Merged in dstaesse/ouroboros/be-split-fp (pull request #238)

lib: Add northbound ringbuffers

5 files changed, 12 insertions, 12 deletions

diff --git a/src/ipcpd/local/main.c b/src/ipcpd/local/main.c
index f1b6dd9e..c0809429 100644
--- a/src/ipcpd/local/main.c
+++ b/src/ipcpd/local/main.c
@@ -105,7 +105,7 @@ static int shim_ap_init()
                 return -1;
         }
 
-        _ap_instance->rb = shm_ap_rbuff_create();
+        _ap_instance->rb = shm_ap_rbuff_create_n();
         if (_ap_instance->rb == NULL) {
                 shm_rdrbuff_close(_ap_instance->rdrb);
                 bmp_destroy(_ap_instance->fds);
@@ -331,7 +331,7 @@ static int ipcp_local_flow_alloc(pid_t         n_api,
                 return -1; /* -ENOTENROLLED */
         }
 
-        rb = shm_ap_rbuff_open(n_api);
+        rb = shm_ap_rbuff_open_s(n_api);
         if (rb == NULL) {
                 pthread_rwlock_unlock(&_ipcp->state_lock);
                 return -1; /* -ENORBUFF */
@@ -421,7 +421,7 @@ static int ipcp_local_flow_alloc_resp(pid_t n_api,
                 return -1;
         }
 
-        rb = shm_ap_rbuff_open(n_api);
+        rb = shm_ap_rbuff_open_s(n_api);
         if (rb == NULL) {
                 LOG_ERR("Could not open N + 1 ringbuffer.");
                 _ap_instance->flows[in_fd].state   = FLOW_NULL;
diff --git a/src/ipcpd/normal/fmgr.c b/src/ipcpd/normal/fmgr.c
index 5d54842e..79b1bb4b 100644
--- a/src/ipcpd/normal/fmgr.c
+++ b/src/ipcpd/normal/fmgr.c
@@ -367,7 +367,7 @@ int fmgr_flow_alloc(pid_t         n_api,
 
         free(buf.data);
 
-        flow->flow.rb = shm_ap_rbuff_open(n_api);
+        flow->flow.rb = shm_ap_rbuff_open_s(n_api);
         if (flow->flow.rb == NULL) {
                 pthread_mutex_unlock(&fmgr->n_flows_lock);
                 free(flow);
@@ -478,7 +478,7 @@ int fmgr_flow_alloc_resp(pid_t n_api,
                 flow->flow.state = FLOW_ALLOCATED;
                 flow->flow.api = n_api;
 
-                flow->flow.rb = shm_ap_rbuff_open(n_api);
+                flow->flow.rb = shm_ap_rbuff_open_s(n_api);
                 if (flow->flow.rb == NULL) {
                         n_flow_dealloc(port_id);
                         pthread_mutex_unlock(&fmgr->n_flows_lock);
diff --git a/src/ipcpd/normal/main.c b/src/ipcpd/normal/main.c
index cf4ae3f1..082973f4 100644
--- a/src/ipcpd/normal/main.c
+++ b/src/ipcpd/normal/main.c
@@ -212,7 +212,7 @@ struct normal_ipcp_data * normal_ipcp_data_create()
                 return NULL;
         }
 
-        normal_data->rb = shm_ap_rbuff_open(getpid());
+        normal_data->rb = shm_ap_rbuff_create_n();
         if (normal_data->rb == NULL) {
                 shm_rdrbuff_close(normal_data->rdrb);
                 free(normal_data);
diff --git a/src/ipcpd/shim-eth-llc/main.c b/src/ipcpd/shim-eth-llc/main.c
index a1ded117..0fa32313 100644
--- a/src/ipcpd/shim-eth-llc/main.c
+++ b/src/ipcpd/shim-eth-llc/main.c
@@ -161,7 +161,7 @@ struct eth_llc_ipcp_data * eth_llc_ipcp_data_create()
                 return NULL;
         }
 
-        eth_llc_data->rb = shm_ap_rbuff_create();
+        eth_llc_data->rb = shm_ap_rbuff_create_n();
         if (eth_llc_data->rb == NULL) {
                 shm_rdrbuff_close(eth_llc_data->rdrb);
                 free(eth_llc_data);
@@ -1084,7 +1084,7 @@ static int eth_llc_ipcp_flow_alloc(pid_t         n_api,
         if (qos != QOS_CUBE_BE)
                 LOG_DBGF("QoS requested. Ethernet LLC can't do that. For now.");
 
-        rb = shm_ap_rbuff_open(n_api);
+        rb = shm_ap_rbuff_open_s(n_api);
         if (rb == NULL)
                 return -1; /* -ENORBUFF */
 
@@ -1169,7 +1169,7 @@ static int eth_llc_ipcp_flow_alloc_resp(pid_t n_api,
                 return -1;
         }
 
-        rb = shm_ap_rbuff_open(n_api);
+        rb = shm_ap_rbuff_open_s(n_api);
         if (rb == NULL) {
                 LOG_ERR("Could not open N + 1 ringbuffer.");
                 ipcp_flow(index)->state = FLOW_NULL;
diff --git a/src/ipcpd/shim-udp/main.c b/src/ipcpd/shim-udp/main.c
index 34af71a7..c35bd244 100644
--- a/src/ipcpd/shim-udp/main.c
+++ b/src/ipcpd/shim-udp/main.c
@@ -128,7 +128,7 @@ static int shim_ap_init()
                 return -1;
         }
 
-        _ap_instance->rb = shm_ap_rbuff_create();
+        _ap_instance->rb = shm_ap_rbuff_create_n();
         if (_ap_instance->rb == NULL) {
                 shm_rdrbuff_close(_ap_instance->rdrb);
                 bmp_destroy(_ap_instance->fds);
@@ -1179,7 +1179,7 @@ static int ipcp_udp_flow_alloc(pid_t         n_api,
         if (qos != QOS_CUBE_BE)
                 LOG_DBG("QoS requested. UDP/IP can't do that.");
 
-        rb = shm_ap_rbuff_open(n_api);
+        rb = shm_ap_rbuff_open_s(n_api);
         if (rb == NULL)
                 return -1; /* -ENORBUFF */
 
@@ -1333,7 +1333,7 @@ static int ipcp_udp_flow_alloc_resp(pid_t n_api,
                 return -1;
         }
 
-        rb = shm_ap_rbuff_open(n_api);
+        rb = shm_ap_rbuff_open_s(n_api);
         if (rb == NULL) {
                 LOG_ERR("Could not open N + 1 ringbuffer.");
                 _ap_instance->flows[fd].state   = FLOW_NULL;