summaryrefslogtreecommitdiff
path: root/src/json_ui.cc
diff options
context:
space:
mode:
authorMaxime Coste <frrrwww@gmail.com>2016-08-30 22:56:47 +0100
committerMaxime Coste <frrrwww@gmail.com>2016-08-30 22:56:47 +0100
commit8b02bb749dece7690f4919372d19cd40907b91b1 (patch)
tree98e636beca5e83f909d3872586f383e95095851b /src/json_ui.cc
parentd0a29511d28f1481622ac9bb3a6ebfa9f8988c2b (diff)
Add a fd_readable(int fd) helper function
Use it instead of direct calls to select scatered around the code base.
Diffstat (limited to 'src/json_ui.cc')
-rw-r--r--src/json_ui.cc15
1 files changed, 1 insertions, 14 deletions
diff --git a/src/json_ui.cc b/src/json_ui.cc
index 644209c0..25fa4513 100644
--- a/src/json_ui.cc
+++ b/src/json_ui.cc
@@ -399,24 +399,11 @@ void JsonUI::eval_json(const Value& json)
throw runtime_error("unknown method");
}
-static bool stdin_ready()
-{
- fd_set rfds;
- FD_ZERO(&rfds);
- FD_SET(0, &rfds);
-
- timeval tv;
- tv.tv_sec = 0;
- tv.tv_usec = 0;
-
- return select(1, &rfds, nullptr, nullptr, &tv) == 1;
-}
-
void JsonUI::parse_requests(EventMode mode)
{
constexpr size_t bufsize = 1024;
char buf[bufsize];
- while (stdin_ready())
+ while (fd_readable(0))
{
ssize_t size = ::read(0, buf, bufsize);
if (size == -1 or size == 0)