One more dynar less.

[simgrid.git] / src / simdag / simdag_private.hpp

diff --git a/src/simdag/simdag_private.hpp b/src/simdag/simdag_private.hpp
index 13d55f4..7565424 100644 (file)
--- a/src/simdag/simdag_private.hpp
+++ b/src/simdag/simdag_private.hpp
@@ -1,5 +1,4 @@
-/* Copyright (c) 2006-2017. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2006-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. */
 
 /* 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. */


@@ -22,6 +21,7 @@ class Global {
 public:
   explicit Global();
   Global(const Global&) = delete;
 public:
   explicit Global();
   Global(const Global&) = delete;

+  Global& operator=(const Global&) = delete;

   ~Global();
   bool watch_point_reached;      /* has a task just reached a watch point? */
   std::set<SD_task_t> *initial_tasks;
   ~Global();
   bool watch_point_reached;      /* has a task just reached a watch point? */
   std::set<SD_task_t> *initial_tasks;


@@ -34,7 +34,6 @@ std::set<SD_task_t>* simulate (double how_long);
 }
 }
 
 }
 }
 

-extern "C" {

 extern XBT_PRIVATE simgrid::sd::Global *sd_global;
 
 /* Task */
 extern XBT_PRIVATE simgrid::sd::Global *sd_global;
 
 /* Task */


@@ -47,12 +46,12 @@ struct s_SD_task_t {
   double alpha;          /* used by typed parallel tasks */
   double start_time;
   double finish_time;
   double alpha;          /* used by typed parallel tasks */
   double start_time;
   double finish_time;

-  surf_action_t surf_action;
+  simgrid::kernel::resource::Action* surf_action;

   unsigned short watch_points;  /* bit field xor()ed with masks */
 
   unsigned short watch_points;  /* bit field xor()ed with masks */
 

-  int marked;                   /* used to check if the task DAG has some cycle*/
+  bool marked = false; /* used to check if the task DAG has some cycle*/

 
 

-  /* dependencies */
+  /* dependencies -- cannot be embedded in the struct since it's not handled as a real C++ class */

   std::set<SD_task_t> *inputs;
   std::set<SD_task_t> *outputs;
   std::set<SD_task_t> *predecessors;
   std::set<SD_task_t> *inputs;
   std::set<SD_task_t> *outputs;
   std::set<SD_task_t> *predecessors;


@@ -71,5 +70,4 @@ XBT_PRIVATE void SD_task_run(SD_task_t task);
 XBT_PRIVATE bool acyclic_graph_detail(xbt_dynar_t dag);
 XBT_PRIVATE void uniq_transfer_task_name(SD_task_t task);
 XBT_PRIVATE const char *__get_state_name(e_SD_task_state_t state);
 XBT_PRIVATE bool acyclic_graph_detail(xbt_dynar_t dag);
 XBT_PRIVATE void uniq_transfer_task_name(SD_task_t task);
 XBT_PRIVATE const char *__get_state_name(e_SD_task_state_t state);

-}

 #endif
 #endif