stv0g/libwebsockets
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

update test server for new extpoll

Browse source
This commit is contained in:
Michael Haberler 2014-02-15 20:21:02 +08:00 • committed by Andy Green
parent ffbc02ff11
commit 099645dc05
1 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
test-server/test-server.c
View file

@ -211,7 +211,7 @@ static int callback_http(struct libwebsocket_context *context,
(struct per_session_data__http *)user;
const char *mimetype;
#ifdef EXTERNAL_POLL
int fd = (int)(long)in;
struct libwebsocket_pollargs *pa = (struct libwebsocket_pollargs *)in;
#endif
switch (reason) {
@ -450,28 +450,25 @@ bail:
return 1;
}
fd_lookup[fd] = count_pollfds;
pollfds[count_pollfds].fd = fd;
pollfds[count_pollfds].events = (int)(long)len;
fd_lookup[pa->fd] = count_pollfds;
pollfds[count_pollfds].fd = pa->fd;
pollfds[count_pollfds].events = pa->events;
pollfds[count_pollfds++].revents = 0;
break;
case LWS_CALLBACK_DEL_POLL_FD:
if (!--count_pollfds)
break;
m = fd_lookup[fd];
m = fd_lookup[pa->fd];
/* have the last guy take up the vacant slot */
pollfds[m] = pollfds[count_pollfds];
fd_lookup[pollfds[count_pollfds].fd] = m;
break;
case LWS_CALLBACK_SET_MODE_POLL_FD:
pollfds[fd_lookup[fd]].events |= (int)(long)len;
case LWS_CALLBACK_CHANGE_MODE_POLL_FD:
pollfds[fd_lookup[pa->fd]].events = pa->events;
break;
case LWS_CALLBACK_CLEAR_MODE_POLL_FD:
pollfds[fd_lookup[fd]].events &= ~(int)(long)len;
break;
#endif
case LWS_CALLBACK_GET_THREAD_ID: