From 88149764207c7719b6a979c5eb4dea3269bdd3e5 Mon Sep 17 00:00:00 2001 From: Aleksi Lindeman Date: Thu, 1 Nov 2018 07:15:28 +0100 Subject: Make operation callback funcs synchronous --- src/DatabaseStorage.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'src/DatabaseStorage.cpp') diff --git a/src/DatabaseStorage.cpp b/src/DatabaseStorage.cpp index 34dd09a..9611993 100644 --- a/src/DatabaseStorage.cpp +++ b/src/DatabaseStorage.cpp @@ -213,6 +213,7 @@ namespace odhtdb void DatabaseStorage::loadNode(const Hash &nodeHash, DatabaseLoadOrder loadOrder) { + std::lock_guard lock(databaseOperationCallbackMutex); string orderByString; if(loadOrder == DatabaseLoadOrder::OLDEST_FIRST) orderByString = " ORDER BY timestamp ASC"; @@ -1053,7 +1054,10 @@ namespace odhtdb { const DatabaseCreateNodeRequest createNodeRequest(&nodeHash, timestamp, creatorPublicKey, adminGroupId, database); if(database->onCreateNodeCallbackFunc) + { + std::lock_guard lock(databaseOperationCallbackMutex); database->onCreateNodeCallbackFunc(createNodeRequest); + } sqlite3_reset(selectNodeAddDataByNodeStmt); sqlite3_clear_bindings(selectNodeAddDataByNodeStmt); @@ -1211,7 +1215,10 @@ namespace odhtdb Log::debug("Got add object, timestamp: %zu, data: %.*s", timestamp, decryptedBody.getDecryptedText().size, decryptedBody.getDecryptedText().data); const DatabaseAddNodeRequest addNodeRequest(&nodeHash, &dataHash, timestamp, creatorPublicKey, decryptedBody.getDecryptedText(), database); if(database->onAddNodeCallbackFunc) + { + std::lock_guard lock(databaseOperationCallbackMutex); database->onAddNodeCallbackFunc(addNodeRequest); + } } catch(DecryptionException &e) { @@ -1244,7 +1251,10 @@ namespace odhtdb Log::debug("Got add user object, timestamp: %zu, user added: %s", timestamp, userToAddPublicKey->toString().c_str()); DatabaseAddUserRequest addUserRequest(&nodeHash, &dataHash, timestamp, creatorPublicKey, userToAddPublicKey, groupToAddUserTo, database); if(database->onAddUserCallbackFunc) + { + std::lock_guard lock(databaseOperationCallbackMutex); database->onAddUserCallbackFunc(addUserRequest); + } return true; } -- cgit v1.2.3