From 433b58511cdfaa9d369108e190964e8b2394e67b Mon Sep 17 00:00:00 2001
From: Julien Fontanet <julien.fontanet@isonoe.net>
Date: Mon, 20 Apr 2015 19:47:49 +0200
Subject: [PATCH] Fix VM_guest_metrics.

---
 src/spec.coffee | 61 ++++++++++++++++++++++++++++---------------------
 1 file changed, 35 insertions(+), 26 deletions(-)

diff --git a/src/spec.coffee b/src/spec.coffee
index 7b54a63f0..6e94b0f1c 100644
--- a/src/spec.coffee
+++ b/src/spec.coffee
@@ -50,49 +50,58 @@ module.exports = ->
   #     console.log event
   #     emit.call collection, event, items
 
-  $link = (keyFn, valFn = (-> @val), once = false) ->
+  $link = (keyFn, valFn = (-> @val)) ->
+    keyPerItem = Object.create null
+    listenerPerItem = Object.create null
     valuePerItem = Object.create null
     updating = false
 
     ->
       {key} = this
 
-      # Returns the value if already defined.
-      return valuePerItem[key] if key of valuePerItem
-
       # Gets the key of the remote object.
       remoteKey = keyFn.call this
 
+      keyHasChanged = remoteKey isnt keyPerItem[key]
+
+      if keyHasChanged
+        keyPerItem[key] = remoteKey
+      else
+        # Returns the value if already defined.
+        return valuePerItem[key] if key of valuePerItem
+
+      eventName = "key=#{remoteKey}"
+      listener = listenerPerItem[key]
+
+      if listener and keyHasChanged
+        collection.remove eventName, listener
+        listener = null
+
       # Special case for `OpaqueRef:NULL`.
       if remoteKey is 'OpaqueRef:NULL'
         return valuePerItem[key] = null
 
+      unless listener
+        listener = (event, item) ->
+          # If the events are due to an update of this link or if the item is
+          # exiting, just returns.
+          return if updating or event isnt 'enter'
+
+          # Register its value.
+          valuePerItem[key] = valFn.call item
+
+          # Force the object to update.
+          try
+            updating = true
+            collection.touch key
+          finally
+            updating = false
+        collection.on eventName, listener
+
       # Tries to find the remote object in the collection.
       try
         return valuePerItem[key] = valFn.call (collection.getRaw remoteKey)
 
-      # If not found, listens for its apparition.
-      eventName = "key=#{remoteKey}"
-      listener = (event, item) ->
-        # If the events are due to an update of this link or if the item is
-        # exiting, just returns.
-        return if updating or event isnt 'enter'
-
-        # Register its value.
-        valuePerItem[key] = valFn.call item
-
-        if once
-          # Removes the now unnecessary listener.
-          collection.removeListener eventName, listener
-
-        # Force the object to update.
-        try
-          updating = true
-          collection.touch key
-        finally
-          updating = false
-      collection.on eventName, listener
-
       # Returns `null` for now.
       valuePerItem[key] = null