From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 56430A00C3; Mon, 8 Jun 2020 09:43:15 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id C5DD81BEE1; Mon, 8 Jun 2020 09:42:18 +0200 (CEST) Received: from mail-lf1-f67.google.com (mail-lf1-f67.google.com [209.85.167.67]) by dpdk.org (Postfix) with ESMTP id 9C10C1BEB3 for ; Mon, 8 Jun 2020 09:42:12 +0200 (CEST) Received: by mail-lf1-f67.google.com with SMTP id x27so9578639lfg.9 for ; Mon, 08 Jun 2020 00:42:12 -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=qFcFCE2ixNqfSA2s+pDQVYer6m1WXyYRCctAYMbitP+B93GKAC/PZ5EL+6bN/UvPxX 9xNVZb1x2heNU5/Q0dv7zOle+dFpEtGHpKKnrvQ0Psmu3UM3LFJaL2tMXSa3ssCbH2d9 +12uthZJp0AnVjgkjKrSpczNf8CkhpajLcoEOxCHsxSqk+428SG27cdn/sHvczw86BIH 43FKzaWJsuXsMAouGB7dtbOFIyYWLNq+ginM3ehyzoGxdkHWUGBUMZjyfKdBYZD2qIhE DgOKvwVKZh6SRvQath7HJ9AYQ6DT7PuxV2SFWceyjFOpMrWSdPHFpmwTWkWczz+DoIV2 5DMQ== 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=oo2YYFpumLRf3D5adweRstkh9MZ/PzLGbpx5VTIXSp864RxRLLDIn+EUK82ExtS1pE yFZ05q+x//jiPpL/WBhasbskPnzp1khv+BYPURJxjs2X1kyHz5T2aY45aiWsyqg1rsQa Fv1QS1mhJAMVODCCYvbOEySUvhPRsiccQOxT4noOtvkSbvN8Baxt1GfhH12of15qwqJv NGK/pPiAQhfearWkS4zSuJaJufmdCM6WJkC30GP68SdDFU/w44T+70732TmphOnv9wfa SIx62PZ/9pZrA949HdiGV2lzdAqLmkPaa3gLmdk6T01YWgeNAAbVqGXteywR5SRdkfTw MTmA== X-Gm-Message-State: AOAM533OCx7c1nXYimXfrNLTCMCE4rcv/iAD37eu8rvKXZMfeXs3o1ZG CDBNqIMPZXZqvGxE/9fSjAaKdZMvmn72tw== X-Google-Smtp-Source: ABdhPJwJp72mzAP1h4ohtvxybGTMqrPWGZAzH9FG44IJk97vyoAuWolQSip58uWvRPXseWlDJKqxGQ== X-Received: by 2002:ac2:5597:: with SMTP id v23mr11855011lfg.42.1591602132024; Mon, 08 Jun 2020 00:42:12 -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 y18sm4207785lfk.16.2020.06.08.00.42.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Jun 2020 00:42:11 -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, 8 Jun 2020 10:41:49 +0300 Message-Id: <20200608074153.29611-8-dmitry.kozliuk@gmail.com> X-Mailer: git-send-email 2.25.4 In-Reply-To: <20200608074153.29611-1-dmitry.kozliuk@gmail.com> References: <20200602230329.17838-1-dmitry.kozliuk@gmail.com> <20200608074153.29611-1-dmitry.kozliuk@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH v7 07/11] 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) { -- 2.25.4