Revert "FIX(jfr): JFR build failed for JDK-8202353"

This reverts commit 86196db.
Tobehalo · Nov 6, 2020 · 7ecf8f7 · 7ecf8f7
1 parent 027ccfa
commit 7ecf8f7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/hotspot/src/os/linux/vm/os_perf_linux.cpp b/hotspot/src/os/linux/vm/os_perf_linux.cpp
@@ -912,20 +912,24 @@ int SystemProcessInterface::SystemProcesses::ProcessIterator::current(SystemProc
 }
 
 int SystemProcessInterface::SystemProcesses::ProcessIterator::next_process() {
+  char* dbuf = NULL;
   if (!is_valid()) {
     return OS_ERR;
   }
+  dbuf = NEW_C_HEAP_ARRAY(char, os::readdir_buf_size(NULL), mtInternal);
 
   do {
-    _entry = os::readdir(_dir);
+    _entry = os::readdir(_dir, (struct dirent *)dbuf);
     if (_entry == NULL) {
       // Error or reached end.  Could use errno to distinguish those cases.
       _valid = false;
+      FREE_C_HEAP_ARRAY(char, dbuf, mtInternal);
       return OS_ERR;
     }
   } while(!is_valid_entry(_entry));
 
   _valid = true;
+  FREE_C_HEAP_ARRAY(char, dbuf, mtInternal);
   return OS_OK;
 }
 

diff --git a/hotspot/src/share/vm/jfr/recorder/repository/jfrRepository.cpp b/hotspot/src/share/vm/jfr/recorder/repository/jfrRepository.cpp
@@ -239,14 +239,16 @@ RepositoryIterator::RepositoryIterator(const char* repository, size_t repository
       if (true) tty->print_cr("Unable to open repository %s", _repo);
       return;
     }
+    char *dbuf = NEW_C_HEAP_ARRAY(char, os::readdir_buf_size(NULL), mtInternal);
     struct dirent* dentry;
-    while ((dentry = os::readdir(dirp)) != NULL) {
+    while ((dentry = os::readdir(dirp, (dirent *)dbuf)) != NULL) {
       const char* const entry_path = filter(dentry->d_name);
       if (NULL != entry_path) {
         _files->append(entry_path);
       }
     }
     os::closedir(dirp);
+    FREE_C_HEAP_ARRAY(char, dbuf, mtInternal);
     if (_files->length() > 1) {
       _files->sort(file_sort);
     }