diff options
Diffstat (limited to 'libcutils')
| -rw-r--r-- | libcutils/buffer.c | 6 | ||||
| -rw-r--r-- | libcutils/loghack.h | 2 | ||||
| -rw-r--r-- | libcutils/mq.c | 34 | ||||
| -rw-r--r-- | libcutils/selector.c | 14 |
4 files changed, 28 insertions, 28 deletions
diff --git a/libcutils/buffer.c b/libcutils/buffer.c index f34b8f8..af99bd7 100644 --- a/libcutils/buffer.c +++ b/libcutils/buffer.c @@ -104,9 +104,9 @@ ssize_t bufferWrite(Buffer* buffer, int fd) { if (bytesWritten >= 0) { buffer->remaining -= bytesWritten; - LOGD("Buffer bytes written: %d", (int) bytesWritten); - LOGD("Buffer size: %d", (int) buffer->size); - LOGD("Buffer remaining: %d", (int) buffer->remaining); + ALOGD("Buffer bytes written: %d", (int) bytesWritten); + ALOGD("Buffer size: %d", (int) buffer->size); + ALOGD("Buffer remaining: %d", (int) buffer->remaining); return buffer->remaining; } diff --git a/libcutils/loghack.h b/libcutils/loghack.h index 52dfc8c..e35f887 100644 --- a/libcutils/loghack.h +++ b/libcutils/loghack.h @@ -28,7 +28,7 @@ #define ALOG(level, ...) \ ((void)printf("cutils:" level "/" LOG_TAG ": " __VA_ARGS__)) #define ALOGV(...) ALOG("V", __VA_ARGS__) -#define LOGD(...) ALOG("D", __VA_ARGS__) +#define ALOGD(...) ALOG("D", __VA_ARGS__) #define LOGI(...) ALOG("I", __VA_ARGS__) #define LOGW(...) ALOG("W", __VA_ARGS__) #define LOGE(...) ALOG("E", __VA_ARGS__) diff --git a/libcutils/mq.c b/libcutils/mq.c index 3b65f1f..65af198 100644 --- a/libcutils/mq.c +++ b/libcutils/mq.c @@ -263,7 +263,7 @@ static void peerUnlock(Peer* peer) { /** Frees a simple, i.e. header-only, outgoing packet. */ static void outgoingPacketFree(OutgoingPacket* packet) { - LOGD("Freeing outgoing packet."); + ALOGD("Freeing outgoing packet."); free(packet); } @@ -435,7 +435,7 @@ static void peerProxyHandleError(PeerProxy* peerProxy, char* functionName) { // Log interruptions but otherwise ignore them. LOGW("%s() interrupted.", functionName); } else if (errno == EAGAIN) { - LOGD("EWOULDBLOCK"); + ALOGD("EWOULDBLOCK"); // Ignore. } else { LOGW("Error returned by %s().", functionName); @@ -461,7 +461,7 @@ static bool peerProxyWriteFromBuffer(PeerProxy* peerProxy, Buffer* outgoing) { static void peerProxyWriteBytes(PeerProxy* peerProxy) { Buffer* buffer = peerProxy->currentPacket->bytes; if (peerProxyWriteFromBuffer(peerProxy, buffer)) { - LOGD("Bytes written."); + ALOGD("Bytes written."); peerProxyNextPacket(peerProxy); } } @@ -527,10 +527,10 @@ static void peerProxyWrite(SelectableFd* fd) { Buffer* outgoingHeader = &peerProxy->outgoingHeader; bool headerWritten = bufferWriteComplete(outgoingHeader); if (!headerWritten) { - LOGD("Writing header..."); + ALOGD("Writing header..."); headerWritten = peerProxyWriteFromBuffer(peerProxy, outgoingHeader); if (headerWritten) { - LOGD("Header written."); + ALOGD("Header written."); } } @@ -559,7 +559,7 @@ static void peerProxyWrite(SelectableFd* fd) { * Sets up a peer proxy's fd before we try to select() it. */ static void peerProxyBeforeSelect(SelectableFd* fd) { - LOGD("Before select..."); + ALOGD("Before select..."); PeerProxy* peerProxy = (PeerProxy*) fd->data; @@ -568,7 +568,7 @@ static void peerProxyBeforeSelect(SelectableFd* fd) { peerUnlock(peerProxy->peer); if (hasPackets) { - LOGD("Packets found. Setting onWritable()."); + ALOGD("Packets found. Setting onWritable()."); fd->onWritable = &peerProxyWrite; } else { @@ -579,9 +579,9 @@ static void peerProxyBeforeSelect(SelectableFd* fd) { /** Prepare to read bytes from the peer. */ static void peerProxyExpectBytes(PeerProxy* peerProxy, Header* header) { - LOGD("Expecting %d bytes.", header->size); - - peerProxy->inputState = READING_BYTES; + ALOGD("Expecting %d bytes.", header->size); + + peerProxy->inputState = READING_BYTES; if (bufferPrepareForRead(peerProxy->inputBuffer, header->size) == -1) { LOGW("Couldn't allocate memory for incoming data. Size: %u", (unsigned int) header->size); @@ -963,23 +963,23 @@ static bool peerProxyBufferInput(PeerProxy* peerProxy) { * Reads input from a peer process. */ static void peerProxyRead(SelectableFd* fd) { - LOGD("Reading..."); + ALOGD("Reading..."); PeerProxy* peerProxy = (PeerProxy*) fd->data; int state = peerProxy->inputState; Buffer* in = peerProxy->inputBuffer; switch (state) { case READING_HEADER: if (peerProxyBufferInput(peerProxy)) { - LOGD("Header read."); + ALOGD("Header read."); // We've read the complete header. Header* header = (Header*) in->data; peerProxyHandleHeader(peerProxy, header); } break; case READING_BYTES: - LOGD("Reading bytes..."); + ALOGD("Reading bytes..."); if (peerProxyBufferInput(peerProxy)) { - LOGD("Bytes read."); + ALOGD("Bytes read."); // We have the complete packet. Notify bytes listener. peerProxy->peer->onBytes(peerProxy->credentials, in->data, in->size); @@ -1030,7 +1030,7 @@ static void masterAcceptConnection(SelectableFd* listenerFd) { return; } - LOGD("Accepted connection as fd %d.", socket); + ALOGD("Accepted connection as fd %d.", socket); // Get credentials. Credentials credentials; @@ -1118,7 +1118,7 @@ static Peer* localPeer; /** Frees a packet of bytes. */ static void outgoingPacketFreeBytes(OutgoingPacket* packet) { - LOGD("Freeing outgoing packet."); + ALOGD("Freeing outgoing packet."); bufferFree(packet->bytes); free(packet); } @@ -1270,7 +1270,7 @@ void masterPeerInitialize(BytesListener* bytesListener, LOG_ALWAYS_FATAL("bind() error: %s", strerror(errno)); } - LOGD("Listener socket: %d", listenerSocket); + ALOGD("Listener socket: %d", listenerSocket); // Queue up to 16 connections. result = listen(listenerSocket, 16); diff --git a/libcutils/selector.c b/libcutils/selector.c index 9436393..9aef5fa 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); |