Changeset 947 for branches/reconfiguration/modules/dspin_router/caba/source/include

Timestamp:

Feb 15, 2015, 8:44:35 PM (10 years ago)

Author:

cfuguet

Message:

reconf: add new mode to the dspin_router

• Modes are:

+ NORMAL : normal X-first routing

+ PATH_RECOVERY : create contour around the blackhole.

If the destination is the blackhole, send
packet to recovery direction, else use normal
X-first routing.

+ SEGMENT_RECOVERY: Like PATH_RECOVERY but do not create contour, only

reroute packets with the blackhole as destination.

• Remove deprecated unitary test simple_recovery_routing_test

• Update the simple_segment_recovery unitary test.

File:

• branches/reconfiguration/modules/dspin_router/caba/source/include/dspin_router.h (modified) (2 diffs)

branches/reconfiguration/modules/dspin_router/caba/source/include/dspin_router.h

@@ -141 +141 @@
 
     // fault-recovery methods
-    bool    need_reroute( size_t xdest, size_t ydest, int bhpos );
+    bool    is_destination_blackhole( size_t xdest, size_t ydest, int bhpos );
     int     recovery_route( size_t xdest, size_t ydest );
 
@@ -149 +149 @@
     {
         m_disable_mask = mask;
+    }
+
+    inline bool is_network_recovery_enable()
+    {
+        return (((p_recovery_cfg->read() >> 7) & 0x1) != 0);
+    }
+
+    inline int migration_route()
+    {
+        return ((p_recovery_cfg->read() >> 4) & 0x7);
+    }
+
+    inline int blackhole_position()
+    {
+        return (p_recovery_cfg->read() & 0xF);
     }