Skip to content

Fix time measurement when EASY_CHRONO_CLOCK is defined #227

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

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

Fix time measurement when EASY_CHRONO_CLOCK is defined #227

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
27 changes: 27 additions & 0 deletions easy_profiler_core/event_trace_win.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,26 @@ static thread_process_info_map THREAD_PROCESS_INFO_TABLE;

//////////////////////////////////////////////////////////////////////////

// "The frequency of the performance counter is fixed at system boot and is consistent across all processors.
// Therefore, the frequency need only be queried upon application initialization, and the result can be cached."
// � https://learn.microsoft.com/en-us/windows/win32/api/profileapi/nf-profileapi-queryperformancefrequency
extern const LONGLONG PERFORMANCE_FREQUENCY = []()
{
LARGE_INTEGER freq;
QueryPerformanceFrequency(&freq);
return freq.QuadPart;
}();

#ifdef EASY_CHRONO_CLOCK
static profiler::timestamp_t ticks2time(LONGLONG ticks)
{
EASY_CONSTEXPR auto clock_freq = EASY_CHRONO_CLOCK::period::den / EASY_CHRONO_CLOCK::period::num;
return static_cast<profiler::timestamp_t>(static_cast<double>(ticks) / PERFORMANCE_FREQUENCY * clock_freq);
}
#endif

//////////////////////////////////////////////////////////////////////////

void WINAPI easyProcessTraceEvent(PEVENT_RECORD _traceEvent)
{
if (_traceEvent->EventHeader.EventDescriptor.Opcode != SWITCH_CONTEXT_OPCODE)
Expand All @@ -220,7 +240,14 @@ void WINAPI easyProcessTraceEvent(PEVENT_RECORD _traceEvent)
EASY_FUNCTION(EASY_COLOR_INTERNAL_EVENT, profiler::OFF);

auto _contextSwitchEvent = reinterpret_cast<CSwitch*>(_traceEvent->UserData);

#ifdef EASY_CHRONO_CLOCK
// We need to use uniform time units, so we need to cast the ticks to time of the clock.
const auto time = ticks2time(_traceEvent->EventHeader.TimeStamp.QuadPart);
#else
// OK, time is measured only in ticks.
const auto time = static_cast<profiler::timestamp_t>(_traceEvent->EventHeader.TimeStamp.QuadPart);
#endif
if (time > TRACING_END_TIME.load(std::memory_order_acquire))
return;

Expand Down
10 changes: 7 additions & 3 deletions easy_profiler_core/profile_manager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,12 @@ EASY_CONSTEXPR profiler::color_t EASY_COLOR_END = 0xfff44336; // profiler::color

//////////////////////////////////////////////////////////////////////////

#ifdef _WIN32
extern const LONGLONG PERFORMANCE_FREQUENCY;
#endif

//////////////////////////////////////////////////////////////////////////

EASY_CONSTEXPR uint8_t FORCE_ON_FLAG = profiler::FORCE_ON & ~profiler::ON;

//////////////////////////////////////////////////////////////////////////
Expand Down Expand Up @@ -259,9 +265,7 @@ static EASY_CONSTEXPR_FCN int64_t calculate_cpu_frequency()
#elif defined(_WIN32)
static int64_t calculate_cpu_frequency()
{
LARGE_INTEGER freq;
QueryPerformanceFrequency(&freq);
return static_cast<int64_t>(freq.QuadPart);
return static_cast<int64_t>(PERFORMANCE_FREQUENCY);
}
#else
# ifndef __APPLE__
Expand Down