Archives
/
OpenTTD-patches
mirror of https://github.com/JGRennison/OpenTTD-patches
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Saveload: Improve performance of script data save/load

Browse Source 
Avoid unnecessarily using SlObject wrappers
pull/590/head
Jonathan G Rennison 11 months ago
parent 2b8171093a
commit d0c6b7136d
1 changed files with 29 additions and 50 deletions
Show Stats Download Patch File Download Diff File

79
src/script/script_instance.cpp
Unescape Escape View File

@ -378,13 +378,6 @@ ScriptLogTypes::LogData &ScriptInstance::GetLogData()
* - null: No data. * - null: No data.
*/ */
static byte _script_sl_byte; ///< Used as source/target by the script saveload code to store/load a single byte.
/** SaveLoad array that saves/loads exactly one byte. */
static const SaveLoad _script_byte[] = {
SLEG_VAR(_script_sl_byte, SLE_UINT8),
};
/* static */ bool ScriptInstance::SaveObject(HSQUIRRELVM vm, SQInteger index, int max_depth, bool test) /* static */ bool ScriptInstance::SaveObject(HSQUIRRELVM vm, SQInteger index, int max_depth, bool test)
{ {
if (max_depth == 0) { if (max_depth == 0) {
@ -395,8 +388,7 @@ static const SaveLoad _script_byte[] = {
switch (sq_gettype(vm, index)) { switch (sq_gettype(vm, index)) {
case OT_INTEGER: { case OT_INTEGER: {
if (!test) { if (!test) {
_script_sl_byte = SQSL_INT; SlWriteByte(SQSL_INT);
SlObject(nullptr, _script_byte);
} }
SQInteger res; SQInteger res;
sq_getinteger(vm, index, &res); sq_getinteger(vm, index, &res);
@ -409,8 +401,7 @@ static const SaveLoad _script_byte[] = {
case OT_STRING: { case OT_STRING: {
if (!test) { if (!test) {
_script_sl_byte = SQSL_STRING; SlWriteByte(SQSL_STRING);
SlObject(nullptr, _script_byte);
} }
const SQChar *buf; const SQChar *buf;
sq_getstring(vm, index, &buf); sq_getstring(vm, index, &buf);
@ -420,8 +411,7 @@ static const SaveLoad _script_byte[] = {
return false; return false;
} }
if (!test) { if (!test) {
_script_sl_byte = (byte)len; SlWriteByte((byte)len);
SlObject(nullptr, _script_byte);
SlArray(const_cast<char *>(buf), len, SLE_CHAR); SlArray(const_cast<char *>(buf), len, SLE_CHAR);
} }
return true; return true;
@ -429,8 +419,7 @@ static const SaveLoad _script_byte[] = {
case OT_ARRAY: { case OT_ARRAY: {
if (!test) { if (!test) {
_script_sl_byte = SQSL_ARRAY; SlWriteByte(SQSL_ARRAY);
SlObject(nullptr, _script_byte);
} }
sq_pushnull(vm); sq_pushnull(vm);
while (SQ_SUCCEEDED(sq_next(vm, index - 1))) { while (SQ_SUCCEEDED(sq_next(vm, index - 1))) {
@ -444,16 +433,14 @@ static const SaveLoad _script_byte[] = {
} }
sq_pop(vm, 1); sq_pop(vm, 1);
if (!test) { if (!test) {
_script_sl_byte = SQSL_ARRAY_TABLE_END; SlWriteByte(SQSL_ARRAY_TABLE_END);
SlObject(nullptr, _script_byte);
} }
return true; return true;
} }
case OT_TABLE: { case OT_TABLE: {
if (!test) { if (!test) {
_script_sl_byte = SQSL_TABLE; SlWriteByte(SQSL_TABLE);
SlObject(nullptr, _script_byte);
} }
sq_pushnull(vm); sq_pushnull(vm);
while (SQ_SUCCEEDED(sq_next(vm, index - 1))) { while (SQ_SUCCEEDED(sq_next(vm, index - 1))) {
@ -467,30 +454,26 @@ static const SaveLoad _script_byte[] = {
} }
sq_pop(vm, 1); sq_pop(vm, 1);
if (!test) { if (!test) {
_script_sl_byte = SQSL_ARRAY_TABLE_END; SlWriteByte(SQSL_ARRAY_TABLE_END);
SlObject(nullptr, _script_byte);
} }
return true; return true;
} }
case OT_BOOL: { case OT_BOOL: {
if (!test) { if (!test) {
_script_sl_byte = SQSL_BOOL; SlWriteByte(SQSL_BOOL);
SlObject(nullptr, _script_byte);
} }
SQBool res; SQBool res;
sq_getbool(vm, index, &res); sq_getbool(vm, index, &res);
if (!test) { if (!test) {
_script_sl_byte = res ? 1 : 0; SlWriteByte(res ? 1 : 0);
SlObject(nullptr, _script_byte);
} }
return true; return true;
} }
case OT_NULL: { case OT_NULL: {
if (!test) { if (!test) {
_script_sl_byte = SQSL_NULL; SlWriteByte(SQSL_NULL);
SlObject(nullptr, _script_byte);
} }
return true; return true;
} }
@ -503,8 +486,7 @@ static const SaveLoad _script_byte[] = {
/* static */ void ScriptInstance::SaveEmpty() /* static */ void ScriptInstance::SaveEmpty()
{ {
_script_sl_byte = 0; SlWriteByte(0);
SlObject(nullptr, _script_byte);
} }
void ScriptInstance::Save() void ScriptInstance::Save()
@ -519,8 +501,7 @@ void ScriptInstance::Save()
HSQUIRRELVM vm = this->engine->GetVM(); HSQUIRRELVM vm = this->engine->GetVM();
if (this->is_save_data_on_stack) { if (this->is_save_data_on_stack) {
_script_sl_byte = 1; SlWriteByte(1);
SlObject(nullptr, _script_byte);
/* Save the data that was just loaded. */ /* Save the data that was just loaded. */
SaveObject(vm, -1, SQUIRREL_MAX_DEPTH, false); SaveObject(vm, -1, SQUIRREL_MAX_DEPTH, false);
} else if (!this->is_started) { } else if (!this->is_started) {
@ -562,8 +543,7 @@ void ScriptInstance::Save()
} }
sq_pushobject(vm, savedata); sq_pushobject(vm, savedata);
if (SaveObject(vm, -1, SQUIRREL_MAX_DEPTH, true)) { if (SaveObject(vm, -1, SQUIRREL_MAX_DEPTH, true)) {
_script_sl_byte = 1; SlWriteByte(1);
SlObject(nullptr, _script_byte);
SaveObject(vm, -1, SQUIRREL_MAX_DEPTH, false); SaveObject(vm, -1, SQUIRREL_MAX_DEPTH, false);
this->is_save_data_on_stack = true; this->is_save_data_on_stack = true;
} else { } else {
@ -572,8 +552,7 @@ void ScriptInstance::Save()
} }
} else { } else {
ScriptLog::Warning("Save function is not implemented"); ScriptLog::Warning("Save function is not implemented");
_script_sl_byte = 0; SlWriteByte(0);
SlObject(nullptr, _script_byte);
} }
} }
@ -598,8 +577,8 @@ bool ScriptInstance::IsPaused()
/* static */ bool ScriptInstance::LoadObjects(ScriptData *data) /* static */ bool ScriptInstance::LoadObjects(ScriptData *data)
{ {
SlObject(nullptr, _script_byte); byte type = SlReadByte();
switch (_script_sl_byte) { switch (type) {
case SQSL_INT: { case SQSL_INT: {
int64 value; int64 value;
SlArray(&value, 1, (IsSavegameVersionBefore(SLV_SCRIPT_INT64) && SlXvIsFeatureMissing(XSLFI_SCRIPT_INT64)) ? SLE_FILE_I32 | SLE_VAR_I64 : SLE_INT64); SlArray(&value, 1, (IsSavegameVersionBefore(SLV_SCRIPT_INT64) && SlXvIsFeatureMissing(XSLFI_SCRIPT_INT64)) ? SLE_FILE_I32 | SLE_VAR_I64 : SLE_INT64);
@ -608,34 +587,34 @@ bool ScriptInstance::IsPaused()
} }
case SQSL_STRING: { case SQSL_STRING: {
SlObject(nullptr, _script_byte); byte len = SlReadByte();
static char buf[std::numeric_limits<decltype(_script_sl_byte)>::max()]; static char buf[std::numeric_limits<decltype(len)>::max()];
SlArray(buf, _script_sl_byte, SLE_CHAR); SlArray(buf, len, SLE_CHAR);
StrMakeValidInPlace(buf, buf + _script_sl_byte); StrMakeValidInPlace(buf, buf + len);
if (data != nullptr) data->push_back(std::string(buf)); if (data != nullptr) data->push_back(std::string(buf));
return true; return true;
} }
case SQSL_ARRAY: case SQSL_ARRAY:
case SQSL_TABLE: { case SQSL_TABLE: {
if (data != nullptr) data->push_back((SQSaveLoadType)_script_sl_byte); if (data != nullptr) data->push_back((SQSaveLoadType)type);
while (LoadObjects(data)); while (LoadObjects(data));
return true; return true;
} }
case SQSL_BOOL: { case SQSL_BOOL: {
SlObject(nullptr, _script_byte); byte sl_byte = SlReadByte();
if (data != nullptr) data->push_back((SQBool)(_script_sl_byte != 0)); if (data != nullptr) data->push_back((SQBool)(sl_byte != 0));
return true; return true;
} }
case SQSL_NULL: { case SQSL_NULL: {
if (data != nullptr) data->push_back((SQSaveLoadType)_script_sl_byte); if (data != nullptr) data->push_back((SQSaveLoadType)type);
return true; return true;
} }
case SQSL_ARRAY_TABLE_END: { case SQSL_ARRAY_TABLE_END: {
if (data != nullptr) data->push_back((SQSaveLoadType)_script_sl_byte); if (data != nullptr) data->push_back((SQSaveLoadType)type);
return false; return false;
} }
@ -698,9 +677,9 @@ bool ScriptInstance::IsPaused()
/* static */ void ScriptInstance::LoadEmpty() /* static */ void ScriptInstance::LoadEmpty()
{ {
SlObject(nullptr, _script_byte); byte sl_byte = SlReadByte();
/* Check if there was anything saved at all. */ /* Check if there was anything saved at all. */
if (_script_sl_byte == 0) return; if (sl_byte == 0) return;
LoadObjects(nullptr); LoadObjects(nullptr);
} }
@ -712,9 +691,9 @@ bool ScriptInstance::IsPaused()
return nullptr; return nullptr;
} }
SlObject(nullptr, _script_byte); byte sl_byte = SlReadByte();
/* Check if there was anything saved at all. */ /* Check if there was anything saved at all. */
if (_script_sl_byte == 0) return nullptr; if (sl_byte == 0) return nullptr;
ScriptData *data = new ScriptData(); ScriptData *data = new ScriptData();
data->push_back((SQInteger)version); data->push_back((SQInteger)version);

Write Preview
Loading…
Cancel
Save