Merge pull request #5 from intel-go/develop

Release 0.7.3

Dockerfile

@@ -7,7 +7,7 @@ FROM ${USER_NAME}/nff-go-base
 
 LABEL RUN docker run -it --privileged -v /sys/bus/pci/drivers:/sys/bus/pci/drivers -v /sys/kernel/mm/hugepages:/sys/kernel/mm/hugepages -v /sys/devices/system/node:/sys/devices/system/node -v /dev:/dev --name NAME -e NAME=NAME -e IMAGE=IMAGE IMAGE
 
-RUN dnf -y install procps-ng iputils httpd wget; dnf clean all
+RUN apt-get install -y procps iproute2 iputils-ping net-tools apache2 wget; apt-get clean
 RUN dd if=/dev/zero of=/var/www/html/10k.bin bs=1 count=10240
 RUN dd if=/dev/zero of=/var/www/html/100k.bin bs=1 count=102400
 RUN dd if=/dev/zero of=/var/www/html/1m.bin bs=1 count=1048576

Makefile

@@ -26,7 +26,7 @@ httpperfserv:
 
 .PHONY: wrk
 wrk:
- $(MAKE) -C test/wrk
+ $(MAKE) -s -C test/wrk
 
 .PHONY: clean
 clean:

env.sh

@@ -7,7 +7,11 @@ then
 fi
 
 export RTE_TARGET=x86_64-native-linuxapp-gcc
-export RTE_SDK="${NFF_GO}"/dpdk/dpdk
+
+DPDK_DIR=dpdk
+DPDK_INSTALL_DIR=${RTE_TARGET}-install
+export RTE_SDK="${NFF_GO}"/dpdk/${DPDK_DIR}/${DPDK_INSTALL_DIR}/usr/local/share/dpdk
+
 export CGO_LDFLAGS_ALLOW='-Wl,--((no-)?whole-archive|((start|end)-group))'
 export CGO_CFLAGS="-I${RTE_SDK}/${RTE_TARGET}/include -O3 -std=gnu11 -m64 -pthread -march=native -mno-fsgsbase -mno-f16c -DRTE_MACHINE_CPUFLAG_SSE -DRTE_MACHINE_CPUFLAG_SSE2 -DRTE_MACHINE_CPUFLAG_SSE3 -DRTE_MACHINE_CPUFLAG_SSSE3 -DRTE_MACHINE_CPUFLAG_SSE4_1 -DRTE_MACHINE_CPUFLAG_SSE4_2 -DRTE_MACHINE_CPUFLAG_PCLMULQDQ -DRTE_MACHINE_CPUFLAG_RDRAND -DRTE_MACHINE_CPUFLAG_F16C -include rte_config.h -Wno-deprecated-declarations"
 export CGO_LDFLAGS="-L${RTE_SDK}/${RTE_TARGET}/lib -Wl,--no-as-needed -Wl,-export-dynamic"

go.mod

@@ -1,24 +1,64 @@
 module github.com/intel-go/nff-go-nat
 
 require (
- cloud.google.com/go v0.33.1 // indirect
- github.com/docker/distribution v2.7.0+incompatible // indirect
- github.com/golang/lint v0.0.0-20181026193005-c67002cb31c3 // indirect
+ cloud.google.com/go v0.35.1 // indirect
+ dmitri.shuralyov.com/app/changes v0.0.0-20181114035150-5af16e21babb // indirect
+ dmitri.shuralyov.com/service/change v0.0.0-20190130035545-6cc139383561 // indirect
+ git.apache.org/thrift.git v0.12.0 // indirect
+ github.com/Shopify/sarama v1.20.1 // indirect
+ github.com/coreos/go-systemd v0.0.0-20181031085051-9002847aa142 // indirect
+ github.com/docker/distribution v2.7.1+incompatible // indirect
+ github.com/go-logfmt/logfmt v0.4.0 // indirect
+ github.com/gogo/protobuf v1.2.0 // indirect
+ github.com/golang/lint v0.0.0-20181217174547-8f45f776aaf1 // indirect
  github.com/golang/protobuf v1.2.0
  github.com/google/gopacket v1.1.16-0.20181023151400-a35e09f9f224
+ github.com/google/pprof v0.0.0-20190109223431-e84dfd68c163 // indirect
+ github.com/googleapis/gax-go v2.0.2+incompatible // indirect
  github.com/gopherjs/gopherjs v0.0.0-20181103185306-d547d1d9531e // indirect
- github.com/intel-go/nff-go v0.7.1
- github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d // indirect
+ github.com/gorilla/mux v1.7.0 // indirect
+ github.com/gregjones/httpcache v0.0.0-20181110185634-c63ab54fda8f // indirect
+ github.com/grpc-ecosystem/grpc-gateway v1.7.0 // indirect
+ github.com/intel-go/nff-go v0.7.3
+ github.com/microcosm-cc/bluemonday v1.0.2 // indirect
+ github.com/nsf/gocode v0.0.0-20181120081338-6cac7c69a41e // indirect
+ github.com/openzipkin/zipkin-go v0.1.5 // indirect
+ github.com/pkg/errors v0.8.1 // indirect
+ github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90 // indirect
+ github.com/prometheus/common v0.2.0 // indirect
+ github.com/prometheus/procfs v0.0.0-20190129233650-316cf8ccfec5 // indirect
+ github.com/russross/blackfriday v2.0.0+incompatible // indirect
+ github.com/shurcooL/go v0.0.0-20190121191506-3fef8c783dec // indirect
+ github.com/shurcooL/gofontwoff v0.0.0-20181114050219-180f79e6909d // indirect
+ github.com/shurcooL/highlight_diff v0.0.0-20181222201841-111da2e7d480 // indirect
+ github.com/shurcooL/highlight_go v0.0.0-20181215221002-9d8641ddf2e1 // indirect
+ github.com/shurcooL/home v0.0.0-20190127175526-fdd6870b8ab8 // indirect
+ github.com/shurcooL/htmlg v0.0.0-20190120222857-1e8a37b806f3 // indirect
+ github.com/shurcooL/httpfs v0.0.0-20181222201310-74dc9339e414 // indirect
+ github.com/shurcooL/issues v0.0.0-20190120000219-08d8dadf8acb // indirect
+ github.com/shurcooL/issuesapp v0.0.0-20181229001453-b8198a402c58 // indirect
+ github.com/shurcooL/notifications v0.0.0-20181111060504-bcc2b3082a7a // indirect
+ github.com/shurcooL/octicon v0.0.0-20181222203144-9ff1a4cf27f4 // indirect
+ github.com/shurcooL/reactions v0.0.0-20181222204718-145cd5e7f3d1 // indirect
+ github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect
+ github.com/shurcooL/webdavfs v0.0.0-20181215192745-5988b2d638f6 // indirect
+ github.com/sirupsen/logrus v1.3.0 // indirect
+ github.com/smartystreets/assertions v0.0.0-20190116191733-b6c0e53d7304 // indirect
  github.com/smartystreets/goconvey v0.0.0-20181108003508-044398e4856c // indirect
+ github.com/stretchr/testify v1.3.0 // indirect
  github.com/vishvananda/netlink v1.0.0
- golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3 // indirect
- golang.org/x/net v0.0.0-20181207154023-610586996380
- golang.org/x/oauth2 v0.0.0-20181120190819-8f65e3013eba // indirect
- golang.org/x/sync v0.0.0-20181108010431-42b317875d0f // indirect
- golang.org/x/sys v0.0.0-20181212120007-b05ddf57801d // indirect
- golang.org/x/tools v0.0.0-20181212200058-49db546f375e // indirect
- google.golang.org/appengine v1.3.0 // indirect
- google.golang.org/genproto v0.0.0-20181127195345-31ac5d88444a // indirect
- google.golang.org/grpc v1.16.0
- honnef.co/go/tools v0.0.0-20180920025451-e3ad64cb4ed3 // indirect
+ go.opencensus.io v0.19.0 // indirect
+ go4.org v0.0.0-20181109185143-00e24f1b2599 // indirect
+ golang.org/x/build v0.0.0-20190130154758-d2e98d5e1bc8 // indirect
+ golang.org/x/crypto v0.0.0-20190130090550-b01c7a725664 // indirect
+ golang.org/x/exp v0.0.0-20190125153040-c74c464bbbf2 // indirect
+ golang.org/x/net v0.0.0-20190125091013-d26f9f9a57f3
+ golang.org/x/oauth2 v0.0.0-20190130055435-99b60b757ec1 // indirect
+ golang.org/x/perf v0.0.0-20190124201629-844a5f5b46f4 // indirect
+ golang.org/x/sys v0.0.0-20190130150945-aca44879d564 // indirect
+ golang.org/x/tools v0.0.0-20190130190128-9bdeaddf5f7f // indirect
+ google.golang.org/genproto v0.0.0-20190128161407-8ac453e89fca // indirect
+ google.golang.org/grpc v1.18.0
+ honnef.co/go/tools v0.0.0-20190128043916-71123fcbb8fe // indirect
+ sourcegraph.com/sqs/pbtypes v1.0.0 // indirect
 )