alx/mu4e
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

indexer/store: avoid completed callback

Browse Source 
This cause havoc / race conditions.
This commit is contained in:
Dirk-Jan C. Binnema
2022-05-18 20:16:48 +03:00
parent c3778cd467
commit 9af9d0fa94
4 changed files with 26 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
lib/mu-store.cc
View File

@ -103,8 +103,6 @@ struct Store::Private {
~Private() try {
indexer_.reset(); // reset so it cannot call us back
g_debug("closing store @ %s", properties_.database_path.c_str());
if (!read_only_) {
transaction_maybe_commit(true /*force*/);
@ -173,6 +171,13 @@ struct Store::Private {
contacts_cache_.serialize());
});
}
if (indexer_) { // save last index time.
if (auto&& t{indexer_->completed()}; t != 0)
writable_db().set_metadata(
IndexedKey, tstamp_to_string(t));
}
if (transaction_size_ == 0)
return; // nothing more to do here.
@ -642,16 +647,6 @@ Store::commit()
}
void
Store::index_complete()
{
std::lock_guard lock{priv_->lock_};
g_debug("marking index complete");
priv_->writable_db().set_metadata(IndexedKey, tstamp_to_string(::time({})));
}
std::size_t
Store::for_each_term(Field::Id field_id, Store::ForEachTermFunc func) const
{