summaryrefslogtreecommitdiffstats
path: root/libutils/include
diff options
context:
space:
mode:
authorTom Cherry <tomcherry@google.com>2017-07-10 14:36:53 -0700
committerTom Cherry <tomcherry@google.com>2017-07-14 19:51:57 +0000
commitb648daaa40779ad123ef7d5c062baef23a3abb61 (patch)
tree7e73891ba4e7837ce9ddabd584fa8f1af9016331 /libutils/include
parent3205cd6cc4f5cb19ffc63101ce1c60b84a975c95 (diff)
downloadsystem_core-b648daaa40779ad123ef7d5c062baef23a3abb61.tar.gz
system_core-b648daaa40779ad123ef7d5c062baef23a3abb61.tar.bz2
system_core-b648daaa40779ad123ef7d5c062baef23a3abb61.zip
Remove ALOGD_IF_SLOW
ALOGD_IF_SLOW isn't intuitively implemented as it cannot handle temporaries used as its parameters. Since there are so few users of it already and since it's just sugar on top of 2 otherwise trivial lines, we opt to remove it entirely. Bug: 62820330 Test: Build Change-Id: Ie91b40cdaf650154203ccf0ca70e029cc097b350
Diffstat (limited to 'libutils/include')
-rw-r--r--libutils/include/utils/Log.h73
1 files changed, 4 insertions, 69 deletions
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 @@
-/*
- * 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.
- */
+// DO NOT INCLUDE ANYTHING NEW IN THIS FILE.
-//
-// C/C++ logging functions. See the logging documentation for API details.
-//
-// 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>
+// <log/log.h> has replaced this file and all changes should go there instead.
+// This path remains strictly to include that header as there are thousands of
+// references to <utils/Log.h> in the tree.
#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