Skip to content

Commit

Permalink
[fix] Startup failure on Windows due to unexpected global object cons…
Browse files Browse the repository at this point in the history
…truction order in Data::Producer
  • Loading branch information
pajama-coder committed Jul 26, 2024
1 parent f9e7969 commit c42fd19
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 4 deletions.
6 changes: 5 additions & 1 deletion src/data.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,17 @@
namespace pipy {

List<Data::Producer> Data::Producer::s_all_producers;
std::mutex Data::Producer::s_all_producers_mutex;
Data::Producer Data::s_unknown_producer("Unknown");

auto Data::Producer::unknown() -> Producer* {
return &s_unknown_producer;
}

auto Data::Producer::producer_list_mutex() -> std::mutex& {
static std::mutex s_mutex;
return s_mutex;
}

void Data::pack(const Data &data, Producer *producer, double vacancy) {
assert_same_thread(*this);
if (&data == this) return;
Expand Down
7 changes: 4 additions & 3 deletions src/data.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -75,14 +75,14 @@ class Data : public EventTemplate<Data> {
static auto unknown() -> Producer*;

static void for_each(const std::function<void(Producer*)> &cb) {
std::lock_guard<std::mutex> lock(s_all_producers_mutex);
std::lock_guard<std::mutex> lock(producer_list_mutex());
for (auto p = s_all_producers.head(); p; p = p->next()) {
cb(p);
}
}

Producer(const std::string &name) : m_name(name), m_count(0) {
std::lock_guard<std::mutex> lock(s_all_producers_mutex);
std::lock_guard<std::mutex> lock(producer_list_mutex());
s_all_producers.push(this);
}

Expand All @@ -109,11 +109,12 @@ class Data : public EventTemplate<Data> {
std::string m_name;
std::atomic<size_t> m_count;

static auto producer_list_mutex() -> std::mutex&;

void increase() { m_count.fetch_add(1, std::memory_order_relaxed); }
void decrease() { m_count.fetch_sub(1, std::memory_order_relaxed); }

static List<Producer> s_all_producers;
static std::mutex s_all_producers_mutex;

friend struct Chunk;
};
Expand Down

0 comments on commit c42fd19

Please sign in to comment.