Rooba
/
boinc
mirror of https://github.com/BOINC/boinc.git
1
0
Fork 0
Code Issues 1 Packages Projects Releases Wiki Activity

- scheduler: tweaks to user messages 

svn path=/trunk/boinc/; revision=21749
This commit is contained in:
David Anderson 2010-06-15 17:56:30 +00:00
parent 2eef482a12
commit 9194af6722
4 changed files with 46 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
checkin_notes
View File

@ -4264,3 +4264,11 @@ David 14 Jun 2010
html/inc/
result.inc
api/boinc_api.cpp
David 14 Jun 2010
- scheduler: tweaks to user messages
sched/
sched_customize.cpp
sched_resend.cpp
handle_request.cpp

14
sched/handle_request.cpp
View File

@ -654,7 +654,7 @@ int send_result_abort() {
// send user message
char buf[256];
sprintf(buf, "Result %s is no longer usable", orp.name);
g_reply->insert_message(buf, "high");
g_reply->insert_message(buf, "low");
} else if (orp.abort_if_not_started) {
g_reply->result_abort_if_not_starteds.push_back(orp.name);
log_messages.printf(MSG_NORMAL,
@ -863,7 +863,7 @@ void warn_user_if_core_client_upgrade_scheduled() {
sprintf(msg,
"In %d days and %d hours, this project will require a minimum "
"BOINC core client version of %d.%d.%d. You are currently using "
"BOINC version of %d.%d.%d. You are currently using "
"version %d.%d.%d; please upgrade before this time.",
days, hours,
config.min_core_client_version_announced / 10000,
@ -910,7 +910,7 @@ bool unacceptable_os() {
sprintf(buf, "This project doesn't support OS type %s %s",
g_request->host.os_name, g_request->host.os_version
);
g_reply->insert_message(buf, "low");
g_reply->insert_message(buf, "high");
g_reply->set_delay(DELAY_UNACCEPTABLE_OS);
return true;
}
@ -935,7 +935,7 @@ bool unacceptable_cpu() {
sprintf(buf, "This project doesn't support CPU type %s %s",
g_request->host.p_vendor, g_request->host.p_model
);
g_reply->insert_message(buf, "low");
g_reply->insert_message(buf, "high");
g_reply->set_delay(DELAY_UNACCEPTABLE_OS);
return true;
}
@ -952,7 +952,7 @@ bool wrong_core_client_version() {
return false;
}
sprintf(msg,
"Need version %d.%d.%d or higher of the BOINC client. You have %d.%d.%d.",
"Need BOINC version %d.%d.%d or higher. You have %d.%d.%d.",
config.min_core_client_version / 10000,
(config.min_core_client_version / 100)%100,
config.min_core_client_version % 100,
@ -965,7 +965,7 @@ bool wrong_core_client_version() {
g_request->hostid,
config.min_core_client_version, g_request->core_client_minor_version
);
g_reply->insert_message(msg, "low");
g_reply->insert_message(msg, "high");
g_reply->set_delay(DELAY_BAD_CLIENT_VERSION);
return true;
}
@ -1214,7 +1214,7 @@ void process_request(char* code_sign_key) {
}
if (g_request->platforms.list.size() == 0) {
sprintf(buf, "platform '%s' not found", g_request->platform.name);
g_reply->insert_message(buf, "low");
g_reply->insert_message(buf, "high");
log_messages.printf(MSG_CRITICAL,
"[HOST#%d] platform '%s' not found\n",
g_reply->host.id, g_request->platform.name

44
sched/sched_customize.cpp
View File

@ -152,7 +152,7 @@ static inline bool app_plan_ati(
"[version] Host lacks ATI GPU for plan class ati\n"
);
}
add_no_work_message("Your computer has no ATI GPU");
//add_no_work_message("Your computer has no ATI GPU");
return false;
}
@ -170,7 +170,7 @@ static inline bool app_plan_ati(
cp->version
);
}
add_no_work_message("ATI Catalyst 8.12+ needed to use GPU");
//add_no_work_message("ATI Catalyst 8.12+ needed to use GPU");
return false;
}
if (!cp->amdrt_detected) {
@ -179,7 +179,7 @@ static inline bool app_plan_ati(
"[version] ati libs found, need amd\n"
);
}
add_no_work_message("Need libraries named amd* to use ATI GPU");
//add_no_work_message("Need libraries named amd* to use ATI GPU");
return false;
}
}
@ -192,7 +192,7 @@ static inline bool app_plan_ati(
cp->version
);
}
add_no_work_message("ATI Catalyst 9.1+ needed to use GPU");
//add_no_work_message("ATI Catalyst 9.1+ needed to use GPU");
return false;
}
if (!cp->amdrt_detected) {
@ -201,7 +201,7 @@ static inline bool app_plan_ati(
"[version] ati libs found, need amd\n"
);
}
add_no_work_message("Need libraries named amd* to use ATI GPU");
//add_no_work_message("Need libraries named amd* to use ATI GPU");
return false;
}
}
@ -214,7 +214,7 @@ static inline bool app_plan_ati(
cp->version
);
}
add_no_work_message("ATI Catalyst 9.2+ needed to use GPU");
//add_no_work_message("ATI Catalyst 9.2+ needed to use GPU");
return false;
}
if (!cp->atirt_detected) {
@ -223,7 +223,7 @@ static inline bool app_plan_ati(
"[version] amd libs found, need ati\n"
);
}
add_no_work_message("Need libraries named ati* to use ATI GPU");
//add_no_work_message("Need libraries named ati* to use ATI GPU");
return false;
}
}
@ -236,7 +236,7 @@ static inline bool app_plan_ati(
cp->version
);
}
add_no_work_message("ATI Catalyst 9.7+ needed to use GPU");
//add_no_work_message("ATI Catalyst 9.7+ needed to use GPU");
return false;
}
if (!cp->atirt_detected) {
@ -245,7 +245,7 @@ static inline bool app_plan_ati(
"[version] amd libs found, need ati\n"
);
}
add_no_work_message("Need libraries named ati* to use ATI GPU");
//add_no_work_message("Need libraries named ati* to use ATI GPU");
return false;
}
}
@ -261,11 +261,13 @@ static inline bool app_plan_ati(
cp->attribs.localRAM, (int)(min_ram/MEGA)
);
}
#if 0
sprintf(buf,
"Your ATI GPU has insufficient memory (need %.0fMB)",
min_ram/MEGA
);
add_no_work_message(buf);
#endif
return false;
}
hu.gpu_ram = 200*MEGA;
@ -335,7 +337,7 @@ static inline bool app_plan_cuda(
plan_class
);
}
add_no_work_message("Your computer has no NVIDIA GPU");
//add_no_work_message("Your computer has no NVIDIA GPU");
return false;
}
@ -343,9 +345,11 @@ static inline bool app_plan_cuda(
//
if (strstr(sreq.host.os_name, "Darwin")) {
if (sreq.core_client_version < 61028) {
#if 0
add_no_work_message(
"NVIDIA GPU apps require BOINC version 6.10.28+"
);
#endif
return false;
}
}
@ -359,9 +363,11 @@ static inline bool app_plan_cuda(
"[version] Compute capability %d < 1.0\n", compute_capability
);
}
#if 0
add_no_work_message(
"Your NVIDIA GPU lacks the needed compute capability"
);
#endif
return false;
}
@ -373,11 +379,11 @@ static inline bool app_plan_cuda(
//
if (!strcmp(plan_class, "cuda_fermi")) {
if (compute_capability < 200) {
add_no_work_message("Fermi-class GPU needed");
//add_no_work_message("Fermi-class GPU needed");
return false;
}
if (cp->cuda_version < 3000) {
add_no_work_message("CUDA version 3.0 needed");
//add_no_work_message("CUDA version 3.0 needed");
return false;
}
min_ram = CUDA23_MIN_RAM;
@ -387,22 +393,24 @@ static inline bool app_plan_cuda(
}
if (cp->cuda_version) {
if (cp->cuda_version < 2030) {
add_no_work_message("CUDA version 2.3 needed");
//add_no_work_message("CUDA version 2.3 needed");
return false;
}
} else if (cp->display_driver_version) {
if (cp->display_driver_version < CUDA23_MIN_DRIVER_VERSION) {
#if 0
sprintf(buf, "NVIDIA display driver %d or later needed",
CUDA23_MIN_DRIVER_VERSION
);
add_no_work_message(buf);
#endif
return false;
}
} else {
// pre-6.10 Linux clients report neither CUDA nor driver
// version; they'll end up here
//
add_no_work_message("CUDA version 2.3 needed");
//add_no_work_message("CUDA version 2.3 needed");
return false;
}
min_ram = CUDA23_MIN_RAM;
@ -410,10 +418,12 @@ static inline bool app_plan_cuda(
if (!cp->display_driver_version
|| cp->display_driver_version < CUDA23_MIN_DRIVER_VERSION
) {
#if 0
sprintf(buf, "NVIDIA display driver %d or later needed",
CUDA_OPENCL_MIN_DRIVER_VERSION
);
add_no_work_message(buf);
#endif
return false;
}
min_ram = CUDA23_MIN_RAM;
@ -428,10 +438,12 @@ static inline bool app_plan_cuda(
cp->display_driver_version
);
}
#if 0
sprintf(buf, "NVIDIA driver version %d or later needed",
CUDA_MIN_DRIVER_VERSION
);
add_no_work_message(buf);
#endif
return false;
}
min_ram = CUDA_MIN_RAM;
@ -449,11 +461,13 @@ static inline bool app_plan_cuda(
cp->prop.dtotalGlobalMem/MEGA, min_ram/MEGA
);
}
#if 0
sprintf(buf,
"Your NVIDIA GPU has insufficient memory (need %.0fMB)",
min_ram/MEGA
);
add_no_work_message(buf);
#endif
return false;
}
hu.gpu_ram = 200*MEGA;
@ -518,7 +532,7 @@ static inline bool app_plan_sse3(
) {
downcase_string(sreq.host.p_features);
if (!strstr(sreq.host.p_features, "sse3")) {
add_no_work_message("Your CPU lacks SSE3");
//add_no_work_message("Your CPU lacks SSE3");
return false;
}
hu.avg_ncpus = 1;

4
sched/sched_resend.cpp
View File

@ -195,7 +195,7 @@ bool resend_lost_work() {
sprintf(warning_msg,
"Didn't resend lost task %s (expired)", result.name
);
g_reply->insert_message(warning_msg, "high");
g_reply->insert_message(warning_msg, "low");
} else {
retval = add_result_to_reply(result, wu, bavp, false);
if (retval) {
@ -206,7 +206,7 @@ bool resend_lost_work() {
continue;
}
sprintf(warning_msg, "Resent lost task %s", result.name);
g_reply->insert_message(warning_msg, "high");
g_reply->insert_message(warning_msg, "low");
num_resent++;
did_any = true;