Changeset 947 for branches/reconfiguration/modules/dspin_router/caba/test

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.

Location:

branches/reconfiguration/modules/dspin_router/caba/test

Files:

• simple_recovery_routing_test (deleted)
• simple_segment_recovery_test/main.c (modified) (1 diff)

branches/reconfiguration/modules/dspin_router/caba/test/simple_segment_recovery_test/main.c

@@ -25 +25 @@
     /* configure the routers around the blackhole (1, 1) to define a cycle-free
      * contour */
+    const int PATH_RECOVERY = 1;
     uint32_t val;
 
     printf("router(0, 2): configuring as NW\n");
     assert(xcu_get_register(0, 2, XICU_CFG_REG, 0) == BH_NONE);
-    val = (REQ_SOUTH << 4) | BH_NW;
+    val = (PATH_RECOVERY << 7) | (REQ_SOUTH << 4) | BH_NW;
     xcu_set_register(0, 2, XICU_CFG_REG, 0, val);     /* configure NW */
 
     printf("router(0, 1): configuring as W\n");
     assert(xcu_get_register(0, 1, XICU_CFG_REG, 0) == BH_NONE);
-    val = (REQ_LOCAL << 4) | BH_W;
+    val = (PATH_RECOVERY << 7) | (REQ_LOCAL << 4) | BH_W;
     xcu_set_register(0, 1, XICU_CFG_REG, 0, val);     /* configure W */
 
     printf("router(0, 0): configuring as SW\n");
     assert(xcu_get_register(0, 0, XICU_CFG_REG, 0) == BH_NONE);
-    val = (REQ_NORTH << 4) | BH_SW;
+    val = (PATH_RECOVERY << 7) | (REQ_NORTH << 4) | BH_SW;
     xcu_set_register(0, 0, XICU_CFG_REG, 0, val);     /* configure SW */
 
     printf("router(1, 2): configuring as N\n");
     assert(xcu_get_register(1, 2, XICU_CFG_REG, 0) == BH_NONE);
-    val = (REQ_WEST << 4) | BH_N;
+    val = (PATH_RECOVERY << 7) | (REQ_WEST << 4) | BH_N;
     xcu_set_register(1, 2, XICU_CFG_REG, 0, val);     /* configure N */
 
     printf("router(2, 2): configuring as NE\n");
     assert(xcu_get_register(2, 2, XICU_CFG_REG, 0) == BH_NONE);
-    val = (REQ_WEST << 4) | BH_NE;
+    val = (PATH_RECOVERY << 7) | (REQ_WEST << 4) | BH_NE;
     xcu_set_register(2, 2, XICU_CFG_REG, 0, val);     /* configure NE */
 
     printf("router(2, 1): configuring as E\n");
     assert(xcu_get_register(2, 1, XICU_CFG_REG, 0) == BH_NONE);
-    val = (REQ_SOUTH << 4) | BH_E;
+    val = (PATH_RECOVERY << 7) | (REQ_SOUTH << 4) | BH_E;
     xcu_set_register(2, 1, XICU_CFG_REG, 0, val);     /* configure E */
 
     printf("router(2, 0): configuring as SE\n");
     assert(xcu_get_register(2, 0, XICU_CFG_REG, 0) == BH_NONE);
-    val = (REQ_WEST << 4) | BH_SE;
+    val = (PATH_RECOVERY << 7) | (REQ_WEST << 4) | BH_SE;
     xcu_set_register(2, 0, XICU_CFG_REG, 0, val);     /* configure SE */
 
     printf("router(1, 0): configuring as S\n");
     assert(xcu_get_register(1, 0, XICU_CFG_REG, 0) == BH_NONE);
-    val = (REQ_WEST << 4) | BH_S;
+    val = (PATH_RECOVERY << 7) | (REQ_WEST << 4) | BH_S;
     xcu_set_register(1, 0, XICU_CFG_REG, 0, val);     /* configure S */