no need for a lib to store the netcards. A dict is easier

[simgrid.git] / src / msg / msg_private.h

diff --git a/src/msg/msg_private.h b/src/msg/msg_private.h
index a275943..fa1262c 100644 (file)
--- a/src/msg/msg_private.h
+++ b/src/msg/msg_private.h
@@ -27,7 +27,11 @@
 SG_BEGIN_DECL()
 
 /**************** datatypes **********************************/
+/********************************* Host **************************************/
+typedef struct s_msg_host_priv {
 
+  std::vector<int> *file_descriptor_table;
+} s_msg_host_priv_t;
 /********************************* Task **************************************/
 
 typedef struct simdata_task {
@@ -111,17 +115,9 @@ typedef struct dirty_page {
   msg_task_t task;
 } s_dirty_page, *dirty_page_t;
 
-XBT_PUBLIC_DATA(const char*) MSG_vm_get_property_value(msg_vm_t vm, const char *name);
-XBT_PUBLIC_DATA(xbt_dict_t) MSG_vm_get_properties(msg_vm_t vm);
-XBT_PUBLIC_DATA(void) MSG_vm_set_property_value(msg_vm_t vm, const char *name, void *value, void_f_pvoid_t free_ctn);
-XBT_PUBLIC_DATA(msg_vm_t) MSG_vm_get_by_name(const char *name);
-XBT_PUBLIC_DATA(const char*) MSG_vm_get_name(msg_vm_t vm);
-
 /************************** Global variables ********************************/
 typedef struct MSG_Global {
-  xbt_fifo_t host;
-  int session;
-  int debug_multiple_use;
+  int debug_multiple_use;       /* whether we want an error message when reusing the same Task for 2 things */
   unsigned long int sent_msg;   /* Total amount of messages sent during the simulation */
   void (*task_copy_callback) (msg_task_t task, msg_process_t src, msg_process_t dst);
   void_f_pvoid_t process_data_cleanup;
@@ -137,12 +133,12 @@ XBT_PRIVATE void __MSG_host_priv_free(msg_host_priv_t priv);
 XBT_PRIVATE void __MSG_storage_destroy(msg_storage_priv_t host);
 XBT_PRIVATE void __MSG_file_destroy(msg_file_priv_t host);
 
-XBT_PRIVATE void MSG_process_cleanup_from_SIMIX(smx_process_t smx_proc);
-XBT_PRIVATE smx_process_t MSG_process_create_from_SIMIX(const char *name,
+XBT_PRIVATE void MSG_process_cleanup_from_SIMIX(smx_actor_t smx_proc);
+XBT_PRIVATE smx_actor_t MSG_process_create_from_SIMIX(const char *name,
                                    std::function<void()> code, void *data,
-                                   const char *hostname, double kill_time,
+                                   sg_host_t host, double kill_time,
                                    xbt_dict_t properties, int auto_restart,
-                                   smx_process_t parent_process);
+                                   smx_actor_t parent_process);
 XBT_PRIVATE void MSG_comm_copy_data_from_SIMIX(smx_activity_t comm, void* buff, size_t buff_size);
 
 XBT_PRIVATE void MSG_post_create_environment();
@@ -174,19 +170,6 @@ XBT_PRIVATE void TRACE_msg_process_resume(msg_process_t process);
 XBT_PRIVATE void TRACE_msg_process_sleep_in(msg_process_t process);   //called from msg/gos.c
 XBT_PRIVATE void TRACE_msg_process_sleep_out(msg_process_t process);
 
-/* declaration of instrumentation functions from instr_msg_vm.c */
-XBT_PRIVATE char *instr_vm_id(msg_vm_t vm, char *str, int len);
-XBT_PRIVATE char *instr_vm_id_2(const char *vm_name, char *str, int len);
-XBT_PRIVATE void TRACE_msg_vm_change_host(msg_vm_t vm, msg_host_t old_host, msg_host_t new_host);
-XBT_PRIVATE void TRACE_msg_vm_start(msg_vm_t vm);
-XBT_PRIVATE void TRACE_msg_vm_create(const char *vm_name, msg_host_t host);
-XBT_PRIVATE void TRACE_msg_vm_kill(msg_vm_t process);
-XBT_PRIVATE void TRACE_msg_vm_suspend(msg_vm_t vm);
-XBT_PRIVATE void TRACE_msg_vm_resume(msg_vm_t vm);
-XBT_PRIVATE void TRACE_msg_vm_save(msg_vm_t vm);
-XBT_PRIVATE void TRACE_msg_vm_restore(msg_vm_t vm);
-XBT_PRIVATE void TRACE_msg_vm_end(msg_vm_t vm);
-
 SG_END_DECL()
 
 XBT_PUBLIC(msg_process_t) MSG_process_create_with_environment(