Commit 7cdb3a70 authored by David Anderson's avatar David Anderson Committed by Oliver Bock

- web: add advisory text to "Export as Notice" balloon

- scheduler: make max # of CPUs a #define, default 4096
parent 3e288f77
......@@ -7843,3 +7843,15 @@ Charlie 21 Dec 2012
events.h
NoticeListCtrl.cpp,.h
ViewNotices.cpp,.h
David 21 Dec 2012
- web: add advisory text to "Export as Notice" balloon
- scheduler: make max # of CPUs a #define, default 4096
client/
client_state.cpp
html/user/
forum_thread.php
sched/
edf_sim.cpp
sched_send.cpp,h
......@@ -476,7 +476,7 @@ int CLIENT_STATE::init() {
avp->flops = avp->avg_ncpus * host_info.p_fpops;
// for GPU apps, use conservative estimate:
// assume app will run at peak CPU speed, not peak GPU
// assume GPU runs at 10X peak CPU speed
//
if (avp->gpu_usage.rsc_type) {
avp->flops += avp->gpu_usage.usage * 10 * host_info.p_fpops;
......
......@@ -241,7 +241,7 @@ if (is_news_forum($forum) && $logged_in_user && ($logged_in_user->id == $thread-
show_button(
"forum_thread_status.php?action=clear&id=$thread->id",
tra("Export as Notice"),
tra("Export this news item as a Notice")
"Show this message to all volunteers in the desktop GUI. Use this only for messages of interest or importance to all volunteers."
);
} else {
show_button(
......
......@@ -225,7 +225,7 @@ void GLOBAL_PREFS::defaults() {
max_ncpus = 0;
cpu_scheduling_period_minutes = 60;
disk_interval = 60;
disk_max_used_gb = 0;
disk_max_used_gb = 1000;
disk_max_used_pct = 90;
disk_min_free_gb = 0.1;
vm_max_used_frac = 0.75;
......
......@@ -15,11 +15,6 @@
// You should have received a copy of the GNU Lesser General Public License
// along with BOINC. If not, see <http://www.gnu.org/licenses/>.
#ifndef SIM
#include "sched_config.h"
#include "sched_msgs.h"
#endif
#ifndef _USING_FCGI_
#include <cstdio>
#else
......@@ -31,6 +26,13 @@
#include <cstring>
#include <cstdarg>
#ifdef SIM
const int MAX_CPUS=4096;
#else
#include "sched_config.h"
#include "sched_msgs.h"
#include "sched_send.h"
#endif
#include "edf_sim.h"
#ifdef SIM
......@@ -84,7 +86,7 @@ bool lessthan_deadline(const IP_RESULT& p1, const IP_RESULT& p2) {
//
void mark_edf_misses (int ncpus, vector<IP_RESULT>& ip_results){
vector<IP_RESULT>::iterator ipp_it;
double booked_to[128];
double booked_to[MAX_CPUS];
int j;
log_msg(DETAIL, "[edf_detail] mark_edf_misses\n");
......@@ -223,7 +225,7 @@ bool check_candidate (
int ncpus,
vector<IP_RESULT> ip_results // passed by value (copy)
) {
double booked_to[128]; // keeps track of when each cpu is free
double booked_to[MAX_CPUS]; // keeps track of when each cpu is free
int j;
log_msg(DETAIL, "[edf_detail] check_candidate %s: dl %.2f cpu %.2f\n",
......
......@@ -139,9 +139,6 @@ const char* infeasible_string(int code) {
const double MIN_REQ_SECS = 0;
const double MAX_REQ_SECS = (28*SECONDS_IN_DAY);
const int MAX_GPUS = 64;
// don't believe clients who claim they have more GPUs than this
// get limits on:
// # jobs per day
// # jobs per RPC
......@@ -155,6 +152,7 @@ void WORK_REQ::get_job_limits() {
}
if (n > config.max_ncpus) n = config.max_ncpus;
if (n < 1) n = 1;
if (n > MAX_CPUS) n = MAX_CPUS;
effective_ncpus = n;
n = g_request->coprocs.ndevs();
......
......@@ -23,6 +23,11 @@
#include "boinc_db.h"
#include "sched_types.h"
const int MAX_GPUS = 64;
// don't believe clients who claim they have more GPUs than this
const int MAX_CPUS = 4096;
// don't believe clients who claim they have more CPUs than this
extern void send_work();
extern int add_result_to_reply(
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment