modernize some simcalls

[simgrid.git] / src / simix / popping_accessors.h

diff --git a/src/simix/popping_accessors.h b/src/simix/popping_accessors.h
index 6232869..7d414e6 100644 (file)
--- a/src/simix/popping_accessors.h
+++ b/src/simix/popping_accessors.h
@@ -1542,17 +1542,17 @@ static inline void simcall_sem_get_capacity__set__result(smx_simcall_t simcall,
     simgrid::simix::marshal<int>(simcall->result, result);
 }
 
-static inline smx_file_t simcall_file_read__get__fd(smx_simcall_t simcall)
+static inline surf_file_t simcall_file_read__get__fd(smx_simcall_t simcall)
 {
-  return simgrid::simix::unmarshal<smx_file_t>(simcall->args[0]);
+  return simgrid::simix::unmarshal<surf_file_t>(simcall->args[0]);
 }
-static inline smx_file_t simcall_file_read__getraw__fd(smx_simcall_t simcall)
+static inline surf_file_t simcall_file_read__getraw__fd(smx_simcall_t simcall)
 {
-  return simgrid::simix::unmarshal_raw<smx_file_t>(simcall->args[0]);
+  return simgrid::simix::unmarshal_raw<surf_file_t>(simcall->args[0]);
 }
-static inline void simcall_file_read__set__fd(smx_simcall_t simcall, smx_file_t arg)
+static inline void simcall_file_read__set__fd(smx_simcall_t simcall, surf_file_t arg)
 {
-  simgrid::simix::marshal<smx_file_t>(simcall->args[0], arg);
+  simgrid::simix::marshal<surf_file_t>(simcall->args[0], arg);
 }
 static inline sg_size_t simcall_file_read__get__size(smx_simcall_t simcall)
 {
@@ -1590,17 +1590,17 @@ static inline void simcall_file_read__set__result(smx_simcall_t simcall, sg_size
     simgrid::simix::marshal<sg_size_t>(simcall->result, result);
 }
 
-static inline smx_file_t simcall_file_write__get__fd(smx_simcall_t simcall)
+static inline surf_file_t simcall_file_write__get__fd(smx_simcall_t simcall)
 {
-  return simgrid::simix::unmarshal<smx_file_t>(simcall->args[0]);
+  return simgrid::simix::unmarshal<surf_file_t>(simcall->args[0]);
 }
-static inline smx_file_t simcall_file_write__getraw__fd(smx_simcall_t simcall)
+static inline surf_file_t simcall_file_write__getraw__fd(smx_simcall_t simcall)
 {
-  return simgrid::simix::unmarshal_raw<smx_file_t>(simcall->args[0]);
+  return simgrid::simix::unmarshal_raw<surf_file_t>(simcall->args[0]);
 }
-static inline void simcall_file_write__set__fd(smx_simcall_t simcall, smx_file_t arg)
+static inline void simcall_file_write__set__fd(smx_simcall_t simcall, surf_file_t arg)
 {
-  simgrid::simix::marshal<smx_file_t>(simcall->args[0], arg);
+  simgrid::simix::marshal<surf_file_t>(simcall->args[0], arg);
 }
 static inline sg_size_t simcall_file_write__get__size(smx_simcall_t simcall)
 {
@@ -1674,29 +1674,30 @@ static inline void simcall_file_open__set__st(smx_simcall_t simcall, sg_storage_
 {
   simgrid::simix::marshal<sg_storage_t>(simcall->args[2], arg);
 }
-static inline smx_file_t simcall_file_open__get__result(smx_simcall_t simcall)
+static inline surf_file_t simcall_file_open__get__result(smx_simcall_t simcall)
 {
-  return simgrid::simix::unmarshal<smx_file_t>(simcall->result);
+  return simgrid::simix::unmarshal<surf_file_t>(simcall->result);
 }
-static inline smx_file_t simcall_file_open__getraw__result(smx_simcall_t simcall)
+static inline surf_file_t simcall_file_open__getraw__result(smx_simcall_t simcall)
 {
-  return simgrid::simix::unmarshal_raw<smx_file_t>(simcall->result);
+  return simgrid::simix::unmarshal_raw<surf_file_t>(simcall->result);
 }
-static inline void simcall_file_open__set__result(smx_simcall_t simcall, smx_file_t result){
-    simgrid::simix::marshal<smx_file_t>(simcall->result, result);
+static inline void simcall_file_open__set__result(smx_simcall_t simcall, surf_file_t result)
+{
+  simgrid::simix::marshal<surf_file_t>(simcall->result, result);
 }
 
-static inline smx_file_t simcall_file_close__get__fd(smx_simcall_t simcall)
+static inline surf_file_t simcall_file_close__get__fd(smx_simcall_t simcall)
 {
-  return simgrid::simix::unmarshal<smx_file_t>(simcall->args[0]);
+  return simgrid::simix::unmarshal<surf_file_t>(simcall->args[0]);
 }
-static inline smx_file_t simcall_file_close__getraw__fd(smx_simcall_t simcall)
+static inline surf_file_t simcall_file_close__getraw__fd(smx_simcall_t simcall)
 {
-  return simgrid::simix::unmarshal_raw<smx_file_t>(simcall->args[0]);
+  return simgrid::simix::unmarshal_raw<surf_file_t>(simcall->args[0]);
 }
-static inline void simcall_file_close__set__fd(smx_simcall_t simcall, smx_file_t arg)
+static inline void simcall_file_close__set__fd(smx_simcall_t simcall, surf_file_t arg)
 {
-  simgrid::simix::marshal<smx_file_t>(simcall->args[0], arg);
+  simgrid::simix::marshal<surf_file_t>(simcall->args[0], arg);
 }
 static inline sg_host_t simcall_file_close__get__host(smx_simcall_t simcall)
 {
@@ -1722,17 +1723,17 @@ static inline void simcall_file_close__set__result(smx_simcall_t simcall, int re
     simgrid::simix::marshal<int>(simcall->result, result);
 }
 
-static inline smx_file_t simcall_file_unlink__get__fd(smx_simcall_t simcall)
+static inline surf_file_t simcall_file_unlink__get__fd(smx_simcall_t simcall)
 {
-  return simgrid::simix::unmarshal<smx_file_t>(simcall->args[0]);
+  return simgrid::simix::unmarshal<surf_file_t>(simcall->args[0]);
 }
-static inline smx_file_t simcall_file_unlink__getraw__fd(smx_simcall_t simcall)
+static inline surf_file_t simcall_file_unlink__getraw__fd(smx_simcall_t simcall)
 {
-  return simgrid::simix::unmarshal_raw<smx_file_t>(simcall->args[0]);
+  return simgrid::simix::unmarshal_raw<surf_file_t>(simcall->args[0]);
 }
-static inline void simcall_file_unlink__set__fd(smx_simcall_t simcall, smx_file_t arg)
+static inline void simcall_file_unlink__set__fd(smx_simcall_t simcall, surf_file_t arg)
 {
-  simgrid::simix::marshal<smx_file_t>(simcall->args[0], arg);
+  simgrid::simix::marshal<surf_file_t>(simcall->args[0], arg);
 }
 static inline sg_host_t simcall_file_unlink__get__host(smx_simcall_t simcall)
 {
@@ -1758,113 +1759,17 @@ static inline void simcall_file_unlink__set__result(smx_simcall_t simcall, int r
     simgrid::simix::marshal<int>(simcall->result, result);
 }
 
-static inline smx_file_t simcall_file_get_size__get__fd(smx_simcall_t simcall)
-{
-  return simgrid::simix::unmarshal<smx_file_t>(simcall->args[0]);
-}
-static inline smx_file_t simcall_file_get_size__getraw__fd(smx_simcall_t simcall)
-{
-  return simgrid::simix::unmarshal_raw<smx_file_t>(simcall->args[0]);
-}
-static inline void simcall_file_get_size__set__fd(smx_simcall_t simcall, smx_file_t arg)
-{
-  simgrid::simix::marshal<smx_file_t>(simcall->args[0], arg);
-}
-static inline sg_size_t simcall_file_get_size__get__result(smx_simcall_t simcall)
-{
-  return simgrid::simix::unmarshal<sg_size_t>(simcall->result);
-}
-static inline sg_size_t simcall_file_get_size__getraw__result(smx_simcall_t simcall)
-{
-  return simgrid::simix::unmarshal_raw<sg_size_t>(simcall->result);
-}
-static inline void simcall_file_get_size__set__result(smx_simcall_t simcall, sg_size_t result){
-    simgrid::simix::marshal<sg_size_t>(simcall->result, result);
-}
-
-static inline smx_file_t simcall_file_tell__get__fd(smx_simcall_t simcall)
-{
-  return simgrid::simix::unmarshal<smx_file_t>(simcall->args[0]);
-}
-static inline smx_file_t simcall_file_tell__getraw__fd(smx_simcall_t simcall)
-{
-  return simgrid::simix::unmarshal_raw<smx_file_t>(simcall->args[0]);
-}
-static inline void simcall_file_tell__set__fd(smx_simcall_t simcall, smx_file_t arg)
-{
-  simgrid::simix::marshal<smx_file_t>(simcall->args[0], arg);
-}
-static inline sg_size_t simcall_file_tell__get__result(smx_simcall_t simcall)
-{
-  return simgrid::simix::unmarshal<sg_size_t>(simcall->result);
-}
-static inline sg_size_t simcall_file_tell__getraw__result(smx_simcall_t simcall)
-{
-  return simgrid::simix::unmarshal_raw<sg_size_t>(simcall->result);
-}
-static inline void simcall_file_tell__set__result(smx_simcall_t simcall, sg_size_t result){
-    simgrid::simix::marshal<sg_size_t>(simcall->result, result);
-}
-
-static inline smx_file_t simcall_file_seek__get__fd(smx_simcall_t simcall)
-{
-  return simgrid::simix::unmarshal<smx_file_t>(simcall->args[0]);
-}
-static inline smx_file_t simcall_file_seek__getraw__fd(smx_simcall_t simcall)
-{
-  return simgrid::simix::unmarshal_raw<smx_file_t>(simcall->args[0]);
-}
-static inline void simcall_file_seek__set__fd(smx_simcall_t simcall, smx_file_t arg)
-{
-  simgrid::simix::marshal<smx_file_t>(simcall->args[0], arg);
-}
-static inline sg_offset_t simcall_file_seek__get__offset(smx_simcall_t simcall)
-{
-  return simgrid::simix::unmarshal<sg_offset_t>(simcall->args[1]);
-}
-static inline sg_offset_t simcall_file_seek__getraw__offset(smx_simcall_t simcall)
-{
-  return simgrid::simix::unmarshal_raw<sg_offset_t>(simcall->args[1]);
-}
-static inline void simcall_file_seek__set__offset(smx_simcall_t simcall, sg_offset_t arg)
-{
-  simgrid::simix::marshal<sg_offset_t>(simcall->args[1], arg);
-}
-static inline int simcall_file_seek__get__origin(smx_simcall_t simcall)
-{
-  return simgrid::simix::unmarshal<int>(simcall->args[2]);
-}
-static inline int simcall_file_seek__getraw__origin(smx_simcall_t simcall)
-{
-  return simgrid::simix::unmarshal_raw<int>(simcall->args[2]);
-}
-static inline void simcall_file_seek__set__origin(smx_simcall_t simcall, int arg)
-{
-  simgrid::simix::marshal<int>(simcall->args[2], arg);
-}
-static inline int simcall_file_seek__get__result(smx_simcall_t simcall)
-{
-  return simgrid::simix::unmarshal<int>(simcall->result);
-}
-static inline int simcall_file_seek__getraw__result(smx_simcall_t simcall)
-{
-  return simgrid::simix::unmarshal_raw<int>(simcall->result);
-}
-static inline void simcall_file_seek__set__result(smx_simcall_t simcall, int result){
-    simgrid::simix::marshal<int>(simcall->result, result);
-}
-
-static inline smx_file_t simcall_file_move__get__fd(smx_simcall_t simcall)
+static inline surf_file_t simcall_file_move__get__fd(smx_simcall_t simcall)
 {
-  return simgrid::simix::unmarshal<smx_file_t>(simcall->args[0]);
+  return simgrid::simix::unmarshal<surf_file_t>(simcall->args[0]);
 }
-static inline smx_file_t simcall_file_move__getraw__fd(smx_simcall_t simcall)
+static inline surf_file_t simcall_file_move__getraw__fd(smx_simcall_t simcall)
 {
-  return simgrid::simix::unmarshal_raw<smx_file_t>(simcall->args[0]);
+  return simgrid::simix::unmarshal_raw<surf_file_t>(simcall->args[0]);
 }
-static inline void simcall_file_move__set__fd(smx_simcall_t simcall, smx_file_t arg)
+static inline void simcall_file_move__set__fd(smx_simcall_t simcall, surf_file_t arg)
 {
-  simgrid::simix::marshal<smx_file_t>(simcall->args[0], arg);
+  simgrid::simix::marshal<surf_file_t>(simcall->args[0], arg);
 }
 static inline const char* simcall_file_move__get__fullpath(smx_simcall_t simcall)
 {
@@ -2028,9 +1933,9 @@ XBT_PRIVATE int simcall_HANDLER_sem_would_block(smx_simcall_t simcall, smx_sem_t
 XBT_PRIVATE void simcall_HANDLER_sem_acquire(smx_simcall_t simcall, smx_sem_t sem);
 XBT_PRIVATE void simcall_HANDLER_sem_acquire_timeout(smx_simcall_t simcall, smx_sem_t sem, double timeout);
 XBT_PRIVATE int simcall_HANDLER_sem_get_capacity(smx_simcall_t simcall, smx_sem_t sem);
-XBT_PRIVATE void simcall_HANDLER_file_read(smx_simcall_t simcall, smx_file_t fd, sg_size_t size, sg_host_t host);
-XBT_PRIVATE void simcall_HANDLER_file_write(smx_simcall_t simcall, smx_file_t fd, sg_size_t size, sg_host_t host);
+XBT_PRIVATE void simcall_HANDLER_file_read(smx_simcall_t simcall, surf_file_t fd, sg_size_t size, sg_host_t host);
+XBT_PRIVATE void simcall_HANDLER_file_write(smx_simcall_t simcall, surf_file_t fd, sg_size_t size, sg_host_t host);
 XBT_PRIVATE void simcall_HANDLER_file_open(smx_simcall_t simcall, const char* mount, const char* path, sg_storage_t st);
-XBT_PRIVATE void simcall_HANDLER_file_close(smx_simcall_t simcall, smx_file_t fd, sg_host_t host);
-XBT_PRIVATE int simcall_HANDLER_file_move(smx_simcall_t simcall, smx_file_t fd, const char* fullpath);
+XBT_PRIVATE void simcall_HANDLER_file_close(smx_simcall_t simcall, surf_file_t fd, sg_host_t host);
+XBT_PRIVATE int simcall_HANDLER_file_move(smx_simcall_t simcall, surf_file_t fd, const char* fullpath);
 XBT_PRIVATE int simcall_HANDLER_mc_random(smx_simcall_t simcall, int min, int max);
\ No newline at end of file