added experimental multi thread support

[NeonServV5.git] / src / ChanNode.c

diff --git a/src/ChanNode.c b/src/ChanNode.c
index af8a5bb892a6b4ef985825cec97e54bdeebecb47..977b9b4c985eb8d9270e0f788607882a9db81d3a 100644 (file)
--- a/src/ChanNode.c
+++ b/src/ChanNode.c
@@ -1,5 +1,5 @@
-/* ChanNode.c - NeonServ v5.1
- * Copyright (C) 2011  Philipp Kreil (pk910)
+/* ChanNode.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
@@ -20,10 +20,16 @@
 #include "BanNode.h"
 #include "modcmd.h"
 #include "ModeNode.h"
+#include "bot_NeonSpam.h"
+#include "IRCEvents.h"
 
 static struct ChanNode **chanList;
+#ifdef HAVE_THREADS
+pthread_mutex_t cache_sync;
+#endif
 
 void init_ChanNode() {
+    THREAD_MUTEX_INIT(cache_sync);
     /*
      len pos chars 
      26  0   a-z
@@ -38,6 +44,7 @@ void init_ChanNode() {
 }
 
 void free_ChanNode() {
+    SYNCHRONIZE(cache_sync);
     //kamikaze free all channels and chanusers
     int i;
     struct ChanNode *chan, *next;
@@ -47,14 +54,13 @@ void free_ChanNode() {
             next = chan->next;
             for(chanuser = getChannelUsers(chan, NULL); chanuser; chanuser = next_chanuser) {
                 next_chanuser = getChannelUsers(chan, chanuser);
-                if(chanuser->spamnode)
-                    free(chanuser->spamnode);
-                free(chanuser);
+                freeChanUser(chanuser);
             }
             freeChanNode(chan);
         }
     }
     free(chanList);
+    DESYNCHRONIZE(cache_sync);
 }
 
 int is_valid_chan(const char *name) {
@@ -105,8 +111,9 @@ struct ChanNode* getAllChans(struct ChanNode *last) {
             cindex++;
         if(cindex >= CHANNEL_LIST_SIZE) return NULL;
         return chanList[cindex];
-    } else
+    } else {
         return last->next;
+    }
 }
 
 struct ChanNode* getChanByName(const char *name) { //case insensitive
@@ -143,8 +150,10 @@ struct ChanNode* addChannel(const char *name) {
     chan->modes = createModeNode(chan);
     chan->trigger = NULL;
     
+    SYNCHRONIZE(cache_sync);
     chan->next = chanList[chanListIndex];
     chanList[chanListIndex] = chan;
+    DESYNCHRONIZE(cache_sync);
     return chan;
 }
 
@@ -186,6 +195,7 @@ int getChanBanCount() {
 void delChannel(struct ChanNode* chan, int freeChan) {
     int chanListIndex = get_chanlist_entry(chan->name[1]);
     if(chanListIndex == -1) return;
+    SYNCHRONIZE(cache_sync);
     struct ChanNode *cchan, *last_chan = NULL;
     for(cchan = chanList[chanListIndex]; cchan; cchan = cchan->next) {
         if(cchan == chan) {
@@ -209,9 +219,11 @@ void delChannel(struct ChanNode* chan, int freeChan) {
         freeChanNode(chan);
     else
         chan->next = NULL;
+    DESYNCHRONIZE(cache_sync);
 }
 
 void freeChanNode(struct ChanNode* chan) {
+    event_freechan(chan);
     if(chan->trigger) {
         struct trigger_cache *trigger, *next_trigger;
         for(trigger = chan->trigger; trigger; trigger = next_trigger) {
@@ -224,19 +236,20 @@ void freeChanNode(struct ChanNode* chan) {
     if(chan->bans)
         removeChannelBans(chan);
     if(chan->spam_settings)
-        free(chan->spam_settings);
+        freeNeonSpamSettings(chan->spam_settings);
     free(chan);
 }
 
-void checkChannelVisibility(struct ChanNode* chan) {
+int checkChannelVisibility(struct ChanNode* chan) {
     struct ChanUser *chanuser, *next;
     for(chanuser = getChannelUsers(chan, NULL); chanuser; chanuser = getChannelUsers(chan, chanuser)) {
         if(chanuser->user->flags & USERFLAG_ISBOT) {
             chan->chanbot = chanuser->user;
-            return;
+            return 1;
         }
     }
     //free the channel...
+    SYNCHRONIZE(cache_sync);
     for(chanuser = getChannelUsers(chan, NULL); chanuser; chanuser = next) {
         next = getChannelUsers(chan, chanuser);
         //remove the channel from the user's channel-list
@@ -245,10 +258,10 @@ void checkChannelVisibility(struct ChanNode* chan) {
             //free the user (no more channels)
             delUser(chanuser->user, 1);
         }
-        if(chanuser->spamnode)
-            free(chanuser->spamnode);
-        free(chanuser);
+        freeChanUser(chanuser);
     }
     chan->user = NULL;
     delChannel(chan, 1);
+    DESYNCHRONIZE(cache_sync);
+    return 0;
 }