Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/104142/?format=api
{ "id": 104142, "url": "https://patches.dpdk.org/api/patches/104142/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/1636594425-9692-7-git-send-email-navasile@linux.microsoft.com/", "project": { "id": 1, "url": "https://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": "<1636594425-9692-7-git-send-email-navasile@linux.microsoft.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1636594425-9692-7-git-send-email-navasile@linux.microsoft.com", "date": "2021-11-11T01:33:43", "name": "[v18,6/8] eal: add thread lifetime management", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "09b39c7408797551d1a2f37e0a371e8806e2d0dc", "submitter": { "id": 1668, "url": "https://patches.dpdk.org/api/people/1668/?format=api", "name": "Narcisa Ana Maria Vasile", "email": "navasile@linux.microsoft.com" }, "delegate": { "id": 24651, "url": "https://patches.dpdk.org/api/users/24651/?format=api", "username": "dmarchand", "first_name": "David", "last_name": "Marchand", "email": "david.marchand@redhat.com" }, "mbox": "https://patches.dpdk.org/project/dpdk/patch/1636594425-9692-7-git-send-email-navasile@linux.microsoft.com/mbox/", "series": [ { "id": 20472, "url": "https://patches.dpdk.org/api/series/20472/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=20472", "date": "2021-11-11T01:33:40", "name": "eal: Add EAL API for threading", "version": 18, "mbox": "https://patches.dpdk.org/series/20472/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/104142/comments/", "check": "warning", "checks": "https://patches.dpdk.org/api/patches/104142/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 mails.dpdk.org (mails.dpdk.org [217.70.189.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id 54773A0C4B;\n\tThu, 11 Nov 2021 02:35:27 +0100 (CET)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id DDC964115E;\n\tThu, 11 Nov 2021 02:35:01 +0100 (CET)", "from linux.microsoft.com (linux.microsoft.com [13.77.154.182])\n by mails.dpdk.org (Postfix) with ESMTP id 3DFC340E28\n for <dev@dpdk.org>; Thu, 11 Nov 2021 02:34:54 +0100 (CET)", "by linux.microsoft.com (Postfix, from userid 1059)\n id D617620C3586; Wed, 10 Nov 2021 17:34:52 -0800 (PST)" ], "DKIM-Filter": "OpenDKIM Filter v2.11.0 linux.microsoft.com D617620C3586", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com;\n s=default; t=1636594492;\n bh=lHepfH9qe/0dZVIEViVQ9bfKKTNk/mzBb7YPka+RmRc=;\n h=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n b=nQ487PJKOhPG2GloIjiomx30QSqac3/MQccykGCO6nz6oXrXS9mj4AT5YIpL19+Xx\n 6gT2mAkWzFSeWh1Q39ZsuGoDCIq4u4UXy8tilzHXXuq3qLIcQq77aP44q+wK+PmvNA\n rZ3wPxhU2QAfLTxps0Pe6EFfS8csKdTqj7lidoEU=", "From": "Narcisa Ana Maria Vasile <navasile@linux.microsoft.com>", "To": "dev@dpdk.org, thomas@monjalon.net, dmitry.kozliuk@gmail.com,\n khot@microsoft.com, navasile@microsoft.com, dmitrym@microsoft.com,\n roretzla@microsoft.com, talshn@nvidia.com, ocardona@microsoft.com", "Cc": "bruce.richardson@intel.com, david.marchand@redhat.com,\n pallavi.kadam@intel.com", "Subject": "[PATCH v18 6/8] eal: add thread lifetime management", "Date": "Wed, 10 Nov 2021 17:33:43 -0800", "Message-Id": "<1636594425-9692-7-git-send-email-navasile@linux.microsoft.com>", "X-Mailer": "git-send-email 1.8.3.1", "In-Reply-To": "<1636594425-9692-1-git-send-email-navasile@linux.microsoft.com>", "References": "<1636513302-7359-1-git-send-email-navasile@linux.microsoft.com>\n <1636594425-9692-1-git-send-email-navasile@linux.microsoft.com>", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.29", "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" }, "content": "From: Narcisa Vasile <navasile@microsoft.com>\n\nAdd functions for thread creation, joining, detaching.\n\nThe *rte_thread_create()* function can optionally receive\nan rte_thread_attr_t object that will cause the thread to be\ncreated with the affinity and priority described by the\nattributes object. If no rte_thread_attr_t is passed (parameter is NULL),\nthe default affinity and priority are used.\n\nOn Windows, the function executed by a thread when the thread starts is\nrepreseneted by a function pointer of type DWORD (*func) (void*).\nOn other platforms, the function pointer is a void* (*func) (void*).\n\nPerforming a cast between these two types of function pointers to\nuniformize the API on all platforms may result in undefined behavior.\nTO fix this issue, a wrapper that respects the signature required by\nCreateThread() has been created on Windows.\n\nAdd unit tests:\n - verify rte_thread_self() correctly retrieves the thread id.\n - verify that affinity and priority can be set successfully.\n - verify that threads are created and cleaned up correctly.\n\nSigned-off-by: Narcisa Vasile <navasile@microsoft.com>\n---\n app/test/meson.build | 2 +\n app/test/test_threads.c | 217 ++++++++++++++++++++++++++++++++\n lib/eal/common/rte_thread.c | 111 ++++++++++++++++\n lib/eal/include/rte_thread.h | 55 ++++++++\n lib/eal/version.map | 3 +\n lib/eal/windows/include/sched.h | 2 +-\n lib/eal/windows/rte_thread.c | 134 ++++++++++++++++++++\n 7 files changed, 523 insertions(+), 1 deletion(-)\n create mode 100644 app/test/test_threads.c", "diff": "diff --git a/app/test/meson.build b/app/test/meson.build\nindex 96670c3504..9fd34459e9 100644\n--- a/app/test/meson.build\n+++ b/app/test/meson.build\n@@ -146,6 +146,7 @@ test_sources = files(\n 'test_tailq.c',\n 'test_thash.c',\n 'test_thash_perf.c',\n+ 'test_threads.c',\n 'test_timer.c',\n 'test_timer_perf.c',\n 'test_timer_racecond.c',\n@@ -287,6 +288,7 @@ fast_tests = [\n ['reorder_autotest', true],\n ['service_autotest', true],\n ['thash_autotest', true],\n+ ['threads_autotest', true],\n ['trace_autotest', true],\n ]\n \ndiff --git a/app/test/test_threads.c b/app/test/test_threads.c\nnew file mode 100644\nindex 0000000000..9fcae34179\n--- /dev/null\n+++ b/app/test/test_threads.c\n@@ -0,0 +1,217 @@\n+/* SPDX-License-Identifier: BSD-3-Clause\n+ * Copyright (c) 2021 Microsoft.\n+ */\n+\n+#include <rte_thread.h>\n+#include <rte_debug.h>\n+\n+#include \"test.h\"\n+\n+#define THREADS_COUNT 20\n+\n+RTE_LOG_REGISTER(threads_logtype_test, test.threads, INFO);\n+\n+static void *\n+thread_loop_self(void *arg)\n+{\n+\trte_thread_t *id = arg;\n+\n+\t*id = rte_thread_self();\n+\n+\treturn NULL;\n+}\n+\n+static int\n+test_thread_self(void)\n+{\n+\trte_thread_t threads_ids[THREADS_COUNT];\n+\trte_thread_t self_ids[THREADS_COUNT] = {};\n+\tint ret;\n+\tint i;\n+\n+\tfor (i = 0; i < THREADS_COUNT; ++i) {\n+\t\tret = rte_thread_create(&threads_ids[i], NULL, thread_loop_self,\n+\t\t\t\t&self_ids[i]);\n+\t\tRTE_TEST_ASSERT(ret == 0, \"Failed to create threads!\");\n+\t}\n+\n+\tfor (i = 0; i < THREADS_COUNT; ++i) {\n+\t\tRTE_TEST_ASSERT(rte_thread_join(threads_ids[i], NULL) == 0, \"Failed to join thread!\");\n+\t\tRTE_TEST_ASSERT_EQUAL(threads_ids[i].opaque_id,\n+\t\t\t\tself_ids[i].opaque_id, \"Unexpected thread id!\");\n+\t}\n+\n+\treturn 0;\n+}\n+\n+struct thread_affinity_ctx {\n+\trte_cpuset_t *cpuset;\n+\tunsigned int result;\n+};\n+\n+static void *\n+thread_loop_attributes_affinity(void *arg)\n+{\n+\tstruct thread_affinity_ctx *ctx = arg;\n+\trte_cpuset_t cpuset;\n+\tsize_t i;\n+\n+\tctx->result = 0;\n+\n+\tCPU_ZERO(&cpuset);\n+\tif (rte_thread_get_affinity_by_id(rte_thread_self(), &cpuset) != 0) {\n+\t\tctx->result = 1;\n+\t\trte_log(RTE_LOG_DEBUG, threads_logtype_test, \"Failed to get thread affinity!\");\n+\t\treturn NULL;\n+\t}\n+\n+\t/*\n+\t * Check that the thread is not running on CPUs which were not\n+\t * specified in the affinity mask. Note that the CPU mask\n+\t * retrieved above can be different than the original mask specified\n+\t * with rte_thread_attr_set_affinity(), since some CPUs may not be\n+\t * available on the system.\n+\t */\n+\tfor (i = 0; i < CPU_SETSIZE; ++i) {\n+\t\tif (!CPU_ISSET(i, ctx->cpuset) && CPU_ISSET(i, &cpuset)) {\n+\t\t\tctx->result = 1;\n+\t\t\trte_log(RTE_LOG_DEBUG, threads_logtype_test, \"CPU %zu should not be set for this thread!\\n\",\n+\t\t\t\t\ti);\n+\t\t\treturn NULL;\n+\t\t}\n+\t}\n+\n+\treturn NULL;\n+}\n+\n+static int\n+test_thread_attributes_affinity(void)\n+{\n+\trte_thread_t threads_ids[THREADS_COUNT];\n+\tstruct thread_affinity_ctx ctx[THREADS_COUNT] = {};\n+\trte_thread_attr_t attr;\n+\trte_cpuset_t cpuset;\n+\tsize_t i;\n+\tint ret = 0;\n+\n+\tret = rte_thread_attr_init(&attr);\n+\tRTE_TEST_ASSERT(ret == 0, \"Failed to initialize thread attributes!\");\n+\n+\tCPU_ZERO(&cpuset);\n+\tret = rte_thread_get_affinity_by_id(rte_thread_self(), &cpuset);\n+\tRTE_TEST_ASSERT(ret == 0, \"Failed to get main thread affinity!\");\n+\n+\tret = rte_thread_attr_set_affinity(&attr, &cpuset);\n+\tRTE_TEST_ASSERT(ret == 0, \"Failed to set thread attributes!\");\n+\n+\tfor (i = 0; i < THREADS_COUNT; ++i) {\n+\t\tctx[i].cpuset = &cpuset;\n+\t\tret = rte_thread_create(&threads_ids[i], &attr,\n+\t\t\t\tthread_loop_attributes_affinity, &ctx[i]);\n+\t\tRTE_TEST_ASSERT(ret == 0, \"Failed to create threads!\");\n+\t}\n+\n+\tfor (i = 0; i < THREADS_COUNT; ++i) {\n+\t\tret = rte_thread_join(threads_ids[i], NULL);\n+\t\tRTE_TEST_ASSERT(ret == 0, \"Failed to join threads!\");\n+\n+\t\tRTE_TEST_ASSERT_EQUAL(ctx[i].result, 0, \"Unexpected thread affinity!\");\n+\t}\n+\n+\treturn ret;\n+}\n+\n+static void *\n+thread_loop_priority(void *arg)\n+{\n+\tint ret;\n+\tenum rte_thread_priority priority;\n+\tint *result = arg;\n+\n+\t*result = 1;\n+\tret = rte_thread_get_priority(rte_thread_self(), &priority);\n+\tif (ret != 0 || priority != RTE_THREAD_PRIORITY_NORMAL)\n+\t\t*result = 2;\n+\n+\treturn NULL;\n+}\n+\n+static int\n+test_thread_attributes_priority(void)\n+{\n+\trte_thread_t threads_ids[THREADS_COUNT];\n+\trte_thread_attr_t attr;\n+\tsize_t i;\n+\tint ret = 0;\n+\tint results[THREADS_COUNT] = {};\n+\n+\tret = rte_thread_attr_init(&attr);\n+\tRTE_TEST_ASSERT(ret == 0, \"Failed to initialize thread attributes!\");\n+\n+\tret = rte_thread_attr_set_priority(&attr, RTE_THREAD_PRIORITY_NORMAL);\n+\tRTE_TEST_ASSERT(ret == 0, \"Failed to set thread priority!\");\n+\n+\tfor (i = 0; i < THREADS_COUNT; ++i) {\n+\t\tret = rte_thread_create(&threads_ids[i], &attr,\n+\t\t\t\tthread_loop_priority, &results[i]);\n+\t\tRTE_TEST_ASSERT(ret == 0, \"Failed to create threads!\");\n+\t}\n+\n+\tfor (i = 0; i < THREADS_COUNT; ++i) {\n+\t\tret = rte_thread_join(threads_ids[i], NULL);\n+\t\tRTE_TEST_ASSERT(ret == 0, \"Failed to join threads!\");\n+\n+\t\tRTE_TEST_ASSERT_EQUAL(results[i], 1, \"Unexpected priority value!\");\n+\t}\n+\n+\treturn ret;\n+}\n+\n+static void *\n+thread_loop_return(void *arg)\n+{\n+\tRTE_SET_USED(arg);\n+\treturn NULL;\n+}\n+\n+static int\n+test_thread_detach(void)\n+{\n+\trte_thread_t threads_ids[THREADS_COUNT];\n+\tsize_t i;\n+\tint ret = 0;\n+\n+\tfor (i = 0; i < THREADS_COUNT; ++i) {\n+\t\tret = rte_thread_create(&threads_ids[i], NULL,\n+\t\t\t\tthread_loop_return, NULL);\n+\t\tRTE_TEST_ASSERT(ret == 0, \"Failed to create threads!\");\n+\t}\n+\n+\tfor (i = 0; i < THREADS_COUNT; ++i) {\n+\t\tret = rte_thread_detach(threads_ids[i]);\n+\t\tRTE_TEST_ASSERT(ret == 0, \"Failed to detach thread!\");\n+\t}\n+\n+\treturn ret;\n+}\n+\n+static struct unit_test_suite threads_test_suite = {\n+\t.suite_name = \"threads autotest\",\n+\t.setup = NULL,\n+\t.teardown = NULL,\n+\t.unit_test_cases = {\n+\t\t\tTEST_CASE(test_thread_self),\n+\t\t\tTEST_CASE(test_thread_attributes_affinity),\n+\t\t\tTEST_CASE(test_thread_attributes_priority),\n+\t\t\tTEST_CASE(test_thread_detach),\n+\t\t\tTEST_CASES_END()\n+\t}\n+};\n+\n+static int\n+test_threads(void)\n+{\n+\treturn unit_test_suite_runner(&threads_test_suite);\n+}\n+\n+REGISTER_TEST_COMMAND(threads_autotest, test_threads);\ndiff --git a/lib/eal/common/rte_thread.c b/lib/eal/common/rte_thread.c\nindex fc5d7c5b1a..910c39eb88 100644\n--- a/lib/eal/common/rte_thread.c\n+++ b/lib/eal/common/rte_thread.c\n@@ -198,6 +198,117 @@ rte_thread_attr_set_priority(rte_thread_attr_t *thread_attr,\n \treturn 0;\n }\n \n+int\n+rte_thread_create(rte_thread_t *thread_id,\n+\t\tconst rte_thread_attr_t *thread_attr,\n+\t\trte_thread_func thread_func, void *args)\n+{\n+\tint ret = 0;\n+\tpthread_attr_t attr;\n+\tpthread_attr_t *attrp = NULL;\n+\tstruct sched_param param = {\n+\t\t.sched_priority = 0,\n+\t};\n+\tint policy = SCHED_OTHER;\n+\n+\tif (thread_attr != NULL) {\n+\t\tret = pthread_attr_init(&attr);\n+\t\tif (ret != 0) {\n+\t\t\tRTE_LOG(DEBUG, EAL, \"pthread_attr_init failed\\n\");\n+\t\t\tgoto cleanup;\n+\t\t}\n+\n+\t\tattrp = &attr;\n+\n+\t\t/*\n+\t\t * Set the inherit scheduler parameter to explicit,\n+\t\t * otherwise the priority attribute is ignored.\n+\t\t */\n+\t\tret = pthread_attr_setinheritsched(attrp,\n+\t\t\t\tPTHREAD_EXPLICIT_SCHED);\n+\t\tif (ret != 0) {\n+\t\t\tRTE_LOG(DEBUG, EAL, \"pthread_attr_setinheritsched failed\\n\");\n+\t\t\tgoto cleanup;\n+\t\t}\n+\n+\n+/* Realtime priority can cause crashes on non-Windows platforms. */\n+#ifndef RTE_EXEC_ENV_WINDOWS\n+\t\tif (thread_attr->priority ==\n+\t\t\t\tRTE_THREAD_PRIORITY_REALTIME_CRITICAL) {\n+\t\t\tret = ENOTSUP;\n+\t\t\tgoto cleanup;\n+\t\t}\n+#endif\n+\t\tret = thread_map_priority_to_os_value(thread_attr->priority,\n+\t\t\t\t¶m.sched_priority, &policy);\n+\t\tif (ret != 0)\n+\t\t\tgoto cleanup;\n+\n+\t\tret = pthread_attr_setschedpolicy(attrp, policy);\n+\t\tif (ret != 0) {\n+\t\t\tRTE_LOG(DEBUG, EAL, \"pthread_attr_setschedpolicy failed\\n\");\n+\t\t\tgoto cleanup;\n+\t\t}\n+\n+\t\tret = pthread_attr_setschedparam(attrp, ¶m);\n+\t\tif (ret != 0) {\n+\t\t\tRTE_LOG(DEBUG, EAL, \"pthread_attr_setschedparam failed\\n\");\n+\t\t\tgoto cleanup;\n+\t\t}\n+\t}\n+\n+\tret = pthread_create((pthread_t *)&thread_id->opaque_id, attrp,\n+\t\tthread_func, args);\n+\tif (ret != 0) {\n+\t\tRTE_LOG(DEBUG, EAL, \"pthread_create failed\\n\");\n+\t\tgoto cleanup;\n+\t}\n+\n+\tif (thread_attr != NULL && CPU_COUNT(&thread_attr->cpuset) > 0) {\n+\t\tret = rte_thread_set_affinity_by_id(*thread_id,\n+\t\t\t&thread_attr->cpuset);\n+\t\tif (ret != 0) {\n+\t\t\tRTE_LOG(DEBUG, EAL, \"rte_thread_set_affinity_by_id failed\\n\");\n+\t\t\tgoto cleanup;\n+\t\t}\n+\t}\n+\n+cleanup:\n+\tif (attrp != NULL)\n+\t\tpthread_attr_destroy(&attr);\n+\n+\treturn ret;\n+}\n+\n+int\n+rte_thread_join(rte_thread_t thread_id, unsigned long *value_ptr)\n+{\n+\tint ret = 0;\n+\tvoid *res = NULL;\n+\tvoid **pres = NULL;\n+\n+\tif (value_ptr != NULL)\n+\t\tpres = &res;\n+\n+\tret = pthread_join((pthread_t)thread_id.opaque_id, pres);\n+\tif (ret != 0) {\n+\t\tRTE_LOG(DEBUG, EAL, \"pthread_join failed\\n\");\n+\t\treturn ret;\n+\t}\n+\n+\tif (value_ptr != NULL && *pres != NULL)\n+\t\t*value_ptr = *(unsigned long *)(*pres);\n+\n+\treturn 0;\n+}\n+\n+int\n+rte_thread_detach(rte_thread_t thread_id)\n+{\n+\treturn pthread_detach((pthread_t)thread_id.opaque_id);\n+}\n+\n int\n rte_thread_key_create(rte_thread_key *key, void (*destructor)(void *))\n {\ndiff --git a/lib/eal/include/rte_thread.h b/lib/eal/include/rte_thread.h\nindex 7077c9ce46..e841321819 100644\n--- a/lib/eal/include/rte_thread.h\n+++ b/lib/eal/include/rte_thread.h\n@@ -31,6 +31,7 @@ typedef struct rte_thread_tag {\n \tuintptr_t opaque_id; /**< thread identifier */\n } rte_thread_t;\n \n+typedef void* (*rte_thread_func) (void *);\n /**\n * Thread priority values.\n */\n@@ -211,6 +212,60 @@ int rte_thread_set_affinity(rte_cpuset_t *cpusetp);\n */\n void rte_thread_get_affinity(rte_cpuset_t *cpusetp);\n \n+/**\n+ * Create a new thread that will invoke the 'thread_func' routine.\n+ *\n+ * @param thread_id\n+ * A pointer that will store the id of the newly created thread.\n+ *\n+ * @param thread_attr\n+ * Attributes that are used at the creation of the new thread.\n+ *\n+ * @param thread_func\n+ * The routine that the new thread will invoke when starting execution.\n+ *\n+ * @param args\n+ * Arguments to be passed to the 'thread_func' routine.\n+ *\n+ * @return\n+ * On success, return 0.\n+ * On failure, return a positive errno-style error number.\n+ */\n+__rte_experimental\n+int rte_thread_create(rte_thread_t *thread_id,\n+\t\tconst rte_thread_attr_t *thread_attr,\n+\t\trte_thread_func thread_func, void *args);\n+\n+/**\n+ * Waits for the thread identified by 'thread_id' to terminate\n+ *\n+ * @param thread_id\n+ * The identifier of the thread.\n+ *\n+ * @param value_ptr\n+ * Stores the exit status of the thread.\n+ *\n+ * @return\n+ * On success, return 0.\n+ * On failure, return a positive errno-style error number.\n+ */\n+__rte_experimental\n+int rte_thread_join(rte_thread_t thread_id, unsigned long *value_ptr);\n+\n+/**\n+ * Indicate that the return value of the thread is not needed and\n+ * all thread resources should be release when the thread terminates.\n+ *\n+ * @param thread_id\n+ * The id of the thread to be detached.\n+ *\n+ * @return\n+ * On success, return 0.\n+ * On failure, return a positive errno-style error number.\n+ */\n+__rte_experimental\n+int rte_thread_detach(rte_thread_t thread_id);\n+\n #endif /* RTE_HAS_CPUSET */\n \n /**\ndiff --git a/lib/eal/version.map b/lib/eal/version.map\nindex 5bc5a6cf76..0384a09fa2 100644\n--- a/lib/eal/version.map\n+++ b/lib/eal/version.map\n@@ -431,6 +431,9 @@ EXPERIMENTAL {\n \trte_thread_set_affinity_by_id;\n \trte_thread_get_priority;\n \trte_thread_set_priority;\n+\trte_thread_create;\n+\trte_thread_join;\n+\trte_thread_detach;\n };\n \n INTERNAL {\ndiff --git a/lib/eal/windows/include/sched.h b/lib/eal/windows/include/sched.h\nindex bc31cc8465..912fed12c2 100644\n--- a/lib/eal/windows/include/sched.h\n+++ b/lib/eal/windows/include/sched.h\n@@ -44,7 +44,7 @@ typedef struct _rte_cpuset_s {\n \t(1LL << _WHICH_BIT(b))) != 0LL)\n \n static inline int\n-count_cpu(rte_cpuset_t *s)\n+count_cpu(const rte_cpuset_t *s)\n {\n \tunsigned int _i;\n \tint count = 0;\ndiff --git a/lib/eal/windows/rte_thread.c b/lib/eal/windows/rte_thread.c\nindex 5c02a6eaff..669a68d6a8 100644\n--- a/lib/eal/windows/rte_thread.c\n+++ b/lib/eal/windows/rte_thread.c\n@@ -14,6 +14,11 @@ struct eal_tls_key {\n \tDWORD thread_index;\n };\n \n+struct thread_routine_ctx {\n+\trte_thread_func thread_func;\n+\tvoid *routine_args;\n+};\n+\n /* Translates the most common error codes related to threads */\n static int\n thread_translate_win32_error(DWORD error)\n@@ -370,6 +375,135 @@ rte_thread_attr_set_priority(rte_thread_attr_t *thread_attr,\n \treturn 0;\n }\n \n+static DWORD\n+thread_func_wrapper(void *args)\n+{\n+\tstruct thread_routine_ctx *pctx = args;\n+\tstruct thread_routine_ctx ctx;\n+\n+\tctx.thread_func = pctx->thread_func;\n+\tctx.routine_args = pctx->routine_args;\n+\n+\tfree(pctx);\n+\n+\treturn (DWORD)(uintptr_t)ctx.thread_func(ctx.routine_args);\n+}\n+\n+int\n+rte_thread_create(rte_thread_t *thread_id,\n+\t\t const rte_thread_attr_t *thread_attr,\n+\t\t rte_thread_func thread_func, void *args)\n+{\n+\tint ret = 0;\n+\tDWORD tid;\n+\tHANDLE thread_handle = NULL;\n+\tGROUP_AFFINITY thread_affinity;\n+\tstruct thread_routine_ctx *ctx = NULL;\n+\n+\tctx = calloc(1, sizeof(*ctx));\n+\tif (ctx == NULL) {\n+\t\tRTE_LOG(DEBUG, EAL, \"Insufficient memory for thread context allocations\\n\");\n+\t\tret = ENOMEM;\n+\t\tgoto cleanup;\n+\t}\n+\tctx->routine_args = args;\n+\tctx->thread_func = thread_func;\n+\n+\tthread_handle = CreateThread(NULL, 0, thread_func_wrapper, ctx,\n+\t\tCREATE_SUSPENDED, &tid);\n+\tif (thread_handle == NULL) {\n+\t\tret = thread_log_last_error(\"CreateThread()\");\n+\t\tfree(ctx);\n+\t\tgoto cleanup;\n+\t}\n+\tthread_id->opaque_id = tid;\n+\n+\tif (thread_attr != NULL) {\n+\t\tif (CPU_COUNT(&thread_attr->cpuset) > 0) {\n+\t\t\tret = rte_convert_cpuset_to_affinity(\n+\t\t\t\t\t\t\t&thread_attr->cpuset,\n+\t\t\t\t\t\t\t&thread_affinity\n+\t\t\t\t\t\t\t);\n+\t\t\tif (ret != 0) {\n+\t\t\t\tRTE_LOG(DEBUG, EAL, \"Unable to convert cpuset to thread affinity\\n\");\n+\t\t\t\tgoto cleanup;\n+\t\t\t}\n+\n+\t\t\tif (!SetThreadGroupAffinity(thread_handle,\n+\t\t\t\t\t\t &thread_affinity, NULL)) {\n+\t\t\t\tret = thread_log_last_error(\"SetThreadGroupAffinity()\");\n+\t\t\t\tgoto cleanup;\n+\t\t\t}\n+\t\t}\n+\t\tret = rte_thread_set_priority(*thread_id,\n+\t\t\t\tthread_attr->priority);\n+\t\tif (ret != 0) {\n+\t\t\tRTE_LOG(DEBUG, EAL, \"Unable to set thread priority\\n\");\n+\t\t\tgoto cleanup;\n+\t\t}\n+\t}\n+\n+\tif (ResumeThread(thread_handle) == (DWORD)-1) {\n+\t\tret = thread_log_last_error(\"ResumeThread()\");\n+\t\tgoto cleanup;\n+\t}\n+\n+cleanup:\n+\tif (thread_handle != NULL) {\n+\t\tCloseHandle(thread_handle);\n+\t\tthread_handle = NULL;\n+\t}\n+\treturn ret;\n+}\n+\n+int\n+rte_thread_join(rte_thread_t thread_id, unsigned long *value_ptr)\n+{\n+\tHANDLE thread_handle;\n+\tDWORD result;\n+\tDWORD exit_code = 0;\n+\tBOOL err;\n+\tint ret = 0;\n+\n+\tthread_handle = OpenThread(SYNCHRONIZE | THREAD_QUERY_INFORMATION,\n+\t\t\t\t FALSE, thread_id.opaque_id);\n+\tif (thread_handle == NULL) {\n+\t\tret = thread_log_last_error(\"OpenThread()\");\n+\t\tgoto cleanup;\n+\t}\n+\n+\tresult = WaitForSingleObject(thread_handle, INFINITE);\n+\tif (result != WAIT_OBJECT_0) {\n+\t\tret = thread_log_last_error(\"WaitForSingleObject()\");\n+\t\tgoto cleanup;\n+\t}\n+\n+\tif (value_ptr != NULL) {\n+\t\terr = GetExitCodeThread(thread_handle, &exit_code);\n+\t\tif (err == 0) {\n+\t\t\tret = thread_log_last_error(\"GetExitCodeThread()\");\n+\t\t\tgoto cleanup;\n+\t\t}\n+\t\t*value_ptr = exit_code;\n+\t}\n+\n+cleanup:\n+\tif (thread_handle != NULL) {\n+\t\tCloseHandle(thread_handle);\n+\t\tthread_handle = NULL;\n+\t}\n+\n+\treturn ret;\n+}\n+\n+int\n+rte_thread_detach(rte_thread_t thread_id)\n+{\n+\t/* No resources that need to be released. */\n+\tRTE_SET_USED(thread_id);\n+\treturn 0;\n+}\n+\n int\n rte_thread_key_create(rte_thread_key *key,\n \t\t__rte_unused void (*destructor)(void *))\n", "prefixes": [ "v18", "6/8" ] }