From 1c388a5257b0e83da65c6804c7dc00b391c1b446 Mon Sep 17 00:00:00 2001
From: logwang <logwang@tencent.com>
Date: Mon, 25 Sep 2017 12:03:26 +0800
Subject: [PATCH] Update f-stack.conf of nginx.

Close #81.
---
 app/nginx-1.11.10/conf/f-stack.conf | 29 +++++++++++++++++++++--------
 1 file changed, 21 insertions(+), 8 deletions(-)

diff --git a/app/nginx-1.11.10/conf/f-stack.conf b/app/nginx-1.11.10/conf/f-stack.conf
index cb649f49..15163164 100644
--- a/app/nginx-1.11.10/conf/f-stack.conf
+++ b/app/nginx-1.11.10/conf/f-stack.conf
@@ -1,12 +1,7 @@
 [dpdk]
 ## Hexadecimal bitmask of cores to run on.
 lcore_mask=1
-## Port mask, enable and disable ports.
-## Default: all ports are enabled.
-#port_mask=1
 channel=4
-## Number of ports.
-nb_ports=1
 promiscuous=1
 numa_on=1
 ## TCP segment offload, default: disabled.
@@ -14,6 +9,20 @@ tso=0
 ## HW vlan strip, default: enabled.
 vlan_strip=1
 
+# enabled port list
+#
+# EBNF grammar:
+#
+#    exp      ::= num_list {"," num_list}
+#    num_list ::= <num> | <range>
+#    range    ::= <num>"-"<num>
+#    num      ::= '0' | '1' | '2' | '3' | '4' | '5' | '6' | '7' | '8' | '9'
+#
+# examples
+#    1-3       ports 1,2,3 are enabled
+#    1-3,4,7   ports 1,2,3,4,7 are enabled
+port_list=0
+
 ## Port config section
 ## According to dpdk.nb_ports: port0, port1...
 [port0]
@@ -21,6 +30,11 @@ addr=192.168.1.2
 netmask=255.255.255.0
 broadcast=192.168.1.255
 gateway=192.168.1.1
+# lcore list used to handle this port
+# the format is same as port_list
+
+# lcore_list= 0
+
 ## Packet capture path, this will hurt performance
 #pcap=./a.pcap
 
@@ -59,15 +73,14 @@ net.inet.tcp.fast_finwait2_recycle=1
 net.inet.tcp.sendspace=16384
 net.inet.tcp.recvspace=8192
 net.inet.tcp.nolocaltimewait=1
-net.inet.tcp.cc.algorithm=htcp
+net.inet.tcp.cc.algorithm=cubic
 net.inet.tcp.sendbuf_max=16777216
 net.inet.tcp.recvbuf_max=16777216
 net.inet.tcp.sendbuf_auto=1
 net.inet.tcp.recvbuf_auto=1
 net.inet.tcp.sendbuf_inc=16384
 net.inet.tcp.recvbuf_inc=524288
-net.inet.tcp.inflight.enable=0
-net.inet.tcp.sack=1
+net.inet.tcp.sack.enable=1
 net.inet.tcp.blackhole=1
 net.inet.tcp.msl=2000
 net.inet.tcp.delayed_ack=0