Skip to content

Commit dcd46e6

Browse files
committed
Timer -> GlobalTimer for thread timers, add dependencyTimer
1 parent 8c8104a commit dcd46e6

2 files changed

Lines changed: 11 additions & 8 deletions

File tree

src/engine/renderer-vulkan/Thread/Thread.cpp

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -112,14 +112,16 @@ void Thread::Run() {
112112
task->Execute( task->data );
113113
task->active = false;
114114
task->complete.Signal();
115+
execing.Stop();
115116

117+
dependencyTimer.Start();
116118
task->forwardTaskLock.Finish();
117119
const uint32_t forwardTasks = task->forwardTaskCounter.load( std::memory_order_relaxed );
118120
for ( uint32_t i = 0; i < forwardTasks; i++ ) {
119121
taskList.FinishDependency( task->forwardTasks[i] );
120122
}
123+
dependencyTimer.Stop();
121124

122-
execing.Stop();
123125
t.Stop();
124126

125127
taskTimes[task->Execute].count++;
@@ -144,10 +146,10 @@ void Thread::Exit() {
144146

145147
osThread.join();
146148

147-
Log::NoticeTag( "id: %u", id );
149+
Log::NoticeTag( "\nid: %u", id );
148150

149-
Log::NoticeTag( "id: %u: total: %s, fetching: %s, execing: %s, idle: %s\n", id, total.FormatTime( Timer::ms ),
150-
fetching.FormatTime( Timer::ms ), execing.FormatTime( Timer::ms ),
151+
Log::NoticeTag( "id: %u: total: %s, fetching: %s, execing: %s, dependency: %s, idle: %s", id, total.FormatTime( Timer::ms ),
152+
fetching.FormatTime( Timer::ms ), execing.FormatTime( Timer::ms ), dependencyTimer.FormatTime( Timer::ms ),
151153
idle.FormatTime( Timer::ms ) );
152154

153155
Log::NoticeTag( "id: %u: fetch: queueLock: %s, outer: %s", id, Timer::FormatTime( fetchQueueLock, Timer::ms ),

src/engine/renderer-vulkan/Thread/Thread.h

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,10 +67,11 @@ class Thread :
6767
bool running = true;
6868
bool exiting = false;
6969

70-
Timer total;
71-
Timer fetching;
72-
Timer idle;
73-
Timer execing;
70+
GlobalTimer total;
71+
GlobalTimer fetching;
72+
GlobalTimer idle;
73+
GlobalTimer execing;
74+
GlobalTimer dependencyTimer;
7475

7576
uint64_t fetchQueueLock;
7677
uint64_t fetchOuter;

0 commit comments

Comments
 (0)