Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-23 01:21:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't delete persistent entries in DeleteAllEntries. (#71)

Browse Source 
This is a behavior change but without it DeleteAllEntries is dangerous and
not very useful, so I consider the current behavior to be a bug.
This commit is contained in:
Peter Johnson
2016-06-17 22:33:02 -07:00
committed by GitHub
parent c7d9ecbab3
commit 4b516de183
3 changed files with 40 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
src/Storage.cpp
View File

@@ -319,17 +319,7 @@ void Storage::ProcessIncoming(std::shared_ptr<Message> msg,
}
case Message::kClearEntries: {
// update local
EntriesMap map;
m_entries.swap(map);
m_idmap.resize(0);
// set persistent dirty flag
m_persistent_dirty = true;
// notify
for (auto& entry : map)
m_notifier.NotifyEntry(entry.getKey(), entry.getValue()->value,
NT_NOTIFY_DELETE);
DeleteAllEntriesImpl();
// broadcast to all other connections (note for client there won't
// be any other connections, so don't bother)
@@ -638,22 +628,35 @@ void Storage::DeleteEntry(StringRef name) {
}
}
void Storage::DeleteAllEntriesImpl() {
if (m_entries.empty()) return;
// only delete non-persistent values
// can't erase without invalidating iterators, so build a new map
EntriesMap entries;
for (auto& i : m_entries) {
Entry* entry = i.getValue().get();
if (!entry->IsPersistent()) {
// notify it's being deleted
if (m_notifier.local_notifiers()) {
m_notifier.NotifyEntry(i.getKey(), i.getValue()->value,
NT_NOTIFY_DELETE | NT_NOTIFY_LOCAL);
}
// remove it from idmap
if (entry->id != 0xffff) m_idmap[entry->id] = nullptr;
} else {
// add it to new entries
entries.insert(std::make_pair(i.getKey(), std::move(i.getValue())));
}
}
m_entries.swap(entries);
}
void Storage::DeleteAllEntries() {
std::unique_lock<std::mutex> lock(m_mutex);
if (m_entries.empty()) return;
EntriesMap map;
m_entries.swap(map);
m_idmap.resize(0);
// set persistent dirty flag
m_persistent_dirty = true;
// notify
if (m_notifier.local_notifiers()) {
for (auto& entry : map)
m_notifier.NotifyEntry(entry.getKey(), entry.getValue()->value,
NT_NOTIFY_DELETE | NT_NOTIFY_LOCAL);
}
DeleteAllEntriesImpl();
// generate message
if (!m_queue_outgoing) return;