mirror of https://github.com/BOINC/boinc.git
- client: test the above; compile fixes for Win
svn path=/trunk/boinc/; revision=15290
This commit is contained in:
parent
18d6f5e708
commit
ac77678d16
|
@ -4307,3 +4307,11 @@ David May 23 2008
|
||||||
cpu_sched.C
|
cpu_sched.C
|
||||||
lib/
|
lib/
|
||||||
coproc.h
|
coproc.h
|
||||||
|
|
||||||
|
David May 23 2008
|
||||||
|
- client: test the above; compile fixes for Win
|
||||||
|
|
||||||
|
client/
|
||||||
|
client_types.h
|
||||||
|
cpu_sched.C
|
||||||
|
sim_util.C
|
||||||
|
|
|
@ -178,8 +178,8 @@ struct RR_SIM_PROJECT_STATUS {
|
||||||
inline bool none_active() {
|
inline bool none_active() {
|
||||||
return !active.size();
|
return !active.size();
|
||||||
}
|
}
|
||||||
inline bool can_run(RESULT* p, int ncpus) {
|
inline bool can_run(RESULT*, int ncpus) {
|
||||||
return active.size() < (int)ncpus;
|
return (int)active.size() < ncpus;
|
||||||
}
|
}
|
||||||
inline void remove_active(RESULT* r) {
|
inline void remove_active(RESULT* r) {
|
||||||
std::vector<RESULT*>::iterator it = active.begin();
|
std::vector<RESULT*>::iterator it = active.begin();
|
||||||
|
|
|
@ -579,7 +579,7 @@ void CLIENT_STATE::schedule_cpus() {
|
||||||
double expected_payoff;
|
double expected_payoff;
|
||||||
unsigned int i;
|
unsigned int i;
|
||||||
double rrs = runnable_resource_share();
|
double rrs = runnable_resource_share();
|
||||||
double ncpus_used;
|
double ncpus_used = 0;
|
||||||
|
|
||||||
if (log_flags.cpu_sched_debug) {
|
if (log_flags.cpu_sched_debug) {
|
||||||
msg_printf(0, MSG_INFO, "[cpu_sched_debug] schedule_cpus(): start");
|
msg_printf(0, MSG_INFO, "[cpu_sched_debug] schedule_cpus(): start");
|
||||||
|
@ -620,7 +620,6 @@ void CLIENT_STATE::schedule_cpus() {
|
||||||
#ifdef SIM
|
#ifdef SIM
|
||||||
if (!cpu_sched_rr_only) {
|
if (!cpu_sched_rr_only) {
|
||||||
#endif
|
#endif
|
||||||
ncpus_used = 0;
|
|
||||||
while (ncpus_used < ncpus) {
|
while (ncpus_used < ncpus) {
|
||||||
rp = earliest_deadline_result();
|
rp = earliest_deadline_result();
|
||||||
if (!rp) break;
|
if (!rp) break;
|
||||||
|
@ -1144,7 +1143,6 @@ void CLIENT_STATE::rr_simulation() {
|
||||||
RESULT* rp, *rpbest;
|
RESULT* rp, *rpbest;
|
||||||
RR_SIM_STATUS sim_status;
|
RR_SIM_STATUS sim_status;
|
||||||
unsigned int i;
|
unsigned int i;
|
||||||
double x;
|
|
||||||
|
|
||||||
sim_status.coprocs.clone(coprocs);
|
sim_status.coprocs.clone(coprocs);
|
||||||
double ar = available_ram();
|
double ar = available_ram();
|
||||||
|
|
|
@ -156,9 +156,7 @@ void SIM_PROJECT::init() {
|
||||||
project_files_downloaded_time = 0;
|
project_files_downloaded_time = 0;
|
||||||
|
|
||||||
// Initialize scratch variables.
|
// Initialize scratch variables.
|
||||||
rrsim_proc_rate = 0.0;
|
rr_sim_status.clear();
|
||||||
cpu_shortfall = 0.0;
|
|
||||||
rr_sim_deadlines_missed = 0;
|
|
||||||
deadlines_missed = 0;
|
deadlines_missed = 0;
|
||||||
|
|
||||||
// sim-specific:
|
// sim-specific:
|
||||||
|
|
Loading…
Reference in New Issue