modify vcl patch and remove ldp-lock patch

Signed-off-by: Xiaolong Jiang <xiaolongx.jiang@intel.com>
Change-Id: I4fe5f4dc2121d952bd0a4394afe0b18ce6f93516

4 files changed, 147 insertions, 74 deletions

diff --git a/configs/nginx-test.conf b/configs/nginx-test.conf
new file mode 100644
index 0000000..e67e8fa
--- /dev/null
+++ b/configs/nginx-test.conf
@@ -0,0 +1,80 @@
+#user  xxx;
+worker_processes 1;
+#worker_processes 2;
+#worker_processes 4;
+#worker_processes 8;
+
+master_process on;
+daemon off;
+
+worker_rlimit_nofile 10240;
+events {
+    use epoll;
+    worker_connections  10240;
+    accept_mutex       off;
+    multi_accept       off;
+}
+
+
+http {
+    access_log    off;
+    include       mime.types;
+    default_type  application/octet-stream;
+    sendfile        on;
+
+
+    ##RPS test
+    keepalive_timeout 300s;
+    keepalive_requests 1000000;
+
+    server {
+        listen 80;
+        root   html;
+        index  index.html index.htm;
+        location /return {
+                return 204;
+           }
+        location /64B.json {
+                return 200 '{"status":"success","result":"this is a 64Byte json file test!"}';
+           }
+        location /1KB.json{
+               return 201 '{"status":"success","result":"Hello from  NGINX, 1KB test!     \
+                           1xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx \
+                           2xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx \
+                           3xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx \
+                           4xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx \
+                           5xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx \
+                           6xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx \
+                           7xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx \
+                           8xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx \
+                           9xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx \
+                           0xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx \
+                           "}';
+           }
+        location /2KB.json{
+               return 202 '{"status":"success","result":"Hello from  NGINX, 2KB test!      \
+                           1xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx \
+                           2xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx \
+                           3xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx \
+                           4xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx \
+                           5xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx \
+                           6xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx \
+                           7xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx \
+                           8xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx \
+                           9xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx \
+                           0xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx \
+                           1xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx \
+                           2xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx \
+                           3xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx \
+                           4xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx \
+                           5xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx \
+                           6xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx \
+                           7xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx \
+                           8xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx \
+                           9xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx \
+                           0xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx \
+                           1xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx \
+                           "}';
+           }
+        }
+    }
diff --git a/configs/nginx.conf b/configs/nginx.conf
index d184b89..6770ea0 100644
--- a/configs/nginx.conf
+++ b/configs/nginx.conf
@@ -10,7 +10,6 @@ daemon off;
 worker_rlimit_nofile 10240;
 events {
     use epoll;
-    #epoll_events        512;
     worker_connections  10240;
     accept_mutex       off;
     multi_accept       off;
@@ -29,88 +28,53 @@ http {
     keepalive_requests 1000000;
 
     server {
-        listen 443;
-        #ssl_protocols TLSv1.2;
-        #ssl_prefer_server_ciphers on;
+        listen 80;
         root   html;
         index  index.html index.htm;
         location /return {
                 return 204;
            }
         location /64B.json {
-                return 200 '{"status":"success","result":"this is \
-                           a 64Byte json file test!"}';
-          }
+                return 200 '{"status":"success","result":"this is a 64Byte json file test!"}';
+           }
         location /1KB.json{
-               return 201 '{"status":"success","result":"\
-                           Nanchang, which was the capital of Yuzhang \
-                           Prefecture during the HanDynasty, \
-                           now falls under the jurisdiction of Hongzhou. \
-                           It straddles the borderof the \
-                           influence of the Ye and Zhen constellations , \
-                           and is adjacent to theHeng \
-                           and the Lu mountains . The three rivers enfold \
-                           it like the frontpart \
-                           of a garment and the five lakes encircle it \
-                           like a girdle. Itcontrols \
-                           the savage Jing area and connects Ou and Yue, \
-                           and itsproducts are \
-                           nature’s jewels. The radiance of its legendary \
-                           sword shootsdirectly upward \
-                           between the constellations Niu and Dou. \
-                           Its talented peopleare outstanding,\
-                           and the spirit of intelligence pervades the \
-                           place. This wasthe place where Xu \
-                           Ru spent the night on his visit to Chen Fan (10). \
-                           The mightyHongzhou spreads \
-                           out immensely amid the fog, and the intellectual \
-                           luminariesare as numerous as\
-                           meteors chasing one another. \
+               return 201 '{"status":"success","result":"Hello from  NGINX, 1KB test!     \
+                           1xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx \
+                           2xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx \
+                           3xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx \
+                           4xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx \
+                           5xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx \
+                           6xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx \
+                           7xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx \
+                           8xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx \
+                           9xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx \
+                           0xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx \
                            "}';
-          }
+           }
         location /2KB.json{
-               return 202 '{"status":"success","result":"\
-                           Hello from  NGINX, 2KB test\
-                           Nanchang, which was the capital of Yuzhang \
-                           Prefecture during the HanDynasty, \
-                           now falls under the jurisdiction of Hongzhou. \
-                           It straddles the borderof the \
-                           influence of the Ye and Zhen constellations , \
-                           and is adjacent to theHeng \
-                           and the Lu mountains . The three rivers enfold \
-                           it like the frontpart \
-                           of a garment and the five lakes encircle it \
-                           like a girdle. Itcontrols \
-                           the savage Jing area and connects Ou and Yue, \
-                           and itsproducts are \
-                           nature’s jewels. The radiance of its legendary \
-                           sword shootsdirectly upward \
-                           between the constellations Niu and Dou. \
-                           Its talented peopleare outstanding,\
-                           and the spirit of intelligence pervades \
-                           the place. This wasthe place where Xu \
-                           Ru spent the night on his visit to \
-                           Chen Fan (10). The mightyHongzhou spreads \
-                           out immensely amid the fog, and the intellectual \
-                           luminariesare as numerous as\
-                           meteors chasing one another.\
-                           of a garment and the five lakes encircle \
-                           it like a girdle. Itcontrols \
-                           the savage Jing area and connects \
-                           Ou and Yue, and itsproducts are \
-                           nature’s jewels. The radiance of its \
-                           legendary sword shootsdirectly upward \
-                           between the constellations Niu and Dou. \
-                           Its talented peopleare outstanding,\
-                           and the spirit of intelligence pervades \
-                           the place. This wasthe place where Xu \
-                           Ru spent the night on his visit to \
-                           Chen Fan (10). The mightyHongzhou spreads \
-                           out immensely amid the fog, and the \
-                           intellectual luminariesare as numerous as\
-                           meteors chasing one another. \
+               return 202 '{"status":"success","result":"Hello from  NGINX, 2KB test!      \
+                           1xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx \
+                           2xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx \
+                           3xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx \
+                           4xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx \
+                           5xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx \
+                           6xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx \
+                           7xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx \
+                           8xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx \
+                           9xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx \
+                           0xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx \
+                           1xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx \
+                           2xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx \
+                           3xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx \
+                           4xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx \
+                           5xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx \
+                           6xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx \
+                           7xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx \
+                           8xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx \
+                           9xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx \
+                           0xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx \
+                           1xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx \
                            "}';
-          }
-
+           }
         }
     }
diff --git a/configs/startup-test.conf b/configs/startup-test.conf
new file mode 100644
index 0000000..cf41cca
--- /dev/null
+++ b/configs/startup-test.conf
@@ -0,0 +1,28 @@
+unix {
+  interactive
+  log /tmp/vpp.log
+  full-coredump
+  cli-listen /run/vpp/cli.sock
+  exec /tmp/vppset-test
+}
+
+api-trace {
+  on
+}
+
+session { 
+	evt_qs_memfd_seg  
+}
+
+socksvr {
+  	default
+}
+
+cpu {
+	main-core 0
+        ##Start 4 VPP workers
+	#corelist-workers 1-4
+        ##start 1 VPP worker  
+        corelist-workers 1
+}
+
diff --git a/configs/vppset-test b/configs/vppset-test
new file mode 100644
index 0000000..082ac46
--- /dev/null
+++ b/configs/vppset-test
@@ -0,0 +1 @@
+set int state local0 up