[Mauischeduler-cvs_notes] CVS: mauisched/src/unm/maui/wikid NodeDaemonImpl.java,1.21,1.22

[Aaron S. <mau...@us...>]

Update of /cvsroot/mauischeduler/mauisched/src/unm/maui/wikid
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32201/src/unm/maui/wikid

Modified Files:
	NodeDaemonImpl.java 
Log Message:
merge from 1.8


Index: NodeDaemonImpl.java
===================================================================
RCS file: /cvsroot/mauischeduler/mauisched/src/unm/maui/wikid/NodeDaemonImpl.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** NodeDaemonImpl.java	9 Sep 2003 20:04:14 -0000	1.21
--- NodeDaemonImpl.java	3 Feb 2005 21:15:36 -0000	1.22
***************
*** 63,66 ****
--- 63,70 ----
      public final transient static String minSleepProperty = ".sleep";
  
+     public final transient static String minNodeSleepProperty = ".sleep.node";
+ 
+     public final transient static String minSubSleepProperty = ".subsleep";
+ 
      public final transient static String jobSleepProperty = ".sleep.jobstart";
  
***************
*** 131,134 ****
--- 135,144 ----
  
      /**
+      * Minimum sleep for node updates, in seconds--only used if
+      * present in configuration file...
+      */
+     protected int minNodeSleep = -1;
+ 
+     /**
       * Cryptix security library wrapper.
       */
***************
*** 305,309 ****
  	str = props.getProperty(prefix+sleepIntervalProperty);
  	if (str != null) {
! 	    sleepInterval = Integer.parseInt(str);
  	}
  
--- 315,319 ----
  	str = props.getProperty(prefix+sleepIntervalProperty);
  	if (str != null) {
! 	    sleepInterval = Integer.parseInt(str) * 1000; // milliseconds
  	}
  
***************
*** 315,319 ****
  	str = props.getProperty(prefix+minSleepProperty);
  	if (str != null) {
! 	    minSleep = Integer.parseInt(str);
  	}
  
--- 325,337 ----
  	str = props.getProperty(prefix+minSleepProperty);
  	if (str != null) {
! 	    minSleep = Integer.parseInt(str) * 1000; // milliseconds
! 	    str = props.getProperty(prefix+minSubSleepProperty);
! 	    if (str != null) {
! 		minSleep += Integer.parseInt(str); // miolliseconds
! 	    }
! 	}
! 	str = props.getProperty(prefix+minNodeSleepProperty);
! 	if (str != null) {
! 	    minNodeSleep = Integer.parseInt(str) * 1000; // milliseconds
  	}
  
***************
*** 752,756 ****
  
  			// stall ...
! 			Thread.currentThread().sleep(jobSleep);
  
  			try {
--- 770,776 ----
  
  			// stall ...
! 			if (jobSleep > 0) {
! 			    Thread.currentThread().sleep(jobSleep);
! 			}
  
  			try {
***************
*** 880,883 ****
--- 900,906 ----
  	fireProlog();
  
+ 
+ 	int minisleep = (minNodeSleep >= 0) ? minNodeSleep : minSleep;
+ 
  	// loop handling commands until stopped
  	while (!finished) {
***************
*** 904,912 ****
  	    ++iteration;
  	    try {
! 		int randSleep = (int)((double)sleepInterval*(double)Math.random()) + minSleep;
  		if (Log.logging("sched-verbose")) {
  		    Log.out.println(threadName+" sleeping for "+randSleep+" seconds");
  		}
! 		wait(randSleep*1000);
  	    } catch (InterruptedException e) {
  		Log.err.println(e.getMessage());
--- 927,936 ----
  	    ++iteration;
  	    try {
! 		int randSleep = (int)((double)sleepInterval*(double)Math.random()) + minisleep;
! 
  		if (Log.logging("sched-verbose")) {
  		    Log.out.println(threadName+" sleeping for "+randSleep+" seconds");
  		}
! 		wait(randSleep);
  	    } catch (InterruptedException e) {
  		Log.err.println(e.getMessage());
***************
*** 1124,1128 ****
  		Log.out.println(Thread.currentThread().getName()+" sleeping for "+randSleep+" seconds");
  	    }
! 	    Thread.currentThread().sleep(randSleep*1000);
  
  	    if (doOnce) {
--- 1148,1152 ----
  		Log.out.println(Thread.currentThread().getName()+" sleeping for "+randSleep+" seconds");
  	    }
! 	    Thread.currentThread().sleep(randSleep);
  
  	    if (doOnce) {