X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=src%2Ftimeq.c;h=17b190488381576cfa9837b7c24709061258dc0c;hb=55831bf424312a6908ca07a904f288fba0919a9a;hp=ab463eeb060ba09ba7269870f1c5ed75d6ad1cae;hpb=c575e458c6257e75b97884847143b20965a5dfda;p=NeonServV5.git

diff --git a/src/timeq.c b/src/timeq.c
index ab463ee..17b1904 100644
--- a/src/timeq.c
+++ b/src/timeq.c
@@ -1,5 +1,5 @@
-/* timeq.c - NeonServ v5.2
- * Copyright (C) 2011  Philipp Kreil (pk910)
+/* timeq.c - NeonServ v5.3
+ * Copyright (C) 2011-2012  Philipp Kreil (pk910)
  * 
  * 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
@@ -18,19 +18,29 @@
 #include "timeq.h"
 
 static struct timeq_entry *timeq_events;
+#ifdef HAVE_THREADS
+static pthread_mutex_t synchronized;
+#endif
+
+void init_timeq() {
+    THREAD_MUTEX_INIT(synchronized);
+}
 
 void timeq_tick() {
+    SYNCHRONIZE(synchronized);
     struct timeq_entry *entry, *next;
     time_t now = time(0);
     for(entry = timeq_events; entry; entry = next) {
         if(entry->execute <= now) {
-            entry->callback(entry->data);
             next = entry->next;
+            if(timeq_events == entry)
+                timeq_events = next;
+            entry->callback(entry->data);
             free(entry);
         } else
             break;
     }
-    timeq_events = entry;
+    DESYNCHRONIZE(synchronized);
 }
 
 struct timeq_entry* timeq_add(int seconds, timeq_callback_t *callback, void *data) {
@@ -41,6 +51,7 @@ struct timeq_entry* timeq_add(int seconds, timeq_callback_t *callback, void *dat
         perror("malloc() failed");
         return NULL;
     }
+    SYNCHRONIZE(synchronized);
     entry->execute = now + seconds;
     entry->callback = callback;
     entry->data = data;
@@ -59,16 +70,20 @@ struct timeq_entry* timeq_add(int seconds, timeq_callback_t *callback, void *dat
         entry->next = next;
         prev->next = entry;
     }
+    DESYNCHRONIZE(synchronized);
     return entry;
 }
 
 struct timeq_entry* timeq_add_name(char *name, int seconds, timeq_callback_t *callback, void *data) {
+    SYNCHRONIZE(synchronized);
     struct timeq_entry *entry = timeq_add(seconds, callback, data);
     entry->name = strdup(name);
+    DESYNCHRONIZE(synchronized);
     return entry;
 }
 
 int timeq_del(struct timeq_entry* entry) {
+    SYNCHRONIZE(synchronized);
     struct timeq_entry *centry, *last = NULL;
     for(centry = timeq_events; centry; centry = centry->next) {
         if(centry == entry) {
@@ -79,15 +94,18 @@ int timeq_del(struct timeq_entry* entry) {
             if(centry->name)
                 free(centry->name);
             free(centry);
+            DESYNCHRONIZE(synchronized);
             return 1;
         } else {
             last = centry;
         }
     }
+    DESYNCHRONIZE(synchronized);
     return 0;
 }
 
 int timeq_del_name(char *name) {
+    SYNCHRONIZE(synchronized);
     struct timeq_entry *centry, *last = NULL;
     for(centry = timeq_events; centry; centry = centry->next) {
         if(centry->name && !stricmp(centry->name, name)) {
@@ -97,20 +115,25 @@ int timeq_del_name(char *name) {
                 timeq_events = centry->next;
             free(centry->name);
             free(centry);
+            DESYNCHRONIZE(synchronized);
             return 1;
         } else {
             last = centry;
         }
     }
+    DESYNCHRONIZE(synchronized);
     return 0;
 }
 
 int timeq_name_exists(char *name) {
+    SYNCHRONIZE(synchronized);
     struct timeq_entry *centry;
     for(centry = timeq_events; centry; centry = centry->next) {
         if(centry->name && !stricmp(centry->name, name)) {
+            DESYNCHRONIZE(synchronized);
             return 1;
         }
     }
+    DESYNCHRONIZE(synchronized);
     return 0;
 }