8366864: Sort os/linux includes

Reviewed-by: ayang, dholmes

Author: fandreuz

src/hotspot/os/linux/cgroupSubsystem_linux.cpp

@@ -22,21 +22,22 @@
  *
  */
 
-#include <string.h>
-#include <math.h>
-#include <errno.h>
-#include <sys/vfs.h>
 #include "cgroupSubsystem_linux.hpp"
+#include "cgroupUtil_linux.hpp"
 #include "cgroupV1Subsystem_linux.hpp"
 #include "cgroupV2Subsystem_linux.hpp"
-#include "cgroupUtil_linux.hpp"
 #include "logging/log.hpp"
 #include "memory/allocation.hpp"
 #include "os_linux.hpp"
 #include "runtime/globals.hpp"
 #include "runtime/os.hpp"
 #include "utilities/globalDefinitions.hpp"
 
+#include <errno.h>
+#include <math.h>
+#include <string.h>
+#include <sys/vfs.h>
+
 // Inlined from <linux/magic.h> for portability.
 #ifndef CGROUP2_SUPER_MAGIC
 #  define CGROUP2_SUPER_MAGIC 0x63677270

src/hotspot/os/linux/cgroupSubsystem_linux.hpp

@@ -25,12 +25,12 @@
 #ifndef CGROUP_SUBSYSTEM_LINUX_HPP
 #define CGROUP_SUBSYSTEM_LINUX_HPP
 
+#include "logging/log.hpp"
 #include "memory/allocation.hpp"
+#include "osContainer_linux.hpp"
 #include "runtime/os.hpp"
-#include "logging/log.hpp"
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/macros.hpp"
-#include "osContainer_linux.hpp"
 
 // Shared cgroups code (used by cgroup version 1 and version 2)
 

src/hotspot/os/linux/cgroupUtil_linux.cpp

@@ -22,8 +22,8 @@
  *
  */
 
-#include "os_linux.hpp"
 #include "cgroupUtil_linux.hpp"
+#include "os_linux.hpp"
 
 int CgroupUtil::processor_count(CgroupCpuController* cpu_ctrl, int host_cpus) {
   assert(host_cpus > 0, "physical host cpus must be positive");

src/hotspot/os/linux/cgroupUtil_linux.hpp

@@ -25,8 +25,8 @@
 #ifndef CGROUP_UTIL_LINUX_HPP
 #define CGROUP_UTIL_LINUX_HPP
 
-#include "utilities/globalDefinitions.hpp"
 #include "cgroupSubsystem_linux.hpp"
+#include "utilities/globalDefinitions.hpp"
 
 class CgroupUtil: AllStatic {
 

src/hotspot/os/linux/cgroupV1Subsystem_linux.cpp

@@ -22,17 +22,18 @@
  *
  */
 
-#include <string.h>
-#include <math.h>
-#include <errno.h>
-#include "cgroupV1Subsystem_linux.hpp"
 #include "cgroupUtil_linux.hpp"
+#include "cgroupV1Subsystem_linux.hpp"
 #include "logging/log.hpp"
 #include "memory/allocation.hpp"
+#include "os_linux.hpp"
 #include "runtime/globals.hpp"
 #include "runtime/os.hpp"
 #include "utilities/globalDefinitions.hpp"
-#include "os_linux.hpp"
+
+#include <errno.h>
+#include <math.h>
+#include <string.h>
 
 /*
  * Set directory to subsystem specific files based

src/hotspot/os/linux/cgroupV1Subsystem_linux.hpp

@@ -25,10 +25,10 @@
 #ifndef CGROUP_V1_SUBSYSTEM_LINUX_HPP
 #define CGROUP_V1_SUBSYSTEM_LINUX_HPP
 
-#include "runtime/os.hpp"
-#include "memory/allocation.hpp"
 #include "cgroupSubsystem_linux.hpp"
 #include "cgroupUtil_linux.hpp"
+#include "memory/allocation.hpp"
+#include "runtime/os.hpp"
 
 // Cgroups version 1 specific implementation
 

src/hotspot/os/linux/cgroupV2Subsystem_linux.cpp

@@ -23,8 +23,8 @@
  *
  */
 
-#include "cgroupV2Subsystem_linux.hpp"
 #include "cgroupUtil_linux.hpp"
+#include "cgroupV2Subsystem_linux.hpp"
 
 // Constructor
 CgroupV2Controller::CgroupV2Controller(char* mount_path,

src/hotspot/os/linux/osContainer_linux.cpp

@@ -22,15 +22,16 @@
  *
  */
 
-#include <string.h>
-#include <math.h>
-#include <errno.h>
-#include "runtime/globals.hpp"
-#include "runtime/os.hpp"
+#include "cgroupSubsystem_linux.hpp"
 #include "logging/log.hpp"
 #include "os_linux.hpp"
 #include "osContainer_linux.hpp"
-#include "cgroupSubsystem_linux.hpp"
+#include "runtime/globals.hpp"
+#include "runtime/os.hpp"
+
+#include <errno.h>
+#include <math.h>
+#include <string.h>
 
 
 bool  OSContainer::_is_initialized   = false;

src/hotspot/os/linux/osContainer_linux.hpp

@@ -25,10 +25,10 @@
 #ifndef OS_LINUX_OSCONTAINER_LINUX_HPP
 #define OS_LINUX_OSCONTAINER_LINUX_HPP
 
+#include "memory/allStatic.hpp"
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/macros.hpp"
 #include "utilities/ostream.hpp"
-#include "memory/allStatic.hpp"
 
 #define OSCONTAINER_ERROR (-2)
 

src/hotspot/os/linux/os_linux.cpp

@@ -36,9 +36,9 @@
 #include "memory/allocation.inline.hpp"
 #include "nmt/memTracker.hpp"
 #include "oops/oop.inline.hpp"
-#include "osContainer_linux.hpp"
 #include "os_linux.inline.hpp"
 #include "os_posix.inline.hpp"
+#include "osContainer_linux.hpp"
 #include "prims/jniFastGetField.hpp"
 #include "prims/jvm_misc.hpp"
 #include "runtime/arguments.hpp"
@@ -81,42 +81,39 @@
 #include "jfr/support/jfrNativeLibraryLoadEvent.hpp"
 #endif
 
-// put OS-includes here
 # include <ctype.h>
-# include <stdlib.h>
-# include <sys/types.h>
-# include <sys/mman.h>
-# include <sys/stat.h>
-# include <sys/select.h>
-# include <sys/sendfile.h>
-# include <pthread.h>
-# include <signal.h>
+# include <dlfcn.h>
 # include <endian.h>
 # include <errno.h>
+# include <fcntl.h>
 # include <fenv.h>
-# include <dlfcn.h>
+# include <inttypes.h>
+# include <link.h>
+# include <linux/elf-em.h>
+# include <poll.h>
+# include <pthread.h>
+# include <pwd.h>
+# include <signal.h>
+# include <stdint.h>
 # include <stdio.h>
-# include <unistd.h>
+# include <stdlib.h>
+# include <string.h>
+# include <sys/ioctl.h>
+# include <sys/ipc.h>
+# include <sys/mman.h>
+# include <sys/prctl.h>
 # include <sys/resource.h>
-# include <pthread.h>
+# include <sys/select.h>
+# include <sys/sendfile.h>
+# include <sys/socket.h>
 # include <sys/stat.h>
+# include <sys/sysinfo.h>
 # include <sys/time.h>
 # include <sys/times.h>
+# include <sys/types.h>
 # include <sys/utsname.h>
-# include <sys/socket.h>
-# include <pwd.h>
-# include <poll.h>
-# include <fcntl.h>
-# include <string.h>
 # include <syscall.h>
-# include <sys/sysinfo.h>
-# include <sys/ipc.h>
-# include <link.h>
-# include <stdint.h>
-# include <inttypes.h>
-# include <sys/ioctl.h>
-# include <linux/elf-em.h>
-# include <sys/prctl.h>
+# include <unistd.h>
 #ifdef __GLIBC__
 # include <malloc.h>
 #endif