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 --combined MANIFEST.in
@@@ -597,12 -597,9 +597,12 @@@ include examples/smpi/trace_simple/trac
  include examples/smpi/trace_simple/trace_simple.tesh
  include examples/sthread/pthread-mc-mutex-simple.tesh
  include examples/sthread/pthread-mc-mutex-simpledeadlock.tesh
 +include examples/sthread/pthread-mc-producer-consumer.tesh
  include examples/sthread/pthread-mutex-simple.c
  include examples/sthread/pthread-mutex-simple.tesh
  include examples/sthread/pthread-mutex-simpledeadlock.c
 +include examples/sthread/pthread-producer-consumer.c
 +include examples/sthread/pthread-producer-consumer.tesh
  include examples/sthread/sthread-mutex-simple.c
  include examples/sthread/sthread-mutex-simple.tesh
  include teshsuite/catch_simgrid.hpp
@@@ -2215,8 -2212,16 +2215,16 @@@ include src/mc/transition/TransitionRan
  include src/mc/transition/TransitionRandom.hpp
  include src/mc/transition/TransitionSynchro.cpp
  include src/mc/transition/TransitionSynchro.hpp
- include src/mc/udpor_global.cpp
- include src/mc/udpor_global.hpp
+ include src/mc/explo/udpor/Configuration.hpp
+ include src/mc/explo/udpor/Configuration.cpp
+ include src/mc/explo/udpor/EventSet.cpp
+ include src/mc/explo/udpor/EventSet.hpp
+ include src/mc/explo/udpor/History.cpp
+ include src/mc/explo/udpor/History.hpp
+ include src/mc/explo/udpor/UnfoldingEvent.cpp
+ include src/mc/explo/udpor/UnfoldingEvent.hpp
+ include src/mc/explo/udpor/Unfolding.cpp
+ include src/mc/explo/udpor/Unfolding.hpp
  include src/plugins/ProducerConsumer.cpp
  include src/plugins/chaos_monkey.cpp
  include src/plugins/file_system/s4u_FileSystem.cpp
@@@ -2494,13 -2499,15 +2502,13 @@@ include src/xbt/unit-tests_main.cp
  include src/xbt/xbt_log_appender_file.cpp
  include src/xbt/xbt_log_layout_format.cpp
  include src/xbt/xbt_log_layout_simple.cpp
 -include src/xbt/xbt_main.cpp
 -include src/xbt/xbt_modinter.h
 +include src/xbt/xbt_misc.cpp
  include src/xbt/xbt_os_file.cpp
  include src/xbt/xbt_os_time.c
  include src/xbt/xbt_parse_units.cpp
  include src/xbt/xbt_replay.cpp
  include src/xbt/xbt_str.cpp
  include src/xbt/xbt_str_test.cpp
 -include src/xbt/xbt_virtu.cpp
  include teshsuite/kernel/CMakeLists.txt
  include teshsuite/mc/CMakeLists.txt
  include teshsuite/models/CMakeLists.txt
diff --combined src/mc/api/RemoteApp.cpp
@@@ -171,13 -171,13 +171,13 @@@ void RemoteApp::get_actors_status(std::
    model_checker_->channel().send(MessageType::ACTORS_STATUS);
  
    s_mc_message_actors_status_answer_t answer;
 -  ssize_t received = model_checker_->channel().receive(answer);
 -  xbt_assert(received != -1, "Could not receive message");
 -  xbt_assert(received == sizeof(answer) && answer.type == MessageType::ACTORS_STATUS_REPLY,
 -             "Received unexpected message %s (%i, size=%i) "
 -             "expected MessageType::ACTORS_STATUS_REPLY (%i, size=%i)",
 -             to_c_str(answer.type), (int)answer.type, (int)received, (int)MessageType::ACTORS_STATUS_REPLY,
 -             (int)sizeof(answer));
 +  ssize_t answer_size = model_checker_->channel().receive(answer);
 +  xbt_assert(answer_size != -1, "Could not receive message");
 +  xbt_assert(answer_size == sizeof answer && answer.type == MessageType::ACTORS_STATUS_REPLY,
 +             "Received unexpected message %s (%i, size=%zd) "
 +             "expected MessageType::ACTORS_STATUS_REPLY (%i, size=%zu)",
 +             to_c_str(answer.type), (int)answer.type, answer_size, (int)MessageType::ACTORS_STATUS_REPLY,
 +             sizeof answer);
  
    // Message sanity checks
    xbt_assert(answer.count >= 0, "Received an ACTOR_STATUS_REPLY message with an actor count of '%d' < 0", answer.count);
    std::vector<s_mc_message_simcall_probe_one_t> probes(answer.transition_count);
    if (answer.transition_count > 0) {
      for (auto& probe : probes) {
 -      size_t size      = sizeof(s_mc_message_simcall_probe_one_t);
 -      ssize_t received = model_checker_->channel().receive(&probe, size);
 +      ssize_t received = model_checker_->channel().receive(probe);
        xbt_assert(received >= 0, "Could not receive response to ACTORS_PROBE message (%s)", strerror(errno));
 -      xbt_assert(static_cast<size_t>(received) == size,
 +      xbt_assert(static_cast<size_t>(received) == sizeof probe,
                   "Could not receive response to ACTORS_PROBE message (%zd bytes received != %zu bytes expected",
 -                 received, size);
 +                 received, sizeof probe);
      }
    }
  
    whereto.clear();
 -  auto probes_iter = std::move_iterator(probes.begin());
 +  std::move_iterator probes_iter(probes.begin());
  
    for (const auto& actor : status) {
      xbt_assert(actor.n_transitions == 0 || actor.n_transitions == actor.max_considered,
                 "(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));
    }
  }
@@@ -239,13 -241,13 +239,13 @@@ void RemoteApp::check_deadlock() cons
  {
    xbt_assert(model_checker_->channel().send(MessageType::DEADLOCK_CHECK) == 0, "Could not check deadlock state");
    s_mc_message_int_t message;
 -  ssize_t s = model_checker_->channel().receive(message);
 -  xbt_assert(s != -1, "Could not receive message");
 -  xbt_assert(s == sizeof(message) && message.type == MessageType::DEADLOCK_CHECK_REPLY,
 -             "Received unexpected message %s (%i, size=%i) "
 -             "expected MessageType::DEADLOCK_CHECK_REPLY (%i, size=%i)",
 -             to_c_str(message.type), (int)message.type, (int)s, (int)MessageType::DEADLOCK_CHECK_REPLY,
 -             (int)sizeof(message));
 +  ssize_t received = model_checker_->channel().receive(message);
 +  xbt_assert(received != -1, "Could not receive message");
 +  xbt_assert(received == sizeof message && message.type == MessageType::DEADLOCK_CHECK_REPLY,
 +             "Received unexpected message %s (%i, size=%zd) "
 +             "expected MessageType::DEADLOCK_CHECK_REPLY (%i, size=%zu)",
 +             to_c_str(message.type), (int)message.type, received, (int)MessageType::DEADLOCK_CHECK_REPLY,
 +             sizeof message);
  
    if (message.value != 0) {
      XBT_CINFO(mc_global, "Counter-example execution trace:");
@@@ -56,6 -56,7 +56,6 @@@ set(EXTRA_DIS
    src/xbt/log_private.hpp
    src/xbt/mallocator_private.h
    src/xbt/parmap.hpp
 -  src/xbt/xbt_modinter.h
    
    src/xbt/mmalloc/mmalloc.h
    src/xbt/mmalloc/mfree.c
@@@ -277,12 -278,13 +277,12 @@@ set(XBT_SR
    src/xbt/xbt_log_appender_file.cpp
    src/xbt/xbt_log_layout_format.cpp
    src/xbt/xbt_log_layout_simple.cpp
 -  src/xbt/xbt_main.cpp
 +  src/xbt/xbt_misc.cpp
    src/xbt/xbt_os_file.cpp
    src/xbt/xbt_os_time.c
    src/xbt/xbt_parse_units.cpp
    src/xbt/xbt_replay.cpp
    src/xbt/xbt_str.cpp
 -  src/xbt/xbt_virtu.cpp
    )
  
  if(HAVE_MMALLOC)
@@@ -523,6 -525,17 +523,17 @@@ set(MC_SR
    src/mc/explo/UdporChecker.cpp
    src/mc/explo/UdporChecker.hpp
  
+   src/mc/explo/udpor/Configuration.hpp
+   src/mc/explo/udpor/Configuration.cpp
+   src/mc/explo/udpor/EventSet.cpp
+   src/mc/explo/udpor/EventSet.hpp
+   src/mc/explo/udpor/History.cpp
+   src/mc/explo/udpor/History.hpp
+   src/mc/explo/udpor/UnfoldingEvent.cpp
+   src/mc/explo/udpor/UnfoldingEvent.hpp
+   src/mc/explo/udpor/Unfolding.cpp
+   src/mc/explo/udpor/Unfolding.hpp
+   
    src/mc/inspect/DwarfExpression.cpp
    src/mc/inspect/DwarfExpression.hpp
    src/mc/inspect/Frame.cpp
    src/mc/mc_forward.hpp
    src/mc/mc_private.hpp
    src/mc/mc_record.cpp
-   src/mc/udpor_global.cpp
-   src/mc/udpor_global.hpp
  
    src/xbt/mmalloc/mm_interface.c
    )