X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Futil%2Ftimer.c;h=01bd7686b972783b2bd324641fde78b9bf3eaa74;hb=a72ae04bf96477f11d8bf24baea54596f6d3356b;hp=8de7eec891795811da885208e3a9721ab2054c91;hpb=5a10bb1b43935ba67ffff036bf2b56eceacb802f;p=chaz%2Ftint2

diff --git a/src/util/timer.c b/src/util/timer.c
index 8de7eec..01bd768 100644
--- a/src/util/timer.c
+++ b/src/util/timer.c
@@ -22,8 +22,9 @@
 
 #include "timer.h"
 
-GSList* timeout_list = 0;
+GSList* timeout_list;
 struct timeval next_timeout;
+GHashTable* multi_timeouts;
 
 
 // functions and structs for multi timeouts
@@ -61,7 +62,26 @@ void callback_multi_timeout(void* mth);
 void remove_from_multi_timeout(timeout* t);
 void stop_multi_timeout(timeout* t);
 
-GHashTable* multi_timeouts = 0;
+void default_timeout()
+{
+	timeout_list = 0;
+	multi_timeouts = 0;
+}
+
+void cleanup_timeout()
+{
+	while (timeout_list) {
+		timeout* t = timeout_list->data;
+		if (t->multi_timeout)
+			stop_multi_timeout(t);
+		free(t);
+		timeout_list = g_slist_remove(timeout_list, t);
+	}
+	if (multi_timeouts) {
+		g_hash_table_destroy(multi_timeouts);
+		multi_timeouts = 0;
+	}
+}
 
 /** Implementation notes for timeouts: The timeouts are kept in a GSList sorted by their
 	* expiration time.
@@ -156,18 +176,6 @@ void stop_timeout(timeout* t)
 }
 
 
-void stop_all_timeouts()
-{
-	while (timeout_list) {
-		timeout* t = timeout_list->data;
-		if (t->multi_timeout)
-			stop_multi_timeout(t);
-		free(t);
-		timeout_list = g_slist_remove(timeout_list, t);
-	}
-}
-
-
 void add_timeout_intern(int value_msec, int interval_msec, void(*_callback)(), void* arg, timeout *t)
 {
 	t->interval_msec = interval_msec;