[Gridsim-commits] SF.net SVN: gridsim: [129] branches/gridsim4.0-branch2/source/gridsim/net/ flow/FlowLink.java

[<bro...@us...>]

Revision: 129
          http://gridsim.svn.sourceforge.net/gridsim/?rev=129&view=rev
Author:   brobergj
Date:     2008-02-25 20:40:33 -0800 (Mon, 25 Feb 2008)

Log Message:
-----------
*Minor changes

Modified Paths:
--------------
    branches/gridsim4.0-branch2/source/gridsim/net/flow/FlowLink.java

Modified: branches/gridsim4.0-branch2/source/gridsim/net/flow/FlowLink.java
===================================================================
--- branches/gridsim4.0-branch2/source/gridsim/net/flow/FlowLink.java	2008-02-26 04:39:24 UTC (rev 128)
+++ branches/gridsim4.0-branch2/source/gridsim/net/flow/FlowLink.java	2008-02-26 04:40:33 UTC (rev 129)
@@ -378,8 +378,9 @@
         }
         
         if (np.getTag() == GridSimTags.FLOW_RETURN) {
-        	System.out.println("Dereg flow # " + np.getID() +" here");
-            // Deregister passing flow as it is npw de-active on this link
+        	System.out.println(super.get_name() + ".deque() Dereg flow # " + np.getID() +" here");
+            // Deregister passing flow as it is now de-active on this link
+        	((FlowPacket)np).addLatency(this.getDelay());
         	deregisterFlow(np);
         }
 
@@ -477,10 +478,10 @@
             	if (this.getBaudRate() > tempFlow.getBandwidth_() && tempFlow.getID() != np.getID() && 
             			tempFlow.getBottleneckID() == this.get_id()) {
             		// Need to notify flow
-            		System.out.println(super.get_name() + ".registerFlow():  flow #" + np.getID() 
+            		System.out.println(super.get_name() + ".deregisterFlow():  flow #" + np.getID() 
                 			+ " bottleneck now " + this.getBaudRate() + " at time " + GridSim.clock());
             		// I can notify directly as I  know the destId's!!!!
-            		System.out.println(super.get_name() + ".registerFlow(): updating flow #" + tempFlow.getID()
+            		System.out.println(super.get_name() + ".deregisterFlow(): updating flow #" + tempFlow.getID()
             				+ " destination " + tempFlow.getDestID());
                     super.sim_schedule(GridSim.getEntityId("Output_" + 
                     		GridSim.getEntityName(tempFlow.getDestID())), GridSimTags.SCHEDULE_NOW, 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.