Bug 15571: Clean up GUID-less connections correctly (Scott James Remnant)

[platform/upstream/dbus.git] / bus / expirelist.c

diff --git a/bus/expirelist.c b/bus/expirelist.c
index ea2760a..d718d9f 100644 (file)
--- a/bus/expirelist.c
+++ b/bus/expirelist.c
@@ -1,9 +1,9 @@
-/* -*- mode: C; c-file-style: "gnu" -*- */
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
 /* expirelist.c  List of items that expire
  *
  * Copyright (C) 2003  Red Hat, Inc.
  *
- * Licensed under the Academic Free License version 2.0
+ * 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
@@ -27,6 +27,16 @@
 #include <dbus/dbus-mainloop.h>
 #include <dbus/dbus-timeout.h>
 
+struct BusExpireList
+{
+  DBusList      *items; /**< List of BusExpireItem */
+  DBusTimeout   *timeout;
+  DBusLoop      *loop;
+  BusExpireFunc  expire_func;
+  void          *data;
+  int            expire_after; /**< Expire after milliseconds (thousandths) */
+};
+
 static dbus_bool_t expire_timeout_handler (void *data);
 
 static void
@@ -81,7 +91,6 @@ bus_expire_list_new (DBusLoop      *loop,
 void
 bus_expire_list_free (BusExpireList *list)
 {
-  _dbus_assert (list->n_items == 0);
   _dbus_assert (list->items == NULL);
 
   _dbus_loop_remove_timeout (list->loop, list->timeout,
@@ -93,8 +102,8 @@ bus_expire_list_free (BusExpireList *list)
 }
 
 void
-bus_expire_timeout_set_interval (DBusTimeout *timeout,
-                                 int          next_interval)
+bus_expire_timeout_set_interval (DBusTimeout   *timeout,
+                                 int            next_interval)
 {
   if (next_interval >= 0)
     {
@@ -102,17 +111,25 @@ bus_expire_timeout_set_interval (DBusTimeout *timeout,
                                   next_interval);
       _dbus_timeout_set_enabled (timeout, TRUE);
 
-      _dbus_verbose ("Enabled expire timeout with interval %d\n",
+      _dbus_verbose ("Enabled an expire timeout with interval %d\n",
                      next_interval);
     }
   else if (dbus_timeout_get_enabled (timeout))
     {
       _dbus_timeout_set_enabled (timeout, FALSE);
 
-      _dbus_verbose ("Disabled expire timeout\n");
+      _dbus_verbose ("Disabled an expire timeout\n");
     }
   else
-    _dbus_verbose ("No need to disable expire timeout\n");
+    _dbus_verbose ("No need to disable this expire timeout\n");
+}
+
+void
+bus_expire_list_recheck_immediately (BusExpireList *list)
+{
+  _dbus_verbose ("setting interval on expire list to 0 for immediate recheck\n");
+
+  bus_expire_timeout_set_interval (list->timeout, 0);
 }
 
 static int
@@ -121,9 +138,11 @@ do_expiration_with_current_time (BusExpireList *list,
                                  long           tv_usec)
 {
   DBusList *link;
-  int next_interval;
+  int next_interval, min_wait_time, items_to_expire;
 
   next_interval = -1;
+  min_wait_time = 3600 * 1000; /* this is reset anyway if used */
+  items_to_expire = 0;
   
   link = _dbus_list_get_first_link (&list->items);
   while (link != NULL)
@@ -156,17 +175,20 @@ do_expiration_with_current_time (BusExpireList *list,
         }
       else
         {
-          /* We can end the loop, since the connections are in oldest-first order */
-          next_interval = ((double)list->expire_after) - elapsed;
-          _dbus_verbose ("Item %p expires in %d milliseconds\n",
-                         item, next_interval);
+          double to_wait;
 
-          break;
+          items_to_expire = 1;
+          to_wait = (double) list->expire_after - elapsed;
+          if (min_wait_time > to_wait)
+            min_wait_time = to_wait;
         }
 
       link = next;
     }
 
+  if (next_interval < 0 && items_to_expire)
+    next_interval = min_wait_time;
+
   return next_interval;
 }
 
@@ -202,6 +224,72 @@ expire_timeout_handler (void *data)
   return TRUE;
 }
 
+void
+bus_expire_list_remove_link (BusExpireList *list,
+                             DBusList      *link)
+{
+  _dbus_list_remove_link (&list->items, link);
+}
+
+dbus_bool_t
+bus_expire_list_remove (BusExpireList *list,
+                        BusExpireItem *item)
+{
+  return _dbus_list_remove (&list->items, item);
+}
+
+void
+bus_expire_list_unlink (BusExpireList *list,
+                        DBusList      *link)
+{
+  _dbus_list_unlink (&list->items, link);
+}
+
+dbus_bool_t
+bus_expire_list_add (BusExpireList *list,
+                     BusExpireItem *item)
+{
+  dbus_bool_t ret;
+
+  ret = _dbus_list_prepend (&list->items, item);
+  if (ret && !dbus_timeout_get_enabled (list->timeout))
+    bus_expire_timeout_set_interval (list->timeout, 0);
+
+  return ret;
+}
+
+void
+bus_expire_list_add_link (BusExpireList *list,
+                          DBusList      *link)
+{
+  _dbus_assert (link->data != NULL);
+  
+  _dbus_list_prepend_link (&list->items, link);
+
+  if (!dbus_timeout_get_enabled (list->timeout))
+    bus_expire_timeout_set_interval (list->timeout, 0);
+}
+
+DBusList*
+bus_expire_list_get_first_link (BusExpireList *list)
+{
+  return _dbus_list_get_first_link (&list->items);
+}
+
+DBusList*
+bus_expire_list_get_next_link (BusExpireList *list,
+                               DBusList      *link)
+{
+  return _dbus_list_get_next_link (&list->items, link);
+}
+
+dbus_bool_t
+bus_expire_list_contains_item (BusExpireList *list,
+                               BusExpireItem *item)
+{
+  return _dbus_list_find_last (&list->items, item) != NULL;
+}
+
 #ifdef DBUS_BUILD_TESTS
 
 typedef struct
@@ -249,7 +337,9 @@ bus_expire_list_test (const DBusString *test_data_dir)
   long tv_sec_past, tv_usec_past;
   TestExpireItem *item;
   int next_interval;
-  
+  dbus_bool_t result = FALSE;
+
+
   loop = _dbus_loop_new ();
   _dbus_assert (loop != NULL);
 
@@ -277,9 +367,12 @@ bus_expire_list_test (const DBusString *test_data_dir)
 
   item = dbus_new0 (TestExpireItem, 1);
 
+  if (item == NULL)
+    goto oom;
+
   item->item.added_tv_sec = tv_sec;
   item->item.added_tv_usec = tv_usec;
-  if (!_dbus_list_append (&list->items, item))
+  if (!bus_expire_list_add (list, &item->item))
     _dbus_assert_not_reached ("out of memory");
 
   next_interval =
@@ -303,13 +396,16 @@ bus_expire_list_test (const DBusString *test_data_dir)
   _dbus_verbose ("next_interval = %d\n", next_interval);
   _dbus_assert (next_interval == 1000 + EXPIRE_AFTER);
 
-  _dbus_list_clear (&list->items);
+  bus_expire_list_remove (list, &item->item);
   dbus_free (item);
   
   bus_expire_list_free (list);
   _dbus_loop_unref (loop);
   
-  return TRUE;
+  result = TRUE;
+
+ oom:
+  return result;
 }
 
 #endif /* DBUS_BUILD_TESTS */