diff options
Diffstat (limited to 'src/lib/dev.c')
| -rw-r--r-- | src/lib/dev.c | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/src/lib/dev.c b/src/lib/dev.c index 63cf92f7..95fca1ec 100644 --- a/src/lib/dev.c +++ b/src/lib/dev.c @@ -154,6 +154,26 @@ static int port_id_to_fd(int port_id) } #endif +static void clean_fds() +{ + int i; + for (i = 0; i < AP_MAX_FLOWS; ++i) { + if (flow_alloc_res(i) < 0) { + rw_lock_wrlock(&_ap_instance->flows_lock); + if (_ap_instance->flows[i].port_id < 0) { + rw_lock_unlock(&_ap_instance->flows_lock); + continue; + } + + bmp_release(_ap_instance->fds, i); + _ap_instance->flows[i].port_id = -1; + shm_ap_rbuff_close(_ap_instance->flows[i].rb); + _ap_instance->flows[i].rb = NULL; + rw_lock_unlock(&_ap_instance->flows_lock); + } + } +} + int ap_reg(char ** difs, size_t len) { @@ -202,6 +222,7 @@ int ap_reg(char ** difs, rw_lock_wrlock(&_ap_instance->flows_lock); fd = bmp_allocate(_ap_instance->fds); + _ap_instance->flows[fd].port_id = -1; rw_lock_unlock(&_ap_instance->flows_lock); rw_lock_unlock(&_ap_instance->data_lock); @@ -268,6 +289,8 @@ int flow_accept(int fd, msg.pid = _ap_instance->api->id; + clean_fds(); + rw_lock_unlock(&_ap_instance->data_lock); recv_msg = send_recv_irm_msg(&msg); @@ -389,6 +412,8 @@ int flow_alloc(char * dst_name, msg.pid = _ap_instance->api->id; msg.ap_name = _ap_instance->api->name; + clean_fds(); + rw_lock_unlock(&_ap_instance->data_lock); recv_msg = send_recv_irm_msg(&msg); @@ -402,6 +427,7 @@ int flow_alloc(char * dst_name, } rw_lock_rdlock(&_ap_instance->data_lock); + rw_lock_wrlock(&_ap_instance->flows_lock); fd = bmp_allocate(_ap_instance->fds); |