Skip to content

Make EventTrace access thread safe. #238

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 15, 2022
Merged

Make EventTrace access thread safe. #238

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 16 additions & 12 deletions src/gpgmm/TraceEvent.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,32 +16,38 @@

#include "gpgmm/EventTraceWriter.h"

#include <mutex>
#include <string>

namespace gpgmm {

static std::unique_ptr<EventTraceWriter> gEventTrace;
static EventTraceWriter* gEventTrace;
static std::mutex mMutex;

static EventTraceWriter* GetInstance() {
std::lock_guard<std::mutex> lock(mMutex);
if (gEventTrace == nullptr) {
gEventTrace = new EventTraceWriter();
}
return gEventTrace;
}

void StartupEventTrace(const std::string& traceFile,
bool skipDurationEvents,
bool skipObjectEvents,
bool skipInstantEvents) {
if (gEventTrace == nullptr) {
gEventTrace = std::make_unique<EventTraceWriter>();
}

TRACE_EVENT_METADATA1(TraceEventCategory::Metadata, "thread_name", "name",
"GPGMM_MainThread");

#if !defined(GPGMM_ENABLE_RECORDING_UNTIL_TERMINATION)
gEventTrace->FlushQueuedEventsToDisk();
GetInstance()->FlushQueuedEventsToDisk();
#endif
gEventTrace->SetConfiguration(traceFile, skipDurationEvents, skipObjectEvents,
skipInstantEvents);
GetInstance()->SetConfiguration(traceFile, skipDurationEvents, skipObjectEvents,
skipInstantEvents);
}

bool IsEventTraceEnabled() {
return (gEventTrace != nullptr);
return (GetInstance() != nullptr);
}

TraceEvent::TraceEvent(char phase,
Expand All @@ -68,8 +74,6 @@ namespace gpgmm {
uint64_t id,
uint32_t flags,
const JSONDict& args) {
if (gEventTrace != nullptr) {
gEventTrace->EnqueueTraceEvent(phase, category, name, id, flags, args);
}
GetInstance()->EnqueueTraceEvent(phase, category, name, id, flags, args);
}
} // namespace gpgmm