CERBERUS/nmap
1
0
Fork 0
mirror of https://github.com/nmap/nmap.git synced 2026-08-28 12:31:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Cleaning up: consistently get event masks from a static inline get_evmask() function.

Browse source
This commit is contained in:
henri 2012-10-22 04:26:19 +00:00
parent 62570b7be7
commit 9865b8f828
3 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

24
nsock/src/engine_epoll.c
View file

@ -316,6 +316,18 @@ int epoll_loop(mspool *nsp, int msec_timeout) {
/* ---- INTERNAL FUNCTIONS ---- */
static inline int get_evmask(struct epoll_engine_info *einfo, int n) {
int evmask = EV_NONE;
if (einfo->events[n].events & EPOLL_R_FLAGS)
evmask |= EV_READ;
if (einfo->events[n].events & EPOLL_W_FLAGS)
evmask |= EV_WRITE;
if (einfo->events[n].events & EPOLL_X_FLAGS)
evmask |= (EV_READ | EV_WRITE | EV_EXCEPT);
return evmask;
}
/* Iterate through all the event lists (such as connect_events, read_events,
* timer_events, etc) and take action for those that have completed (due to
@ -336,24 +348,14 @@ void iterate_through_event_lists(mspool *nsp, int evcount) {
initial_iod_count = GH_LIST_COUNT(&nsp->active_iods);
for (n = 0; n < evcount; n++) {
int evmask = EV_NONE;
nsi = (msiod *)einfo->events[n].data.ptr;
assert(nsi);
if (nsi->entry_in_nsp_active_iods == last)
last = GH_LIST_ELEM_PREV(nsi->entry_in_nsp_active_iods);
/* generate the corresponding event mask with nsock event flags */
if (einfo->events[n].events & EPOLL_R_FLAGS)
evmask |= EV_READ;
if (einfo->events[n].events & EPOLL_W_FLAGS)
evmask |= EV_WRITE;
if (einfo->events[n].events & EPOLL_X_FLAGS)
evmask |= (EV_READ | EV_WRITE | EV_EXCEPT);
/* process all the pending events for this IOD */
process_iod_events(nsp, nsi, evmask);
process_iod_events(nsp, nsi, get_evmask(einfo, n));
if (nsi->state != NSIOD_STATE_DELETED) {
gh_list_move_front(&nsp->active_iods, nsi->entry_in_nsp_active_iods);

6
nsock/src/engine_kqueue.c
View file

@ -299,7 +299,7 @@ int kqueue_loop(mspool *nsp, int msec_timeout) {
/* ---- INTERNAL FUNCTIONS ---- */
static int get_nsock_event(msiod *nsi, const struct kevent *kev) {
static inline int get_evmask(msiod *nsi, const struct kevent *kev) {
int evmask = EV_NONE;
/* generate the corresponding event mask with nsock event flags */
@ -343,13 +343,11 @@ void iterate_through_event_lists(mspool *nsp, int evcount) {
for (n = 0; n < evcount; n++) {
struct kevent *kev = &kinfo->events[n];
int evmask;
nsi = (msiod *)kev->udata;
/* process all the pending events for this IOD */
evmask = get_nsock_event(nsi, kev);
process_iod_events(nsp, nsi, evmask);
process_iod_events(nsp, nsi, get_evmask(nsi, kev));
IOD_PROPSET(nsi, IOD_PROCESSED);
}

2
nsock/src/engine_select.c
View file

@ -355,7 +355,7 @@ int select_loop(mspool *nsp, int msec_timeout) {
/* ---- INTERNAL FUNCTIONS ---- */
static int get_evmask(const mspool *nsp, const msiod *nsi) {
static inline int get_evmask(const mspool *nsp, const msiod *nsi) {
struct select_engine_info *sinfo = (struct select_engine_info *)nsp->engine_data;
int sd, evmask;