test/acl
1
0
Fork 0
mirror of https://gitee.com/acl-dev/acl.git synced 2024-11-30 02:47:56 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

optimize and test io_uring...

Browse Source
This commit is contained in:
zhengshuxin 2022-10-08 15:15:21 -04:00
parent dd3fcc3919
commit 1ed47abeb1
9 changed files with 79 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib_acl/include/stdlib/acl_define_unix.h
View File

@ -54,6 +54,7 @@
# define ACL_API
# define ACL_ETIMEDOUT ETIMEDOUT
# define ACL_ETIME ETIME
# define ACL_ENOMEM ENOMEM
# define ACL_EINVAL EINVAL

1
lib_acl/include/stdlib/acl_define_win32.h
View File

@ -124,6 +124,7 @@
/* errno define */
#if defined(_WIN32) || defined(_WIN64)
# define ACL_ETIMEDOUT WSAETIMEDOUT
# define ACL_ETIME WSAETIMEDOUT
# define ACL_ENOMEM WSAENOBUFS
# define ACL_EINVAL WSAEINVAL

2
lib_acl/src/stdlib/iostuff/acl_read_wait.c
View File

@ -230,7 +230,7 @@ int acl_read_epoll_wait(ACL_SOCKET fd, int delay)
if (delay == 0) {
acl_set_error(ACL_EAGAIN);
} else {
acl_set_error(ACL_ETIMEDOUT);
acl_set_error(ACL_ETIME);
}
ret = -1;
break;

2
lib_fiber/c/include/fiber/fiber_define.h
View File

@ -27,6 +27,7 @@ typedef SOCKET socket_t;
typedef int socklen_t;
# define FIBER_ETIMEDOUT WSAETIMEDOUT
# define FIBER_ETIME WSAETIMEDOUT
# define FIBER_ENOMEM WSAENOBUFS
# define FIBER_EINVAL WSAEINVAL
# define FIBER_ECONNREFUSED WSAECONNREFUSED
@ -59,6 +60,7 @@ typedef int socklen_t;
typedef int socket_t;
# define FIBER_ETIMEDOUT ETIMEDOUT
# define FIBER_ETIME ETIME
# define FIBER_ENOMEM ENOMEM
# define FIBER_EINVAL EINVAL
# define FIBER_ECONNREFUSED ECONNREFUSED

2
lib_fiber/c/src/common/read_wait.c
View File

@ -23,7 +23,7 @@ int read_wait(socket_t fd, int delay)
}
return -1;
case 0:
acl_fiber_set_error(FIBER_ETIMEDOUT);
acl_fiber_set_error(FIBER_ETIME);
return -1;
default:
if ((fds.revents & POLLIN)) {

118
lib_fiber/c/src/event/event_io_uring.c
View File

@ -23,6 +23,13 @@ static void event_uring_free(EVENT *ev)
mem_free(ep);
}
#define TRY_SUBMMIT(e) do { \
if (++(e)->appending >= (e)->sqe_size) { \
(e)->appending = 0; \
io_uring_submit(&(e)->ring); \
} \
} while (0)
static void add_read_wait(EVENT_URING *ep, FILE_EVENT *fe, int tmo_ms)
{
struct io_uring_sqe *sqe;
@ -31,12 +38,9 @@ static void add_read_wait(EVENT_URING *ep, FILE_EVENT *fe, int tmo_ms)
io_uring_prep_poll_add(sqe, fe->fd, POLLIN | POLLHUP | POLLERR);
io_uring_sqe_set_data(sqe, fe);
sqe->flags = IOSQE_IO_LINK;
if (++ep->appending >= ep->sqe_size) {
ep->appending = 0;
io_uring_submit(&ep->ring);
}
file_event_refer(fe);
TRY_SUBMMIT(ep);
fe->rts.tv_sec = tmo_ms / 1000;
fe->rts.tv_nsec = (((long long) tmo_ms) % 1000) * 1000000;
@ -46,11 +50,7 @@ static void add_read_wait(EVENT_URING *ep, FILE_EVENT *fe, int tmo_ms)
io_uring_sqe_set_data(sqe, fe);
file_event_refer(fe);
if (++ep->appending >= ep->sqe_size) {
ep->appending = 0;
io_uring_submit(&ep->ring);
}
TRY_SUBMMIT(ep);
}
static int event_uring_add_read(EVENT_URING *ep, FILE_EVENT *fe)
@ -72,18 +72,14 @@ static int event_uring_add_read(EVENT_URING *ep, FILE_EVENT *fe)
(struct sockaddr*) &fe->peer_addr,
(socklen_t*) &fe->addr_len, 0);
io_uring_sqe_set_data(sqe, fe);
if (++ep->appending >= ep->sqe_size) {
ep->appending = 0;
io_uring_submit(&ep->ring);
}
TRY_SUBMMIT(ep);
} else {
struct io_uring_sqe *sqe = io_uring_get_sqe(&ep->ring);
io_uring_prep_read(sqe, fe->fd, fe->rbuf, fe->rsize, 0);
io_uring_sqe_set_data(sqe, fe);
if (++ep->appending >= ep->sqe_size) {
ep->appending = 0;
io_uring_submit(&ep->ring);
}
TRY_SUBMMIT(ep);
}
return 0;
@ -137,6 +133,60 @@ static int event_uring_del_write(EVENT_URING *ep UNUSED, FILE_EVENT *fe)
return 0;
}
static void handle_read(EVENT *ev, FILE_EVENT *fe, int res)
{
if (fe->mask & EVENT_ACCEPT) {
fe->iocp_sock = res;
} else if (fe->mask & EVENT_POLLIN) {
if (res == -ETIME) {
printf("fd=%d timeout, fe=%p\r\n", fe->fd, fe);
file_event_unrefer(fe);
return;
} else if (res == -ECANCELED) {
printf("fd=%d canceled, fe=%p\n", fe->fd, fe);
file_event_unrefer(fe);
return;
} else if (res & POLLIN) {
fe->mask &= ~EVENT_POLLIN;
CLR_READWAIT(fe);
} else {
printf("unknown res=%d, fd=%d\n", res, fe->fd);
}
} else {
fe->rlen = res;
}
fe->mask &= ~EVENT_READ;
fe->r_proc(ev, fe);
}
static void handle_write(EVENT *ev, FILE_EVENT *fe, int res)
{
if (fe->mask & EVENT_CONNECT) {
fe->iocp_sock = res;
} else if (fe->mask & EVENT_POLLOUT) {
if (res == -ETIME) {
printf("fd=%d timeout, fe=%p\r\n", fe->fd, fe);
file_event_unrefer(fe);
return;
} else if (res == -ECANCELED) {
printf("fd=%d canceled, fe=%p\n", fe->fd, fe);
file_event_unrefer(fe);
return;
} else if (res & POLLIN) {
fe->mask &= ~EVENT_POLLOUT;
CLR_WRITEWAIT(fe);
} else {
printf("unknown res=%d, fd=%d\n", res, fe->fd);
}
} else {
fe->wlen = res;
}
fe->mask &= ~EVENT_WRITE;
fe->w_proc(ev, fe);
}
static int event_uring_wait(EVENT *ev, int timeout)
{
EVENT_URING *ep = (EVENT_URING*) ev;
@ -157,8 +207,6 @@ static int event_uring_wait(EVENT *ev, int timeout)
}
if (ep->appending > 0) {
printf("\r\n>>>>fid=%d, submit append=%d\r\n",
acl_fiber_self(), (int) ep->appending);
ep->appending = 0;
io_uring_submit(&ep->ring);
}
@ -197,43 +245,17 @@ static int event_uring_wait(EVENT *ev, int timeout)
return -1;
}
usleep(1000000);
//usleep(100000);
if ((fe->mask & EVENT_READ) && fe->r_proc) {
fe->mask &= ~EVENT_READ;
if (fe->mask & EVENT_ACCEPT) {
fe->iocp_sock = res;
} else if (fe->mask & EVENT_POLLIN) {
if (res == -ETIME) {
printf("fd read timeout=%d\r\n", fe->fd);
fe->rlen = -1;
file_event_unrefer(fe);
} else if (res == -ECANCELED) {
printf("fd=%d canceled\n", fe->fd);
file_event_unrefer(fe);
continue;
} else if (res & POLLIN) {
}
} else {
fe->rlen = res;
}
fe->r_proc(ev, fe);
handle_read(ev, fe, res);
}
if ((fe->mask & EVENT_WRITE) && fe->w_proc) {
fe->mask &= ~EVENT_WRITE;
if (fe->mask & EVENT_CONNECT) {
fe->iocp_sock = res;
} else {
fe->wlen = res;
}
fe->w_proc(ev, fe);
handle_write(ev, fe, res);
}
}
printf(">>>fid=%d, handle count=%d<<<<\n\n", acl_fiber_self(), count);
return count;
}

2
lib_fiber/c/src/fiber_cond.c
View File

@ -144,7 +144,7 @@ int acl_fiber_cond_timedwait(ACL_FIBER_COND *cond, ACL_FIBER_EVENT *event,
msg_fatal("%s(%d), %s: wait event error",
__FILE__, __LINE__, __FUNCTION__);
}
return ETIMEDOUT;
return FIBER_ETIME;
}
__ll_lock(cond);

2
lib_fiber/c/src/hook/epoll.c
View File

@ -652,7 +652,7 @@ int epoll_wait(int epfd, struct epoll_event *events, int maxevents, int timeout)
now = event_get_stamp(ev);
if (ee->expire > 0 && now >= ee->expire) {
acl_fiber_set_error(FIBER_ETIMEDOUT);
acl_fiber_set_error(FIBER_ETIME);
break;
}
}

2
lib_fiber/c/src/hook/poll.c
View File

@ -385,7 +385,7 @@ int WINAPI acl_fiber_poll(struct pollfd *fds, nfds_t nfds, int timeout)
now = event_get_stamp(ev);
if (pe->expire > 0 && now >= pe->expire) {
acl_fiber_set_error(FIBER_ETIMEDOUT);
acl_fiber_set_error(FIBER_ETIME);
break;
}
}