diff options
| author | Dimitri Staessens <dimitri.staessens@ugent.be> | 2018-10-10 11:11:09 +0200 |
|---|---|---|
| committer | Sander Vrijders <sander.vrijders@ugent.be> | 2018-10-10 13:51:42 +0200 |
| commit | a46f96fbfc017963a5578498c93bc85650461020 (patch) | |
| tree | 4351e56b0da9f3a6e1920c3296d4f617c582780c | |
| parent | e8b3e880da69f9ac398bfd90015564ef09e948a3 (diff) | |
| download | ouroboros-a46f96fbfc017963a5578498c93bc85650461020.tar.gz ouroboros-a46f96fbfc017963a5578498c93bc85650461020.zip | |
ipcpd: Remove stale QoS cubes
There were QoS cubes defined for raw and data flows, which are now run
on the best effort cube.
Signed-off-by: Dimitri Staessens <dimitri.staessens@ugent.be>
Signed-off-by: Sander Vrijders <sander.vrijders@ugent.be>
| -rw-r--r-- | include/ouroboros/qoscube.h | 4 | ||||
| -rw-r--r-- | src/ipcpd/CMakeLists.txt | 14 | ||||
| -rw-r--r-- | src/ipcpd/config.h.in | 2 | ||||
| -rw-r--r-- | src/ipcpd/normal/psched.c | 2 |
4 files changed, 2 insertions, 20 deletions
diff --git a/include/ouroboros/qoscube.h b/include/ouroboros/qoscube.h index e0e93a82..bce9b361 100644 --- a/include/ouroboros/qoscube.h +++ b/include/ouroboros/qoscube.h @@ -26,9 +26,7 @@ #include <ouroboros/qos.h> typedef enum qos_cube { - QOS_CUBE_RAW = 0, - QOS_CUBE_BE, - QOS_CUBE_DATA, + QOS_CUBE_BE = 0, QOS_CUBE_VIDEO, QOS_CUBE_VOICE, QOS_CUBE_MAX diff --git a/src/ipcpd/CMakeLists.txt b/src/ipcpd/CMakeLists.txt index b706d432..50d23f8e 100644 --- a/src/ipcpd/CMakeLists.txt +++ b/src/ipcpd/CMakeLists.txt @@ -1,15 +1,11 @@ set(IPCP_ACCEPT_TIMEOUT 100 CACHE STRING "Timeout for accept in IPCP mainloop threads (ms)") -set(IPCP_QOS_CUBE_RAW_PRIO 50 CACHE STRING - "Priority for raw flow processing (0-99)") -set(IPCP_QOS_CUBE_BE_PRIO 0 CACHE STRING +set(IPCP_QOS_CUBE_BE_PRIO 50 CACHE STRING "Priority for best effort QoS cube (0-99)") set(IPCP_QOS_CUBE_VIDEO_PRIO 90 CACHE STRING "Priority for video QoS cube (0-99)") set(IPCP_QOS_CUBE_VOICE_PRIO 99 CACHE STRING "Priority for voice QoS cube (0-99)") -set(IPCP_QOS_CUBE_DATA_PRIO 0 CACHE STRING - "Priority for data QoS cube (0-99)") set(IPCP_MIN_THREADS 4 CACHE STRING "Minimum number of worker threads in the IPCP") set(IPCP_ADD_THREADS 4 CACHE STRING @@ -21,18 +17,10 @@ set(DISABLE_CORE_LOCK 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_RAW_PRIO LESS 0) OR (IPCP_QOS_CUBE_RAW_PRIO GREATER 99)) - message(FATAL_ERROR "Invalid priority for raw flow") -endif () - if ((IPCP_QOS_CUBE_BE_PRIO LESS 0) OR (IPCP_QOS_CUBE_BE_PRIO GREATER 99)) message(FATAL_ERROR "Invalid priority for best effort QoS cube") endif () -if ((IPCP_QOS_CUBE_DATA_PRIO LESS 0) OR (IPCP_QOS_CUBE_DATA_PRIO GREATER 99)) - message(FATAL_ERROR "Invalid priority for data QoS cube") -endif () - if ((IPCP_QOS_CUBE_VIDEO_PRIO LESS 0) OR (IPCP_QOS_CUBE_VIDEO_PRIO GREATER 99)) message(FATAL_ERROR "Invalid priority for video QoS cube") endif () diff --git a/src/ipcpd/config.h.in b/src/ipcpd/config.h.in index afce5e86..567fe971 100644 --- a/src/ipcpd/config.h.in +++ b/src/ipcpd/config.h.in @@ -42,11 +42,9 @@ #cmakedefine HAVE_LIBGCRYPT /* normal IPCP */ -#define QOS_PRIO_RAW @IPCP_QOS_CUBE_RAW_PRIO@ #define QOS_PRIO_BE @IPCP_QOS_CUBE_BE_PRIO@ #define QOS_PRIO_VIDEO @IPCP_QOS_CUBE_VIDEO_PRIO@ #define QOS_PRIO_VOICE @IPCP_QOS_CUBE_VOICE_PRIO@ -#define QOS_PRIO_DATA @IPCP_QOS_CUBE_DATA_PRIO@ #define IPCP_SCHED_THR_MUL @IPCP_SCHED_THR_MUL@ #define PFT_SIZE @PFT_SIZE@ diff --git a/src/ipcpd/normal/psched.c b/src/ipcpd/normal/psched.c index 27e5f1de..c38c072d 100644 --- a/src/ipcpd/normal/psched.c +++ b/src/ipcpd/normal/psched.c @@ -42,11 +42,9 @@ #include <string.h> static int qos_prio [] = { - QOS_PRIO_RAW, QOS_PRIO_BE, QOS_PRIO_VIDEO, QOS_PRIO_VOICE, - QOS_PRIO_DATA }; struct psched { |