Mercurial > hg > truffle
comparison src/share/vm/memory/allocation.inline.hpp @ 8883:b9a918201d47
Merge with hsx25
author | Gilles Duboscq <duboscq@ssw.jku.at> |
---|---|
date | Sat, 06 Apr 2013 20:04:06 +0200 |
parents | 63e54c37ac64 |
children | 83f27710f5f7 |
comparison
equal
deleted
inserted
replaced
8660:d47b52b0ff68 | 8883:b9a918201d47 |
---|---|
1 /* | 1 /* |
2 * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. | 2 * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. |
3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. | 3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
4 * | 4 * |
5 * This code is free software; you can redistribute it and/or modify it | 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 | 6 * under the terms of the GNU General Public License version 2 only, as |
7 * published by the Free Software Foundation. | 7 * published by the Free Software Foundation. |
23 */ | 23 */ |
24 | 24 |
25 #ifndef SHARE_VM_MEMORY_ALLOCATION_INLINE_HPP | 25 #ifndef SHARE_VM_MEMORY_ALLOCATION_INLINE_HPP |
26 #define SHARE_VM_MEMORY_ALLOCATION_INLINE_HPP | 26 #define SHARE_VM_MEMORY_ALLOCATION_INLINE_HPP |
27 | 27 |
28 #include "runtime/atomic.inline.hpp" | |
28 #include "runtime/os.hpp" | 29 #include "runtime/os.hpp" |
29 | 30 |
30 // Explicit C-heap memory management | 31 // Explicit C-heap memory management |
31 | 32 |
32 void trace_heap_malloc(size_t size, const char* name, void *p); | 33 void trace_heap_malloc(size_t size, const char* name, void *p); |