From f89d168fd507eb260721ac80510518811af50b22 Mon Sep 17 00:00:00 2001 From: radkesvat <134321679+radkesvat@users.noreply.github.com> Date: Tue, 17 Nov 2026 22:52:10 +0000 Subject: [PATCH] Fix hevent_set_cb for named callbacks --- Makefile | 1 + event/hloop.h | 2 +- scripts/unittest.sh | 1 + unittest/CMakeLists.txt | 5 +++++ unittest/hevent_set_cb_test.c | 11 +++++++++++ 5 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 unittest/hevent_set_cb_test.c diff --git a/Makefile b/Makefile index 34817430b..091075f82 100644 --- a/Makefile +++ b/Makefile @@ -384,6 +384,7 @@ unittest: prepare libhv $(CC) -g -Wall -O0 -std=c99 -I. -Ibase -o bin/rmdir_p unittest/rmdir_test.c base/hbase.c $(CC) -g -Wall -O0 -std=c99 -I. -Ibase -o bin/date unittest/date_test.c base/htime.c $(CC) -g -Wall -O0 -std=c99 -I. -Ibase -o bin/hlog_test unittest/hlog_test.c base/hlog.c + $(CC) -g -Wall -O0 -std=c99 -I. -Ibase -Issl -Ievent -o bin/hevent_set_cb_test unittest/hevent_set_cb_test.c $(CC) -g -Wall -O0 -std=c99 -I. -Ibase -o bin/hatomic_test unittest/hatomic_test.c -pthread $(CXX) -g -Wall -O0 -std=c++11 -I. -Ibase -o bin/hatomic_cpp_test unittest/hatomic_test.cpp -pthread $(CXX) -g -Wall -O0 -std=c++11 -I. -Ibase -o bin/hthread_test unittest/hthread_test.cpp -pthread diff --git a/event/hloop.h b/event/hloop.h index b074d8ab5..53094afb2 100644 --- a/event/hloop.h +++ b/event/hloop.h @@ -86,7 +86,7 @@ struct hevent_s { }; #define hevent_set_id(ev, id) ((hevent_t*)(ev))->event_id = id -#define hevent_set_cb(ev, cb) ((hevent_t*)(ev))->cb = cb +#define hevent_set_cb(ev, callback) ((hevent_t*)(ev))->cb = (callback) #define hevent_set_priority(ev, prio) ((hevent_t*)(ev))->priority = prio #define hevent_set_userdata(ev, udata) ((hevent_t*)(ev))->userdata = (void*)udata diff --git a/scripts/unittest.sh b/scripts/unittest.sh index ca1046e8d..c5a63e5f6 100755 --- a/scripts/unittest.sh +++ b/scripts/unittest.sh @@ -14,6 +14,7 @@ bin/mkdir_p 123/456 bin/ls bin/rmdir_p 123/456 bin/hlog_test +bin/hevent_set_cb_test || exit $? bin/base64 bin/md5 diff --git a/unittest/CMakeLists.txt b/unittest/CMakeLists.txt index 6e17408b3..02e312089 100644 --- a/unittest/CMakeLists.txt +++ b/unittest/CMakeLists.txt @@ -72,6 +72,10 @@ add_executable(objectpool_test objectpool_test.cpp) target_include_directories(objectpool_test PRIVATE .. ../base ../cpputil) target_link_libraries(objectpool_test -lpthread) +# ------event: public callback setter------ +add_executable(hevent_set_cb_test hevent_set_cb_test.c) +target_include_directories(hevent_set_cb_test PRIVATE .. ../base ../ssl ../event) + # ------protocol------ add_executable(nslookup nslookup_test.c ../protocol/dns.c ../base/hsocket.c ../base/htime.c) target_include_directories(nslookup PRIVATE .. ../base ../protocol) @@ -214,6 +218,7 @@ add_custom_target(unittest DEPENDS mkdir_p rmdir_p date + hevent_set_cb_test hatomic_test hthread_test hmutex_test diff --git a/unittest/hevent_set_cb_test.c b/unittest/hevent_set_cb_test.c new file mode 100644 index 000000000..702e468ae --- /dev/null +++ b/unittest/hevent_set_cb_test.c @@ -0,0 +1,11 @@ +#include "hloop.h" + +static void on_ready(hevent_t *ev) { + (void)ev; +} + +int main(void) { + hevent_t ev = {0}; + hevent_set_cb(&ev, on_ready); + return hevent_cb(&ev) != on_ready; +}