-/* Copyright (c) 2004-2017. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2004-2018. 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. */
#ifdef __cplusplus
-#include "s4u/forward.hpp"
-#include "xbt/base.h"
+#include <simgrid/s4u/forward.hpp>
+#include <xbt/base.h>
+
#include <boost/intrusive_ptr.hpp>
namespace simgrid {
namespace kernel {
+class EngineImpl;
namespace context {
class Context;
class ContextFactory;
namespace activity {
class ActivityImpl;
using ActivityImplPtr = boost::intrusive_ptr<ActivityImpl>;
- XBT_PUBLIC(void) intrusive_ptr_add_ref(ActivityImpl* activity);
- XBT_PUBLIC(void) intrusive_ptr_release(ActivityImpl* activity);
+ XBT_PUBLIC void intrusive_ptr_add_ref(ActivityImpl* activity);
+ XBT_PUBLIC void intrusive_ptr_release(ActivityImpl* activity);
class CommImpl;
using CommImplPtr = boost::intrusive_ptr<CommImpl>;
class ConstraintLight;
class System;
}
+namespace resource {
+class Action;
+class Model;
+class Resource;
+class TraceEvent;
+}
namespace routing {
- class NetPoint;
- class NetZoneImpl;
+class ClusterCreationArgs;
+class LinkCreationArgs;
+class NetPoint;
+class NetZoneImpl;
+class RouteCreationArgs;
}
}
namespace simix {
}
namespace surf {
- class Resource;
class Cpu;
class LinkImpl;
class HostImpl;
typedef simgrid::s4u::VirtualMachine s4u_VM;
typedef boost::intrusive_ptr<simgrid::kernel::activity::ActivityImpl> smx_activity_t;
typedef simgrid::kernel::routing::NetPoint routing_NetPoint;
-typedef simgrid::surf::Resource surf_Resource;
+typedef simgrid::kernel::resource::Resource surf_Resource;
typedef simgrid::trace_mgr::trace tmgr_Trace;
typedef simgrid::kernel::context::Context* smx_context_t;
typedef simgrid::kernel::lmm::Element* lmm_element_t;
typedef const simgrid::kernel::lmm::Element* const_lmm_element_t;
-typedef simgrid::kernel::lmm::Variable* lmm_variable_t;
-typedef simgrid::kernel::lmm::Constraint* lmm_constraint_t;
typedef simgrid::kernel::lmm::ConstraintLight* lmm_constraint_light_t;
-typedef simgrid::kernel::lmm::System* lmm_system_t;
#else
typedef s4u_Storage* sg_storage_t;
typedef s4u_File* sg_file_t;
typedef s4u_VM* sg_vm_t;
+typedef s4u_Actor* sg_actor_t;
typedef routing_NetPoint* sg_netpoint_t;
typedef surf_Resource *sg_resource_t;
typedef struct s_smx_simcall* smx_simcall_t;
typedef enum { // FIXME: move this to s4u::Link; make it an enum class
- SURF_LINK_FULLDUPLEX = 2,
- SURF_LINK_SHARED = 1,
- SURF_LINK_FATPIPE = 0
+ SURF_LINK_SPLITDUPLEX = 2,
+ SURF_LINK_SHARED = 1,
+ SURF_LINK_FATPIPE = 0
} e_surf_link_sharing_policy_t;
-typedef enum { // FIXME: move this to s4u::Actor; make it an enum class
- SURF_ACTOR_ON_FAILURE_DIE = 1,
- SURF_ACTOR_ON_FAILURE_RESTART = 0
-} e_surf_process_on_failure_t;
-
/** @ingroup m_datatypes_management_details
* @brief Type for any simgrid size
*/
*/
typedef long long sg_offset_t;
-typedef unsigned long aid_t;
+typedef long aid_t;
#endif /* SIMGRID_TYPES_H */