Correctly handle duplicate peq entries

machineware-gmbh · Dec 17, 2023 · 8a2ee56 · 8a2ee56
1 parent 224aa19
commit 8a2ee56
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/include/vcml/core/peq.h b/include/vcml/core/peq.h
@@ -50,6 +50,11 @@ inline void peq<T>::notify(const T& payload, double t, sc_time_unit tu) {
 template <typename T>
 inline void peq<T>::notify(const T& payload, const sc_time& delta) {
     sc_time t = sc_time_stamp() + delta;
+    auto range = m_schedule.equal_range(t);
+    for (auto it = range.first; it != range.second; it++)
+        if (it->second == payload)
+            return;
+
     m_schedule.emplace(t, payload);
     m_event.notify(m_schedule.begin()->first - sc_time_stamp());
 }

diff --git a/test/core/peq.cpp b/test/core/peq.cpp
@@ -26,6 +26,7 @@ class peq_test : public test_base
         queue.notify(2, 2.0, SC_SEC);
         queue.notify(1, 1.0, SC_SEC);
         queue.notify(3, 3.0, SC_SEC);
+        queue.notify(3, 3.0, SC_SEC);
 
         queue.wait(val);
         EXPECT_EQ(val, 1);