calc params are now only loaded if a preference is on

normal users dont have to care about this and we can bypass some logic here as a result this also allows us to be really careless with the load params function which basically means im going to tell it to open files endless amounts of times and it wont be slow ok good luck
etternagame · Jul 13, 2021 · 817c913 · 817c913
1 parent a25ec25
commit 817c913
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 10 deletions.
diff --git a/src/Etterna/MinaCalc/MinaCalc.cpp b/src/Etterna/MinaCalc/MinaCalc.cpp
@@ -463,7 +463,7 @@ Calc::InitializeHands(const std::vector<NoteInfo>& NoteInfo,
 	thread_local TheGreatBazoinkazoinkInTheSky ulbu_that_which_consumes_all(
 	  *this);
 	// if debug, force params to load
-	if (debugmode)
+	if (debugmode || loadparams)
 		ulbu_that_which_consumes_all.load_calc_params_from_disk(true);
 	ulbu_that_which_consumes_all();
 

diff --git a/src/Etterna/MinaCalc/MinaCalc.h b/src/Etterna/MinaCalc/MinaCalc.h
@@ -69,6 +69,10 @@ class Calc
 	// set to true for scores, false for cache
 	bool ssr = true;
 
+	// set to true to load params
+	// alternative to telling load_params to force load
+	bool loadparams = false;
+
   private:
 	/* Splits up the chart by each hand and processes them individually to
 	 * produce hand specific base difficulty values, which are then passed to

diff --git a/src/Etterna/MinaCalc/Ulbu.h b/src/Etterna/MinaCalc/Ulbu.h
@@ -112,11 +112,7 @@ struct TheGreatBazoinkazoinkInTheSky
 
 	explicit TheGreatBazoinkazoinkInTheSky(Calc& calc)
 	  : _calc(calc)
-	{
-#if NDEBUG
-		load_calc_params_from_disk();
-#endif
-
+	{		
 		// setup our data pointers
 		_last_mri = std::make_unique<metaRowInfo>();
 		_mri = std::make_unique<metaRowInfo>();
@@ -505,8 +501,8 @@ struct TheGreatBazoinkazoinkInTheSky
 		int iError;
 
 		// Hold calc params program-global persistent info
-		static RageFileBasic* pFile;
-		static XNode params;
+		thread_local RageFileBasic* pFile;
+		thread_local XNode params;
 		// Only ever try to load params once per thread unless forcing
 		thread_local bool paramsLoaded = false;
 
@@ -515,11 +511,10 @@ struct TheGreatBazoinkazoinkInTheSky
 		if (paramsLoaded && !bForce)
 			return;
 
-		// Load if missing or allow a force reload
+		// Load if missing
 		if (pFile == nullptr || bForce) {
 			delete pFile;
 			pFile = FILEMAN->Open(fn, RageFile::READ, iError);
-			paramsLoaded = true;
 			// Failed to load
 			if (pFile == nullptr)
 				return;
@@ -539,6 +534,7 @@ struct TheGreatBazoinkazoinkInTheSky
 		if (vers.empty() || stoi(vers) != GetCalcVersion()) {
 			return;
 		}
+		paramsLoaded = true;
 
 		load_params_for_mod(&params, _s._params, _s.name);
 		load_params_for_mod(&params, _js._params, _js.name);

diff --git a/src/Etterna/Singletons/PrefsManager.cpp b/src/Etterna/Singletons/PrefsManager.cpp
@@ -204,6 +204,7 @@ PrefsManager::PrefsManager()
   , m_bShowLogOutput("ShowLogOutput", TRUE_IF_DEBUG)
   , m_bLogSkips("LogSkips", false)
   , m_show_theme_errors("ShowThemeErrors", false)
+  , m_bAlwaysLoadCalcParams("AlwaysLoadCalcParams", false)
 
 {
 	Init();

diff --git a/src/Etterna/Singletons/PrefsManager.h b/src/Etterna/Singletons/PrefsManager.h
@@ -231,6 +231,7 @@ class PrefsManager
 	Preference<bool> m_bShowLoadingWindow;
 	Preference<bool> m_bPseudoLocalize;
 	Preference<bool> m_show_theme_errors;
+	Preference<bool> m_bAlwaysLoadCalcParams;
 
 	// levels 0, 1, and 2 where higher numbers
 	// means more logging

diff --git a/src/Etterna/Singletons/ScoreManager.cpp b/src/Etterna/Singletons/ScoreManager.cpp
@@ -484,6 +484,7 @@ ScoreManager::RecalculateSSRs(LoadingWindow* ld)
 		  std::pair<vectorIt<HighScore*>, vectorIt<HighScore*>> workload,
 		  ThreadData* data) {
 			const auto per_thread_calc = std::make_unique<Calc>();
+			per_thread_calc->loadparams = PREFSMAN->m_bAlwaysLoadCalcParams;
 
 			auto* pair =
 			  static_cast<std::pair<int, LoadingWindow*>*>(data->data);
@@ -699,6 +700,7 @@ ScoreManager::RecalculateSSRs(const string& profileID)
 		  std::pair<vectorIt<HighScore*>, vectorIt<HighScore*>> workload,
 		  ThreadData* data) {
 			const auto per_thread_calc = std::make_unique<Calc>();
+			per_thread_calc->loadparams = PREFSMAN->m_bAlwaysLoadCalcParams;
 
 			auto scoreIndex = 0;
 			for (auto it = workload.first; it != workload.second; ++it) {

diff --git a/src/Etterna/Singletons/SongManager.cpp b/src/Etterna/Singletons/SongManager.cpp
@@ -92,6 +92,7 @@ SongManager::SongManager()
 
 	// calc for debug/session scores
 	calc = std::make_unique<Calc>();
+	calc->loadparams = PREFSMAN->m_bAlwaysLoadCalcParams;
 }
 
 SongManager::~SongManager()