Malfunctioning status at the end of 23/10, squash this when merging

sfc-aqua · Oct 23, 2024 · 351d33d · 351d33d
1 parent 056e8aa
commit 351d33d
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 3 deletions.
diff --git a/quisp/messages/connection_setup_messages.msg b/quisp/messages/connection_setup_messages.msg
@@ -36,3 +36,7 @@ packet ConnectionSetupResponse extends Header
     int application_type;
     int stack_of_QNodeIndexes[];
 }
+
+packet InternalTerminatedRulesetIdsNotifier extends Header {
+    unsigned long terminated_rulesets_ids[] @appender(appendTerminatedRulesetId);
+}
diff --git a/quisp/modules/Common/Router.cc b/quisp/modules/Common/Router.cc
@@ -142,6 +142,10 @@ void Router::handleMessage(cMessage *msg) {
   } else if (dest_addr == my_address && dynamic_cast<OspfPacket *>(msg)) {
     send(pk, "rdPort$o");
     return;
+  } else if (dest_addr == my_address && dynamic_cast<InternalTerminatedRulesetIdsNotifier *>(msg)){
+    bubble("Terminated rulesets IDs list received");
+    send(pk, "cmPort$o");
+    return;
   }
 
   // RoutingDaemon sends hello packet without desination specified

diff --git a/quisp/modules/QRSA/ConnectionManager/ConnectionManager.cc b/quisp/modules/QRSA/ConnectionManager/ConnectionManager.cc
@@ -126,6 +126,11 @@ void ConnectionManager::handleMessage(cMessage *msg) {
     delete msg;
     return;
   }
+
+  if (auto *pk = dynamic_cast<InternalTerminatedRulesetIdsNotifier *>(msg)) {
+    delete msg;
+    return;
+  }
 }
 
 PurType ConnectionManager::parsePurType(const std::string &pur_type) {

diff --git a/quisp/modules/QRSA/RuleEngine/RuleEngine.cc b/quisp/modules/QRSA/RuleEngine/RuleEngine.cc
@@ -371,7 +371,11 @@ void RuleEngine::ResourceAllocation(int qnic_type, int qnic_index) {
   }
 }
 
-void RuleEngine::executeAllRuleSets() { runtimes.exec(); }
+void RuleEngine::executeAllRuleSets() {
+  runtimes.exec();
+  const auto& terminated_rulesets_ids = runtimes.getTerminatedRulesetIds();
+  sendTerminatedRulesetIds(terminated_rulesets_ids);
+  }
 
 void RuleEngine::freeConsumedResource(int qnic_index /*Not the address!!!*/, IStationaryQubit *qubit, QNIC_type qnic_type) {
   auto *qubit_record = qnic_store->getQubitRecord(qnic_type, qnic_index, qubit->par("stationary_qubit_address"));
@@ -383,4 +387,13 @@ void RuleEngine::freeConsumedResource(int qnic_index /*Not the address!!!*/, ISt
   bell_pair_store.eraseQubit(qubit_record);
 }
 
+void RuleEngine::sendTerminatedRulesetIds(const std::vector<unsigned long>& terminated_rulesets_ids) {
+InternalTerminatedRulesetIdsNotifier* pkt = new InternalTerminatedRulesetIdsNotifier();
+pkt->setSrcAddr(parentAddress);
+pkt->setDestAddr(parentAddress);
+for (auto id : terminated_rulesets_ids) {
+  pkt->appendTerminatedRulesetId(id);
+}
+send(pkt,"RouterPort$o");
+};
 }  // namespace quisp::modules
diff --git a/quisp/modules/QRSA/RuleEngine/RuleEngine.h b/quisp/modules/QRSA/RuleEngine/RuleEngine.h
@@ -92,6 +92,7 @@ class RuleEngine : public IRuleEngine, public Logger::LoggerBase {
   void schedulePhotonEmission(QNIC_type qnic_type, int qnic_index, messages::BSMTimingNotification *notification);
   void scheduleMSMPhotonEmission(QNIC_type qnic_type, int qnic_index, messages::EPPSTimingNotification *notification);
   void handleStopEmitting(messages::StopEmitting *stop_emit);
+  void sendTerminatedRulesetIds(const std::vector<unsigned long>& terminated_rulesets_ids);
 
   utils::ComponentProvider provider;
   std::unique_ptr<IQNicStore> qnic_store = nullptr;

diff --git a/quisp/runtime/RuntimeManager.cc b/quisp/runtime/RuntimeManager.cc
@@ -17,9 +17,11 @@ Runtime *RuntimeManager::findById(unsigned long long ruleset_id) {
 }
 
 void RuntimeManager::exec() {
+  terminated_rulesets.clear();
   for (auto it = runtimes.begin(); it != runtimes.end();) {
     it->exec();
     if (it->terminated) {
+      terminated_rulesets.push_back(it->ruleset.id);
       it = runtimes.erase(it);
     } else {
       ++it;
@@ -31,5 +33,5 @@ std::vector<Runtime>::iterator RuntimeManager::begin() { return runtimes.begin()
 std::vector<Runtime>::iterator RuntimeManager::end() { return runtimes.end(); }
 std::vector<Runtime>::reference RuntimeManager::at(size_t index) { return runtimes.at(index); }
 size_t RuntimeManager::size() const { return runtimes.size(); }
-
+const std::vector<unsigned long>& RuntimeManager::getTerminatedRulesetIds() const {return terminated_rulesets; }
 }  // namespace quisp::runtime
diff --git a/quisp/runtime/RuntimeManager.h b/quisp/runtime/RuntimeManager.h
@@ -13,9 +13,10 @@ class RuntimeManager {
   std::vector<Runtime>::iterator end();
   std::vector<Runtime>::reference at(size_t);
   size_t size() const;
-
+  const std::vector<unsigned long>& getTerminatedRulesetIds() const;
  protected:
   std::vector<Runtime> runtimes = {};
   std::unique_ptr<Runtime::ICallBack> callback;
+  std::vector<unsigned long> terminated_rulesets;
 };
 }  // namespace quisp::runtime