summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDimitri Staessens <[email protected]>2019-03-12 00:47:18 +0100
committerSander Vrijders <[email protected]>2019-03-12 09:18:51 +0100
commit7702cb0f44f4cbb31436b2d2c621d4e5b4c0edec (patch)
tree1de01fc2ae47afa64244420cd5a553bf2d0e8886
parent5c74c348ff66d6e6093d21a614ec527e0e31aac6 (diff)
downloadouroboros-7702cb0f44f4cbb31436b2d2c621d4e5b4c0edec.tar.gz
ouroboros-7702cb0f44f4cbb31436b2d2c621d4e5b4c0edec.zip
irmd: Don't destroy shm_flow_set from IRMd
The shm_flow_set for the processes are now created and destroyed together with the irm_flow objects. This old code causes stack overflows in some (rare) conditions and must be removed. Signed-off-by: Dimitri Staessens <[email protected]> Signed-off-by: Sander Vrijders <[email protected]>
-rw-r--r--src/irmd/main.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/src/irmd/main.c b/src/irmd/main.c
index 5f9771a7..22a32124 100644
--- a/src/irmd/main.c
+++ b/src/irmd/main.c
@@ -37,7 +37,6 @@
#include <ouroboros/utils.h>
#include <ouroboros/irm.h>
#include <ouroboros/lockfile.h>
-#include <ouroboros/shm_flow_set.h>
#include <ouroboros/shm_rbuff.h>
#include <ouroboros/shm_rdrbuff.h>
#include <ouroboros/bitmap.h>
@@ -1775,13 +1774,9 @@ void * irm_sanitize(void * o)
}
if (kill(f->n_pid, 0) < 0) {
- struct shm_flow_set * set;
log_dbg("Process %d gone, deallocating "
"flow %d.",
f->n_pid, f->flow_id);
- set = shm_flow_set_open(f->n_pid);
- if (set != NULL)
- shm_flow_set_destroy(set);
f->n_pid = -1;
irm_flow_set_state(f, FLOW_DEALLOC_PENDING);
ipcpi = f->n_1_pid;