From 5f93b7af2efe9a7910e0fb0852c7e0e741c9d5f3 Mon Sep 17 00:00:00 2001
From: dimitri staessens <dimitri.staessens@ugent.be>
Date: Thu, 23 Mar 2017 17:03:51 +0100
Subject: ipcpd: Increase update timeout in fmgr

This works around a possible bug in glibc 2.25.
---
 src/ipcpd/normal/fmgr.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'src/ipcpd/normal/fmgr.c')

diff --git a/src/ipcpd/normal/fmgr.c b/src/ipcpd/normal/fmgr.c
index e78dd2d6..6f89084f 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];
-- 
cgit v1.2.3