Add not-in-use computing prefs #4871

davidpanderson · 2022-08-07T04:23:03Z

Fixes #41 (!)
Previously there were single prefs for

% of CPUs
% of CPU time
suspend if non-BOINC CPU load above X
These applied whether or not the computer was in use.
This PR adds separate prefs for when the computer is not in use.
It includes both web-based and Manager interfaces for editing them.
Backwards compatible; if the new prefs are not specified, it uses the old ones for both cases.

niu_cpu_usage_limit: CPU throttling while computer not in use niu_max_ncpus_pct: # CPUs to use while computer not in use niu_suspend_cpu_usage: suspend if non-BOINC usage while computer not in use Client: parse these from global_prefs files, and enforce them. If not specified, use the corresponding (non-niu) pref all the time. Web: add them to the computing prefs pages. Refactor the prefs into: in use / not in use / tasks / disk / network TODO: update the Manager prefs dialog accordingly

use the values from corresponding in-use pref

Note: the Manager code is written in a clunky way. I cleaned up one instance. TODO: clean up others.

CharlieFenton · 2022-08-07T08:38:10Z

clientgui/DlgAdvPreferencesBase.cpp

-        suspendComputingStaticBox, ID_DEFAULT,
-        _("Suspend when no mouse/keyboard input in last"),
+    // CPU throttling
+    //


Precede line 375 with /*xgettext:no-c-format*/

@davidpanderson You have not fixed this. For an explanation why this is needed, see here and here.

(Of course the /*xgettext:no-c-format*/ directive must now precede line 376 in the latest version of this file.)

AenBleidd · 2022-08-07T08:43:15Z

On Windows it's failing on this:

         sim.cpp
    27>D:\a\boinc\boinc\client\sim.cpp(302,24): error C2065: 'ncpus': undeclared identifier [D:\a\boinc\boinc\win_build\sim_vs2019.vcxproj]
    27>D:\a\boinc\boinc\client\sim.cpp(350,24): warning C4459: declaration of 'delta' hides global declaration [D:\a\boinc\boinc\win_build\sim_vs2019.vcxproj]
       D:\a\boinc\boinc\client\sim.cpp(91,26): message : see declaration of 'delta' [D:\a\boinc\boinc\win_build\sim_vs2019.vcxproj]
    27>D:\a\boinc\boinc\client\sim.cpp(405,26): warning C4458: declaration of 'apps' hides class member [D:\a\boinc\boinc\win_build\sim_vs2019.vcxproj]
       D:\a\boinc\boinc\client\client_state.h(75,18): message : see declaration of 'CLIENT_STATE::apps' [D:\a\boinc\boinc\win_build\sim_vs2019.vcxproj]
    27>D:\a\boinc\boinc\client\sim.cpp(415,36): error C2065: 'ncpus': undeclared identifier [D:\a\boinc\boinc\win_build\sim_vs2019.vcxproj]
    27>D:\a\boinc\boinc\client\sim.cpp(456,32): warning C4477: '_snprintf' : format string '%lu' requires an argument of type 'unsigned long', but variadic argument 1 has type 'unsigned __int64' [D:\a\boinc\boinc\win_build\sim_vs2019.vcxproj]
       D:\a\boinc\boinc\client\sim.cpp(456,32): message : consider using '%zu' in the format string [D:\a\boinc\boinc\win_build\sim_vs2019.vcxproj]
    27>D:\a\boinc\boinc\client\sim.cpp(1498,12): error C2039: 'set_ncpus': is not a member of 'CLIENT_STATE' [D:\a\boinc\boinc\win_build\sim_vs2019.vcxproj]
       D:\a\boinc\boinc\client\client_state.h(71): message : see declaration of 'CLIENT_STATE' [D:\a\boinc\boinc\win_build\sim_vs2019.vcxproj]

On linux it's failing on:

DlgAdvPreferencesBase.cpp: In member function ‘wxPanel* CDlgAdvPreferencesBase::createProcessorTab(wxNotebook*)’:
DlgAdvPreferencesBase.cpp:335:9: error: cannot bind non-const lvalue reference of type ‘wxString&’ to an rvalue of type ‘wxString’
 335 |         wxString (_("Suspend computing when your computer is busy running other programs.")),
     |         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
DlgAdvPreferencesBase.cpp:205:45: note:   initializing argument 2 of ‘void CDlgAdvPreferencesBase::addNewRowToSizer(wxSizer*, wxString&, wxWindow*, wxWindow*, wxWindow*, wxWindow*, wxWindow*)’
 205 |                 wxSizer* toSizer, wxString& toolTipText,
     |                                   ~~~~~~~~~~^~~~~~~~~~~
make[2]: *** [Makefile:1158: boincmgr-DlgAdvPreferencesBase.o] Error 1

clientgui/DlgAdvPreferencesBase.cpp

CharlieFenton

@AenBleidd This is a substantial amount of added and changed code. I will try to review this within the next week.

AenBleidd · 2022-08-07T08:58:33Z

@CharlieFenton, I completely agree with you. I don't push you to make it just immediately. But this change is quite significant so I believe your review is essential.

RichardHaselgrove · 2022-08-07T10:24:05Z

It would reassure me while testing if the scheduler at SETI@home (or another project with the provisional web selection tools) could be re-activated so that I can test the automatic propagation of global preferences from project to project (propagation considers the time and project of the most recent update).

davidpanderson · 2022-08-07T16:50:08Z

I fixed the compile error. Oddly, it wasn't an error in VS

davidpanderson · 2022-08-07T16:58:13Z

I fixed the sim build error

codecov · 2022-08-07T17:17:43Z

Codecov Report

Merging #4871 (f627b09) into master (a036709) will decrease coverage by 0.01%.
The diff coverage is 0.00%.

@@             Coverage Diff              @@
##             master    #4871      +/-   ##
============================================
- Coverage     10.43%   10.42%   -0.02%     
  Complexity     1046     1046              
============================================
  Files           278      278              
  Lines         35827    35864      +37     
  Branches       8113     8127      +14     
============================================
  Hits           3739     3739              
- Misses        31717    31754      +37     
  Partials        371      371

Impacted Files	Coverage Δ
lib/prefs.cpp	`0.00% <0.00%> (ø)`
lib/prefs.h	`0.00% <ø> (ø)`
lib/cc_config.cpp	`0.00% <0.00%> (ø)`
sched/db_dump.cpp	`0.00% <0.00%> (ø)`
sched/validator.cpp	`0.00% <0.00%> (ø)`
sched/sched_main.cpp	`0.00% <0.00%> (ø)`
sched/sched_util.cpp	`0.00% <0.00%> (ø)`
sched/sched_types.cpp	`0.00% <0.00%> (ø)`
sched/sched_resend.cpp	`0.00% <0.00%> (ø)`
sched/sched_result.cpp	`0.00% <0.00%> (ø)`
... and 4 more

This eliminates ambiguity between "no limit" and "inherit from in use"

davidpanderson · 2022-09-05T07:37:08Z

I changed the web code to fix 1 and (I think) 5.
I changed the way NIU prefs are parsed, fixing 3 and 4.

6 doesn't happen. When the client gets prefs from a project,
it puts them in global_prefs.xml and doesn't modify it.
It only modified global_prefs_override.xml

7: the dialog is now 644 pixels high on Win. That's short enough.
We can't support tiny displays, and they can edit prefs other ways.

9: the web form says "Requires BOINC 7.20.3+"

10: works AFAIK

- replace code lost from commit 27aff32 - restore previous values from global_prefs.xml or global_prefs_override.xml

CharlieFenton · 2022-09-06T12:33:20Z

@davidpanderson I have confirmed you have fixed all the items on my list (except [6] which probably has no solution.

I found a couple of additional problems, but I have fixed them in the code myself. (For some reason, a couple of the changes you made in commit 27aff32 were lost; I replaced them.)

Regarding item 6, you wrote:

6 doesn't happen. When the client gets prefs from a project,
it puts them in global_prefs.xml and doesn't modify it.
It only modified global_prefs_override.xml

I'm sorry if I was not clear. I was referring only to changes on a project web site, so the propagation happens via global_prefs.xml. I agree that updating the client transfers the updated web prefs to global_prefs.xml, which is in effect updating it.

When you then update another project, that project's web prefs receive the updated data from global_prefs.xml. The scenario I asked about was when a user is running BOINC 7.20.2 or earlier, which does not save the not-in-use prefs from the first project in global_prefs.xml. As a result, the second project does not receive the not-in-use prefs and sets them to the in-use prefs (the default.) This scenario does not involve global_prefs_override.xml at all; the customizing I mentioned is done entirely on project websites.

But, as I wrote earlier, I suspect there is no fix for this and it is not critical.

AenBleidd · 2022-09-06T13:30:58Z

Code looks ok to me. I still would like to check it in a week when I'll have access to the linux laptop with 768 pixels height just to see how new Preferences windows looks like on it, then we could probably close the corresponding ticket as well.
If nothing new appears before the end of the next week, I'll merge this PR and will update Transifex to get new strings localized.
Until then please keep this PR open.
Thanks

CharlieFenton · 2022-09-06T13:49:06Z

@davidpanderson Please remember to update the documentation, and add the missing description of Suspend when no mouse/keyboard input in last xx minutes .

davidpanderson · 2022-09-06T22:07:56Z

I added the "no input in X min" to the mediawiki page
(which had a number of other errors, some of which I fixed).
I'll update this to the new version when we release it.

AenBleidd · 2022-09-13T09:26:33Z

For Ubuntu with the screen resolution 1366x768 the window is too big (the same as for the current version).
Not sure if we need to do smth with it in this particular PR.
Old version:

New version:

AenBleidd · 2022-09-13T09:30:07Z

I suggest to go ahead and merge this, and fix the size issue later in the corresponding ticket instead #1872
@davidpanderson, @CharlieFenton, what do you think?

CharlieFenton · 2022-09-13T10:06:08Z

I suggest to go ahead and merge this, and fix the size issue later in the corresponding ticket instead #1872

I agree.

RichardHaselgrove · 2022-09-13T10:11:29Z

Likewise. I agree.

davidpanderson · 2022-09-13T19:14:18Z

On Linux can you drag the dialog to make the bottom visible?

AenBleidd · 2022-09-13T19:23:31Z

No. The window is already on its top most position.

AenBleidd · 2022-09-21T22:49:49Z

As discussed, I'm merging it now.
I have an idea how to solve this issue #1872, so I'll take a couple of weeks to try it out before pushing new strings for localization to Transifex.

davidpanderson added 8 commits August 2, 2022 13:59

change "Tasks" to "General"

3ce9291

Manager: restructure compute prefs; add not-in-use prefs

50f56c5

Manager: change advanced prefs dialog to include not-in-use prefs

b6570bc

Manager: add checkbox for "suspend if no recent input pref".

5789724

client: if new not-in-use prefs aren't specified in XML file,

51bfc0a

use the values from corresponding in-use pref

Client and Manager: debug computing prefs.

7d24c02

Note: the Manager code is written in a clunky way. I cleaned up one instance. TODO: clean up others.

Web: in computing prefs, move swap limit to Disk section

588ab8f

AenBleidd requested review from AenBleidd and CharlieFenton August 7, 2022 04:25

AenBleidd self-assigned this Aug 7, 2022

AenBleidd added C: Client C: Client - Scheduler Policy C: Manager P: Minor PR: Enhancement PR: Review required labels Aug 7, 2022

AenBleidd added this to the Client 7.22.0 milestone Aug 7, 2022

CharlieFenton reviewed Aug 7, 2022

View reviewed changes

clientgui/DlgAdvPreferencesBase.cpp Show resolved Hide resolved

CharlieFenton reviewed Aug 7, 2022

View reviewed changes

Manager: gcc compile fix

7fe3166

sim: fix build error

c050459

client and manager: when parsing NIU prefs, immediately chanee 0 to 100.

28e9114

This eliminates ambiguity between "no limit" and "inherit from in use"

Manager: fix handling when disabled items are enabled

f627b09

- replace code lost from commit 27aff32 - restore previous values from global_prefs.xml or global_prefs_override.xml

CharlieFenton approved these changes Sep 6, 2022

View reviewed changes

Vulpine05 mentioned this pull request Sep 7, 2022

[Feature] Provide limit checks when reading global_prefs_override #4916

Open

AenBleidd approved these changes Sep 13, 2022

View reviewed changes

AenBleidd added PR: Reviewed and removed PR: Review required labels Sep 13, 2022

AenBleidd merged commit 373bcff into master Sep 21, 2022

Vulpine05 mentioned this pull request Sep 27, 2022

[WIP] Check for idle time settings that preventing computing #4634

Closed

3 tasks

AenBleidd mentioned this pull request Oct 7, 2022

add several scheduler profile against time #935

Closed

AenBleidd mentioned this pull request Oct 20, 2022

"use % of CPU cores" different if computer in use. #4983

Closed

RichardHaselgrove mentioned this pull request Oct 29, 2022

Server: Bug: Runtime of MT tasks underestimated in sched_send #4151

Closed

CharlieFenton deleted the dpa_niu_prefs branch January 14, 2023 10:16

This was referenced May 23, 2023

client: the default value for the "suspend_if_no_recent_input" pref should to 0, not 60 #5251

Merged

Client - change in behaviour - sporadic re-reading of prefs_override file #5255

Closed

AenBleidd removed the PR: Reviewed label Oct 23, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add not-in-use computing prefs #4871

Add not-in-use computing prefs #4871

davidpanderson commented Aug 7, 2022

CharlieFenton Aug 7, 2022

CharlieFenton Aug 12, 2022

AenBleidd commented Aug 7, 2022

CharlieFenton left a comment

AenBleidd commented Aug 7, 2022

RichardHaselgrove commented Aug 7, 2022

davidpanderson commented Aug 7, 2022

davidpanderson commented Aug 7, 2022

codecov bot commented Aug 7, 2022 •

edited

Loading

davidpanderson commented Sep 5, 2022

CharlieFenton commented Sep 6, 2022

AenBleidd commented Sep 6, 2022

CharlieFenton commented Sep 6, 2022

davidpanderson commented Sep 6, 2022

AenBleidd commented Sep 13, 2022

AenBleidd commented Sep 13, 2022

CharlieFenton commented Sep 13, 2022

RichardHaselgrove commented Sep 13, 2022

davidpanderson commented Sep 13, 2022

AenBleidd commented Sep 13, 2022

AenBleidd commented Sep 21, 2022

Add not-in-use computing prefs #4871

Add not-in-use computing prefs #4871

Conversation

davidpanderson commented Aug 7, 2022

CharlieFenton Aug 7, 2022

Choose a reason for hiding this comment

CharlieFenton Aug 12, 2022

Choose a reason for hiding this comment

AenBleidd commented Aug 7, 2022

CharlieFenton left a comment

Choose a reason for hiding this comment

AenBleidd commented Aug 7, 2022

RichardHaselgrove commented Aug 7, 2022

davidpanderson commented Aug 7, 2022

davidpanderson commented Aug 7, 2022

codecov bot commented Aug 7, 2022 • edited Loading

Codecov Report

davidpanderson commented Sep 5, 2022

CharlieFenton commented Sep 6, 2022

AenBleidd commented Sep 6, 2022

CharlieFenton commented Sep 6, 2022

davidpanderson commented Sep 6, 2022

AenBleidd commented Sep 13, 2022

AenBleidd commented Sep 13, 2022

CharlieFenton commented Sep 13, 2022

RichardHaselgrove commented Sep 13, 2022

davidpanderson commented Sep 13, 2022

AenBleidd commented Sep 13, 2022

AenBleidd commented Sep 21, 2022

codecov bot commented Aug 7, 2022 •

edited

Loading