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 A3D91A051F; Wed, 10 Jun 2020 16:29:11 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 9BC3A1BF86; Wed, 10 Jun 2020 16:28:03 +0200 (CEST) Received: from mail-lj1-f195.google.com (mail-lj1-f195.google.com [209.85.208.195]) by dpdk.org (Postfix) with ESMTP id 2FAC41BEC7 for ; Wed, 10 Jun 2020 16:27:58 +0200 (CEST) Received: by mail-lj1-f195.google.com with SMTP id 9so2743772ljv.5 for ; Wed, 10 Jun 2020 07:27:58 -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=Q4Ja4nVR2Z2yMaSt/7bQCRLm1u9RR2nQwohBxOgIocrZ/YhBI03BO3ZwFbVYaM3Ci+ 097noQ0Dd3QXJeypJdSNofrrPUFF2vq7VaxhyHTjzrSDcjhMad3cNsMbZxhGMxVh7ZKj MZt0W914pQTSXsdqPvWm+6ViQEnLZTPxv/tB47HRxcZwq2ArieJ/KNxL6oH3WXalB42v 3j3BdAqvFNal1yXFhvdm3j+APLdinzR4oLC52MaF7azs1upm523VthUaqA2XNETYn1Om 66NvGILeyPQsJBlvg1aRMxLZPY+V18qQ/Qkngsw0R/dBcPXsXYck+FFJmypqRzHt9LlZ iCEw== 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=LLo4zCKBs2R7HCOeJ5OJ+6JQzLH3i38z1aUUEyH20/Z5LNASp4vB0L+GP9SQZSG/30 +yYudEcHQ69VWo4P7HbIK9V+fDfUVgvoaA6AdoNF8dGYe4z4nKbgBpZ5ywOjZTO7TLC1 RR+THhgS59jlZWnmFNlq36jynGA/2K1C/L8MMgxrm6453+GbBnCp4Rzdjv7Ws1fHq4bJ 7UPiXnttHKxPDAvRd7zteR5wvs4KcwBNt1p8RUW0TfTbEdLH22CUQJIg/BJLKQgDJSbu 0L7xdnzV2+etQqVT5ubMB5wZWjIuXEWoiInrlIVGW8Fd6treLz8mmqaPELgHZil9kYFK NnZw== X-Gm-Message-State: AOAM530+eRWe+RDRD0aWICqvshiMFvSzhvGNFR3Z5O/B3VTM1IVoSdCZ RQRnbTCYk+5m+3WS6sCozZIza+miFVvV8A== X-Google-Smtp-Source: ABdhPJytb9tkIm78x+QykmbQ7+NlBk8jchgRp/afZPOtpUEOGuXpWS67ylZ5o/Tz8zLvMgkGmf7Uhg== X-Received: by 2002:a05:651c:1022:: with SMTP id w2mr2091582ljm.262.1591799277598; Wed, 10 Jun 2020 07:27:57 -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 j12sm5051733ljg.15.2020.06.10.07.27.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Jun 2020 07:27:56 -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: Wed, 10 Jun 2020 17:27:26 +0300 Message-Id: <20200610142730.31376-8-dmitry.kozliuk@gmail.com> X-Mailer: git-send-email 2.25.4 In-Reply-To: <20200610142730.31376-1-dmitry.kozliuk@gmail.com> References: <20200608074153.29611-1-dmitry.kozliuk@gmail.com> <20200610142730.31376-1-dmitry.kozliuk@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH v8 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