Itms/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Remove some obsolete backref logic from the deserializer. It was introduced in earlier versions of the SpiderMonkey API.

Browse Source 
Name some variables more logically in one test.

Fixes #4244

This was SVN commit r18993.
This commit is contained in:
Nicolas Auvray 2016-11-24 14:47:49 +00:00
parent 808dd347b6
commit a27dc31b0e
3 changed files with 17 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
source/simulation2/serialization/StdDeserializer.cpp
View File

@ -44,7 +44,6 @@ CStdDeserializer::CStdDeserializer(ScriptInterface& scriptInterface, std::istrea
CStdDeserializer::~CStdDeserializer()
{
FreeScriptBackrefs();
JS_RemoveExtraGCRootsTracer(m_ScriptInterface.GetJSRuntime(), CStdDeserializer::Trace, this);
}
@ -121,23 +120,6 @@ void CStdDeserializer::GetScriptBackref(u32 tag, JS::MutableHandleObject ret)
ret.set(m_ScriptBackrefs[tag]);
}
u32 CStdDeserializer::ReserveScriptBackref()
{
m_ScriptBackrefs.push_back(JS::Heap<JSObject*>(m_dummyObject));
return m_ScriptBackrefs.size()-1;
}
void CStdDeserializer::SetReservedScriptBackref(u32 tag, JS::HandleObject obj)
{
ENSURE(m_ScriptBackrefs[tag] == m_dummyObject);
m_ScriptBackrefs[tag] = JS::Heap<JSObject*>(obj);
}
void CStdDeserializer::FreeScriptBackrefs()
{
m_ScriptBackrefs.clear();
}
////////////////////////////////////////////////////////////////
jsval CStdDeserializer::ReadScriptVal(const char* UNUSED(name), JS::HandleObject appendParent)
@ -202,6 +184,8 @@ jsval CStdDeserializer::ReadScriptVal(const char* UNUSED(name), JS::HandleObject
if (hasCustomDeserialize)
{
AddScriptBackref(obj);
JS::RootedValue serialize(cx);
if (!JS_GetProperty(cx, obj, "Serialize", &serialize))
throw PSERROR_Serialize_ScriptError("JS_GetProperty failed");
@ -215,8 +199,6 @@ jsval CStdDeserializer::ReadScriptVal(const char* UNUSED(name), JS::HandleObject
JS::RootedValue objVal(cx, JS::ObjectValue(*obj));
m_ScriptInterface.CallFunctionVoid(objVal, "Deserialize", data);
AddScriptBackref(obj);
return JS::ObjectValue(*obj);
}
}
@ -352,7 +334,8 @@ jsval CStdDeserializer::ReadScriptVal(const char* UNUSED(name), JS::HandleObject
NumberU32_Unbounded("length", length);
// To match the serializer order, we reserve the typed array's backref tag here
u32 arrayTag = ReserveScriptBackref();
JS::RootedObject arrayObj(cx);
AddScriptBackref(arrayObj);
// Get buffer object
JS::RootedValue bufferVal(cx, ReadScriptVal("buffer", JS::NullPtr()));
@ -364,7 +347,6 @@ jsval CStdDeserializer::ReadScriptVal(const char* UNUSED(name), JS::HandleObject
if (!JS_IsArrayBufferObject(bufferObj))
throw PSERROR_Deserialize_ScriptError("js_IsArrayBuffer failed");
JS::RootedObject arrayObj(cx);
switch(arrayType)
{
case SCRIPT_TYPED_ARRAY_INT8:
@ -400,8 +382,6 @@ jsval CStdDeserializer::ReadScriptVal(const char* UNUSED(name), JS::HandleObject
if (!arrayObj)
throw PSERROR_Deserialize_ScriptError("js_CreateTypedArrayWithBuffer failed");
SetReservedScriptBackref(arrayTag, arrayObj);
return JS::ObjectValue(*arrayObj);
}
case SCRIPT_TYPE_ARRAY_BUFFER:
@ -423,38 +403,37 @@ jsval CStdDeserializer::ReadScriptVal(const char* UNUSED(name), JS::HandleObject
case SCRIPT_TYPE_OBJECT_MAP:
{
JS::RootedObject obj(cx, JS::NewMapObject(cx));
AddScriptBackref(obj);
u32 mapSize;
NumberU32_Unbounded("map size", mapSize);
// To match the serializer order, we reserve the map's backref tag here
u32 mapTag = ReserveScriptBackref();
for (u32 i=0; i<mapSize; ++i)
{
JS::RootedValue key(cx, ReadScriptVal("map key", JS::NullPtr()));
JS::RootedValue value(cx, ReadScriptVal("map value", JS::NullPtr()));
JS::MapSet(cx, obj, key, value);
}
SetReservedScriptBackref(mapTag, obj);
return JS::ObjectValue(*obj);
}
case SCRIPT_TYPE_OBJECT_SET:
{
u32 setSize;
NumberU32_Unbounded("set size", setSize);
JS::RootedValue setVal(cx);
m_ScriptInterface.Eval("(new Set())", &setVal);
// To match the serializer order, we reserve the set's backref tag here
u32 setTag = ReserveScriptBackref();
JS::RootedObject setObj(cx, &setVal.toObject());
AddScriptBackref(setObj);
u32 setSize;
NumberU32_Unbounded("set size", setSize);
for (u32 i=0; i<setSize; ++i)
{
JS::RootedValue value(cx, ReadScriptVal("set value", JS::NullPtr()));
m_ScriptInterface.CallFunctionVoid(setVal, "add", value);
}
JS::RootedObject setObj(cx, &setVal.toObject());
SetReservedScriptBackref(setTag, setObj);
return setVal;
}
default:

5
source/simulation2/serialization/StdDeserializer.h
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2013 Wildfire Games.
/* Copyright (C) 2016 Wildfire Games.
* This file is part of 0 A.D.
*
* 0 A.D. is free software: you can redistribute it and/or modify
@ -54,9 +54,6 @@ private:
virtual void AddScriptBackref(JS::HandleObject obj);
virtual void GetScriptBackref(u32 tag, JS::MutableHandleObject ret);
virtual u32 ReserveScriptBackref();
virtual void SetReservedScriptBackref(u32 tag, JS::HandleObject obj);
void FreeScriptBackrefs();
std::vector<JS::Heap<JSObject*> > m_ScriptBackrefs;
JS::PersistentRooted<JSObject*> m_dummyObject;

6
source/simulation2/tests/test_Serializer.h
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2015 Wildfire Games.
/* Copyright (C) 2016 Wildfire Games.
* This file is part of 0 A.D.
*
* 0 A.D. is free software: you can redistribute it and/or modify
@ -673,7 +673,7 @@ public:
);
helper_script_roundtrip("Nested maps using backrefs",
"var a = new Map(); var b = new Map(); b.set(1, a); b.set(2, a); b",
"var a = new Map(); var b = new Map(); a.set(1, b); a.set(2, b); a",
/* expected: */
"({})",
/* expected stream: */
@ -689,7 +689,7 @@ public:
"\x05" // SCRIPT_TYPE_INT
"\x02\0\0\0" // 2
"\x08" // SCRIPT_TYPE_BACKREF
"\x02\0\0\0" // ref. to object #2, i.e. "a", with #1 being "b"
"\x02\0\0\0" // ref. to object #2, i.e. "b", with #1 being "a"
);
}