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

Instrumentation fixes for #176 and #181 #179

Merged
merged 12 commits into from
Jan 12, 2020
Merged

Instrumentation fixes for #176 and #181 #179

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
e324aee
Avoid std::hash hack on ProfileResult::ThreadId
0xworks Nov 29, 2019
22cd042
Remove InstrumentationSession.
0xworks Nov 29, 2019
a686b12
Remove accidentally committed .json files
0xworks Nov 29, 2019
9b31a4e
Fix white-space inconsistencies
0xworks Nov 29, 2019
048e7ad
Put back InstrumentationSession (reverted 22cd042f)
0xworks Nov 29, 2019
344d041
WIP use m_CurrentSession to guard against potential mismatched Begin…
0xworks Nov 29, 2019
54ae187
Fix potential race-conditoin on m_CurrentSession pointer
0xworks Dec 1, 2019
3d73b18
In Instrumentor::WriteProfie(), hold lock for less time
0xworks Dec 5, 2019
1158d93
Remove Instrumentor::m_ProfileCount (as otherwise it would need to be…
0xworks Dec 5, 2019
6c2a24a
Instrumentor::WriteProfile() needs to check for current session after…
0xworks Dec 6, 2019
5c165fe
Add extra check for Log::GetCoreLogger()
0xworks Dec 7, 2019
0aaab1c
Merge branch 'master' into pr/179
LovelySanta Jan 12, 2020
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
Next Next commit
Avoid std::hash hack on ProfileResult::ThreadId
  • Loading branch information
@0xworks
0xworks committed Nov 29, 2019
commit e324aee9ecf7e9e0a52ee7752d0391f05c28ebfc
5 changes: 2 additions & 3 deletions Hazel/src/Hazel/Debug/Instrumentor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ namespace Hazel {
{
std::string Name;
long long Start, End;
uint32_t ThreadID;
std::thread::id ThreadID;
};

struct InstrumentationSession
Expand Down Expand Up @@ -110,8 +110,7 @@ namespace Hazel {
long long start = std::chrono::time_point_cast<std::chrono::microseconds>(m_StartTimepoint).time_since_epoch().count();
long long end = std::chrono::time_point_cast<std::chrono::microseconds>(endTimepoint).time_since_epoch().count();

uint32_t threadID = std::hash<std::thread::id>{}(std::this_thread::get_id());
Instrumentor::Get().WriteProfile({ m_Name, start, end, threadID });
Instrumentor::Get().WriteProfile({ m_Name, start, end, std::this_thread::get_id()});

m_Stopped = true;
}
Expand Down