riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

cope with SIGIO behaviour

Browse Source 
SIGIO appears to be edge triggered, therefore we need to read
continuously until no more data is available
This commit is contained in:
Ludwig Ortmann 2013-11-08 13:16:08 +01:00
parent 2c7070bf0c
commit 1df56ed47b
1 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
cpu/native/net/tap.c
View File

@ -23,6 +23,7 @@
#include <fcntl.h> #include <fcntl.h>
#include <arpa/inet.h> #include <arpa/inet.h>
#include <inttypes.h> #include <inttypes.h>
#include <errno.h>
#ifdef __MACH__ #ifdef __MACH__
#define _POSIX_C_SOURCE #define _POSIX_C_SOURCE
@ -87,9 +88,35 @@ void _native_handle_tap_input(void)
else { else {
DEBUG("ignoring non-native frame\n"); DEBUG("ignoring non-native frame\n");
} }
/* work around lost signals */
fd_set rfds;
struct timeval t;
memset(&t, 0, sizeof(t));
FD_ZERO(&rfds);
FD_SET(_native_tap_fd, &rfds);
_native_in_syscall++; // no switching here
if (select(_native_tap_fd +1, &rfds, NULL, NULL, &t) == 1) {
int sig = SIGIO;
extern int _sig_pipefd[2];
extern ssize_t (*real_write)(int fd, const void *buf, size_t count);
real_write(_sig_pipefd[1], &sig, sizeof(int));
_native_sigpend++;
DEBUG("_native_handle_tap_input: sigpend++\n");
}
else {
DEBUG("_native_handle_tap_input: no more pending tap data\n");
}
_native_in_syscall--;
} }
else if (nread == -1) { else if (nread == -1) {
err(EXIT_FAILURE, "read"); if ((errno == EAGAIN ) || (errno == EWOULDBLOCK)) {
//warn("read");
}
else {
err(EXIT_FAILURE, "_native_handle_tap_input: read");
}
} }
else { else {
errx(EXIT_FAILURE, "internal error _native_handle_tap_input"); errx(EXIT_FAILURE, "internal error _native_handle_tap_input");