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
Reinitialize waiting_action at proper place.
[simgrid.git]
/
src
/
simix
/
smx_user.c
diff --git
a/src/simix/smx_user.c
b/src/simix/smx_user.c
index
e26d97f
..
8c08f25
100644
(file)
--- a/
src/simix/smx_user.c
+++ b/
src/simix/smx_user.c
@@
-17,6
+17,7
@@
#include "smx_private.h"
#include "mc/mc.h"
#include "smx_private.h"
#include "mc/mc.h"
+#include "xbt/ex.h"
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix);
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix);
@@
-1177,11
+1178,12
@@
int simcall_sem_get_capacity(smx_sem_t sem)
return simcall->sem_get_capacity.result;
}
return simcall->sem_get_capacity.result;
}
-size_t simcall_file_read(
void* ptr, size_t size, size_t nmemb, smx_file_t*
stream)
+size_t simcall_file_read(
const char* storage, void* ptr, size_t size, size_t nmemb, smx_file_t
stream)
{
smx_simcall_t simcall = SIMIX_simcall_mine();
simcall->call = SIMCALL_FILE_READ;
{
smx_simcall_t simcall = SIMIX_simcall_mine();
simcall->call = SIMCALL_FILE_READ;
+ simcall->file_read.storage = storage;
simcall->file_read.ptr = ptr;
simcall->file_read.size = size;
simcall->file_read.nmemb = nmemb;
simcall->file_read.ptr = ptr;
simcall->file_read.size = size;
simcall->file_read.nmemb = nmemb;
@@
-1191,11
+1193,12
@@
size_t simcall_file_read(void* ptr, size_t size, size_t nmemb, smx_file_t* strea
return simcall->file_read.result;
}
return simcall->file_read.result;
}
-size_t simcall_file_write(const
void* ptr, size_t size, size_t nmemb, smx_file_t*
stream)
+size_t simcall_file_write(const
char* storage, const void* ptr, size_t size, size_t nmemb, smx_file_t
stream)
{
smx_simcall_t simcall = SIMIX_simcall_mine();
simcall->call = SIMCALL_FILE_WRITE;
{
smx_simcall_t simcall = SIMIX_simcall_mine();
simcall->call = SIMCALL_FILE_WRITE;
+ simcall->file_write.storage = storage;
simcall->file_write.ptr = ptr;
simcall->file_write.size = size;
simcall->file_write.nmemb = nmemb;
simcall->file_write.ptr = ptr;
simcall->file_write.size = size;
simcall->file_write.nmemb = nmemb;
@@
-1205,11
+1208,12
@@
size_t simcall_file_write(const void* ptr, size_t size, size_t nmemb, smx_file_t
return simcall->file_write.result;
}
return simcall->file_write.result;
}
-smx_file_t
* simcall_file_open(
const char* path, const char* mode)
+smx_file_t
simcall_file_open(const char* storage,
const char* path, const char* mode)
{
smx_simcall_t simcall = SIMIX_simcall_mine();
simcall->call = SIMCALL_FILE_OPEN;
{
smx_simcall_t simcall = SIMIX_simcall_mine();
simcall->call = SIMCALL_FILE_OPEN;
+ simcall->file_open.storage = storage;
simcall->file_open.path = path;
simcall->file_open.mode = mode;
SIMIX_simcall_push(simcall->issuer);
simcall->file_open.path = path;
simcall->file_open.mode = mode;
SIMIX_simcall_push(simcall->issuer);
@@
-1217,26
+1221,29
@@
smx_file_t* simcall_file_open(const char* path, const char* mode)
return simcall->file_open.result;
}
return simcall->file_open.result;
}
-int simcall_file_close(
smx_file_t*
fp)
+int simcall_file_close(
const char* storage, smx_file_t
fp)
{
smx_simcall_t simcall = SIMIX_simcall_mine();
simcall->call = SIMCALL_FILE_CLOSE;
{
smx_simcall_t simcall = SIMIX_simcall_mine();
simcall->call = SIMCALL_FILE_CLOSE;
+ simcall->file_close.storage = storage;
simcall->file_close.fp = fp;
SIMIX_simcall_push(simcall->issuer);
return simcall->file_close.result;
}
simcall->file_close.fp = fp;
SIMIX_simcall_push(simcall->issuer);
return simcall->file_close.result;
}
-int simcall_file_stat(
int fd, void*
buf)
+int simcall_file_stat(
const char* storage, smx_file_t fd, s_file_stat_t *
buf)
{
smx_simcall_t simcall = SIMIX_simcall_mine();
{
smx_simcall_t simcall = SIMIX_simcall_mine();
-
simcall->call = SIMCALL_FILE_STAT;
simcall->call = SIMCALL_FILE_STAT;
+ simcall->file_stat.storage = storage;
simcall->file_stat.fd = fd;
simcall->file_stat.fd = fd;
- simcall->file_stat.buf = buf;
+
SIMIX_simcall_push(simcall->issuer);
SIMIX_simcall_push(simcall->issuer);
+ *buf = simcall->file_stat.buf;
+
return simcall->file_stat.result;
}
return simcall->file_stat.result;
}