bm_sim: fix spurious duplicate ageing notifications across sweeps

Signed-off-by: Devansh-567 <devansh.jay.singh@gmail.com>

Author: Devansh-567

src/bm_sim/ageing.cpp

@@ -174,15 +174,14 @@ AgeingMonitor::do_sweep() {
         entries.push_back(handle);
       }
     }
-    entries_tmp.clear();
+    // Save the full set of aged entries seen in this sweep so already-reported
+    // entries aren't re-notified as new on subsequent sweeps.
     prev_sweep_entries.clear();
+    prev_sweep_entries.insert(entries_tmp.begin(), entries_tmp.end());
+    entries_tmp.clear();
 
     if (entries.empty()) continue;
 
-    for (entry_handle_t handle : entries) {
-      prev_sweep_entries.insert(handle);
-    }
-
     BMLOG_TRACE("Sending ageing notification for table '{}' ({})",
                 t->get_name(), entry.first);
 

tests/test_ageing.cpp

@@ -177,14 +177,13 @@ TEST_F(AgeingTest, NoDuplicate) {
   ASSERT_GT(elapsed, sweep_int - 20u);
   ASSERT_LT(elapsed, 2 * sweep_int + 20u);
 
-  auto tp3 = clock::now();
-  ageing_writer->read(buffer, sizeof(buffer));
-  auto tp4 = clock::now();
-
-  // we make sure that the next sweep does not generate a message
-
-  elapsed = duration_cast<milliseconds>(tp4 - tp3).count();
-  ASSERT_GT(elapsed, (unsigned int) (sweep_int * 1.5));
+  // Poll non-blocking over multiple sweep intervals to verify no duplicate
+  // notifications are produced for untreated aged entries.
+  auto deadline = clock::now() + milliseconds(4 * sweep_int);
+  while (clock::now() < deadline) {
+    ASSERT_NE(MemoryAccessor::Status::CAN_READ, ageing_writer->check_status());
+    sleep_for(milliseconds(10));
+  }
 }
 
 TEST_F(AgeingTest, GetTableNameFromId) {