pdxx
/
fastdfs
mirror of https://github.com/happyfish100/fastdfs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

correct spell iovent to ioevent follows libfastcommon

pull/484/head
YuQing 2020-09-30 19:41:09 +08:00
parent b5534f9c8f
commit 55b2eeafc1
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
HISTORY
View File

@ -1,7 +1,8 @@
Version 6.07 2020-09-08 Version 6.07 2020-09-30
* use libfastcommon V1.44 * use libfastcommon V1.44
NOTE: you MUST upgrade libfastcommon to V1.44 or later NOTE: you MUST upgrade libfastcommon to V1.44 or later
* correct spell iovent to ioevent follows libfastcommon
Version 6.06 2019-12-30 Version 6.06 2019-12-30
* bugfixed: fdfs_storaged can't quit normally * bugfixed: fdfs_storaged can't quit normally

2
storage/storage_dio.c
View File

@ -157,7 +157,7 @@ int storage_dio_queue_push(struct fast_task_info *pTask)
pClientInfo->stage |= FDFS_STORAGE_STAGE_DIO_THREAD; pClientInfo->stage |= FDFS_STORAGE_STAGE_DIO_THREAD;
if ((result=blocked_queue_push(&(pContext->queue), pTask)) != 0) if ((result=blocked_queue_push(&(pContext->queue), pTask)) != 0)
{ {
iovent_add_to_deleted_list(pTask); ioevent_add_to_deleted_list(pTask);
return result; return result;
} }

6
storage/storage_nio.c
View File

@ -81,7 +81,7 @@ static int set_recv_event(struct fast_task_info *pTask)
pTask->event.fd, IOEVENT_READ, pTask) != 0) pTask->event.fd, IOEVENT_READ, pTask) != 0)
{ {
result = errno != 0 ? errno : ENOENT; result = errno != 0 ? errno : ENOENT;
iovent_add_to_deleted_list(pTask); ioevent_add_to_deleted_list(pTask);
logError("file: "__FILE__", line: %d, "\ logError("file: "__FILE__", line: %d, "\
"ioevent_modify fail, " \ "ioevent_modify fail, " \
@ -106,7 +106,7 @@ static int set_send_event(struct fast_task_info *pTask)
pTask->event.fd, IOEVENT_WRITE, pTask) != 0) pTask->event.fd, IOEVENT_WRITE, pTask) != 0)
{ {
result = errno != 0 ? errno : ENOENT; result = errno != 0 ? errno : ENOENT;
iovent_add_to_deleted_list(pTask); ioevent_add_to_deleted_list(pTask);
logError("file: "__FILE__", line: %d, "\ logError("file: "__FILE__", line: %d, "\
"ioevent_modify fail, " \ "ioevent_modify fail, " \
@ -204,7 +204,7 @@ void storage_recv_notify_read(int sock, short event, void *arg)
if (result != 0) if (result != 0)
{ {
iovent_add_to_deleted_list(pTask); ioevent_add_to_deleted_list(pTask);
} }
} }
} }

2
storage/storage_service.c
View File

@ -8434,7 +8434,7 @@ int storage_deal_task(struct fast_task_info *pTask)
result = storage_server_fetch_one_path_binlog(pTask); result = storage_server_fetch_one_path_binlog(pTask);
break; break;
case FDFS_PROTO_CMD_QUIT: case FDFS_PROTO_CMD_QUIT:
iovent_add_to_deleted_list(pTask); ioevent_add_to_deleted_list(pTask);
return 0; return 0;
case FDFS_PROTO_CMD_ACTIVE_TEST: case FDFS_PROTO_CMD_ACTIVE_TEST:
result = storage_deal_active_test(pTask); result = storage_deal_active_test(pTask);