diff options
| author | Sander Vrijders <sander.vrijders@intec.ugent.be> | 2017-02-13 12:46:17 +0000 |
|---|---|---|
| committer | dimitri staessens <dimitri.staessens@intec.ugent.be> | 2017-02-13 12:46:17 +0000 |
| commit | d26df9b9fd1dd50ed9c26518fcecfe2af7ca4868 (patch) | |
| tree | 3a39b66972c45919ccd654bcb93e017ad0ef895f | |
| parent | 5ea091f9cde6090c4829e78b7d2ac5a566ede8f1 (diff) | |
| parent | 65f3f7673b23fbd5f6582bd529f2784fca9bbe1b (diff) | |
| download | ouroboros-d26df9b9fd1dd50ed9c26518fcecfe2af7ca4868.tar.gz ouroboros-d26df9b9fd1dd50ed9c26518fcecfe2af7ca4868.zip | |
Merged in sandervrijders/ouroboros/be-ipcpd-threads (pull request #372)
ipcpd: Increase threadpool size
| -rw-r--r-- | include/ouroboros/config.h.in | 2 | ||||
| -rw-r--r-- | src/ipcpd/normal/dir.c | 2 | ||||
| -rw-r--r-- | src/ipcpd/normal/gam.c | 1 |
3 files changed, 2 insertions, 3 deletions
diff --git a/include/ouroboros/config.h.in b/include/ouroboros/config.h.in index 10d78cd0..517eee45 100644 --- a/include/ouroboros/config.h.in +++ b/include/ouroboros/config.h.in @@ -48,7 +48,7 @@ #define SHM_FLOW_SET_PREFIX "/ouroboros.sets." #define IRMD_MAX_FLOWS 4096 #define IRMD_THREADPOOL_SIZE 16 -#define IPCPD_THREADPOOL_SIZE 3 +#define IPCPD_THREADPOOL_SIZE 16 #define IPCPD_MAX_CONNS IRMD_MAX_FLOWS #define PTHREAD_COND_CLOCK CLOCK_MONOTONIC #define PFT_SIZE 1 << 12 diff --git a/src/ipcpd/normal/dir.c b/src/ipcpd/normal/dir.c index 703f4e79..c67d303f 100644 --- a/src/ipcpd/normal/dir.c +++ b/src/ipcpd/normal/dir.c @@ -42,7 +42,7 @@ static void dir_path_reset(void) { int dir_init(void) { - /*FIXME: set ribmgr dissemination here */ + /* FIXME: set ribmgr dissemination here */ if (rib_add(RIB_ROOT, DIR_NAME)) return -1; diff --git a/src/ipcpd/normal/gam.c b/src/ipcpd/normal/gam.c index f80efe47..9ee55261 100644 --- a/src/ipcpd/normal/gam.c +++ b/src/ipcpd/normal/gam.c @@ -227,7 +227,6 @@ int gam_flow_alloc(struct gam * instance, struct cacep_info * info; int fd; - fd = flow_alloc(dst_name, instance->ae_name, NULL); if (fd < 0) { log_err("Failed to allocate flow to %s.", dst_name); |