cmhi
/
f-stack
mirror of https://github.com/F-Stack/f-stack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix #124 

Fix #124: set/get user data in epoll
This commit is contained in:
daovanhuy 2017-12-27 11:28:49 +07:00 committed by GitHub
parent b2dbf8fd04
commit 8d6a4447df
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/ff_epoll.c
View File

@ -96,8 +96,9 @@ ff_epoll_ctl(int epfd, int op, int fd, struct epoll_event *event)
write_flags |= EV_ENABLE; write_flags |= EV_ENABLE;
} }
EV_SET(&kev[0], fd, EVFILT_READ, read_flags, 0, 0, NULL); // Fix #124: set user data
EV_SET(&kev[1], fd, EVFILT_WRITE, write_flags, 0, 0, NULL); EV_SET(&kev[0], fd, EVFILT_READ, read_flags, 0, 0, event->data.ptr);
EV_SET(&kev[1], fd, EVFILT_WRITE, write_flags, 0, 0, event->data.ptr);
return ff_kevent(epfd, kev, changes, NULL, 0, NULL); return ff_kevent(epfd, kev, changes, NULL, 0, NULL);
} }
@ -135,6 +136,10 @@ ff_event_to_epoll(void **ev, struct kevent *kev)
} }
(*ppev)->events = event_one; (*ppev)->events = event_one;
// Fix #124: get user data
if (kev->udata != NULL)
(*ppev)->data.ptr = kev->udata;
else
(*ppev)->data.fd = kev->ident; (*ppev)->data.fd = kev->ident;
(*ppev)++; (*ppev)++;
} }