net/virtio: fix incorrect cast of void *

[dpdk.git] / lib / librte_eal / bsdapp / eal / eal_lcore.c

diff --git a/lib/librte_eal/bsdapp/eal/eal_lcore.c b/lib/librte_eal/bsdapp/eal/eal_lcore.c
index e2f3793..bc584dd 100644 (file)
--- a/lib/librte_eal/bsdapp/eal/eal_lcore.c
+++ b/lib/librte_eal/bsdapp/eal/eal_lcore.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
- * 
+ *
  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   All rights reserved.
- * 
+ *
  *   Redistribution and use in source and binary forms, with or without
  *   modification, are permitted provided that the following conditions
  *   are met:
- * 
+ *
  *     * Redistributions of source code must retain the above copyright
  *       notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above copyright
@@ -17,7 +17,7 @@
  *     * Neither the name of Intel Corporation nor the names of its
  *       contributors may be used to endorse or promote products derived
  *       from this software without specific prior written permission.
- * 
+ *
  *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -41,62 +41,41 @@
 #include <rte_debug.h>
 
 #include "eal_private.h"
+#include "eal_thread.h"
 
 /* No topology information available on FreeBSD including NUMA info */
-#define cpu_core_id(X) 0
-#define cpu_socket_id(X) 0
+unsigned
+eal_cpu_core_id(__rte_unused unsigned lcore_id)
+{
+       return 0;
+}
 
 static int
-get_ncpus(void)
+eal_get_ncpus(void)
 {
+       static int ncpu = -1;
        int mib[2] = {CTL_HW, HW_NCPU};
-       int ncpu;
        size_t len = sizeof(ncpu);
 
-       sysctl(mib, 2, &ncpu, &len, NULL, 0);
-       RTE_LOG(INFO, EAL, "Sysctl reports %d cpus\n", ncpu);
+       if (ncpu < 0) {
+               sysctl(mib, 2, &ncpu, &len, NULL, 0);
+               RTE_LOG(INFO, EAL, "Sysctl reports %d cpus\n", ncpu);
+       }
        return ncpu;
 }
 
-/*
- * fill the cpu_info structure with as much info as we can get.
- * code is similar to linux version, but sadly available info is less.
+unsigned
+eal_cpu_socket_id(__rte_unused unsigned cpu_id)
+{
+       return 0;
+}
+
+/* Check if a cpu is present by the presence of the
+ * cpu information for it.
  */
 int
-rte_eal_cpu_init(void)
+eal_cpu_detected(unsigned lcore_id)
 {
-       /* pointer to global configuration */
-       struct rte_config *config = rte_eal_get_configuration();
-       unsigned lcore_id;
-       unsigned count = 0;
-
-       const unsigned ncpus = get_ncpus();
-
-       /* disable lcores that were not detected */
-       RTE_LCORE_FOREACH(lcore_id) {
-
-               lcore_config[lcore_id].detected = (lcore_id < ncpus);
-               if (lcore_config[lcore_id].detected == 0) {
-                       RTE_LOG(DEBUG, EAL, "Skip lcore %u (not detected)\n", lcore_id);
-                       config->lcore_role[lcore_id] = ROLE_OFF;
-                       continue;
-               }
-               count++;
-               lcore_config[lcore_id].core_id = cpu_core_id(lcore_id);
-               lcore_config[lcore_id].socket_id = cpu_socket_id(lcore_id);
-               if (lcore_config[lcore_id].socket_id >= RTE_MAX_NUMA_NODES)
-#ifdef RTE_EAL_ALLOW_INV_SOCKET_ID
-                       lcore_config[lcore_id].socket_id = 0;
-#else
-                       rte_panic("Socket ID (%u) is greater than "
-                               "RTE_MAX_NUMA_NODES (%d)\n",
-                               lcore_config[lcore_id].socket_id, RTE_MAX_NUMA_NODES);
-#endif
-               RTE_LOG(DEBUG, EAL, "Detected lcore %u\n",
-                               lcore_id);
-       }
-
-       config->lcore_count = count;
-
-       return 0;
+       const unsigned ncpus = eal_get_ncpus();
+       return lcore_id < ncpus;
 }