diff options
| author |   imarom <imarom@cisco.com> | 2017-01-22 16:20:45 +0200 |
|---|---|---|
| committer | imarom <imarom@cisco.com> | 2017-01-22 16:20:45 +0200 |
| commit | 904eacd9be1230efb7ae0ab7997ec131b588ec8a (patch) | |
| tree | 8e4bcd1b1a5f683efdb8f3eeb962acefc3201961 /src/main.cpp | |
| parent | d2f1c8451e2e8ffc47b208f68f9b16697d706d60 (diff) | |
| parent | b81cdb6c2d6d118c1c346e7c8dae6a5e747d867d (diff) | |
Merge branch 'master' into capture
Signed-off-by: imarom <imarom@cisco.com>
Conflicts:
scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_client.py
scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_jsonrpc_client.py
scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_port.py
src/main_dpdk.cpp
Diffstat (limited to 'src/main.cpp')
| -rwxr-xr-x | src/main.cpp | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/src/main.cpp b/src/main.cpp index 15bd99dd..dc9e89f4 100755 --- a/src/main.cpp +++ b/src/main.cpp @@ -38,7 +38,7 @@ using namespace std; enum { OPT_HELP, OPT_CFG, OPT_NODE_DUMP, OP_STATS, OPT_FILE_OUT, OPT_UT, OPT_PCAP, OPT_IPV6, OPT_CLIENT_CFG_FILE, OPT_SL, OPT_DP_CORE_COUNT, OPT_DP_CORE_INDEX, OPT_LIMIT, - OPT_DRY_RUN}; + OPT_DRY_RUN, OPT_DURATION}; @@ -69,8 +69,10 @@ static CSimpleOpt::SOption parser_options[] = { OP_STATS, "-s", SO_NONE }, { OPT_CFG, "-f", SO_REQ_SEP }, { OPT_CLIENT_CFG_FILE, "--client_cfg", SO_REQ_SEP }, + { OPT_CLIENT_CFG_FILE, "--client-cfg", SO_REQ_SEP }, { OPT_FILE_OUT , "-o", SO_REQ_SEP }, { OPT_NODE_DUMP , "-v", SO_REQ_SEP }, + { OPT_DURATION, "-d", SO_REQ_SEP }, { OPT_PCAP, "--pcap", SO_NONE }, { OPT_IPV6, "--ipv6", SO_NONE }, { OPT_SL, "--sl", SO_NONE }, @@ -95,7 +97,8 @@ static int usage(){ printf(" Usage: bp_sim [OPTION] -f cfg.yaml -o outfile.erf \n"); printf(" \n"); printf(" \n"); - printf(" options \n"); + printf(" options:\n"); + printf(" -d [s] duration time of simulated traffic in seconds\n"); printf(" -v [1-3] verbose mode \n"); printf(" 1 show only stats \n"); printf(" 2 run preview do not write to file \n"); @@ -194,12 +197,16 @@ static int parse_options(int argc, params["limit"] = atoi(args.OptionArg()); break; + case OPT_DURATION: + sscanf(args.OptionArg(),"%f", &po->m_duration); + break; + case OPT_DRY_RUN: params["dry"] = 1; break; default: - usage(); + printf("Error: option %s is defined, but not handled.\n\n", args.OptionText()); return -1; break; } // End of switch |