From a652fded48440890e6cf73e3b92860afad776ff1 Mon Sep 17 00:00:00 2001 From: doggo Date: Fri, 4 Jun 2021 00:27:47 -0500 Subject: [PATCH 1/4] Changed logging, added assertations in main, changed user constructor to enforce logging struct reqs --- include/log.hpp | 27 +++++++++------------------ include/user.hpp | 14 +++++++------- main.cpp | 12 +++--------- 3 files changed, 19 insertions(+), 34 deletions(-) diff --git a/include/log.hpp b/include/log.hpp index 21c862a..2567ac8 100644 --- a/include/log.hpp +++ b/include/log.hpp @@ -7,31 +7,22 @@ struct Log { std::vector data; - void AddTrans(Transaction &&v) + void AddTrans(Transaction &&t) { - if (data.capacity() == data.size() && data.size() < max_log_size) //if memory reserved is full and max isnt reached + if (data.size() == max_log_size) // If we hit the max size { - if (data.size() + pre_log_size > max_log_size) //if prefetched memory is larger then max + for (uint32_t i = 0; i < data.size() - 1; i--) // Make room at the back { - data.reserve(max_log_size); //just allocate max - } - else - { - data.reserve(data.size() + pre_log_size); //prefetching memory + data[i - 1] = std::move(data[i]); // Shifts everything left } + data[data.size() - 1] = std::move(t); // Place new in opened spot + return; } - if (data.size() == max_log_size) + else if (data.size() == data.capacity()) // If we haven't hit the max but hit capacity { - for (size_t i = 0; i < data.size() - 1; ++i) - { - data[i] = std::move(data[i + 1]); - } - data[data.size() - 1] = std::move(v); - } - else - { - data.push_back(std::move(v)); + data.reserve(data.capacity() + pre_log_size); // Reserve more memory } + data.push_back(std::move(t)); // In either case we have space under max length, move to new spot } Json::Value Serialize() const { diff --git a/include/user.hpp b/include/user.hpp index 205aeb1..473c720 100644 --- a/include/user.hpp +++ b/include/user.hpp @@ -36,17 +36,17 @@ struct User { if (log_j.size()) { - unsigned size = ((log_j.size() / pre_log_size) + 1) * pre_log_size; // Ensures that we have a log size aligned on a multiple of `pre_log_size` - log.data.reserve(size); // Ensures that the log size is under `max_log_size` - size = std::min(log_j.size(), max_log_size); - log.data.resize(size); - for (uint32_t i = 0; i < size; ++i) + log.data.reserve( + std::min(((log_j.size() / pre_log_size) + 1) * pre_log_size, max_log_size) + ); // Ensures that the log size is under `max_log_size` and is aligned on multiple of `pre_log_size` + for (uint32_t i = 0; i < std::min(log_j.size(), max_log_size); i++) //Matches the logs { - log.data[i] = std::move(Transaction( + log.data.push_back(std::move(Transaction( log_j[i]["from"].asCString(), log_j[i]["to"].asCString(), log_j[i]["amount"].asUInt(), - log_j[i]["time"].asUInt64())); + log_j[i]["time"].asUInt64() + ))); } } } diff --git a/main.cpp b/main.cpp index 962574e..a2a72fc 100644 --- a/main.cpp +++ b/main.cpp @@ -22,15 +22,9 @@ void SaveSig(int s) int main(int argc, char **argv) { - static_assert(pre_log_size <= max_log_size, "`max_log_size` must be larger than `pre_log_size`."); - if constexpr (max_log_size) - { - if (max_log_size % pre_log_size) - { - std::cerr << "`max_log_size` must be a multiple of `pre_log_size`."; - return 0; - } - } + // Static assertations for logging only (!max_log_size) + static_assert(!max_log_size || pre_log_size < max_log_size, "`max_log_size` must be larger than `pre_log_size`."); + static_assert(!max_log_size || !(max_log_size % pre_log_size), "`max_log_size` must be a multiple of `pre_log_size`."); if (argc != 4) { From 6a79ca9c39cffb24335e46e2648a2e130e839b81 Mon Sep 17 00:00:00 2001 From: doggo Date: Fri, 4 Jun 2021 21:51:06 -0500 Subject: [PATCH 2/4] request --- config.json | 21 +++++++-------------- include/user.hpp | 14 +++++++------- 2 files changed, 14 insertions(+), 21 deletions(-) diff --git a/config.json b/config.json index fa95be9..4e2bcd6 100644 --- a/config.json +++ b/config.json @@ -1,16 +1,9 @@ { - "listeners": [ - { - "address": "0.0.0.0", - "port": 80, - "https": false - }, - { - "address": "0.0.0.0", - "port": 443, - "https": true, - "cert": "", - "key": "" - } - ] + "listeners": [ + { + "address": "127.0.0.1", + "port": 80, + "https": false + } + ] } diff --git a/include/user.hpp b/include/user.hpp index 473c720..205aeb1 100644 --- a/include/user.hpp +++ b/include/user.hpp @@ -36,17 +36,17 @@ struct User { if (log_j.size()) { - log.data.reserve( - std::min(((log_j.size() / pre_log_size) + 1) * pre_log_size, max_log_size) - ); // Ensures that the log size is under `max_log_size` and is aligned on multiple of `pre_log_size` - for (uint32_t i = 0; i < std::min(log_j.size(), max_log_size); i++) //Matches the logs + unsigned size = ((log_j.size() / pre_log_size) + 1) * pre_log_size; // Ensures that we have a log size aligned on a multiple of `pre_log_size` + log.data.reserve(size); // Ensures that the log size is under `max_log_size` + size = std::min(log_j.size(), max_log_size); + log.data.resize(size); + for (uint32_t i = 0; i < size; ++i) { - log.data.push_back(std::move(Transaction( + log.data[i] = std::move(Transaction( log_j[i]["from"].asCString(), log_j[i]["to"].asCString(), log_j[i]["amount"].asUInt(), - log_j[i]["time"].asUInt64() - ))); + log_j[i]["time"].asUInt64())); } } } From 84f835e8b80261c20612e2ffd787bfb89c1e1d35 Mon Sep 17 00:00:00 2001 From: doggo Date: Sat, 5 Jun 2021 21:25:27 -0500 Subject: [PATCH 3/4] User log constructor change Now shifts to the end, is in order but takes only the lotest logs that it is able to. --- include/user.hpp | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/include/user.hpp b/include/user.hpp index 205aeb1..5608c47 100644 --- a/include/user.hpp +++ b/include/user.hpp @@ -36,17 +36,14 @@ struct User { if (log_j.size()) { - unsigned size = ((log_j.size() / pre_log_size) + 1) * pre_log_size; // Ensures that we have a log size aligned on a multiple of `pre_log_size` - log.data.reserve(size); // Ensures that the log size is under `max_log_size` - size = std::min(log_j.size(), max_log_size); - log.data.resize(size); - for (uint32_t i = 0; i < size; ++i) - { - log.data[i] = std::move(Transaction( + uint32_t newLogSize = std::min(pre_log_size * ((log_j.size() / pre_log_size) + 1), max_log_size); + log.data.reserve(newLogSize); + for (uint32_t i = std::max(0, log_j.size() - max_log_size); i < log_j.size(); i++) { + log.data.push_back(std::move(Transaction( log_j[i]["from"].asCString(), log_j[i]["to"].asCString(), log_j[i]["amount"].asUInt(), - log_j[i]["time"].asUInt64())); + log_j[i]["time"].asUInt64()))); } } } From a6c0595f646532dc6efc3a8a78eabd261152f8a5 Mon Sep 17 00:00:00 2001 From: doggo Date: Sat, 5 Jun 2021 22:15:01 -0500 Subject: [PATCH 4/4] Branchless loop init --- include/user.hpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/include/user.hpp b/include/user.hpp index 5608c47..dd2070c 100644 --- a/include/user.hpp +++ b/include/user.hpp @@ -38,12 +38,14 @@ struct User { uint32_t newLogSize = std::min(pre_log_size * ((log_j.size() / pre_log_size) + 1), max_log_size); log.data.reserve(newLogSize); - for (uint32_t i = std::max(0, log_j.size() - max_log_size); i < log_j.size(); i++) { - log.data.push_back(std::move(Transaction( - log_j[i]["from"].asCString(), + for (uint32_t i = (log_j.size() - max_log_size) * (log_j.size() > max_log_size); i < log_j.size(); i++) + { + log.data.push_back(std::move(Transaction( // Push back because `i` is not at the beginning + log_j[i]["from"].asCString(), // and no array creation with `vector::resize()` log_j[i]["to"].asCString(), log_j[i]["amount"].asUInt(), - log_j[i]["time"].asUInt64()))); + log_j[i]["time"].asUInt64() + ))); } } }