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

- VBOX: We don't need to display the state of the VM before startup. 

- VBOX: Change the snapshot naming scheme by removing the quotes and
        prefixing the checkpoint time with 'boinc_'.  Hopefully this will
        prevent the VM from asserting during the snapshot process.

    samples/vboxwrapper/
        vbox.cpp, .h

svn path=/trunk/boinc/; revision=25471
This commit is contained in:
Rom Walton 2012-03-21 22:13:06 +00:00
parent fc8191220f
commit 7710c0cfc8
3 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
checkin_notes
View File

@ -2923,3 +2923,12 @@ David 21 Mar 2012
client/ client/
app.h app.h
app_control.cpp app_control.cpp
Rom 21 Mar 2012
- VBOX: We don't need to display the state of the VM before startup.
- VBOX: Change the snapshot naming scheme by removing the quotes and
prefixing the checkpoint time with 'boinc_'. Hopefully this will
prevent the VM from asserting during the snapshot process.
samples/vboxwrapper/
vbox.cpp, .h

8
samples/vboxwrapper/vbox.cpp
View File

@ -219,7 +219,7 @@ int VBOX_VM::run(double elapsed_time) {
vm_name = vm_master_name; vm_name = vm_master_name;
// Check to see if the VM is already in a running state, if so, poweroff. // Check to see if the VM is already in a running state, if so, poweroff.
poll(); poll(false);
if (online) { if (online) {
poweroff(); poweroff();
} }
@ -398,18 +398,16 @@ int VBOX_VM::createsnapshot(double elapsed_time, double checkpoint_cpu_time) {
// Create new snapshot // Create new snapshot
sprintf(buf, "%d", (int)elapsed_time); sprintf(buf, "%d", (int)elapsed_time);
command = "snapshot \"" + vm_name + "\" "; command = "snapshot \"" + vm_name + "\" ";
command += "take \""; command += "take boinc_";
command += buf; command += buf;
command += "\" ";
retval = vbm_popen(command, output, "create new snapshot"); retval = vbm_popen(command, output, "create new snapshot");
if (retval) return retval; if (retval) return retval;
// Delete stale snapshot // Delete stale snapshot
sprintf(buf, "%d", (int)checkpoint_cpu_time); sprintf(buf, "%d", (int)checkpoint_cpu_time);
command = "snapshot \"" + vm_name + "\" "; command = "snapshot \"" + vm_name + "\" ";
command += "delete \""; command += "delete boinc_";
command += buf; command += buf;
command += "\" ";
retval = vbm_popen(command, output, "delete stale snapshot"); retval = vbm_popen(command, output, "delete stale snapshot");
if (retval) return retval; if (retval) return retval;

8
win_build/vboxwrapper.vcproj
View File

@ -81,13 +81,13 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="libcmt.lib libcpmt.lib kernel32.lib user32.lib gdi32.lib ole32.lib wsock32.lib" AdditionalDependencies="libcmt.lib libcpmt.lib kernel32.lib user32.lib gdi32.lib ole32.lib wsock32.lib"
OutputFile=".\Build\$(PlatformName)\$(ConfigurationName)\vboxwrapper_25433_windows_intelx86.exe" OutputFile=".\Build\$(PlatformName)\$(ConfigurationName)\vboxwrapper_25469_windows_intelx86.exe"
LinkIncremental="0" LinkIncremental="0"
SuppressStartupBanner="true" SuppressStartupBanner="true"
IgnoreAllDefaultLibraries="true" IgnoreAllDefaultLibraries="true"
DelayLoadDLLs="" DelayLoadDLLs=""
GenerateDebugInformation="true" GenerateDebugInformation="true"
ProgramDatabaseFile=".\Build\$(PlatformName)\$(ConfigurationName)\vboxwrapper_25433_windows_intelx86.pdb" ProgramDatabaseFile=".\Build\$(PlatformName)\$(ConfigurationName)\vboxwrapper_25469_windows_intelx86.pdb"
SubSystem="2" SubSystem="2"
TargetMachine="1" TargetMachine="1"
/> />
@ -182,13 +182,13 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="libcmt.lib libcpmt.lib kernel32.lib user32.lib gdi32.lib ole32.lib wsock32.lib" AdditionalDependencies="libcmt.lib libcpmt.lib kernel32.lib user32.lib gdi32.lib ole32.lib wsock32.lib"
OutputFile=".\Build\$(PlatformName)\$(ConfigurationName)\vboxwrapper_25433_windows_x86_64.exe" OutputFile=".\Build\$(PlatformName)\$(ConfigurationName)\vboxwrapper_25469_windows_x86_64.exe"
LinkIncremental="0" LinkIncremental="0"
SuppressStartupBanner="true" SuppressStartupBanner="true"
IgnoreAllDefaultLibraries="true" IgnoreAllDefaultLibraries="true"
DelayLoadDLLs="" DelayLoadDLLs=""
GenerateDebugInformation="true" GenerateDebugInformation="true"
ProgramDatabaseFile=".\Build\$(PlatformName)\$(ConfigurationName)\vboxwrapper_25433_windows_x86_64.pdb" ProgramDatabaseFile=".\Build\$(PlatformName)\$(ConfigurationName)\vboxwrapper_25469_windows_x86_64.pdb"
SubSystem="2" SubSystem="2"
TargetMachine="17" TargetMachine="17"
/> />