aboutsummaryrefslogtreecommitdiffstats
path: root/src/vppinfra/unix-misc.c
diff options
context:
space:
mode:
authorDamjan Marion <damarion@cisco.com>2017-05-10 21:06:28 +0200
committerDave Barach <openvpp@barachs.net>2017-05-10 22:01:15 +0000
commitf55f9b851f59264d737d92c6277a87588c565d24 (patch)
tree4e1c69bed3ff6b0968b9558a814a23edac4f9ae6 /src/vppinfra/unix-misc.c
parente5f1d27695e2e6b9be17198e9b49e95639a15c58 (diff)
completelly deprecate os_get_cpu_number, replace new occurences
Change-Id: I82c663bc0866c6c68ba354104b0bb059387f4b9d Signed-off-by: Damjan Marion <damarion@cisco.com>
Diffstat (limited to 'src/vppinfra/unix-misc.c')
-rw-r--r--src/vppinfra/unix-misc.c19
1 files changed, 7 insertions, 12 deletions
diff --git a/src/vppinfra/unix-misc.c b/src/vppinfra/unix-misc.c
index 2928369d..361015b4 100644
--- a/src/vppinfra/unix-misc.c
+++ b/src/vppinfra/unix-misc.c
@@ -45,6 +45,8 @@
#include <fcntl.h>
#include <stdio.h> /* for sprintf */
+__thread uword __os_thread_index = 0;
+
clib_error_t *
unix_file_n_bytes (char *file, uword * result)
{
@@ -188,14 +190,14 @@ void os_puts (u8 * string, uword string_length, uword is_error)
void
os_puts (u8 * string, uword string_length, uword is_error)
{
- int cpu = os_get_cpu_number ();
- int ncpus = os_get_ncpus ();
+ int cpu = os_get_thread_index ();
+ int nthreads = os_get_nthreads ();
char buf[64];
int fd = is_error ? 2 : 1;
struct iovec iovs[2];
int n_iovs = 0;
- if (ncpus > 1)
+ if (nthreads > 1)
{
snprintf (buf, sizeof (buf), "%d: ", cpu);
@@ -219,16 +221,9 @@ os_out_of_memory (void)
os_panic ();
}
-uword os_get_cpu_number (void) __attribute__ ((weak));
-uword
-os_get_cpu_number (void)
-{
- return 0;
-}
-
-uword os_get_ncpus (void) __attribute__ ((weak));
+uword os_get_nthreads (void) __attribute__ ((weak));
uword
-os_get_ncpus (void)
+os_get_nthreads (void)
{
return 1;
}