1.1 --- a/src/share/vm/jfr/recorder/repository/jfrChunkWriter.cpp Fri Dec 06 12:42:29 2019 +0100 1.2 +++ b/src/share/vm/jfr/recorder/repository/jfrChunkWriter.cpp Tue Jun 16 11:03:04 2020 +0800 1.3 @@ -32,9 +32,8 @@ 1.4 #include "runtime/os.hpp" 1.5 #include "runtime/os.hpp" 1.6 1.7 -const u2 JFR_VERSION_MAJOR = 2; 1.8 -const u2 JFR_VERSION_MINOR = 0; 1.9 - 1.10 +static const u2 JFR_VERSION_MAJOR = 2; 1.11 +static const u2 JFR_VERSION_MINOR = 0; 1.12 static const size_t MAGIC_LEN = 4; 1.13 static const size_t FILEHEADER_SLOT_SIZE = 8; 1.14 static const size_t CHUNK_SIZE_OFFSET = 8; 1.15 @@ -79,14 +78,14 @@ 1.16 return is_open; 1.17 } 1.18 1.19 -size_t JfrChunkWriter::close(intptr_t metadata_offset) { 1.20 +size_t JfrChunkWriter::close(int64_t metadata_offset) { 1.21 write_header(metadata_offset); 1.22 this->flush(); 1.23 this->close_fd(); 1.24 - return size_written(); 1.25 + return (size_t)size_written(); 1.26 } 1.27 1.28 -void JfrChunkWriter::write_header(intptr_t metadata_offset) { 1.29 +void JfrChunkWriter::write_header(int64_t metadata_offset) { 1.30 assert(this->is_valid(), "invariant"); 1.31 // Chunk size 1.32 this->write_be_at_offset((jlong)size_written(), CHUNK_SIZE_OFFSET); 1.33 @@ -106,15 +105,15 @@ 1.34 _chunkstate->set_path(chunk_path); 1.35 } 1.36 1.37 -intptr_t JfrChunkWriter::size_written() const { 1.38 +int64_t JfrChunkWriter::size_written() const { 1.39 return this->is_valid() ? this->current_offset() : 0; 1.40 } 1.41 1.42 -intptr_t JfrChunkWriter::previous_checkpoint_offset() const { 1.43 +int64_t JfrChunkWriter::previous_checkpoint_offset() const { 1.44 return _chunkstate->previous_checkpoint_offset(); 1.45 } 1.46 1.47 -void JfrChunkWriter::set_previous_checkpoint_offset(intptr_t offset) { 1.48 +void JfrChunkWriter::set_previous_checkpoint_offset(int64_t offset) { 1.49 _chunkstate->set_previous_checkpoint_offset(offset); 1.50 } 1.51