Merge pull request #3017 from secondlife/maxim/viewer-2884

maxim-productengine · web-flow · commit e37996269d8d · 2024-11-06T01:21:52.000+02:00
#2884 fix for stalls caused by coro suspend
diff --git a/indra/llcommon/llcoros.cpp b/indra/llcommon/llcoros.cpp
@@ -472,7 +472,7 @@ LLBoundListener LLCoros::getStopListener(const std::string& caller,
     // This overload responds to viewer shutdown and to killreq(consumer).
     return LLEventPumps::instance().obtain("LLCoros")
         .listen(
-            LLEventPump::inventName(caller),
+            caller,
             [consumer, cleanup](const LLSD& event)
             {
                 auto status{ event["status"].asString() };
diff --git a/indra/llcommon/lleventcoro.cpp b/indra/llcommon/lleventcoro.cpp
@@ -168,7 +168,7 @@ postAndSuspendSetup(const std::string& callerName,
     // notice the pending LLApp status first.
     LLBoundListener stopper(
         LLCoros::getStopListener(
-            listenerName,
+            LLEventPump::ANONYMOUS,
             LLCoros::instance().getName(),
             [&promise, listenerName](const LLSD& status)
             {
diff --git a/indra/llcommon/lualistener.cpp b/indra/llcommon/lualistener.cpp
@@ -40,7 +40,7 @@ LuaListener::LuaListener(lua_State* L):
     // Listen for shutdown events.
     mShutdownConnection(
         LLCoros::getStopListener(
-            "LuaState",
+            LLEventPump::ANONYMOUS,
             mCoroName,
             [this](const LLSD&)
             {

Original file line number	Diff line number	Diff line change
`@@ -472,7 +472,7 @@ LLBoundListener LLCoros::getStopListener(const std::string& caller,`
`472`	`472`	`// This overload responds to viewer shutdown and to killreq(consumer).`
`473`	`473`	`return LLEventPumps::instance().obtain("LLCoros")`
`474`	`474`	`.listen(`
`475`		`- LLEventPump::inventName(caller),`
	`475`	`+ caller,`
`476`	`476`	`[consumer, cleanup](const LLSD& event)`
`477`	`477`	`{`
`478`	`478`	`auto status{ event["status"].asString() };`
Original file line number	Diff line number	Diff line change
`@@ -168,7 +168,7 @@ postAndSuspendSetup(const std::string& callerName,`
`168`	`168`	`// notice the pending LLApp status first.`
`169`	`169`	`LLBoundListener stopper(`
`170`	`170`	`LLCoros::getStopListener(`
`171`		`- listenerName,`
	`171`	`+ LLEventPump::ANONYMOUS,`
`172`	`172`	`LLCoros::instance().getName(),`
`173`	`173`	`[&promise, listenerName](const LLSD& status)`
`174`	`174`	`{`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ LuaListener::LuaListener(lua_State* L):`
`40`	`40`	`// Listen for shutdown events.`
`41`	`41`	`mShutdownConnection(`
`42`	`42`	`LLCoros::getStopListener(`
`43`		`- "LuaState",`
	`43`	`+ LLEventPump::ANONYMOUS,`
`44`	`44`	`mCoroName,`
`45`	`45`	`[this](const LLSD&)`
`46`	`46`	`{`