From patchwork Tue Apr 2 14:19:47 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Awais Belal X-Patchwork-Id: 1074487 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=googlegroups.com (client-ip=2a00:1450:4864:20::540; helo=mail-ed1-x540.google.com; envelope-from=swupdate+bncbdtohouhxydrbeo7rxsqkgqeumg3sfy@googlegroups.com; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=mentor.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=googlegroups.com header.i=@googlegroups.com header.b="Qyss9Bsw"; dkim-atps=neutral Received: from mail-ed1-x540.google.com (mail-ed1-x540.google.com [IPv6:2a00:1450:4864:20::540]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44YWZF45Szz9sP7 for ; Wed, 3 Apr 2019 01:20:05 +1100 (AEDT) Received: by mail-ed1-x540.google.com with SMTP id f11sf5859411edq.18 for ; Tue, 02 Apr 2019 07:20:05 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1554214801; cv=pass; d=google.com; s=arc-20160816; b=LSOf8T7BKSwQAWE+MSBuUFwOw5dmcxUkQFpanX/Rq082mnie2xgZ1twI+ZFOXd7PPv 0ssnQ2Hdke+OmOC0VjbW8FQof5QIgOVKINeJ4zpGQ/2mI/SXaNRN96tRKydbCjrxJ+4E xr8z6MQb/r1hhY6iY2+b7wsQIwu/Rl2B5ELhJzx5o2OxZmoIPbsa6e6Tet34GzjMBRDd X69hbbFjtZf0Tp5M4wiwinfY/L+cbWA7X+raBGjSMx/5z9+CbVfL2ChpgpbnB2AgMzQ9 FgxC1AFNwjm/A+9d63DJC9mVcabksOaJPbl7Rka32FlEhwtLagttxYl2RdYMr9G33yqt r+Gg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:message-id:date :subject:to:from:sender:dkim-signature; bh=1D4N1yZqzNLL6t4yXH7gFbRpE5dzM5Ty7yWY6E/UYWs=; b=PEtFeQpcr+Y4dDZX0N5L7nr5/AWZTXpLWbO5sdFGT//AI8N/pkVjKxcHfyEqeUI8ZT G1MZjg9Dva+mDVSJQi/B5VSuf4NUjo8lntCPd+klLLFMFNWFzZYfSc7skSj691TFm68U PE/4m3OjV9OHXJCa4tzogh0KHMDa/bs5PFtTM9jyUSLntCVlEnYqotSPi1VK3PFr5L8A /xRVw2RaJeJTloRJAjYWy54OMB+0TqKWsx/U1iMUmMHlTEbEJZXTB7cmfvbpb4hjqwQo K6xdcNTxy2C5/V9NDyZLz+wGkN7f30QG7oHj6UBGtBzLBiPZtzdSkDSJVZ88k2ZvCD7s vOJw== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of awais_belal@mentor.com designates 192.94.38.131 as permitted sender) smtp.mailfrom=Awais_Belal@mentor.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20161025; h=sender:from:to:subject:date:message-id:mime-version :x-original-sender:x-original-authentication-results:precedence :mailing-list:list-id:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=1D4N1yZqzNLL6t4yXH7gFbRpE5dzM5Ty7yWY6E/UYWs=; b=Qyss9BswWgv37mkkXTjkTXl3BfOfwf46y9UGPNyvDDcE3tOjYdQGyXfXorwxk/W7A5 CSOiQyWMQKQ85j20EZG9Tybsmr+AmkPgldZsR0SKtGnIQ9HY20bXYDg0S3wuMefBLNqd IGTUoJyOUSJpatFsosAzz7DnFs6iPC2+W+pmkJgW3WHvtTIKZa27ogTI/F4+cymhZYAw JyW23pmE+RfnV6WqgxY8nvn0k8oRDl5w0EBa8joTHfoAFK5kgFkM1V4ldqed86R1BscB zwMfeX/99ErOtOMofuO8nsV9huvEwmUTJj2PNI2C4o94U6afq2GpEWNIZMgPsEB9zC3g 8WTQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=sender:x-gm-message-state:from:to:subject:date:message-id :mime-version:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:x-spam-checked-in-group:list-post :list-help:list-archive:list-subscribe:list-unsubscribe; bh=1D4N1yZqzNLL6t4yXH7gFbRpE5dzM5Ty7yWY6E/UYWs=; b=e/8QBh7oR8obpJgCx21DGAp0fDI2s5uYcWwc/KtqnfLWMjLdORwwX+AayhyzRdJqQg FrT2b1rBd0XYkUM8HZWmiSlYVi7xi6W17MTjj+BzNXYlxwrv6SgDZI+UWX7R+Glnj5O1 ar8t9EjSPKWEy3sMCKnMWnyoRLUAXr0ByOI39Rs9A2RMIwJd6IlGbNOUqROXtIlAW9r0 SwAIEgfvEh8PP9+IuPimtuzHgp+qZbq0OkoVumyXyoyRyBQEuoKKGrQfjPKRK3o9Ws7O NmTZd+h0Qx0MwRQWJnzPSNhECAuyIwUGErkTnhzdQe1izhO/iiibH0xjXGw/7+SIBCkM 0QPA== Sender: swupdate@googlegroups.com X-Gm-Message-State: APjAAAXsdOiwkWq6F3SIDrq5+yk68SxUP5jO2QYFs6JxbNoVZ1gb9WUK aD35kC/G0XkfwD7psAlRjxs= X-Google-Smtp-Source: APXvYqz3wKjN0heK2GFFeqSvixvknezEQgRmbkC+d0Cuv6oYC4vj4uuHa4/x7PM/ZPGCRhSLyJkj7Q== X-Received: by 2002:a50:ad09:: with SMTP id y9mr43604870edc.128.1554214801776; Tue, 02 Apr 2019 07:20:01 -0700 (PDT) X-BeenThere: swupdate@googlegroups.com Received: by 2002:a17:906:4806:: with SMTP id w6ls2608167ejq.10.gmail; Tue, 02 Apr 2019 07:20:01 -0700 (PDT) X-Received: by 2002:a17:906:b288:: with SMTP id q8mr4628904ejz.10.1554214801288; Tue, 02 Apr 2019 07:20:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1554214801; cv=none; d=google.com; s=arc-20160816; b=RuM+V5neT/dVOFi9HOKjGIzt1JGze84PX6tQhoml70isFfNA/ww4ATLt7YFY8X3+KN jxrSYafVF1eAbhSWsOJdPhcS2AaGoiJhWr9462IOjD/6ua6P6Ect8J6USA24yjgHYjvl /qPFAxqssyn8xQCr4M5K9OYJqYGkGiTOBFw/EwlIrKW7Xg8WlopT7Zcdq0KpYzUGyUd6 Z5wIlv+CaAqB2bOdnQAUKBvuSFUnAkqT/mGe7nle9p9OLi8gUbtxJ3yvB3Q5Q65wev3A sLSKjMO4JHWurPVps6bbHjjj3eqwJ1cR1EG3eq2SdTQSpMRUWdYoABbZIMlnNICe8aPM i0ew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:message-id:date:subject:to:from; bh=qiDLLDz1DylSKGVFOZMy9JmtwR0qE8B6YubM4n0Y/Yc=; b=fwt6AILQUmpJ+7FvEHiEwXAx/PFMm65HCgoiR5Y2Eu99X53ScfE6mLiTgi32vjDmTi MSxTFpBvKJYlF1N1iQsadMj86GinF9oKfWj//0hwzvG0fS4UbaX4IGCTrJfHil61kCO4 LwunVJYKcJnYtbYHkGHvH9p13AzN1lbzpLPqkkcBw8eKD7auMRrueMDG49I2hmZ1Flcb aex0KFyUJsPAhApjzvaK4cHLI3iHFfyVgkZNlYicLSC4LNpdATJoG4qVPbd0nEVhn/R3 qwF1Q9SPTaMBS5zFUjfb29oRyuEIK933NdIddhp3S9sCp8xkHSItjQtcahdapmj8S6nZ cLUA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of awais_belal@mentor.com designates 192.94.38.131 as permitted sender) smtp.mailfrom=Awais_Belal@mentor.com Received: from relay1.mentorg.com (relay1.mentorg.com. [192.94.38.131]) by gmr-mx.google.com with ESMTPS id a38si596222edd.0.2019.04.02.07.20.01 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 02 Apr 2019 07:20:01 -0700 (PDT) Received-SPF: pass (google.com: domain of awais_belal@mentor.com designates 192.94.38.131 as permitted sender) client-ip=192.94.38.131; Received: from nat-ies.mentorg.com ([192.94.31.2] helo=SVR-IES-MBX-03.mgc.mentorg.com) by relay1.mentorg.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-SHA384:256) id 1hBKGd-0000bf-Sw from Awais_Belal@mentor.com for swupdate@googlegroups.com; Tue, 02 Apr 2019 07:19:59 -0700 Received: from P7520.pkl.mentorg.com (137.202.0.90) by SVR-IES-MBX-03.mgc.mentorg.com (139.181.222.3) with Microsoft SMTP Server (TLS) id 15.0.1320.4; Tue, 2 Apr 2019 15:19:56 +0100 From: Awais Belal To: Subject: [swupdate] [PATCH v2] client: simply return if async start fails Date: Tue, 2 Apr 2019 19:19:47 +0500 Message-ID: <1554214787-16594-1-git-send-email-awais_belal@mentor.com> X-Mailer: git-send-email 2.7.4 MIME-Version: 1.0 X-Originating-IP: [137.202.0.90] X-ClientProxiedBy: svr-ies-mbx-06.mgc.mentorg.com (139.181.222.6) To SVR-IES-MBX-03.mgc.mentorg.com (139.181.222.3) X-Original-Sender: awais_belal@mentor.com X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of awais_belal@mentor.com designates 192.94.38.131 as permitted sender) smtp.mailfrom=Awais_Belal@mentor.com Precedence: list Mailing-list: list swupdate@googlegroups.com; contact swupdate+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: swupdate@googlegroups.com X-Google-Group-Id: 605343134186 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , The client should return after cleaning up if async start fails for any reason otherwise the caller will block because the client app will keep on waiting for the mutex which will never be triggered. Signed-off-by: Awais Belal --- tools/client.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/tools/client.c b/tools/client.c index 6dd378c..aa29c0f 100644 --- a/tools/client.c +++ b/tools/client.c @@ -113,8 +113,13 @@ static int send_file(const char* filename) { rc = swupdate_async_start(readimage, printstatus, end, dryrun); - if (rc) - printf("swupdate_async_start returns %d\n", rc); + printf("swupdate_async_start returns %d\n", rc); + /* return if we've hit an error scenario */ + if (rc < 0) { + pthread_mutex_unlock(&mymutex); + close(fd); + return 1; + } /* Now block */ pthread_mutex_lock(&mymutex);