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

🔥🎨 simplified by using only one save_lock

Browse source
This commit is contained in:
EntireTwix 2021-07-03 19:45:52 -07:00
parent a561742347
commit 239e8007e9
2 changed files with 5 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
include/bank.h
View file

@ -36,17 +36,7 @@ private:
#endif #endif
#endif #endif
/** std::shared_mutex save_lock;
* @brief size_l should be grabbed if the operation MODIFIES the size (shared), this is so that when save claims unique
*
*/
std::shared_mutex size_l;
/**
* @brief send_funds_l should be grabbed if balances are being MODIFIED (shared) or if an operation needs to READ without the intermediary states that sendfunds has (unique)
*
*/
std::shared_mutex send_funds_l;
public: public:
std::string admin_account; std::string admin_account;

8
src/bank.cpp
View file

@ -68,7 +68,7 @@ BankResponse Bank::SendFunds(const std::string &a_name, const std::string &b_nam
} }
BankResponse state; BankResponse state;
std::shared_lock<std::shared_mutex> lock{send_funds_l}; //about 10% of this function's cost std::shared_lock<std::shared_mutex> lock{save_lock}; //about 10% of this function's cost
#if MAX_LOG_SIZE > 0 #if MAX_LOG_SIZE > 0
Transaction temp(a_name, b_name, amount); Transaction temp(a_name, b_name, amount);
if (!users.modify_if(a_name, [&temp, &state, amount](User &a) { if (!users.modify_if(a_name, [&temp, &state, amount](User &a) {
@ -164,7 +164,7 @@ BankResponse Bank::AddUser(std::string &&name, uint32_t init_bal, std::string &&
{ {
return {k400BadRequest, "Invalid Name, breaks size and/or character restrictions"}; return {k400BadRequest, "Invalid Name, breaks size and/or character restrictions"};
} }
std::shared_lock<std::shared_mutex> lock{size_l}; std::shared_lock<std::shared_mutex> lock{save_lock};
if (users.try_emplace_l( if (users.try_emplace_l(
std::move(name), [](User &) {}, init_bal, std::move(init_pass))) std::move(name), [](User &) {}, init_bal, std::move(init_pass)))
{ {
@ -184,7 +184,7 @@ BankResponse Bank::AddUser(std::string &&name, uint32_t init_bal, std::string &&
} }
BankResponse Bank::DelUser(const std::string &name) noexcept BankResponse Bank::DelUser(const std::string &name) noexcept
{ {
std::shared_lock<std::shared_mutex> lock{size_l}; std::shared_lock<std::shared_mutex> lock{save_lock};
#if RETURN_ON_DEL #if RETURN_ON_DEL
uint32_t bal; uint32_t bal;
if (users.if_contains(name, [this, &bal](const User &u) { if (users.if_contains(name, [this, &bal](const User &u) {
@ -223,7 +223,7 @@ void Bank::Save()
//loading info into json temp //loading info into json temp
{ {
std::scoped_lock<std::shared_mutex, std::shared_mutex> lock{size_l, send_funds_l}; std::unique_lock<std::shared_mutex> lock{save_lock};
for (const auto &u : users) for (const auto &u : users)
{ {
//we know it contains this key but we call this func to grab mutex //we know it contains this key but we call this func to grab mutex