diff --git a/checkin_notes b/checkin_notes index 732846821f..3a54561028 100644 --- a/checkin_notes +++ b/checkin_notes @@ -7725,3 +7725,11 @@ Charlie 14 Dec 2012 mac_build/ boinc.xcodeproj/ project.pbxproj + +David 18 Dec 2012 + - client simulator: fix build errors + + client/ + app.cpp + makefile_sim + sim.cpp diff --git a/client/app.cpp b/client/app.cpp index 086d581d39..4c71d92416 100644 --- a/client/app.cpp +++ b/client/app.cpp @@ -188,6 +188,8 @@ int ACTIVE_TASK::preempt(int preempt_type) { return 0; } +#ifndef SIM + // called when a process has exited // void ACTIVE_TASK::cleanup_task() { @@ -237,7 +239,6 @@ void ACTIVE_TASK::cleanup_task() { } } -#ifndef SIM int ACTIVE_TASK::init(RESULT* rp) { result = rp; wup = rp->wup; diff --git a/client/makefile_sim b/client/makefile_sim index d79471ee4c..6aee9dd07e 100644 --- a/client/makefile_sim +++ b/client/makefile_sim @@ -9,6 +9,7 @@ OBJS = \ acct_mgr.o \ acct_setup.o \ app.o \ + app_config.o \ client_msgs.o \ client_state.o \ client_types.o \ @@ -28,6 +29,7 @@ OBJS = \ file_xfer.o \ gpu_amd.o \ gpu_detect.o \ + gpu_intel.o \ gpu_nvidia.o \ gpu_opencl.o \ gui_http.o \ diff --git a/client/sim.cpp b/client/sim.cpp index 1997698a2c..60c60e4fe3 100644 --- a/client/sim.cpp +++ b/client/sim.cpp @@ -502,7 +502,7 @@ bool CLIENT_STATE::scheduler_rpc_poll() { #if 0 p = next_project_sched_rpc_pending(); if (p) { - work_fetch.compute_work_request(p); + work_fetch.piggyback_work_request(p); action = simulate_rpc(p); break; } @@ -511,7 +511,7 @@ bool CLIENT_STATE::scheduler_rpc_poll() { p = find_project_with_overdue_results(false); if (p) { //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); break; }