Merge branch 'master' into hypervisor

[simgrid.git] / src / simix / smx_user.c

diff --git a/src/simix/smx_user.c b/src/simix/smx_user.c
index 8bd8e53..6743b04 100644 (file)
--- a/src/simix/smx_user.c
+++ b/src/simix/smx_user.c
@@ -14,10 +14,12 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix);
 
 /* generate strings from the enumeration values */
 static const char* simcall_names[] = {
 
 /* generate strings from the enumeration values */
 static const char* simcall_names[] = {

-SIMCALL_LIST(SIMCALL_TYPE, SIMCALL_SEP_COMMA)
+SIMCALL_LIST(SIMCALL_STRING_TYPE, SIMCALL_SEP_COMMA)

 [SIMCALL_NONE] = "NONE"
 };
 
 [SIMCALL_NONE] = "NONE"
 };
 

+SIMCALL_LIST(SIMCALL_FUNC, SIMCALL_SEP_NOTHING)
+

 /**
  * \ingroup simix_host_management
  * \brief Returns a host given its name.
 /**
  * \ingroup simix_host_management
  * \brief Returns a host given its name.


@@ -272,6 +274,44 @@ e_smx_state_t simcall_host_execution_wait(smx_action_t execution)
   return simcall_BODY_host_execution_wait(execution);
 }
 
   return simcall_BODY_host_execution_wait(execution);
 }
 

+
+/**
+ * \ingroup simix_vm_management
+ * \brief Returns a dict of the properties assigned to a host.
+ *
+ * \param host A host
+ * \return The properties of this host
+ */
+void* simcall_vm_ws_create(const char *name, smx_host_t phys_host){
+  return simcall_BODY_vm_ws_create(name, phys_host);
+}
+
+void simcall_vm_start(smx_host_t vm) {
+{
+  simcall_BODY_set_vm_state(vm, msg_vm_state_running);
+}
+
+void simcall_vm_suspend(smx_host_t vm)
+{
+  /* will jump to SIMIX_pre_vm_suspend */
+  simcall_BODY_vm_suspend(vm);
+}
+
+void simcall_vm_shutdown(smx_host_t vm)
+{
+  /* will jump to SIMIX_pre_vm_shutdown */
+  simcall_BODY_vm_shutdown(vm);
+}
+
+void simcall_vm_destroy(smx_host_t vm)
+{
+  /*
+   * simcall_BODY_ is defined in src/simix/smx_smurf_private.h.
+   * This function will jump to SIMIX_pre_vm_destroy.
+   **/
+  simcall_BODY_vm_destroy(vm);
+}
+

 /**
  * \ingroup simix_process_management
  * \brief Creates and runs a new SIMIX process.
 /**
  * \ingroup simix_process_management
  * \brief Creates and runs a new SIMIX process.


@@ -321,9 +361,9 @@ void simcall_process_kill(smx_process_t process)
  * \ingroup simix_process_management
  * \brief Kills all SIMIX processes.
  */
  * \ingroup simix_process_management
  * \brief Kills all SIMIX processes.
  */

-void simcall_process_killall(void)
+void simcall_process_killall(int reset_pid)

 {
 {

-  simcall_BODY_process_killall();
+  simcall_BODY_process_killall(reset_pid);

 }
 
 /**
 }
 
 /**


@@ -391,6 +431,38 @@ int simcall_process_count(void)
   return simcall_BODY_process_count();
 }
 
   return simcall_BODY_process_count();
 }
 

+/**
+ * \ingroup simix_process_management
+ * \brief Return the PID of a #smx_process_t.
+ * \param process a SIMIX process
+ * \return the PID of this process
+ */
+int simcall_process_get_PID(smx_process_t process)
+{
+  if (process == SIMIX_process_self()) {
+    /* avoid a simcall if this function is called by the process itself */
+    return SIMIX_process_get_PID(process);
+  }
+
+  return simcall_BODY_process_get_PID(process);
+}
+
+/**
+ * \ingroup simix_process_management
+ * \brief Return the parent PID of a #smx_process_t.
+ * \param process a SIMIX process
+ * \return the PID of this process parenrt
+ */
+int simcall_process_get_PPID(smx_process_t process)
+{
+  if (process == SIMIX_process_self()) {
+    /* avoid a simcall if this function is called by the process itself */
+    return SIMIX_process_get_PPID(process);
+  }
+
+  return simcall_BODY_process_get_PPID(process);
+}
+

 /**
  * \ingroup simix_process_management
  * \brief Return the user data of a #smx_process_t.
 /**
  * \ingroup simix_process_management
  * \brief Return the user data of a #smx_process_t.


@@ -438,7 +510,7 @@ void simcall_process_set_kill_time(smx_process_t process, double kill_time)
   if (kill_time > SIMIX_get_clock()) {
     if (simix_global->kill_process_function) {
       XBT_DEBUG("Set kill time %f for process %s(%s)",kill_time, process->name,
   if (kill_time > SIMIX_get_clock()) {
     if (simix_global->kill_process_function) {
       XBT_DEBUG("Set kill time %f for process %s(%s)",kill_time, process->name,

-          process->smx_host->name);
+          sg_host_name(process->smx_host));

       SIMIX_timer_set(kill_time, simix_global->kill_process_function, process);
     }
   }
       SIMIX_timer_set(kill_time, simix_global->kill_process_function, process);
     }
   }


@@ -760,7 +832,7 @@ int simcall_comm_testany(xbt_dynar_t comms)
 void simcall_comm_wait(smx_action_t comm, double timeout)
 {
   xbt_assert(isfinite(timeout), "timeout is not finite!");
 void simcall_comm_wait(smx_action_t comm, double timeout)
 {
   xbt_assert(isfinite(timeout), "timeout is not finite!");

-  simcall_comm_wait(comm, timeout);
+  simcall_BODY_comm_wait(comm, timeout);

 }
 
 #ifdef HAVE_TRACING
 }
 
 #ifdef HAVE_TRACING


@@ -1062,8 +1134,7 @@ int simcall_file_close(smx_file_t fp)
  */
 int simcall_file_stat(smx_file_t fd, s_file_stat_t *buf)
 {
  */
 int simcall_file_stat(smx_file_t fd, s_file_stat_t *buf)
 {

-  //*buf = simcall->file_stat.buf;
-  return simcall_BODY_file_stat(fd, *buf);
+  return simcall_BODY_file_stat(fd, buf);

 }
 
 /**
 }
 
 /**