Return-Path: Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTPS id 36B3E6E7D2 for ; Wed, 30 Sep 2020 11:53:15 +0000 (UTC) From: Petri Latvala Date: Wed, 30 Sep 2020 14:53:07 +0300 Message-Id: <20200930115307.1447-1-petri.latvala@intel.com> MIME-Version: 1.0 Subject: [igt-dev] [PATCH i-g-t v2] lib/igt_chamelium: Use curl timeout for xmlrpc calls List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: igt-dev-bounces@lists.freedesktop.org Sender: "igt-dev" To: igt-dev@lists.freedesktop.org Cc: Kunal Joshi , Petri Latvala List-ID: Use of timeouts everywhere is meaningless if xmlrpc calls are allowed to be blocking forever. v2: Use milliseconds correctly (Juha-Pekka) Signed-off-by: Petri Latvala Cc: Kunal Joshi Cc: Arkadiusz Hiler Cc: Juha-Pekka Heikkila Reviewed-by: Juha-Pekka Heikkila #v1 --- lib/igt_chamelium.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/lib/igt_chamelium.c b/lib/igt_chamelium.c index d9fab902..585fdfa8 100644 --- a/lib/igt_chamelium.c +++ b/lib/igt_chamelium.c @@ -2427,11 +2427,22 @@ 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)); + + /* curl's timeout is in milliseconds */ + curlparms.timeout = _RECEIVER_RESPONSIVE_AFTER_RESET_SECONDS * 1000; + + clientparms.transport = "curl"; + clientparms.transportparmsP = &curlparms; + clientparms.transportparm_size = XMLRPC_CXPSIZE(timeout); chamelium->drm_fd = -1; @@ -2439,7 +2450,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