diff --git a/HISTORY b/HISTORY index a90f7fda2d450d60aa9012ba9e7a0e92ef87a5ae..295c7435aa6eefe840d9ad0e15c6a2ab32edbc4b 100644 --- a/HISTORY +++ b/HISTORY @@ -1,5 +1,5 @@ -Version 1.44 2020-09-29 +Version 1.44 2020-09-30 * add test file src/tests/test_pthread_lock.c * add uniq_skiplist.[hc] * add function split_string_ex diff --git a/src/ioevent_loop.c b/src/ioevent_loop.c index aff8a3cc2e68c78c5009af6f2056b84eeaf3fd93..b8cdf2cd48df14ad624aca098194ac86ddc06679 100644 --- a/src/ioevent_loop.c +++ b/src/ioevent_loop.c @@ -18,7 +18,7 @@ static void deal_ioevents(IOEventPoller *ioevent) } else { logDebug("file: "__FILE__", line: %d, " - "ignore iovent : %d, index: %d", + "ignore ioevent : %d, index: %d", __LINE__, event, ioevent->iterator.index); } } @@ -46,7 +46,7 @@ int ioevent_remove(IOEventPoller *ioevent, void *data) pEntry = (IOEventEntry *)IOEVENT_GET_DATA(ioevent, index); if (pEntry != NULL && pEntry->timer.data == data) { logDebug("file: "__FILE__", line: %d, " - "clear iovent data: %p", __LINE__, data); + "clear ioevent data: %p", __LINE__, data); IOEVENT_CLEAR_DATA(ioevent, index); return 0; } diff --git a/src/ioevent_loop.h b/src/ioevent_loop.h index 3f1a0a08627b56ff4702fd890c86055088c25d25..eb761af0026344aa87eb2305a1ad436c8ffd15bf 100644 --- a/src/ioevent_loop.h +++ b/src/ioevent_loop.h @@ -17,7 +17,7 @@ int ioevent_remove(IOEventPoller *ioevent, void *data); int ioevent_set(struct fast_task_info *pTask, struct nio_thread_data *pThread, int sock, short event, IOEventCallback callback, const int timeout); -static inline void iovent_add_to_deleted_list(struct fast_task_info *task) +static inline void ioevent_add_to_deleted_list(struct fast_task_info *task) { if (task->thread_data == NULL) { @@ -35,7 +35,7 @@ static inline void iovent_add_to_deleted_list(struct fast_task_info *task) task->thread_data->deleted_list = task; } -static inline int iovent_notify_thread(struct nio_thread_data *thread_data) +static inline int ioevent_notify_thread(struct nio_thread_data *thread_data) { int64_t n; int result;