issue #3: Teach core.py the difference between its parent context and the master context.

Needed to allow GET_MODULE calls to reach the parent rather than the
master, when they are not the same context.

econtext/core.py

@@ -737,10 +737,6 @@ class Router(object):
     def __repr__(self):
         return 'Router(%r)' % (self.broker,)
 
-    def set_parent(self, context):
-        self.parent_context = context
-        context.add_handler(self._on_add_route, ADD_ROUTE)
-
     def on_disconnect(self, stream, broker):
         """Invoked by Stream.on_disconnect()."""
         for context in self._context_by_id.itervalues():
@@ -772,15 +768,16 @@ class Router(object):
         self.broker.start_receive(stream)
 
     def _route(self, msg):
-        #LOG.debug('%r._route(%r)', self, msg)
+        IOLOG.debug('%r._route(%r)', self, msg)
         context = self._context_by_id.get(msg.src_id)
-        if msg.dst_id == econtext.context_id and context is not None:
+        if context and msg.dst_id == econtext.context_id:
             context._invoke(msg)
             return
 
         stream = self._stream_by_id.get(msg.dst_id)
         if stream is None:
-            LOG.error('%r: no route for %r, my ID is %r', self, msg, econtext.context_id)
+            LOG.error('%r: no route for %r, my ID is %r',
+                      self, msg, econtext.context_id)
             return
 
         stream.send(msg)
@@ -963,10 +960,15 @@ class ExternalContext(object):
     def _setup_master(self, parent_id, context_id, key):
         self.broker = Broker()
         self.router = Router(self.broker)
-        self.context = Context(self.router, parent_id, 'master', key=key)
-        self.router.set_parent(self.context)
-        self.channel = Channel(self.context, CALL_FUNCTION)
+        self.master = Context(self.router, 0, 'master')
+        if parent_id == 0:
+            self.parent = self.master
+        else:
+            self.parent = Context(self.router, parent_id, 'parent')
+
+        self.channel = Channel(self.master, CALL_FUNCTION)
         self.stream = Stream(self.router, parent_id, key)
+        self.stream.name = 'parent'
         self.stream.accept(100, 1)
 
         os.wait()  # Reap first stage.
@@ -975,7 +977,7 @@ class ExternalContext(object):
     def _setup_logging(self, debug, log_level):
         root = logging.getLogger()
         root.setLevel(log_level)
-        root.handlers = [LogHandler(self.context)]
+        root.handlers = [LogHandler(self.master)]
         if debug:
             enable_debug_logging()
 
@@ -987,7 +989,7 @@ class ExternalContext(object):
             core_src = '\n'.join(core_src.splitlines()[:-1])
             fp.close()
 
-        self.importer = Importer(self.context, core_src)
+        self.importer = Importer(self.master, core_src)
         sys.meta_path.append(self.importer)
 
     def _setup_package(self, context_id):
@@ -1030,10 +1032,10 @@ class ExternalContext(object):
                     obj = getattr(obj, klass)
                 fn = getattr(obj, func)
                 ret = fn(*args, **kwargs)
-                self.context.send(Message.pickled(ret, handle=msg.reply_to))
+                self.master.send(Message.pickled(ret, handle=msg.reply_to))
             except Exception, e:
                 e = CallError(str(e))
-                self.context.send(Message.pickled(e, handle=msg.reply_to))
+                self.master.send(Message.pickled(e, handle=msg.reply_to))
 
     def main(self, parent_id, context_id, key, debug, log_level):
         self._setup_master(parent_id, context_id, key)
@@ -1043,10 +1045,12 @@ class ExternalContext(object):
                 self._setup_importer()
                 self._setup_package(context_id)
                 self._setup_stdio()
+
+                self.router.register(self.parent, self.stream)
+                self.router.register(self.master, self.stream)
                 LOG.debug('Connected to %s; my ID is %r, PID is %r',
-                          self.context, context_id, os.getpid())
+                          self.parent, context_id, os.getpid())
 
-                self.router.register(self.context, self.stream)
                 self._dispatch_calls()
                 LOG.debug('ExternalContext.main() normal exit')
             except BaseException:

econtext/master.py

@@ -383,8 +383,7 @@ class Stream(econtext.core.Stream):
     def get_preamble(self):
         source = inspect.getsource(econtext.core)
         source += '\nExternalContext().main%r\n' % ((
-            # econtext.context_id,       # parent_id
-            0,
+            econtext.context_id,       # parent_id
             self.remote_id,            # context_id
             self.key,
             self.debug,