Changeset 15688

Timestamp:

05/12/12 11:45:49 (11 years ago)

Author:

nit

Message:

[titan] fix dead lock

File:

• titan/titan/channel.h (modified) (3 diffs)

titan/titan/channel.h

@@ -36 +36 @@
 }
 
-struct channel* getlastchannel(struct channel* node)
+//flag 0: lock
+//flag 1: no lock
+struct channel* getlastchannel(struct channel* node, int flag)
 {
         debug(1000, "in");
         struct channel *prev = NULL;
 
-        m_lock(&status.channelmutex, 5);
+        if(flag == 0) m_lock(&status.channelmutex, 5);
         while(node != NULL)
         {
@@ -47 +49 @@
                 node = node->next;
         }
-        m_unlock(&status.channelmutex, 5);
+        if(flag == 0) m_unlock(&status.channelmutex, 5);
 
         debug(1000, "out");
@@ -136 +138 @@
         if(node->prev == NULL)
         {
-                last = getlastchannel(channel);
+                last = getlastchannel(channel, 1);
 
                 if(node->next != NULL)