From 794072c1415e986b95cab65f8217857263d7468a Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Tue, 3 Dec 2019 12:49:18 -0500
Subject: [PATCH] DRTVWR-494: Streamline LLSingleton state machine.
The CONSTRUCTED state was only briefly set between constructSingleton() and
finishInitializing(). But as no consumer code is executed between setting
CONSTRUCTED and setting INITIALIZING, it was impossible to reach the switch
statement in either getInstance() method in state CONSTRUCTED. So there was no
point in state CONSTRUCTED. Remove it.
With CONSTRUCTED gone, we only ever call finishInitializing() right after
constructSingleton(). Merge finishInitializing() into constructSingleton().
---
indra/llcommon/llsingleton.h | 24 ------------------------
1 file changed, 24 deletions(-)
diff --git a/indra/llcommon/llsingleton.h b/indra/llcommon/llsingleton.h
index 4efffde43a3..ebae6010293 100644
--- a/indra/llcommon/llsingleton.h
+++ b/indra/llcommon/llsingleton.h
@@ -57,7 +57,6 @@ class LLSingletonBase: private boost::noncopyable
{
UNINITIALIZED = 0, // must be default-initialized state
CONSTRUCTING, // within DERIVED_TYPE constructor
- CONSTRUCTED, // finished DERIVED_TYPE constructor
INITIALIZING, // within DERIVED_TYPE::initSingleton()
INITIALIZED, // normal case
DELETED // deleteSingleton() or deleteAll() called
@@ -355,7 +354,6 @@ class LLSingleton : public LLSingletonBase
{
sData.mInstance = new DERIVED_TYPE(std::forward<Args>(args)...);
// we have called constructor, have not yet called initSingleton()
- sData.mInitState = CONSTRUCTED;
}
catch (const std::exception& err)
{
@@ -373,10 +371,7 @@ class LLSingleton : public LLSingletonBase
// propagate the exception
throw;
}
- }
- static void finishInitializing()
- {
// getInstance() calls are from within initSingleton()
sData.mInitState = INITIALIZING;
try
@@ -506,11 +501,6 @@ class LLSingleton : public LLSingletonBase
case UNINITIALIZED:
constructSingleton();
- // fall through...
-
- case CONSTRUCTED:
- // still have to call initSingleton()
- finishInitializing();
break;
case INITIALIZING:
@@ -526,7 +516,6 @@ class LLSingleton : public LLSingletonBase
classname<DERIVED_TYPE>().c_str(),
" -- creating new instance");
constructSingleton();
- finishInitializing();
break;
}
@@ -625,7 +614,6 @@ class LLParamSingleton : public LLSingleton<DERIVED_TYPE>
else
{
super::constructSingleton(std::forward<Args>(args)...);
- super::finishInitializing();
}
}
@@ -648,18 +636,6 @@ class LLParamSingleton : public LLSingleton<DERIVED_TYPE>
" from singleton constructor!");
break;
- case super::CONSTRUCTED:
- // Should never happen!? The CONSTRUCTED state is specifically to
- // navigate through LLSingleton::SingletonInitializer getting
- // constructed (once) before LLSingleton::getInstance()'s switch
- // on mInitState. But our initParamSingleton() method calls
- // constructSingleton() and then calls finishInitializing(), which
- // immediately sets INITIALIZING. Why are we here?
- super::logerrs("Param singleton ",
- super::template classname<DERIVED_TYPE>().c_str(),
- "::initSingleton() not yet called");
- break;
-
case super::INITIALIZING:
// As with LLSingleton, explicitly permit circular calls from
// within initSingleton()
--
GitLab