Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9786ec41 authored by Steve Block's avatar Steve Block
Browse files

Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) 

Change-Id: Ia0476219b71ece949595515ee07ea072ed349d73
parent 66b68757

include/cutils/log.h

+16 −7
Original line number Diff line number Diff line
@@ -105,17 +105,23 @@ extern "C" { 
/*

 * Simplified macro to send a debug log message using the current LOG_TAG.

 */

#ifndef ALOGD

#define ALOGD(...) ((void)ALOG(LOG_DEBUG, LOG_TAG, __VA_ARGS__))

// Temporary measure for code still using old LOG macros.

#ifndef LOGD

#define LOGD(...) ((void)ALOG(LOG_DEBUG, LOG_TAG, __VA_ARGS__))

#define ALOGD LOGD

#define LOGD ALOGD

#endif

#endif



#ifndef LOGD_IF

#define LOGD_IF(cond, ...) \

#ifndef ALOGD_IF

#define ALOGD_IF(cond, ...) \

    ( (CONDITION(cond)) \

    ? ((void)ALOG(LOG_DEBUG, LOG_TAG, __VA_ARGS__)) \

    : (void)0 )

#define ALOGD_IF LOGD_IF

// Temporary measure for code still using old LOG macros.

#ifndef LOGD_IF

#define LOGD_IF ALOGD_IF

#endif

#endif



/*
@@ -188,9 +194,12 @@ extern "C" { 
 * Conditional based on whether the current LOG_TAG is enabled at

 * debug priority.

 */

#ifndef IF_ALOGD

#define IF_ALOGD() IF_ALOG(LOG_DEBUG, LOG_TAG)

// Temporary measure for code still using old LOG macros.

#ifndef IF_LOGD

#define IF_LOGD() IF_ALOG(LOG_DEBUG, LOG_TAG)

#define IF_ALOGD IF_LOGD

#define IF_LOGD IF_ALOGD

#endif

#endif



/*

libcutils/buffer.c

+3 −3
Original line number Diff line number Diff line
@@ -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;

    }

libcutils/loghack.h

+1 −1
Original line number Diff line number Diff line
@@ -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__)

libcutils/mq.c

+17 −17
Original line number Diff line number Diff line
@@ -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,7 +579,7 @@ 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);

    ALOGD("Expecting %d bytes.", header->size);



    peerProxy->inputState = READING_BYTES;

    if (bufferPrepareForRead(peerProxy->inputBuffer, header->size) == -1) {
@@ -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);

libcutils/selector.c

+7 −7
Original line number Diff line number Diff line
@@ -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)) {
@@ -202,7 +202,7 @@ static inline void maybeInvoke(SelectableFd* selectableFd, 
        void (*callback)(SelectableFd*), fd_set* fdSet) {

    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);