From patchwork Wed Jul 3 14:05:39 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: 'Darko Komljenovic' via swupdate X-Patchwork-Id: 1126900 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=2607:f8b0:4864:20::837; helo=mail-qt1-x837.google.com; envelope-from=swupdate+bncbaabbnpm6luakgqe4dusn4q@googlegroups.com; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=googlegroups.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=googlegroups.com header.i=@googlegroups.com header.b="eWo16hBC"; dkim-atps=neutral Received: from mail-qt1-x837.google.com (mail-qt1-x837.google.com [IPv6:2607:f8b0:4864:20::837]) (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 45f2vF3Zslz9s3Z for ; Thu, 4 Jul 2019 00:05:45 +1000 (AEST) Received: by mail-qt1-x837.google.com with SMTP id g56sf2726071qte.4 for ; Wed, 03 Jul 2019 07:05:45 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1562162742; cv=pass; d=google.com; s=arc-20160816; b=JdTKNxOcJDVkL5eGfFyHj6rDcR/i6UNDGP6lsFT4QVMSjniTZ39ZehPCqP4c4C+tbZ wQ/o2AZPsQlexR+LTo6MWr77Hp0lk2mnbkogM4ymoJeedF5raieZIRtzSTNnQQJrnBtq ytvL1FVzGC5zO30DEyck4VZ+64FY7Sl6Xrp7yhmorU27c+xKzLlsD5AXMqqfNnEQBE4c 8tTXKbvA2wQVHtDggk+xCe6+X84+gbcsd8WLAwEB/8vqmdD8ZMbrLRwSSde2LX1cdWTo oc5gGGqnxlRgqONHM4goLhE9/WovvCFL5W+7x+vaKJnuRXNnyxs1kKmjBCkI+Ctl2hAJ 19UQ== 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:reply-to:mime-version :content-transfer-encoding:content-language:accept-language :message-id:date:thread-index:thread-topic:subject:to:from :dkim-signature; bh=kPHYVPtQifG9rP30/sBzuB/2YhwW/kqY0fXFUzYwBIE=; b=IiHGnZtmATkBXKntMxqqHIrrNPlXRH/tRg+dzmy1k1GTctd/ES7PljpgLBGtLTqXOe lJl2Gngr35iZLA35OT1bInKy6cv0p6LPzui9aNhYPrt8Cf7r6Ne4UQceE9dsNCizQL4M zH8fqSyuHy4qjGOLh4yE4nEynwBD7pINQTrHYEmWy/DWjyGm76S1XivF9nmJ1UyQEzsb q+/g6hGm+eZQvlnIsVnRO4z1CZf4H38CM2tqySpSRFVP9bHz4JWoIpug616v+JuUNTSn jLEA0j8ofBEuoznaQPFThZOfuE5+fEtZV1pwha5CeeVK583fQb0rNgNZliRKpPlQVnRu +ArA== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@woodward.com header.s=20190114Woodward header.b=gngWWQRL; spf=pass (google.com: domain of daniel.cyran@woodward.com designates 204.27.169.35 as permitted sender) smtp.mailfrom=Daniel.Cyran@woodward.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=woodward.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20161025; h=from:to:subject:thread-topic:thread-index:date:message-id :accept-language:content-language:content-transfer-encoding :mime-version:x-original-sender:x-original-authentication-results :reply-to:precedence:mailing-list:list-id:list-post:list-help :list-archive:list-subscribe:list-unsubscribe; bh=kPHYVPtQifG9rP30/sBzuB/2YhwW/kqY0fXFUzYwBIE=; b=eWo16hBCn7nxqvB6sRDArIZSnh0xKL0tpLBuYS58MG8DexipJTk7pHAX3e04f0kBaa LnpzvUqmTTRB0rbxAavMaSdWDrcNor0NOygsS7XiSNxj50KburtUr7NPAwsmYPA653+/ axEo14Fss902dikhLWozFUQtqjRLdsLKewXLVMgkZ8TIO5FlOsKHXLjSopW2F2ROcQrk hkyoillDe+e88CDzyFoCjoNj2cTI88+sFoOhQ5uhmhQsMqAHo87miJF+Endys4QdXWbq Ae2/MA0vwqIc9FDu2AVG1gnmXBslxoCGa7Q3RH2EEvru4UfAzKeNc7New2auSeAjGev8 m5Gw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:thread-topic:thread-index:date :message-id:accept-language:content-language :content-transfer-encoding:mime-version:x-original-sender :x-original-authentication-results:reply-to:precedence:mailing-list :list-id:x-spam-checked-in-group:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=kPHYVPtQifG9rP30/sBzuB/2YhwW/kqY0fXFUzYwBIE=; b=cLImuCwEIpXWunExVGDObQ/ew1xdA1Fz89qkPv/wkiylVXaKpPB4JEgHWCqTLFMngd jr/54R3X83gDdc04fLFpnCq5tBjgrnmQtI31UvE5Svi8XDmai0zb14fcDKUCLD/RZp2D HCwGzTNfY5j2iM40nTrUWJeeIKiogglucNZuSQzzDgobgrrVDXuUsJjtzeUgDAP8fq8t K6u/qDhgiQtpWtNAIsbKhigLwHNb5PWUcCSi1p4UeqdQjERJuCtlyzZfRWWX/q34+uxF 0x9Z4rFVyT9gsb4n+tGLYLNv86g82M1MnaQTooLEwu9zT+kDCalbiL0Hkah4qpC4ubo7 6ouQ== X-Gm-Message-State: APjAAAUDwW/RwsgQNp9gt5Rf5AUvHUD0RK3qg9k2HCR1qCQWr0dINKgM TZw2wb3r1sjh2reYIiJvNhU= X-Google-Smtp-Source: APXvYqwbE1fIq7iebwOfpn1mJdU8IxnAUHDxrukSFM52D638Hbrq1PzQZobFTDIqjGW/+LON9IQkLQ== X-Received: by 2002:aed:2fe7:: with SMTP id m94mr29640758qtd.191.1562162742053; Wed, 03 Jul 2019 07:05:42 -0700 (PDT) X-BeenThere: swupdate@googlegroups.com Received: by 2002:ae9:d801:: with SMTP id u1ls892805qkf.13.gmail; Wed, 03 Jul 2019 07:05:41 -0700 (PDT) X-Received: by 2002:a37:b646:: with SMTP id g67mr3208996qkf.92.1562162741781; Wed, 03 Jul 2019 07:05:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1562162741; cv=none; d=google.com; s=arc-20160816; b=XDOThZ/mrggjPpu7uMR31tZclt2843uGisRoAuqDPeBG5b+cNiZRsIkrr0jfEXfBjk O5X12HYDXDVLEA3hIT2polzQ2z+5B617IvqAh9QMFVcqOXdx0BAR85fGnLOWubgfkdeH So47WwuF/ZKl3eq5AbGkdlJsiFM+FAu6hqGiSIoKFLmjmlOAQ6pgUl1SuQn4f0aGCrpm GUYDswUWzLATqHhCRcve+/PCxSli+9ZWwjlwYa7fB9htPxVrcDOoRjeWPJCSW9fugEcJ I5h4ot16R1Hqpku3XzrExztg4zDbhOTGbh4xuwSzafTEZzBKBM0rqdtREyEyZx/81sMk 4zCw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:content-transfer-encoding:content-language :accept-language:message-id:date:thread-index:thread-topic:subject :to:from:dkim-signature; bh=hnl9L6WsMkkKYwRN2wPd8w5jlmaxKnU5+1/q0bokpIg=; b=gsKNe0j+J07+ChbIdTkeucjR5cKIFb7ERaUTc2vwH8dmiVYED24eUQo5lAm6cFCiY3 0Dnnv9oFu6/RrSKt30JH6R1zo7wGOYc/VFLn89zXDFtYhJkbro7rm9mMjeBYZ95jU6w9 fLSLF1rOWUYKv+ukKU0L2sfgKejECHRoetHvWzRFNnKwHILcZeS+O5gTJeeJl8Vght75 3W6+njHihDARb7yHP0rUOSkToP/xr5bm7wE7CTFjQ1pE5pZCyELXhaF8rL6Nh42HYhbz GjxbUox8inVJi7Nk/1Dg3NkSaMwzJnLrk97URm2bc+WfM9ioSSN4Mh48eZa0DvjjLo5I CSSg== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@woodward.com header.s=20190114Woodward header.b=gngWWQRL; spf=pass (google.com: domain of daniel.cyran@woodward.com designates 204.27.169.35 as permitted sender) smtp.mailfrom=Daniel.Cyran@woodward.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=woodward.com Received: from Mail4.woodward.com (mail4.woodward.com. [204.27.169.35]) by gmr-mx.google.com with ESMTPS id y53si165582qtj.1.2019.07.03.07.05.41 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 03 Jul 2019 07:05:41 -0700 (PDT) Received-SPF: pass (google.com: domain of daniel.cyran@woodward.com designates 204.27.169.35 as permitted sender) client-ip=204.27.169.35; Received: from pps.filterd (COIL-PMSGA1.woodward.com [127.0.0.1]) by COIL-PMSGA1.woodward.com (8.16.0.27/8.16.0.27) with SMTP id x63E1bpj010525 for ; Wed, 3 Jul 2019 09:05:40 -0500 Received: from coil-exmb2.woodward.com ([10.51.100.65]) by COIL-PMSGA1.woodward.com with ESMTP id 2tf49sp31h-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT) for ; Wed, 03 Jul 2019 09:05:40 -0500 Received: from COIL-ExMb3.woodward.com (10.51.100.66) by COIL-ExMb2.woodward.com (10.51.100.65) with Microsoft SMTP Server (TLS) id 15.0.1473.3; Wed, 3 Jul 2019 09:05:39 -0500 Received: from COIL-ExMb3.woodward.com ([10.51.100.66]) by COIL-ExMb3.woodward.com ([10.51.100.66]) with mapi id 15.00.1473.003; Wed, 3 Jul 2019 09:05:39 -0500 X-Patchwork-Original-From: "'Daniel Cyran' via swupdate" From: 'Darko Komljenovic' via swupdate To: "swupdate@googlegroups.com" Subject: [swupdate] [PATCH] Name of a running handler is never updated in the progress_msg Thread-Topic: [PATCH] Name of a running handler is never updated in the progress_msg Thread-Index: AdUxqGRaqHKHDF1UQ3O8+Okz/gb4AQ== Date: Wed, 3 Jul 2019 14:05:39 +0000 Message-ID: <3fb0220105ef46d8a7a92f213a320582@COIL-ExMb3.woodward.com> Accept-Language: pl-PL, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-exchange-transport-fromentityheader: Hosted x-originating-ip: [10.4.20.46] MIME-Version: 1.0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=1011 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1907030171 X-Original-Sender: daniel.cyran@woodward.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@woodward.com header.s=20190114Woodward header.b=gngWWQRL; spf=pass (google.com: domain of daniel.cyran@woodward.com designates 204.27.169.35 as permitted sender) smtp.mailfrom=Daniel.Cyran@woodward.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=woodward.com X-Original-From: Daniel Cyran Reply-To: Daniel Cyran 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: , Fix: hnd_name is set when new installation of an image is started Signed-off-by: Daniel Cyran --- corelib/installer.c | 2 +- corelib/progress_thread.c | 3 ++- include/progress.h | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/corelib/installer.c b/corelib/installer.c index 498fcc8..ff6cb18 100644 --- a/corelib/installer.c +++ b/corelib/installer.c @@ -233,7 +233,7 @@ int install_single_image(struct img_type *img, int dry_run) } TRACE("Found installer for stream %s %s", img->fname, hnd->desc); - swupdate_progress_inc_step(img->fname); + swupdate_progress_inc_step(img->fname, hnd->desc); /* TODO : check callback to push results / progress */ ret = hnd->installer(img, hnd->data); diff --git a/corelib/progress_thread.c b/corelib/progress_thread.c index b3fad3d..4f29d6a 100644 --- a/corelib/progress_thread.c +++ b/corelib/progress_thread.c @@ -113,13 +113,14 @@ void swupdate_progress_update(unsigned int perc) pthread_mutex_unlock(&prbar->lock); } -void swupdate_progress_inc_step(char *image) +void swupdate_progress_inc_step(char *image, char *handler_name) { struct swupdate_progress *prbar = &progress; pthread_mutex_lock(&prbar->lock); prbar->msg.cur_step++; prbar->msg.cur_percent = 0; strncpy(prbar->msg.cur_image, image, sizeof(prbar->msg.cur_image)); + strncpy(prbar->msg.hnd_name, handler_name, sizeof(prbar->msg.hnd_name)); prbar->step_running = true; prbar->msg.status = RUN; send_progress_msg(); diff --git a/include/progress.h b/include/progress.h index 982bdd0..b4d09d2 100644 --- a/include/progress.h +++ b/include/progress.h @@ -18,7 +18,7 @@ */ void swupdate_progress_init(unsigned int nsteps); void swupdate_progress_update(unsigned int perc); -void swupdate_progress_inc_step(char *image); +void swupdate_progress_inc_step(char *image, char *handler_name); void swupdate_progress_step_completed(void); void swupdate_progress_end(RECOVERY_STATUS status); void swupdate_progress_done(const char *info);