Ticket #783: sleep_interval.diff

sched/file_deleter.cpp

@@ -66 +66 @@
 #define LOCKFILE "file_deleter.out"
 #define PIDFILE  "file_deleter.pid"
 
-#define SLEEP_INTERVAL 5
+#define DEFAULT_SLEEP_INTERVAL 5
 #define RESULTS_PER_WU 4        // an estimate of redundancy 
 
 int id_modulus=0, id_remainder=0;
@@ -76 +76 @@
 int antique_delay = ANTIQUE_DELAY;
 bool do_input_files = true;
 bool do_output_files = true;
+double sleep_interval = DEFAULT_SLEEP_INTERVAL;
 
 void usage() {
     fprintf(stderr,
@@ -608 +609 @@
             dont_delete_antiques = true;
         } else if (!strcmp(argv[i], "-output_files_only")) {
             do_input_files = false;
+        } else if (!strcmp(argv[i], "-sleep_interval")) {
+            sleep_interval = atof(argv[++i]);
         } else if (!strcmp(argv[i], "-help")) {
             usage();
         } else {
@@ -667 +670 @@
         }
         if (!got_any) {
             if (one_pass) break;
-            sleep(SLEEP_INTERVAL);
+            sleep(sleep_interval);
         }
         if (!dont_delete_antiques && (dtime() > next_antique_time)) {
             log_messages.printf(MSG_DEBUG,

sched/transitioner.cpp

@@ -24 +24 @@
 //   [ -one_pass ]          do one pass, then exit
 //   [ -d x ]               debug level x
 //   [ -mod n i ]           process only WUs with (id mod n) == i
+//   [ -sleep_interval x ]  sleep x seconds if nothing to do
 
 using namespace std;
 #include "config.h"
@@ -53 +54 @@
 #define PIDFILE                 "transitioner.pid"
 
 #define SELECT_LIMIT    1000
-#ifdef EINSTEIN_AT_HOME
-#define SLEEP_INTERVAL  1
-#else
-#define SLEEP_INTERVAL  5
-#endif
 
+#define DEFAULT_SLEEP_INTERVAL  5
+
 int startup_time;
 R_RSA_PRIVATE_KEY key;
 int mod_n, mod_i;
 bool do_mod = false;
 bool one_pass = false;
+double sleep_interval = DEFAULT_SLEEP_INTERVAL;
 
 void signal_handler(int) {
     log_messages.printf(MSG_NORMAL, "Signaled by simulator\n");
@@ -667 +666 @@
             signal(SIGUSR2, simulator_signal_handler);
             pause();
 #else
-            log_messages.printf(MSG_DEBUG, "sleeping %d\n", SLEEP_INTERVAL);
-            sleep(SLEEP_INTERVAL);
+            log_messages.printf(MSG_DEBUG, "sleeping %d\n", sleep_interval);
+            sleep(sleep_interval);
 #endif
         }
     }
@@ -688 +687 @@
             mod_n = atoi(argv[++i]);
             mod_i = atoi(argv[++i]);
             do_mod = true;
+        } else if (!strcmp(argv[i], "-sleep_interval")) {
+            sleep_interval = atof(argv[++i]);
         }
     }
     if (!one_pass) check_stop_daemons();