Adapt nginx-1.28.0 to f-stack

Author: jinliu777

app/nginx-1.28.0/auto/cc/gcc

@@ -49,8 +49,8 @@ esac
 # optimizations
 
 #NGX_GCC_OPT="-O2"
-#NGX_GCC_OPT="-Os"
-NGX_GCC_OPT="-O"
+NGX_GCC_OPT="-Os"
+#NGX_GCC_OPT="-O"
 
 #CFLAGS="$CFLAGS -fomit-frame-pointer"
 

app/nginx-1.28.0/auto/install

@@ -148,6 +148,9 @@ install:	build $NGX_INSTALL_PERL_MODULES
 		|| cp conf/nginx.conf '\$(DESTDIR)$NGX_CONF_PATH'
 	cp conf/nginx.conf '\$(DESTDIR)$NGX_CONF_PREFIX/nginx.conf.default'
 
+	test -f '\$(DESTDIR)$NGX_CONF_PREFIX/f-stack.conf' \\
+		|| cp conf/f-stack.conf '\$(DESTDIR)$NGX_CONF_PREFIX'
+
 	test -d '\$(DESTDIR)`dirname "$NGX_PID_PATH"`' \\
 		|| mkdir -p '\$(DESTDIR)`dirname "$NGX_PID_PATH"`'
 

app/nginx-1.28.0/auto/make

@@ -19,13 +19,29 @@ ngx_objs_dir=$NGX_OBJS$ngx_regex_dirsep
 ngx_use_pch=`echo $NGX_USE_PCH | sed -e "s/\//$ngx_regex_dirsep/g"`
 
 
+if [ ! $FF_PATH ]; then
+    FF_PATH=/usr/local
+    echo "FF_PATH environment variable not defined, default FF_PATH=$FF_PATH"
+fi
+
+if [ ! $(pkg-config --exists libdpdk && echo 1) ]; then
+    echo "error: no installation of DPDK found, maybe you shuld export environment variable \`PKG_CONFIG_PATH\`"
+    exit 1
+fi
+
+CORE_LIBS="$CORE_LIBS \$(shell pkg-config --static --libs libdpdk)"
+CORE_LIBS="$CORE_LIBS -L$FF_PATH/lib -Wl,--whole-archive,-lfstack,--no-whole-archive"
+CORE_LIBS="$CORE_LIBS -Wl,--no-whole-archive -lrt -lm -ldl -lcrypto -lpthread -lnuma"
+
 cat << END                                                     > $NGX_MAKEFILE
 
 CC =	$CC
 CFLAGS = $CFLAGS
 CPP =	$CPP
 LINK =	$LINK
 
+CFLAGS += -I$FF_PATH/lib
+
 END
 
 

app/nginx-1.28.0/auto/modules

@@ -55,6 +55,13 @@ if [ $NGX_TEST_BUILD_SOLARIS_SENDFILEV = YES ]; then
     CORE_SRCS="$CORE_SRCS $SOLARIS_SENDFILEV_SRCS"
 fi
 
+if [ $USE_FSTACK = YES ]; then
+    have=NGX_HAVE_FSTACK . auto/have
+    have=NGX_HAVE_FSTACK . auto/have_headers
+    have=SOCK_FSTACK value=0x1000 . auto/define
+    CORE_SRCS="$CORE_SRCS $KQUEUE_SRCS"
+    EVENT_MODULES="$EVENT_MODULES $KQUEUE_MODULE"
+fi
 
 if [ $HTTP = YES ]; then
     HTTP_MODULES=

app/nginx-1.28.0/auto/options

@@ -179,6 +179,8 @@ NGX_CPU_CACHE_LINE=
 
 NGX_POST_CONF_MSG=
 
+USE_FSTACK=NO
+
 opt=
 
 for option
@@ -214,6 +216,8 @@ do
         --with-poll_module)              EVENT_POLL=YES             ;;
         --without-poll_module)           EVENT_POLL=NONE            ;;
 
+        --with-ff_module)                USE_FSTACK=YES             ;;
+
         --with-threads)                  USE_THREADS=YES            ;;
 
         --with-file-aio)                 NGX_FILE_AIO=YES           ;;
@@ -450,6 +454,8 @@ cat << END
   --with-poll_module                 enable poll module
   --without-poll_module              disable poll module
 
+  --with-ff_module                   enable F-Stack module
+
   --with-threads                     enable thread pool support
 
   --with-file-aio                    enable file AIO support

app/nginx-1.28.0/auto/os/linux

@@ -85,7 +85,7 @@ if [ $ngx_found = yes ]; then
                       ee.events = EPOLLIN|EPOLLEXCLUSIVE;
                       ee.data.ptr = NULL;
                       epoll_ctl(efd, EPOLL_CTL_ADD, fd, &ee)"
-    . auto/feature
+    #. auto/feature
 
 
     # eventfd()
@@ -251,16 +251,16 @@ ngx_feature_test="union bpf_attr attr = { 0 };
                   attr.map_type = BPF_MAP_TYPE_SOCKHASH;
 
                   syscall(__NR_bpf, 0, &attr, 0);"
-. auto/feature
-
-if [ $ngx_found = yes ]; then
-    CORE_SRCS="$CORE_SRCS src/core/ngx_bpf.c"
-    CORE_DEPS="$CORE_DEPS src/core/ngx_bpf.h"
-
-    if [ $QUIC_BPF != NONE ]; then
-        QUIC_BPF=YES
-    fi
-fi
+#. auto/feature
+#
+#if [ $ngx_found = yes ]; then
+#    CORE_SRCS="$CORE_SRCS src/core/ngx_bpf.c"
+#    CORE_DEPS="$CORE_DEPS src/core/ngx_bpf.h"
+#
+#    if [ $QUIC_BPF != NONE ]; then
+#        QUIC_BPF=YES
+#    fi
+#fi
 
 
 ngx_feature="SO_COOKIE"
@@ -273,11 +273,11 @@ ngx_feature_libs=
 ngx_feature_test="socklen_t optlen = sizeof(uint64_t);
                   uint64_t cookie;
                   getsockopt(0, SOL_SOCKET, SO_COOKIE, &cookie, &optlen)"
-. auto/feature
-
-if [ $ngx_found = yes ]; then
-    SO_COOKIE_FOUND=YES
-fi
+#. auto/feature
+#
+#if [ $ngx_found = yes ]; then
+#    SO_COOKIE_FOUND=YES
+#fi
 
 
 # UDP segmentation offloading
@@ -292,7 +292,7 @@ ngx_feature_libs=
 ngx_feature_test="socklen_t optlen = sizeof(int);
                   int val;
                   getsockopt(0, SOL_UDP, UDP_SEGMENT, &val, &optlen)"
-. auto/feature
+#. auto/feature
 
 
 CC_AUX_FLAGS="$cc_aux_flags -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64"

app/nginx-1.28.0/auto/sources

@@ -109,8 +109,8 @@ POLL_MODULE=ngx_poll_module
 POLL_SRCS=src/event/modules/ngx_poll_module.c
 WIN32_POLL_SRCS=src/event/modules/ngx_win32_poll_module.c
 
-KQUEUE_MODULE=ngx_kqueue_module
-KQUEUE_SRCS=src/event/modules/ngx_kqueue_module.c
+KQUEUE_MODULE="ngx_kqueue_module ngx_ff_host_event_module"
+KQUEUE_SRCS="src/event/modules/ngx_kqueue_module.c src/event/modules/ngx_ff_module.c src/event/modules/ngx_ff_host_event_module.c"
 
 DEVPOLL_MODULE=ngx_devpoll_module
 DEVPOLL_SRCS=src/event/modules/ngx_devpoll_module.c

app/nginx-1.28.0/auto/unix

@@ -403,7 +403,9 @@ ngx_feature_incs="#include <sys/socket.h>
 ngx_feature_path=
 ngx_feature_libs=
 ngx_feature_test="setsockopt(0, IPPROTO_IP, IP_RECVDSTADDR, NULL, 0)"
-. auto/feature
+#. auto/feature
+have=NGX_HAVE_IP_RECVDSTADDR . auto/have
+have=IP_RECVDSTADDR value=7 . auto/define
 
 
 # BSD way to set IPv4 datagram source address
@@ -416,7 +418,9 @@ ngx_feature_incs="#include <sys/socket.h>
 ngx_feature_path=
 ngx_feature_libs=
 ngx_feature_test="setsockopt(0, IPPROTO_IP, IP_SENDSRCADDR, NULL, 0)"
-. auto/feature
+#. auto/feature
+have=NGX_HAVE_IP_SENDSRCADDR . auto/have
+have=IP_SENDSRCADDR value=7 . auto/define
 
 
 # Linux way to get IPv4 datagram destination address
@@ -432,7 +436,7 @@ ngx_feature_test="struct in_pktinfo  pkt;
                   pkt.ipi_spec_dst.s_addr = INADDR_ANY;
                   (void) pkt;
                   setsockopt(0, IPPROTO_IP, IP_PKTINFO, NULL, 0)"
-. auto/feature
+#. auto/feature
 
 
 # RFC 3542 way to get IPv6 datagram destination address
@@ -459,7 +463,7 @@ ngx_feature_path=
 ngx_feature_libs=
 ngx_feature_test="(void) IP_PMTUDISC_DO;
                   setsockopt(0, IPPROTO_IP, IP_MTU_DISCOVER, NULL, 0)"
-. auto/feature
+#. auto/feature
 
 
 ngx_feature="IPV6_MTU_DISCOVER"
@@ -471,7 +475,7 @@ ngx_feature_path=
 ngx_feature_libs=
 ngx_feature_test="(void) IPV6_PMTUDISC_DO;
                   setsockopt(0, IPPROTO_IPV6, IPV6_MTU_DISCOVER, NULL, 0)"
-. auto/feature
+#. auto/feature
 
 
 ngx_feature="IP_DONTFRAG"
@@ -482,7 +486,9 @@ ngx_feature_incs="#include <sys/socket.h>
 ngx_feature_path=
 ngx_feature_libs=
 ngx_feature_test="setsockopt(0, IPPROTO_IP, IP_DONTFRAG, NULL, 0)"
-. auto/feature
+#. auto/feature
+have=NGX_HAVE_IP_DONTFRAG . auto/have
+have=IP_DONTFRAG value=67 . auto/define
 
 
 ngx_feature="IPV6_DONTFRAG"
@@ -493,7 +499,9 @@ ngx_feature_incs="#include <sys/socket.h>
 ngx_feature_path=
 ngx_feature_libs=
 ngx_feature_test="setsockopt(0, IPPROTO_IP, IPV6_DONTFRAG, NULL, 0)"
-. auto/feature
+#. auto/feature
+have=NGX_HAVE_IPV6_DONTFRAG . auto/have
+have=IPV6_DONTFRAG value=62 . auto/define
 
 
 ngx_feature="TCP_DEFER_ACCEPT"
@@ -559,7 +567,7 @@ ngx_feature_incs="#include <sys/socket.h>"
 ngx_feature_path=
 ngx_feature_libs=
 ngx_feature_test="accept4(0, NULL, NULL, SOCK_NONBLOCK)"
-. auto/feature
+#. auto/feature
 
 if [ $NGX_FILE_AIO = YES ]; then