diff options
| author | Sander Vrijders <sander.vrijders@ugent.be> | 2018-05-29 10:04:41 +0200 |
|---|---|---|
| committer | Dimitri Staessens <dimitri.staessens@ugent.be> | 2018-05-29 10:47:29 +0200 |
| commit | c24d3376c306e2c1f6c893d597cf80ef40a40f4b (patch) | |
| tree | 09251a38a76ac7231f658c50201abf4b0c0b6b8c | |
| parent | f634f4b0961c8fb143f3ff54ea91f32f5d412ab9 (diff) | |
| download | ouroboros-c24d3376c306e2c1f6c893d597cf80ef40a40f4b.tar.gz ouroboros-c24d3376c306e2c1f6c893d597cf80ef40a40f4b.zip | |
build: Update default values0.11.7
This sets updated 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@ugent.be>
Signed-off-by: Dimitri Staessens <dimitri.staessens@ugent.be>
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | include/ouroboros/wrap/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/ipcpd/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/ipcpd/normal/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/irmd/CMakeLists.txt | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 535eef6c..090a03fa 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,7 +8,7 @@ include(GNUInstallDirs) set(PACKAGE_VERSION_MAJOR 0) set(PACKAGE_VERSION_MINOR 11) -set(PACKAGE_VERSION_PATCH 6) +set(PACKAGE_VERSION_PATCH 7) set(PACKAGE_NAME "${CMAKE_PROJECT_NAME}") set(PACKAGE_DESCRIPTION "The Ouroboros prototype") diff --git a/include/ouroboros/wrap/CMakeLists.txt b/include/ouroboros/wrap/CMakeLists.txt index 18e695b9..abcd1cec 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 5402dc80..39e597e0 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 2446dc00..6dd68385 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 51719dcf..458e1efa 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.") |