2003-08-29 Havoc Pennington <hp@pobox.com>

	* dbus/dbus-internals.h: fix _DBUS_N_GLOBAL_LOCKS

diff --git a/ChangeLog b/ChangeLog
index 6aa3676005abced39887b7c476d1a7fdf266e1e9..489b1d51d0b36fec9b06a79b76a32b8c8d9bb973 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2003-08-29  Havoc Pennington  <hp@pobox.com>
+
+       * dbus/dbus-internals.h: fix _DBUS_N_GLOBAL_LOCKS
+
 2003-08-28  Havoc Pennington  <hp@pobox.com>
 
        purge DBusObjectID

diff --git a/dbus/dbus-internals.h b/dbus/dbus-internals.h
index 1c0f731437f385f2ad8faded9a2ffd255c279481..a0c5b194dd5ed3003b28242cc13e20536cdb8d1d 100644 (file)
--- a/dbus/dbus-internals.h
+++ b/dbus/dbus-internals.h
@@ -237,7 +237,7 @@ _DBUS_DECLARE_GLOBAL_LOCK (message_handler);
 _DBUS_DECLARE_GLOBAL_LOCK (bus);
 _DBUS_DECLARE_GLOBAL_LOCK (shutdown_funcs);
 _DBUS_DECLARE_GLOBAL_LOCK (system_users);
-#define _DBUS_N_GLOBAL_LOCKS (10)
+#define _DBUS_N_GLOBAL_LOCKS (9)
 
 dbus_bool_t _dbus_threads_init_debug (void);
 

diff --git a/doc/TODO b/doc/TODO
index 843d4e15f22ca2d095b258d0e545ab5989abbf85..4cd4eeb6afe70d73071bdc76e62f229517c8322a 100644 (file)
--- a/doc/TODO
+++ b/doc/TODO
@@ -68,3 +68,11 @@
    files; they have to be in the toplevel file. when loading 
    a child file, we could just init its DBusLimits from the parent, 
    then after parsing copy its DBusLimits back to the parent
+
+ - when making a method call, if the call serial were globally unique,
+   we could forward the call serial along with any method calls made
+   as a result of the first method call, and allow reentrancy that was
+   strictly part of the call stack of said method call. But I don't
+   really see how to do this without making the user pass around the
+   call serial to all method calls all the time, or disallowing 
+   async calls.