Dynamic ntp time source selection in timestamp_mw#364
Draft
WiktorM8 wants to merge 5 commits into
Draft
Conversation
added 2 commits
May 2, 2026 19:35
- NodeInfo storage using std::unordered_map - Implemented best neighbor selection algorithm - Unit tests for discovery manager
- configuration manager - integration with controller - unit tests
| @@ -0,0 +1,5 @@ | |||
| { | |||
| "ip": "192.168.10.51", | |||
| "ntp_class": 3, | |||
Collaborator
There was a problem hiding this comment.
Suggested change
| "ntp_class": 3, | |
| "ntp_class": 4, |
|
|
||
| auto raw_json = parser.GetObject(); | ||
|
|
||
| if (raw_json.contains("ntp_class") && raw_json["ntp_class"].is_number_integer()) { |
Collaborator
There was a problem hiding this comment.
Suggested change
| if (raw_json.contains("ntp_class") && raw_json["ntp_class"].is_number_integer()) { | |
| auto ntp_class = raw_json.GetNumer<uint8_t>("ntp_class"); | |
| config.ntp_class = ntp_class.value_or(kDefault_device_class); |
tak samo dla reszty (do definiowania defaultowych wartosci użyj namespace {static constexpr auto kDefault_device_class = 7;}
| namespace srp { | ||
| namespace tinyNTP { | ||
|
|
||
| constexpr const char* CONFIG_FILEPATH = "/srp/opt/cpu_srp/ntp_config.json"; |
Collaborator
There was a problem hiding this comment.
Suggested change
| constexpr const char* CONFIG_FILEPATH = "/srp/opt/cpu_srp/ntp_config.json"; | |
| namespace { | |
| static constexpr auto kConfig_file_path = "/srp/opt/cpu_srp/ntp_config.json"; | |
| } |
Author
There was a problem hiding this comment.
cpplint rzuca błąd za nienazwany namespace w .hpp
|
|
||
| std::optional<std::string> readMyIP(); | ||
| std::vector<uint8_t> socket_callback(const std::string& ip, const std::uint16_t& port, | ||
| const std::vector<std::uint8_t> payload); |
Collaborator
There was a problem hiding this comment.
Suggested change
| const std::vector<std::uint8_t> payload); | |
| const std::vector<std::uint8_t>& payload); |
Comment on lines
43
to
44
| int64_t CalculateOffset(const int64_t T0, const int64_t T1, const int64_t T2, const int64_t T3); | ||
| uint64_t CalculateRoundTripDelay(const int64_t T0, const int64_t T1, const int64_t T2, const int64_t T3); |
Collaborator
There was a problem hiding this comment.
Suggested change
| int64_t CalculateOffset(const int64_t T0, const int64_t T1, const int64_t T2, const int64_t T3); | |
| uint64_t CalculateRoundTripDelay(const int64_t T0, const int64_t T1, const int64_t T2, const int64_t T3); | |
| int64_t CalculateOffset(const int64_t& T0, const int64_t& T1, const int64_t& T2, const int64_t& T3); | |
| uint64_t CalculateRoundTripDelay(const int64_t& T0, const int64_t& T1, const int64_t& T2, const int64_t& T3); |
| void DiscoveryManager::UpdateNode(const std::string& ip, uint8_t ntp_class, bool holdover) { | ||
| std::lock_guard<std::mutex> lock(map_mutex_); | ||
|
|
||
| NodeInfo& node = neighbors_[ip]; |
Collaborator
There was a problem hiding this comment.
pootencjalny segmentation fault?
Author
There was a problem hiding this comment.
neighbors_ to std::unordered_map<std::string, NodeInfo>, więc raczej nie. Tu co najwyżej pytanie, czy nie zmienić tego na zwykły vector?
Collaborator
There was a problem hiding this comment.
bardzo dobrze że jest to unordered map, ale jeśli w neightbors_ nie będzie ip do którego się odwołujesz dostaniesz Segmentation Fault, użyj np find.
cytując https://www.geeksforgeeks.org/cpp/unordered_map-in-cpp-stl/
#include <bits/stdc++.h>
using namespace std;
int main() {
unordered_map<int, string> um =
{{1, "Geeks"}, {2, "For"}, {3, "C++"}};
// Finding element with key 2
auto it = um.find(2);
if (it != um.end())
cout << it->first << ": " << it->second;
else cout << "Not Found";
return 0;
}
added 3 commits
June 1, 2026 13:33
- Initialization of udp and udp multicast sockets - Connecting to mechanism of chosing best neighbor
- Resolving conversations - Fixing code to pass cpplint tests - Fixing code to pass unit tests
- separate callback functions for socket - safety checks for invalid message types and rapid change of function between server and client mode - header setting encoding test
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
No description provided.