From: Fady Bader <fady@mellanox.com>
To: dev@dpdk.org
Cc: fady@mellanox.com, thomas@monjalon.net, tbashar@mellanox.com,
talshn@mellanox.com, yohadt@mellanox.com,
dmitry.kozliuk@gmail.com, harini.ramakrishnan@microsoft.com,
ocardona@microsoft.com, ranjit.menon@intel.com,
pallavi.kadam@intel.com, kevin.laatz@intel.com,
ferruh.yigit@intel.com, arybchenko@solarflare.com
Subject: [dpdk-dev] [PATCH 4/5] telemetry: implement empty stubs for Windows
Date: Thu, 25 Jun 2020 16:30:37 +0300 [thread overview]
Message-ID: <20200625133038.25180-5-fady@mellanox.com> (raw)
In-Reply-To: <20200625133038.25180-1-fady@mellanox.com>
Telemetry didn't compile under Windows.
Empty stubs implementation was added for Windows.
Signed-off-by: Fady Bader <fady@mellanox.com>
---
lib/librte_telemetry/rte_telemetry.h | 4 +++
lib/librte_telemetry/telemetry.c | 43 ++++++++++++++++++++++++++++++++-
lib/librte_telemetry/telemetry_legacy.c | 26 +++++++++++++++++++-
3 files changed, 71 insertions(+), 2 deletions(-)
diff --git a/lib/librte_telemetry/rte_telemetry.h b/lib/librte_telemetry/rte_telemetry.h
index eb7f2c917c..bad255c385 100644
--- a/lib/librte_telemetry/rte_telemetry.h
+++ b/lib/librte_telemetry/rte_telemetry.h
@@ -5,6 +5,10 @@
#include <stdint.h>
#include <rte_compat.h>
+#ifdef RTE_EXEC_ENV_WINDOWS
+#include <sched.h>
+#endif
+
#ifndef _RTE_TELEMETRY_H_
#define _RTE_TELEMETRY_H_
diff --git a/lib/librte_telemetry/telemetry.c b/lib/librte_telemetry/telemetry.c
index e7e3d861dd..3e202a089b 100644
--- a/lib/librte_telemetry/telemetry.c
+++ b/lib/librte_telemetry/telemetry.c
@@ -1,7 +1,7 @@
/* SPDX-License-Identifier: BSD-3-Clause
* Copyright(c) 2020 Intel Corporation
*/
-
+#ifndef RTE_EXEC_ENV_WINDOWS
#include <unistd.h>
#include <pthread.h>
#include <sys/socket.h>
@@ -20,6 +20,18 @@
#include "telemetry_data.h"
#include "rte_telemetry_legacy.h"
+#else
+
+#include <rte_common.h>
+
+#include "rte_telemetry.h"
+#include "telemetry_json.h"
+#include "telemetry_data.h"
+#include "rte_telemetry_legacy.h"
+
+#endif
+
+#ifndef RTE_EXEC_ENV_WINDOWS
#define MAX_CMD_LEN 56
#define MAX_HELP_LEN 64
#define MAX_OUTPUT_LEN (1024 * 16)
@@ -46,10 +58,13 @@ static struct cmd_callback callbacks[TELEMETRY_MAX_CALLBACKS];
static int num_callbacks; /* How many commands are registered */
/* Used when accessing or modifying list of command callbacks */
static rte_spinlock_t callback_sl = RTE_SPINLOCK_INITIALIZER;
+#endif
int
rte_telemetry_register_cmd(const char *cmd, telemetry_cb fn, const char *help)
{
+#ifndef RTE_EXEC_ENV_WINDOWS
+
int i = 0;
if (strlen(cmd) >= MAX_CMD_LEN || fn == NULL || cmd[0] != '/'
@@ -73,8 +88,19 @@ rte_telemetry_register_cmd(const char *cmd, telemetry_cb fn, const char *help)
rte_spinlock_unlock(&callback_sl);
return 0;
+
+#else
+
+ RTE_SET_USED(cmd);
+ RTE_SET_USED(fn);
+ RTE_SET_USED(help);
+
+ return 0;
+
+#endif
}
+#ifndef RTE_EXEC_ENV_WINDOWS
static int
list_commands(const char *cmd __rte_unused, const char *params __rte_unused,
struct rte_tel_data *d)
@@ -396,11 +422,14 @@ telemetry_v2_init(const char *runtime_dir, rte_cpuset_t *cpuset)
return 0;
}
+#endif
int32_t
rte_telemetry_init(const char *runtime_dir, rte_cpuset_t *cpuset,
const char **err_str)
{
+#ifndef RTE_EXEC_ENV_WINDOWS
+
if (telemetry_v2_init(runtime_dir, cpuset) != 0) {
*err_str = telemetry_log_error;
return -1;
@@ -409,4 +438,16 @@ rte_telemetry_init(const char *runtime_dir, rte_cpuset_t *cpuset,
*err_str = telemetry_log_error;
}
return 0;
+
+#else
+
+ RTE_SET_USED(runtime_dir);
+ RTE_SET_USED(cpuset);
+ RTE_SET_USED(err_str);
+
+ RTE_LOG(WARNING, TELEMETRY, "Telemetry is not supported on Windows.\n");
+
+ return 0;
+
+#endif
}
diff --git a/lib/librte_telemetry/telemetry_legacy.c b/lib/librte_telemetry/telemetry_legacy.c
index a341fe4ebd..674f9c40ef 100644
--- a/lib/librte_telemetry/telemetry_legacy.c
+++ b/lib/librte_telemetry/telemetry_legacy.c
@@ -1,7 +1,7 @@
/* SPDX-License-Identifier: BSD-3-Clause
* Copyright(c) 2020 Intel Corporation
*/
-
+#ifndef RTE_EXEC_ENV_WINDOWS
#include <unistd.h>
#include <sys/socket.h>
#include <sys/un.h>
@@ -15,6 +15,15 @@
#include "rte_telemetry_legacy.h"
+#else
+
+#include <rte_common.h>
+
+#include "rte_telemetry_legacy.h"
+
+#endif
+#ifndef RTE_EXEC_ENV_WINDOWS
+
#define MAX_LEN 128
#define BUF_SIZE 1024
#define CLIENTS_UNREG_ACTION "\"action\":2"
@@ -48,12 +57,15 @@ struct json_command callbacks[TELEMETRY_LEGACY_MAX_CALLBACKS] = {
};
int num_legacy_callbacks = 1;
static rte_spinlock_t callback_sl = RTE_SPINLOCK_INITIALIZER;
+#endif
int
rte_telemetry_legacy_register(const char *cmd,
enum rte_telemetry_legacy_data_req data_req,
telemetry_legacy_cb fn)
{
+#ifndef RTE_EXEC_ENV_WINDOWS
+
if (fn == NULL)
return -EINVAL;
if (num_legacy_callbacks >= (int) RTE_DIM(callbacks))
@@ -71,8 +83,19 @@ rte_telemetry_legacy_register(const char *cmd,
rte_spinlock_unlock(&callback_sl);
return 0;
+
+#else
+
+ RTE_SET_USED(cmd);
+ RTE_SET_USED(data_req);
+ RTE_SET_USED(fn);
+
+ return 0;
+
+#endif
}
+#ifndef RTE_EXEC_ENV_WINDOWS
static int
register_client(const char *cmd __rte_unused, const char *params,
char *buffer __rte_unused, int buf_len __rte_unused)
@@ -239,3 +262,4 @@ legacy_client_handler(void *sock_id)
close(s);
return NULL;
}
+#endif
--
2.16.1.windows.4
next prev parent reply other threads:[~2020-06-25 13:31 UTC|newest]
Thread overview: 61+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-25 13:30 [dpdk-dev] [PATCH 0/5] compiling ethdev lib under windows Fady Bader
2020-06-25 13:30 ` [dpdk-dev] [PATCH 1/5] eal: added interrupts empty stubs Fady Bader
2020-06-28 10:58 ` [dpdk-dev] [PATCH v2 0/5] compiling ethdev lib under windows Fady Bader
2020-06-28 10:58 ` [dpdk-dev] [PATCH v2 1/5] eal: added interrupts empty stubs Fady Bader
2020-06-28 10:58 ` [dpdk-dev] [PATCH v2 2/5] eal: updated export list for Windows Fady Bader
2020-06-28 10:58 ` [dpdk-dev] [PATCH v2 3/5] ethdev: remove structs from export list Fady Bader
2020-06-28 10:58 ` [dpdk-dev] [PATCH v2 4/5] telemetry: implement empty stubs for Windows Fady Bader
2020-06-28 18:04 ` Stephen Hemminger
2020-06-29 7:59 ` Thomas Monjalon
2020-06-28 10:58 ` [dpdk-dev] [PATCH v2 5/5] ethdev: compiling ethdev under Windows Fady Bader
2020-07-26 9:24 ` [dpdk-dev] [PATCH v2 0/5] compiling ethdev lib under windows Fady Bader
2020-07-27 18:53 ` Narcisa Ana Maria Vasile
2020-06-25 13:30 ` [dpdk-dev] [PATCH 2/5] eal: updated export list for Windows Fady Bader
2020-06-25 13:30 ` [dpdk-dev] [PATCH 3/5] ethdev: remove structs from export list Fady Bader
2020-06-25 13:30 ` Fady Bader [this message]
2020-06-25 13:30 ` [dpdk-dev] [PATCH 5/5] ethdev: compiling ethdev under Windows Fady Bader
2020-07-29 1:01 ` [dpdk-dev] [PATCH 0/5] compiling ethdev lib under windows Narcisa Ana Maria Vasile
2020-08-03 6:16 ` Fady Bader
2020-08-03 10:38 ` [dpdk-dev] [PATCH v3 " Fady Bader
2020-08-03 10:38 ` [dpdk-dev] [PATCH v3 1/5] eal: added interrupts empty stubs Fady Bader
2020-08-03 10:38 ` [dpdk-dev] [PATCH v3 2/5] eal: updated export list for Windows Fady Bader
2020-08-03 10:38 ` [dpdk-dev] [PATCH v3 3/5] ethdev: remove structs from export list Fady Bader
2020-08-03 10:38 ` [dpdk-dev] [PATCH v3 4/5] telemetry: implement empty stubs for Windows Fady Bader
2020-08-04 1:26 ` Narcisa Ana Maria Vasile
2020-08-04 6:05 ` Fady Bader
2020-08-03 10:38 ` [dpdk-dev] [PATCH v3 5/5] ethdev: compiling ethdev under Windows Fady Bader
2020-08-04 6:29 ` [dpdk-dev] [PATCH v4 0/5] compiling ethdev lib under windows Fady Bader
2020-08-04 6:29 ` [dpdk-dev] [PATCH v4 1/5] eal: added interrupts empty stubs Fady Bader
2020-08-04 18:45 ` Narcisa Ana Maria Vasile
2020-08-04 23:43 ` Dmitry Kozlyuk
2020-08-04 6:29 ` [dpdk-dev] [PATCH v4 2/5] eal: updated export list for Windows Fady Bader
2020-08-04 18:46 ` Narcisa Ana Maria Vasile
2020-08-04 6:29 ` [dpdk-dev] [PATCH v4 3/5] ethdev: remove structs from export list Fady Bader
2020-08-04 18:47 ` Narcisa Ana Maria Vasile
2020-08-04 6:29 ` [dpdk-dev] [PATCH v4 4/5] telemetry: implement empty stubs for Windows Fady Bader
2020-08-04 18:47 ` Narcisa Ana Maria Vasile
2020-08-04 23:39 ` Dmitry Kozlyuk
2020-08-05 8:27 ` Thomas Monjalon
2020-08-05 8:40 ` Bruce Richardson
2020-08-05 9:06 ` Thomas Monjalon
2020-08-05 10:02 ` Bruce Richardson
2020-08-05 8:28 ` Thomas Monjalon
2020-08-04 6:29 ` [dpdk-dev] [PATCH v4 5/5] ethdev: compiling ethdev under Windows Fady Bader
2020-08-04 18:51 ` Narcisa Ana Maria Vasile
2020-08-11 6:24 ` [dpdk-dev] [PATCH v5 0/5] compiling ethdev lib under windows Fady Bader
2020-08-11 6:24 ` [dpdk-dev] [PATCH v5 1/5] eal: added interrupts empty stubs Fady Bader
2020-08-11 6:24 ` [dpdk-dev] [PATCH v5 2/5] eal: updated export list for Windows Fady Bader
2020-08-11 6:24 ` [dpdk-dev] [PATCH v5 3/5] ethdev: remove structs from export list Fady Bader
2020-08-11 6:24 ` [dpdk-dev] [PATCH v5 4/5] telemetry: implement empty stubs for Windows Fady Bader
2020-09-10 23:35 ` Thomas Monjalon
2020-08-11 6:24 ` [dpdk-dev] [PATCH v5 5/5] ethdev: compiling ethdev under Windows Fady Bader
2020-08-13 7:02 ` [dpdk-dev] [PATCH v5 0/5] compiling ethdev lib under windows Thomas Monjalon
2020-08-18 16:13 ` Dmitry Kozlyuk
2020-08-20 21:40 ` Ranjit Menon
2020-09-10 23:50 ` [dpdk-dev] [PATCH v6 0/5] build ethdev on Windows Thomas Monjalon
2020-09-10 23:50 ` [dpdk-dev] [PATCH v6 1/5] eal/windows: add stub for Rx interrupt control Thomas Monjalon
2020-09-10 23:50 ` [dpdk-dev] [PATCH v6 2/5] eal/windows: update symbols export Thomas Monjalon
2020-09-10 23:50 ` [dpdk-dev] [PATCH v6 3/5] telemetry: build stubs for Windows Thomas Monjalon
2020-09-10 23:50 ` [dpdk-dev] [PATCH v6 4/5] ethdev: remove structs from export map Thomas Monjalon
2020-09-10 23:50 ` [dpdk-dev] [PATCH v6 5/5] ethdev: build on Windows Thomas Monjalon
2020-09-10 23:58 ` [dpdk-dev] [PATCH v6 0/5] build ethdev " Thomas Monjalon
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200625133038.25180-5-fady@mellanox.com \
--to=fady@mellanox.com \
--cc=arybchenko@solarflare.com \
--cc=dev@dpdk.org \
--cc=dmitry.kozliuk@gmail.com \
--cc=ferruh.yigit@intel.com \
--cc=harini.ramakrishnan@microsoft.com \
--cc=kevin.laatz@intel.com \
--cc=ocardona@microsoft.com \
--cc=pallavi.kadam@intel.com \
--cc=ranjit.menon@intel.com \
--cc=talshn@mellanox.com \
--cc=tbashar@mellanox.com \
--cc=thomas@monjalon.net \
--cc=yohadt@mellanox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).