diff options
Diffstat (limited to 'ns3-simulations/simulate.org')
| -rw-r--r-- | ns3-simulations/simulate.org | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/ns3-simulations/simulate.org b/ns3-simulations/simulate.org index 1749035..7594128 100644 --- a/ns3-simulations/simulate.org +++ b/ns3-simulations/simulate.org @@ -12,7 +12,6 @@ #+END_SRC #+RESULTS: - : sensorsSendInterval:1 sensorsPktSize:10 sensorsNumber:2 nbHop:2 linksBandwidth:10 linksLatency:10 #+NAME: singleRun @@ -32,16 +31,22 @@ simCMD="$simulator --sensorsSendInterval=${sensorsSendInterval} --sensorsPktSize=${sensorsPktSize} --sensorsNumber=${sensorsNumber} --nbHop=${nbHop} --linksBandwidth=${linksBandwidth} --linksLatency=${linksLatency} 2>&1" log=$(bash -c "$simCMD") + # Compute some metrics + energyLog=$(echo "$log" | $parseEnergyScript) + totalEnergy=$(echo "$energyLog"| awk 'BEGIN{power=0;FS=","}NR!=1{power+=$2}END{print(power)}') + nbPacketCloud=$(echo "$log"|grep -c "CloudSwitch receive") + nbNodes=$(echo "$log"|awk '/Starting simul/{print($4)}') + # Save logs echo -e "#+TITLE: $(date) ns-3 simulation\n" > $logFile echo "* Full Command" >> $logFile echo "$simCMD" >> $logFile echo "* Output" >> $logFile echo "$log" >> $logFile - echo "* Energy CSV" >> $logFile - echo "$log" | $parseEnergyScript >> $logFile + echo "* Energy CSV (negative nodeId = WIFI, 0 = AP (Wireless+Wired), positive nodeId = ECOFEN" >> $logFile + echo "$energyLog" >> $logFile echo "* Metrics" >> $logFile - echo " sensorsSendInterval:${sensorsSendInterval} sensorsPktSize:${sensorsPktSize} sensorsNumber:${sensorsNumber} nbHop:${nbHop} linksBandwidth:${linksBandwidth} linksLatency:${linksLatency}" >> $logFile + echo " sensorsSendInterval:${sensorsSendInterval} sensorsPktSize:${sensorsPktSize} sensorsNumber:${sensorsNumber} nbHop:${nbHop} linksBandwidth:${linksBandwidth} linksLatency:${linksLatency} totalEnergy:$totalEnergy nbPacketCloud:$nbPacketCloud nbNodes:$nbNodes" >> $logFile } #+END_SRC |