Update Variorum Service to use Energy API.

examples/apps/CMakeLists.txt

@@ -13,6 +13,7 @@ set(CALIPER_MPI_EXAMPLE_APPS
   collective-output-channel)
 set(CALIPER_C_EXAMPLE_APPS
   c-example
+  c-spinloop-example
   cali-print-snapshot)
 set(CALIPER_Fortran_EXAMPLE_APPS
   fortran-example

examples/apps/c-spinloop-example.c

@@ -0,0 +1,39 @@
+// Copyright (c) 2015-2022, Lawrence Livermore National Security, LLC.
+// See top-level LICENSE file for details.
+
+// A C Caliper instrumentation and ConfigManager example
+
+//   Usage: $ cali-basic-annotations <configuration-string>
+// For example, "$ cali-basic-annotations runtime-report" will print a
+// hierarchical runtime summary for all annotated regions.
+
+#include <caliper/cali.h>
+
+#include <stdio.h>
+#include <unistd.h>
+#include <string.h>
+
+#define LARGE_NUM 50000000
+
+void foo()
+{
+    // Mark begin of the current function. Must be manually closed.
+    CALI_MARK_FUNCTION_BEGIN;
+    printf("Enter foo. Run a long spinloop\n");
+    long double res = 0.1;
+    uint64_t i;
+    for (i = 0; i < LARGE_NUM; i++)
+    {
+        res += res * i;
+    }
+    printf("Exit foo. \n");
+    // Mark the end of the current function
+    CALI_MARK_FUNCTION_END;
+}
+
+int main(int argc, char *argv[])
+{
+    printf("Enter main. Call foo.\n");
+    foo();
+    printf("Exit main. \n");
+}

ext/gotcha/src/gotcha.c

@@ -239,7 +239,8 @@ struct Boundary {
 int find_relro_boundary(struct dl_phdr_info *info, size_t size, void *data) {
   struct Boundary *boundary = data;
   int found = 0;
-  for (int i = 0; i < info->dlpi_phnum; ++i) {
+  int i = 0;
+  for (i = 0; i < info->dlpi_phnum; ++i) {
     if (info->dlpi_phdr[i].p_type == PT_LOAD) {
       if (strcmp(boundary->l_name, info->dlpi_name) == 0 &&
           boundary->load_addr == info->dlpi_addr) {
@@ -249,7 +250,8 @@ int find_relro_boundary(struct dl_phdr_info *info, size_t size, void *data) {
     }
   }
   if (found) {
-    for (int i = 0; i < info->dlpi_phnum; ++i) {
+    int i = 0;
+    for (i = 0; i < info->dlpi_phnum; ++i) {
       if (info->dlpi_phdr[i].p_type == PT_GNU_RELRO) {
         boundary->start_addr = boundary->load_addr + info->dlpi_phdr[i].p_vaddr;
         boundary->end_addr = boundary->start_addr + info->dlpi_phdr[i].p_memsz;

ext/gotcha/src/gotcha_dl.c

@@ -30,7 +30,8 @@ int lib_header_callback(struct dl_phdr_info *info, size_t size, void *data) {
   struct Addrs *addrs = data;
   const char *name = NULL;
   ElfW(Addr) load_address;
-  for (int i = 0; i < info->dlpi_phnum; ++i) {
+  int i = 0;
+  for (i = 0; i < info->dlpi_phnum; ++i) {
     if (info->dlpi_phdr[i].p_type == PT_LOAD) {
       ElfW(Addr) base_addr = info->dlpi_addr;
       ElfW(Addr) start_addr = base_addr + info->dlpi_phdr[i].p_vaddr;

src/services/variorum/README.md

@@ -1,14 +1,19 @@
 Variorum Service
 ================
 
-The Variorum service implements a monitoring service of power usage at runtime.
+The Variorum service implements a monitoring service of energy usage at runtime.
 It implements the `snapshot` callback for adding data to Caliper snapshot
-records.
+records. Minimum Variorum version is v0.8.
+Nesting of Caliper markers is not supported yet in this service.
+
+To build with the Variorum service, set WITH_VARIORUM=On and 
+VARIORUM_PREFIX=<path-to-variorum-install>.
 
 With the following configuration, Caliper will export its
 data to a cali file:
 
 ```
     $ CALI_SERVICES_ENABLE=aggregate,event,variorum,recorder \
-      CALI_VARIORUM_DOMAINS=power_node_watts \
+      CALI_VARIORUM_DOMAINS=energy_node_joules \
 ```
+