include src/simgrid/sg_version.cpp
include src/simgrid/util.hpp
include src/simix/libsmx.cpp
-include src/simix/smx_context.cpp
include src/smpi/bindings/smpi_f77.cpp
include src/smpi/bindings/smpi_f77_coll.cpp
include src/smpi/bindings/smpi_f77_comm.cpp
XBT_ATTRIB_NORETURN= \
XBT_ATTRIB_UNUSED= \
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(cname,parent,desc)= \
- XBT_ATTRIB_DEPRECATED_v333(mesg)= \
XBT_ATTRIB_DEPRECATED_v334(mesg)= \
XBT_ATTRIB_DEPRECATED_v335(mesg)= \
XBT_ATTRIB_DEPRECATED_v336(mesg)=
/*** Called on each newly created regular route (not on bypass routes) */
static xbt::signal<void(bool symmetrical, NetPoint* src, NetPoint* dst, NetPoint* gw_src, NetPoint* gw_dst,
std::vector<resource::StandardLinkImpl*> const& link_list)>
- on_route_creation; // XBT_ATTRIB_DEPRECATED_v332 : should be an internal signal used by NS3.. if necessary,
+ on_route_creation; // FIXME: XBT_ATTRIB_DEPRECATED_v332: should be an internal signal used by NS3.. if necessary,
// callback shouldn't use LinkImpl*
private:
#define SIMGRID_SIMIX_H
#include <simgrid/forward.h>
-#include <xbt/parmap.h>
+// avoid deprecation warning on include (remove entire file with XBT_ATTRIB_DEPRECATED_v335)
#ifndef SIMIX_H_NO_DEPRECATED_WARNING
#warning simgrid/simix.h is deprecated and will be removed in v3.35.
#endif
-/******************************* Networking ***********************************/
-SG_BEGIN_DECL
-
-/* parallelism */
-XBT_ATTRIB_DEPRECATED_v333("Please use kernel::context::is_parallel()") XBT_PUBLIC int SIMIX_context_is_parallel();
-XBT_ATTRIB_DEPRECATED_v333("Please use kernel::context::get_nthreads()") XBT_PUBLIC int SIMIX_context_get_nthreads();
-XBT_ATTRIB_DEPRECATED_v333("Please use kernel::context::set_nthreads()") XBT_PUBLIC
- void SIMIX_context_set_nthreads(int nb_threads);
-XBT_ATTRIB_DEPRECATED_v333("Please use kernel::context::get_parallel_mode()") XBT_PUBLIC e_xbt_parmap_mode_t
- SIMIX_context_get_parallel_mode();
-XBT_ATTRIB_DEPRECATED_v333("Please use kernel::context::set_parallel_mode()") XBT_PUBLIC
- void SIMIX_context_set_parallel_mode(e_xbt_parmap_mode_t mode);
-XBT_ATTRIB_DEPRECATED_v333("Please use Actor::is_maestro()") XBT_PUBLIC int SIMIX_is_maestro();
-
-/********************************** Global ************************************/
-/* Set some code to execute in the maestro (must be used before the engine creation)
- *
- * If no maestro code is registered (the default), the main thread
- * is assumed to be the maestro. */
-XBT_ATTRIB_DEPRECATED_v333("Please use simgrid_set_maestro()") XBT_PUBLIC
- void SIMIX_set_maestro(void (*code)(void*), void* data);
-
-SG_END_DECL
-
-/********************************* Process ************************************/
-SG_BEGIN_DECL
-XBT_ATTRIB_DEPRECATED_v333("Please use kernel::actor::ActorImpl::self()") XBT_PUBLIC
#ifdef __cplusplus
- simgrid::kernel::actor::ActorImpl*
-#else
- smx_actor_t
-#endif
- SIMIX_process_self();
-XBT_ATTRIB_DEPRECATED_v333("Please use xbt_procname()") XBT_PUBLIC const char* SIMIX_process_self_get_name();
-SG_END_DECL
-
-/****************************** Communication *********************************/
-#ifdef __cplusplus
-XBT_ATTRIB_DEPRECATED_v333("Please use Engine::set_default_comm_data_copy_callback()") XBT_PUBLIC
- void SIMIX_comm_set_copy_data_callback(void (*callback)(simgrid::kernel::activity::CommImpl*, void*, size_t));
-
-XBT_ATTRIB_DEPRECATED_v333("Please use Comm::copy_buffer_callback()") XBT_PUBLIC
- void SIMIX_comm_copy_pointer_callback(simgrid::kernel::activity::CommImpl* comm, void* buff, size_t buff_size);
-XBT_ATTRIB_DEPRECATED_v333("Please use Comm::copy_pointer_callback()") XBT_PUBLIC
- void SIMIX_comm_copy_buffer_callback(simgrid::kernel::activity::CommImpl* comm, void* buff, size_t buff_size);
/******************************************************************************/
/* SIMIX simcalls */
#define XBT_ATTRIB_DEPRECATED(mesg) __attribute__((deprecated(mesg)))
#endif
-#define XBT_ATTRIB_DEPRECATED_v333(mesg) \
- XBT_ATTRIB_DEPRECATED(mesg " (this compatibility wrapper will be dropped after v3.32)")
#define XBT_ATTRIB_DEPRECATED_v334(mesg) \
XBT_ATTRIB_DEPRECATED(mesg " (this compatibility wrapper will be dropped after v3.33)")
#define XBT_ATTRIB_DEPRECATED_v335(mesg) \
#include <simgrid/modelchecker.h>
#include <simgrid/s4u/Host.hpp>
-#define SIMIX_H_NO_DEPRECATED_WARNING // avoid deprecation warning on include (remove with XBT_ATTRIB_DEPRECATED_v333)
-#include <simgrid/simix.h>
-
#include "src/kernel/EngineImpl.hpp"
#include "src/kernel/activity/CommImpl.hpp"
#include "src/kernel/activity/MailboxImpl.hpp"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(ker_network, kernel, "Kernel network-related synchronization");
-/******************************************************************************/
-/* SIMIX_comm_copy_data callbacks */
-/******************************************************************************/
-// XBT_ATTRIB_DEPRECATED_v333
-void SIMIX_comm_set_copy_data_callback(void (*callback)(simgrid::kernel::activity::CommImpl*, void*, size_t))
-{
- simgrid::kernel::activity::CommImpl::set_copy_data_callback(callback);
-}
-
-// XBT_ATTRIB_DEPRECATED_v333
-void SIMIX_comm_copy_buffer_callback(simgrid::kernel::activity::CommImpl* comm, void* buff, size_t buff_size)
-{
- simgrid::s4u::Comm::copy_buffer_callback(comm, buff, buff_size);
-}
-
-// XBT_ATTRIB_DEPRECATED_v333
-void SIMIX_comm_copy_pointer_callback(simgrid::kernel::activity::CommImpl* comm, void* buff, size_t buff_size)
-{
- simgrid::s4u::Comm::copy_pointer_callback(comm, buff, buff_size);
-}
-
namespace simgrid::kernel::activity {
xbt::signal<void(CommImpl const&)> CommImpl::on_start;
xbt::signal<void(CommImpl const&)> CommImpl::on_completion;
#include <simgrid/s4u/Actor.hpp>
#include <simgrid/s4u/Host.hpp>
-#define SIMIX_H_NO_DEPRECATED_WARNING // avoid deprecation warning on include (remove with XBT_ATTRIB_DEPRECATED_v333)
-#include <simgrid/simix.h>
-
#include "src/kernel/EngineImpl.hpp"
#if HAVE_SMPI
#include "src/smpi/include/private.hpp"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(ker_actor, kernel, "Logging specific to Actor's kernel side");
-/**
- * @brief Returns the current agent.
- *
- * This functions returns the currently running SIMIX process.
- *
- * @return The SIMIX process
- */
-simgrid::kernel::actor::ActorImpl* SIMIX_process_self() // XBT_ATTRIB_DEPRECATED_v333
-{
- return simgrid::kernel::actor::ActorImpl::self();
-}
-
namespace simgrid::kernel::actor {
/*------------------------- [ ActorIDTrait ] -------------------------*/
}
} // namespace simgrid::kernel::actor
-
-/* needs to be public and without simcall because it is called by exceptions and logging events */
-const char* SIMIX_process_self_get_name() // XBT_ATTRIB_DEPRECATED_v333
-{
- return simgrid::s4u::Actor::is_maestro() ? "maestro" : simgrid::kernel::actor::ActorImpl::self()->get_cname();
-}
-
-int SIMIX_is_maestro() // XBT_ATTRIB_DEPRECATED_v333
-{
- const auto* self = simgrid::kernel::actor::ActorImpl::self();
- return self != nullptr && self->is_maestro();
-}
#include <simgrid/modelchecker.h>
#include <simgrid/s4u/Engine.hpp>
-#define SIMIX_H_NO_DEPRECATED_WARNING // avoid deprecation warning on include (remove with XBT_ATTRIB_DEPRECATED_v333)
-#include <simgrid/simix.h>
-
#include "mc/mc.h"
#include "src/instr/instr_private.hpp"
#include "src/kernel/EngineImpl.hpp"
#endif
maestro_code = std::bind(code, data);
}
-void SIMIX_set_maestro(void (*code)(void*), void* data) // XBT_ATTRIB_DEPRECATED_v333
-{
- simgrid_set_maestro(code, data);
-}
+++ /dev/null
-/* a fast and simple context switching library */
-
-/* Copyright (c) 2009-2022. 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 "src/kernel/context/Context.hpp"
-
-#define SIMIX_H_NO_DEPRECATED_WARNING // avoid deprecation warning on include (remove with XBT_ATTRIB_DEPRECATED_v333)
-#include <simgrid/simix.h>
-
-int SIMIX_context_is_parallel() // XBT_ATTRIB_DEPRECATED_v333
-{
- return simgrid::kernel::context::is_parallel();
-}
-
-int SIMIX_context_get_nthreads() // XBT_ATTRIB_DEPRECATED_v333
-{
- return simgrid::kernel::context::get_nthreads();
-}
-
-void SIMIX_context_set_nthreads(int nb_threads) // XBT_ATTRIB_DEPRECATED_v333
-{
- simgrid::kernel::context::set_nthreads(nb_threads);
-}
-
-e_xbt_parmap_mode_t SIMIX_context_get_parallel_mode() // XBT_ATTRIB_DEPRECATED_v333
-{
- return simgrid::kernel::context::get_parallel_mode();
-}
-
-void SIMIX_context_set_parallel_mode(e_xbt_parmap_mode_t mode) // XBT_ATTRIB_DEPRECATED_v333
-{
- simgrid::kernel::context::set_parallel_mode(mode);
-}
src/kernel/context/ContextThread.cpp
src/kernel/context/ContextThread.hpp
src/simix/libsmx.cpp
- src/simix/smx_context.cpp
)
# Boost context may not be available
