From 3fb501630a5671807539baa58059914db1f15a5f Mon Sep 17 00:00:00 2001 From: fengzero Date: Mon, 25 Dec 2023 02:41:48 +0000 Subject: [PATCH 1/2] fix(event): timer/io index set --- src/event/event_linux.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/event/event_linux.c b/src/event/event_linux.c index e5ee451b..5a7e0399 100644 --- a/src/event/event_linux.c +++ b/src/event/event_linux.c @@ -239,6 +239,7 @@ neu_event_timer_t *neu_event_add_timer(neu_events_t * events, timer_ctx->event_data->usr_data = timer.usr_data; timer_ctx->event_data->callback.timer = timer.cb; timer_ctx->event_data->ctx.timer = events->event_datas[index].ctx.timer; + timer_ctx->event_data->index = index; timer_ctx->value = value; timer_ctx->fd = timer_fd; @@ -296,6 +297,7 @@ neu_event_io_t *neu_event_add_io(neu_events_t *events, neu_event_io_param_t io) io_ctx->event_data->usr_data = io.usr_data; io_ctx->event_data->callback.io = io.cb; io_ctx->event_data->ctx.io = events->event_datas[index].ctx.io; + io_ctx->event_data->index = index; io_ctx->fd = io.fd; From 52d15c31de628d0cf0fe9147b66d50d1f5b82309 Mon Sep 17 00:00:00 2001 From: fengzero Date: Mon, 25 Dec 2023 02:46:15 +0000 Subject: [PATCH 2/2] event log --- src/event/event_linux.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/event/event_linux.c b/src/event/event_linux.c index 5a7e0399..1c98a2bf 100644 --- a/src/event/event_linux.c +++ b/src/event/event_linux.c @@ -252,17 +252,17 @@ neu_event_timer_t *neu_event_add_timer(neu_events_t * events, zlog_notice(neuron, "add timer, second: %" PRId64 ", millisecond: %" PRId64 ", timer: %d in epoll %d, " - "ret: %d", + "ret: %d, index: %d", timer.second, timer.millisecond, timer_fd, events->epoll_fd, - ret); + ret, index); return timer_ctx; } int neu_event_del_timer(neu_events_t *events, neu_event_timer_t *timer) { - zlog_notice(neuron, "del timer: %d from epoll: %d", timer->fd, - events->epoll_fd); + zlog_notice(neuron, "del timer: %d from epoll: %d, index: %d", timer->fd, + events->epoll_fd, timer->event_data->index); timer->stop = true; epoll_ctl(events->epoll_fd, EPOLL_CTL_DEL, timer->fd, NULL); @@ -303,8 +303,8 @@ neu_event_io_t *neu_event_add_io(neu_events_t *events, neu_event_io_param_t io) ret = epoll_ctl(events->epoll_fd, EPOLL_CTL_ADD, io.fd, &event); - nlog_notice("add io, fd: %d, epoll: %d, ret: %d(%d)", io.fd, - events->epoll_fd, ret, errno); + nlog_notice("add io, fd: %d, epoll: %d, ret: %d(%d), index: %d", io.fd, + events->epoll_fd, ret, errno, index); assert(ret == 0); return io_ctx; @@ -316,7 +316,8 @@ int neu_event_del_io(neu_events_t *events, neu_event_io_t *io) return 0; } - zlog_notice(neuron, "del io: %d from epoll: %d", io->fd, events->epoll_fd); + zlog_notice(neuron, "del io: %d from epoll: %d, index: %d", io->fd, + events->epoll_fd, io->event_data->index); epoll_ctl(events->epoll_fd, EPOLL_CTL_DEL, io->fd, NULL); free_event(events, io->event_data->index);