diff options
| author | Sander Vrijders <[email protected]> | 2018-07-03 15:51:16 +0200 |
|---|---|---|
| committer | Dimitri Staessens <[email protected]> | 2018-07-04 16:16:41 +0200 |
| commit | 301212fc967b51fd01e02c0dca8c9183db923b11 (patch) | |
| tree | 4db76fb5977f0ecd34eb300a6375e1cf5d280497 /src/lib | |
| parent | bedee0b0aac97fb195288ec81837e192cbb7b27c (diff) | |
| download | ouroboros-301212fc967b51fd01e02c0dca8c9183db923b11.tar.gz ouroboros-301212fc967b51fd01e02c0dca8c9183db923b11.zip | |
ipcpd: React to flow events actively
This adds the infrastructure to actively react to flow up, down and
deallocated events.
Signed-off-by: Sander Vrijders <[email protected]>
Signed-off-by: Dimitri Staessens <[email protected]>
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/dev.c | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/src/lib/dev.c b/src/lib/dev.c index 9eade797..dd908f78 100644 --- a/src/lib/dev.c +++ b/src/lib/dev.c @@ -252,8 +252,12 @@ static void flow_fini(int fd) shm_rbuff_close(ai.flows[fd].tx_rb); } - if (ai.flows[fd].set != NULL) + if (ai.flows[fd].set != NULL) { + shm_flow_set_notify(ai.flows[fd].set, + ai.flows[fd].port_id, + FLOW_DEALLOC); shm_flow_set_close(ai.flows[fd].set); + } if (ai.flows[fd].frcti != NULL) frcti_destroy(ai.flows[fd].frcti); @@ -435,8 +439,6 @@ static void fini(void) frct_fini(); - shm_flow_set_destroy(ai.fqset); - if (ai.prog != NULL) free(ai.prog); @@ -452,6 +454,8 @@ static void fini(void) } } + shm_flow_set_destroy(ai.fqset); + for (i = 0; i < SYS_MAX_FLOWS; ++i) { pthread_mutex_destroy(&ai.ports[i].state_lock); pthread_cond_destroy(&ai.ports[i].state_cond); @@ -764,9 +768,15 @@ int fccntl(int fd, if (flow->oflags & FLOWFDOWN) { rx_acl |= ACL_FLOWDOWN; tx_acl |= ACL_FLOWDOWN; + shm_flow_set_notify(flow->set, + flow->port_id, + FLOW_DOWN); } else { rx_acl &= ~ACL_FLOWDOWN; tx_acl &= ~ACL_FLOWDOWN; + shm_flow_set_notify(flow->set, + flow->port_id, + FLOW_UP); } shm_rbuff_set_acl(flow->rx_rb, rx_acl); @@ -1425,6 +1435,10 @@ void ipcp_flow_fini(int fd) shm_rbuff_set_acl(ai.flows[fd].rx_rb, ACL_FLOWDOWN); shm_rbuff_set_acl(ai.flows[fd].tx_rb, ACL_FLOWDOWN); + shm_flow_set_notify(ai.flows[fd].set, + ai.flows[fd].port_id, + FLOW_DEALLOC); + rx_rb = ai.flows[fd].rx_rb; pthread_rwlock_unlock(&ai.lock); |