-/* Copyright (c) 2004-2020. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2004-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. */
namespace s4u {
class Activity;
-/** Smart pointer to a simgrid::s4u::Actor */
+/** Smart pointer to a simgrid::s4u::Activity */
using ActivityPtr = boost::intrusive_ptr<Activity>;
XBT_PUBLIC void intrusive_ptr_release(const Activity* actor);
XBT_PUBLIC void intrusive_ptr_add_ref(const Activity* actor);
XBT_PUBLIC void intrusive_ptr_add_ref(Io* i);
class Link;
+class SplitDuplexLink;
class Mailbox;
class Semaphore;
/** Smart pointer to a simgrid::s4u::Semaphore */
using SemaphorePtr = boost::intrusive_ptr<Semaphore>;
-XBT_PUBLIC void intrusive_ptr_release(Semaphore* m);
-XBT_PUBLIC void intrusive_ptr_add_ref(Semaphore* m);
+XBT_PUBLIC void intrusive_ptr_release(const Semaphore* m);
+XBT_PUBLIC void intrusive_ptr_add_ref(const Semaphore* m);
class Disk;
-class Storage;
+/**
+ * @brief Callback to dynamically change the resource's capacity
+ *
+ * Allows user to change resource's capacity depending on the number of concurrent activities
+ * running on the resource at a given instant
+ */
+using NonLinearResourceCb = std::function<double(double capacity, int n_activities)>;
} // namespace s4u
namespace config {
using ActorCode = std::function<void()>;
// Create an ActorCode from the parameters parsed in the XML file (or elsewhere)
using ActorCodeFactory = std::function<ActorCode(std::vector<std::string> args)>;
+
+class SimcallObserver;
} // namespace actor
namespace activity {
XBT_PUBLIC void intrusive_ptr_release(ActivityImpl* activity);
class ConditionVariableImpl;
+ using ConditionVariableImplPtr = boost::intrusive_ptr<ConditionVariableImpl>;
+ XBT_PUBLIC void intrusive_ptr_add_ref(ConditionVariableImpl* cond);
+ XBT_PUBLIC void intrusive_ptr_release(ConditionVariableImpl* cond);
class CommImpl;
using CommImplPtr = boost::intrusive_ptr<CommImpl>;
using IoImplPtr = boost::intrusive_ptr<IoImpl>;
class MutexImpl;
using MutexImplPtr = boost::intrusive_ptr<MutexImpl>;
+ XBT_PUBLIC void intrusive_ptr_add_ref(MutexImpl* mutex);
+ XBT_PUBLIC void intrusive_ptr_release(MutexImpl* mutex);
class RawImpl;
using RawImplPtr = boost::intrusive_ptr<RawImpl>;
class SemaphoreImpl;
using SemaphoreImplPtr = boost::intrusive_ptr<SemaphoreImpl>;
+ XBT_PUBLIC void intrusive_ptr_add_ref(SemaphoreImpl* sem);
+ XBT_PUBLIC void intrusive_ptr_release(SemaphoreImpl* sem);
class SleepImpl;
using SleepImplPtr = boost::intrusive_ptr<SleepImpl>;
}
namespace resource {
class Action;
-class Cpu;
+class CpuImpl;
class Model;
class Resource;
class CpuModel;
class NetworkModel;
+class NetworkModelIntf;
class LinkImpl;
+class SplitDuplexLinkImpl;
+class LinkImplIntf;
class NetworkAction;
class DiskImpl;
class DiskModel;
-class StorageImpl;
-class StorageType;
-class StorageModel;
+}
+namespace timer {
+class Timer;
}
namespace routing {
-class ClusterCreationArgs;
-class LinkCreationArgs;
class NetPoint;
class NetZoneImpl;
-class RouteCreationArgs;
}
namespace profile {
class Event;
} // namespace kernel
namespace simix {
class Host;
- class Timer;
}
namespace surf {
class HostImpl;
}
namespace mc {
class CommunicationDeterminismChecker;
-class SimcallInspector;
}
namespace vm {
class VMModel;
using s4u_Mutex = simgrid::s4u::Mutex;
using s4u_Semaphore = simgrid::s4u::Semaphore;
using s4u_Disk = simgrid::s4u::Disk;
-using s4u_Storage = simgrid::s4u::Storage;
using s4u_NetZone = simgrid::s4u::NetZone;
using s4u_VM = simgrid::s4u::VirtualMachine;
-using smx_timer_t = simgrid::simix::Timer*;
+using smx_timer_t = simgrid::kernel::timer::Timer*;
using smx_actor_t = simgrid::kernel::actor::ActorImpl*;
using smx_activity_t = simgrid::kernel::activity::ActivityImpl*;
using smx_cond_t = simgrid::kernel::activity::ConditionVariableImpl*;
using smx_mailbox_t = simgrid::kernel::activity::MailboxImpl*;
using smx_mutex_t = simgrid::kernel::activity::MutexImpl*;
using smx_sem_t = simgrid::kernel::activity::SemaphoreImpl*;
-XBT_ATTRIB_DEPRECATED_v330("Please use kernel::activity::State") typedef simgrid::kernel::activity::State e_smx_state_t;
+using e_smx_state_t XBT_ATTRIB_DEPRECATED_v330("Please use kernel::activity::State") = simgrid::kernel::activity::State;
#else
typedef struct s4u_Actor s4u_Actor;
typedef struct s4u_Mutex s4u_Mutex;
typedef struct s4u_Semaphore s4u_Semaphore;
typedef struct s4u_Disk s4u_Disk;
-typedef struct s4u_Storage s4u_Storage;
typedef struct s4u_NetZone s4u_NetZone;
typedef struct s4u_VM s4u_VM;
XBT_ATTRIB_DEPRECATED_v330("Please stop using this type alias") typedef enum kernel_activity_state e_smx_state_t;
typedef const s4u_Link* const_sg_link_t;
typedef s4u_Disk* sg_disk_t;
typedef const s4u_Disk* const_sg_disk_t;
-typedef s4u_Storage* sg_storage_t;
-typedef const s4u_Storage* const_sg_storage_t;
+/** Pointer to a SimGrid file object @ingroup plugin_filesystem */
typedef s4u_File* sg_file_t;
+/** Constant pointer to a SimGrid file object @ingroup plugin_filesystem */
typedef const s4u_File* const_sg_file_t;
typedef s4u_VM* sg_vm_t;
typedef const s4u_VM* const_sg_vm_t;
+/** Pointer to an actor object */
typedef s4u_Actor* sg_actor_t;
+/** Pointer to a constant actor object */
typedef const s4u_Actor* const_sg_actor_t;
typedef struct s_smx_simcall* smx_simcall_t;
