Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Merge branch 'simgrid-udpor-integration' into 'master'
authorArnaud Giersch <arnaud.giersch@univ-fcomte.fr>
Thu, 23 Feb 2023 17:00:25 +0000 (18:00 +0100)
committerArnaud Giersch <arnaud.giersch@univ-fcomte.fr>
Thu, 23 Feb 2023 20:07:22 +0000 (21:07 +0100)
Phase 1 of Integration of UDPOR: Adding UDPOR Constructs

See merge request simgrid/simgrid!132

1  2 
MANIFEST.in
src/mc/api/RemoteApp.cpp
tools/cmake/DefinePackages.cmake

diff --cc MANIFEST.in
Simple merge
@@@ -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));
    }
  }
Simple merge