GithubStar/neuron
1
0
Fork 0
mirror of https://github.com/emqx/neuron.git synced 2026-10-27 04:19:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix stop timer

Browse Source
This commit is contained in:
fengzero
2022-10-21 10:38:48 +00:00
parent 04f6a85bfd
commit 1a2c94ad89
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/event/event_linux.c
+8 -3
View File
@@ -42,6 +42,7 @@ struct neu_event_timer {
struct itimerspec value;
nng_mtx *mtx;
bool stop;
};
struct neu_event_io {
@@ -102,9 +103,11 @@ static void *event_loop(void *arg)
ssize_t size = read(data->fd, &t, sizeof(t));
assert(size != -1);
nng_mtx_lock(data->ctx.timer->mtx);
ret = data->callback.timer(data->usr_data);
nng_mtx_unlock(data->ctx.timer->mtx);
if (!data->ctx.timer->stop) {
nng_mtx_lock(data->ctx.timer->mtx);
ret = data->callback.timer(data->usr_data);
nng_mtx_unlock(data->ctx.timer->mtx);
}
}
break;
case IO:
@@ -180,6 +183,7 @@ neu_event_timer_t *neu_event_add_timer(neu_events_t * events,
timer_ctx->value = value;
timer_ctx->fd = timer_fd;
timer_ctx->event_data = data;
timer_ctx->stop = false;
nng_mtx_alloc(&timer_ctx->mtx);
ret = epoll_ctl(events->epoll_fd, EPOLL_CTL_ADD, timer_fd, &event);
@@ -198,6 +202,7 @@ int neu_event_del_timer(neu_events_t *events, neu_event_timer_t *timer)
zlog_info(neuron, "del timer: %d from epoll: %d", timer->fd,
events->epoll_fd);
timer->stop = true;
nng_mtx_lock(timer->mtx);
close(timer->fd);
epoll_ctl(events->epoll_fd, EPOLL_CTL_DEL, timer->fd, NULL);