dbus/test/glib test-profile.c,1.15,1.16

Havoc Pennington hp@freedesktop.org
Sat Jan 15 18:23:58 PST 2005


Update of /cvs/dbus/dbus/test/glib
In directory gabe:/tmp/cvs-serv27412/test/glib

Modified Files:
	test-profile.c 
Log Message:
2005-01-15  Havoc Pennington  <hp@redhat.com>

	* test/glib/test-profile.c (with_bus_server_filter): fix crash

	* dbus/dbus-marshal-basic.c (_dbus_unpack_uint32): inline as macro
	when DBUS_DISABLE_ASSERT
	(_dbus_marshal_set_basic): be sure we align for the string length

	* dbus/dbus-marshal-recursive.c (skip_one_complete_type): make
	this look faster

	* dbus/dbus-string.c (_dbus_string_get_const_data_len): add an
	inline macro version
	(_dbus_string_set_byte): provide inline macro version



Index: test-profile.c
===================================================================
RCS file: /cvs/dbus/dbus/test/glib/test-profile.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- test-profile.c	15 Jan 2005 07:15:38 -0000	1.15
+++ test-profile.c	16 Jan 2005 02:23:56 -0000	1.16
@@ -48,7 +48,7 @@
  */
 #define N_CLIENT_THREADS 1
 /* It seems like at least 750000 or so iterations reduces the variability to sane levels */
-#define N_ITERATIONS 7500
+#define N_ITERATIONS 750000
 #define N_PROGRESS_UPDATES 20
 /* Don't make PAYLOAD_SIZE too huge because it gets used as a static buffer size */
 #define PAYLOAD_SIZE 0
@@ -425,7 +425,7 @@
                                    DBUS_INTERFACE_ORG_FREEDESKTOP_DBUS,
                                    "ServiceOwnerChanged"))
     {
-      char *service_name, *old_owner, *new_owner;
+      const char *service_name, *old_owner, *new_owner;
       DBusError error;
 
       service_name = NULL;
@@ -455,10 +455,6 @@
           if (server->sd->n_clients == 0)
             g_main_loop_quit (server->sd->loop);
         }
-
-      dbus_free (service_name);
-      dbus_free (old_owner);
-      dbus_free (new_owner);
     }
   else if (dbus_message_is_method_call (message,
                                         ECHO_INTERFACE,



More information about the dbus-commit mailing list