2003-02-26 Havoc Pennington <hp@pobox.com>

	* dbus/dbus-connection.c
	(dbus_connection_send_message_with_reply_and_block): fix crash
	where we ref'd the outgoing message instead of the returned reply

	* dbus/dbus-transport-unix.c (do_authentication): check read watch
	at the end of this function, so if we didn't need to read for
	authentication, we reinstall it for receiving messages

	* dbus/dbus-message.c (dbus_message_new_reply): allow replies to
	a NULL sender for peer-to-peer case

	* dbus/dbus-transport-unix.c (check_read_watch): handle
	!authenticated case correctly

	* glib/dbus-gmain.c: add support for DBusServer

	* dbus/dbus-server.c: add data slot support

	* glib/dbus-gmain.c (dbus_connection_setup_with_g_main): check
	return values and handle errors

	* dbus/dbus-dataslot.c: factor out the data slot stuff from
	DBusConnection

	* Doxyfile.in (INPUT): add glib subdir

	* glib/dbus-gmain.c (dbus_connection_setup_with_g_main): rename
	setup_with_g_main instead of hookup_with_g_main; write docs

1 files changed, 372 insertions, 0 deletions

diff --git a/dbus/dbus-dataslot.c b/dbus/dbus-dataslot.c
new file mode 100644
index 00000000..a5909ffc
--- /dev/null
+++ b/dbus/dbus-dataslot.c
@@ -0,0 +1,372 @@
+/* -*- mode: C; c-file-style: "gnu" -*- */
+/* dbus-dataslot.c  storing data on objects
+ *
+ * Copyright (C) 2003 Red Hat, Inc.
+ *
+ * Licensed under the Academic Free License version 1.2
+ * 
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ */
+#include "dbus-dataslot.h"
+#include "dbus-threads.h"
+
+/**
+ * @defgroup DBusDataSlot Data slots
+ * @ingroup  DBusInternals
+ * @brief Storing data by ID
+ *
+ * Types and functions related to storing data by an
+ * allocated ID. This is used for dbus_connection_set_data(),
+ * dbus_server_set_data(), etc. 
+ * @{
+ */
+
+/**
+ * Initializes a data slot allocator object, used to assign
+ * integer IDs for data slots.
+ *
+ * @param allocator the allocator to initialize
+ */
+dbus_bool_t
+_dbus_data_slot_allocator_init (DBusDataSlotAllocator *allocator)
+{
+  allocator->allocated_slots = NULL;
+  allocator->n_allocated_slots = 0;
+  allocator->n_used_slots = 0;
+  allocator->lock = dbus_mutex_new ();
+  if (allocator->lock == NULL)
+    return FALSE;
+  else
+    return TRUE;
+}
+
+/**
+ * Allocates an integer ID to be used for storing data
+ * in a #DBusDataSlotList.
+ *
+ * @param allocator the allocator
+ * @returns the integer ID, or -1 on failure
+ */
+int
+_dbus_data_slot_allocator_alloc (DBusDataSlotAllocator *allocator)
+{
+  int slot;
+  
+  if (!dbus_mutex_lock (allocator->lock))
+    return -1;
+
+  if (allocator->n_used_slots < allocator->n_allocated_slots)
+    {
+      slot = 0;
+      while (slot < allocator->n_allocated_slots)
+        {
+          if (allocator->allocated_slots[slot] < 0)
+            {
+              allocator->allocated_slots[slot] = slot;
+              allocator->n_used_slots += 1;
+              break;
+            }
+          ++slot;
+        }
+
+      _dbus_assert (slot < allocator->n_allocated_slots);
+    }
+  else
+    {
+      int *tmp;
+      
+      slot = -1;
+      tmp = dbus_realloc (allocator->allocated_slots,
+                          sizeof (int) * (allocator->n_allocated_slots + 1));
+      if (tmp == NULL)
+        goto out;
+
+      allocator->allocated_slots = tmp;
+      slot = allocator->n_allocated_slots;
+      allocator->n_allocated_slots += 1;
+      allocator->n_used_slots += 1;
+      allocator->allocated_slots[slot] = slot;
+    }
+
+  _dbus_assert (slot >= 0);
+  _dbus_assert (slot < allocator->n_allocated_slots);
+  
+ out:
+  dbus_mutex_unlock (allocator->lock);
+  return slot;
+}
+
+/**
+ * Deallocates an ID previously allocated with
+ * _dbus_data_slot_allocator_alloc().  Existing data stored on
+ * existing #DBusDataList objects with this ID will be freed when the
+ * data list is finalized, but may not be retrieved (and may only be
+ * replaced if someone else reallocates the slot).
+ *
+ * @param allocator the allocator
+ * @param slot the slot to deallocate
+ */
+void
+_dbus_data_slot_allocator_free (DBusDataSlotAllocator *allocator,
+                                int slot)
+{
+  dbus_mutex_lock (allocator->lock);
+
+  _dbus_assert (slot < allocator->n_allocated_slots);
+  _dbus_assert (allocator->allocated_slots[slot] == slot);
+  
+  allocator->allocated_slots[slot] = -1;
+  allocator->n_used_slots -= 1;
+
+  if (allocator->n_used_slots == 0)
+    {
+      dbus_free (allocator->allocated_slots);
+      allocator->allocated_slots = NULL;
+      allocator->n_allocated_slots = 0;
+    }
+  
+  dbus_mutex_unlock (allocator->lock);
+}
+
+/**
+ * Initializes a slot list.
+ * @param list the list to initialize.
+ */
+void
+_dbus_data_slot_list_init (DBusDataSlotList *list)
+{
+  list->slots = NULL;
+  list->n_slots = 0;
+}
+
+/**
+ * Stores a pointer in the data slot list, along with an optional
+ * function to be used for freeing the data when the data is set
+ * again, or when the slot list is finalized. The slot number must
+ * have been allocated with _dbus_data_slot_allocator_alloc() for the
+ * same allocator passed in here. The same allocator has to be used
+ * with the slot list every time.
+ *
+ * @param allocator the allocator to use
+ * @param list the data slot list
+ * @param slot the slot number
+ * @param data the data to store
+ * @param free_data_func finalizer function for the data
+ * @param old_free_func free function for any previously-existing data
+ * @param old_data previously-existing data, should be freed with old_free_func
+ * @returns #TRUE if there was enough memory to store the data
+ */
+dbus_bool_t
+_dbus_data_slot_list_set  (DBusDataSlotAllocator *allocator,
+                           DBusDataSlotList      *list,
+                           int                    slot,
+                           void                  *data,
+                           DBusFreeFunction       free_data_func,
+                           DBusFreeFunction      *old_free_func,
+                           void                 **old_data)
+{  
+  _dbus_assert (slot < allocator->n_allocated_slots);
+  _dbus_assert (allocator->allocated_slots[slot] == slot);
+  
+  if (slot >= list->n_slots)
+    {
+      DBusDataSlot *tmp;
+      int i;
+      
+      tmp = dbus_realloc (list->slots,
+                          sizeof (DBusDataSlot) * (slot + 1));
+      if (tmp == NULL)
+        return FALSE;
+      
+      list->slots = tmp;
+      i = list->n_slots;
+      list->n_slots = slot + 1;
+      while (i < list->n_slots)
+        {
+          list->slots[i].data = NULL;
+          list->slots[i].free_data_func = NULL;
+          ++i;
+        }
+    }
+
+  _dbus_assert (slot < list->n_slots);
+
+  *old_data = list->slots[slot].data;
+  *old_free_func = list->slots[slot].free_data_func;
+
+  list->slots[slot].data = data;
+  list->slots[slot].free_data_func = free_data_func;
+
+  return TRUE;
+}
+
+/**
+ * Retrieves data previously set with _dbus_data_slot_list_set_data().
+ * The slot must still be allocated (must not have been freed).
+ *
+ * @param allocator the allocator slot was allocated from
+ * @param list the data slot list
+ * @param slot the slot to get data from
+ * @returns the data, or #NULL if not found
+ */
+void*
+_dbus_data_slot_list_get  (DBusDataSlotAllocator *allocator,
+                           DBusDataSlotList      *list,
+                           int                    slot)
+{
+  _dbus_assert (slot < allocator->n_allocated_slots);
+  _dbus_assert (allocator->allocated_slots[slot] == slot);
+
+  if (slot >= list->n_slots)
+    return NULL;
+  else
+    return list->slots[slot].data;
+}
+
+/**
+ * Frees the data slot list and all data slots contained
+ * in it, calling application-provided free functions
+ * if they exist.
+ *
+ * @param list the list to free
+ */
+void
+_dbus_data_slot_list_free (DBusDataSlotList *list)
+{
+  int i;
+
+  i = 0;
+  while (i < list->n_slots)
+    {
+      if (list->slots[i].free_data_func)
+        (* list->slots[i].free_data_func) (list->slots[i].data);
+      list->slots[i].data = NULL;
+      list->slots[i].free_data_func = NULL;
+      ++i;
+    }
+
+  dbus_free (list->slots);
+  list->slots = NULL;
+  list->n_slots = 0;
+}
+
+/** @} */
+
+#ifdef DBUS_BUILD_TESTS
+#include "dbus-test.h"
+#include <stdio.h>
+
+static int free_counter;
+
+static void
+test_free_slot_data_func (void *data)
+{
+  int i = _DBUS_POINTER_TO_INT (data);
+
+  _dbus_assert (free_counter == i);
+  ++free_counter;
+}
+
+/**
+ * Test function for data slots
+ */
+dbus_bool_t
+_dbus_data_slot_test (void)
+{
+  DBusDataSlotAllocator allocator;
+  DBusDataSlotList list;
+  int i;
+  DBusFreeFunction old_free_func;
+  void *old_data;
+  
+  if (!_dbus_data_slot_allocator_init (&allocator))
+    _dbus_assert_not_reached ("no memory for allocator");
+
+  _dbus_data_slot_list_init (&list);
+
+#define N_SLOTS 100
+
+  i = 0;
+  while (i < N_SLOTS)
+    {
+      /* we don't really want apps to rely on this ordered
+       * allocation, but it simplifies things to rely on it
+       * here.
+       */
+      if (_dbus_data_slot_allocator_alloc (&allocator) != i)
+        _dbus_assert_not_reached ("did not allocate slots in numeric order\n");
+
+      ++i;
+    }
+
+  i = 0;
+  while (i < N_SLOTS)
+    {
+      if (!_dbus_data_slot_list_set (&allocator, &list,
+                                     i,
+                                     _DBUS_INT_TO_POINTER (i), 
+                                     test_free_slot_data_func,
+                                     &old_free_func, &old_data))
+        _dbus_assert_not_reached ("no memory to set data");
+
+      _dbus_assert (old_free_func == NULL);
+      _dbus_assert (old_data == NULL);
+
+      _dbus_assert (_dbus_data_slot_list_get (&allocator, &list, i) ==
+                    _DBUS_INT_TO_POINTER (i));
+      
+      ++i;
+    }
+
+  free_counter = 0;
+  i = 0;
+  while (i < N_SLOTS)
+    {
+      if (!_dbus_data_slot_list_set (&allocator, &list,
+                                     i,
+                                     _DBUS_INT_TO_POINTER (i), 
+                                     test_free_slot_data_func,
+                                     &old_free_func, &old_data))
+        _dbus_assert_not_reached ("no memory to set data");
+
+      _dbus_assert (old_free_func == test_free_slot_data_func);
+      _dbus_assert (_DBUS_POINTER_TO_INT (old_data) == i);
+
+      (* old_free_func) (old_data);
+      _dbus_assert (i == (free_counter - 1));
+
+      _dbus_assert (_dbus_data_slot_list_get (&allocator, &list, i) ==
+                    _DBUS_INT_TO_POINTER (i));
+      
+      ++i;
+    }
+
+  free_counter = 0;
+  _dbus_data_slot_list_free (&list);
+
+  _dbus_assert (N_SLOTS == free_counter);
+
+  i = 0;
+  while (i < N_SLOTS)
+    {
+      _dbus_data_slot_allocator_free (&allocator, i);
+      ++i;
+    }
+  
+  return TRUE;
+}
+
+#endif /* DBUS_BUILD_TESTS */