From d7d29fe546ab0acb332013eb380f8193e1d5b9fc Mon Sep 17 00:00:00 2001 From: Brian Ashworth Date: Wed, 17 Apr 2019 01:57:34 -0400 Subject: swaymsg: add timeout and type checks This adds a 3 second timeout to the initial reply in swaymsg. This prevents swaymsg from hanging when `swaymsg -t get_{inputs,seats}` is used in i3. The timeout is removed when waiting for a subscribed event or monitoring for subscribed events. This also adds type checks to commands where i3 does not reply with all of the properties that sway does (such as `modes` in `get_outputs`). This is mostly just a behavioral adjustment since swaymsg should run on i3. When running under i3, some command reply's (such as the one for `get_outputs) may have more useful information in the raw json than the pretty printed version. --- common/ipc-client.c | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'common') diff --git a/common/ipc-client.c b/common/ipc-client.c index 13e2dfa3..b6c03d13 100644 --- a/common/ipc-client.c +++ b/common/ipc-client.c @@ -69,6 +69,16 @@ int ipc_open_socket(const char *socket_path) { return socketfd; } +bool ipc_set_recv_timeout(int socketfd, struct timeval tv) { + if (setsockopt(socketfd, SOL_SOCKET, SO_RCVTIMEO, &tv, sizeof(tv)) == -1) { + sway_log_errno(SWAY_ERROR, "Failed to set ipc recv timeout"); + return false; + } + sway_log(SWAY_DEBUG, "ipc recv timeout set to %ld.%06ld", + tv.tv_sec, tv.tv_usec); + return true; +} + struct ipc_response *ipc_recv_response(int socketfd) { char data[IPC_HEADER_SIZE]; uint32_t *data32 = (uint32_t *)(data + sizeof(ipc_magic)); -- cgit v1.2.3-54-g00ecf