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

Move immediate entry notification logic into Storage.

Browse Source 
This prevents a race condition that could result in out of order
notifications.
This commit is contained in:
Peter Johnson
2017-09-30 23:25:45 -07:00
parent 10982e0275
commit e4a8bff70e
6 changed files with 120 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/main/native/cpp/ntcore_cpp.cpp
View File

@@ -257,15 +257,7 @@ NT_EntryListener AddEntryListener(
auto ii = InstanceImpl::Get(i);
if (i < 0 || !ii) return 0;
unsigned int uid = ii->entry_notifier.Add(callback, prefix, flags);
// perform immediate notifications
if ((flags & NT_NOTIFY_IMMEDIATE) != 0 && (flags & NT_NOTIFY_NEW) != 0) {
for (auto& i : ii->storage.GetEntries(prefix, 0)) {
ii->entry_notifier.NotifyEntry(i, ii->storage.GetEntryName(i),
ii->storage.GetEntryValue(i),
NT_NOTIFY_IMMEDIATE | NT_NOTIFY_NEW, uid);
}
}
unsigned int uid = ii->storage.AddListener(prefix, callback, flags);
return Handle(i, uid, Handle::kEntryListener);
}
@@ -279,17 +271,7 @@ NT_EntryListener AddEntryListener(
auto ii = InstanceImpl::Get(i);
if (id < 0 || !ii) return 0;
unsigned int uid = ii->entry_notifier.Add(callback, id, flags);
// perform immediate notifications
if ((flags & NT_NOTIFY_IMMEDIATE) != 0 && (flags & NT_NOTIFY_NEW) != 0) {
auto name = ii->storage.GetEntryName(id);
auto value = ii->storage.GetEntryValue(id);
// if no name or value, don't notify
if (!name.empty() && value) {
ii->entry_notifier.NotifyEntry(id, name, value,
NT_NOTIFY_IMMEDIATE | NT_NOTIFY_NEW, uid);
}
}
unsigned int uid = ii->storage.AddListener(id, callback, flags);
return Handle(i, uid, Handle::kEntryListener);
}
@@ -319,15 +301,7 @@ NT_EntryListener AddPolledEntryListener(NT_EntryListenerPoller poller,
auto ii = InstanceImpl::Get(i);
if (id < 0 || !ii) return 0;
unsigned int uid = ii->entry_notifier.AddPolled(id, prefix, flags);
// perform immediate notifications
if ((flags & NT_NOTIFY_IMMEDIATE) != 0 && (flags & NT_NOTIFY_NEW) != 0) {
for (auto& i : ii->storage.GetEntries(prefix, 0)) {
ii->entry_notifier.NotifyEntry(i, ii->storage.GetEntryName(i),
ii->storage.GetEntryValue(i),
NT_NOTIFY_IMMEDIATE | NT_NOTIFY_NEW, uid);
}
}
unsigned int uid = ii->storage.AddPolledListener(id, prefix, flags);
return Handle(i, uid, Handle::kEntryListener);
}
@@ -344,17 +318,7 @@ NT_EntryListener AddPolledEntryListener(NT_EntryListenerPoller poller,
if (p_id < 0) return 0;
if (handle.GetInst() != phandle.GetInst()) return 0;
unsigned int uid = ii->entry_notifier.AddPolled(p_id, entry, flags);
// perform immediate notifications
if ((flags & NT_NOTIFY_IMMEDIATE) != 0 && (flags & NT_NOTIFY_NEW) != 0) {
auto name = ii->storage.GetEntryName(id);
auto value = ii->storage.GetEntryValue(id);
// if no name or value, don't notify
if (!name.empty() && value) {
ii->entry_notifier.NotifyEntry(id, name, value,
NT_NOTIFY_IMMEDIATE | NT_NOTIFY_NEW, uid);
}
}
unsigned int uid = ii->storage.AddPolledListener(p_id, id, flags);
return Handle(i, uid, Handle::kEntryListener);
}