errors are never predicted in branch prediction (likely/unlikely macros added)

src/atomic_counter.hpp

@@ -17,7 +17,6 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-
 #ifndef __ZMQ_ATOMIC_COUNTER_HPP_INCLUDED__
 #define __ZMQ_ATOMIC_COUNTER_HPP_INCLUDED__
 

src/err.hpp

@@ -27,6 +27,7 @@
 #include <stdio.h>
 
 #include "platform.hpp"
+#include "likely.hpp"
 
 #ifdef ZMQ_HAVE_WINDOWS
 #include "windows.hpp"
@@ -46,53 +47,71 @@ namespace zmq
 }
 
 //  Provides convenient way to check WSA-style errors on Windows.
-#define wsa_assert(x) do { if (!(x)){\
+#define wsa_assert(x) \
-    const char *errstr = zmq::wsa_error ();\
+    do {\
-    if (errstr != NULL) {\
+        if (unlikely (!(x))) {\
-    fprintf (stderr, "Assertion failed: %s (%s:%d)\n", errstr, \
+            const char *errstr = zmq::wsa_error ();\
-        __FILE__, __LINE__);\
+            if (errstr != NULL) {\
-        abort ();\
+                fprintf (stderr, "Assertion failed: %s (%s:%d)\n", errstr, \
-    }\
+                    __FILE__, __LINE__);\
-}} while (false)
+                abort ();\
+            }\
+        }\
+    } while (false)
 
-//  Provides convenient way to check GetLastError-style errors on Windows.
+// Provides convenient way to check GetLastError-style errors on Windows.
-#define win_assert(x) do { if (!(x)) {\
+#define win_assert(x) \
-    char errstr [256];\
+    do {\
-    zmq::win_error (errstr, 256);\
+        if (unlikely (!(x))) {\
-    fprintf (stderr, "Assertion failed: %s (%s:%d)\n", errstr, \
+            char errstr [256];\
-        __FILE__, __LINE__);\
+            zmq::win_error (errstr, 256);\
-    abort ();\
+            fprintf (stderr, "Assertion failed: %s (%s:%d)\n", errstr, \
-}} while (false)
+                __FILE__, __LINE__);\
+            abort ();\
+        }\
+    } while (false)
 
 #endif
 
 //  This macro works in exactly the same way as the normal assert. It is used
 //  in its stead because standard assert on Win32 in broken - it prints nothing
 //  when used within the scope of JNI library.
-#define zmq_assert(x) do { if (!(x)){\
+#define zmq_assert(x) \
-    fprintf (stderr, "Assertion failed: %s (%s:%d)\n", #x, \
+    do {\
-        __FILE__, __LINE__);\
+        if (unlikely (!(x))) {\
-        abort ();\
+            fprintf (stderr, "Assertion failed: %s (%s:%d)\n", #x, \
-}} while (false) 
+                __FILE__, __LINE__);\
+            abort ();\
+        }\
+    } while (false) 
 
 //  Provides convenient way to check for errno-style errors.
-#define errno_assert(x) do { if (!(x)) {\
+#define errno_assert(x) \
-    perror (NULL);\
+    do {\
-    fprintf (stderr, "%s (%s:%d)\n", #x, __FILE__, __LINE__);\
+        if (unlikely (!(x))) {\
-    abort ();\
+            perror (NULL);\
-}} while (false)
+            fprintf (stderr, "%s (%s:%d)\n", #x, __FILE__, __LINE__);\
+            abort ();\
+        }\
+    } while (false)
 
 // Provides convenient way to check for POSIX errors.
-#define posix_assert(x) do { if ((x)) {\
+#define posix_assert(x) \
-    fprintf (stderr, "%s (%s:%d)\n", strerror (x), __FILE__, __LINE__);\
+    do {\
-    abort ();\
+        if (unlikely (x)) {\
-}} while (false)
+            fprintf (stderr, "%s (%s:%d)\n", strerror (x), __FILE__, __LINE__);\
+            abort ();\
+        }\
+    } while (false)
 
 // Provides convenient way to check for errors from getaddrinfo.
-#define gai_assert(x) do { if (x) {\
+#define gai_assert(x) \
-    const char *errstr = gai_strerror (x);\
+    do {\
-    fprintf (stderr, "%s (%s:%d)\n", errstr, __FILE__, __LINE__);\
+        if (unlikely (x)) {\
-    abort ();\
+            const char *errstr = gai_strerror (x);\
-}} while (false)
+            fprintf (stderr, "%s (%s:%d)\n", errstr, __FILE__, __LINE__);\
+            abort ();\
+        }\
+    } while (false)
 
 #endif

src/likely.hpp

@@ -0,0 +1,32 @@
+/*
+    Copyright (c) 2007-2009 FastMQ Inc.
+
+    This file is part of 0MQ.
+
+    0MQ is free software; you can redistribute it and/or modify it under
+    the terms of the Lesser GNU General Public License as published by
+    the Free Software Foundation; either version 3 of the License, or
+    (at your option) any later version.
+
+    0MQ is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    Lesser GNU General Public License for more details.
+
+    You should have received a copy of the Lesser GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef __ZMQ_LIKELY_HPP_INCLUDED__
+#define __ZMQ_LIKELY_HPP_INCLUDED__
+
+#if defined __GNUC__
+#define likely(x) __builtin_expect ((x), 1)
+#define unlikely(x) __builtin_expect ((x), 0)
+#else
+#define likely(x) (x)
+#define unlikely(x) (x)
+#endif
+
+
+#endif