Merge pull request #6800 from BOINC/dpa_resource_usage2

client: fill in resource usage if not specified

Author: AenBleidd

client/client_state.cpp

@@ -706,19 +706,7 @@ int CLIENT_STATE::init() {
     // (typically anonymous platform)
     //
     for (APP_VERSION* avp: app_versions) {
-        if (!avp->resource_usage.avg_ncpus) {
-            avp->resource_usage.avg_ncpus = 1;
-        }
-        if (!avp->resource_usage.flops) {
-            avp->resource_usage.flops = avp->resource_usage.avg_ncpus * host_info.p_fpops;
-
-            // for GPU apps, use conservative estimate:
-            // assume GPU runs at 10X peak CPU speed
-            //
-            if (avp->resource_usage.rsc_type) {
-                avp->resource_usage.flops += avp->resource_usage.coproc_usage * 10 * host_info.p_fpops;
-            }
-        }
+        avp->fill_in_resource_usage();
     }
 
     // must go after check_app_config() and parse_state_file()

client/client_types.cpp

@@ -883,6 +883,61 @@ void APP_VERSION::init() {
 #endif
 }
 
+// see if app version is disallowed by config
+//
+bool APP_VERSION::disallowed_by_config(PROJECT *p) {
+    if (cc_config.dont_use_vbox && strstr(plan_class, "vbox")) {
+        msg_printf(p, MSG_INFO,
+            "Skipping VirtualBox app version: disabled in cc_config.xml"
+        );
+        return true;
+    }
+    if (cc_config.dont_use_wsl && strstr(plan_class, "wsl")) {
+        msg_printf(p, MSG_INFO,
+            "skipping WSL app version: disabled in cc_config.xml"
+        );
+        return true;
+    }
+    if (cc_config.dont_use_docker && strstr(plan_class, "docker")) {
+        msg_printf(p, MSG_INFO,
+            "skipping Docker app: disabled in cc_config.xml"
+        );
+        return true;
+    }
+    return false;
+}
+
+// fill in resource usage if not already present
+//
+void APP_VERSION::fill_in_resource_usage() {
+    if (resource_usage.avg_ncpus == 0) {
+        resource_usage.avg_ncpus = 1;
+    }
+    if (resource_usage.flops == 0) {
+        resource_usage.flops = resource_usage.avg_ncpus * gstate.host_info.p_fpops;
+
+        // for GPU apps, use conservative estimate:
+        // assume GPU runs at 10X peak CPU speed
+        //
+        if (resource_usage.rsc_type) {
+            resource_usage.flops += resource_usage.coproc_usage * 10 * gstate.host_info.p_fpops;
+        }
+    }
+}
+
+// Parse an <app_version> element; called from
+// 1) parse scheduler reply: scheduler_op.cpp
+// 2) parse client state file: cs_statefile.cpp
+// 3) parse app_info.xml for anonymous platform: cs_statefile.cpp
+//
+// After this you need to:
+// - check if disallowed by config
+//      do this right away; config.xml has already been parsed
+// - fill in resource usage if not specified
+//      In cases 2 and 3 we don't have CPU FLOPS yet,
+//      so we have to do this a bit later.
+//      In case 1 we do it right away.
+//
 int APP_VERSION::parse(XML_PARSER& xp) {
     FILE_REF file_ref;
     double dtemp;

client/client_types.h

@@ -390,6 +390,8 @@ struct APP_VERSION {
     ~APP_VERSION(){}
     void init();
     int parse(XML_PARSER&);
+    bool disallowed_by_config(PROJECT*);
+    void fill_in_resource_usage();
     int write(MIOFILE&, bool write_file_info = true);
     bool had_download_failure(int& failnum);
     void get_file_errors(std::string&);

client/cpu_sched.cpp

@@ -676,10 +676,13 @@ double total_peak_flops() {
 // Initialize project "priorities" based on REC:
 // compute resource share and REC fractions
 // among compute-intensive, non-suspended projects
+// Also compute rec_sum
 //
 void project_priority_init(bool for_work_fetch) {
     double rs_sum = 0;
+        // sum of resource share of runnable (or fetchable) projects
     rec_sum = 0;
+        // sum of recent work of runnable (or fetchable) projects
     for (unsigned int i=0; i<gstate.projects.size(); i++) {
         PROJECT* p = gstate.projects[i];
         if (p->non_cpu_intensive) continue;
@@ -722,7 +725,11 @@ void PROJECT::compute_sched_priority() {
     if (resource_share == 0) {
         sched_priority = -1e3 - rec_frac;
     } else {
-        sched_priority = - rec_frac/resource_share_frac;
+        if (resource_share_frac > 0) {
+            sched_priority = - rec_frac/resource_share_frac;
+        } else {
+            sched_priority = - rec_frac;
+        }
     }
 }
 

client/cs_statefile.cpp

@@ -262,12 +262,16 @@ int CLIENT_STATE::parse_state_file_aux(const char* fname) {
                 continue;
             }
             if (retval) {
-                msg_printf(NULL, MSG_INTERNAL_ERROR,
+                msg_printf(project, MSG_INTERNAL_ERROR,
                     "Can't parse application version in state file"
                 );
                 delete avp;
                 continue;
             }
+            if (avp->disallowed_by_config(project)) {
+                delete avp;
+                continue;
+            }
             if (strlen(avp->platform) == 0) {
                 safe_strcpy(avp->platform, get_primary_platform());
             } else {
@@ -957,24 +961,7 @@ int CLIENT_STATE::parse_app_info(PROJECT* p, FILE* in) {
                 delete avp;
                 continue;
             }
-            if (cc_config.dont_use_vbox && strstr(avp->plan_class, "vbox")) {
-                msg_printf(p, MSG_INFO,
-                    "skipping vbox app in app_info.xml; vbox disabled in cc_config.xml"
-                );
-                delete avp;
-                continue;
-            }
-            if (cc_config.dont_use_wsl && strstr(avp->plan_class, "wsl")) {
-                msg_printf(p, MSG_INFO,
-                    "skipping wsl app in app_info.xml; wsl disabled in cc_config.xml"
-                );
-                delete avp;
-                continue;
-            }
-            if (cc_config.dont_use_docker && strstr(avp->plan_class, "docker")) {
-                msg_printf(p, MSG_INFO,
-                    "skipping docker app in app_info.xml; docker disabled in cc_config.xml"
-                );
+            if (avp->disallowed_by_config(p)) {
                 delete avp;
                 continue;
             }

client/scheduler_op.cpp

@@ -774,7 +774,8 @@ int SCHEDULER_REPLY::parse(FILE* in, PROJECT* project) {
                     "Can't parse application version in scheduler reply: %s",
                     boincerror(retval)
                 );
-            } else {
+            } else if (!av.disallowed_by_config(project)) {
+                av.fill_in_resource_usage();
                 app_versions.push_back(av);
             }
         } else if (xp.match_tag("workunit")) {

client/sim.cpp

@@ -225,15 +225,16 @@ void make_job(
 ) {
     APP* app = choose_app(app_list);
     APP_VERSION* avp = choose_app_version(app);
-    rp->clear();
-    rp->avp = avp;
-    rp->app = app;
-    if (!rp->avp) {
+    if (!avp) {
         fprintf(stderr, "ERROR - NO APP VERSION\n");
         exit(1);
     }
+    rp->clear();
+    rp->avp = avp;
+    rp->app = app;
     rp->project = p;
     rp->wup = wup;
+    rp->resource_usage = avp->resource_usage;
     sprintf(rp->name, "%s_%d", p->project_name, p->result_index++);
     wup->project = p;
     wup->rsc_fpops_est = app->fpops_est;

client/work_fetch.cpp

@@ -657,7 +657,7 @@ PROJECT* WORK_FETCH::non_cpu_intensive_project_needing_work() {
     return 0;
 }
 
-static bool higher_priority(PROJECT *p1, PROJECT *p2) {
+static bool higher_priority(const PROJECT *p1, const PROJECT *p2) {
     return (p1->sched_priority > p2->sched_priority);
 }
 
@@ -712,15 +712,15 @@ void WORK_FETCH::setup() {
     // and from project/resource pairs.
     // Must do this after rr_simulation() and compute_nuploading_results()
     //
-    for (unsigned int i=0; i<gstate.projects.size(); i++) {
+    for (unsigned int i = 0; i < gstate.projects.size(); i++) {
         PROJECT* p = gstate.projects[i];
         p->pwf.project_reason = compute_project_reason(p);
-        for (int j=0; j<coprocs.n_rsc; j++) {
+        for (int j = 0; j < coprocs.n_rsc; j++) {
             RSC_PROJECT_WORK_FETCH& rpwf = p->rsc_pwf[j];
             rpwf.rsc_project_reason = rpwf.compute_rsc_project_reason(p);
         }
     }
-    for (int j=0; j<coprocs.n_rsc; j++) {
+    for (int j = 0; j < coprocs.n_rsc; j++) {
         rsc_work_fetch[j].dont_fetch_reason = RSC_REASON_NONE;
     }
 
@@ -734,11 +734,13 @@ void WORK_FETCH::setup() {
     // which will generally be between 0 and 1.
     // This is a little arbitrary but I can't think of anything better.
     //
-    double max_queued_flops = gstate.work_buf_total()*total_peak_flops();
-    for (unsigned int i=0; i<gstate.results.size(); i++) {
-        RESULT* rp = gstate.results[i];
-        PROJECT* p = rp->project;
-        p->sched_priority -= rp->estimated_flops_remaining()/max_queued_flops;
+    double max_queued_flops = gstate.work_buf_total() * total_peak_flops();
+    if (max_queued_flops) {
+        for (unsigned int i = 0; i < gstate.results.size(); i++) {
+            RESULT* rp = gstate.results[i];
+            PROJECT* p = rp->project;
+            p->sched_priority -= rp->estimated_flops_remaining() / max_queued_flops;
+        }
     }
 
     projects_sorted = gstate.projects;