diff options
author | Bartosz Taudul <wolf.pld@gmail.com> | 2019-08-14 14:53:25 +0300 |
---|---|---|
committer | Bartosz Taudul <wolf.pld@gmail.com> | 2019-08-14 14:55:05 +0300 |
commit | 0bb0c10e3c10adc6a0de3687e22ca3455acc19c5 (patch) | |
tree | 566860ffbebb47bc31b3a3e8d0ecdc0a00dfbced /server/TracyWorker.cpp | |
parent | 3996516fcebdf76e2171a8fef7863f2a7e071e94 (diff) |
Revert "Save one byte on ContextSwitchData."
Counting bits is hard, let's go shopping.
Diffstat (limited to 'server/TracyWorker.cpp')
-rw-r--r-- | server/TracyWorker.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/server/TracyWorker.cpp b/server/TracyWorker.cpp index 96b12f54..a1be5640 100644 --- a/server/TracyWorker.cpp +++ b/server/TracyWorker.cpp @@ -1167,7 +1167,7 @@ Worker::Worker( FileRead& f, EventType::Type eventMask ) { ptr->start = ReadTimeOffset( f, refTime ); ptr->end = ReadTimeOffset( f, refTime ); - f.Read( &ptr->cpu, sizeof( ptr->cpu ) + sizeof( ptr->data ) ); + f.Read( &ptr->cpu, sizeof( ptr->cpu ) + sizeof( ptr->reason ) + sizeof( ptr->state ) ); ptr++; } m_data.ctxSwitch.emplace( thread, data ); @@ -3726,9 +3726,8 @@ void Worker::ProcessContextSwitch( const QueueContextSwitch& ev ) auto& item = data.back(); assert( item.start <= time ); item.end = time; - assert( ( ev.reason & 0xF ) == ev.reason ); - assert( ( ev.state & 0xF ) == ev.state ); - item.data = ev.reason | ( ev.state << 4 ); + item.reason = ev.reason; + item.state = ev.state; } } if( ev.newThread != 0 ) @@ -3745,7 +3744,8 @@ void Worker::ProcessContextSwitch( const QueueContextSwitch& ev ) item.start = time; item.end = -1; item.cpu = ev.cpu; - item.data = ~0; + item.reason = -1; + item.state = -1; } } @@ -4496,7 +4496,7 @@ void Worker::Write( FileWrite& f ) { WriteTimeOffset( f, refTime, cs.start ); WriteTimeOffset( f, refTime, cs.end ); - f.Write( &cs.cpu, sizeof( cs.cpu ) + sizeof( cs.data ) ); + f.Write( &cs.cpu, sizeof( cs.cpu ) + sizeof( cs.reason ) + sizeof( cs.state ) ); } } } |