Make the wifi_energy tests pass (+cosmetics)

diff --git a/examples/s4u/energy-wifi/s4u-energy-wifi.cpp b/examples/s4u/energy-wifi/s4u-energy-wifi.cpp
index 0f5c909..62cb239 100644 (file)
--- a/examples/s4u/energy-wifi/s4u-energy-wifi.cpp
+++ b/examples/s4u/energy-wifi/s4u-energy-wifi.cpp
@@ -11,13 +11,6 @@
 #include "simgrid/s4u/Host.hpp"
 #include "simgrid/s4u/Link.hpp"
 #include "simgrid/s4u/Mailbox.hpp"
-#include "xbt/log.h"
-
-//#include <exception>
-//#include <iostream>
-//#include <random>
-//#include <sstream>
-//#include <string>
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(test_wifi, "Wifi energy demo");
 
@@ -49,9 +42,7 @@ static void receiver()
 
 int main(int argc, char** argv)
 {
-  // engine
   simgrid::s4u::Engine engine(&argc, argv);
-  XBT_INFO("Activating the SimGrid link energy plugin");
   sg_wifi_energy_plugin_init();
   engine.load_platform(argv[1]);
 

diff --git a/examples/s4u/energy-wifi/s4u-energy-wifi.tesh b/examples/s4u/energy-wifi/s4u-energy-wifi.tesh
new file mode 100644 (file)
index 0000000..3df3c43
--- /dev/null
+++ b/examples/s4u/energy-wifi/s4u-energy-wifi.tesh
@@ -0,0 +1,13 @@
+#!/usr/bin/env tesh
+
+p Testing the mechanism for computing link energy consumption (using CM02 as a network model)
+
+$ ${bindir:=.}/s4u-energy-wifi ${platfdir}/wifi_energy.xml  "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --cfg=network/model:CM02 --cfg=network/crosstraffic:no
+> [  0.000000] (0:maestro@) Configuration change: Set 'network/model' to 'CM02'
+> [  0.000000] (0:maestro@) Configuration change: Set 'network/crosstraffic' to 'no'
+> [  0.000000] (0:maestro@) Activating the wifi_energy plugin.
+> [  0.000000] (2:act1@Station 2) RECEIVING on mb MailBoxRCV
+> [  5.000000] (1:act0@Station 1) SENDING 1 msg of size 6750000 to MailBoxRCV
+> [  7.000000] (2:act1@Station 2) received all messages
+> [  7.000000] (1:act0@Station 1) finished sending
+> [  7.000000] (0:maestro@) Link AP1 destroyed, consumed: 6.000000 J dyn: 6.000000 stat: 0.000000 durIdle: 5.000000 durTxRx: 2.000000

diff --git a/src/plugins/link_energy_wifi.cpp b/src/plugins/link_energy_wifi.cpp
index 33f677c..a69c7f7 100644 (file)
--- a/src/plugins/link_energy_wifi.cpp
+++ b/src/plugins/link_energy_wifi.cpp
@@ -280,10 +280,10 @@ using simgrid::plugin::LinkEnergyWifi;
 
 void sg_wifi_energy_plugin_init()
 {
-  XBT_DEBUG("Initialization wifi_energy plugin");
-
   if (LinkEnergyWifi::EXTENSION_ID.valid())
     return;
+
+  XBT_INFO("Activating the wifi_energy plugin.");
   LinkEnergyWifi::EXTENSION_ID = simgrid::s4u::Link::extension_create<LinkEnergyWifi>();
 
   /**