[PATCH] Some hacks for preloading some modules and then executing a python activity from a fork().

Tomeu Vizoso tomeu
Fri Feb 8 13:12:06 EST 2008


---
 rainbow/rainbow/inject.py        |   35 +++++++++-
 rainbow/rainbow/service.py       |   21 +++++
 rainbow/rainbow/sugaractivity.py |  152 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 207 insertions(+), 1 deletions(-)
 create mode 100644 rainbow/rainbow/sugaractivity.py

diff --git a/rainbow/rainbow/inject.py b/rainbow/rainbow/inject.py
index 96231c0..85fa3d5 100644
--- a/rainbow/rainbow/inject.py
+++ b/rainbow/rainbow/inject.py
@@ -1,6 +1,7 @@
 import os
 from os import F_OK, R_OK, W_OK, X_OK
 from os.path import join, dirname, isabs, basename, realpath, lexists
+import sys
 from stat import S_IFDIR
 import shutil
 import subprocess
@@ -202,7 +203,39 @@ def launch(log, home, uid, gid, argv, env, cwd, safe_fds, strace_hint):
         if fd not in safe_fds:
             try: os.close(fd) # propagate failure from EIO or EBADF.
             except: pass
-    os.execvpe(argv[0], argv, env)
+
+    # This looks a bit hacky. Probably need a better way to know that this
+    # activitiy needs to go through the fast path.
+    if argv[0] == 'sugar-activity':
+
+        # hack: should be parameters to sugarlaunch.launch()
+        sys.argv = argv
+
+        os.environ['SUGAR_BUNDLE_PATH'] = env['SUGAR_BUNDLE_PATH']
+        os.environ['SUGAR_BUNDLE_ID'] = env['SUGAR_BUNDLE_ID']
+        os.environ['SUGAR_ACTIVITY_ROOT'] = env['SUGAR_ACTIVITY_ROOT']
+        os.environ['SUGAR_PREFIX'] = env['SUGAR_PREFIX']
+        os.environ['SUGAR_PATH'] = env['SUGAR_PATH']
+        os.environ['SUGAR_LOGGER_LEVEL'] = env['SUGAR_LOGGER_LEVEL']
+        os.environ['HOME'] = env['HOME']
+        os.environ['USER'] = env['USER']
+        os.environ['TMPDIR'] = env['TMPDIR']
+        os.environ['LOGNAME'] = env['LOGNAME']
+        #for key, value in env.iteritems():
+        #    os.environ[key] = value
+
+        log(os.environ)
+
+        # Recreate the connection to X
+        import gtk
+        d = gtk.gdk.Display(':0')
+        dm = gtk.gdk.display_manager_get()
+        dm.set_default_display(d)
+
+        from rainbow import sugaractivity
+        sugaractivity.launch()
+    else:
+        os.execvpe(argv[0], argv, env)
 
 def check_bundle_id(bundle_id):
     assert bundle_id and all(s.isalnum() for s in bundle_id.split('.'))
diff --git a/rainbow/rainbow/service.py b/rainbow/rainbow/service.py
index b431915..314073f 100644
--- a/rainbow/rainbow/service.py
+++ b/rainbow/rainbow/service.py
@@ -87,6 +87,27 @@ def main():
     try: gc_spool(log, SPOOL)
     except: util.trace()
 
+    # Pre-load dbus
+    os.environ['DBUS_SESSION_BUS_ADDRESS'] = 'unix:path=/tmp/olpc-session-bus'
+    import dbus.service, dbus.decorators
+    # the rainbow service needs to be sure not to create a connection to the SessionBus
+    # the children would then need to close that connection and create a new one
+
+    # Pre-load telepathy
+    import telepathy
+
+    # Pre-load heavy sugar modules
+    from sugar.activity import activity, activityservice
+    from sugar.graphics import style, window
+    from rainbow import sugaractivity
+
+    # Pre-load pygtk
+    os.environ['DISPLAY'] = ':0'
+    os.environ['GTK2_RC_FILES'] = '/usr/share/sugar/data/sugar-xo.gtkrc'
+    import gtk
+    display = gtk.gdk.display_get_default()
+    display.close() # This needs to happen after importing s.g.style
+
     dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
 
     bus = dbus.SystemBus()
diff --git a/rainbow/rainbow/sugaractivity.py b/rainbow/rainbow/sugaractivity.py
new file mode 100644
index 0000000..d3689d2
--- /dev/null
+++ b/rainbow/rainbow/sugaractivity.py
@@ -0,0 +1,152 @@
+#!/usr/bin/env python
+
+# Copyright (C) 2006, Red Hat, Inc.
+# Copyright (C) 2008, One Laptop Per Child
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+import os
+import sys
+import gettext
+from optparse import OptionParser
+
+import pygtk
+pygtk.require('2.0')
+import gtk
+import dbus
+import dbus.service
+import dbus.glib
+
+from sugar.activity import activityhandle
+from sugar.bundle.activitybundle import ActivityBundle
+from sugar import _sugarbaseext
+from sugar import logger
+
+activity_instances = []
+
+def activity_destroy_cb(window):
+    activity_instances.remove(window)
+    if len(activity_instances) == 0:
+        gtk.main_quit()
+
+def create_activity_instance(constructor, handle):
+    activity = constructor(handle)
+    activity.connect('destroy', activity_destroy_cb)
+    activity.show()
+
+    activity_instances.append(activity)
+
+def get_single_process_name(bundle_id):
+    return bundle_id
+
+def get_single_process_path(bundle_id):
+    return '/' + bundle_id.replace('.', '/')
+
+class SingleProcess(dbus.service.Object):
+    def __init__(self, service_name, constructor):
+        self.constructor = constructor
+    
+        bus = dbus.SessionBus()
+        bus_name = dbus.service.BusName(service_name, bus = bus)
+        object_path = get_single_process_path(service_name)
+        dbus.service.Object.__init__(self, bus_name, object_path)
+
+    @dbus.service.method("org.laptop.SingleProcess", in_signature="a{ss}")
+    def create(self, handle_dict):
+        handle = activityhandle.create_from_dict(handle_dict)
+        create_activity_instance(self.constructor, handle)
+
+def launch():
+    parser = OptionParser()
+    parser.add_option("-b", "--bundle-id", dest="bundle_id",
+                      help="identifier of the activity bundle")
+    parser.add_option("-a", "--activity-id", dest="activity_id",
+                      help="identifier of the activity instance")
+    parser.add_option("-o", "--object-id", dest="object_id",
+                      help="identifier of the associated datastore object")
+    parser.add_option("-u", "--uri", dest="uri",
+                      help="URI to load")
+    parser.add_option('-s', '--single-process', dest='single_process',
+                      action='store_true',
+                      help='start all the instances in the same process')
+    (options, args) = parser.parse_args()
+
+    logger.start()
+
+    if 'SUGAR_BUNDLE_PATH' not in os.environ:
+        print 'SUGAR_BUNDLE_PATH is not defined in the environment.'
+        sys.exit(1)
+
+    if len(args) == 0:
+        print 'A python class must be specified as first argument.'
+        sys.exit(1)    
+
+    bundle_path = os.environ['SUGAR_BUNDLE_PATH']
+    sys.path.append(bundle_path)
+
+    bundle = ActivityBundle(bundle_path)
+
+    os.environ['SUGAR_BUNDLE_ID'] = bundle.get_bundle_id()
+    os.environ['SUGAR_BUNDLE_NAME'] = bundle.get_name()
+
+    gtk.icon_theme_get_default().append_search_path(bundle.get_icons_path())
+
+    gettext.bindtextdomain(bundle.get_bundle_id(),
+                           bundle.get_locale_path())
+    gettext.textdomain(bundle.get_bundle_id())
+
+    splitted_module = args[0].rsplit('.', 1)
+    module_name = splitted_module[0]
+    class_name = splitted_module[1]
+
+    module = __import__(module_name)        
+    for comp in module_name.split('.')[1:]:
+        module = getattr(module, comp)
+
+    constructor = getattr(module, class_name)
+    handle = activityhandle.ActivityHandle(
+                activity_id=options.activity_id,
+                object_id=options.object_id, uri=options.uri)
+
+    if options.single_process is True:
+        bus = dbus.SessionBus()
+
+        service_name = get_single_process_name(options.bundle_id)
+        service_path = get_single_process_path(options.bundle_id)
+
+        bus_object = bus.get_object(
+                'org.freedesktop.DBus', '/org/freedesktop/DBus')
+        try:
+            name = bus_object.GetNameOwner(
+                    service_name, dbus_interface='org.freedesktop.DBus')
+        except  dbus.DBusException:
+            name = None
+
+        if not name:
+            service = SingleProcess(service_name, constructor)
+        else:
+            single_process = bus.get_object(service_name, service_path)
+            single_process.create(handle.get_dict())
+
+            print 'Created %s in a single process.' % service_name
+            sys.exit(0)
+
+    if hasattr(module, 'start'):
+        module.start()
+
+    create_activity_instance(constructor, handle)
+
+    gtk.main()
+
-- 
1.5.2.5


--=-RWAA0jX2UYOsTZ/x4xpF--




More information about the Sugar-devel mailing list