From patchwork Tue Nov 10 11:34:26 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefano Babic X-Patchwork-Id: 1397591 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=googlegroups.com (client-ip=2a00:1450:4864:20::33d; helo=mail-wm1-x33d.google.com; envelope-from=swupdate+bncbcxploxj6ikrbshvvh6qkgqev3ncqxa@googlegroups.com; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=denx.de Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=googlegroups.com header.i=@googlegroups.com header.a=rsa-sha256 header.s=20161025 header.b=eflkax/r; dkim-atps=neutral Received: from mail-wm1-x33d.google.com (mail-wm1-x33d.google.com [IPv6:2a00:1450:4864:20::33d]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CVm403Qp2z9sTv for ; Tue, 10 Nov 2020 22:34:37 +1100 (AEDT) Received: by mail-wm1-x33d.google.com with SMTP id z62sf1039142wmb.1 for ; Tue, 10 Nov 2020 03:34:37 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1605008074; cv=pass; d=google.com; s=arc-20160816; b=UpX/wi7HxP8PbhO6FyO5QyC/OtvDpcahuzHNak8AY5nPwRJJlWdXscK5ZiSwa2FPAZ qHN4R1BqLrX0ZeEFaaTgYK8sIBzCh5Pzvr7kpF+aIuSXUGdfLN5IE/lE67QIS0vJEsQW YfVXOLyzHJtoaxT68G/lhuqQkr/8ZTeFGfVfrY6ZW56idyvNkXSNAl5joTRvpO1fG1Nc 6mPEfhu0KcF+RdTQC0NraIWnzm98M/jhRS94uGw96kDxQlD5fe8DqAhpgNt/qgAE+zPR VEaDzMoxE/KsG+CbSzE+GNd4Eg48uKJU5Ao5H75KpKLZgUInlTfG4nz1qts90BaI+FOq HD+A== 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:cc:to:from:sender:dkim-signature; bh=/FdLXWMO58r+lOGp+OinPRrkWyzuc3YJS74e3wFi0TA=; b=HrEqo+BdIv/lsI3FMlCO0HUVfHqXT7HUsLmUyEGeJSyiwTCgJ352/D5fnYVaR7gTEM oQEf7cG9/tkp5m1+4AygBwDPO6MM+Zqw5ReBudrE62l7hTMZQtUj52s7VYbq6h8BIFtR bzGcyywUgQyjySkT0SQkwKyDDgD2XVeZYpv+cbnPNmcWAP4ioOv2aujXCfxu1ybJiVuk FfU1MEQvAtcFJ5XIys8MV+45EvbtWX9pyN/w+faVLBMzxq4uygQeyzovgnaiq5mz3uO0 CM324AMHKXL9OXFZApilDTSEyFKcDowobqf1yLArtgtqDBEM9zKKChy0dZsK8o0NnLcM ORSg== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=neutral (google.com: 2001:a60:0:28:0:1:25:1 is neither permitted nor denied by best guess record for domain of sbabic@denx.de) smtp.mailfrom=sbabic@denx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20161025; h=sender:from:to:cc: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=/FdLXWMO58r+lOGp+OinPRrkWyzuc3YJS74e3wFi0TA=; b=eflkax/r8QNLD6hjLm11cmQuMhiJC3wTix2RgK4uHew8iKKhzR8LJKd6NvDUWRJwOe Cx2cmIzqc5OkHZvstiGfHcHXlDG2q1JVVYSwQd/rZTW2emc/MQJtjqc89bsoPN65D6pv w0JK4vLsvkGVf2hdcK09B4Kd0D35qs6cV0tpBGzUJGGdYhhf6KdhWGVOM+KzAxpPhIrm 4JcPd7oyPkVJSmxzmSgbI9cydxdpnfFIyax+9tIZJV75oEp5D9y/KyAgDBaSXJkAT2MM l07YZohjrH0Dwbf6LLBzGCA7TQUF4C5f1BnKH/il9qoR9lzG3aDPwwzfnbjmjr1FgVGV zoBw== 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:cc: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=/FdLXWMO58r+lOGp+OinPRrkWyzuc3YJS74e3wFi0TA=; b=HZD8nUgAvqJ4Q43/3rrolg6lq1mwqsO5M7kSPVWY/g1u7N2Oy2QvtATs5GaUMHUYoL 5/AKccmbJrWTy+Ebcx+ecB3mkQYt2Xl+2U/KPsYtGw7LgW3n23va5DcAsgSV+RmXkUPD AEyvclZZhWADFylR3sIOwXqxyN/86G9b6kkRJoNjH3Su0NYTFpCjva+7toxu6eIsHcbD YKs3QS7D16o8WqCYJkTk3oBRSFgcQpDtVoKiEsJTGp52mOlGIgWlHrsXagrsIx1Ad/ab SblpabIaq7Yj6nkpM/DWhdInZtqaMSd82NO3d+vCbsOYNhSrPekkA20Vql+cxPePt5Kh h12A== Sender: swupdate@googlegroups.com X-Gm-Message-State: AOAM532RoJ7pqNqd9GEIrWMb+AcxGOYgrr5ejYmJ9UvJtbVBjqWFl9O/ JMbBXM+dhj5TpIhh803Cj94= X-Google-Smtp-Source: ABdhPJwgDyU8hvVpVlf5gv3RP9qzZN/8MzDB1mxEc7S2wILj122yQHZlTDtp67vySwTAzzhUE/gG8w== X-Received: by 2002:adf:e6cf:: with SMTP id y15mr13083567wrm.403.1605008073507; Tue, 10 Nov 2020 03:34:33 -0800 (PST) X-BeenThere: swupdate@googlegroups.com Received: by 2002:adf:c689:: with SMTP id j9ls2522802wrg.0.gmail; Tue, 10 Nov 2020 03:34:32 -0800 (PST) X-Received: by 2002:adf:f24b:: with SMTP id b11mr9039599wrp.342.1605008072011; Tue, 10 Nov 2020 03:34:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1605008072; cv=none; d=google.com; s=arc-20160816; b=MwI6x7CGCkljEiHyPA6zvPYhlUcddz5FAyD/1SSEoLe79EQTzm8k+NMEauUpIgEaGv canJsIiO2PjVuIsoWstLR+szbUt+uyQYslbNzIZegXuFhMg+e80VPs7tv5I12DlaPwlT L1Tdgf9VMYdtv/cKanLCxIuOchVuu/cUAXU5kp/yqojwJy3mSuuTkfQUyZWzEg3TwKLE Ap4mN7PRofeGy21+Dm1JIptVrtgbqja9m3vnonqDo56uIu6rqB5yX3xE9h8/VhzKeC9I hoo1yEtdVztVkqUsQjPkVHew5UVW8mCdqYRDJICrjObasUVfZf9U2DuHlR6ExtheLXSZ qL0w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from; bh=PVtzPVaqOImPX0EwuYdC4AZ3gSGH9AKUjHXRRx5OtSM=; b=0zNEXxQckEaeGU0bh0dEU0oYwmFZHyjnwwdjuDNvtYO48XW6UZLNAjrkUqWNI7QiB/ fqX/u0PAhBYaIc1ED9b6cvdxxmjuPg6CnbYq+uGhlMYtW6YNlJMe/NaZ4L1EO2CCQ7Hu eH46aLlcMlVT0RdnRmnQvUKB1kRUyVpcnqXbTP5WtK3jgTviu7kv8q+I9mlYQN5SOsfu YEl+dfH4zlcWhV345MdTQv6SefMNSsmifRbTlq2IdpFUS3KL1Grmw5156yLNv7uIOs0O WOktlEHXQilz0I3nQiJMIlLpKkd7tnuC9o9ndgr4Vub53PAq35RZhleGZ+n0C4xbxPSk vbSg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=neutral (google.com: 2001:a60:0:28:0:1:25:1 is neither permitted nor denied by best guess record for domain of sbabic@denx.de) smtp.mailfrom=sbabic@denx.de Received: from mail-out.m-online.net (mail-out.m-online.net. [2001:a60:0:28:0:1:25:1]) by gmr-mx.google.com with ESMTPS id v10si247679wrr.3.2020.11.10.03.34.31 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 10 Nov 2020 03:34:31 -0800 (PST) Received-SPF: neutral (google.com: 2001:a60:0:28:0:1:25:1 is neither permitted nor denied by best guess record for domain of sbabic@denx.de) client-ip=2001:a60:0:28:0:1:25:1; Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 4CVm3q5J7Yz1rvxj; Tue, 10 Nov 2020 12:34:31 +0100 (CET) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 4CVm3q4ymmz1r56L; Tue, 10 Nov 2020 12:34:31 +0100 (CET) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id VySoYnGGMo5M; Tue, 10 Nov 2020 12:34:30 +0100 (CET) Received: from babic.homelinux.org (host-88-217-136-221.customer.m-online.net [88.217.136.221]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPS; Tue, 10 Nov 2020 12:34:30 +0100 (CET) Received: from localhost (mail.babic.homelinux.org [127.0.0.1]) by babic.homelinux.org (Postfix) with ESMTP id CEF9845404CB; Tue, 10 Nov 2020 12:34:29 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at babic.homelinux.org Received: from babic.homelinux.org ([IPv6:::1]) by localhost (mail.babic.homelinux.org [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id 8bzl9YsyCaSV; Tue, 10 Nov 2020 12:34:27 +0100 (CET) Received: from paperino.fritz.box (paperino.fritz.box [192.168.178.64]) by babic.homelinux.org (Postfix) with ESMTP id 2914845403CB; Tue, 10 Nov 2020 12:34:27 +0100 (CET) From: Stefano Babic To: swupdate@googlegroups.com Cc: Stefano Babic , Christian Storm Subject: [swupdate] [PATCH] Reset progress value in swupdate_progress_end() Date: Tue, 10 Nov 2020 12:34:26 +0100 Message-Id: <20201110113426.45800-1-sbabic@denx.de> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Original-Sender: sbabic@denx.de X-Original-Authentication-Results: gmr-mx.google.com; spf=neutral (google.com: 2001:a60:0:28:0:1:25:1 is neither permitted nor denied by best guess record for domain of sbabic@denx.de) smtp.mailfrom=sbabic@denx.de 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: , Reset value for progress interface in swupdate_progress_end(), that is always called, instead of swupdate_progress_done() Signed-off-by: Stefano Babic Suggested-by: Christian Storm --- core/progress_thread.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/core/progress_thread.c b/core/progress_thread.c index 7c424fc..24d9563 100644 --- a/core/progress_thread.c +++ b/core/progress_thread.c @@ -183,6 +183,12 @@ void swupdate_progress_end(RECOVERY_STATUS status) pprog->step_running = false; pprog->msg.status = status; send_progress_msg(); + pprog->msg.nsteps = 0; + pprog->msg.cur_step = 0; + pprog->msg.cur_percent = 0; + pprog->msg.dwl_percent = 0; + pprog->msg.dwl_bytes = 0; + pthread_mutex_unlock(&pprog->lock); } @@ -212,10 +218,6 @@ void swupdate_progress_done(const char *info) pprog->msg.status = DONE; send_progress_msg(); pprog->msg.infolen = 0; - pprog->msg.nsteps = 0; - pprog->msg.cur_step = 0; - pprog->msg.cur_percent = 0; - pprog->msg.dwl_percent = 0; pthread_mutex_unlock(&pprog->lock); }