ring: remove experimental flag from custom element API

[dpdk.git] / lib / librte_eal / windows / eal_thread.c

diff --git a/lib/librte_eal/windows/eal_thread.c b/lib/librte_eal/windows/eal_thread.c
index 9e4bbaa..20889b6 100644 (file)
--- a/lib/librte_eal/windows/eal_thread.c
+++ b/lib/librte_eal/windows/eal_thread.c
@@ -14,10 +14,7 @@
 #include <eal_thread.h>
 
 #include "eal_private.h"
-
-RTE_DEFINE_PER_LCORE(unsigned int, _lcore_id) = LCORE_ID_ANY;
-RTE_DEFINE_PER_LCORE(unsigned int, _socket_id) = (unsigned int)SOCKET_ID_ANY;
-RTE_DEFINE_PER_LCORE(rte_cpuset_t, _cpuset);
+#include "eal_windows.h"
 
 /*
  * Send a message to a slave lcore identified by slave_id to call a
@@ -56,19 +53,6 @@ rte_eal_remote_launch(lcore_function_t *f, void *arg, unsigned int slave_id)
        return 0;
 }
 
-void
-eal_thread_init_master(unsigned int lcore_id)
-{
-       /* set the lcore ID in per-lcore memory area */
-       RTE_PER_LCORE(_lcore_id) = lcore_id;
-}
-
-static inline pthread_t
-eal_thread_self(void)
-{
-       return GetCurrentThreadId();
-}
-
 /* main loop of threads */
 void *
 eal_thread_loop(void *arg __rte_unused)
@@ -80,7 +64,7 @@ eal_thread_loop(void *arg __rte_unused)
        int m2s, s2m;
        char cpuset[RTE_CPU_AFFINITY_STR_LEN];
 
-       thread_id = eal_thread_self();
+       thread_id = pthread_self();
 
        /* retrieve our lcore_id from the configuration structure */
        RTE_LCORE_FOREACH_SLAVE(lcore_id) {
@@ -93,8 +77,7 @@ eal_thread_loop(void *arg __rte_unused)
        m2s = lcore_config[lcore_id].pipe_master2slave[0];
        s2m = lcore_config[lcore_id].pipe_slave2master[1];
 
-       /* set the lcore ID in per-lcore memory area */
-       RTE_PER_LCORE(_lcore_id) = lcore_id;
+       __rte_thread_init(lcore_id, &lcore_config[lcore_id].cpuset);
 
        RTE_LOG(DEBUG, EAL, "lcore %u is ready (tid=%zx;cpuset=[%s])\n",
                lcore_id, (uintptr_t)thread_id, cpuset);
@@ -145,7 +128,8 @@ eal_thread_create(pthread_t *thread)
 {
        HANDLE th;
 
-       th = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE)eal_thread_loop,
+       th = CreateThread(NULL, 0,
+               (LPTHREAD_START_ROUTINE)(ULONG_PTR)eal_thread_loop,
                                                NULL, 0, (LPDWORD)thread);
        if (!th)
                return -1;
@@ -156,6 +140,13 @@ eal_thread_create(pthread_t *thread)
        return 0;
 }
 
+/* get current thread ID */
+int
+rte_sys_gettid(void)
+{
+       return GetCurrentThreadId();
+}
+
 int
 rte_thread_setname(__rte_unused pthread_t id, __rte_unused const char *name)
 {