Changeset 2287 for research/2008-displacement/main-cpushareTweet

Timestamp:

Apr 16, 2008, 12:11:35 AM (15 years ago)

Author:

Sam Hocevar

Message:

• Better error reporting and argument passing from/to the bytecode.

File:

• research/2008-displacement/main-cpushare (modified) (3 diffs)

research/2008-displacement/main-cpushare

@@ -18 +18 @@
     sys.exit(-1)
 mode = sys.argv[2][1]
+done = 0
 source = sys.argv[3:]
 result = [False] * len(source)
@@ -35 +36 @@
         global todo, source
         if todo >= len(source):
-            return # We're finished... FIXME: a process is stuck
+            return # We're finished... FIXME: is the transaction kept stuck?
         self.index = todo
         todo += 1
         gd.gdMaxColors = 256 * 256 * 256
         im = gd.image(source[self.index])
-        # Send mode
-        self.protocol.sendString(PROTO_SECCOMP_FORWARD + mode)
+        # Send argument count
+        self.protocol.sendString(PROTO_SECCOMP_FORWARD + chr(3))
+        # Send arguments
+        msg = chr(3)
+        msg += "bytecode\0"
+        msg += "-1\0"
+        msg += source[self.index] + "\0"
+        self.protocol.sendString(PROTO_SECCOMP_FORWARD + msg)
         # Send image size
         (self.w, self.h) = (w, h) = im.size()
@@ -65 +72 @@
             if ord(self.answer[-1]) != 0:
                 return
-            global result
+            global done, result
             result[self.index] = self.answer[:-1]
             print self.answer[:-1],
             self.protocol.sendString(PROTO_SECCOMP_SUCCESS)
-            # the PROTO_SECCOMP_SUCCESS probably won't have a chance
-            # to go out but it doesn't matter because we'll disconnect
-            # not just this but all other seccomp state machines too
+            done += 1
+            if done < len(source):
+                return
             from twisted.internet import reactor
             reactor.stop()