Mercurial > hg > truffle
annotate src/share/vm/memory/filemap.hpp @ 12301:2c022e432e10
8024974: Incorrect use of GC_locker::is_active()
Summary: SymbolTable and StringTable can make calls to GC_locker::is_active() outside a safepoint. This isn't safe because the GC_locker active state (lock count) is only updated at a safepoint and only remains valid as long as _needs_gc is true. However, outside a safepoint_needs_gc can change to false at any time, which makes it impossible to do a correct call to is_active() in that context. In this case these calls can just be removed since the input argument to basic_add() should never be on the heap and so there's no need to check the GC_locker state. This change also adjusts the assert() in is_active() to makes sure all calls to this function are always done under a safepoint.
Reviewed-by: brutisso, dcubed
Contributed-by: per.liden@oracle.com
| author | stefank |
|---|---|
| date | Fri, 20 Sep 2013 10:53:28 +0200 |
| parents | 740e263c80c6 |
| children | 85c1ca43713f |
| rev | line source |
|---|---|
| 0 | 1 /* |
|
12056
740e263c80c6
8003424: Enable Class Data Sharing for CompressedOops
hseigel
parents:
11056
diff
changeset
|
2 * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. |
| 0 | 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 * | |
|
1552
c18cbe5936b8
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
0
diff
changeset
|
19 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
|
c18cbe5936b8
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
0
diff
changeset
|
20 * or visit www.oracle.com if you need additional information or have any |
|
c18cbe5936b8
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
0
diff
changeset
|
21 * questions. |
| 0 | 22 * |
| 23 */ | |
| 24 | |
| 1972 | 25 #ifndef SHARE_VM_MEMORY_FILEMAP_HPP |
| 26 #define SHARE_VM_MEMORY_FILEMAP_HPP | |
| 27 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
28 #include "memory/metaspaceShared.hpp" |
| 1972 | 29 |
| 0 | 30 // Layout of the file: |
| 31 // header: dump of archive instance plus versioning info, datestamp, etc. | |
| 32 // [magic # = 0xF00BABA2] | |
| 33 // ... padding to align on page-boundary | |
| 34 // read-write space from CompactingPermGenGen | |
| 35 // read-only space from CompactingPermGenGen | |
| 36 // misc data (block offset table, string table, symbols, dictionary, etc.) | |
| 37 // tag(666) | |
| 38 | |
| 39 static const int JVM_SHARED_JARS_MAX = 128; | |
| 40 static const int JVM_SPACENAME_MAX = 128; | |
| 41 static const int JVM_IDENT_MAX = 256; | |
| 42 static const int JVM_ARCH_MAX = 12; | |
| 43 | |
| 44 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
45 class Metaspace; |
| 0 | 46 |
| 6197 | 47 class FileMapInfo : public CHeapObj<mtInternal> { |
| 0 | 48 private: |
| 49 enum { | |
| 50 _invalid_version = -1, | |
| 51 _current_version = 1 | |
| 52 }; | |
| 53 | |
| 54 bool _file_open; | |
| 55 int _fd; | |
| 56 long _file_offset; | |
| 57 | |
| 58 // FileMapHeader describes the shared space data in the file to be | |
| 59 // mapped. This structure gets written to a file. It is not a class, so | |
| 60 // that the compilers don't add any compiler-private data to it. | |
| 61 | |
| 62 struct FileMapHeader { | |
| 63 int _magic; // identify file type. | |
| 64 int _version; // (from enum, above.) | |
| 65 size_t _alignment; // how shared archive should be aligned | |
|
7461
561148896559
8005076: Creating a CDS archive with one alignment and running another causes a crash.
hseigel
parents:
6882
diff
changeset
|
66 int _obj_alignment; // value of ObjectAlignmentInBytes |
| 0 | 67 |
| 68 struct space_info { | |
| 69 int _file_offset; // sizeof(this) rounded to vm page size | |
| 70 char* _base; // copy-on-write base address | |
| 71 size_t _capacity; // for validity checking | |
| 72 size_t _used; // for setting space top on read | |
| 73 bool _read_only; // read only space? | |
| 74 bool _allow_exec; // executable code in space? | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
75 } _space[MetaspaceShared::n_regions]; |
| 0 | 76 |
| 77 // The following fields are all sanity checks for whether this archive | |
| 78 // will function correctly with this JVM and the bootclasspath it's | |
| 79 // invoked with. | |
| 80 char _arch[JVM_ARCH_MAX]; // architecture | |
| 81 char _jvm_ident[JVM_IDENT_MAX]; // identifier for jvm | |
| 82 int _num_jars; // Number of jars in bootclasspath | |
| 83 | |
| 84 // Per jar file data: timestamp, size. | |
| 85 | |
| 86 struct { | |
| 87 time_t _timestamp; // jar timestamp. | |
| 88 long _filesize; // jar file size. | |
| 89 } _jar[JVM_SHARED_JARS_MAX]; | |
| 90 } _header; | |
| 91 const char* _full_path; | |
| 92 | |
| 93 static FileMapInfo* _current_info; | |
| 94 | |
| 95 bool init_from_file(int fd); | |
| 96 void align_file_position(); | |
| 97 | |
| 98 public: | |
| 99 FileMapInfo() { | |
| 100 _file_offset = 0; | |
| 101 _file_open = false; | |
| 102 _header._version = _invalid_version; | |
| 103 } | |
| 104 | |
| 105 static int current_version() { return _current_version; } | |
| 106 void populate_header(size_t alignment); | |
| 107 bool validate(); | |
| 108 void invalidate(); | |
| 109 int version() { return _header._version; } | |
| 110 size_t alignment() { return _header._alignment; } | |
| 111 size_t space_capacity(int i) { return _header._space[i]._capacity; } | |
| 112 char* region_base(int i) { return _header._space[i]._base; } | |
| 113 struct FileMapHeader* header() { return &_header; } | |
| 114 | |
|
8720
fad90b102190
8008310: Some adjustments needed to minimal VM warnings and errors for unsupported command line options
jprovino
parents:
7461
diff
changeset
|
115 static void set_current_info(FileMapInfo* info) { |
|
fad90b102190
8008310: Some adjustments needed to minimal VM warnings and errors for unsupported command line options
jprovino
parents:
7461
diff
changeset
|
116 CDS_ONLY(_current_info = info;) |
|
fad90b102190
8008310: Some adjustments needed to minimal VM warnings and errors for unsupported command line options
jprovino
parents:
7461
diff
changeset
|
117 } |
|
fad90b102190
8008310: Some adjustments needed to minimal VM warnings and errors for unsupported command line options
jprovino
parents:
7461
diff
changeset
|
118 |
|
fad90b102190
8008310: Some adjustments needed to minimal VM warnings and errors for unsupported command line options
jprovino
parents:
7461
diff
changeset
|
119 static FileMapInfo* current_info() { |
|
fad90b102190
8008310: Some adjustments needed to minimal VM warnings and errors for unsupported command line options
jprovino
parents:
7461
diff
changeset
|
120 CDS_ONLY(return _current_info;) |
|
fad90b102190
8008310: Some adjustments needed to minimal VM warnings and errors for unsupported command line options
jprovino
parents:
7461
diff
changeset
|
121 NOT_CDS(return NULL;) |
|
fad90b102190
8008310: Some adjustments needed to minimal VM warnings and errors for unsupported command line options
jprovino
parents:
7461
diff
changeset
|
122 } |
|
fad90b102190
8008310: Some adjustments needed to minimal VM warnings and errors for unsupported command line options
jprovino
parents:
7461
diff
changeset
|
123 |
| 0 | 124 static void assert_mark(bool check); |
| 125 | |
| 126 // File manipulation. | |
|
8720
fad90b102190
8008310: Some adjustments needed to minimal VM warnings and errors for unsupported command line options
jprovino
parents:
7461
diff
changeset
|
127 bool initialize() NOT_CDS_RETURN_(false); |
| 0 | 128 bool open_for_read(); |
| 129 void open_for_write(); | |
| 130 void write_header(); | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
131 void write_space(int i, Metaspace* space, bool read_only); |
| 0 | 132 void write_region(int region, char* base, size_t size, |
| 133 size_t capacity, bool read_only, bool allow_exec); | |
| 134 void write_bytes(const void* buffer, int count); | |
| 135 void write_bytes_aligned(const void* buffer, int count); | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
136 char* map_region(int i); |
| 0 | 137 void unmap_region(int i); |
| 138 void close(); | |
| 139 bool is_open() { return _file_open; } | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
140 ReservedSpace reserve_shared_memory(); |
| 0 | 141 |
| 142 // JVM/TI RedefineClasses() support: | |
| 143 // Remap the shared readonly space to shared readwrite, private. | |
| 144 bool remap_shared_readonly_as_readwrite(); | |
| 145 | |
| 146 // Errors. | |
| 147 static void fail_stop(const char *msg, ...); | |
| 148 void fail_continue(const char *msg, ...); | |
| 149 | |
| 150 // Return true if given address is in the mapped shared space. | |
|
8720
fad90b102190
8008310: Some adjustments needed to minimal VM warnings and errors for unsupported command line options
jprovino
parents:
7461
diff
changeset
|
151 bool is_in_shared_space(const void* p) NOT_CDS_RETURN_(false); |
|
11056
221df7e37535
8016075: Win32 crash with CDS enabled and small heap size
iklam
parents:
8720
diff
changeset
|
152 void print_shared_spaces() NOT_CDS_RETURN; |
|
12056
740e263c80c6
8003424: Enable Class Data Sharing for CompressedOops
hseigel
parents:
11056
diff
changeset
|
153 |
|
740e263c80c6
8003424: Enable Class Data Sharing for CompressedOops
hseigel
parents:
11056
diff
changeset
|
154 static size_t shared_spaces_size() { |
|
740e263c80c6
8003424: Enable Class Data Sharing for CompressedOops
hseigel
parents:
11056
diff
changeset
|
155 return align_size_up(SharedReadOnlySize + SharedReadWriteSize + |
|
740e263c80c6
8003424: Enable Class Data Sharing for CompressedOops
hseigel
parents:
11056
diff
changeset
|
156 SharedMiscDataSize + SharedMiscCodeSize, |
|
740e263c80c6
8003424: Enable Class Data Sharing for CompressedOops
hseigel
parents:
11056
diff
changeset
|
157 os::vm_allocation_granularity()); |
|
740e263c80c6
8003424: Enable Class Data Sharing for CompressedOops
hseigel
parents:
11056
diff
changeset
|
158 } |
|
740e263c80c6
8003424: Enable Class Data Sharing for CompressedOops
hseigel
parents:
11056
diff
changeset
|
159 |
|
740e263c80c6
8003424: Enable Class Data Sharing for CompressedOops
hseigel
parents:
11056
diff
changeset
|
160 // Stop CDS sharing and unmap CDS regions. |
|
740e263c80c6
8003424: Enable Class Data Sharing for CompressedOops
hseigel
parents:
11056
diff
changeset
|
161 static void stop_sharing_and_unmap(const char* msg); |
| 0 | 162 }; |
| 1972 | 163 |
| 164 #endif // SHARE_VM_MEMORY_FILEMAP_HPP |