From f06808fd0c3890b4a9674efc708ccd9907225f53 Mon Sep 17 00:00:00 2001 From: Andre Noll Date: Sun, 19 Jul 2009 18:09:27 +0200 Subject: [PATCH] Remove the likely/unlikely macros. These also slow down the compress filter, its only user, by about 10%. --- compress_filter.c | 4 ++-- gcc-compat.h | 8 +++----- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/compress_filter.c b/compress_filter.c index 2e263e87..7bad4c25 100644 --- a/compress_filter.c +++ b/compress_filter.c @@ -53,7 +53,7 @@ static ssize_t compress(char *inbuf, size_t inbuf_len, struct filter_node *fn) /* be careful in that heat, my dear */ int sample = *ip++, adjusted_sample = (PARA_ABS(sample) * pcd->current_gain) >> gain_shift; - if (unlikely(adjusted_sample > 32767)) { /* clip */ + if (adjusted_sample > 32767) { /* clip */ PARA_NOTICE_LOG("clip: sample: %d, adjusted sample: %d\n", sample, adjusted_sample); adjusted_sample = 32767; @@ -63,7 +63,7 @@ static ssize_t compress(char *inbuf, size_t inbuf_len, struct filter_node *fn) } else pcd->peak = PARA_MAX(pcd->peak, adjusted_sample); *op++ = sample >= 0? adjusted_sample : -adjusted_sample; - if (likely(++pcd->num_samples & mask)) + if (++pcd->num_samples & mask) continue; // PARA_DEBUG_LOG("gain: %u, peak: %u\n", pcd->current_gain, // pcd->peak); diff --git a/gcc-compat.h b/gcc-compat.h index 61c3c88d..1cd30af2 100644 --- a/gcc-compat.h +++ b/gcc-compat.h @@ -2,11 +2,9 @@ # define __noreturn __attribute__ ((noreturn)) # define __malloc __attribute__ ((malloc)) # define __a_unused __attribute__ ((unused)) -# define likely(x) __builtin_expect (!!(x), 1) -# define unlikely(x) __builtin_expect (!!(x), 0) -/* - * p is the number of the "format string" parameter, and q is - * the number of the first variadic parameter +/* + * p is the number of the "format string" parameter, and q is + * the number of the first variadic parameter. */ # define __printf(p,q) __attribute__ ((format (printf, p, q))) /* -- 2.39.5