client: add app testing feature

client/Makefile.am

@@ -40,6 +40,7 @@ boinc_client_SOURCES = \
     app_config.cpp \
     app_control.cpp \
     app_start.cpp \
+    app_test.cpp \
     async_file.cpp \
     check_state.cpp \
     client_msgs.cpp \

client/Makefile.linux

@@ -6,7 +6,8 @@
 #    make -f Makefile.linux clean all
 # 3) do the same in this dir
 
-CC = g++ -O4 -Wall -I ../ -I ../lib/
+//CC = g++ -O4 -Wall -I ../ -I ../lib/
+CC = g++ -g -Wall -I ../ -I ../lib/
 
 PROGS = boinc boinccmd
 
@@ -19,6 +20,7 @@ BOINC_OBJ = \
     app_config.o \
     app_control.o \
     app_start.o \
+    app_test.o \
     async_file.o \
     check_state.o \
     client_msgs.o \
@@ -133,7 +135,7 @@ SRC = \
 clean:
 	rm -f $(PROGS) $(BOINC_OBJ) dependencies
 
-LIBS = ../lib/lib.a \
+LIBS = ../lib/boinc.a \
     -L /usr/local/lib/ \
     -lpthread \
     -lX11 -lXss \

client/app_control.cpp

@@ -609,7 +609,9 @@ void ACTIVE_TASK::handle_exited_app(int stat) {
                 "read_stderr_file(): %s", boincerror(retval)
             );
         }
-        client_clean_out_dir(slot_dir, "handle_exited_app()");
+        if (!wup->project->app_test) {
+            client_clean_out_dir(slot_dir, "handle_exited_app()");
+        }
         clear_schedule_backoffs(this);
             // clear scheduling backoffs of jobs waiting for GPU
     }

client/app_start.cpp

@@ -691,6 +691,14 @@ int ACTIVE_TASK::start(bool test) {
         exit(0);
     }
 
+    // use special slot and exec path for test app
+    //
+    if (wup->project->app_test) {
+        strcpy(slot_dir, "slots/app_test");
+        strcpy(exec_path, gstate.app_test_file.c_str());
+    }
+
+
 #ifdef _WIN32
     PROCESS_INFORMATION process_info;
     STARTUPINFO startup_info;
@@ -897,7 +905,7 @@ int ACTIVE_TASK::start(bool test) {
 
     if (log_flags.task_debug) {
         msg_printf(wup->project, MSG_INFO,
-            "[task] ACTIVE_TASK::start(): forked process: pid %d\n", pid
+            "[task_debug] ACTIVE_TASK::start(): forked process: pid %d\n", pid
         );
     }
 
@@ -1131,7 +1139,7 @@ int ACTIVE_TASK::start(bool test) {
     //
     if (log_flags.task_debug) {
         msg_printf(wup->project, MSG_INFO,
-            "[task] ACTIVE_TASK::start(): forked process: pid %d\n", pid
+            "[task_debug] ACTIVE_TASK::start(): forked process: pid %d\n", pid
         );
     }
 
@@ -1154,14 +1162,16 @@ int ACTIVE_TASK::start(bool test) {
         gstate.verify_app_version_files(result);
     }
 
-    char err_msg[4096];
-    snprintf(err_msg, sizeof(err_msg), "couldn't start app: %.256s", buf);
-    gstate.report_result_error(*result, err_msg);
     if (log_flags.task_debug) {
         msg_printf(wup->project, MSG_INFO,
-            "[task] couldn't start app: %s", buf
+            "[task_debug] couldn't start app: %s", buf
         );
     }
+
+    char err_msg[4096];
+    snprintf(err_msg, sizeof(err_msg), "couldn't start app: %.256s", buf);
+    gstate.report_result_error(*result, err_msg);
+
     set_task_state(PROCESS_COULDNT_START, "start");
     return retval;
 }

client/app_test.cpp

@@ -0,0 +1,84 @@
+// This file is part of BOINC.
+// http://boinc.berkeley.edu
+// Copyright (C) 2023 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
+// as published by the Free Software Foundation,
+// either version 3 of the License, or (at your option) any later version.
+//
+// BOINC is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with BOINC.  If not, see <http://www.gnu.org/licenses/>.
+
+// Set up data structures (project, app, app version, WU, result etc.)
+// so that the client runs the given executable.
+// Lets you debug client/app interactions with no server or fake XML files
+
+#include "project.h"
+#include "client_types.h"
+#include "result.h"
+#include "client_state.h"
+#include "log_flags.h"
+
+void CLIENT_STATE::app_test_init() {
+    PROJECT *proj = new PROJECT;
+    strcpy(proj->project_name, "test project");
+    strcpy(proj->master_url, "test_project_url");
+    strcpy(proj->_project_dir, ".");
+    proj->app_test = true;
+    projects.push_back(proj);
+
+    APP *app = new APP;
+    strcpy(app->name, "test app");
+    strcpy(app->user_friendly_name, "test app");
+    app->project = proj;
+    apps.push_back(app);
+
+    FILE_INFO *fip = new FILE_INFO;
+    strcpy(fip->name, app_test_file.c_str());
+    fip->status = FILE_PRESENT;
+    fip->executable = true;
+    file_infos.push_back(fip);
+
+    FILE_REF * fref = new FILE_REF;
+    fref->file_info = fip;
+    strcpy(fip->name, app_test_file.c_str());
+    fref->main_program = true;
+
+    APP_VERSION *av = new APP_VERSION;
+    strcpy(av->app_name, "test_av");
+    strcpy(av->api_version, "8.0");
+    av->app = app;
+    av->project = proj;
+    av->app_files.push_back(*fref);
+    app_versions.push_back(av);
+
+    WORKUNIT *wu = new WORKUNIT;
+    strcpy(wu->name, "test_wu");
+    strcpy(wu->app_name, "test_app");
+    wu->project = proj;
+    wu->app = app;
+    wu->rsc_fpops_est = 1e9;
+    wu->rsc_fpops_bound = 1e12;
+    wu->rsc_memory_bound = 1e9;
+    wu->rsc_disk_bound = 1e9;
+    workunits.push_back(wu);
+
+    RESULT *res = new RESULT;
+    strcpy(res->name, "test_result");
+    strcpy(res->wu_name, "test_wu");
+    res->project = proj;
+    res->avp = av;
+    res->wup = wu;
+    res->app = app;
+    res->report_deadline = dtime()+86400;
+    results.push_back(res);
+
+    network_suspended = true;
+    cc_config.skip_cpu_benchmarks = true;
+}

client/client_state.cpp

@@ -611,6 +611,10 @@ int CLIENT_STATE::init() {
     //
     parse_state_file();
 
+    if (app_test) {
+        app_test_init();
+    }
+
     bool new_client = is_new_client();
 
     // this follows parse_state_file() since we need to have read

client/client_state.h

@@ -244,6 +244,11 @@ struct CLIENT_STATE {
     PROJECT_LIST project_list;
     void process_autologin(bool first);
 
+// --------------- app_test.cpp:
+    bool app_test;
+    string app_test_file;
+    void app_test_init();
+
 // --------------- current_version.cpp:
     string newer_version;
     string client_version_check_url;

client/cs_cmdline.cpp

@@ -127,6 +127,9 @@ void CLIENT_STATE::parse_cmdline(int argc, char** argv) {
             cc_config.allow_multiple_clients = true;
         } else if (ARG(allow_remote_gui_rpc)) {
             cc_config.allow_remote_gui_rpc = true;
+        } else if (ARG(app_test)) {
+            app_test = true;
+            app_test_file = argv[++i];
         } else if (ARG(attach_project)) {
             if (i >= argc-2) {
                 show_options = true;

client/file_names.cpp

@@ -227,6 +227,9 @@ void delete_old_slot_dirs() {
         safe_strcpy(filename, "");
         retval = dir_scan(filename, dirp, sizeof(filename));
         if (retval) break;
+        if (!strcmp(filename, "app_test")) {
+            continue;
+        }
         snprintf(path, sizeof(path), "%s/%s", SLOTS_DIR, filename);
         if (is_dir(path)) {
 #ifndef _WIN32

client/project.cpp

@@ -126,6 +126,7 @@ void PROJECT::init() {
     app_configs.clear();
     upload_backoff.is_upload = true;
     download_backoff.is_upload = false;
+    app_test = false;
 
 #ifdef SIM
     idle_time = 0;

client/project.h

@@ -202,6 +202,8 @@ struct PROJECT : PROJ_AM {
     std::vector<FILE_REF> user_files;
     std::vector<FILE_REF> project_files;
         // files not specific to apps or work - e.g. icons
+    bool app_test;
+        // this is the project created by --app_test
 
     ///////////////// member functions /////////////////
 

client/work_fetch.cpp

@@ -736,11 +736,13 @@ void WORK_FETCH::setup() {
 PROJECT* WORK_FETCH::choose_project() {
     PROJECT* p;
 
-    if (log_flags.work_fetch_debug) {
-        msg_printf(0, MSG_INFO, "choose_project(): %f", gstate.now);
-    }
     p = non_cpu_intensive_project_needing_work();
-    if (p) return p;
+    if (p) {
+        if (log_flags.work_fetch_debug) {
+            msg_printf(p, MSG_INFO, "[work_fetch] fetching work for NCI project");
+        }
+        return p;
+    }
 
     setup();
 

lib/msg_queue.cpp

@@ -25,6 +25,7 @@
 #include <unistd.h>
 #endif
 
+#include "boinc_stdio.h"
 #include "msg_queue.h"
 
 int create_message_queue(key_t key) {

mac_build/boinc.xcodeproj/project.pbxproj

@@ -40,6 +40,8 @@
 /* End PBXAggregateTarget section */
 
 /* Begin PBXBuildFile section */
+		81FD378F2AB95D4A00E29818 /* app_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 81FD378E2AB95D4A00E29818 /* app_test.cpp */; };
+		81FD37902AB95D4A00E29818 /* app_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 81FD378E2AB95D4A00E29818 /* app_test.cpp */; };
 		B13E2D172655655000D5C977 /* detect_rosetta_cpu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B13E2D162655655000D5C977 /* detect_rosetta_cpu.cpp */; };
 		DD000D6A24D0208E0083DE77 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DD89165E0F3B1BC200DE5B1C /* OpenGL.framework */; };
 		DD000D6B24D020940083DE77 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DD89165E0F3B1BC200DE5B1C /* OpenGL.framework */; };
@@ -887,6 +889,7 @@
 
 /* Begin PBXFileReference section */
 		20286C33FDCF999611CA2CEA /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = /System/Library/Frameworks/Carbon.framework; sourceTree = "<absolute>"; };
+		81FD378E2AB95D4A00E29818 /* app_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = app_test.cpp; sourceTree = "<group>"; };
 		AA8B6B1B046C364400A80164 /* app_ipc.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = app_ipc.cpp; sourceTree = "<group>"; };
 		AA8B6B1C046C364400A80164 /* app_ipc.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = app_ipc.h; path = ../lib/app_ipc.h; sourceTree = SOURCE_ROOT; };
 		AAA31C97042157A800A80164 /* shmem.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = shmem.cpp; sourceTree = "<group>"; };
@@ -2075,6 +2078,7 @@
 		F54B8FBE02AC0A0C01FB7237 /* client */ = {
 			isa = PBXGroup;
 			children = (
+				81FD378E2AB95D4A00E29818 /* app_test.cpp */,
 				DD344B3D07C5ABF40043025C /* acct_mgr.cpp */,
 				DD344B3E07C5ABF40043025C /* acct_mgr.h */,
 				DD33C6F608B5BB4500768630 /* acct_setup.h */,
@@ -3959,6 +3963,7 @@
 				DD99172A1E69A92A00555337 /* mac_spawn.cpp in Sources */,
 				DDE586B310FC8E9B00DFA887 /* mfile.cpp in Sources */,
 				DD3741D610FC948C001257EB /* filesys.cpp in Sources */,
+				81FD37902AB95D4A00E29818 /* app_test.cpp in Sources */,
 				DD3741D910FC94BA001257EB /* url.cpp in Sources */,
 				DD76BF9717CB465C0075936D /* opencl_boinc.cpp in Sources */,
 			);
@@ -4073,6 +4078,7 @@
 				DD76BF9517CB45D20075936D /* opencl_boinc.cpp in Sources */,
 				DD82D83C1F831E0500EEC6AD /* keyword.cpp in Sources */,
 				DD6A829C181103990037172D /* thread.cpp in Sources */,
+				81FD378F2AB95D4A00E29818 /* app_test.cpp in Sources */,
 				DDDC2055183B560B00CB5845 /* mac_address.cpp in Sources */,
 				DD55AF6D1916248200259439 /* coproc_sched.cpp in Sources */,
 			);

win_build/boinc_cli.vcxproj

@@ -311,6 +311,7 @@
     <ClCompile Include="..\client\app_config.cpp" />
     <ClCompile Include="..\client\app_control.cpp" />
     <ClCompile Include="..\client\app_start.cpp" />
+    <ClCompile Include="..\client\app_test.cpp" />
     <ClCompile Include="..\client\async_file.cpp" />
     <ClCompile Include="..\client\coproc_sched.cpp" />
     <ClCompile Include="..\client\hostinfo_linux.cpp" />