summaryrefslogtreecommitdiff
path: root/src/irmd
diff options
context:
space:
mode:
authorSander Vrijders <sander.vrijders@intec.ugent.be>2016-09-02 15:04:19 +0200
committerSander Vrijders <sander.vrijders@intec.ugent.be>2016-09-02 15:04:19 +0200
commit10d74eef2851e032ee92c62907a7e8e6db230369 (patch)
tree5391bc92f4c3e614dbe1a1dfe908dbe6d3cccb13 /src/irmd
parentee2235c62cf0c51f7188fdeb6ac283c1e2ea0335 (diff)
parent4f44c91c68a3706e04334066f28471d56cc71849 (diff)
downloadouroboros-10d74eef2851e032ee92c62907a7e8e6db230369.tar.gz
ouroboros-10d74eef2851e032ee92c62907a7e8e6db230369.zip
Merged in dstaesse/ouroboros/be-split-fp (pull request #238)
lib: Add northbound ringbuffers
Diffstat (limited to 'src/irmd')
-rw-r--r--src/irmd/main.c14
1 files changed, 9 insertions, 5 deletions
diff --git a/src/irmd/main.c b/src/irmd/main.c
index a69dd526..a4962c3b 100644
--- a/src/irmd/main.c
+++ b/src/irmd/main.c
@@ -1742,7 +1742,7 @@ void * irm_sanitize()
if (kill(f->n_api, 0) < 0) {
struct shm_ap_rbuff * n_rb =
- shm_ap_rbuff_open(f->n_api);
+ shm_ap_rbuff_open_s(f->n_api);
bmp_release(irmd->port_ids, f->port_id);
list_del(&f->next);
@@ -1755,13 +1755,17 @@ void * irm_sanitize()
continue;
}
if (kill(f->n_1_api, 0) < 0) {
- struct shm_ap_rbuff * n_1_rb =
- shm_ap_rbuff_open(f->n_1_api);
+ struct shm_ap_rbuff * n_1_rb_s =
+ shm_ap_rbuff_open_s(f->n_1_api);
+ struct shm_ap_rbuff * n_1_rb_n =
+ shm_ap_rbuff_open_n(f->n_1_api);
list_del(&f->next);
LOG_ERR("IPCP %d gone, flow %d removed.",
f->n_1_api, f->port_id);
- if (n_1_rb != NULL)
- shm_ap_rbuff_destroy(n_1_rb);
+ if (n_1_rb_n != NULL)
+ shm_ap_rbuff_destroy(n_1_rb_n);
+ if (n_1_rb_s != NULL)
+ shm_ap_rbuff_destroy(n_1_rb_s);
irm_flow_destroy(f);
}
}