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

- client simulator: fix build errors

This commit is contained in:
David Anderson 2012-12-18 00:08:08 -08:00 committed by Oliver Bock
parent 2a104e29e5
commit 3960a9fc83
4 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
checkin_notes
View File

@ -7725,3 +7725,11 @@ Charlie 14 Dec 2012
mac_build/ mac_build/
boinc.xcodeproj/ boinc.xcodeproj/
project.pbxproj project.pbxproj
David 18 Dec 2012
- client simulator: fix build errors
client/
app.cpp
makefile_sim
sim.cpp

3
client/app.cpp
View File

@ -188,6 +188,8 @@ int ACTIVE_TASK::preempt(int preempt_type) {
return 0; return 0;
} }
#ifndef SIM
// called when a process has exited // called when a process has exited
// //
void ACTIVE_TASK::cleanup_task() { void ACTIVE_TASK::cleanup_task() {
@ -237,7 +239,6 @@ void ACTIVE_TASK::cleanup_task() {
} }
} }
#ifndef SIM
int ACTIVE_TASK::init(RESULT* rp) { int ACTIVE_TASK::init(RESULT* rp) {
result = rp; result = rp;
wup = rp->wup; wup = rp->wup;

2
client/makefile_sim
View File

@ -9,6 +9,7 @@ OBJS = \
acct_mgr.o \ acct_mgr.o \
acct_setup.o \ acct_setup.o \
app.o \ app.o \
app_config.o \
client_msgs.o \ client_msgs.o \
client_state.o \ client_state.o \
client_types.o \ client_types.o \
@ -28,6 +29,7 @@ OBJS = \
file_xfer.o \ file_xfer.o \
gpu_amd.o \ gpu_amd.o \
gpu_detect.o \ gpu_detect.o \
gpu_intel.o \
gpu_nvidia.o \ gpu_nvidia.o \
gpu_opencl.o \ gpu_opencl.o \
gui_http.o \ gui_http.o \

4
client/sim.cpp
View File

@ -502,7 +502,7 @@ bool CLIENT_STATE::scheduler_rpc_poll() {
#if 0 #if 0
p = next_project_sched_rpc_pending(); p = next_project_sched_rpc_pending();
if (p) { if (p) {
work_fetch.compute_work_request(p); work_fetch.piggyback_work_request(p);
action = simulate_rpc(p); action = simulate_rpc(p);
break; break;
} }
@ -511,7 +511,7 @@ bool CLIENT_STATE::scheduler_rpc_poll() {
p = find_project_with_overdue_results(false); p = find_project_with_overdue_results(false);
if (p) { if (p) {
//printf("doing RPC to %s to report results\n", p->project_name); //printf("doing RPC to %s to report results\n", p->project_name);
work_fetch.compute_work_request(p); work_fetch.piggyback_work_request(p);
action = simulate_rpc(p); action = simulate_rpc(p);
break; break;
} }