Merge branch 'dbus-1.4'

[platform/upstream/dbus.git] / dbus / dbus-list.c

diff --git a/dbus/dbus-list.c b/dbus/dbus-list.c
index 5f4c67c..d4d74f6 100644 (file)
--- a/dbus/dbus-list.c
+++ b/dbus/dbus-list.c
@@ -1,9 +1,9 @@
-/* -*- mode: C; c-file-style: "gnu" -*- */
-/* dbus-list.c Generic linked list utility (internal to D-BUS implementation)
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+/* dbus-list.c Generic linked list utility (internal to D-Bus implementation)
  * 
  * Copyright (C) 2002  Red Hat, Inc.
  *
- * Licensed under the Academic Free License version 1.2
+ * Licensed under the Academic Free License version 2.1
  * 
  * 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
@@ -17,14 +17,15 @@
  * 
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  *
  */
 
+#include <config.h>
 #include "dbus-internals.h"
 #include "dbus-list.h"
 #include "dbus-mempool.h"
-#include "dbus-threads.h"
+#include "dbus-threads-internal.h"
 
 /**
  * @defgroup DBusList Linked list
@@ -55,8 +56,7 @@ alloc_link (void *data)
 {
   DBusList *link;
 
-  if (!_DBUS_LOCK (list))
-    return NULL;
+  _DBUS_LOCK (list);
 
   if (list_pool == NULL)
     {      
@@ -146,6 +146,18 @@ link_after (DBusList **list,
     }
 }
 
+#ifdef DBUS_ENABLE_STATS
+void
+_dbus_list_get_stats     (dbus_uint32_t *in_use_p,
+                          dbus_uint32_t *in_free_list_p,
+                          dbus_uint32_t *allocated_p)
+{
+  _DBUS_LOCK (list);
+  _dbus_mem_pool_get_stats (list_pool, in_use_p, in_free_list_p, allocated_p);
+  _DBUS_UNLOCK (list);
+}
+#endif
+
 /** @} */
 
 /**
@@ -313,6 +325,7 @@ _dbus_list_prepend_link (DBusList **list,
   link_before (list, *list, link);
 }
 
+#ifdef DBUS_BUILD_TESTS
 /**
  * Inserts data into the list before the given existing link.
  * 
@@ -341,6 +354,7 @@ _dbus_list_insert_before (DBusList **list,
   
   return TRUE;
 }
+#endif /* DBUS_BUILD_TESTS */
 
 /**
  * Inserts data into the list after the given existing link.
@@ -454,23 +468,54 @@ _dbus_list_remove_last (DBusList **list,
 {
   DBusList *link;
 
+  link = _dbus_list_find_last (list, data);
+  if (link)
+    {
+      _dbus_list_remove_link (list, link);
+      return TRUE;
+    }
+  else
+    return FALSE;
+}
+
+/**
+ * Finds a value in the list. Returns the last link
+ * with value equal to the given data pointer.
+ * This is a linear-time operation.
+ * Returns #NULL if no value found that matches.
+ *
+ * @param list address of the list head.
+ * @param data the value to find.
+ * @returns the link if found
+ */
+DBusList*
+_dbus_list_find_last (DBusList **list,
+                      void      *data)
+{
+  DBusList *link;
+
   link = _dbus_list_get_last_link (list);
 
   while (link != NULL)
     {
       if (link->data == data)
-        {
-          _dbus_list_remove_link (list, link);
-          return TRUE;
-        }
+        return link;
       
       link = _dbus_list_get_prev_link (list, link);
     }
 
-  return FALSE;
+  return NULL;
 }
 
-static void
+/**
+ * Removes the given link from the list, but doesn't
+ * free it. _dbus_list_remove_link() both removes the
+ * link and also frees it.
+ *
+ * @param list the list
+ * @param link the link in the list
+ */
+void
 _dbus_list_unlink (DBusList **list,
                    DBusList  *link)
 {
@@ -487,6 +532,9 @@ _dbus_list_unlink (DBusList **list,
       if (*list == link)
         *list = link->next;
     }
+
+  link->next = NULL;
+  link->prev = NULL;
 }
 
 /**
@@ -656,6 +704,7 @@ _dbus_list_pop_last (DBusList **list)
   return data;
 }
 
+#ifdef DBUS_BUILD_TESTS
 /**
  * Removes the last link in the list and returns it.  This is a
  * constant-time operation.
@@ -676,6 +725,7 @@ _dbus_list_pop_last_link (DBusList **list)
 
   return link;
 }
+#endif /* DBUS_BUILD_TESTS */
 
 /**
  * Copies a list. This is a linear-time operation.  If there isn't