util: place a couple of _likely_ around cache TLS vars

diff --git a/src/cgroup-util.c b/src/cgroup-util.c
index 8e574bf98a359b9597576ce7a6da19cff716c92e..fd0ac98e28faad081e1b2faa17425b592f2e9ea7 100644 (file)
--- a/src/cgroup-util.c
+++ b/src/cgroup-util.c
@@ -488,7 +488,7 @@ int cg_get_path(const char *controller, const char *path, const char *suffix, ch
         assert(controller);
         assert(fs);
 
         assert(controller);
         assert(fs);
 

-        if (!good) {
+        if (_unlikely_(!good)) {

                 int r;
 
                 r = path_is_mount_point("/sys/fs/cgroup");
                 int r;
 
                 r = path_is_mount_point("/sys/fs/cgroup");

diff --git a/src/util.c b/src/util.c
index 4e2a4fab832f8c98c578097d0e4ba4857db2d67b..8d54049754c0495b2d4394483c9d2825fcc84f73 100644 (file)
--- a/src/util.c
+++ b/src/util.c
@@ -73,7 +73,7 @@ size_t page_size(void) {
         static __thread size_t pgsz = 0;
         long r;
 
         static __thread size_t pgsz = 0;
         long r;
 

-        if (pgsz)
+        if (_likely_(pgsz))

                 return pgsz;
 
         assert_se((r = sysconf(_SC_PAGESIZE)) > 0);
                 return pgsz;
 
         assert_se((r = sysconf(_SC_PAGESIZE)) > 0);


@@ -3768,7 +3768,7 @@ int columns(void) {
         static __thread int parsed_columns = 0;
         const char *e;
 
         static __thread int parsed_columns = 0;
         const char *e;
 

-        if (parsed_columns > 0)
+        if (_likely_(parsed_columns > 0))

                 return parsed_columns;
 
         if ((e = getenv("COLUMNS")))
                 return parsed_columns;
 
         if ((e = getenv("COLUMNS")))


@@ -4364,7 +4364,7 @@ int detect_virtualization(const char **id) {
         const char *_id;
         int r;
 
         const char *_id;
         int r;
 

-        if (cached_id) {
+        if (_likely_(cached_id)) {

 
                 if (cached_id == (const char*) -1)
                         return 0;
 
                 if (cached_id == (const char*) -1)
                         return 0;