summaryrefslogtreecommitdiffstats
path: root/linux_dpdk
diff options
context:
space:
mode:
authorDan Klein <danklei@cisco.com>2015-10-20 05:39:14 +0300
committerDan Klein <danklei@cisco.com>2015-10-20 05:39:14 +0300
commitcf753587ffb7b89cff1863c74ca334b8c41fd0c0 (patch)
treef9d8bd9e67cb93306e93041f11f5e4124a6e151a /linux_dpdk
parentd09df99769f67819c64a7a025dbdcd39811c7b44 (diff)
parent51ad078182d17b42a36c239c3c21381eeb3eec85 (diff)
Merge branch 'master' into master-demo +
working demo of loading a YAML, and attaching it to server
Diffstat (limited to 'linux_dpdk')
-rwxr-xr-xlinux_dpdk/ws_main.py16
1 files changed, 15 insertions, 1 deletions
diff --git a/linux_dpdk/ws_main.py b/linux_dpdk/ws_main.py
index 6aad508a..61a9d4f3 100755
--- a/linux_dpdk/ws_main.py
+++ b/linux_dpdk/ws_main.py
@@ -141,6 +141,7 @@ rpc_server_src = SrcGroup(dir='src/rpc-server/',
src_list=[
'trex_rpc_server.cpp',
'trex_rpc_req_resp_server.cpp',
+ 'trex_rpc_async_server.cpp',
'trex_rpc_jsonrpc_v2_parser.cpp',
'trex_rpc_cmds_table.cpp',
'trex_rpc_cmd.cpp',
@@ -148,8 +149,17 @@ rpc_server_src = SrcGroup(dir='src/rpc-server/',
'commands/trex_rpc_cmd_test.cpp',
'commands/trex_rpc_cmd_general.cpp',
'commands/trex_rpc_cmd_stream.cpp',
+
])
+# stateless code
+stateless_src = SrcGroup(dir='src/stateless/',
+ src_list=['cp/trex_stream.cpp',
+ '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',
src_list=[
@@ -346,6 +356,9 @@ bp =SrcGroups([
cmn_src ,
net_src ,
yaml_src,
+ rpc_server_src,
+ json_src,
+ stateless_src,
version_src
]);
@@ -400,7 +413,8 @@ includes_path =''' ../src/pal/linux_dpdk/
../src/
../src/rpc-server/
- ../src/stateless/
+ ../src/stateless/cp/
+ ../src/stateless/dp/
../external_libs/yaml-cpp/include/
../external_libs/zmq/include/