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
Merge branch 'mc'
[simgrid.git]
/
src
/
surf
/
surf_c_bindings.cpp
diff --git
a/src/surf/surf_c_bindings.cpp
b/src/surf/surf_c_bindings.cpp
index
20931bc
..
d5a0cb0
100644
(file)
--- a/
src/surf/surf_c_bindings.cpp
+++ b/
src/surf/surf_c_bindings.cpp
@@
-287,7
+287,7
@@
xbt_dynar_t surf_workstation_model_get_route(surf_workstation_model_t /*model*/,
}
void surf_vm_workstation_model_create(const char *name, surf_resource_t ind_phys_host){
}
void surf_vm_workstation_model_create(const char *name, surf_resource_t ind_phys_host){
- surf_vm_workstation_model->create
Resource
(name, ind_phys_host);
+ surf_vm_workstation_model->create
WorkstationVM
(name, ind_phys_host);
}
surf_action_t surf_network_model_communicate(surf_network_model_t model, sg_routing_edge_t src, sg_routing_edge_t dst, double size, double rate){
}
surf_action_t surf_network_model_communicate(surf_network_model_t model, sg_routing_edge_t src, sg_routing_edge_t dst, double size, double rate){
@@
-392,7
+392,8
@@
size_t surf_workstation_file_tell(surf_resource_t workstation, surf_file_t fd){
return get_casted_workstation(workstation)->fileTell(fd);
}
return get_casted_workstation(workstation)->fileTell(fd);
}
-int surf_workstation_file_seek(surf_resource_t workstation, surf_file_t fd, sg_size_t offset, int origin){
+int surf_workstation_file_seek(surf_resource_t workstation, surf_file_t fd,
+ sg_offset_t offset, int origin){
return get_casted_workstation(workstation)->fileSeek(fd, offset, origin);
}
return get_casted_workstation(workstation)->fileSeek(fd, offset, origin);
}
@@
-520,9
+521,11
@@
void surf_action_set_priority(surf_action_t action, double priority){
action->setPriority(priority);
}
action->setPriority(priority);
}
+#ifdef HAVE_TRACING
void surf_action_set_category(surf_action_t action, const char *category){
action->setCategory(category);
}
void surf_action_set_category(surf_action_t action, const char *category){
action->setCategory(category);
}
+#endif
void *surf_action_get_data(surf_action_t action){
return action->getData();
void *surf_action_get_data(surf_action_t action){
return action->getData();
@@
-557,7
+560,3
@@
double surf_network_action_get_latency_limited(surf_action_t action) {
surf_file_t surf_storage_action_get_file(surf_action_t action){
return static_cast<StorageActionPtr>(action)->p_file;
}
surf_file_t surf_storage_action_get_file(surf_action_t action){
return static_cast<StorageActionPtr>(action)->p_file;
}
-
-xbt_dict_t surf_storage_action_get_ls_dict(surf_action_t action){
- return static_cast<StorageActionPtr>(action)->p_lsDict;
-}