summaryrefslogtreecommitdiffstats
path: root/linux
diff options
context:
space:
mode:
authorHanoh Haim <hhaim@cisco.com>2015-10-19 16:30:55 +0300
committerHanoh Haim <hhaim@cisco.com>2015-10-19 16:30:55 +0300
commit872a205b4c5e4119b6d0d10a7ec774ce22d63256 (patch)
treee650ddcc3ceb5cb9e4b9c33609fcbfc956455f03 /linux
parentcf5dc18ecbeca6b4be9a171d996bba1cba9c3679 (diff)
parent6c7880b9881ed6690954f0c29259dd0b584b3970 (diff)
Merge branch 'rpc' -> add support for interactive mode
Diffstat (limited to 'linux')
-rwxr-xr-xlinux/ws_main.py17
1 files changed, 12 insertions, 5 deletions
diff --git a/linux/ws_main.py b/linux/ws_main.py
index 8ad3e5ba..eac46ac7 100755
--- a/linux/ws_main.py
+++ b/linux/ws_main.py
@@ -142,15 +142,18 @@ net_src = SrcGroup(dir='src/common/Network/Packet',
# stateless code
stateless_src = SrcGroup(dir='src/stateless/',
- src_list=['trex_stream.cpp',
- 'trex_stream_vm.cpp',
- 'trex_stateless.cpp',
+ 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'
])
# RPC code
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',
@@ -162,10 +165,12 @@ rpc_server_src = SrcGroup(dir='src/rpc-server/',
])
# RPC mock server (test)
-rpc_server_mock_src = SrcGroup(dir='src/rpc-server/',
+rpc_server_mock_src = SrcGroup(dir='src/mock/',
src_list=[
'trex_rpc_server_mock.cpp',
'../gtest/rpc_test.cpp',
+ '../pal/linux/mbuf.cpp',
+ '../os_time.cpp',
])
# JSON package
@@ -233,8 +238,10 @@ cxxflags_base =['-DWIN_UCODE_SIM',
includes_path =''' ../src/pal/linux/
../src/
+ ../src/mock/
../src/rpc-server/
- ../src/stateless/
+ ../src/stateless/cp/
+ ../src/stateless/dp/
../external_libs/json/
../external_libs/zmq/include/
../external_libs/yaml-cpp/include/