From patchwork Mon Apr 20 08:40:47 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Storm, Christian" X-Patchwork-Id: 1273207 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::437; helo=mail-wr1-x437.google.com; envelope-from=swupdate+bncbdd6bwv65qpbbrv76x2akgqeon5kwcq@googlegroups.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=siemens.com 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=ipqteTg/; dkim-atps=neutral Received: from mail-wr1-x437.google.com (mail-wr1-x437.google.com [IPv6:2a00:1450:4864:20::437]) (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 495KrB2VPPz9sP7 for ; Mon, 20 Apr 2020 18:39:38 +1000 (AEST) Received: by mail-wr1-x437.google.com with SMTP id m5sf5376234wru.15 for ; Mon, 20 Apr 2020 01:39:38 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1587371975; cv=pass; d=google.com; s=arc-20160816; b=cqBfWhBNzwKUFGxLJzLD/nTnktyBcOurN6EpYyr2xdMFxy5sPcOD60QeWxdgJpui97 V8SP/HlM5Ej818blWwiZ97yrvqV+cMRLGNNNOIwIYE6Fjp1E6tjwF73QRScHF0uIVz0B IDdHygfDxtmyaWUkWOXwtQHbhBDPK5S7DtmTrTZfHHphkSE0dJP5/A+rEdPwl7EVXvVC eHN9B3P6Lzazwcw5HGfNvPE+XcAl+LCHpBzZGOSYO8HlcIJQfAc6gZGdtn2wNoiyA/yB 2EVyXN9bT2AlGqfPjZul1jkQ6QA01wYB6uJG7ZxqdqidFKCzRteOtN8s5Mjhvzy+evzi c3EA== 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=YAFV8BJBybTL++oU+dGASs6MHKtkg8pp6zzzyEnc8QA=; b=NV76YJimlqyQgGpzjU6RHE4wvOQjUUF5IoN6M5LOTeu3MfXdCB3pbHBK5Q6Pv+hywd cPjfgTRJO28FDa7N0eQTSBX5azTDffe6/fk3nYETZUvn97EUww7jb9UuAQgRfxhOpAuB QbKc9gXGUTFHzGNBl45HJMRDpOYr2QIMi6qXNN6B/7wLjwVVJfZxYu8lNQ3Ik0qMgVSH g7ZrDYPoHI3DI9S+VMeDT0td4WdKpidVctjUEvv6z3zW80g8M/x+ZVyhZ9mxY2VGCBCU fGxjNEqe1T8VdTuCaclHexGtVKmPS0HWXbBAehzrZahvRXKaV5nZIvkgHxVNZ4KHqytA JchA== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of christian.storm@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=christian.storm@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com 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=YAFV8BJBybTL++oU+dGASs6MHKtkg8pp6zzzyEnc8QA=; b=ipqteTg/gpxdJVRJbQQJrEwP0XCOfN4OaeXPQfKbKmeY2fb3x4JiO9crcxHIfyW6Yd 8Sm0iMdTRZEocbS/C+cm5dF55yXBWrOLPPz8BoKRROqixiiMMUrtDgDsYZPK1RCv7+yO zX6UMW84JULSrO7a+7l2gHHxc4/C+KMtCcS+0ofaOBFFo91VmlzWwdq+EyFUsq7xB/TA WyGx8kWMJ0H8jV8asb44+FnKmV/sI608JdG7lQiGwHW+vsssG83X4ZUEtofHpRf+O8vi R/IocWQCS6NVCsmFBCXLoSzihMFnBlAyFa0ZnGl6wiyDfzPqkhBzsueL7iQFokn5wh3k /CTw== 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=YAFV8BJBybTL++oU+dGASs6MHKtkg8pp6zzzyEnc8QA=; b=M1GpmdcVhKtrHycrSgJh979B1FlZnp97RmrY0gtgy5MUB5kyFnG8n5+9eQcQKUqoXJ YtklGsmGMQlhw2vEVukS3Xv5+nrrSt5KkPTakQALLM6JSNKULKRR2gNK78gfQzBht1ZX DuFnsitYSmo4Nk4xgn4X3iiSp9qoig2AWZL45zidme/kaHlt24h6dJJ0VNTJRKdXSu/p grJ5D6uh5nOiEKkGSv9Nxs8wT3mAmSawYy6WOTfXlCDEzPS83CLzocfoYgrbhnrrbkoj 5jJkvANhMfIfhfrDQ2ygZ9fnXzIECnIeAxDEoineomuBcv6sx6S0EEbSI7MDH7a7z5Fb TKvA== Sender: swupdate@googlegroups.com X-Gm-Message-State: AGi0PubuHylm80JrQatvAEkZ/JU0fWDPsyIpMmlU5bdzKW9PWo3qrbAW XwQCkOQXyVackae6CoHqxTE= X-Google-Smtp-Source: APiQypKKfTriIyCT+kyQUxyYAx1IxFMhRxo8RrjzSX8CeMyILBxdBXvOG57WXFLyXdX0BWb3SIBYkg== X-Received: by 2002:adf:e3ca:: with SMTP id k10mr18770016wrm.53.1587371975250; Mon, 20 Apr 2020 01:39:35 -0700 (PDT) X-BeenThere: swupdate@googlegroups.com Received: by 2002:a05:600c:224f:: with SMTP id a15ls13260192wmm.3.gmail; Mon, 20 Apr 2020 01:39:34 -0700 (PDT) X-Received: by 2002:a1c:148:: with SMTP id 69mr17135548wmb.181.1587371974562; Mon, 20 Apr 2020 01:39:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1587371974; cv=none; d=google.com; s=arc-20160816; b=K7LzQLdCE7B2oDYNMLhjeFqMoBeLp9BkV8V/2+5f5/yHmtsdHO9Rgpidy18fTePYbk ribPqsd3M3uZf3G4CM/tYQseLoMRpVYoNvBrhdLXh22fWaLS3KtvltI6swS3Y+VOQRUg JLFCz3oMDiI/V33dHV14dHQSlajKZLmq1Ntq157XTsHL9tSWM6lRMCNJjIL4naJAPDDO 1ohhN9oGKNuvqtGFhmxfEg9CzBLIRZTObWSx6hxY8gRgifiy/BTQx72fJRUri/CIx5Du SM5Af4FaYFm0yrQnVcswim7Lrm2bAdiWCmD5ypIhZyShr2J6RuAVzYYaEqNPiVuSiDcQ o3Qg== 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=Q7yJIsLwQkSdjSJsHS/vDxmNh0jAh8rnciWMzK3j5Dc=; b=ktDYj4NnhPM9/bKs5gBvh/jSJk8+2IBGEvigdRdbW/jAcpSxIhO1fik9dgg+fxSSrZ HoUZBcJxADBYxBSb9fJoralQKiC9LgpDhIAbK7EQ4pBAxchLGfTR7sf40YVJGqYVyMfI h9fqXvE/cVOMkNAS3QOIDJxXJwt3eriw1XFTwUojGyvNE6W2ebdW8+ROipVDxrELdiee AOLnSv15FtxQ5OUTfo3pMQR+PkWAYDUdB3Y5ps0tEQ6THbNMuOZrYS1m3+CNEcvKDO69 u7sL42ItrfW4XiHM7A+/f58NKERriIeFYTsbRAUIAwpgfkBIuQYy+sR425YAudAbkIHh puLw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of christian.storm@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=christian.storm@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from goliath.siemens.de (goliath.siemens.de. [192.35.17.28]) by gmr-mx.google.com with ESMTPS id 71si316337wmb.1.2020.04.20.01.39.34 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 20 Apr 2020 01:39:34 -0700 (PDT) Received-SPF: pass (google.com: domain of christian.storm@siemens.com designates 192.35.17.28 as permitted sender) client-ip=192.35.17.28; Received: from mail1.siemens.de (mail1.siemens.de [139.23.33.14]) by goliath.siemens.de (8.15.2/8.15.2) with ESMTPS id 03K8dYrp020428 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 20 Apr 2020 10:39:34 +0200 Received: from MD1ZFJVC.ad001.siemens.net ([167.87.32.117]) by mail1.siemens.de (8.15.2/8.15.2) with ESMTP id 03K8dWco006755; Mon, 20 Apr 2020 10:39:33 +0200 From: Christian Storm To: swupdate@googlegroups.com Cc: Christian Storm Subject: [swupdate] [PATCH] Lua: expose notification functions Date: Mon, 20 Apr 2020 10:40:47 +0200 Message-Id: <20200420084047.40228-1-christian.storm@siemens.com> X-Mailer: git-send-email 2.26.1 MIME-Version: 1.0 X-Original-Sender: christian.storm@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of christian.storm@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=christian.storm@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.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: , Expose the notification functions for TRACE, DEBUG, WARN, INFO, and ERROR as public for other modules to use them. Signed-off-by: Christian Storm --- corelib/lua_interface.c | 20 ++++++++++---------- include/lua_util.h | 7 +++++++ 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/corelib/lua_interface.c b/corelib/lua_interface.c index 394aef1..219ee41 100644 --- a/corelib/lua_interface.c +++ b/corelib/lua_interface.c @@ -711,24 +711,24 @@ static int notify_helper(lua_State *L, LOGLEVEL level) return 0; } -static int l_trace(lua_State *L) { +int lua_notify_trace(lua_State *L) { return notify_helper(L, TRACELEVEL); } -static int l_error(lua_State *L) { +int lua_notify_error(lua_State *L) { return notify_helper(L, ERRORLEVEL); } -static int l_info(lua_State *L) { +int lua_notify_info(lua_State *L) { return notify_helper(L, INFOLEVEL); } -static int l_warn(lua_State *L) +int lua_notify_warn(lua_State *L) { return notify_helper(L, WARNLEVEL); } -static int l_debug(lua_State *L) +int lua_notify_debug(lua_State *L) { return notify_helper(L, DEBUGLEVEL); } @@ -851,11 +851,11 @@ static int l_progress_update(lua_State *L) */ static const luaL_Reg l_swupdate[] = { { "notify", l_notify }, - { "error", l_error }, - { "trace", l_trace }, - { "info", l_info }, - { "warn", l_warn }, - { "debug", l_debug }, + { "error", lua_notify_error }, + { "trace", lua_notify_trace }, + { "info", lua_notify_info }, + { "warn", lua_notify_warn }, + { "debug", lua_notify_debug }, { "mount", l_mount }, { "umount", l_umount }, { NULL, NULL } diff --git a/include/lua_util.h b/include/lua_util.h index ee5e2cf..a38a735 100644 --- a/include/lua_util.h +++ b/include/lua_util.h @@ -20,6 +20,13 @@ int run_lua_script(const char *script, const char *function, char *parms); lua_State *lua_parser_init(const char *buf, struct dict *bootenv); int lua_parser_fn(lua_State *L, const char *fcn, struct img_type *img); int lua_handlers_init(void); + +int lua_notify_trace(lua_State *L); +int lua_notify_error(lua_State *L); +int lua_notify_info(lua_State *L); +int lua_notify_warn(lua_State *L); +int lua_notify_debug(lua_State *L); + #define lua_parser_exit(L) lua_close((lua_State *)L) #if !defined(LUA_VERSION_NUM) || LUA_VERSION_NUM == 501