diff --git a/checkin_notes b/checkin_notes index b8febbc1de..b83c4e505a 100644 --- a/checkin_notes +++ b/checkin_notes @@ -9313,3 +9313,14 @@ Rom 22 Dec 2011 samples/vboxwrapper/ vbox.cpp + +Rom 22 Dec 2011 + - VBOX: Remove code that was meant to force the CC to reschedule jobs. There was + a bug that was fixed last night which prevented the wrapper from properly + reporting its checkpoint time to the CC. The lack of checkpoint information + for the job would have prevented the CC from rescheduling the job and removing + it from memory. Now it can so the extra shutdown each scheduling period + should not be needed. + + samples/vboxwrapper/ + vboxwrapper.cpp diff --git a/samples/vboxwrapper/vboxwrapper.cpp b/samples/vboxwrapper/vboxwrapper.cpp index 9a65690186..6f7219d33f 100644 --- a/samples/vboxwrapper/vboxwrapper.cpp +++ b/samples/vboxwrapper/vboxwrapper.cpp @@ -417,16 +417,6 @@ int main(int argc, char** argv) { } } - // if we've been running for at least the scheduling period, - // do a checkpoint and temporary exit; - // the client will run us again if it wants. - // - if (elapsed_time > aid.starting_elapsed_time + aid.global_prefs.cpu_scheduling_period()) { - vm.stop(); - write_checkpoint(checkpoint_cpu_time); - boinc_temporary_exit(0); - } - // if the VM has a maximum amount of time it is allowed to run, // shut it down gacefully and exit. // diff --git a/win_build/vboxwrapper.vcproj b/win_build/vboxwrapper.vcproj index e464d8ff29..8c0dc168f1 100644 --- a/win_build/vboxwrapper.vcproj +++ b/win_build/vboxwrapper.vcproj @@ -81,13 +81,13 @@ @@ -182,13 +182,13 @@