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

Commit 949cbfce authored by Jean-Baptiste Queru's avatar Jean-Baptiste Queru Committed by Android Git Automerger
Browse files

am 36b48c30: am c318bbb0: Merge "Rename (IF_)LOG() to (IF_)ALOG()" 

* commit '36b48c30adf7236b00eccf87f3b5691359526540':
  Rename (IF_)LOG() to (IF_)ALOG()
parents 135dcb7b 88c42cf1

include/binder/CursorWindow.h

+2 −2
Original line number Diff line number Diff line
@@ -31,8 +31,8 @@ 


#else



#define IF_LOG_WINDOW() IF_LOG(LOG_DEBUG, "CursorWindow")

#define LOG_WINDOW(...) LOG(LOG_DEBUG, "CursorWindow", __VA_ARGS__)

#define IF_LOG_WINDOW() IF_ALOG(LOG_DEBUG, "CursorWindow")

#define LOG_WINDOW(...) ALOG(LOG_DEBUG, "CursorWindow", __VA_ARGS__)



#endif

libs/binder/IPCThreadState.cpp

+6 −6
Original line number Diff line number Diff line
@@ -56,12 +56,12 @@ 


#else



#define IF_LOG_TRANSACTIONS() IF_LOG(LOG_VERBOSE, "transact")

#define IF_LOG_COMMANDS() IF_LOG(LOG_VERBOSE, "ipc")

#define LOG_REMOTEREFS(...) LOG(LOG_DEBUG, "remoterefs", __VA_ARGS__)

#define IF_LOG_REMOTEREFS() IF_LOG(LOG_DEBUG, "remoterefs")

#define LOG_THREADPOOL(...) LOG(LOG_DEBUG, "threadpool", __VA_ARGS__)

#define LOG_ONEWAY(...) LOG(LOG_DEBUG, "ipc", __VA_ARGS__)

#define IF_LOG_TRANSACTIONS() IF_ALOG(LOG_VERBOSE, "transact")

#define IF_LOG_COMMANDS() IF_ALOG(LOG_VERBOSE, "ipc")

#define LOG_REMOTEREFS(...) ALOG(LOG_DEBUG, "remoterefs", __VA_ARGS__)

#define IF_LOG_REMOTEREFS() IF_ALOG(LOG_DEBUG, "remoterefs")

#define LOG_THREADPOOL(...) ALOG(LOG_DEBUG, "threadpool", __VA_ARGS__)

#define LOG_ONEWAY(...) ALOG(LOG_DEBUG, "ipc", __VA_ARGS__)



#endif

libs/binder/Parcel.cpp

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ 
#endif



#define LOG_REFS(...)

//#define LOG_REFS(...) LOG(LOG_DEBUG, "Parcel", __VA_ARGS__)

//#define LOG_REFS(...) ALOG(LOG_DEBUG, "Parcel", __VA_ARGS__)



// ---------------------------------------------------------------------------

libs/utils/Threads.cpp

+4 −4
Original line number Diff line number Diff line
@@ -205,7 +205,7 @@ static __stdcall unsigned int threadIntermediary(void* vDetails) 


    delete pDetails;



    LOG(LOG_VERBOSE, "thread", "thread exiting\n");

    ALOG(LOG_VERBOSE, "thread", "thread exiting\n");

    return (unsigned int) result;

}
@@ -232,7 +232,7 @@ static bool doCreateThread(android_thread_func_t fn, void* arg, android_thread_i 
    if (hThread == NULL)

#endif

    {

        LOG(LOG_WARN, "thread", "WARNING: thread create failed\n");

        ALOG(LOG_WARN, "thread", "WARNING: thread create failed\n");

        return false;

    }
@@ -470,7 +470,7 @@ status_t Mutex::lock() 
void Mutex::unlock()

{

    if (!ReleaseMutex((HANDLE) mState))

        LOG(LOG_WARN, "thread", "WARNING: bad result from unlocking mutex\n");

        ALOG(LOG_WARN, "thread", "WARNING: bad result from unlocking mutex\n");

}



status_t Mutex::tryLock()
@@ -479,7 +479,7 @@ status_t Mutex::tryLock() 


    dwWaitResult = WaitForSingleObject((HANDLE) mState, 0);

    if (dwWaitResult != WAIT_OBJECT_0 && dwWaitResult != WAIT_TIMEOUT)

        LOG(LOG_WARN, "thread", "WARNING: bad result from try-locking mutex\n");

        ALOG(LOG_WARN, "thread", "WARNING: bad result from try-locking mutex\n");

    return (dwWaitResult == WAIT_OBJECT_0) ? 0 : -1;

}

libs/utils/Timers.cpp

+1 −1
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ long long DurationTimer::durationUsecs(void) const 
/*static*/ void DurationTimer::addToTimeval(struct timeval* ptv, long usec)

{

    if (usec < 0) {

        LOG(LOG_WARN, "", "Negative values not supported in addToTimeval\n");

        ALOG(LOG_WARN, "", "Negative values not supported in addToTimeval\n");

        return;

    }