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 SNPRINTF macro for multiple platforms.

Browse Source
This commit is contained in:
zhengshuxin 2023-01-11 00:24:44 +08:00
parent e4b0b89bf4
commit fb02991e32
4 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -44,12 +44,6 @@ struct EPOLL {
/****************************************************************************/
#ifdef SYS_WIN
# define SNPRINTF _snprintf
#else
# define SNPRINTF snprintf
#endif
static void epoll_event_free(EPOLL_EVENT *ee)
{
mem_free(ee);

2
lib_fiber/c/src/stdafx.h
View File

@ -6,9 +6,11 @@
#if defined(_WIN32) || defined(_WIN64)
# define LIKELY
# define UNLIKELY
# define SNPRINTF _snprintf
#else
# define LIKELY(x) __builtin_expect(!!(x), 1)
# define UNLIKELY(x) __builtin_expect(!!(x), 0)
# define SNPRINTF snprintf
#endif
#ifndef _GNU_SOURCE

14
lib_fiber/c/src/sync/fiber_mutex.c
View File

@ -114,7 +114,7 @@ static MUTEX_OWNER *create_owner(MUTEX_CHECK *check, ACL_FIBER_MUTEX *mutex)
array_append(owner->holding, mutex);
snprintf(owner->hkey, sizeof(owner->hkey), "%ld", owner->owner);
SNPRINTF(owner->hkey, sizeof(owner->hkey), "%ld", owner->owner);
htable_enter(check->owners, owner->hkey, owner);
return owner;
}
@ -130,7 +130,7 @@ static MUTEX_OWNER *find_owner(MUTEX_CHECK *check, ACL_FIBER_MUTEX *mutex)
MUTEX_OWNER *owner;
char hkey[64];
snprintf(hkey, sizeof(hkey), "%ld", mutex->owner);
SNPRINTF(hkey, sizeof(hkey), "%ld", mutex->owner);
owner = (MUTEX_OWNER*) htable_find(check->owners, hkey);
return owner;
}
@ -151,7 +151,7 @@ static MUTEX_WAITER *create_waiter(MUTEX_CHECK *check, ACL_FIBER_MUTEX *mutex)
{
MUTEX_WAITER *waiter = (MUTEX_WAITER*) mem_malloc(sizeof(MUTEX_WAITER));
snprintf(waiter->hkey, sizeof(waiter->hkey), "%p", mutex);
SNPRINTF(waiter->hkey, sizeof(waiter->hkey), "%p", mutex);
waiter->waiters = array_create(10, ARRAY_F_UNORDER);
htable_enter(check->waiters, waiter->hkey, waiter);
return waiter;
@ -167,7 +167,7 @@ static MUTEX_WAITER *find_waiter(MUTEX_CHECK *check, ACL_FIBER_MUTEX *mutex)
{
char hkey[64];
snprintf(hkey, sizeof(hkey), "%p", mutex);
SNPRINTF(hkey, sizeof(hkey), "%p", mutex);
return (MUTEX_WAITER*) htable_find(check->waiters, hkey);
}
@ -186,7 +186,7 @@ static void add_waiters(MUTEX_CHECK *check, ACL_FIBER_MUTEX *mutex)
MUTEX_OWNER *owner;
array_append(waiter->waiters, fiber);
snprintf(hkey, sizeof(hkey), "%d", acl_fiber_id(fiber));
SNPRINTF(hkey, sizeof(hkey), "%d", acl_fiber_id(fiber));
owner = (MUTEX_OWNER*) htable_find(check->owners, hkey);
if (owner) {
owner->waiting = mutex;
@ -253,10 +253,10 @@ static ACL_FIBER_MUTEX_STATS *check_deadlock2(MUTEX_CHECK *check)
continue;
}
snprintf(hkey, sizeof(hkey), "%d", acl_fiber_id(owner->fiber));
SNPRINTF(hkey, sizeof(hkey), "%d", acl_fiber_id(owner->fiber));
htable_enter(table, hkey, owner);
snprintf(hkey, sizeof(hkey), "%d", acl_fiber_id(fiber));
SNPRINTF(hkey, sizeof(hkey), "%d", acl_fiber_id(fiber));
if (htable_find(table, hkey) != NULL) {
deadlocked = 1;
printf("DeadLock happened!\r\n");

2
lib_fiber/samples/dead_lock/main.c
View File

@ -69,6 +69,8 @@ static void fiber_check(ACL_FIBER *fb, void *ctx)
if (stats) {
acl_fiber_mutex_stats_show(stats);
acl_fiber_mutex_stats_free(stats);
} else {
printf("No deadlock happened!\r\n");
}
printf("===============================================\r\n");
}