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
Move collective algorithms to separate folders
[simgrid.git]
/
src
/
surf
/
storage_n11.cpp
diff --git
a/src/surf/storage_n11.cpp
b/src/surf/storage_n11.cpp
index
79c7bc5
..
b89e195
100644
(file)
--- a/
src/surf/storage_n11.cpp
+++ b/
src/surf/storage_n11.cpp
@@
-5,9
+5,11
@@
* under the terms of the license (GNU LGPL) which comes with this package. */
#include "storage_n11.hpp"
* under the terms of the license (GNU LGPL) which comes with this package. */
#include "storage_n11.hpp"
-#include "src/kernel/routing/NetCard.hpp"
+#include "simgrid/s4u/engine.hpp"
+#include "src/kernel/routing/NetPoint.hpp"
#include "surf_private.h"
#include <math.h> /*ceil*/
#include "surf_private.h"
#include <math.h> /*ceil*/
+
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_storage);
/*************
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_storage);
/*************
@@
-26,46
+28,32
@@
static inline void routing_storage_type_free(void *r)
free(stype);
}
free(stype);
}
-static inline void surf_storage_resource_free(void *r)
-{
- // specific to storage
- simgrid::surf::Storage *storage = static_cast<simgrid::surf::Storage*>(r);
- // generic resource
- delete storage;
-}
-
-static inline void routing_storage_host_free(void *r)
-{
- xbt_dynar_t dyn = (xbt_dynar_t) r;
- xbt_dynar_free(&dyn);
-}
-
static void check_disk_attachment()
{
xbt_lib_cursor_t cursor;
char* key;
void** data;
static void check_disk_attachment()
{
xbt_lib_cursor_t cursor;
char* key;
void** data;
- xbt_lib_foreach(storage_lib, cursor, key, data)
- {
+ xbt_lib_foreach(storage_lib, cursor, key, data) {
if (xbt_lib_get_level(xbt_lib_get_elm_or_null(storage_lib, key), SURF_STORAGE_LEVEL) != nullptr) {
simgrid::surf::Storage* storage =
static_cast<simgrid::surf::Storage*>(xbt_lib_get_or_null(storage_lib, key, SURF_STORAGE_LEVEL));
if (xbt_lib_get_level(xbt_lib_get_elm_or_null(storage_lib, key), SURF_STORAGE_LEVEL) != nullptr) {
simgrid::surf::Storage* storage =
static_cast<simgrid::surf::Storage*>(xbt_lib_get_or_null(storage_lib, key, SURF_STORAGE_LEVEL));
- simgrid::kernel::routing::Net
Card* host_elm = sg_netcard
_by_name_or_null(storage->attach_);
+ simgrid::kernel::routing::Net
Point* host_elm = sg_netpoint
_by_name_or_null(storage->attach_);
if (!host_elm)
if (!host_elm)
- surf_parse_error("Unable to attach storage %s: host %s does
n't exist.", storage->getN
ame(), storage->attach_);
+ surf_parse_error("Unable to attach storage %s: host %s does
not exist.", storage->cn
ame(), storage->attach_);
}
}
}
void storage_register_callbacks()
{
}
}
}
void storage_register_callbacks()
{
- simgrid::s
urf::on_postparse
.connect(check_disk_attachment);
+ simgrid::s
4u::onPlatformCreated
.connect(check_disk_attachment);
instr_routing_define_callbacks();
ROUTING_STORAGE_LEVEL = xbt_lib_add_level(storage_lib, xbt_free_f);
instr_routing_define_callbacks();
ROUTING_STORAGE_LEVEL = xbt_lib_add_level(storage_lib, xbt_free_f);
- ROUTING_STORAGE_HOST_LEVEL = xbt_lib_add_level(storage_lib, routing_storage_host_free);
ROUTING_STORAGE_TYPE_LEVEL = xbt_lib_add_level(storage_type_lib, routing_storage_type_free);
ROUTING_STORAGE_TYPE_LEVEL = xbt_lib_add_level(storage_type_lib, routing_storage_type_free);
- SURF_STORAGE_LEVEL = xbt_lib_add_level(storage_lib, surf_storage_resource_free);
+ SURF_STORAGE_LEVEL = xbt_lib_add_level(storage_lib, [](void *self) {
+ delete static_cast<simgrid::surf::Storage*>(self);
+ });
}
/*********
}
/*********
@@
-81,7
+69,6
@@
void surf_storage_model_init_default()
namespace simgrid {
namespace surf {
namespace simgrid {
namespace surf {
-#include "src/surf/xml/platf.hpp" // FIXME: move that back to the parsing area
Storage* StorageN11Model::createStorage(const char* id, const char* type_id, const char* content_name,
const char* content_type, const char* attach)
{
Storage* StorageN11Model::createStorage(const char* id, const char* type_id, const char* content_name,
const char* content_type, const char* attach)
{
@@
-198,8
+185,8
@@
StorageAction *StorageN11::open(const char* mount, const char* path)
{
XBT_DEBUG("\tOpen file '%s'",path);
{
XBT_DEBUG("\tOpen file '%s'",path);
- sg_size_t size
, *psize
;
-
psize = (sg_size_t*)
xbt_dict_get_or_null(content_, path);
+ sg_size_t size;
+
sg_size_t* psize = (sg_size_t*)
xbt_dict_get_or_null(content_, path);
// if file does not exist create an empty file
if(psize)
size = *psize;
// if file does not exist create an empty file
if(psize)
size = *psize;
@@
-216,7
+203,7
@@
StorageAction *StorageN11::open(const char* mount, const char* path)
file->mount = xbt_strdup(mount);
file->current_position = 0;
file->mount = xbt_strdup(mount);
file->current_position = 0;
- StorageAction
*action = new StorageN11Action(getM
odel(), 0, isOff(), this, OPEN);
+ StorageAction
* action = new StorageN11Action(m
odel(), 0, isOff(), this, OPEN);
action->file_ = file;
return action;
action->file_ = file;
return action;
@@
-238,7
+225,7
@@
StorageAction *StorageN11::close(surf_file_t fd)
free(fd->name);
free(fd->mount);
xbt_free(fd);
free(fd->name);
free(fd->mount);
xbt_free(fd);
- StorageAction
*action = new StorageN11Action(getM
odel(), 0, isOff(), this, CLOSE);
+ StorageAction
* action = new StorageN11Action(m
odel(), 0, isOff(), this, CLOSE);
return action;
}
return action;
}
@@
-255,7
+242,7
@@
StorageAction *StorageN11::read(surf_file_t fd, sg_size_t size)
else
fd->current_position += size;
else
fd->current_position += size;
- StorageAction
*action = new StorageN11Action(getM
odel(), size, isOff(), this, READ);
+ StorageAction
* action = new StorageN11Action(m
odel(), size, isOff(), this, READ);
return action;
}
return action;
}
@@
-264,7
+251,7
@@
StorageAction *StorageN11::write(surf_file_t fd, sg_size_t size)
char *filename = fd->name;
XBT_DEBUG("\tWrite file '%s' size '%llu/%llu'",filename,size,fd->size);
char *filename = fd->name;
XBT_DEBUG("\tWrite file '%s' size '%llu/%llu'",filename,size,fd->size);
- StorageAction
*action = new StorageN11Action(getM
odel(), size, isOff(), this, WRITE);
+ StorageAction
* action = new StorageN11Action(m
odel(), size, isOff(), this, WRITE);
action->file_ = fd;
/* Substract the part of the file that might disappear from the used sized on the storage element */
usedSize_ -= (fd->size - fd->current_position);
action->file_ = fd;
/* Substract the part of the file that might disappear from the used sized on the storage element */
usedSize_ -= (fd->size - fd->current_position);
@@
-283,10
+270,10
@@
StorageN11Action::StorageN11Action(Model *model, double cost, bool failed, Stora
: StorageAction(model, cost, failed,
lmm_variable_new(model->getMaxminSystem(), this, 1.0, -1.0 , 3),
storage, type) {
: StorageAction(model, cost, failed,
lmm_variable_new(model->getMaxminSystem(), this, 1.0, -1.0 , 3),
storage, type) {
- XBT_IN("(%s,%g", storage->
getN
ame(), cost);
+ XBT_IN("(%s,%g", storage->
cn
ame(), cost);
// Must be less than the max bandwidth for all actions
// Must be less than the max bandwidth for all actions
- lmm_expand(model->getMaxminSystem(), storage->
getC
onstraint(), getVariable(), 1.0);
+ lmm_expand(model->getMaxminSystem(), storage->
c
onstraint(), getVariable(), 1.0);
switch(type) {
case OPEN:
case CLOSE:
switch(type) {
case OPEN:
case CLOSE:
@@
-303,6
+290,8
@@
StorageN11Action::StorageN11Action(Model *model, double cost, bool failed, Stora
// storage->p_writeActions->push_back(action);
// ref();
break;
// storage->p_writeActions->push_back(action);
// ref();
break;
+ default:
+ THROW_UNIMPLEMENTED;
}
XBT_OUT();
}
}
XBT_OUT();
}