From: Arnaud Giersch Date: Wed, 14 Jul 2021 19:23:34 +0000 (+0200) Subject: Remove deprecated features for next release (3.29). X-Git-Tag: v3.29~223 X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/10675785aab38470f386150c08e4c3ab8fcc8a71 Remove deprecated features for next release (3.29). --- diff --git a/MANIFEST.in b/MANIFEST.in index 2c4178930c..e794796615 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -2397,7 +2397,6 @@ include src/simix/popping_private.hpp include src/simix/simcalls.in include src/simix/simcalls.py include src/simix/smx_context.cpp -include src/simix/smx_deployment.cpp include src/simix/smx_global.cpp include src/simix/smx_private.hpp include src/smpi/bindings/smpi_f77.cpp diff --git a/docs/source/Doxyfile b/docs/source/Doxyfile index 374dff927a..5872d9f002 100644 --- a/docs/source/Doxyfile +++ b/docs/source/Doxyfile @@ -67,7 +67,6 @@ PREDEFINED += \ XBT_ATTRIB_NORETURN= \ XBT_ATTRIB_UNUSED= \ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(cname,parent,desc)= \ - XBT_ATTRIB_DEPRECATED_v329(mesg)= \ XBT_ATTRIB_DEPRECATED_v330(mesg)= \ XBT_ATTRIB_DEPRECATED_v331(mesg)= \ XBT_ATTRIB_DEPRECATED_v332(mesg)= diff --git a/docs/source/app_s4u.rst b/docs/source/app_s4u.rst index 79e4023ca9..38f44862b4 100644 --- a/docs/source/app_s4u.rst +++ b/docs/source/app_s4u.rst @@ -740,7 +740,6 @@ the execution, or start an asynchronous activity. .. doxygenfunction:: simgrid::s4u::this_actor::execute(double flop) .. doxygenfunction:: simgrid::s4u::this_actor::execute(double flop, double priority) .. doxygenfunction:: simgrid::s4u::this_actor::parallel_execute(const std::vector< s4u::Host * > &hosts, const std::vector< double > &flops_amounts, const std::vector< double > &bytes_amounts) - .. doxygenfunction:: simgrid::s4u::this_actor::parallel_execute(const std::vector< s4u::Host * > &hosts, const std::vector< double > &flops_amounts, const std::vector< double > &bytes_amounts, double timeout) .. group-tab:: Python diff --git a/include/simgrid/actor.h b/include/simgrid/actor.h index af0ef343db..d43239beab 100644 --- a/include/simgrid/actor.h +++ b/include/simgrid/actor.h @@ -64,11 +64,6 @@ XBT_PUBLIC void sg_actor_set_auto_restart(sg_actor_t actor, int auto_restart); XBT_PUBLIC void sg_actor_daemonize(sg_actor_t actor); XBT_PUBLIC int sg_actor_is_daemon(const_sg_actor_t actor); -#ifndef DOXYGEN -XBT_ATTRIB_DEPRECATED_v329("Please use sg_actor_set_host() instead") XBT_PUBLIC - void sg_actor_migrate(sg_actor_t process, sg_host_t host); -#endif - XBT_PUBLIC void sg_actor_set_host(sg_actor_t actor, sg_host_t host); XBT_PUBLIC void sg_actor_join(const_sg_actor_t actor, double timeout); XBT_PUBLIC void sg_actor_kill(sg_actor_t actor); diff --git a/include/simgrid/kernel/resource/Model.hpp b/include/simgrid/kernel/resource/Model.hpp index b36fc9933a..afa2e1fe77 100644 --- a/include/simgrid/kernel/resource/Model.hpp +++ b/include/simgrid/kernel/resource/Model.hpp @@ -61,12 +61,6 @@ public: /** @brief Set the maxmin system of the current Model */ void set_maxmin_system(lmm::System* system); - /** @brief Get the update algorithm of the current Model */ - XBT_ATTRIB_DEPRECATED_v329("Please use is_update_lazy()") UpdateAlgo get_update_algorithm() const - { - return update_algorithm_; - } - /** @brief Get Action heap */ ActionHeap& get_action_heap() { return action_heap_; } @@ -80,21 +74,6 @@ public: virtual double next_occurring_event_lazy(double now); virtual double next_occurring_event_full(double now); - XBT_ATTRIB_DEPRECATED_v329("Please use next_occurring_event()") virtual double next_occuring_event(double now) final - { - return next_occurring_event(now); - } - XBT_ATTRIB_DEPRECATED_v329("Please use next_occurring_event_lazy()") virtual double next_occuring_event_lazy( - double now) final - { - return next_occurring_event_lazy(now); - } - XBT_ATTRIB_DEPRECATED_v329("Please use next_occurring_event_full()") virtual double next_occuring_event_full( - double now) final - { - return next_occurring_event_full(now); - } - private: Action* extract_action(Action::StateSet* list); @@ -119,12 +98,6 @@ public: */ virtual bool next_occurring_event_is_idempotent() { return true; } - XBT_ATTRIB_DEPRECATED_v329( - "Please use next_occurring_event_is_idempotent()") virtual bool next_occuring_event_is_idempotent() final - { - return next_occurring_event_is_idempotent(); - } - /** @brief Gets the model name */ std::string get_name() const { return name_; } diff --git a/include/simgrid/msg.h b/include/simgrid/msg.h index 73041159a6..d64a3f57b3 100644 --- a/include/simgrid/msg.h +++ b/include/simgrid/msg.h @@ -298,12 +298,6 @@ XBT_PUBLIC void MSG_create_environment(const char* file); /** @brief Creates the application described in the provided file */ XBT_PUBLIC void MSG_launch_application(const char* file); -#ifndef DOXYGEN -/** @brief register functions bypassing the parser */ -XBT_ATTRIB_DEPRECATED_v329("This function will be removed. Speak up if you need it.") XBT_PUBLIC - void MSG_set_function(const char* host_id, const char* function_name, xbt_dynar_t arguments); -#endif - /** @brief A clock (in second). */ XBT_PUBLIC double MSG_get_clock(); /** @brief Returns the amount of messages sent since the simulation start */ diff --git a/include/simgrid/plugins/file_system.h b/include/simgrid/plugins/file_system.h index 39b45cb11c..49b13a3d40 100644 --- a/include/simgrid/plugins/file_system.h +++ b/include/simgrid/plugins/file_system.h @@ -117,11 +117,6 @@ public: /** Simulates a write action. Returns the size of data actually written. */ sg_size_t write(sg_size_t size, bool write_inside = false); - /** Allows to store user data on that host */ - XBT_ATTRIB_DEPRECATED_v329("Please use set_data()") void set_userdata(void* data) { set_data(data); } - /** Retrieves the previously stored data */ - XBT_ATTRIB_DEPRECATED_v329("Please use get_data()") void* get_userdata() { return get_data(); } - sg_size_t size() const; void seek(sg_offset_t pos); /** Sets the file head to the given position. */ void seek(sg_offset_t pos, int origin); /** Sets the file head to the given position from a given origin. */ diff --git a/include/simgrid/s4u/Actor.hpp b/include/simgrid/s4u/Actor.hpp index 1d2ac9318f..067fdd7ded 100644 --- a/include/simgrid/s4u/Actor.hpp +++ b/include/simgrid/s4u/Actor.hpp @@ -80,10 +80,6 @@ public: static xbt::signal on_wake_up; /** Signal to others that an actor is has been migrated to another host **/ static xbt::signal on_host_change; -#ifndef DOXYGEN - static xbt::signal on_migration_start; // XBT_ATTRIB_DEPRECATED_v329 - static xbt::signal on_migration_end; // XBT_ATTRIB_DEPRECATED_v329 -#endif /** Signal indicating that an actor terminated its code. * @beginrst @@ -208,9 +204,6 @@ public: * to take care of this yourself (only you knows which ones should be migrated). */ void set_host(Host* new_host); -#ifndef DOXYGEN - XBT_ATTRIB_DEPRECATED_v329("Please use set_host() instead") void migrate(Host* new_host) { set_host(new_host); } -#endif /** Ask the actor to die. * @@ -344,10 +337,6 @@ XBT_PUBLIC void execute(double flop, double priority); XBT_PUBLIC void parallel_execute(const std::vector& hosts, const std::vector& flops_amounts, const std::vector& bytes_amounts); -XBT_ATTRIB_DEPRECATED_v329("Please use exec_init(...)->wait_for(timeout)") XBT_PUBLIC - void parallel_execute(const std::vector& hosts, const std::vector& flops_amounts, - const std::vector& bytes_amounts, double timeout); - /** Initialize a sequential execution that must then be started manually */ XBT_PUBLIC ExecPtr exec_init(double flops_amounts); /** Initialize a parallel execution that must then be started manually */ @@ -397,9 +386,6 @@ XBT_PUBLIC void on_exit(const std::function& fun); /** @brief Migrate the current actor to a new host. */ XBT_PUBLIC void set_host(Host* new_host); -#ifndef DOXYGEN -XBT_ATTRIB_DEPRECATED_v329("Please use set_host() instead") XBT_PUBLIC void migrate(Host* new_host); -#endif } diff --git a/include/simgrid/s4u/Exec.hpp b/include/simgrid/s4u/Exec.hpp index c4ac5542d8..c6b3898288 100644 --- a/include/simgrid/s4u/Exec.hpp +++ b/include/simgrid/s4u/Exec.hpp @@ -78,9 +78,6 @@ public: ExecPtr set_bound(double bound); ExecPtr set_priority(double priority); -#ifndef DOXYGEN - XBT_ATTRIB_DEPRECATED_v329("Please use exec_init(...)->wait_for(timeout)") ExecPtr set_timeout(double timeout); -#endif Host* get_host() const; unsigned int get_host_number() const; diff --git a/include/simgrid/simix.h b/include/simgrid/simix.h index eeb501f90a..8009151397 100644 --- a/include/simgrid/simix.h +++ b/include/simgrid/simix.h @@ -48,51 +48,14 @@ XBT_PUBLIC void SIMIX_set_maestro(void (*code)(void*), void* data); XBT_ATTRIB_DEPRECATED_v332("Please use EngineImpl:run()") XBT_PUBLIC void SIMIX_run(); XBT_ATTRIB_DEPRECATED_v332("Please use simgrid_get_clock() or Engine::get_clock()") XBT_PUBLIC double SIMIX_get_clock(); -XBT_ATTRIB_DEPRECATED_v329("Please use simgrid::kernel::timer::Timer::set()") XBT_PUBLIC smx_timer_t - SIMIX_timer_set(double date, void (*function)(void*), void* arg); -XBT_ATTRIB_DEPRECATED_v329("Please use simgrid::kernel::timer::Timer::remove()") XBT_PUBLIC - void SIMIX_timer_remove(smx_timer_t timer); -XBT_ATTRIB_DEPRECATED_v329("Please use simgrid::kernel::timer::Timer::next()") XBT_PUBLIC double SIMIX_timer_next(); -XBT_ATTRIB_DEPRECATED_v329("Please use simgrid::kernel::timer::Timer::get_date()") XBT_PUBLIC - double SIMIX_timer_get_date(smx_timer_t timer); - -XBT_ATTRIB_DEPRECATED_v329("Please use simix_global->display_all_actor_status()") XBT_PUBLIC - void SIMIX_display_process_status(); SG_END_DECL -/******************************** Deployment **********************************/ -SG_BEGIN_DECL -XBT_ATTRIB_DEPRECATED_v329("Please use simgrid_register_default() or Engine::register_default()") XBT_PUBLIC - void SIMIX_function_register_default(xbt_main_func_t code); -XBT_ATTRIB_DEPRECATED_v329("This function will be removed") XBT_PUBLIC void SIMIX_init_application(); - -XBT_PUBLIC void SIMIX_process_set_function(const char* process_host, const char* process_function, - xbt_dynar_t arguments, double process_start_time, double process_kill_time); -SG_END_DECL - -#ifdef __cplusplus -XBT_ATTRIB_DEPRECATED_v329("Please use simgrid_register_function() or Engine::register_function()") XBT_PUBLIC - void SIMIX_function_register(const std::string& name, void (*code)(std::vector)); -XBT_ATTRIB_DEPRECATED_v329("Please use simgrid_register_function() or Engine::register_function()") XBT_PUBLIC - void SIMIX_function_register(const std::string& name, xbt_main_func_t code); -XBT_ATTRIB_DEPRECATED_v329("Please use simgrid_load_deployment() or Engine::load_deployment()") XBT_PUBLIC - void SIMIX_launch_application(const std::string& file); -#endif - /********************************* Process ************************************/ SG_BEGIN_DECL -XBT_ATTRIB_DEPRECATED_v329("Please use sg_actor_count()") XBT_PUBLIC int SIMIX_process_count(); XBT_PUBLIC smx_actor_t SIMIX_process_self(); XBT_PUBLIC const char* SIMIX_process_self_get_name(); -XBT_ATTRIB_DEPRECATED_v329("This function will be removed") XBT_PUBLIC void SIMIX_process_self_set_data(void* data); -XBT_ATTRIB_DEPRECATED_v329("This function will be removed") XBT_PUBLIC void* SIMIX_process_self_get_data(); SG_END_DECL -#ifdef __cplusplus -XBT_ATTRIB_DEPRECATED_v329("This function will be removed") XBT_PUBLIC - void SIMIX_process_on_exit(smx_actor_t process, const std::function& fun); -#endif - /****************************** Communication *********************************/ #ifdef __cplusplus XBT_PUBLIC void SIMIX_comm_set_copy_data_callback(void (*callback)(simgrid::kernel::activity::CommImpl*, void*, @@ -126,19 +89,6 @@ XBT_ATTRIB_DEPRECATED_v330("Please use s4u::Exec::test()") XBT_PUBLIC #endif -/**************************** Process simcalls ********************************/ -SG_BEGIN_DECL -XBT_ATTRIB_DEPRECATED_v329("This function will be removed") void simcall_process_set_data(smx_actor_t process, - void* data); -XBT_ATTRIB_DEPRECATED_v329("Please use sg_actor_sleep_for()") XBT_PUBLIC -#ifdef __cplusplus - simgrid::kernel::activity::State -#else - enum kernel_activity_state -#endif - simcall_process_sleep(double duration); -SG_END_DECL - /************************** Communication simcalls ****************************/ #ifdef __cplusplus diff --git a/include/xbt/base.h b/include/xbt/base.h index d764f5ee30..e8e091e676 100644 --- a/include/xbt/base.h +++ b/include/xbt/base.h @@ -53,8 +53,6 @@ #define XBT_ATTRIB_DEPRECATED(mesg) __attribute__((deprecated(mesg))) #endif -#define XBT_ATTRIB_DEPRECATED_v329(mesg) \ - XBT_ATTRIB_DEPRECATED(mesg " (this compatibility wrapper will be dropped after v3.28)") #define XBT_ATTRIB_DEPRECATED_v330(mesg) \ XBT_ATTRIB_DEPRECATED(mesg " (this compatibility wrapper will be dropped after v3.29)") #define XBT_ATTRIB_DEPRECATED_v331(mesg) \ diff --git a/src/kernel/actor/ActorImpl.cpp b/src/kernel/actor/ActorImpl.cpp index 347c9614d0..587e847362 100644 --- a/src/kernel/actor/ActorImpl.cpp +++ b/src/kernel/actor/ActorImpl.cpp @@ -526,22 +526,6 @@ void create_maestro(const std::function& code) } // namespace kernel } // namespace simgrid -int SIMIX_process_count() // XBT_ATTRIB_DEPRECATED_v329 -{ - return simgrid::kernel::EngineImpl::get_instance()->get_actor_list().size(); -} - -void* SIMIX_process_self_get_data() // XBT_ATTRIB_DEPRECATED_v329 -{ - const simgrid::s4u::Actor* self = simgrid::s4u::Actor::self(); - return self ? self->get_data() : nullptr; -} - -void SIMIX_process_self_set_data(void* data) // XBT_ATTRIB_DEPRECATED_v329 -{ - simgrid::s4u::Actor::self()->set_data(data); -} - /* needs to be public and without simcall because it is called by exceptions and logging events */ const char* SIMIX_process_self_get_name() @@ -554,15 +538,3 @@ smx_actor_t SIMIX_process_from_PID(aid_t pid) // XBT_ATTRIB_DEPRECATD_v331 { return simgrid::kernel::actor::ActorImpl::by_pid(pid); } - -void SIMIX_process_on_exit(smx_actor_t actor, - const std::function& fun) // XBT_ATTRIB_DEPRECATED_v329 -{ - xbt_assert(actor, "current process not found: are you in maestro context ?"); - actor->on_exit->emplace_back(fun); -} - -void simcall_process_set_data(smx_actor_t process, void* data) // XBT_ATTRIB_DEPRECATED_v329 -{ - simgrid::kernel::actor::simcall([process, data] { process->get_ciface()->set_data(data); }); -} diff --git a/src/msg/msg_global.cpp b/src/msg/msg_global.cpp index d927e443a0..f1610fe7ee 100644 --- a/src/msg/msg_global.cpp +++ b/src/msg/msg_global.cpp @@ -74,9 +74,3 @@ unsigned long int MSG_get_sent_msg() { return msg_global->sent_msg; } - -/** @brief register functions bypassing the parser */ -void MSG_set_function(const char* host_id, const char* function_name, xbt_dynar_t arguments) -{ - SIMIX_process_set_function(host_id, function_name, arguments, -1, -1); -} diff --git a/src/s4u/s4u_Actor.cpp b/src/s4u/s4u_Actor.cpp index 5a67ebda72..363569617b 100644 --- a/src/s4u/s4u_Actor.cpp +++ b/src/s4u/s4u_Actor.cpp @@ -32,10 +32,6 @@ xbt::signal s4u::Actor::on_suspend; xbt::signal s4u::Actor::on_resume; xbt::signal s4u::Actor::on_sleep; xbt::signal s4u::Actor::on_wake_up; -#ifndef DOXYGEN -xbt::signal s4u::Actor::on_migration_start; // XBT_ATTRIB_DEPRECATED_v329 -xbt::signal s4u::Actor::on_migration_end; // XBT_ATTRIB_DEPRECATED_v329 -#endif xbt::signal s4u::Actor::on_host_change; xbt::signal s4u::Actor::on_termination; xbt::signal s4u::Actor::on_destruction; @@ -144,16 +140,6 @@ void Actor::on_exit(const std::function& fun) const void Actor::set_host(Host* new_host) { - if (s4u::Actor::on_migration_start.get_slot_count() > 0) { // XBT_ATTRIB_DEPRECATED_v329 - static bool already_warned = false; - if (not already_warned) { - XBT_INFO("Please use s4u::Actor::on_host_change instead of s4u::Actor::on_migration_start. This will be removed " - "in v3.29"); - already_warned = true; - } - s4u::Actor::on_migration_start(*this); - } - const s4u::Host* previous_location = get_host(); kernel::actor::simcall([this, new_host]() { @@ -165,16 +151,6 @@ void Actor::set_host(Host* new_host) this->pimpl_->set_host(new_host); }); - if (s4u::Actor::on_migration_end.get_slot_count() > 0) { // XBT_ATTRIB_DEPRECATED_v329 - static bool already_warned = false; - if (not already_warned) { - XBT_INFO("Please use s4u::Actor::on_host_change instead of s4u::Actor::on_migration_end. This will be removed in " - "v3.29"); - already_warned = true; - } - s4u::Actor::on_migration_end(*this); - } - s4u::Actor::on_host_change(*this, *previous_location); } @@ -373,12 +349,6 @@ void parallel_execute(const std::vector& hosts, const std::vectorwait(); } -void parallel_execute(const std::vector& hosts, const std::vector& flops_amounts, - const std::vector& bytes_amounts, double timeout) // XBT_ATTRIB_DEPRECATED_v329 -{ - exec_init(hosts, flops_amounts, bytes_amounts)->wait_for(timeout); -} - ExecPtr exec_init(double flops_amount) { return Exec::init()->set_flops_amount(flops_amount)->set_host(get_host()); @@ -468,10 +438,6 @@ void set_host(Host* new_host) { simgrid::kernel::actor::ActorImpl::self()->get_iface()->set_host(new_host); } -void migrate(Host* new_host) // XBT_ATTRIB_DEPRECATED_v329 -{ - set_host(new_host); -} } // namespace this_actor } // namespace s4u @@ -687,10 +653,6 @@ void sg_actor_set_host(sg_actor_t actor, sg_host_t host) { actor->set_host(host); } -void sg_actor_migrate(sg_actor_t actor, sg_host_t host) // XBT_ATTRIB_DEPRECATED_v329 -{ - actor->set_host(host); -} /** * @brief Wait for the completion of a #sg_actor_t. diff --git a/src/s4u/s4u_Exec.cpp b/src/s4u/s4u_Exec.cpp index 71368f7420..febefcebc6 100644 --- a/src/s4u/s4u_Exec.cpp +++ b/src/s4u/s4u_Exec.cpp @@ -100,15 +100,6 @@ ExecPtr Exec::set_priority(double priority) return this; } -ExecPtr Exec::set_timeout(double timeout) // XBT_ATTRIB_DEPRECATED_v329 -{ - xbt_assert(state_ == State::INITED || state_ == State::STARTING, - "Cannot change the bound of an exec after its start"); - kernel::actor::simcall( - [this, timeout] { boost::static_pointer_cast(pimpl_)->set_timeout(timeout); }); - return this; -} - ExecPtr Exec::set_flops_amount(double flops_amount) { xbt_assert(state_ == State::INITED || state_ == State::STARTING, diff --git a/src/simix/libsmx.cpp b/src/simix/libsmx.cpp index d32231a1ae..5d323db06f 100644 --- a/src/simix/libsmx.cpp +++ b/src/simix/libsmx.cpp @@ -75,12 +75,6 @@ unsigned int simcall_execution_waitany_for(simgrid::kernel::activity::ExecImpl* &observer); } -simgrid::kernel::activity::State simcall_process_sleep(double duration) // XBT_ATTRIB_DEPRECATED_v329 -{ - simgrid::kernel::actor::ActorImpl::self()->sleep(duration); - return simgrid::kernel::activity::State::DONE; -} - /** * @ingroup simix_comm_management */ diff --git a/src/simix/smx_deployment.cpp b/src/simix/smx_deployment.cpp deleted file mode 100644 index d353db2210..0000000000 --- a/src/simix/smx_deployment.cpp +++ /dev/null @@ -1,70 +0,0 @@ -/* Copyright (c) 2007-2021. 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/s4u/Host.hpp" -#include "smx_private.hpp" -#include "src/kernel/EngineImpl.hpp" -#include "src/surf/xml/platf_private.hpp" // FIXME: KILLME. There must be a better way than mimicking XML here -#include -#include - -#include -#include - -XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_deployment, simix, "Logging specific to SIMIX (deployment)"); - -void SIMIX_init_application() // XBT_ATTRIB_DEPRECATED_v329 -{ - sg_platf_exit(); - sg_platf_init(); -} - -void SIMIX_launch_application(const std::string& file) // XBT_ATTRIB_DEPRECATED_v329 -{ - simgrid_load_deployment(file.c_str()); -} -void SIMIX_function_register(const std::string& name, xbt_main_func_t code) // XBT_ATTRIB_DEPRECATED_v329 -{ - simgrid::s4u::Engine::get_instance()->register_function(name, code); -} -void SIMIX_function_register(const std::string& name, - void (*code)(std::vector)) // XBT_ATTRIB_DEPRECATED_v329 -{ - simgrid::s4u::Engine::get_instance()->register_function(name, code); -} -void SIMIX_function_register_default(xbt_main_func_t code) // XBT_ATTRIB_DEPRECATED_v329 -{ - simgrid::s4u::Engine::get_instance()->register_default(code); -} - -/** @brief Bypass the parser, get arguments, and set function to each process */ -void SIMIX_process_set_function(const char* process_host, const char* process_function, xbt_dynar_t arguments, - double process_start_time, double process_kill_time) // XBT_ATTRIB_DEPRECATED_v329 -{ - simgrid::kernel::routing::ActorCreationArgs actor; - - const simgrid::s4u::Host* host = sg_host_by_name(process_host); - if (not host) - throw std::invalid_argument(simgrid::xbt::string_printf("Host '%s' unknown", process_host)); - actor.host = process_host; - actor.args.emplace_back(process_function); - /* add arguments */ - unsigned int i; - char *arg; - xbt_dynar_foreach(arguments, i, arg) { - actor.args.emplace_back(arg); - } - - // Check we know how to handle this function name: - const simgrid::kernel::actor::ActorCodeFactory& parse_code = - simgrid::kernel::EngineImpl::get_instance()->get_function(process_function); - xbt_assert(parse_code, "Function '%s' unknown", process_function); - - actor.function = process_function; - actor.kill_time = process_kill_time; - actor.start_time = process_start_time; - actor.restart_on_failure = false; - sg_platf_new_actor(&actor); -} diff --git a/src/simix/smx_global.cpp b/src/simix/smx_global.cpp index 21a2e63f72..3256da84cd 100644 --- a/src/simix/smx_global.cpp +++ b/src/simix/smx_global.cpp @@ -249,33 +249,6 @@ void SIMIX_run() // XBT_ATTRIB_DEPRECATED_v332 simgrid::kernel::EngineImpl::get_instance()->run(); } -double SIMIX_timer_next() // XBT_ATTRIB_DEPRECATED_v329 -{ - return simgrid::kernel::timer::Timer::next(); -} - -smx_timer_t SIMIX_timer_set(double date, void (*callback)(void*), void* arg) // XBT_ATTRIB_DEPRECATED_v329 -{ - return simgrid::kernel::timer::Timer::set(date, std::bind(callback, arg)); -} - -/** @brief cancels a timer that was added earlier */ -void SIMIX_timer_remove(smx_timer_t timer) // XBT_ATTRIB_DEPRECATED_v329 -{ - timer->remove(); -} - -/** @brief Returns the date at which the timer will trigger (or 0 if nullptr timer) */ -double SIMIX_timer_get_date(smx_timer_t timer) // XBT_ATTRIB_DEPRECATED_v329 -{ - return timer ? timer->get_date() : 0.0; -} - -void SIMIX_display_process_status() // XBT_ATTRIB_DEPRECATED_v329 -{ - simgrid::kernel::EngineImpl::get_instance()->display_all_actor_status(); -} - int SIMIX_is_maestro() { if (simix_global == nullptr) // SimDag diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake index 0168bb8c37..2eb0b7360a 100644 --- a/tools/cmake/DefinePackages.cmake +++ b/tools/cmake/DefinePackages.cmake @@ -399,7 +399,6 @@ set(SIMIX_SRC src/kernel/context/ContextSwapped.hpp src/kernel/context/ContextThread.cpp src/kernel/context/ContextThread.hpp - src/simix/smx_deployment.cpp src/simix/smx_global.cpp src/simix/popping.cpp src/kernel/activity/ActivityImpl.cpp