From: Arnaud Giersch <arnaud.giersch@univ-fcomte.fr>
Date: Thu, 23 Feb 2023 17:00:25 +0000 (+0100)
Subject: Merge branch 'simgrid-udpor-integration' into 'master'
X-Git-Tag: v3.34~462
X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/7b50ef668fe46e44363e4c7ea2089e37c6afec38

Merge branch 'simgrid-udpor-integration' into 'master'

Phase 1 of Integration of UDPOR: Adding UDPOR Constructs

See merge request simgrid/simgrid!132
---

7b50ef668fe46e44363e4c7ea2089e37c6afec38
diff --cc src/mc/api/RemoteApp.cpp
index dc816e7287,ee1627feda..9007e82f57
--- a/src/mc/api/RemoteApp.cpp
+++ b/src/mc/api/RemoteApp.cpp
@@@ -224,13 -225,14 +224,13 @@@ void RemoteApp::get_actors_status(std::
                 "(currently %d), but only %d transition(s) was/were said to be encoded",
                 actor.max_considered, actor.n_transitions);
  
-     std::vector<std::unique_ptr<Transition>> actor_transitions;
 -    auto actor_transitions = std::vector<std::shared_ptr<Transition>>(actor.n_transitions);
++    std::vector<std::shared_ptr<Transition>> actor_transitions;
      for (int times_considered = 0; times_considered < actor.n_transitions; times_considered++, probes_iter++) {
        std::stringstream stream((*probes_iter).buffer.data());
 -      auto transition = std::shared_ptr<Transition>(deserialize_transition(actor.aid, times_considered, stream));
 -      actor_transitions[times_considered] = std::move(transition);
 +      actor_transitions.emplace_back(deserialize_transition(actor.aid, times_considered, stream));
      }
  
 -    XBT_DEBUG("Received %d transitions for actor %ld", actor.n_transitions, actor.aid);
 +    XBT_DEBUG("Received %zu transitions for actor %ld", actor_transitions.size(), actor.aid);
      whereto.try_emplace(actor.aid, actor.aid, actor.enabled, actor.max_considered, std::move(actor_transitions));
    }
  }