Merge pull request #6842 from BOINC/dpa_for_sched

back end code: use range-based for

Author: AenBleidd

db/boinc_db.cpp

@@ -2397,15 +2397,15 @@ int DB_SCHED_RESULT_ITEM_SET::enumerate() {
     return 0;
 }
 
-int DB_SCHED_RESULT_ITEM_SET::add_result(char* result_name) {
+int DB_SCHED_RESULT_ITEM_SET::add_result(const char* result_name) {
     SCHED_RESULT_ITEM result;
     result.id = 0;
     strcpy2(result.queried_name, result_name);
     results.push_back(result);
     return 0;
 }
 
-int DB_SCHED_RESULT_ITEM_SET::lookup_result(char* result_name, SCHED_RESULT_ITEM** rip) {
+int DB_SCHED_RESULT_ITEM_SET::lookup_result(const char* result_name, SCHED_RESULT_ITEM** rip) {
     unsigned int i;
     for (i=0; i<results.size(); i++) {
         if (!strcmp(results[i].name, result_name)) {

db/boinc_db.h

@@ -417,14 +417,14 @@ class DB_SCHED_RESULT_ITEM_SET : public DB_BASE_SPECIAL {
     DB_SCHED_RESULT_ITEM_SET(DB_CONN* p=0);
     std::vector<SCHED_RESULT_ITEM> results;
 
-    int add_result(char* result_name);
+    int add_result(const char* result_name);
 
     int enumerate();
         // using a single SQL query, look up all the reported results,
         // (based on queried_name)
         // and fill in the rest of the entries in the results vector
 
-    int lookup_result(char* result_name, SCHED_RESULT_ITEM** result);
+    int lookup_result(const char* result_name, SCHED_RESULT_ITEM** result);
 
     int update_result(SCHED_RESULT_ITEM& result);
     int update_workunits();

lib/average.h

@@ -1,6 +1,6 @@
 // This file is part of BOINC.
-// http://boinc.berkeley.edu
-// Copyright (C) 2010 University of California
+// https://boinc.berkeley.edu
+// Copyright (C) 2026 University of California
 //
 // BOINC is free software; you can redistribute it and/or modify it
 // under the terms of the GNU Lesser General Public License
@@ -56,7 +56,7 @@ struct AVERAGE {
         return truncated;
     }
 
-    inline double get_avg() {
+    inline double get_avg() const {
         return avg;
     }
 };

sched/credit.cpp

@@ -1,6 +1,6 @@
 // This file is part of BOINC.
-// http://boinc.berkeley.edu
-// Copyright (C) 2008 University of California
+// https://boinc.berkeley.edu
+// Copyright (C) 2026 University of California
 //
 // BOINC is free software; you can redistribute it and/or modify it
 // under the terms of the GNU Lesser General Public License
@@ -828,28 +828,27 @@ double low_average(vector<double>& v) {
 // compute the average of number weighted by proximity
 // to another number
 double pegged_average(vector<double>& v, double anchor) {
-    int n=v.size();
-    double weights=0,sum=0,w;
-    int i;
+    int n = v.size();
+    double weights=0, sum=0, w;
     if (n==1) {
         return v[0];
     }
-    for (i=0; i<n; i++) {
-        w=(1.0/(0.1*anchor+fabs(anchor-v[i])));
-        weights+=w;
-        sum+=w*v[i];
+    for (double x: v) {
+        w = (1.0/(0.1*anchor+fabs(anchor-x)));
+        weights += w;
+        sum += w*x;
     }
     return sum/weights;
 }
 
 double vec_min(vector<double>& v) {
-    double x = v[0];
-    for (unsigned int i=1; i<v.size(); i++) {
-        if (v[i] < x) {
-            x = v[i];
+    double m = v[0];
+    for (double x: v) {
+        if (x < m) {
+            m = x;
         }
     }
-    return x;
+    return m;
 }
 
 // Called by validator when canonical result has been selected.
@@ -872,13 +871,12 @@ int assign_credit_set(
     double max_granted_credit,
     double &credit      // out
 ) {
-    unsigned int i;
     int mode, retval;
     double pfc;
     vector<double> normal;
     vector<double> approx;
 
-    for (i=0; i<results.size(); i++) {
+    for (unsigned int i=0; i<results.size(); i++) {
         RESULT &r = results[i];
         if (r.validate_state != VALIDATE_STATE_VALID) {
             continue;
@@ -970,26 +968,23 @@ int assign_credit_set(
 // done at the end of every validator scan.
 //
 int write_modified_app_versions(vector<DB_APP_VERSION_VAL>& app_versions) {
-    unsigned int i, j;
     int retval = 0;
     double now = dtime();
 
-    for (i=0; i<app_versions.size(); i++) {
-        DB_APP_VERSION_VAL &av = app_versions[i];
+    for (DB_APP_VERSION_VAL &av: app_versions) {
         if (av.pfc_samples.empty() && av.credit_samples.empty()) {
             continue;
         }
         for (int k=0; k<10; k++) {
             double pfc_n_orig = av.pfc.n;
             double expavg_credit_orig = av.expavg_credit;
 
-            for (j=0; j<av.pfc_samples.size(); j++) {
+            for (double x: av.pfc_samples) {
                 av.pfc.update(
-                    av.pfc_samples[j],
-                    AV_AVG_THRESH, AV_AVG_WEIGHT, AV_AVG_LIMIT
+                    x, AV_AVG_THRESH, AV_AVG_WEIGHT, AV_AVG_LIMIT
                 );
             }
-            for (j=0; j<av.credit_samples.size(); j++) {
+            for (unsigned int j=0; j<av.credit_samples.size(); j++) {
                 update_average(
                     now,
                     av.credit_times[j], av.credit_samples[j], CREDIT_HALF_LIFE,

sched/credit_test.cpp

@@ -1,6 +1,6 @@
 // This file is part of BOINC.
-// http://boinc.berkeley.edu
-// Copyright (C) 2016 University of California
+// https://boinc.berkeley.edu
+// Copyright (C) 2026 University of California
 //
 // BOINC is free software; you can redistribute it and/or modify it
 // under the terms of the GNU Lesser General Public License
@@ -76,28 +76,22 @@ void read_db() {
 }
 
 PLATFORM* lookup_platform(int id) {
-    unsigned int i;
-    for (i=0; i<platforms.size(); i++) {
-        PLATFORM& p = platforms[i];
+    for (PLATFORM& p: platforms) {
         if (p.id == id) return &p;
     }
     return NULL;
 }
 
 APP_VERSION* lookup_av(int id) {
-    unsigned int i;
-    for (i=0; i<app_versions.size(); i++) {
-        APP_VERSION& av = app_versions[i];
+    for (APP_VERSION& av: app_versions) {
         if (av.id == id) return &av;
     }
     printf(" missing app version %d\n", id);
     exit(1);
 }
 
 APP& lookup_app(int id) {
-    unsigned int i;
-    for (i=0; i<apps.size(); i++) {
-        APP& app = apps[i];
+    for (APP& app: apps) {
         if (app.id == id) return app;
     }
     printf("missing app: %d\n", id);
@@ -106,9 +100,7 @@ APP& lookup_app(int id) {
 }
 
 HOST_APP_VERSION& lookup_host_app_version(int hostid, int avid) {
-    unsigned int i;
-    for (i=0; i<host_app_versions.size(); i++) {
-        HOST_APP_VERSION& hav = host_app_versions[i];
+    for (HOST_APP_VERSION& hav: host_app_versions) {
         if (hav.host_id != hostid) continue;
         if (hav.app_version_id != avid) continue;
         return hav;
@@ -120,16 +112,13 @@ HOST_APP_VERSION& lookup_host_app_version(int hostid, int avid) {
     return host_app_versions.back();
 }
 
-void print_average(AVERAGE& a) {
-    printf("n %f avg %f\n", a.n, a.get_avg()
-    );
+void print_average(const AVERAGE& a) {
+    printf("n %f avg %f\n", a.n, a.get_avg());
 }
 
 void print_avs() {
-    unsigned int i;
     printf("----- scales --------\n");
-    for (i=0; i<app_versions.size(); i++) {
-        APP_VERSION& av = app_versions[i];
+    for (const APP_VERSION& av: app_versions) {
         if (!av.pfc.n) continue;
         PLATFORM* p = lookup_platform(av.platformid);
         printf("app %lu vers %lu (%s %s)\n scale %f ",
@@ -163,7 +152,7 @@ struct RSC_INFO {
         nvers_thresh = 0;
         nvers_total = 0;
     }
-    void update(APP_VERSION& av) {
+    void update(const APP_VERSION& av) {
         nvers_total++;
         if (av.pfc.n > MIN_VERSION_SAMPLES) {
             nvers_thresh++;
@@ -177,12 +166,11 @@ struct RSC_INFO {
 };
 
 void scale_versions(APP& app, double avg) {
-    for (unsigned int j=0; j<app_versions.size(); j++) {
-        APP_VERSION& av = app_versions[j];
+    for (APP_VERSION& av: app_versions) {
         if (av.appid != app.id) continue;
         if (av.pfc.n < MIN_VERSION_SAMPLES) continue;
 
-        av.pfc_scale= avg/av.pfc.get_avg();
+        av.pfc_scale = avg/av.pfc.get_avg();
         PLATFORM* p = lookup_platform(av.platformid);
         printf("updating scale factor for (%s %s)\n",
              p->name, av.plan_class
@@ -198,17 +186,14 @@ void scale_versions(APP& app, double avg) {
 // and find the min average PFC for each app
 //
 void update_av_scales() {
-    unsigned int i, j;
     printf("----- updating scales --------\n");
-    for (i=0; i<apps.size(); i++) {
-        APP& app = apps[i];
+    for (APP& app: apps) {
         printf("app %lu\n", app.id);
         RSC_INFO cpu_info, gpu_info;
 
         // find the average PFC of CPU and GPU versions
 
-        for (j=0; j<app_versions.size(); j++) {
-            APP_VERSION& av = app_versions[j];
+        for (const APP_VERSION& av: app_versions) {
             if (av.appid != app.id) continue;
             if (strstr(av.plan_class, "cuda") || strstr(av.plan_class, "ati")) {
                 printf("gpu update: %lu %s %f\n", av.id, av.plan_class, av.pfc.get_avg());
@@ -247,8 +232,6 @@ void update_av_scales() {
                 accumulate_stats = true;
             }
         }
-
-
     }
     printf("-------------\n");
 }

sched/db_dump.cpp

@@ -1,6 +1,6 @@
 // This file is part of BOINC.
-// http://boinc.berkeley.edu
-// Copyright (C) 2019 University of California
+// https://boinc.berkeley.edu
+// Copyright (C) 2026 University of California
 //
 // BOINC is free software; you can redistribute it and/or modify it
 // under the terms of the GNU Lesser General Public License
@@ -841,7 +841,6 @@ int tables_file(char* dir) {
 }
 
 int ENUMERATION::make_it_happen(char* output_dir) {
-    unsigned int i;
     int n, retval;
     DB_USER user;
     DB_USER_DELETED user_deleted;
@@ -863,8 +862,7 @@ int ENUMERATION::make_it_happen(char* output_dir) {
 
     sprintf(path, "%s/%s", output_dir, filename);
 
-    for (i=0; i<outputs.size(); i++) {
-        OUTPUT& out = outputs[i];
+    for (OUTPUT& out: outputs) {
         if (out.recs_per_file) {
             out.nzfile = new NUMBERED_ZFILE(
                 tag_name[table], out.compression, path, out.recs_per_file
@@ -944,8 +942,7 @@ int ENUMERATION::make_it_happen(char* output_dir) {
             if (retval) break;
 
             if (!strncmp("deleted", user.authenticator, 7)) continue;
-            for (i=0; i<outputs.size(); i++) {
-                OUTPUT& out = outputs[i];
+            for (OUTPUT& out: outputs) {
                 if (sort == SORT_ID && out.recs_per_file) {
                     out.nzfile->set_id(n++);
                 }
@@ -969,8 +966,7 @@ int ENUMERATION::make_it_happen(char* output_dir) {
             retval = user_deleted.enumerate("order by userid");
             if (retval) break;
             nusers_deleted++;
-            for (i=0; i<outputs.size(); i++) {
-                OUTPUT& out = outputs[i];
+            for (OUTPUT& out: outputs) {
                 if (sort == SORT_ID && out.recs_per_file) {
                     out.nzfile->set_id(n++);
                 }
@@ -1032,8 +1028,7 @@ int ENUMERATION::make_it_happen(char* output_dir) {
             if (retval) break;
             if (!host.userid) continue;
             if (!strncmp("deleted", host.domain_name, 8)) continue;
-            for (i=0; i<outputs.size(); i++) {
-                OUTPUT& out = outputs[i];
+            for (OUTPUT& out: outputs) {
                 if (sort == SORT_ID && out.recs_per_file) {
                     out.nzfile->set_id(n++);
                 }
@@ -1057,8 +1052,7 @@ int ENUMERATION::make_it_happen(char* output_dir) {
             retval = host_deleted.enumerate("order by hostid");
             if (retval) break;
             nhosts_deleted++;
-            for (i=0; i<outputs.size(); i++) {
-                OUTPUT& out = outputs[i];
+            for (OUTPUT& out: outputs) {
                 if (sort == SORT_ID && out.recs_per_file) {
                     out.nzfile->set_id(n++);
                 }
@@ -1087,8 +1081,7 @@ int ENUMERATION::make_it_happen(char* output_dir) {
             retval = team.enumerate(clause);
             if (retval) break;
             nteams++;
-            for (i=0; i<outputs.size(); i++) {
-                OUTPUT& out = outputs[i];
+            for (OUTPUT& out: outputs) {
                 if (sort == SORT_ID && out.recs_per_file) {
                     out.nzfile->set_id(n++);
                 }
@@ -1107,8 +1100,7 @@ int ENUMERATION::make_it_happen(char* output_dir) {
         }
         break;
     }
-    for (i=0; i<outputs.size(); i++) {
-        OUTPUT& out = outputs[i];
+    for (OUTPUT& out: outputs) {
         if (out.zfile) {
           out.zfile->close();
           delete out.zfile;
@@ -1265,9 +1257,7 @@ int main(int argc, char** argv) {
 
     boinc_mkdir(spec.output_dir);
 
-    unsigned int j;
-    for (j=0; j<spec.enumerations.size(); j++) {
-        ENUMERATION& e = spec.enumerations[j];
+    for (ENUMERATION& e: spec.enumerations) {
         e.make_it_happen(spec.output_dir);
     }