expand/CCash
1
0
Fork 0
mirror of https://github.com/Expand-sys/CCash synced 2025-12-19 01:22:14 +11:00
Code Issues Projects Releases Packages Wiki Activity Actions

🐛 Send funds wasn't grabbing save_lock as shared

Browse source
This commit is contained in:
William Katz 2021-04-02 22:58:28 -10:00 committed by GitHub
parent f7b842197d
commit 34873d702b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
include/bank.hpp
View file

@ -16,14 +16,14 @@ private:
std::mutex> std::mutex>
users; users;
std::shared_mutex size_lock; std::shared_mutex save_lock;
public: public:
std::string admin_pass; std::string admin_pass;
bool AddUser(const std::string &name, std::string &&init_pass) bool AddUser(const std::string &name, std::string &&init_pass)
{ {
std::shared_lock<std::shared_mutex> lock{size_lock}; std::shared_lock<std::shared_mutex> lock{save_lock};
return users.try_emplace_l( return users.try_emplace_l(
name, [](User &) {}, std::forward<std::string &&>(init_pass)); name, [](User &) {}, std::forward<std::string &&>(init_pass));
} }
@ -32,7 +32,7 @@ public:
bool state = (admin_pass == attempt); bool state = (admin_pass == attempt);
if (state) if (state)
{ {
std::shared_lock<std::shared_mutex> lock{size_lock}; std::shared_lock<std::shared_mutex> lock{save_lock};
state = users.try_emplace_l( state = users.try_emplace_l(
name, [](User &) {}, init_bal, std::forward<std::string &&>(init_pass)); name, [](User &) {}, init_bal, std::forward<std::string &&>(init_pass));
} }
@ -61,7 +61,7 @@ public:
{ {
//if A exists, A can afford it, and A's password matches //if A exists, A can afford it, and A's password matches
bool state = false; bool state = false;
std::shared_lock<std::shared_mutex> lock{save_lock};
users.modify_if(a_name, [&state, amount, &attempt](User &a) { users.modify_if(a_name, [&state, amount, &attempt](User &a) {
if (state = (a.balance >= amount) && (a.password == attempt), state) if (state = (a.balance >= amount) && (a.password == attempt), state)
{ {
@ -96,7 +96,7 @@ public:
Json::Value temp; Json::Value temp;
{ {
std::unique_lock<std::shared_mutex> lock{size_lock}; //grabbing it from any busy add/del opperations std::unique_lock<std::shared_mutex> lock{save_lock}; //grabbing it from any busy add/del opperations
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