chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
util: no need for in_initrd() cache to be thread-local
[elogind.git]
/
src
/
shared
/
util.c
diff --git
a/src/shared/util.c
b/src/shared/util.c
index cdc58e394f1e77fbe9ed329dc2054ae299d03c77..80dbf73c947d4f501503b2cc3626f28c8afff289 100644
(file)
--- a/
src/shared/util.c
+++ b/
src/shared/util.c
@@
-86,7
+86,7
@@
static volatile unsigned cached_columns = 0;
static volatile unsigned cached_lines = 0;
size_t page_size(void) {
static volatile unsigned cached_lines = 0;
size_t page_size(void) {
- static
__thread
size_t pgsz = 0;
+ static
thread_local
size_t pgsz = 0;
long r;
if (_likely_(pgsz > 0))
long r;
if (_likely_(pgsz > 0))
@@
-2737,9
+2737,9
@@
int rm_rf_children_dangerous(int fd, bool only_dirs, bool honour_sticky, struct
_pure_ static int is_temporary_fs(struct statfs *s) {
assert(s);
_pure_ static int is_temporary_fs(struct statfs *s) {
assert(s);
- return
-
F_TYPE_EQUAL(s->f_type, TMPFS_MAGIC) ||
-
F_TYPE_EQUAL(s->f_type, RAMFS_MAGIC);
+
+
return
F_TYPE_EQUAL(s->f_type, TMPFS_MAGIC) ||
+ F_TYPE_EQUAL(s->f_type, RAMFS_MAGIC);
}
int rm_rf_children(int fd, bool only_dirs, bool honour_sticky, struct stat *root_dev) {
}
int rm_rf_children(int fd, bool only_dirs, bool honour_sticky, struct stat *root_dev) {
@@
-4580,7
+4580,7
@@
char *strjoin(const char *x, ...) {
}
bool is_main_thread(void) {
}
bool is_main_thread(void) {
- static
__thread
int cached = 0;
+ static
thread_local
int cached = 0;
if (_unlikely_(cached == 0))
cached = getpid() == gettid() ? 1 : -1;
if (_unlikely_(cached == 0))
cached = getpid() == gettid() ? 1 : -1;
@@
-4798,7
+4798,7
@@
static const char *const __signal_table[] = {
DEFINE_PRIVATE_STRING_TABLE_LOOKUP(__signal, int);
const char *signal_to_string(int signo) {
DEFINE_PRIVATE_STRING_TABLE_LOOKUP(__signal, int);
const char *signal_to_string(int signo) {
- static
__thread
char buf[sizeof("RTMIN+")-1 + DECIMAL_STR_MAX(int) + 1];
+ static
thread_local
char buf[sizeof("RTMIN+")-1 + DECIMAL_STR_MAX(int) + 1];
const char *name;
name = __signal_to_string(signo);
const char *name;
name = __signal_to_string(signo);
@@
-5154,7
+5154,7
@@
bool is_valid_documentation_url(const char *url) {
}
bool in_initrd(void) {
}
bool in_initrd(void) {
- static
__thread
int saved = -1;
+ static int saved = -1;
struct statfs s;
if (saved >= 0)
struct statfs s;
if (saved >= 0)