piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 06:09:50 -06:00
Code Issues Packages Projects Releases Wiki Activity

Save states: Stabilize loads (no more LZO crashes, hopefully), make sure we don't crash if user loads state too quickly in succession

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4276 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
hrydgard
2009-09-15 18:54:10 +00:00
parent adbfea0a09
commit e6b87febe5
2 changed files with 67 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
Source/Core/Core/Src/State.cpp
View File

@ -52,6 +52,7 @@ static unsigned char __LZO_MMODEL out [ OUT_LEN ];
static HEAP_ALLOC(wrkmem,LZO1X_1_MEM_COMPRESS);
static bool state_op_in_progress = false;
static int ev_Save, ev_BufferSave;
static int ev_Load, ev_BufferLoad;
@ -75,7 +76,8 @@ void DoState(PointerWrap &p)
{
u32 cookie = 0xBAADBABE + version;
p.Do(cookie);
if (cookie != 0xBAADBABE + version) {
if (cookie != 0xBAADBABE + version)
{
PanicAlert("Can't load states from other versions.");
return;
}
@ -107,6 +109,7 @@ void LoadBufferStateCallback(u64 userdata, int cyclesLate)
cur_buffer = NULL;
Core::DisplayMessage("Loaded state", 2000);
state_op_in_progress = false;
}
void SaveBufferStateCallback(u64 userdata, int cyclesLate)
@ -135,6 +138,7 @@ void SaveBufferStateCallback(u64 userdata, int cyclesLate)
DoState(p);
cur_buffer = NULL;
state_op_in_progress = false;
}
THREAD_RETURN CompressAndDumpState(void *pArgs)
@ -169,9 +173,8 @@ THREAD_RETURN CompressAndDumpState(void *pArgs)
header.sz = bCompressed ? sz : 0;
fwrite(&header, sizeof(state_header), 1, f);
if (bCompressed) {
lzo_uint cur_len;
lzo_uint cur_len = 0;
lzo_uint i = 0;
for (;;) {
@ -192,8 +195,11 @@ THREAD_RETURN CompressAndDumpState(void *pArgs)
i += cur_len;
}
} else
}
else
{
fwrite(buffer, sz, 1, f);
}
fclose(f);
@ -202,6 +208,7 @@ THREAD_RETURN CompressAndDumpState(void *pArgs)
Core::DisplayMessage(StringFromFormat("Saved State to %s",
filename.c_str()).c_str(), 2000);
state_op_in_progress = false;
return 0;
}
@ -215,10 +222,14 @@ void SaveStateCallback(u64 userdata, int cyclesLate)
}
jit.ClearCache();
// Measure the size of the buffer.
u8 *ptr = 0;
PointerWrap p(&ptr, PointerWrap::MODE_MEASURE);
DoState(p);
size_t sz = (size_t)ptr;
// Then actually do the write.
u8 *buffer = new u8[sz];
ptr = buffer;
p.SetMode(PointerWrap::MODE_WRITE);
@ -235,9 +246,6 @@ void SaveStateCallback(u64 userdata, int cyclesLate)
void LoadStateCallback(u64 userdata, int cyclesLate)
{
lzo_uint cur_len;
lzo_uint new_len;
bool bCompressedState;
// If saving state, wait for it to finish
@ -252,7 +260,8 @@ void LoadStateCallback(u64 userdata, int cyclesLate)
SaveBufferStateCallback(userdata, cyclesLate);
FILE *f = fopen(cur_filename.c_str(), "rb");
if (!f) {
if (!f)
{
Core::DisplayMessage("State not found", 2000);
return;
}
@ -277,8 +286,8 @@ void LoadStateCallback(u64 userdata, int cyclesLate)
sz = header.sz;
bCompressedState = (sz != 0);
if (bCompressedState) {
if (bCompressedState)
{
Core::DisplayMessage("Decompressing State...", 500);
lzo_uint i = 0;
@ -287,19 +296,22 @@ void LoadStateCallback(u64 userdata, int cyclesLate)
PanicAlert("Error allocating buffer");
return;
}
for (;;) {
while (true)
{
lzo_uint cur_len = 0;
lzo_uint new_len = 0;
if (fread(&cur_len, 1, sizeof(int), f) == 0)
break;
if (feof(f))
break; // don't know if this happens.
fread(out, 1, cur_len, f);
int res = lzo1x_decompress(out, cur_len, (buffer + i), &new_len, NULL);
if(res != LZO_E_OK) {
if (res != LZO_E_OK)
{
// This doesn't seem to happen anymore.
PanicAlert("Internal LZO Error - decompression failed (%d) (%d, %d) \n"
"Try loading the state again", res, i, new_len);
fclose(f);
delete [] buffer;
return;
}
@ -307,13 +319,13 @@ void LoadStateCallback(u64 userdata, int cyclesLate)
// The size of the data to read to our buffer is 'new_len'
i += new_len;
}
} else {
}
else
{
fseek(f, 0, SEEK_END);
sz = (int)(ftell(f) - sizeof(int));
fseek(f, sizeof(int), SEEK_SET);
buffer = new u8[sz];
int x;
if ((x = (int)fread(buffer, 1, sz, f)) != (int)sz)
PanicAlert("wtf? %d %d", x, sz);
@ -364,6 +376,9 @@ std::string MakeStateFilename(int state_number)
void State_SaveAs(const std::string &filename)
{
if (state_op_in_progress)
return;
state_op_in_progress = true;
cur_filename = filename;
lastFilename = filename;
CoreTiming::ScheduleEvent_Threadsafe(0, ev_Save);
@ -376,6 +391,9 @@ void State_Save(int slot)
void State_LoadAs(const std::string &filename)
{
if (state_op_in_progress)
return;
state_op_in_progress = true;
cur_filename = filename;
CoreTiming::ScheduleEvent_Threadsafe(0, ev_Load);
}
@ -395,12 +413,18 @@ void State_LoadLastSaved()
void State_LoadFromBuffer(u8 **buffer)
{
if (state_op_in_progress)
return;
state_op_in_progress = true;
cur_buffer = buffer;
CoreTiming::ScheduleEvent_Threadsafe(0, ev_BufferLoad);
}
void State_SaveToBuffer(u8 **buffer)
{
if (state_op_in_progress)
return;
state_op_in_progress = true;
cur_buffer = buffer;
CoreTiming::ScheduleEvent_Threadsafe(0, ev_BufferSave);
}

6
Source/Core/Core/Src/State.h
View File

@ -39,13 +39,13 @@ void State_Load(int slot);
void State_SaveAs(const std::string &filename);
void State_LoadAs(const std::string &filename);
void State_LoadFromBuffer(u8 **buffer);
void State_SaveToBuffer(u8 **buffer);
void State_LoadLastSaved();
void State_UndoSaveState();
void State_UndoLoadState();
void State_LoadFromBuffer(u8 **buffer);
void State_SaveToBuffer(u8 **buffer);
typedef struct
{