Skip to content

Fix rumble events causing game to freeze #87

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ReenigneArcher merged 6 commits into from
Mar 13, 2022
Merged

Fix rumble events causing game to freeze #87

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4a48307
Merge pull request #30 from SunshineStream/nightly
ReenigneArcher Feb 14, 2022
4b658cd
Merge pull request #73 from SunshineStream/nightly
ReenigneArcher Feb 27, 2022
1f79f4e
Fix rumble events causing hang because the received input events were…
HomerSp Mar 8, 2022
9a26896
Fix lint warning about code style.
HomerSp Mar 9, 2022
80ebc99
Fix another lint warning.
HomerSp Mar 9, 2022
e61bbe8
Read revents from the temporary pollfds instead of copying them over …
HomerSp Mar 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions sunshine/platform/linux/input.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -696,13 +696,13 @@ struct input_raw_t {
};

inline void rumbleIterate(std::vector<effect_t> &effects, std::vector<pollfd_t> &polls, std::chrono::milliseconds to) {
std::vector<pollfd> polls_tmp;
polls_tmp.reserve(polls.size());
std::vector<pollfd> polls_recv;
polls_recv.reserve(polls.size());
for(auto &poll : polls) {
polls_tmp.emplace_back(poll.el);
polls_recv.emplace_back(poll.el);
}

auto res = poll(polls_tmp.data(), polls.size(), to.count());
auto res = poll(polls_recv.data(), polls_recv.size(), to.count());

// If timed out
if(!res) {
Expand All @@ -725,16 +725,17 @@ inline void rumbleIterate(std::vector<effect_t> &effects, std::vector<pollfd_t>
// TUPLE_2D_REF(dev, q, *dev_q_it);

// on error
if((*poll)->revents & (POLLHUP | POLLRDHUP | POLLERR)) {
if(polls_recv[x].revents & (POLLHUP | POLLRDHUP | POLLERR)) {
BOOST_LOG(warning) << "Gamepad ["sv << x << "] file discriptor closed unexpectedly"sv;

polls.erase(poll);
effects.erase(effect_it);

--x;
continue;
}

if(!((*poll)->revents & POLLIN)) {
if(!(polls_recv[x].revents & POLLIN)) {
continue;
}

Expand All @@ -751,6 +752,7 @@ inline void rumbleIterate(std::vector<effect_t> &effects, std::vector<pollfd_t>
polls.erase(poll);
effects.erase(effect_it);

--x;
continue;
}

Expand Down