zhangengru/tracy
1
0
Fork 0
mirror of https://github.com/wolfpld/tracy.git synced 2025-03-20 07:40:02 +08:00
Code Issues Projects Wiki Activity

Ports are uint16_t.

Browse Source
This commit is contained in:
Bartosz Taudul
2020-10-02 18:51:54 +02:00
parent 0d82d6fe63
commit b6724bec3a
9 changed files with 38 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
profiler/src/ResolvService.cpp
+1 -1
View File
@@ -8,7 +8,7 @@
#include "ResolvService.hpp"
ResolvService::ResolvService( int port )
ResolvService::ResolvService( uint16_t port )
: m_exit( false )
, m_port( port )
, m_thread( [this] { Worker(); } )
profiler/src/ResolvService.hpp
+2 -2
View File
@@ -19,7 +19,7 @@ class ResolvService
};
public:
ResolvService( int port );
ResolvService( uint16_t port );
~ResolvService();
void Query( uint32_t ip, const std::function<void(std::string&&)>& callback );
@@ -31,7 +31,7 @@ private:
std::mutex m_lock;
std::condition_variable m_cv;
std::vector<QueueItem> m_queue;
int m_port;
uint16_t m_port;
std::thread m_thread;
};
profiler/src/main.cpp
+8 -8
View File
@@ -107,7 +107,7 @@ struct ClientData
int64_t time;
uint32_t protocolVersion;
int32_t activeTime;
uint32_t port;
uint16_t port;
std::string procName;
std::string address;
};
@@ -117,7 +117,7 @@ enum class ViewShutdown { False, True, Join };
static tracy::unordered_flat_map<uint64_t, ClientData> clients;
static std::unique_ptr<tracy::View> view;
static tracy::BadVersionState badVer;
static int port = 8086;
static uint16_t port = 8086;
static const char* connectTo = nullptr;
static char title[128];
static std::thread loadThread, updateThread, updateNotesThread;
@@ -357,7 +357,7 @@ int main( int argc, char** argv )
}
else if( strcmp( argv[1], "-p" ) == 0 )
{
port = atoi( argv[2] );
port = (uint16_t)atoi( argv[2] );
}
else
{
@@ -475,7 +475,7 @@ static void DrawContents()
{
static bool reconnect = false;
static std::string reconnectAddr;
static int reconnectPort;
static uint16_t reconnectPort;
static bool showFilter = false;
const ImVec4 clear_color = ImColor( 114, 144, 154 );
@@ -712,7 +712,7 @@ static void DrawContents()
if( *ptr == ':' )
{
std::string addrPart = std::string( addr, ptr );
uint32_t portPart = atoi( ptr+1 );
uint16_t portPart = (uint16_t)atoi( ptr+1 );
view = std::make_unique<tracy::View>( RunOnMainThread, addrPart.c_str(), portPart, fixedWidth, smallFont, bigFont, SetWindowTitleCallback, GetMainWindowNative );
}
else
@@ -826,7 +826,7 @@ static void DrawContents()
if( portFilter.IsActive() )
{
char buf[32];
sprintf( buf, "%" PRIu32, v.second.port );
sprintf( buf, "%" PRIu16, v.second.port );
if( !portFilter.PassFilter( buf ) ) continue;
}
if( progFilter.IsActive() && !progFilter.PassFilter( v.second.procName.c_str() ) ) continue;
@@ -838,7 +838,7 @@ static void DrawContents()
if( ImGui::IsItemHovered() )
{
char portstr[32];
sprintf( portstr, "%" PRIu32, v.second.port );
sprintf( portstr, "%" PRIu16, v.second.port );
ImGui::BeginTooltip();
if( badProto )
{
@@ -853,7 +853,7 @@ static void DrawContents()
if( v.second.port != port )
{
ImGui::SameLine();
ImGui::TextDisabled( ":%" PRIu32, v.second.port );
ImGui::TextDisabled( ":%" PRIu16, v.second.port );
}
if( selected && !loadThread.joinable() )
{