Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

check struct timeout_cb when defined TIMEOUT_CB_OVERRIDE #25

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,20 @@ LUA_APIS = 5.1 5.2 5.3
include $(top_srcdir)/lua/Rules.mk
include $(top_srcdir)/bench/Rules.mk

all: test-timeout
all: check-timeout-cb test-timeout

check-timeout-cb:
@echo $(CFLAGS) $(CPPFLAGS) | grep "\-DTIMEOUT_CB_OVERRIDE" > /dev/null \
&& NEED_OVERRIDE=1 || NEED_OVERRIDE=0;\
if [[ "$${NEED_OVERRIDE}" -eq "1" ]];then \
TEMPOUT=`mktemp /tmp/timeout-out.XXXXXX`; \
TEMPCHK=`mktemp /tmp/timeout-chk.XXXXXX`; \
printf "#include \"timeout_cb.h\"\nint main(){struct timeout_cb cb;return 0;}" > $${TEMPCHK}.c; \
$(CC) -o $${TEMPOUT} $${TEMPCHK}.c $(ALL_CPPFLAGS) 2> /dev/null && HAS_TIMEOUT_CB=1 || HAS_TIMEOUT_CB=0; \
$(RM) /tmp/timeout-out.* /tmp/timeout-chk.*; \
if [[ "$${HAS_TIMEOUT_CB}" -eq "0" ]];then echo "Error: Can not find 'timeout_cb.h' or have not defined \
struct timeout_cb. If you have defined the macro TIMEOUT_CB_OVERRIDE, please create 'timeout_cb.h' and \
define your own struct timeout_cb in it." && exit 1; fi fi

timeout.o: $(top_srcdir)/timeout.c
test-timeout.o: $(top_srcdir)/test-timeout.c
Expand Down
4 changes: 3 additions & 1 deletion timeout.h
Original file line number Diff line number Diff line change
Expand Up @@ -90,9 +90,11 @@ typedef uint64_t timeout_t;

#ifndef TIMEOUT_CB_OVERRIDE
struct timeout_cb {
void (*fn)();
void (*fn)(void);
void *arg;
}; /* struct timeout_cb */
#else
#include "timeout_cb.h"
#endif

/*
Expand Down
5 changes: 5 additions & 0 deletions timeout_cb.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
/* Customize your own timeout callback here */
struct timeout_cb {
void (*fn)(void);
void *arg;
};