Merge "Use the standard CC_LIKELY and CC_UNLIKELY macros" (a8719ad9) · Commits · e / os / android_frameworks_base

libs/gui/ISurfaceComposer.cpp

+0 −5

Original line number	Diff line number	Diff line
		@@ -40,11 +40,6 @@

		// ---------------------------------------------------------------------------

		#define LIKELY( exp ) (__builtin_expect( (exp) != 0, true ))
		#define UNLIKELY( exp ) (__builtin_expect( (exp) != 0, false ))

		// ---------------------------------------------------------------------------

		namespace android {

		class IDisplayEventConnection;

libs/gui/ISurfaceComposerClient.cpp

+0 −3

Original line number	Diff line number	Diff line
		@@ -42,9 +42,6 @@
		#define AID_GRAPHICS 1003
		#endif

		#define LIKELY( exp ) (__builtin_expect( (exp) != 0, true ))
		#define UNLIKELY( exp ) (__builtin_expect( (exp) != 0, false ))

		// ---------------------------------------------------------------------------

		namespace android {

libs/rs/driver/rsdRuntimeMath.cpp

+6 −4

Original line number	Diff line number	Diff line
		@@ -14,6 +14,8 @@
		* limitations under the License.
		*/

		#include <cutils/compiler.h>

		#include "rsContext.h"
		#include "rsScriptC.h"
		#include "rsMatrix4x4.h"
		@@ -306,7 +308,7 @@ static int32_t SC_AtomicSub(volatile int32_t *ptr, int32_t value) {
		do {
		prev = *ptr;
		status = android_atomic_release_cas(prev, prev - value, ptr);
		} while (__builtin_expect(status != 0, 0));
		} while (CC_UNLIKELY(status != 0));
		return prev;
		}

		@@ -323,7 +325,7 @@ static int32_t SC_AtomicXor(volatile int32_t *ptr, int32_t value) {
		do {
		prev = *ptr;
		status = android_atomic_release_cas(prev, prev ^ value, ptr);
		} while (__builtin_expect(status != 0, 0));
		} while (CC_UNLIKELY(status != 0));
		return prev;
		}

		@@ -333,7 +335,7 @@ static int32_t SC_AtomicMin(volatile int32_t *ptr, int32_t value) {
		prev = *ptr;
		int32_t n = rsMin(value, prev);
		status = android_atomic_release_cas(prev, n, ptr);
		} while (__builtin_expect(status != 0, 0));
		} while (CC_UNLIKELY(status != 0));
		return prev;
		}

		@@ -343,7 +345,7 @@ static int32_t SC_AtomicMax(volatile int32_t *ptr, int32_t value) {
		prev = *ptr;
		int32_t n = rsMax(value, prev);
		status = android_atomic_release_cas(prev, n, ptr);
		} while (__builtin_expect(status != 0, 0));
		} while (CC_UNLIKELY(status != 0));
		return prev;
		}

media/libeffects/testlibs/AudioBiquadFilter.cpp

+5 −7

Original line number	Diff line number	Diff line
		@@ -17,12 +17,10 @@

		#include <string.h>
		#include <assert.h>
		#include <cutils/compiler.h>

		#include "AudioBiquadFilter.h"

		#define LIKELY( exp ) (__builtin_expect( (exp) != 0, true ))
		#define UNLIKELY( exp ) (__builtin_expect( (exp) != 0, false ))

		namespace android {

		const audio_coef_t AudioBiquadFilter::IDENTITY_COEFS[AudioBiquadFilter::NUM_COEFS] = { AUDIO_COEF_ONE, 0, 0, 0, 0 };
		@@ -55,7 +53,7 @@ void AudioBiquadFilter::clear() {
		void AudioBiquadFilter::setCoefs(const audio_coef_t coefs[NUM_COEFS], bool immediate) {
		memcpy(mTargetCoefs, coefs, sizeof(mTargetCoefs));
		if (mState & STATE_ENABLED_MASK) {
		if (UNLIKELY(immediate)) {
		if (CC_UNLIKELY(immediate)) {
		memcpy(mCoefs, coefs, sizeof(mCoefs));
		setState(STATE_NORMAL);
		} else {
		@@ -70,7 +68,7 @@ void AudioBiquadFilter::process(const audio_sample_t in[], audio_sample_t out[],
		}

		void AudioBiquadFilter::enable(bool immediate) {
		if (UNLIKELY(immediate)) {
		if (CC_UNLIKELY(immediate)) {
		memcpy(mCoefs, mTargetCoefs, sizeof(mCoefs));
		setState(STATE_NORMAL);
		} else {
		@@ -79,7 +77,7 @@ void AudioBiquadFilter::enable(bool immediate) {
		}

		void AudioBiquadFilter::disable(bool immediate) {
		if (UNLIKELY(immediate)) {
		if (CC_UNLIKELY(immediate)) {
		memcpy(mCoefs, IDENTITY_COEFS, sizeof(mCoefs));
		setState(STATE_BYPASS);
		} else {
		@@ -142,7 +140,7 @@ void AudioBiquadFilter::process_bypass(const audio_sample_t * in,
		audio_sample_t * out,
		int frameCount) {
		// The common case is in-place processing, because this is what the EQ does.
		if (UNLIKELY(in != out)) {
		if (CC_UNLIKELY(in != out)) {
		memcpy(out, in, frameCount * mNumChannels * sizeof(audio_sample_t));
		}
		}

media/libeffects/testlibs/AudioCoefInterpolator.cpp

+6 −6

Original line number	Diff line number	Diff line
		@@ -16,10 +16,10 @@
		*/

		#include <string.h>
		#include "AudioCoefInterpolator.h"

		#define LIKELY( exp ) (__builtin_expect( (exp) != 0, true ))
		#define UNLIKELY( exp ) (__builtin_expect( (exp) != 0, false ))
		#include <cutils/compiler.h>

		#include "AudioCoefInterpolator.h"

		namespace android {

		@@ -44,9 +44,9 @@ void AudioCoefInterpolator::getCoef(const int intCoord[], uint32_t fracCoord[],
		size_t index = 0;
		size_t dim = mNumInDims;
		while (dim-- > 0) {
		if (UNLIKELY(intCoord[dim] < 0)) {
		if (CC_UNLIKELY(intCoord[dim] < 0)) {
		fracCoord[dim] = 0;
		} else if (UNLIKELY(intCoord[dim] >= (int)mInDims[dim] - 1)) {
		} else if (CC_UNLIKELY(intCoord[dim] >= (int)mInDims[dim] - 1)) {
		fracCoord[dim] = 0;
		index += mInDimOffsets[dim] * (mInDims[dim] - 1);
		} else {
		@@ -63,7 +63,7 @@ void AudioCoefInterpolator::getCoefRecurse(size_t index,
		memcpy(out, mTable + index, mNumOutDims * sizeof(audio_coef_t));
		} else {
		getCoefRecurse(index, fracCoord, out, dim + 1);
		if (LIKELY(fracCoord != 0)) {
		if (CC_LIKELY(fracCoord != 0)) {
		audio_coef_t tempCoef[MAX_OUT_DIMS];
		getCoefRecurse(index + mInDimOffsets[dim], fracCoord, tempCoef,
		dim + 1);