jdk-sandbox: comparison hotspot/src/os/linux/vm/perfMemory

equal deleted inserted replaced

-:98572401ab0a
+:5a33bf5089ac
 /*
-* Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2001, 2016, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
 * under the terms of the GNU General Public License version 2 only, as
 * published by the Free Software Foundation.
 #include "memory/allocation.inline.hpp"
 #include "memory/resourceArea.hpp"
 #include "oops/oop.inline.hpp"
 #include "os_linux.inline.hpp"
 #include "runtime/handles.inline.hpp"
+#include "runtime/os.hpp"
 #include "runtime/perfMemory.hpp"
 #include "services/memTracker.hpp"
 #include "utilities/exceptions.hpp"
 // put OS-includes here
 RESTARTABLE(::open(destfile, O_CREAT|O_WRONLY|O_TRUNC, S_IREAD|S_IWRITE),
 result);;
 if (result == OS_ERR) {
 if (PrintMiscellaneous && Verbose) {
 warning("Could not create Perfdata save file: %s: %s\n",
-destfile, strerror(errno));
+destfile, os::strerror(errno));
 }
 } else {
 int fd = result;
 for (size_t remaining = size; remaining > 0;) {
 RESTARTABLE(::write(fd, addr, remaining), result);
 if (result == OS_ERR) {
 if (PrintMiscellaneous && Verbose) {
 warning("Could not write Perfdata save file: %s: %s\n",
-destfile, strerror(errno));
+destfile, os::strerror(errno));
 }
 break;
 }
 remaining -= (size_t)result;
 }
 result = ::close(fd);
 if (PrintMiscellaneous && Verbose) {
 if (result == OS_ERR) {
-warning("Could not close %s: %s\n", destfile, strerror(errno));
+warning("Could not close %s: %s\n", destfile, os::strerror(errno));
 }
 }
 }
 FREE_C_HEAP_ARRAY(char, destfile);
 }
 if (result == OS_ERR) {
 if (PrintMiscellaneous && Verbose) {
 if (errno == ELOOP) {
 warning("directory %s is a symlink and is not secure\n", dirname);
 } else {
-warning("could not open directory %s: %s\n", dirname, strerror(errno));
+warning("could not open directory %s: %s\n", dirname, os::strerror(errno));
 }
 }
 return dirp;
 }
 int fd = result;
 // Determine if the file is secure.
 RESTARTABLE(::fstat(fd, &statbuf), result);
 if (result == OS_ERR) {
 if (PrintMiscellaneous && Verbose) {
-warning("fstat failed on %s: %s\n", filename, strerror(errno));
+warning("fstat failed on %s: %s\n", filename, os::strerror(errno));
 }
 return false;
 }
 if (statbuf.st_nlink > 1) {
 // A file with multiple links is not expected.
 if (result != 0 || p == NULL || p->pw_name == NULL || *(p->pw_name) == '\0') {
 if (PrintMiscellaneous && Verbose) {
 if (result != 0) {
 warning("Could not retrieve passwd entry: %s\n",
-strerror(result));
+os::strerror(result));
 }
 else if (p == NULL) {
 // this check is added to protect against an observed problem
 // with getpwuid_r() on RedHat 9 where getpwuid_r returns 0,
 // indicating success, but has p == NULL. This was observed when
 // is safe under any condition, but the use of errno in the output
 // message may result in an erroneous message.
 // Bug Id 89052 was opened with RedHat.
 //
 warning("Could not retrieve passwd entry: %s\n",
-strerror(errno));
+os::strerror(errno));
 }
 else {
 warning("Could not determine user name: %s\n",
 p->pw_name == NULL ? "pw_name = NULL" :
 "pw_name zero length");
 if (errno == ESRCH) {
 THROW_MSG_0(vmSymbols::java_lang_IllegalArgumentException(),
 "Process not found");
 }
 else /* EPERM */ {
-THROW_MSG_0(vmSymbols::java_io_IOException(), strerror(errno));
+THROW_MSG_0(vmSymbols::java_io_IOException(), os::strerror(errno));
 }
 }
 // directory search
 char* oldest_user = NULL;
 //
 RESTARTABLE(::unlink(path), result);
 if (PrintMiscellaneous && Verbose && result == OS_ERR) {
 if (errno != ENOENT) {
 warning("Could not unlink shared memory backing"
-" store file %s : %s\n", path, strerror(errno));
+" store file %s : %s\n", path, os::strerror(errno));
 }
 }
 }
 // we encountered some other failure while attempting
 // to create the directory
 //
 if (PrintMiscellaneous && Verbose) {
 warning("could not create directory %s: %s\n",
-dirname, strerror(errno));
+dirname, os::strerror(errno));
 }
 return false;
 }
 }
 return true;
 if (result == OS_ERR) {
 if (PrintMiscellaneous && Verbose) {
 if (errno == ELOOP) {
 warning("file %s is a symlink and is not secure\n", filename);
 } else {
-warning("could not create file %s: %s\n", filename, strerror(errno));
+warning("could not create file %s: %s\n", filename, os::strerror(errno));
 }
 }
 // close the directory and reset the current working directory
 close_directory_secure_cwd(dirp, saved_cwd_fd);
 // truncate the file to get rid of any existing data
 RESTARTABLE(::ftruncate(fd, (off_t)0), result);
 if (result == OS_ERR) {
 if (PrintMiscellaneous && Verbose) {
-warning("could not truncate shared memory file: %s\n", strerror(errno));
+warning("could not truncate shared memory file: %s\n", os::strerror(errno));
 }
 ::close(fd);
 return -1;
 }
 // set the file size
 RESTARTABLE(::ftruncate(fd, (off_t)size), result);
 if (result == OS_ERR) {
 if (PrintMiscellaneous && Verbose) {
-warning("could not set shared memory file size: %s\n", strerror(errno));
+warning("could not set shared memory file size: %s\n", os::strerror(errno));
 }
 ::close(fd);
 return -1;
 }
 else if (errno == EACCES) {
 THROW_MSG_(vmSymbols::java_lang_IllegalArgumentException(),
 "Permission denied", OS_ERR);
 }
 else {
-THROW_MSG_(vmSymbols::java_io_IOException(), strerror(errno), OS_ERR);
+THROW_MSG_(vmSymbols::java_io_IOException(), os::strerror(errno), OS_ERR);
 }
 }
 int fd = result;
 // check to see if the file is secure
 result = ::close(fd);
 assert(result != OS_ERR, "could not close file");
 if (mapAddress == MAP_FAILED) {
 if (PrintMiscellaneous && Verbose) {
-warning("mmap failed -  %s\n", strerror(errno));
+warning("mmap failed -  %s\n", os::strerror(errno));
 }
 remove_file(filename);
 FREE_C_HEAP_ARRAY(char, filename);
 return NULL;
 }
 int result;
 RESTARTABLE(::fstat(fd, &statbuf), result);
 if (result == OS_ERR) {
 if (PrintMiscellaneous && Verbose) {
-warning("fstat failed: %s\n", strerror(errno));
+warning("fstat failed: %s\n", os::strerror(errno));
 }
 THROW_MSG_0(vmSymbols::java_io_IOException(),
 "Could not determine PerfMemory size");
 }
 result = ::close(fd);
 assert(result != OS_ERR, "could not close file");
 if (mapAddress == MAP_FAILED) {
 if (PrintMiscellaneous && Verbose) {
-warning("mmap failed: %s\n", strerror(errno));
+warning("mmap failed: %s\n", os::strerror(errno));
 }
 THROW_MSG(vmSymbols::java_lang_OutOfMemoryError(),
 "Could not map PerfMemory");
 }

changeset 37113	5a33bf5089ac
parent 32387	a376fff9d4a5
child 40103	3c3569845229