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
inline a function called only once
[simgrid.git]
/
src
/
simix
/
smx_io.cpp
diff --git
a/src/simix/smx_io.cpp
b/src/simix/smx_io.cpp
index
a9c34d0
..
1485d59
100644
(file)
--- a/
src/simix/smx_io.cpp
+++ b/
src/simix/smx_io.cpp
@@
-58,19
+58,19
@@
void SIMIX_storage_destroy(void *s)
//SIMIX FILE READ
void simcall_HANDLER_file_read(smx_simcall_t simcall, smx_file_t fd, sg_size_t size, sg_host_t host)
{
//SIMIX FILE READ
void simcall_HANDLER_file_read(smx_simcall_t simcall, smx_file_t fd, sg_size_t size, sg_host_t host)
{
- smx_
synchro
_t synchro = SIMIX_file_read(fd, size, host);
+ smx_
activity
_t synchro = SIMIX_file_read(fd, size, host);
synchro->simcalls.push_back(simcall);
simcall->issuer->waiting_synchro = synchro;
}
synchro->simcalls.push_back(simcall);
simcall->issuer->waiting_synchro = synchro;
}
-smx_
synchro
_t SIMIX_file_read(smx_file_t fd, sg_size_t size, sg_host_t host)
+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));
{
/* 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));
- simgrid::
simix::Io *synchro = new simgrid::simix
::Io();
+ simgrid::
kernel::activity::Io *synchro = new simgrid::kernel::activity
::Io();
synchro->host = host;
synchro->surf_io = surf_host_read(host, fd->surf_file, size);
synchro->host = host;
synchro->surf_io = surf_host_read(host, fd->surf_file, size);
@@
-83,17
+83,17
@@
smx_synchro_t SIMIX_file_read(smx_file_t fd, sg_size_t size, sg_host_t host)
//SIMIX FILE WRITE
void simcall_HANDLER_file_write(smx_simcall_t simcall, smx_file_t fd, sg_size_t size, sg_host_t host)
{
//SIMIX FILE WRITE
void simcall_HANDLER_file_write(smx_simcall_t simcall, smx_file_t fd, sg_size_t size, sg_host_t host)
{
- smx_
synchro
_t synchro = SIMIX_file_write(fd, size, host);
+ smx_
activity
_t synchro = SIMIX_file_write(fd, size, host);
synchro->simcalls.push_back(simcall);
simcall->issuer->waiting_synchro = synchro;
}
synchro->simcalls.push_back(simcall);
simcall->issuer->waiting_synchro = synchro;
}
-smx_
synchro
_t SIMIX_file_write(smx_file_t fd, sg_size_t size, sg_host_t host)
+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));
{
if (host->isOff())
THROWF(host_error, 0, "Host %s failed, you cannot call this function", sg_host_get_name(host));
- simgrid::
simix::Io *synchro = new simgrid::simix
::Io();
+ simgrid::
kernel::activity::Io *synchro = new simgrid::kernel::activity
::Io();
synchro->host = host;
synchro->surf_io = surf_host_write(host, fd->surf_file, size);
synchro->surf_io->setData(synchro);
synchro->host = host;
synchro->surf_io = surf_host_write(host, fd->surf_file, size);
synchro->surf_io->setData(synchro);
@@
-105,17
+105,17
@@
smx_synchro_t SIMIX_file_write(smx_file_t fd, sg_size_t size, sg_host_t host)
//SIMIX FILE OPEN
void simcall_HANDLER_file_open(smx_simcall_t simcall, const char* fullpath, sg_host_t host)
{
//SIMIX FILE OPEN
void simcall_HANDLER_file_open(smx_simcall_t simcall, const char* fullpath, sg_host_t host)
{
- smx_
synchro
_t synchro = SIMIX_file_open(fullpath, host);
+ smx_
activity
_t synchro = SIMIX_file_open(fullpath, host);
synchro->simcalls.push_back(simcall);
simcall->issuer->waiting_synchro = synchro;
}
synchro->simcalls.push_back(simcall);
simcall->issuer->waiting_synchro = synchro;
}
-smx_
synchro
_t SIMIX_file_open(const char* fullpath, sg_host_t host)
+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));
{
if (host->isOff())
THROWF(host_error, 0, "Host %s failed, you cannot call this function", sg_host_get_name(host));
- simgrid::
simix::Io *synchro = new simgrid::simix
::Io();
+ simgrid::
kernel::activity::Io *synchro = new simgrid::kernel::activity
::Io();
synchro->host = host;
synchro->surf_io = surf_host_open(host, fullpath);
synchro->surf_io->setData(synchro);
synchro->host = host;
synchro->surf_io = surf_host_open(host, fullpath);
synchro->surf_io->setData(synchro);
@@
-127,17
+127,17
@@
smx_synchro_t SIMIX_file_open(const char* fullpath, sg_host_t host)
//SIMIX FILE CLOSE
void simcall_HANDLER_file_close(smx_simcall_t simcall, smx_file_t fd, sg_host_t host)
{
//SIMIX FILE CLOSE
void simcall_HANDLER_file_close(smx_simcall_t simcall, smx_file_t fd, sg_host_t host)
{
- smx_
synchro
_t synchro = SIMIX_file_close(fd, host);
+ smx_
activity
_t synchro = SIMIX_file_close(fd, host);
synchro->simcalls.push_back(simcall);
simcall->issuer->waiting_synchro = synchro;
}
synchro->simcalls.push_back(simcall);
simcall->issuer->waiting_synchro = synchro;
}
-smx_
synchro
_t SIMIX_file_close(smx_file_t fd, sg_host_t host)
+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));
{
if (host->isOff())
THROWF(host_error, 0, "Host %s failed, you cannot call this function", sg_host_get_name(host));
- simgrid::
simix::Io *synchro = new simgrid::simix
::Io();
+ simgrid::
kernel::activity::Io *synchro = new simgrid::kernel::activity
::Io();
synchro->host = host;
synchro->surf_io = surf_host_close(host, fd->surf_file);
synchro->surf_io->setData(synchro);
synchro->host = host;
synchro->surf_io = surf_host_close(host, fd->surf_file);
synchro->surf_io->setData(synchro);
@@
-162,7
+162,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);
}
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);
{
sg_host_t host = process->host;
return surf_host_get_size(host, fd->surf_file);
@@
-173,7
+173,7
@@
sg_size_t simcall_HANDLER_file_tell(smx_simcall_t simcall, smx_file_t fd)
return SIMIX_file_tell(simcall->issuer, 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);
{
sg_host_t host = process->host;
return surf_host_file_tell(host, fd->surf_file);
@@
-185,7
+185,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);
}
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);
{
sg_host_t host = process->host;
return surf_host_get_info(host, fd->surf_file);
@@
-196,7
+196,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);
}
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);
{
sg_host_t host = process->host;
return surf_host_file_seek(host, fd->surf_file, offset, origin);
@@
-207,7
+207,7
@@
int simcall_HANDLER_file_move(smx_simcall_t simcall, smx_file_t file, const char
return SIMIX_file_move(simcall->issuer, file, fullpath);
}
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);
{
sg_host_t host = process->host;
return surf_host_file_move(host, file->surf_file, fullpath);
@@
-222,7
+222,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);
}
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);
}
{
return surf_storage_get_free_size(storage);
}
@@
-232,7
+232,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);
}
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);
}
{
return surf_storage_get_used_size(storage);
}
@@
-253,16
+253,16
@@
const char* SIMIX_storage_get_host(smx_storage_t storage){
return surf_storage_get_host(storage);
}
return surf_storage_get_host(storage);
}
-void SIMIX_io_destroy(smx_
synchro
_t synchro)
+void SIMIX_io_destroy(smx_
activity
_t synchro)
{
{
- simgrid::
simix::Io *io = static_cast<simgrid::simix
::Io*>(synchro);
+ simgrid::
kernel::activity::Io *io = static_cast<simgrid::kernel::activity
::Io*>(synchro);
XBT_DEBUG("Destroy synchro %p", synchro);
if (io->surf_io)
io->surf_io->unref();
delete io;
}
XBT_DEBUG("Destroy synchro %p", synchro);
if (io->surf_io)
io->surf_io->unref();
delete io;
}
-void SIMIX_io_finish(smx_
synchro
_t synchro)
+void SIMIX_io_finish(smx_
activity
_t synchro)
{
for (smx_simcall_t simcall : synchro->simcalls) {
switch (synchro->state) {
{
for (smx_simcall_t simcall : synchro->simcalls) {
switch (synchro->state) {