mirror of
https://github.com/wolfpld/tracy.git
synced 2024-11-27 00:04:35 +00:00
String literal message transfer.
This commit is contained in:
parent
95439a726a
commit
5b9fcddfb3
@ -19,6 +19,7 @@
|
||||
#define TracyPlot(x,y)
|
||||
|
||||
#define TracyMessage(x,y)
|
||||
#define TracyMessageL(x)
|
||||
|
||||
#else
|
||||
|
||||
@ -42,6 +43,7 @@
|
||||
#define TracyPlot( name, val ) tracy::Profiler::PlotData( name, val );
|
||||
|
||||
#define TracyMessage( txt, size ) tracy::Profiler::Message( txt, size );
|
||||
#define TracyMessageL( txt ) tracy::Profiler::Message( txt );
|
||||
|
||||
#endif
|
||||
|
||||
|
@ -285,6 +285,9 @@ bool Profiler::HandleServerQuery()
|
||||
SendString( ptr, (const char*)ptr, QueueType::MessageData );
|
||||
tracy_free( (void*)ptr );
|
||||
break;
|
||||
case ServerQueryMessageLiteral:
|
||||
SendString( ptr, (const char*)ptr, QueueType::MessageData );
|
||||
break;
|
||||
default:
|
||||
assert( false );
|
||||
break;
|
||||
|
@ -146,6 +146,20 @@ public:
|
||||
tail.store( magic + 1, std::memory_order_release );
|
||||
}
|
||||
|
||||
static tracy_force_inline void Message( const char* txt )
|
||||
{
|
||||
uint32_t cpu;
|
||||
Magic magic;
|
||||
auto& token = s_token.ptr;
|
||||
auto& tail = token->get_tail_index();
|
||||
auto item = token->enqueue_begin<moodycamel::CanAlloc>( magic );
|
||||
item->hdr.type = QueueType::MessageLiteral;
|
||||
item->message.time = GetTime( cpu );
|
||||
item->message.thread = GetThreadHandle();
|
||||
item->message.text = (uint64_t)txt;
|
||||
tail.store( magic + 1, std::memory_order_release );
|
||||
}
|
||||
|
||||
static bool ShouldExit();
|
||||
|
||||
private:
|
||||
|
@ -24,6 +24,7 @@ enum ServerQuery : uint8_t
|
||||
ServerQuerySourceLocation,
|
||||
ServerQueryPlotName,
|
||||
ServerQueryMessage,
|
||||
ServerQueryMessageLiteral,
|
||||
};
|
||||
|
||||
enum { WelcomeMessageProgramNameSize = 64 };
|
||||
|
@ -24,6 +24,7 @@ enum class QueueType : uint8_t
|
||||
PlotData,
|
||||
PlotName,
|
||||
Message,
|
||||
MessageLiteral,
|
||||
MessageData,
|
||||
NUM_TYPES
|
||||
};
|
||||
@ -185,6 +186,7 @@ static const size_t QueueDataSize[] = {
|
||||
sizeof( QueueHeader ) + sizeof( QueuePlotData ),
|
||||
sizeof( QueueHeader ) + sizeof( QueueStringTransfer ), // plot name
|
||||
sizeof( QueueHeader ) + sizeof( QueueMessage ),
|
||||
sizeof( QueueHeader ) + sizeof( QueueMessage ), // literal
|
||||
sizeof( QueueHeader ) + sizeof( QueueStringTransfer ), // message data
|
||||
};
|
||||
|
||||
|
@ -511,7 +511,10 @@ void View::Process( const QueueItem& ev )
|
||||
ProcessPlotData( ev.plotData );
|
||||
break;
|
||||
case QueueType::Message:
|
||||
ProcessMessage( ev.message );
|
||||
ProcessMessage( ev.message, false );
|
||||
break;
|
||||
case QueueType::MessageLiteral:
|
||||
ProcessMessage( ev.message, true );
|
||||
break;
|
||||
default:
|
||||
assert( false );
|
||||
@ -701,10 +704,10 @@ void View::ProcessPlotData( const QueuePlotData& ev )
|
||||
}
|
||||
}
|
||||
|
||||
void View::ProcessMessage( const QueueMessage& ev )
|
||||
void View::ProcessMessage( const QueueMessage& ev, bool literal )
|
||||
{
|
||||
m_pendingMessages.emplace( ev.text, MessagePending { int64_t( ev.time * m_timerMul ), ev.thread } );
|
||||
ServerQuery( ServerQueryMessage, ev.text );
|
||||
ServerQuery( literal ? ServerQueryMessageLiteral : ServerQueryMessage, ev.text );
|
||||
}
|
||||
|
||||
void View::CheckString( uint64_t ptr )
|
||||
|
@ -108,7 +108,7 @@ private:
|
||||
void ProcessLockRelease( const QueueLockRelease& ev );
|
||||
void ProcessLockMark( const QueueLockMark& ev );
|
||||
void ProcessPlotData( const QueuePlotData& ev );
|
||||
void ProcessMessage( const QueueMessage& ev );
|
||||
void ProcessMessage( const QueueMessage& ev, bool literal );
|
||||
|
||||
void CheckString( uint64_t ptr );
|
||||
void CheckThreadString( uint64_t id );
|
||||
|
Loading…
Reference in New Issue
Block a user