summaryrefslogtreecommitdiff
path: root/src/lib/dev.c
diff options
context:
space:
mode:
authorSander Vrijders <sander.vrijders@intec.ugent.be>2016-08-04 17:07:45 +0200
committerSander Vrijders <sander.vrijders@intec.ugent.be>2016-08-04 17:07:45 +0200
commit51bb7c6f315dba4044eb2ece5c1312362674d7fb (patch)
treefff3eeadb6eb04edee21340ecdcdfc13da3115b4 /src/lib/dev.c
parent44b55f0b03ffc6aff4f1c290b5687d5ac95ddbf9 (diff)
parent4931526cf9b5e40294e043deab856f25bf56c7cf (diff)
downloadouroboros-51bb7c6f315dba4044eb2ece5c1312362674d7fb.tar.gz
ouroboros-51bb7c6f315dba4044eb2ece5c1312362674d7fb.zip
Merged in dstaesse/ouroboros/be-blocking (pull request #185)
lib: Revise blocking I/O
Diffstat (limited to 'src/lib/dev.c')
-rw-r--r--src/lib/dev.c56
1 files changed, 29 insertions, 27 deletions
diff --git a/src/lib/dev.c b/src/lib/dev.c
index 22e77169..ce919263 100644
--- a/src/lib/dev.c
+++ b/src/lib/dev.c
@@ -41,6 +41,8 @@ struct flow {
int oflags;
pid_t api;
+
+ struct timespec * timeout;
};
struct ap_data {
@@ -93,7 +95,9 @@ int ap_init(char * ap_name)
for (i = 0; i < AP_MAX_FLOWS; ++i) {
_ap_instance->flows[i].rb = NULL;
_ap_instance->flows[i].port_id = -1;
+ _ap_instance->flows[i].oflags = 0;
_ap_instance->flows[i].api = -1;
+ _ap_instance->flows[i].timeout = NULL;
}
pthread_rwlock_init(&_ap_instance->flows_lock, NULL);
@@ -127,6 +131,9 @@ void ap_fini(void)
pthread_rwlock_unlock(&_ap_instance->flows_lock);
pthread_rwlock_unlock(&_ap_instance->data_lock);
+ pthread_rwlock_destroy(&_ap_instance->flows_lock);
+ pthread_rwlock_destroy(&_ap_instance->data_lock);
+
free(_ap_instance);
}
@@ -458,7 +465,7 @@ int flow_cntl(int fd, int cmd, int oflags)
ssize_t flow_write(int fd, void * buf, size_t count)
{
- ssize_t index;
+ ssize_t idx;
struct rb_entry e;
if (buf == NULL)
@@ -477,37 +484,35 @@ ssize_t flow_write(int fd, void * buf, size_t count)
}
if (_ap_instance->flows[fd].oflags & FLOW_O_NONBLOCK) {
- index = shm_du_map_write(_ap_instance->dum,
- _ap_instance->flows[fd].api,
- DU_BUFF_HEADSPACE,
- DU_BUFF_TAILSPACE,
- (uint8_t *) buf,
- count);
- if (index == -1) {
+ idx = shm_du_map_write(_ap_instance->dum,
+ _ap_instance->flows[fd].api,
+ DU_BUFF_HEADSPACE,
+ DU_BUFF_TAILSPACE,
+ (uint8_t *) buf,
+ count);
+ if (idx == -1) {
pthread_rwlock_unlock(&_ap_instance->flows_lock);
pthread_rwlock_unlock(&_ap_instance->data_lock);
return -EAGAIN;
}
- e.index = index;
+ e.index = idx;
e.port_id = _ap_instance->flows[fd].port_id;
if (shm_ap_rbuff_write(_ap_instance->flows[fd].rb, &e) < 0) {
- shm_du_map_remove(_ap_instance->dum, index);
+ shm_du_map_remove(_ap_instance->dum, idx);
pthread_rwlock_unlock(&_ap_instance->flows_lock);
pthread_rwlock_unlock(&_ap_instance->data_lock);
return -1;
}
} else { /* blocking */
- while ((index = shm_du_map_write(_ap_instance->dum,
- _ap_instance->flows[fd].api,
- DU_BUFF_HEADSPACE,
- DU_BUFF_TAILSPACE,
- (uint8_t *) buf,
- count)) < 0)
- ;
-
- e.index = index;
+ idx = shm_du_map_write_b(_ap_instance->dum,
+ _ap_instance->flows[fd].api,
+ DU_BUFF_HEADSPACE,
+ DU_BUFF_TAILSPACE,
+ (uint8_t *) buf,
+ count);
+ e.index = idx;
e.port_id = _ap_instance->flows[fd].port_id;
while (shm_ap_rbuff_write(_ap_instance->flows[fd].rb, &e) < 0)
@@ -546,16 +551,13 @@ ssize_t flow_read(int fd, void * buf, size_t count)
return -ENOTALLOC;
}
- if (_ap_instance->flows[fd].oflags & FLOW_O_NONBLOCK) {
+ if (_ap_instance->flows[fd].oflags & FLOW_O_NONBLOCK)
idx = shm_ap_rbuff_read_port(_ap_instance->rb,
_ap_instance->flows[fd].port_id);
- } else { /* block */
- while ((idx =
- shm_ap_rbuff_read_port(_ap_instance->rb,
- _ap_instance->
- flows[fd].port_id)) < 0)
- ;
- }
+ else
+ idx = shm_ap_rbuff_read_port_b(_ap_instance->rb,
+ _ap_instance->flows[fd].port_id,
+ _ap_instance->flows[fd].timeout);
pthread_rwlock_unlock(&_ap_instance->flows_lock);