From patchwork Tue Nov 25 15:09:54 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Taras Kondratiuk X-Patchwork-Id: 41473 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f71.google.com (mail-la0-f71.google.com [209.85.215.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id B856D25E18 for ; Tue, 25 Nov 2014 15:10:27 +0000 (UTC) Received: by mail-la0-f71.google.com with SMTP id s18sf543195lam.2 for ; Tue, 25 Nov 2014 07:10:26 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:date:message-id:in-reply-to :references:subject:precedence:list-id:list-unsubscribe:list-archive :list-post:list-help:list-subscribe:mime-version:content-type :content-transfer-encoding:errors-to:sender:x-original-sender :x-original-authentication-results:mailing-list; bh=AdRVobhw5dI/JOcNoFETgkKRV1HXgEZ+S26mqJrN27Q=; b=IvH6hlmC5ThRqZH6fo29oMEZiprGxxUeToJiEoRc3A8oduAPba78BMGivdn9qQarhH ZJ9cHk967OpeS7S37tB6x94Rd/FpVa+Ka+DV29WTuQOvArVeGMFTfuRTy8xyOmGsEnu4 l8SR0yxIoY6+fbl8DJ+EjZAZ5pR3GyNMCzLit59Sb16ob3FWNBO6xoAn71X9T39R4N6s gwGgunClMyBbGW1+HtMy5FHz2EtsU7RKc49Lnv7fx5B3DJ6h84F38n9aGdvaG5cod3tD JIZx9SqtOu6UlFnhUGBD5ruNqYYdc6xDkY7LY4KFkxsxgUEqhX0feAF5UMl8Y9HxTlLi IS1A== X-Gm-Message-State: ALoCoQkdlcHP7e8MX0VWEfAVww/VcmRuoGHILp2W5fM0sJdGkqw/mms/uP65MH2WOOI3wswU4+8y X-Received: by 10.112.188.199 with SMTP id gc7mr7774487lbc.6.1416928226735; Tue, 25 Nov 2014 07:10:26 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.2.67 with SMTP id 3ls449646las.61.gmail; Tue, 25 Nov 2014 07:10:26 -0800 (PST) X-Received: by 10.152.115.230 with SMTP id jr6mr27820811lab.2.1416928226368; Tue, 25 Nov 2014 07:10:26 -0800 (PST) Received: from mail-lb0-f179.google.com (mail-lb0-f179.google.com. [209.85.217.179]) by mx.google.com with ESMTPS id v4si1596292laj.106.2014.11.25.07.10.26 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 25 Nov 2014 07:10:26 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.179 as permitted sender) client-ip=209.85.217.179; Received: by mail-lb0-f179.google.com with SMTP id z11so690702lbi.24 for ; Tue, 25 Nov 2014 07:10:26 -0800 (PST) X-Received: by 10.152.9.7 with SMTP id v7mr27770473laa.40.1416928225924; Tue, 25 Nov 2014 07:10:25 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.184.201 with SMTP id ew9csp450820lbc; Tue, 25 Nov 2014 07:10:25 -0800 (PST) X-Received: by 10.220.225.74 with SMTP id ir10mr14929221vcb.69.1416928224388; Tue, 25 Nov 2014 07:10:24 -0800 (PST) Received: from ip-10-35-177-41.ec2.internal (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTPS id d35si1526142qgd.84.2014.11.25.07.10.19 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 25 Nov 2014 07:10:24 -0800 (PST) Received-SPF: none (google.com: lng-odp-bounces@lists.linaro.org does not designate permitted sender hosts) client-ip=54.225.227.206; Received: from localhost ([127.0.0.1] helo=ip-10-35-177-41.ec2.internal) by ip-10-35-177-41.ec2.internal with esmtp (Exim 4.76) (envelope-from ) id 1XtHkw-0008Lx-Gc; Tue, 25 Nov 2014 15:10:18 +0000 Received: from mail-la0-f45.google.com ([209.85.215.45]) by ip-10-35-177-41.ec2.internal with esmtp (Exim 4.76) (envelope-from ) id 1XtHkm-0008Jw-B2 for lng-odp@lists.linaro.org; Tue, 25 Nov 2014 15:10:08 +0000 Received: by mail-la0-f45.google.com with SMTP id gq15so713151lab.32 for ; Tue, 25 Nov 2014 07:10:02 -0800 (PST) X-Received: by 10.112.27.133 with SMTP id t5mr24047965lbg.45.1416928202619; Tue, 25 Nov 2014 07:10:02 -0800 (PST) Received: from uglx0153363.synapse.com ([195.238.92.128]) by mx.google.com with ESMTPSA id s8sm402716lae.47.2014.11.25.07.10.01 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 25 Nov 2014 07:10:01 -0800 (PST) From: Taras Kondratiuk To: lng-odp@lists.linaro.org Date: Tue, 25 Nov 2014 17:09:54 +0200 Message-Id: <1416928195-17612-2-git-send-email-taras.kondratiuk@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1416928195-17612-1-git-send-email-taras.kondratiuk@linaro.org> References: <1416928195-17612-1-git-send-email-taras.kondratiuk@linaro.org> X-Topics: patch Subject: [lng-odp] [PATCHv2 1/2] platform: debug: replace fprintf() with odp_override_log() X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , MIME-Version: 1.0 Errors-To: lng-odp-bounces@lists.linaro.org Sender: lng-odp-bounces@lists.linaro.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: taras.kondratiuk@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.179 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 ODP application may want to override default ODP logging behaviour and use custom logging function. Add a weak odp_override_log() function for this purpose instead of default fprintf(). Signed-off-by: Taras Kondratiuk --- platform/linux-generic/Makefile.am | 3 +- platform/linux-generic/include/api/odp_debug.h | 41 ++++++++++++++++-------- platform/linux-generic/odp_weak.c | 23 +++++++++++++ 3 files changed, 53 insertions(+), 14 deletions(-) create mode 100644 platform/linux-generic/odp_weak.c diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index e709700..cc78de3 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -75,4 +75,5 @@ __LIB__libodp_la_SOURCES = \ odp_thread.c \ odp_ticketlock.c \ odp_time.c \ - odp_timer.c + odp_timer.c \ + odp_weak.c diff --git a/platform/linux-generic/include/api/odp_debug.h b/platform/linux-generic/include/api/odp_debug.h index 5c3adde..cb5bc83 100644 --- a/platform/linux-generic/include/api/odp_debug.h +++ b/platform/linux-generic/include/api/odp_debug.h @@ -14,6 +14,7 @@ #include #include +#include #ifdef __cplusplus extern "C" { @@ -81,62 +82,76 @@ typedef enum odp_log_level { } odp_log_level_e; /** - * ODP default LOG macro. + * ODP log function + * + * Instead of direct prints to stdout/stderr all logging in ODP implementation + * should be done via this function or its wrappers. + * ODP platform MUST provide a default *weak* implementation of this function. + * Application MAY override the function if needed by providing a strong + * function. + * + * @param level Log level + * @param fmt printf-style message format + */ +extern int odp_override_log(odp_log_level_e level, const char *fmt, ...); + +/** + * ODP LOG macro. */ #define ODP_LOG(level, fmt, ...) \ do { \ switch (level) { \ case ODP_LOG_ERR: \ - fprintf(stderr, "%s:%d:%s():" fmt, __FILE__, \ + odp_override_log(level, "%s:%d:%s():" fmt, __FILE__, \ __LINE__, __func__, ##__VA_ARGS__); \ break; \ case ODP_LOG_DBG: \ if (ODP_DEBUG_PRINT == 1) \ - fprintf(stderr, "%s:%d:%s():" fmt, __FILE__, \ + odp_override_log(level, "%s:%d:%s():" fmt, __FILE__, \ __LINE__, __func__, ##__VA_ARGS__); \ break; \ case ODP_LOG_PRINT: \ - fprintf(stdout, "%s:%d:%s():" fmt, __FILE__, \ + odp_override_log(level, "%s:%d:%s():" fmt, __FILE__, \ __LINE__, __func__, ##__VA_ARGS__); \ break; \ case ODP_LOG_ABORT: \ - fprintf(stderr, "%s:%d:%s(): " fmt, __FILE__, \ + odp_override_log(level, "%s:%d:%s(): " fmt, __FILE__, \ __LINE__, __func__, ##__VA_ARGS__); \ abort(); \ break; \ case ODP_LOG_UNIMPLEMENTED: \ - fprintf(stderr, \ + odp_override_log(level, \ "%s:%d:The function %s() is not implemented\n" \ fmt, __FILE__, __LINE__, __func__, ##__VA_ARGS__); \ break; \ default: \ - fprintf(stderr, "Unknown LOG level"); \ + odp_override_log(level, "Unknown LOG level"); \ break;\ } \ } while (0) /** - * Printing macro, which prints output when the application - * calls one of the ODP APIs specifically for dumping internal data. + * Log print message when the application calls one of the ODP APIs + * specifically for dumping internal data. */ #define ODP_PRINT(fmt, ...) \ ODP_LOG(ODP_LOG_PRINT, fmt, ##__VA_ARGS__) /** - * Debug printing macro, which prints output when DEBUG flag is set. + * Log debug message if DEBUG flag is set. */ #define ODP_DBG(fmt, ...) \ ODP_LOG(ODP_LOG_DBG, fmt, ##__VA_ARGS__) /** - * Print output to stderr (file, line and function). + * Log error message. */ #define ODP_ERR(fmt, ...) \ ODP_LOG(ODP_LOG_ERR, fmt, ##__VA_ARGS__) /** - * Print output to stderr (file, line and function), - * then abort. + * Log abort message and then stop execution (by default call abort()). + * This function should not return. */ #define ODP_ABORT(fmt, ...) \ ODP_LOG(ODP_LOG_ABORT, fmt, ##__VA_ARGS__) diff --git a/platform/linux-generic/odp_weak.c b/platform/linux-generic/odp_weak.c new file mode 100644 index 0000000..fccbc3f --- /dev/null +++ b/platform/linux-generic/odp_weak.c @@ -0,0 +1,23 @@ +/* Copyright (c) 2014, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include +#include +#include +#include + +ODP_WEAK_SYMBOL int odp_override_log(odp_log_level_e level ODP_UNUSED, + const char *fmt, ...) +{ + va_list args; + int r; + + va_start(args, fmt); + r = vfprintf(stderr, fmt, args); + va_end(args); + + return r; +}