diff options
| -rw-r--r-- | include/cutils/trace.h | 14 | ||||
| -rw-r--r-- | libcutils/Android.mk | 5 | ||||
| -rw-r--r-- | libcutils/trace-dev.c (renamed from libcutils/trace.c) | 0 | ||||
| -rw-r--r-- | libcutils/trace-host.c | 35 |
4 files changed, 38 insertions, 16 deletions
diff --git a/include/cutils/trace.h b/include/cutils/trace.h index 59ff6c1..9d039e6 100644 --- a/include/cutils/trace.h +++ b/include/cutils/trace.h @@ -80,7 +80,6 @@ __BEGIN_DECLS #error ATRACE_TAG must be defined to be one of the tags defined in cutils/trace.h #endif -#ifdef HAVE_ANDROID_OS /** * Opens the trace file for writing and reads the property for initial tags. * The atrace.tags.enableflags property sets the tags to trace. @@ -248,19 +247,6 @@ static inline void atrace_int64(uint64_t tag, const char* name, int64_t value) } } -#else // not HAVE_ANDROID_OS - -#define ATRACE_INIT() -#define ATRACE_GET_ENABLED_TAGS() -#define ATRACE_ENABLED() 0 -#define ATRACE_BEGIN(name) -#define ATRACE_END() -#define ATRACE_ASYNC_BEGIN(name, cookie) -#define ATRACE_ASYNC_END(name, cookie) -#define ATRACE_INT(name, value) - -#endif // not HAVE_ANDROID_OS - __END_DECLS #endif // _LIBS_CUTILS_TRACE_H diff --git a/libcutils/Android.mk b/libcutils/Android.mk index d890319..9f32307 100644 --- a/libcutils/Android.mk +++ b/libcutils/Android.mk @@ -59,7 +59,8 @@ ifneq ($(WINDOWS_HOST_ONLY),1) sockets.c \ commonHostSources += \ - ashmem-host.c + ashmem-host.c \ + trace-host.c endif @@ -116,7 +117,7 @@ LOCAL_SRC_FILES := $(commonSources) \ partition_utils.c \ properties.c \ qtaguid.c \ - trace.c \ + trace-dev.c \ uevent.c \ LOCAL_SRC_FILES_arm += \ diff --git a/libcutils/trace.c b/libcutils/trace-dev.c index 4396625..4396625 100644 --- a/libcutils/trace.c +++ b/libcutils/trace-dev.c diff --git a/libcutils/trace-host.c b/libcutils/trace-host.c new file mode 100644 index 0000000..b87e543 --- /dev/null +++ b/libcutils/trace-host.c @@ -0,0 +1,35 @@ +/* + * 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. + */ + +#include <cutils/trace.h> + +#ifndef __unused +#define __unused __attribute__((__unused__)) +#endif + +volatile int32_t atrace_is_ready = 1; +int atrace_marker_fd = -1; +uint64_t atrace_enabled_tags = 0; + +void atrace_set_debuggable(bool debuggable __unused) { } +void atrace_set_tracing_enabled(bool enabled __unused) { } +void atrace_update_tags() { } +void atrace_setup() { } +void atrace_begin_body(const char* name __unused) { } +void atrace_async_begin_body(const char* name __unused, int32_t cookie __unused) { } +void atrace_async_end_body(const char* name __unused, int32_t cookie __unused) { } +void atrace_int_body(const char* name __unused, int32_t value __unused) { } +void atrace_int64_body(const char* name __unused, int64_t value __unused) { } |