components/library/ORBit2/patches/ORBit2-02-custom-g-main-context.patch

   1 diff -ur ORBit2-2.14.18-old/include/orbit/GIOP/giop.h ORBit2-2.14.18-new/include/orbit/GIOP/giop.h
   2 --- ORBit2-2.14.18-old/include/orbit/GIOP/giop.h        2009-04-18 20:20:54.000000000 +0800
   3 +++ ORBit2-2.14.18-new/include/orbit/GIOP/giop.h        2010-05-28 14:35:56.012926304 +0800
   4 @@ -14,6 +14,7 @@
   5
   6  #ifdef ORBIT2_INTERNAL_API
   7
   8 +void        giop_set_main_context  (GMainContext *context);
   9  void        giop_init              (gboolean thread_safe,
  10                                     gboolean blank_wire_data);
  11  void        giop_main_run          (void);
  12 diff -ur ORBit2-2.14.18-old/include/orbit/orb-core/corba-orb.h ORBit2-2.14.18-new/include/orbit/orb-core/corba-orb.h
  13 --- ORBit2-2.14.18-old/include/orbit/orb-core/corba-orb.h       2009-04-18 20:20:54.000000000 +0800
  14 +++ ORBit2-2.14.18-new/include/orbit/orb-core/corba-orb.h       2010-05-28 14:36:31.612946110 +0800
  15 @@ -32,6 +32,8 @@
  16   */
  17  glong ORBit_get_giop_recv_limit (void);
  18
  19 +void ORBit_set_giop_main_context (GMainContext *context);
  20 +
  21  #ifdef ORBIT2_INTERNAL_API
  22
  23  void      ORBit_ORB_forw_bind (CORBA_ORB                   orb,
  24 diff -ur ORBit2-2.14.18-old/src/orb/GIOP/giop.c ORBit2-2.14.18-new/src/orb/GIOP/giop.c
  25 --- ORBit2-2.14.18-old/src/orb/GIOP/giop.c      2009-04-18 20:20:54.000000000 +0800
  26 +++ ORBit2-2.14.18-new/src/orb/GIOP/giop.c      2010-05-28 14:34:39.517566265 +0800
  27 @@ -21,6 +21,7 @@
  28  static int      corba_wakeup_fds[2];
  29  #define WAKEUP_POLL  corba_wakeup_fds [0]
  30  #define WAKEUP_WRITE corba_wakeup_fds [1]
  31 +static GMainContext *giop_main_context = NULL;
  32  static GSource *giop_main_source = NULL;
  33  static GIOPThread *giop_main_thread = NULL;
  34
  35 @@ -530,19 +531,26 @@
  36  }
  37
  38  void
  39 +giop_set_main_context (GMainContext *context)
  40 +{
  41 +       giop_main_context = context;
  42 +}
  43 +
  44 +void
  45  giop_init (gboolean thread_safe, gboolean blank_wire_data)
  46  {
  47         link_init (thread_safe);
  48
  49         if (giop_thread_safe ()) {
  50                 GIOPThread *tdata;
  51 +               if (!giop_main_context)
  52 +                       giop_main_context = g_main_context_default();
  53
  54                 /* We need a destructor to clean up if giopthreads are used
  55                  * outside of ORBit controlled threads */
  56                 giop_tdata_private = g_private_new ((GDestroyNotify)giop_thread_free);
  57
  58 -               giop_main_thread = tdata = giop_thread_new (
  59 -                       g_main_context_default ()); /* main thread */
  60 +               giop_main_thread = tdata = giop_thread_new (giop_main_context); /* main thread */
  61
  62                 if (link_pipe (corba_wakeup_fds) < 0) /* cf. g_main_context_init_pipe */
  63                         g_error ("Can't create CORBA main-thread wakeup pipe");
  64 @@ -556,7 +564,7 @@
  65                 fcntl (WAKEUP_WRITE, F_SETFL, O_NONBLOCK);
  66  #endif
  67                 giop_main_source = link_source_create_watch (
  68 -                       g_main_context_default (), WAKEUP_POLL,
  69 +                       giop_main_context, WAKEUP_POLL,
  70                         NULL, (G_IO_IN | G_IO_PRI),
  71                         giop_mainloop_handle_input, NULL);
  72
  73 diff -ur ORBit2-2.14.18-old/src/orb/orb-core/corba-orb.c ORBit2-2.14.18-new/src/orb/orb-core/corba-orb.c
  74 --- ORBit2-2.14.18-old/src/orb/orb-core/corba-orb.c     2009-04-18 20:20:54.000000000 +0800
  75 +++ ORBit2-2.14.18-new/src/orb/orb-core/corba-orb.c     2010-05-28 14:35:25.821387536 +0800
  76 @@ -1442,6 +1442,12 @@
  77         return giop_recv_get_limit ();
  78  }
  79
  80 +void
  81 +ORBit_set_giop_main_context (GMainContext *context)
  82 +{
  83 +       giop_set_main_context (context);
  84 +}
  85 +
  86  const ORBit_option orbit_supported_options[] = {
  87         { "ORBid",              ORBIT_OPTION_STRING,  NULL }, /* FIXME: unimplemented */
  88         { "ORBImplRepoIOR",     ORBIT_OPTION_STRING,  NULL }, /* FIXME: unimplemented */