Clean up historical cruft.
The use of 'register' in external/freetype was fixed a long time ago,
and we never set HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE, it isn't available
on LP64, and this code doesn't need it anyway.
Change-Id: Ib7d861cca975f091713dce14372ea7f9b818bb8c
diff --git a/Android.mk b/Android.mk
index 3b4194d..3eb6b74 100644
--- a/Android.mk
+++ b/Android.mk
@@ -179,9 +179,6 @@
LOCAL_CXX_STL := libc++
LOCAL_CFLAGS += $(rs_base_CFLAGS)
-# TODO: external/freetype still uses the register keyword
-# Bug: 17163086
-LOCAL_CFLAGS += -Wno-deprecated-register
LOCAL_CPPFLAGS += -fno-exceptions
@@ -244,9 +241,6 @@
LOCAL_SHARED_LIBRARIES += liblog
LOCAL_CFLAGS += $(rs_base_CFLAGS)
-# TODO: external/freetype still uses the register keyword
-# Bug: 17163086
-LOCAL_CFLAGS += -Wno-deprecated-register
LOCAL_CPPFLAGS += -fno-exceptions
diff --git a/rsSignal.cpp b/rsSignal.cpp
index bf25384..8c2564e 100644
--- a/rsSignal.cpp
+++ b/rsSignal.cpp
@@ -33,13 +33,13 @@
bool Signal::init() {
int status = pthread_mutex_init(&mMutex, nullptr);
if (status) {
- ALOGE("LocklessFifo mutex init failure");
+ ALOGE("Signal::init: mutex init failure: %s", strerror(status));
return false;
}
status = pthread_cond_init(&mCondition, nullptr);
if (status) {
- ALOGE("LocklessFifo condition init failure");
+ ALOGE("Signal::init: condition init failure: %s", strerror(status));
pthread_mutex_destroy(&mMutex);
return false;
}
@@ -48,11 +48,9 @@
}
void Signal::set() {
- int status;
-
- status = pthread_mutex_lock(&mMutex);
+ int status = pthread_mutex_lock(&mMutex);
if (status) {
- ALOGE("LocklessCommandFifo: error %i locking for set condition.", status);
+ ALOGE("Signal::set: error locking for set condition: %s", strerror(status));
return;
}
@@ -60,54 +58,37 @@
status = pthread_cond_signal(&mCondition);
if (status) {
- ALOGE("LocklessCommandFifo: error %i on set condition.", status);
+ ALOGE("Signal::set: error on set condition: %s", strerror(status));
}
status = pthread_mutex_unlock(&mMutex);
if (status) {
- ALOGE("LocklessCommandFifo: error %i unlocking for set condition.", status);
+ ALOGE("Signal::set: error unlocking for set condition: %s", strerror(status));
}
}
-bool Signal::wait(uint64_t timeout) {
- int status;
- bool ret = false;
-
- status = pthread_mutex_lock(&mMutex);
+void Signal::wait() {
+ int status = pthread_mutex_lock(&mMutex);
if (status) {
- ALOGE("LocklessCommandFifo: error %i locking for condition.", status);
- return false;
+ ALOGE("Signal::wait: error locking for condition: %s", strerror(status));
+ return;
}
if (!mSet) {
- if (!timeout) {
- status = pthread_cond_wait(&mCondition, &mMutex);
- } else {
-#if defined(HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE)
- status = pthread_cond_timeout_np(&mCondition, &mMutex, timeout / 1000000);
-#else
- // This is safe it will just make things less reponsive
- status = pthread_cond_wait(&mCondition, &mMutex);
-#endif
- }
+ status = pthread_cond_wait(&mCondition, &mMutex);
}
if (!status) {
mSet = false;
- ret = true;
} else {
#ifndef RS_SERVER
- if (status != ETIMEDOUT) {
- ALOGE("LocklessCommandFifo: error %i waiting for condition.", status);
- }
+ ALOGE("Signal::wait: error waiting for condition: %s", strerror(status));
#endif
}
status = pthread_mutex_unlock(&mMutex);
if (status) {
- ALOGE("LocklessCommandFifo: error %i unlocking for condition.", status);
+ ALOGE("Signal::wait: error unlocking for condition: %s", strerror(status));
}
-
- return ret;
}
diff --git a/rsSignal.h b/rsSignal.h
index fc31883..adeb662 100644
--- a/rsSignal.h
+++ b/rsSignal.h
@@ -32,9 +32,7 @@
void set();
- // returns true if the signal occured
- // false for timeout
- bool wait(uint64_t timeout = 0);
+ void wait();
protected:
bool mSet;
