mirror of https://github.com/F-Stack/f-stack.git
Add FF_THREAD_SOCKET in Makefile, Whether to use thread-level socket,
default enable.
This commit is contained in:
parent
865ab0ed63
commit
fe7e360eca
|
@ -8,15 +8,27 @@ ifneq ($(shell pkg-config --exists libdpdk && echo 0),0)
|
||||||
$(error "No installation of DPDK found, maybe you should export environment variable `PKG_CONFIG_PATH`")
|
$(error "No installation of DPDK found, maybe you should export environment variable `PKG_CONFIG_PATH`")
|
||||||
endif
|
endif
|
||||||
|
|
||||||
DEBUG=-O0 -gdwarf-2 -g3 -DDEBUG
|
DEBUG=-O0 -gdwarf-2 -g3
|
||||||
|
|
||||||
|
# Per thread separate initialization dpdk lib and attach sc when needed,
|
||||||
|
# such as listen same port in different threads, and socket can use in own thread.
|
||||||
|
# Default enable.
|
||||||
|
#
|
||||||
|
# If disable it, one socket can use in all threads.
|
||||||
|
FF_THREAD_SOCKET=1
|
||||||
|
|
||||||
PKGCONF ?= pkg-config
|
PKGCONF ?= pkg-config
|
||||||
|
|
||||||
ifndef DEBUG
|
ifndef DEBUG
|
||||||
CFLAGS+= -g -O2
|
CFLAGS+= -g -O2 -DNDEBUG
|
||||||
else
|
else
|
||||||
CFLAGS+= ${DEBUG}
|
CFLAGS+= ${DEBUG}
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
ifdef FF_THREAD_SOCKET
|
||||||
|
CFLAGS+= -DFF_THREAD_SOCKET
|
||||||
|
endif
|
||||||
|
|
||||||
CFLAGS += -fPIC -Wall -Werror $(shell $(PKGCONF) --cflags libdpdk)
|
CFLAGS += -fPIC -Wall -Werror $(shell $(PKGCONF) --cflags libdpdk)
|
||||||
|
|
||||||
INCLUDES= -I. -I${FF_PATH}/lib
|
INCLUDES= -I. -I${FF_PATH}/lib
|
||||||
|
|
|
@ -95,9 +95,19 @@
|
||||||
return ret; \
|
return ret; \
|
||||||
} while (0)
|
} while (0)
|
||||||
|
|
||||||
/* per thread separate initialization dpdk lib and attach sc */
|
/*
|
||||||
static __thread int inited = 0;
|
* Per thread separate initialization dpdk lib and attach sc when needed,
|
||||||
static __thread struct ff_so_context *sc;
|
* such as listen same port in different threads, and socket can use in own thread.
|
||||||
|
*
|
||||||
|
* Otherwise, one socket can use in all threads.
|
||||||
|
*/
|
||||||
|
#ifdef FF_THREAD_SOCKET
|
||||||
|
#define __FF_THREAD __thread
|
||||||
|
#else
|
||||||
|
#define __FF_THREAD
|
||||||
|
#endif
|
||||||
|
static __FF_THREAD int inited = 0;
|
||||||
|
static __FF_THREAD struct ff_so_context *sc;
|
||||||
|
|
||||||
/* process-level initialization flag */
|
/* process-level initialization flag */
|
||||||
static int proc_inited = 0;
|
static int proc_inited = 0;
|
||||||
|
|
|
@ -10,10 +10,10 @@
|
||||||
printf("file:%s, line:%u, fun:%s, "fmt, __FILE__, __LINE__, __func__, ##__VA_ARGS__); \
|
printf("file:%s, line:%u, fun:%s, "fmt, __FILE__, __LINE__, __func__, ##__VA_ARGS__); \
|
||||||
} while (0)
|
} while (0)
|
||||||
|
|
||||||
#ifdef DEBUG
|
#ifdef NDEBUG
|
||||||
#define DEBUG_LOG ERR_LOG
|
|
||||||
#else
|
|
||||||
#define DEBUG_LOG(...)
|
#define DEBUG_LOG(...)
|
||||||
|
#else
|
||||||
|
#define DEBUG_LOG ERR_LOG
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
enum FF_SOCKET_OPS {
|
enum FF_SOCKET_OPS {
|
||||||
|
|
Loading…
Reference in New Issue