ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 6 Pull Requests Releases Wiki Activity

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

Browse Source 
* commit '36b48c30adf7236b00eccf87f3b5691359526540':
  Rename (IF_)LOG() to (IF_)ALOG()
This commit is contained in:
Jean-Baptiste Queru 2012-01-19 17:02:27 -08:00 committed by Android Git Automerger
commit 949cbfce8c
5 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/binder/CursorWindow.h
View File

@ -31,8 +31,8 @@
#else #else
#define IF_LOG_WINDOW() IF_LOG(LOG_DEBUG, "CursorWindow") #define IF_LOG_WINDOW() IF_ALOG(LOG_DEBUG, "CursorWindow")
#define LOG_WINDOW(...) LOG(LOG_DEBUG, "CursorWindow", __VA_ARGS__) #define LOG_WINDOW(...) ALOG(LOG_DEBUG, "CursorWindow", __VA_ARGS__)
#endif #endif

12
libs/binder/IPCThreadState.cpp
View File

@ -56,12 +56,12 @@
#else #else
#define IF_LOG_TRANSACTIONS() IF_LOG(LOG_VERBOSE, "transact") #define IF_LOG_TRANSACTIONS() IF_ALOG(LOG_VERBOSE, "transact")
#define IF_LOG_COMMANDS() IF_LOG(LOG_VERBOSE, "ipc") #define IF_LOG_COMMANDS() IF_ALOG(LOG_VERBOSE, "ipc")
#define LOG_REMOTEREFS(...) LOG(LOG_DEBUG, "remoterefs", __VA_ARGS__) #define LOG_REMOTEREFS(...) ALOG(LOG_DEBUG, "remoterefs", __VA_ARGS__)
#define IF_LOG_REMOTEREFS() IF_LOG(LOG_DEBUG, "remoterefs") #define IF_LOG_REMOTEREFS() IF_ALOG(LOG_DEBUG, "remoterefs")
#define LOG_THREADPOOL(...) LOG(LOG_DEBUG, "threadpool", __VA_ARGS__) #define LOG_THREADPOOL(...) ALOG(LOG_DEBUG, "threadpool", __VA_ARGS__)
#define LOG_ONEWAY(...) LOG(LOG_DEBUG, "ipc", __VA_ARGS__) #define LOG_ONEWAY(...) ALOG(LOG_DEBUG, "ipc", __VA_ARGS__)
#endif #endif

2
libs/binder/Parcel.cpp
View File

@ -44,7 +44,7 @@
#endif #endif
#define LOG_REFS(...) #define LOG_REFS(...)
//#define LOG_REFS(...) LOG(LOG_DEBUG, "Parcel", __VA_ARGS__) //#define LOG_REFS(...) ALOG(LOG_DEBUG, "Parcel", __VA_ARGS__)
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------

8
libs/utils/Threads.cpp
View File

@ -205,7 +205,7 @@ static __stdcall unsigned int threadIntermediary(void* vDetails)
delete pDetails; delete pDetails;
LOG(LOG_VERBOSE, "thread", "thread exiting\n"); ALOG(LOG_VERBOSE, "thread", "thread exiting\n");
return (unsigned int) result; return (unsigned int) result;
} }
@ -232,7 +232,7 @@ static bool doCreateThread(android_thread_func_t fn, void* arg, android_thread_i
if (hThread == NULL) if (hThread == NULL)
#endif #endif
{ {
LOG(LOG_WARN, "thread", "WARNING: thread create failed\n"); ALOG(LOG_WARN, "thread", "WARNING: thread create failed\n");
return false; return false;
} }
@ -470,7 +470,7 @@ status_t Mutex::lock()
void Mutex::unlock() void Mutex::unlock()
{ {
if (!ReleaseMutex((HANDLE) mState)) 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() status_t Mutex::tryLock()
@ -479,7 +479,7 @@ status_t Mutex::tryLock()
dwWaitResult = WaitForSingleObject((HANDLE) mState, 0); dwWaitResult = WaitForSingleObject((HANDLE) mState, 0);
if (dwWaitResult != WAIT_OBJECT_0 && dwWaitResult != WAIT_TIMEOUT) 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; return (dwWaitResult == WAIT_OBJECT_0) ? 0 : -1;
} }

2
libs/utils/Timers.cpp
View File

@ -113,7 +113,7 @@ long long DurationTimer::durationUsecs(void) const
/*static*/ void DurationTimer::addToTimeval(struct timeval* ptv, long usec) /*static*/ void DurationTimer::addToTimeval(struct timeval* ptv, long usec)
{ {
if (usec < 0) { if (usec < 0) {
LOG(LOG_WARN, "", "Negative values not supported in addToTimeval\n"); ALOG(LOG_WARN, "", "Negative values not supported in addToTimeval\n");
return; return;
} }