summaryrefslogtreecommitdiffstats
path: root/libcutils/selector.c
diff options
context:
space:
mode:
authorSteve Block <steveblock@google.com>2011-12-20 16:07:45 +0000
committerSteve Block <steveblock@google.com>2012-01-03 22:32:30 +0000
commit8d66c49258ac4f59bd67c23c9c914cca81f85b01 (patch)
tree24447dff0da16f6ef9af1512f1f4ff936e3014af /libcutils/selector.c
parent0fdccb561d37022d4ccc82982de81c2b32617803 (diff)
downloadsystem_core-8d66c49258ac4f59bd67c23c9c914cca81f85b01.tar.gz
system_core-8d66c49258ac4f59bd67c23c9c914cca81f85b01.tar.bz2
system_core-8d66c49258ac4f59bd67c23c9c914cca81f85b01.zip
Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGE
Bug: 5449033 Change-Id: I9244d927f14c750cd359ebffb1fc1c355a755d5a
Diffstat (limited to 'libcutils/selector.c')
-rw-r--r--libcutils/selector.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/libcutils/selector.c b/libcutils/selector.c
index 943639370..9aef5fa97 100644
--- a/libcutils/selector.c
+++ b/libcutils/selector.c
@@ -96,7 +96,7 @@ Selector* selectorCreate(void) {
LOG_ALWAYS_FATAL("pipe() error: %s", strerror(errno));
}
- LOGD("Wakeup fd: %d", selector->wakeupPipe[0]);
+ ALOGD("Wakeup fd: %d", selector->wakeupPipe[0]);
SelectableFd* wakeupFd = selectorAdd(selector, selector->wakeupPipe[0]);
if (wakeupFd == NULL) {
@@ -169,11 +169,11 @@ static void prepareForSelect(Selector* selector) {
bool inSet = false;
if (maybeAdd(selectableFd, selectableFd->onExcept, exceptFds)) {
- LOGD("Selecting fd %d for writing...", selectableFd->fd);
+ ALOGD("Selecting fd %d for writing...", selectableFd->fd);
inSet = true;
}
if (maybeAdd(selectableFd, selectableFd->onReadable, readFds)) {
- LOGD("Selecting fd %d for reading...", selectableFd->fd);
+ ALOGD("Selecting fd %d for reading...", selectableFd->fd);
inSet = true;
}
if (maybeAdd(selectableFd, selectableFd->onWritable, writeFds)) {
@@ -200,9 +200,9 @@ static void prepareForSelect(Selector* selector) {
*/
static inline void maybeInvoke(SelectableFd* selectableFd,
void (*callback)(SelectableFd*), fd_set* fdSet) {
- if (callback != NULL && !selectableFd->remove &&
+ if (callback != NULL && !selectableFd->remove &&
FD_ISSET(selectableFd->fd, fdSet)) {
- LOGD("Selected fd %d.", selectableFd->fd);
+ ALOGD("Selected fd %d.", selectableFd->fd);
callback(selectableFd);
}
}
@@ -238,13 +238,13 @@ void selectorLoop(Selector* selector) {
prepareForSelect(selector);
- LOGD("Entering select().");
+ ALOGD("Entering select().");
// Select file descriptors.
int result = select(selector->maxFd + 1, &selector->readFds,
&selector->writeFds, &selector->exceptFds, NULL);
- LOGD("Exiting select().");
+ ALOGD("Exiting select().");
setInSelect(selector, false);