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

- client: ignore max_cpus if max_ncpus_pct is nonzero 

svn path=/trunk/boinc/; revision=16318
This commit is contained in:
David Anderson 2008-10-25 15:21:28 +00:00
parent ec28245556
commit a726775e94
3 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
checkin_notes
View File

@ -8689,3 +8689,9 @@ Charlie 24 Oct 2008
BOINCListCtrl.cpp
ViewProjects.cpp
ViewTransfers.cpp
David 25 Oct 2008
- client: ignore max_cpus if max_ncpus_pct is nonzero
client/
cpu_sched.cpp

7
client/cpu_sched.cpp
View File

@ -1638,11 +1638,8 @@ void CLIENT_STATE::set_ncpus() {
if (global_prefs.max_ncpus_pct) {
ncpus = (int)((ncpus * global_prefs.max_ncpus_pct)/100);
}
if (ncpus == 0) ncpus = 1;
if (global_prefs.max_ncpus && global_prefs.max_ncpus < ncpus) {
if (ncpus == 0) ncpus = 1;
} else if (global_prefs.max_ncpus && global_prefs.max_ncpus < ncpus) {
ncpus = global_prefs.max_ncpus;
}

17
html/user/bolt_sched.php
View File

@ -97,19 +97,14 @@ function create_view($iter, $mode, $prev_view_id) {
return BoltView::insert("(user_id, course_id, item_name, start_time, mode, state, fraction_done, prev_view_id) values ($user->id, $course->id, '$item->name', $now, $mode, '$state', $iter->frac_done, $prev_view_id)");
}
function page_header($title=null) {
function page_header() {
global $course;
echo "<html><head>
";
if ($title) {
echo "
<title>$title</title>
";
}
echo "
<title>$course->name</title>
<link rel=stylesheet type=text/css href=bolt.css>
</head><body>
";
if (function_exists('bolt_header')) bolt_header($title);
if (function_exists('bolt_header')) bolt_header();
}
function page_footer() {
@ -352,7 +347,7 @@ case 'start':
}
$e = BoltEnrollment::lookup($user->id, $course_id);
if ($e) {
page_header("Confirm restart");
page_header();
echo "You are already enrolled in $course->name.
<p>
Are you sure you want to start over from the beginning?
@ -647,7 +642,7 @@ case 'question':
$now = time();
$question = BoltDb::escape_string(get_str('question'));
BoltQuestion::insert("(create_time, user_id, course_id, name, question, state) values ($now, $user->id, $course->id, '$view->item_name', '$question', 0)");
page_header("Question recorded");
page_header();
echo "
Thanks; we have recorded your question.
Questions help us improve this course.