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
Introduce sg_storage_size_t type
[simgrid.git]
/
src
/
simix
/
smx_io.c
diff --git
a/src/simix/smx_io.c
b/src/simix/smx_io.c
index
9d7d19e
..
a657e1b
100644
(file)
--- a/
src/simix/smx_io.c
+++ b/
src/simix/smx_io.c
@@
-1,4
+1,4
@@
-/* Copyright (c) 2007
, 2008, 2009, 2010
. The SimGrid Team.
+/* Copyright (c) 2007
-2010, 2012-2013
. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
@@
-29,7
+29,8
@@
smx_storage_t SIMIX_storage_create(const char *name, void *storage, void *data)
/* Update global variables */
xbt_lib_set(storage_lib,name,SIMIX_STORAGE_LEVEL,smx_storage);
/* Update global variables */
xbt_lib_set(storage_lib,name,SIMIX_STORAGE_LEVEL,smx_storage);
- return xbt_lib_get_elm_or_null(storage_lib, name);
+
+ return xbt_lib_get_or_null(storage_lib, name, SIMIX_STORAGE_LEVEL);
}
}
@@
-54,7
+55,7
@@
void SIMIX_file_set_data(smx_file_t fd, void *data){
}
//SIMIX FILE READ
}
//SIMIX FILE READ
-void SIMIX_pre_file_read(smx_simcall_t simcall, size_t size,
+void SIMIX_pre_file_read(smx_simcall_t simcall, s
g_storage_s
ize_t size,
smx_file_t fd)
{
smx_action_t action = SIMIX_file_read(simcall->issuer, size, fd);
smx_file_t fd)
{
smx_action_t action = SIMIX_file_read(simcall->issuer, size, fd);
@@
-62,7
+63,7
@@
void SIMIX_pre_file_read(smx_simcall_t simcall, size_t size,
simcall->issuer->waiting_action = action;
}
simcall->issuer->waiting_action = action;
}
-smx_action_t SIMIX_file_read(smx_process_t process, size_t size,
+smx_action_t SIMIX_file_read(smx_process_t process, s
g_storage_s
ize_t size,
smx_file_t fd)
{
smx_action_t action;
smx_file_t fd)
{
smx_action_t action;
@@
-94,7
+95,7
@@
smx_action_t SIMIX_file_read(smx_process_t process, size_t size,
}
//SIMIX FILE WRITE
}
//SIMIX FILE WRITE
-void SIMIX_pre_file_write(smx_simcall_t simcall, size_t size,
+void SIMIX_pre_file_write(smx_simcall_t simcall, s
g_storage_s
ize_t size,
smx_file_t fd)
{
smx_action_t action = SIMIX_file_write(simcall->issuer, size, fd);
smx_file_t fd)
{
smx_action_t action = SIMIX_file_write(simcall->issuer, size, fd);
@@
-103,7
+104,7
@@
void SIMIX_pre_file_write(smx_simcall_t simcall, size_t size,
}
smx_action_t SIMIX_file_write(smx_process_t process,
}
smx_action_t SIMIX_file_write(smx_process_t process,
-
size_t size, smx_file_t fd)
+
sg_storage_
size_t size, smx_file_t fd)
{
smx_action_t action;
smx_host_t host = process->smx_host;
{
smx_action_t action;
smx_host_t host = process->smx_host;
@@
-265,12
+266,12
@@
smx_action_t SIMIX_file_ls(smx_process_t process, const char* mount, const char
return action;
}
return action;
}
-size_t SIMIX_pre_file_get_size(smx_simcall_t simcall, smx_file_t fd)
+s
g_storage_s
ize_t SIMIX_pre_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);
}
-size_t SIMIX_file_get_size(smx_process_t process, smx_file_t fd)
+s
g_storage_s
ize_t SIMIX_file_get_size(smx_process_t process, smx_file_t fd)
{
smx_host_t host = process->smx_host;
return surf_workstation_model->extension.workstation.get_size(host,
{
smx_host_t host = process->smx_host;
return surf_workstation_model->extension.workstation.get_size(host,
@@
-289,23
+290,23
@@
xbt_dynar_t SIMIX_file_get_info(smx_process_t process, smx_file_t fd)
fd->surf_file);
}
fd->surf_file);
}
-size_t SIMIX_pre_storage_get_free_size(smx_simcall_t simcall, const char* name)
+s
g_storage_s
ize_t SIMIX_pre_storage_get_free_size(smx_simcall_t simcall, const char* name)
{
return SIMIX_storage_get_free_size(simcall->issuer, name);
}
{
return SIMIX_storage_get_free_size(simcall->issuer, name);
}
-size_t SIMIX_storage_get_free_size(smx_process_t process, const char* name)
+s
g_storage_s
ize_t SIMIX_storage_get_free_size(smx_process_t process, const char* name)
{
smx_host_t host = process->smx_host;
return surf_workstation_model->extension.workstation.get_free_size(host,name);
}
{
smx_host_t host = process->smx_host;
return surf_workstation_model->extension.workstation.get_free_size(host,name);
}
-size_t SIMIX_pre_storage_get_used_size(smx_simcall_t simcall, const char* name)
+s
g_storage_s
ize_t SIMIX_pre_storage_get_used_size(smx_simcall_t simcall, const char* name)
{
return SIMIX_storage_get_used_size(simcall->issuer, name);
}
{
return SIMIX_storage_get_used_size(simcall->issuer, name);
}
-size_t SIMIX_storage_get_used_size(smx_process_t process, const char* name)
+s
g_storage_s
ize_t SIMIX_storage_get_used_size(smx_process_t process, const char* name)
{
smx_host_t host = process->smx_host;
return surf_workstation_model->extension.workstation.get_used_size(host,name);
{
smx_host_t host = process->smx_host;
return surf_workstation_model->extension.workstation.get_used_size(host,name);