diff options
| author | dimitri staessens <dimitri.staessens@ugent.be> | 2017-08-03 17:32:29 +0000 |
|---|---|---|
| committer | Sander Vrijders <sander.vrijders@ugent.be> | 2017-08-03 17:32:29 +0000 |
| commit | 9017e3006c1e1246de5291f13319a763fd440e2f (patch) | |
| tree | 6299c95a879c17ce4609028782acc99b50e6cbf4 /src/ipcpd/shim-udp/main.c | |
| parent | 0dacddfff0a705591e6665a00c367c367c23c1f0 (diff) | |
| parent | e3d19da0501bbb80ba1caf562ba61a99c63b10b7 (diff) | |
| download | ouroboros-9017e3006c1e1246de5291f13319a763fd440e2f.tar.gz ouroboros-9017e3006c1e1246de5291f13319a763fd440e2f.zip | |
Merged in dstaesse/ouroboros/testing-deadlines (pull request #540)
ipcpd: Fix pthread_cond_timedwait deadlines
Diffstat (limited to 'src/ipcpd/shim-udp/main.c')
| -rw-r--r-- | src/ipcpd/shim-udp/main.c | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/src/ipcpd/shim-udp/main.c b/src/ipcpd/shim-udp/main.c index ab199ffd..fa77f843 100644 --- a/src/ipcpd/shim-udp/main.c +++ b/src/ipcpd/shim-udp/main.c @@ -236,6 +236,7 @@ static int ipcp_udp_port_req(struct sockaddr_in * c_saddr, qoscube_t cube) { struct timespec ts = {0, FD_UPDATE_TIMEOUT * 1000}; + struct timespec abstime; struct sockaddr_in f_saddr; socklen_t f_saddr_len = sizeof(f_saddr); int skfd; @@ -272,12 +273,16 @@ static int ipcp_udp_port_req(struct sockaddr_in * c_saddr, return -1; } + clock_gettime(PTHREAD_COND_CLOCK, &abstime); + pthread_mutex_lock(&ipcpi.alloc_lock); - while (ipcpi.alloc_id != -1 && ipcp_get_state() == IPCP_OPERATIONAL) + while (ipcpi.alloc_id != -1 && ipcp_get_state() == IPCP_OPERATIONAL) { + ts_add(&abstime, &ts, &abstime); pthread_cond_timedwait(&ipcpi.alloc_cond, &ipcpi.alloc_lock, - &ts); + &abstime); + } if (ipcp_get_state() != IPCP_OPERATIONAL) { log_dbg("Won't allocate over non-operational IPCP."); @@ -971,6 +976,7 @@ static int ipcp_udp_flow_alloc_resp(int fd, int response) { struct timespec ts = {0, FD_UPDATE_TIMEOUT * 1000}; + struct timespec abstime; int skfd = -1; struct sockaddr_in f_saddr; struct sockaddr_in r_saddr; @@ -979,12 +985,16 @@ static int ipcp_udp_flow_alloc_resp(int fd, if (response) return 0; + clock_gettime(PTHREAD_COND_CLOCK, &abstime); + pthread_mutex_lock(&ipcpi.alloc_lock); - while (ipcpi.alloc_id != fd && ipcp_get_state() == IPCP_OPERATIONAL) + while (ipcpi.alloc_id != fd && ipcp_get_state() == IPCP_OPERATIONAL) { + ts_add(&abstime, &ts, &abstime); pthread_cond_timedwait(&ipcpi.alloc_cond, &ipcpi.alloc_lock, - &ts); + &abstime); + } if (ipcp_get_state() != IPCP_OPERATIONAL) { pthread_mutex_unlock(&ipcpi.alloc_lock); |