From: <sul...@us...> - 2008-10-12 06:38:07
|
Revision: 256 http://gridsim.svn.sourceforge.net/gridsim/?rev=256&view=rev Author: sulistio Date: 2008-10-12 06:38:06 +0000 (Sun, 12 Oct 2008) Log Message: ----------- minor changes Modified Paths: -------------- trunk/examples/DataGrid/example4/DataGridSim.java trunk/examples/DataGrid/example4/SimUser.java Modified: trunk/examples/DataGrid/example4/DataGridSim.java =================================================================== --- trunk/examples/DataGrid/example4/DataGridSim.java 2008-10-12 06:37:26 UTC (rev 255) +++ trunk/examples/DataGrid/example4/DataGridSim.java 2008-10-12 06:38:06 UTC (rev 256) @@ -45,8 +45,10 @@ // Initialize the GridSim package System.out.println("Initializing GridSim package"); GridSim.init(num_user, calendar, trace_flag, gisFlag); - GridSim.initNetworkType(GridSimTags.NET_FLOW_LEVEL); + // NOTE: uncomment this if you want to use the new Flow extension + //GridSim.initNetworkType(GridSimTags.NET_FLOW_LEVEL); + // set the GIS into DataGIS that handles specifically for data grid // scenarios DataGIS gis = new DataGIS(); @@ -60,14 +62,19 @@ //read available files LinkedList files = FilesReader.read(ParameterReader.filesFilename); + //------------------------------------------- //read topology - //LinkedList routerList = NetworkReader.createFIFO(ParameterReader.networkFilename); - LinkedList routerList = NetworkReader.createFlow(ParameterReader.networkFilename); + LinkedList routerList = NetworkReader.createFIFO(ParameterReader.networkFilename); //attach central RC entity to one of the routers //Create a central RC - //Link l = new SimpleLink("rc_link", baud_rate, propDelay, mtu); - Link l = new FlowLink("rc_link", baud_rate, propDelay, mtu); + Link l = new SimpleLink("rc_link", baud_rate, propDelay, mtu); + + // NOTE: uncomment this if you want to use the new Flow extension + //LinkedList routerList = NetworkReader.createFlow(ParameterReader.networkFilename); + //Link l = new FlowLink("rc_link", baud_rate, propDelay, mtu); + //------------------------------------------- + TopRegionalRC rc = new TopRegionalRC(l); //connect the TopRC to a router specified in the parameters file Modified: trunk/examples/DataGrid/example4/SimUser.java =================================================================== --- trunk/examples/DataGrid/example4/SimUser.java 2008-10-12 06:37:26 UTC (rev 255) +++ trunk/examples/DataGrid/example4/SimUser.java 2008-10-12 06:38:06 UTC (rev 256) @@ -23,11 +23,13 @@ private ArrayList tasks; // constructor - SimUser(String name, double baud_rate, double delay, int MTU) - throws Exception { - //super(name, new SimpleLink(name + "_link", baud_rate, delay, MTU)); - super(name, new FlowLink(name + "_link", baud_rate, delay, MTU)); + SimUser(String name, double baud_rate, double delay, int MTU) throws Exception { + super(name, new SimpleLink(name + "_link", baud_rate, delay, MTU)); + + // NOTE: uncomment this if you want to use the new Flow extension + //super(name, new FlowLink(name + "_link", baud_rate, delay, MTU)); + this.name_ = name; this.tasks = new ArrayList(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |