From patchwork Sat Jun 15 16:24:56 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefano Babic X-Patchwork-Id: 1948191 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=googlegroups.com header.i=@googlegroups.com header.a=rsa-sha256 header.s=20230601 header.b=imtjiRnk; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=googlegroups.com (client-ip=2a00:1450:4864:20::13a; helo=mail-lf1-x13a.google.com; envelope-from=swupdate+bncbd2zdgn6sekrbyuaw6zqmgqe764fyli@googlegroups.com; receiver=patchwork.ozlabs.org) Received: from mail-lf1-x13a.google.com (mail-lf1-x13a.google.com [IPv6:2a00:1450:4864:20::13a]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4W1hMH5vJRz20KL for ; Sun, 16 Jun 2024 02:25:14 +1000 (AEST) Received: by mail-lf1-x13a.google.com with SMTP id 2adb3069b0e04-52c8126f372sf2312982e87.1 for ; Sat, 15 Jun 2024 09:25:14 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1718468708; cv=pass; d=google.com; s=arc-20160816; b=IaXb0lzeGosggezkq2h4cBDP7vwBus6EjWdAw0fmOxwfeEPsen8UkpSYr8I7TIWmPE nHFmB4a1g7JYxBbFe/DymJKo0QGQFjXrISihmThmQ+cwrilCRqmQeFThxkeRnrRxfPxq 9gYUjNfPIxZw/j9P45H4aRaD/Ch0bE8r+yks2hzKKlr8dS5ZJGtoZNDED0yghK08Pzb2 qtycmaSxYkZFunUd9jjkk0ztKWiivwLlLaQz0/Jt4WG3Z7Y1M7q0N15hKfl014gGrcXg hbP3qcG+QTWgbnHHJ4o++ORIoc9R1xbjBY+KppkyPeRJgoXPe+n5UQdDZUknjPu+mIN6 P1rQ== 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:ui-outboundreport:mime-version :message-id:date:subject:cc:to:from:sender:dkim-signature; bh=tE+GM9KrSt2PKMa7F1eKpiFfs6vMPjdj2sF7pu9IB0s=; fh=QoHieq7HI0XrU0aI3IPeOpoJsdJoJRqiDZqiZeFPwhY=; b=Upr+PmBmgqYf625EZdKZ8dAOsuB3m7nA2XEf6275kjU3ilfRdRyZZuxrXOjUtc4Fcm /hr14dy64UXRk4McPsU7rHbqKHaJpl+oipDmIeEw8gxXpXXTuxOYx1w4Crf3yQKrGg0v OPQ1VbeQ+P5u+Eo76j6GV5qwd1r9/ETQCCuCBiOxqw/zbRAOSCJjGr71bKTW4Q0HMI6F 2AJAuEIO9QS5zE1jV2brN4WJEjliE/U5kFKpRXg5x6Uu1AMeDXqWuv5MWUjjRK3sVdWs SdvgqxBIZoJHH9YjHw42ZJKg2kjn21IZT6yCQ1VzJqTyAgUk9g9v7/0ZR1MjqnQcah1R NQ2Q==; darn=patchwork.ozlabs.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@swupdate.org header.s=s1-ionos header.b=M0jBRyii; spf=pass (google.com: domain of stefano.babic@swupdate.org designates 217.72.192.74 as permitted sender) smtp.mailfrom=stefano.babic@swupdate.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1718468708; x=1719073508; darn=patchwork.ozlabs.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:ui-outboundreport:mime-version:message-id:date :subject:cc:to:from:sender:from:to:cc:subject:date:message-id :reply-to; bh=tE+GM9KrSt2PKMa7F1eKpiFfs6vMPjdj2sF7pu9IB0s=; b=imtjiRnk48mqQRXDzbfdopWtmmbLkw5sWvISekqPYAOnP9cjWMhuioYwwzFwsLQkTs wphzFhcjlPx52FGffixKqhX5OUmv115BEiSdEIOpSs0yOUWFWojaRLkgD6njUS0ApHJO 3iFtd5acqcLLlhZXd5XHbV8AWrk05T/U01nVABv5A6c/j4elQUJLYriwiIa3xHQz+ygM W0vgg3cs4N46SI3nPLErvj5FnHHCrnh90E3X3oOXuZAoveOjY60qrOnXzeAxZdsHcKx9 ujRPVToGJ1ByHJ7kZej0CZFcvZkUrgpouEfMolmPYv+g/SR7RcumfLk3cAW3dXa5BAV+ Yhdg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718468708; x=1719073508; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender :ui-outboundreport:mime-version:message-id:date:subject:cc:to:from :x-beenthere:x-gm-message-state:sender:from:to:cc:subject:date :message-id:reply-to; bh=tE+GM9KrSt2PKMa7F1eKpiFfs6vMPjdj2sF7pu9IB0s=; b=dHkkhucDfp1lxfcFP3y1tWaZrymefrmQhujtCK5ssgOkFXq59MS5zkUii+X8282RuQ PTmgFOa3SlUOAjBPPr+8TAxwnpdtex9FIXHOCVKkm3dr8OIqY72DmfjunHEtpCaBvO/y vwYfnJdIKkbW/9tc+c8QAmaxOcSMhdnRK/NAixL5Qvv967JNhePyhaIo8SKirKCWbcgM h7ea/83OccgSRWIxhJnlJLgDvDJHFjtEzKVPNb1Rke0rwUlWV0mfpfVKk4ydQWWUJU1T CQ+RewkSFJG1TFTgh5SYXN+q12urfS/JfJldIb+eilNUdHdkUjtObhVHmKpefMbw4dio 69Eg== Sender: swupdate@googlegroups.com X-Forwarded-Encrypted: i=2; AJvYcCVTTKfHb8L7YeUeh1VCES4rSkx3RoMaHd9rCR958mxY4vaXiu1MoGBRonJLFBrYgbwZBVgQm2Fro2dhha0WFekEwiJ2M486WWNDQSzkPw== X-Gm-Message-State: AOJu0Ywts6piKwX2JwOK7Ly2piGLYPa78Cr8UJrsXEmaFvEzvxRF9tfa ZlIaFqannNjC21pimLqKJYAKcgfy38k8AqRKMvLktXf7vJsJIRV5 X-Google-Smtp-Source: AGHT+IGvrvE3LeqGOIK4VGyP20SpacgejT7m8uf2zAuewZD8RhdvMFd68ee7aSLmUo/Py+oDBwAvhw== X-Received: by 2002:a19:690f:0:b0:52c:9bb3:6661 with SMTP id 2adb3069b0e04-52ca6e9049amr3464292e87.47.1718468707758; Sat, 15 Jun 2024 09:25:07 -0700 (PDT) X-BeenThere: swupdate@googlegroups.com Received: by 2002:a05:600c:4506:b0:422:27b5:8477 with SMTP id 5b1f17b1804b1-422b8ca9598ls14122295e9.2.-pod-prod-07-eu; Sat, 15 Jun 2024 09:25:05 -0700 (PDT) X-Received: by 2002:a05:600c:1d29:b0:421:79dc:56e4 with SMTP id 5b1f17b1804b1-42304862690mr44294675e9.41.1718468704761; Sat, 15 Jun 2024 09:25:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1718468704; cv=none; d=google.com; s=arc-20160816; b=xssfhWk7cZ1iOxf+ZusQjOsQ21EeSIiBuP+l+TDMnjskf6wSM/3jVZm0Zf/Yku5XNr fKwpeYCn7VgnycsVaxovUsKf8VkM5+Y39mpQs8wH+hBthrm42fmJEsy1wAqxNGQ2O6lP w9QwYDA53Hk+UkIwEnMLlGV1UNaFKVe+PuHz/U80Jzp+QLbje0BrGpGt2dxv1FQAhKKA cVZ7AgGCEkLVUpkjx/mSeSBV8HXxiLKOyHsirklN65HhvkyV5y0gyUCvluRPQrQ98ZNq Ibla618Y0nlBPT2/jXir55XM24n1mY17HIoRfTzfQSoTIXSmYO0XRwbJzCLrf1RhAgE2 8dTQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=ui-outboundreport:content-transfer-encoding:mime-version:message-id :date:subject:cc:to:from:dkim-signature; bh=OEOhArsj3fCSkSgvY47z83yQx+F1VdoxIKf+q7VKvfc=; fh=0WWLKySaSu2VAqBzqueTREBwAckSfWUDFJtt+YZhLVQ=; b=yBOPMKlGhRFddvV02bv2/w3IHvHlgzM+bpeZP2L4yfDe6FPcq0S8ehz/Sj8FXdQtz6 OwUY9y2CdeGsQ3bhxUf53DqktBOxtWcVyLLy0pxZuC8Mq4HKP9fWaB9aSPzUrv0kAvQi z4tzXXwIgJ6SneNrGXq63+hn+yLMyN2n/C5YD1Ry3qbzqKsT+ulObVsrKkR+TObFrGvB eVzRWC/BHJ8V8658Xbsq5Fw7JEWacUAziDmVdA6/knKNPGXqGay4tTmvM4Rp5QuTy4d3 HbowH4O7O7a/5yTG+zCuKoEdec9vG3cic0zkVlAbz/vkvOjj8Qs3Pyj225LnUO61QOEx Yoew==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@swupdate.org header.s=s1-ionos header.b=M0jBRyii; spf=pass (google.com: domain of stefano.babic@swupdate.org designates 217.72.192.74 as permitted sender) smtp.mailfrom=stefano.babic@swupdate.org Received: from mout.kundenserver.de (mout.kundenserver.de. [217.72.192.74]) by gmr-mx.google.com with ESMTPS id 5b1f17b1804b1-422855708b8si457825e9.1.2024.06.15.09.25.04 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 15 Jun 2024 09:25:04 -0700 (PDT) Received-SPF: pass (google.com: domain of stefano.babic@swupdate.org designates 217.72.192.74 as permitted sender) client-ip=217.72.192.74; X-UI-Sender-Class: 55c96926-9e95-11ee-ae09-1f7a4046a0f6 Received: from paperino.fritz.box ([88.217.136.221]) by mrelayeu.kundenserver.de (mreue107 [213.165.67.113]) with ESMTPSA (Nemesis) id 1MbBUc-1spO7k0G1A-00ifEa; Sat, 15 Jun 2024 18:25:04 +0200 From: Stefano Babic To: swupdate@googlegroups.com Cc: "Storm, Christian" , Stefano Babic Subject: [swupdate] [PATCH V2 3/3] handler: Print registered session & global handlers Date: Sat, 15 Jun 2024 18:24:56 +0200 Message-Id: <20240615162456.2732415-1-stefano.babic@swupdate.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Provags-ID: V03:K1:zhGpyexyh+oDFAvFT/Zf7OSK46jXt2WDPWzirlkU9aywdMAxvd2 1gPnFWsDnqaqFh+KV6oCi7EcObElTV43D9k5NWkM0kK1KVh7SXt6cmfuL0JF02RGj3L0nmQ +w1cpeinBPtsIs2P018Y/Z+mcyAfx7/oFVGxXpG6uagMbegdW5w51YqTj5zr+lz4GAiR8Z3 N0LpppcSvmhCFyUSNNkAQ== X-Spam-Flag: NO UI-OutboundReport: notjunk:1;M01:P0:F7sRam3qS2E=;JZbJytZVZ08wchFyzaVOxquNGjR o2n/t2pMF21fb2llH7YmHbOhQfXcfIOt16ln9n0yb0bMiVttCeZI9DMj58pxT6eUL8zXRrpQ/ S5fHxZBvHIw+3uaZzWXiJfcnpFMrg1oOFmtRMilpLbnw+GwjyAQcWDfVlaBasG56QYv0cMWkI 5JcQ1nQiWeOoiwMfx9P9idGE0YENPQ7fTgKcmTaQvi+8As/RxBa9FcNvSLi+FeKMDCsgZ8z/X YYUW+CZl6rmvIxlf6gKZ1oY07cHp5SPo7PpSa/DLtkusmcmPJGHH0Uz/E2hHDITDdePQMSZ7W NUflEPrfEKjAyfp4JdBOQ9R8F+H1l8lDVY2o3O0/ueDVT8moR/jnuRQ0qPOS0ZSRYNWQVeA/c L5foht0KcNWHdTw95Gfr9/3mSmlXpO4sQxq8K38HXMpSJEIe0PcHMhxxXv4RjUj2B6rdLAWJt axpiuxUYdBEtTOVR2FZ2h8ryBTWDGRhZ4QdW6STVgX1pGZrQz3Un+uYOUFxcnmvXxoQJCQ7l7 CGn+R95AXugNwh3F7+c0hbJ/4BSyEM8lEUilmTPtosileN+fRMdehgp9G9I88/JvxVGfVYG0n E6QvVWXouREuT4srht04LXXyKsN2U+GsHYwUMAiiK5D4f/5spz6CJaZ8dgZraAnLm7g59lA4k PfGjKxAp5PJYXubcZHMeFsU6k2O0oISrV7qHh1EItpU8L4v9gjUiV9Tej/MTpFwU10BHI2rff SkxupFlR/i28+QgjifHRwIkzNv1PKRsc8aKpTc0z2GoZkdHyf8Eq8o= X-Original-Sender: stefano.babic@swupdate.org X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@swupdate.org header.s=s1-ionos header.b=M0jBRyii; spf=pass (google.com: domain of stefano.babic@swupdate.org designates 217.72.192.74 as permitted sender) smtp.mailfrom=stefano.babic@swupdate.org 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: , From: "Storm, Christian" With Lua handlers having become session handlers, print them as well on SWUpdate startup. Signed-off-by: Christian Storm Signed-off-by: Stefano Babic --- Changes since V1: - fix defect discovered by coverity core/handler.c | 13 +++++++++---- core/swupdate.c | 2 +- corelib/lua_interface.c | 1 + include/handler.h | 2 +- 4 files changed, 12 insertions(+), 6 deletions(-) -- 2.34.1 diff --git a/core/handler.c b/core/handler.c index 74a211ac..c6fa30ae 100644 --- a/core/handler.c +++ b/core/handler.c @@ -98,16 +98,21 @@ void unregister_session_handlers(void) } } -void print_registered_handlers(void) +void print_registered_handlers(bool global) { unsigned int i; if (!nr_installers) return; - - INFO("Registered handlers:"); + /* + * Invert logic to ask for session handlers + */ + bool noglobal = !global; + INFO("Registered %s handlers:", global ? "global" : "session"); for (i = 0; i < nr_installers; i++) { - INFO("\t%s", supported_types[i].desc); + if (noglobal == supported_types[i].noglobal) { + INFO("\t%s", supported_types[i].desc); + } } } diff --git a/core/swupdate.c b/core/swupdate.c index 009abbbc..8d6467b7 100644 --- a/core/swupdate.c +++ b/core/swupdate.c @@ -866,7 +866,7 @@ int main(int argc, char **argv) if(!get_hw_revision(&swcfg.hw)) INFO("Running on %s Revision %s", swcfg.hw.boardname, swcfg.hw.revision); - print_registered_handlers(); + print_registered_handlers(true); if (swcfg.syslog_enabled) { if (syslog_init()) { ERROR("failed to initialize syslog notifier"); diff --git a/corelib/lua_interface.c b/corelib/lua_interface.c index 8de2e3cd..6b425dd0 100644 --- a/corelib/lua_interface.c +++ b/corelib/lua_interface.c @@ -1603,6 +1603,7 @@ int lua_init(void) { lua_State *L = luaL_newstate(); int res = lua_handlers_init(L); + print_registered_handlers(false); unregister_session_handlers(); lua_close(L); if (!gL) { diff --git a/include/handler.h b/include/handler.h index e100bd72..dc4bfe38 100644 --- a/include/handler.h +++ b/include/handler.h @@ -80,6 +80,6 @@ int unregister_handler(const char *desc); void unregister_session_handlers(void); struct installer_handler *find_handler(struct img_type *img); -void print_registered_handlers(void); +void print_registered_handlers(bool global); struct installer_handler *get_next_handler(void); unsigned int get_handler_mask(struct img_type *img);