src/os/linux/vm/perfMemory_linux.cpp

*** 32,41 ****
--- 32,42 ----
  #include "runtime/perfMemory.hpp"
  #include "services/memTracker.hpp"
  #include "utilities/exceptions.hpp"
  
  // put OS-includes here
+ #include <dirent.h>
  # include <sys/types.h>
  # include <sys/mman.h>
  # include <errno.h>
  # include <stdio.h>
  # include <unistd.h>
*** 531,543 ****
    // open the directory and check if the file for the given vmid exists.
    // The file with the expected name and the latest creation date is used
    // to determine the user name for the process id.
    //
    struct dirent* dentry;
-   char* tdbuf = NEW_C_HEAP_ARRAY(char, os::readdir_buf_size(tmpdirname), mtInternal);
    errno = 0;
!   while ((dentry = os::readdir(tmpdirp, (struct dirent *)tdbuf)) != NULL) {
  
      // check if the directory entry is a hsperfdata file
      if (strncmp(dentry->d_name, PERFDATA_NAME, strlen(PERFDATA_NAME)) != 0) {
        continue;
      }
--- 532,543 ----
    // open the directory and check if the file for the given vmid exists.
    // The file with the expected name and the latest creation date is used
    // to determine the user name for the process id.
    //
    struct dirent* dentry;
    errno = 0;
!   while ((dentry = os::readdir(tmpdirp)) != NULL) {
  
      // check if the directory entry is a hsperfdata file
      if (strncmp(dentry->d_name, PERFDATA_NAME, strlen(PERFDATA_NAME)) != 0) {
        continue;
      }
*** 567,579 ****
        os::closedir(subdirp);
        continue;
      }
  
      struct dirent* udentry;
-     char* udbuf = NEW_C_HEAP_ARRAY(char, os::readdir_buf_size(usrdir_name), mtInternal);
      errno = 0;
!     while ((udentry = os::readdir(subdirp, (struct dirent *)udbuf)) != NULL) {
  
        if (filename_to_pid(udentry->d_name) == vmid) {
          struct stat statbuf;
          int result;
  
--- 567,578 ----
        os::closedir(subdirp);
        continue;
      }
  
      struct dirent* udentry;
      errno = 0;
!     while ((udentry = os::readdir(subdirp)) != NULL) {
  
        if (filename_to_pid(udentry->d_name) == vmid) {
          struct stat statbuf;
          int result;
  
*** 613,627 ****
  
          FREE_C_HEAP_ARRAY(char, filename, mtInternal);
        }
      }
      os::closedir(subdirp);
-     FREE_C_HEAP_ARRAY(char, udbuf, mtInternal);
      FREE_C_HEAP_ARRAY(char, usrdir_name, mtInternal);
    }
    os::closedir(tmpdirp);
-   FREE_C_HEAP_ARRAY(char, tdbuf, mtInternal);
  
    return(oldest_user);
  }
  
  // return the name of the user that owns the JVM indicated by the given vmid.
--- 612,624 ----
*** 696,709 ****
    // remove or create new files in this directory. The behavior of this
    // loop under these conditions is dependent upon the implementation of
    // opendir/readdir.
    //
    struct dirent* entry;
-   char* dbuf = NEW_C_HEAP_ARRAY(char, os::readdir_buf_size(dirname), mtInternal);
- 
    errno = 0;
!   while ((entry = os::readdir(dirp, (struct dirent *)dbuf)) != NULL) {
  
      pid_t pid = filename_to_pid(entry->d_name);
  
      if (pid == 0) {
  
--- 693,704 ----
    // remove or create new files in this directory. The behavior of this
    // loop under these conditions is dependent upon the implementation of
    // opendir/readdir.
    //
    struct dirent* entry;
    errno = 0;
!   while ((entry = os::readdir(dirp)) != NULL) {
  
      pid_t pid = filename_to_pid(entry->d_name);
  
      if (pid == 0) {
  
*** 736,747 ****
      errno = 0;
    }
  
    // close the directory and reset the current working directory
    close_directory_secure_cwd(dirp, saved_cwd_fd);
- 
-   FREE_C_HEAP_ARRAY(char, dbuf, mtInternal);
  }
  
  // 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
--- 731,740 ----