summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKyle Repinski <repinski23@gmail.com>2016-03-08 13:12:32 -0600
committerZiyan <jaraidaniel@gmail.com>2016-03-11 01:17:03 +0100
commitc05105e2d70e93f445fec1471c5f83e8cc9f2d78 (patch)
tree2d08838af4043b041e0e5ea0fd4ce6b946d48f21
parent2f61a1fb13480f1afb2b898d4393246c1fc7f179 (diff)
downloaddevice_samsung_tuna-c05105e2d70e93f445fec1471c5f83e8cc9f2d78.zip
device_samsung_tuna-c05105e2d70e93f445fec1471c5f83e8cc9f2d78.tar.gz
device_samsung_tuna-c05105e2d70e93f445fec1471c5f83e8cc9f2d78.tar.bz2
libsecril-shim: Use CC_(UN)LIKELY macros from cutils.
This is what's generally used in the frameworks.
-rw-r--r--ril/libsecril-shim/secril-shim.c20
-rw-r--r--ril/libsecril-shim/secril-shim.h8
2 files changed, 16 insertions, 12 deletions
diff --git a/ril/libsecril-shim/secril-shim.c b/ril/libsecril-shim/secril-shim.c
index 5ca5a5a..c83a4ae 100644
--- a/ril/libsecril-shim/secril-shim.c
+++ b/ril/libsecril-shim/secril-shim.c
@@ -22,7 +22,7 @@ static void onRequestShim(int request, void *data, size_t datalen, RIL_Token t)
} else if (tunaVariant == VARIANT_TORO || tunaVariant == VARIANT_TOROPLUS) {
raf = RAF_LTE | RAF_IS95A | RAF_IS95B | RAF_1xRTT | RAF_EVDO_0 | RAF_EVDO_A | RAF_EVDO_B | RAF_EHRPD;
}
- if (__predict_true(raf != RAF_UNKNOWN)) {
+ if (CC_LIKELY(raf != RAF_UNKNOWN)) {
RIL_RadioCapability rc[1] =
{
{ /* rc[0] */
@@ -79,7 +79,7 @@ const RIL_RadioFunctions* RIL_Init(const struct RIL_Env *env, int argc, char **a
void *origRil;
char propBuf[PROPERTY_VALUE_MAX];
- if (__predict_true(tunaVariant == VARIANT_INIT)) {
+ if (CC_LIKELY(tunaVariant == VARIANT_INIT)) {
property_get("ro.product.subdevice", propBuf, "unknown");
if (!strcmp(propBuf, "maguro")) {
tunaVariant = VARIANT_MAGURO;
@@ -98,23 +98,21 @@ const RIL_RadioFunctions* RIL_Init(const struct RIL_Env *env, int argc, char **a
/* Open and Init the original RIL. */
origRil = dlopen(RIL_LIB_PATH, RTLD_LOCAL);
- if (__predict_false(!origRil)) {
+ if (CC_UNLIKELY(!origRil)) {
RLOGE("%s: failed to load '" RIL_LIB_PATH "': %s\n", __func__, dlerror());
return NULL;
}
origRilInit = dlsym(origRil, "RIL_Init");
- if (__predict_false(!origRilInit)) {
+ if (CC_UNLIKELY(!origRilInit)) {
RLOGE("%s: couldn't find original RIL_Init!\n", __func__);
- dlclose(origRil);
- return NULL;
+ goto fail_after_dlopen;
}
origRilFunctions = origRilInit(env, argc, argv);
- if (__predict_false(!origRilFunctions)) {
+ if (CC_UNLIKELY(!origRilFunctions)) {
RLOGE("%s: the original RIL_Init derped.\n", __func__);
- dlclose(origRil);
- return NULL;
+ goto fail_after_dlopen;
}
/* Shim functions as needed. */
@@ -122,4 +120,8 @@ const RIL_RadioFunctions* RIL_Init(const struct RIL_Env *env, int argc, char **a
shimmedFunctions.onRequest = onRequestShim;
return &shimmedFunctions;
+
+fail_after_dlopen:
+ dlclose(origRil);
+ return NULL;
}
diff --git a/ril/libsecril-shim/secril-shim.h b/ril/libsecril-shim/secril-shim.h
index f64d053..b1ee607 100644
--- a/ril/libsecril-shim/secril-shim.h
+++ b/ril/libsecril-shim/secril-shim.h
@@ -4,13 +4,15 @@
#define LOG_TAG "secril-shim"
#define RIL_SHLIB
+#include <dlfcn.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <cutils/compiler.h>
#include <cutils/properties.h>
#include <sys/cdefs.h>
#include <telephony/ril.h>
#include <utils/Log.h>
-#include <dlfcn.h>
-#include <stdlib.h>
-#include <string.h>
#define RIL_LIB_PATH "/vendor/lib/libsec-ril.so"