From patchwork Mon Jun 15 00:43:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Kozlyuk X-Patchwork-Id: 71526 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id E1512A0093; Mon, 15 Jun 2020 02:45:15 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id A0CFD1BDF8; Mon, 15 Jun 2020 02:44:25 +0200 (CEST) Received: from mail-lf1-f66.google.com (mail-lf1-f66.google.com [209.85.167.66]) by dpdk.org (Postfix) with ESMTP id BFCA14C9D for ; Mon, 15 Jun 2020 02:44:10 +0200 (CEST) Received: by mail-lf1-f66.google.com with SMTP id g2so870954lfb.0 for ; Sun, 14 Jun 2020 17:44:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=LHlAb1z42AG9LyDm6x4AYa/r3zc1UWVG/v4HM8tjcwQ=; b=PeoE0SatG2KRJAYxDqYj+b6zMOKi3XR7hsNrnF3/xW5KiAVh7weEje+ApcMGNMj1SL 3YMiV8HQhO7/NNDukS/Sldxn3GQ8DP/kkl9OPCzZySPZRrGZMXXZXCT/6+L3T5CEkZGS 7AHwIFE7NgfEeDW+BAjMDaHFMuhqS3kPKO2yz7OGpe/aLb0FfXWmtu7YP+nfkyTheFP0 ReqSBnDs0NCVpp62EfYvlkIjV7bJwCNqP7MrpCTq34eppdRefmSH7XTEOTAt7dzeBCBS hwfT5obkAgdtqJRGV1l+ahFyO8sy8euP6L7YDlP9v9Akls81x0yXqg0oxuYC7if0YQTB y6XQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=LHlAb1z42AG9LyDm6x4AYa/r3zc1UWVG/v4HM8tjcwQ=; b=a1pVnePZko2WyGPK56WUF+wdSjWZgklZ+itnhfAjtFC0QWDhIUAHX18wjlrYHUsvMZ Wn6cH4g84QiaFu/7XPPv52V9/ds9HDIGeOt/Q8++mWgOgVTNl3MkSsoc0q2u5rSDiUM7 Dg0Tm8nEDntOS+UmnI9m79EYzuSxo8hrRLioMUYBNavq2PuocEqM8gzWta2p5RAHoaQf jdP0VHkzkZwdtt6lH5ESyxf0CSOQzpd5A12hpRyYTHZxnjZ4QKqsEHQzv3CRgJGEyMxu KzVGnNs+G4hGc77NAUaR97vUF0jh8SKdQVLmoywD66qIDHB/E94L8OUQYvxT+QR9EsDw lgJQ== X-Gm-Message-State: AOAM532wF/O8YlRWtGMxmz0Egg8yiA5Qj//akg+kQVTdtHbDaN3YkzD9 6fzM/rKQPMR3XmSPx+5PrZNlp0sXhzaELw== X-Google-Smtp-Source: ABdhPJwIj6k8RjxDyGuJEwAZ/waqwZBLQdE3d4eHl2Be4tV63E1T5vte10fBDJcivR7EwJrSIVSRcA== X-Received: by 2002:ac2:4422:: with SMTP id w2mr3334912lfl.152.1592181850237; Sun, 14 Jun 2020 17:44:10 -0700 (PDT) Received: from localhost.localdomain (broadband-37-110-65-23.ip.moscow.rt.ru. [37.110.65.23]) by smtp.gmail.com with ESMTPSA id f19sm4176342lfk.24.2020.06.14.17.44.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 14 Jun 2020 17:44:09 -0700 (PDT) From: Dmitry Kozlyuk To: dev@dpdk.org Cc: Dmitry Malloy , Narcisa Ana Maria Vasile , Fady Bader , Tal Shnaiderman , Dmitry Kozlyuk , Harini Ramakrishnan , Omar Cardona , Pallavi Kadam , Ranjit Menon Date: Mon, 15 Jun 2020 03:43:49 +0300 Message-Id: <20200615004354.14380-8-dmitry.kozliuk@gmail.com> X-Mailer: git-send-email 2.25.4 In-Reply-To: <20200615004354.14380-1-dmitry.kozliuk@gmail.com> References: <20200610142730.31376-1-dmitry.kozliuk@gmail.com> <20200615004354.14380-1-dmitry.kozliuk@gmail.com> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v9 07/12] eal/windows: add tracing support stubs X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" EAL common code depends on tracepoint calls, but generic implementation cannot be enabled on Windows due to missing standard library facilities. Add stub functions to support tracepoint compilation, so that common code does not have to conditionally include tracepoints until proper support is added. Signed-off-by: Dmitry Kozlyuk --- lib/librte_eal/common/eal_common_thread.c | 5 +--- lib/librte_eal/common/meson.build | 1 + lib/librte_eal/windows/eal.c | 34 ++++++++++++++++++++++- 3 files changed, 35 insertions(+), 5 deletions(-) diff --git a/lib/librte_eal/common/eal_common_thread.c b/lib/librte_eal/common/eal_common_thread.c index f9f588c17..370bb1b63 100644 --- a/lib/librte_eal/common/eal_common_thread.c +++ b/lib/librte_eal/common/eal_common_thread.c @@ -15,9 +15,7 @@ #include #include #include -#ifndef RTE_EXEC_ENV_WINDOWS #include -#endif #include "eal_internal_cfg.h" #include "eal_private.h" @@ -169,9 +167,8 @@ static void *rte_thread_init(void *arg) free(params); } -#ifndef RTE_EXEC_ENV_WINDOWS __rte_trace_mem_per_thread_alloc(); -#endif + return start_routine(routine_arg); } diff --git a/lib/librte_eal/common/meson.build b/lib/librte_eal/common/meson.build index d91c22220..4e9208129 100644 --- a/lib/librte_eal/common/meson.build +++ b/lib/librte_eal/common/meson.build @@ -14,6 +14,7 @@ if is_windows 'eal_common_log.c', 'eal_common_options.c', 'eal_common_thread.c', + 'eal_common_trace_points.c', ) subdir_done() endif diff --git a/lib/librte_eal/windows/eal.c b/lib/librte_eal/windows/eal.c index d084606a6..e7461f731 100644 --- a/lib/librte_eal/windows/eal.c +++ b/lib/librte_eal/windows/eal.c @@ -17,6 +17,7 @@ #include #include #include +#include #include "eal_windows.h" @@ -221,7 +222,38 @@ rte_eal_init_alert(const char *msg) RTE_LOG(ERR, EAL, "%s\n", msg); } - /* Launch threads, called at application init(). */ +/* Stubs to enable EAL trace point compilation + * until eal_common_trace.c can be compiled. + */ + +RTE_DEFINE_PER_LCORE(volatile int, trace_point_sz); +RTE_DEFINE_PER_LCORE(void *, trace_mem); + +void +__rte_trace_mem_per_thread_alloc(void) +{ +} + +void +__rte_trace_point_emit_field(size_t sz, const char *field, + const char *type) +{ + RTE_SET_USED(sz); + RTE_SET_USED(field); + RTE_SET_USED(type); +} + +int +__rte_trace_point_register(rte_trace_point_t *trace, const char *name, + void (*register_fn)(void)) +{ + RTE_SET_USED(trace); + RTE_SET_USED(name); + RTE_SET_USED(register_fn); + return -ENOTSUP; +} + +/* Launch threads, called at application init(). */ int rte_eal_init(int argc, char **argv) {