diff options
| author | Elliott Hughes <enh@google.com> | 2014-11-15 11:59:36 -0800 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2014-11-15 12:06:41 -0800 |
| commit | 50e2a5861bf6310427bb043956fa7b545da3b044 (patch) | |
| tree | ac1b0cc82987c0e266dcb2282d4ba9d973186184 /tools | |
| parent | 9013f53c778d11e7ba7a8bf745882a3e29fe938d (diff) | |
| download | android_dalvik-50e2a5861bf6310427bb043956fa7b545da3b044.tar.gz android_dalvik-50e2a5861bf6310427bb043956fa7b545da3b044.tar.bz2 android_dalvik-50e2a5861bf6310427bb043956fa7b545da3b044.zip | |
Clean up some dead dalvik cruft.
I don't know whether dmtracedump is still useful, so I'm assuming we should
keep it building. But at least now it's more obvious that it's the only user
of Profile.h.
Change-Id: Ieabce07cb278a19af72b566b08193db17d95e66d
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/dmtracedump/Android.mk | 2 | ||||
| -rw-r--r-- | tools/dmtracedump/Profile.h | 43 |
2 files changed, 43 insertions, 2 deletions
diff --git a/tools/dmtracedump/Android.mk b/tools/dmtracedump/Android.mk index 5d3146e9a..933f4e5d8 100644 --- a/tools/dmtracedump/Android.mk +++ b/tools/dmtracedump/Android.mk @@ -10,7 +10,6 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) LOCAL_SRC_FILES := TraceDump.c LOCAL_CFLAGS += -O0 -g -LOCAL_C_INCLUDES += dalvik/vm LOCAL_MODULE_TAGS := optional LOCAL_MODULE := dmtracedump include $(BUILD_HOST_EXECUTABLE) @@ -18,7 +17,6 @@ include $(BUILD_HOST_EXECUTABLE) include $(CLEAR_VARS) LOCAL_SRC_FILES := CreateTestTrace.c LOCAL_CFLAGS += -O0 -g -LOCAL_C_INCLUDES += dalvik/vm LOCAL_MODULE_TAGS := optional LOCAL_MODULE := create_test_dmtrace include $(BUILD_HOST_EXECUTABLE) diff --git a/tools/dmtracedump/Profile.h b/tools/dmtracedump/Profile.h new file mode 100644 index 000000000..efbedb35e --- /dev/null +++ b/tools/dmtracedump/Profile.h @@ -0,0 +1,43 @@ +/* + * Copyright (C) 2008 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. + */ + +/* + * Android's method call profiling goodies. + */ +#ifndef DALVIK_PROFILE_H_ +#define DALVIK_PROFILE_H_ + +/* + * Enumeration for the two "action" bits. + */ +enum { + METHOD_TRACE_ENTER = 0x00, // method entry + METHOD_TRACE_EXIT = 0x01, // method exit + METHOD_TRACE_UNROLL = 0x02, // method exited by exception unrolling + // 0x03 currently unused +}; + +#define TOKEN_CHAR '*' + +/* + * Common definitions, shared with the dump tool. + */ +#define METHOD_ACTION_MASK 0x03 /* two bits */ +#define METHOD_ID(_method) ((_method) & (~METHOD_ACTION_MASK)) +#define METHOD_ACTION(_method) (((unsigned int)(_method)) & METHOD_ACTION_MASK) +#define METHOD_COMBINE(_method, _action) ((_method) | (_action)) + +#endif // DALVIK_PROFILE_H_ |