From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 1 Aug 2011 03:05:59 +0000 (+0200)
Subject: util: place a couple of _likely_ around cache TLS vars
X-Git-Tag: v33~26
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=3bfc71846c3eac9011f0182b0c8d5639a9549228;ds=sidebyside

util: place a couple of _likely_ around cache TLS vars
---

diff --git a/src/cgroup-util.c b/src/cgroup-util.c
index 8e574bf98..fd0ac98e2 100644
--- 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);
 
-        if (!good) {
+        if (_unlikely_(!good)) {
                 int r;
 
                 r = path_is_mount_point("/sys/fs/cgroup");
diff --git a/src/util.c b/src/util.c
index 4e2a4fab8..8d5404975 100644
--- 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;
 
-        if (pgsz)
+        if (_likely_(pgsz))
                 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;
 
-        if (parsed_columns > 0)
+        if (_likely_(parsed_columns > 0))
                 return parsed_columns;
 
         if ((e = getenv("COLUMNS")))
@@ -4364,7 +4364,7 @@ int detect_virtualization(const char **id) {
         const char *_id;
         int r;
 
-        if (cached_id) {
+        if (_likely_(cached_id)) {
 
                 if (cached_id == (const char*) -1)
                         return 0;