X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/befbbbe1fbb31663a8f91e24ce12df271cf4ae79..62a32394d08487c948e60b95817e03d81f1af91d:/src/simix/simcalls.in

diff --git a/src/simix/simcalls.in b/src/simix/simcalls.in
index ad9ed06060..b74022207a 100644
--- a/src/simix/simcalls.in
+++ b/src/simix/simcalls.in
@@ -46,8 +46,8 @@ int  process_is_suspended(smx_actor_t process) [[nohandler]];
 int  process_join(smx_actor_t process, double timeout) [[block]];
 int  process_sleep(double duration) [[block]];
 
-boost::intrusive_ptr<simgrid::kernel::activity::ActivityImpl> execution_start(const char* name, double flops_amount, double priority, double bound);
-boost::intrusive_ptr<simgrid::kernel::activity::ActivityImpl> execution_parallel_start(const char* name, int host_nb, sg_host_t* host_list, double* flops_amount, double* bytes_amount, double amount, double rate, double timeout) [[nohandler]];
+boost::intrusive_ptr<simgrid::kernel::activity::ExecImpl> execution_start(const char* name, double flops_amount, double priority, double bound);
+boost::intrusive_ptr<simgrid::kernel::activity::ExecImpl> execution_parallel_start(const char* name, int host_nb, sg_host_t* host_list, double* flops_amount, double* bytes_amount, double amount, double rate, double timeout) [[nohandler]];
 void          execution_cancel(boost::intrusive_ptr<simgrid::kernel::activity::ActivityImpl> execution) [[nohandler]];
 void          execution_set_priority(boost::intrusive_ptr<simgrid::kernel::activity::ActivityImpl> execution, double priority) [[nohandler]];
 void          execution_set_bound(boost::intrusive_ptr<simgrid::kernel::activity::ActivityImpl> execution, double bound) [[nohandler]];
@@ -85,16 +85,15 @@ void      sem_acquire(smx_sem_t sem) [[block]];
 void      sem_acquire_timeout(smx_sem_t sem, double timeout) [[block]];
 int       sem_get_capacity(smx_sem_t sem);
 
-sg_size_t   file_read(smx_file_t fd, sg_size_t size, sg_host_t host) [[block]];
-sg_size_t   file_write(smx_file_t fd, sg_size_t size, sg_host_t host) [[block]];
-smx_file_t  file_open(const char* fullpath, sg_host_t host) [[block]];
-int         file_close(smx_file_t fd, sg_host_t host) [[block]];
-int         file_unlink(smx_file_t fd, sg_host_t host) [[nohandler]];
-sg_size_t   file_get_size(smx_file_t fd);
-sg_size_t   file_tell(smx_file_t fd);
-int         file_seek(smx_file_t fd, sg_offset_t offset, int origin);
-xbt_dynar_t file_get_info(smx_file_t fd);
-int         file_move(smx_file_t fd, const char* fullpath);
+sg_size_t   file_read(surf_file_t fd, sg_size_t size, sg_host_t host) [[block]];
+sg_size_t   file_write(surf_file_t fd, sg_size_t size, sg_host_t host) [[block]];
+surf_file_t  file_open(const char* mount, const char* path, sg_storage_t st) [[block]];
+int         file_close(surf_file_t fd, sg_host_t host) [[block]];
+int         file_unlink(surf_file_t fd, sg_host_t host) [[nohandler]];
+sg_size_t   file_get_size(surf_file_t fd) [[nohandler]];
+sg_size_t   file_tell(surf_file_t fd) [[nohandler]];
+int         file_seek(surf_file_t fd, sg_offset_t offset, int origin) [[nohandler]];
+int         file_move(surf_file_t fd, const char* fullpath);
 
 int        mc_random(int min, int max);
 void       set_category(boost::intrusive_ptr<simgrid::kernel::activity::ActivityImpl> synchro, const char* category) [[nohandler]];