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 'master' of github.com:simgrid/simgrid into s_type_cleanup
[simgrid.git]
/
examples
/
s4u
/
io
/
s4u_io.cpp
diff --git
a/examples/s4u/io/s4u_io.cpp
b/examples/s4u/io/s4u_io.cpp
index 90126b62a4ec766a9e8dff6237a6558f48d07763..8c60b637d0ed9f5ba05cb550ffb0538e0ebac06a 100644
(file)
--- a/
examples/s4u/io/s4u_io.cpp
+++ b/
examples/s4u/io/s4u_io.cpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2006-201
5
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2006-201
7
. 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. */
/* 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. */
@@
-11,36
+11,36
@@
XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_test, "a sample log category");
class MyHost {
public:
class MyHost {
public:
-
-
void show_info(boost::unordered_map <std::string, simgrid::s4u::Storage*> const&mounts)
{
- XBT_INFO("Storage info on %s:", simgrid::s4u::Host::current()->
c
name());
+ void show_info(std::unordered_map<std::string, simgrid::s4u::Storage*> const& mounts)
+ {
+ XBT_INFO("Storage info on %s:", simgrid::s4u::Host::current()->
getC
name());
for (const auto&kv : mounts) {
for (const auto&kv : mounts) {
-
const char* mountpoint = kv.first.c_str()
;
- simgrid::s4u::Storage
storage = *
kv.second;
+
std::string mountpoint = kv.first
;
+ simgrid::s4u::Storage
* storage =
kv.second;
// Retrieve disk's information
// Retrieve disk's information
- sg_size_t free_size = storage
.s
izeFree();
- sg_size_t used_size = storage
.s
izeUsed();
- sg_size_t size
= storage.s
ize();
+ sg_size_t free_size = storage
->getS
izeFree();
+ sg_size_t used_size = storage
->getS
izeUsed();
+ sg_size_t size
= storage->getS
ize();
- XBT_INFO(" %s (%s) Used: %llu; Free: %llu; Total: %llu.",
-
storage.name(), mountpoint, used_size,
free_size, size);
+ XBT_INFO(" %s (%s) Used: %llu; Free: %llu; Total: %llu.",
storage->getName(), mountpoint.c_str(), used_size,
+
free_size, size);
}
}
void operator()() {
}
}
void operator()() {
-
boost::unordered_map <std::string, simgrid::s4u::Storage
*> const& mounts =
-
simgrid::s4u::Host::current()->m
ountedStorages();
+
std::unordered_map<std::string, simgrid::s4u::Storage
*> const& mounts =
+
simgrid::s4u::Host::current()->getM
ountedStorages();
show_info(mounts);
// Open an non-existing file to create it
show_info(mounts);
// Open an non-existing file to create it
-
const char* filename
= "/home/tmp/data.txt";
+
std::string filename
= "/home/tmp/data.txt";
simgrid::s4u::File* file = new simgrid::s4u::File(filename, nullptr);
sg_size_t write = file->write(200000); // Write 200,000 bytes
simgrid::s4u::File* file = new simgrid::s4u::File(filename, nullptr);
sg_size_t write = file->write(200000); // Write 200,000 bytes
- XBT_INFO("Create a %llu bytes file named '%s' on /sd1", write, filename);
+ XBT_INFO("Create a %llu bytes file named '%s' on /sd1", write, filename
.c_str()
);
// check that sizes have changed
show_info(mounts);
// check that sizes have changed
show_info(mounts);
@@
-49,35
+49,35
@@
public:
const sg_size_t file_size = file->size();
file->seek(0);
const sg_size_t read = file->read(file_size);
const sg_size_t file_size = file->size();
file->seek(0);
const sg_size_t read = file->read(file_size);
- XBT_INFO("Read %llu bytes on %s", read, filename);
+ XBT_INFO("Read %llu bytes on %s", read, filename
.c_str()
);
// Now write 100,000 bytes in tmp/data.txt
write = file->write(100000); // Write 100,000 bytes
// Now write 100,000 bytes in tmp/data.txt
write = file->write(100000); // Write 100,000 bytes
- XBT_INFO("Write %llu bytes on %s", write, filename);
+ XBT_INFO("Write %llu bytes on %s", write, filename
.c_str()
);
simgrid::s4u::Storage* storage = simgrid::s4u::Storage::byName("Disk4");
// Now rename file from ./tmp/data.txt to ./tmp/simgrid.readme
simgrid::s4u::Storage* storage = simgrid::s4u::Storage::byName("Disk4");
// Now rename file from ./tmp/data.txt to ./tmp/simgrid.readme
-
const char *
newpath = "/home/tmp/simgrid.readme";
- XBT_INFO("Move '%s' to '%s'", file->
path(), newpath
);
+
std::string
newpath = "/home/tmp/simgrid.readme";
+ XBT_INFO("Move '%s' to '%s'", file->
getPath(), newpath.c_str()
);
file->move(newpath);
// Test attaching some user data to the file
file->setUserdata(xbt_strdup("777"));
file->move(newpath);
// Test attaching some user data to the file
file->setUserdata(xbt_strdup("777"));
- XBT_INFO("User data attached to the file: %s",
(char*)file->userdata(
));
- xbt_free(file->
u
serdata());
+ XBT_INFO("User data attached to the file: %s",
static_cast<char*>(file->getUserdata()
));
+ xbt_free(file->
getU
serdata());
// Close the file
delete file;
// Now attach some user data to disk1
// Close the file
delete file;
// Now attach some user data to disk1
- XBT_INFO("Get/set data for storage element: %s", storage->
n
ame());
- XBT_INFO(" Uninitialized storage data: '%s'",
(char*)storage->userdata(
));
+ XBT_INFO("Get/set data for storage element: %s", storage->
getN
ame());
+ XBT_INFO(" Uninitialized storage data: '%s'",
static_cast<char*>(storage->getUserdata()
));
storage->setUserdata(xbt_strdup("Some user data"));
storage->setUserdata(xbt_strdup("Some user data"));
- XBT_INFO(" Set and get data: '%s'",
(char*)storage->userdata(
));
+ XBT_INFO(" Set and get data: '%s'",
static_cast<char*>(storage->getUserdata()
));
- xbt_free(storage->
u
serdata());
+ xbt_free(storage->
getU
serdata());
}
};
}
};
@@
-87,5
+87,6
@@
int main(int argc, char **argv)
e->loadPlatform("../../platforms/storage/storage.xml");
simgrid::s4u::Actor::createActor("host", simgrid::s4u::Host::by_name("denise"), MyHost());
e->run();
e->loadPlatform("../../platforms/storage/storage.xml");
simgrid::s4u::Actor::createActor("host", simgrid::s4u::Host::by_name("denise"), MyHost());
e->run();
+ delete e;
return 0;
}
return 0;
}