mirror of
https://github.com/RPCS3/rpcs3.git
synced 2025-08-11 18:50:55 +00:00
Merge 65abf2c2cb
into 2262ac1684
This commit is contained in:
commit
3494c4ff46
1 changed files with 9 additions and 3 deletions
|
@ -397,8 +397,14 @@ void logs::message::broadcast(const char* fmt, const fmt_type_info* sup, ...) co
|
||||||
g_tls_log_control(fmt, 0);
|
g_tls_log_control(fmt, 0);
|
||||||
|
|
||||||
// Get text, extract va_args
|
// Get text, extract va_args
|
||||||
/*constinit thread_local*/ std::string text;
|
constinit thread_local std::unique_ptr<std::string> text_{};
|
||||||
/*constinit thread_local*/ std::basic_string<u64> args;
|
constinit thread_local std::unique_ptr<std::vector<u64>> args_{};
|
||||||
|
if (!text_)
|
||||||
|
text_ = std::make_unique<std::string>();
|
||||||
|
if (!args_)
|
||||||
|
args_ = std::make_unique<std::vector<u64>>();
|
||||||
|
auto& text = *text_;
|
||||||
|
auto& args = *args_;
|
||||||
|
|
||||||
static constexpr fmt_type_info empty_sup{};
|
static constexpr fmt_type_info empty_sup{};
|
||||||
|
|
||||||
|
@ -406,7 +412,7 @@ void logs::message::broadcast(const char* fmt, const fmt_type_info* sup, ...) co
|
||||||
for (auto v = sup; v && v->fmt_string; v++)
|
for (auto v = sup; v && v->fmt_string; v++)
|
||||||
args_count++;
|
args_count++;
|
||||||
|
|
||||||
text.reserve(50000);
|
text.clear();
|
||||||
args.resize(args_count);
|
args.resize(args_count);
|
||||||
|
|
||||||
va_list c_args;
|
va_list c_args;
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue