summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Cherry2017-07-18 12:20:39 -0500
committerGerrit Code Review2017-07-18 12:20:39 -0500
commitd13547347fb77433887be0cc6cabbcc0e9fcf63f (patch)
tree79442de81164c6f08e803cf7ede7d293a911f650
parent11649e8925a4f6b0876852c812d7adfc0f502c50 (diff)
parent08678e1f8bfe6a994929e055ddc76d196673a22e (diff)
downloadplatform-system-core-d13547347fb77433887be0cc6cabbcc0e9fcf63f.tar.gz
platform-system-core-d13547347fb77433887be0cc6cabbcc0e9fcf63f.tar.xz
platform-system-core-d13547347fb77433887be0cc6cabbcc0e9fcf63f.zip
Merge "Remove ALOGD_IF_SLOW"android-o-preview-4
-rw-r--r--libutils/Android.bp1
-rw-r--r--libutils/Log.cpp37
-rw-r--r--libutils/include/utils/Log.h73
3 files changed, 4 insertions, 107 deletions
diff --git a/libutils/Android.bp b/libutils/Android.bp
index 0125eacca..fbfb7c2a8 100644
--- a/libutils/Android.bp
+++ b/libutils/Android.bp
@@ -53,7 +53,6 @@ cc_library {
53 "FileMap.cpp", 53 "FileMap.cpp",
54 "JenkinsHash.cpp", 54 "JenkinsHash.cpp",
55 "LinearTransform.cpp", 55 "LinearTransform.cpp",
56 "Log.cpp",
57 "NativeHandle.cpp", 56 "NativeHandle.cpp",
58 "Printer.cpp", 57 "Printer.cpp",
59 "PropertyMap.cpp", 58 "PropertyMap.cpp",
diff --git a/libutils/Log.cpp b/libutils/Log.cpp
deleted file mode 100644
index bffb56eda..000000000
--- a/libutils/Log.cpp
+++ /dev/null
@@ -1,37 +0,0 @@
1/*
2 * Copyright (C) 2012 The Android Open Source Project
3 *
4 * Licensed under the Apache License, Version 2.0 (the "License");
5 * you may not use this file except in compliance with the License.
6 * You may obtain a copy of the License at
7 *
8 * http://www.apache.org/licenses/LICENSE-2.0
9 *
10 * Unless required by applicable law or agreed to in writing, software
11 * distributed under the License is distributed on an "AS IS" BASIS,
12 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13 * See the License for the specific language governing permissions and
14 * limitations under the License.
15 */
16
17#define LOG_TAG "Log"
18
19#include <utils/Log.h>
20#include <utils/Timers.h>
21
22namespace android {
23
24LogIfSlow::LogIfSlow(const char* tag, android_LogPriority priority,
25 int timeoutMillis, const char* message) :
26 mTag(tag), mPriority(priority), mTimeoutMillis(timeoutMillis), mMessage(message),
27 mStart(systemTime(SYSTEM_TIME_BOOTTIME)) {
28}
29
30LogIfSlow::~LogIfSlow() {
31 int durationMillis = nanoseconds_to_milliseconds(systemTime(SYSTEM_TIME_BOOTTIME) - mStart);
32 if (durationMillis > mTimeoutMillis) {
33 LOG_PRI(mPriority, mTag, "%s: %dms", mMessage, durationMillis);
34 }
35}
36
37} // namespace android
diff --git a/libutils/include/utils/Log.h b/libutils/include/utils/Log.h
index 5276a498d..42e03e7c4 100644
--- a/libutils/include/utils/Log.h
+++ b/libutils/include/utils/Log.h
@@ -1,72 +1,7 @@
1/* 1// DO NOT INCLUDE ANYTHING NEW IN THIS FILE.
2 * Copyright (C) 2005 The Android Open Source Project
3 *
4 * Licensed under the Apache License, Version 2.0 (the "License");
5 * you may not use this file except in compliance with the License.
6 * You may obtain a copy of the License at
7 *
8 * http://www.apache.org/licenses/LICENSE-2.0
9 *
10 * Unless required by applicable law or agreed to in writing, software
11 * distributed under the License is distributed on an "AS IS" BASIS,
12 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13 * See the License for the specific language governing permissions and
14 * limitations under the License.
15 */
16 2
17// 3// <log/log.h> has replaced this file and all changes should go there instead.
18// C/C++ logging functions. See the logging documentation for API details. 4// This path remains strictly to include that header as there are thousands of
19// 5// references to <utils/Log.h> in the tree.
20// We'd like these to be available from C code (in case we import some from
21// somewhere), so this has a C interface.
22//
23// The output will be correct when the log file is shared between multiple
24// threads and/or multiple processes so long as the operating system
25// supports O_APPEND. These calls have mutex-protected data structures
26// and so are NOT reentrant. Do not use LOG in a signal handler.
27//
28#ifndef _LIBS_UTILS_LOG_H
29#define _LIBS_UTILS_LOG_H
30
31#include <sys/types.h>
32 6
33#include <log/log.h> 7#include <log/log.h>
34
35#ifdef __cplusplus
36
37namespace android {
38
39/*
40 * A very simple utility that yells in the log when an operation takes too long.
41 */
42class LogIfSlow {
43public:
44 LogIfSlow(const char* tag, android_LogPriority priority,
45 int timeoutMillis, const char* message);
46 ~LogIfSlow();
47
48private:
49 const char* const mTag;
50 const android_LogPriority mPriority;
51 const int mTimeoutMillis;
52 const char* const mMessage;
53 const int64_t mStart;
54};
55
56/*
57 * Writes the specified debug log message if this block takes longer than the
58 * specified number of milliseconds to run. Includes the time actually taken.
59 *
60 * {
61 * ALOGD_IF_SLOW(50, "Excessive delay doing something.");
62 * doSomething();
63 * }
64 */
65#define ALOGD_IF_SLOW(timeoutMillis, message) \
66 android::LogIfSlow _logIfSlow(LOG_TAG, ANDROID_LOG_DEBUG, timeoutMillis, message);
67
68} // namespace android
69
70#endif // __cplusplus
71
72#endif // _LIBS_UTILS_LOG_H