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

equal deleted inserted replaced

-:419385282044
+:afb974a04396
 /*
-* Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2001, 2014, Oracle and/or its affiliates. All rights reserved.
 * Copyright 2012, 2013 SAP AG. 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
 if (result == OS_ERR) {
 warning("Could not close %s: %s\n", destfile, strerror(errno));
 }
 }
 }
-FREE_C_HEAP_ARRAY(char, destfile, mtInternal);
+FREE_C_HEAP_ARRAY(char, destfile);
 }
 // Shared Memory Implementation Details
 warning("Could not determine user name: %s\n",
 p->pw_name == NULL ? "pw_name = NULL" :
 "pw_name zero length");
 }
 }
-FREE_C_HEAP_ARRAY(char, pwbuf, mtInternal);
+FREE_C_HEAP_ARRAY(char, pwbuf);
 return NULL;
 }
 char* user_name = NEW_C_HEAP_ARRAY(char, strlen(p->pw_name) + 1, mtInternal);
 strcpy(user_name, p->pw_name);
-FREE_C_HEAP_ARRAY(char, pwbuf, mtInternal);
+FREE_C_HEAP_ARRAY(char, pwbuf);
 return user_name;
 }
 // return the name of the user that owns the process identified by vmid.
 //
 strcat(usrdir_name, dentry->d_name);
 DIR* subdirp = os::opendir(usrdir_name);
 if (subdirp == NULL) {
-FREE_C_HEAP_ARRAY(char, usrdir_name, mtInternal);
+FREE_C_HEAP_ARRAY(char, usrdir_name);
 continue;
 }
 // Since we don't create the backing store files in directories
 // pointed to by symbolic links, we also don't follow them when
 // looking for the files. We check for a symbolic link after the
 // call to opendir in order to eliminate a small window where the
 // symlink can be exploited.
 //
 if (!is_directory_secure(usrdir_name)) {
-FREE_C_HEAP_ARRAY(char, usrdir_name, mtInternal);
+FREE_C_HEAP_ARRAY(char, usrdir_name);
 os::closedir(subdirp);
 continue;
 }
 struct dirent* udentry;
 strcat(filename, udentry->d_name);
 // don't follow symbolic links for the file
 RESTARTABLE(::lstat(filename, &statbuf), result);
 if (result == OS_ERR) {
-FREE_C_HEAP_ARRAY(char, filename, mtInternal);
+FREE_C_HEAP_ARRAY(char, filename);
 continue;
 }
 // skip over files that are not regular files.
 if (!S_ISREG(statbuf.st_mode)) {
-FREE_C_HEAP_ARRAY(char, filename, mtInternal);
+FREE_C_HEAP_ARRAY(char, filename);
 continue;
 }
 // compare and save filename with latest creation time
 if (statbuf.st_size > 0 && statbuf.st_ctime > oldest_ctime) {
 if (statbuf.st_ctime > oldest_ctime) {
 char* user = strchr(dentry->d_name, '_') + 1;
-if (oldest_user != NULL) FREE_C_HEAP_ARRAY(char, oldest_user, mtInternal);
+if (oldest_user != NULL) FREE_C_HEAP_ARRAY(char, oldest_user);
 oldest_user = NEW_C_HEAP_ARRAY(char, strlen(user)+1, mtInternal);
 strcpy(oldest_user, user);
 oldest_ctime = statbuf.st_ctime;
 }
 }
-FREE_C_HEAP_ARRAY(char, filename, mtInternal);
+FREE_C_HEAP_ARRAY(char, filename);
 }
 }
 os::closedir(subdirp);
-FREE_C_HEAP_ARRAY(char, udbuf, mtInternal);
+FREE_C_HEAP_ARRAY(char, udbuf);
-FREE_C_HEAP_ARRAY(char, usrdir_name, mtInternal);
+FREE_C_HEAP_ARRAY(char, usrdir_name);
 }
 os::closedir(tmpdirp);
-FREE_C_HEAP_ARRAY(char, tdbuf, mtInternal);
+FREE_C_HEAP_ARRAY(char, tdbuf);
 return(oldest_user);
 }
 // return the name of the user that owns the JVM indicated by the given vmid.
 strcat(path, "/");
 strcat(path, filename);
 remove_file(path);
-FREE_C_HEAP_ARRAY(char, path, mtInternal);
+FREE_C_HEAP_ARRAY(char, path);
 }
 // cleanup stale shared memory resources
 //
 remove_file(dirname, entry->d_name);
 }
 errno = 0;
 }
 os::closedir(dirp);
-FREE_C_HEAP_ARRAY(char, dbuf, mtInternal);
+FREE_C_HEAP_ARRAY(char, dbuf);
 }
 // make the user specific temporary directory. Returns true if
 // the directory exists and is secure upon return. Returns false
 // if the directory exists but is either a symlink, is otherwise
 assert(((size > 0) && (size % os::vm_page_size() == 0)),
 "unexpected PerfMemory region size");
 fd = create_sharedmem_resources(dirname, filename, size);
-FREE_C_HEAP_ARRAY(char, user_name, mtInternal);
+FREE_C_HEAP_ARRAY(char, user_name);
-FREE_C_HEAP_ARRAY(char, dirname, mtInternal);
+FREE_C_HEAP_ARRAY(char, dirname);
 if (fd == -1) {
-FREE_C_HEAP_ARRAY(char, filename, mtInternal);
+FREE_C_HEAP_ARRAY(char, filename);
 return NULL;
 }
 mapAddress = (char*)::mmap((char*)0, size, PROT_READ|PROT_WRITE, MAP_SHARED, fd, 0);
 if (mapAddress == MAP_FAILED) {
 if (PrintMiscellaneous && Verbose) {
 warning("mmap failed -  %s\n", strerror(errno));
 }
 remove_file(filename);
-FREE_C_HEAP_ARRAY(char, filename, mtInternal);
+FREE_C_HEAP_ARRAY(char, filename);
 return NULL;
 }
 // save the file name for use in delete_shared_memory()
 backing_store_file_name = filename;
 if (backing_store_file_name != NULL) {
 remove_file(backing_store_file_name);
 // Don't.. Free heap memory could deadlock os::abort() if it is called
 // from signal handler. OS will reclaim the heap memory.
-// FREE_C_HEAP_ARRAY(char, backing_store_file_name, mtInternal);
+// FREE_C_HEAP_ARRAY(char, backing_store_file_name);
 backing_store_file_name = NULL;
 }
 }
 // return the size of the file for the given file descriptor
 // since we don't follow symbolic links when creating the backing
 // store file, we don't follow them when attaching either.
 //
 if (!is_directory_secure(dirname)) {
-FREE_C_HEAP_ARRAY(char, dirname, mtInternal);
+FREE_C_HEAP_ARRAY(char, dirname);
 if (luser != user) {
-FREE_C_HEAP_ARRAY(char, luser, mtInternal);
+FREE_C_HEAP_ARRAY(char, luser);
 }
 THROW_MSG(vmSymbols::java_lang_IllegalArgumentException(),
 "Process not found");
 }
 // would otherwise occur.
 char* rfilename = NEW_RESOURCE_ARRAY(char, strlen(filename) + 1);
 strcpy(rfilename, filename);
 // free the c heap resources that are no longer needed
-if (luser != user) FREE_C_HEAP_ARRAY(char, luser, mtInternal);
+if (luser != user) FREE_C_HEAP_ARRAY(char, luser);
-FREE_C_HEAP_ARRAY(char, dirname, mtInternal);
+FREE_C_HEAP_ARRAY(char, dirname);
-FREE_C_HEAP_ARRAY(char, filename, mtInternal);
+FREE_C_HEAP_ARRAY(char, filename);
 // open the shared memory file for the give vmid
 fd = open_sharedmem_file(rfilename, file_flags, CHECK);
 assert(fd != OS_ERR, "unexpected value");

changeset 27880	afb974a04396
parent 27471	6e56277909f1
child 27883	3179632c8f66