diff --git a/checkin_notes b/checkin_notes index 0d2754ac27..d0f39a6cc9 100644 --- a/checkin_notes +++ b/checkin_notes @@ -6653,3 +6653,19 @@ David 29 July 2009 sched/ sched_score.cpp server_types.h + +David 29 July 2009 + - scheduler: on second thought, it would be better to add the above + feature without requiring use of score-based scheduling. + So add a new customizable function, wu_is_infeasible_custom(), + where projects can put job-specific checks. + + Also, move customizable functions (of which there are now 4) + to a new file, sched_customize.cpp. + + sched/ + Makefile.am + sched_customize.cpp,h + sched_version.cpp + sched_send.cpp + handle_request.cpp diff --git a/sched/Makefile.am b/sched/Makefile.am index a47ac43bd4..c29ffa4993 100644 --- a/sched/Makefile.am +++ b/sched/Makefile.am @@ -141,11 +141,11 @@ cgi_sources = \ main.cpp \ sched_array.cpp \ sched_assign.cpp \ + sched_customize.cpp \ sched_hr.cpp \ sched_resend.cpp \ sched_locality.cpp \ sched_result.cpp \ - sched_plan.cpp \ sched_score.cpp \ sched_send.cpp \ sched_timezone.cpp \ diff --git a/sched/handle_request.cpp b/sched/handle_request.cpp index b80378d476..089ad1941b 100644 --- a/sched/handle_request.cpp +++ b/sched/handle_request.cpp @@ -57,7 +57,7 @@ #include "sched_config.h" #include "sched_locality.h" #include "sched_result.h" -#include "sched_plan.h" +#include "sched_customize.h" #include "time_stats_log.h" diff --git a/sched/sched_plan.cpp b/sched/sched_customize.cpp similarity index 99% rename from sched/sched_plan.cpp rename to sched/sched_customize.cpp index 944377d776..cc064d16fb 100644 --- a/sched/sched_plan.cpp +++ b/sched/sched_customize.cpp @@ -48,7 +48,7 @@ #include "sched_score.h" #include "sched_shmem.h" #include "sched_version.h" -#include "sched_plan.h" +#include "sched_customize.h" bool wu_is_infeasible_custom(WORKUNIT& wu, APP& app, BEST_APP_VERSION& bav) { #if 1 diff --git a/sched/sched_plan.h b/sched/sched_customize.h similarity index 95% rename from sched/sched_plan.h rename to sched/sched_customize.h index 595b28103a..9737994d20 100644 --- a/sched/sched_plan.h +++ b/sched/sched_customize.h @@ -32,5 +32,6 @@ #define PLAN_CUDA_MIN_DRIVER_VERSION 17700 #define PLAN_CUDA_MIN_RAM (254*1024*1024) +extern bool wu_is_infeasible_custom(WORKUNIT&, APP&, BEST_APP_VERSION&); extern int app_plan(SCHEDULER_REQUEST&, char* plan_class, HOST_USAGE&); extern bool app_plan_uses_gpu(const char* plan_class); diff --git a/sched/sched_send.cpp b/sched/sched_send.cpp index 3d7aa1d00c..a1ccafe8e9 100644 --- a/sched/sched_send.cpp +++ b/sched/sched_send.cpp @@ -48,7 +48,7 @@ #include "sched_locality.h" #include "sched_timezone.h" #include "sched_assign.h" -#include "sched_plan.h" +#include "sched_customize.h" #include "sched_send.h" diff --git a/sched/sched_version.cpp b/sched/sched_version.cpp index 8564b2223a..3423dde26e 100644 --- a/sched/sched_version.cpp +++ b/sched/sched_version.cpp @@ -20,7 +20,7 @@ #include "main.h" #include "sched_msgs.h" #include "sched_config.h" -#include "sched_plan.h" +#include "sched_customize.h" #include "server_types.h" #include "sched_version.h"