test/acl
1
0
Fork 0
mirror of https://gitee.com/acl-dev/acl.git synced 2024-12-13 16:35:35 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'gitee-master' into gitlab-upstream

Browse Source
This commit is contained in:
zhengshuxin 2024-03-27 18:36:17 +08:00
commit 0c3c481c53
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib_fiber/c/src/fiber_io.c
View File

@ -502,14 +502,24 @@ int fiber_wait_read(FILE_EVENT *fe)
// If the IO has been canceled, we should try to remove the
// IO read event, because the wakeup process wasn't from
// read_callback normally.
#if 0
// Don't call event_del_read here, because it's a buffered
// delete read operation; We'll real delete read operation on
// the fd in event_close.
event_del_read(__thread_fiber->event, fe);
#endif
acl_fiber_set_error(curr->errnum);
return -1;
} else if (curr->flag & FIBER_F_TIMER) {
// If the IO reading timeout set in setsockopt.
// Clear FIBER_F_TIMER flag been set in wakeup_timers.
curr->flag &= ~FIBER_F_TIMER;
#if 0
// Don't call event_del_read here, because it's a buffered
// delete read operation; We'll real delete read operation on
// the fd in event_close.
event_del_read(__thread_fiber->event, fe);
#endif
acl_fiber_set_errno(curr, FIBER_EAGAIN);
acl_fiber_set_error(FIBER_EAGAIN);
@ -575,12 +585,16 @@ int fiber_wait_write(FILE_EVENT *fe)
}
if (acl_fiber_canceled(curr)) {
#if 0
event_del_write(__thread_fiber->event, fe);
#endif
acl_fiber_set_error(curr->errnum);
return -1;
} else if (curr->flag & FIBER_F_TIMER) {
curr->flag &= ~FIBER_F_TIMER;
#if 0
event_del_write(__thread_fiber->event, fe);
#endif
acl_fiber_set_errno(curr, FIBER_EAGAIN);
acl_fiber_set_error(FIBER_EAGAIN);

2
lib_fiber/samples/ssl_server/main.cpp
View File

@ -60,7 +60,9 @@ static void echo_fiber(ACL_FIBER *, void *ctx)
if (eagain >= 3) {
break;
}
continue;
}
buf[ret] = 0;
if (n++ < 5) {