summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordimitri staessens <dimitri.staessens@ugent.be>2017-03-23 16:33:20 +0000
committerSander Vrijders <sander.vrijders@ugent.be>2017-03-23 16:33:20 +0000
commit6688251a7a18f267535c5369c1e856d2c2c1605e (patch)
tree3db6ad9fae013cdedc7b03e3270ae533b6b0432e
parentb350f91968b05e61a362d21d55cf183af28da77a (diff)
parent5f93b7af2efe9a7910e0fb0852c7e0e741c9d5f3 (diff)
downloadouroboros-6688251a7a18f267535c5369c1e856d2c2c1605e.tar.gz
ouroboros-6688251a7a18f267535c5369c1e856d2c2c1605e.zip
Merged in dstaesse/ouroboros/be-fmgr (pull request #417)
ipcpd: Increase update timeout in fmgr
-rw-r--r--src/ipcpd/normal/fmgr.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/ipcpd/normal/fmgr.c b/src/ipcpd/normal/fmgr.c
index 2906b9e2..8cefd317 100644
--- a/src/ipcpd/normal/fmgr.c
+++ b/src/ipcpd/normal/fmgr.c
@@ -51,7 +51,11 @@
#include "flow_alloc.pb-c.h"
typedef FlowAllocMsg flow_alloc_msg_t;
-#define FD_UPDATE_TIMEOUT 100000 /* nanoseconds */
+/*
+ * 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 */
struct {
flow_set_t * np1_set[QOS_CUBE_MAX];