From 55d4c37d6381a63a76a29addfd6fa73f946419f9 Mon Sep 17 00:00:00 2001
From: Alina Quereilhac <alina.quereilhac@inria.fr>
Date: Tue, 7 Jun 2011 18:36:40 +0200
Subject: [PATCH] possible bug fix: reason why pyQt was freezing when shutting
 down the experiment

---
 src/nepi/core/execute.py                         |  4 +++-
 src/nepi/testbeds/netns/metadata_v01.py          |  6 ++++++
 .../testbeds/ns3/connection_metadata_v3_9.py     | 12 ++++++++++++
 src/nepi/testbeds/ns3/factories_metadata_v3_9.py | 16 ++++++++--------
 4 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/src/nepi/core/execute.py b/src/nepi/core/execute.py
index 07990606..075b0a5f 100644
--- a/src/nepi/core/execute.py
+++ b/src/nepi/core/execute.py
@@ -572,7 +572,9 @@ class ExperimentController(object):
         except:
             # Just print exceptions, this is just cleanup
             import traceback
-            traceback.print_exc(file=sys.stderr)
+            ######## BUG ##########
+            #BUG: If the next line is uncomented pyQt explodes when shutting down the experiment !!!!!!!!
+            #traceback.print_exc(file=sys.stderr)
 
     def stop(self):
        for testbed in self._testbeds.values():
diff --git a/src/nepi/testbeds/netns/metadata_v01.py b/src/nepi/testbeds/netns/metadata_v01.py
index b849482b..45be3b15 100644
--- a/src/nepi/testbeds/netns/metadata_v01.py
+++ b/src/nepi/testbeds/netns/metadata_v01.py
@@ -189,6 +189,11 @@ def start_application(testbed_instance, guid):
             stderr = stderr, user = user)
     testbed_instance.elements[guid] = element
 
+def stop_application(testbed_instance, guid):
+    #app = testbed_instance.elements[guid]
+    #app.signal()
+    pass
+
 ### Status functions ###
 
 def status_application(testbed_instance, guid):
@@ -511,6 +516,7 @@ factories_info = dict({
             "category": "applications",
             "create_function": create_application,
             "start_function": start_application,
+            "stop_function": stop_application,
             "status_function": status_application,
             "box_attributes": ["command", "user"],
             "connector_types": ["node"],
diff --git a/src/nepi/testbeds/ns3/connection_metadata_v3_9.py b/src/nepi/testbeds/ns3/connection_metadata_v3_9.py
index f25d9d10..a3f993d3 100644
--- a/src/nepi/testbeds/ns3/connection_metadata_v3_9.py
+++ b/src/nepi/testbeds/ns3/connection_metadata_v3_9.py
@@ -443,6 +443,18 @@ connections = [
             "init_code": connect_mac_device,
             "can_cross": False
     }),
+    dict({
+            "from": ( "ns3", "ns3::NqapWifiMac", "dev" ),
+            "to":   ( "ns3", "ns3::WifiNetDevice", "mac" ),
+            "init_code": connect_mac_device,
+            "can_cross": False
+    }),
+    dict({
+            "from": ( "ns3", "ns3::NqstaWifiMac", "dev" ),
+            "to":   ( "ns3", "ns3::WifiNetDevice", "mac" ),
+            "init_code": connect_mac_device,
+            "can_cross": False
+    }),
     dict({
             "from": ( "ns3", "ns3::RateErrorModel", "dev" ),
             "to":   ( "ns3", "ns3::CsmaNetDevice", "err" ),
diff --git a/src/nepi/testbeds/ns3/factories_metadata_v3_9.py b/src/nepi/testbeds/ns3/factories_metadata_v3_9.py
index c2205933..6afc7f6d 100644
--- a/src/nepi/testbeds/ns3/factories_metadata_v3_9.py
+++ b/src/nepi/testbeds/ns3/factories_metadata_v3_9.py
@@ -718,7 +718,7 @@ factories_info = dict({
         "tags": [tags.MOBILE],
     }),
      "ns3::Node": dict({
-        "category": "Topology",
+        "category": "Node",
         "create_function": create_node,
         "configure_function": configure_node,
         "help": "",
@@ -1076,10 +1076,10 @@ factories_info = dict({
     }),
      "ns3::NqstaWifiMac": dict({
         "category": "Mac",
-        "create_function": create_element,
+        "create_function": create_wifi_standard_model,
         "configure_function": configure_element,
         "help": "",
-        "connector_types": [],
+        "connector_types": ["dev"],
         "box_attributes": ["ProbeRequestTimeout",
             "AssocRequestTimeout",
             "MaxMissedBeacons",
@@ -1336,10 +1336,10 @@ factories_info = dict({
     }),
      "ns3::NqapWifiMac": dict({
         "category": "Mac",
-        "create_function": create_element,
+        "create_function": create_wifi_standard_model,
         "configure_function": configure_element,
         "help": "",
-        "connector_types": [],
+        "connector_types": ["dev"],
         "box_attributes": ["BeaconInterval",
             "BeaconGeneration",
             "CtsTimeout",
@@ -1568,7 +1568,7 @@ factories_info = dict({
         "box_attributes": ["DefaultLoss"],
     }),
      "ns3::WifiNetDevice": dict({
-        "category": "Wifi",
+        "category": "Device",
         "create_function": create_element,
         "configure_function": configure_device,
         "help": "",
@@ -1577,7 +1577,7 @@ factories_info = dict({
         "box_attributes": ["Mtu"],
     }),
      "ns3::CsmaChannel": dict({
-        "category": "Topology",
+        "category": "Channel",
         "create_function": create_element,
         "configure_function": configure_element,
         "help": "",
@@ -1745,7 +1745,7 @@ factories_info = dict({
             "EnableBeaconCollisionAvoidance"],
     }),
      "ns3::MeshPointDevice": dict({
-        "category": "Topology",
+        "category": "Device",
         "create_function": create_element,
         "configure_function": configure_element,
         "help": "",
-- 
2.47.0