admin/mlib
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix blocking=false for _pop & _get

Browse Source
This commit is contained in:
Patrick Pelissier committed 2018-10-29 18:10:07 +01:00
1 parent 1a4cce7efd
commit 155d01b8c3
1 file changed
+6 -3
Download Patch File Download Diff File Expand all files Collapse all files
m-concurrent.h
+6 -3
View File
@@ -341,13 +341,14 @@
{ \
bool ret = false; \
m_mutex_lock (out->lock); \
while (blocking) { \
while (true) { \
M_GET_VALUE_TYPE oplist *p = M_CALL_GET_KEY(oplist, out->data, key); \
if (p != NULL) { \
M_CALL_SET(M_GET_VALUE_OPLIST oplist, *out_data, *p); \
ret = true; \
break; \
} \
if (blocking == false) break; \
m_cond_wait(out->there_is_data, out->lock); \
} \
m_mutex_unlock (out->lock); \
@@ -361,12 +362,13 @@
{ \
bool ret = false; \
m_mutex_lock (out->lock); \
while (blocking) { \
while (true) { \
if (!M_CALL_TEST_EMPTY(oplist, out->data)) { \
M_CALL_POP(oplist, p, out->data); \
ret = true; \
break; \
} \
if (blocking == false) break; \
m_cond_wait(out->there_is_data, out->lock); \
} \
m_mutex_unlock (out->lock); \
@@ -380,12 +382,13 @@
{ \
bool ret = false; \
m_mutex_lock (out->lock); \
while (blocking) { \
while (true) { \
if (!M_CALL_TEST_EMPTY(oplist, out->data)) { \
M_CALL_POP_MOVE(oplist, p, out->data); \
ret = true; \
break; \
} \
if (blocking == false) break; \
m_cond_wait(out->there_is_data, out->lock); \
} \
m_mutex_unlock (out->lock); \