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
model-checker : MUTEX_UNLOCK is invisible for MC
[simgrid.git]
/
src
/
surf
/
workstation_clm03.hpp
diff --git
a/src/surf/workstation_clm03.hpp
b/src/surf/workstation_clm03.hpp
index
08eb43e
..
88b4854
100644
(file)
--- a/
src/surf/workstation_clm03.hpp
+++ b/
src/surf/workstation_clm03.hpp
@@
-1,3
+1,9
@@
+/* Copyright (c) 2013-2014. 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 "workstation_interface.hpp"
#include "storage_interface.hpp"
#include "cpu_interface.hpp"
#include "workstation_interface.hpp"
#include "storage_interface.hpp"
#include "cpu_interface.hpp"
@@
-13,23
+19,21
@@
class WorkstationCLM03Model;
typedef WorkstationCLM03Model *WorkstationCLM03ModelPtr;
class WorkstationCLM03Model;
typedef WorkstationCLM03Model *WorkstationCLM03ModelPtr;
-class WorkstationCLM03
Lmm
;
-typedef WorkstationCLM03
Lmm *WorkstationCLM03Lmm
Ptr;
+class WorkstationCLM03;
+typedef WorkstationCLM03
*WorkstationCLM03
Ptr;
-class WorkstationCLM03Action
Lmm
;
-typedef WorkstationCLM03Action
Lmm *WorkstationCLM03ActionLmm
Ptr;
+class WorkstationCLM03Action;
+typedef WorkstationCLM03Action
*WorkstationCLM03Action
Ptr;
/*********
* Model *
*********/
/*********
* Model *
*********/
-class WorkstationCLM03Model :
virtual
public WorkstationModel {
+class WorkstationCLM03Model : public WorkstationModel {
public:
public:
- WorkstationCLM03Model(string name);
WorkstationCLM03Model();
~WorkstationCLM03Model();
WorkstationCLM03Model();
~WorkstationCLM03Model();
- void parseInit(sg_platf_host_cbarg_t host);
- WorkstationPtr createResource(string name);
+ WorkstationPtr createWorkstation(const char *name);
double shareResources(double now);
void updateActionsState(double now, double delta);
double shareResources(double now);
void updateActionsState(double now, double delta);
@@
-39,7
+43,6
@@
public:
double *computation_amount,
double *communication_amount,
double rate);
double *computation_amount,
double *communication_amount,
double rate);
- xbt_dynar_t getRoute(WorkstationPtr src, WorkstationPtr dst);
ActionPtr communicate(WorkstationPtr src, WorkstationPtr dst, double size, double rate);
};
ActionPtr communicate(WorkstationPtr src, WorkstationPtr dst, double size, double rate);
};
@@
-47,9
+50,9
@@
public:
* Resource *
************/
* Resource *
************/
-class WorkstationCLM03
Lmm : public WorkstationLmm
{
+class WorkstationCLM03
: public Workstation
{
public:
public:
- WorkstationCLM03
Lmm
(WorkstationModelPtr model, const char* name, xbt_dict_t properties, xbt_dynar_t storage, RoutingEdgePtr netElm, CpuPtr cpu);
+ WorkstationCLM03(WorkstationModelPtr model, const char* name, xbt_dict_t properties, xbt_dynar_t storage, RoutingEdgePtr netElm, CpuPtr cpu);
void updateState(tmgr_trace_event_t event_type, double value, double date);
void updateState(tmgr_trace_event_t event_type, double value, double date);
@@
-71,10
+74,6
@@
public:
* Action *
**********/
* Action *
**********/
-class WorkstationCLM03ActionLmm : public WorkstationActionLmm {
-public:
- WorkstationCLM03ActionLmm(ModelPtr model, double cost, bool failed): Action(model, cost, failed), WorkstationActionLmm() {};
-};
#endif /* SURF_WORKSTATION_CLM03_HPP_ */
#endif /* SURF_WORKSTATION_CLM03_HPP_ */