sal/bochs: compress memory images on save/restore

This saves a lot of disk space for campaigns with many saved VM states.

Change-Id: I19c68d8545bb9b299f113d43d44202a517520b09
This commit is contained in:
Horst Schirmeier
2013-03-25 19:12:24 +01:00
parent 20a137d8d9
commit 0eeec70570
3 changed files with 84 additions and 0 deletions

View File

@ -16,6 +16,7 @@ OPTION(CONFIG_SR_SAVE "Target backend: State saving" OFF)
OPTION(CONFIG_SR_REBOOT "Target backend: Reboot" OFF)
OPTION(CONFIG_BOCHS_NON_VERBOSE "Misc: Reduced verbosity (a lot faster for large campaigns)" OFF)
OPTION(CONFIG_BOCHS_NO_ABORT "Misc: Do not abort or ask the user in case the simulator stumbles on unexpected events (e.g., panics)" ON)
OPTION(CONFIG_BOCHS_COMPRESS_STATE "Misc: Reduce Bochs save/restore size by compressing memory images" OFF)
OPTION(CONFIG_SUPPRESS_INTERRUPTS "Target backend: Suppress interrupts" OFF)
OPTION(CONFIG_FIRE_INTERRUPTS "Target backend: Fire interrupts" OFF)
OPTION(CONFIG_DISABLE_KEYB_INTERRUPTS "Target backend: Suppress keyboard interrupts" OFF)

View File

@ -28,6 +28,7 @@
// Fail configuration
#cmakedefine CONFIG_BOCHS_NON_VERBOSE
#cmakedefine CONFIG_BOCHS_NO_ABORT
#cmakedefine CONFIG_BOCHS_COMPRESS_STATE
#cmakedefine CONFIG_SUPPRESS_INTERRUPTS
#cmakedefine CONFIG_FIRE_INTERRUPTS
#cmakedefine CONFIG_DISABLE_KEYB_INTERRUPTS

View File

@ -0,0 +1,82 @@
#ifndef __COMPRESS_STATE_AH__
#define __COMPRESS_STATE_AH__
#include "config/VariantConfig.hpp"
#include "config/FailConfig.hpp"
#if defined(BUILD_BOCHS) && defined(CONFIG_BOCHS_COMPRESS_STATE)
#include <stdio.h>
#include <zlib.h>
aspect CompressState {
advice call ("% fwrite(...)")
&& within ("% bx_real_sim_c::save_sr_param(...)")
&& args(ptr, size, nmemb, stream)
: around (const void *ptr, size_t size, size_t nmemb, FILE *stream)
{
*tjp->result() = fwrite_compressed(ptr, size, nmemb, stream);
}
advice call ("% fread(...)")
&& within ("% bx_real_sim_c::restore_bochs_param(...)")
&& args(ptr, size, nmemb, stream)
: around (void *ptr, size_t size, size_t nmemb, FILE *stream)
{
*tjp->result() = fread_compressed(ptr, size, nmemb, stream);
}
// FIXME move implementation to a separate compilation unit
size_t fread_compressed(void *ptr, size_t size, size_t nmemb, FILE *stream)
{
size_t remaining = size * nmemb;
ssize_t ret;
char *cbuf = (char *) ptr;
// FIXME check return values
gzFile f = gzdopen(dup(fileno(stream)), "rb");
#if ZLIB_VERNUM >= 0x1240
gzbuffer(f, 1024*1024);
#endif
do {
ret = gzread(f, cbuf, remaining);
// EOF or error?
if (ret == 0 || ret == -1) {
break;
}
remaining -= ret;
cbuf += ret;
} while (remaining);
gzclose(f);
return (cbuf - (char *)ptr) / size;
}
size_t fwrite_compressed(const void *ptr, size_t size, size_t nmemb, FILE *stream)
{
size_t remaining = size * nmemb;
ssize_t ret;
const char *cbuf = (const char *) ptr;
// FIXME check return values
gzFile f = gzdopen(dup(fileno(stream)), "wb9");
#if ZLIB_VERNUM >= 0x1240
gzbuffer(f, 1024*1024);
#endif
do {
ret = gzwrite(f, cbuf, remaining);
// error?
if (ret == 0) {
break;
}
remaining -= ret;
cbuf += ret;
} while (remaining);
gzclose(f);
return (cbuf - (char *)ptr) / size;
}
};
#endif // BUILD_BOCHS && CONFIG_BOCHS_COMPRESS_STATE
#endif // __COMPRESS_STATE_AH__