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

Use syscall other dysym to avoid being blocked when use tcmalloc to debug app.

Browse Source
This commit is contained in:
zhengshuxin 2023-10-30 10:44:39 +08:00
parent 3b9fc38646
commit d4dfe8c7a6
2 changed files with 48 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib_fiber/c/Makefile
View File

@ -150,6 +150,13 @@ ifeq ($(findstring Linux, $(UNIXNAME)), Linux)
ifeq ($(debug_stack), yes) ifeq ($(debug_stack), yes)
CFLAGS += -DDEBUG_STACK CFLAGS += -DDEBUG_STACK
endif endif
ifeq ($(USE_TCMALLOC), yes)
CFLAGS += -DUSE_TCMALLOC
endif
ifeq ($(USE_TCMALLOC), YES)
CFLAGS += -DUSE_TCMALLOC
endif
endif endif
# For CYGWIN # For CYGWIN

45
lib_fiber/c/src/hook/io.c
View File

@ -1,4 +1,11 @@
#include "stdafx.h" #include "stdafx.h"
#if defined(SYS_UNIX) && defined(USE_TCMALLOC)
#include <unistd.h>
#include <sys/syscall.h>
#include <sys/types.h>
#endif
#include "common.h" #include "common.h"
#include "fiber.h" #include "fiber.h"
@ -39,24 +46,34 @@ int WINAPI acl_fiber_close(socket_t fd)
FILE_EVENT *fe; FILE_EVENT *fe;
EVENT *ev; EVENT *ev;
# ifndef USE_TCMALLOC
if (sys_close == NULL) { if (sys_close == NULL) {
hook_once(); hook_once();
if (sys_close == NULL) {
msg_error("%s: sys_close NULL", __FUNCTION__);
return -1;
}
} }
# endif
if (!var_hook_sys_api) { if (!var_hook_sys_api) {
# ifdef USE_TCMALLOC
return syscall(SYS_close, fd);
# else
// In thread mode, we only need to free the fe, because // In thread mode, we only need to free the fe, because
// no fiber was bound with the fe. // no fiber was bound with the fe.
fe = fiber_file_get(fd); fe = fiber_file_get(fd);
if (fe) { if (fe) {
fiber_file_free(fe); fiber_file_free(fe);
} }
return (*sys_close)(fd); return (*sys_close)(fd);
# endif
} }
# ifdef USE_TCMALLOC
if (sys_close == NULL) {
hook_once();
}
# endif
if (IS_INVALID(fd)) { if (IS_INVALID(fd)) {
msg_error("%s(%d): invalid fd=%u", __FUNCTION__, __LINE__, fd); msg_error("%s(%d): invalid fd=%u", __FUNCTION__, __LINE__, fd);
return -1; return -1;
@ -131,6 +148,15 @@ ssize_t acl_fiber_read(socket_t fd, void *buf, size_t count)
return -1; return -1;
} }
# ifdef USE_TCMALLOC
if (!var_hook_sys_api) {
return syscall(SYS_read, fd, buf, count);
}
if (sys_read == NULL) {
hook_once();
}
# else
if (sys_read == NULL) { if (sys_read == NULL) {
hook_once(); hook_once();
} }
@ -138,6 +164,7 @@ ssize_t acl_fiber_read(socket_t fd, void *buf, size_t count)
if (!var_hook_sys_api) { if (!var_hook_sys_api) {
return (*sys_read)(fd, buf, count); return (*sys_read)(fd, buf, count);
} }
# endif
fe = fiber_file_open(fd); fe = fiber_file_open(fd);
return fiber_read(fe, buf, count); return fiber_read(fe, buf, count);
@ -293,6 +320,15 @@ ssize_t acl_fiber_write(socket_t fd, const void *buf, size_t count)
return -1; return -1;
} }
# ifdef USE_TCMALLOC
if (!var_hook_sys_api) {
return syscall(SYS_write, fd, buf, count);
}
if (sys_write == NULL) {
hook_once();
}
# else
if (sys_write == NULL) { if (sys_write == NULL) {
hook_once(); hook_once();
} }
@ -300,6 +336,7 @@ ssize_t acl_fiber_write(socket_t fd, const void *buf, size_t count)
if (!var_hook_sys_api) { if (!var_hook_sys_api) {
return (*sys_write)(fd, buf, count); return (*sys_write)(fd, buf, count);
} }
# endif
fe = fiber_file_open(fd); fe = fiber_file_open(fd);
return fiber_write(fe, buf, count); return fiber_write(fe, buf, count);