runtime: fix serialization of object lists.

Fixes #500.
m-labs · Jul 7, 2016 · 653eeb4 · 653eeb4
1 parent 5a79fcf
commit 653eeb4
Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/artiq/runtime/session.c b/artiq/runtime/session.c
@@ -877,7 +877,12 @@ static int send_rpc_value(const char **tag, void **value)
 
         case 'O': { // host object
             struct { uint32_t id; } **object = *value;
-            return out_packet_int32((*object)->id);
+
+            if(!out_packet_int32((*object)->id))
+                return 0;
+
+            *value = (void*)((intptr_t)(*value) + sizeof(*object));
+            break;
         }
 
         default:

diff --git a/artiq/test/coredevice/test_embedding.py b/artiq/test/coredevice/test_embedding.py
@@ -48,6 +48,9 @@ def test_object(self):
         obj = object()
         self.assertRoundtrip(obj)
 
+    def test_object_list(self):
+        self.assertRoundtrip([object(), object()])
+
 
 class _DefaultArg(EnvExperiment):
     def build(self):