Merge branch 'master' of github.com:tylertreat/chan

tylertreat · tylertreat · commit b4120abe5d64 · 2016-01-22T23:25:38.000-06:00
diff --git a/src/chan.c b/src/chan.c
@@ -321,7 +321,6 @@ static int unbuffered_chan_send(chan_t* chan, void* data)
 
     // Block until reader consumed chan->data.
     pthread_cond_wait(&chan->w_cond, &chan->m_mu);
-    chan->w_waiting--;
 
     pthread_mutex_unlock(&chan->m_mu);
     pthread_mutex_unlock(&chan->w_mu);
@@ -353,6 +352,7 @@ static int unbuffered_chan_recv(chan_t* chan, void** data)
     {
         *data = chan->data;
     }
+    chan->w_waiting--;
 
     // Signal waiting writer.
     pthread_cond_signal(&chan->w_cond);

Original file line number	Diff line number	Diff line change
`@@ -321,7 +321,6 @@ static int unbuffered_chan_send(chan_t* chan, void* data)`
`321`	`321`
`322`	`322`	`// Block until reader consumed chan->data.`
`323`	`323`	`pthread_cond_wait(&chan->w_cond, &chan->m_mu);`
`324`		`- chan->w_waiting--;`
`325`	`324`
`326`	`325`	`pthread_mutex_unlock(&chan->m_mu);`
`327`	`326`	`pthread_mutex_unlock(&chan->w_mu);`
`@@ -353,6 +352,7 @@ static int unbuffered_chan_recv(chan_t* chan, void** data)`
`353`	`352`	`{`
`354`	`353`	`*data = chan->data;`
`355`	`354`	`}`
	`355`	`+ chan->w_waiting--;`
`356`	`356`
`357`	`357`	`// Signal waiting writer.`
`358`	`358`	`pthread_cond_signal(&chan->w_cond);`