summaryrefslogtreecommitdiff
path: root/src/ipcpd/local
diff options
context:
space:
mode:
authordimitri staessens <[email protected]>2017-04-06 14:53:35 +0000
committerSander Vrijders <[email protected]>2017-04-06 14:53:35 +0000
commita520f53970e59b4663b2baa70dd458175154622b (patch)
treeec99dad12704ff9728d408fb93b356d449fe70c8 /src/ipcpd/local
parent0f9954dd086834a996d5585d923364b765b752e4 (diff)
parenta4ce5e7d47d27c8b582e27b38ce61c9cb9735992 (diff)
downloadouroboros-a520f53970e59b4663b2baa70dd458175154622b.tar.gz
ouroboros-a520f53970e59b4663b2baa70dd458175154622b.zip
Merged in dstaesse/ouroboros/be-race-fix (pull request #469)
ipcpd: Fix race condition with concurrent allocs
Diffstat (limited to 'src/ipcpd/local')
-rw-r--r--src/ipcpd/local/main.c46
1 files changed, 38 insertions, 8 deletions
diff --git a/src/ipcpd/local/main.c b/src/ipcpd/local/main.c
index 88d0912e..897ec3a0 100644
--- a/src/ipcpd/local/main.c
+++ b/src/ipcpd/local/main.c
@@ -72,8 +72,7 @@ static int local_data_init(void)
return 0;
}
-static void local_data_fini(void)
-{
+static void local_data_fini(void){
flow_set_destroy(local_data.flows);
fqueue_destroy(local_data.fq);
pthread_rwlock_destroy(&local_data.lock);
@@ -212,18 +211,27 @@ static int ipcp_local_flow_alloc(int fd,
char * dst_name,
qoscube_t cube)
{
- int out_fd = -1;
+ struct timespec ts = {0, EVENT_WAIT_TIMEOUT * 1000};
+ int out_fd = -1;
log_dbg("Allocating flow to %s on fd %d.", dst_name, fd);
assert(dst_name);
+ pthread_mutex_lock(&ipcpi.alloc_lock);
+
+ while (ipcpi.alloc_id != -1 && ipcp_get_state() == IPCP_OPERATIONAL)
+ pthread_cond_timedwait(&ipcpi.alloc_cond,
+ &ipcpi.alloc_lock,
+ &ts);
+
if (ipcp_get_state() != IPCP_OPERATIONAL) {
log_dbg("Won't allocate over non-operational IPCP.");
- return -1; /* -ENOTENROLLED */
+ pthread_mutex_unlock(&ipcpi.alloc_lock);
+ return -1;
}
- pthread_mutex_lock(&ipcpi.alloc_lock);
+ assert(ipcpi.alloc_id == -1);
out_fd = ipcp_flow_req_arr(getpid(), dst_name, cube);
if (out_fd < 0) {
@@ -238,6 +246,10 @@ static int ipcp_local_flow_alloc(int fd,
local_data.in_out[out_fd] = fd;
pthread_rwlock_unlock(&local_data.lock);
+
+ ipcpi.alloc_id = out_fd;
+ pthread_cond_broadcast(&ipcpi.alloc_cond);
+
pthread_mutex_unlock(&ipcpi.alloc_lock);
flow_set_add(local_data.flows, fd);
@@ -250,8 +262,26 @@ static int ipcp_local_flow_alloc(int fd,
static int ipcp_local_flow_alloc_resp(int fd,
int response)
{
- int out_fd = -1;
- int ret = -1;
+ struct timespec ts = {0, EVENT_WAIT_TIMEOUT * 1000};
+ int out_fd = -1;
+ int ret = -1;
+
+ pthread_mutex_lock(&ipcpi.alloc_lock);
+
+ while (ipcpi.alloc_id != fd && ipcp_get_state() == IPCP_OPERATIONAL)
+ pthread_cond_timedwait(&ipcpi.alloc_cond,
+ &ipcpi.alloc_lock,
+ &ts);
+
+ if (ipcp_get_state() != IPCP_OPERATIONAL) {
+ pthread_mutex_unlock(&ipcpi.alloc_lock);
+ return -1;
+ }
+
+ ipcpi.alloc_id = -1;
+ pthread_cond_broadcast(&ipcpi.alloc_cond);
+
+ pthread_mutex_unlock(&ipcpi.alloc_lock);
pthread_rwlock_wrlock(&local_data.lock);
@@ -278,7 +308,7 @@ static int ipcp_local_flow_alloc_resp(int fd,
log_info("Flow allocation completed, fds (%d, %d).", out_fd, fd);
- return ret;
+ return 0;
}
static int ipcp_local_flow_dealloc(int fd)