Hi,
What is the idea behind this magical string? Shouldn't we use an orb
command line option instead?
Please yell if the following patch shouldn't be committed.
Best regards,
jules
? orb-io-option.patch
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/ORBit2/ChangeLog,v
retrieving revision 1.694
diff -u -r1.694 ChangeLog
--- ChangeLog 14 Feb 2005 23:21:41 -0000 1.694
+++ ChangeLog 21 Feb 2005 12:14:33 -0000
@@ -1,3 +1,9 @@
+2005-02-21 Jules Colding <[EMAIL PROTECTED]>
+
+ * src/orb/orb-core/corba-orb.c (CORBA_ORB_init): Make threaded ORB io
+ a command line option. Remove magical ORB identifier string that gave
+ the same effect.
+
2005-02-14 Tor Lillqvist <[EMAIL PROTECTED]>
* configure.in: New autoconf variable LIBM, set to -lm on Unix,
Index: src/orb/orb-core/corba-orb.c
===================================================================
RCS file: /cvs/gnome/ORBit2/src/orb/orb-core/corba-orb.c,v
retrieving revision 1.107
diff -u -r1.107 corba-orb.c
--- src/orb/orb-core/corba-orb.c 14 Feb 2005 13:01:12 -0000 1.107
+++ src/orb/orb-core/corba-orb.c 21 Feb 2005 12:14:34 -0000
@@ -54,6 +54,7 @@
static char *orbit_naming_ref = NULL;
static GSList *orbit_initref_list = NULL;
static gboolean orbit_use_corbaloc = FALSE;
+static gboolean orbit_use_io_threads = FALSE;
void
ORBit_ORB_start_servers (CORBA_ORB orb)
@@ -385,8 +386,7 @@
orbit_use_ipv4 || orbit_use_ipv6 ||
orbit_use_irda || orbit_use_ssl);
- if (orb_identifier && thread_safe &&
- strstr (orb_identifier, "orbit-io-thread") != NULL)
+ if (thread_safe && orbit_use_io_threads)
link_set_io_thread (TRUE);
genuid_init ();
@@ -1354,6 +1354,7 @@
{ "ORBDebugFlags", ORBIT_OPTION_STRING, &orbit_debug_options },
{ "ORBInitRef", ORBIT_OPTION_KEY_VALUE, &orbit_initref_list},
{ "ORBCorbaloc", ORBIT_OPTION_BOOLEAN, &orbit_use_corbaloc},
+ { "ORBIOThreaded", ORBIT_OPTION_BOOLEAN, &orbit_use_io_threads},
{ NULL, 0, NULL },
};
_______________________________________________
orbit-list mailing list
[email protected]
http://mail.gnome.org/mailman/listinfo/orbit-list
