diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2024-09-04 14:07:26 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2024-09-04 14:07:26 -0400 |
| commit | ea24ac899ca28a587be0e187b77873a25d08a556 (patch) | |
| tree | 4645577b8c1e3b60079a67c98dd95c9a03a7c8c6 /indra/llplugin/llpluginprocessparent.h | |
| parent | 03d7f2b84daf9ab991de6cad7d6149abda1ef716 (diff) | |
Extract coroutine-aware synchronization primitives to new header.
Changes on new main and changes on Lua project branch combined into a header
circularity. Resolved by hoisting coroutine-aware synchronization primitives
out to a new llcoromutex.h file in the `llcoro` namespace, rather than being
literally members of the `LLCoros` class. But retained `using` declarations in
`LLCoros` for backwards compatibility.
Diffstat (limited to 'indra/llplugin/llpluginprocessparent.h')
| -rw-r--r-- | indra/llplugin/llpluginprocessparent.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llplugin/llpluginprocessparent.h b/indra/llplugin/llpluginprocessparent.h index d1c4933d81..903be35526 100644 --- a/indra/llplugin/llpluginprocessparent.h +++ b/indra/llplugin/llpluginprocessparent.h @@ -33,6 +33,7 @@ #include <boost/enable_shared_from_this.hpp> #include "llapr.h" +#include "llcoromutex.h" #include "llprocess.h" #include "llpluginmessage.h" #include "llpluginmessagepipe.h" @@ -207,7 +208,7 @@ private: apr_pollfd_t mPollFD; static apr_pollset_t *sPollSet; static bool sPollsetNeedsRebuild; - static LLCoros::Mutex *sInstancesMutex; + static llcoro::Mutex *sInstancesMutex; static mapInstances_t sInstances; static void dirtyPollSet(); static void updatePollset(); |