whitespace clean-ups and other small fixes

Author: jerboaa

src/hotspot/os/linux/cgroupSubsystem_linux.cpp

@@ -676,7 +676,7 @@ bool CgroupSubsystem::memory_limit_in_bytes(physical_memory_size_type upper_boun
   CachingCgroupController<CgroupMemoryController>* contrl = memory_controller();
   CachedMetric* memory_limit = contrl->metrics_cache();
   if (!memory_limit->should_check_metric()) {
-    value = memory_limit->value(); 
+    value = memory_limit->value();
     return true;
   }
   physical_memory_size_type mem_limit = 0;

src/hotspot/os/linux/cgroupUtil_linux.cpp

@@ -78,7 +78,7 @@ int CgroupUtil::get_updated_cpu_limit(CgroupCpuController* cpu,
                                      int upper_bound) {
   assert(lowest > 0 && lowest <= upper_bound, "invariant");
   int cpu_limit_val = -1;
-  if (CgroupUtil::processor_count(cpu, upper_bound, cpu_limit_val) && cpu_limit_val != -1) {
+  if (CgroupUtil::processor_count(cpu, upper_bound, cpu_limit_val) && cpu_limit_val != upper_bound) {
     assert(cpu_limit_val <= upper_bound, "invariant");
     if (lowest > cpu_limit_val) {
       return cpu_limit_val;

src/hotspot/os/linux/cgroupV1Subsystem_linux.cpp

@@ -349,7 +349,7 @@ bool CgroupV1MemoryController::memory_max_usage_in_bytes(physical_memory_size_ty
 
 bool CgroupV1MemoryController::rss_usage_in_bytes(physical_memory_size_type& result) {
   physical_memory_size_type rss = 0;
-  
+
   if (!reader()->read_numerical_key_value("/memory.stat", "rss", rss)) {
     return false;
   }
@@ -452,13 +452,13 @@ char* CgroupV1Subsystem::cpu_cpuset_memory_nodes() {
  * result reference.
  *
  * return:
- *   true if the value was set in the result reference 
+ *   true if the value was set in the result reference
  *   false on failure to read the number from the file
  *   and the result reference has not been touched.
  */
 bool CgroupV1CpuController::cpu_quota(int& result) {
   uint64_t quota = 0;
-  
+
   // intentionally not using the macro so as to not log a
   // negative value as a large unsiged int
   if (!reader()->read_number("/cpu.cfs_quota_us", quota)) {

src/hotspot/os/linux/osContainer_linux.hpp

@@ -33,17 +33,17 @@
 // Some cgroup interface files define the value 'max' for unlimited.
 // Define this constant value to indicate this value.
 const uint64_t value_unlimited = std::numeric_limits<uint64_t>::max();
-const uint64_t value_unused = 0;
 
 // 20ms timeout between re-reads of memory limit and _active_processor_count.
 #define OSCONTAINER_CACHE_TIMEOUT (NANOSECS_PER_SEC/50)
 
 // Carrier object for print_container_helper()
 class MetricResult: public StackObj {
   private:
+    static const uint64_t value_unused = 0;
     bool _success = false;
     physical_memory_size_type _value = value_unused;
-  public: 
+  public:
     void set_value(physical_memory_size_type val) {
       // having a value means success
       _success = true;

test/hotspot/gtest/runtime/test_cgroupSubsystem_linux.cpp

@@ -275,7 +275,7 @@ TEST(cgroupTest, read_number_tests) {
   // Some interface files have numbers as well as the string
   // 'max', which means unlimited.
   uint64_t result = 0;
-  uint64_t unlimited = SIZE_MAX;
+  uint64_t unlimited = std::numeric_limits<uint64_t>::max();
   fill_file(test_file, "max\n");
   ok = controller->read_number_handle_max(base_with_slash, result);
   EXPECT_TRUE(ok) << "Number parsing for 'max' string should have been successful";