couple of new sg_exec_* functions

[simgrid.git] / src / s4u / s4u_Exec.cpp

diff --git a/src/s4u/s4u_Exec.cpp b/src/s4u/s4u_Exec.cpp
index 6d629ed..ba688e4 100644 (file)
--- a/src/s4u/s4u_Exec.cpp
+++ b/src/s4u/s4u_Exec.cpp
@@ -3,6 +3,7 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
+#include "simgrid/Exception.hpp"
 #include "simgrid/exec.h"
 #include "simgrid/s4u/Actor.hpp"
 #include "simgrid/s4u/Exec.hpp"
@@ -216,24 +217,69 @@ void sg_exec_set_bound(sg_exec_t exec, double bound)
   exec->set_bound(bound);
 }
 
-double sg_exec_get_remaining(sg_exec_t exec)
+void sg_exec_set_host(sg_exec_t exec, sg_host_t new_host)
+{
+  exec->set_host(new_host);
+}
+
+double sg_exec_get_remaining(const_sg_exec_t exec)
 {
   return exec->get_remaining();
 }
 
+double sg_exec_get_remaining_ratio(const_sg_exec_t exec)
+{
+  return exec->get_remaining_ratio();
+}
+
 void sg_exec_start(sg_exec_t exec)
 {
   exec->start();
 }
 
-void sg_exec_wait(sg_exec_t exec)
+void sg_exec_cancel(sg_exec_t exec)
+{
+  exec->cancel();
+  exec->unref();
+}
+
+int sg_exec_test(sg_exec_t exec)
 {
-  exec->wait_for(-1);
+  bool finished = exec->test();
+  if (finished)
+    exec->unref();
+  return finished;
+}
+
+sg_error_t sg_exec_wait(sg_exec_t exec)
+{
+  sg_error_t status = SG_OK;
+
+  try {
+    exec->wait_for(-1);
+  } catch (const simgrid::TimeoutException&) {
+    status = SG_ERROR_TIMEOUT;
+  } catch (const simgrid::CancelException&) {
+    status = SG_ERROR_CANCELED;
+  } catch (const simgrid::HostFailureException&) {
+    status = SG_ERROR_HOST;
+  }
   exec->unref();
+  return status;
 }
 
-void sg_exec_wait_for(sg_exec_t exec, double timeout)
+sg_error_t sg_exec_wait_for(sg_exec_t exec, double timeout)
 {
-  exec->wait_for(timeout);
+  sg_error_t status = SG_OK;
+  try {
+    exec->wait_for(timeout);
+  } catch (const simgrid::TimeoutException&) {
+    status = SG_ERROR_TIMEOUT;
+  } catch (const simgrid::CancelException&) {
+    status = SG_ERROR_CANCELED;
+  } catch (const simgrid::HostFailureException&) {
+    status = SG_ERROR_HOST;
+  }
   exec->unref();
+  return status;
 }