diff options
author | csilvers <csilvers@6b5cf1ce-ec42-a296-1ba9-69fdba395a50> | 2009-04-21 17:10:29 +0000 |
---|---|---|
committer | csilvers <csilvers@6b5cf1ce-ec42-a296-1ba9-69fdba395a50> | 2009-04-21 17:10:29 +0000 |
commit | a63235c4331445d718d151a2a659ec9687a0b8c8 (patch) | |
tree | 2f918b353f06253e68779e06a40f855de968bfb7 | |
parent | beb6a9a183c1ca25c99e4401b58266ce73b8c846 (diff) | |
download | gperftools-a63235c4331445d718d151a2a659ec9687a0b8c8.tar.gz |
1) Change #include "config.h" to <config.h>. This is what automake
recommends, and makes it easier to override a config file.
2) Rename OS_WINDOWS in sysinfo.cc, to not conflict with a macro
defined in a windows SDK somewhere.
git-svn-id: http://gperftools.googlecode.com/svn/trunk@70 6b5cf1ce-ec42-a296-1ba9-69fdba395a50
46 files changed, 57 insertions, 57 deletions
diff --git a/src/base/atomicops.h b/src/base/atomicops.h index dcab3e8..0f3d3ef 100644 --- a/src/base/atomicops.h +++ b/src/base/atomicops.h @@ -66,7 +66,7 @@ #ifndef THREAD_ATOMICOPS_H_ #define THREAD_ATOMICOPS_H_ -#include "config.h" +#include <config.h> #ifdef HAVE_STDINT_H #include <stdint.h> #endif diff --git a/src/base/basictypes.h b/src/base/basictypes.h index 9a55422..57a6d82 100644 --- a/src/base/basictypes.h +++ b/src/base/basictypes.h @@ -30,7 +30,7 @@ #ifndef _BASICTYPES_H_ #define _BASICTYPES_H_ -#include "config.h" +#include <config.h> #ifdef HAVE_INTTYPES_H #include <inttypes.h> // gets us PRId64, etc #endif diff --git a/src/base/commandlineflags.h b/src/base/commandlineflags.h index 741f0fe..54bf94f 100644 --- a/src/base/commandlineflags.h +++ b/src/base/commandlineflags.h @@ -48,7 +48,7 @@ #ifndef BASE_COMMANDLINEFLAGS_H_ #define BASE_COMMANDLINEFLAGS_H_ -#include "config.h" +#include <config.h> #include <string> #include <string.h> // for memchr #include <stdlib.h> // for getenv diff --git a/src/base/elfcore.h b/src/base/elfcore.h index a4e5f4e..34a96de 100644 --- a/src/base/elfcore.h +++ b/src/base/elfcore.h @@ -46,7 +46,7 @@ extern "C" { #include <stdarg.h> #include <stdint.h> #include <sys/types.h> -#include "config.h" +#include <config.h> /* Define the DUMPER symbol to make sure that there is exactly one diff --git a/src/base/logging.cc b/src/base/logging.cc index a68401c..4b97858 100644 --- a/src/base/logging.cc +++ b/src/base/logging.cc @@ -30,7 +30,7 @@ // --- // This file just provides storage for FLAGS_verbose. -#include "config.h" +#include <config.h> #include "base/logging.h" #include "base/commandlineflags.h" diff --git a/src/base/logging.h b/src/base/logging.h index bc1a4c2..0444740 100644 --- a/src/base/logging.h +++ b/src/base/logging.h @@ -35,7 +35,7 @@ #ifndef _LOGGING_H_ #define _LOGGING_H_ -#include "config.h" +#include <config.h> #include <stdarg.h> #include <stdlib.h> #include <stdio.h> diff --git a/src/base/low_level_alloc.h b/src/base/low_level_alloc.h index 6c8e751..18b8547 100644 --- a/src/base/low_level_alloc.h +++ b/src/base/low_level_alloc.h @@ -39,7 +39,7 @@ // sparingly, and only when malloc() would introduce an unwanted // dependency, such as inside the heap-checker. -#include "config.h" +#include <config.h> #include <stddef.h> // for size_t #include "base/basictypes.h" diff --git a/src/base/simple_mutex.h b/src/base/simple_mutex.h index 0eed34f..610e99c 100644 --- a/src/base/simple_mutex.h +++ b/src/base/simple_mutex.h @@ -91,7 +91,7 @@ #ifndef GOOGLE_MUTEX_H_ #define GOOGLE_MUTEX_H_ -#include "config.h" // to figure out pthreads support +#include <config.h> #if defined(NO_THREADS) typedef int MutexType; // to keep a lock-count diff --git a/src/base/spinlock.cc b/src/base/spinlock.cc index 3cce898..71ab646 100644 --- a/src/base/spinlock.cc +++ b/src/base/spinlock.cc @@ -31,7 +31,7 @@ * Author: Sanjay Ghemawat */ -#include "config.h" +#include <config.h> #include <time.h> /* For nanosleep() */ #include <sched.h> /* For sched_yield() */ #ifdef HAVE_UNISTD_H diff --git a/src/base/spinlock.h b/src/base/spinlock.h index f1a6d69..92b3287 100644 --- a/src/base/spinlock.h +++ b/src/base/spinlock.h @@ -43,7 +43,7 @@ #ifndef BASE_SPINLOCK_H_ #define BASE_SPINLOCK_H_ -#include "config.h" +#include <config.h> #include "base/basictypes.h" #include "base/atomicops.h" #include "base/dynamic_annotations.h" diff --git a/src/base/stl_allocator.h b/src/base/stl_allocator.h index 6f5eaba..b0ddc68 100644 --- a/src/base/stl_allocator.h +++ b/src/base/stl_allocator.h @@ -35,7 +35,7 @@ #ifndef BASE_STL_ALLOCATOR_H_ #define BASE_STL_ALLOCATOR_H_ -#include "config.h" +#include <config.h> #include <limits> diff --git a/src/base/sysinfo.cc b/src/base/sysinfo.cc index a6bd3a0..4c8f0c8 100644 --- a/src/base/sysinfo.cc +++ b/src/base/sysinfo.cc @@ -30,9 +30,9 @@ // --- // Author: Mike Burrows -#include "config.h" +#include <config.h> #if (defined(_WIN32) || defined(__MINGW32__)) && !defined(__CYGWIN__) && !defined(__CYGWIN32) -# define OS_WINDOWS 1 +# define PLATFORM_WINDOWS 1 #endif #include <stdlib.h> // for getenv() @@ -52,7 +52,7 @@ #include <sys/sysctl.h> #elif defined __sun__ // Solaris #include <procfs.h> // for, e.g., prmap_t -#elif defined(OS_WINDOWS) +#elif defined(PLATFORM_WINDOWS) #include <process.h> // for getpid() (actually, _getpid()) #include <shlwapi.h> // for SHGetValueA() #include <tlhelp32.h> // for Module32First() @@ -62,7 +62,7 @@ #include "base/logging.h" #include "base/cycleclock.h" -#ifdef OS_WINDOWS +#ifdef PLATFORM_WINDOWS #ifdef MODULEENTRY32 // In a change from the usual W-A pattern, there is no A variant of // MODULEENTRY32. Tlhelp32.h #defines the W variant, but not the A. @@ -79,7 +79,7 @@ #ifndef TH32CS_SNAPMODULE32 #define TH32CS_SNAPMODULE32 0 #endif /* TH32CS_SNAPMODULE32 */ -#endif /* OS_WINDOWS */ +#endif /* PLATFORM_WINDOWS */ // Re-run fn until it doesn't cause EINTR. #define NO_INTR(fn) do {} while ((fn) < 0 && errno == EINTR) @@ -181,7 +181,7 @@ static double cpuinfo_cycles_per_second = 1.0; // 0.0 might be dangerous static int cpuinfo_num_cpus = 1; // Conservative guess static void SleepForMilliseconds(int milliseconds) { -#ifdef OS_WINDOWS +#ifdef PLATFORM_WINDOWS _sleep(milliseconds); // Windows's _sleep takes milliseconds argument #else // Sleep for a few milliseconds @@ -338,7 +338,7 @@ static void InitializeSystemInfo() { } // TODO(csilvers): also figure out cpuinfo_num_cpus -#elif defined(OS_WINDOWS) +#elif defined(PLATFORM_WINDOWS) # pragma comment(lib, "shlwapi.lib") // for SHGetValue() // In NT, read MHz from the registry. If we fail to do so or we're in win9x // then make a crude estimate. @@ -414,7 +414,7 @@ bool HasPosixThreads() { if (confstr(_CS_GNU_LIBPTHREAD_VERSION, buf, sizeof(buf)) == 0) return false; return strncmp(buf, "NPTL", 4) == 0; -#elif defined(OS_WINDOWS) || defined(__CYGWIN__) || defined(__CYGWIN32__) +#elif defined(PLATFORM_WINDOWS) || defined(__CYGWIN__) || defined(__CYGWIN32__) return false; #else // other OS return true; // Assume that everything else has Posix @@ -496,7 +496,7 @@ void ProcMapsIterator::Init(pid_t pid, Buffer *buffer, #elif defined(__MACH__) current_image_ = _dyld_image_count(); // count down from the top current_load_cmd_ = -1; -#elif defined(OS_WINDOWS) +#elif defined(PLATFORM_WINDOWS) snapshot_ = CreateToolhelp32Snapshot(TH32CS_SNAPMODULE | TH32CS_SNAPMODULE32, GetCurrentProcessId()); @@ -508,7 +508,7 @@ void ProcMapsIterator::Init(pid_t pid, Buffer *buffer, } ProcMapsIterator::~ProcMapsIterator() { -#if defined(OS_WINDOWS) +#if defined(PLATFORM_WINDOWS) if (snapshot_ != INVALID_HANDLE_VALUE) CloseHandle(snapshot_); #elif defined(__MACH__) // no cleanup necessary! @@ -519,7 +519,7 @@ ProcMapsIterator::~ProcMapsIterator() { } bool ProcMapsIterator::Valid() const { -#if defined(OS_WINDOWS) +#if defined(PLATFORM_WINDOWS) return snapshot_ != INVALID_HANDLE_VALUE; #elif defined(__MACH__) return 1; @@ -744,7 +744,7 @@ bool ProcMapsIterator::NextExt(uint64 *start, uint64 *end, char **flags, // If we get here, no more load_cmd's in this image talk about // segments. Go on to the next image. } -#elif defined(OS_WINDOWS) +#elif defined(PLATFORM_WINDOWS) static char kDefaultPerms[5] = "r-xp"; BOOL ok; if (module_.dwSize == 0) { // only possible before first call diff --git a/src/base/sysinfo.h b/src/base/sysinfo.h index fb276eb..e332b91 100644 --- a/src/base/sysinfo.h +++ b/src/base/sysinfo.h @@ -36,7 +36,7 @@ #ifndef _SYSINFO_H_ #define _SYSINFO_H_ -#include "config.h" +#include <config.h> #include <time.h> #if (defined(_WIN32) || defined(__MINGW32__)) && (!defined(__CYGWIN__) && !defined(__CYGWIN32__)) diff --git a/src/base/vdso_support.h b/src/base/vdso_support.h index 228b177..9d0f369 100644 --- a/src/base/vdso_support.h +++ b/src/base/vdso_support.h @@ -55,7 +55,7 @@ #ifndef BASE_VDSO_SUPPORT_H_ #define BASE_VDSO_SUPPORT_H_ -#include "config.h" +#include <config.h> // Maybe one day we can rewrite this file not to require the elf // symbol extensions in glibc, but for right now we need them. diff --git a/src/heap-checker.cc b/src/heap-checker.cc index 4c446c1..1730783 100644 --- a/src/heap-checker.cc +++ b/src/heap-checker.cc @@ -33,7 +33,7 @@ // Author: Maxim Lifantsev // -#include "config.h" +#include <config.h> #include <fcntl.h> // for O_RDONLY (we use syscall to do actual reads) #include <string.h> diff --git a/src/heap-profile-table.cc b/src/heap-profile-table.cc index 4d0ad8b..08b7479 100644 --- a/src/heap-profile-table.cc +++ b/src/heap-profile-table.cc @@ -32,7 +32,7 @@ // Maxim Lifantsev (refactoring) // -#include "config.h" +#include <config.h> #ifdef HAVE_UNISTD_H #include <unistd.h> // for write() diff --git a/src/heap-profiler.cc b/src/heap-profiler.cc index 81176f7..9ab5d0c 100644 --- a/src/heap-profiler.cc +++ b/src/heap-profiler.cc @@ -32,7 +32,7 @@ // // TODO: Log large allocations -#include "config.h" +#include <config.h> #include <stdio.h> #include <stdlib.h> diff --git a/src/internal_logging.cc b/src/internal_logging.cc index 6bee8fb..ea8e56f 100644 --- a/src/internal_logging.cc +++ b/src/internal_logging.cc @@ -30,7 +30,7 @@ // --- // Sanjay Ghemawat <opensource@google.com> -#include "config.h" +#include <config.h> #include <stdio.h> #include <stdarg.h> #ifdef HAVE_UNISTD_H diff --git a/src/internal_logging.h b/src/internal_logging.h index b9b3e2a..0cb9ba2 100644 --- a/src/internal_logging.h +++ b/src/internal_logging.h @@ -35,7 +35,7 @@ #ifndef TCMALLOC_INTERNAL_LOGGING_H_ #define TCMALLOC_INTERNAL_LOGGING_H_ -#include "config.h" +#include <config.h> #include <stdlib.h> // for abort() #ifdef HAVE_UNISTD_H #include <unistd.h> // for write() diff --git a/src/malloc_extension.cc b/src/malloc_extension.cc index cd121d7..109c8b1 100644 --- a/src/malloc_extension.cc +++ b/src/malloc_extension.cc @@ -30,7 +30,7 @@ // --- // Author: Sanjay Ghemawat <opensource@google.com> -#include "config.h" +#include <config.h> #include <assert.h> #include <stdio.h> #include <string.h> diff --git a/src/malloc_hook.cc b/src/malloc_hook.cc index 92ca3c1..0e2ae98 100644 --- a/src/malloc_hook.cc +++ b/src/malloc_hook.cc @@ -30,7 +30,7 @@ // --- // Author: Sanjay Ghemawat <opensource@google.com> -#include "config.h" +#include <config.h> // Disable the glibc prototype of mremap(), as older versions of the // system headers define this function with only four arguments, diff --git a/src/memfs_malloc.cc b/src/memfs_malloc.cc index 21de3ee..f7fd8e9 100644 --- a/src/memfs_malloc.cc +++ b/src/memfs_malloc.cc @@ -37,7 +37,7 @@ #ifdef __linux -#include "config.h" +#include <config.h> #include <errno.h> #include <fcntl.h> #include <unistd.h> diff --git a/src/memory_region_map.cc b/src/memory_region_map.cc index 8794227..8782756 100644 --- a/src/memory_region_map.cc +++ b/src/memory_region_map.cc @@ -95,7 +95,7 @@ // ========================================================================= // -#include "config.h" +#include <config.h> #ifdef HAVE_UNISTD_H #include <unistd.h> diff --git a/src/memory_region_map.h b/src/memory_region_map.h index f616a52..1289764 100644 --- a/src/memory_region_map.h +++ b/src/memory_region_map.h @@ -34,7 +34,7 @@ #ifndef BASE_MEMORY_REGION_MAP_H_ #define BASE_MEMORY_REGION_MAP_H_ -#include "config.h" +#include <config.h> #ifdef HAVE_PTHREAD #include <pthread.h> diff --git a/src/page_heap.cc b/src/page_heap.cc index 8045833..cbb1cf7 100644 --- a/src/page_heap.cc +++ b/src/page_heap.cc @@ -30,7 +30,7 @@ // --- // Author: Sanjay Ghemawat <opensource@google.com> -#include "config.h" +#include <config.h> #include "page_heap.h" #include "static_vars.h" diff --git a/src/page_heap.h b/src/page_heap.h index d907953..f766ec7 100644 --- a/src/page_heap.h +++ b/src/page_heap.h @@ -33,7 +33,7 @@ #ifndef TCMALLOC_PAGE_HEAP_H_ #define TCMALLOC_PAGE_HEAP_H_ -#include "config.h" +#include <config.h> #include "common.h" #include "packed-cache-inl.h" #include "pagemap.h" diff --git a/src/profiledata.cc b/src/profiledata.cc index 873100e..5f2531b 100644 --- a/src/profiledata.cc +++ b/src/profiledata.cc @@ -33,7 +33,7 @@ // // Collect profiling data. -#include "config.h" +#include <config.h> #include <assert.h> #include <stdio.h> #include <stdlib.h> diff --git a/src/profiledata.h b/src/profiledata.h index 29bc1b7..da7ea9e 100644 --- a/src/profiledata.h +++ b/src/profiledata.h @@ -40,7 +40,7 @@ #ifndef BASE_PROFILEDATA_H_ #define BASE_PROFILEDATA_H_ -#include "config.h" +#include <config.h> #include <time.h> // for time_t #include <stdint.h> #include "base/basictypes.h" diff --git a/src/raw_printer.cc b/src/raw_printer.cc index 7e0cc17..019555a 100644 --- a/src/raw_printer.cc +++ b/src/raw_printer.cc @@ -30,7 +30,7 @@ // --- // Author: sanjay@google.com (Sanjay Ghemawat) -#include "config.h" +#include <config.h> #include <stdarg.h> #include <stdio.h> #include "raw_printer.h" diff --git a/src/raw_printer.h b/src/raw_printer.h index 08f324b..62340bb 100644 --- a/src/raw_printer.h +++ b/src/raw_printer.h @@ -42,7 +42,7 @@ #ifndef BASE_RAW_PRINTER_H_ #define BASE_RAW_PRINTER_H_ -#include "config.h" +#include <config.h> #include "base/basictypes.h" namespace base { diff --git a/src/span.cc b/src/span.cc index 72d36fe..ca0bab3 100644 --- a/src/span.cc +++ b/src/span.cc @@ -30,7 +30,7 @@ // --- // Author: Sanjay Ghemawat <opensource@google.com> -#include "config.h" +#include <config.h> #include "span.h" #ifdef HAVE_INTTYPES_H @@ -35,7 +35,7 @@ #ifndef TCMALLOC_SPAN_H_ #define TCMALLOC_SPAN_H_ -#include "config.h" +#include <config.h> #include "common.h" namespace tcmalloc { diff --git a/src/stack_trace_table.cc b/src/stack_trace_table.cc index 68e5d7b..6672af9 100644 --- a/src/stack_trace_table.cc +++ b/src/stack_trace_table.cc @@ -30,7 +30,7 @@ // --- // Author: Andrew Fikes -#include "config.h" +#include <config.h> #include "base/spinlock.h" #include "common.h" #include "static_vars.h" diff --git a/src/stack_trace_table.h b/src/stack_trace_table.h index d2b798e..799571a 100644 --- a/src/stack_trace_table.h +++ b/src/stack_trace_table.h @@ -35,7 +35,7 @@ #ifndef TCMALLOC_STACK_TRACE_TABLE_H_ #define TCMALLOC_STACK_TRACE_TABLE_H_ -#include "config.h" +#include <config.h> #include "common.h" namespace tcmalloc { diff --git a/src/stacktrace.cc b/src/stacktrace.cc index a9a41f3..d158eea 100644 --- a/src/stacktrace.cc +++ b/src/stacktrace.cc @@ -52,7 +52,7 @@ // correctly when GetStackTrace() is called with max_depth == 0. // Some code may do that. -#include "config.h" +#include <config.h> #include <google/stacktrace.h> #include "stacktrace_config.h" diff --git a/src/stacktrace_with_context.cc b/src/stacktrace_with_context.cc index f9fc28f..02f837d 100644 --- a/src/stacktrace_with_context.cc +++ b/src/stacktrace_with_context.cc @@ -41,7 +41,7 @@ // may inline this code anyway. Let's hope they respect // ATTRIBUTE_NOINLINE. -#include "config.h" +#include <config.h> #include <google/stacktrace.h> #include "stacktrace_config.h" #include "base/basictypes.h" diff --git a/src/static_vars.h b/src/static_vars.h index 31fc414..b21fe2b 100644 --- a/src/static_vars.h +++ b/src/static_vars.h @@ -35,7 +35,7 @@ #ifndef TCMALLOC_STATIC_VARS_H_ #define TCMALLOC_STATIC_VARS_H_ -#include "config.h" +#include <config.h> #include "base/spinlock.h" #include "central_freelist.h" #include "common.h" diff --git a/src/system-alloc.cc b/src/system-alloc.cc index ac32e9e..e4e313c 100644 --- a/src/system-alloc.cc +++ b/src/system-alloc.cc @@ -30,7 +30,7 @@ // --- // Author: Sanjay Ghemawat -#include "config.h" +#include <config.h> #if defined HAVE_STDINT_H #include <stdint.h> #elif defined HAVE_INTTYPES_H diff --git a/src/system-alloc.h b/src/system-alloc.h index 5b0fbb6..44b0333 100644 --- a/src/system-alloc.h +++ b/src/system-alloc.h @@ -36,7 +36,7 @@ #ifndef TCMALLOC_SYSTEM_ALLOC_H_ #define TCMALLOC_SYSTEM_ALLOC_H_ -#include "config.h" +#include <config.h> #include "internal_logging.h" // REQUIRES: "alignment" is a power of two or "0" to indicate default alignment diff --git a/src/tcmalloc.cc b/src/tcmalloc.cc index e5022e3..9dac1fa 100644 --- a/src/tcmalloc.cc +++ b/src/tcmalloc.cc @@ -86,7 +86,7 @@ // * allocation of a reasonably complicated struct // goes from about 1100 ns to about 300 ns. -#include "config.h" +#include <config.h> #include <new> #include <stdio.h> #include <stddef.h> diff --git a/src/tcmalloc.h b/src/tcmalloc.h index 32ac4de..3b0fe7c 100644 --- a/src/tcmalloc.h +++ b/src/tcmalloc.h @@ -34,7 +34,7 @@ // systems. In those cases, we'll just declare them ourselves. // This file is meant to be used only internally, for unittests. -#include "config.h" +#include <config.h> #ifndef _XOPEN_SOURCE # define _XOPEN_SOURCE 600 // for posix_memalign diff --git a/src/thread_cache.cc b/src/thread_cache.cc index a1fdf0f..05e002c 100644 --- a/src/thread_cache.cc +++ b/src/thread_cache.cc @@ -30,7 +30,7 @@ // --- // Author: Ken Ashcraft <opensource@google.com> -#include "config.h" +#include <config.h> #ifdef HAVE_INTTYPES_H #include <inttypes.h> #endif diff --git a/src/thread_cache.h b/src/thread_cache.h index 608fe33..e7ce0c4 100644 --- a/src/thread_cache.h +++ b/src/thread_cache.h @@ -33,7 +33,7 @@ #ifndef TCMALLOC_THREAD_CACHE_H_ #define TCMALLOC_THREAD_CACHE_H_ -#include "config.h" +#include <config.h> #ifdef HAVE_PTHREAD #include <pthread.h> #endif diff --git a/src/windows/override_functions.cc b/src/windows/override_functions.cc index 2ad6bbc..7926c1d 100644 --- a/src/windows/override_functions.cc +++ b/src/windows/override_functions.cc @@ -39,7 +39,7 @@ // See also // http://groups.google.com/group/google-perftools/browse_thread/thread/41cd3710af85e57b -#include "config.h" +#include <config.h> #ifndef _WIN32 # error You should only be including this file in a windows environment! diff --git a/src/windows/patch_functions.cc b/src/windows/patch_functions.cc index ff5acad..a282eb5 100644 --- a/src/windows/patch_functions.cc +++ b/src/windows/patch_functions.cc @@ -66,7 +66,7 @@ # error You should only be including windows/patch_functions.cc in a windows environment! #endif -#include "config.h" +#include <config.h> #ifdef WIN32_OVERRIDE_ALLOCATORS #error This file is intended for patching allocators - use override_functions.cc instead. diff --git a/src/windows/port.cc b/src/windows/port.cc index 0f1a700..5a5ad3b 100644 --- a/src/windows/port.cc +++ b/src/windows/port.cc @@ -35,7 +35,7 @@ # error You should only be including windows/port.cc in a windows environment! #endif -#include "config.h" +#include <config.h> #include <string.h> // for strlen(), memset(), memcmp() #include <assert.h> #include <stdarg.h> // for va_list, va_start, va_end |