Changeset 91c38f8 for lib

Timestamp:

03/15/10 15:44:12 (12 years ago)

Author:

Perry Lorier <perry@…>

Branches:

4.0.1-hotfixes, cachetimestamps, develop, dpdk-ndag, etsilive, getfragoff, help, libtrace4, master, ndag_format, pfring, rc-4.0.1, rc-4.0.2, rc-4.0.3, rc-4.0.4, ringdecrementfix, ringperformance, ringtimestampfixes

Children:

7fc0eaa2

Parents:

9d6452b

Message:

Fix possible deadlock

File:

• lib/iow-lzo.c (modified) (3 diffs)

lib/iow-lzo.c

@@ -260 +260 @@
                         &tdata->outbuf);
 
+                pthread_mutex_lock(&tdata->mutex);
                 tdata->state = FULL;
                 pthread_cond_signal(&tdata->out_ready);
-                pthread_mutex_lock(&tdata->mutex);
         }
         pthread_mutex_unlock(&tdata->mutex);
@@ -433 +433 @@
                           ||get_next_thread(iow)->inbuf.offset >= MAX_BLOCK_SIZE) {
                                 get_next_thread(iow)->state = WAITING;
+                                pthread_cond_signal(&get_next_thread(iow)->in_ready);
                                 pthread_mutex_unlock(&get_next_thread(iow)->mutex);
-                                pthread_cond_signal(&get_next_thread(iow)->in_ready);
 
                                 DATA(iow)->next_thread = 
@@ -475 +475 @@
         /* Now the thread should be empty, so ask it to shut down */
         thread->closing = true;
+        pthread_cond_signal(&thread->in_ready);
         pthread_mutex_unlock(&thread->mutex);
-        pthread_cond_signal(&thread->in_ready);
         /* And wait for it to die */
         pthread_join(thread->thread,NULL);