From patchwork Mon May 25 00:37:16 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Kozlyuk X-Patchwork-Id: 70565 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 F0BC9A04EF; Mon, 25 May 2020 02:38:45 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 31D2C1D647; Mon, 25 May 2020 02:37:52 +0200 (CEST) Received: from mail-lj1-f193.google.com (mail-lj1-f193.google.com [209.85.208.193]) by dpdk.org (Postfix) with ESMTP id 9F0A01D616 for ; Mon, 25 May 2020 02:37:45 +0200 (CEST) Received: by mail-lj1-f193.google.com with SMTP id z13so9283371ljn.7 for ; Sun, 24 May 2020 17:37:45 -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=A81Fd7lxJ8Rpm+4xXj+j5oocsFytdg2RMkqXdwO6Bu6VrLZtFlPrGXPKtfM43PfUO8 y44UHxLaT51xgNrN9w0ZDtbLOFDVXsW49jJiAZWszvC7Ae+n207kWKMRdtKq5X9u5+o/ aVymtGa5Kb1WLkUrii9ugKMa33Zt3lNFjnMmx6Lw2ZmZmFL6QXu5sQ+6sv3Yi226ZKLX XAu+Tq/g/L/Q4kNUxZ0IorXOFQhvAIVsnMU4kbKmf3mqchUX2sGr4b/XalcLhWjG+6EP Cm2lgf5RREOWv15ybn4Hs7lX6d5F/96sOS/EA7Chgijw63//Z/4321X7PlqM5Cny7yhc 4pOw== 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=JDZVzssWR4QiEqvrOW6PGqR+oBs5ALoX8Rl3WVJbVSFcq0S78Z0TXDSpPz/X39XTMP k6Vcz0FpVqJVeqJr799ga6dnsmeIp+oEZ1jc8ARMPknIpymUjaIWlaALcsLxNXGW6JQj 3kiu4Viwcv2Sill/UZbBv+MO/2y3DGtsXPxGL+jRHEcYb+ylYNmAYbLmvn13PCuFiTB4 +/lRVfTJaxAhKC6AEVnqVqUV0vjtnps2W31faq74lbxhhsl0ez5ukQtUp6fxMxZb5Gfe WUMALXyEfu66cR4IiSMJ2hzVhKi55GKDVHSWj657nnVFdRuh45ycR2oOv/O+GItALXSl KOIQ== X-Gm-Message-State: AOAM533CztoH0DydweiaR7BGVyYBA0D8LyeBjo6Y5KyCn8ajG2yP58y3 0g9ks65CxeQ1+ZFiJlWzvuI+/rE2BFW/Ug== X-Google-Smtp-Source: ABdhPJyldcLzchtxFniuHRl+eOWrsU12igG30WBzZfWocsLmm2CxZOlkORB2X9pEEEvfJWNlPuUTzg== X-Received: by 2002:a05:651c:112c:: with SMTP id e12mr13039086ljo.127.1590367065135; Sun, 24 May 2020 17:37:45 -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 n8sm4279526lfb.20.2020.05.24.17.37.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 24 May 2020 17:37:44 -0700 (PDT) From: Dmitry Kozlyuk To: dev@dpdk.org Cc: Dmitry Malloy , Narcisa Ana Maria Vasile , Fady Bader , Tal Shnaiderman , Dmitry Kozlyuk , Jerin Jacob , Harini Ramakrishnan , Omar Cardona , Pallavi Kadam , Ranjit Menon Date: Mon, 25 May 2020 03:37:16 +0300 Message-Id: <20200525003720.6410-8-dmitry.kozliuk@gmail.com> X-Mailer: git-send-email 2.25.4 In-Reply-To: <20200525003720.6410-1-dmitry.kozliuk@gmail.com> References: <20200428235015.2820677-1-dmitry.kozliuk@gmail.com> <20200525003720.6410-1-dmitry.kozliuk@gmail.com> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v5 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) {