A ref change was pushed to the repository containing the project "Grayskull Repository". The branch, master has been updated via b968196f03039954f969f3699666391b36bfd909 (commit) from e056bfcc068a2d5429fec8fb34aa8fde5c6a523d (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit b968196f03039954f969f3699666391b36bfd909 Author: Justin Wozniak <[email protected]> Date: Mon Nov 30 11:39:44 2009 -0600 Correction for Rebuild to handle Copies that finish at the same time. ----------------------------------------------------------------------- Summary of changes: sim/gobs/gobs/sim/Rebuild.java | 12 ++++++------ sim/gobs/gobs/sim/Simulator.java | 2 +- sim/gobs/sweeps/dc02kpv01.cfg | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) Diff of changes: diff --git a/sim/gobs/gobs/sim/Rebuild.java b/sim/gobs/gobs/sim/Rebuild.java index 1ce4fc7..a60314e 100644 --- a/sim/gobs/gobs/sim/Rebuild.java +++ b/sim/gobs/gobs/sim/Rebuild.java @@ -29,9 +29,9 @@ class Rebuild This must be large enough to differentiate all copies based on start time. */ - static double selectTime = 0.000001; + static double selectTime = 0.00001; - static DecimalFormat df = new DecimalFormat("0.0"); + static DecimalFormat df = new DecimalFormat("0.000000000"); Simulator simulator; @@ -80,15 +80,15 @@ class Rebuild schedule.add(copy); busy.add(copy.source); busy.add(copy.destination); - boolean b = inflight.add(copy); - if (!b) + while (!inflight.add(copy)) { System.out.println("add failed!"); System.out.println("" + copy); dumpInflight(inflight); - System.exit(2); + time += selectTime; + copy.startAt(time); + // System.exit(2); } - time += selectTime; if (simulator.bool("print.rebuilds")) System.out.println("start: " + copy.log()); } diff --git a/sim/gobs/gobs/sim/Simulator.java b/sim/gobs/gobs/sim/Simulator.java index fd1f896..cf8001d 100644 --- a/sim/gobs/gobs/sim/Simulator.java +++ b/sim/gobs/gobs/sim/Simulator.java @@ -289,7 +289,7 @@ public class Simulator Collection<gobs.sim.Object> set; do { - System.out.println("allocateFile(): iterate: " + tries); + // System.out.println("allocateFile(): iterate: " + tries); if (tries++ >= maxTries) bail("Could not allocate new object ids!"); diff --git a/sim/gobs/sweeps/dc02kpv01.cfg b/sim/gobs/sweeps/dc02kpv01.cfg index 77ab756..a8e3954 100644 --- a/sim/gobs/sweeps/dc02kpv01.cfg +++ b/sim/gobs/sweeps/dc02kpv01.cfg @@ -1,5 +1,5 @@ -include = kpv01.cfg system_size_1000.cfg +include = kpv01.cfg system_size_20-1000.cfg # This declustering test has no user accesses: hooks/post-receive -- Grayskull Repository