diff options
| author | Sander Vrijders <sander.vrijders@intec.ugent.be> | 2016-09-06 09:57:24 +0200 | 
|---|---|---|
| committer | Sander Vrijders <sander.vrijders@intec.ugent.be> | 2016-09-06 09:57:24 +0200 | 
| commit | b85658366b18db60db684ed5ef218052177038d7 (patch) | |
| tree | d15cb04d68a063fc3418d0259c9e779514861fcf /src/tools/oping/oping.c | |
| parent | d35685c537e7809d5c4a213fcfa553d8a522bc51 (diff) | |
| parent | 116cda0ae03bc4e7b8571cf1658775c13c03c68e (diff) | |
| download | ouroboros-b85658366b18db60db684ed5ef218052177038d7.tar.gz ouroboros-b85658366b18db60db684ed5ef218052177038d7.zip | |
Merged in dstaesse/ouroboros/be-select (pull request #242)
lib: dev: Provide a set of fds to flow_select
Diffstat (limited to 'src/tools/oping/oping.c')
| -rw-r--r-- | src/tools/oping/oping.c | 9 | 
1 files changed, 6 insertions, 3 deletions
| diff --git a/src/tools/oping/oping.c b/src/tools/oping/oping.c index 2871e79e..7d2edf33 100644 --- a/src/tools/oping/oping.c +++ b/src/tools/oping/oping.c @@ -23,6 +23,9 @@  #define _POSIX_C_SOURCE 199506L +#include <ouroboros/select.h> +#include <ouroboros/dev.h> +  #include <stdio.h>  #include <string.h>  #include <pthread.h> @@ -59,9 +62,9 @@ struct c {  } client;  struct s { -        struct timespec times[OPING_MAX_FLOWS]; -        bool            flows[OPING_MAX_FLOWS]; -        pthread_mutex_t lock; +        struct timespec   times[OPING_MAX_FLOWS]; +        struct flow_set * flows; +        pthread_mutex_t   lock;          pthread_t cleaner_pt;          pthread_t accept_pt; | 
