From e57f49086deb1b3fe4a8273ac830cdc11e0960b8 Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Wed, 28 Oct 2020 11:43:53 +0100 Subject: [PATCH] allowing multi receiver with just 2 arguments (without call back as default) --- slsReceiverSoftware/src/MultiReceiverApp.cpp | 21 ++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/slsReceiverSoftware/src/MultiReceiverApp.cpp b/slsReceiverSoftware/src/MultiReceiverApp.cpp index ba7cbe721..fd52200c4 100644 --- a/slsReceiverSoftware/src/MultiReceiverApp.cpp +++ b/slsReceiverSoftware/src/MultiReceiverApp.cpp @@ -30,9 +30,12 @@ void sigInterruptHandler(int p) { sem_post(&semaphore); } * prints usage of this example program */ void printHelp() { - cprintf(RESET, "Usage:\n" - "./slsMultiReceiver(detReceiver) [start_tcp_port] " - "[num_receivers] [1 for call back, 0 for none]\n\n"); + cprintf( + RESET, + "Usage:\n" + "./slsMultiReceiver(detReceiver) [start_tcp_port] " + "[num_receivers] [optional: 1 for call back (print frame header for " + "debugging), 0 for none (default)]\n\n"); exit(EXIT_FAILURE); } @@ -157,10 +160,16 @@ int main(int argc, char *argv[]) { /** - get number of receivers and start tcp port from command line * arguments */ - if ((argc != 4) || (!sscanf(argv[1], "%d", &startTCPPort)) || - (!sscanf(argv[2], "%d", &numReceivers)) || - (!sscanf(argv[3], "%d", &withCallback))) + if (argc != 3 && argc != 4) printHelp(); + if ((argc == 3) && ((!sscanf(argv[1], "%d", &startTCPPort)) || + (!sscanf(argv[2], "%d", &numReceivers)))) + printHelp(); + if ((argc == 4) && ((!sscanf(argv[1], "%d", &startTCPPort)) || + (!sscanf(argv[2], "%d", &numReceivers)) || + (!sscanf(argv[3], "%d", &withCallback)))) + printHelp(); + cprintf(BLUE, "Parent Process Created [ Tid: %ld ]\n", (long)syscall(SYS_gettid)); cprintf(RESET, "Number of Receivers: %d\n", numReceivers);