Merge pull request #6896 from BOINC/dpa_wsl12

client (Win): including WSL disk image in BOINC disk usage

Author: AenBleidd

client/client_state.cpp

@@ -258,7 +258,7 @@ void CLIENT_STATE::show_host_info() {
         }
     } else {
         msg_printf(NULL, MSG_INFO, "Usable WSL distros:");
-        for (auto& wsl : host_info.wsl_distros.distros) {
+        for (WSL_DISTRO &wsl : host_info.wsl_distros.distros) {
             msg_printf(NULL, MSG_INFO,
                 "-   %s (WSL %d)%s",
                 wsl.distro_name.c_str(),
@@ -290,6 +290,14 @@ void CLIENT_STATE::show_host_info() {
                 msg_printf(NULL, MSG_INFO, "-      BOINC WSL distro version %d",
                     wsl.boinc_buda_runner_version
                 );
+                if (!wsl.base_path.empty()) {
+                    double size;
+                    int retval = dir_size_alloc(wsl.base_path.c_str(), size);
+                    if (!retval) {
+                        nbytes_to_string(size, 0, buf, sizeof(buf));
+                        msg_printf(NULL, MSG_INFO, "-      Disk usage: %s", buf);
+                    }
+                }
             }
         }
     }

client/cpu_sched.cpp

@@ -1070,7 +1070,7 @@ static void promote_multi_thread_jobs(vector<RESULT*>& runnable_jobs) {
 // return true if r0 is more important to run than r1
 //
 static inline bool more_important(RESULT* r0, RESULT* r1) {
-    bool cp0, cp1;
+    bool cp0=false, cp1;
 
     if (cc_config.prioritize_gpu) {
         cp0 = r0->uses_coprocs();

client/cs_prefs.cpp

@@ -86,12 +86,17 @@ int CLIENT_STATE::get_disk_usages() {
 
     client_disk_usage = 0;
     total_disk_usage = 0;
+
+    // disk usage in project directories
+    //
     for (PROJECT *p: projects) {
         p->disk_usage = 0;
         retval = dir_size_alloc(p->project_dir(), size);
         if (!retval) p->disk_usage = size;
     }
 
+    // disk usage in slot directories
+    //
     for (i=0; i<active_tasks.active_tasks.size(); i++) {
         ACTIVE_TASK* atp = active_tasks.active_tasks[i];
         get_slot_dir(atp->slot, buf, sizeof(buf));
@@ -102,11 +107,29 @@ int CLIENT_STATE::get_disk_usages() {
     for (PROJECT *p: projects) {
         total_disk_usage += p->disk_usage;
     }
+
+    // disk usage top level of BOINC data dir: XML and log files
+    //
     retval = dir_size_alloc(".", size, false);
     if (!retval) {
         client_disk_usage = size;
         total_disk_usage += size;
     }
+
+#ifdef _WIN64
+    // Win: if using boinc-buda-runner WSL distro,
+    // include its disk image size
+    //
+    WSL_DISTRO *wd = host_info.wsl_distros.find_docker();
+    if (wd) {
+        retval = dir_size_alloc(wd->base_path.c_str(), size);
+        if (!retval) {
+            client_disk_usage += size;
+            total_disk_usage += size;
+        }
+    }
+#endif
+
     return 0;
 }
 

client/gui_rpc_server_ops.cpp

@@ -148,9 +148,6 @@ static void handle_get_project_status(GUI_RPC_CONN& grc) {
 }
 
 static void handle_get_disk_usage(GUI_RPC_CONN& grc) {
-    double size, boinc_non_project, d_allowed;
-//    double boinc_total;
-
     grc.mfout.printf("<disk_usage_summary>\n");
     int retval = get_filesystem_info(
         gstate.host_info.d_total, gstate.host_info.d_free
@@ -161,27 +158,6 @@ static void handle_get_disk_usage(GUI_RPC_CONN& grc) {
         );
     }
 
-    dir_size_alloc(".", boinc_non_project, false);
-    dir_size_alloc("locale", size, false);
-    boinc_non_project += size;
-#ifdef __APPLE__
-    if (gstate.launched_by_manager) {
-        // If launched by Manager, get Manager's size on disk
-        char path[MAXPATHLEN];
-        double manager_size = 0.0;
-        OSStatus err = noErr;
-
-        retval = proc_pidpath(getppid(), path, sizeof(path));
-        if (retval <= 0) {
-            err = fnfErr;
-        }
-        if (!err) {
-            dir_size_alloc(path, manager_size, true);
-            boinc_non_project += manager_size;
-        }
-    }
-#endif
-//    boinc_total = boinc_non_project;
     gstate.get_disk_usages();
     for (PROJECT* p: gstate.projects) {
         grc.mfout.printf(
@@ -191,17 +167,16 @@ static void handle_get_disk_usage(GUI_RPC_CONN& grc) {
             "</project>\n",
             p->master_url, p->disk_usage
         );
-//        boinc_total += p->disk_usage;
     }
-    d_allowed = gstate.allowed_disk_usage(gstate.total_disk_usage);
+    double d_allowed = gstate.allowed_disk_usage(gstate.total_disk_usage);
     grc.mfout.printf(
         "<d_total>%f</d_total>\n"
         "<d_free>%f</d_free>\n"
         "<d_boinc>%f</d_boinc>\n"
         "<d_allowed>%f</d_allowed>\n",
         gstate.host_info.d_total,
         gstate.host_info.d_free,
-        boinc_non_project,
+        gstate.client_disk_usage,
         d_allowed
     );
     grc.mfout.printf("</disk_usage_summary>\n");

client/hostinfo_wsl.cpp

@@ -127,6 +127,20 @@ int get_all_distros(WSL_DISTROS& distros) {
             if (!strcmp(wsl_guid, default_wsl_guid)) {
                 distro.is_default = true;
             }
+
+            // if BOINC distro, get its data dir so we can find disk usage
+            //
+            char path[256];
+            DWORD path_len = sizeof(path);
+            if (distro.distro_name == BOINC_WSL_DISTRO_NAME) {
+                ret = RegQueryValueEx(hSubKey, "BasePath", NULL, NULL,
+                    (LPBYTE)path, &path_len
+                );
+                if (ret == ERROR_SUCCESS) {
+                    distro.base_path = path;
+                }
+            }
+
             distros.distros.push_back(distro);
         }
         RegCloseKey(hSubKey);

lib/wslinfo.h

@@ -56,6 +56,8 @@ struct WSL_DISTRO {
     DOCKER_TYPE docker_compose_type;
     int boinc_buda_runner_version;
         // if this distro is boinc_buda_runner, the version
+    std::string base_path;
+        // the dir where the disk image (.vhdx file) is stored
 
     WSL_DISTRO(){
         clear();