cuberite/libevent
1
0
Fork 0
mirror of https://github.com/cuberite/libevent.git synced 2025-08-03 17:26:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

epoll: introduce PRINT_CHANGES() macro to avoid copy-pasting

Browse Source 
And also this will use change_to_string() for successfully returned
epoll_ctl()
This commit is contained in:
Azat Khuzhin 2015-11-08 14:33:49 +03:00
parent 77ad68a658
commit a1b142bd3e
1 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
epoll.c
View File

@ -246,6 +246,23 @@ epoll_op_to_string(int op)
"???";
}
#define PRINT_CHANGES(op, events, ch, status) \
"Epoll %s(%d) on fd %d " status ". " \
"Old events were %d; " \
"read change was %d (%s); " \
"write change was %d (%s); " \
"close change was %d (%s)", \
epoll_op_to_string(op), \
events, \
ch->fd, \
ch->old_events, \
ch->read_change, \
change_to_string(ch->read_change), \
ch->write_change, \
change_to_string(ch->write_change), \
ch->close_change, \
change_to_string(ch->close_change)
static int
epoll_apply_one_change(struct event_base *base,
struct epollop *epollop,
@ -271,14 +288,7 @@ epoll_apply_one_change(struct event_base *base,
epev.data.fd = ch->fd;
epev.events = events;
if (epoll_ctl(epollop->epfd, op, ch->fd, &epev) == 0) {
event_debug(("Epoll %s(%d) on fd %d okay. [old events were %d; read change was %d; write change was %d; close change was %d]",
epoll_op_to_string(op),
(int)epev.events,
(int)ch->fd,
ch->old_events,
ch->read_change,
ch->write_change,
ch->close_change));
event_debug((PRINT_CHANGES(op, epev.events, ch, "okay")));
return 0;
}
@ -338,18 +348,7 @@ epoll_apply_one_change(struct event_base *base,
break;
}
event_warn("Epoll %s(%d) on fd %d failed. Old events were %d; read change was %d (%s); write change was %d (%s); close change was %d (%s)",
epoll_op_to_string(op),
(int)epev.events,
ch->fd,
ch->old_events,
ch->read_change,
change_to_string(ch->read_change),
ch->write_change,
change_to_string(ch->write_change),
ch->close_change,
change_to_string(ch->close_change));
event_warn(PRINT_CHANGES(op, epev.events, ch, "failed"));
return -1;
}