From: jzhou Date: Wed, 19 Mar 2008 00:22:06 +0000 (+0000) Subject: close debugging info X-Git-Tag: preEdgeChange~224 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=470a74ec1fbe364129d13dd50199b9a1de82dd4a;p=IRC.git close debugging info --- diff --git a/Robust/src/Benchmarks/MapReduce/Java/JobClient.java b/Robust/src/Benchmarks/MapReduce/Java/JobClient.java index b45f77e6..cab79af5 100644 --- a/Robust/src/Benchmarks/MapReduce/Java/JobClient.java +++ b/Robust/src/Benchmarks/MapReduce/Java/JobClient.java @@ -9,11 +9,11 @@ public class JobClient{ Master master = new Master(conf.getM(), conf.getR(), splitter); // split input file - System.printString("Split\n"); + //System.printString("Split\n"); master.split(); // do 'map' - System.printString("Map\n"); + //System.printString("Map\n"); MapWorker[] mworkers = master.assignMap(); for(int i = 0; i < mworkers.length; ++i) { MapWorker mworker = mworkers[i]; @@ -23,7 +23,7 @@ public class JobClient{ } // register intermediate output from map workers to master - System.printString("Mapoutput\n"); + //System.printString("Mapoutput\n"); for(int i = 0; i < mworkers.length; ++i) { for(int j = 0; j < conf.getR(); ++j) { String temp = mworkers[i].outputFile(j); @@ -36,7 +36,7 @@ public class JobClient{ //assert(master.isMapFinish()); // do 'reduce' - System.printString("Reduce\n"); + //System.printString("Reduce\n"); ReduceWorker[] rworkers = master.assignReduce(); for(int i = 0; i < rworkers.length; ++i) { ReduceWorker rworker = rworkers[i]; @@ -46,7 +46,7 @@ public class JobClient{ } // merge all the intermediate output from reduce workers to master - System.printString("Merge\n"); + //System.printString("Merge\n"); for(int i = 0; i < rworkers.length; ++i) { master.collectROutput(rworkers[i].getOutputFile()); master.setReduceFinish(rworkers[i].getID()); diff --git a/Robust/src/Benchmarks/MapReduce/Nor/MapReduce.java b/Robust/src/Benchmarks/MapReduce/Nor/MapReduce.java index cfef9366..1a81bb61 100644 --- a/Robust/src/Benchmarks/MapReduce/Nor/MapReduce.java +++ b/Robust/src/Benchmarks/MapReduce/Nor/MapReduce.java @@ -32,7 +32,7 @@ task startup(StartupObject s{initialstate}) { //Split the input file into M pieces task split(Master master{split}) { - System.printString("Top of task split\n"); + //System.printString("Top of task split\n"); master.split(); taskexit(master{!split, assignMap}); @@ -40,7 +40,7 @@ task split(Master master{split}) { //Select a map worker to handle one of the pieces of input file task assignMap(Master master{assignMap}) { - System.printString("Top of task assignMap\n"); + //System.printString("Top of task assignMap\n"); master.assignMap(); taskexit(master{!assignMap, mapoutput}); @@ -48,7 +48,7 @@ task assignMap(Master master{assignMap}) { //MapWorker do 'map' function on a input file piece task map(MapWorker mworker{map}) { - System.printString("Top of task map\n"); + //System.printString("Top of task map\n"); mworker.map(); taskexit(mworker{!map, partition}); @@ -57,7 +57,7 @@ task map(MapWorker mworker{map}) { //Partition the intermediate key/value pair generated //into R intermediate local files task partition(MapWorker mworker{partition}) { - System.printString("Top of task partition\n"); + //System.printString("Top of task partition\n"); mworker.partition(); taskexit(mworker{!partition, mapoutput}); @@ -65,7 +65,7 @@ task partition(MapWorker mworker{partition}) { //Register the intermediate ouput from map worker to master task mapOutput(Master master{mapoutput}, /*optional*/ MapWorker mworker{mapoutput}) { - System.printString("Top of task mapOutput\n"); + //System.printString("Top of task mapOutput\n"); //if(isavailable(mworker)) { int total = master.getR(); for(int i = 0; i < total; ++i) { @@ -89,7 +89,7 @@ task mapOutput(Master master{mapoutput}, /*optional*/ MapWorker mworker{mapoutpu //Assign the list of intermediate output associated to one key to //a reduce worker task assignReduce(Master master{assignReduce}) { - System.printString("Top of task assignReduce\n"); + //System.printString("Top of task assignReduce\n"); master.assignReduce(); taskexit(master{!assignReduce, reduceoutput}); @@ -98,7 +98,7 @@ task assignReduce(Master master{assignReduce}) { //First do sort and group on the intermediate key/value pairs assigned //to reduce worker task sortgroup(ReduceWorker rworker{sortgroup}) { - System.printString("Top of task sortgroup\n"); + //System.printString("Top of task sortgroup\n"); rworker.sortgroup(); taskexit(rworker{!sortgroup, reduce}); @@ -106,7 +106,7 @@ task sortgroup(ReduceWorker rworker{sortgroup}) { //Do 'reduce' function task reduce(ReduceWorker rworker{reduce}) { - System.printString("Top of task reduce\n"); + //System.printString("Top of task reduce\n"); rworker.reduce(); taskexit(rworker{!reduce, reduceoutput}); @@ -114,7 +114,7 @@ task reduce(ReduceWorker rworker{reduce}) { //Collect the output into master task reduceOutput(Master master{reduceoutput}, /*optional*/ ReduceWorker rworker{reduceoutput}) { - System.printString("Top of task reduceOutput\n"); + //System.printString("Top of task reduceOutput\n"); //if(isavailable(rworker)) { master.collectROutput(rworker.getOutputFile()); master.setReduceFinish(rworker.getID()); @@ -131,7 +131,7 @@ task reduceOutput(Master master{reduceoutput}, /*optional*/ ReduceWorker rworker } task output(Master master{output}) { - System.printString("Top of task output\n"); + //System.printString("Top of task output\n"); if(master.isPartial()) { System.printString("Partial! The result may not be right due to some failure!\n"); } diff --git a/Robust/src/Benchmarks/MapReduce/Tag/MapReduce.java b/Robust/src/Benchmarks/MapReduce/Tag/MapReduce.java index 7556a8fc..a411a165 100644 --- a/Robust/src/Benchmarks/MapReduce/Tag/MapReduce.java +++ b/Robust/src/Benchmarks/MapReduce/Tag/MapReduce.java @@ -32,7 +32,7 @@ task startup(StartupObject s{initialstate}) { //Split the input file into M pieces task split(Master master{split}) { - System.printString("Top of task split\n"); + //System.printString("Top of task split\n"); master.split(); taskexit(master{!split, assignMap}); @@ -40,7 +40,7 @@ task split(Master master{split}) { //Select a map worker to handle one of the pieces of input file task assignMap(Master master{assignMap}) { - System.printString("Top of task assignMap\n"); + //System.printString("Top of task assignMap\n"); master.assignMap(); taskexit(master{!assignMap, mapoutput}); @@ -48,7 +48,7 @@ task assignMap(Master master{assignMap}) { //MapWorker do 'map' function on a input file piece task map(MapWorker mworker{map}) { - System.printString("Top of task map\n"); + //System.printString("Top of task map\n"); mworker.map(); taskexit(mworker{!map, partition}); @@ -57,7 +57,7 @@ task map(MapWorker mworker{map}) { //Partition the intermediate key/value pair generated //into R intermediate local files task partition(MapWorker mworker{partition}) { - System.printString("Top of task partition\n"); + //System.printString("Top of task partition\n"); mworker.partition(); taskexit(mworker{!partition, mapoutput}); @@ -65,7 +65,7 @@ task partition(MapWorker mworker{partition}) { //Register the intermediate ouput from map worker to master task mapOutput(Master master{mapoutput}, optional MapWorker mworker{mapoutput}) { - System.printString("Top of task mapOutput\n"); + //System.printString("Top of task mapOutput\n"); if(isavailable(mworker)) { int total = master.getR(); for(int i = 0; i < total; ++i) { @@ -89,7 +89,7 @@ task mapOutput(Master master{mapoutput}, optional MapWorker mworker{mapoutput}) //Assign the list of intermediate output associated to one key to //a reduce worker task assignReduce(Master master{assignReduce}) { - System.printString("Top of task assignReduce\n"); + //System.printString("Top of task assignReduce\n"); master.assignReduce(); taskexit(master{!assignReduce, reduceoutput}); @@ -98,7 +98,7 @@ task assignReduce(Master master{assignReduce}) { //First do sort and group on the intermediate key/value pairs assigned //to reduce worker task sortgroup(ReduceWorker rworker{sortgroup}) { - System.printString("Top of task sortgroup\n"); + //System.printString("Top of task sortgroup\n"); rworker.sortgroup(); taskexit(rworker{!sortgroup, reduce}); @@ -106,7 +106,7 @@ task sortgroup(ReduceWorker rworker{sortgroup}) { //Do 'reduce' function task reduce(ReduceWorker rworker{reduce}) { - System.printString("Top of task reduce\n"); + //System.printString("Top of task reduce\n"); rworker.reduce(); taskexit(rworker{!reduce, reduceoutput}); @@ -114,7 +114,7 @@ task reduce(ReduceWorker rworker{reduce}) { //Collect the output into master task reduceOutput(Master master{reduceoutput}, optional ReduceWorker rworker{reduceoutput}) { - System.printString("Top of task reduceOutput\n"); + //System.printString("Top of task reduceOutput\n"); if(isavailable(rworker)) { master.collectROutput(rworker.getOutputFile()); master.setReduceFinish(rworker.getID()); @@ -131,7 +131,7 @@ task reduceOutput(Master master{reduceoutput}, optional ReduceWorker rworker{red } task output(Master master{output}) { - System.printString("Top of task output\n"); + //System.printString("Top of task output\n"); if(master.isPartial()) { System.printString("Partial! The result may not be right due to some failure!\n"); } diff --git a/Robust/src/Benchmarks/PERT/Tag/PERT.java b/Robust/src/Benchmarks/PERT/Tag/PERT.java index aa9c4888..951312a3 100644 --- a/Robust/src/Benchmarks/PERT/Tag/PERT.java +++ b/Robust/src/Benchmarks/PERT/Tag/PERT.java @@ -1,7 +1,7 @@ task startup(StartupObject s{initialstate}) { // read in configuration parameters - System.printString("Top of task startup\n"); + //System.printString("Top of task startup\n"); String path = new String("/home/jzhou/pert/conf.txt"); FileInputStream iStream = new FileInputStream(path); byte[] b = new byte[1024]; @@ -23,7 +23,7 @@ task startup(StartupObject s{initialstate}) { } task sampling(Stage s{sampling}) { - System.printString("Top of task sampling\n"); + //System.printString("Top of task sampling\n"); s.sampling(); @@ -31,7 +31,7 @@ task sampling(Stage s{sampling}) { } task estimateStage(Stage s{estimate}) { - System.printString("Top of task estimateStage\n"); + //System.printString("Top of task estimateStage\n"); s.estimate(); @@ -39,7 +39,7 @@ task estimateStage(Stage s{estimate}) { } task estimate(Estimator e{estimate}, optional Stage s{merge}) { - System.printString("Top of task estimate\n"); + //System.printString("Top of task estimate\n"); boolean fake = false; if(!isavailable(s)) { @@ -55,7 +55,7 @@ task estimate(Estimator e{estimate}, optional Stage s{merge}) { } task prob(Estimator e{prob}) { - System.printString("Top of task prob\n"); + //System.printString("Top of task prob\n"); if(e.isPartial()) { System.printString("There are some sampling data unavailable. The anticipate probability may be greater than it should be!\n"); diff --git a/Robust/src/Benchmarks/TileSearch/Tag/TileSearch.java b/Robust/src/Benchmarks/TileSearch/Tag/TileSearch.java index ded343e1..d7bd5a7f 100644 --- a/Robust/src/Benchmarks/TileSearch/Tag/TileSearch.java +++ b/Robust/src/Benchmarks/TileSearch/Tag/TileSearch.java @@ -53,7 +53,7 @@ task Startup( StartupObject s{ initialstate } ) { - System.printString("Top of task Startup\n"); + //System.printString("Top of task Startup\n"); SubProblem top = new SubProblem(){ findingNewFits, main }; /* @@ -101,7 +101,7 @@ task findNewFits(optional SubProblem sp{ findingNewFits }, GlobalCounter counter counter.partial = true; taskexit( sp{ !findingNewFits } ); } - System.printString("Top of task findNewFits\n"); + //System.printString("Top of task findNewFits\n"); // if we have run out of iterations of the // findNewFits task, mark waitingForSubProblems if( sp.indexToFit == sp.tilesToFit.length ) @@ -196,14 +196,14 @@ task findNewFits(optional SubProblem sp{ findingNewFits }, GlobalCounter counter } task scoreSubProbleam(SubProblem sp{ !scored && leaf }) { - System.printString("Top of task scoreSubProblem\n"); + //System.printString("Top of task scoreSubProblem\n"); sp.scoreWorkingGrid(); taskexit(sp { scored }); } //check the highest score task findHighestScore(SubProblem pSp{ !scored && main }, optional SubProblem cSp{ scored && leaf }, GlobalCounter counter{ Init } ) { - System.printString("Top of task findHighestScore\n"); + //System.printString("Top of task findHighestScore\n"); --counter.counter; //System.printString( "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n" ); //System.printString( "find highest score:\n" + counter.counter + "\n" ); @@ -226,7 +226,7 @@ task findHighestScore(SubProblem pSp{ !scored && main }, optional SubProblem cSp } task printHighestScore(SubProblem sp{ scored && main }) { - System.printString("Top of task printHighestScore\n"); + //System.printString("Top of task printHighestScore\n"); // if(isavailable(sp)) { if(sp.partial == true) { System.printString ( "Result may not be the best one due to some failure during execution!\n" );