Print this page
rev 7148 : 8071501: perfMemory_solaris.cpp failing to compile with "Error: dd_fd is not a member of DIR."
Summary: Force all Solaris builds to use the same version of the DIR structure.
Reviewed-by: dcubed, dholmes, kvn
| Split |
Split |
Close |
| Expand all |
| Collapse all |
--- old/hotspot/src/share/vm/utilities/globalDefinitions_sparcWorks.hpp
+++ new/hotspot/src/share/vm/utilities/globalDefinitions_sparcWorks.hpp
1 1 /*
2 - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
2 + * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
3 3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4 4 *
5 5 * This code is free software; you can redistribute it and/or modify it
6 6 * under the terms of the GNU General Public License version 2 only, as
7 7 * published by the Free Software Foundation.
8 8 *
9 9 * This code is distributed in the hope that it will be useful, but WITHOUT
10 10 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
11 11 * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
12 12 * version 2 for more details (a copy is included in the LICENSE file that
13 13 * accompanied this code).
14 14 *
15 15 * You should have received a copy of the GNU General Public License version
16 16 * 2 along with this work; if not, write to the Free Software Foundation,
17 17 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
18 18 *
19 19 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
20 20 * or visit www.oracle.com if you need additional information or have any
21 21 * questions.
22 22 *
23 23 */
24 24
25 25 #ifndef SHARE_VM_UTILITIES_GLOBALDEFINITIONS_SPARCWORKS_HPP
|
↓ open down ↓ |
13 lines elided |
↑ open up ↑ |
26 26 #define SHARE_VM_UTILITIES_GLOBALDEFINITIONS_SPARCWORKS_HPP
27 27
28 28 #include "prims/jni.h"
29 29
30 30 // This file holds compiler-dependent includes,
31 31 // globally used constants & types, class (forward)
32 32 // declarations and a few frequently used utility functions.
33 33
34 34
35 35 # include <ctype.h>
36 +#define __USE_LEGACY_PROTOTYPES__
36 37 # include <dirent.h>
38 +#undef __USE_LEGACY_PROTOTYPES__
37 39 # include <string.h>
38 40 # include <strings.h> // for bsd'isms
39 41 # include <stdarg.h>
40 42 # include <stddef.h> // for offsetof
41 43 # include <stdio.h>
42 44 # include <stdlib.h>
43 45 # include <wchar.h>
44 46 # include <stdarg.h>
45 47 #ifdef SOLARIS
46 48 # include <ieeefp.h>
47 49 #endif
48 50 # include <math.h>
49 51 #ifdef LINUX
50 52 #ifndef FP_PZERO
51 53 // Linux doesn't have positive/negative zero
52 54 #define FP_PZERO FP_ZERO
53 55 #endif
54 56 #ifndef fpclass
55 57 #define fpclass fpclassify
56 58 #endif
57 59 #endif
58 60 # include <time.h>
59 61 # include <fcntl.h>
60 62 # include <dlfcn.h>
61 63 # include <pthread.h>
62 64 #ifdef SOLARIS
63 65 # include <thread.h>
64 66 #endif
65 67 # include <limits.h>
66 68 # include <errno.h>
67 69 #ifdef SOLARIS
68 70 # include <sys/trap.h>
69 71 # include <sys/regset.h>
70 72 # include <sys/procset.h>
71 73 # include <ucontext.h>
72 74 # include <setjmp.h>
73 75 #endif
74 76 # ifdef SOLARIS_MUTATOR_LIBTHREAD
75 77 # include <sys/procfs.h>
76 78 # endif
77 79
78 80 #include <inttypes.h>
79 81
80 82 // Solaris 8 doesn't provide definitions of these
81 83 #ifdef SOLARIS
82 84 #ifndef PRIdPTR
83 85 #if defined(_LP64)
84 86 #define PRIdPTR "ld"
85 87 #define PRIuPTR "lu"
86 88 #define PRIxPTR "lx"
87 89 #else
88 90 #define PRIdPTR "d"
89 91 #define PRIuPTR "u"
90 92 #define PRIxPTR "x"
91 93 #endif
92 94 #endif
93 95 #endif
94 96
95 97 #ifdef LINUX
96 98 # include <signal.h>
97 99 # include <ucontext.h>
98 100 # include <sys/time.h>
99 101 #endif
100 102
101 103
102 104 // 4810578: varargs unsafe on 32-bit integer/64-bit pointer architectures
103 105 // When __cplusplus is defined, NULL is defined as 0 (32-bit constant) in
104 106 // system header files. On 32-bit architectures, there is no problem.
105 107 // On 64-bit architectures, defining NULL as a 32-bit constant can cause
106 108 // problems with varargs functions: C++ integral promotion rules say for
107 109 // varargs, we pass the argument 0 as an int. So, if NULL was passed to a
108 110 // varargs function it will remain 32-bits. Depending on the calling
109 111 // convention of the machine, if the argument is passed on the stack then
110 112 // only 32-bits of the "NULL" pointer may be initialized to zero. The
111 113 // other 32-bits will be garbage. If the varargs function is expecting a
112 114 // pointer when it extracts the argument, then we have a problem.
113 115 //
114 116 // Solution: For 64-bit architectures, redefine NULL as 64-bit constant 0.
115 117 //
116 118 // Note: this fix doesn't work well on Linux because NULL will be overwritten
117 119 // whenever a system header file is included. Linux handles NULL correctly
118 120 // through a special type '__null'.
119 121 #ifdef SOLARIS
120 122 #ifdef _LP64
121 123 #undef NULL
122 124 #define NULL 0L
123 125 #else
124 126 #ifndef NULL
125 127 #define NULL 0
126 128 #endif
127 129 #endif
128 130 #endif
129 131
130 132 // NULL vs NULL_WORD:
131 133 // On Linux NULL is defined as a special type '__null'. Assigning __null to
132 134 // integer variable will cause gcc warning. Use NULL_WORD in places where a
133 135 // pointer is stored as integer value. On some platforms, sizeof(intptr_t) >
134 136 // sizeof(void*), so here we want something which is integer type, but has the
135 137 // same size as a pointer.
136 138 #ifdef LINUX
137 139 #ifdef _LP64
138 140 #define NULL_WORD 0L
139 141 #else
140 142 // Cast 0 to intptr_t rather than int32_t since they are not the same type
141 143 // on some platforms.
142 144 #define NULL_WORD ((intptr_t)0)
143 145 #endif
144 146 #else
145 147 #define NULL_WORD NULL
146 148 #endif
147 149
148 150 #ifndef LINUX
149 151 // Compiler-specific primitive types
150 152 typedef unsigned short uint16_t;
151 153 #ifndef _UINT32_T
152 154 #define _UINT32_T
153 155 typedef unsigned int uint32_t;
154 156 #endif
155 157 #if !defined(_SYS_INT_TYPES_H)
156 158 #ifndef _UINT64_T
157 159 #define _UINT64_T
158 160 typedef unsigned long long uint64_t;
159 161 #endif
160 162 // %%%% how to access definition of intptr_t portably in 5.5 onward?
161 163 typedef int intptr_t;
162 164 typedef unsigned int uintptr_t;
163 165 // If this gets an error, figure out a symbol XXX that implies the
164 166 // prior definition of intptr_t, and add "&& !defined(XXX)" above.
165 167 #endif
166 168 #endif
167 169
168 170 // On solaris 8, UINTPTR_MAX is defined as empty.
169 171 // Everywhere else it's an actual value.
170 172 #if UINTPTR_MAX - 1 == -1
171 173 #undef UINTPTR_MAX
172 174 #ifdef _LP64
173 175 #define UINTPTR_MAX UINT64_MAX
174 176 #else
175 177 #define UINTPTR_MAX UINT32_MAX
176 178 #endif /* ifdef _LP64 */
177 179 #endif
178 180
179 181 // Additional Java basic types
180 182
181 183 typedef unsigned char jubyte;
182 184 typedef unsigned short jushort;
183 185 typedef unsigned int juint;
184 186 typedef unsigned long long julong;
185 187
186 188
187 189 //----------------------------------------------------------------------------------------------------
188 190 // Constant for jlong (specifying an long long constant is C++ compiler specific)
189 191
190 192 // Build a 64bit integer constant
191 193 #define CONST64(x) (x ## LL)
192 194 #define UCONST64(x) (x ## ULL)
193 195
194 196 const jlong min_jlong = CONST64(0x8000000000000000);
195 197 const jlong max_jlong = CONST64(0x7fffffffffffffff);
196 198
197 199 #ifdef SOLARIS
198 200 //----------------------------------------------------------------------------------------------------
199 201 // ANSI C++ fixes
200 202 // NOTE:In the ANSI committee's continuing attempt to make each version
201 203 // of C++ incompatible with the previous version, you can no longer cast
202 204 // pointers to functions without specifying linkage unless you want to get
203 205 // warnings.
204 206 //
205 207 // This also means that pointers to functions can no longer be "hidden"
206 208 // in opaque types like void * because at the invokation point warnings
207 209 // will be generated. While this makes perfect sense from a type safety
208 210 // point of view it causes a lot of warnings on old code using C header
209 211 // files. Here are some typedefs to make the job of silencing warnings
210 212 // a bit easier.
211 213 //
212 214 // The final kick in the teeth is that you can only have extern "C" linkage
213 215 // specified at file scope. So these typedefs are here rather than in the
214 216 // .hpp for the class (os:Solaris usually) that needs them.
215 217
216 218 extern "C" {
217 219 typedef int (*int_fnP_thread_t_iP_uP_stack_tP_gregset_t)(thread_t, int*, unsigned *, stack_t*, gregset_t);
218 220 typedef int (*int_fnP_thread_t_i_gregset_t)(thread_t, int, gregset_t);
219 221 typedef int (*int_fnP_thread_t_i)(thread_t, int);
220 222 typedef int (*int_fnP_thread_t)(thread_t);
221 223
222 224 typedef int (*int_fnP_cond_tP_mutex_tP_timestruc_tP)(cond_t *cv, mutex_t *mx, timestruc_t *abst);
223 225 typedef int (*int_fnP_cond_tP_mutex_tP)(cond_t *cv, mutex_t *mx);
224 226
225 227 // typedef for missing API in libc
226 228 typedef int (*int_fnP_mutex_tP_i_vP)(mutex_t *, int, void *);
227 229 typedef int (*int_fnP_mutex_tP)(mutex_t *);
228 230 typedef int (*int_fnP_cond_tP_i_vP)(cond_t *cv, int scope, void *arg);
229 231 typedef int (*int_fnP_cond_tP)(cond_t *cv);
230 232 };
231 233 #endif
232 234
233 235 //----------------------------------------------------------------------------------------------------
234 236 // Debugging
235 237
236 238 #define DEBUG_EXCEPTION ::abort();
237 239
238 240 extern "C" void breakpoint();
239 241 #define BREAKPOINT ::breakpoint()
240 242
241 243 // checking for nanness
242 244 #ifdef SOLARIS
243 245 #ifdef SPARC
244 246 inline int g_isnan(float f) { return isnanf(f); }
245 247 #else
246 248 // isnanf() broken on Intel Solaris use isnand()
247 249 inline int g_isnan(float f) { return isnand(f); }
248 250 #endif
249 251
250 252 inline int g_isnan(double f) { return isnand(f); }
251 253 #elif LINUX
252 254 inline int g_isnan(float f) { return isnanf(f); }
253 255 inline int g_isnan(double f) { return isnan(f); }
254 256 #else
255 257 #error "missing platform-specific definition here"
256 258 #endif
257 259
258 260 // Checking for finiteness
259 261
260 262 inline int g_isfinite(jfloat f) { return finite(f); }
261 263 inline int g_isfinite(jdouble f) { return finite(f); }
262 264
263 265
264 266 // Wide characters
265 267
266 268 inline int wcslen(const jchar* x) { return wcslen((const wchar_t*)x); }
267 269
268 270
269 271 // Misc
270 272 // NOTE: This one leads to an infinite recursion on Linux
271 273 #ifndef LINUX
272 274 int local_vsnprintf(char* buf, size_t count, const char* fmt, va_list argptr);
273 275 #define vsnprintf local_vsnprintf
274 276 #endif
275 277
276 278 // Portability macros
277 279 #define PRAGMA_INTERFACE
278 280 #define PRAGMA_IMPLEMENTATION
279 281 #define PRAGMA_IMPLEMENTATION_(arg)
280 282 #define VALUE_OBJ_CLASS_SPEC : public _ValueObj
281 283
282 284 // Formatting.
283 285 #ifdef _LP64
284 286 #define FORMAT64_MODIFIER "l"
285 287 #else // !_LP64
286 288 #define FORMAT64_MODIFIER "ll"
287 289 #endif // _LP64
288 290
289 291 #define offset_of(klass,field) offsetof(klass,field)
290 292
291 293 #endif // SHARE_VM_UTILITIES_GLOBALDEFINITIONS_SPARCWORKS_HPP
|
↓ open down ↓ |
245 lines elided |
↑ open up ↑ |
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX