From 666f7cb564e90ee4efaf210e3f19f69437d1a418 Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Sun, 20 Dec 2020 20:36:45 -0500
Subject: [PATCH] Moar build and crash feex
---
indra/llcommon/llmetricperformancetester.cpp | 4 ++--
indra/llxml/llcontrol.cpp | 7 ++++---
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/indra/llcommon/llmetricperformancetester.cpp b/indra/llcommon/llmetricperformancetester.cpp
index 9a8fbed036c..3b73c8eeaa0 100644
--- a/indra/llcommon/llmetricperformancetester.cpp
+++ b/indra/llcommon/llmetricperformancetester.cpp
@@ -252,14 +252,14 @@ void LLMetricPerformanceTesterBasic::analyzePerformance(llofstream* os, LLSD* ba
/*virtual*/
void LLMetricPerformanceTesterBasic::compareTestResults(llofstream* os, std::string_view metric_string, S32 v_base, S32 v_current)
{
- *os << absl::StrFormat(" ,%s, %d, %d, %d, %.4f\n", metric_string, v_base, v_current,
+ *os << llformat(" ,%s, %d, %d, %d, %.4f\n", std::string(metric_string).c_str(), v_base, v_current,
v_current - v_base, (v_base != 0) ? 100.f * v_current / v_base : 0) ;
}
/*virtual*/
void LLMetricPerformanceTesterBasic::compareTestResults(llofstream* os, std::string_view metric_string, F32 v_base, F32 v_current)
{
- *os << absl::StrFormat(" ,%s, %.4f, %.4f, %.4f, %.4f\n", metric_string, v_base, v_current,
+ *os << llformat(" ,%s, %.4f, %.4f, %.4f, %.4f\n", std::string(metric_string).c_str(), v_base, v_current,
v_current - v_base, (fabs(v_base) > 0.0001f) ? 100.f * v_current / v_base : 0.f ) ;
}
diff --git a/indra/llxml/llcontrol.cpp b/indra/llxml/llcontrol.cpp
index 035d798b6f8..46ca5bcb2a9 100644
--- a/indra/llxml/llcontrol.cpp
+++ b/indra/llxml/llcontrol.cpp
@@ -113,7 +113,6 @@ const S32 CURRENT_VERSION = 101;
typedef std::pair<std::string, U32> settings_pair_t;
typedef std::vector<settings_pair_t> settings_vec_t;
std::map<std::string, int, std::less<>> getCount;
-settings_vec_t getCount_v;
F64 start_time = 0;
std::string SETTINGS_PROFILE = "settings_profile.log";
@@ -431,10 +430,12 @@ void LLControlGroup::cleanup()
}
else
{
+ static settings_vec_t getCount_v;
+
F64 end_time = LLTimer::getTotalSeconds();
U32 total_seconds = (U32)(end_time - start_time);
- std::string msg = absl::StrFormat("Runtime (seconds): %d\n\n No. accesses Avg. accesses/sec Name\n", total_seconds);
+ std::string msg = llformat("Runtime (seconds): %d\n\n No. accesses Avg. accesses/sec Name\n", total_seconds);
size_t data_size = msg.size();
if (fwrite(msg.c_str(), 1, data_size, out) != data_size)
{
@@ -456,7 +457,7 @@ void LLControlGroup::cleanup()
}
if (access_rate >= 2)
{
- msg = absl::StrFormat("%13d %7d %s\n", iter->second, access_rate, iter->first);
+ msg = llformat("%13d %7d %s\n", iter->second, access_rate, iter->first.c_str());
size_t data_size = msg.size();
if (fwrite(msg.c_str(), 1, data_size, out) != data_size)
{
--
GitLab