add debugging code

BOINC · Oct 3, 2023 · b7eee0c · b7eee0c
1 parent c5226bc
commit b7eee0c
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 9 deletions.
diff --git a/client/coproc_sched.h b/client/coproc_sched.h
@@ -33,19 +33,21 @@ extern void assign_coprocs(std::vector<RESULT*>& jobs);
 struct SPORADIC_RESOURCES {
     double ncpus_used, ncpus_max;
     double mem_used, mem_max;
-    COPROCS sp_coprocs;
+    COPROCS sr_coprocs;
 
     // clear reservations; called on each poll
     void init_poll() {
         ncpus_used= 0;
         mem_used = 0;
-        sp_coprocs.clear_usage();
+        sr_coprocs.clear_usage();
     }
+
     // called once at start
     void init() {
-        sp_coprocs.clone(coprocs, false);
+        sr_coprocs.clone(coprocs, false);
         init_poll();
     }
+
     // are there enough free resources to run the task?
     bool enough(ACTIVE_TASK *atp) {
         if (mem_used + atp->procinfo.working_set_size_smoothed > mem_max) {
@@ -60,7 +62,7 @@ struct SPORADIC_RESOURCES {
         bool found = false;
         if (rt) {
             double u = avp->gpu_usage.usage;
-            COPROC& cp = sp_coprocs.coprocs[rt];
+            COPROC& cp = sr_coprocs.coprocs[rt];
             for (int i=0; i<cp.count; i++) {
                 if (gpu_excluded(rp->app, cp, i)) continue;
                 if (u + cp.usage[i] <= 1) {
@@ -72,6 +74,7 @@ struct SPORADIC_RESOURCES {
         }
         return true;
     }
+
     // reserve resources for the task
     void reserve(ACTIVE_TASK *atp) {
         RESULT *rp = atp->result;
@@ -81,7 +84,7 @@ struct SPORADIC_RESOURCES {
         int rt = avp->gpu_usage.rsc_type;
         if (rt) {
             double u = avp->gpu_usage.usage;
-            COPROC& cp = sp_coprocs.coprocs[rt];
+            COPROC& cp = sr_coprocs.coprocs[rt];
             for (int i=0; i<cp.count; i++) {
                 if (gpu_excluded(rp->app, cp, i)) continue;
                 if (u + cp.usage[i] <= 1) {
@@ -91,6 +94,8 @@ struct SPORADIC_RESOURCES {
             }
         }
     }
+
+    void print();
 };
 
 extern SPORADIC_RESOURCES sporadic_resources;
diff --git a/client/cpu_sched.cpp b/client/cpu_sched.cpp
@@ -889,7 +889,7 @@ void CLIENT_STATE::make_run_list(vector<RESULT*>& run_list) {
         proc_rsc.ncpus -= sporadic_resources.ncpus_used;
         for (int rt=1; rt<proc_rsc.pr_coprocs.n_rsc; rt++) {
             COPROC& cp = proc_rsc.pr_coprocs.coprocs[rt];
-            COPROC& cp2 = sporadic_resources.sp_coprocs.coprocs[rt];
+            COPROC& cp2 = sporadic_resources.sr_coprocs.coprocs[rt];
             for (int j=0; j<cp.count; j++) {
                 cp.usage[j] = cp2.usage[j];
             }

diff --git a/client/cs_sporadic.cpp b/client/cs_sporadic.cpp
@@ -81,6 +81,22 @@
 
 SPORADIC_RESOURCES sporadic_resources;
 
+void SPORADIC_RESOURCES::print() {
+    msg_printf(NULL, MSG_INFO, "Sporadic resources:");
+    msg_printf(NULL, MSG_INFO, "   %f CPUs", ncpus_used);
+    msg_printf(NULL, MSG_INFO, "   %f MB RAM", mem_used/MEGA);
+    for (int i=1; i<sr_coprocs.n_rsc; i++) {
+        COPROC& cp = sr_coprocs.coprocs[i];
+        for (int j=0; j<cp.count; j++) {
+            if (cp.usage[j] > 0) {
+                msg_printf(NULL, MSG_INFO, "   GPU %s instance %d: %f\n",
+                    cp.type, j, cp.usage[j]
+                );
+            }
+        }
+    }
+}
+
 // is computing suspended for this job?
 //
 static bool computing_suspended(ACTIVE_TASK *atp) {
@@ -218,6 +234,10 @@ void CLIENT_STATE::sporadic_poll() {
     if (changed_active) {
         request_schedule_cpus("sporadic apps changed state");
     }
+
+    if (log_flags.sporadic_debug) {
+        sporadic_resources.print();
+    }
 }
 
 void CLIENT_STATE::sporadic_init() {

diff --git a/samples/sporadic/sporadic.cpp b/samples/sporadic/sporadic.cpp
@@ -20,9 +20,6 @@
 void boinc_sporadic_set_ac_state(SPORADIC_AC_STATE);
 SPORADIC_CA_STATE boinc_sporadic_get_ca_state();
 
-void print_state() {
-}
-
 void compute_one_sec() {
     double start = dtime();
     while (1) {