From fd525409bb3a6698b2a4a35ead369101bccdce92 Mon Sep 17 00:00:00 2001 From: David Anderson Date: Wed, 12 Mar 2003 21:37:50 +0000 Subject: [PATCH] renamed result_retry to timeout_check svn path=/trunk/boinc/; revision=1057 --- sched/Makefile.in | 10 +++++----- sched/{result_retry.C => timeout_check.C} | 4 ++-- test/make_project.php | 2 +- test/make_project_ap.php | 2 +- test/make_project_sah.php | 2 +- test/test.inc | 14 +++++++------- 6 files changed, 17 insertions(+), 17 deletions(-) rename sched/{result_retry.C => timeout_check.C} (98%) diff --git a/sched/Makefile.in b/sched/Makefile.in index 5bb9dee392..0506e5fdf0 100644 --- a/sched/Makefile.in +++ b/sched/Makefile.in @@ -18,7 +18,7 @@ CC = g++ $(CFLAGS) CLIBS = @LIBS@ -PROGS = cgi feeder show_shmem file_upload_handler validate_test make_work result_retry file_deleter assimilator db_dump update_stats start_servers +PROGS = cgi feeder show_shmem file_upload_handler validate_test make_work timeout_check file_deleter assimilator db_dump update_stats start_servers all: $(PROGS) @@ -111,8 +111,8 @@ MAKE_WORK_OBJS = \ ../lib/crypt.o \ ../RSAEuro/source/rsaeuro.a -RESULT_RETRY_OBJS = \ - result_retry.o \ +TIMEOUT_CHECK_OBJS = \ + timeout_check.o \ sched_util.o \ config.o \ ../db/db_mysql.o \ @@ -203,8 +203,8 @@ validate_test: $(VALIDATE_OBJS) make_work: $(MAKE_WORK_OBJS) $(CC) $(MAKE_WORK_OBJS) $(MYSQL_LIBS) $(CLIBS) -o make_work -result_retry: $(RESULT_RETRY_OBJS) - $(CC) $(RESULT_RETRY_OBJS) $(MYSQL_LIBS) $(CLIBS) -o result_retry +timeout_check: $(TIMEOUT_CHECK_OBJS) + $(CC) $(TIMEOUT_CHECK_OBJS) $(MYSQL_LIBS) $(CLIBS) -o timeout_check file_deleter: $(FILE_DELETER_OBJS) $(CC) $(FILE_DELETER_OBJS) $(MYSQL_LIBS) $(CLIBS) -o file_deleter diff --git a/sched/result_retry.C b/sched/timeout_check.C similarity index 98% rename from sched/result_retry.C rename to sched/timeout_check.C index cea5074b5f..d2fdc20316 100644 --- a/sched/result_retry.C +++ b/sched/timeout_check.C @@ -41,7 +41,7 @@ using namespace std; #include "config.h" #include "sched_util.h" -#define LOCKFILE "result_retry.out" +#define LOCKFILE "timeout_check.out" int max_errors = 999; int max_done = 999; @@ -362,7 +362,7 @@ int main(int argc, char** argv) { } if (lock_file(LOCKFILE)) { - fprintf(stderr, "Another copy of result_retry is already running\n"); + fprintf(stderr, "Another copy of timeout_check is already running\n"); exit(1); } diff --git a/test/make_project.php b/test/make_project.php index 89f55d57a4..047e603fad 100644 --- a/test/make_project.php +++ b/test/make_project.php @@ -32,7 +32,7 @@ $project->start_feeder = true; $project->start_file_deleter = true; $project->start_make_work = true; - $project->start_result_retry = true; + $project->start_timeout_check = true; $project->start_validate = true; $project->shmem_key = 0x31415926; diff --git a/test/make_project_ap.php b/test/make_project_ap.php index 04888fea55..5542fb2a3c 100644 --- a/test/make_project_ap.php +++ b/test/make_project_ap.php @@ -36,7 +36,7 @@ $project->start_make_work = true; $project->make_work_wu_template = "pulse_wu"; $project->make_work_result_template = "pulse_result"; - $project->start_result_retry = false; + $project->start_timeout_check = false; $project->start_validate = false; $project->shmem_key = 0x31415927; $project->project_php_file = "project_ap.inc"; diff --git a/test/make_project_sah.php b/test/make_project_sah.php index 4644ce4fcd..41eb09851d 100644 --- a/test/make_project_sah.php +++ b/test/make_project_sah.php @@ -36,7 +36,7 @@ $project->start_make_work = true; $project->make_work_wu_template = "pulse_wu"; $project->make_work_result_template = "pulse_result"; - $project->start_result_retry = false; + $project->start_timeout_check = false; $project->start_validate = false; $project->shmem_key = 0x31415928; $project->project_php_file = "project_sah.inc"; diff --git a/test/test.inc b/test/test.inc index cf70d4bda7..b5adf7fe57 100644 --- a/test/test.inc +++ b/test/test.inc @@ -152,7 +152,7 @@ class Project { var $start_feeder; var $start_file_deleter; var $start_make_work; - var $start_result_retry; + var $start_timeout_check; var $start_validate; var $project_php_file; var $project_prefs_php_file; @@ -175,7 +175,7 @@ class Project { $this->start_feeder = false; $this->start_file_deleter = false; $this->start_make_work = false; - $this->start_result_retry = false; + $this->start_timeout_check = false; $this->start_validate = false; } @@ -339,7 +339,7 @@ class Project { PassThru("cp $source_dir/sched/file_upload_handler $this->project_dir/cgi/"); PassThru("cp $source_dir/sched/make_work $this->project_dir/cgi/"); PassThru("cp $source_dir/sched/feeder $this->project_dir/cgi/"); - PassThru("cp $source_dir/sched/result_retry $this->project_dir/cgi/"); + PassThru("cp $source_dir/sched/timeout_check $this->project_dir/cgi/"); PassThru("cp $source_dir/sched/validate_test $this->project_dir/cgi/"); PassThru("cp $source_dir/sched/file_deleter $this->project_dir/cgi/"); PassThru("cp $source_dir/sched/assimilator $this->project_dir/cgi/"); @@ -371,8 +371,8 @@ class Project { $result_template_path = realpath($this->make_work_result_template); fputs($f, "make_work -asynch -result_template $result_template_path -wu_name $this->make_work_wu_template >> make_work.out 2>&1\n"); } - if ($this->start_result_retry) { - fputs($f, "result_retry -asynch >> result_retry.out 2>&1\n"); + if ($this->start_timeout_check) { + fputs($f, "timeout_check -asynch >> timeout_check.out 2>&1\n"); } if ($this->start_validate) { fputs($f, "validate -asynch >> validate.out 2>&1\n"); @@ -491,8 +491,8 @@ class Project { PassThru("cd $this->project_dir/cgi; ./feeder -asynch >> feeder_out 2>&1"); } - function start_result_retry($app, $nerror = 5,$ndet = 5, $nredundancy = 5){ - PassThru("cd $this->project_dir/cgi; ./result_retry -app $app->name -nerror $nerror -ndet $ndet -nredundancy $nredundancy -asynch >> result_retry_out 2>&1"); + function start_timeout_check($app, $nerror = 5,$ndet = 5, $nredundancy = 5){ + PassThru("cd $this->project_dir/cgi; ./timeout_check -app $app->name -nerror $nerror -ndet $ndet -nredundancy $nredundancy -asynch >> timeout_check_out 2>&1"); } function start_make_work($work){