Link/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

format

Browse Source
This commit is contained in:
Grégoire Roussel 2024-08-09 01:27:30 +02:00
parent 584a1c8b56
commit b9323c1029
4 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
profiler/src/main.cpp
View File

@ -456,7 +456,7 @@ static void UpdateBroadcastClients()
auto parsedMessageOpt = tracy::ParseBroadcastMessage(msg, len); auto parsedMessageOpt = tracy::ParseBroadcastMessage(msg, len);
if (parsedMessageOpt.has_value()) if (parsedMessageOpt.has_value())
{ {
auto parsedMessage = parsedMessageOpt.value(); auto parsedMessage = parsedMessageOpt.value();
auto address = addr.GetText(); auto address = addr.GetText();
const auto clientId = tracy::ClientUniqueID(addr, parsedMessage.listenPort); const auto clientId = tracy::ClientUniqueID(addr, parsedMessage.listenPort);
const auto ipNumerical = addr.GetNumber(); const auto ipNumerical = addr.GetNumber();
@ -478,16 +478,24 @@ static void UpdateBroadcastClients()
} ); } );
} }
resolvLock.unlock(); resolvLock.unlock();
clients.emplace( clientId, ClientData { time, parsedMessage.protocolVersion, parsedMessage.activeTime, parsedMessage.listenPort, parsedMessage.pid, parsedMessage.programName, std::move( ip ) } ); clients.emplace(clientId,
ClientData{time,
parsedMessage.protocolVersion,
parsedMessage.activeTime,
parsedMessage.listenPort,
parsedMessage.pid,
parsedMessage.programName,
std::move(ip)});
} }
else else
{ {
it->second.time = time; it->second.time = time;
it->second.activeTime = parsedMessage.activeTime; it->second.activeTime = parsedMessage.activeTime;
it->second.port = parsedMessage.listenPort; it->second.port = parsedMessage.listenPort;
it->second.pid = parsedMessage.pid; it->second.pid = parsedMessage.pid;
it->second.protocolVersion = parsedMessage.protocolVersion; it->second.protocolVersion = parsedMessage.protocolVersion;
if( strcmp( it->second.procName.c_str(), parsedMessage.programName ) != 0 ) it->second.procName = parsedMessage.programName; if (strcmp(it->second.procName.c_str(), parsedMessage.programName) != 0)
it->second.procName = parsedMessage.programName;
} }
} }
else if( it != clients.end() ) else if( it != clients.end() )

2
public/common/TracySocket.cpp
View File

@ -651,7 +651,7 @@ void IpAddress::Set( const struct sockaddr& addr )
#else #else
auto ai = (const struct sockaddr_in*)&addr; auto ai = (const struct sockaddr_in*)&addr;
#endif #endif
inet_ntop( AF_INET, &ai->sin_addr, m_text, TEXT_SIZE ); inet_ntop(AF_INET, &ai->sin_addr, m_text, TEXT_SIZE);
m_number = ai->sin_addr.s_addr; m_number = ai->sin_addr.s_addr;
} }

2
server/TracyProtocolServer.cpp
View File

@ -104,4 +104,4 @@ uint64_t ClientUniqueID(tracy::IpAddress const& addr, uint16_t port)
{ {
return uint64_t(addr.GetNumber()) | (uint64_t(port) << 32); return uint64_t(addr.GetNumber()) | (uint64_t(port) << 32);
} }
} } // namespace tracy

2
server/TracyProtocolServer.hpp
View File

@ -12,6 +12,6 @@ namespace tracy
std::optional<tracy::BroadcastMessage> ParseBroadcastMessage(const char* msg, size_t msgLen); std::optional<tracy::BroadcastMessage> ParseBroadcastMessage(const char* msg, size_t msgLen);
// internal unique ID for a client // internal unique ID for a client
uint64_t ClientUniqueID(tracy::IpAddress const& addr, uint16_t port); uint64_t ClientUniqueID(tracy::IpAddress const& addr, uint16_t port);
} } // namespace tracy
#endif #endif