diff options
author | Elliott Hughes <enh@google.com> | 2012-12-12 18:34:25 -0800 |
---|---|---|
committer | Elliott Hughes <enh@google.com> | 2012-12-12 18:35:05 -0800 |
commit | 07ed66b5ae659c452cbe1ab20c3dbf1d6f546461 (patch) | |
tree | 2350745da33df6fcb9fb0c9059e55ea5d5ea8f67 | |
parent | 76b6167407c2b6f5d40ad895b2793a6b037f54b2 (diff) | |
download | art-07ed66b5ae659c452cbe1ab20c3dbf1d6f546461.zip art-07ed66b5ae659c452cbe1ab20c3dbf1d6f546461.tar.gz art-07ed66b5ae659c452cbe1ab20c3dbf1d6f546461.tar.bz2 |
Move logging.h into base/logging.h.
Change-Id: Id68f85f7c3a71b156cb40dec63f94d4fb827f279
92 files changed, 159 insertions, 152 deletions
diff --git a/build/Android.common.mk b/build/Android.common.mk index e008779..03d403f 100644 --- a/build/Android.common.mk +++ b/build/Android.common.mk @@ -130,6 +130,7 @@ OATEXEC_SRC_FILES := \ LIBART_COMMON_SRC_FILES := \ src/atomic.cc.arm \ + src/base/logging.cc \ src/base/mutex.cc \ src/base/unix_file/fd_file.cc \ src/base/unix_file/mapped_file.cc \ @@ -178,7 +179,6 @@ LIBART_COMMON_SRC_FILES := \ src/jni_internal.cc \ src/jobject_comparator.cc \ src/locks.cc \ - src/logging.cc \ src/mem_map.cc \ src/memory_region.cc \ src/monitor.cc \ @@ -270,8 +270,8 @@ LIBART_COMMON_SRC_FILES += \ LIBART_TARGET_SRC_FILES := \ $(LIBART_COMMON_SRC_FILES) \ + src/base/logging_android.cc \ src/jdwp/jdwp_adb.cc \ - src/logging_android.cc \ src/monitor_android.cc \ src/runtime_android.cc \ src/thread_android.cc @@ -315,7 +315,7 @@ endif # TARGET_ARCH != arm LIBART_HOST_SRC_FILES := \ $(LIBART_COMMON_SRC_FILES) \ - src/logging_linux.cc \ + src/base/logging_linux.cc \ src/monitor_linux.cc \ src/runtime_linux.cc \ src/thread_linux.cc diff --git a/src/logging.cc b/src/base/logging.cc index 6d0452b..6d0452b 100644 --- a/src/logging.cc +++ b/src/base/logging.cc diff --git a/src/logging.h b/src/base/logging.h index 55dc710..a08acab 100644 --- a/src/logging.h +++ b/src/base/logging.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_LOGGING_H_ -#define ART_SRC_LOGGING_H_ +#ifndef ART_SRC_BASE_LOGGING_H_ +#define ART_SRC_BASE_LOGGING_H_ #include <cerrno> #include <cstring> @@ -329,4 +329,4 @@ extern const char* ProgramInvocationShortName(); } // namespace art -#endif // ART_SRC_LOGGING_H_ +#endif // ART_SRC_BASE_LOGGING_H_ diff --git a/src/logging_android.cc b/src/base/logging_android.cc index 0acf5f9..0acf5f9 100644 --- a/src/logging_android.cc +++ b/src/base/logging_android.cc diff --git a/src/logging_linux.cc b/src/base/logging_linux.cc index 789c083..789c083 100644 --- a/src/logging_linux.cc +++ b/src/base/logging_linux.cc diff --git a/src/base/mutex.cc b/src/base/mutex.cc index 16811d3..a5d890a 100644 --- a/src/base/mutex.cc +++ b/src/base/mutex.cc @@ -19,9 +19,9 @@ #include <errno.h> #include <sys/time.h> +#include "base/logging.h" #include "cutils/atomic.h" #include "cutils/atomic-inline.h" -#include "logging.h" #include "runtime.h" #include "scoped_thread_state_change.h" #include "thread.h" diff --git a/src/base/mutex.h b/src/base/mutex.h index af7becf..5cc021f 100644 --- a/src/base/mutex.h +++ b/src/base/mutex.h @@ -23,10 +23,10 @@ #include <iosfwd> #include <string> +#include "base/logging.h" #include "base/macros.h" #include "globals.h" #include "locks.h" -#include "logging.h" #if defined(__APPLE__) #define ART_USE_FUTEXES 0 diff --git a/src/base/unix_file/fd_file.cc b/src/base/unix_file/fd_file.cc index 73130a3..7bb28a1 100644 --- a/src/base/unix_file/fd_file.cc +++ b/src/base/unix_file/fd_file.cc @@ -14,12 +14,12 @@ * limitations under the License. */ +#include "base/logging.h" #include "base/unix_file/fd_file.h" #include <errno.h> #include <sys/stat.h> #include <sys/types.h> #include <unistd.h> -#include "logging.h" namespace unix_file { diff --git a/src/base/unix_file/mapped_file.cc b/src/base/unix_file/mapped_file.cc index 84629b3..b63fdd3 100644 --- a/src/base/unix_file/mapped_file.cc +++ b/src/base/unix_file/mapped_file.cc @@ -14,6 +14,7 @@ * limitations under the License. */ +#include "base/logging.h" #include "base/unix_file/mapped_file.h" #include <fcntl.h> #include <sys/mman.h> @@ -22,7 +23,6 @@ #include <unistd.h> #include <algorithm> #include <string> -#include "logging.h" namespace unix_file { diff --git a/src/base/unix_file/mapped_file_test.cc b/src/base/unix_file/mapped_file_test.cc index f61ed3b..a3b097d 100644 --- a/src/base/unix_file/mapped_file_test.cc +++ b/src/base/unix_file/mapped_file_test.cc @@ -15,12 +15,12 @@ */ #include "base/unix_file/mapped_file.h" +#include "base/logging.h" #include "base/unix_file/fd_file.h" #include "base/unix_file/random_access_file_test.h" #include "base/unix_file/random_access_file_utils.h" #include "base/unix_file/string_file.h" #include "gtest/gtest.h" -#include "logging.h" namespace unix_file { diff --git a/src/base/unix_file/string_file.cc b/src/base/unix_file/string_file.cc index 5d47b17..ff0d0fa 100644 --- a/src/base/unix_file/string_file.cc +++ b/src/base/unix_file/string_file.cc @@ -17,7 +17,7 @@ #include "base/unix_file/string_file.h" #include <errno.h> #include <algorithm> -#include "logging.h" +#include "base/logging.h" namespace unix_file { diff --git a/src/check_jni.cc b/src/check_jni.cc index 7c5186a..026dfe6 100644 --- a/src/check_jni.cc +++ b/src/check_jni.cc @@ -19,8 +19,8 @@ #include <sys/mman.h> #include <zlib.h> +#include "base/logging.h" #include "class_linker.h" -#include "logging.h" #include "object_utils.h" #include "scoped_thread_state_change.h" #include "gc/space.h" diff --git a/src/class_linker.cc b/src/class_linker.cc index a81914e..626b1d9 100644 --- a/src/class_linker.cc +++ b/src/class_linker.cc @@ -27,6 +27,7 @@ #include <utility> #include <vector> +#include "base/logging.h" #include "base/unix_file/fd_file.h" #include "casts.h" #include "class_loader.h" @@ -37,7 +38,6 @@ #include "intern_table.h" #include "interpreter/interpreter.h" #include "leb128.h" -#include "logging.h" #include "oat_file.h" #include "object.h" #include "object_utils.h" diff --git a/src/common_test.cc b/src/common_test.cc index 55dbb2d..5df7d41 100644 --- a/src/common_test.cc +++ b/src/common_test.cc @@ -14,8 +14,8 @@ * limitations under the License. */ +#include "base/logging.h" #include "gtest/gtest.h" -#include "logging.h" int main(int argc, char **argv) { art::InitLogging(argv); diff --git a/src/common_throws.cc b/src/common_throws.cc index 84ce565..cefc4ab 100644 --- a/src/common_throws.cc +++ b/src/common_throws.cc @@ -16,9 +16,9 @@ #include "common_throws.h" +#include "base/logging.h" #include "dex_instruction.h" #include "invoke_type.h" -#include "logging.h" #include "object_utils.h" #include "thread.h" diff --git a/src/compiler/compiler_internals.h b/src/compiler/compiler_internals.h index 9ed3f8d..1379a3b 100644 --- a/src/compiler/compiler_internals.h +++ b/src/compiler/compiler_internals.h @@ -22,20 +22,19 @@ #include <stdint.h> #include <stdio.h> -#include "gc/card_table.h" +#include "base/logging.h" #include "class_linker.h" +#include "codegen/codegen.h" #include "compiler.h" +#include "compiler_ir.h" +#include "compiler_utility.h" #include "dex_cache.h" -#include "logging.h" +#include "frontend.h" +#include "gc/card_table.h" #include "monitor.h" #include "object.h" +#include "ralloc.h" #include "thread.h" #include "utils.h" -#include "frontend.h" -#include "ralloc.h" -#include "compiler_utility.h" -#include "compiler_ir.h" -#include "codegen/codegen.h" - #endif // ART_SRC_COMPILER_COMPILER_INTERNAL_H_ diff --git a/src/compiler_llvm/backend_types.h b/src/compiler_llvm/backend_types.h index ae226d6..14b8a66 100644 --- a/src/compiler_llvm/backend_types.h +++ b/src/compiler_llvm/backend_types.h @@ -17,7 +17,7 @@ #ifndef ART_SRC_COMPILER_LLVM_BACKEND_TYPES_H_ #define ART_SRC_COMPILER_LLVM_BACKEND_TYPES_H_ -#include "logging.h" +#include "base/logging.h" namespace art { diff --git a/src/compiler_llvm/compilation_unit.cc b/src/compiler_llvm/compilation_unit.cc index b482d00..596169b 100644 --- a/src/compiler_llvm/compilation_unit.cc +++ b/src/compiler_llvm/compilation_unit.cc @@ -16,11 +16,11 @@ #include "compilation_unit.h" +#include "base/logging.h" #include "compiled_method.h" #include "compiler_llvm.h" #include "instruction_set.h" #include "ir_builder.h" -#include "logging.h" #include "os.h" #include "runtime_support_builder_arm.h" diff --git a/src/compiler_llvm/compilation_unit.h b/src/compiler_llvm/compilation_unit.h index 5fb0c0c..591d4f0 100644 --- a/src/compiler_llvm/compilation_unit.h +++ b/src/compiler_llvm/compilation_unit.h @@ -17,13 +17,13 @@ #ifndef ART_SRC_COMPILER_LLVM_COMPILATION_UNIT_H_ #define ART_SRC_COMPILER_LLVM_COMPILATION_UNIT_H_ +#include "base/logging.h" #include "base/mutex.h" #include "globals.h" #if defined(ART_USE_DEXLANG_FRONTEND) # include "greenland/dex_lang.h" #endif #include "instruction_set.h" -#include "logging.h" #include "runtime_support_builder.h" #include "runtime_support_func.h" #include "safe_map.h" diff --git a/src/compiler_llvm/jni_compiler.cc b/src/compiler_llvm/jni_compiler.cc index 2a17320..da55d94 100644 --- a/src/compiler_llvm/jni_compiler.cc +++ b/src/compiler_llvm/jni_compiler.cc @@ -16,13 +16,13 @@ #include "jni_compiler.h" +#include "base/logging.h" #include "class_linker.h" #include "compilation_unit.h" #include "compiled_method.h" #include "compiler.h" #include "compiler_llvm.h" #include "ir_builder.h" -#include "logging.h" #include "oat_compilation_unit.h" #include "object.h" #include "runtime.h" diff --git a/src/compiler_llvm/method_compiler.cc b/src/compiler_llvm/method_compiler.cc index 68121de..d989728 100644 --- a/src/compiler_llvm/method_compiler.cc +++ b/src/compiler_llvm/method_compiler.cc @@ -17,12 +17,12 @@ #include "method_compiler.h" #include "backend_types.h" +#include "base/logging.h" #include "compilation_unit.h" #include "compiler.h" #include "dalvik_reg.h" #include "greenland/inferred_reg_category_map.h" #include "ir_builder.h" -#include "logging.h" #include "oat_compilation_unit.h" #include "object.h" #include "object_utils.h" diff --git a/src/compiler_llvm/procedure_linkage_table.cc b/src/compiler_llvm/procedure_linkage_table.cc index cb4a9ed..51d6cd2 100644 --- a/src/compiler_llvm/procedure_linkage_table.cc +++ b/src/compiler_llvm/procedure_linkage_table.cc @@ -16,10 +16,10 @@ #include "procedure_linkage_table.h" +#include "base/logging.h" #include "compiler_runtime_func_list.h" #include "globals.h" #include "instruction_set.h" -#include "logging.h" #include "runtime_support_func_list.h" #include "runtime_support_llvm.h" #include "utils_llvm.h" diff --git a/src/compiler_llvm/runtime_support_builder.h b/src/compiler_llvm/runtime_support_builder.h index 58f01f6..7c11702 100644 --- a/src/compiler_llvm/runtime_support_builder.h +++ b/src/compiler_llvm/runtime_support_builder.h @@ -18,7 +18,7 @@ #define ART_SRC_COMPILER_LLVM_RUNTIME_SUPPORT_BUILDER_H_ #include "backend_types.h" -#include "logging.h" +#include "base/logging.h" #include "runtime_support_func.h" #include <stdint.h> diff --git a/src/compiler_llvm/stub_compiler.cc b/src/compiler_llvm/stub_compiler.cc index 4571f58..d03400f 100644 --- a/src/compiler_llvm/stub_compiler.cc +++ b/src/compiler_llvm/stub_compiler.cc @@ -16,12 +16,12 @@ #include "stub_compiler.h" +#include "base/logging.h" #include "compilation_unit.h" #include "compiled_method.h" #include "compiler.h" #include "compiler_llvm.h" #include "ir_builder.h" -#include "logging.h" #include "object.h" #include "runtime_support_func.h" #include "utils_llvm.h" diff --git a/src/constants_arm.h b/src/constants_arm.h index 0a53480..022bc6e 100644 --- a/src/constants_arm.h +++ b/src/constants_arm.h @@ -18,10 +18,12 @@ #define ART_SRC_CONSTANTS_ARM_H_ #include <stdint.h> + #include <iosfwd> + +#include "base/logging.h" #include "casts.h" #include "globals.h" -#include "logging.h" namespace art { namespace arm { diff --git a/src/constants_mips.h b/src/constants_mips.h index a03a0c5..87a1355 100644 --- a/src/constants_mips.h +++ b/src/constants_mips.h @@ -18,9 +18,10 @@ #define ART_SRC_CONSTANTS_MIPS_H_ #include <iosfwd> + +#include "base/logging.h" #include "base/macros.h" #include "globals.h" -#include "logging.h" namespace art { namespace mips { diff --git a/src/constants_x86.h b/src/constants_x86.h index e1ddd9a..e48b281 100644 --- a/src/constants_x86.h +++ b/src/constants_x86.h @@ -18,9 +18,10 @@ #define ART_SRC_CONSTANTS_X86_H_ #include <iosfwd> + +#include "base/logging.h" #include "base/macros.h" #include "globals.h" -#include "logging.h" namespace art { namespace x86 { diff --git a/src/dex_cache.cc b/src/dex_cache.cc index adb889b..98fc932 100644 --- a/src/dex_cache.cc +++ b/src/dex_cache.cc @@ -14,11 +14,11 @@ * limitations under the License. */ +#include "base/logging.h" #include "class_linker.h" #include "dex_cache.h" #include "heap.h" #include "globals.h" -#include "logging.h" #include "object.h" namespace art { diff --git a/src/dex_file.cc b/src/dex_file.cc index 4ac80bc..83912b9 100644 --- a/src/dex_file.cc +++ b/src/dex_file.cc @@ -24,11 +24,11 @@ #include <sys/file.h> #include <sys/stat.h> +#include "base/logging.h" #include "class_linker.h" #include "dex_file_verifier.h" #include "globals.h" #include "leb128.h" -#include "logging.h" #include "object.h" #include "os.h" #include "safe_map.h" diff --git a/src/dex_file.h b/src/dex_file.h index 58a0b3f..194ce8a 100644 --- a/src/dex_file.h +++ b/src/dex_file.h @@ -20,10 +20,10 @@ #include <string> #include <vector> +#include "base/logging.h" #include "globals.h" #include "invoke_type.h" #include "jni.h" -#include "logging.h" #include "mem_map.h" #include "modifiers.h" #include "safe_map.h" diff --git a/src/dex_instruction.h b/src/dex_instruction.h index 658e756..3921212 100644 --- a/src/dex_instruction.h +++ b/src/dex_instruction.h @@ -17,9 +17,9 @@ #ifndef ART_SRC_DEX_INSTRUCTION_H_ #define ART_SRC_DEX_INSTRUCTION_H_ +#include "base/logging.h" #include "base/macros.h" #include "globals.h" -#include "logging.h" namespace art { diff --git a/src/disassembler.cc b/src/disassembler.cc index 8fe3dc7..0670835 100644 --- a/src/disassembler.cc +++ b/src/disassembler.cc @@ -18,10 +18,10 @@ #include <iostream> +#include "base/logging.h" #include "disassembler_arm.h" #include "disassembler_mips.h" #include "disassembler_x86.h" -#include "logging.h" namespace art { diff --git a/src/disassembler_arm.cc b/src/disassembler_arm.cc index 15480b9..c3bcc9f 100644 --- a/src/disassembler_arm.cc +++ b/src/disassembler_arm.cc @@ -18,7 +18,7 @@ #include <iostream> -#include "logging.h" +#include "base/logging.h" #include "stringprintf.h" #include "thread.h" diff --git a/src/disassembler_mips.cc b/src/disassembler_mips.cc index 0efcb0b..6f0cdd4 100644 --- a/src/disassembler_mips.cc +++ b/src/disassembler_mips.cc @@ -18,7 +18,7 @@ #include <iostream> -#include "logging.h" +#include "base/logging.h" #include "stringprintf.h" #include "thread.h" diff --git a/src/disassembler_x86.cc b/src/disassembler_x86.cc index bb187e1..8dbc7c1 100644 --- a/src/disassembler_x86.cc +++ b/src/disassembler_x86.cc @@ -18,7 +18,7 @@ #include <iostream> -#include "logging.h" +#include "base/logging.h" #include "stringprintf.h" #include "thread.h" diff --git a/src/dlmalloc.cc b/src/dlmalloc.cc index 89bd029..1d62d20 100644 --- a/src/dlmalloc.cc +++ b/src/dlmalloc.cc @@ -16,7 +16,7 @@ #include "dlmalloc.h" -#include "logging.h" +#include "base/logging.h" // ART specific morecore implementation defined in space.cc. #define MORECORE(x) art_heap_morecore(m, x) diff --git a/src/gc/atomic_stack.h b/src/gc/atomic_stack.h index 4a7920e..8de5e35 100644 --- a/src/gc/atomic_stack.h +++ b/src/gc/atomic_stack.h @@ -20,9 +20,9 @@ #include <string> #include "atomic_integer.h" +#include "base/logging.h" #include "base/macros.h" #include "UniquePtr.h" -#include "logging.h" #include "mem_map.h" #include "utils.h" diff --git a/src/gc/card_table.cc b/src/gc/card_table.cc index 1e978b5..f27777b 100644 --- a/src/gc/card_table.cc +++ b/src/gc/card_table.cc @@ -18,9 +18,9 @@ #include <dynamic_annotations.h> +#include "base/logging.h" #include "heap.h" #include "heap_bitmap.h" -#include "logging.h" #include "runtime.h" #include "space.h" #include "utils.h" diff --git a/src/gc/card_table.h b/src/gc/card_table.h index 5b38ae5..8f1bc92 100644 --- a/src/gc/card_table.h +++ b/src/gc/card_table.h @@ -17,8 +17,8 @@ #ifndef ART_SRC_GC_CARDTABLE_H_ #define ART_SRC_GC_CARDTABLE_H_ +#include "base/logging.h" #include "globals.h" -#include "logging.h" #include "mem_map.h" #include "space_bitmap.h" #include "UniquePtr.h" diff --git a/src/gc/large_object_space.cc b/src/gc/large_object_space.cc index a994479..0247e8d 100644 --- a/src/gc/large_object_space.cc +++ b/src/gc/large_object_space.cc @@ -14,11 +14,11 @@ * limitations under the License. */ +#include "base/logging.h" #include "large_object_space.h" #include "UniquePtr.h" #include "dlmalloc.h" #include "image.h" -#include "logging.h" #include "os.h" #include "space_bitmap.h" #include "stl_util.h" diff --git a/src/gc/mark_sweep.cc b/src/gc/mark_sweep.cc index f57d615..7c52c83 100644 --- a/src/gc/mark_sweep.cc +++ b/src/gc/mark_sweep.cc @@ -22,6 +22,7 @@ #include <vector> #include "barrier.h" +#include "base/logging.h" #include "base/macros.h" #include "card_table.h" #include "class_loader.h" @@ -31,7 +32,6 @@ #include "intern_table.h" #include "jni_internal.h" #include "large_object_space.h" -#include "logging.h" #include "monitor.h" #include "object.h" #include "runtime.h" diff --git a/src/gc/space.cc b/src/gc/space.cc index 27f78cc..bf25358 100644 --- a/src/gc/space.cc +++ b/src/gc/space.cc @@ -17,10 +17,10 @@ #include "space.h" #include "UniquePtr.h" +#include "base/logging.h" #include "base/unix_file/fd_file.h" #include "dlmalloc.h" #include "image.h" -#include "logging.h" #include "os.h" #include "space_bitmap.h" #include "stl_util.h" diff --git a/src/gc/space_bitmap.cc b/src/gc/space_bitmap.cc index 273ae4f..25fa672 100644 --- a/src/gc/space_bitmap.cc +++ b/src/gc/space_bitmap.cc @@ -16,7 +16,7 @@ #include "heap_bitmap.h" -#include "logging.h" +#include "base/logging.h" #include "UniquePtr.h" #include "utils.h" diff --git a/src/gc/space_bitmap.h b/src/gc/space_bitmap.h index 8bd75d5..dd2f47d 100644 --- a/src/gc/space_bitmap.h +++ b/src/gc/space_bitmap.h @@ -22,11 +22,11 @@ #include <stdint.h> #include <vector> +#include "base/logging.h" #include "cutils/atomic.h" #include "cutils/atomic-inline.h" #include "UniquePtr.h" #include "globals.h" -#include "logging.h" #include "mem_map.h" #include "utils.h" diff --git a/src/gc_map.h b/src/gc_map.h index 80810b0..8e4dbdb 100644 --- a/src/gc_map.h +++ b/src/gc_map.h @@ -17,10 +17,11 @@ #ifndef ART_SRC_GC_MAP_H_ #define ART_SRC_GC_MAP_H_ -#include "base/macros.h" -#include "logging.h" #include <stdint.h> +#include "base/logging.h" +#include "base/macros.h" + namespace art { // Lightweight wrapper for native PC offset to reference bit maps. diff --git a/src/greenland/backend_types.h b/src/greenland/backend_types.h index dcdd86d..6a4a473 100644 --- a/src/greenland/backend_types.h +++ b/src/greenland/backend_types.h @@ -17,7 +17,7 @@ #ifndef ART_SRC_GREENLAND_BACKEND_TYPES_H_ #define ART_SRC_GREENLAND_BACKEND_TYPES_H_ -#include "logging.h" +#include "base/logging.h" namespace art { namespace greenland { diff --git a/src/greenland/intrinsic_helper.h b/src/greenland/intrinsic_helper.h index 365d529..1fe8855 100644 --- a/src/greenland/intrinsic_helper.h +++ b/src/greenland/intrinsic_helper.h @@ -17,7 +17,7 @@ #ifndef ART_SRC_GREENLAND_INTRINSIC_HELPER_H_ #define ART_SRC_GREENLAND_INTRINSIC_HELPER_H_ -#include "logging.h" +#include "base/logging.h" #include <llvm/ADT/DenseMap.h> diff --git a/src/greenland/ir_builder.h b/src/greenland/ir_builder.h index ba8e5e1..ff98dba 100644 --- a/src/greenland/ir_builder.h +++ b/src/greenland/ir_builder.h @@ -20,7 +20,7 @@ #include "backend_types.h" #include "intrinsic_helper.h" -#include "logging.h" +#include "base/logging.h" #include <llvm/Support/IRBuilder.h> #include <llvm/Support/NoFolder.h> diff --git a/src/hprof/hprof.cc b/src/hprof/hprof.cc index 8838c29..8777986 100644 --- a/src/hprof/hprof.cc +++ b/src/hprof/hprof.cc @@ -37,12 +37,12 @@ #include <set> +#include "base/logging.h" #include "base/unix_file/fd_file.h" #include "class_linker.h" #include "debugger.h" #include "globals.h" #include "heap.h" -#include "logging.h" #include "object.h" #include "object_utils.h" #include "os.h" diff --git a/src/image_writer.cc b/src/image_writer.cc index 877d5de..186cb6c 100644 --- a/src/image_writer.cc +++ b/src/image_writer.cc @@ -20,6 +20,7 @@ #include <vector> +#include "base/logging.h" #include "base/unix_file/fd_file.h" #include "class_linker.h" #include "class_loader.h" @@ -32,7 +33,6 @@ #include "heap.h" #include "image.h" #include "intern_table.h" -#include "logging.h" #include "oat_file.h" #include "object.h" #include "object_utils.h" diff --git a/src/indirect_reference_table.h b/src/indirect_reference_table.h index 48bd35b..cd358e9 100644 --- a/src/indirect_reference_table.h +++ b/src/indirect_reference_table.h @@ -17,13 +17,14 @@ #ifndef ART_SRC_INDIRECT_REFERENCE_TABLE_H_ #define ART_SRC_INDIRECT_REFERENCE_TABLE_H_ -#include "heap.h" -#include "logging.h" +#include <stdint.h> #include <iosfwd> -#include <stdint.h> #include <string> +#include "base/logging.h" +#include "heap.h" + namespace art { class Object; diff --git a/src/interpreter/interpreter.cc b/src/interpreter/interpreter.cc index 636bb85..fd101fe 100644 --- a/src/interpreter/interpreter.cc +++ b/src/interpreter/interpreter.cc @@ -18,11 +18,11 @@ #include <math.h> +#include "base/logging.h" #include "common_throws.h" #include "debugger.h" #include "dex_instruction.h" #include "invoke_arg_array_builder.h" -#include "logging.h" #include "nth_caller_visitor.h" #include "object.h" #include "object_utils.h" diff --git a/src/jdwp/jdwp_adb.cc b/src/jdwp/jdwp_adb.cc index a1d0acf..5cf8f3f 100644 --- a/src/jdwp/jdwp_adb.cc +++ b/src/jdwp/jdwp_adb.cc @@ -14,17 +14,17 @@ * limitations under the License. */ -#include "logging.h" -#include "jdwp/jdwp_priv.h" -#include "jdwp/jdwp_handler.h" -#include "stringprintf.h" - #include <errno.h> #include <stdio.h> #include <sys/socket.h> #include <sys/un.h> #include <unistd.h> +#include "base/logging.h" +#include "jdwp/jdwp_handler.h" +#include "jdwp/jdwp_priv.h" +#include "stringprintf.h" + #ifdef HAVE_ANDROID_OS #include "cutils/sockets.h" #endif diff --git a/src/jdwp/jdwp_event.cc b/src/jdwp/jdwp_event.cc index de6a235..20d7cde 100644 --- a/src/jdwp/jdwp_event.cc +++ b/src/jdwp/jdwp_event.cc @@ -13,23 +13,22 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -/* - * Send events to the debugger. - */ -#include "debugger.h" -#include "jdwp/jdwp_priv.h" -#include "jdwp/jdwp_constants.h" -#include "jdwp/jdwp_handler.h" + #include "jdwp/jdwp_event.h" -#include "jdwp/jdwp_expand_buf.h" -#include "logging.h" -#include "stringprintf.h" +#include <stddef.h> /* for offsetof() */ #include <stdlib.h> #include <string.h> -#include <stddef.h> /* for offsetof() */ #include <unistd.h> +#include "base/logging.h" +#include "debugger.h" +#include "jdwp/jdwp_constants.h" +#include "jdwp/jdwp_expand_buf.h" +#include "jdwp/jdwp_handler.h" +#include "jdwp/jdwp_priv.h" +#include "stringprintf.h" + /* General notes: diff --git a/src/jdwp/jdwp_event.h b/src/jdwp/jdwp_event.h index b28aac9..a6eabb1 100644 --- a/src/jdwp/jdwp_event.h +++ b/src/jdwp/jdwp_event.h @@ -19,6 +19,7 @@ #ifndef ART_JDWP_JDWPEVENT_H_ #define ART_JDWP_JDWPEVENT_H_ +#include "jdwp/jdwp.h" #include "jdwp/jdwp_constants.h" #include "jdwp/jdwp_expand_buf.h" diff --git a/src/jdwp/jdwp_expand_buf.cc b/src/jdwp/jdwp_expand_buf.cc index 663afac..0a64f28 100644 --- a/src/jdwp/jdwp_expand_buf.cc +++ b/src/jdwp/jdwp_expand_buf.cc @@ -18,14 +18,15 @@ * primitive values, e.g. JDWP replies. */ -#include "jdwp/jdwp.h" -#include "jdwp/jdwp_bits.h" #include "jdwp/jdwp_expand_buf.h" -#include "logging.h" #include <stdlib.h> #include <string.h> +#include "base/logging.h" +#include "jdwp/jdwp.h" +#include "jdwp/jdwp_bits.h" + namespace art { namespace JDWP { diff --git a/src/jdwp/jdwp_expand_buf.h b/src/jdwp/jdwp_expand_buf.h index ba70920..820f62d 100644 --- a/src/jdwp/jdwp_expand_buf.h +++ b/src/jdwp/jdwp_expand_buf.h @@ -19,6 +19,8 @@ #ifndef ART_JDWP_EXPANDBUF_H_ #define ART_JDWP_EXPANDBUF_H_ +#include <string> + #include <stddef.h> #include <stdint.h> diff --git a/src/jdwp/jdwp_handler.cc b/src/jdwp/jdwp_handler.cc index 2a2bde2..c243ae2 100644 --- a/src/jdwp/jdwp_handler.cc +++ b/src/jdwp/jdwp_handler.cc @@ -25,21 +25,22 @@ * end of each function. Not needed at this time. */ +#include "jdwp/jdwp_handler.h" + +#include <stdlib.h> +#include <string.h> +#include <unistd.h> + #include "atomic.h" +#include "base/logging.h" #include "base/macros.h" #include "debugger.h" -#include "jdwp/jdwp_priv.h" -#include "jdwp/jdwp_handler.h" -#include "jdwp/jdwp_event.h" #include "jdwp/jdwp_constants.h" +#include "jdwp/jdwp_event.h" #include "jdwp/jdwp_expand_buf.h" -#include "logging.h" +#include "jdwp/jdwp_priv.h" #include "stringprintf.h" -#include <stdlib.h> -#include <string.h> -#include <unistd.h> - namespace art { namespace JDWP { diff --git a/src/jdwp/jdwp_main.cc b/src/jdwp/jdwp_main.cc index 33aadee..f4250e5 100644 --- a/src/jdwp/jdwp_main.cc +++ b/src/jdwp/jdwp_main.cc @@ -14,22 +14,18 @@ * limitations under the License. */ -/* - * JDWP initialization. - */ +#include <errno.h> +#include <stdlib.h> +#include <sys/time.h> +#include <time.h> +#include <unistd.h> #include "atomic.h" +#include "base/logging.h" #include "debugger.h" #include "jdwp/jdwp_priv.h" -#include "logging.h" #include "scoped_thread_state_change.h" -#include <stdlib.h> -#include <unistd.h> -#include <sys/time.h> -#include <time.h> -#include <errno.h> - namespace art { namespace JDWP { diff --git a/src/jdwp/jdwp_socket.cc b/src/jdwp/jdwp_socket.cc index 1cd610b..604ba83 100644 --- a/src/jdwp/jdwp_socket.cc +++ b/src/jdwp/jdwp_socket.cc @@ -13,25 +13,23 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -/* - * JDWP TCP socket network code. - */ -#include "jdwp/jdwp_priv.h" -#include "jdwp/jdwp_handler.h" -#include "logging.h" -#include "stringprintf.h" -#include <stdlib.h> -#include <unistd.h> -#include <stdio.h> -#include <string.h> +#include <arpa/inet.h> #include <errno.h> -#include <sys/types.h> -#include <sys/socket.h> +#include <netdb.h> #include <netinet/in.h> #include <netinet/tcp.h> -#include <arpa/inet.h> -#include <netdb.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <sys/socket.h> +#include <sys/types.h> +#include <unistd.h> + +#include "base/logging.h" +#include "jdwp/jdwp_handler.h" +#include "jdwp/jdwp_priv.h" +#include "stringprintf.h" #define kBasePort 8000 #define kMaxPort 8040 diff --git a/src/jni_internal.cc b/src/jni_internal.cc index 43532c2..db72a99 100644 --- a/src/jni_internal.cc +++ b/src/jni_internal.cc @@ -22,12 +22,12 @@ #include <utility> #include <vector> +#include "base/logging.h" #include "base/mutex.h" #include "class_linker.h" #include "class_loader.h" #include "invoke_arg_array_builder.h" #include "jni.h" -#include "logging.h" #include "object.h" #include "object_utils.h" #include "runtime.h" diff --git a/src/memory_region.cc b/src/memory_region.cc index 78cb91d..06eba0f 100644 --- a/src/memory_region.cc +++ b/src/memory_region.cc @@ -14,11 +14,13 @@ * limitations under the License. */ +#include "memory_region.h" + #include <stdint.h> #include <string.h> + +#include "base/logging.h" #include "globals.h" -#include "logging.h" -#include "memory_region.h" namespace art { diff --git a/src/memory_region.h b/src/memory_region.h index bd1ae87..cfbe42d 100644 --- a/src/memory_region.h +++ b/src/memory_region.h @@ -19,10 +19,9 @@ #include <stdint.h> +#include "base/logging.h" #include "base/macros.h" #include "globals.h" -#include "logging.h" -#include "memory_region.h" namespace art { diff --git a/src/native/dalvik_system_DexFile.cc b/src/native/dalvik_system_DexFile.cc index fca9bf7..a6a5c98 100644 --- a/src/native/dalvik_system_DexFile.cc +++ b/src/native/dalvik_system_DexFile.cc @@ -16,18 +16,18 @@ #include <unistd.h> +#include "base/logging.h" #include "class_linker.h" #include "class_loader.h" #include "dex_file.h" +#include "gc/space.h" #include "image.h" #include "jni_internal.h" -#include "logging.h" #include "os.h" #include "runtime.h" #include "scoped_thread_state_change.h" #include "ScopedLocalRef.h" #include "ScopedUtfChars.h" -#include "gc/space.h" #include "toStringArray.h" #include "zip_archive.h" diff --git a/src/native/org_apache_harmony_dalvik_ddmc_DdmServer.cc b/src/native/org_apache_harmony_dalvik_ddmc_DdmServer.cc index fe95746..d7cd18d 100644 --- a/src/native/org_apache_harmony_dalvik_ddmc_DdmServer.cc +++ b/src/native/org_apache_harmony_dalvik_ddmc_DdmServer.cc @@ -14,8 +14,8 @@ * limitations under the License. */ +#include "base/logging.h" #include "debugger.h" -#include "logging.h" #include "scoped_thread_state_change.h" #include "ScopedPrimitiveArray.h" diff --git a/src/native/org_apache_harmony_dalvik_ddmc_DdmVmInternal.cc b/src/native/org_apache_harmony_dalvik_ddmc_DdmVmInternal.cc index cbf6400..a6588b4 100644 --- a/src/native/org_apache_harmony_dalvik_ddmc_DdmVmInternal.cc +++ b/src/native/org_apache_harmony_dalvik_ddmc_DdmVmInternal.cc @@ -14,10 +14,10 @@ * limitations under the License. */ +#include "base/logging.h" #include "base/mutex.h" #include "debugger.h" #include "jni_internal.h" -#include "logging.h" #include "scoped_thread_state_change.h" #include "ScopedLocalRef.h" #include "ScopedPrimitiveArray.h" diff --git a/src/oat/jni/arm/calling_convention_arm.cc b/src/oat/jni/arm/calling_convention_arm.cc index e06a583..e9b09c5 100644 --- a/src/oat/jni/arm/calling_convention_arm.cc +++ b/src/oat/jni/arm/calling_convention_arm.cc @@ -14,8 +14,8 @@ * limitations under the License. */ +#include "base/logging.h" #include "calling_convention_arm.h" -#include "logging.h" #include "oat/utils/arm/managed_register_arm.h" namespace art { diff --git a/src/oat/jni/calling_convention.cc b/src/oat/jni/calling_convention.cc index 92d4f00..9356860 100644 --- a/src/oat/jni/calling_convention.cc +++ b/src/oat/jni/calling_convention.cc @@ -16,10 +16,10 @@ #include "calling_convention.h" +#include "base/logging.h" #include "oat/jni/arm/calling_convention_arm.h" #include "oat/jni/mips/calling_convention_mips.h" #include "oat/jni/x86/calling_convention_x86.h" -#include "logging.h" #include "utils.h" namespace art { diff --git a/src/oat/jni/jni_compiler.cc b/src/oat/jni/jni_compiler.cc index 5a2243e..ac35143 100644 --- a/src/oat/jni/jni_compiler.cc +++ b/src/oat/jni/jni_compiler.cc @@ -17,6 +17,7 @@ #include <algorithm> #include <vector> +#include "base/logging.h" #include "base/macros.h" #include "calling_convention.h" #include "class_linker.h" @@ -24,7 +25,6 @@ #include "compiler.h" #include "disassembler.h" #include "jni_internal.h" -#include "logging.h" #include "oat/runtime/oat_support_entrypoints.h" #include "oat/utils/assembler.h" #include "oat/utils/managed_register.h" diff --git a/src/oat/jni/mips/calling_convention_mips.cc b/src/oat/jni/mips/calling_convention_mips.cc index 606c05a..053ab44 100644 --- a/src/oat/jni/mips/calling_convention_mips.cc +++ b/src/oat/jni/mips/calling_convention_mips.cc @@ -15,7 +15,8 @@ */ #include "calling_convention_mips.h" -#include "logging.h" + +#include "base/logging.h" #include "oat/utils/mips/managed_register_mips.h" namespace art { diff --git a/src/oat/jni/x86/calling_convention_x86.cc b/src/oat/jni/x86/calling_convention_x86.cc index 90c050c..b671bd1 100644 --- a/src/oat/jni/x86/calling_convention_x86.cc +++ b/src/oat/jni/x86/calling_convention_x86.cc @@ -16,7 +16,7 @@ #include "calling_convention_x86.h" -#include "logging.h" +#include "base/logging.h" #include "oat/utils/x86/managed_register_x86.h" #include "utils.h" diff --git a/src/oat/utils/arm/assembler_arm.cc b/src/oat/utils/arm/assembler_arm.cc index 6241492..960a60d 100644 --- a/src/oat/utils/arm/assembler_arm.cc +++ b/src/oat/utils/arm/assembler_arm.cc @@ -16,7 +16,7 @@ #include "assembler_arm.h" -#include "logging.h" +#include "base/logging.h" #include "oat/runtime/oat_support_entrypoints.h" #include "offsets.h" #include "thread.h" diff --git a/src/oat/utils/arm/assembler_arm.h b/src/oat/utils/arm/assembler_arm.h index e7b980d..06e0a55 100644 --- a/src/oat/utils/arm/assembler_arm.h +++ b/src/oat/utils/arm/assembler_arm.h @@ -17,13 +17,14 @@ #ifndef ART_SRC_OAT_UTILS_ARM_ASSEMBLER_ARM_H_ #define ART_SRC_OAT_UTILS_ARM_ASSEMBLER_ARM_H_ +#include <vector> + +#include "base/logging.h" #include "constants_arm.h" -#include "logging.h" #include "oat/utils/arm/managed_register_arm.h" #include "oat/utils/assembler.h" #include "offsets.h" #include "utils.h" -#include <vector> namespace art { namespace arm { diff --git a/src/oat/utils/arm/managed_register_arm.h b/src/oat/utils/arm/managed_register_arm.h index e29af92..b069f6d 100644 --- a/src/oat/utils/arm/managed_register_arm.h +++ b/src/oat/utils/arm/managed_register_arm.h @@ -17,8 +17,8 @@ #ifndef ART_SRC_OAT_UTILS_ARM_MANAGED_REGISTER_ARM_H_ #define ART_SRC_OAT_UTILS_ARM_MANAGED_REGISTER_ARM_H_ +#include "base/logging.h" #include "constants_arm.h" -#include "logging.h" #include "oat/utils/managed_register.h" namespace art { diff --git a/src/oat/utils/assembler.h b/src/oat/utils/assembler.h index c05309a..cbf145b 100644 --- a/src/oat/utils/assembler.h +++ b/src/oat/utils/assembler.h @@ -19,12 +19,12 @@ #include <vector> +#include "base/logging.h" #include "base/macros.h" #include "constants_arm.h" #include "constants_mips.h" #include "constants_x86.h" #include "instruction_set.h" -#include "logging.h" #include "managed_register.h" #include "memory_region.h" #include "offsets.h" diff --git a/src/oatexec.cc b/src/oatexec.cc index 8908abb..ede4799 100644 --- a/src/oatexec.cc +++ b/src/oatexec.cc @@ -21,8 +21,8 @@ #include <cstring> #include <string> +#include "base/logging.h" #include "jni.h" -#include "logging.h" #include "object.h" #include "ScopedLocalRef.h" #include "toStringArray.h" diff --git a/src/object.cc b/src/object.cc index 210c42d..df42f8c 100644 --- a/src/object.cc +++ b/src/object.cc @@ -23,6 +23,7 @@ #include <string> #include <utility> +#include "base/logging.h" #include "class_linker.h" #include "class_loader.h" #include "dex_cache.h" @@ -31,7 +32,6 @@ #include "heap.h" #include "intern_table.h" #include "interpreter/interpreter.h" -#include "logging.h" #include "monitor.h" #include "object_utils.h" #include "runtime.h" diff --git a/src/object.h b/src/object.h index a3b808f..f577f0a 100644 --- a/src/object.h +++ b/src/object.h @@ -22,12 +22,12 @@ #include "UniquePtr.h" #include "atomic.h" +#include "base/logging.h" #include "base/macros.h" #include "casts.h" #include "globals.h" #include "heap.h" #include "invoke_type.h" -#include "logging.h" #include "modifiers.h" #include "offsets.h" #include "primitive.h" diff --git a/src/primitive.h b/src/primitive.h index d0caeca..cb78ccc 100644 --- a/src/primitive.h +++ b/src/primitive.h @@ -19,8 +19,8 @@ #include <sys/types.h> +#include "base/logging.h" #include "base/macros.h" -#include "logging.h" namespace art { diff --git a/src/runtime_linux.cc b/src/runtime_linux.cc index ee1e7c5..862a066 100644 --- a/src/runtime_linux.cc +++ b/src/runtime_linux.cc @@ -20,8 +20,8 @@ #include <string.h> #include <sys/utsname.h> +#include "base/logging.h" #include "base/mutex.h" -#include "logging.h" #include "stringprintf.h" #include "thread.h" #include "utils.h" diff --git a/src/safe_map.h b/src/safe_map.h index 4001aaf..b9a6ecf 100644 --- a/src/safe_map.h +++ b/src/safe_map.h @@ -19,7 +19,7 @@ #include <map> -#include "logging.h" +#include "base/logging.h" namespace art { diff --git a/src/signal_set.h b/src/signal_set.h index 030a2d1..d4aec86 100644 --- a/src/signal_set.h +++ b/src/signal_set.h @@ -19,7 +19,7 @@ #include <signal.h> -#include "logging.h" +#include "base/logging.h" namespace art { diff --git a/src/sirt_ref.h b/src/sirt_ref.h index 5e29214..12f8326 100644 --- a/src/sirt_ref.h +++ b/src/sirt_ref.h @@ -17,8 +17,8 @@ #ifndef ART_SRC_SIRT_REF_H_ #define ART_SRC_SIRT_REF_H_ +#include "base/logging.h" #include "base/macros.h" -#include "logging.h" #include "thread.h" namespace art { diff --git a/src/stack_indirect_reference_table.h b/src/stack_indirect_reference_table.h index a9d305a..92fb003 100644 --- a/src/stack_indirect_reference_table.h +++ b/src/stack_indirect_reference_table.h @@ -17,8 +17,8 @@ #ifndef ART_SRC_STACK_INDIRECT_REFERENCE_TABLE_H_ #define ART_SRC_STACK_INDIRECT_REFERENCE_TABLE_H_ +#include "base/logging.h" #include "base/macros.h" -#include "logging.h" namespace art { diff --git a/src/timing_logger.h b/src/timing_logger.h index 7b20563..b0a3e66 100644 --- a/src/timing_logger.h +++ b/src/timing_logger.h @@ -17,7 +17,7 @@ #ifndef ART_SRC_TIMING_LOGGER_H_ #define ART_SRC_TIMING_LOGGER_H_ -#include "logging.h" +#include "base/logging.h" #include "utils.h" #include <cmath> @@ -16,7 +16,7 @@ #include "utf.h" -#include "logging.h" +#include "base/logging.h" #include "object.h" namespace art { diff --git a/src/utils.h b/src/utils.h index b2b2de9..b73693c 100644 --- a/src/utils.h +++ b/src/utils.h @@ -17,8 +17,8 @@ #ifndef ART_SRC_UTILS_H_ #define ART_SRC_UTILS_H_ +#include "base/logging.h" #include "globals.h" -#include "logging.h" #include "primitive.h" #include "stringpiece.h" #include "stringprintf.h" diff --git a/src/verifier/dex_gc_map.cc b/src/verifier/dex_gc_map.cc index c1c9a29..cd0b137 100644 --- a/src/verifier/dex_gc_map.cc +++ b/src/verifier/dex_gc_map.cc @@ -16,7 +16,7 @@ #include "verifier/dex_gc_map.h" -#include "logging.h" +#include "base/logging.h" namespace art { namespace verifier { diff --git a/src/verifier/dex_gc_map.h b/src/verifier/dex_gc_map.h index 540dae8..673112b 100644 --- a/src/verifier/dex_gc_map.h +++ b/src/verifier/dex_gc_map.h @@ -17,10 +17,11 @@ #ifndef ART_SRC_VERIFIER_DEX_GC_MAP_H_ #define ART_SRC_VERIFIER_DEX_GC_MAP_H_ -#include "base/macros.h" -#include "logging.h" #include <stdint.h> +#include "base/logging.h" +#include "base/macros.h" + namespace art { namespace verifier { diff --git a/src/verifier/method_verifier.cc b/src/verifier/method_verifier.cc index b96989d..d98b9b9 100644 --- a/src/verifier/method_verifier.cc +++ b/src/verifier/method_verifier.cc @@ -18,6 +18,7 @@ #include <iostream> +#include "base/logging.h" #include "class_linker.h" #include "compiler.h" #include "dex_cache.h" @@ -28,7 +29,6 @@ #include "indenter.h" #include "intern_table.h" #include "leb128.h" -#include "logging.h" #include "object_utils.h" #include "runtime.h" #include "stringpiece.h" diff --git a/src/well_known_classes.cc b/src/well_known_classes.cc index 80edb52..afe6dcd 100644 --- a/src/well_known_classes.cc +++ b/src/well_known_classes.cc @@ -18,7 +18,7 @@ #include <stdlib.h> -#include "logging.h" +#include "base/logging.h" #include "ScopedLocalRef.h" #include "thread.h" diff --git a/src/zip_archive.h b/src/zip_archive.h index 65fbdb8..cee33da 100644 --- a/src/zip_archive.h +++ b/src/zip_archive.h @@ -20,9 +20,9 @@ #include <stdint.h> #include <zlib.h> +#include "base/logging.h" #include "base/unix_file/random_access_file.h" #include "globals.h" -#include "logging.h" #include "mem_map.h" #include "os.h" #include "safe_map.h" |