oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

event/PollBackend: use unordered_map::find() instead of operator[]

Browse Source 
The latter creates a new object, but we know that the key already
exists.
This commit is contained in:
Max Kellermann 2020-10-30 16:22:59 +01:00
parent ab5d23da11
commit b9b02b4ff2
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/event/PollBackend.cxx
View File

@ -66,7 +66,7 @@ PollBackend::Remove(int fd) noexcept
std::size_t last_index = poll_events.size() - 1; std::size_t last_index = poll_events.size() - 1;
if (index != last_index) { if (index != last_index) {
std::swap(poll_events[index], poll_events[last_index]); std::swap(poll_events[index], poll_events[last_index]);
items[poll_events[index].fd].index = index; items.find(poll_events[index].fd)->second.index = index;
} }
poll_events.pop_back(); poll_events.pop_back();
items.erase(item_iter); items.erase(item_iter);
@ -83,7 +83,11 @@ PollBackend::ReadEvents(int timeout_ms) noexcept
for (std::size_t i = 0; n > 0 && i < poll_events.size(); ++i) { for (std::size_t i = 0; n > 0 && i < poll_events.size(); ++i) {
const auto &e = poll_events[i]; const auto &e = poll_events[i];
if (e.revents != 0) { if (e.revents != 0) {
result.Add(e.revents, items[e.fd].obj); auto it = items.find(e.fd);
assert(it != items.end());
assert(it->second.index == i);
result.Add(e.revents, it->second.obj);
--n; --n;
} }
} }