From owner-svn-src-projects@FreeBSD.ORG Fri Mar 27 01:48:06 2015 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5DABAC4B; Fri, 27 Mar 2015 01:48:06 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2F27EC41; Fri, 27 Mar 2015 01:48:06 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t2R1m5IZ024210; Fri, 27 Mar 2015 01:48:05 GMT (envelope-from rpaulo@FreeBSD.org) Received: (from rpaulo@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t2R1m5Dg024209; Fri, 27 Mar 2015 01:48:05 GMT (envelope-from rpaulo@FreeBSD.org) Message-Id: <201503270148.t2R1m5Dg024209@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: rpaulo set sender to rpaulo@FreeBSD.org using -f From: Rui Paulo Date: Fri, 27 Mar 2015 01:48:05 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r280723 - projects/lua-bootloader/sys/boot/common X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 27 Mar 2015 01:48:06 -0000 Author: rpaulo Date: Fri Mar 27 01:48:05 2015 New Revision: 280723 URL: https://svnweb.freebsd.org/changeset/base/280723 Log: Improve the debugging printfs. Modified: projects/lua-bootloader/sys/boot/common/interp_lua.c Modified: projects/lua-bootloader/sys/boot/common/interp_lua.c ============================================================================== --- projects/lua-bootloader/sys/boot/common/interp_lua.c Fri Mar 27 00:42:51 2015 (r280722) +++ projects/lua-bootloader/sys/boot/common/interp_lua.c Fri Mar 27 01:48:05 2015 (r280723) @@ -43,13 +43,18 @@ __FBSDID("$FreeBSD$"); struct interp_lua_softc { lua_State *luap; }; -static struct interp_lua_softc lua_softc = { 0 }; +static struct interp_lua_softc lua_softc; + +#ifdef LUA_DEBUG #define LDBG(...) do { \ printf("%s(%d): ", __func__, __LINE__); \ printf(__VA_ARGS__); \ printf("\n"); \ } while (0) +#else +#define LDBG(...) +#endif void @@ -63,9 +68,11 @@ interp_lua_init(void *ctx) char buf[16]; softc = ctx; + LDBG("creating context"); luap = lua_create(); if (luap == NULL) { - LDBG("problem initializing the Lua interpreter"); + printf("problem initializing the Lua interpreter\n"); + abort(); } softc->luap = luap; register_utils(luap); @@ -84,9 +91,9 @@ interp_lua_run(void *data, const char *l softc = data; luap = softc->luap; - + LDBG("running line..."); if (ldo_string(luap, line, strlen(line)) != 0) - LDBG("failed to execute \'%s\'", line); + printf("failed to parse \'%s\'\n", line); return (0); } @@ -97,6 +104,7 @@ interp_lua_incl(void *ctx, const char *f struct interp_lua_softc *softc; softc = ctx; + LDBG("loading file %s", filename); return (ldo_file(softc->luap, filename)); } @@ -108,10 +116,11 @@ interp_lua_incl(void *ctx, const char *f int interp_lua_load_config(void *ctx) { + LDBG("loading config"); + return (interp_lua_incl(ctx, "/boot/loader.lua")); } - struct interp boot_interp_lua = { .init = interp_lua_init, .run = interp_lua_run,