A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Get ride of ???Ptr types in C++: make pointers explicit
[simgrid.git]
/
src
/
surf
/
vm_interface.hpp
diff --git
a/src/surf/vm_interface.hpp
b/src/surf/vm_interface.hpp
index
a8ddce8
..
0dede2e
100644
(file)
--- a/
src/surf/vm_interface.hpp
+++ b/
src/surf/vm_interface.hpp
@@
-17,13
+17,7
@@
***********/
class VMModel;
***********/
class VMModel;
-typedef VMModel *VMModelPtr;
-
class VM;
class VM;
-typedef VM *VMPtr;
-
-class VMLmm;
-typedef VMLmm *VMLmmPtr;
/*************
* Callbacks *
/*************
* Callbacks *
@@
-33,19
+27,19
@@
typedef VMLmm *VMLmmPtr;
* @brief Callbacks handler which emit the callbacks after VM creation *
* @details Callback functions have the following signature: `void(VMPtr)`
*/
* @brief Callbacks handler which emit the callbacks after VM creation *
* @details Callback functions have the following signature: `void(VMPtr)`
*/
-extern surf_callback(void, VM
Ptr
) VMCreatedCallbacks;
+extern surf_callback(void, VM
*
) VMCreatedCallbacks;
/** @ingroup SURF_callbacks
* @brief Callbacks handler which emit the callbacks after VM destruction *
* @details Callback functions have the following signature: `void(VMPtr)`
*/
/** @ingroup SURF_callbacks
* @brief Callbacks handler which emit the callbacks after VM destruction *
* @details Callback functions have the following signature: `void(VMPtr)`
*/
-extern surf_callback(void, VM
Ptr
) VMDestructedCallbacks;
+extern surf_callback(void, VM
*
) VMDestructedCallbacks;
/** @ingroup SURF_callbacks
* @brief Callbacks handler which emit the callbacks after VM State changed *
* @details Callback functions have the following signature: `void(VMActionPtr)`
*/
/** @ingroup SURF_callbacks
* @brief Callbacks handler which emit the callbacks after VM State changed *
* @details Callback functions have the following signature: `void(VMActionPtr)`
*/
-extern surf_callback(void, VM
Ptr
) VMStateChangedCallbacks;
+extern surf_callback(void, VM
*
) VMStateChangedCallbacks;
/*********
* Model *
/*********
* Model *
@@
-59,7
+53,7
@@
public:
VMModel();
~VMModel(){};
VMModel();
~VMModel(){};
- Host
Ptr
createHost(const char *name){DIE_IMPOSSIBLE;}
+ Host
*
createHost(const char *name){DIE_IMPOSSIBLE;}
/**
* @brief Create a new VM
/**
* @brief Create a new VM
@@
-68,7
+62,7
@@
public:
* @param host_PM The real machine hosting the VM
*
*/
* @param host_PM The real machine hosting the VM
*
*/
- virtual VM
Ptr
createVM(const char *name, surf_resource_t host_PM)=0;
+ virtual VM
*
createVM(const char *name, surf_resource_t host_PM)=0;
void adjustWeightOfDummyCpuActions() {};
typedef boost::intrusive::list<VM,
void adjustWeightOfDummyCpuActions() {};
typedef boost::intrusive::list<VM,
@@
-97,8
+91,8
@@
public:
* @param netElm The RoutingEdge associated to this VM
* @param cpu The Cpu associated to this VM
*/
* @param netElm The RoutingEdge associated to this VM
* @param cpu The Cpu associated to this VM
*/
- VM(Model
Ptr
model, const char *name, xbt_dict_t props,
- RoutingEdge
Ptr netElm, CpuPtr
cpu);
+ VM(Model
*
model, const char *name, xbt_dict_t props,
+ RoutingEdge
*netElm, Cpu *
cpu);
/**
* @brief WdorkstationVM destructor
/**
* @brief WdorkstationVM destructor
@@
-141,11
+135,11
@@
public:
virtual surf_resource_t getPm()=0;
virtual void setBound(double bound)=0;
virtual surf_resource_t getPm()=0;
virtual void setBound(double bound)=0;
- virtual void setAffinity(Cpu
Ptr
cpu, unsigned long mask)=0;
+ virtual void setAffinity(Cpu
*
cpu, unsigned long mask)=0;
/* The vm object of the lower layer */
/* The vm object of the lower layer */
- CpuAction
Ptr
p_action;
- Host
Ptr
p_subWs; // Pointer to the ''host'' OS
+ CpuAction
*
p_action;
+ Host
*
p_subWs; // Pointer to the ''host'' OS
e_surf_vm_state_t p_currentState;
};
e_surf_vm_state_t p_currentState;
};