Patch Detail

HTTP 200 OK
Allow: GET, PUT, PATCH, HEAD, OPTIONS
Content-Type: application/json
Vary: Accept

{
    "id": 77250,
    "url": "http://patches.dpdk.org/api/patches/77250/?format=api",
    "web_url": "http://patches.dpdk.org/project/dpdk/patch/20200910235005.2420342-4-thomas@monjalon.net/",
    "project": {
        "id": 1,
        "url": "http://patches.dpdk.org/api/projects/1/?format=api",
        "name": "DPDK",
        "link_name": "dpdk",
        "list_id": "dev.dpdk.org",
        "list_email": "dev@dpdk.org",
        "web_url": "http://core.dpdk.org",
        "scm_url": "git://dpdk.org/dpdk",
        "webscm_url": "http://git.dpdk.org/dpdk",
        "list_archive_url": "https://inbox.dpdk.org/dev",
        "list_archive_url_format": "https://inbox.dpdk.org/dev/{}",
        "commit_url_format": ""
    },
    "msgid": "<20200910235005.2420342-4-thomas@monjalon.net>",
    "list_archive_url": "https://inbox.dpdk.org/dev/20200910235005.2420342-4-thomas@monjalon.net",
    "date": "2020-09-10T23:50:03",
    "name": "[v6,3/5] telemetry: build stubs for Windows",
    "commit_ref": null,
    "pull_url": null,
    "state": "accepted",
    "archived": true,
    "hash": "39ca716120af1f18b93bf51872422573fa2d1b9c",
    "submitter": {
        "id": 685,
        "url": "http://patches.dpdk.org/api/people/685/?format=api",
        "name": "Thomas Monjalon",
        "email": "thomas@monjalon.net"
    },
    "delegate": null,
    "mbox": "http://patches.dpdk.org/project/dpdk/patch/20200910235005.2420342-4-thomas@monjalon.net/mbox/",
    "series": [
        {
            "id": 12113,
            "url": "http://patches.dpdk.org/api/series/12113/?format=api",
            "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=12113",
            "date": "2020-09-10T23:50:00",
            "name": "build ethdev on Windows",
            "version": 6,
            "mbox": "http://patches.dpdk.org/series/12113/mbox/"
        }
    ],
    "comments": "http://patches.dpdk.org/api/patches/77250/comments/",
    "check": "success",
    "checks": "http://patches.dpdk.org/api/patches/77250/checks/",
    "tags": {},
    "related": [],
    "headers": {
        "Return-Path": "<dev-bounces@dpdk.org>",
        "X-Original-To": "patchwork@inbox.dpdk.org",
        "Delivered-To": "patchwork@inbox.dpdk.org",
        "Received": [
            "from dpdk.org (dpdk.org [92.243.14.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id 1DF81A04B5;\n\tFri, 11 Sep 2020 01:51:03 +0200 (CEST)",
            "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id E45671C0D8;\n\tFri, 11 Sep 2020 01:51:00 +0200 (CEST)",
            "from out3-smtp.messagingengine.com (out3-smtp.messagingengine.com\n [66.111.4.27]) by dpdk.org (Postfix) with ESMTP id 2A2191C0D8\n for <dev@dpdk.org>; Fri, 11 Sep 2020 01:51:00 +0200 (CEST)",
            "from compute7.internal (compute7.nyi.internal [10.202.2.47])\n by mailout.nyi.internal (Postfix) with ESMTP id D09A25C00E3;\n Thu, 10 Sep 2020 19:50:59 -0400 (EDT)",
            "from mailfrontend2 ([10.202.2.163])\n by compute7.internal (MEProxy); Thu, 10 Sep 2020 19:50:59 -0400",
            "from xps.monjalon.net (184.203.134.77.rev.sfr.net [77.134.203.184])\n by mail.messagingengine.com (Postfix) with ESMTPA id AC090306467D;\n Thu, 10 Sep 2020 19:50:58 -0400 (EDT)"
        ],
        "DKIM-Signature": [
            "v=1; a=rsa-sha256; c=relaxed/relaxed; d=monjalon.net; h=\n from:to:cc:subject:date:message-id:in-reply-to:references\n :mime-version:content-transfer-encoding; s=fm2; bh=C7dp9Q/rg7pvV\n ikyJAlkoo4xGzB9DpeWT7c1DhiXl7Q=; b=CqBmSRRSkCgiV+pBLciPIIW0gV0Vf\n JzbdxDIQnp/9NoleJ8SCffAvTCNuLu/ijgC3PK9pBrJvEzrd9X8uJF2/HdnlODX0\n hgw/jmbbDiEFC+37UwUUYDP+dWooZv94Df2xeiBNfoa4RwYeJbEScGmEd68/BJTN\n 9yoSFS0wUXGGWs/r3RfZKU9XA/ni6mcikFTTgG5iqBaTR6hxJ7H0UiwnrmCayf1/\n iXfI2rZqcjTkxGYezWYyBKf5FqKte49VkV7RadqW+GI/6Eg2n1wJzur+xpwCKwLF\n hkTfUKWDVsq5Q4wfr0eojkJmMp7IdcY1yGrFPmU9eQKgvsIKnO6jXUd6Q==",
            "v=1; a=rsa-sha256; c=relaxed/relaxed; d=\n messagingengine.com; h=cc:content-transfer-encoding:date:from\n :in-reply-to:message-id:mime-version:references:subject:to\n :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=\n fm3; bh=C7dp9Q/rg7pvVikyJAlkoo4xGzB9DpeWT7c1DhiXl7Q=; b=bU9YJW4d\n qmB6U/w4Oh0KOpB3dFnIFTvrW6bSbW1GIzqtsWkvpj0HNaC0qmxUcRUu4T/tkzpz\n ITKdaxsEt+I7YNGst0ZBt072pB55YhqKV3+ejXj/ZlzD3D51QVuTv8ERT0GNDzHV\n wkkOZjxkJ7PEQ3l3dJt4d6dPo0mCJI/Q4PwZQL6PGzilXMpMS3TcfUU87dT/FnI7\n B2jEQdDLFI4rYRzW4ACsYzPJYRBzjof59DTQTtxP5YNPVgeAcm1j5eBsRmgDayxx\n 5JLSs7Haaxj+GDe1LB8v82aNKsHOMHbN3Dbn4DC9Nn74HozRp13O4dWYSUFMdzyB\n IMuf1glPXINm4g=="
        ],
        "X-ME-Sender": "<xms:47taX6nrzUVBM9CMtF6nV0Ina76lzPaOPCjdvFP7q7bowUWxggxrEA>\n <xme:47taXx1JKdAS1HgK6zjJNO05bZSVrDXhMbaK4reSlnKizf3VfinOzSUCeNic5X5Yl\n Q0nNshOdPGNdb_24Q>",
        "X-ME-Proxy-Cause": "\n gggruggvucftvghtrhhoucdtuddrgeduiedrudehkedgvdejucetufdoteggodetrfdotf\n fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen\n uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne\n cujfgurhephffvufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefvhhhomhgr\n shcuofhonhhjrghlohhnuceothhhohhmrghssehmohhnjhgrlhhonhdrnhgvtheqnecugg\n ftrfgrthhtvghrnhepvdehgfeivdejgedtveehfefhteelfefgieevgfffveefjeegtdfg\n uedthedtgeevnecukfhppeejjedrudefgedrvddtfedrudekgeenucevlhhushhtvghruf\n hiiigvpeefnecurfgrrhgrmhepmhgrihhlfhhrohhmpehthhhomhgrshesmhhonhhjrghl\n ohhnrdhnvght",
        "X-ME-Proxy": "<xmx:47taX4qHYD2TdFy0fU8ro7znk1JsiQodCph0FHjf1j2un_LUl1EZ0g>\n <xmx:47taX-kd-781aUGYB-P0jw6l7_bj7-gM-UUhOrM88Pm-D4XPH4LZng>\n <xmx:47taX43W2jcwj4dJ4O0Ku-lvqjh6xQZajLT4D_L9ueKPLGO5X1747w>\n <xmx:47taX8967UNmuiMH55VolRDdS24yikenE1oS14vw27CNchAo7WnWCQ>",
        "From": "Thomas Monjalon <thomas@monjalon.net>",
        "To": "dev@dpdk.org",
        "Cc": "david.marchand@redhat.com, bruce.richardson@intel.com,\n Fady Bader <fady@mellanox.com>,\n Narcisa Vasile <navasile@linux.microsoft.com>,\n Dmitry Kozlyuk <dmitry.kozliuk@gmail.com>,\n Ranjit Menon <ranjit.menon@intel.com>, Kevin Laatz <kevin.laatz@intel.com>",
        "Date": "Fri, 11 Sep 2020 01:50:03 +0200",
        "Message-Id": "<20200910235005.2420342-4-thomas@monjalon.net>",
        "X-Mailer": "git-send-email 2.28.0",
        "In-Reply-To": "<20200910235005.2420342-1-thomas@monjalon.net>",
        "References": "<20200625133038.25180-1-fady@mellanox.com>\n <20200910235005.2420342-1-thomas@monjalon.net>",
        "MIME-Version": "1.0",
        "Content-Transfer-Encoding": "8bit",
        "Subject": "[dpdk-dev] [PATCH v6 3/5] telemetry: build stubs for Windows",
        "X-BeenThere": "dev@dpdk.org",
        "X-Mailman-Version": "2.1.15",
        "Precedence": "list",
        "List-Id": "DPDK patches and discussions <dev.dpdk.org>",
        "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n <mailto:dev-request@dpdk.org?subject=unsubscribe>",
        "List-Archive": "<http://mails.dpdk.org/archives/dev/>",
        "List-Post": "<mailto:dev@dpdk.org>",
        "List-Help": "<mailto:dev-request@dpdk.org?subject=help>",
        "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n <mailto:dev-request@dpdk.org?subject=subscribe>",
        "Errors-To": "dev-bounces@dpdk.org",
        "Sender": "\"dev\" <dev-bounces@dpdk.org>"
    },
    "content": "From: Fady Bader <fady@mellanox.com>\n\nTelemetry didn't compile under Windows.\nEmpty stubs are arranged, waiting for a proper implementation.\n\nSigned-off-by: Fady Bader <fady@mellanox.com>\nAcked-by: Narcisa Vasile <navasile@linux.microsoft.com>\nAcked-by: Dmitry Kozlyuk <dmitry.kozliuk@gmail.com>\nAcked-by: Ranjit Menon <ranjit.menon@intel.com>\nSigned-off-by: Thomas Monjalon <thomas@monjalon.net>\n---\n lib/librte_telemetry/rte_telemetry.h    |  1 +\n lib/librte_telemetry/telemetry.c        | 22 ++++++++++++++++++++++\n lib/librte_telemetry/telemetry_legacy.c | 11 ++++++++++-\n lib/meson.build                         |  1 +\n 4 files changed, 34 insertions(+), 1 deletion(-)",
    "diff": "diff --git a/lib/librte_telemetry/rte_telemetry.h b/lib/librte_telemetry/rte_telemetry.h\nindex d13010b8fb..deac2e71ca 100644\n--- a/lib/librte_telemetry/rte_telemetry.h\n+++ b/lib/librte_telemetry/rte_telemetry.h\n@@ -3,6 +3,7 @@\n  */\n \n #include <stdint.h>\n+#include <sched.h>\n #include <rte_compat.h>\n \n #ifndef _RTE_TELEMETRY_H_\ndiff --git a/lib/librte_telemetry/telemetry.c b/lib/librte_telemetry/telemetry.c\nindex 0252282735..51e7ceeb1b 100644\n--- a/lib/librte_telemetry/telemetry.c\n+++ b/lib/librte_telemetry/telemetry.c\n@@ -2,11 +2,13 @@\n  * Copyright(c) 2020 Intel Corporation\n  */\n \n+#ifndef RTE_EXEC_ENV_WINDOWS\n #include <unistd.h>\n #include <pthread.h>\n #include <sys/socket.h>\n #include <sys/un.h>\n #include <dlfcn.h>\n+#endif /* !RTE_EXEC_ENV_WINDOWS */\n \n /* we won't link against libbsd, so just always use DPDKs-specific strlcpy */\n #undef RTE_USE_LIBBSD\n@@ -25,8 +27,10 @@\n #define MAX_OUTPUT_LEN (1024 * 16)\n #define MAX_CONNECTIONS 10\n \n+#ifndef RTE_EXEC_ENV_WINDOWS\n static void *\n client_handler(void *socket);\n+#endif /* !RTE_EXEC_ENV_WINDOWS */\n \n struct cmd_callback {\n \tchar cmd[MAX_CMD_LEN];\n@@ -34,6 +38,7 @@ struct cmd_callback {\n \tchar help[MAX_HELP_LEN];\n };\n \n+#ifndef RTE_EXEC_ENV_WINDOWS\n struct socket {\n \tint sock;\n \tchar path[sizeof(((struct sockaddr_un *)0)->sun_path)];\n@@ -42,13 +47,16 @@ struct socket {\n };\n static struct socket v2_socket; /* socket for v2 telemetry */\n static struct socket v1_socket; /* socket for v1 telemetry */\n+#endif /* !RTE_EXEC_ENV_WINDOWS */\n static char telemetry_log_error[1024]; /* Will contain error on init failure */\n /* list of command callbacks, with one command registered by default */\n static struct cmd_callback callbacks[TELEMETRY_MAX_CALLBACKS];\n static int num_callbacks; /* How many commands are registered */\n /* Used when accessing or modifying list of command callbacks */\n static rte_spinlock_t callback_sl = RTE_SPINLOCK_INITIALIZER;\n+#ifndef RTE_EXEC_ENV_WINDOWS\n static uint16_t v2_clients;\n+#endif /* !RTE_EXEC_ENV_WINDOWS */\n \n int\n rte_telemetry_register_cmd(const char *cmd, telemetry_cb fn, const char *help)\n@@ -78,6 +86,8 @@ rte_telemetry_register_cmd(const char *cmd, telemetry_cb fn, const char *help)\n \treturn 0;\n }\n \n+#ifndef RTE_EXEC_ENV_WINDOWS\n+\n static int\n list_commands(const char *cmd __rte_unused, const char *params __rte_unused,\n \t\tstruct rte_tel_data *d)\n@@ -412,10 +422,13 @@ telemetry_v2_init(const char *runtime_dir, rte_cpuset_t *cpuset)\n \treturn 0;\n }\n \n+#endif /* !RTE_EXEC_ENV_WINDOWS */\n+\n int32_t\n rte_telemetry_init(const char *runtime_dir, rte_cpuset_t *cpuset,\n \t\tconst char **err_str)\n {\n+#ifndef RTE_EXEC_ENV_WINDOWS\n \tif (telemetry_v2_init(runtime_dir, cpuset) != 0) {\n \t\t*err_str = telemetry_log_error;\n \t\treturn -1;\n@@ -423,5 +436,14 @@ rte_telemetry_init(const char *runtime_dir, rte_cpuset_t *cpuset,\n \tif (telemetry_legacy_init(runtime_dir, cpuset) != 0) {\n \t\t*err_str = telemetry_log_error;\n \t}\n+#else /* RTE_EXEC_ENV_WINDOWS */\n+\tRTE_SET_USED(runtime_dir);\n+\tRTE_SET_USED(cpuset);\n+\tRTE_SET_USED(err_str);\n+\n+\tsnprintf(telemetry_log_error, sizeof(telemetry_log_error),\n+\t\t\"DPDK Telemetry is not supported on Windows.\");\n+#endif /* RTE_EXEC_ENV_WINDOWS */\n+\n \treturn 0;\n }\ndiff --git a/lib/librte_telemetry/telemetry_legacy.c b/lib/librte_telemetry/telemetry_legacy.c\nindex a341fe4ebd..b8e424041c 100644\n--- a/lib/librte_telemetry/telemetry_legacy.c\n+++ b/lib/librte_telemetry/telemetry_legacy.c\n@@ -2,10 +2,12 @@\n  * Copyright(c) 2020 Intel Corporation\n  */\n \n+#ifndef RTE_EXEC_ENV_WINDOWS\n #include <unistd.h>\n #include <sys/socket.h>\n #include <sys/un.h>\n #include <pthread.h>\n+#endif /* !RTE_EXEC_ENV_WINDOWS */\n \n /* we won't link against libbsd, so just always use DPDKs-specific strlcpy */\n #undef RTE_USE_LIBBSD\n@@ -24,7 +26,6 @@\n #define DATA_REQ_LABEL \"\\\"data\\\":\"\n #define TELEMETRY_LEGACY_MAX_CALLBACKS 4\n \n-\n static int\n register_client(const char *cmd __rte_unused,\n \t\tconst char *params __rte_unused,\n@@ -77,15 +78,18 @@ static int\n register_client(const char *cmd __rte_unused, const char *params,\n \t\tchar *buffer __rte_unused, int buf_len __rte_unused)\n {\n+#ifndef RTE_EXEC_ENV_WINDOWS\n \tpthread_t th;\n \tchar data[BUF_SIZE];\n \tint fd;\n \tstruct sockaddr_un addrs;\n+#endif /* !RTE_EXEC_ENV_WINDOWS */\n \n \tif (!strchr(params, ':')) {\n \t\tfprintf(stderr, \"Invalid data\\n\");\n \t\treturn -1;\n \t}\n+#ifndef RTE_EXEC_ENV_WINDOWS\n \tstrlcpy(data, strchr(params, ':'), sizeof(data));\n \tmemcpy(data, &data[strlen(\":\\\"\")], strlen(data));\n \tif (!strchr(data, '\\\"')) {\n@@ -109,9 +113,12 @@ register_client(const char *cmd __rte_unused, const char *params,\n \t}\n \tpthread_create(&th, NULL, &legacy_client_handler,\n \t\t\t(void *)(uintptr_t)fd);\n+#endif /* !RTE_EXEC_ENV_WINDOWS */\n \treturn 0;\n }\n \n+#ifndef RTE_EXEC_ENV_WINDOWS\n+\n static int\n send_error_response(int s, int err)\n {\n@@ -239,3 +246,5 @@ legacy_client_handler(void *sock_id)\n \tclose(s);\n \treturn NULL;\n }\n+\n+#endif /* !RTE_EXEC_ENV_WINDOWS */\ndiff --git a/lib/meson.build b/lib/meson.build\nindex 283ee6c505..eb0cd9090a 100644\n--- a/lib/meson.build\n+++ b/lib/meson.build\n@@ -38,6 +38,7 @@ libraries = [\n if is_windows\n \tlibraries = [\n \t\t'kvargs',\n+\t\t'telemetry',\n \t\t'eal',\n \t\t'ring',\n \t\t'mempool', 'mbuf', 'net', 'pci',\n",
    "prefixes": [
        "v6",
        "3/5"
    ]
}