mirror of https://github.com/BOINC/boinc.git
- scheduler: in app_plan_sse3(): check for CPU features in
p_model as well as p_features; pre-6.x clients report them in p_model. - client: fix bug where "reread config file" didn't update the max log file sizes svn path=/trunk/boinc/; revision=22838
This commit is contained in:
parent
864ee7e3a3
commit
3de1406265
|
@ -8697,3 +8697,16 @@ David 8 Dec 2010
|
||||||
util.cpp,h
|
util.cpp,h
|
||||||
sched/
|
sched/
|
||||||
sched_version.cpp
|
sched_version.cpp
|
||||||
|
|
||||||
|
David 9 Dec 2010
|
||||||
|
- scheduler: in app_plan_sse3(): check for CPU features in
|
||||||
|
p_model as well as p_features;
|
||||||
|
pre-6.x clients report them in p_model.
|
||||||
|
- client: fix bug where "reread config file" didn't update
|
||||||
|
the max log file sizes
|
||||||
|
|
||||||
|
client/
|
||||||
|
main.cpp
|
||||||
|
log_flags.cpp
|
||||||
|
sched/
|
||||||
|
sched_customize.cpp
|
||||||
|
|
|
@ -29,11 +29,12 @@
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "error_numbers.h"
|
|
||||||
#include "common_defs.h"
|
#include "common_defs.h"
|
||||||
|
#include "diagnostics.h"
|
||||||
|
#include "error_numbers.h"
|
||||||
|
#include "filesys.h"
|
||||||
#include "parse.h"
|
#include "parse.h"
|
||||||
#include "str_util.h"
|
#include "str_util.h"
|
||||||
#include "filesys.h"
|
|
||||||
|
|
||||||
#include "file_names.h"
|
#include "file_names.h"
|
||||||
#include "client_state.h"
|
#include "client_state.h"
|
||||||
|
@ -490,8 +491,12 @@ int read_config_file(bool init, const char* fname) {
|
||||||
}
|
}
|
||||||
FILE* f = boinc_fopen(fname, "r");
|
FILE* f = boinc_fopen(fname, "r");
|
||||||
if (!f) return ERR_FOPEN;
|
if (!f) return ERR_FOPEN;
|
||||||
config.parse(f);
|
int retval = config.parse(f);
|
||||||
fclose(f);
|
fclose(f);
|
||||||
|
if (retval) return retval;
|
||||||
|
diagnostics_set_max_file_sizes(
|
||||||
|
config.max_stdout_file_size, config.max_stderr_file_size
|
||||||
|
);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -214,12 +214,6 @@ static void init_core_client(int argc, char** argv) {
|
||||||
|
|
||||||
read_config_file(true);
|
read_config_file(true);
|
||||||
|
|
||||||
// Set the max file sizes of the logs based on user preferences.
|
|
||||||
//
|
|
||||||
diagnostics_set_max_file_sizes(
|
|
||||||
config.max_stdout_file_size, config.max_stderr_file_size
|
|
||||||
);
|
|
||||||
|
|
||||||
// Win32 - detach from console if requested
|
// Win32 - detach from console if requested
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
if (gstate.detach_console) {
|
if (gstate.detach_console) {
|
||||||
|
|
|
@ -409,16 +409,20 @@ static inline bool app_plan_nci(
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
// the following is for an app that requires a processor with SSE3,
|
// the following is for an app version that requires a processor with SSE3,
|
||||||
// and will run 10% faster if so
|
// and will run 10% faster than the non-SSE3 version
|
||||||
//
|
//
|
||||||
static inline bool app_plan_sse3(
|
static inline bool app_plan_sse3(
|
||||||
SCHEDULER_REQUEST& sreq, HOST_USAGE& hu
|
SCHEDULER_REQUEST& sreq, HOST_USAGE& hu
|
||||||
) {
|
) {
|
||||||
downcase_string(sreq.host.p_features);
|
downcase_string(sreq.host.p_features);
|
||||||
if (!strstr(sreq.host.p_features, "sse3")) {
|
if (!strstr(sreq.host.p_features, "sse3")) {
|
||||||
//add_no_work_message("Your CPU lacks SSE3");
|
// Pre-6.x clients report CPU features in p_model
|
||||||
return false;
|
//
|
||||||
|
if (!strstr(sreq.host.p_model, "sse3")) {
|
||||||
|
//add_no_work_message("Your CPU lacks SSE3");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
hu.avg_ncpus = 1;
|
hu.avg_ncpus = 1;
|
||||||
hu.max_ncpus = 1;
|
hu.max_ncpus = 1;
|
||||||
|
|
Loading…
Reference in New Issue