Make select work for MS Windows.
This commit was SVN r14845.
Этот коммит содержится в:
родитель
0961669912
Коммит
90b99e5344
@ -42,7 +42,9 @@
|
|||||||
#endif
|
#endif
|
||||||
#include <sys/queue.h>
|
#include <sys/queue.h>
|
||||||
#include <sys/tree.h>
|
#include <sys/tree.h>
|
||||||
|
#ifndef __WINDOWS__
|
||||||
#include <signal.h>
|
#include <signal.h>
|
||||||
|
#endif
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
@ -73,6 +75,11 @@ extern opal_mutex_t opal_event_lock;
|
|||||||
extern volatile sig_atomic_t opal_evsignal_caught;
|
extern volatile sig_atomic_t opal_evsignal_caught;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifdef __WINDOWS__
|
||||||
|
#define NFDBITS 32
|
||||||
|
int fd_mask;
|
||||||
|
#endif
|
||||||
|
|
||||||
struct selectop {
|
struct selectop {
|
||||||
int event_fds; /* Highest fd in fd set */
|
int event_fds; /* Highest fd in fd set */
|
||||||
int event_fdsz;
|
int event_fdsz;
|
||||||
@ -198,8 +205,8 @@ select_dispatch(struct event_base *base, void *arg, struct timeval *tv)
|
|||||||
the lock and it just takes up time we could spend doing
|
the lock and it just takes up time we could spend doing
|
||||||
something else. */
|
something else. */
|
||||||
OPAL_THREAD_UNLOCK(&opal_event_lock);
|
OPAL_THREAD_UNLOCK(&opal_event_lock);
|
||||||
res = select(sop->event_fds + 1, sop->event_readset_out,
|
res = select(sop->event_fds + 1, sop->event_readset_out,
|
||||||
sop->event_writeset_out, NULL, tv);
|
sop->event_writeset_out, NULL, tv);
|
||||||
OPAL_THREAD_LOCK(&opal_event_lock);
|
OPAL_THREAD_LOCK(&opal_event_lock);
|
||||||
|
|
||||||
check_selectop(sop);
|
check_selectop(sop);
|
||||||
@ -219,13 +226,13 @@ select_dispatch(struct event_base *base, void *arg, struct timeval *tv)
|
|||||||
|
|
||||||
tv->tv_sec = 0;
|
tv->tv_sec = 0;
|
||||||
tv->tv_usec = 0;
|
tv->tv_usec = 0;
|
||||||
memset(sop->event_readset, 0, sop->event_fdsz);
|
memset(sop->event_readset, 0, sop->event_fdsz);
|
||||||
memset(sop->event_writeset, 0, sop->event_fdsz);
|
memset(sop->event_writeset, 0, sop->event_fdsz);
|
||||||
if (ev->ev_events & OPAL_EV_WRITE)
|
if (ev->ev_events & OPAL_EV_WRITE)
|
||||||
FD_SET(ev->ev_fd, sop->event_writeset);
|
FD_SET(ev->ev_fd, sop->event_writeset);
|
||||||
if (ev->ev_events & OPAL_EV_READ)
|
if (ev->ev_events & OPAL_EV_READ)
|
||||||
FD_SET(ev->ev_fd, sop->event_readset);
|
FD_SET(ev->ev_fd, sop->event_readset);
|
||||||
res = select(sop->event_fds + 1, sop->event_readset,
|
res = select(sop->event_fds + 1, sop->event_readset,
|
||||||
sop->event_writeset, NULL, tv);
|
sop->event_writeset, NULL, tv);
|
||||||
if(res < 0) {
|
if(res < 0) {
|
||||||
opal_output(0, "bad file descriptor: %d\n", ev->ev_fd);
|
opal_output(0, "bad file descriptor: %d\n", ev->ev_fd);
|
||||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user