Ticket #4053: autorequestfix_v2.patch

source/gui/GUIManager.cpp

@@ -115 +115 @@
     shared_ptr<ScriptInterface::StructuredClone> initDataClone = m_PageStack.back().initData;
     PopPage();
 
     shared_ptr<ScriptInterface> scriptInterface = m_PageStack.back().gui->GetScriptInterface();
     JSContext* cx = scriptInterface->GetContext();
+    JSAutoRequest rq(cx);
+
     JS::RootedValue initDataVal(cx);
     if (!initDataClone)
     {
         LOGERROR("Called PopPageCB when initData (which should contain the callback function name) isn't set!");
         return;

source/network/NetTurnManager.cpp

@@ -300 +300 @@
         debug_warn(L"Received command for invalid turn");
         return;
     }
 
     m_Simulation2.GetScriptInterface().FreezeObject(data, true);
-    m_QueuedCommands[turn - (m_CurrentTurn+1)][client].emplace_back(player, m_Simulation2.GetScriptInterface().GetContext(), data);
+
+    JSContext* cx = m_Simulation2.GetScriptInterface().GetContext();
+    JSAutoRequest rq(cx);
+
+    m_QueuedCommands[turn - (m_CurrentTurn+1)][client].emplace_back(player, cx, data);
 }
 
 void CNetTurnManager::FinishedAllCommands(u32 turn, u32 turnLength)
 {
     NETTURN_LOG((L"FinishedAllCommands(%d, %d)\n", turn, turnLength));
@@ -564 +568 @@
 {
     debug_printf("Executing turn %u of %u\n", turn, m_FinalTurn);
 
     m_TurnLength = m_ReplayTurnLengths[turn];
 
+    JSContext* cx = m_Simulation2.GetScriptInterface().GetContext();
+    JSAutoRequest rq(cx);
+
     // Simulate commands for that turn
     for (const std::pair<player_id_t, std::string>& p : m_ReplayCommands[turn])
     {
-        JS::RootedValue command(m_Simulation2.GetScriptInterface().GetContext());
+        JS::RootedValue command(cx);
         m_Simulation2.GetScriptInterface().ParseJSON(p.second, &command);
         AddCommand(m_ClientId, p.first, command, m_CurrentTurn + 1);
     }
 
     if (turn == m_FinalTurn)

source/ps/Game.cpp

@@ -183 +183 @@
     std::string type;
     ENSURE((*m_ReplayStream >> type).good() && type == "start");
 
     std::string line;
     std::getline(*m_ReplayStream, line);
-    JS::RootedValue attribs(scriptInterface.GetContext());
+
+    JSContext* cx = scriptInterface.GetContext();
+    JSAutoRequest rq(cx);
+
+    JS::RootedValue attribs(cx);
     scriptInterface.ParseJSON(line, &attribs);
     StartGame(&attribs, "");
 
     return true;
 }

source/ps/scripting/JSInterface_VFS.cpp

@@ -89 +89 @@
     if (!filterStr.empty())
         filter = filterStr.c_str();
  
     int flags = recurse ? vfs::DIR_RECURSIVE : 0;
 
+    JSContext* cx = pCxPrivate->pScriptInterface->GetContext();
+    JSAutoRequest rq(cx);
+
     // build array in the callback function
-    BuildDirEntListState state(pCxPrivate->pScriptInterface->GetContext());
+    BuildDirEntListState state(cx);
     vfs::ForEachFile(g_VFS, path, BuildDirEntListCB, (uintptr_t)&state, filter, flags);
 
     return OBJECT_TO_JSVAL(state.filename_array);
 }
 

source/simulation2/components/CCmpAIManager.cpp

@@ -296 +296 @@
         JS::HandleValue position, JS::HandleValue goal, pass_class_t passClass)
     {
         ENSURE(pCxPrivate->pCBData);
         CAIWorker* self = static_cast<CAIWorker*> (pCxPrivate->pCBData);
         JSContext* cx(self->m_ScriptInterface->GetContext());
+        JSAutoRequest rq(cx);
 
         CFixedVector2D pos, goalPos;
         std::vector<CFixedVector2D> waypoints;
         JS::RootedValue retVal(cx);
 
@@ -325 +326 @@
     static JS::Value GetConnectivityGrid(ScriptInterface::CxPrivate* pCxPrivate, pass_class_t passClass)
     {
         ENSURE(pCxPrivate->pCBData);
         CAIWorker* self = static_cast<CAIWorker*> (pCxPrivate->pCBData);
         JSContext* cx(self->m_ScriptInterface->GetContext());
+        JSAutoRequest rq(cx);
 
         JS::RootedValue retVal(cx);
         self->m_ScriptInterface->ToJSVal<Grid<u16> >(cx, &retVal, self->m_LongPathfinder.GetConnectivityGrid(passClass));
         return retVal;
     }
@@ -519 +521 @@
     {
         ENSURE(m_CommandsComputed);
 
         m_GameState = gameState;
         JSContext* cx = m_ScriptInterface->GetContext();
+        JSAutoRequest rq(cx);
 
         if (dirtinessInformations.dirty)
         {
             m_PassabilityMap = passabilityMap;
             if (dirtinessInformations.globallyDirty)
@@ -768 +771 @@
     void RegisterSerializablePrototype(std::wstring name, JS::HandleValue proto)
     {
         // Require unique prototype and name (for reverse lookup)
         // TODO: this is yucky - see comment in Deserialize()
         ENSURE(proto.isObject() && "A serializable prototype has to be an object!");
-        JS::RootedObject obj(m_ScriptInterface->GetContext(), &proto.toObject());
+
+        JSContext* cx = m_ScriptInterface->GetContext();
+        JSAutoRequest rq(cx);
+
+        JS::RootedObject obj(cx, &proto.toObject());
         if (m_SerializablePrototypes->has(obj) || m_DeserializablePrototypes.find(name) != m_DeserializablePrototypes.end())
         {
             LOGERROR("RegisterSerializablePrototype called with same prototype multiple times: p=%p n='%s'", (void *)obj.get(), utf8_from_wstring(name));
             return;
         }
-        m_SerializablePrototypes->add(m_ScriptInterface->GetContext(), obj, name);
+        m_SerializablePrototypes->add(cx, obj, name);
         m_DeserializablePrototypes[name] = JS::Heap<JSObject*>(obj);
     }
 
 private:
     static void Trace(JSTracer *trc, void *data)

source/simulation2/components/CCmpCommandQueue.cpp

@@ -80 +80 @@
     }
 
     virtual void PushLocalCommand(player_id_t player, JS::HandleValue cmd)
     {
         JSContext* cx = GetSimContext().GetScriptInterface().GetContext();
+        JSAutoRequest rq(cx);
+
         m_LocalQueue.emplace_back(SimulationCommand(player, cx, cmd));
     }
 
     virtual void PostNetworkCommand(JS::HandleValue cmd1)
     {

source/simulation2/serialization/BinarySerializer.cpp

@@ -436 +436 @@
     // If it was already there, return the tag
     u32 tag;
     if (m_ScriptBackrefs.find(obj, tag))
         return tag;
 
-    m_ScriptBackrefs.add(m_ScriptInterface.GetContext(), obj, m_ScriptBackrefsNext);
+    JSContext* cx = m_ScriptInterface.GetContext();
+    JSAutoRequest rq(cx);
+
+    m_ScriptBackrefs.add(cx, obj, m_ScriptBackrefsNext);
 
     m_ScriptBackrefsNext++;
     // Return a non-tag number so callers know they need to serialize the object
     return 0;
 }

source/simulation2/serialization/StdDeserializer.cpp

@@ -464 +464 @@
 
 #if BYTE_ORDER != LITTLE_ENDIAN
 #error TODO: probably need to convert JS strings from little-endian
 #endif
 
-    out.set(JS_NewUCStringCopyN(m_ScriptInterface.GetContext(), (const char16_t*)str.data(), str.length()));
+    JSContext* cx = m_ScriptInterface.GetContext();
+    JSAutoRequest rq(cx);
+
+    out.set(JS_NewUCStringCopyN(cx, (const char16_t*)str.data(), str.length()));
     if (!out)
         throw PSERROR_Deserialize_ScriptError("JS_NewUCStringCopyN failed");
 }
 
 void CStdDeserializer::ScriptVal(const char* name, JS::MutableHandleValue out)