Improved scripts and manpage.

Author: dreibh

src/plot-netperfmeter-results

@@ -32,7 +32,7 @@ set -eu
 
 # ###### Usage ##############################################################
 usage () {
-   echo >&2 "Usage: $0 config_file [-w|--own-file] [-k|--keep-summaries] [-c|--colour|--color|-g|--greyscale|--grayscale|-b|--blackandwhite]"
+   echo >&2 "Usage: $0 config_file [-w|--own-file] [-k|--keep-summaries] [-p|--per-flow-plots]"
    exit 1
 }
 
@@ -41,14 +41,14 @@ usage () {
 
 # ====== Handle arguments ===================================================
 GETOPT="$(PATH=/usr/local/bin:${PATH} which getopt)"
-options="$(${GETOPT} -o wkcgbh --long own-file,ownfile,keep-summaries,colour,color,greyscale,grayscale,blackandwhite,help -a -- "$@")"
+options="$(${GETOPT} -o wkph --long own-file,ownfile,keep-summaries,per-flow-plots,help -a -- "$@")"
 # shellcheck disable=SC2181
 if [[ $? -ne 0 ]]; then
    usage
 fi
 
 KEEP_SUMMARIES=0
-PLOT_COLOR_MODE="cmColor"
+PER_FLOW_PLOTS=0
 PLOT_OWN_FILE="FALSE"
 eval set -- "${options}"
 while [ $# -gt 0 ] ; do
@@ -61,16 +61,8 @@ while [ $# -gt 0 ] ; do
          KEEP_SUMMARIES=1
          shift
          ;;
-      -c | --colour | --color)
-         PLOT_COLOR_MODE="cmColor"
-         shift
-         ;;
-      -g | --greyscale | --grayscale)
-         PLOT_COLOR_MODE="cmGrayScale"
-         shift
-         ;;
-      -b | ---blackandwhite)
-         PLOT_COLOR_MODE="cmBlackAndWhite"
+      -p | --per-flow-plots)
+         PER_FLOW_PLOTS=1
          shift
          ;;
       -h | --help)
@@ -98,6 +90,7 @@ echo -e "\e[34mChecking vector files ...\e[0m"
 VECTOR_ACTIVE_NODE=""
 VECTOR_PASSIVE_NODE=""
 NUM_FLOWS=0
+# shellcheck disable=SC1090
 . "${CONFIG_FILE}"
 if [ "${VECTOR_PASSIVE_NODE}" == "" ] || [ "${VECTOR_ACTIVE_NODE}" == "" ] || [ ${NUM_FLOWS} -lt 1 ] ; then
    echo >&2 "ERROR: Bad vector file configuration!"
@@ -111,6 +104,7 @@ if [ ! -e "${VECTOR_PASSIVE_NODE}" ] ; then
    echo >&2 "ERROR: Vector file ${VECTOR_ACTIVE_NODE} of passive node not found!"
    exit 1
 fi
+# shellcheck disable=SC2001
 OUTPUT_PREFIX="$(echo "${CONFIG_FILE}" | sed -e "s/.config$//g")"
 
 echo "Configuration:"
@@ -169,16 +163,16 @@ SEARCH_PATHS=". /usr/share/netperfmeter /usr/local/share/netperfmeter"
 PLOT_PROGRAM_DIR=""
 PLOT_PROGRAM_SCRIPT="plot-netperfmeter-results.R"
 for searchPath in ${SEARCH_PATHS} ; do
-   if [ -e "${searchPath}/${PLOT_PROGRAM_SCRIPT}" ] && [ -e "${searchPath}/plotter.R" ] ; then
+   if [ -e "${searchPath}/${PLOT_PROGRAM_SCRIPT}" ] ; then
       PLOT_PROGRAM_DIR=${searchPath}
       break
    fi
 done
 if [ "${PLOT_PROGRAM_DIR}" = "" ] ; then
-   echo >&2 "ERROR: Cannot find ${PLOT_PROGRAM_SCRIPT} and plotter.R!"
+   echo >&2 "ERROR: Cannot find ${PLOT_PROGRAM_SCRIPT}!"
    exit 1
 elif [ "${PLOT_PROGRAM_DIR}" = "." ] ; then
-   echo "Using ${PLOT_PROGRAM_SCRIPT} and plotter.R from ${searchPath}."
+   echo "Using ${PLOT_PROGRAM_SCRIPT} from ${searchPath}."
 fi
 
 
@@ -190,7 +184,7 @@ R CMD BATCH --slave --vanilla \
       summaryFile=\"${SUMMARY_NAME}\"
       flowSummaryFile=\"${FLOW_SUMMARY_NAME}\"
       pdfFilePrefix=\"${OUTPUT_PREFIX}\"
-      plotColorMode=${PLOT_COLOR_MODE}
+      perFlowPlots=${PER_FLOW_PLOTS}
       plotOwnFile=${PLOT_OWN_FILE}" \
    "${PLOT_PROGRAM_DIR}/${PLOT_PROGRAM_SCRIPT}" /dev/stdout
 

src/plot-netperfmeter-results.1

@@ -26,7 +26,7 @@
 .\" Homepage: https://www.nntb.no/~dreibh/netperfmeter/
 .\"
 .\" ###### Setup ############################################################
-.Dd November 14, 2025
+.Dd November 17, 2025
 .Dt plot-netperfmeter-results 1
 .Os plot-netperfmeter-results
 .\" ###### Name #############################################################
@@ -40,9 +40,7 @@ config_name
 .br
 .Op Fl w | Fl Fl ownfile
 .br
-.Op Fl c | Fl Fl colour | Fl Fl color
-.Op Fl g | Fl Fl greyscale | Fl Fl grayscale
-.Op Fl b | Fl Fl blackandwhite
+.Op Fl p | Fl Fl per-flow-plots
 .Nm plot-netperfmeter-results
 .Op Fl h | Fl Fl help
 .\" ###### Description ######################################################
@@ -58,12 +56,8 @@ The following arguments have to be provided:
 The name of the config file written by NetPerfMeter.
 .It Fl w | Fl Fl ownfile
 Plot a separate PDF file for each page.
-.It Fl c | Fl Fl colour | Fl Fl color
-Create colour plot.
-.It Fl g | Fl Fl greyscale | Fl Fl grayscale
-Create grey-scale plot.
-.It Fl b | Fl Fl blackandwhite
-Create black and white plot.
+.It Fl p | Fl Fl per-flow-plots
+Also generate separate plots for each flow.
 .It Fl h | Fl Fl help
 Prints command-line parameters.
 .El
@@ -72,7 +66,9 @@ Prints command-line parameters.
 Some plot-netperfmeter-results usage examples:
 .Bl -tag -width indent
 .It plot-netperfmeter-results output.config
-Plot the vector file output.vec.bz2. The resulting PDF file will be named output.pdf.
+Plot the results given by output.config. The resulting PDF file will be named output.pdf.
+.It plot-netperfmeter-results output.config --per-flow-plots
+Plot the results given by output.config, including per-flow plots. The resulting PDF file will be named output.pdf.
 .It plot-netperfmeter-results output.config --ownfile
 Plot the results given by output.config. For each page, a separate PDF file is written. The resulting PDF files will be named output-<title>.pdf, where <title> corresponds to the page title.
 .It plot-netperfmeter-results --help

src/plot-netperfmeter-results.R

@@ -349,7 +349,6 @@ plotQoSStatistics <- function(inputData, flowSummaryData, nodeName) {
 # ###########################################################################
 
 # ###### Default Settings ###################################################
-plotColorMode  <- 2   # == cmColor
 plotOwnFile    <- TRUE
 plotFontFamily <- "Helvetica"
 plotPointSize  <- 12
@@ -361,23 +360,16 @@ plotPaper      <- "A4r"   # Use "special" for manual values! Or: A4/A4r.
 # ###### Command-Line Arguments #############################################
 args <- commandArgs(TRUE)
 # print(args)
-
 for(i in 1:length(args)) {
    eval(parse(text=args[i]))
-   if(i == 2) {
-      # ------ Include plotting functions -----------------------------------
-      # The first parameter must set "programDirectory". The further
-      # parameters may use constants defined in plotter.R. Therefore, plotter.R
-      # must be included before!
-      source(paste(sep="", programDirectory, "/plotter.R"))
-   }
 }
 
-# cat(sep="", "programDirectory=", programDirectory,    "\n")
-# cat(sep="", "configFile=",       configFile,    "\n")
-# cat(sep="", "summaryFile=",      summaryFile,    "\n")
-# cat(sep="", "pdfFilePrefix=",    pdfFilePrefix, "\n")
-# cat(sep="", "plotOwnFile=",      plotOwnFile,   "\n")
+# cat(sep="", "programDirectory=", programDirectory, "\n")
+# cat(sep="", "configFile=",       configFile,       "\n")
+# cat(sep="", "summaryFile=",      summaryFile,      "\n")
+# cat(sep="", "pdfFilePrefix=",    pdfFilePrefix,    "\n")
+# cat(sep="", "perFlowPlots=",     perFlowPlots,     "\n")
+# cat(sep="", "plotOwnFile=",      plotOwnFile,      "\n")
 
 
 # ====== Load input data ====================================================
@@ -408,7 +400,9 @@ plotNodeStats(data, NAME_PASSIVE_NODE)
 
 
 # ====== Flow QoS Statistics ================================================
-# plotQoSStatistics(summaryData, flowSummaryData)
+if(perFlowPlots == 1) {
+   plotQoSStatistics(summaryData, flowSummaryData)
+}
 
 
 # ====== Finish PDF file ====================================================