Commit 5f0c1247 authored by apvrille's avatar apvrille

Update on router handling

parent ea19f59f
...@@ -201,7 +201,7 @@ $(WEBCRAWLER_SERVER_BINARY): FORCE ...@@ -201,7 +201,7 @@ $(WEBCRAWLER_SERVER_BINARY): FORCE
$(JTTOOL_BINARY): FORCE $(JTTOOL_BINARY): FORCE
@$(MAKE) -C $(JTTOOL_DIR) -e $@ @$(MAKE) -C $(JTTOOL_DIR) -e $@
ttoolhelp: html internalhelp: html
html: $(MD2HTML) html: $(MD2HTML)
......
...@@ -300,7 +300,7 @@ public class TranslatedRouter<E> { ...@@ -300,7 +300,7 @@ public class TranslatedRouter<E> {
if (fromPreviousRouters[portNb] != null) { if (fromPreviousRouters[portNb] != null) {
for (int vcNb = 0; vcNb < nbOfVCs; vcNb++) { for (int vcNb = 0; vcNb < nbOfVCs; vcNb++) {
TaskINForVC taskINForVC = new TaskINForVC("IN_" + nameOfExecNode + "_" + vcNb, null, TaskINForVC taskINForVC = new TaskINForVC("INVC_" + nameOfExecNode + "___" + portNb + "_" + vcNb, null,
null); null);
tmlm.addTask(taskINForVC); tmlm.addTask(taskINForVC);
dispatchInVCs[portNb][vcNb] = taskINForVC; dispatchInVCs[portNb][vcNb] = taskINForVC;
...@@ -441,8 +441,11 @@ public class TranslatedRouter<E> { ...@@ -441,8 +441,11 @@ public class TranslatedRouter<E> {
// Internal events and channels // Internal events and channels
// Between IN and INVC // Between IN and INVC
pktInEvtsVCs = new TMLEvent[TMAP2Network.DOMAIN + 1][nbOfVCs];
pktInChsVCs = new TMLChannel[TMAP2Network.DOMAIN + 1][nbOfVCs];
pktInEvtsVCs = new TMLEvent[NB_OF_PORTS][nbOfVCs];
pktInChsVCs = new TMLChannel[NB_OF_PORTS][nbOfVCs];
for (int i = 0; i < TMAP2Network.DOMAIN + 1; i++) { for (int i = 0; i < TMAP2Network.DOMAIN + 1; i++) {
for (int j = 0; j < nbOfVCs; j++) { for (int j = 0; j < nbOfVCs; j++) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment