New function: simcall_process_get_kill_time()

diff --git a/ChangeLog b/ChangeLog
index f1aee90..c4ab1f6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,5 @@
+New function: simcall_process_get_kill_time()
+
  surf.java:
  * class NetworkLink renamed to Link
 

diff --git a/include/simgrid/simix.h b/include/simgrid/simix.h
index 44535e3..e80e3b6 100644 (file)
--- a/include/simgrid/simix.h
+++ b/include/simgrid/simix.h
@@ -395,6 +395,7 @@ XBT_PUBLIC(int) simcall_process_get_PPID(smx_process_t process);
 XBT_PUBLIC(int) simcall_process_is_suspended(smx_process_t process);
 XBT_PUBLIC(xbt_dict_t) simcall_process_get_properties(smx_process_t host);
 XBT_PUBLIC(void) simcall_process_set_kill_time(smx_process_t process, double kill_time);
+XBT_PUBLIC(double) simcall_process_get_kill_time(smx_process_t process);
 XBT_PUBLIC(void) simcall_process_on_exit(smx_process_t process, int_f_pvoid_pvoid_t fun, void *data);
 XBT_PUBLIC(void) simcall_process_auto_restart_set(smx_process_t process, int auto_restart);
 XBT_PUBLIC(smx_process_t) simcall_process_restart(smx_process_t process);

diff --git a/src/simix/libsmx.c b/src/simix/libsmx.c
index 6287ac4..fb8cc80 100644 (file)
--- a/src/simix/libsmx.c
+++ b/src/simix/libsmx.c
@@ -758,8 +758,6 @@ void simcall_process_set_data(smx_process_t process, void *data)
 /**
  * \ingroup simix_process_management
  * \brief Set the kill time of a process.
- * \param process a process
- * \param kill_time a double
  */
 void simcall_process_set_kill_time(smx_process_t process, double kill_time)
 {
@@ -772,6 +770,13 @@ void simcall_process_set_kill_time(smx_process_t process, double kill_time)
     }
   }
 }
+/**
+ * \ingroup simix_process_management
+ * \brief Get the kill time of a process (or 0 if unset).
+ */
+double simcall_process_get_kill_time(smx_process_t process) {
+       return SIMIX_timer_get_date(process->kill_timer);
+}
 
 /**
  * \ingroup simix_process_management