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
add the ISP/UMPIRE tests to the dist in any case
[simgrid.git]
/
src
/
surf
/
vm_hl13.hpp
diff --git
a/src/surf/vm_hl13.hpp
b/src/surf/vm_hl13.hpp
index
397bac5
..
311c0f8
100644
(file)
--- a/
src/surf/vm_hl13.hpp
+++ b/
src/surf/vm_hl13.hpp
@@
-1,9
+1,11
@@
-/* Copyright (c) 2013-201
4
. The SimGrid Team.
+/* Copyright (c) 2013-201
5
. 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. */
* 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 "xbt/base.h"
+
#include "host_clm03.hpp"
#include "vm_interface.hpp"
#include "host_clm03.hpp"
#include "vm_interface.hpp"
@@
-17,11
+19,8
@@
* Classes *
***********/
* Classes *
***********/
-class VMHL13Model;
-typedef VMHL13Model *VMHL13ModelPtr;
-
-class VMHL13;
-typedef VMHL13 *VMHL13Ptr;
+class XBT_PRIVATE VMHL13Model;
+class XBT_PRIVATE VMHL13;
/*********
* Model *
/*********
* Model *
@@
-31,15
+30,14
@@
public:
VMHL13Model();
~VMHL13Model(){};
VMHL13Model();
~VMHL13Model(){};
- VM
Ptr
createVM(const char *name, surf_resource_t host_PM);
+ VM
*
createVM(const char *name, surf_resource_t host_PM);
double shareResources(double now);
void adjustWeightOfDummyCpuActions() {};
double shareResources(double now);
void adjustWeightOfDummyCpuActions() {};
- ActionPtr communicate(HostPtr src, HostPtr dst, double size, double rate);
- ActionPtr executeParallelTask(int host_nb,
- void **host_list,
- double *flops_amount,
- double *bytes_amount,
- double rate);
+ Action *executeParallelTask(int host_nb,
+ sg_host_t *host_list,
+ double *flops_amount,
+ double *bytes_amount,
+ double rate);
void updateActionsState(double /*now*/, double /*delta*/);
};
void updateActionsState(double /*now*/, double /*delta*/);
};
@@
-49,7
+47,7
@@
public:
class VMHL13 : public VM {
public:
class VMHL13 : public VM {
public:
- VMHL13(VMModel
Ptr
model, const char* name, xbt_dict_t props, surf_resource_t host_PM);
+ VMHL13(VMModel
*
model, const char* name, xbt_dict_t props, surf_resource_t host_PM);
~VMHL13();
void suspend();
~VMHL13();
void suspend();
@@
-66,14
+64,14
@@
public:
surf_resource_t getPm(); // will be vm_ws_get_pm()
void setBound(double bound);
surf_resource_t getPm(); // will be vm_ws_get_pm()
void setBound(double bound);
- void setAffinity(Cpu
Ptr
cpu, unsigned long mask);
+ void setAffinity(Cpu
*
cpu, unsigned long mask);
//FIXME: remove
void updateState(tmgr_trace_event_t event_type, double value, double date);
bool isUsed();
//FIXME: remove
void updateState(tmgr_trace_event_t event_type, double value, double date);
bool isUsed();
- Action
Ptr
execute(double size);
- Action
Ptr
sleep(double duration);
+ Action
*
execute(double size);
+ Action
*
sleep(double duration);
};
/**********
};
/**********