further objectification of jedule bindings

[simgrid.git] / include / simgrid / jedule / jedule_platform.hpp

diff --git a/include/simgrid/jedule/jedule_platform.hpp b/include/simgrid/jedule/jedule_platform.hpp
index 618f9e0..204ddc8 100644 (file)
--- a/include/simgrid/jedule/jedule_platform.hpp
+++ b/include/simgrid/jedule/jedule_platform.hpp
@@ -10,7 +10,6 @@
 #include "simgrid_config.h"
 #include "simgrid/forward.h"
 #include "xbt/dynar.h"
-#include "xbt/dict.h"
 #include <unordered_map>
 #include <vector>
 #include <string>
@@ -22,14 +21,14 @@ namespace jedule{
 XBT_PUBLIC_CLASS Container {
 public:
   Container(std::string name);
-  ~Container()=default;
+  virtual ~Container();
 private:
   int last_id;
-  int is_lowest;
+  int is_lowest = 0;
 public:
   std::string name;
   std::unordered_map<const char*, int> name2id;
-  Container *parent;
+  Container *parent = nullptr;
   std::vector<Container*> children;
   std::vector<sg_host_t> resource_list;
   void addChild(Container* child);
@@ -46,6 +45,7 @@ public:
 SG_BEGIN_DECL()
 typedef simgrid::jedule::Container * jed_container_t;
 
+/* FIXME: jedule_container should be objectified too */
 /** selection of a subset of resources from the original set */
 struct jed_res_subset {
   jed_container_t parent;
@@ -55,17 +55,6 @@ struct jed_res_subset {
 
 typedef struct jed_res_subset s_jed_res_subset_t, *jed_res_subset_t;
 
-typedef struct jedule_struct {
-  jed_container_t root_container;
-  std::unordered_map<char*, char*> jedule_meta_info;
-} s_jedule_t;
-
-typedef s_jedule_t *jedule_t;
-
-void jed_create_jedule(jedule_t *jedule);
-void jed_free_jedule(jedule_t jedule);
-void jedule_add_meta_info(jedule_t jedule, char *key, char *value);
-
 /**
  * it is assumed that the host_names in the entire system are unique that means that we don't need parent references
  *