formatting

LLNL · Nov 15, 2023 · 20f05ca · 20f05ca
1 parent 1a8052d
commit 20f05ca
Show file tree

Hide file tree

Showing 20 changed files with 54 additions and 54 deletions.
diff --git a/src/docs/sphinx/api/json.rst b/src/docs/sphinx/api/json.rst
@@ -1,48 +1,48 @@
-..
-   # Copyright 2019-2023 Lawrence Livermore National Security, LLC and other
+.. # Copyright 2019-2023 Lawrence Livermore National Security, LLC and other
    # Variorum Project Developers. See the top-level LICENSE file for details.
    #
    # SPDX-License-Identifier: MIT
 
-*********
+##########
  JSON API
-*********
+##########
 
-Obtaining Thermal Information
-=============================
+*******************************
+ Obtaining Thermal Information
+*******************************
 
 The API to obtain node thermal has the following format. It takes a string
-(``char**``) by reference as input, and populates this string with a nested 
-JSON object with hostname, followed by socket_{number}, followed by CPU and 
-or GPU (depending on the platform, may contain only one or both), followed 
-by Core and Mem for CPU. 
+(``char**``) by reference as input, and populates this string with a nested
+JSON object with hostname, followed by socket_{number}, followed by CPU and or
+GPU (depending on the platform, may contain only one or both), followed by Core
+and Mem for CPU.
 
 The ``variorum_get_thermals_json(char **)`` function returns a string type
-nested JSON object. An example is provided below.
+nested JSON object. An example is provided below::
 
-{
-    "hostname": {
-        "Socket_0": {
-            "CPU":  {
-                "Core": {
-                    "temp_celsius_core_0":  (Integer),
-					 ...
-                    "temp_celsius_core_i":  (Integer),
+    {
+        "hostname": {
+            "Socket_0": {
+                "CPU":  {
+                    "Core": {
+                        "temp_celsius_core_0":  (Integer),
+                         ...
+                        "temp_celsius_core_i":  (Integer),
+                    },
+                    "Mem":  {
+                        "temp_celsius_dimm_0":  (Integer),
+                         ...
+                        :temp_celsius_dimm_i":  (Integer),
+                     },
                 },
-                "Mem":  {
-                    "temp_celsius_dimm_0":  (Integer),
-					 ...
-                    :temp_celsius_dimm_i":  (Integer),
-                 },
+                "GPU":  {
+                    "temp_celsius_gpu_0":  (Integer),
+                     ...
+                    "temp_celsius_gpu_i":  (Integer),
+                }
             },
-            "GPU":  {
-                "temp_celsius_gpu_0":  (Integer),
-				 ...
-                "temp_celsius_gpu_i":  (Integer),
-            }
-        },
-        "timestamp" : (Integer)
+            "timestamp" : (Integer)
+        }
     }
-}
 
-* where i is the index of the core/gpu. 0 <= i < num_cores/gpus.
+Here, ``i`` is the index of the core or GPU and ``0 <= i < num_cores/GPUs``.
diff --git a/src/variorum/Intel/Intel_06_2A.c b/src/variorum/Intel/Intel_06_2A.c
@@ -431,7 +431,7 @@ int intel_cpu_fm_06_2a_get_node_power_json(char **get_power_obj_str)
 }
 
 int intel_cpu_fm_06_2a_get_node_power_domain_info_json(char
-        **get_domain_obj_str)
+    **get_domain_obj_str)
 {
     char *val = getenv("VARIORUM_LOG");
     if (val != NULL && atoi(val) == 1)

diff --git a/src/variorum/Intel/Intel_06_2A.h b/src/variorum/Intel/Intel_06_2A.h
@@ -105,7 +105,7 @@ int intel_cpu_fm_06_2a_monitoring(FILE *output);
 int intel_cpu_fm_06_2a_get_node_power_json(char **get_power_obj_str);
 
 int intel_cpu_fm_06_2a_get_node_power_domain_info_json(char
-        **get_domain_obj_str);
+    **get_domain_obj_str);
 
 int intel_cpu_fm_06_2a_cap_best_effort_node_power_limit(int node_power_limit);
 

diff --git a/src/variorum/Intel/Intel_06_2D.c b/src/variorum/Intel/Intel_06_2D.c
@@ -434,7 +434,7 @@ int intel_cpu_fm_06_2d_get_node_power_json(char **get_power_obj_str)
 }
 
 int intel_cpu_fm_06_2d_get_node_power_domain_info_json(char
-        **get_domain_obj_str)
+    **get_domain_obj_str)
 {
     char *val = getenv("VARIORUM_LOG");
     if (val != NULL && atoi(val) == 1)

diff --git a/src/variorum/Intel/Intel_06_2D.h b/src/variorum/Intel/Intel_06_2D.h
@@ -107,7 +107,7 @@ int intel_cpu_fm_06_2d_monitoring(FILE *output);
 int intel_cpu_fm_06_2d_get_node_power_json(char **get_power_obj_str);
 
 int intel_cpu_fm_06_2d_get_node_power_domain_info_json(char
-        **get_domain_obj_str);
+    **get_domain_obj_str);
 
 int intel_cpu_fm_06_2d_cap_best_effort_node_power_limit(int node_power_limit);
 

diff --git a/src/variorum/Intel/Intel_06_3E.c b/src/variorum/Intel/Intel_06_3E.c
@@ -460,7 +460,7 @@ int intel_cpu_fm_06_3e_get_node_power_json(char **get_power_obj_str)
 }
 
 int intel_cpu_fm_06_3e_get_node_power_domain_info_json(char
-        **get_domain_obj_str)
+    **get_domain_obj_str)
 {
     char *val = getenv("VARIORUM_LOG");
     if (val != NULL && atoi(val) == 1)

diff --git a/src/variorum/Intel/Intel_06_3E.h b/src/variorum/Intel/Intel_06_3E.h
@@ -108,7 +108,7 @@ int intel_cpu_fm_06_3e_monitoring(FILE *output);
 int intel_cpu_fm_06_3e_get_node_power_json(char **get_power_obj_str);
 
 int intel_cpu_fm_06_3e_get_node_power_domain_info_json(char
-        **get_domain_obj_str);
+    **get_domain_obj_str);
 
 int intel_cpu_fm_06_3e_cap_best_effort_node_power_limit(int node_power_limit);
 

diff --git a/src/variorum/Intel/Intel_06_3F.c b/src/variorum/Intel/Intel_06_3F.c
@@ -454,7 +454,7 @@ int intel_cpu_fm_06_3f_get_node_power_json(char **get_power_obj_str)
 }
 
 int intel_cpu_fm_06_3f_get_node_power_domain_info_json(char
-        **get_domain_obj_str)
+    **get_domain_obj_str)
 {
     char *val = getenv("VARIORUM_LOG");
     if (val != NULL && atoi(val) == 1)

diff --git a/src/variorum/Intel/Intel_06_3F.h b/src/variorum/Intel/Intel_06_3F.h
@@ -110,7 +110,7 @@ int intel_cpu_fm_06_3f_monitoring(FILE *output);
 int intel_cpu_fm_06_3f_get_node_power_json(char **get_power_obj_str);
 
 int intel_cpu_fm_06_3f_get_node_power_domain_info_json(char
-        **get_domain_obj_str);
+    **get_domain_obj_str);
 
 int intel_cpu_fm_06_3f_cap_best_effort_node_power_limit(int node_power_limit);
 

diff --git a/src/variorum/Intel/Intel_06_4F.c b/src/variorum/Intel/Intel_06_4F.c
@@ -477,7 +477,7 @@ int intel_cpu_fm_06_4f_get_node_power_json(char **get_power_obj_str)
 }
 
 int intel_cpu_fm_06_4f_get_node_power_domain_info_json(char
-        **get_domain_obj_str)
+    **get_domain_obj_str)
 {
     char *val = getenv("VARIORUM_LOG");
     if (val != NULL && atoi(val) == 1)

diff --git a/src/variorum/Intel/Intel_06_4F.h b/src/variorum/Intel/Intel_06_4F.h
@@ -110,7 +110,7 @@ int intel_cpu_fm_06_4f_monitoring(FILE *output);
 int intel_cpu_fm_06_4f_get_node_power_json(char **get_power_obj_str);
 
 int intel_cpu_fm_06_4f_get_node_power_domain_info_json(char
-        **get_domain_obj_str);
+    **get_domain_obj_str);
 
 int intel_cpu_fm_06_4f_cap_best_effort_node_power_limit(int node_power_limit);
 

diff --git a/src/variorum/Intel/Intel_06_55.c b/src/variorum/Intel/Intel_06_55.c
@@ -394,7 +394,7 @@ int intel_cpu_fm_06_55_get_node_power_json(char **get_power_obj_str)
 }
 
 int intel_cpu_fm_06_55_get_node_power_domain_info_json(char
-        **get_domain_obj_str)
+    **get_domain_obj_str)
 {
     char *val = getenv("VARIORUM_LOG");
     if (val != NULL && atoi(val) == 1)

diff --git a/src/variorum/Intel/Intel_06_55.h b/src/variorum/Intel/Intel_06_55.h
@@ -106,7 +106,7 @@ int intel_cpu_fm_06_55_get_node_power_json(char **get_power_obj_str);
 int intel_cpu_fm_06_55_cap_best_effort_node_power_limit(int node_power_limit);
 
 int intel_cpu_fm_06_55_get_node_power_domain_info_json(char
-        **get_domain_obj_str);
+    **get_domain_obj_str);
 
 int intel_cpu_fm_06_55_cap_frequency(int core_freq_mhz);
 

diff --git a/src/variorum/Intel/Intel_06_6A.c b/src/variorum/Intel/Intel_06_6A.c
@@ -149,7 +149,7 @@ int intel_cpu_fm_06_6a_get_node_power_json(char **get_power_obj_str)
 }
 
 int intel_cpu_fm_06_6a_get_node_power_domain_info_json(char
-        **get_domain_obj_str)
+    **get_domain_obj_str)
 {
     char *val = getenv("VARIORUM_LOG");
     if (val != NULL && atoi(val) == 1)

diff --git a/src/variorum/Intel/Intel_06_6A.h b/src/variorum/Intel/Intel_06_6A.h
@@ -41,6 +41,6 @@ int intel_cpu_fm_06_6a_get_features(void);
 int intel_cpu_fm_06_6a_get_node_power_json(char **get_power_obj_str);
 
 int intel_cpu_fm_06_6a_get_node_power_domain_info_json(char
-        **get_domain_obj_str);
+    **get_domain_obj_str);
 
 #endif
diff --git a/src/variorum/Intel/Intel_06_9E.c b/src/variorum/Intel/Intel_06_9E.c
@@ -396,7 +396,7 @@ int intel_cpu_fm_06_9e_get_node_power_json(char **get_power_obj_str)
 }
 
 int intel_cpu_fm_06_9e_get_node_power_domain_info_json(char
-        **get_domain_obj_str)
+    **get_domain_obj_str)
 {
     char *val = getenv("VARIORUM_LOG");
     if (val != NULL && atoi(val) == 1)

diff --git a/src/variorum/Intel/Intel_06_9E.h b/src/variorum/Intel/Intel_06_9E.h
@@ -104,7 +104,7 @@ int intel_cpu_fm_06_9e_monitoring(FILE *output);
 int intel_cpu_fm_06_9e_get_node_power_json(char **get_power_obj_str);
 
 int intel_cpu_fm_06_9e_get_node_power_domain_info_json(char
-        **get_domain_obj_str);
+    **get_domain_obj_str);
 
 int intel_cpu_fm_06_9e_cap_best_effort_node_power_limit(int node_power_limit);
 

diff --git a/src/variorum/Intel/thermal_features.c b/src/variorum/Intel/thermal_features.c
@@ -394,9 +394,9 @@ int get_therm_temp_reading_json(json_t *get_thermal_object,
     float core_temp;
     int pkg_temp;
 
-	variorum_get_topology(&nsockets, &ncores, &nthreads, P_INTEL_CPU_IDX);
+    variorum_get_topology(&nsockets, &ncores, &nthreads, P_INTEL_CPU_IDX);
 
-	pkg_stat = (struct pkg_therm_stat *) malloc(nsockets * sizeof(
+    pkg_stat = (struct pkg_therm_stat *) malloc(nsockets * sizeof(
                    struct pkg_therm_stat));
     get_pkg_therm_stat(pkg_stat, msr_pkg_therm_stat);
 

diff --git a/src/variorum/msr/msr_core.c b/src/variorum/msr/msr_core.c
@@ -200,7 +200,7 @@ static int do_batch_op(int batchnum, int type)
 
     /* If current flag is the opposite type, switch the flags. */
     if ((type == BATCH_WRITE && batch->ops[0].isrdmsr) || (type == BATCH_READ &&
-            !batch->ops[0].isrdmsr))
+        !batch->ops[0].isrdmsr))
     {
         __u8 readflag = (__u8)(type == BATCH_READ ? 1 : 0);
         for (j = 0; j < (int)batch->numops; j++)

diff --git a/src/variorum/variorum.c b/src/variorum/variorum.c
@@ -59,7 +59,7 @@ static void print_children(hwloc_topology_t topology, hwloc_obj_t obj,
     //exit condition
 #ifdef LIBJUSTIFY_FOUND
     if ((int)obj->logical_index == hwloc_get_type_depth(topology,
-            HWLOC_OBJ_NUMANODE))
+        HWLOC_OBJ_NUMANODE))
     {
         cflush();
     }
@@ -465,7 +465,7 @@ int variorum_cap_socket_frequency_limit(int socketid, int socket_freq_mhz)
             return 0;
         }
         err = g_platform[i].variorum_cap_socket_frequency_limit(socketid,
-                socket_freq_mhz);
+              socket_freq_mhz);
         if (err)
         {
             return -1;