src/os/linux/vm/os_linux.cpp

rev 8831 : Merge
rev 8910 : full patch for jfr

*** 1,7 ****
  /*
!  * Copyright (c) 1999, 2018, 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.
--- 1,7 ----
  /*
!  * Copyright (c) 1999, 2019, 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.
*** 2139,2148 ****
--- 2139,2183 ----
    if (!_print_ascii_file(fname, st)) {
      st->print("Can not get library information for pid = %d\n", pid);
    }
  }
  
+ int os::get_loaded_modules_info(os::LoadedModulesCallbackFunc callback, void *param) {
+   FILE *procmapsFile = NULL;
+ 
+   // Open the procfs maps file for the current process
+   if ((procmapsFile = fopen("/proc/self/maps", "r")) != NULL) {
+     // Allocate PATH_MAX for file name plus a reasonable size for other fields.
+     char line[PATH_MAX + 100];
+ 
+     // Read line by line from 'file'
+     while (fgets(line, sizeof(line), procmapsFile) != NULL) {
+       u8 base, top, offset, inode;
+       char permissions[5];
+       char device[6];
+       char name[PATH_MAX + 1];
+ 
+       // Parse fields from line
+       sscanf(line, UINT64_FORMAT_X "-" UINT64_FORMAT_X " %4s " UINT64_FORMAT_X " %5s " INT64_FORMAT " %s",
+              &base, &top, permissions, &offset, device, &inode, name);
+ 
+       // Filter by device id '00:00' so that we only get file system mapped files.
+       if (strcmp(device, "00:00") != 0) {
+ 
+         // Call callback with the fields of interest
+         if(callback(name, (address)base, (address)top, param)) {
+           // Oops abort, callback aborted
+           fclose(procmapsFile);
+           return 1;
+         }
+       }
+     }
+     fclose(procmapsFile);
+   }
+   return 0;
+ }
+ 
  void os::print_os_info_brief(outputStream* st) {
    os::Linux::print_distro_info(st);
  
    os::Posix::print_uname_info(st);
  
*** 4023,4032 ****
--- 4058,4071 ----
  
  size_t os::read(int fd, void *buf, unsigned int nBytes) {
    return ::read(fd, buf, nBytes);
  }
  
+ size_t os::read_at(int fd, void *buf, unsigned int nBytes, jlong offset) {
+   return ::pread(fd, buf, nBytes, offset);
+ }
+ 
  // TODO-FIXME: reconcile Solaris' os::sleep with the linux variation.
  // Solaris uses poll(), linux uses park().
  // Poll() is likely a better choice, assuming that Thread.interrupt()
  // generates a SIGUSRx signal. Note that SIGUSR1 can interfere with
  // SIGSEGV, see 4355769.