diff options
Diffstat (limited to 'src/vlib')
| -rw-r--r-- | src/vlib/buffer.c | 6 | ||||
| -rw-r--r-- | src/vlib/linux/pci.c | 8 | ||||
| -rw-r--r-- | src/vlib/threads.c | 14 |
3 files changed, 12 insertions, 16 deletions
diff --git a/src/vlib/buffer.c b/src/vlib/buffer.c index b5200ba5029..e1dcf7ed827 100644 --- a/src/vlib/buffer.c +++ b/src/vlib/buffer.c @@ -44,6 +44,8 @@ */ #include <vppinfra/linux/sysfs.h> +#include <vppinfra/bitmap.h> +#include <vppinfra/unix.h> #include <vlib/vlib.h> #include <vlib/unix/unix.h> #include <vlib/stats/stats.h> @@ -840,9 +842,7 @@ vlib_buffer_main_init (struct vlib_main_t * vm) clib_spinlock_init (&bm->buffer_known_hash_lockp); - if ((err = clib_sysfs_read ("/sys/devices/system/node/online", "%U", - unformat_bitmap_list, &bmp))) - clib_error_free (err); + bmp = os_get_online_cpu_node_bitmap (); if ((err = clib_sysfs_read ("/sys/devices/system/node/has_memory", "%U", unformat_bitmap_list, &bmp_has_memory))) diff --git a/src/vlib/linux/pci.c b/src/vlib/linux/pci.c index 0435d569bec..3af97414ed8 100644 --- a/src/vlib/linux/pci.c +++ b/src/vlib/linux/pci.c @@ -38,6 +38,8 @@ */ #include <vppinfra/linux/sysfs.h> +#include <vppinfra/bitmap.h> +#include <vppinfra/unix.h> #include <vlib/vlib.h> #include <vlib/pci/pci.h> @@ -257,11 +259,7 @@ vlib_pci_get_device_info (vlib_main_t * vm, vlib_pci_addr_t * addr, } if (di->numa_node == -1) { - /* if '/sys/bus/pci/devices/<device id>/numa_node' returns -1 and - it is a SMP system, set numa_node to 0. */ - if ((err = clib_sysfs_read ("/sys/devices/system/node/online", "%U", - unformat_bitmap_list, &bmp))) - clib_error_free (err); + bmp = os_get_online_cpu_node_bitmap (); if (clib_bitmap_count_set_bits (bmp) == 1) di->numa_node = 0; } diff --git a/src/vlib/threads.c b/src/vlib/threads.c index 03fda388edf..b96cbf9470c 100644 --- a/src/vlib/threads.c +++ b/src/vlib/threads.c @@ -20,6 +20,8 @@ #include <vppinfra/time_range.h> #include <vppinfra/interrupt.h> #include <vppinfra/linux/sysfs.h> +#include <vppinfra/bitmap.h> +#include <vppinfra/unix.h> #include <vlib/vlib.h> #include <vlib/threads.h> @@ -186,10 +188,8 @@ vlib_thread_init (vlib_main_t * vm) ASSERT (stats_num_worker_threads_dir_index != ~0); /* get bitmaps of active cpu cores and sockets */ - tm->cpu_core_bitmap = - clib_sysfs_list_to_bitmap ("/sys/devices/system/cpu/online"); - tm->cpu_socket_bitmap = - clib_sysfs_list_to_bitmap ("/sys/devices/system/node/online"); + tm->cpu_core_bitmap = os_get_online_cpu_core_bitmap (); + tm->cpu_socket_bitmap = os_get_online_cpu_node_bitmap (); avail_cpu = clib_bitmap_dup (tm->cpu_core_bitmap); @@ -440,9 +440,7 @@ vlib_get_thread_core_numa (vlib_worker_thread_t * w, unsigned cpu_id) clib_sysfs_read ((char *) p, "%d", &core_id); vec_reset_length (p); - /* *INDENT-OFF* */ - clib_sysfs_read ("/sys/devices/system/node/online", "%U", - unformat_bitmap_list, &nbmp); + nbmp = os_get_online_cpu_node_bitmap (); clib_bitmap_foreach (node, nbmp) { p = format (p, "%s%u/cpulist%c", sys_node_path, node, 0); clib_sysfs_read ((char *) p, "%U", unformat_bitmap_list, &cbmp); @@ -451,7 +449,7 @@ vlib_get_thread_core_numa (vlib_worker_thread_t * w, unsigned cpu_id) vec_reset_length (cbmp); vec_reset_length (p); } - /* *INDENT-ON* */ + vec_free (nbmp); vec_free (cbmp); vec_free (p); |