Fixed missing headers in Makefile

Added value constructors for Commdata_t, CounterData_t and ExecData_t
ADCounter can now be passed CounterData_t instances directly rather than as an Event_t

Author: giltirn

include/Makefile.am

@@ -1 +1 @@
-nobase_include_HEADERS = chimbuko/chimbuko.hpp chimbuko/ad/ADOutlier.hpp chimbuko/ad/ADNetClient.hpp chimbuko/ad/ADAnomalyProvenance.hpp chimbuko/ad/ADParser.hpp chimbuko/ad/ADProvenanceDBengine.hpp chimbuko/ad/ADNormalEventProvenance.hpp chimbuko/ad/ADLocalFuncStatistics.hpp chimbuko/ad/ADMetadataParser.hpp chimbuko/ad/AnomalyData.hpp chimbuko/ad/ADDefine.hpp chimbuko/ad/ADglobalFunctionIndexMap.hpp chimbuko/ad/ADProvenanceDBclient.hpp chimbuko/ad/ADEvent.hpp chimbuko/ad/ADCounter.hpp chimbuko/ad/ADLocalCounterStatistics.hpp chimbuko/ad/ExecData.hpp chimbuko/ad/utils.hpp chimbuko/ad/ADio.hpp chimbuko/verbose.hpp chimbuko/pserver/PSProvenanceDBclient.hpp chimbuko/pserver/global_anomaly_stats.hpp chimbuko/pserver/PSglobalFunctionIndexMap.hpp chimbuko/pserver/PSstatSender.hpp chimbuko/pserver/AnomalyStat.hpp chimbuko/pserver/global_counter_stats.hpp chimbuko/param/sstd_param.hpp chimbuko/param/hbos_param.hpp chimbuko/AD.hpp chimbuko/message.hpp chimbuko/net.hpp chimbuko/pserver.hpp chimbuko/param.hpp chimbuko/net/zmqme_net.hpp chimbuko/net/mpi_net.hpp chimbuko/net/zmq_net.hpp chimbuko/util/RunStats.hpp chimbuko/util/ADIOS2parseUtils.hpp chimbuko/util/time.hpp chimbuko/util/map.hpp chimbuko/util/error.hpp chimbuko/util/string.hpp chimbuko/util/DispatchQueue.hpp chimbuko/util/PerfStats.hpp chimbuko/util/RunMetric.hpp chimbuko/util/memutils.hpp chimbuko/util/Anomalies.hpp chimbuko/util/barrier.hpp chimbuko/util/threadPool.hpp chimbuko/util/hash.hpp chimbuko/util/mtQueue.hpp chimbuko/util/commandLineParser.hpp 
+nobase_include_HEADERS = chimbuko/chimbuko.hpp chimbuko/ad/ADOutlier.hpp chimbuko/ad/ADNetClient.hpp chimbuko/ad/ADAnomalyProvenance.hpp chimbuko/ad/ADParser.hpp chimbuko/ad/ADProvenanceDBengine.hpp chimbuko/ad/ADNormalEventProvenance.hpp chimbuko/ad/ADLocalFuncStatistics.hpp chimbuko/ad/ADMetadataParser.hpp chimbuko/ad/AnomalyData.hpp chimbuko/ad/ADDefine.hpp chimbuko/ad/ADglobalFunctionIndexMap.hpp chimbuko/ad/ADProvenanceDBclient.hpp chimbuko/ad/ADEvent.hpp chimbuko/ad/ADCounter.hpp chimbuko/ad/ADLocalCounterStatistics.hpp chimbuko/ad/ExecData.hpp chimbuko/ad/utils.hpp chimbuko/ad/ADio.hpp chimbuko/verbose.hpp chimbuko/pserver/PSProvenanceDBclient.hpp chimbuko/pserver/global_anomaly_stats.hpp chimbuko/pserver/PSglobalFunctionIndexMap.hpp chimbuko/pserver/PSstatSender.hpp chimbuko/pserver/AnomalyStat.hpp chimbuko/pserver/global_counter_stats.hpp chimbuko/param/sstd_param.hpp chimbuko/param/hbos_param.hpp chimbuko/AD.hpp chimbuko/message.hpp chimbuko/net.hpp chimbuko/pserver.hpp chimbuko/param.hpp chimbuko/net/zmqme_net.hpp chimbuko/net/mpi_net.hpp chimbuko/net/zmq_net.hpp chimbuko/net/local_net.hpp chimbuko/util/RunStats.hpp chimbuko/util/ADIOS2parseUtils.hpp chimbuko/util/time.hpp chimbuko/util/map.hpp chimbuko/util/error.hpp chimbuko/util/string.hpp chimbuko/util/DispatchQueue.hpp chimbuko/util/PerfStats.hpp chimbuko/util/RunMetric.hpp chimbuko/util/memutils.hpp chimbuko/util/Anomalies.hpp chimbuko/util/barrier.hpp chimbuko/util/threadPool.hpp chimbuko/util/hash.hpp chimbuko/util/mtQueue.hpp chimbuko/util/serialize.hpp chimbuko/util/commandLineParser.hpp 

include/chimbuko/ad/ADCounter.hpp

@@ -45,6 +45,14 @@ namespace chimbuko {
      */
     void addCounter(const Event_t& event);
 
+    /**
+     * @brief Insert a new counter in CounterData_t form
+     * @param cdata CounterData_t instance
+     *
+     * This function does not require the counter index->name map to be linked, but if it is a consistency check will be performed
+     */
+    void addCounter(const CounterData_t &cdata);
+
     /**
      * @brief Return all counters collected in the timestep
      */

include/chimbuko/ad/ExecData.hpp

@@ -174,6 +174,22 @@ class CommData_t {
      * @param commType communication type (e.g. SEND/RECV)
      */
     CommData_t(const Event_t& ev, const std::string &commType);
+
+    /**
+     * @brief Construct a new CommData_t object by values
+     * @param pid Program index
+     * @param rid Rank index
+     * @param tid Thread index     
+     * @param partner The other rank involved in the communication
+     * @param bytes The number of bytes sent/received
+     * @param tag The tag of the event
+     * @param timestamp The time of the counter
+     * @param commType Either "SEND" or "RECV" depending on the comm type
+     */
+    CommData_t(unsigned long pid, unsigned long rid, unsigned long tid,
+	       unsigned long partner, unsigned long bytes, unsigned long tag,
+	       unsigned long timestamp, const std::string &commType);    
+
     /**
      * @brief Destroy the CommData_t object
      *
@@ -264,6 +280,21 @@ class CommData_t {
      */
     CounterData_t(const Event_t& ev, const std::string &counter_name);
 
+    /**
+     * @brief Construct a new CounterData_t object by values
+     * @param pid Program index
+     * @param rid Rank index
+     * @param tid Thread index
+     * @param counter_id Counter index
+     * @param counter_name The name of the counter (should match the counter_id through the name map)
+     * @param counter_value The value of the counter
+     * @param timestamp The time of the counter
+     */
+    CounterData_t(unsigned long pid, unsigned long rid, unsigned long tid,
+		  unsigned long counter_id, const std::string &counter_name,
+		  unsigned long counter_value,
+		  unsigned long timestamp);
+
     /**
      * @brief Get the json object of this communication data
      */
@@ -347,6 +378,24 @@ class ExecData_t {
      * @param ev constant reference to a Event_t object
      */
     ExecData_t(const Event_t& ev);
+
+  
+    /**
+     * @brief Construct a new ExecData_t object by values
+     * @param id The id associated with the instance
+     * @param pid Program index
+     * @param rid Rank index
+     * @param tid Thread index
+     * @param fid Function index
+     * @param func_name The name of the function (should match the function index through the name map)
+     * @param entry Timestamp of function start (entry)
+     * @param exit Timestamp of function exit. A value of -1 (default) indicates that the exit is not yet known. It should be set later using update_exit
+     */
+    ExecData_t(const eventID &id, 
+	       unsigned long pid, unsigned long rid, unsigned long tid, 
+	       unsigned long fid, const std::string &func_name, 
+	       long entry, long exit = -1);
+
     /**
      * @brief Destroy the ExecData_t object
      *
@@ -467,7 +516,7 @@ class ExecData_t {
      *
      * @param funcname function name
      */
-    void set_funcname(std::string funcname) { m_funcname = funcname; }
+    void set_funcname(const std::string &funcname) { m_funcname = funcname; }
 
     /**
      * @brief update exit event of this execution
@@ -477,6 +526,15 @@ class ExecData_t {
      * @return false incorrect exit event
      */
     bool update_exit(const Event_t& ev);
+
+    /**
+     * @brief update exit event of this execution
+     *
+     * @param exit timestamp
+     */
+    void update_exit(unsigned long exit);
+
+
     /**
      * @brief update exclusive running time
      *

src/ad/ADCounter.cpp

@@ -22,6 +22,25 @@ void ADCounter::addCounter(const Event_t& event){
   m_countersByIdx[event.counter_id()].push_back(cit);
 }
 
+void ADCounter::addCounter(const CounterData_t &cdata){
+  //If the counter name map is linked, check the name matches
+  if(m_counterMap){
+    auto it = m_counterMap->find(cdata.get_counterid());
+    if(it == m_counterMap->end()) fatal_error("Counter index " + std::to_string(cdata.get_counterid()) + " could not be found in map");
+    if(it->second != cdata.get_countername()) fatal_error("Counter name " + cdata.get_countername() + " does not match the name in the index map, " + it->second);
+  }
+
+  //If this is the first counter after a flush, we recreate the list
+  if(!m_counters) m_counters = new CounterDataListMap_p_t; 
+
+  auto &count_list_prt = (*m_counters)[cdata.get_pid()][cdata.get_rid()][cdata.get_tid()];
+  CounterDataListIterator_t cit = count_list_prt.insert(count_list_prt.end(), cdata);
+  m_timestampCounterMap[cdata.get_pid()][cdata.get_rid()][cdata.get_tid()][cdata.get_ts()].push_back(cit);
+  m_countersByIdx[cdata.get_counterid()].push_back(cit);
+}
+  
+
+
 CounterDataListMap_p_t* ADCounter::flushCounters(){
   CounterDataListMap_p_t* ret = m_counters;
   m_counters = nullptr;

src/ad/ExecData.cpp

@@ -1,4 +1,5 @@
 #include "chimbuko/ad/ExecData.hpp"
+#include "chimbuko/util/error.hpp"
 
 using namespace chimbuko;
 
@@ -22,18 +23,34 @@ ExecData_t::ExecData_t(const Event_t& ev) : ExecData_t()
     m_parent = eventID::root();
 }
 
-ExecData_t::~ExecData_t() {
+ExecData_t::ExecData_t(const eventID &id, unsigned long pid, unsigned long rid, unsigned long tid, unsigned long fid, 
+		       const std::string &func_name, long entry, long exit) : ExecData_t()
+{
+    m_id = id;
+    m_pid = pid;
+    m_rid = rid;
+    m_tid = tid;
+    m_fid = fid;
+    m_entry = entry;
+    m_parent = eventID::root();
+    m_funcname = func_name;
+    if(exit != -1) update_exit(exit);
+}
+
+ExecData_t::~ExecData_t() {}
 
+void ExecData_t::update_exit(unsigned long exit){
+  m_exit = exit;
+  m_runtime = m_exit - m_entry;
+  m_exclusive += m_runtime;
 }
 
 bool ExecData_t::update_exit(const Event_t& ev)
 {
-    if (m_fid != ev.fid() || m_entry > (long)ev.ts())
-        return false;
-    m_exit = ev.ts();
-    m_runtime = m_exit - m_entry;
-    m_exclusive += m_runtime;
-    return true;
+  if (m_fid != ev.fid() || m_entry > (long)ev.ts())
+    return false;
+  update_exit(ev.ts());
+  return true;
 }
 
 bool ExecData_t::add_message(const CommData_t& comm, ListEnd end) {
@@ -285,6 +302,19 @@ CommData_t::CommData_t(const Event_t& ev, const std::string &commType)
     m_ts = ev.ts();
 }
 
+CommData_t::CommData_t(unsigned long pid, unsigned long rid, unsigned long tid,
+		       unsigned long partner, unsigned long bytes, unsigned long tag,
+		       unsigned long timestamp, const std::string &commType)
+  : m_commType(commType), m_pid(pid), m_rid(rid), m_tid(tid), m_bytes(bytes), m_tag(tag), m_ts(timestamp){
+  if (m_commType.compare("SEND") == 0) {
+    m_src = m_rid;
+    m_tar = partner;
+  } else if (m_commType.compare("RECV") == 0){
+    m_src = partner;
+    m_tar = m_rid;
+  }
+}
+
 bool CommData_t::is_same(const CommData_t& other) const
 {
     if (!(m_commType == other.m_commType)) return false;
@@ -343,6 +373,21 @@ CounterData_t::CounterData_t(const Event_t& ev, const std::string &counter_name)
   m_value(ev.counter_value()),
   m_ts(ev.ts()){}
 
+
+CounterData_t::CounterData_t(unsigned long pid, unsigned long rid, unsigned long tid,
+			     unsigned long counter_id, const std::string &counter_name, 
+			     unsigned long counter_value,
+			     unsigned long timestamp):
+  m_countername(counter_name),
+  m_pid(pid),
+  m_rid(rid),
+  m_tid(tid),
+  m_cid(counter_id),
+  m_value(counter_value),
+  m_ts(timestamp){}
+
+
+
 nlohmann::json CounterData_t::get_json() const{
   return {
 	  {"pid",m_pid},