[multicapture 1/3] Refactor to extract useful functions/constants for multi-capture #837
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,107 @@ | ||
| #include "TracyProtocolServer.hpp" | ||
| #include <cassert> | ||
| #include <cstring> | ||
| #include <iostream> | ||
|
|
||
| namespace tracy | ||
| { | ||
| std::optional<tracy::BroadcastMessage> ParseBroadcastMessage(const char* msg, size_t msgLen) | ||
| { | ||
| if (msgLen < sizeof(uint16_t)) | ||
| { | ||
| std::cout << "Received too short broadcast message" << std::endl; | ||
| return std::nullopt; | ||
| } | ||
| uint16_t broadcastVersion; | ||
| memcpy(&broadcastVersion, msg, sizeof(uint16_t)); | ||
| if (broadcastVersion > tracy::BroadcastVersion) | ||
| { | ||
| std::cout << "Received broadcast message with unsupported version: " << broadcastVersion << std::endl; | ||
| return std::nullopt; | ||
| } | ||
| switch (broadcastVersion) | ||
| { | ||
| case 3: | ||
| { | ||
| if (msgLen > sizeof(tracy::BroadcastMessage)) | ||
| { | ||
| std::cout << "Received unexpected size broadcast v3 message" << std::endl; | ||
| return std::nullopt; | ||
| } | ||
| tracy::BroadcastMessage bm; | ||
| memcpy(&bm, msg, msgLen); | ||
| return bm; | ||
| break; | ||
| } | ||
| case 2: | ||
| { | ||
| if (msgLen > sizeof(tracy::BroadcastMessage_v2)) | ||
| { | ||
| std::cout << "Received unexpected size broadcast v2 message" << std::endl; | ||
| return std::nullopt; | ||
| } | ||
| tracy::BroadcastMessage_v2 bm; | ||
| memcpy(&bm, msg, msgLen); | ||
|
|
||
| tracy::BroadcastMessage out; | ||
| out.broadcastVersion = broadcastVersion; | ||
| out.protocolVersion = bm.protocolVersion; | ||
| out.activeTime = bm.activeTime; | ||
| out.listenPort = bm.listenPort; | ||
| strcpy(out.programName, bm.programName); | ||
| out.pid = 0; | ||
| return out; | ||
| break; | ||
| } | ||
| case 1: | ||
| { | ||
| if (msgLen > sizeof(tracy::BroadcastMessage_v1)) | ||
| { | ||
| std::cout << "Received unexpected size broadcast v1 message" << std::endl; | ||
| return std::nullopt; | ||
| } | ||
| tracy::BroadcastMessage_v1 bm; | ||
| memcpy(&bm, msg, msgLen); | ||
|
|
||
| tracy::BroadcastMessage out; | ||
| out.broadcastVersion = broadcastVersion; | ||
| out.protocolVersion = bm.protocolVersion; | ||
| out.activeTime = bm.activeTime; | ||
| out.listenPort = bm.listenPort; | ||
| strcpy(out.programName, bm.programName); | ||
| out.pid = 0; | ||
| return out; | ||
| break; | ||
| } | ||
| case 0: | ||
| { | ||
| if (msgLen > sizeof(tracy::BroadcastMessage_v0)) | ||
| { | ||
| std::cout << "Received unexpected size broadcast v0 message" << std::endl; | ||
| return std::nullopt; | ||
| } | ||
| tracy::BroadcastMessage_v0 bm; | ||
| memcpy(&bm, msg, msgLen); | ||
|
|
||
| tracy::BroadcastMessage out; | ||
| out.broadcastVersion = broadcastVersion; | ||
| out.protocolVersion = bm.protocolVersion; | ||
| out.activeTime = bm.activeTime; | ||
| out.listenPort = tracy::DEFAULT_CLIENT_DATA_TCP_PORT; | ||
| strcpy(out.programName, bm.programName); | ||
| out.pid = 0; | ||
| return out; | ||
| break; | ||
| } | ||
| default: | ||
| assert(false); | ||
| break; | ||
| } | ||
| return std::nullopt; | ||
| } | ||
|
|
||
| uint64_t ClientUniqueID(tracy::IpAddress const& addr, uint16_t port) | ||
|
There was a problem hiding this comment. I assume the client cannot connect with different IP addresses and ports along its lifetime, so this info can uniquely identify him ? Multicapture uses this as a key to the map of clients, so knowing if it's unique was important. that said, |
||
| { | ||
| return uint64_t(addr.GetNumber()) | (uint64_t(port) << 32); | ||
| } | ||
| } // namespace tracy | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| // server-side functions supporting the protocol | ||
| #ifndef __TRACYPROTOCOLSERVER_HPP__ | ||
| #define __TRACYPROTOCOLSERVER_HPP__ | ||
|
|
||
| #include <optional> | ||
| #include "TracyProtocol.hpp" | ||
| #include "TracySocket.hpp" | ||
|
|
||
| namespace tracy | ||
| { | ||
| // create the latest version of broadcast message, migrating older versions if possible | ||
| std::optional<tracy::BroadcastMessage> ParseBroadcastMessage(const char* msg, size_t msgLen); | ||
| // internal unique ID for a client | ||
| uint64_t ClientUniqueID(tracy::IpAddress const& addr, uint16_t port); | ||
| } // namespace tracy | ||
|
|
||
| #endif |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What is the purpose of this change? How is writing or reading this much text more clear in intent than a negative value?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
the point was less to clarify the constant than being able to see where this logic is used in other files. There's a lot
-1constants in the codebase, but renaming it enabled to find all the places we were talking about memory limits.This is not adding any feature, and you're the maintainer here, so if you prefer
tracy::NO_LIMITor even me keeping several-1around I can do that. (remark applies to most of the proposed changes here - their goal was to limit code duplication where I understood it well enough to operate changes)