Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
vppinfra: numa vector placement support
[vpp.git]
/
src
/
vppinfra
/
unix-misc.c
diff --git
a/src/vppinfra/unix-misc.c
b/src/vppinfra/unix-misc.c
index
2928369
..
54016ed
100644
(file)
--- a/
src/vppinfra/unix-misc.c
+++ b/
src/vppinfra/unix-misc.c
@@
-45,8
+45,11
@@
#include <fcntl.h>
#include <stdio.h> /* for sprintf */
#include <fcntl.h>
#include <stdio.h> /* for sprintf */
+__thread uword __os_thread_index = 0;
+__thread uword __os_numa_index = 0;
+
clib_error_t *
clib_error_t *
-
unix
_file_n_bytes (char *file, uword * result)
+
clib
_file_n_bytes (char *file, uword * result)
{
struct stat s;
{
struct stat s;
@@
-62,7
+65,7
@@
unix_file_n_bytes (char *file, uword * result)
}
clib_error_t *
}
clib_error_t *
-
unix
_file_read_contents (char *file, u8 * result, uword n_bytes)
+
clib
_file_read_contents (char *file, u8 * result, uword n_bytes)
{
int fd = -1;
uword n_done, n_left;
{
int fd = -1;
uword n_done, n_left;
@@
-106,19
+109,19
@@
done:
}
clib_error_t *
}
clib_error_t *
-
unix
_file_contents (char *file, u8 ** result)
+
clib
_file_contents (char *file, u8 ** result)
{
uword n_bytes;
clib_error_t *error = 0;
u8 *v;
{
uword n_bytes;
clib_error_t *error = 0;
u8 *v;
- if ((error =
unix
_file_n_bytes (file, &n_bytes)))
+ if ((error =
clib
_file_n_bytes (file, &n_bytes)))
return error;
v = 0;
vec_resize (v, n_bytes);
return error;
v = 0;
vec_resize (v, n_bytes);
- error =
unix
_file_read_contents (file, v, n_bytes);
+ error =
clib
_file_read_contents (file, v, n_bytes);
if (error)
vec_free (v);
if (error)
vec_free (v);
@@
-188,14
+191,14
@@
void os_puts (u8 * string, uword string_length, uword is_error)
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 n
cpus = os_get_ncpu
s ();
+ int cpu = os_get_
thread_index
();
+ int n
threads = os_get_nthread
s ();
char buf[64];
int fd = is_error ? 2 : 1;
struct iovec iovs[2];
int n_iovs = 0;
char buf[64];
int fd = is_error ? 2 : 1;
struct iovec iovs[2];
int n_iovs = 0;
- if (n
cpu
s > 1)
+ if (n
thread
s > 1)
{
snprintf (buf, sizeof (buf), "%d: ", cpu);
{
snprintf (buf, sizeof (buf), "%d: ", cpu);
@@
-219,16
+222,9
@@
os_out_of_memory (void)
os_panic ();
}
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
uword
-os_get_n
cpu
s (void)
+os_get_n
thread
s (void)
{
return 1;
}
{
return 1;
}