summaryrefslogtreecommitdiff
path: root/src/ipcpd/normal
diff options
context:
space:
mode:
authordimitri staessens <dimitri.staessens@ugent.be>2017-04-01 21:08:17 +0000
committerSander Vrijders <sander.vrijders@ugent.be>2017-04-01 21:08:17 +0000
commita240900525c0ffba92588a3deca88dfec82125e3 (patch)
tree9a15aeced5cc0409418bb726a5aa438b309b6eef /src/ipcpd/normal
parent4aa99753a5fa9afa3230d4eea166a4fa4c21dbbd (diff)
parent4c393500bcf2b35166b98f0def4c767db712cc9e (diff)
downloadouroboros-a240900525c0ffba92588a3deca88dfec82125e3.tar.gz
ouroboros-a240900525c0ffba92588a3deca88dfec82125e3.zip
Merged in dstaesse/ouroboros/be-rbuff-ll (pull request #451)
lib: Fix some issues in lockless rbuff
Diffstat (limited to 'src/ipcpd/normal')
-rw-r--r--src/ipcpd/normal/fmgr.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/src/ipcpd/normal/fmgr.c b/src/ipcpd/normal/fmgr.c
index 2c94160a..19653430 100644
--- a/src/ipcpd/normal/fmgr.c
+++ b/src/ipcpd/normal/fmgr.c
@@ -52,11 +52,7 @@
#include "flow_alloc.pb-c.h"
typedef FlowAllocMsg flow_alloc_msg_t;
-/*
- * NOTE: setting this too low may lead to missed pthread
- * cancellations when using glibc 2.25. Bug reported to glibc.
- */
-#define FD_UPDATE_TIMEOUT 10000000 /* nanoseconds */
+#define FD_UPDATE_TIMEOUT 10000 /* nanoseconds */
struct {
flow_set_t * np1_set[QOS_CUBE_MAX];
@@ -147,7 +143,6 @@ static void * fmgr_np1_sdu_reader(void * o)
}
pthread_rwlock_unlock(&fmgr.np1_flows_lock);
-
}
}