From: <sul...@us...> - 2008-10-11 03:28:57
|
Revision: 254 http://gridsim.svn.sourceforge.net/gridsim/?rev=254&view=rev Author: sulistio Date: 2008-10-11 03:28:52 +0000 (Sat, 11 Oct 2008) Log Message: ----------- add javadoc target to the build file, and minor update to the javadoc script. Modified Paths: -------------- trunk/build.xml trunk/javadoc.sh Added Paths: ----------- trunk/source/gridsim/net/fnb/package.html Modified: trunk/build.xml =================================================================== --- trunk/build.xml 2008-10-11 03:26:18 UTC (rev 253) +++ trunk/build.xml 2008-10-11 03:28:52 UTC (rev 254) @@ -24,6 +24,10 @@ <description> This is the build file for GridSim </description> + + <!-- GridSim version number and release year for javadoc --> + <property name="version" value="4.2"/> + <property name="year" value="2008"/> <!-- location to store Java classes --> <property name="class.dir" location="./classes" /> @@ -67,6 +71,25 @@ <delete dir="${class.dir}/gridsim"/> </target> + <target name="javadoc" description="Create Javadocs"> + <mkdir dir="${doc.dir}" /> + <javadoc access="package" author="true" + version="true" use="true" + noqualifier="all" + windowtitle="GridSim ${version} API Specification" + doctitle="GridSim ${version} API Specification" + header="GridSim ${version}" + bottom="The University of Melbourne, Australia, ${year}" + destdir="${doc.dir}"> + + <tag name="invariant" scope="all" description="Invariant:"/> + <tag name="pre" scope="all" description="Pre Condition:"/> + <tag name="post" scope="all" description="Post Condition:"/> + <fileset dir="./source" includes="**/*.java" /> + + </javadoc> + </target> + </project> Modified: trunk/javadoc.sh =================================================================== --- trunk/javadoc.sh 2008-10-11 03:26:18 UTC (rev 253) +++ trunk/javadoc.sh 2008-10-11 03:28:52 UTC (rev 254) @@ -1,8 +1,8 @@ ## A script to run javadoc (Anthony Sept 2004). -year="2007" # year -ver="v4.1" # version number +year="2008" # year +ver="v4.2" # version number dir=./source # source directory that contains Java files doc=./doc # output directory @@ -17,9 +17,13 @@ -tag pre:a:"Pre Condition:" \ -tag post:a:"Post Condition:" \ -tag invariant:t:"Invariant:" \ + $dir/eduni/simjava/*.java \ + $dir/eduni/simjava/distributions/*.java \ $dir/gridsim/*.java \ $dir/gridsim/util/*.java \ $dir/gridsim/net/*.java \ + $dir/gridsim/net/flow/*.java \ + $dir/gridsim/net/fnb/*.java \ $dir/gridsim/filter/*.java \ $dir/gridsim/index/*.java \ $dir/gridsim/resFailure/*.java \ Added: trunk/source/gridsim/net/fnb/package.html =================================================================== --- trunk/source/gridsim/net/fnb/package.html (rev 0) +++ trunk/source/gridsim/net/fnb/package.html 2008-10-11 03:28:52 UTC (rev 254) @@ -0,0 +1,5 @@ +<html> + <body> + Classes that form the finite network buffer extension of <code>GridSim</code>. + </body> +</html> \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sul...@us...> - 2008-10-12 11:22:33
|
Revision: 258 http://gridsim.svn.sourceforge.net/gridsim/?rev=258&view=rev Author: sulistio Date: 2008-10-12 10:59:53 +0000 (Sun, 12 Oct 2008) Log Message: ----------- minor changes with regards to documentation or javadoc Modified Paths: -------------- trunk/README.txt trunk/build.xml trunk/examples/Network/README.txt trunk/javadoc.sh trunk/source/gridsim/net/flow/FlowInput.java Added Paths: ----------- trunk/source/gridsim/net/flow/package.html Modified: trunk/README.txt =================================================================== --- trunk/README.txt 2008-10-12 10:58:04 UTC (rev 257) +++ trunk/README.txt 2008-10-12 10:59:53 UTC (rev 258) @@ -29,9 +29,9 @@ http://www.gridbus.org/gridsim/release.html -Software Requirements : Java version 1.4.2 or newer +Software Requirements : Java version 1.50 or newer --------------------- -GridSim has been tested and ran on Sun's Java version 1.4.2 or newer. +GridSim has been tested and ran on Sun's Java version 1.5.0 or newer. Older versions of Java are not compatible. If you have non-Sun Java version, such as gcj or J++, they may not be compatible. You also need to install Ant to compile GridSim (explained in more details later). @@ -117,10 +117,20 @@ GridSim mailing lists can be found below: http://sourceforge.net/projects/gridsim/ then click on the "Mailing Lists" tab. + Please subscribe to the following mailing lists: -gridsim-users (at) lists.sourceforge.net - for any queries and feedbacks -gridsim-developers (at) lists.sourceforge.net - for contributing to GridSim +* For general queries and feedbacks: + gridsim-users (at) lists.sourceforge.net + +* For contributing to GridSim or questions related to the existing GridSim code: + gridsim-developers (at) lists.sourceforge.net + +To subscribe, go to + https://lists.sourceforge.net/lists/listinfo/gridsim-users + https://lists.sourceforge.net/lists/listinfo/gridsim-developers + + Contributors are always needed to improve and maintain GridSim. Another option is to integrate your work/project into future GridSim releases. If you want to contribute, advertise yourself to us. @@ -140,6 +150,7 @@ we analyze your problem. Hence, the sooner we can reply. * Please send your questions to these mailing lists so that other people can read and reply them. +* Please only send to one of the mailing lists. * We have hectic schedules, so do not expect an instant reply. Modified: trunk/build.xml =================================================================== --- trunk/build.xml 2008-10-12 10:58:04 UTC (rev 257) +++ trunk/build.xml 2008-10-12 10:59:53 UTC (rev 258) @@ -26,14 +26,14 @@ </description> <!-- GridSim version number and release year for javadoc --> - <property name="version" value="4.2"/> + <property name="version" value="4.2 beta"/> <property name="year" value="2008"/> <!-- location to store Java classes --> <property name="class.dir" location="./classes" /> <!-- location to store GridSim source files --> - <property name="src.dir" location="./source/gridsim" /> + <property name="src.dir" location="./source" /> <!-- location to store jar files --> <property name="jar.dir" location="./jars" /> @@ -85,7 +85,7 @@ <tag name="invariant" scope="all" description="Invariant:"/> <tag name="pre" scope="all" description="Pre Condition:"/> <tag name="post" scope="all" description="Post Condition:"/> - <fileset dir="./source" includes="**/*.java" /> + <fileset dir="${src.dir}" includes="**/*.java" /> </javadoc> </target> Modified: trunk/examples/Network/README.txt =================================================================== --- trunk/examples/Network/README.txt 2008-10-12 10:58:04 UTC (rev 257) +++ trunk/examples/Network/README.txt 2008-10-12 10:59:53 UTC (rev 258) @@ -1,6 +1,10 @@ This directory contains few GridSim network extension examples. Here are the summary of what each example does: +./FiniteBuffer01 : shows how to use the finite network buffer functionality + +./Flow : shows how to use the flow network functionality + ./NetEx01 : shows how to connect two GridSim entities using a link. ./NetEx02 : shows how to build a network topology for users and Modified: trunk/javadoc.sh =================================================================== --- trunk/javadoc.sh 2008-10-12 10:58:04 UTC (rev 257) +++ trunk/javadoc.sh 2008-10-12 10:59:53 UTC (rev 258) @@ -2,7 +2,7 @@ ## A script to run javadoc (Anthony Sept 2004). year="2008" # year -ver="v4.2" # version number +ver="v4.2 beta" # version number dir=./source # source directory that contains Java files doc=./doc # output directory Modified: trunk/source/gridsim/net/flow/FlowInput.java =================================================================== --- trunk/source/gridsim/net/flow/FlowInput.java 2008-10-12 10:58:04 UTC (rev 257) +++ trunk/source/gridsim/net/flow/FlowInput.java 2008-10-12 10:59:53 UTC (rev 258) @@ -128,14 +128,14 @@ /** * This is an empty method and only applicable to - * {@link gridsim.net.FlowOutput} class. + * {@link gridsim.net.flow.FlowOutput} class. * @param gen a background traffic generator * @param userName a collection of user entity name (in String object). * @return <tt>false</tt> since this method is not used by this class. * @pre gen != null * @pre userName != null * @post $none - * @see gridsim.net.Output + * @see gridsim.net.flow.FlowOutput */ public boolean setBackgroundTraffic(TrafficGenerator gen, Collection userName) Added: trunk/source/gridsim/net/flow/package.html =================================================================== --- trunk/source/gridsim/net/flow/package.html (rev 0) +++ trunk/source/gridsim/net/flow/package.html 2008-10-12 10:59:53 UTC (rev 258) @@ -0,0 +1,5 @@ +<html> + <body> + Classes that form the network flow extension of <code>GridSim</code>. + </body> +</html> \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mar...@us...> - 2009-05-19 12:43:32
|
Revision: 265 http://gridsim.svn.sourceforge.net/gridsim/?rev=265&view=rev Author: marcos_dias Date: 2009-05-19 12:18:14 +0000 (Tue, 19 May 2009) Log Message: ----------- Changes from 4.2 to 5.0 - Improvements to make GridSim more compatible with Java 5 and 6 - Changes in SimJava to enable a simulation to be paused and resumed. - Add a new package (i.e. gridsim.parallel) that provides: * A graphical user interface for debugging resource allocation policies * several allocation policies for scheduling parallel jobs on clusters and and supercomputers. The policies include aggressive backfilling, conservative backfilling, advance reservation with conservative backfilling, selective backfilling and agressive backfilling with multiple resource partitions. * A workload model by Lublin and Feitelson for generating jobs for grid resources. * A data structure to facilitate the scheduling of jobs and advance reservations. * Logging features using Java logging API. Modified Paths: -------------- trunk/build.xml trunk/changelog.txt trunk/jars/simjava2.jar trunk/release_note.txt trunk/source/gridsim/ARGridResource.java trunk/source/gridsim/ARObject.java trunk/source/gridsim/ARPolicy.java trunk/source/gridsim/ARSimpleSpaceShared.java trunk/source/gridsim/Accumulator.java trunk/source/gridsim/AdvanceReservation.java trunk/source/gridsim/AllocPolicy.java trunk/source/gridsim/GridInformationService.java trunk/source/gridsim/GridResource.java trunk/source/gridsim/GridSim.java trunk/source/gridsim/GridSimCore.java trunk/source/gridsim/GridSimRandom.java trunk/source/gridsim/GridSimShutdown.java trunk/source/gridsim/GridSimStandardPE.java trunk/source/gridsim/GridSimTags.java trunk/source/gridsim/GridStatistics.java trunk/source/gridsim/GridUser.java trunk/source/gridsim/Gridlet.java trunk/source/gridsim/GridletList.java trunk/source/gridsim/IO_data.java trunk/source/gridsim/Machine.java trunk/source/gridsim/MachineList.java trunk/source/gridsim/PE.java trunk/source/gridsim/PEList.java trunk/source/gridsim/ParameterException.java trunk/source/gridsim/ResGridlet.java trunk/source/gridsim/ResGridletList.java trunk/source/gridsim/ResourceCalendar.java trunk/source/gridsim/ResourceCharacteristics.java trunk/source/gridsim/ResourceUserList.java trunk/source/gridsim/Sim_from_port.java trunk/source/gridsim/Stat.java trunk/source/gridsim/auction/AuctionTags.java trunk/source/gridsim/datagrid/DataGridResource.java trunk/source/gridsim/datagrid/DataGridTags.java trunk/source/gridsim/datagrid/DataGridUser.java trunk/source/gridsim/datagrid/DataGridlet.java trunk/source/gridsim/datagrid/File.java trunk/source/gridsim/datagrid/FileAttribute.java trunk/source/gridsim/datagrid/ReplicaManager.java trunk/source/gridsim/datagrid/SimpleReplicaManager.java trunk/source/gridsim/datagrid/filter/FileNameFilter.java trunk/source/gridsim/datagrid/filter/Filter.java trunk/source/gridsim/datagrid/filter/FilterDataResult.java trunk/source/gridsim/datagrid/index/AbstractRC.java trunk/source/gridsim/datagrid/index/DataGIS.java trunk/source/gridsim/datagrid/index/DataRegionalGIS.java trunk/source/gridsim/datagrid/index/RegionalRC.java trunk/source/gridsim/datagrid/index/TopRegionalRC.java trunk/source/gridsim/datagrid/storage/HarddriveStorage.java trunk/source/gridsim/datagrid/storage/Storage.java trunk/source/gridsim/datagrid/storage/TapeStorage.java trunk/source/gridsim/filter/FilterCreateAR.java trunk/source/gridsim/filter/FilterGridlet.java trunk/source/gridsim/filter/FilterQueryTimeAR.java trunk/source/gridsim/filter/FilterResult.java trunk/source/gridsim/net/fnb/FIFO.java trunk/source/gridsim/net/fnb/FnbSCFQScheduler.java trunk/source/gridsim/net/fnb/FnbWhiteList.java trunk/source/gridsim/net/fnb/RED.java trunk/source/gridsim/resFailure/AllocPolicyWithFailure.java trunk/source/gridsim/resFailure/AvailabilityInfo.java trunk/source/gridsim/resFailure/FailureMsg.java trunk/source/gridsim/resFailure/GridResourceWithFailure.java trunk/source/gridsim/resFailure/RegionalGISWithFailure.java trunk/source/gridsim/resFailure/SpaceSharedWithFailure.java trunk/source/gridsim/resFailure/TimeSharedWithFailure.java trunk/source/gridsim/util/HyperExponential.java trunk/source/gridsim/util/LCGRandom.java trunk/source/gridsim/util/NetworkReader.java trunk/source/gridsim/util/Workload.java Added Paths: ----------- trunk/examples/ResFailure/ trunk/examples/ResFailure/example01/ trunk/examples/ResFailure/example01/Ex01_Regional_GIS trunk/examples/ResFailure/example01/Ex01_Res_0 trunk/examples/ResFailure/example01/Ex01_Res_1 trunk/examples/ResFailure/example01/Ex01_Res_2 trunk/examples/ResFailure/example01/Ex01_User0 trunk/examples/ResFailure/example01/Ex01_User0_Fin trunk/examples/ResFailure/example01/GridUserFailureEx01.java trunk/examples/ResFailure/example01/GridletSubmission.java trunk/examples/ResFailure/example01/ResFailureEx01.java trunk/examples/ResFailure/example01/network_ex01.txt trunk/examples/ResFailure/example01/output.txt trunk/examples/ResFailure/example01/readme.txt trunk/examples/ResFailure/example02/ trunk/examples/ResFailure/example02/Ex02_Regional_GIS trunk/examples/ResFailure/example02/Ex02_Res_0 trunk/examples/ResFailure/example02/Ex02_Res_1 trunk/examples/ResFailure/example02/Ex02_Res_2 trunk/examples/ResFailure/example02/Ex02_Res_3 trunk/examples/ResFailure/example02/Ex02_Res_4 trunk/examples/ResFailure/example02/Ex02_Res_5 trunk/examples/ResFailure/example02/Ex02_User_0 trunk/examples/ResFailure/example02/GridUserFailureEx02.java trunk/examples/ResFailure/example02/GridletSubmission.java trunk/examples/ResFailure/example02/ResFailureEx02.java trunk/examples/ResFailure/example02/network_ex02.txt trunk/examples/ResFailure/example02/output.txt trunk/examples/ResFailure/example02/readme.txt trunk/examples/ResFailure/example03/ trunk/examples/ResFailure/example03/Ex03_Regional_GIS_0 trunk/examples/ResFailure/example03/Ex03_Regional_GIS_1 trunk/examples/ResFailure/example03/Ex03_Regional_GIS_2 trunk/examples/ResFailure/example03/Ex03_Res_0 trunk/examples/ResFailure/example03/Ex03_Res_10 trunk/examples/ResFailure/example03/Ex03_Res_12 trunk/examples/ResFailure/example03/Ex03_Res_14 trunk/examples/ResFailure/example03/Ex03_Res_2 trunk/examples/ResFailure/example03/Ex03_Res_4 trunk/examples/ResFailure/example03/Ex03_Res_6 trunk/examples/ResFailure/example03/Ex03_Res_8 trunk/examples/ResFailure/example03/Ex03_User_0 trunk/examples/ResFailure/example03/GridUserFailureEx03.java trunk/examples/ResFailure/example03/GridletSubmission.java trunk/examples/ResFailure/example03/ResFailureEx03.java trunk/examples/ResFailure/example03/network_ex03.txt trunk/examples/ResFailure/example03/output.txt trunk/examples/ResFailure/example03/readme.txt trunk/examples/ResFailure/readme.txt trunk/examples/WorkloadTrace/ trunk/examples/WorkloadTrace/custom_trace.txt trunk/examples/WorkloadTrace/example01/ trunk/examples/WorkloadTrace/example01/TraceEx01.java trunk/examples/WorkloadTrace/example01/output.txt trunk/examples/WorkloadTrace/example01/readme.txt trunk/examples/WorkloadTrace/example02/ trunk/examples/WorkloadTrace/example02/TraceEx02.java trunk/examples/WorkloadTrace/example02/User.java trunk/examples/WorkloadTrace/example02/output.txt trunk/examples/WorkloadTrace/example02/readme.txt trunk/examples/WorkloadTrace/example03/ trunk/examples/WorkloadTrace/example03/NetUser.java trunk/examples/WorkloadTrace/example03/TraceEx03.java trunk/examples/WorkloadTrace/example03/output.txt trunk/examples/WorkloadTrace/example03/readme.txt trunk/examples/WorkloadTrace/l_lanl_o2k.swf.txt trunk/examples/WorkloadTrace/l_sdsc_blue.swf.txt trunk/examples/WorkloadTrace/readme.txt trunk/examples/auction/ trunk/examples/auction/example01/ trunk/examples/auction/example01/AuctionResource.java trunk/examples/auction/example01/Broker.java trunk/examples/auction/example01/ExampleAuction.java trunk/examples/auction/example01/ResponderImpl.java trunk/examples/auction/example01/output.txt trunk/examples/auction/example02/ trunk/examples/auction/example02/AuctionResource.java trunk/examples/auction/example02/Broker.java trunk/examples/auction/example02/ExampleAuction.java trunk/examples/auction/example02/NetUser.java trunk/examples/auction/example02/ResponderImpl.java trunk/examples/auction/example02/output.txt trunk/examples/auction/example03/ trunk/examples/auction/example03/AuctionResource.java trunk/examples/auction/example03/Broker.java trunk/examples/auction/example03/ExampleAuction.java trunk/examples/auction/example03/NetUser.java trunk/examples/auction/example03/ResponderImpl.java trunk/examples/auction/example03/output.txt trunk/examples/auction/example_of_use.pdf trunk/examples/auction/readme.txt trunk/examples/datagrid/ trunk/examples/datagrid/example01/ trunk/examples/datagrid/example01/DataExample1.java trunk/examples/datagrid/example01/DummyUser.java trunk/examples/datagrid/example01/output.txt trunk/examples/datagrid/example01/readme.txt trunk/examples/datagrid/example02/ trunk/examples/datagrid/example02/DataExample2.java trunk/examples/datagrid/example02/FileUser.java trunk/examples/datagrid/example02/output.txt trunk/examples/datagrid/example02/readme.txt trunk/examples/datagrid/example03/ trunk/examples/datagrid/example03/DataGridletExample.java trunk/examples/datagrid/example03/DataGridletUser.java trunk/examples/datagrid/example03/output.txt trunk/examples/datagrid/example03/readme.txt trunk/examples/datagrid/example04/ trunk/examples/datagrid/example04/DataGridSim.java trunk/examples/datagrid/example04/FilesReader.java trunk/examples/datagrid/example04/ParameterReader.java trunk/examples/datagrid/example04/ResourceReader.java trunk/examples/datagrid/example04/SimUser.java trunk/examples/datagrid/example04/UserReader.java trunk/examples/datagrid/example04/files.txt trunk/examples/datagrid/example04/network.txt trunk/examples/datagrid/example04/output.txt trunk/examples/datagrid/example04/parameters.txt trunk/examples/datagrid/example04/readme.txt trunk/examples/datagrid/example04/resources.txt trunk/examples/datagrid/example04/users.txt trunk/examples/datagrid/tutorial/ trunk/examples/datagrid/tutorial/Simulation.html trunk/examples/datagrid/tutorial/connectEntities.html trunk/examples/datagrid/tutorial/createNetwork.html trunk/examples/datagrid/tutorial/createTopLevelRC.html trunk/examples/datagrid/tutorial/createUsers.html trunk/examples/datagrid/tutorial/creatingResources.html trunk/examples/datagrid/tutorial/design_architecture.html trunk/examples/datagrid/tutorial/getting_started.html trunk/examples/datagrid/tutorial/img/ trunk/examples/datagrid/tutorial/img/CentralRC.png trunk/examples/datagrid/tutorial/img/ExampleTopology.png trunk/examples/datagrid/tutorial/img/Resource.png trunk/examples/datagrid/tutorial/img/TwoLevelRC1.png trunk/examples/datagrid/tutorial/img/TwoLevelRC2.png trunk/examples/datagrid/tutorial/img/logo.png trunk/examples/datagrid/tutorial/index.html trunk/examples/datagrid/tutorial/initialization.html trunk/examples/datagrid/tutorial/writingRC.html trunk/examples/datagrid/tutorial/writingRM.html trunk/examples/gridsim/ trunk/examples/gridsim/example01/ trunk/examples/gridsim/example01/Example1.java trunk/examples/gridsim/example01/readme.txt trunk/examples/gridsim/example02/ trunk/examples/gridsim/example02/Example2.java trunk/examples/gridsim/example02/readme.txt trunk/examples/gridsim/example03/ trunk/examples/gridsim/example03/Example3.java trunk/examples/gridsim/example03/Test.java trunk/examples/gridsim/example03/output.txt trunk/examples/gridsim/example03/readme.txt trunk/examples/gridsim/example04/ trunk/examples/gridsim/example04/Example4.java trunk/examples/gridsim/example04/GridSim_stat.txt trunk/examples/gridsim/example04/output.txt trunk/examples/gridsim/example04/readme.txt trunk/examples/gridsim/example05/ trunk/examples/gridsim/example05/Example5.java trunk/examples/gridsim/example05/GridSim_stat.txt trunk/examples/gridsim/example05/output.txt trunk/examples/gridsim/example05/readme.txt trunk/examples/gridsim/example06/ trunk/examples/gridsim/example06/Example6.java trunk/examples/gridsim/example06/GridSim_stat.txt trunk/examples/gridsim/example06/output.txt trunk/examples/gridsim/example06/readme.txt trunk/examples/gridsim/example07/ trunk/examples/gridsim/example07/Test.java trunk/examples/gridsim/example07/TestCase1.java trunk/examples/gridsim/example07/TestCase2.java trunk/examples/gridsim/example07/TestCase3.java trunk/examples/gridsim/example07/TestCase4.java trunk/examples/gridsim/example07/TestCase5.java trunk/examples/gridsim/example07/TestCase6.java trunk/examples/gridsim/example07/TestCase7.java trunk/examples/gridsim/example07/TestCase8.java trunk/examples/gridsim/example07/outputSpaceCase8.txt trunk/examples/gridsim/example07/outputTimeCase5.txt trunk/examples/gridsim/example07/readme.txt trunk/examples/gridsim/example08/ trunk/examples/gridsim/example08/Example8.java trunk/examples/gridsim/example08/NewPolicy.java trunk/examples/gridsim/example08/output.txt trunk/examples/gridsim/example08/readme.txt trunk/examples/gridsim/example09/ trunk/examples/gridsim/example09/Example9.java trunk/examples/gridsim/example09/NewGIS.java trunk/examples/gridsim/example09/NewGridResource.java trunk/examples/gridsim/example09/output.txt trunk/examples/gridsim/example09/readme.txt trunk/examples/gridsim/example10/ trunk/examples/gridsim/example10/ARTest.java trunk/examples/gridsim/example10/Example10.java trunk/examples/gridsim/example10/readme.txt trunk/examples/gridsim/regionalGIS/ trunk/examples/gridsim/regionalGIS/ExampleGIS.java trunk/examples/gridsim/regionalGIS/NetUserGIS.java trunk/examples/gridsim/regionalGIS/output.txt trunk/examples/gridsim/regionalGIS/readme.txt trunk/examples/network/ trunk/examples/network/FiniteBuffer/ trunk/examples/network/FiniteBuffer/FnbUser.java trunk/examples/network/FiniteBuffer/GridletSubmission.java trunk/examples/network/FiniteBuffer/mainExample.java trunk/examples/network/FiniteBuffer/network_example.txt trunk/examples/network/FiniteBuffer/readme.txt trunk/examples/network/example01/ trunk/examples/network/example01/NetEx01.java trunk/examples/network/example01/NetUser.java trunk/examples/network/example01/Test.java trunk/examples/network/example01/output.txt trunk/examples/network/example01/readme.txt trunk/examples/network/example01/test.csv trunk/examples/network/example02/ trunk/examples/network/example02/NetEx02.java trunk/examples/network/example02/NetUser.java trunk/examples/network/example02/User_0.csv trunk/examples/network/example02/User_1.csv trunk/examples/network/example02/output.txt trunk/examples/network/example02/readme.txt trunk/examples/network/example02/router1_report.csv trunk/examples/network/example02/router2_report.csv trunk/examples/network/example03/ trunk/examples/network/example03/NetEx03.java trunk/examples/network/example03/NetUser.java trunk/examples/network/example03/User_0.csv trunk/examples/network/example03/User_1.csv trunk/examples/network/example03/output.txt trunk/examples/network/example03/readme.txt trunk/examples/network/example03/router1_report.csv trunk/examples/network/example03/router2_report.csv trunk/examples/network/flow/ trunk/examples/network/flow/example01/ trunk/examples/network/flow/example01/FlowNetEx01.java trunk/examples/network/flow/example01/FlowNetUser.java trunk/examples/network/flow/example01/FlowTest.java trunk/examples/network/flow/example01/output.txt trunk/examples/network/flow/example01/readme.txt trunk/examples/network/flow/example01/test1.csv trunk/examples/network/flow/example01/test2.csv trunk/examples/network/flow/example02/ trunk/examples/network/flow/example02/FlowNetEx02.java trunk/examples/network/flow/example02/FlowNetUser.java trunk/examples/network/flow/example02/User_0.csv trunk/examples/network/flow/example02/User_1.csv trunk/examples/network/flow/example02/output.txt trunk/examples/network/flow/example02/readme.txt trunk/examples/network/flow/example02/router1_report.csv trunk/examples/network/flow/example02/router2_report.csv trunk/examples/network/rate/ trunk/examples/network/rate/NetUser.java trunk/examples/network/rate/R1_report.csv trunk/examples/network/rate/RateExample.java trunk/examples/network/rate/network.txt trunk/examples/network/rate/output.txt trunk/examples/network/rate/readme.txt trunk/examples/network/readme.txt trunk/examples/network/scfq/ trunk/examples/network/scfq/NetUser.java trunk/examples/network/scfq/R1_report.csv trunk/examples/network/scfq/SCFQExample.java trunk/examples/network/scfq/network.txt trunk/examples/network/scfq/output.txt trunk/examples/network/scfq/readme.txt trunk/examples/parallel/ trunk/examples/parallel/agressive/ trunk/examples/parallel/agressive/ExampleEASY01.java trunk/examples/parallel/conservative/ trunk/examples/parallel/conservative/ExampleCB01.java trunk/examples/parallel/partitions/ trunk/examples/parallel/partitions/ExampleMulti01.java trunk/examples/parallel/partitions/ExampleMulti02.java trunk/examples/parallel/reservation/ trunk/examples/parallel/reservation/ARExample01.java trunk/examples/parallel/reservation/ARUser.java trunk/examples/parallel/sdsc_blue_01.txt trunk/examples/parallel/sdsc_blue_02.txt trunk/examples/parallel/selective/ trunk/examples/parallel/selective/ExampleSelective01.java trunk/examples/parallel/selective/ExampleSelective02.java trunk/examples/parallel/util/ trunk/examples/parallel/util/ExampleLublin99.java trunk/examples/readme.txt trunk/source/gridsim/parallel/ trunk/source/gridsim/parallel/ParallelResource.java trunk/source/gridsim/parallel/ResourceDynamics.java trunk/source/gridsim/parallel/SSGridlet.java trunk/source/gridsim/parallel/SSGridletList.java trunk/source/gridsim/parallel/gui/ trunk/source/gridsim/parallel/gui/AbstractVisualizer.java trunk/source/gridsim/parallel/gui/ActionType.java trunk/source/gridsim/parallel/gui/AllocationAction.java trunk/source/gridsim/parallel/gui/AllocationListener.java trunk/source/gridsim/parallel/gui/GUISettings.java trunk/source/gridsim/parallel/gui/JobTypePanel.java trunk/source/gridsim/parallel/gui/ParallelVisualizer.java trunk/source/gridsim/parallel/gui/ResourceWindow.java trunk/source/gridsim/parallel/gui/Visualizer.java trunk/source/gridsim/parallel/gui/VisualizerAdaptor.java trunk/source/gridsim/parallel/gui/gui.properties trunk/source/gridsim/parallel/log/ trunk/source/gridsim/parallel/log/LogFormatter.java trunk/source/gridsim/parallel/log/LoggerEnum.java trunk/source/gridsim/parallel/log/Logging.java trunk/source/gridsim/parallel/profile/ trunk/source/gridsim/parallel/profile/LinkedTreeMap.java trunk/source/gridsim/parallel/profile/PERange.java trunk/source/gridsim/parallel/profile/PERangeList.java trunk/source/gridsim/parallel/profile/PartProfile.java trunk/source/gridsim/parallel/profile/PartProfileEntry.java trunk/source/gridsim/parallel/profile/PartitionPredicate.java trunk/source/gridsim/parallel/profile/Profile.java trunk/source/gridsim/parallel/profile/ProfileEntry.java trunk/source/gridsim/parallel/profile/ResourcePartition.java trunk/source/gridsim/parallel/profile/ScheduleItem.java trunk/source/gridsim/parallel/profile/SingleProfile.java trunk/source/gridsim/parallel/profile/SingleProfileEntry.java trunk/source/gridsim/parallel/profile/TimeSlot.java trunk/source/gridsim/parallel/reservation/ trunk/source/gridsim/parallel/reservation/ErrorType.java trunk/source/gridsim/parallel/reservation/FilterARMessage.java trunk/source/gridsim/parallel/reservation/MessageType.java trunk/source/gridsim/parallel/reservation/Reservation.java trunk/source/gridsim/parallel/reservation/ReservationMessage.java trunk/source/gridsim/parallel/reservation/ReservationPolicy.java trunk/source/gridsim/parallel/reservation/ReservationRequester.java trunk/source/gridsim/parallel/reservation/ReservationStatus.java trunk/source/gridsim/parallel/reservation/ServerReservation.java trunk/source/gridsim/parallel/scheduler/ trunk/source/gridsim/parallel/scheduler/ARConservativeBackfill.java trunk/source/gridsim/parallel/scheduler/AggressiveBackfill.java trunk/source/gridsim/parallel/scheduler/AggressiveMultiPartitions.java trunk/source/gridsim/parallel/scheduler/ConservativeBackfill.java trunk/source/gridsim/parallel/scheduler/PrioritySelector.java trunk/source/gridsim/parallel/scheduler/RuntimePredicate.java trunk/source/gridsim/parallel/scheduler/SelectiveBackfill.java trunk/source/gridsim/parallel/util/ trunk/source/gridsim/parallel/util/Workload.java trunk/source/gridsim/parallel/util/WorkloadFileReader.java trunk/source/gridsim/parallel/util/WorkloadJob.java trunk/source/gridsim/parallel/util/WorkloadLublin99.java trunk/source/gridsim/parallel/util/WorkloadModel.java Modified: trunk/build.xml =================================================================== --- trunk/build.xml 2009-05-19 11:41:03 UTC (rev 264) +++ trunk/build.xml 2009-05-19 12:18:14 UTC (rev 265) @@ -26,8 +26,8 @@ </description> <!-- GridSim version number and release year for javadoc --> - <property name="version" value="4.2 beta"/> - <property name="year" value="2008"/> + <property name="version" value="5.0 beta"/> + <property name="year" value="2009"/> <!-- location to store Java classes --> <property name="class.dir" location="./classes" /> @@ -45,7 +45,6 @@ <property name="classpath" location="${jar.dir}/simjava2.jar" /> - <target name="prepare"> <mkdir dir="${class.dir}" /> </target> @@ -62,9 +61,9 @@ * The new jar file only contains gridsim classes NOT SimJava2. --> <target name="makejar" depends="build"> - <echo>Compiling a new jar file, named: "new_gridsim.jar".</echo> + <echo>Compiling a new jar file, named: "gridsim.jar".</echo> <echo>This jar file only contains GridSim classes but not SimJava2.</echo> - <jar destfile="${jar.dir}/new_gridsim.jar" basedir="${class.dir}" /> + <jar destfile="${jar.dir}/gridsim.jar" basedir="${class.dir}" /> </target> <target name="clean" description="clean up" > Modified: trunk/changelog.txt =================================================================== --- trunk/changelog.txt 2009-05-19 11:41:03 UTC (rev 264) +++ trunk/changelog.txt 2009-05-19 12:18:14 UTC (rev 265) @@ -1,7 +1,17 @@ # Changelog for GridSim Toolkit -# Maintained by Anthony Sulistio -# $Id: changelog.txt,v 1.7 2007/09/01 02:40:12 anthony Exp $ +Changes from 4.2 to 5.0 +- Improvements to make GridSim more compatible with Java 5 and 6 +- Changes in SimJava to enable a simulation to be paused and resumed. +- Add a new package (i.e. gridsim.parallel) that provides: + * A graphical user interface for debugging resource allocation policies + * several allocation policies for scheduling parallel jobs on clusters and + and supercomputers. The policies include aggressive backfilling, conservative + backfilling, advance reservation with conservative backfilling, selective + backfilling and agressive backfilling with multiple resource partitions. + * A workload model by Lublin and Feitelson for generating jobs for grid resources. + * A data structure to facilitate the scheduling of jobs and advance reservations. + * Logging features using Java logging API. Changes from 4.0 to 4.1 - add a new functionality that supports resource failures during runtime. Added: trunk/examples/ResFailure/example01/Ex01_Regional_GIS =================================================================== --- trunk/examples/ResFailure/example01/Ex01_Regional_GIS (rev 0) +++ trunk/examples/ResFailure/example01/Ex01_Regional_GIS 2009-05-19 12:18:14 UTC (rev 265) @@ -0,0 +1,4 @@ +Event ResourceID Clock +Registering 10 10.020000998399999 +Registering 15 10.030000998399998 +Registering 20 10.040000998399998 Added: trunk/examples/ResFailure/example01/Ex01_Res_0 =================================================================== --- trunk/examples/ResFailure/example01/Ex01_Res_0 (rev 0) +++ trunk/examples/ResFailure/example01/Ex01_Res_0 2009-05-19 12:18:14 UTC (rev 265) @@ -0,0 +1 @@ +Event NumMachines Clock Added: trunk/examples/ResFailure/example01/Ex01_Res_1 =================================================================== --- trunk/examples/ResFailure/example01/Ex01_Res_1 (rev 0) +++ trunk/examples/ResFailure/example01/Ex01_Res_1 2009-05-19 12:18:14 UTC (rev 265) @@ -0,0 +1,2 @@ +Event NumMachines Clock +Failure 3 31.205408168820174 Added: trunk/examples/ResFailure/example01/Ex01_Res_2 =================================================================== --- trunk/examples/ResFailure/example01/Ex01_Res_2 (rev 0) +++ trunk/examples/ResFailure/example01/Ex01_Res_2 2009-05-19 12:18:14 UTC (rev 265) @@ -0,0 +1 @@ +Event NumMachines Clock Added: trunk/examples/ResFailure/example01/Ex01_User0 =================================================================== --- trunk/examples/ResFailure/example01/Ex01_User0 (rev 0) +++ trunk/examples/ResFailure/example01/Ex01_User0 2009-05-19 12:18:14 UTC (rev 265) @@ -0,0 +1,11 @@ +User Event GridletID Resource GridletStatus Clock +Ex01_User0 Sending 0 Ex01_Res_2 Created 374.04012479999994 +Ex01_User0 Sending 1 Ex01_Res_1 Created 374.77037439999924 +Ex01_User0 Sending 2 Ex01_Res_2 Created 375.50062399999854 +Ex01_User0 Sending 3 Ex01_Res_2 Created 376.23087359999784 +Ex01_User0 Sending 4 Ex01_Res_0 Created 376.96112319999713 +Ex01_User0 Receiving 0 Ex01_Res_2 Success 1233.4001439999986 +Ex01_User0 Receiving 1 Ex01_Res_1 Success 1234.130393599998 +Ex01_User0 Receiving 2 Ex01_Res_2 Success 1234.8606431999972 +Ex01_User0 Receiving 3 Ex01_Res_2 Success 1235.5306431999966 +Ex01_User0 Receiving 4 Ex01_Res_0 Success 1236.3211423999958 Added: trunk/examples/ResFailure/example01/Ex01_User0_Fin =================================================================== --- trunk/examples/ResFailure/example01/Ex01_User0_Fin (rev 0) +++ trunk/examples/ResFailure/example01/Ex01_User0_Fin 2009-05-19 12:18:14 UTC (rev 265) @@ -0,0 +1,6 @@ +User GridletID Resource Cost CPU time Latency +Ex01_User0 0 Ex01_Res_2 2574.0 858.0 245555.1188510172 +Ex01_User0 1 Ex01_Res_1 2574.0 858.0 245555.1188510172 +Ex01_User0 2 Ex01_Res_2 2574.0 858.0 245555.1188510172 +Ex01_User0 3 Ex01_Res_2 2571.809251200002 857.2697504000007 245555.1188510172 +Ex01_User0 4 Ex01_Res_0 2574.0 858.0 245555.1188510172 Added: trunk/examples/ResFailure/example01/GridUserFailureEx01.java =================================================================== --- trunk/examples/ResFailure/example01/GridUserFailureEx01.java (rev 0) +++ trunk/examples/ResFailure/example01/GridUserFailureEx01.java 2009-05-19 12:18:14 UTC (rev 265) @@ -0,0 +1,747 @@ +package ResFailure.example01; + +/* + * Title: GridSim Toolkit + * Description: GridSim (Grid Simulation) Toolkit for Modeling and Simulation + * of Parallel and Distributed Systems such as Clusters and Grids + * An example of how to use the failure functionality. + * Licence: GPL - http://www.gnu.org/copyleft/gpl.html + * + * Author: Agustin Caminero and Anthony Sulistio + * Organization: UCLM (Spain) + * Created on: August 2007 + */ + +import gridsim.*; +import gridsim.index.AbstractGIS; +import gridsim.net.Link; +import java.util.Random; +import java.util.ArrayList; +import java.io.FileWriter; +import gridsim.resFailure.RegionalGISWithFailure; +import eduni.simjava.Sim_system; +import eduni.simjava.Sim_event; + + +/** + * Creates a Grid User that also considers what happens if a resource fails. + * @author Agustin Caminero and Anthony Sulistio + * @since GridSim Toolkit 4.1 + */ +public class GridUserFailureEx01 extends GridUser +{ + // the base for our constants (chosen at random) + private static final int BASE = 440000; + + /** This constant is to tell the user when he should submit a gridlet */ + private static final int SUBMIT_GRIDLET = BASE + 1; + + private ArrayList GridletSubmittedList_; // list of submitted Gridlets + private GridletList GridletReceiveList_; // list of received Gridlets + + private int NUM_GRIDLETS; + private double pollingTime_; + + // The sizes of gridlets + private int gridletLength; + private int gridletInput; + private int gridletOutput; + + // we keep here the time when each gridlet is submitted + private double gridletSubmissionTime []; + private double gridletLatencyTime []; + + // a flag that denotes whether to trace GridSim events or not. + private boolean trace_flag; + + + /** + * Creates a GridUserFailure object + * @param name this entity name + * @param link a network link connecting this entity + * @param pollTime the time between polls + * @param glLength length (MI) for the gridlets of this user + * @param glIn input file size for the gridlets of this user + * @param glOut output file size for the gridlets of this user + * @param trace_flag a flag that denotes whether to trace this user events + * or not. + * @throws java.lang.Exception happens if either name or link is empty + */ + public GridUserFailureEx01(String name, Link link, double pollTime, + int glLength, int glIn, int glOut, boolean trace_flag) + throws Exception + { + super(name, link); + + this.GridletSubmittedList_ = new ArrayList(); + this.GridletReceiveList_ = new GridletList(); + pollingTime_ = pollTime; + + gridletLength = glLength; + gridletInput = glIn; + gridletOutput = glOut; + this.trace_flag = trace_flag; + } + + /** + * Sets the number of gridlets that this user has to submit. + * Also, create the submission and reception times arrays. + * @param gridlet_num the number of gridlets + */ + public void setGridletNumber(int gridlet_num) + { + NUM_GRIDLETS = gridlet_num; + + gridletSubmissionTime = new double[NUM_GRIDLETS]; + gridletLatencyTime = new double[NUM_GRIDLETS]; + } + + /** + * Handles incoming requests to this entity. + * This method specifies the behaviours and/or scenarios of a user. + */ + public void body() + { + initializeResultsFile(); + createGridlet(super.get_id(), NUM_GRIDLETS); + + // schedule the initial sending of gridlets. + // The sending will start in a ramdom time within 5 min + Random random = new Random(); + int init_time = random.nextInt(5*60); + + // sends a reminder to itself + super.send(super.get_id(), init_time, SUBMIT_GRIDLET); + System.out.println(super.get_name() + + ": initial SUBMIT_GRIDLET event will be at clock: " + + init_time + ". Current clock: " + GridSim.clock()); + + + //////////////////////////////////////////////////////////// + // Now, we have the framework of the entity: + while (Sim_system.running()) + { + Sim_event ev = new Sim_event(); + super.sim_get_next(ev); // get the next event in the queue + + switch (ev.get_tag()) + { + // submit a gridlet + case SUBMIT_GRIDLET: + processGridletSubmission(ev); // process the received event + break; + + // Receive a gridlet back + case GridSimTags.GRIDLET_RETURN: + processGridletReturn(ev); + break; + + case GridSimTags.END_OF_SIMULATION: + System.out.println("\n============== " + super.get_name() + + ". Ending simulation..."); + break; + + default: + System.out.println(super.get_name() + + ": Received an event: " + ev.get_tag()); + break; + + } // switch + + } // while + + // remove I/O entities created during construction of this entity + super.terminateIOEntities(); + + // prints the completed gridlets + printGridletList(GridletReceiveList_, super.get_name(), false, + gridletLatencyTime); + } // body() + + ///////////////////////////////////////////////////////////////////////// + + /** + * This functions process the submission of a gridlet. We have to get the + * list of available resources from the RegGIS, choose one of them, and + * submit the gridlet. + * @param ev an incoming event + */ + private void processGridletSubmission(Sim_event ev) + { + if (trace_flag) + { + System.out.println(super.get_name() + + ": received an SUBMIT_GRIDLET event. Clock: " + GridSim.clock()); + } + + /*********** + We have to submit: + - the gridlet whose id comes with the event + - all the gridlets with the "gridletSub.getSubmitted() == false" + + So, set the gridletSub.getSubmitted() to false for the gridlet whose + id comes with the event + ***********/ + + int i = 0; + GridletSubmission gridletSub; + int resourceID[]; + Random random = new Random(5); // a random generator with a random seed + int index; + Gridlet gl; + Integer obj; + int glID; + + // This is because the initial GRIDLET_SUBMIT event, at the beginning + // of sims, does not have any gridlet id. We have to submit + // all the gridlets. + if (ev.get_data() instanceof Integer) + { + obj = (Integer) ev.get_data(); + glID = obj.intValue(); // get the gridlet id. + } + else { + glID = 99; // a value at random, not used at all in this case + } + + while (i < GridletSubmittedList_.size()) + { + gridletSub = (GridletSubmission)GridletSubmittedList_.get(i); + + if ( (gridletSub.getGridlet()).getGridletID() == glID ) + { + // set this gridlet whose id comes with the event as not submitted, + // so that it is submitted as soon as possible. + ((GridletSubmission) GridletSubmittedList_.get(i)).setSubmitted(false); + } + + // Submit the gridlets with the "gridletSub.getSubmitted() == false" + if ( (gridletSub.getSubmitted() == false)) + { + // we have to resubmit this gridlet + gl = ((GridletSubmission) GridletSubmittedList_.get(i)).getGridlet(); + resourceID = getResList(); // Get list of resources from GIS + + // If we have resources in the list + if ((resourceID != null) && (resourceID.length != 0)) + { + index = random.nextInt(resourceID.length); + + // make sure the gridlet will be executed from the begining + resetGridlet(gl); + + // submits this gridlet to a resource + super.gridletSubmit(gl, resourceID[index]); + gridletSubmissionTime[gl.getGridletID()] = GridSim.clock(); + + // set this gridlet as submitted + ((GridletSubmission) GridletSubmittedList_.get(i)).setSubmitted(true); + + if (trace_flag) + { + System.out.println(super.get_name() + + ": Sending Gridlet #" + i + " to " + + GridSim.getEntityName(resourceID[index]) + + " at clock: " + GridSim.clock()); + + // Write into a results file + write(super.get_name(), "Sending", gl.getGridletID(), + GridSim.getEntityName(resourceID[index]), + gl.getGridletStatusString(), GridSim.clock()); + } + + } + // No resources available at this moment, so schedule an event + // in the future. The event wil be in 15 min (900 sec), as + // resource failures may last several hours. + // This event includes the gridletID, so that the user will + // try to submit only this gridlet + else + { + super.send(super.get_id(), GridSimTags.SCHEDULE_NOW + 900, + SUBMIT_GRIDLET, new Integer(gl.getGridletID()) ); + } + + }// if (gridletSub.getSubmitted() == false) + + i++; + } // while (i < GridletSubmittedList_.size()) + + } // processGridletSubmission + + /** + * This functions process the return of a gridlet. + * We pay attention to the status of the gridlet + * and then decide what we have to do the next + * @param ev an incoming event + */ + private void processGridletReturn(Sim_event ev) + { + if (trace_flag) + { + System.out.println(super.get_name() + + ": received an GRIDLET_RETURN event. Clock: " + GridSim.clock()); + } + + Object obj = (Object) ev.get_data(); + Gridlet gl = null; + Random random = new Random(5); // a random generator with a random seed + + if (obj instanceof Gridlet) + { + gl = (Gridlet) obj; + gridletLatencyTime[gl.getGridletID()] = GridSim.clock(); + + // Write into a results file + if (trace_flag) + { + write(super.get_name(), "Receiving", gl.getGridletID(), + GridSim.getEntityName(gl.getResourceID()), + gl.getGridletStatusString(), GridSim.clock()); + } + + ///////////////////////// Gridlet Success + if (gl.getGridletStatusString().compareTo("Success") == 0) + { + System.out.println(super.get_name() + ": Receiving Gridlet #" + + gl.getGridletID() + " with status Success at time = " + + GridSim.clock() + " from resource " + + GridSim.getEntityName(gl.getResourceID())); + + this.GridletReceiveList_.add(gl); // add into the received list + gridletLatencyTime[gl.getGridletID()] = + gridletLatencyTime[gl.getGridletID()] - + gridletSubmissionTime[gl.getGridletID()]; + + // We have received all the gridlets. So, finish the simulation. + if (GridletReceiveList_.size() == GridletSubmittedList_.size()) + { + super.finishSimulation(); + } + + } // if (gl.getGridletStatusString() == "Success") + + //////////////////////// Gridlet Failed + else if (gl.getGridletStatusString().compareTo("Failed") == 0) + { + System.out.println(super.get_name() + ": Receiving Gridlet #" + + gl.getGridletID() + " with status Failed at time = " + + GridSim.clock() + " from resource " + + GridSim.getEntityName(gl.getResourceID())); + + // Send the gridlet as soon as we have resources available. + // This gridlet will be resend as soon as possible, + // in the first loop. + int pos = findGridletInGridletSubmittedList(gl); + if (pos == -1) { + System.out.println(super.get_name() + + ". Gridlet not found in GridletSubmittedList."); + } + else + { + // set this gridlet as submitted, because otherwise + // this gridlet may be submitted several times. + // A gridlet will only be submitted when the event carrying + // its id reaches the user + ((GridletSubmission) GridletSubmittedList_.get(pos)).setSubmitted(true); + + // Now, schedule an event to itself to submit the gridlet + // The gridlet will be sent as soon as possible + Integer glID_Int = new Integer(gl.getGridletID()); + + // This event includes the gridletID, so that the user + // will try to submit only this gridlet + super.send(super.get_id(), GridSimTags.SCHEDULE_NOW, + SUBMIT_GRIDLET, glID_Int); + } + } // if (gl.getGridletStatusString() == "Failed") + + ////////////////////////////// Gridlet Failed_resource + else if (gl.getGridletStatusString().compareTo("Failed_resource_unavailable") == 0) + { + int pos = findGridletInGridletSubmittedList(gl); + if (pos == -1) { + System.out.println(super.get_name() + + ". Gridlet not found in GridletSubmittedList."); + } + else + { + // Now, set its submission time for a random time between + // 1 and the polling time + double resubmissionTime = random.nextDouble() * pollingTime_; + + // this is to prevent the gridlet from being submitted + // before its resubmission time. + // This is different from the FAILED case, because + // in that case, the gridlet should be resubmited as soon + // as possible. As oppossed to that, this gridlet should + // not be resubmited before its resubmission time. + ((GridletSubmission) GridletSubmittedList_.get(pos)).setSubmitted(true); + + + System.out.println(super.get_name() + ": Receiving Gridlet #" + + gl.getGridletID() + + " with status Failed_resource_unavailable at time = " + + GridSim.clock() + " from resource " + + GridSim.getEntityName(gl.getResourceID()) + + "(resID: " + gl.getResourceID() + + "). Resubmission time will be: " + + resubmissionTime + GridSim.clock()); + + // Now, we have to inform the GIS about this failure, so it + // can keep the list of resources up-to-date. + informGIS(gl.getResourceID()); + + // Now, schedule an event to itself to submit the gridlet + Integer glID_Int = new Integer(gl.getGridletID()); + + // This event includes the gridletID, so that the user + // will try to submit only this gridlet + super.send(super.get_id(), resubmissionTime, + SUBMIT_GRIDLET, glID_Int); + } + } // else if + else + { + System.out.println(super.get_name() + ": Receiving Gridlet #" + + gl.getGridletID() + " with status " + + gl.getGridletStatusString() + " at time = " + + GridSim.clock() + " from resource " + + GridSim.getEntityName(gl.getResourceID()) + + " resID: " + gl.getResourceID()); + } + + } // if (obj instanceof Gridlet) + } + + /** + * Prints the Gridlet objects + * @param list the list of gridlets + * @param name the name of the user + * @param detail if we want the gridlet's history or not + * @param gridletLatencyTime array containing the latencies of gridlets. + * Latencies are from the moment when the gridlet is sent, till + * the moment they are back at the user. + * They take into account the last submission of a gridlet + * (when the gridlet is successfully run) + */ + private void printGridletList(GridletList list, String name, + boolean detail, double gridletLatencyTime[]) + { + int size = list.size(); + Gridlet gridlet = null; + + String indent = " "; + System.out.println(); + System.out.println("============= OUTPUT for " + name + " =========="); + System.out.println("Gridlet ID" + indent + "STATUS" + indent + + "Resource ID" + indent + "Cost" + indent + + "CPU Time"+ indent + "Latency"); + + // a loop to print the overall result + int i = 0; + for (i = 0; i < size; i++) + { + gridlet = (Gridlet) list.get(i); + System.out.print(indent + gridlet.getGridletID() + indent + + indent); + + System.out.print(gridlet.getGridletStatusString()); + + System.out.println(indent + indent + gridlet.getResourceID() + + indent + indent + gridlet.getProcessingCost() + + indent + indent + gridlet.getActualCPUTime()+ + indent + indent + + gridletLatencyTime[gridlet.getGridletID()]); + + writeFin(name, gridlet.getGridletID(), + GridSim.getEntityName(gridlet.getResourceID()), + gridlet.getProcessingCost(), gridlet.getActualCPUTime(), + GridSim.clock()); + + + + } + + + if (detail == true) + { + // a loop to print each Gridlet's history + for (i = 0; i < size; i++) + { + gridlet = (Gridlet) list.get(i); + System.out.println(gridlet.getGridletHistory()); + + System.out.print("Gridlet #" + gridlet.getGridletID()); + System.out.println(", length = " + gridlet.getGridletLength() + + ", finished so far = " + + gridlet.getGridletFinishedSoFar()); + System.out.println("======================================\n"); + } + } + + System.out.println("================================================="); + + } + + /** + * This method will show you on how to create Gridlets + * @param userID owner ID of a Gridlet + * @param numGridlet number of Gridlet to be created + */ + private void createGridlet(int userID, int numGridlet) + { + for (int i = 0; i < numGridlet; i++) + { + // Creates a Gridlet + Gridlet gl = new Gridlet(i, gridletLength, gridletInput, gridletOutput); + gl.setUserID(userID); + + // Originally, gridlets are created to be submitted + // as soon as possible (the 0.0 param) + GridletSubmission gst = new GridletSubmission(gl, false); + + // add this gridlet into a list + this.GridletSubmittedList_.add(gst); + } + } + + /** + * Gets a list of received Gridlets + * @return a list of received/completed Gridlets + */ + public GridletList getGridletList() { + return GridletReceiveList_; + } + + /** + * Tells you the possition of this gridlet in the GridletSubmittedList_ + * @param gl the gridlet + * @return the position of this gridlet in the list of submitted gridlets + */ + private int findGridletInGridletSubmittedList(Gridlet gl) + { + Gridlet g = null; + GridletSubmission gst = null; + for (int i = 0; i< GridletSubmittedList_.size(); i++) + { + gst = (GridletSubmission)GridletSubmittedList_.get(i); + g = gst.getGridlet(); + + if ( g.getGridletID() == gl.getGridletID() ) + return i; + } + + return -1; + } + + /** This function resets the gridlet into its original values of + * length and gridletFinishedSoFar + * @param gl the gridlet to be resetted + */ + private void resetGridlet (Gridlet gl) + { + gl.setGridletLength(gridletLength); + gl.setGridletFinishedSoFar(0); + + } + + /** + * Write some data into the final results file. + * @param user user name + * @param glID gridlet id + * @param resName Name of the resource + * @param cost the processing cost of the gridlet + * @param cpu the cpu time + * @param clock Current time + */ + private void writeFin(String user, int glID, String resName, + double cost, double cpu, double clock) + { + if (trace_flag == false) { + return; + } + + // Write into a results file + FileWriter fwriter = null; + try + { + fwriter = new FileWriter(user+"_Fin", true); + } catch (Exception ex) + { + ex.printStackTrace(); + System.out.println( + "Unwanted errors while opening file " + user+"_Fin"); + } + + try + { + fwriter.write(user +"\t "+ glID + "\t" + + resName + "\t" + cost + "\t"+ cpu + "\t" + + clock + "\n"); + } catch (Exception ex) + { + ex.printStackTrace(); + System.out.println( + "Unwanted errors while writing on file " + user+"_Fin"); + } + + try + { + fwriter.close(); + } catch (Exception ex) + { + ex.printStackTrace(); + System.out.println( + "Unwanted errors while closing file " + user+"_Fin"); + } + + } + + /** + * Write some data into a results file. + * @param user user name + * @param event Values: "Sending" or "Receive" a gridlet + * @param glID gridlet id + * @param resName Name of the resource + * @param status Status of the gridlet + * @param clock Current time + * */ + private void write(String user, String event, int glID, String resName, + String status, double clock) + { + if (trace_flag == false) { + return; + } + + // Write into a results file + FileWriter fwriter = null; + try + { + fwriter = new FileWriter(super.get_name(), true); + } catch (Exception ex) + { + ex.printStackTrace(); + System.out.println( + "Unwanted errors while opening file " + super.get_name()); + } + + try + { + fwriter.write(user + "\t " + event + "\t" + glID + "\t" + + resName + "\t" + status + "\t\t" + clock + "\t" + "\n"); + } catch (Exception ex) + { + ex.printStackTrace(); + System.out.println( + "Unwanted errors while writing on file " + super.get_name()); + } + + + try + { + fwriter.close(); + } catch (Exception ex) + { + ex.printStackTrace(); + System.out.println( + "Unwanted errors while closing file " + super.get_name()); + } + + } + + /** + * This function informs the GIS of this user about the failure of a resource + * @param resID the id of the resource which has failed + */ + private void informGIS(int resID) + { + Integer resID_Int = new Integer(resID); + + super.send(super.output, 0.0, AbstractGIS.NOTIFY_GIS_RESOURCE_FAILURE, + new IO_data(resID_Int, Link.DEFAULT_MTU, super.getRegionalGISId()) ); + } + + /** + * Initialize the results files (put headers over each column) + * */ + private void initializeResultsFile() + { + if (trace_flag == false) { + return; + } + + // Initialize the results file + FileWriter fwriter = null; + FileWriter fwriterFin = null; + try + { + fwriter = new FileWriter(super.get_name(), true); + fwriterFin = new FileWriter(super.get_name() + "_Fin", true); + } catch (Exception ex) + { + ex.printStackTrace(); + System.out.println( + "Unwanted errors while opening file " + super.get_name() + + " or " + super.get_name()+"_Fin"); + } + + try + { + fwriter.write( + "User \t\t Event \t GridletID \t Resource \t GridletStatus \t\t\t Clock\n"); + fwriterFin.write( + "User \t\t GridletID \t Resource \t Cost \t CPU time \t Latency\n"); + + + } catch (Exception ex) + { + ex.printStackTrace(); + System.out.println( + "Unwanted errors while writing on file " + super.get_name()+ + " or " + super.get_name()+"_Fin"); + } + + try + { + fwriter.close(); + fwriterFin.close(); + } catch (Exception ex) + { + ex.printStackTrace(); + System.out.println( + "Unwanted errors while closing file " + super.get_name()+ + " or " + super.get_name()+"_Fin"); + } + } + + /** + * This function retrieves a list of available resources from the GIS. + * @return an array containing the ids of the resources + */ + private int[] getResList() + { + Object[] resList = super.getLocalResourceList(); + int resourceID[] = null; + + // if we have any resource + if ((resList != null) && (resList.length != 0)) + { + resourceID = new int[resList.length]; + for (int x = 0; x < resList.length; x++) + { + // Resource list contains list of resource IDs + resourceID[x] = ((Integer) resList[x]).intValue(); + + if (trace_flag == true) + { + System.out.println(super.get_name() + + ": resource[" + x + "] = " + resourceID[x]); + } + } + + } + + return resourceID; + } + +} // end class Added: trunk/examples/ResFailure/example01/GridletSubmission.java =================================================================== --- trunk/examples/ResFailure/example01/GridletSubmission.java (rev 0) +++ trunk/examples/ResFailure/example01/GridletSubmission.java 2009-05-19 12:18:14 UTC (rev 265) @@ -0,0 +1,56 @@ +package ResFailure.example01; + +/* + * Title: GridSim Toolkit + * Description: GridSim (Grid Simulation) Toolkit for Modeling and Simulation + * of Parallel and Distributed Systems such as Clusters and Grids + * An example of how to use the failure functionality. + * Licence: GPL - http://www.gnu.org/copyleft/gpl.html + * + * Author: Agustin Caminero and Anthony Sulistio + * Organization: UCLM (Spain) + * Created on: August 2007 + */ + + +import gridsim.Gridlet; + +/** + * This class is just a wrapper to denote + * whether this gridlet has been already submitted or not + * @author Agustin Caminero and Anthony Sulistio + * @since GridSim Toolkit 4.1 + */ +public class GridletSubmission +{ + private Gridlet gl; + private boolean submitted; + + + public GridletSubmission(Gridlet gl,boolean submitted) + { + this.gl = gl; + this.submitted = submitted; + } + + public Gridlet getGridlet() + { + return gl; + } + + public boolean getSubmitted() + { + return submitted; + } + + public void setGridlet(Gridlet g) + { + this.gl = g; + } + + public void setSubmitted(boolean submitted) + { + this.submitted = submitted; + } + +} // end class Added: trunk/examples/ResFailure/example01/ResFailureEx01.java =================================================================== --- trunk/examples/ResFailure/example01/ResFailureEx01.java (rev 0) +++ trunk/examples/ResFailure/example01/ResFailureEx01.java 2009-05-19 12:18:14 UTC (rev 265) @@ -0,0 +1,328 @@ +package ResFailure.example01; + +/* + * Title: GridSim Toolkit + * Description: GridSim (Grid Simulation) Toolkit for Modeling and Simulation + * of Parallel and Distributed Systems such as Clusters and Grids + * An example of how to use the failure functionality. + * Licence: GPL - http://www.gnu.org/copyleft/gpl.html + * + * Author: Agustin Caminero and Anthony Sulistio + * Organization: UCLM (Spain) + * Created on: August 2007 + */ + +import gridsim.resFailure.*; +import gridsim.*; +import gridsim.net.*; +import java.util.*; +import gridsim.util.NetworkReader; +import gridsim.util.HyperExponential; + + +/** + * This example shows a basic topology with 1 user, 3 resources and 1 GIS. + * All of them are connected by a router. + * There is only one VO in this example. + * @author Agustin Caminero and Anthony Sulistio + * @since GridSim Toolkit 4.1 + */ +public class ResFailureEx01 +{ + public static void main(String[] args) + { + System.out.println("Starting failure example 1..."); + + try + { + if (args.length < 1) + { + System.out.println("Usage: java ResFailureEx01 network_ex01.txt"); + return; + } + + + ////////////////////////////////////////// + // First step: Initialize the GridSim package. It should be called + // before creating any entities. We can't run this example without + // initializing GridSim first. We will get a run-time exception + // error. + + // a flag that denotes whether to trace GridSim events or not. + boolean trace_flag = false; // dont use SimJava trace + int num_user = 1; // number of grid users + Calendar calendar = Calendar.getInstance(); + + // Initialize the GridSim package + System.out.println("Initializing GridSim package"); + GridSim.init(num_user, calendar, trace_flag); + trace_flag = true; + + + ////////////////////////////////////////// + // Second step: Builds the network topology among Routers. + + String filename = args[0]; // get the network topology + System.out.println("Reading network from " + filename); + LinkedList routerList = NetworkReader.createFIFO(filename); +... [truncated message content] |
From: <mar...@us...> - 2009-05-22 05:16:50
|
Revision: 267 http://gridsim.svn.sourceforge.net/gridsim/?rev=267&view=rev Author: marcos_dias Date: 2009-05-22 05:16:40 +0000 (Fri, 22 May 2009) Log Message: ----------- Changes in the documentation of some classes and examples. Modified Paths: -------------- trunk/examples/ResFailure/example01/ResFailureEx01.java trunk/examples/ResFailure/example01/readme.txt trunk/examples/ResFailure/example02/ResFailureEx02.java trunk/examples/ResFailure/example02/readme.txt trunk/examples/ResFailure/example03/ResFailureEx03.java trunk/examples/ResFailure/example03/readme.txt trunk/examples/WorkloadTrace/example01/TraceEx01.java trunk/examples/WorkloadTrace/example01/readme.txt trunk/examples/WorkloadTrace/example02/TraceEx02.java trunk/examples/WorkloadTrace/example02/readme.txt trunk/examples/WorkloadTrace/example03/TraceEx03.java trunk/examples/WorkloadTrace/example03/readme.txt trunk/examples/auction/example01/ExampleAuction.java trunk/examples/auction/example02/ExampleAuction.java trunk/examples/auction/example03/ExampleAuction.java trunk/examples/datagrid/example01/DataExample1.java trunk/examples/datagrid/example02/DataExample2.java trunk/examples/datagrid/example03/DataGridletExample.java trunk/examples/datagrid/example04/readme.txt trunk/examples/gridsim/example01/Example1.java trunk/examples/gridsim/example03/readme.txt trunk/examples/gridsim/example04/Example4.java trunk/examples/gridsim/example04/readme.txt trunk/examples/gridsim/example05/Example5.java trunk/examples/gridsim/example05/readme.txt trunk/examples/gridsim/example06/Example6.java trunk/examples/gridsim/example06/readme.txt trunk/examples/gridsim/example07/Test.java trunk/examples/gridsim/example07/readme.txt trunk/examples/gridsim/example08/Example8.java trunk/examples/gridsim/example09/Example9.java trunk/examples/gridsim/example10/Example10.java trunk/examples/gridsim/example10/readme.txt trunk/examples/gridsim/regionalGIS/ExampleGIS.java trunk/examples/gridsim/regionalGIS/readme.txt trunk/examples/network/FiniteBuffer/mainExample.java trunk/examples/network/FiniteBuffer/readme.txt trunk/examples/network/example02/NetEx02.java trunk/examples/network/example03/NetEx03.java trunk/examples/network/flow/example02/FlowNetEx02.java trunk/examples/network/rate/RateExample.java trunk/examples/network/scfq/SCFQExample.java trunk/examples/network/scfq/readme.txt trunk/examples/readme.txt trunk/faq.txt trunk/jars/simjava2.jar trunk/javadoc.sh trunk/source/gridsim/ARSimpleSpaceShared.java trunk/source/gridsim/AdvanceReservation.java trunk/source/gridsim/Gridlet.java trunk/source/gridsim/GridletList.java trunk/source/gridsim/ResGridlet.java trunk/source/gridsim/SpaceShared.java trunk/source/gridsim/Stat.java trunk/source/gridsim/TimeShared.java trunk/source/gridsim/datagrid/FileAttribute.java trunk/source/gridsim/net/Input.java trunk/source/gridsim/net/NetIO.java trunk/source/gridsim/net/Output.java trunk/source/gridsim/net/flow/FlowInput.java trunk/source/gridsim/net/flow/FlowOutput.java trunk/source/gridsim/net/fnb/FnbNetworkReader.java trunk/source/gridsim/net/fnb/firstLastPacketsGridlet.java trunk/source/gridsim/resFailure/AllocPolicyWithFailure.java trunk/source/gridsim/resFailure/SpaceSharedWithFailure.java trunk/source/gridsim/resFailure/TimeSharedWithFailure.java trunk/source/gridsim/util/HyperExponential.java trunk/source/gridsim/util/LCGRandom.java trunk/source/gridsim/util/NetworkReader.java trunk/source/gridsim/util/Poisson.java trunk/source/gridsim/util/SimReport.java trunk/source/gridsim/util/TrafficGenerator.java trunk/source/gridsim/util/Variate.java trunk/source/gridsim/util/Weibull.java Added Paths: ----------- trunk/source/gridsim/net/fnb/GridletPackets.java Removed Paths: ------------- trunk/examples/datagrid/example01/readme.txt trunk/examples/datagrid/example02/readme.txt trunk/examples/datagrid/example03/readme.txt trunk/examples/gridsim/example01/readme.txt trunk/examples/gridsim/example08/readme.txt trunk/examples/gridsim/example09/readme.txt trunk/examples/network/example01/readme.txt trunk/examples/network/example02/readme.txt trunk/examples/network/example03/readme.txt trunk/examples/network/flow/example01/readme.txt trunk/examples/network/flow/example02/readme.txt trunk/examples/network/rate/readme.txt Modified: trunk/examples/ResFailure/example01/ResFailureEx01.java =================================================================== --- trunk/examples/ResFailure/example01/ResFailureEx01.java 2009-05-21 01:59:34 UTC (rev 266) +++ trunk/examples/ResFailure/example01/ResFailureEx01.java 2009-05-22 05:16:40 UTC (rev 267) @@ -257,24 +257,11 @@ MachineList mList = new MachineList(); for (int i = 0; i < totalMachine; i++) { - // 2. A Machine contains one or more PEs or CPUs. Therefore, should - // create an object of PEList to store these PEs before creating - // a Machine. - PEList peList = new PEList(); - - // 3. Create PEs and add these into an object of PEList. - for (int k = 0; k < totalPE; k++) - { - // need to store PE id and MIPS Rating - peList.add( new PE(k, rating) ); - } - - // 4. Create one Machine with its id and list of PEs or CPUs - mList.add( new Machine(i, peList) ); + // 2. Create one Machine with its id, number of PEs and rating + mList.add( new Machine(i, totalPE, rating)); } - - // 5. Create a ResourceCharacteristics object that stores the + // 3. Create a ResourceCharacteristics object that stores the // properties of a Grid resource: architecture, OS, list of // Machines, allocation policy: time- or space-shared, time zone // and its price (G$/PE time unit). @@ -296,7 +283,7 @@ arch, os, mList, scheduling_alg, time_zone, cost); - // 6. Finally, we need to create a GridResource object. + // 4. Finally, we need to create a GridResource object. long seed = 11L*13*17*19*23+1; double peakLoad = 0.0; // the resource load during peak hour double offPeakLoad = 0.0; // the resource load during off-peak hr Modified: trunk/examples/ResFailure/example01/readme.txt =================================================================== --- trunk/examples/ResFailure/example01/readme.txt 2009-05-21 01:59:34 UTC (rev 266) +++ trunk/examples/ResFailure/example01/readme.txt 2009-05-22 05:16:40 UTC (rev 267) @@ -30,16 +30,6 @@ When running the example file, it will produce the following files: - sim_trace -> created by the SimJava2 package (lower-level) to trace every - events (performed by SimJava and GridSim) during the simulation. - We don't need to worry about this file. Not to important for our - example. - - sim_report -> created by the SimJava2 package (lower-level) of GridSim. - This is a simulation report that contains general information about - running this experiment. We don't need to worry about this file. - Not to important for our example. - Ex01_Regional_GIS -> contains one line describing each registering/removing an event that takes place at the GIS. Resources register in the begining of simulations, and after recovering from a Modified: trunk/examples/ResFailure/example02/ResFailureEx02.java =================================================================== --- trunk/examples/ResFailure/example02/ResFailureEx02.java 2009-05-21 01:59:34 UTC (rev 266) +++ trunk/examples/ResFailure/example02/ResFailureEx02.java 2009-05-22 05:16:40 UTC (rev 267) @@ -265,24 +265,11 @@ MachineList mList = new MachineList(); for (int i = 0; i < totalMachine; i++) { - // 2. A Machine contains one or more PEs or CPUs. Therefore, should - // create an object of PEList to store these PEs before creating - // a Machine. - PEList peList = new PEList(); - - // 3. Create PEs and add these into an object of PEList. - for (int k = 0; k < totalPE; k++) - { - // need to store PE id and MIPS Rating - peList.add( new PE(k, rating) ); - } - - // 4. Create one Machine with its id and list of PEs or CPUs - mList.add( new Machine(i, peList) ); + // 2. Create one Machine with its id, number of PEs and rating + mList.add( new Machine(i, totalPE, rating)); } - - // 5. Create a ResourceCharacteristics object that stores the + // 3. Create a ResourceCharacteristics object that stores the // properties of a Grid resource: architecture, OS, list of // Machines, allocation policy: time- or space-shared, time zone // and its price (G$/PE time unit). @@ -304,7 +291,7 @@ arch, os, mList, scheduling_alg, time_zone, cost); - // 6. Finally, we need to create a GridResource object. + // 4. Finally, we need to create a GridResource object. long seed = 11L*13*17*19*23+1; double peakLoad = 0.0; // the resource load during peak hour double offPeakLoad = 0.0; // the resource load during off-peak hr Modified: trunk/examples/ResFailure/example02/readme.txt =================================================================== --- trunk/examples/ResFailure/example02/readme.txt 2009-05-21 01:59:34 UTC (rev 266) +++ trunk/examples/ResFailure/example02/readme.txt 2009-05-22 05:16:40 UTC (rev 267) @@ -29,16 +29,6 @@ When running the example file, it will produce the following files: - sim_trace -> created by the SimJava2 package (lower-level) to trace every - events (performed by SimJava and GridSim) during the simulation. - We don't need to worry about this file. Not to important for our - example. - - sim_report -> created by the SimJava2 package (lower-level) of GridSim. - This is a simulation report that contains general information about - running this experiment. We don't need to worry about this file. - Not to important for our example. - Ex02_Regional_GIS -> contains one line describing each registering/removing an event that takes place at the GIS. Resources register in the begining of simulations, and after recovering from a Modified: trunk/examples/ResFailure/example03/ResFailureEx03.java =================================================================== --- trunk/examples/ResFailure/example03/ResFailureEx03.java 2009-05-21 01:59:34 UTC (rev 266) +++ trunk/examples/ResFailure/example03/ResFailureEx03.java 2009-05-22 05:16:40 UTC (rev 267) @@ -311,24 +311,11 @@ MachineList mList = new MachineList(); for (int i = 0; i < totalMachine; i++) { - // 2. A Machine contains one or more PEs or CPUs. Therefore, should - // create an object of PEList to store these PEs before creating - // a Machine. - PEList peList = new PEList(); - - // 3. Create PEs and add these into an object of PEList. - for (int k = 0; k < totalPE; k++) - { - // need to store PE id and MIPS Rating - peList.add( new PE(k, rating) ); - } - - // 4. Create one Machine with its id and list of PEs or CPUs - mList.add( new Machine(i, peList) ); + // 2. Create one Machine with its id, number of PEs and rating + mList.add( new Machine(i, totalPE, rating)); } - - // 5. Create a ResourceCharacteristics object that stores the + // 3. Create a ResourceCharacteristics object that stores the // properties of a Grid resource: architecture, OS, list of // Machines, allocation policy: time- or space-shared, time zone // and its price (G$/PE time unit). @@ -350,7 +337,7 @@ arch, os, mList, scheduling_alg, time_zone, cost); - // 6. Finally, we need to create a GridResource object. + // 4. Finally, we need to create a GridResource object. long seed = 11L*13*17*19*23+1; double peakLoad = 0.0; // the resource load during peak hour double offPeakLoad = 0.0; // the resource load during off-peak hr Modified: trunk/examples/ResFailure/example03/readme.txt =================================================================== --- trunk/examples/ResFailure/example03/readme.txt 2009-05-21 01:59:34 UTC (rev 266) +++ trunk/examples/ResFailure/example03/readme.txt 2009-05-22 05:16:40 UTC (rev 267) @@ -29,16 +29,6 @@ When running the example file, it will produce the following files: - sim_trace -> created by the SimJava2 package (lower-level) to trace every - events (performed by SimJava and GridSim) during the simulation. - We don't need to worry about this file. Not to important for our - example. - - sim_report -> created by the SimJava2 package (lower-level) of GridSim. - This is a simulation report that contains general information about - running this experiment. We don't need to worry about this file. - Not to important for our example. - Ex03_Regional_GIS_0, ..., Ex03_Regional_GIS_2 -> contains one line describing each registering/removing an event that takes place at the GIS. Resources register in the begining of simulations, and after recovering from a Modified: trunk/examples/WorkloadTrace/example01/TraceEx01.java =================================================================== --- trunk/examples/WorkloadTrace/example01/TraceEx01.java 2009-05-21 01:59:34 UTC (rev 266) +++ trunk/examples/WorkloadTrace/example01/TraceEx01.java 2009-05-22 05:16:40 UTC (rev 267) @@ -168,27 +168,12 @@ int rating = peRating; for (int i = 0; i < totalMachine; i++) { - ////////////////////////////////////////// - // 2. A Machine contains one or more PEs or CPUs. Therefore, should - // create an object of PEList to store these PEs before creating - // a Machine. - PEList peList = new PEList(); - - ////////////////////////////////////////// - // 3. Create PEs and add these into an object of PEList. - for (int k = 0; k < totalPE; k++) - { - // need to store PE id and MIPS Rating - peList.add( new PE(k, rating) ); - } - - ////////////////////////////////////////// - // 4. Create one Machine with its id and list of PEs or CPUs - mList.add( new Machine(i, peList) ); + // 2. Create one Machine with its id, number of PEs and rating + mList.add( new Machine(i, totalPE, rating)); } ////////////////////////////////////////// - // 5. Create a ResourceCharacteristics object that stores the + // 3. Create a ResourceCharacteristics object that stores the // properties of a Grid resource: architecture, OS, list of // Machines, allocation policy: time- or space-shared, time zone // and its price (G$/PE time unit). @@ -202,7 +187,7 @@ time_zone, cost); ////////////////////////////////////////// - // 6. Finally, we need to create a GridResource object. + // 4. Finally, we need to create a GridResource object. double baud_rate = 10000.0; // communication speed long seed = 11L*13*17*19*23+1; double peakLoad = 0.0; // the resource load during peak hour Modified: trunk/examples/WorkloadTrace/example01/readme.txt =================================================================== --- trunk/examples/WorkloadTrace/example01/readme.txt 2009-05-21 01:59:34 UTC (rev 266) +++ trunk/examples/WorkloadTrace/example01/readme.txt 2009-05-22 05:16:40 UTC (rev 267) @@ -27,20 +27,5 @@ TimeShared and SpaceShared, only process 1 PE for each Gridlet. You are welcome to write your own scheduler that incorporates this QoS (Quality of Service) requirement. - -When running the example file, it will produce the following files: - sim_trace -> created by the SimJava2 package (lower-level) to trace every - events (performed by SimJava and GridSim) during the simulation. - We don't need to worry about this file. Not to important for our - example. - - sim_report -> created by the SimJava2 package (lower-level) of GridSim. - This is a simulation report that contains general information about - running this experiment. We don't need to worry about this file. - Not to important for our example. - -NOTE: sim_trace and sim_report will be overwritten if running - a new experiment. - Modified: trunk/examples/WorkloadTrace/example02/TraceEx02.java =================================================================== --- trunk/examples/WorkloadTrace/example02/TraceEx02.java 2009-05-21 01:59:34 UTC (rev 266) +++ trunk/examples/WorkloadTrace/example02/TraceEx02.java 2009-05-22 05:16:40 UTC (rev 267) @@ -195,27 +195,12 @@ int rating = peRating; for (int i = 0; i < totalMachine; i++) { - ////////////////////////////////////////// - // 2. A Machine contains one or more PEs or CPUs. Therefore, should - // create an object of PEList to store these PEs before creating - // a Machine. - PEList peList = new PEList(); - - ////////////////////////////////////////// - // 3. Create PEs and add these into an object of PEList. - for (int k = 0; k < totalPE; k++) - { - // need to store PE id and MIPS Rating - peList.add( new PE(k, rating) ); - } - - ////////////////////////////////////////// - // 4. Create one Machine with its id and list of PEs or CPUs - mList.add( new Machine(i, peList) ); + // 2. Create one Machine with its id, number of PEs and rating + mList.add( new Machine(i, totalPE, rating)); } ////////////////////////////////////////// - // 5. Create a ResourceCharacteristics object that stores the + // 3. Create a ResourceCharacteristics object that stores the // properties of a Grid resource: architecture, OS, list of // Machines, allocation policy: time- or space-shared, time zone // and its price (G$/PE time unit). @@ -229,7 +214,7 @@ time_zone, cost); ////////////////////////////////////////// - // 6. Finally, we need to create a GridResource object. + // 4. Finally, we need to create a GridResource object. double baud_rate = 10000.0; // communication speed long seed = 11L*13*17*19*23+1; double peakLoad = 0.0; // the resource load during peak hour Modified: trunk/examples/WorkloadTrace/example02/readme.txt =================================================================== --- trunk/examples/WorkloadTrace/example02/readme.txt 2009-05-21 01:59:34 UTC (rev 266) +++ trunk/examples/WorkloadTrace/example02/readme.txt 2009-05-22 05:16:40 UTC (rev 267) @@ -29,19 +29,3 @@ You are welcome to write your own scheduler that incorporates this QoS (Quality of Service) requirement. - -When running the example file, it will produce the following files: - - sim_trace -> created by the SimJava2 package (lower-level) to trace every - events (performed by SimJava and GridSim) during the simulation. - We don't need to worry about this file. Not to important for our - example. - - sim_report -> created by the SimJava2 package (lower-level) of GridSim. - This is a simulation report that contains general information about - running this experiment. We don't need to worry about this file. - Not to important for our example. - -NOTE: sim_trace and sim_report will be overwritten if running - a new experiment. - Modified: trunk/examples/WorkloadTrace/example03/TraceEx03.java =================================================================== --- trunk/examples/WorkloadTrace/example03/TraceEx03.java 2009-05-21 01:59:34 UTC (rev 266) +++ trunk/examples/WorkloadTrace/example03/TraceEx03.java 2009-05-22 05:16:40 UTC (rev 267) @@ -285,63 +285,25 @@ // 1. We need to create an object of MachineList to store one or more // Machines MachineList mList = new MachineList(); - //System.out.println("Creates a Machine list"); + // 2. Create one Machine with its id, number of PEs and MIPS rating per PE + // In this example, we are using a resource from + // hpc420.hpcc.jp, AIST, Tokyo, Japan + // Note: these data are taken the from GridSim paper, page 25. + // In this example, all PEs has the same MIPS (Millions + // Instruction Per Second) Rating for a Machine. + int mipsRating = 377; + mList.add( new Machine(0, 4, mipsRating)); // First Machine - // 2. A Machine contains one or more PEs or CPUs. Therefore, should - // create an object of PEList to store these PEs before creating - // a Machine. - PEList peList1 = new PEList(); - //System.out.println("Creates a PE list for the 1st Machine"); - - - // 3. Create PEs and add these into an object of PEList. - peList1.add( new PE(0,rating) ); // need to store PE id and MIPS Rating - peList1.add( new PE(1,rating) ); - peList1.add( new PE(2,rating) ); - peList1.add( new PE(3,rating) ); - //System.out.println("Creates 4 PEs with same MIPS Rating and put them"+ - // " into the PE list"); - - - // 4. Create one Machine with its id and list of PEs or CPUs - mList.add( new Machine(0, peList1) ); // First Machine - //System.out.println("Creates the 1st Machine that has 4 PEs and " + - // "stores it into the Machine list"); - //System.out.println(); - - // 5. Repeat the process from 2 if we want to create more Machines + // 3. Repeat the process from 2 if we want to create more Machines + // In this example, the AIST in Japan has 3 Machines with same + // MIPS Rating but different PEs. // NOTE: if you only want to create one Machine for one Grid resource, // then you could skip this step. - PEList peList2 = new PEList(); - //System.out.println("Creates a PE list for the 2nd Machine"); + mList.add( new Machine(1, 4, mipsRating)); // Second Machine + mList.add( new Machine(2, 2, mipsRating)); // Third Machine - peList2.add( new PE(0, rating) ); - peList2.add( new PE(1, rating) ); - peList2.add( new PE(2, rating) ); - peList2.add( new PE(3, rating) ); - //System.out.println("Creates 4 PEs with same MIPS Rating and put them"+ - // " into the PE list"); - - mList.add( new Machine(1, peList2) ); // Second Machine - //System.out.println("Creates the 2nd Machine that has 4 PEs and " + - // "stores it into the Machine list"); - //System.out.println(); - - PEList peList3 = new PEList(); - //System.out.println("Creates a PE list for the 3rd Machine"); - - peList3.add( new PE(0, rating) ); - peList3.add( new PE(1, rating) ); - //System.out.println("Creates 2 PEs with same MIPS Rating and put them"+ - // " into the PE list"); - - mList.add( new Machine(2, peList3) ); // Third Machine - //System.out.println("Creates the 3rd Machine that has 2 PEs and " + - // "stores it into the Machine list"); - //System.out.println(); - - // 6. Create a ResourceCharacteristics object that stores the + // 4. Create a ResourceCharacteristics object that stores the // properties of a Grid resource: architecture, OS, list of // Machines, allocation policy: time- or space-shared, time zone // and its price (G$/PE time unit). @@ -357,7 +319,7 @@ //System.out.println("Creates the properties of a Grid resource and " + // "stores the Machine list"); - // 7. Finally, we need to create a GridResource object. + // 5. Finally, we need to create a GridResource object. long seed = 11L*13*17*19*23+1; double peakLoad = 0.0; // the resource load during peak hour double offPeakLoad = 0.0; // the resource load during off-peak hr Modified: trunk/examples/WorkloadTrace/example03/readme.txt =================================================================== --- trunk/examples/WorkloadTrace/example03/readme.txt 2009-05-21 01:59:34 UTC (rev 266) +++ trunk/examples/WorkloadTrace/example03/readme.txt 2009-05-22 05:16:40 UTC (rev 267) @@ -28,20 +28,5 @@ TimeShared and SpaceShared, only process 1 PE for each Gridlet. You are welcome to write your own scheduler that incorporates this QoS (Quality of Service) requirement. - + -When running the example file, it will produce the following files: - - sim_trace -> created by the SimJava2 package (lower-level) to trace every - events (performed by SimJava and GridSim) during the simulation. - We don't need to worry about this file. Not to important for our - example. - - sim_report -> created by the SimJava2 package (lower-level) of GridSim. - This is a simulation report that contains general information about - running this experiment. We don't need to worry about this file. - Not to important for our example. - -NOTE: sim_trace and sim_report will be overwritten if running - a new experiment. - Modified: trunk/examples/auction/example01/ExampleAuction.java =================================================================== --- trunk/examples/auction/example01/ExampleAuction.java 2009-05-21 01:59:34 UTC (rev 266) +++ trunk/examples/auction/example01/ExampleAuction.java 2009-05-22 05:16:40 UTC (rev 267) @@ -143,15 +143,9 @@ // Object of MachineList to store one or more Machines MachineList mList = new MachineList(); - // A Machine contains one or more PEs or CPUs. - PEList peList = new PEList(); + // Create one Machine with its id, number of PEs and MIPS rating + mList.add( new Machine(0, 1, 500) ); - // Create PEs and add these into an object of PEList. - peList.add( new PE(0, 500) ); // need to store PE id and MIPS Rating - - // Create one Machine with its id and list of PEs or CPUs - mList.add( new Machine(0, peList) ); - // Create a ResourceCharacteristics object that stores the // properties of a Grid resource: architecture, OS, list of // Machines, allocation policy: time- or space-shared, time zone and @@ -171,10 +165,10 @@ double offPeakLoad = 0.0; double holidayLoad = 0.0; - LinkedList weekends = new LinkedList(); + LinkedList<Integer> weekends = new LinkedList<Integer>(); weekends.add(new Integer(Calendar.SATURDAY)); weekends.add(new Integer(Calendar.SUNDAY)); - LinkedList holidays = new LinkedList(); + LinkedList<Integer> holidays = new LinkedList<Integer>(); ResourceCalendar calendar = new ResourceCalendar(time_zone, peakLoad, offPeakLoad, holidayLoad, weekends, holidays, seed); Modified: trunk/examples/auction/example02/ExampleAuction.java =================================================================== --- trunk/examples/auction/example02/ExampleAuction.java 2009-05-21 01:59:34 UTC (rev 266) +++ trunk/examples/auction/example02/ExampleAuction.java 2009-05-22 05:16:40 UTC (rev 267) @@ -67,68 +67,14 @@ MachineList mList = new MachineList(); //System.out.println("Creates a Machine list"); + // 2. Create a Machine with id, number of PEs and MIPS rating per PE + mList.add( new Machine(0, 4, mips)); // First Machine - // 2. A Machine contains one or more PEs or CPUs. Therefore, should - // create an object of PEList to store these PEs before creating - // a Machine. - PEList peList1 = new PEList(); - //System.out.println("Creates a PE list for the 1st Machine"); + // 3. Repeat the process from 2 if we want to create more Machines + mList.add( new Machine(1, 4, mips)); // Second Machine + mList.add( new Machine(2, 2, mips)); // Third Machine - - // 3. Create PEs and add these into an object of PEList. - // In this example, we are using a resource from - // hpc420.hpcc.jp, AIST, Tokyo, Japan - // Note: these data are taken the from GridSim paper, page 25. - // In this example, all PEs has the same MIPS (Millions - // Instruction Per Second) Rating for a Machine. - peList1.add( new PE(0, mips) ); // need to store PE id and MIPS Rating - peList1.add( new PE(1, mips) ); - peList1.add( new PE(2, mips) ); - peList1.add( new PE(3, mips) ); - //System.out.println("Creates 4 PEs with same MIPS Rating and put them"+ - // " into the PE list"); - - - // 4. Create one Machine with its id and list of PEs or CPUs - mList.add( new Machine(0, peList1) ); // First Machine - //System.out.println("Creates the 1st Machine that has 4 PEs and " + - // "stores it into the Machine list"); - //System.out.println(); - - // 5. Repeat the process from 2 if we want to create more Machines - // In this example, the AIST in Japan has 3 Machines with same - // MIPS Rating but different PEs. - // NOTE: if you only want to create one Machine for one Grid resource, - // then you could skip this step. - PEList peList2 = new PEList(); - //System.out.println("Creates a PE list for the 2nd Machine"); - - peList2.add( new PE(0, mips) ); - peList2.add( new PE(1, mips) ); - peList2.add( new PE(2, mips) ); - peList2.add( new PE(3, mips) ); - //System.out.println("Creates 4 PEs with same MIPS Rating and put them"+ - // " into the PE list"); - - mList.add( new Machine(1, peList2) ); // Second Machine - //System.out.println("Creates the 2nd Machine that has 4 PEs and " + - // "stores it into the Machine list"); - //System.out.println(); - - PEList peList3 = new PEList(); - //System.out.println("Creates a PE list for the 3rd Machine"); - - peList3.add( new PE(0, mips) ); - peList3.add( new PE(1, mips) ); - //System.out.println("Creates 2 PEs with same MIPS Rating and put them"+ - // " into the PE list"); - - mList.add( new Machine(2, peList3) ); // Third Machine - //System.out.println("Creates the 3rd Machine that has 2 PEs and " + - // "stores it into the Machine list"); - //System.out.println(); - - // 6. Create a ResourceCharacteristics object that stores the + // 4. Create a ResourceCharacteristics object that stores the // properties of a Grid resource: architecture, OS, list of // Machines, allocation policy: time- or space-shared, time zone // and its price (G$/PE time unit). @@ -140,10 +86,7 @@ arch, os, mList, ResourceCharacteristics.TIME_SHARED, time_zone, cost); - //System.out.println("Creates the properties of a Grid resource and " + - // "stores the Machine list"); - - // 7. Finally, we need to create a GridResource object. + // 5. Finally, we need to create a GridResource object. long seed = 11L*13*17*19*23+1; double peakLoad = 0.0; // the resource load during peak hour double offPeakLoad = 0.0; // the resource load during off-peak hr @@ -230,11 +173,6 @@ Broker broker = new Broker("Broker_" + i, baud_rate, propDelay, mtu); - // if trace_flag is set to "true", then this experiment will - // create User_i.csv where i = 0 ... (num_user-1) -// NetUser user = new NetUser(name, num_gridlet, -// broker.getLink(), broker); - NetUser user = new NetUser("User_" + i, num_gridlet, baud_rate, propDelay, mtu, broker); Modified: trunk/examples/auction/example03/ExampleAuction.java =================================================================== --- trunk/examples/auction/example03/ExampleAuction.java 2009-05-21 01:59:34 UTC (rev 266) +++ trunk/examples/auction/example03/ExampleAuction.java 2009-05-22 05:16:40 UTC (rev 267) @@ -67,68 +67,14 @@ MachineList mList = new MachineList(); //System.out.println("Creates a Machine list"); + // 2. Create a Machine with id, number of PEs and MIPS rating per PE + mList.add( new Machine(0, 4, mips)); // First Machine - // 2. A Machine contains one or more PEs or CPUs. Therefore, should - // create an object of PEList to store these PEs before creating - // a Machine. - PEList peList1 = new PEList(); - //System.out.println("Creates a PE list for the 1st Machine"); + // 3. Repeat the process from 2 if we want to create more Machines + mList.add( new Machine(1, 4, mips)); // Second Machine + mList.add( new Machine(2, 2, mips)); // Third Machine - - // 3. Create PEs and add these into an object of PEList. - // In this example, we are using a resource from - // hpc420.hpcc.jp, AIST, Tokyo, Japan - // Note: these data are taken the from GridSim paper, page 25. - // In this example, all PEs has the same MIPS (Millions - // Instruction Per Second) Rating for a Machine. - peList1.add( new PE(0, mips) ); // need to store PE id and MIPS Rating - peList1.add( new PE(1, mips) ); - peList1.add( new PE(2, mips) ); - peList1.add( new PE(3, mips) ); - //System.out.println("Creates 4 PEs with same MIPS Rating and put them"+ - // " into the PE list"); - - - // 4. Create one Machine with its id and list of PEs or CPUs - mList.add( new Machine(0, peList1) ); // First Machine - //System.out.println("Creates the 1st Machine that has 4 PEs and " + - // "stores it into the Machine list"); - //System.out.println(); - - // 5. Repeat the process from 2 if we want to create more Machines - // In this example, the AIST in Japan has 3 Machines with same - // MIPS Rating but different PEs. - // NOTE: if you only want to create one Machine for one Grid resource, - // then you could skip this step. - PEList peList2 = new PEList(); - //System.out.println("Creates a PE list for the 2nd Machine"); - - peList2.add( new PE(0, mips) ); - peList2.add( new PE(1, mips) ); - peList2.add( new PE(2, mips) ); - peList2.add( new PE(3, mips) ); - //System.out.println("Creates 4 PEs with same MIPS Rating and put them"+ - // " into the PE list"); - - mList.add( new Machine(1, peList2) ); // Second Machine - //System.out.println("Creates the 2nd Machine that has 4 PEs and " + - // "stores it into the Machine list"); - //System.out.println(); - - PEList peList3 = new PEList(); - //System.out.println("Creates a PE list for the 3rd Machine"); - - peList3.add( new PE(0, mips) ); - peList3.add( new PE(1, mips) ); - //System.out.println("Creates 2 PEs with same MIPS Rating and put them"+ - // " into the PE list"); - - mList.add( new Machine(2, peList3) ); // Third Machine - //System.out.println("Creates the 3rd Machine that has 2 PEs and " + - // "stores it into the Machine list"); - //System.out.println(); - - // 6. Create a ResourceCharacteristics object that stores the + // 4. Create a ResourceCharacteristics object that stores the // properties of a Grid resource: architecture, OS, list of // Machines, allocation policy: time- or space-shared, time zone // and its price (G$/PE time unit). @@ -143,7 +89,7 @@ //System.out.println("Creates the properties of a Grid resource and " + // "stores the Machine list"); - // 7. Finally, we need to create a GridResource object. + // 5. Finally, we need to create a GridResource object. long seed = 11L*13*17*19*23+1; double peakLoad = 0.0; // the resource load during peak hour double offPeakLoad = 0.0; // the resource load during off-peak hr Modified: trunk/examples/datagrid/example01/DataExample1.java =================================================================== --- trunk/examples/datagrid/example01/DataExample1.java 2009-05-21 01:59:34 UTC (rev 266) +++ trunk/examples/datagrid/example01/DataExample1.java 2009-05-22 05:16:40 UTC (rev 267) @@ -146,50 +146,18 @@ MachineList mList = new MachineList(); //System.out.println("Creates a Machine list"); - // 2. A Machine contains one or more PEs or CPUs. Therefore, should - // create an object of PEList to store these PEs before creating - // a Machine. - PEList peList1 = new PEList(); - //System.out.println("Creates a PE list for the 1st Machine"); + // 2. Create a Machine with id, number of PEs and MIPS rating per PE + mList.add(new Machine(0, 4, 377)); // First Machine - // 3. Create PEs and add these into an object of PEList. - // In this example, we are using a resource from - // hpc420.hpcc.jp, AIST, Tokyo, Japan - // Note: these data are taken the from GridSim paper, page 25. - // In this example, all PEs has the same MIPS (Millions - // Instruction Per Second) Rating for a Machine. - peList1.add(new PE(0, 377)); // need to store PE id and MIPS Rating - peList1.add(new PE(1, 377)); - peList1.add(new PE(2, 377)); - peList1.add(new PE(3, 377)); - - // 4. Create one Machine with its id and list of PEs or CPUs - mList.add(new Machine(0, peList1)); // First Machine - - // 5. Repeat the process from 2 if we want to create more Machines + // 3. Repeat the process from 2 if we want to create more Machines // In this example, the AIST in Japan has 3 Machines with same // MIPS Rating but different PEs. // NOTE: if you only want to create one Machine for one Grid resource, // then you could skip this step. - PEList peList2 = new PEList(); + mList.add(new Machine(1, 4, 377)); // Second Machine + mList.add(new Machine(2, 2, 377)); // Third Machine - peList2.add(new PE(0, 377)); - peList2.add(new PE(1, 377)); - peList2.add(new PE(2, 377)); - peList2.add(new PE(3, 377)); - - mList.add(new Machine(1, peList2)); // Second Machine - - PEList peList3 = new PEList(); - - peList3.add(new PE(0, 377)); - peList3.add(new PE(1, 377)); - - - mList.add(new Machine(2, peList3)); // Third Machine - - - // 6. Create a ResourceCharacteristics object that stores the + // 4. Create a ResourceCharacteristics object that stores the // properties of a Grid resource: architecture, OS, list of // Machines, allocation policy: time- or space-shared, time zone // and its price (G$/PE time unit). @@ -202,7 +170,7 @@ os, mList, ResourceCharacteristics.TIME_SHARED, time_zone, cost); - // 7. Finally, we need to create a GridResource object. + // 5. Finally, we need to create a GridResource object. long seed = 11L * 13 * 17 * 19 * 23 + 1; double peakLoad = 0.0; // the resource load during peak hour double offPeakLoad = 0.0; // the resource load during off-peak hr Deleted: trunk/examples/datagrid/example01/readme.txt =================================================================== --- trunk/examples/datagrid/example01/readme.txt 2009-05-21 01:59:34 UTC (rev 266) +++ trunk/examples/datagrid/example01/readme.txt 2009-05-22 05:16:40 UTC (rev 267) @@ -1,22 +0,0 @@ -/** - * Author: Anthony Sulistio - * Date: March 2006 - */ - -NOTE: When you open "output.txt" file, it tells you that grid user entities - sending Gridlets to a selected grid resource. - -When running the example file, it will produce the following files: - - sim_trace -> created by the SimJava2 package (lower-level) to trace every - events (performed by SimJava and GridSim) during the simulation. - We don't need to worry about this file. Not to important for our - example. - - sim_report -> created by the SimJava2 package (lower-level) of GridSim. - This is a simulation report that contains general information about - running this experiment. We don't need to worry about this file. - Not to important for our example. - -NOTE: sim_trace and sim_report file will be overwritten if running - a new experiment. Modified: trunk/examples/datagrid/example02/DataExample2.java =================================================================== --- trunk/examples/datagrid/example02/DataExample2.java 2009-05-21 01:59:34 UTC (rev 266) +++ trunk/examples/datagrid/example02/DataExample2.java 2009-05-22 05:16:40 UTC (rev 267) @@ -136,51 +136,22 @@ // Here are the steps needed to create a Grid resource: // 1. We need to create an object of MachineList to store one or more - // Machines + // Machines MachineList mList = new MachineList(); + //System.out.println("Creates a Machine list"); - // 2. A Machine contains one or more PEs or CPUs. Therefore, should - // create an object of PEList to store these PEs before creating - // a Machine. - PEList peList1 = new PEList(); + // 2. Create a Machine with id, number of PEs and MIPS rating per PE + mList.add(new Machine(0, 4, 377)); // First Machine - // 3. Create PEs and add these into an object of PEList. - // In this example, we are using a resource from - // hpc420.hpcc.jp, AIST, Tokyo, Japan - // Note: these data are taken the from GridSim paper, page 25. - // In this example, all PEs has the same MIPS (Millions - // Instruction Per Second) Rating for a Machine. - peList1.add(new PE(0, 377)); // need to store PE id and MIPS Rating - peList1.add(new PE(1, 377)); - peList1.add(new PE(2, 377)); - peList1.add(new PE(3, 377)); - - // 4. Create one Machine with its id and list of PEs or CPUs - mList.add(new Machine(0, peList1)); // First Machine - - // 5. Repeat the process from 2 if we want to create more Machines - // In this example, the AIST in Japan has 3 Machines with same - // MIPS Rating but different PEs. + // 3. Repeat the process from 2 if we want to create more Machines + // In this example, the AIST in Japan has 3 Machines with same + // MIPS Rating but different PEs. // NOTE: if you only want to create one Machine for one Grid resource, - // then you could skip this step. - PEList peList2 = new PEList(); + // then you could skip this step. + mList.add(new Machine(1, 4, 377)); // Second Machine + mList.add(new Machine(2, 2, 377)); // Third Machine - peList2.add(new PE(0, 377)); - peList2.add(new PE(1, 377)); - peList2.add(new PE(2, 377)); - peList2.add(new PE(3, 377)); - - mList.add(new Machine(1, peList2)); // Second Machine - - PEList peList3 = new PEList(); - // System.out.println("Creates a PE list for the 3rd Machine"); - - peList3.add(new PE(0, 377)); - peList3.add(new PE(1, 377)); - - mList.add(new Machine(2, peList3)); // Third Machine - - // 6. Create a ResourceCharacteristics object that stores the + // 4. Create a ResourceCharacteristics object that stores the // properties of a Grid resource: architecture, OS, list of // Machines, allocation policy: time- or space-shared, time zone // and its price (G$/PE time unit). @@ -195,7 +166,7 @@ // System.out.println("Creates the properties of a Grid resource and " + // "stores the Machine list"); - // 7. Finally, we need to create a GridResource object. + // 5. Finally, we need to create a GridResource object. long seed = 11L * 13 * 17 * 19 * 23 + 1; double peakLoad = 0.0; // the resource load during peak hour double offPeakLoad = 0.0; // the resource load during off-peak hr Deleted: trunk/examples/datagrid/example02/readme.txt =================================================================== --- trunk/examples/datagrid/example02/readme.txt 2009-05-21 01:59:34 UTC (rev 266) +++ trunk/examples/datagrid/example02/readme.txt 2009-05-22 05:16:40 UTC (rev 267) @@ -1,22 +0,0 @@ -/** - * Author: Anthony Sulistio - * Date: March 2006 - */ - -NOTE: When you open "output.txt" file, it tells you that grid user entities - sending Gridlets to a selected grid resource. - -When running the example file, it will produce the following files: - - sim_trace -> created by the SimJava2 package (lower-level) to trace every - events (performed by SimJava and GridSim) during the simulation. - We don't need to worry about this file. Not to important for our - example. - - sim_report -> created by the SimJava2 package (lower-level) of GridSim. - This is a simulation report that contains general information about - running this experiment. We don't need to worry about this file. - Not to important for our example. - -NOTE: sim_trace and sim_report file will be overwritten if running - a new experiment. Modified: trunk/examples/datagrid/example03/DataGridletExample.java =================================================================== --- trunk/examples/datagrid/example03/DataGridletExample.java 2009-05-21 01:59:34 UTC (rev 266) +++ trunk/examples/datagrid/example03/DataGridletExample.java 2009-05-22 05:16:40 UTC (rev 267) @@ -140,51 +140,22 @@ // Here are the steps needed to create a Grid resource: // 1. We need to create an object of MachineList to store one or more - // Machines + // Machines MachineList mList = new MachineList(); + //System.out.println("Creates a Machine list"); - // 2. A Machine contains one or more PEs or CPUs. Therefore, should - // create an object of PEList to store these PEs before creating - // a Machine. - PEList peList1 = new PEList(); + // 2. Create a Machine with id, number of PEs and MIPS rating per PE + mList.add(new Machine(0, 4, 377)); // First Machine - // 3. Create PEs and add these into an object of PEList. - // In this example, we are using a resource from - // hpc420.hpcc.jp, AIST, Tokyo, Japan - // Note: these data are taken the from GridSim paper, page 25. - // In this example, all PEs has the same MIPS (Millions - // Instruction Per Second) Rating for a Machine. - peList1.add(new PE(0, 377)); // need to store PE id and MIPS Rating - peList1.add(new PE(1, 377)); - peList1.add(new PE(2, 377)); - peList1.add(new PE(3, 377)); - - // 4. Create one Machine with its id and list of PEs or CPUs - mList.add(new Machine(0, peList1)); // First Machine - - // 5. Repeat the process from 2 if we want to create more Machines - // In this example, the AIST in Japan has 3 Machines with same - // MIPS Rating but different PEs. + // 3. Repeat the process from 2 if we want to create more Machines + // In this example, the AIST in Japan has 3 Machines with same + // MIPS Rating but different PEs. // NOTE: if you only want to create one Machine for one Grid resource, - // then you could skip this step. - PEList peList2 = new PEList(); + // then you could skip this step. + mList.add(new Machine(1, 4, 377)); // Second Machine + mList.add(new Machine(2, 2, 377)); // Third Machine - peList2.add(new PE(0, 377)); - peList2.add(new PE(1, 377)); - peList2.add(new PE(2, 377)); - peList2.add(new PE(3, 377)); - - mList.add(new Machine(1, peList2)); // Second Machine - - PEList peList3 = new PEList(); - // System.out.println("Creates a PE list for the 3rd Machine"); - - peList3.add(new PE(0, 377)); - peList3.add(new PE(1, 377)); - - mList.add(new Machine(2, peList3)); // Third Machine - - // 6. Create a ResourceCharacteristics object that stores the + // 4. Create a ResourceCharacteristics object that stores the // properties of a Grid resource: architecture, OS, list of // Machines, allocation policy: time- or space-shared, time zone // and its price (G$/PE time unit). @@ -199,7 +170,7 @@ // System.out.println("Creates the properties of a Grid resource and " + // "stores the Machine list"); - // 7. Finally, we need to create a GridResource object. + // 5. Finally, we need to create a GridResource object. long seed = 11L * 13 * 17 * 19 * 23 + 1; double peakLoad = 0.0; // the resource load during peak hour double offPeakLoad = 0.0; // the resource load during off-peak hr Deleted: trunk/examples/datagrid/example03/readme.txt =================================================================== --- trunk/examples/datagrid/example03/readme.txt 2009-05-21 01:59:34 UTC (rev 266) +++ trunk/examples/datagrid/example03/readme.txt 2009-05-22 05:16:40 UTC (rev 267) @@ -1,23 +0,0 @@ -/** - * Author: Anthony Sulistio - * Date: March 2006 - */ - -NOTE: When you open "output.txt" file, it tells you that grid user entities - sending Gridlets to a selected grid resource. - - -When running the example file, it will produce the following files: - - sim_trace -> created by the SimJava2 package (lower-level) to trace every - events (performed by SimJava and GridSim) during the simulation. - We don't need to worry about this file. Not to important for our - example. - - sim_report -> created by the SimJava2 package (lower-level) of GridSim. - This is a simulation report that contains general information about - running this experiment. We don't need to worry about this file. - Not to important for our example. - -NOTE: sim_trace and sim_report file will be overwritten if running - a new experiment. Modified: trunk/examples/datagrid/example04/readme.txt =================================================================== --- trunk/examples/datagrid/example04/readme.txt 2009-05-21 01:59:34 UTC (rev 266) +++ trunk/examples/datagrid/example04/readme.txt 2009-05-22 05:16:40 UTC (rev 267) @@ -14,22 +14,3 @@ Each of these two users must execute a small set of tasks. A more detailed description of this package can be found in the tutorial. - -NOTE: When you open "output.txt" file, it tells you that grid user entities - sending Gridlets to a selected grid resource. - - -When running the example file, it will produce the following files: - - sim_trace -> created by the SimJava2 package (lower-level) to trace every - events (performed by SimJava and GridSim) during the simulation. - We don't need to worry about this file. Not to important for our - example. - - sim_report -> created by the SimJava2 package (lower-level) of GridSim. - This is a simulation report that contains general information about - running this experiment. We don't need to worry about this file. - Not to important for our example. - -NOTE: sim_trace and sim_report file will be overwritten if running - a new experiment. Modified: trunk/examples/gridsim/example01/Example1.java =================================================================== --- trunk/examples/gridsim/example01/Example1.java 2009-05-21 01:59:34 UTC (rev 266) +++ trunk/examples/gridsim/example01/Example1.java 2009-05-22 05:16:40 UTC (rev 267) @@ -12,7 +12,9 @@ * $Id: Example1.java,v 1.6 2004/05/29 05:24:00 anthony Exp $ */ -import java.util.*; +import java.util.Calendar; +import java.util.LinkedList; + import gridsim.*; /** @@ -99,70 +101,31 @@ MachineList mList = new MachineList(); System.out.println("Creates a Machine list"); - - // 2. A Machine contains one or more PEs or CPUs. Therefore, should - // create an object of PEList to store these PEs before creating - // a Machine. - PEList peList1 = new PEList(); - System.out.println("Creates a PE list for the 1st Machine"); - - - // 3. Create PEs and add these into an object of PEList. + // 2. Create one Machine with its id, number of PEs and MIPS rating per PE // In this example, we are using a resource from // hpc420.hpcc.jp, AIST, Tokyo, Japan // Note: these data are taken the from GridSim paper, page 25. // In this example, all PEs has the same MIPS (Millions // Instruction Per Second) Rating for a Machine. - int MIPSRating = 377; - peList1.add( new PE(0, MIPSRating) ); // store PE id and MIPS Rating - peList1.add( new PE(1, MIPSRating) ); - peList1.add( new PE(2, MIPSRating) ); - peList1.add( new PE(3, MIPSRating) ); - System.out.println("Creates 4 PEs with same MIPS Rating and put " + - "them into the PE list"); - - - // 4. Create one Machine with its id and list of PEs or CPUs - mList.add( new Machine(0, peList1) ); // First Machine + int mipsRating = 377; + mList.add( new Machine(0, 4, mipsRating)); // First Machine System.out.println("Creates the 1st Machine that has 4 PEs and " + "stores it into the Machine list"); - - // 5. Repeat the process from 2 if we want to create more Machines + // 3. Repeat the process from 2 if we want to create more Machines // In this example, the AIST in Japan has 3 Machines with same // MIPS Rating but different PEs. // NOTE: if you only want to create one Machine for one Grid resource, // then you could skip this step. - PEList peList2 = new PEList(); - System.out.println(); - System.out.println("Creates a PE list for the 2nd Machine"); - - peList2.add( new PE(0, MIPSRating) ); - peList2.add( new PE(1, MIPSRating) ); - peList2.add( new PE(2, MIPSRating) ); - peList2.add( new PE(3, MIPSRating) ); - System.out.println("Creates 4 PEs with same MIPS Rating and put " + - "them into the PE list"); - - mList.add( new Machine(1, peList2) ); // Second Machine + mList.add( new Machine(1, 4, mipsRating)); // Second Machine System.out.println("Creates the 2nd Machine that has 4 PEs and " + "stores it into the Machine list"); - PEList peList3 = new PEList(); - System.out.println(); - System.out.println("Creates a PE list for the 3rd Machine"); - - peList3.add( new PE(0, MIPSRating) ); - peList3.add( new PE(1, MIPSRating) ); - System.out.println("Creates 2 PEs with same MIPS Rating and put " + - "them into the PE list"); - - mList.add( new Machine(2, peList3) ); // Third Machine + mList.add( new Machine(2, 2, mipsRating)); // Third Machine System.out.println("Creates the 3rd Machine that has 2 PEs and " + "stores it into the Machine list"); - - // 6. Create a ResourceCharacteristics object that stores the + // 4. Create a ResourceCharacteristics object that stores the // properties of a Grid resource: architecture, OS, list of // Machines, allocation policy: time- or space-shared, time zone // and its price (G$/PE time unit). @@ -179,8 +142,7 @@ System.out.println("Creates the properties of a Grid resource and " + "stores the Machine list"); - - // 7. Finally, we need to create a GridResource object. + // 5. Finally, we need to create a GridResource object. String name = "Resource_0"; // resource name double baud_rate = 100.0; // communication speed long seed = 11L*13*17*19*23+1; @@ -189,12 +151,12 @@ double holidayLoad = 0.0; // the resource load during holiday // incorporates weekends so the grid resource is on 7 days a week - LinkedList Weekends = new LinkedList(); + LinkedList<Integer> Weekends = new LinkedList<Integer>(); Weekends.add(new Integer(Calendar.SATURDAY)); Weekends.add(new Integer(Calendar.SUNDAY)); // incorporates holidays. However, no holidays are set in this example - LinkedList Holidays = new LinkedList(); + LinkedList<Integer> Holidays = new LinkedList<Integer>(); GridResource gridRes = null; try @@ -212,6 +174,5 @@ return gridRes; } +} -} // end class - Deleted: trunk/examples/gridsim/example01/readme.txt =================================================================== --- trunk/examples/gridsim/example01/readme.txt 2009-05-21 01:59:34 UTC (rev 266) +++ trunk/examples/gridsim/example01/readme.txt 2009-05-22 05:16:40 UTC (rev 267) @@ -1,20 +0,0 @@ - -/** - * Author: Anthony Sulistio - * Date: April 2003 - */ - -When running the example file, it will produce the following files: - - GridSim_stat.txt -> created by the GridSim version 2.2 onwards - during GridSim.init() to create - GridStatistics object for statistical purposes. Since this example only - shows how to create one Grid resource, therefore, this file is empty. - We don't simulate anything yet. - - sim_trace -> created by the SimJava2 package (lower-level) to trace every - events (performed by SimJava and GridSim) during the simulation. - We don't need to worry about this file. Not to important for our - example. Inside this file is empty since we don't simulate anything yet. - - Modified: trunk/examples/gridsim/example03/readme.txt =================================================================== --- trunk/examples/gridsim/example03/readme.txt 2009-05-21 01:59:34 UTC (rev 266) +++ trunk/examples/gridsim/example03/readme.txt 2009-05-22 05:16:40 UTC (rev 267) @@ -9,20 +9,3 @@ "Gridlet.SUCCESS". Therefore, the output is correct as expected with all the Gridlets have the same status. -When running the example file, it will produce the following files: - - GridSim_stat.txt -> created by the GridSim version 2.2 onwards - during GridSim.init() to create - GridStatistics object for statistical purposes. Since this example only - shows how to create one Grid resource, therefore, this file is empty. - We don't simulate anything yet. - - sim_trace -> created by the SimJava2 package (lower-level) to trace every - events (performed by SimJava and GridSim) during the simulation. - We don't need to w... [truncated message content] |
From: <mar...@us...> - 2009-05-22 05:49:28
|
Revision: 269 http://gridsim.svn.sourceforge.net/gridsim/?rev=269&view=rev Author: marcos_dias Date: 2009-05-22 05:47:14 +0000 (Fri, 22 May 2009) Log Message: ----------- * Changes in the build.xml file to include the SimJava2 classes into gridsim.jar. * Updated readme.txt file. Modified Paths: -------------- trunk/build.xml Added Paths: ----------- trunk/readme.txt Modified: trunk/build.xml =================================================================== --- trunk/build.xml 2009-05-22 05:18:22 UTC (rev 268) +++ trunk/build.xml 2009-05-22 05:47:14 UTC (rev 269) @@ -62,8 +62,31 @@ --> <target name="makejar" depends="build"> <echo>Compiling a new jar file, named: "gridsim.jar".</echo> + + <!-- <echo>This jar file only contains GridSim classes but not SimJava2.</echo> - <jar destfile="${jar.dir}/gridsim.jar" basedir="${class.dir}" /> + --> + + <echo>Unpacking SimJava2 jar file.</echo> + <delete file="${jar.dir}/gridsim.jar"/> + <delete dir="tmp"/> + <mkdir dir="tmp"/> + + <unjar dest="tmp"> + <fileset dir="jars" includes="simjava2.jar"/> + </unjar> + + <echo>Creating GridSim jar file including SimJava2 classes.</echo> + <delete dir="tmp/META-INF"/> + <jar jarfile="${jar.dir}/gridsim.jar" basedir="${class.dir}"> + <fileset dir="tmp"/> + </jar> + <delete dir="tmp"/> + + <!-- + <jar destfile="${jar.dir}/gridsim.jar" basedir="${class.dir}"/> + --> + </target> <target name="clean" description="clean up" > Added: trunk/readme.txt =================================================================== --- trunk/readme.txt (rev 0) +++ trunk/readme.txt 2009-05-22 05:47:14 UTC (rev 269) @@ -0,0 +1,65 @@ +Readme file + +Directory Structure of GridSim Toolkit +-------------------------------------- + +$GRIDSIM/ -- the current GridSim directory (top level) + classes/ -- The GridSim class files + doc/ -- GridSim and SimJava API Documentation + eduni/ + gridsim/ + examples/ -- GridSim examples, see examples/readme.txt for details + jars/ -- jar archives + source/ -- The GridSim Java source code + gridsim/*.java + gridsim/auction/*.java -- framework for the auction model + gridsim/datagrid/*.java -- framework for the Data Grids model + gridsim/filter/*.java -- filters incoming events + gridsim/index/*.java -- framework for the Grid Info Service model + gridsim/net/*.java -- framework for the network model + gridsim/resFailure/*.java -- framework for the resource failure model + gridsim/util/*.java -- includes some statistics classes. + gridsim/parallel/*.java -- includes scheduling of parallel jobs + +GridSim APIs and examples are also available on the GridSim website. + +Software Requirements : Java version 1.50 or newer +--------------------- +GridSim has been tested and run on Sun's Java version 1.5.0 or newer. Older +versions of Java are not compatible. You also need to install Ant to compile +GridSim (explained in more details later). + + +Installation and Running GridSim Toolkit +---------------------------------------- +There is no special program to install GridSim. You just need to +unzip the GridSim file to install. +If you want to remove GridSim, then remove the whole $GRIDSIM directory. + +NOTE: You do not need to compile GridSim source code. The JAR file is + provided to compile and to run GridSim applications. + +Description of the following jar files: +* gridsim.jar -- contains both GridSim and SimJava v2.0 class files +* simjava2.jar -- contains SimJava v2.0 class files only + +To compile and run GridSim applications, do the following step: +1) Go the directory where the GridSim's examples reside + In Unix or Linux: cd $GRIDSIM/examples/ + In Windows: cd %GRIDSIM%\examples\ + +2) Compile the Java source file (e.g. example01) + In Unix or Linux: javac -cp $GRIDSIM/jars/gridsim.jar:. gridsim/example01/Example1.java + In Windows: javac -cp %GRIDSIM%\jars\gridsim.jar;. gridsim\example01\Example1.java + +3) Running the Java class file + In Unix or Linux: java -cp $GRIDSIM/jars/gridsim.jar:. gridsim/example01/Example1 + In Windows: java -cp %GRIDSIM%\jars\gridsim.jar;. gridsim\example01\Example1 + +NOTE: +* $GRIDSIM or %GRIDSIM% is the location of the GridSim Toolkit package. +* Running GridSim of this version requires a lot of memory since there are many + objects to be created. Therefore, it is recommended to have at least 512MB RAM + or increase JVM heap size when running Java for large simulation experiments. + For example: java -Xmx300m -classpath $GRIDSIM/jars/gridsim.jar:. gridsim/example01/Example1 + (max. heap size is 300MB). This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mar...@us...> - 2009-09-23 16:56:54
|
Revision: 272 http://gridsim.svn.sourceforge.net/gridsim/?rev=272&view=rev Author: marcos_dias Date: 2009-09-23 16:56:07 +0000 (Wed, 23 Sep 2009) Log Message: ----------- Changes in documentation and script details to release GridSim as version 5 Modified Paths: -------------- trunk/build.xml trunk/changelog.txt trunk/faq.txt trunk/readme.txt trunk/release_note.txt Added Paths: ----------- trunk/release.sh trunk/roadmap.txt Removed Paths: ------------- trunk/javadoc.sh Modified: trunk/build.xml =================================================================== --- trunk/build.xml 2009-09-22 10:44:29 UTC (rev 271) +++ trunk/build.xml 2009-09-23 16:56:07 UTC (rev 272) @@ -1,6 +1,7 @@ <?xml version="1.0"?> -<!-- September 2004 +<!-- + Build file or Makefile for GridSim. NOTE: Make sure you have installed 'ant' and put the location of it into your path so you can access it anywhere. @@ -11,15 +12,9 @@ classes/ directory * type 'ant makejar' to compile the source files (if necessary) and to create a jar file into jar/ directory - -NOTE: rule for javadoc is not included yet. Use javadoc.sh script instead under - Unix/Linux environment. - -Acknowledgement: Thank to Uros Cibej for providing this file and instruction on - how to use it. + --> - <project name="GridSim" basedir="." default="build"> <description> This is the build file for GridSim @@ -42,9 +37,11 @@ <property name="doc.dir" location="./doc" /> <!-- location to use SimJava libraries --> - <property name="classpath" location="${jar.dir}/simjava2.jar" /> + <property name="classpath" location="${jar.dir}/simjava2.jar" /> + + <!-- the website where the SimJava2 documentation is maintained --> + <property name="sjdoc" value="http://www.icsa.informatics.ed.ac.uk/research/groups/hase/simjava/doc" /> - <target name="prepare"> <mkdir dir="${class.dir}" /> </target> @@ -102,12 +99,14 @@ doctitle="GridSim ${version} API Specification" header="GridSim ${version}" bottom="The University of Melbourne, Australia, ${year}" - destdir="${doc.dir}"> + destdir="${doc.dir}" classpath="${classpath}"> <tag name="invariant" scope="all" description="Invariant:"/> <tag name="pre" scope="all" description="Pre Condition:"/> <tag name="post" scope="all" description="Post Condition:"/> - <fileset dir="${src.dir}" includes="**/*.java" /> + + <link href="${sjdoc}" offline="true" packagelistLoc="${jar.dir}"/> + <fileset dir="${src.dir}" includes="**/*.java"/> </javadoc> </target> Modified: trunk/changelog.txt =================================================================== --- trunk/changelog.txt 2009-09-22 10:44:29 UTC (rev 271) +++ trunk/changelog.txt 2009-09-23 16:56:07 UTC (rev 272) @@ -1,4 +1,4 @@ -#Changelog for GridSim Toolkit +#Change log for GridSim Toolkit Changes from 4.2 to 5.0 - Improvements to make GridSim more compatible with Java 5 and 6 Modified: trunk/faq.txt =================================================================== --- trunk/faq.txt 2009-09-22 10:44:29 UTC (rev 271) +++ trunk/faq.txt 2009-09-23 16:56:07 UTC (rev 272) @@ -10,8 +10,7 @@ --------------------------------------------------------- Q: Where can I find gridbroker, visual modeler, ... ? -A: Gridbroker and Visual Modeler are no longer supported. The can be found at: -http://www.gridbus.org/gridsim/release.html, but their use is not encouraged. +A: Gridbroker and Visual Modeler are no longer supported. --------------------------------------------------------- Q: I would like to do some experiments for my research work on grid computing @@ -20,9 +19,6 @@ administrators, etc. on a PC environment? Please pass on some resources, links, and white papers and links where from I should download. -Q: Please help me by sending GridSim Package, give instructions and - also technical help to complete my project successfully. - A: The best way to learn GridSim is by downloading it from the link below: http://www.gridbus.org/gridsim/ @@ -44,17 +40,17 @@ * to compile type: javac -cp $GRIDSIM/jars/gridsim.jar:. gridsim/example01/Example1.java * to run type: - java -cp $GRIDSIM/jars/gridsim.jar:. gridsim/example01/Example1 + java -cp $GRIDSIM/jars/gridsim.jar:. gridsim.example01.Example1 In Windows: * go to the examples directory, i.e. at command prompt type: cd %GRIDSIM%\examples * to compile type: javac -cp %GRIDSIM%\jars\gridsim.jar;. gridsim\example01\Example1.java - * to run type: java -cp %GRIDSIM%\jars\gridsim.jar;. gridsim\example01\Example1 + * to run type: java -cp %GRIDSIM%\jars\gridsim.jar;. gridsim.example01.Example1 The main difference is the use of ":" for Unix/Linux, and ";" for Windows NOTE: $GRIDSIM or %GRIDSIM% is the location of the GridSim Toolkit package. - Also, inside gridsim.jar contains SimJava v2.0 classes. Hence, + Also, gridsim.jar contains SimJava v2.0 classes. Hence, you do not need to install SimJava libraries. --------------------------------------------------------- @@ -63,9 +59,9 @@ A: You need the classpath to refer to the directory where Example1.java located. For Example, to run in Windows: - java -classpath gridsim.jar;. Example1 + java -classpath gridsim.jar;. gridsim.example01.Example1 - where Example1 is the classname you want to execute + where gridsim.example01.Example1 is the classname you want to execute --------------------------------------------------------- Q: My GridSim application runs perfectly, however, after the end of simulation @@ -167,7 +163,7 @@ Q: How do I create Gridlets with compute I/O requirements? A: Gridlets with compute I/O requirements are simulated through their file - sizes (input) and output sizez (output) parameters. + sizes (input) and output size (output) parameters. See Figure 16 of the GridSim paper. --------------------------------------------------------- @@ -182,11 +178,11 @@ A: Not supported in the older versions. Currently GridSim uses very simple network model. - Since GridSim ver3.1, it has a realistic network model. However, + Since GridSim 3.1, it has a realistic network model. However, advanced network features are not supported. --------------------------------------------------------- -Q: Is GridSim tool kit provides any help in solving problems for dynamical +Q: Is GridSim tool kit provides any help in solving problems for dynamic resource allocation upon failure? A: GridSim provides mechanism to reserve, but policy of reservation and @@ -203,7 +199,7 @@ Q: Does each gridlet can only be processed by only one PE? A: For older GridSim versions, it runs one PE. - Since GridSim ver3.0, each Gridlet can ask to be run on multiple PEs. + Since GridSim 3.0, each Gridlet can ask to be run on multiple PEs. However, it is up to the scheduler to handle this. At the moment, by default, TimeShared and SpaceShared scheduler executes an incoming Gridlet to only 1 PE. Deleted: trunk/javadoc.sh =================================================================== --- trunk/javadoc.sh 2009-09-22 10:44:29 UTC (rev 271) +++ trunk/javadoc.sh 2009-09-23 16:56:07 UTC (rev 272) @@ -1,44 +0,0 @@ - -## A script to run javadoc (Anthony Sept 2004). - -year="2008" # year -ver="v4.2 beta" # version number - -dir=./source # source directory that contains Java files -doc=./doc # output directory - -# Only creates GridSim javadoc. -javadoc -author -version -package -noqualifier java.* \ - -windowtitle 'GridSim '$ver' API Specification' \ - -doctitle '<b>GridSim</b> '$ver' API Specification' \ - -header '<b>GridSim</b><br><font size='-1'>'$ver'</font>' \ - -bottom 'The University of Melbourne, Australia, '$year \ - -d $doc -breakiterator \ - -tag pre:a:"Pre Condition:" \ - -tag post:a:"Post Condition:" \ - -tag invariant:t:"Invariant:" \ - $dir/eduni/simjava/*.java \ - $dir/eduni/simjava/distributions/*.java \ - $dir/gridsim/*.java \ - $dir/gridsim/util/*.java \ - $dir/gridsim/net/*.java \ - $dir/gridsim/net/flow/*.java \ - $dir/gridsim/net/fnb/*.java \ - $dir/gridsim/filter/*.java \ - $dir/gridsim/index/*.java \ - $dir/gridsim/resFailure/*.java \ - $dir/gridsim/auction/*.java \ - $dir/gridsim/datagrid/*.java \ - $dir/gridsim/datagrid/filter/*.java \ - $dir/gridsim/datagrid/index/*.java \ - $dir/gridsim/datagrid/storage/*.java \ - $dir/gridsim/parallel/*.java \ - $dir/gridsim/parallel/gui/*.java \ - $dir/gridsim/parallel/log/*.java \ - $dir/gridsim/parallel/profile/*.java \ - $dir/gridsim/parallel/reservation/*.java \ - $dir/gridsim/parallel/scheduler/*.java \ - $dir/gridsim/parallel/*.java \ - -echo "javadoc is done ...." - Modified: trunk/readme.txt =================================================================== --- trunk/readme.txt 2009-09-22 10:44:29 UTC (rev 271) +++ trunk/readme.txt 2009-09-23 16:56:07 UTC (rev 272) @@ -23,7 +23,7 @@ GridSim APIs and examples are also available on the GridSim website. -Software Requirements : Java version 1.50 or newer +Software Requirements : Java version 1.5 or newer --------------------- GridSim has been tested and run on Sun's Java version 1.5.0 or newer. Older versions of Java are not compatible. You also need to install Ant to compile Added: trunk/release.sh =================================================================== --- trunk/release.sh (rev 0) +++ trunk/release.sh 2009-09-23 16:56:07 UTC (rev 272) @@ -0,0 +1,24 @@ +#!/bin/sh + +# Pack the files for a GridSim release +# Usage example: +# sh release.sh 5beta + +VERSION=$1 +FILES="./source ./examples ./jars ./build.xml *.txt" +CURRDIR=`pwd` + +mkdir -p ./release/gridsim + +for file in $FILES; do + cp -r $file release/gridsim +done + +cd ./release + +tar cfzv gridsim-toolkit${VERSION}.tar.gz gridsim --exclude=**/.svn +zip -r gridsim-toolkit${VERSION}.zip gridsim -x *.svn* + +rm -rf gridsim + +cd $CURRDIR Modified: trunk/release_note.txt =================================================================== --- trunk/release_note.txt 2009-09-22 10:44:29 UTC (rev 271) +++ trunk/release_note.txt 2009-09-23 16:56:07 UTC (rev 272) @@ -1,10 +1,11 @@ - Gridbus Project to Release GridSim Toolkit 5.0 - June 2009 + CLOUDS Lab to Release GridSim Toolkit 5.0 + September 2009 -The Gridbus Project at The University of Melbourne, Australia has released the -next-version of Grid simulation software, the GridSim Toolkit 5.0. +The Cloud Computing and Distributed Systems (CLOUDS) Laboratory at +the University of Melbourne, Australia has released the next-version of +Grid simulation software, the GridSim Toolkit 5.0. This new version of GridSim brings a new package (i.e. gridsim.parallel) that provides: @@ -33,15 +34,15 @@ * An implementation of the workload model by Lublin and Feitelson for modelling -the workload of resources. Details about the workload model are available in: +the workload of clusters and supercomputers. Details about the workload model +are available in the following publication: Uri Lublin and Dror G. Feitelson, The Workload on Parallel Supercomputers: Modeling the Characteristics of Rigid Jobs. J. Parallel & Distributed Comput. 63(11), pp. 1105-1122, Nov 2003. * A data structure to facilitate the scheduling of jobs and advance reservations. -This data structure is decribed as an appendix on Marcos Dias de -Assuncao's PhD thesis. +This data structure is described as an appendix on Marcos Assuncao's PhD thesis. * Logging features using Java logging API. @@ -62,21 +63,22 @@ Tsinghua University (China), Sun Microsystems, IBM Research, Unisys, HP, Northrop Grumman Information Technology, British Telecom and EMC Corp. -The contributors to the GridSim software (from early to new version) are: -* Rajkumar Buyya, GRIDS Lab @ The University of Melbourne. +The contributors to the GridSim software (from early to new versions) are: +* Rajkumar Buyya, CLOUDS Lab @ The University of Melbourne. * Manzur Murshed, GSCIT @ Monash University, Australia. -* Anthony Sulistio, GRIDS Lab @ The University of Melbourne. +* Anthony Sulistio, CLOUDS Lab @ The University of Melbourne. * Gokul Poduval and Chen-Khong Tham, Dept. of Electrical & Computer Engineering @ National University of Singapore. -* Marcos Dias de Assuncao, GRIDS Lab @ The University of Melbourne. +* Marcos Dias de Assuncao, INRIA Lyon @ Ecole Normale Superieure de Lyon * Uros Cibej and Borut Robic, Faculty of Computer and Information Service, The University of Ljubljana, Slovenia. * Agustin Caminero, Department of Computing Systems, Universidad de Castilla La Mancha (UCLM), Spain. +* James Broberg, CLOUDS Lab @ The University of Melbourne. +* Saurabh Garg, CLOUDS Lab @ The University of Melbourne. +To download the GridSim software, please visit the CLOUDS Lab web site at +http://www.cloudbus.org/gridsim/ -To download the GridSim software, please visit the Gridbus Project web site at -http://www.gridbus.org/gridsim/ - Join the GridSim mailing lists at http://sourceforge.net/projects/gridsim Added: trunk/roadmap.txt =================================================================== --- trunk/roadmap.txt (rev 0) +++ trunk/roadmap.txt 2009-09-23 16:56:07 UTC (rev 272) @@ -0,0 +1,11 @@ +Short term goals: ++ Make lists typed to be compliant with Java 1.5+ ++ Check which packages are in use ++ Remove the dependency on entities that wait for particular events. For example, +the advance reservation class waits for the response of a given reservation request +and ignores other events. This creates a dependency on multi-threading for +entities. That becomes a bottleneck. ++ Not every entity should be a thread. Work with the idea of thread-pool. + +For version 6.0: ++ Complete new design for the simulation core. Remove dependency on SimJava \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mar...@us...> - 2009-09-23 17:23:03
|
Revision: 273 http://gridsim.svn.sourceforge.net/gridsim/?rev=273&view=rev Author: marcos_dias Date: 2009-09-23 17:22:45 +0000 (Wed, 23 Sep 2009) Log Message: ----------- Changes in documentation and script details to release GridSim as version 5 Modified Paths: -------------- trunk/examples/ResFailure/example01/GridUserFailureEx01.java trunk/examples/ResFailure/example01/GridletSubmission.java trunk/examples/ResFailure/example01/ResFailureEx01.java trunk/examples/ResFailure/example01/readme.txt trunk/examples/ResFailure/example02/GridUserFailureEx02.java trunk/examples/ResFailure/example02/GridletSubmission.java trunk/examples/ResFailure/example02/ResFailureEx02.java trunk/examples/ResFailure/example02/readme.txt trunk/examples/ResFailure/example03/GridUserFailureEx03.java trunk/examples/ResFailure/example03/GridletSubmission.java trunk/examples/ResFailure/example03/ResFailureEx03.java trunk/examples/ResFailure/example03/readme.txt trunk/examples/datagrid/example01/DataExample1.java trunk/examples/datagrid/example01/DummyUser.java trunk/examples/datagrid/example02/DataExample2.java trunk/examples/datagrid/example02/FileUser.java trunk/examples/datagrid/example03/DataGridletExample.java trunk/examples/datagrid/example03/DataGridletUser.java trunk/examples/datagrid/example04/DataGridSim.java trunk/examples/datagrid/example04/FilesReader.java trunk/examples/datagrid/example04/ParameterReader.java trunk/examples/datagrid/example04/ResourceReader.java trunk/examples/datagrid/example04/SimUser.java trunk/examples/datagrid/example04/UserReader.java trunk/examples/network/FiniteBuffer/FnbUser.java trunk/examples/network/FiniteBuffer/GridletSubmission.java trunk/examples/network/FiniteBuffer/mainExample.java trunk/examples/network/FiniteBuffer/readme.txt trunk/examples/parallel/agressive/ExampleEASY01.java trunk/examples/parallel/conservative/ExampleCB01.java trunk/examples/readme.txt trunk/source/gridsim/ARGridResource.java trunk/source/gridsim/ARObject.java trunk/source/gridsim/ARPolicy.java trunk/source/gridsim/ARSimpleSpaceShared.java trunk/source/gridsim/Accumulator.java trunk/source/gridsim/AdvanceReservation.java trunk/source/gridsim/AllocPolicy.java trunk/source/gridsim/GridInformationService.java trunk/source/gridsim/GridResource.java trunk/source/gridsim/GridSim.java trunk/source/gridsim/GridSimCore.java trunk/source/gridsim/GridSimRandom.java trunk/source/gridsim/GridSimShutdown.java trunk/source/gridsim/GridSimStandardPE.java trunk/source/gridsim/GridSimTags.java trunk/source/gridsim/GridStatistics.java trunk/source/gridsim/GridUser.java trunk/source/gridsim/Gridlet.java trunk/source/gridsim/GridletList.java trunk/source/gridsim/IO_data.java trunk/source/gridsim/Machine.java trunk/source/gridsim/MachineList.java trunk/source/gridsim/PE.java trunk/source/gridsim/PEList.java trunk/source/gridsim/ParameterException.java trunk/source/gridsim/ResGridlet.java trunk/source/gridsim/ResGridletList.java trunk/source/gridsim/ResourceCalendar.java trunk/source/gridsim/ResourceCharacteristics.java trunk/source/gridsim/ResourceUserList.java trunk/source/gridsim/Sim_from_port.java trunk/source/gridsim/SpaceShared.java trunk/source/gridsim/Stat.java trunk/source/gridsim/TimeShared.java trunk/source/gridsim/auction/Auction.java trunk/source/gridsim/auction/AuctionObserver.java trunk/source/gridsim/auction/AuctionTags.java trunk/source/gridsim/auction/Auctioneer.java trunk/source/gridsim/auction/ContinuousDoubleAuction.java trunk/source/gridsim/auction/DoubleAuction.java trunk/source/gridsim/auction/DutchAuction.java trunk/source/gridsim/auction/EnglishAuction.java trunk/source/gridsim/auction/FirstPriceSealedBidAuction.java trunk/source/gridsim/auction/Message.java trunk/source/gridsim/auction/MessageAsk.java trunk/source/gridsim/auction/MessageBid.java trunk/source/gridsim/auction/MessageCallForBids.java trunk/source/gridsim/auction/MessageInformOutcome.java trunk/source/gridsim/auction/MessageInformStart.java trunk/source/gridsim/auction/MessageRejectBid.java trunk/source/gridsim/auction/MessageRejectCallForBid.java trunk/source/gridsim/auction/OneSidedAuction.java trunk/source/gridsim/auction/Responder.java trunk/source/gridsim/auction/ReverseDutchAuction.java trunk/source/gridsim/auction/ReverseEnglishAuction.java trunk/source/gridsim/auction/ReverseFirstPriceSealedBidAuction.java trunk/source/gridsim/datagrid/DataGridResource.java trunk/source/gridsim/datagrid/DataGridTags.java trunk/source/gridsim/datagrid/DataGridUser.java trunk/source/gridsim/datagrid/DataGridlet.java trunk/source/gridsim/datagrid/File.java trunk/source/gridsim/datagrid/FileAttribute.java trunk/source/gridsim/datagrid/ReplicaManager.java trunk/source/gridsim/datagrid/SimpleReplicaManager.java trunk/source/gridsim/datagrid/filter/FileNameFilter.java trunk/source/gridsim/datagrid/filter/Filter.java trunk/source/gridsim/datagrid/filter/FilterDataResult.java trunk/source/gridsim/datagrid/index/AbstractRC.java trunk/source/gridsim/datagrid/index/DataGIS.java trunk/source/gridsim/datagrid/index/DataRegionalGIS.java trunk/source/gridsim/datagrid/index/RegionalRC.java trunk/source/gridsim/datagrid/index/TopRegionalRC.java trunk/source/gridsim/datagrid/storage/HarddriveStorage.java trunk/source/gridsim/datagrid/storage/Storage.java trunk/source/gridsim/datagrid/storage/TapeStorage.java trunk/source/gridsim/filter/FilterCreateAR.java trunk/source/gridsim/filter/FilterGridlet.java trunk/source/gridsim/filter/FilterQueryTimeAR.java trunk/source/gridsim/filter/FilterResult.java trunk/source/gridsim/index/AbstractGIS.java trunk/source/gridsim/index/RegionalGIS.java trunk/source/gridsim/net/FIFOScheduler.java trunk/source/gridsim/net/FloodAdPack.java trunk/source/gridsim/net/FloodingRouter.java trunk/source/gridsim/net/InfoPacket.java trunk/source/gridsim/net/Input.java trunk/source/gridsim/net/Link.java trunk/source/gridsim/net/NetIO.java trunk/source/gridsim/net/NetPacket.java trunk/source/gridsim/net/Output.java trunk/source/gridsim/net/Packet.java trunk/source/gridsim/net/PacketScheduler.java trunk/source/gridsim/net/RIPAdPack.java trunk/source/gridsim/net/RIPRouter.java trunk/source/gridsim/net/RateControlledRouter.java trunk/source/gridsim/net/RateControlledScheduler.java trunk/source/gridsim/net/Router.java trunk/source/gridsim/net/SCFQScheduler.java trunk/source/gridsim/net/SimpleLink.java trunk/source/gridsim/net/flow/FilterFlow.java trunk/source/gridsim/net/flow/Flow.java trunk/source/gridsim/net/flow/FlowInput.java trunk/source/gridsim/net/flow/FlowLink.java trunk/source/gridsim/net/flow/FlowOutput.java trunk/source/gridsim/net/flow/FlowPacket.java trunk/source/gridsim/net/flow/FlowRouter.java trunk/source/gridsim/net/fnb/ARED.java trunk/source/gridsim/net/fnb/FIFO.java trunk/source/gridsim/net/fnb/FnbDroppedPacketInfo.java trunk/source/gridsim/net/fnb/FnbDroppedUserObject.java trunk/source/gridsim/net/fnb/FnbEndToEndPath.java trunk/source/gridsim/net/fnb/FnbInput.java trunk/source/gridsim/net/fnb/FnbMessage.java trunk/source/gridsim/net/fnb/FnbMessageDropFile.java trunk/source/gridsim/net/fnb/FnbMessageDropGridlet.java trunk/source/gridsim/net/fnb/FnbNetPacket.java trunk/source/gridsim/net/fnb/FnbNetworkReader.java trunk/source/gridsim/net/fnb/FnbOutput.java trunk/source/gridsim/net/fnb/FnbRIPRouter.java trunk/source/gridsim/net/fnb/FnbSCFQScheduler.java trunk/source/gridsim/net/fnb/FnbWhiteList.java trunk/source/gridsim/net/fnb/GridletPackets.java trunk/source/gridsim/net/fnb/RED.java trunk/source/gridsim/net/fnb/firstLastPacketsGridlet.java trunk/source/gridsim/net/fnb/source_pktNum.java trunk/source/gridsim/parallel/ParallelResource.java trunk/source/gridsim/parallel/ResourceDynamics.java trunk/source/gridsim/parallel/SSGridletList.java trunk/source/gridsim/parallel/gui/AbstractVisualizer.java trunk/source/gridsim/parallel/gui/ActionType.java trunk/source/gridsim/parallel/gui/AllocationAction.java trunk/source/gridsim/parallel/gui/AllocationListener.java trunk/source/gridsim/parallel/gui/GUISettings.java trunk/source/gridsim/parallel/gui/JobTypePanel.java trunk/source/gridsim/parallel/gui/ParallelVisualizer.java trunk/source/gridsim/parallel/gui/ResourceWindow.java trunk/source/gridsim/parallel/gui/Visualizer.java trunk/source/gridsim/parallel/gui/VisualizerAdaptor.java trunk/source/gridsim/parallel/log/LogFormatter.java trunk/source/gridsim/parallel/log/LoggerEnum.java trunk/source/gridsim/parallel/log/Logging.java trunk/source/gridsim/parallel/profile/PERange.java trunk/source/gridsim/parallel/profile/PERangeList.java trunk/source/gridsim/parallel/profile/PartProfile.java trunk/source/gridsim/parallel/profile/PartProfileEntry.java trunk/source/gridsim/parallel/profile/PartitionPredicate.java trunk/source/gridsim/parallel/profile/Profile.java trunk/source/gridsim/parallel/profile/ProfileEntry.java trunk/source/gridsim/parallel/profile/ResourcePartition.java trunk/source/gridsim/parallel/profile/ScheduleItem.java trunk/source/gridsim/parallel/profile/SingleProfile.java trunk/source/gridsim/parallel/profile/SingleProfileEntry.java trunk/source/gridsim/parallel/profile/TimeSlot.java trunk/source/gridsim/parallel/reservation/ErrorType.java trunk/source/gridsim/parallel/reservation/FilterARMessage.java trunk/source/gridsim/parallel/reservation/MessageType.java trunk/source/gridsim/parallel/reservation/Reservation.java trunk/source/gridsim/parallel/reservation/ReservationMessage.java trunk/source/gridsim/parallel/reservation/ReservationPolicy.java trunk/source/gridsim/parallel/reservation/ReservationRequester.java trunk/source/gridsim/parallel/reservation/ReservationStatus.java trunk/source/gridsim/parallel/reservation/ServerReservation.java trunk/source/gridsim/parallel/scheduler/ARConservativeBackfill.java trunk/source/gridsim/parallel/scheduler/AggressiveBackfill.java trunk/source/gridsim/parallel/scheduler/AggressiveMultiPartitions.java trunk/source/gridsim/parallel/scheduler/ConservativeBackfill.java trunk/source/gridsim/parallel/scheduler/PrioritySelector.java trunk/source/gridsim/parallel/scheduler/RuntimePredicate.java trunk/source/gridsim/parallel/scheduler/SelectiveBackfill.java trunk/source/gridsim/parallel/util/Workload.java trunk/source/gridsim/parallel/util/WorkloadFileReader.java trunk/source/gridsim/parallel/util/WorkloadJob.java trunk/source/gridsim/parallel/util/WorkloadLublin99.java trunk/source/gridsim/parallel/util/WorkloadModel.java trunk/source/gridsim/resFailure/AllocPolicyWithFailure.java trunk/source/gridsim/resFailure/AvailabilityInfo.java trunk/source/gridsim/resFailure/FailureMsg.java trunk/source/gridsim/resFailure/GridResourceWithFailure.java trunk/source/gridsim/resFailure/RegionalGISWithFailure.java trunk/source/gridsim/resFailure/SpaceSharedWithFailure.java trunk/source/gridsim/resFailure/TimeSharedWithFailure.java trunk/source/gridsim/util/NetworkReader.java trunk/source/gridsim/util/SimReport.java trunk/source/gridsim/util/TrafficGenerator.java trunk/source/gridsim/util/Workload.java Added Paths: ----------- trunk/jars/gridsim.jar trunk/jars/package-list Modified: trunk/examples/ResFailure/example01/GridUserFailureEx01.java =================================================================== --- trunk/examples/ResFailure/example01/GridUserFailureEx01.java 2009-09-23 16:56:07 UTC (rev 272) +++ trunk/examples/ResFailure/example01/GridUserFailureEx01.java 2009-09-23 17:22:45 UTC (rev 273) @@ -5,7 +5,7 @@ * Description: GridSim (Grid Simulation) Toolkit for Modeling and Simulation * of Parallel and Distributed Systems such as Clusters and Grids * An example of how to use the failure functionality. - * Licence: GPL - http://www.gnu.org/copyleft/gpl.html + * License: GPL - http://www.gnu.org/copyleft/gpl.html * * Author: Agustin Caminero and Anthony Sulistio * Organization: UCLM (Spain) Modified: trunk/examples/ResFailure/example01/GridletSubmission.java =================================================================== --- trunk/examples/ResFailure/example01/GridletSubmission.java 2009-09-23 16:56:07 UTC (rev 272) +++ trunk/examples/ResFailure/example01/GridletSubmission.java 2009-09-23 17:22:45 UTC (rev 273) @@ -5,7 +5,7 @@ * Description: GridSim (Grid Simulation) Toolkit for Modeling and Simulation * of Parallel and Distributed Systems such as Clusters and Grids * An example of how to use the failure functionality. - * Licence: GPL - http://www.gnu.org/copyleft/gpl.html + * License: GPL - http://www.gnu.org/copyleft/gpl.html * * Author: Agustin Caminero and Anthony Sulistio * Organization: UCLM (Spain) Modified: trunk/examples/ResFailure/example01/ResFailureEx01.java =================================================================== --- trunk/examples/ResFailure/example01/ResFailureEx01.java 2009-09-23 16:56:07 UTC (rev 272) +++ trunk/examples/ResFailure/example01/ResFailureEx01.java 2009-09-23 17:22:45 UTC (rev 273) @@ -5,7 +5,7 @@ * Description: GridSim (Grid Simulation) Toolkit for Modeling and Simulation * of Parallel and Distributed Systems such as Clusters and Grids * An example of how to use the failure functionality. - * Licence: GPL - http://www.gnu.org/copyleft/gpl.html + * License: GPL - http://www.gnu.org/copyleft/gpl.html * * Author: Agustin Caminero and Anthony Sulistio * Organization: UCLM (Spain) Modified: trunk/examples/ResFailure/example01/readme.txt =================================================================== --- trunk/examples/ResFailure/example01/readme.txt 2009-09-23 16:56:07 UTC (rev 272) +++ trunk/examples/ResFailure/example01/readme.txt 2009-09-23 17:22:45 UTC (rev 273) @@ -3,7 +3,7 @@ * Description: GridSim (Grid Simulation) Toolkit for Modeling and Simulation * of Parallel and Distributed Systems such as Clusters and Grids * An example of how to use the failure functionality. - * Licence: GPL - http://www.gnu.org/copyleft/gpl.html + * License: GPL - http://www.gnu.org/copyleft/gpl.html * * Author: Agustin Caminero and Anthony Sulistio * Organization: UCLM (Spain) Modified: trunk/examples/ResFailure/example02/GridUserFailureEx02.java =================================================================== --- trunk/examples/ResFailure/example02/GridUserFailureEx02.java 2009-09-23 16:56:07 UTC (rev 272) +++ trunk/examples/ResFailure/example02/GridUserFailureEx02.java 2009-09-23 17:22:45 UTC (rev 273) @@ -5,7 +5,7 @@ * Description: GridSim (Grid Simulation) Toolkit for Modeling and Simulation * of Parallel and Distributed Systems such as Clusters and Grids * An example of how to use the failure functionality. - * Licence: GPL - http://www.gnu.org/copyleft/gpl.html + * License: GPL - http://www.gnu.org/copyleft/gpl.html * * Author: Agustin Caminero and Anthony Sulistio * Organization: UCLM (Spain) Modified: trunk/examples/ResFailure/example02/GridletSubmission.java =================================================================== --- trunk/examples/ResFailure/example02/GridletSubmission.java 2009-09-23 16:56:07 UTC (rev 272) +++ trunk/examples/ResFailure/example02/GridletSubmission.java 2009-09-23 17:22:45 UTC (rev 273) @@ -5,7 +5,7 @@ * Description: GridSim (Grid Simulation) Toolkit for Modeling and Simulation * of Parallel and Distributed Systems such as Clusters and Grids * An example of how to use the failure functionality. - * Licence: GPL - http://www.gnu.org/copyleft/gpl.html + * License: GPL - http://www.gnu.org/copyleft/gpl.html * * Author: Agustin Caminero and Anthony Sulistio * Organization: UCLM (Spain) Modified: trunk/examples/ResFailure/example02/ResFailureEx02.java =================================================================== --- trunk/examples/ResFailure/example02/ResFailureEx02.java 2009-09-23 16:56:07 UTC (rev 272) +++ trunk/examples/ResFailure/example02/ResFailureEx02.java 2009-09-23 17:22:45 UTC (rev 273) @@ -5,7 +5,7 @@ * Description: GridSim (Grid Simulation) Toolkit for Modeling and Simulation * of Parallel and Distributed Systems such as Clusters and Grids * An example of how to use the failure functionality. - * Licence: GPL - http://www.gnu.org/copyleft/gpl.html + * License: GPL - http://www.gnu.org/copyleft/gpl.html * * Author: Agustin Caminero and Anthony Sulistio * Organization: UCLM (Spain) Modified: trunk/examples/ResFailure/example02/readme.txt =================================================================== --- trunk/examples/ResFailure/example02/readme.txt 2009-09-23 16:56:07 UTC (rev 272) +++ trunk/examples/ResFailure/example02/readme.txt 2009-09-23 17:22:45 UTC (rev 273) @@ -3,7 +3,7 @@ * Description: GridSim (Grid Simulation) Toolkit for Modeling and Simulation * of Parallel and Distributed Systems such as Clusters and Grids * An example of how to use the failure functionality. - * Licence: GPL - http://www.gnu.org/copyleft/gpl.html + * License: GPL - http://www.gnu.org/copyleft/gpl.html * * Author: Agustin Caminero and Anthony Sulistio * Organization: UCLM (Spain) Modified: trunk/examples/ResFailure/example03/GridUserFailureEx03.java =================================================================== --- trunk/examples/ResFailure/example03/GridUserFailureEx03.java 2009-09-23 16:56:07 UTC (rev 272) +++ trunk/examples/ResFailure/example03/GridUserFailureEx03.java 2009-09-23 17:22:45 UTC (rev 273) @@ -5,7 +5,7 @@ * Description: GridSim (Grid Simulation) Toolkit for Modeling and Simulation * of Parallel and Distributed Systems such as Clusters and Grids * An example of how to use the failure functionality. - * Licence: GPL - http://www.gnu.org/copyleft/gpl.html + * License: GPL - http://www.gnu.org/copyleft/gpl.html * * Author: Agustin Caminero and Anthony Sulistio * Organization: UCLM (Spain) Modified: trunk/examples/ResFailure/example03/GridletSubmission.java =================================================================== --- trunk/examples/ResFailure/example03/GridletSubmission.java 2009-09-23 16:56:07 UTC (rev 272) +++ trunk/examples/ResFailure/example03/GridletSubmission.java 2009-09-23 17:22:45 UTC (rev 273) @@ -5,7 +5,7 @@ * Description: GridSim (Grid Simulation) Toolkit for Modeling and Simulation * of Parallel and Distributed Systems such as Clusters and Grids * An example of how to use the failure functionality. - * Licence: GPL - http://www.gnu.org/copyleft/gpl.html + * License: GPL - http://www.gnu.org/copyleft/gpl.html * * Author: Agustin Caminero and Anthony Sulistio * Organization: UCLM (Spain) Modified: trunk/examples/ResFailure/example03/ResFailureEx03.java =================================================================== --- trunk/examples/ResFailure/example03/ResFailureEx03.java 2009-09-23 16:56:07 UTC (rev 272) +++ trunk/examples/ResFailure/example03/ResFailureEx03.java 2009-09-23 17:22:45 UTC (rev 273) @@ -5,7 +5,7 @@ * Description: GridSim (Grid Simulation) Toolkit for Modeling and Simulation * of Parallel and Distributed Systems such as Clusters and Grids * An example of how to use the failure functionality. - * Licence: GPL - http://www.gnu.org/copyleft/gpl.html + * License: GPL - http://www.gnu.org/copyleft/gpl.html * * Author: Agustin Caminero and Anthony Sulistio * Organization: UCLM (Spain) Modified: trunk/examples/ResFailure/example03/readme.txt =================================================================== --- trunk/examples/ResFailure/example03/readme.txt 2009-09-23 16:56:07 UTC (rev 272) +++ trunk/examples/ResFailure/example03/readme.txt 2009-09-23 17:22:45 UTC (rev 273) @@ -3,7 +3,7 @@ * Description: GridSim (Grid Simulation) Toolkit for Modeling and Simulation * of Parallel and Distributed Systems such as Clusters and Grids * An example of how to use the failure functionality. - * Licence: GPL - http://www.gnu.org/copyleft/gpl.html + * License: GPL - http://www.gnu.org/copyleft/gpl.html * * Author: Agustin Caminero and Anthony Sulistio * Organization: UCLM (Spain) Modified: trunk/examples/datagrid/example01/DataExample1.java =================================================================== --- trunk/examples/datagrid/example01/DataExample1.java 2009-09-23 16:56:07 UTC (rev 272) +++ trunk/examples/datagrid/example01/DataExample1.java 2009-09-23 17:22:45 UTC (rev 273) @@ -4,7 +4,7 @@ * Title: GridSim Toolkit * Description: GridSim (Grid Simulation) Toolkit for Modeling and Simulation * of Parallel and Distributed Systems such as Clusters and Grids - * Licence: GPL - http://www.gnu.org/copyleft/gpl.html + * License: GPL - http://www.gnu.org/copyleft/gpl.html */ import gridsim.*; Modified: trunk/examples/datagrid/example01/DummyUser.java =================================================================== --- trunk/examples/datagrid/example01/DummyUser.java 2009-09-23 16:56:07 UTC (rev 272) +++ trunk/examples/datagrid/example01/DummyUser.java 2009-09-23 17:22:45 UTC (rev 273) @@ -4,7 +4,7 @@ * Title: GridSim Toolkit * Description: GridSim (Grid Simulation) Toolkit for Modeling and Simulation * of Parallel and Distributed Systems such as Clusters and Grids - * Licence: GPL - http://www.gnu.org/copyleft/gpl.html + * License: GPL - http://www.gnu.org/copyleft/gpl.html */ import gridsim.GridSim; Modified: trunk/examples/datagrid/example02/DataExample2.java =================================================================== --- trunk/examples/datagrid/example02/DataExample2.java 2009-09-23 16:56:07 UTC (rev 272) +++ trunk/examples/datagrid/example02/DataExample2.java 2009-09-23 17:22:45 UTC (rev 273) @@ -4,7 +4,7 @@ * Title: GridSim Toolkit * Description: GridSim (Grid Simulation) Toolkit for Modeling and Simulation * of Parallel and Distributed Systems such as Clusters and Grids - * Licence: GPL - http://www.gnu.org/copyleft/gpl.html + * License: GPL - http://www.gnu.org/copyleft/gpl.html */ import gridsim.*; Modified: trunk/examples/datagrid/example02/FileUser.java =================================================================== --- trunk/examples/datagrid/example02/FileUser.java 2009-09-23 16:56:07 UTC (rev 272) +++ trunk/examples/datagrid/example02/FileUser.java 2009-09-23 17:22:45 UTC (rev 273) @@ -4,7 +4,7 @@ * Title: GridSim Toolkit * Description: GridSim (Grid Simulation) Toolkit for Modeling and Simulation * of Parallel and Distributed Systems such as Clusters and Grids - * Licence: GPL - http://www.gnu.org/copyleft/gpl.html + * License: GPL - http://www.gnu.org/copyleft/gpl.html */ import gridsim.GridSim; Modified: trunk/examples/datagrid/example03/DataGridletExample.java =================================================================== --- trunk/examples/datagrid/example03/DataGridletExample.java 2009-09-23 16:56:07 UTC (rev 272) +++ trunk/examples/datagrid/example03/DataGridletExample.java 2009-09-23 17:22:45 UTC (rev 273) @@ -4,7 +4,7 @@ * Title: GridSim Toolkit * Description: GridSim (Grid Simulation) Toolkit for Modeling and Simulation * of Parallel and Distributed Systems such as Clusters and Grids - * Licence: GPL - http://www.gnu.org/copyleft/gpl.html + * License: GPL - http://www.gnu.org/copyleft/gpl.html */ import gridsim.*; Modified: trunk/examples/datagrid/example03/DataGridletUser.java =================================================================== --- trunk/examples/datagrid/example03/DataGridletUser.java 2009-09-23 16:56:07 UTC (rev 272) +++ trunk/examples/datagrid/example03/DataGridletUser.java 2009-09-23 17:22:45 UTC (rev 273) @@ -4,7 +4,7 @@ * Title: GridSim Toolkit * Description: GridSim (Grid Simulation) Toolkit for Modeling and Simulation * of Parallel and Distributed Systems such as Clusters and Grids - * Licence: GPL - http://www.gnu.org/copyleft/gpl.html + * License: GPL - http://www.gnu.org/copyleft/gpl.html */ import eduni.simjava.Sim_event; Modified: trunk/examples/datagrid/example04/DataGridSim.java =================================================================== --- trunk/examples/datagrid/example04/DataGridSim.java 2009-09-23 16:56:07 UTC (rev 272) +++ trunk/examples/datagrid/example04/DataGridSim.java 2009-09-23 17:22:45 UTC (rev 273) @@ -4,7 +4,7 @@ * Title: GridSim Toolkit * Description: GridSim (Grid Simulation) Toolkit for Modeling and Simulation * of Parallel and Distributed Systems such as Clusters and Grids - * Licence: GPL - http://www.gnu.org/copyleft/gpl.html + * License: GPL - http://www.gnu.org/copyleft/gpl.html */ import eduni.simjava.Sim_system; Modified: trunk/examples/datagrid/example04/FilesReader.java =================================================================== --- trunk/examples/datagrid/example04/FilesReader.java 2009-09-23 16:56:07 UTC (rev 272) +++ trunk/examples/datagrid/example04/FilesReader.java 2009-09-23 17:22:45 UTC (rev 273) @@ -4,7 +4,7 @@ * Title: GridSim Toolkit * Description: GridSim (Grid Simulation) Toolkit for Modeling and Simulation * of Parallel and Distributed Systems such as Clusters and Grids - * Licence: GPL - http://www.gnu.org/copyleft/gpl.html + * License: GPL - http://www.gnu.org/copyleft/gpl.html */ import gridsim.datagrid.File; Modified: trunk/examples/datagrid/example04/ParameterReader.java =================================================================== --- trunk/examples/datagrid/example04/ParameterReader.java 2009-09-23 16:56:07 UTC (rev 272) +++ trunk/examples/datagrid/example04/ParameterReader.java 2009-09-23 17:22:45 UTC (rev 273) @@ -4,7 +4,7 @@ * Title: GridSim Toolkit * Description: GridSim (Grid Simulation) Toolkit for Modeling and Simulation * of Parallel and Distributed Systems such as Clusters and Grids - * Licence: GPL - http://www.gnu.org/copyleft/gpl.html + * License: GPL - http://www.gnu.org/copyleft/gpl.html */ import java.io.BufferedReader; Modified: trunk/examples/datagrid/example04/ResourceReader.java =================================================================== --- trunk/examples/datagrid/example04/ResourceReader.java 2009-09-23 16:56:07 UTC (rev 272) +++ trunk/examples/datagrid/example04/ResourceReader.java 2009-09-23 17:22:45 UTC (rev 273) @@ -4,7 +4,7 @@ * Title: GridSim Toolkit * Description: GridSim (Grid Simulation) Toolkit for Modeling and Simulation * of Parallel and Distributed Systems such as Clusters and Grids - * Licence: GPL - http://www.gnu.org/copyleft/gpl.html + * License: GPL - http://www.gnu.org/copyleft/gpl.html */ import gridsim.*; Modified: trunk/examples/datagrid/example04/SimUser.java =================================================================== --- trunk/examples/datagrid/example04/SimUser.java 2009-09-23 16:56:07 UTC (rev 272) +++ trunk/examples/datagrid/example04/SimUser.java 2009-09-23 17:22:45 UTC (rev 273) @@ -4,7 +4,7 @@ * Title: GridSim Toolkit * Description: GridSim (Grid Simulation) Toolkit for Modeling and Simulation * of Parallel and Distributed Systems such as Clusters and Grids - * Licence: GPL - http://www.gnu.org/copyleft/gpl.html + * License: GPL - http://www.gnu.org/copyleft/gpl.html */ import gridsim.GridSim; Modified: trunk/examples/datagrid/example04/UserReader.java =================================================================== --- trunk/examples/datagrid/example04/UserReader.java 2009-09-23 16:56:07 UTC (rev 272) +++ trunk/examples/datagrid/example04/UserReader.java 2009-09-23 17:22:45 UTC (rev 273) @@ -4,7 +4,7 @@ * Title: GridSim Toolkit * Description: GridSim (Grid Simulation) Toolkit for Modeling and Simulation * of Parallel and Distributed Systems such as Clusters and Grids - * Licence: GPL - http://www.gnu.org/copyleft/gpl.html + * License: GPL - http://www.gnu.org/copyleft/gpl.html */ import gridsim.net.*; Modified: trunk/examples/network/FiniteBuffer/FnbUser.java =================================================================== --- trunk/examples/network/FiniteBuffer/FnbUser.java 2009-09-23 16:56:07 UTC (rev 272) +++ trunk/examples/network/FiniteBuffer/FnbUser.java 2009-09-23 17:22:45 UTC (rev 273) @@ -4,7 +4,7 @@ * Title: GridSim Toolkit * Description: GridSim (Grid Simulation) Toolkit for Modeling and Simulation * of Parallel and Distributed Systems such as Clusters and Grids - * Licence: GPL - http://www.gnu.org/copyleft/gpl.html + * License: GPL - http://www.gnu.org/copyleft/gpl.html * * Authors: Agustin Caminero and Anthony Sulistio * Organization: Universidad de Castilla La Mancha (UCLM), Spain. Modified: trunk/examples/network/FiniteBuffer/GridletSubmission.java =================================================================== --- trunk/examples/network/FiniteBuffer/GridletSubmission.java 2009-09-23 16:56:07 UTC (rev 272) +++ trunk/examples/network/FiniteBuffer/GridletSubmission.java 2009-09-23 17:22:45 UTC (rev 273) @@ -4,7 +4,7 @@ * Title: GridSim Toolkit * Description: GridSim (Grid Simulation) Toolkit for Modeling and Simulation * of Parallel and Distributed Systems such as Clusters and Grids - * Licence: GPL - http://www.gnu.org/copyleft/gpl.html + * License: GPL - http://www.gnu.org/copyleft/gpl.html * * Author: Agustin Caminero * Organization: Universidad de Castilla La Mancha (UCLM), Spain. Modified: trunk/examples/network/FiniteBuffer/mainExample.java =================================================================== --- trunk/examples/network/FiniteBuffer/mainExample.java 2009-09-23 16:56:07 UTC (rev 272) +++ trunk/examples/network/FiniteBuffer/mainExample.java 2009-09-23 17:22:45 UTC (rev 273) @@ -4,7 +4,7 @@ * Title: GridSim Toolkit * Description: GridSim (Grid Simulation) Toolkit for Modeling and Simulation * of Parallel and Distributed Systems such as Clusters and Grids - * Licence: GPL - http://www.gnu.org/copyleft/gpl.html + * License: GPL - http://www.gnu.org/copyleft/gpl.html * * Author: Agustin Caminero and Anthony Sulistio * Organization: Universidad de Castilla La Mancha (UCLM), Spain. Modified: trunk/examples/network/FiniteBuffer/readme.txt =================================================================== --- trunk/examples/network/FiniteBuffer/readme.txt 2009-09-23 16:56:07 UTC (rev 272) +++ trunk/examples/network/FiniteBuffer/readme.txt 2009-09-23 17:22:45 UTC (rev 273) @@ -3,7 +3,7 @@ * Description: GridSim (Grid Simulation) Toolkit for Modeling and Simulation * of Parallel and Distributed Systems such as Clusters and Grids * An example of how to use the failure functionality. - * Licence: GPL - http://www.gnu.org/copyleft/gpl.html + * License: GPL - http://www.gnu.org/copyleft/gpl.html * * Author: Agustin Caminero and Anthony Sulistio * Organization: Universidad de Castilla La Mancha (UCLM), Spain. Modified: trunk/examples/parallel/agressive/ExampleEASY01.java =================================================================== --- trunk/examples/parallel/agressive/ExampleEASY01.java 2009-09-23 16:56:07 UTC (rev 272) +++ trunk/examples/parallel/agressive/ExampleEASY01.java 2009-09-23 17:22:45 UTC (rev 273) @@ -1,11 +1,17 @@ /* * Author Marcos Dias de Assuncao + * Date: May 2009 * * Description: This example shows how to create a resource using an aggressive * backfilling policy without advance reservation features. The jobs are * read from a trace file. To test this example, you can use one of the traces - * included in the workloads directory. + * included in the parallel directory (e.g. sdsc_blue_01.txt). + * + * For example, in order to run the example on Linux, you should use: + * + * java -cp $GRIDSIM/jars/gridsim.jar;. parallel.agressive.ExampleEASY01 \ + * $GRIDSIM/examples/parallel/sdsc_blue_01.txt */ package parallel.agressive; Modified: trunk/examples/parallel/conservative/ExampleCB01.java =================================================================== --- trunk/examples/parallel/conservative/ExampleCB01.java 2009-09-23 16:56:07 UTC (rev 272) +++ trunk/examples/parallel/conservative/ExampleCB01.java 2009-09-23 17:22:45 UTC (rev 273) @@ -1,11 +1,17 @@ /* * Author Marcos Dias de Assuncao + * Date: May 2009 * * Description: This example shows how to create a resource using a conservative * backfilling policy without advance reservation features. The jobs are * read from a trace file. To test this example, you can use one of the traces * included in the workloads directory. + * + * For example, in order to run the example on Linux, you should use: + * + * java -cp $GRIDSIM/jars/gridsim.jar;. parallel.conservative.ExampleCB01 \ + * $GRIDSIM/examples/parallel/sdsc_blue_01.txt */ package parallel.conservative; Modified: trunk/examples/readme.txt =================================================================== --- trunk/examples/readme.txt 2009-09-23 16:56:07 UTC (rev 272) +++ trunk/examples/readme.txt 2009-09-23 17:22:45 UTC (rev 273) @@ -1,6 +1,6 @@ /** - * Last update: May 2009 + * Last update: September 2009 */ This directory contains examples on how to use the GridSim toolkit. The classes @@ -15,8 +15,8 @@ where $GRIDSIM or %GRIDSIM% is the location of the gridsim toolkit package. To run the class file (in the examples directory): - In Unix/Linux: java -cp $GRIDSIM/jars/gridsim.jar:. path/to/example/MainClass > file.txt - In Windows: java -cp %GRIDSIM%\jars\gridsim.jar;. path\to\example\MainClass > file.txt + In Unix/Linux: java -cp $GRIDSIM/jars/gridsim.jar:. MainClass > file.txt + In Windows: java -cp %GRIDSIM%\jars\gridsim.jar;. MainClass > file.txt The above command means run the program and output the results into a file named "file.txt" rather than into screen or standard output. To prevent from @@ -104,6 +104,13 @@ shows few examples how to use workload traces from a file in GridSim. parallel: - Illustrates how to model clusters/supercomputers that process parallel jobs. + Illustrates how to model clusters/supercomputers that process + parallel jobs. To run most examples, you will need to inform the + path to a workload file that contains the information on the jobs + submitted to the cluster. For example, in order to run the EASY + backfilling example on Linux, you should use: + + java -cp $GRIDSIM/jars/gridsim.jar;. \ + parallel.agressive.ExampleEASY01 parallel/sdsc_blue_01.txt NOTE: Detailed explanations are provided in the source file(s). Added: trunk/jars/gridsim.jar =================================================================== (Binary files differ) Property changes on: trunk/jars/gridsim.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/jars/package-list =================================================================== --- trunk/jars/package-list (rev 0) +++ trunk/jars/package-list 2009-09-23 17:22:45 UTC (rev 273) @@ -0,0 +1,2 @@ +eduni.simjava +eduni.simjava.distributions Property changes on: trunk/jars/package-list ___________________________________________________________________ Added: svn:executable + * Modified: trunk/source/gridsim/ARGridResource.java =================================================================== --- trunk/source/gridsim/ARGridResource.java 2009-09-23 16:56:07 UTC (rev 272) +++ trunk/source/gridsim/ARGridResource.java 2009-09-23 17:22:45 UTC (rev 273) @@ -1,10 +1,10 @@ /* * Title: GridSim Toolkit + * Description: GridSim (Grid Simulation) Toolkit for Modeling and Simulation * of Parallel and Distributed Systems such as Clusters and Grids - * Licence: GPL - http://www.gnu.org/copyleft/gpl.html + * License: GPL - http://www.gnu.org/copyleft/gpl.html * - * Copyright (c) 2004, The University of Melbourne, Australia */ package gridsim; Modified: trunk/source/gridsim/ARObject.java =================================================================== --- trunk/source/gridsim/ARObject.java 2009-09-23 16:56:07 UTC (rev 272) +++ trunk/source/gridsim/ARObject.java 2009-09-23 17:22:45 UTC (rev 273) @@ -1,10 +1,10 @@ /* * Title: GridSim Toolkit + * Description: GridSim (Grid Simulation) Toolkit for Modeling and Simulation * of Parallel and Distributed Systems such as Clusters and Grids - * Licence: GPL - http://www.gnu.org/copyleft/gpl.html + * License: GPL - http://www.gnu.org/copyleft/gpl.html * - * Copyright (c) 2004, The University of Melbourne, Australia */ package gridsim; Modified: trunk/source/gridsim/ARPolicy.java =================================================================== --- trunk/source/gridsim/ARPolicy.java 2009-09-23 16:56:07 UTC (rev 272) +++ trunk/source/gridsim/ARPolicy.java 2009-09-23 17:22:45 UTC (rev 273) @@ -1,10 +1,10 @@ /* * Title: GridSim Toolkit + * Description: GridSim (Grid Simulation) Toolkit for Modeling and Simulation * of Parallel and Distributed Systems such as Clusters and Grids - * Licence: GPL - http://www.gnu.org/copyleft/gpl.html + * License: GPL - http://www.gnu.org/copyleft/gpl.html * - * Copyright (c) 2004, The University of Melbourne, Australia */ package gridsim; Modified: trunk/source/gridsim/ARSimpleSpaceShared.java =================================================================== --- trunk/source/gridsim/ARSimpleSpaceShared.java 2009-09-23 16:56:07 UTC (rev 272) +++ trunk/source/gridsim/ARSimpleSpaceShared.java 2009-09-23 17:22:45 UTC (rev 273) @@ -1,10 +1,10 @@ /* * Title: GridSim Toolkit + * Description: GridSim (Grid Simulation) Toolkit for Modeling and Simulation * of Parallel and Distributed Systems such as Clusters and Grids - * Licence: GPL - http://www.gnu.org/copyleft/gpl.html + * License: GPL - http://www.gnu.org/copyleft/gpl.html * - * Copyright (c) 2004, The University of Melbourne, Australia */ package gridsim; Modified: trunk/source/gridsim/Accumulator.java =================================================================== --- trunk/source/gridsim/Accumulator.java 2009-09-23 16:56:07 UTC (rev 272) +++ trunk/source/gridsim/Accumulator.java 2009-09-23 17:22:45 UTC (rev 273) @@ -1,10 +1,10 @@ /* * Title: GridSim Toolkit + * Description: GridSim (Grid Simulation) Toolkit for Modeling and Simulation * of Parallel and Distributed Systems such as Clusters and Grids - * Licence: GPL - http://www.gnu.org/copyleft/gpl.html + * License: GPL - http://www.gnu.org/copyleft/gpl.html * - * Copyright (c) 2002, The University of Melbourne, Australia */ package gridsim; Modified: trunk/source/gridsim/AdvanceReservation.java =================================================================== --- trunk/source/gridsim/AdvanceReservation.java 2009-09-23 16:56:07 UTC (rev 272) +++ trunk/source/gridsim/AdvanceReservation.java 2009-09-23 17:22:45 UTC (rev 273) @@ -1,10 +1,10 @@ /* * Title: GridSim Toolkit + * Description: GridSim (Grid Simulation) Toolkit for Modeling and Simulation * of Parallel and Distributed Systems such as Clusters and Grids - * Licence: GPL - http://www.gnu.org/copyleft/gpl.html + * License: GPL - http://www.gnu.org/copyleft/gpl.html * - * Copyright (c) 2004, The University of Melbourne, Australia */ package gridsim; Modified: trunk/source/gridsim/AllocPolicy.java =================================================================== --- trunk/source/gridsim/AllocPolicy.java 2009-09-23 16:56:07 UTC (rev 272) +++ trunk/source/gridsim/AllocPolicy.java 2009-09-23 17:22:45 UTC (rev 273) @@ -1,10 +1,10 @@ /* * Title: GridSim Toolkit + * Description: GridSim (Grid Simulation) Toolkit for Modeling and Simulation * of Parallel and Distributed Systems such as Clusters and Grids - * Licence: GPL - http://www.gnu.org/copyleft/gpl.html + * License: GPL - http://www.gnu.org/copyleft/gpl.html * - * Copyright (c) 2003, The University of Melbourne, Australia */ package gridsim; Modified: trunk/source/gridsim/GridInformationService.java =================================================================== --- trunk/source/gridsim/GridInformationService.java 2009-09-23 16:56:07 UTC (rev 272) +++ trunk/source/gridsim/GridInformationService.java 2009-09-23 17:22:45 UTC (rev 273) @@ -1,10 +1,10 @@ /* * Title: GridSim Toolkit + * Description: GridSim (Grid Simulation) Toolkit for Modeling and Simulation * of Parallel and Distributed Systems such as Clusters and Grids - * Licence: GPL - http://www.gnu.org/copyleft/gpl.html + * License: GPL - http://www.gnu.org/copyleft/gpl.html * - * Copyright (c) 2002, The University of Melbourne, Australia */ package gridsim; Modified: trunk/source/gridsim/GridResource.java =================================================================== --- trunk/source/gridsim/GridResource.java 2009-09-23 16:56:07 UTC (rev 272) +++ trunk/source/gridsim/GridResource.java 2009-09-23 17:22:45 UTC (rev 273) @@ -1,10 +1,10 @@ /* * Title: GridSim Toolkit + * Description: GridSim (Grid Simulation) Toolkit for Modeling and Simulation * of Parallel and Distributed Systems such as Clusters and Grids - * Licence: GPL - http://www.gnu.org/copyleft/gpl.html + * License: GPL - http://www.gnu.org/copyleft/gpl.html * - * Copyright (c) 2002, The University of Melbourne, Australia */ package gridsim; Modified: trunk/source/gridsim/GridSim.java =================================================================== --- trunk/source/gridsim/GridSim.java 2009-09-23 16:56:07 UTC (rev 272) +++ trunk/source/gridsim/GridSim.java 2009-09-23 17:22:45 UTC (rev 273) @@ -1,15 +1,16 @@ /* * Title: GridSim Toolkit + * Description: GridSim (Grid Simulation) Toolkit for Modeling and Simulation * of Parallel and Distributed Systems such as Clusters and Grids - * Licence: GPL - http://www.gnu.org/copyleft/gpl.html + * License: GPL - http://www.gnu.org/copyleft/gpl.html * - * Copyright (c) 2002, The University of Melbourne, Australia */ package gridsim; import eduni.simjava.Sim_event; + import eduni.simjava.Sim_exception; import eduni.simjava.Sim_port; import eduni.simjava.Sim_system; @@ -17,7 +18,6 @@ import gridsim.filter.FilterGridlet; import gridsim.filter.FilterResult; import gridsim.net.Link; -import gridsim.parallel.gui.AbstractVisualizer; import gridsim.parallel.gui.ParallelVisualizer; import gridsim.parallel.gui.Visualizer; import gridsim.parallel.gui.VisualizerAdaptor; Modified: trunk/source/gridsim/GridSimCore.java =================================================================== --- trunk/source/gridsim/GridSimCore.java 2009-09-23 16:56:07 UTC (rev 272) +++ trunk/source/gridsim/GridSimCore.java 2009-09-23 17:22:45 UTC (rev 273) @@ -1,10 +1,10 @@ /* * Title: GridSim Toolkit + * Description: GridSim (Grid Simulation) Toolkit for Modeling and Simulation * of Parallel and Distributed Systems such as Clusters and Grids - * Licence: GPL - http://www.gnu.org/copyleft/gpl.html + * License: GPL - http://www.gnu.org/copyleft/gpl.html * - * Copyright (c) 2004, The University of Melbourne, Australia */ package gridsim; Modified: trunk/source/gridsim/GridSimRandom.java =================================================================== --- trunk/source/gridsim/GridSimRandom.java 2009-09-23 16:56:07 UTC (rev 272) +++ trunk/source/gridsim/GridSimRandom.java 2009-09-23 17:22:45 UTC (rev 273) @@ -1,10 +1,10 @@ /* * Title: GridSim Toolkit + * Description: GridSim (Grid Simulation) Toolkit for Modeling and Simulation * of Parallel and Distributed Systems such as Clusters and Grids - * Licence: GPL - http://www.gnu.org/copyleft/gpl.html + * License: GPL - http://www.gnu.org/copyleft/gpl.html * - * Copyright (c) 2002, The University of Melbourne, Australia */ package gridsim; Modified: trunk/source/gridsim/GridSimShutdown.java =================================================================== --- trunk/source/gridsim/GridSimShutdown.java 2009-09-23 16:56:07 UTC (rev 272) +++ trunk/source/gridsim/GridSimShutdown.java 2009-09-23 17:22:45 UTC (rev 273) @@ -1,10 +1,10 @@ /* * Title: GridSim Toolkit + * Description: GridSim (Grid Simulation) Toolkit for Modeling and Simulation * of Parallel and Distributed Systems such as Clusters and Grids - * Licence: GPL - http://www.gnu.org/copyleft/gpl.html + * License: GPL - http://www.gnu.org/copyleft/gpl.html * - * Copyright (c) 2002, The University of Melbourne, Australia */ package gridsim; Modified: trunk/source/gridsim/GridSimStandardPE.java =================================================================== --- trunk/source/gridsim/GridSimStandardPE.java 2009-09-23 16:56:07 UTC (rev 272) +++ trunk/source/gridsim/GridSimStandardPE.java 2009-09-23 17:22:45 UTC (rev 273) @@ -1,10 +1,10 @@ /* * Title: GridSim Toolkit + * Description: GridSim (Grid Simulation) Toolkit for Modeling and Simulation * of Parallel and Distributed Systems such as Clusters and Grids - * Licence: GPL - http://www.gnu.org/copyleft/gpl.html + * License: GPL - http://www.gnu.org/copyleft/gpl.html * - * Copyright (c) 2002, The University of Melbourne, Australia */ package gridsim; Modified: trunk/source/gridsim/GridSimTags.java =================================================================== --- trunk/source/gridsim/GridSimTags.java 2009-09-23 16:56:07 UTC (rev 272) +++ trunk/source/gridsim/GridSimTags.java 2009-09-23 17:22:45 UTC (rev 273) @@ -1,10 +1,10 @@ /* * Title: GridSim Toolkit + * Description: GridSim (Grid Simulation) Toolkit for Modeling and Simulation * of Parallel and Distributed Systems such as Clusters and Grids - * Licence: GPL - http://www.gnu.org/copyleft/gpl.html + * License: GPL - http://www.gnu.org/copyleft/gpl.html * - * Copyright (c) 2002, The University of Melbourne, Australia */ package gridsim; Modified: trunk/source/gridsim/GridStatistics.java =================================================================== --- trunk/source/gridsim/GridStatistics.java 2009-09-23 16:56:07 UTC (rev 272) +++ trunk/source/gridsim/GridStatistics.java 2009-09-23 17:22:45 UTC (rev 273) @@ -1,11 +1,9 @@ /* * Title: GridSim Toolkit - * Date: May 2003 + * Description: GridSim (Grid Simulation) Toolkit for Modeling and Simulation * of Parallel and Distributed Systems such as Clusters and Grids - * Licence: GPL - http://www.gnu.org/copyleft/gpl.html - * - * Copyright (c) 2002, The University of Melbourne, Australia + * License: GPL - http://www.gnu.org/copyleft/gpl.html */ package gridsim; Modified: trunk/source/gridsim/GridUser.java =================================================================== --- trunk/source/gridsim/GridUser.java 2009-09-23 16:56:07 UTC (rev 272) +++ trunk/source/gridsim/GridUser.java 2009-09-23 17:22:45 UTC (rev 273) @@ -1,10 +1,9 @@ /* * Title: GridSim Toolkit + * Description: GridSim (Grid Simulation) Toolkit for Modeling and Simulation * of Parallel and Distributed Systems such as Clusters and Grids - * Licence: GPL - http://www.gnu.org/copyleft/gpl.html - * - * Copyright (c) 2005, The University of Melbourne, Australia + * License: GPL - http://www.gnu.org/copyleft/gpl.html */ package gridsim; Modified: trunk/source/gridsim/Gridlet.java =================================================================== --- trunk/source/gridsim/Gridlet.java 2009-09-23 16:56:07 UTC (rev 272) +++ trunk/source/gridsim/Gridlet.java 2009-09-23 17:22:45 UTC (rev 273) @@ -1,10 +1,10 @@ /* * Title: GridSim Toolkit + * Description: GridSim (Grid Simulation) Toolkit for Modeling and Simulation * of Parallel and Distributed Systems such as Clusters and Grids - * Licence: GPL - http://www.gnu.org/copyleft/gpl.html + * License: GPL - http://www.gnu.org/copyleft/gpl.html * - * Copyright (c) 2002, The University of Melbourne, Australia */ package gridsim; Modified: trunk/source/gridsim/GridletList.java =================================================================== --- trunk/source/gridsim/GridletList.java 2009-09-23 16:56:07 UTC (rev 272) +++ trunk/source/gridsim/GridletList.java 2009-09-23 17:22:45 UTC (rev 273) @@ -1,10 +1,10 @@ /* * Title: GridSim Toolkit + * Description: GridSim (Grid Simulation) Toolkit for Modeling and Simulation * of Parallel and Distributed Systems such as Clusters and Grids - * Licence: GPL - http://www.gnu.org/copyleft/gpl.html + * License: GPL - http://www.gnu.org/copyleft/gpl.html * - * Copyright (c) 2002, The University of Melbourne, Australia */ package gridsim; Modified: trunk/source/gridsim/IO_data.java =================================================================== --- trunk/source/gridsim/IO_data.java 2009-09-23 16:56:07 UTC (rev 272) +++ trunk/source/gridsim/IO_data.java 2009-09-23 17:22:45 UTC (rev 273) @@ -1,10 +1,10 @@ /* * Title: GridSim Toolkit + * Description: GridSim (Grid Simulation) Toolkit for Modeling and Simulation * of Parallel and Distributed Systems such as Clusters and Grids - * Licence: GPL - http://www.gnu.org/copyleft/gpl.html + * License: GPL - http://www.gnu.org/copyleft/gpl.html * - * Copyright (c) 2002, The University of Melbourne, Australia */ package gridsim; Modified: trunk/source/gridsim/Machine.java =================================================================== --- trunk/source/gridsim/Machine.java 2009-09-23 16:56:07 UTC (rev 272) +++ trunk/source/gridsim/Machine.java 2009-09-23 17:22:45 UTC (rev 273) @@ -1,10 +1,10 @@ /* * Title: GridSim Toolkit + * Description: GridSim (Grid Simulation) Toolkit for Modeling and Simulation * of Parallel and Distributed Systems such as Clusters and Grids - * Licence: GPL - http://www.gnu.org/copyleft/gpl.html + * License: GPL - http://www.gnu.org/copyleft/gpl.html * - * Copyright (c) 2002, The University of Melbourne, Australia */ @@ -56,7 +56,7 @@ * @param id the machine ID * @param list list of PEs * @deprecated as of GridSim version 5.0, you should - * use {@link Machine(int,int,int)} + * use {@link #Machine(int,int,int)} * @pre id > 0 * @pre list != null * @post $none Modified: trunk/source/gridsim/MachineList.java =================================================================== --- trunk/source/gridsim/MachineList.java 2009-09-23 16:56:07 UTC (rev 272) +++ trunk/source/gridsim/MachineList.java 2009-09-23 17:22:45 UTC (rev 273) @@ -1,10 +1,10 @@ /* * Title: GridSim Toolkit + * Description: GridSim (Grid Simulation) Toolkit for Modeling and Simulation * of Parallel and Distributed Systems such as Clusters and Grids - * Licence: GPL - http://www.gnu.org/copyleft/gpl.html + * License: GPL - http://www.gnu.org/copyleft/gpl.html * - * Copyright (c) 2002, The University of Melbourne, Australia */ package gridsim; Modified: trunk/source/gridsim/PE.java =================================================================== --- trunk/source/gridsim/PE.java 2009-09-23 16:56:07 UTC (rev 272) +++ trunk/source/gridsim/PE.java 2009-09-23 17:22:45 UTC (rev 273) @@ -2,9 +2,8 @@ * Title: GridSim Toolkit * Description: GridSim (Grid Simulation) Toolkit for Modeling and Simulation * of Parallel and Distributed Systems such as Clusters and Grids - * Licence: GPL - http://www.gnu.org/copyleft/gpl.html + * License: GPL - http://www.gnu.org/copyleft/gpl.html * - * Copyright (c) 2002, The University of Melbourne, Australia */ package gridsim; Modified: trunk/source/gridsim/PEList.java =================================================================== --- trunk/source/gridsim/PEList.java 2009-09-23 16:56:07 UTC (rev 272) +++ trunk/source/gridsim/PEList.java 2009-09-23 17:22:45 UTC (rev 273) @@ -2,9 +2,8 @@ * Title: GridSim Toolkit * Description: GridSim (Grid Simulation) Toolkit for Modeling and Simulation * of Parallel and Distributed Systems such as Clusters and Grids - * Licence: GPL - http://www.gnu.org/copyleft/gpl.html + * License: GPL - http://www.gnu.org/copyleft/gpl.html * - * Copyright (c) 2002, The University of Melbourne, Australia */ package gridsim; Modified: trunk/source/gridsim/ParameterException.java =================================================================== --- trunk/source/gridsim/ParameterException.java 2009-09-23 16:56:07 UTC (rev 272) +++ trunk/source/gridsim/ParameterException.java 2009-09-23 17:22:45 UTC (rev 273) @@ -7,7 +7,7 @@ * National University of Singapore * October 2004 * - * Licence: GPL - http://www.gnu.org/copyleft/gpl.html + * License: GPL - http://www.gnu.org/copyleft/gpl.html * Copyright (c) 2004, The University of Melbourne, Australia and * National University of Singapore * ParameterException.java - Thrown for illegal parameters Modified: trunk/source/gridsim/ResGridlet.java =================================================================== --- trunk/source/gridsim/ResGridlet.java 2009-09-23 16:56:07 UTC (rev 272) +++ trunk/source/gridsim/ResGridlet.java 2009-09-23 17:22:45 UTC (rev 273) @@ -2,9 +2,8 @@ * Title: GridSim Toolkit * Description: GridSim (Grid Simulation) Toolkit for Modeling and Simulation * of Parallel and Distributed Systems such as Clusters and Grids - * Licence: GPL - http://www.gnu.org/copyleft/gpl.html + * License: GPL - http://www.gnu.org/copyleft/gpl.html * - * Copyright (c) 2002, The University of Melbourne, Australia */ package gridsim; Modified: trunk/source/gridsim/ResGridletList.java =================================================================== --- trunk/source/gridsim/ResGridletList.java 2009-09-23 16:56:07 UTC (rev 272) +++ trunk/source/gridsim/ResGridletList.java 2009-09-23 17:22:45 UTC (rev 273) @@ -2,9 +2,8 @@ * Title: GridSim Toolkit * Description: GridSim (Grid Simulation) Toolkit for Modeling and Simulation * of Parallel and Distributed Systems such as Clusters and Grids - * Licence: GPL - http://www.gnu.org/copyleft/gpl.html + * License: GPL - http://www.gnu.org/copyleft/gpl.html * - * Copyright (c) 2002, The University of Melbourne, Australia */ package gridsim; Modified: trunk/source/gridsim/ResourceCalendar.java =================================================================== --- trunk/source/gridsim/ResourceCalendar.java 2009-09-23 16:56:07 UTC (rev 272) +++ trunk/source/gridsim/ResourceCalendar.java 2009-09-23 17:22:45 UTC (rev 273) @@ -2,12 +2,10 @@ * Title: GridSim Toolkit * Description: GridSim (Grid Simulation) Toolkit for Modeling and Simulation * of Parallel and Distributed Systems such as Clusters and Grids - * Licence: GPL - http://www.gnu.org/copyleft/gpl.html + * License: GPL - http://www.gnu.org/copyleft/gpl.html * - * Copyright (c) 2002, The University of Melbourne, Australia */ - package gridsim; import java.util.*; Modified: trunk/source/gridsim/ResourceCharacteristics.java =================================================================== --- trunk/source/gridsim/ResourceCharacteristics.java 2009-09-23 16:56:07 UTC (rev 272) +++ trunk/source/gridsim/ResourceCharacteristics.java 2009-09-23 17:22:45 UTC (rev 273) @@ -2,9 +2,8 @@ * Title: GridSim Toolkit * Description: GridSim (Grid Simulation) Toolkit for Modeling and Simulation * of Parallel and Distributed Systems such as Clusters and Grids - * Licence: GPL - http://www.gnu.org/copyleft/gpl.html + * License: GPL - http://www.gnu.org/copyleft/gpl.html * - * Copyright (c) 2002, The University of Melbourne, Australia */ package gridsim; Modified: trunk/source/gridsim/ResourceUserList.java =================================================================== --- trunk/source/gridsim/ResourceUserList.java 2009-09-23 16:56:07 UTC (rev 272) +++ trunk/source/gridsim/ResourceUserList.java 2009-09-23 17:22:45 UTC (rev 273) @@ -2,9 +2,8 @@ * Title: GridSim Toolkit * Description: GridSim (Grid Simulation) Toolkit for Modeling and Simulation * of Parallel and Distributed Systems such as Clusters and Grids - * Licence: GPL - http://www.gnu.org/copyleft/gpl.html + * License: GPL - http://www.gnu.org/copyleft/gpl.html * - * Copyright (c) 2002, The University of Melbourne, Australia */ package gridsim; Modified: trunk/source/gridsim/Sim_from_port.java =================================================================== --- trunk/source/gridsim/Sim_from_port.java 2009-09-23 16:56:07 UTC (rev 272) +++ trunk/source/gridsim/Sim_from_port.java 2009-09-23 17:22:45 UTC (rev 273) @@ -2,9 +2,8 @@ * Title: GridSim Toolkit * Description: GridSim (Grid Simulation) Toolkit for Modeling and Simulation * of Parallel and Distributed Systems such as Clusters and Grids - * Licence: GPL - http://www.gnu.org/copyleft/gpl.html + * License: GPL - http://www.gnu.org/copyleft/gpl.html * - * Copyright (c) 2002, The University of Melbourne, Australia */ package gridsim; Modified: trunk/source/gridsim/SpaceShared.java =================================================================== --- trunk/source/gridsim/SpaceShared.java 2009-09-23 16:56:07 UTC (rev 272) +++ trunk/source/gridsim/SpaceShared.java 2009-09-23 17:22:45 UTC (rev 273) @@ -2,9 +2,8 @@ * Title: GridSim Toolkit * Description: GridSim (Grid Simulation) Toolkit for Modeling and Simulation * of Parallel and Distributed Systems such as Clusters and Grids - * Licence: GPL - http://www.gnu.org/copyleft/gpl.html + * License: GPL - http://www.gnu.org/copyleft/gpl.html * - * Copyright (c) 2003, The University of Melbourne, Australia */ package gridsim; Modified: trunk/source/gridsim/Stat.java =================================================================== --- trunk/source/gridsim/Stat.java 2009-09-23 16:56:07 UTC (rev 272) +++ trunk/source/gridsim/Stat.java 2009-09-23 17:22:45 UTC (rev 273) @@ -2,9 +2,8 @@ * Title: GridSim Toolkit * Description: GridSim (Grid Simulation) Toolkit for Modeling and Simulation * of Parallel and Distributed Systems such as Clusters and Grids - * Licence: GPL - http://www.gnu.org/copyleft/gpl.html + * License: GPL - http://www.gnu.org/copyleft/gpl.html * - * Copyright (c) 2002, The University of Melbourne, Australia */ package gridsim; @@ -31,11 +30,11 @@ /** * Allocat... [truncated message content] |
From: <mar...@us...> - 2009-09-24 09:00:56
|
Revision: 274 http://gridsim.svn.sourceforge.net/gridsim/?rev=274&view=rev Author: marcos_dias Date: 2009-09-24 09:00:48 +0000 (Thu, 24 Sep 2009) Log Message: ----------- Changes in documentation and script details to release GridSim as version 5 Modified Paths: -------------- trunk/jars/gridsim.jar trunk/release.sh Modified: trunk/jars/gridsim.jar =================================================================== (Binary files differ) Modified: trunk/release.sh =================================================================== --- trunk/release.sh 2009-09-23 17:22:45 UTC (rev 273) +++ trunk/release.sh 2009-09-24 09:00:48 UTC (rev 274) @@ -5,7 +5,7 @@ # sh release.sh 5beta VERSION=$1 -FILES="./source ./examples ./jars ./build.xml *.txt" +FILES="./source ./examples ./jars ./build.xml ./doc *.txt" CURRDIR=`pwd` mkdir -p ./release/gridsim This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |