--- a/hotspot/make/hotspot_version Sat Feb 23 17:40:33 2013 -0800
+++ b/hotspot/make/hotspot_version Tue Feb 26 08:58:20 2013 -0800
@@ -35,7 +35,7 @@
HS_MAJOR_VER=25
HS_MINOR_VER=0
-HS_BUILD_NUMBER=20
+HS_BUILD_NUMBER=21
JDK_MAJOR_VER=1
JDK_MINOR_VER=8
--- a/hotspot/src/share/vm/gc_implementation/g1/concurrentMarkThread.cpp Sat Feb 23 17:40:33 2013 -0800
+++ b/hotspot/src/share/vm/gc_implementation/g1/concurrentMarkThread.cpp Tue Feb 26 08:58:20 2013 -0800
@@ -117,7 +117,7 @@
if (G1Log::fine()) {
gclog_or_tty->date_stamp(PrintGCDateStamps);
gclog_or_tty->stamp(PrintGCTimeStamps);
- gclog_or_tty->print_cr("[GC concurrent-root-region-scan-end, %1.7lf]",
+ gclog_or_tty->print_cr("[GC concurrent-root-region-scan-end, %1.7lf secs]",
scan_end - scan_start);
}
}
@@ -150,7 +150,7 @@
if (G1Log::fine()) {
gclog_or_tty->date_stamp(PrintGCDateStamps);
gclog_or_tty->stamp(PrintGCTimeStamps);
- gclog_or_tty->print_cr("[GC concurrent-mark-end, %1.7lf sec]",
+ gclog_or_tty->print_cr("[GC concurrent-mark-end, %1.7lf secs]",
mark_end_sec - mark_start_sec);
}
@@ -234,7 +234,7 @@
if (G1Log::fine()) {
gclog_or_tty->date_stamp(PrintGCDateStamps);
gclog_or_tty->stamp(PrintGCTimeStamps);
- gclog_or_tty->print_cr("[GC concurrent-cleanup-end, %1.7lf]",
+ gclog_or_tty->print_cr("[GC concurrent-cleanup-end, %1.7lf secs]",
cleanup_end_sec - cleanup_start_sec);
}
}
--- a/hotspot/src/share/vm/runtime/atomic.hpp Sat Feb 23 17:40:33 2013 -0800
+++ b/hotspot/src/share/vm/runtime/atomic.hpp Tue Feb 26 08:58:20 2013 -0800
@@ -29,10 +29,17 @@
class Atomic : AllStatic {
public:
+ // Atomic operations on jlong types are not available on all 32-bit
+ // platforms. If atomic ops on jlongs are defined here they must only
+ // be used from code that verifies they are available at runtime and
+ // can provide an alternative action if not - see supports_cx8() for
+ // a means to test availability.
+
// Atomically store to a location
inline static void store (jbyte store_value, jbyte* dest);
inline static void store (jshort store_value, jshort* dest);
inline static void store (jint store_value, jint* dest);
+ // See comment above about using jlong atomics on 32-bit platforms
inline static void store (jlong store_value, jlong* dest);
inline static void store_ptr(intptr_t store_value, intptr_t* dest);
inline static void store_ptr(void* store_value, void* dest);
@@ -40,17 +47,19 @@
inline static void store (jbyte store_value, volatile jbyte* dest);
inline static void store (jshort store_value, volatile jshort* dest);
inline static void store (jint store_value, volatile jint* dest);
+ // See comment above about using jlong atomics on 32-bit platforms
inline static void store (jlong store_value, volatile jlong* dest);
inline static void store_ptr(intptr_t store_value, volatile intptr_t* dest);
inline static void store_ptr(void* store_value, volatile void* dest);
+ // See comment above about using jlong atomics on 32-bit platforms
inline static jlong load(volatile jlong* src);
// Atomically add to a location, return updated value
inline static jint add (jint add_value, volatile jint* dest);
inline static intptr_t add_ptr(intptr_t add_value, volatile intptr_t* dest);
inline static void* add_ptr(intptr_t add_value, volatile void* dest);
-
+ // See comment above about using jlong atomics on 32-bit platforms
static jlong add (jlong add_value, volatile jlong* dest);
// Atomically increment location
@@ -75,6 +84,7 @@
// barrier across the cmpxchg. I.e., it's really a 'fence_cmpxchg_acquire'.
static jbyte cmpxchg (jbyte exchange_value, volatile jbyte* dest, jbyte compare_value);
inline static jint cmpxchg (jint exchange_value, volatile jint* dest, jint compare_value);
+ // See comment above about using jlong atomics on 32-bit platforms
inline static jlong cmpxchg (jlong exchange_value, volatile jlong* dest, jlong compare_value);
static unsigned int cmpxchg(unsigned int exchange_value,
--- a/hotspot/src/share/vm/utilities/ostream.cpp Sat Feb 23 17:40:33 2013 -0800
+++ b/hotspot/src/share/vm/utilities/ostream.cpp Tue Feb 26 08:58:20 2013 -0800
@@ -431,7 +431,7 @@
rotatingFileStream::rotatingFileStream(const char* file_name) {
_cur_file_num = 0;
- _bytes_writen = 0L;
+ _bytes_written = 0L;
_file_name = NEW_C_HEAP_ARRAY(char, strlen(file_name)+10, mtInternal);
jio_snprintf(_file_name, strlen(file_name)+10, "%s.%d", file_name, _cur_file_num);
_file = fopen(_file_name, "w");
@@ -440,7 +440,7 @@
rotatingFileStream::rotatingFileStream(const char* file_name, const char* opentype) {
_cur_file_num = 0;
- _bytes_writen = 0L;
+ _bytes_written = 0L;
_file_name = NEW_C_HEAP_ARRAY(char, strlen(file_name)+10, mtInternal);
jio_snprintf(_file_name, strlen(file_name)+10, "%s.%d", file_name, _cur_file_num);
_file = fopen(_file_name, opentype);
@@ -448,10 +448,9 @@
}
void rotatingFileStream::write(const char* s, size_t len) {
- if (_file != NULL) {
- // Make an unused local variable to avoid warning from gcc 4.x compiler.
+ if (_file != NULL) {
size_t count = fwrite(s, 1, len, _file);
- Atomic::add((jlong)count, &_bytes_writen);
+ _bytes_written += count;
}
update_position(s, len);
}
@@ -465,7 +464,10 @@
// concurrent GC threads to run parallel with VMThread at safepoint, write and rotate_log
// must be synchronized.
void rotatingFileStream::rotate_log() {
- if (_bytes_writen < (jlong)GCLogFileSize) return;
+ if (_bytes_written < (jlong)GCLogFileSize) {
+ return;
+ }
+
#ifdef ASSERT
Thread *thread = Thread::current();
assert(thread == NULL ||
@@ -475,7 +477,7 @@
if (NumberOfGCLogFiles == 1) {
// rotate in same file
rewind();
- _bytes_writen = 0L;
+ _bytes_written = 0L;
return;
}
@@ -491,7 +493,7 @@
}
_file = fopen(_file_name, "w");
if (_file != NULL) {
- _bytes_writen = 0L;
+ _bytes_written = 0L;
_need_close = true;
} else {
tty->print_cr("failed to open rotation log file %s due to %s\n",
--- a/hotspot/src/share/vm/utilities/ostream.hpp Sat Feb 23 17:40:33 2013 -0800
+++ b/hotspot/src/share/vm/utilities/ostream.hpp Tue Feb 26 08:58:20 2013 -0800
@@ -231,7 +231,7 @@
class rotatingFileStream : public fileStream {
protected:
char* _file_name;
- jlong _bytes_writen;
+ jlong _bytes_written;
uintx _cur_file_num; // current logfile rotation number, from 0 to MaxGCLogFileNumbers-1
public:
rotatingFileStream(const char* file_name);