From 434c33afeb211d818494b5fb64a9f008a27f61df Mon Sep 17 00:00:00 2001 From: vlad shkapenyuk Date: Mon, 10 Aug 2020 17:14:03 -0400 Subject: [PATCH] Remove disabled queries from output_spec.cfg Signed-off-by: vlad shkapenyuk Change-Id: I547e010b9aebfb33d25f186618709119c4dd806f --- mc-core/Dockerfile | 2 +- mc-core/mc/mcnib/gsprintconsole_ves.c | 5 +++-- mc-core/mc/queries/generate_runall.py | 3 ++- mc-core/mc/queries/output_spec.cfg | 5 ----- 4 files changed, 6 insertions(+), 9 deletions(-) diff --git a/mc-core/Dockerfile b/mc-core/Dockerfile index 8a9c5c9..511e035 100644 --- a/mc-core/Dockerfile +++ b/mc-core/Dockerfile @@ -16,7 +16,7 @@ ARG STAGE_DIR=/mc -FROM nexus3.o-ran-sc.org:10004/o-ran-sc/bldr-ubuntu18-c-go:8-u18.04 AS project-build +FROM nexus3.o-ran-sc.org:10004/o-ran-sc/bldr-ubuntu18-c-go:9-u18.04 AS project-build ARG STAGE_DIR diff --git a/mc-core/mc/mcnib/gsprintconsole_ves.c b/mc-core/mc/mcnib/gsprintconsole_ves.c index 75dccb0..62a9789 100644 --- a/mc-core/mc/mcnib/gsprintconsole_ves.c +++ b/mc-core/mc/mcnib/gsprintconsole_ves.c @@ -242,7 +242,7 @@ int main(int argc, char* argv[]) { curl_endpoint.ip=htonl(tip1<<24|tip2<<16|tip3<<8|tip4); curl_endpoint.port=htons(curl_endpoint.port); break; - case 'R': + case 'R': rmr_port=strdup(optarg); break; case 'U': @@ -687,7 +687,8 @@ int main(int argc, char* argv[]) { if (rmr_port) { rmr_sbuf->mtype = rmr_mtype; // fill in the message bits - rmr_sbuf->len = strlen(linebuf) + 1; // our receiver likely wants a nice acsii-z string + rmr_sbuf->len = strlen(linebuf) + 1; // our receiver likely wants a nice acsii-z string + memcpy(rmr_sbuf->payload, linebuf, rmr_sbuf->len); rmr_sbuf->state = 0; rmr_sbuf = rmr_send_msg( mrc, rmr_sbuf); // send it (send returns an empty payload on success, or the original payload on fail/retry) while( rmr_sbuf->state == RMR_ERR_RETRY ) { // soft failure (device busy?) retry diff --git a/mc-core/mc/queries/generate_runall.py b/mc-core/mc/queries/generate_runall.py index 667120b..801c1c7 100644 --- a/mc-core/mc/queries/generate_runall.py +++ b/mc-core/mc/queries/generate_runall.py @@ -142,7 +142,8 @@ runall += """ sleep 1 bash /mc/gs-lite/bin/start_processing -fg %1 +sleep infinity +# fg %1 """ rflnm = options.querydir+"/runall" diff --git a/mc-core/mc/queries/output_spec.cfg b/mc-core/mc/queries/output_spec.cfg index 3a5547d..04aa293 100644 --- a/mc-core/mc/queries/output_spec.cfg +++ b/mc-core/mc/queries/output_spec.cfg @@ -65,9 +65,4 @@ reconfig_all_debug,stream,,,,, reconfig_success_debug,stream,,,,, reconfig_reject_debug,stream,,,,, dc_release_debug,stream,,,,, -throughput_meas_crnti,stream,,,,, -throughput_meas_alt_crnti,stream,,,,, -drb_pdcp_pdu_stats,stream,,,,, -ue_drb_count,stream,,,,, -dl_sched_trace_stats,stream,,,,, throughput_userclass_pci,stream,,,,, -- 2.16.6