Move the non-deprecated bits of simix to kernel::actor::Simcall

[simgrid.git] / src / simix / libsmx.cpp

diff --git a/src/simix/libsmx.cpp b/src/simix/libsmx.cpp
index 24a2eef..79b6a89 100644 (file)
--- a/src/simix/libsmx.cpp
+++ b/src/simix/libsmx.cpp
@@ -1,28 +1,21 @@
-/* libsmx.c - public interface to simix                                       */
-/* --------                                                                   */
-/* These functions are the only ones that are visible from the higher levels  */
-/* (most of them simply add some documentation to the generated simcall body) */
-/*                                                                            */
-/* This is somehow the "libc" of SimGrid                                      */
+/* This file only contains deprecated code, and will die with v3.25           */
 
-/* Copyright (c) 2010-2022. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2010-2023. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
+#include "simgrid/config.h"
+#include "simgrid/modelchecker.h"
 #include "src/kernel/EngineImpl.hpp"
 #include "src/kernel/activity/CommImpl.hpp"
 #include "src/kernel/actor/SimcallObserver.hpp"
+#include "src/mc/mc_replay.hpp"
 #include <simgrid/s4u/Activity.hpp>
 
 #define SIMIX_H_NO_DEPRECATED_WARNING // avoid deprecation warning on include (remove with XBT_ATTRIB_DEPRECATED_v335)
 #include <simgrid/simix.h>
 
-XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(ker_simcall);
-
-/**
- * @ingroup simix_comm_management
- */
 void simcall_comm_send(simgrid::kernel::actor::ActorImpl* sender, simgrid::kernel::activity::MailboxImpl* mbox,
                        double task_size, double rate, void* src_buff, size_t src_buff_size,
                        bool (*match_fun)(void*, void*, simgrid::kernel::activity::CommImpl*),
@@ -34,9 +27,6 @@ void simcall_comm_send(simgrid::kernel::actor::ActorImpl* sender, simgrid::kerne
                            copy_data_fun, data, timeout);
 }
 
-/**
- * @ingroup simix_comm_management
- */
 simgrid::kernel::activity::ActivityImplPtr
 simcall_comm_isend(simgrid::kernel::actor::ActorImpl* sender, simgrid::kernel::activity::MailboxImpl* mbox,
                    double task_size, double rate, void* src_buff, size_t src_buff_size,
@@ -57,9 +47,6 @@ simcall_comm_isend(simgrid::kernel::actor::ActorImpl* sender, simgrid::kernel::a
       [&observer] { return simgrid::kernel::activity::CommImpl::isend(&observer); });
 }
 
-/**
- * @ingroup simix_comm_management
- */
 void simcall_comm_recv(simgrid::kernel::actor::ActorImpl* receiver, simgrid::kernel::activity::MailboxImpl* mbox,
                        void* dst_buff, size_t* dst_buff_size,
                        bool (*match_fun)(void*, void*, simgrid::kernel::activity::CommImpl*),
@@ -71,9 +58,6 @@ void simcall_comm_recv(simgrid::kernel::actor::ActorImpl* receiver, simgrid::ker
                            timeout, rate);
 }
 
-/**
- * @ingroup simix_comm_management
- */
 simgrid::kernel::activity::ActivityImplPtr
 simcall_comm_irecv(simgrid::kernel::actor::ActorImpl* receiver, simgrid::kernel::activity::MailboxImpl* mbox,
                    void* dst_buff, size_t* dst_buff_size,
@@ -89,9 +73,6 @@ simcall_comm_irecv(simgrid::kernel::actor::ActorImpl* receiver, simgrid::kernel:
       [&observer] { return simgrid::kernel::activity::CommImpl::irecv(&observer); });
 }
 
-/**
- * @ingroup simix_comm_management
- */
 ssize_t simcall_comm_waitany(simgrid::kernel::activity::CommImpl* comms[], size_t count,
                              double timeout) // XBT_ATTRIB_DEPRECATED_v335
 {
@@ -111,9 +92,6 @@ ssize_t simcall_comm_waitany(simgrid::kernel::activity::CommImpl* comms[], size_
   return changed_pos;
 }
 
-/**
- * @ingroup simix_comm_management
- */
 ssize_t simcall_comm_testany(simgrid::kernel::activity::CommImpl* comms[], size_t count) // XBT_ATTRIB_DEPRECATED_v335
 {
   if (count == 0)
@@ -134,9 +112,6 @@ ssize_t simcall_comm_testany(simgrid::kernel::activity::CommImpl* comms[], size_
   return changed_pos;
 }
 
-/**
- * @ingroup simix_comm_management
- */
 void simcall_comm_wait(simgrid::kernel::activity::ActivityImpl* comm, double timeout) // XBT_ATTRIB_DEPRECATED_v335
 {
   xbt_assert(std::isfinite(timeout), "timeout is not finite!");
@@ -144,10 +119,6 @@ void simcall_comm_wait(simgrid::kernel::activity::ActivityImpl* comm, double tim
   simgrid::kernel::actor::simcall_blocking([issuer, comm, timeout] { comm->wait_for(issuer, timeout); });
 }
 
-/**
- * @ingroup simix_comm_management
- *
- */
 bool simcall_comm_test(simgrid::kernel::activity::ActivityImpl* comm) // XBT_ATTRIB_DEPRECATED_v335
 {
   simgrid::kernel::actor::ActorImpl* issuer = simgrid::kernel::actor::ActorImpl::self();
@@ -159,34 +130,3 @@ bool simcall_comm_test(simgrid::kernel::activity::ActivityImpl* comm) // XBT_ATT
   }
   return false;
 }
-
-static void simcall(simgrid::kernel::actor::Simcall::Type call, std::function<void()> const& code)
-{
-  auto self = simgrid::kernel::actor::ActorImpl::self();
-  self->simcall_.call_ = call;
-  self->simcall_.code_ = &code;
-  if (not simgrid::kernel::EngineImpl::get_instance()->is_maestro(self)) {
-    XBT_DEBUG("Yield process '%s' on simcall %s", self->get_cname(), self->simcall_.get_cname());
-    self->yield();
-  } else {
-    self->simcall_handle(0);
-  }
-}
-
-void simcall_run_answered(std::function<void()> const& code, simgrid::kernel::actor::SimcallObserver* observer)
-{
-  simgrid::kernel::actor::ActorImpl::self()->simcall_.observer_ = observer;
-  // The function `code` is called in kernel mode (either because we are already in maestor or after a context switch)
-  // and simcall_answer() is called
-  simcall(simgrid::kernel::actor::Simcall::Type::RUN_ANSWERED, code);
-  simgrid::kernel::actor::ActorImpl::self()->simcall_.observer_ = nullptr;
-}
-
-void simcall_run_blocking(std::function<void()> const& code, simgrid::kernel::actor::SimcallObserver* observer)
-{
-  simgrid::kernel::actor::ActorImpl::self()->simcall_.observer_ = observer;
-  // The function `code` is called in kernel mode (either because we are already in maestor or after a context switch)
-  // BUT simcall_answer IS NOT CALLED
-  simcall(simgrid::kernel::actor::Simcall::Type::RUN_BLOCKING, code);
-  simgrid::kernel::actor::ActorImpl::self()->simcall_.observer_ = nullptr;
-}