- client: print a message, and recompute ncpus, when reread cc_config.xml

svn path=/trunk/boinc/; revision=16187

checkin_notes

@@ -8274,3 +8274,12 @@ Charlie 10 Oct 2008
         BOINCBaseView.cpp
         BOINCListCtrl.cpp,.h
         MainDocument.cpp
+
+David  10 Oct 2008
+    - client: print a message, and recompute ncpus, when reread cc_config.xml
+
+    client/
+        gui_rpc_server_ops.cpp
+        log_flags.cpp,h
+        main.cpp
+        sim.cpp

client/gui_rpc_server_ops.cpp

@@ -1143,7 +1143,8 @@ int GUI_RPC_CONN::handle_rpc() {
         handle_set_cc_config(request_msg, mf);
     } else if (match_tag(request_msg, "<read_cc_config/>")) {
         mf.printf("<success/>\n");
-        read_config_file();
+        read_config_file(false);
+        gstate.set_ncpus();
         gstate.request_schedule_cpus("Core client configuration");
         gstate.request_work_fetch("Core client configuration");
     } else if (match_tag(request_msg, "<get_all_projects_list/>")) {

client/log_flags.cpp

@@ -310,12 +310,15 @@ int CONFIG::parse(FILE* f) {
     return ERR_XML_PARSE;
 }
 
-int read_config_file() {
+int read_config_file(bool init) {
     FILE* f;
 
     log_flags.defaults();
     config.defaults();
 
+    if (!init) {
+        msg_printf(NULL, MSG_INFO, "Re-reading cc_config.xml");
+    }
     f = boinc_fopen(CONFIG_FILE, "r");
     if (!f) return ERR_FOPEN;
     config.parse(f);

client/log_flags.h

@@ -134,6 +134,6 @@ struct CONFIG {
 
 extern LOG_FLAGS log_flags;
 extern CONFIG config;
-extern int read_config_file();
+extern int read_config_file(bool init);
 
 #endif

client/main.cpp

@@ -306,9 +306,7 @@ static void init_core_client(int argc, char** argv) {
 
     diagnostics_init(flags, "stdoutdae", "stderrdae");
 
-    // Read config and parse the commandline after initializing the
-    // diagnostics framework.
-    read_config_file();
+    read_config_file(true);
 
     // Set the max file sizes of the logs based on user preferences.
     //

client/sim.cpp

@@ -718,7 +718,7 @@ int main(int argc, char** argv) {
         total_results.divide((int)(dirs.size()));
         total_results.print(stdout, "Total");
     } else {
-        read_config_file();
+        read_config_file(true);
         int retval;
         bool flag;