Merge pull request #7 from pvelesko/velesko_fix

Velesko fix
wilseypa · Apr 8, 2020 · c8fe87b · c8fe87b
2 parents d42cd6b + 43a81d5
commit c8fe87b
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 1 deletion.
diff --git a/src/AggregateEventStatistics.cpp b/src/AggregateEventStatistics.cpp
@@ -27,6 +27,14 @@ void AggregateEventStatistics::record(const std::string& source, unsigned int se
     edge_stats_[makeEdge(source, event->receiverName())] += 1;
 }
 
+void AggregateEventStatistics::record(const std::string& source, unsigned int send_time,
+                             const std::vector<std::shared_ptr<Event>>& events) {
+    for (const auto& e : events) {
+        record(source, send_time, e.get());
+    }
+}
+
+
 unsigned int AggregateEventStatistics::getStat(const Edge& e) const {
     return edge_stats_.at(e);
 }

diff --git a/src/AggregateEventStatistics.hpp b/src/AggregateEventStatistics.hpp
@@ -24,6 +24,9 @@ class AggregateEventStatistics : public EventStatistics {
     AggregateEventStatistics(std::string filename, OutputType output_type);
 
     void record(const std::string& source, unsigned int send_time, Event* event);
+    // Record zero or more events at once
+    void record(const std::string& source, unsigned int send_time,
+                        const std::vector<std::shared_ptr<Event>>& events);
 
     // Make an undirectional edge connecting two vertices.
     Edge makeEdge(const std::string& a, const std::string& b) const;

diff --git a/src/IndividualEventStatistics.cpp b/src/IndividualEventStatistics.cpp
@@ -44,6 +44,13 @@ void IndividualEventStatistics::record(const std::string& source, unsigned int s
                             event->timestamp(),
                             event->size() + event->base_size()  );
 }
+void IndividualEventStatistics::record(const std::string& source, unsigned int send_time,
+                             const std::vector<std::shared_ptr<Event>>& events) {
+    for (const auto& e : events) {
+        record(source, send_time, e.get());
+    }
+}
+
 
 std::ostream& IndividualEventStatistics::printStats(std::ostream& stream) const {
     if (output_type_ == OutputType::Json) {

diff --git a/src/IndividualEventStatistics.hpp b/src/IndividualEventStatistics.hpp
@@ -30,6 +30,8 @@ class IndividualEventStatistics : public EventStatistics {
 
     IndividualEventStatistics(std::string filename, OutputType output_type);
     void record(const std::string& source, unsigned int send_time, Event* event);
+    void record(const std::string& source, unsigned int send_time,
+                        const std::vector<std::shared_ptr<Event>>& events);
 
 private:
     std::ostream& printStats(std::ostream& stream) const;

diff --git a/src/NullEventStatistics.hpp b/src/NullEventStatistics.hpp
@@ -18,6 +18,13 @@ class NullEventStatistics : public EventStatistics {
     void record(const std::string& source, unsigned int send_time, Event* event) {
         unused(source, send_time, event);
     }
+    void record(const std::string& source, unsigned int send_time,
+                             const std::vector<std::shared_ptr<Event>>& events) {
+    for (const auto& e : events) {
+        record(source, send_time, e.get());
+    }
+}
+
 
     void writeToFile() {}
 private:

diff --git a/src/TimeWarpEventDispatcher.hpp b/src/TimeWarpEventDispatcher.hpp
@@ -1,7 +1,7 @@
 #ifndef TIME_WARP_EVENT_DISPATCHER_H
 #define TIME_WARP_EVENT_DISPATCHER_H
 
-#define THREAD_LOCAL_SPECIFIER _Thread_local
+#define THREAD_LOCAL_SPECIFIER thread_local
 
 #ifdef __GNUC__ 
   #if __GNUC_MINOR__ < 8