folkslinux
/
mamba
mirror of https://github.com/mamba-org/mamba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

homebrew workaround attempt

This commit is contained in:
Klaim (Joël Lamotte) 2025-07-23 12:42:22 +02:00 committed by Joël Lamotte (Klaim)
parent 082acf5d7e
commit 1f40fef971
2 changed files with 30 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libmamba/include/mamba/util/synchronized_value.hpp
View File

@ -546,12 +546,7 @@ namespace mamba::util
///////////////////////////////////////////////////////////////////////////////////////////
template <std::default_initializable T, Mutex M>
constexpr synchronized_value<T, M>::synchronized_value(
) noexcept(std::is_nothrow_default_constructible_v<T>)
{
// NOTE: non-defaulted because of homebrew/clang compiler not liking the defaulted version
// for some reason
}
constexpr synchronized_value<T, M>::synchronized_value() noexcept(std::is_nothrow_default_constructible_v<T>) = default;
template <std::default_initializable T, Mutex M>
synchronized_value<T, M>::synchronized_value(T value) noexcept

32
libmamba/src/core/logging.cpp
View File

@ -128,7 +128,33 @@ namespace mamba::logging
{
constinit std::atomic<bool> message_logger_use_buffer;
using MessageLoggerBuffer = std::vector<LogRecord>;
// NOTE: this looks complicated because it's a workaround `std::vector` implementations
// which are not `constexpr` (required by c++20), we defer the vector creation to the moment it's needed.
// Constexpr constructor is required for a type which is usable in a `constinit` declaration,
// which is required to avoid the static-initialization-fiasco (at least for initialization).
struct MessageLoggerBuffer
{
using buffer = std::vector<LogRecord>;
constexpr MessageLoggerBuffer() = default;
template<class T>
auto push_back(T&& record)
{
return ready_records().push_back(std::forward<T>(record));
}
auto ready_records() -> buffer&
{
if (not records)
{
records = buffer{};
}
return *records;
}
std::optional<buffer> records;
};
constinit util::synchronized_value<MessageLoggerBuffer> message_logger_buffer;
auto
@ -193,8 +219,8 @@ namespace mamba::logging
void MessageLogger::print_buffer(std::ostream& /*ostream*/)
{
MessageLoggerBuffer tmp;
message_logger_buffer->swap(tmp);
MessageLoggerBuffer::buffer tmp;
message_logger_buffer->ready_records().swap(tmp);
for (auto& log_record : tmp)
{