From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id 2v7XJIhTpmCnVgAAWB0awg (envelope-from ) for ; Thu, 20 May 2021 08:18:16 -0400 Received: by simark.ca (Postfix, from userid 112) id 87C471F11C; Thu, 20 May 2021 08:18:16 -0400 (EDT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_REPLYTO_END_DIGIT,MAILING_LIST_MULTI, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from lists.lttng.org (lists.lttng.org [167.114.26.123]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPS id B1D411E54D for ; Thu, 20 May 2021 08:18:15 -0400 (EDT) Received: from lists-lttng01.efficios.com (localhost [IPv6:::1]) by lists.lttng.org (Postfix) with ESMTP id 4Fm807099lz1rhf; Thu, 20 May 2021 08:18:14 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=lists.lttng.org; s=default; t=1621513095; bh=fR9wl3OqrVIWvuC/qZaEhgGoMrnxFGWY2vt9gGUGz6A=; h=To:Date:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=vzhERUoW15idz3Dv43UROv3Jis7vXtmaMXN3GiGlx302gUQkHv4Y+ZWYuhxScSpxY BufzuAdg4hM4WpUQy1v2+T6i/BnA/kkrnmwiAChJFmfnC05awTnqhJBQrHejmv18QJ kL7ZxHY9UHm7so271exBHqfSknavq92STaxNZHGE2q5rl3kYTa8qSNiAvHFBj9RMOA GTCDjtRGfjaH0Ok/v0h5CBjhdedAuB8LuPkfN6ePaif3PXdfQtjE4NgYyvPlCVtuF2 QjQXeEMPrAHYa7XTp2od6JmYm8ozoEzcCmx6Zh9Vnk3vK2l1OY54XunXJsI741Sg+Q vV2M86KSw9qug== Received: from mail-ej1-x62f.google.com (mail-ej1-x62f.google.com [IPv6:2a00:1450:4864:20::62f]) by lists.lttng.org (Postfix) with ESMTPS id 4Fm8062kk6z1rhd for ; Thu, 20 May 2021 08:18:14 -0400 (EDT) Received: by mail-ej1-x62f.google.com with SMTP id p24so23684175ejb.1 for ; Thu, 20 May 2021 05:18:14 -0700 (PDT) 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:date:message-id:mime-version :content-transfer-encoding; bh=eR/8xH1TaNdomWLy/XJpn8sA/L1Rs2/O//6Gaz3pGL0=; b=NzlYp6tv7HLgkj9BnDeedjI7AXd1W+WQTwqjOvenEkAYDZ88a7k1UxFrgud0Pt0EWw xxhdMLpgLIi39rQLETGCqUCTRfZZkB1YljrGg9uOwhbW3oGMdR7rlNeYDVCM6jdXY52I JDmd1is9ygJMqrCuDlXaaOIWRtSnt93K5dLwhe4SRUueE3Vr9yQxrO78+rlq2xxajrVs 63bT9xv9bufbtr26WlVpSJXzMMkQm4ewvJMlnct5PPzI9/voGRuwIWDYFVEQUboVpFHi kEYtYEo0RWsSnJmlH5uFmHntqBTNDf51TG7yRbumKKg3iF9F6BBRJKUUxRE6Xx5tQHCB Bogg== X-Gm-Message-State: AOAM532vn6yej6uNaP16dLUDi/fz5F4rOlwIhOX8YtDYY9CSLt+Hc8Ru 4y6RxqFlU/siswKbJo77JnaDRoGMS7CEYQ== X-Google-Smtp-Source: ABdhPJwLPn9RcRvyittl/6fDheGrBdrY6VPByi/33IjKuj0V+S8iNdacmvsDBM3dHqy85EGX+weeVw== X-Received: by 2002:a17:907:1b1e:: with SMTP id mp30mr4514270ejc.532.1621513093014; Thu, 20 May 2021 05:18:13 -0700 (PDT) Received: from debian-noppl.. (84-114-45-16.cable.dynamic.surfer.at. [84.114.45.16]) by smtp.gmail.com with ESMTPSA id kx3sm1286319ejc.44.2021.05.20.05.18.12 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 May 2021 05:18:12 -0700 (PDT) To: lttng-dev@lists.lttng.org Date: Thu, 20 May 2021 14:18:06 +0200 Message-Id: <20210520121807.55428-1-nolange79@gmail.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Subject: [lttng-dev] [PATCH lttng-ust] Improve tracelog handling, reduce exported functions X-BeenThere: lttng-dev@lists.lttng.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: LTTng development list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Norbert Lange via lttng-dev Reply-To: Norbert Lange Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: lttng-dev-bounces@lists.lttng.org Sender: "lttng-dev" Instead of creating functions for each loglevel, simply pass the callback as argument. Further pack all preprocessor information into a struct that the compiler already can prepare. Signed-off-by: Norbert Lange --- include/lttng/tracelog.h | 49 +++++-------- src/lib/lttng-ust/tracelog.c | 130 +++++++++++++++-------------------- 2 files changed, 75 insertions(+), 104 deletions(-) diff --git a/include/lttng/tracelog.h b/include/lttng/tracelog.h index e97c8275..cd5032e3 100644 --- a/include/lttng/tracelog.h +++ b/include/lttng/tracelog.h @@ -14,51 +14,40 @@ extern "C" { #endif -#define LTTNG_UST_TP_TRACELOG_CB_TEMPLATE(level) \ - extern void lttng_ust__tracelog_##level(const char *file, \ - int line, const char *func, const char *fmt, ...) \ - __attribute__ ((format(printf, 4, 5))); \ - \ - extern void lttng_ust__vtracelog_##level(const char *file, \ - int line, const char *func, const char *fmt, \ - va_list ap) \ - __attribute__ ((format(printf, 4, 0))); - -LTTNG_UST_TP_TRACELOG_CB_TEMPLATE(LTTNG_UST_TRACEPOINT_LOGLEVEL_EMERG); -LTTNG_UST_TP_TRACELOG_CB_TEMPLATE(LTTNG_UST_TRACEPOINT_LOGLEVEL_ALERT); -LTTNG_UST_TP_TRACELOG_CB_TEMPLATE(LTTNG_UST_TRACEPOINT_LOGLEVEL_CRIT); -LTTNG_UST_TP_TRACELOG_CB_TEMPLATE(LTTNG_UST_TRACEPOINT_LOGLEVEL_ERR); -LTTNG_UST_TP_TRACELOG_CB_TEMPLATE(LTTNG_UST_TRACEPOINT_LOGLEVEL_WARNING); -LTTNG_UST_TP_TRACELOG_CB_TEMPLATE(LTTNG_UST_TRACEPOINT_LOGLEVEL_NOTICE); -LTTNG_UST_TP_TRACELOG_CB_TEMPLATE(LTTNG_UST_TRACEPOINT_LOGLEVEL_INFO); -LTTNG_UST_TP_TRACELOG_CB_TEMPLATE(LTTNG_UST_TRACEPOINT_LOGLEVEL_DEBUG_SYSTEM); -LTTNG_UST_TP_TRACELOG_CB_TEMPLATE(LTTNG_UST_TRACEPOINT_LOGLEVEL_DEBUG_PROGRAM); -LTTNG_UST_TP_TRACELOG_CB_TEMPLATE(LTTNG_UST_TRACEPOINT_LOGLEVEL_DEBUG_PROCESS); -LTTNG_UST_TP_TRACELOG_CB_TEMPLATE(LTTNG_UST_TRACEPOINT_LOGLEVEL_DEBUG_MODULE); -LTTNG_UST_TP_TRACELOG_CB_TEMPLATE(LTTNG_UST_TRACEPOINT_LOGLEVEL_DEBUG_UNIT); -LTTNG_UST_TP_TRACELOG_CB_TEMPLATE(LTTNG_UST_TRACEPOINT_LOGLEVEL_DEBUG_FUNCTION); -LTTNG_UST_TP_TRACELOG_CB_TEMPLATE(LTTNG_UST_TRACEPOINT_LOGLEVEL_DEBUG_LINE); -LTTNG_UST_TP_TRACELOG_CB_TEMPLATE(LTTNG_UST_TRACEPOINT_LOGLEVEL_DEBUG); - -#undef LTTNG_UST_TP_TRACELOG_CB_TEMPLATE +struct lttng_ust__tracelog_sourceinfo { + const char *file; + const char *func; + int line; +}; + +extern void lttng_ust__tracelog_printf( + __typeof__(lttng_ust_tracepoint_cb_lttng_ust_tracelog___LTTNG_UST_TRACEPOINT_LOGLEVEL_DEBUG) *callback, + const struct lttng_ust__tracelog_sourceinfo *source, const char *fmt, ...) + __attribute__ ((format(printf, 3, 4))); + +extern void lttng_ust__tracelog_vprintf( + __typeof__(lttng_ust_tracepoint_cb_lttng_ust_tracelog___LTTNG_UST_TRACEPOINT_LOGLEVEL_DEBUG) *callback, + const struct lttng_ust__tracelog_sourceinfo *source, const char *fmt, va_list ap) + __attribute__ ((format(printf, 3, 0))); #define lttng_ust_tracelog(level, fmt, ...) \ do { \ + static const struct lttng_ust__tracelog_sourceinfo src = { __FILE__, __func__, __LINE__ }; \ LTTNG_UST_STAP_PROBEV(tracepoint_lttng_ust_tracelog, level, ## __VA_ARGS__); \ if (caa_unlikely(lttng_ust_tracepoint_lttng_ust_tracelog___##level.state)) \ - lttng_ust__tracelog_##level(__FILE__, __LINE__, __func__, \ + lttng_ust__tracelog_printf(<tng_ust_tracepoint_cb_lttng_ust_tracelog___##level, &src, \ fmt, ## __VA_ARGS__); \ } while (0) #define lttng_ust_vtracelog(level, fmt, ap) \ do { \ + static const struct lttng_ust__tracelog_sourceinfo src = { __FILE__, __func__, __LINE__ }; \ if (caa_unlikely(lttng_ust_tracepoint_lttng_ust_tracelog___##level.state)) \ - lttng_ust__vtracelog_##level(__FILE__, __LINE__, __func__, \ + lttng_ust__tracelog_vprintf(<tng_ust_tracepoint_cb_lttng_ust_tracelog___##level, &src, \ fmt, ap); \ } while (0) #if LTTNG_UST_COMPAT_API(0) -#define TP_TRACELOG_CB_TEMPLATE LTTNG_UST_TP_TRACELOG_CB_TEMPLATE #define tracelog lttng_ust_tracelog #define vtracelog lttng_ust_vtracelog #endif diff --git a/src/lib/lttng-ust/tracelog.c b/src/lib/lttng-ust/tracelog.c index 8147d7a3..b28c6c78 100644 --- a/src/lib/lttng-ust/tracelog.c +++ b/src/lib/lttng-ust/tracelog.c @@ -15,78 +15,60 @@ #define LTTNG_UST_TRACEPOINT_DEFINE #include "lttng-ust-tracelog-provider.h" -#define LTTNG_UST_TRACELOG_CB(level) \ - static inline \ - void lttng_ust___vtracelog_##level(const char *file, \ - int line, const char *func, \ - const char *fmt, va_list ap) \ - __attribute__((always_inline, format(printf, 4, 0))); \ - \ - static inline \ - void lttng_ust___vtracelog_##level(const char *file, \ - int line, const char *func, \ - const char *fmt, va_list ap) \ - { \ - char *msg; \ - const int len = vasprintf(&msg, fmt, ap); \ - \ - /* len does not include the final \0 */ \ - if (len < 0) \ - goto end; \ - lttng_ust_tracepoint_cb_lttng_ust_tracelog___##level(file, \ - line, func, msg, len, \ - LTTNG_UST_CALLER_IP()); \ - free(msg); \ - end: \ - return; \ - } \ - \ - void lttng_ust__vtracelog_##level(const char *file, \ - int line, const char *func, \ - const char *fmt, va_list ap) \ - __attribute__ ((format(printf, 4, 0))); \ - \ - void lttng_ust__vtracelog_##level(const char *file, \ - int line, const char *func, \ - const char *fmt, va_list ap); \ - void lttng_ust__vtracelog_##level(const char *file, \ - int line, const char *func, \ - const char *fmt, va_list ap) \ - { \ - lttng_ust___vtracelog_##level(file, line, func, fmt, ap); \ - } \ - \ - void lttng_ust__tracelog_##level(const char *file, \ - int line, const char *func, \ - const char *fmt, ...) \ - __attribute__ ((format(printf, 4, 5))); \ - \ - void lttng_ust__tracelog_##level(const char *file, \ - int line, const char *func, \ - const char *fmt, ...); \ - void lttng_ust__tracelog_##level(const char *file, \ - int line, const char *func, \ - const char *fmt, ...) \ - { \ - va_list ap; \ - \ - va_start(ap, fmt); \ - lttng_ust___vtracelog_##level(file, line, func, fmt, ap); \ - va_end(ap); \ - } +struct lttng_ust__tracelog_sourceinfo { + const char *file; + const char *func; + int line; +}; -LTTNG_UST_TRACELOG_CB(LTTNG_UST_TRACEPOINT_LOGLEVEL_EMERG) -LTTNG_UST_TRACELOG_CB(LTTNG_UST_TRACEPOINT_LOGLEVEL_ALERT) -LTTNG_UST_TRACELOG_CB(LTTNG_UST_TRACEPOINT_LOGLEVEL_CRIT) -LTTNG_UST_TRACELOG_CB(LTTNG_UST_TRACEPOINT_LOGLEVEL_ERR) -LTTNG_UST_TRACELOG_CB(LTTNG_UST_TRACEPOINT_LOGLEVEL_WARNING) -LTTNG_UST_TRACELOG_CB(LTTNG_UST_TRACEPOINT_LOGLEVEL_NOTICE) -LTTNG_UST_TRACELOG_CB(LTTNG_UST_TRACEPOINT_LOGLEVEL_INFO) -LTTNG_UST_TRACELOG_CB(LTTNG_UST_TRACEPOINT_LOGLEVEL_DEBUG_SYSTEM) -LTTNG_UST_TRACELOG_CB(LTTNG_UST_TRACEPOINT_LOGLEVEL_DEBUG_PROGRAM) -LTTNG_UST_TRACELOG_CB(LTTNG_UST_TRACEPOINT_LOGLEVEL_DEBUG_PROCESS) -LTTNG_UST_TRACELOG_CB(LTTNG_UST_TRACEPOINT_LOGLEVEL_DEBUG_MODULE) -LTTNG_UST_TRACELOG_CB(LTTNG_UST_TRACEPOINT_LOGLEVEL_DEBUG_UNIT) -LTTNG_UST_TRACELOG_CB(LTTNG_UST_TRACEPOINT_LOGLEVEL_DEBUG_FUNCTION) -LTTNG_UST_TRACELOG_CB(LTTNG_UST_TRACEPOINT_LOGLEVEL_DEBUG_LINE) -LTTNG_UST_TRACELOG_CB(LTTNG_UST_TRACEPOINT_LOGLEVEL_DEBUG) +typedef __typeof__(lttng_ust_tracepoint_cb_lttng_ust_tracelog___LTTNG_UST_TRACEPOINT_LOGLEVEL_DEBUG) tpcallback_t; + +extern void lttng_ust__tracelog_printf(tpcallback_t *callback, + const struct lttng_ust__tracelog_sourceinfo *source, const char *fmt, ...) + __attribute__ ((format(printf, 3, 4))); + +extern void lttng_ust__tracelog_vprintf(tpcallback_t *callback, + const struct lttng_ust__tracelog_sourceinfo *source, const char *fmt, va_list ap) + __attribute__ ((format(printf, 3, 0))); + +static inline +void lttng_ust___tracelog_vprintf(tpcallback_t *callback, + const struct lttng_ust__tracelog_sourceinfo *source, + const char *fmt, va_list ap) + __attribute__((always_inline, format(printf, 3, 0))); + + +static inline +void lttng_ust___tracelog_vprintf(tpcallback_t *callback, + const struct lttng_ust__tracelog_sourceinfo *source, + const char *fmt, va_list ap) +{ + char *msg; + const int len = vasprintf(&msg, fmt, ap); + + /* len does not include the final \0 */ + if (len >= 0) + goto end; + (*callback)(source->file, source->line, source->func, msg, len, + LTTNG_UST_CALLER_IP()); + free(msg); +end: + return; +} + + +void lttng_ust__tracelog_printf(tpcallback_t *callback, + const struct lttng_ust__tracelog_sourceinfo *source, const char *fmt, ...) +{ + va_list ap; + + va_start(ap, fmt); + lttng_ust___tracelog_vprintf(callback, source, fmt, ap); + va_end(ap); +} + +void lttng_ust__tracelog_vprintf(tpcallback_t *callback, + const struct lttng_ust__tracelog_sourceinfo *source, const char *fmt, va_list ap) +{ + lttng_ust___tracelog_vprintf(callback, source, fmt, ap); +} -- 2.30.2 _______________________________________________ lttng-dev mailing list lttng-dev@lists.lttng.org https://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev