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

client: don't show "no work" messages as notices 

On startup the client sees, for each project,
whether it's barred from using particular resources (CPU, GPU).
It was showing these situations as notices.
I think the idea was to make sure the user hadn't changed
a setting and forgotten about it.

But this was annoying overkill.
Instead, just show startup messages (not notices)
saying what (project, resource) pairs are disallowed, and wy.
This commit is contained in:
David Anderson 2020-04-25 15:50:51 -07:00
parent ca709c6c08
commit a299991406
4 changed files with 15 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
client/client_state.h
View File

@ -675,6 +675,5 @@ extern THREAD throttle_thread;
#endif
#define NEED_NETWORK_MSG _("BOINC can't access Internet - check network connection or proxy configuration.")
#define NO_WORK_MSG _("Your settings do not allow fetching tasks for")
#endif

3
client/cs_notice.cpp
View File

@ -544,9 +544,6 @@ void NOTICES::remove_notices(PROJECT* p, int which) {
case REMOVE_SCHEDULER_MSG:
remove = !strcmp(n.category, "scheduler");
break;
case REMOVE_NO_WORK_MSG:
remove = !strstr(n.description.c_str(), NO_WORK_MSG);
break;
case REMOVE_CONFIG_MSG:
remove = (strstr(n.description.c_str(), "cc_config.xml") != NULL);
break;

2
client/cs_notice.h
View File

@ -88,8 +88,6 @@ struct NOTICES {
// "need network access" notice
#define REMOVE_SCHEDULER_MSG 1
// msgs from scheduler
#define REMOVE_NO_WORK_MSG 2
// msgs about no work due to settings
#define REMOVE_CONFIG_MSG 3
// notices about cc_config.xml
#define REMOVE_APP_INFO_MSG 4

50
client/project.cpp
View File

@ -984,51 +984,31 @@ void PROJECT::check_no_apps() {
}
}
// show a notice if we can't get work from this project,
// and there's something the user could do about it.
// show devices this project is not allowed to compute for
// because of a user setting
//
void PROJECT::show_no_work_notice() {
bool some_banned = false;
for (int i=0; i<coprocs.n_rsc; i++) {
if (no_rsc_apps[i]) continue;
bool banned_by_user = no_rsc_pref[i] || no_rsc_config[i];
if (!gstate.acct_mgr_info.dynamic) {
// dynamic account managers manage rsc usage themselves, not user
//
banned_by_user = banned_by_user || no_rsc_ams[i];
// note to self: ||= doesn't exist
}
if (!banned_by_user) {
continue;
}
string x;
x = NO_WORK_MSG;
x += " ";
x += rsc_name_long(i);
x += ". ";
x += _("To fix this, you can ");
// project can't use resource anyway
bool first = true;
if (no_rsc_pref[i]) {
x += _("change Project Preferences on the project's web site");
first = false;
msg_printf(this, MSG_INFO,
"Not using %s: project preferences",
rsc_name_long(i)
);
}
if (no_rsc_config[i]) {
if (!first) x += ", or ";
x += _("remove GPU exclusions in your cc_config.xml file");
first = false;
msg_printf(this, MSG_INFO,
"Not using %s: GPU exclusions in cc_config.xml",
rsc_name_long(i)
);
}
if (no_rsc_ams[i] && !gstate.acct_mgr_info.dynamic) {
if (!first) x += ", or ";
x += _("change your settings at your account manager web site");
msg_printf(this, MSG_INFO,
"Not using %s: account manager settings",
rsc_name_long(i)
);
}
x += ".";
msg_printf(this, MSG_USER_ALERT, "%s", x.c_str());
some_banned = true;
}
if (!some_banned) {
notices.remove_notices(this, REMOVE_NO_WORK_MSG);
return;
}
}