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

IOEventCallback: change event type from short to int

use_iouring
YuQing 2025-10-05 16:53:21 +08:00
parent 3dcc1c570d
commit 68079fc468
2 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/sf_nio.c
View File

@ -41,8 +41,8 @@
#include "sf_service.h" #include "sf_service.h"
#include "sf_nio.h" #include "sf_nio.h"
static int sf_client_sock_write(int sock, short event, void *arg); static int sf_client_sock_write(int sock, const int event, void *arg);
static int sf_client_sock_read(int sock, short event, void *arg); static int sf_client_sock_read(int sock, const int event, void *arg);
void sf_set_parameters_ex(SFContext *sf_context, const int header_size, void sf_set_parameters_ex(SFContext *sf_context, const int header_size,
sf_set_body_length_callback set_body_length_func, sf_set_body_length_callback set_body_length_func,
@ -67,12 +67,14 @@ void sf_set_parameters_ex(SFContext *sf_context, const int header_size,
FC_URING_OP_TYPE(task) = IORING_OP_NOP; \ FC_URING_OP_TYPE(task) = IORING_OP_NOP; \
sf_release_task(task) sf_release_task(task)
static int sf_uring_cancel_done(int sock, short event, void *arg) static int sf_uring_cancel_done(int sock, const int event, void *arg)
{ {
struct fast_task_info *task; struct fast_task_info *task;
task = (struct fast_task_info *)arg; task = (struct fast_task_info *)arg;
CLEAR_OP_TYPE_AND_RELEASE_TASK(task); if (event != IOEVENT_TIMEOUT) {
CLEAR_OP_TYPE_AND_RELEASE_TASK(task);
}
return 0; return 0;
} }
#endif #endif
@ -269,16 +271,16 @@ static inline int set_read_event(struct fast_task_info *task)
int sf_set_read_event(struct fast_task_info *task) int sf_set_read_event(struct fast_task_info *task)
{ {
/* reset recv offset and length */
task->recv.ptr->offset = 0;
task->recv.ptr->length = 0;
#if IOEVENT_USE_URING #if IOEVENT_USE_URING
if (task->handler->use_io_uring) { if (task->handler->use_io_uring) {
return 0; return 0;
} }
#endif #endif
/* reset recv offset and length */
task->recv.ptr->offset = 0;
task->recv.ptr->length = 0;
task->nio_stages.current = SF_NIO_STAGE_RECV; task->nio_stages.current = SF_NIO_STAGE_RECV;
return set_read_event(task); return set_read_event(task);
} }
@ -323,7 +325,7 @@ int sf_socket_async_connect_check(struct fast_task_info *task)
return result; return result;
} }
static int sf_client_connect_done(int sock, short event, void *arg) static int sf_client_connect_done(int sock, const int event, void *arg)
{ {
int result; int result;
struct fast_task_info *task; struct fast_task_info *task;
@ -339,7 +341,7 @@ static int sf_client_connect_done(int sock, short event, void *arg)
return ENOTCONN; return ENOTCONN;
} }
if (event & IOEVENT_TIMEOUT) { if (event == IOEVENT_TIMEOUT) {
result = ETIMEDOUT; result = ETIMEDOUT;
} else { } else {
#if IOEVENT_USE_URING #if IOEVENT_USE_URING
@ -597,7 +599,7 @@ static inline void deal_notified_task(struct fast_task_info *task,
} }
} }
void sf_recv_notify_read(int fd, short event, void *arg) void sf_recv_notify_read(int fd, const int event, void *arg)
{ {
int64_t n; int64_t n;
int stage; int stage;
@ -672,7 +674,7 @@ int sf_send_add_event(struct fast_task_info *task)
} }
static inline int check_task(struct fast_task_info *task, static inline int check_task(struct fast_task_info *task,
const short event, const int expect_stage) const int event, const int expect_stage)
{ {
if (task->canceled) { if (task->canceled) {
return ENOTCONN; return ENOTCONN;
@ -1160,7 +1162,7 @@ int sf_rdma_busy_polling_callback(struct nio_thread_data *thread_data)
return 0; return 0;
} }
static int sf_client_sock_read(int sock, short event, void *arg) static int sf_client_sock_read(int sock, const int event, void *arg)
{ {
int result; int result;
int bytes; int bytes;
@ -1171,14 +1173,14 @@ static int sf_client_sock_read(int sock, short event, void *arg)
task = (struct fast_task_info *)arg; task = (struct fast_task_info *)arg;
if ((result=check_task(task, event, SF_NIO_STAGE_RECV)) != 0) { if ((result=check_task(task, event, SF_NIO_STAGE_RECV)) != 0) {
#if IOEVENT_USE_URING #if IOEVENT_USE_URING
if (task->handler->use_io_uring && (event != IOEVENT_TIMEOUT)) { if (task->handler->use_io_uring && event != IOEVENT_TIMEOUT) {
CLEAR_OP_TYPE_AND_RELEASE_TASK(task); CLEAR_OP_TYPE_AND_RELEASE_TASK(task);
} }
#endif #endif
return result >= 0 ? 0 : -1; return result >= 0 ? 0 : -1;
} }
if (event & IOEVENT_TIMEOUT) { if (event == IOEVENT_TIMEOUT) {
if (task->recv.ptr->offset == 0 && task->req_count > 0) { if (task->recv.ptr->offset == 0 && task->req_count > 0) {
if (SF_CTX->callbacks.task_timeout != NULL) { if (SF_CTX->callbacks.task_timeout != NULL) {
if (SF_CTX->callbacks.task_timeout(task) != 0) { if (SF_CTX->callbacks.task_timeout(task) != 0) {
@ -1262,7 +1264,7 @@ static int sf_client_sock_read(int sock, short event, void *arg)
return total_read; return total_read;
} }
static int sf_client_sock_write(int sock, short event, void *arg) static int sf_client_sock_write(int sock, const int event, void *arg)
{ {
int result; int result;
int bytes; int bytes;
@ -1276,14 +1278,14 @@ static int sf_client_sock_write(int sock, short event, void *arg)
task = (struct fast_task_info *)arg; task = (struct fast_task_info *)arg;
if ((result=check_task(task, event, SF_NIO_STAGE_SEND)) != 0) { if ((result=check_task(task, event, SF_NIO_STAGE_SEND)) != 0) {
#if IOEVENT_USE_URING #if IOEVENT_USE_URING
if (task->handler->use_io_uring && (event != IOEVENT_TIMEOUT)) { if (task->handler->use_io_uring && event != IOEVENT_TIMEOUT) {
CLEAR_OP_TYPE_AND_RELEASE_TASK(task); CLEAR_OP_TYPE_AND_RELEASE_TASK(task);
} }
#endif #endif
return result >= 0 ? 0 : -1; return result >= 0 ? 0 : -1;
} }
if (event & IOEVENT_TIMEOUT) { if (event == IOEVENT_TIMEOUT) {
logError("file: "__FILE__", line: %d, " logError("file: "__FILE__", line: %d, "
"client ip: %s, send timeout. total length: %d, offset: %d, " "client ip: %s, send timeout. total length: %d, offset: %d, "
"remain: %d", __LINE__, task->client_ip, task->send.ptr->length, "remain: %d", __LINE__, task->client_ip, task->send.ptr->length,

2
src/sf_nio.h
View File

@ -91,7 +91,7 @@ static inline void sf_nio_reset_task_length(struct fast_task_info *task)
} }
void sf_socket_close_connection(struct fast_task_info *task); void sf_socket_close_connection(struct fast_task_info *task);
void sf_recv_notify_read(int sock, short event, void *arg); void sf_recv_notify_read(int sock, const int event, void *arg);
int sf_send_add_event(struct fast_task_info *task); int sf_send_add_event(struct fast_task_info *task);
void sf_task_finish_clean_up(struct fast_task_info *task); void sf_task_finish_clean_up(struct fast_task_info *task);