diff options
| author | dimitri staessens <dimitri.staessens@intec.ugent.be> | 2016-11-17 16:28:33 +0100 |
|---|---|---|
| committer | dimitri staessens <dimitri.staessens@intec.ugent.be> | 2016-11-17 17:02:09 +0100 |
| commit | 2ae032ddc4f5eb6d0e7eaa5400c1ffb80e2c0a8d (patch) | |
| tree | 18e6b9f690e7aaf615a91c4ccbc8ab0bc2edb967 /src/lib/dev.c | |
| parent | b0e0c74a14906639f5cd36d942d46b2d793e1fd4 (diff) | |
| download | ouroboros-2ae032ddc4f5eb6d0e7eaa5400c1ffb80e2c0a8d.tar.gz ouroboros-2ae032ddc4f5eb6d0e7eaa5400c1ffb80e2c0a8d.zip | |
lib: Remove dst_api field from rdrbuff blocks
Now that we have an rbuff per flow per AP, there is no more need to
keep the dst_api in the rdrbuff. This also simplifies the sanitizer in
the irmd.
Diffstat (limited to 'src/lib/dev.c')
| -rw-r--r-- | src/lib/dev.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/lib/dev.c b/src/lib/dev.c index fc8739a2..1c0d73a1 100644 --- a/src/lib/dev.c +++ b/src/lib/dev.c @@ -536,7 +536,7 @@ int flow_alloc(char * dst_name, char * src_ae_name, struct qos_spec * qos) return -1; } - ai.flows[fd].rx_rb = shm_rbuff_open(ai.api, recv_msg->port_id); + ai.flows[fd].rx_rb = shm_rbuff_open(ai.api, recv_msg->port_id); if (ai.flows[fd].rx_rb == NULL) { reset_flow(fd); bmp_release(ai.fds, fd); @@ -746,7 +746,6 @@ ssize_t flow_write(int fd, void * buf, size_t count) if (ai.flows[fd].oflags & FLOW_O_NONBLOCK) { idx = shm_rdrbuff_write(ai.rdrb, - ai.flows[fd].api, DU_BUFF_HEADSPACE, DU_BUFF_TAILSPACE, buf, @@ -766,7 +765,6 @@ ssize_t flow_write(int fd, void * buf, size_t count) } else { /* blocking */ struct shm_rdrbuff * rdrb = ai.rdrb; struct shm_rbuff * tx_rb = ai.flows[fd].tx_rb; - pid_t api = ai.flows[fd].api; pthread_rwlock_unlock(&ai.flows_lock); pthread_rwlock_unlock(&ai.data_lock); @@ -774,7 +772,6 @@ ssize_t flow_write(int fd, void * buf, size_t count) assert(tx_rb); idx = shm_rdrbuff_write_b(rdrb, - api, DU_BUFF_HEADSPACE, DU_BUFF_TAILSPACE, buf, |