Wed, 01 Dec 2010 15:04:06 +0100
7003125: precompiled.hpp is included when precompiled headers are not used
Summary: Added an ifndef DONT_USE_PRECOMPILED_HEADER to precompiled.hpp. Set up DONT_USE_PRECOMPILED_HEADER when compiling with Sun Studio or when the user specifies USE_PRECOMPILED_HEADER=0. Fixed broken include dependencies.
Reviewed-by: coleenp, kvn
1 /*
2 * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4 *
5 * This code is free software; you can redistribute it and/or modify it
6 * under the terms of the GNU General Public License version 2 only, as
7 * published by the Free Software Foundation.
8 *
9 * This code is distributed in the hope that it will be useful, but WITHOUT
10 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
11 * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
12 * version 2 for more details (a copy is included in the LICENSE file that
13 * accompanied this code).
14 *
15 * You should have received a copy of the GNU General Public License version
16 * 2 along with this work; if not, write to the Free Software Foundation,
17 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
18 *
19 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
20 * or visit www.oracle.com if you need additional information or have any
21 * questions.
22 *
23 */
25 #ifndef SHARE_VM_MEMORY_ALLOCATION_INLINE_HPP
26 #define SHARE_VM_MEMORY_ALLOCATION_INLINE_HPP
28 #include "runtime/os.hpp"
30 // Explicit C-heap memory management
32 void trace_heap_malloc(size_t size, const char* name, void *p);
33 void trace_heap_free(void *p);
36 // allocate using malloc; will fail if no memory available
37 inline char* AllocateHeap(size_t size, const char* name = NULL) {
38 char* p = (char*) os::malloc(size);
39 #ifdef ASSERT
40 if (PrintMallocFree) trace_heap_malloc(size, name, p);
41 #else
42 Unused_Variable(name);
43 #endif
44 if (p == NULL) vm_exit_out_of_memory(size, name);
45 return p;
46 }
48 inline char* ReallocateHeap(char *old, size_t size, const char* name = NULL) {
49 char* p = (char*) os::realloc(old,size);
50 #ifdef ASSERT
51 if (PrintMallocFree) trace_heap_malloc(size, name, p);
52 #else
53 Unused_Variable(name);
54 #endif
55 if (p == NULL) vm_exit_out_of_memory(size, name);
56 return p;
57 }
59 inline void FreeHeap(void* p) {
60 #ifdef ASSERT
61 if (PrintMallocFree) trace_heap_free(p);
62 #endif
63 os::free(p);
64 }
66 #endif // SHARE_VM_MEMORY_ALLOCATION_INLINE_HPP