ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Remove ALOGD_IF_SLOW" into stage-aosp-master

Browse source 
am: 6665fd5991

Change-Id: I53083a698a510ac07faa55eb35979514217b3292
This commit is contained in:
Tom Cherry 2017-07-17 19:26:12 +00:00 • committed by android-build-merger
commit fb61b61986
3 changed files with 4 additions and 107 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
libutils/Android.bp
View file

@ -50,7 +50,6 @@ cc_library {
"CallStack.cpp", "CallStack.cpp",
"FileMap.cpp", "FileMap.cpp",
"JenkinsHash.cpp", "JenkinsHash.cpp",
"Log.cpp",
"NativeHandle.cpp", "NativeHandle.cpp",
"Printer.cpp", "Printer.cpp",
"PropertyMap.cpp", "PropertyMap.cpp",

37
libutils/Log.cpp
View file

@ -1,37 +0,0 @@
/*
* Copyright (C) 2012 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#define LOG_TAG "Log"
#include <utils/Log.h>
#include <utils/Timers.h>
namespace android {
LogIfSlow::LogIfSlow(
const char* tag, android_LogPriority priority, int timeoutMillis, const char* message)
: mTag(tag), mPriority(priority), mTimeoutMillis(timeoutMillis), mMessage(message),
mStart(systemTime(SYSTEM_TIME_BOOTTIME)) {
}
LogIfSlow::~LogIfSlow() {
int durationMillis = (int)nanoseconds_to_milliseconds(systemTime(SYSTEM_TIME_BOOTTIME) - mStart);
if (durationMillis > mTimeoutMillis) {
LOG_PRI(mPriority, mTag, "%s: %dms", mMessage, durationMillis);
}
}
} // namespace android

73
libutils/include/utils/Log.h
View file

@ -1,72 +1,7 @@
/* // DO NOT INCLUDE ANYTHING NEW IN THIS FILE.
* Copyright (C) 2005 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
// // <log/log.h> has replaced this file and all changes should go there instead.
// C/C++ logging functions. See the logging documentation for API details. // This path remains strictly to include that header as there are thousands of
// // references to <utils/Log.h> in the tree.
// We'd like these to be available from C code (in case we import some from
// somewhere), so this has a C interface.
//
// The output will be correct when the log file is shared between multiple
// threads and/or multiple processes so long as the operating system
// supports O_APPEND. These calls have mutex-protected data structures
// and so are NOT reentrant. Do not use LOG in a signal handler.
//
#ifndef _LIBS_UTILS_LOG_H
#define _LIBS_UTILS_LOG_H
#include <sys/types.h>
#include <log/log.h> #include <log/log.h>
#ifdef __cplusplus
namespace android {
/*
* A very simple utility that yells in the log when an operation takes too long.
*/
class LogIfSlow {
public:
LogIfSlow(const char* tag, android_LogPriority priority,
int timeoutMillis, const char* message);
~LogIfSlow();
private:
const char* const mTag;
const android_LogPriority mPriority;
const int mTimeoutMillis;
const char* const mMessage;
const int64_t mStart;
};
/*
* Writes the specified debug log message if this block takes longer than the
* specified number of milliseconds to run. Includes the time actually taken.
*
* {
* ALOGD_IF_SLOW(50, "Excessive delay doing something.");
* doSomething();
* }
*/
#define ALOGD_IF_SLOW(timeoutMillis, message) \
android::LogIfSlow _logIfSlow(LOG_TAG, ANDROID_LOG_DEBUG, timeoutMillis, message);
} // namespace android
#endif // __cplusplus
#endif // _LIBS_UTILS_LOG_H