From 55b2eeafc1214bb6196be4ebcacc15079f3a7dc8 Mon Sep 17 00:00:00 2001 From: YuQing <384681@qq.com> Date: Wed, 30 Sep 2020 19:41:09 +0800 Subject: [PATCH] correct spell iovent to ioevent follows libfastcommon --- HISTORY | 3 ++- storage/storage_dio.c | 2 +- storage/storage_nio.c | 6 +++--- storage/storage_service.c | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/HISTORY b/HISTORY index 3c82fb9..a51c7d4 100644 --- a/HISTORY +++ b/HISTORY @@ -1,7 +1,8 @@ -Version 6.07 2020-09-08 +Version 6.07 2020-09-30 * use libfastcommon V1.44 NOTE: you MUST upgrade libfastcommon to V1.44 or later + * correct spell iovent to ioevent follows libfastcommon Version 6.06 2019-12-30 * bugfixed: fdfs_storaged can't quit normally diff --git a/storage/storage_dio.c b/storage/storage_dio.c index 0d456cd..cca3e78 100644 --- a/storage/storage_dio.c +++ b/storage/storage_dio.c @@ -157,7 +157,7 @@ int storage_dio_queue_push(struct fast_task_info *pTask) pClientInfo->stage |= FDFS_STORAGE_STAGE_DIO_THREAD; if ((result=blocked_queue_push(&(pContext->queue), pTask)) != 0) { - iovent_add_to_deleted_list(pTask); + ioevent_add_to_deleted_list(pTask); return result; } diff --git a/storage/storage_nio.c b/storage/storage_nio.c index 3bf05b0..df199cc 100644 --- a/storage/storage_nio.c +++ b/storage/storage_nio.c @@ -81,7 +81,7 @@ static int set_recv_event(struct fast_task_info *pTask) pTask->event.fd, IOEVENT_READ, pTask) != 0) { result = errno != 0 ? errno : ENOENT; - iovent_add_to_deleted_list(pTask); + ioevent_add_to_deleted_list(pTask); logError("file: "__FILE__", line: %d, "\ "ioevent_modify fail, " \ @@ -106,7 +106,7 @@ static int set_send_event(struct fast_task_info *pTask) pTask->event.fd, IOEVENT_WRITE, pTask) != 0) { result = errno != 0 ? errno : ENOENT; - iovent_add_to_deleted_list(pTask); + ioevent_add_to_deleted_list(pTask); logError("file: "__FILE__", line: %d, "\ "ioevent_modify fail, " \ @@ -204,7 +204,7 @@ void storage_recv_notify_read(int sock, short event, void *arg) if (result != 0) { - iovent_add_to_deleted_list(pTask); + ioevent_add_to_deleted_list(pTask); } } } diff --git a/storage/storage_service.c b/storage/storage_service.c index a7fbda6..50e50f3 100644 --- a/storage/storage_service.c +++ b/storage/storage_service.c @@ -8434,7 +8434,7 @@ int storage_deal_task(struct fast_task_info *pTask) result = storage_server_fetch_one_path_binlog(pTask); break; case FDFS_PROTO_CMD_QUIT: - iovent_add_to_deleted_list(pTask); + ioevent_add_to_deleted_list(pTask); return 0; case FDFS_PROTO_CMD_ACTIVE_TEST: result = storage_deal_active_test(pTask);