diff options
| author | dimitri staessens <dimitri.staessens@ugent.be> | 2017-04-26 11:17:39 +0000 |
|---|---|---|
| committer | Sander Vrijders <sander.vrijders@ugent.be> | 2017-04-26 11:17:39 +0000 |
| commit | ad522c14994ae19c5a6507ee10ebcacdbf3cf107 (patch) | |
| tree | 4e4d3b4f8da805ca9f0f0733977ff678c064660f /src/lib | |
| parent | ea16fc664673d65c0e3e51591258be4d3b8be406 (diff) | |
| parent | e2c8623e66d66f4b9c8619349d11375a32ac2134 (diff) | |
| download | ouroboros-ad522c14994ae19c5a6507ee10ebcacdbf3cf107.tar.gz ouroboros-ad522c14994ae19c5a6507ee10ebcacdbf3cf107.zip | |
Merged in dstaesse/ouroboros/be-shm-reserve (pull request #493)
lib: Add call to reserve blocks in rdrbuff
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/dev.c | 28 | ||||
| -rw-r--r-- | src/lib/shm_rdrbuff.c | 25 |
2 files changed, 46 insertions, 7 deletions
diff --git a/src/lib/dev.c b/src/lib/dev.c index 757f26a8..c46cd407 100644 --- a/src/lib/dev.c +++ b/src/lib/dev.c @@ -1430,6 +1430,32 @@ int ipcp_flow_write(int fd, return 0; } +int ipcp_sdb_reserve(struct shm_du_buff ** sdb, + size_t len) +{ + struct shm_rdrbuff * rdrb; + ssize_t idx; + + pthread_rwlock_rdlock(&ai.data_lock); + + rdrb = ai.rdrb; + + pthread_rwlock_unlock(&ai.data_lock); + + idx = shm_rdrbuff_write_b(rdrb, + DU_BUFF_HEADSPACE, + DU_BUFF_TAILSPACE, + NULL, + len); + + if (idx < 0) + return -1; + + *sdb = shm_rdrbuff_get(rdrb, idx); + + return 0; +} + int ipcp_flow_fini(int fd) { struct shm_rbuff * rx_rb; @@ -1539,7 +1565,7 @@ int ipcp_read_shim(int fd, return 0; } -void ipcp_flow_del(struct shm_du_buff * sdb) +void ipcp_sdb_release(struct shm_du_buff * sdb) { shm_rdrbuff_remove(ai.rdrb, shm_du_buff_get_idx(sdb)); } diff --git a/src/lib/shm_rdrbuff.c b/src/lib/shm_rdrbuff.c index 9dffdf74..ed9c3847 100644 --- a/src/lib/shm_rdrbuff.c +++ b/src/lib/shm_rdrbuff.c @@ -24,6 +24,7 @@ #include <ouroboros/config.h> #include <ouroboros/errno.h> #include <ouroboros/shm_rdrbuff.h> +#include <ouroboros/shm_du_buff.h> #include <ouroboros/time_utils.h> #include <pthread.h> @@ -333,7 +334,6 @@ ssize_t shm_rdrbuff_write(struct shm_rdrbuff * rdrb, ssize_t sz = size + sizeof(*sdb); assert(rdrb); - assert(data); #ifndef SHM_RDRB_MULTI_BLOCK if (sz > SHM_RDRB_BLOCK_SIZE) @@ -392,7 +392,8 @@ ssize_t shm_rdrbuff_write(struct shm_rdrbuff * rdrb, sdb->du_head = headspace; sdb->du_tail = sdb->du_head + len; - memcpy(((uint8_t *) (sdb + 1)) + headspace, data, len); + if (data != NULL) + memcpy(((uint8_t *) (sdb + 1)) + headspace, data, len); return sdb->idx; } @@ -412,7 +413,6 @@ ssize_t shm_rdrbuff_write_b(struct shm_rdrbuff * rdrb, ssize_t sz = size + sizeof(*sdb); assert(rdrb); - assert(data); #ifndef SHM_RDRB_MULTI_BLOCK if (sz > SHM_RDRB_BLOCK_SIZE) @@ -472,7 +472,9 @@ ssize_t shm_rdrbuff_write_b(struct shm_rdrbuff * rdrb, sdb->size = size; sdb->du_head = headspace; sdb->du_tail = sdb->du_head + len; - memcpy(((uint8_t *) (sdb + 1)) + headspace, data, len); + + if (data != NULL) + memcpy(((uint8_t *) (sdb + 1)) + headspace, data, len); return sdb->idx; } @@ -495,7 +497,8 @@ ssize_t shm_rdrbuff_read(uint8_t ** dst, return len; } -struct shm_du_buff * shm_rdrbuff_get(struct shm_rdrbuff * rdrb, size_t idx) +struct shm_du_buff * shm_rdrbuff_get(struct shm_rdrbuff * rdrb, + size_t idx) { struct shm_du_buff * sdb; @@ -507,7 +510,8 @@ struct shm_du_buff * shm_rdrbuff_get(struct shm_rdrbuff * rdrb, size_t idx) return sdb; } -int shm_rdrbuff_remove(struct shm_rdrbuff * rdrb, size_t idx) +int shm_rdrbuff_remove(struct shm_rdrbuff * rdrb, + size_t idx) { assert(rdrb); assert(idx < (SHM_BUFFER_SIZE)); @@ -609,3 +613,12 @@ void shm_du_buff_tail_release(struct shm_du_buff * sdb, sdb->du_tail -= size; } + +void shm_du_buff_truncate(struct shm_du_buff * sdb, + size_t len) +{ + assert(sdb); + assert(len <= sdb->size); + + sdb->du_tail -= sdb->size - len; +} |