expand/CCash
1
0
Fork 0
mirror of https://github.com/Expand-sys/CCash synced 2026-03-22 20:47:10 +11:00
Code Issues Projects Releases Packages Wiki Activity Actions

User construct/Add trans changes

Browse source 
once again this has many errors but ill merge and fix
This commit is contained in:
William Katz 2021-06-06 16:52:36 -07:00 committed by GitHub
commit f198913ced
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 26 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
config.json
View file

@ -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
}
]
}

27
include/log.hpp
View file

@ -7,31 +7,22 @@
struct Log
{
std::vector<Transaction> 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
{

15
include/user.hpp
View file

@ -36,17 +36,16 @@ 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)
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 = (log_j.size() - max_log_size) * (log_j.size() > max_log_size); i < log_j.size(); i++)
{
log.data[i] = std::move(Transaction(
log_j[i]["from"].asCString(),
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()
)));
}
}
}

12
main.cpp
View file

@ -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)
{