diff options
| author |   Dan Klein <danklein10@gmail.com> | 2016-01-04 23:31:31 +0200 |
|---|---|---|
| committer | Dan Klein <danklein10@gmail.com> | 2016-01-04 23:31:31 +0200 |
| commit | 629b54c4c9df9c718d818a004ecf15c2cf6c770a (patch) | |
| tree | 7dfc3c64c7561032d690ce6188130e80d344054e /linux | |
| parent | 3757099103ed1bf56f85ccf5bb861a331287cbbb (diff) | |
| parent | 857bdcf05a920b99e1cf180c700176b04801da00 (diff) | |
Merge branch 'master' into dan_stateless
Diffstat (limited to 'linux')
| -rw-r--r-- | linux/d | 2 | ||||
| -rwxr-xr-x | linux/ws_main.py | 8 |
2 files changed, 8 insertions, 2 deletions
diff --git a/linux/d b/linux/d new file mode 100644 index 00000000..1d1d1fc7 --- /dev/null +++ b/linux/d @@ -0,0 +1,2 @@ +rm -f ../linux/build/linux/bp-sim-64 +./b --target=bp-sim-64-debug diff --git a/linux/ws_main.py b/linux/ws_main.py index b0499842..71914630 100755 --- a/linux/ws_main.py +++ b/linux/ws_main.py @@ -121,7 +121,9 @@ main_src = SrcGroup(dir='src', 'latency.cpp', 'pal/linux/pal_utl.cpp', - 'pal/linux/mbuf.cpp' + 'pal/linux/mbuf.cpp', + 'sim/trex_sim_stateless.cpp', + 'sim/trex_sim_stateful.cpp' ]); cmn_src = SrcGroup(dir='src/common', @@ -153,6 +155,7 @@ stateless_src = SrcGroup(dir='src/stateless/', 'cp/trex_stateless.cpp', 'cp/trex_stateless_port.cpp', 'cp/trex_streams_compiler.cpp', + 'cp/trex_vm_splitter.cpp', 'cp/trex_dp_port_events.cpp', 'dp/trex_stateless_dp_core.cpp', 'messaging/trex_stateless_messaging.cpp', @@ -171,13 +174,14 @@ rpc_server_src = SrcGroup(dir='src/rpc-server/', 'commands/trex_rpc_cmd_general.cpp', 'commands/trex_rpc_cmd_stream.cpp', + # for simulation we use mock API + '../mock/trex_platform_api_mock.cpp', ]) # RPC mock server (test) rpc_server_mock_src = SrcGroup(dir='src/mock/', src_list=[ 'trex_rpc_server_mock.cpp', - 'trex_platform_api_mock.cpp', '../gtest/rpc_test.cpp', ]) |