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
Replace linear search by a faster one.
[simgrid.git]
/
src
/
simix
/
smx_io.cpp
diff --git
a/src/simix/smx_io.cpp
b/src/simix/smx_io.cpp
index
9f15b73
..
fc2dbd1
100644
(file)
--- a/
src/simix/smx_io.cpp
+++ b/
src/simix/smx_io.cpp
@@
-67,8
+67,7
@@
smx_activity_t SIMIX_file_read(smx_file_t fd, sg_size_t size, sg_host_t host)
{
/* check if the host is active */
if (host->isOff())
- THROWF(host_error, 0, "Host %s failed, you cannot call this function", sg_host_get_name(host));
-
+ THROWF(host_error, 0, "Host %s failed, you cannot call this function", host->cname());
simgrid::kernel::activity::Io *synchro = new simgrid::kernel::activity::Io();
synchro->host = host;
@@
-91,7
+90,7
@@
void simcall_HANDLER_file_write(smx_simcall_t simcall, smx_file_t fd, sg_size_t
smx_activity_t SIMIX_file_write(smx_file_t fd, sg_size_t size, sg_host_t host)
{
if (host->isOff())
- THROWF(host_error, 0, "Host %s failed, you cannot call this function",
sg_host_get_name(host
));
+ THROWF(host_error, 0, "Host %s failed, you cannot call this function",
host->cname(
));
simgrid::kernel::activity::Io *synchro = new simgrid::kernel::activity::Io();
synchro->host = host;
@@
-113,7
+112,7
@@
void simcall_HANDLER_file_open(smx_simcall_t simcall, const char* fullpath, sg_h
smx_activity_t SIMIX_file_open(const char* fullpath, sg_host_t host)
{
if (host->isOff())
- THROWF(host_error, 0, "Host %s failed, you cannot call this function",
sg_host_get_name(host
));
+ THROWF(host_error, 0, "Host %s failed, you cannot call this function",
host->cname(
));
simgrid::kernel::activity::Io *synchro = new simgrid::kernel::activity::Io();
synchro->host = host;
@@
-135,7
+134,7
@@
void simcall_HANDLER_file_close(smx_simcall_t simcall, smx_file_t fd, sg_host_t
smx_activity_t SIMIX_file_close(smx_file_t fd, sg_host_t host)
{
if (host->isOff())
- THROWF(host_error, 0, "Host %s failed, you cannot call this function",
sg_host_get_name(host
));
+ THROWF(host_error, 0, "Host %s failed, you cannot call this function",
host->cname(
));
simgrid::kernel::activity::Io *synchro = new simgrid::kernel::activity::Io();
synchro->host = host;
@@
-150,7
+149,7
@@
smx_activity_t SIMIX_file_close(smx_file_t fd, sg_host_t host)
int SIMIX_file_unlink(smx_file_t fd, sg_host_t host)
{
if (host->isOff())
- THROWF(host_error, 0, "Host %s failed, you cannot call this function",
sg_host_get_name(host
));
+ THROWF(host_error, 0, "Host %s failed, you cannot call this function",
host->cname(
));
int res = surf_host_unlink(host, fd->surf_file);
xbt_free(fd);
@@
-162,7
+161,7
@@
sg_size_t simcall_HANDLER_file_get_size(smx_simcall_t simcall, smx_file_t fd)
return SIMIX_file_get_size(simcall->issuer, fd);
}
-sg_size_t SIMIX_file_get_size(smx_
process
_t process, smx_file_t fd)
+sg_size_t SIMIX_file_get_size(smx_
actor
_t process, smx_file_t fd)
{
sg_host_t host = process->host;
return surf_host_get_size(host, fd->surf_file);
@@
-173,7
+172,7
@@
sg_size_t simcall_HANDLER_file_tell(smx_simcall_t simcall, smx_file_t fd)
return SIMIX_file_tell(simcall->issuer, fd);
}
-sg_size_t SIMIX_file_tell(smx_
process
_t process, smx_file_t fd)
+sg_size_t SIMIX_file_tell(smx_
actor
_t process, smx_file_t fd)
{
sg_host_t host = process->host;
return surf_host_file_tell(host, fd->surf_file);
@@
-185,7
+184,7
@@
xbt_dynar_t simcall_HANDLER_file_get_info(smx_simcall_t simcall, smx_file_t fd)
return SIMIX_file_get_info(simcall->issuer, fd);
}
-xbt_dynar_t SIMIX_file_get_info(smx_
process
_t process, smx_file_t fd)
+xbt_dynar_t SIMIX_file_get_info(smx_
actor
_t process, smx_file_t fd)
{
sg_host_t host = process->host;
return surf_host_get_info(host, fd->surf_file);
@@
-196,7
+195,7
@@
int simcall_HANDLER_file_seek(smx_simcall_t simcall, smx_file_t fd, sg_offset_t
return SIMIX_file_seek(simcall->issuer, fd, offset, origin);
}
-int SIMIX_file_seek(smx_
process
_t process, smx_file_t fd, sg_offset_t offset, int origin)
+int SIMIX_file_seek(smx_
actor
_t process, smx_file_t fd, sg_offset_t offset, int origin)
{
sg_host_t host = process->host;
return surf_host_file_seek(host, fd->surf_file, offset, origin);
@@
-207,7
+206,7
@@
int simcall_HANDLER_file_move(smx_simcall_t simcall, smx_file_t file, const char
return SIMIX_file_move(simcall->issuer, file, fullpath);
}
-int SIMIX_file_move(smx_
process
_t process, smx_file_t file, const char* fullpath)
+int SIMIX_file_move(smx_
actor
_t process, smx_file_t file, const char* fullpath)
{
sg_host_t host = process->host;
return surf_host_file_move(host, file->surf_file, fullpath);
@@
-222,7
+221,7
@@
sg_size_t simcall_HANDLER_storage_get_free_size(smx_simcall_t simcall, smx_stora
return SIMIX_storage_get_free_size(simcall->issuer, storage);
}
-sg_size_t SIMIX_storage_get_free_size(smx_
process
_t process, smx_storage_t storage)
+sg_size_t SIMIX_storage_get_free_size(smx_
actor
_t process, smx_storage_t storage)
{
return surf_storage_get_free_size(storage);
}
@@
-232,7
+231,7
@@
sg_size_t simcall_HANDLER_storage_get_used_size(smx_simcall_t simcall, smx_stora
return SIMIX_storage_get_used_size(simcall->issuer, storage);
}
-sg_size_t SIMIX_storage_get_used_size(smx_
process
_t process, smx_storage_t storage)
+sg_size_t SIMIX_storage_get_used_size(smx_
actor
_t process, smx_storage_t storage)
{
return surf_storage_get_used_size(storage);
}
@@
-245,10
+244,6
@@
const char* SIMIX_storage_get_name(smx_storage_t storage){
return sg_storage_name(storage);
}
-xbt_dict_t SIMIX_storage_get_content(smx_storage_t storage){
- return surf_storage_get_content(storage);
-}
-
const char* SIMIX_storage_get_host(smx_storage_t storage){
return surf_storage_get_host(storage);
}