Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid

[simgrid.git] / src / include / surf / surf.h

diff --git a/src/include/surf/surf.h b/src/include/surf/surf.h
index 3616544..ea2b4bd 100644 (file)
--- a/src/include/surf/surf.h
+++ b/src/include/surf/surf.h
@@ -192,9 +192,6 @@ XBT_PUBLIC(surf_action_t) surf_model_extract_failed_action_set(surf_model_t mode
  */
 XBT_PUBLIC(int) surf_model_running_action_set_size(surf_model_t model);
 
-/** @brief Create a new VM on the specified host */
-XBT_PUBLIC(void) surf_vm_model_create(const char *name, sg_host_t host_PM);
-
 /** @brief Create a communication between two hosts
  *
  * @param model The model which handle the communication
@@ -254,13 +251,6 @@ XBT_PUBLIC(sg_size_t) surf_host_get_free_size(sg_host_t resource, const char* na
  */
 XBT_PUBLIC(sg_size_t) surf_host_get_used_size(sg_host_t resource, const char* name);
 
-/**
- * @brief Destroy a VM
- *
- * @param resource The surf vm
- */
-XBT_PUBLIC(void) surf_vm_destroy(sg_host_t resource);
-
 /** @brief Suspend a VM */
 XBT_PUBLIC(void) surf_vm_suspend(sg_host_t resource);
 
@@ -306,16 +296,6 @@ XBT_PUBLIC(sg_host_t) surf_vm_get_pm(sg_host_t resource);
  */
 XBT_PUBLIC(void) surf_vm_set_bound(sg_host_t resource, double bound);
 
-/**
- * @brief [brief description]
- * @details [long description]
- *
- * @param resource [description]
- * @param cpu [description]
- * @param mask [description]
- */
-XBT_PUBLIC(void) surf_vm_set_affinity(sg_host_t resource, sg_host_t cpu, unsigned long mask);
-
 /**
  * @brief Unlink a file descriptor
  *
@@ -370,9 +350,7 @@ XBT_PUBLIC(int) surf_host_file_move(sg_host_t host, surf_file_t fd, const char*
  *  - SEEK_END: end of the file
  * @return MSG_OK if successful, otherwise MSG_TASK_CANCELED
  */
-XBT_PUBLIC(int) surf_host_file_seek(sg_host_t host,
-                                           surf_file_t fd, sg_offset_t offset,
-                                           int origin);
+XBT_PUBLIC(int) surf_host_file_seek(sg_host_t host, surf_file_t fd, sg_offset_t offset, int origin);
 
 /**
  * @brief Get the content of a storage
@@ -563,7 +541,6 @@ XBT_PUBLIC(void) surf_network_model_init_Constant();
  */
 XBT_PUBLIC(void) surf_network_model_init_CM02();
 
-#if HAVE_NS3
 /** \ingroup SURF_models
  *  \brief Initializes the platform with the network model NS3
  *
@@ -573,7 +550,6 @@ XBT_PUBLIC(void) surf_network_model_init_CM02();
  *  \see surf_host_model_init_NS3()
  */
 XBT_PUBLIC(void) surf_network_model_init_NS3();
-#endif
 
 /** \ingroup SURF_models
  *  \brief Initializes the platform with the network model Reno
@@ -693,16 +669,6 @@ XBT_PUBLIC(void) surf_vm_model_init_HL13();
  */
 XBT_PUBLIC_DATA(s_surf_model_description_t) surf_vm_model_description[];
 
-/** \ingroup SURF_models
- *  \brief List of initialized models
- */
-XBT_PUBLIC_DATA(xbt_dynar_t) all_existing_models;
-
-/** \ingroup SURF_simulation
- *  \brief List of hosts that have just restarted and whose autorestart process should be restarted.
- */
-XBT_PUBLIC_DATA(xbt_dynar_t) host_that_restart;
-
 /** \ingroup SURF_simulation
  *  \brief List of hosts for which one want to be notified if they ever restart.
  */