[igt-dev] [PATCH i-g-t RFC] lib/igt_chamelium: Use curl timeout for xmlrpc calls
From: Petri Latvala <hidden>
Date: 2020-09-24 12:36:37
Subsystem:
library code, the rest · Maintainers:
Andrew Morton, Linus Torvalds
Use of timeouts everywhere is meaningless if xmlrpc calls are allowed to be blocking forever. Signed-off-by: Petri Latvala <redacted> Cc: Kunal Joshi <redacted> Cc: Arkadiusz Hiler <redacted> Cc: Juha-Pekka Heikkila <redacted> --- lib/igt_chamelium.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/lib/igt_chamelium.c b/lib/igt_chamelium.c
index d9fab902..eac893a6 100644
--- a/lib/igt_chamelium.c
+++ b/lib/igt_chamelium.c@@ -2427,11 +2427,21 @@ void chamelium_deinit_rpc_only(struct chamelium *chamelium) struct chamelium *chamelium_init_rpc_only(void) { struct chamelium *chamelium = malloc(sizeof(struct chamelium)); + struct xmlrpc_clientparms clientparms; + struct xmlrpc_curl_xportparms curlparms; if (!chamelium) return NULL; memset(chamelium, 0, sizeof(*chamelium)); + memset(&clientparms, 0, sizeof(clientparms)); + memset(&curlparms, 0, sizeof(curlparms)); + + curlparms.timeout = _RECEIVER_RESPONSIVE_AFTER_RESET_SECONDS; + + clientparms.transport = "curl"; + clientparms.transportparmsP = &curlparms; + clientparms.transportparm_size = XMLRPC_CXPSIZE(timeout); chamelium->drm_fd = -1;
@@ -2439,7 +2449,7 @@ struct chamelium *chamelium_init_rpc_only(void) xmlrpc_env_init(&chamelium->env); xmlrpc_client_setup_global_const(&chamelium->env); xmlrpc_client_create(&chamelium->env, XMLRPC_CLIENT_NO_FLAGS, PACKAGE, - PACKAGE_VERSION, NULL, 0, &chamelium->client); + PACKAGE_VERSION, &clientparms, 0, &chamelium->client); if (chamelium->env.fault_occurred) { igt_debug("Failed to init xmlrpc: %s\n", chamelium->env.fault_string);
--
2.20.1
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev