Add ability to get information about specific types of profiling.

Author: oehmke

src/Infrastructure/Trace/include/ESMCI_Trace.h

@@ -89,7 +89,11 @@ namespace ESMCI {
   void TraceTest_GetMPIWaitStats(int *count, long long *time);
   void TraceTest_CheckMPIRegion(std::string name, int *exists);
   //////////////////////////////
-    
+
+  // Trace by specific type info
+  enum ESMC_ProfileType {ESMC_PROFILETYPE_REGRID=0, ESMC_PROFILETYPE_NUM};
+
+
 
   ////////////////////////////////
 
@@ -109,6 +113,8 @@ namespace ESMCI {
   void TraceEventClock(int *ep_year, int *ep_month, int *ep_day,
                        int *ep_hour, int *ep_minute, int *ep_second);
 
+  int TraceGetProfileTypeInfo(enum ESMC_ProfileType type);
+
 }
 
 #endif

src/Infrastructure/Trace/src/ESMCI_Trace.C

@@ -99,6 +99,9 @@ namespace ESMCI {
   static bool profileOutputToBinary = false; // output to binary trace?
   static bool profileOutputSummary = false;   // output aggregate profile on root PET?
 
+  // Profile information by type
+  static int ProfileTypeInfo[ESMC_PROFILETYPE_NUM];
+  
   static bool profileLocalPetThread(){
     return (profileLocalPet && VM::isThreadKnown());
   }
@@ -451,6 +454,35 @@ namespace ESMCI {
 #endif
   }
 
+static void SetProfileTypeInfoFromEnv() {
+  
+  // Init to 0
+  for (int i=0; i<ESMC_PROFILETYPE_NUM; i++) {
+    ProfileTypeInfo[i]=0;
+  }
+  
+  // Check for environment variable and set based on that
+  // These will probably be fairly specific to the type, so for now
+  // not trying to do anything automatic across different types
+
+  // NOTE: You need to set up the env variable in ESMCI_VM.C before it'll work here
+  
+  // Set ESMF_ProfileType_Regrid 
+  char const *envRegridChar = VM::getenv("ESMF_RUNTIME_PROFILE_REGRID");
+  if (envRegridChar != NULL && strlen(envRegridChar) > 0) {
+
+    // Get regrid info from string
+    int info;
+    if (envRegridChar[0] == '1') info=1;
+    else if (envRegridChar[0] == '2') info=2;
+    else if (envRegridChar[0] == '3') info=3;
+
+    // Set in profile info array
+    ProfileTypeInfo[ESMC_PROFILETYPE_REGRID] = info;
+  }    
+}
+
+  
 #undef  ESMC_METHOD
 #define ESMC_METHOD "ESMCI::TraceOpen()"
   void TraceOpen(std::string trace_dir, int *profileToLog, int *rc) {
@@ -464,7 +496,7 @@ namespace ESMCI {
     if (ESMC_LogDefault.MsgFoundError(localrc,
          ESMCI_ERR_PASSTHRU, ESMC_CONTEXT, rc))
       return;
-
+    
     //determine if tracing is turned on for this PET
     traceLocalPet = TraceIsEnabledForPET(globalvm->getLocalPet(), &localrc);
     if (ESMC_LogDefault.MsgFoundError(localrc,
@@ -473,6 +505,7 @@ namespace ESMCI {
       return;
     }
 
+
     //determine if profiling is turned on for this PET
     //if tracing is enabled, automatically turn on profiling
     profileLocalPet = traceLocalPet || ProfileIsEnabledForPET(globalvm->getLocalPet(), &localrc);
@@ -481,7 +514,7 @@ namespace ESMCI {
       profileLocalPet = false;
       return;
     }
-
+    
     //determine output method for profiling, if enabled
     if (profileLocalPetThread()) {
       //always output binary if tracing is enabled
@@ -530,6 +563,9 @@ namespace ESMCI {
       ESMC_LogDefault.Write("ESMF Profiling Enabled", ESMC_LOGMSG_INFO);
     }
 
+    // Set other profile information
+    SetProfileTypeInfoFromEnv();
+    
     // initialize the clock
     struct esmftrc_platform_filesys_ctx *ctx;
     if (traceLocalPet || profileLocalPetThread()) {
@@ -1240,6 +1276,7 @@ namespace ESMCI {
   }
 
 
+  
 
 #undef ESMC_METHOD
 #define ESMC_METHOD "ESMCI::TraceClose()"
@@ -1329,6 +1366,13 @@ namespace ESMCI {
   }
 
 
+  
+#undef ESMC_METHOD
+#define ESMC_METHOD "ESMCI::TraceGetProfileTypeInfo()"
+  int TraceGetProfileTypeInfo(enum ESMC_ProfileType type) {
+    return ProfileTypeInfo[type];
+  }
+  
 
   ///////////////////// I/O Tracing //////////////////
 

src/Infrastructure/VM/src/ESMCI_VM.C

@@ -3370,7 +3370,14 @@ VM *VM::initialize(
       esmfRuntimeEnv.push_back(esmfRuntimeVarName);
       esmfRuntimeEnvValue.push_back(esmfRuntimeVarValue);
     }
+    esmfRuntimeVarName = "ESMF_RUNTIME_PROFILE_REGRID";
+    esmfRuntimeVarValue = std::getenv(esmfRuntimeVarName);
+    if (esmfRuntimeVarValue){
+      esmfRuntimeEnv.push_back(esmfRuntimeVarName);
+      esmfRuntimeEnvValue.push_back(esmfRuntimeVarValue);
+    }
 
+    
     int count = esmfRuntimeEnv.size();
     GlobalVM->broadcast(&count, sizeof(int), 0);
     int *length = new int[2];