This sets saner default values for the default build. A higher connect
timeout until we have asynchronous local IPC. Disabled SWIG since the
lastest gcc reports an error. IPCP flow stats enabled by default since
their impact on the performance is very limited. Waiting for the
directory to enroll before returning to increase stability.
Signed-off-by: Sander Vrijders <sander.vrijders@xxxxxxxx>
---
include/ouroboros/wrap/CMakeLists.txt | 2 +-
src/ipcpd/CMakeLists.txt | 2 +-
src/ipcpd/normal/CMakeLists.txt | 2 +-
src/irmd/CMakeLists.txt | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/include/ouroboros/wrap/CMakeLists.txt
b/include/ouroboros/wrap/CMakeLists.txt
index 18e695b..abcd1ce 100644
--- a/include/ouroboros/wrap/CMakeLists.txt
+++ b/include/ouroboros/wrap/CMakeLists.txt
@@ -5,7 +5,7 @@ find_package(SWIG QUIET)
if (NOT SWIG_FOUND)
message(STATUS "Install SWIG to enable bindings for other languages")
else ()
- set(DISABLE_SWIG FALSE CACHE BOOL "Disable SWIG support")
+ set(DISABLE_SWIG TRUE CACHE BOOL "Disable SWIG support")
if (NOT DISABLE_SWIG)
message(STATUS "SWIG support enabled")
include(${SWIG_USE_FILE})
diff --git a/src/ipcpd/CMakeLists.txt b/src/ipcpd/CMakeLists.txt
index 5402dc8..39e597e 100644
--- a/src/ipcpd/CMakeLists.txt
+++ b/src/ipcpd/CMakeLists.txt
@@ -14,7 +14,7 @@ set(IPCP_SCHED_THR_MUL 2 CACHE STRING
"Number of scheduler threads per QoS cube")
set(DISABLE_CORE_LOCK FALSE CACHE BOOL
"Disable locking performance threads to a core")
-set(IPCP_CONN_WAIT_DIR FALSE CACHE BOOL
+set(IPCP_CONN_WAIT_DIR TRUE CACHE BOOL
"Check the running state of the directory when adding a dt connection")
if ((IPCP_QOS_CUBE_BE_PRIO LESS 0) OR (IPCP_QOS_CUBE_BE_PRIO GREATER 99))
diff --git a/src/ipcpd/normal/CMakeLists.txt b/src/ipcpd/normal/CMakeLists.txt
index 2446dc0..6dd6838 100644
--- a/src/ipcpd/normal/CMakeLists.txt
+++ b/src/ipcpd/normal/CMakeLists.txt
@@ -20,7 +20,7 @@ math(EXPR PFT_EXPR "1 << 12")
set(PFT_SIZE ${PFT_EXPR} CACHE STRING
"Size of the PDU forwarding table")
if (HAVE_FUSE)
- set(IPCP_FLOW_STATS FALSE CACHE BOOL
+ set(IPCP_FLOW_STATS TRUE CACHE BOOL
"Enable flow statistics tracking in IPCP")
if (IPCP_FLOW_STATS)
message(STATUS "IPCP flow statistics enabled")
diff --git a/src/irmd/CMakeLists.txt b/src/irmd/CMakeLists.txt
index 51719dc..458e1ef 100644
--- a/src/irmd/CMakeLists.txt
+++ b/src/irmd/CMakeLists.txt
@@ -18,7 +18,7 @@ set(REG_TIMEOUT 10000 CACHE STRING
"Timeout for registering a name (ms)")
set(QUERY_TIMEOUT 3000 CACHE STRING
"Timeout to query a name with an IPCP (ms)")
-set(CONNECT_TIMEOUT 5000 CACHE STRING
+set(CONNECT_TIMEOUT 60000 CACHE STRING
"Timeout to connect an IPCP to another IPCP (ms)")
set(IRMD_MIN_THREADS 8 CACHE STRING
"Minimum number of worker threads in the IRMd.")
--
2.17.0
