Skip to content
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

Common: Make Profiler thread safe #13467

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Common: Make Profiler thread safe #13467

Show file tree
Hide file tree
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
19 changes: 10 additions & 9 deletions Source/Core/Common/Profiler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,8 @@ std::string Profiler::s_lazy_result;
int Profiler::s_lazy_delay = 0;

Profiler::Profiler(const std::string& name)
: m_name(name), m_usecs(0), m_usecs_min(UINT64_MAX), m_usecs_max(0), m_usecs_quad(0),
m_calls(0), m_depth(0)
: m_name(name), m_usecs(0), m_usecs_min(UINT64_MAX), m_usecs_max(0), m_usecs_quad(0), m_calls(0)
{
m_time = Common::Timer::NowUs();
s_max_length = std::max<u32>(s_max_length, u32(m_name.length()));

std::lock_guard<std::mutex> lk(s_mutex);
Expand Down Expand Up @@ -97,22 +95,23 @@ std::string Profiler::ToString()
return s_lazy_result;
}

void Profiler::Start()
void Profiler::Start(u64* time, int* depth)
{
if (!m_depth++)
if ((*depth)++ == 0)
{
m_time = Common::Timer::NowUs();
*time = Common::Timer::NowUs();
}
}

void Profiler::Stop()
void Profiler::Stop(u64* time, int* depth)
{
if (!--m_depth)
if (--(*depth) == 0)
{
u64 end = Common::Timer::NowUs();

u64 diff = end - m_time;
u64 diff = end - *time;

std::lock_guard lk(m_mutex);
m_usecs += diff;
m_usecs_min = std::min(m_usecs_min, diff);
m_usecs_max = std::max(m_usecs_max, diff);
Expand All @@ -123,6 +122,8 @@ void Profiler::Stop()

std::string Profiler::Read()
{
std::lock_guard lk(m_mutex);

double avg = 0;
double stdev = 0;
double time_rel = 0;
Expand Down
24 changes: 15 additions & 9 deletions Source/Core/Common/Profiler.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ class Profiler

static std::string ToString();

void Start();
void Stop();
void Start(u64* time, int* depth);
void Stop(u64* time, int* depth);
std::string Read();

bool operator<(const Profiler& b) const;
Expand All @@ -35,28 +35,34 @@ class Profiler
static std::string s_lazy_result;
static int s_lazy_delay;

std::mutex m_mutex;
std::string m_name;
u64 m_usecs;
u64 m_usecs_min;
u64 m_usecs_max;
u64 m_usecs_quad;
u64 m_calls;
u64 m_time;
int m_depth;
};

class ProfilerExecuter
{
public:
ProfilerExecuter(Profiler* _p) : m_p(_p) { m_p->Start(); }
~ProfilerExecuter() { m_p->Stop(); }
ProfilerExecuter(Profiler* profiler, u64* time, int* depth)
: m_profiler(profiler), m_time(time), m_depth(depth)
{
m_profiler->Start(m_time, m_depth);
}
~ProfilerExecuter() { m_profiler->Stop(m_time, m_depth); }

private:
Profiler* m_p;
Profiler* m_profiler;
u64* m_time;
int* m_depth;
};
} // namespace Common

// Warning: This profiler isn't thread safe. Only profile functions which doesn't run simultaneously
#define PROFILE(name) \
static Common::Profiler prof_gen(name); \
Common::ProfilerExecuter prof_e(&prof_gen);
static thread_local u64 prof_time; \
static thread_local int prof_depth; \
Common::ProfilerExecuter prof_e(&prof_gen, &prof_time, &prof_depth);