diff options
-rw-r--r-- | common/ipc-client.c | 10 | ||||
-rw-r--r-- | include/ipc-client.h | 6 | ||||
-rw-r--r-- | swaymsg/main.c | 11 |
3 files changed, 26 insertions, 1 deletions
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) { | |||
69 | return socketfd; | 69 | return socketfd; |
70 | } | 70 | } |
71 | 71 | ||
72 | bool ipc_set_recv_timeout(int socketfd, struct timeval tv) { | ||
73 | if (setsockopt(socketfd, SOL_SOCKET, SO_RCVTIMEO, &tv, sizeof(tv)) == -1) { | ||
74 | sway_log_errno(SWAY_ERROR, "Failed to set ipc recv timeout"); | ||
75 | return false; | ||
76 | } | ||
77 | sway_log(SWAY_DEBUG, "ipc recv timeout set to %ld.%06ld", | ||
78 | tv.tv_sec, tv.tv_usec); | ||
79 | return true; | ||
80 | } | ||
81 | |||
72 | struct ipc_response *ipc_recv_response(int socketfd) { | 82 | struct ipc_response *ipc_recv_response(int socketfd) { |
73 | char data[IPC_HEADER_SIZE]; | 83 | char data[IPC_HEADER_SIZE]; |
74 | uint32_t *data32 = (uint32_t *)(data + sizeof(ipc_magic)); | 84 | uint32_t *data32 = (uint32_t *)(data + sizeof(ipc_magic)); |
diff --git a/include/ipc-client.h b/include/ipc-client.h index c9f5b344..d3895023 100644 --- a/include/ipc-client.h +++ b/include/ipc-client.h | |||
@@ -1,7 +1,9 @@ | |||
1 | #ifndef _SWAY_IPC_CLIENT_H | 1 | #ifndef _SWAY_IPC_CLIENT_H |
2 | #define _SWAY_IPC_CLIENT_H | 2 | #define _SWAY_IPC_CLIENT_H |
3 | 3 | ||
4 | #include <stdbool.h> | ||
4 | #include <stdint.h> | 5 | #include <stdint.h> |
6 | #include <sys/time.h> | ||
5 | 7 | ||
6 | #include "ipc.h" | 8 | #include "ipc.h" |
7 | 9 | ||
@@ -36,5 +38,9 @@ struct ipc_response *ipc_recv_response(int socketfd); | |||
36 | * Free ipc_response struct | 38 | * Free ipc_response struct |
37 | */ | 39 | */ |
38 | void free_ipc_response(struct ipc_response *response); | 40 | void free_ipc_response(struct ipc_response *response); |
41 | /** | ||
42 | * Sets the receive timeout for the IPC socket | ||
43 | */ | ||
44 | bool ipc_set_recv_timeout(int socketfd, struct timeval tv); | ||
39 | 45 | ||
40 | #endif | 46 | #endif |
diff --git a/swaymsg/main.c b/swaymsg/main.c index ccc847f5..518993af 100644 --- a/swaymsg/main.c +++ b/swaymsg/main.c | |||
@@ -7,6 +7,7 @@ | |||
7 | #include <stdint.h> | 7 | #include <stdint.h> |
8 | #include <sys/un.h> | 8 | #include <sys/un.h> |
9 | #include <sys/socket.h> | 9 | #include <sys/socket.h> |
10 | #include <sys/time.h> | ||
10 | #include <ctype.h> | 11 | #include <ctype.h> |
11 | #include <unistd.h> | 12 | #include <unistd.h> |
12 | #include <json.h> | 13 | #include <json.h> |
@@ -238,7 +239,8 @@ static void pretty_print_output(json_object *o) { | |||
238 | ); | 239 | ); |
239 | } | 240 | } |
240 | 241 | ||
241 | size_t modes_len = json_object_array_length(modes); | 242 | size_t modes_len = json_object_is_type(modes, json_type_array) |
243 | ? json_object_array_length(modes) : 0; | ||
242 | if (modes_len > 0) { | 244 | if (modes_len > 0) { |
243 | printf(" Available modes:\n"); | 245 | printf(" Available modes:\n"); |
244 | for (size_t i = 0; i < modes_len; ++i) { | 246 | for (size_t i = 0; i < modes_len; ++i) { |
@@ -448,6 +450,8 @@ int main(int argc, char **argv) { | |||
448 | 450 | ||
449 | int ret = 0; | 451 | int ret = 0; |
450 | int socketfd = ipc_open_socket(socket_path); | 452 | int socketfd = ipc_open_socket(socket_path); |
453 | struct timeval timeout = {.tv_sec = 3, .tv_usec = 0}; | ||
454 | ipc_set_recv_timeout(socketfd, timeout); | ||
451 | uint32_t len = strlen(command); | 455 | uint32_t len = strlen(command); |
452 | char *resp = ipc_single_command(socketfd, type, command, &len); | 456 | char *resp = ipc_single_command(socketfd, type, command, &len); |
453 | if (!quiet) { | 457 | if (!quiet) { |
@@ -478,6 +482,11 @@ int main(int argc, char **argv) { | |||
478 | free(resp); | 482 | free(resp); |
479 | 483 | ||
480 | if (type == IPC_SUBSCRIBE && ret == 0) { | 484 | if (type == IPC_SUBSCRIBE && ret == 0) { |
485 | // Remove the timeout for subscribed events | ||
486 | timeout.tv_sec = 0; | ||
487 | timeout.tv_usec = 0; | ||
488 | ipc_set_recv_timeout(socketfd, timeout); | ||
489 | |||
481 | do { | 490 | do { |
482 | struct ipc_response *reply = ipc_recv_response(socketfd); | 491 | struct ipc_response *reply = ipc_recv_response(socketfd); |
483 | if (!reply) { | 492 | if (!reply) { |