factor suspend/resume across Activities

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

diff --git a/src/msg/msg_private.hpp b/src/msg/msg_private.hpp
index 25cead36121d71f225853524cf34bfb0f2464908..5e0c177bf38e2820e24325b7ac9c37929b1b9f59 100644 (file)
--- a/src/msg/msg_private.hpp
+++ b/src/msg/msg_private.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2004-2018. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2004-2019. The SimGrid Team. All rights reserved.          */
 
 /* 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. */
@@ -18,8 +18,9 @@ struct s_simdata_task_t {
   ~s_simdata_task_t()
   {
     /* parallel tasks only */
-    delete[] this->host_list;
-    /* flops_parallel_amount and bytes_parallel_amount are automatically deleted in ~L07Action */
+    delete[] host_list;
+    delete[] flops_parallel_amount;
+    delete[] bytes_parallel_amount;
   }
   void setUsed();
   void setNotUsed() { this->isused = false; }
@@ -51,12 +52,6 @@ private:
 
 namespace simgrid {
 namespace msg {
-class ActorExt {
-public:
-  explicit ActorExt(void* d) : data(d) {}
-  msg_error_t errno_ = MSG_OK;  /* the last value returned by a MSG_function */
-  void* data         = nullptr; /* user data */
-};
 
 class Comm {
 public:
@@ -84,10 +79,6 @@ typedef s_MSG_Global_t* MSG_Global_t;
 XBT_PUBLIC_DATA MSG_Global_t msg_global;
 
 /*************************************************************/
-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,
-                                                      sg_host_t host, std::map<std::string, std::string>* properties,
-                                                      smx_actor_t parent_process);
 XBT_PRIVATE void MSG_comm_copy_data_from_SIMIX(smx_activity_t comm, void* buff, size_t buff_size);
 
 /********** Tracing **********/