From b77fef12a08d6d964e522eea6b2d846dfcc98b08 Mon Sep 17 00:00:00 2001 From: imarom Date: Mon, 26 Oct 2015 18:13:18 +0200 Subject: RPC control plane now integarted with DPDK --- linux_dpdk/ws_main.py | 1 - 1 file changed, 1 deletion(-) (limited to 'linux_dpdk') diff --git a/linux_dpdk/ws_main.py b/linux_dpdk/ws_main.py index 61a9d4f3..d54531f3 100755 --- a/linux_dpdk/ws_main.py +++ b/linux_dpdk/ws_main.py @@ -158,7 +158,6 @@ stateless_src = SrcGroup(dir='src/stateless/', 'cp/trex_stream_vm.cpp', 'cp/trex_stateless.cpp', 'cp/trex_stateless_port.cpp', - 'dp/trex_stateless_dp_core.cpp' ]) # JSON package json_src = SrcGroup(dir='external_libs/json', -- cgit From ea0b6efc3a41f425e46d81f4b6b8bbbf3238add1 Mon Sep 17 00:00:00 2001 From: imarom Date: Tue, 27 Oct 2015 19:25:03 +0200 Subject: working cont. stream on 1 core --- linux_dpdk/ws_main.py | 3 +++ 1 file changed, 3 insertions(+) (limited to 'linux_dpdk') diff --git a/linux_dpdk/ws_main.py b/linux_dpdk/ws_main.py index d54531f3..d8b1bc98 100755 --- a/linux_dpdk/ws_main.py +++ b/linux_dpdk/ws_main.py @@ -158,6 +158,8 @@ stateless_src = SrcGroup(dir='src/stateless/', 'cp/trex_stream_vm.cpp', 'cp/trex_stateless.cpp', 'cp/trex_stateless_port.cpp', + 'dp/trex_stateless_dp_core.cpp', + 'messaging/trex_stateless_messaging.cpp' ]) # JSON package json_src = SrcGroup(dir='external_libs/json', @@ -414,6 +416,7 @@ includes_path =''' ../src/pal/linux_dpdk/ ../src/rpc-server/ ../src/stateless/cp/ ../src/stateless/dp/ + ../src/stateless/messaging/ ../external_libs/yaml-cpp/include/ ../external_libs/zmq/include/ -- cgit From 788ba38b545be2f76f290f73b16cbfc37f4fa187 Mon Sep 17 00:00:00 2001 From: imarom Date: Wed, 28 Oct 2015 14:47:56 +0200 Subject: moved all stream compiling phase to a new file trex_streams_compiler.cpp --- linux_dpdk/ws_main.py | 1 + 1 file changed, 1 insertion(+) (limited to 'linux_dpdk') diff --git a/linux_dpdk/ws_main.py b/linux_dpdk/ws_main.py index d8b1bc98..3f3c0950 100755 --- a/linux_dpdk/ws_main.py +++ b/linux_dpdk/ws_main.py @@ -158,6 +158,7 @@ stateless_src = SrcGroup(dir='src/stateless/', 'cp/trex_stream_vm.cpp', 'cp/trex_stateless.cpp', 'cp/trex_stateless_port.cpp', + 'cp/trex_streams_compiler.cpp', 'dp/trex_stateless_dp_core.cpp', 'messaging/trex_stateless_messaging.cpp' ]) -- cgit From 67bcc46be09049d2ca65c0af2aa6a2fe0821eb04 Mon Sep 17 00:00:00 2001 From: imarom Date: Mon, 9 Nov 2015 10:40:11 +0200 Subject: DPDK target is now built with -Wall -Werror (with few expections) on both Fedora 18 and Ubunutu --- linux_dpdk/ws_main.py | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'linux_dpdk') diff --git a/linux_dpdk/ws_main.py b/linux_dpdk/ws_main.py index 3f3c0950..c8cbb38a 100755 --- a/linux_dpdk/ws_main.py +++ b/linux_dpdk/ws_main.py @@ -582,6 +582,12 @@ class build_option: # support c++ 2011 flags += ['-std=c++0x'] + flags += ['-Wall', + '-Werror', + '-Wno-literal-suffix', + '-Wno-sign-compare', + '-Wno-strict-aliasing'] + return (flags) def get_c_flags (self): -- cgit From eca85af498f908da17f8595b2ec9c683ed9f68fa Mon Sep 17 00:00:00 2001 From: Hanoh Haim Date: Fri, 13 Nov 2015 09:42:32 +0200 Subject: v1.79 --- linux_dpdk/ws_main.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'linux_dpdk') diff --git a/linux_dpdk/ws_main.py b/linux_dpdk/ws_main.py index c8cbb38a..6591a241 100755 --- a/linux_dpdk/ws_main.py +++ b/linux_dpdk/ws_main.py @@ -774,7 +774,7 @@ files_list=[ 'trex-console' ]; -files_dir=['cap2','avl','cfg','ko','automation', 'external_libs', 'python-lib'] +files_dir=['cap2','avl','cfg','ko','automation', 'external_libs', 'python-lib','stl'] class Env(object): @@ -859,7 +859,7 @@ def publish(bld): from_ = exec_p+'/'+release_name; os.system("rsync -av %s %s:%s/%s " %(from_,Env().get_local_web_server(),Env().get_remote_release_path (), release_name)) os.system("ssh %s 'cd %s;rm be_latest; ln -P %s be_latest' " %(Env().get_local_web_server(),Env().get_remote_release_path (),release_name)) - os.system("ssh %s 'cd %s;rm latest; ln -P %s latest' " %(Env().get_local_web_server(),Env().get_remote_release_path (),release_name)) + #os.system("ssh %s 'cd %s;rm latest; ln -P %s latest' " %(Env().get_local_web_server(),Env().get_remote_release_path (),release_name)) def publish_ext(bld): @@ -870,7 +870,7 @@ def publish_ext(bld): from_ = exec_p+'/'+release_name; os.system('rsync -avz -e "ssh -i %s" --rsync-path=/usr/bin/rsync %s %s@%s:%s/release/%s' % (Env().get_trex_ex_web_key(),from_, Env().get_trex_ex_web_user(),Env().get_trex_ex_web_srv(),Env().get_trex_ex_web_path() ,release_name) ) os.system("ssh -i %s -l %s %s 'cd %s/release/;rm be_latest; ln -P %s be_latest' " %(Env().get_trex_ex_web_key(),Env().get_trex_ex_web_user(),Env().get_trex_ex_web_srv(),Env().get_trex_ex_web_path(),release_name)) - os.system("ssh -i %s -l %s %s 'cd %s/release/;rm latest; ln -P %s latest' " %(Env().get_trex_ex_web_key(),Env().get_trex_ex_web_user(),Env().get_trex_ex_web_srv(),Env().get_trex_ex_web_path(),release_name)) + #os.system("ssh -i %s -l %s %s 'cd %s/release/;rm latest; ln -P %s latest' " %(Env().get_trex_ex_web_key(),Env().get_trex_ex_web_user(),Env().get_trex_ex_web_srv(),Env().get_trex_ex_web_path(),release_name)) -- cgit From 07e6795a7497151e0920c82337cca6cfb5c3c3cd Mon Sep 17 00:00:00 2001 From: imarom Date: Tue, 17 Nov 2015 15:26:41 +0200 Subject: checkpoint before merge --- linux_dpdk/ws_main.py | 1 + 1 file changed, 1 insertion(+) (limited to 'linux_dpdk') diff --git a/linux_dpdk/ws_main.py b/linux_dpdk/ws_main.py index 6591a241..3f63eabc 100755 --- a/linux_dpdk/ws_main.py +++ b/linux_dpdk/ws_main.py @@ -107,6 +107,7 @@ main_src = SrcGroup(dir='src', 'utl_yaml.cpp', 'nat_check.cpp', 'msg_manager.cpp', + 'publisher/trex_publisher.cpp', 'pal/linux_dpdk/pal_utl.cpp', 'pal/linux_dpdk/mbuf.cpp' ]); -- cgit From a7317d45787669af71ca8c65fd1e51f8a47d2c1e Mon Sep 17 00:00:00 2001 From: imarom Date: Thu, 19 Nov 2015 12:35:16 +0200 Subject: async events (DP to CP) --- linux_dpdk/ws_main.py | 1 + 1 file changed, 1 insertion(+) (limited to 'linux_dpdk') diff --git a/linux_dpdk/ws_main.py b/linux_dpdk/ws_main.py index 3f63eabc..b7a9c746 100755 --- a/linux_dpdk/ws_main.py +++ b/linux_dpdk/ws_main.py @@ -108,6 +108,7 @@ main_src = SrcGroup(dir='src', 'nat_check.cpp', 'msg_manager.cpp', 'publisher/trex_publisher.cpp', + 'trex_dp_port_events.cpp', 'pal/linux_dpdk/pal_utl.cpp', 'pal/linux_dpdk/mbuf.cpp' ]); -- cgit From 8b33a58a8269347faec3fa45e7544328ea2ba912 Mon Sep 17 00:00:00 2001 From: Hanoh Haim Date: Thu, 19 Nov 2015 16:02:28 +0200 Subject: support debug logs in case of dpdk debug image --- linux_dpdk/ws_main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'linux_dpdk') diff --git a/linux_dpdk/ws_main.py b/linux_dpdk/ws_main.py index 6591a241..98fa1fc6 100755 --- a/linux_dpdk/ws_main.py +++ b/linux_dpdk/ws_main.py @@ -572,7 +572,7 @@ class build_option: if self.isRelease () : flags += ['-O3']; else: - flags += ['-O0']; + flags += ['-O0','-D_DEBUG']; return (flags) -- cgit From c181e882312206254ec0c50d5a1cd049780e75ea Mon Sep 17 00:00:00 2001 From: Ido Barnea Date: Sun, 29 Nov 2015 07:20:23 +0200 Subject: Added ICMP latency packet modes --- linux_dpdk/ws_main.py | 1 + 1 file changed, 1 insertion(+) (limited to 'linux_dpdk') diff --git a/linux_dpdk/ws_main.py b/linux_dpdk/ws_main.py index 89f41376..566ceb1a 100755 --- a/linux_dpdk/ws_main.py +++ b/linux_dpdk/ws_main.py @@ -95,6 +95,7 @@ main_src = SrcGroup(dir='src', 'global_io_mode.cpp', 'main_dpdk.cpp', 'bp_sim.cpp', + 'latency.cpp', 'platform_cfg.cpp', 'tuple_gen.cpp', 'rx_check.cpp', -- cgit From 301341ddb1bf17387d7fea19667bedd40fce4509 Mon Sep 17 00:00:00 2001 From: Hanoh Haim Date: Sun, 13 Dec 2015 15:43:59 +0200 Subject: add git sha to version --- linux_dpdk/ws_main.py | 17 +++++++++++++++++ linux_dpdk/wscript | 3 +++ 2 files changed, 20 insertions(+) (limited to 'linux_dpdk') diff --git a/linux_dpdk/ws_main.py b/linux_dpdk/ws_main.py index 566ceb1a..e5ac40fb 100755 --- a/linux_dpdk/ws_main.py +++ b/linux_dpdk/ws_main.py @@ -12,6 +12,7 @@ import shutil; import copy; import re import uuid +import subprocess # these variables are mandatory ('/' are converted automatically) @@ -702,6 +703,15 @@ def get_build_num (): return s; def create_version_files (): + git_sha="N/A" + try: + r=commands.getstatusoutput("git log --pretty=format:'%H' -n 1") + if r[0]==0: + git_sha=r[1] + except : + pass; + + s ='' s +="#ifndef __TREX_VER_FILE__ \n" s +="#define __TREX_VER_FILE__ \n" @@ -712,6 +722,7 @@ def create_version_files (): s +='extern const char * get_build_date(void); \n' s +='extern const char * get_build_time(void); \n' s +='#define VERSION_UIID "%s" \n' % uuid.uuid1() + s +='#define VERSION_GIT_SHA "%s" \n' % git_sha s +='#define VERSION_BUILD_NUM "%s" \n' % get_build_num() s +="#ifdef __cplusplus \n" s +=" } \n" @@ -877,6 +888,12 @@ def publish_ext(bld): +def test (bld): + r=commands.getstatusoutput("git log --pretty=format:'%H' -n 1") + if r[0]==0: + print r[1] + + diff --git a/linux_dpdk/wscript b/linux_dpdk/wscript index be048bd8..459e2201 100755 --- a/linux_dpdk/wscript +++ b/linux_dpdk/wscript @@ -45,6 +45,9 @@ def publish_web(bld): def sync(bld): ws_main.sync(bld) +def test(bld): + ws_main.test(bld) + -- cgit