Update copyright notices

[simgrid.git] / src / instr / jedule / jedule_platform.c

diff --git a/src/instr/jedule/jedule_platform.c b/src/instr/jedule/jedule_platform.c
index b31fc7a..e5593f3 100644 (file)
--- a/src/instr/jedule/jedule_platform.c
+++ b/src/instr/jedule/jedule_platform.c
@@ -1,9 +1,8 @@
-/*
- * jed_simgrid_platform.c
- *
- *  Created on: Nov 30, 2010
- *      Author: sascha
- */
+/* Copyright (c) 2010-2015. 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. */
 
 #include <stdlib.h>
 #include <string.h>
@@ -54,13 +53,16 @@ static void jed_free_container(jed_simgrid_container_t container) {
     xbt_dynar_foreach(container->container_children, iter, child_container) {
       jed_free_container(child_container);
     }
+    xbt_dynar_free(&container->container_children);
   }
 
-  free(container->name);
-  free(container);
+  xbt_free(container->name);
+  xbt_free(container);
 }
 
-void jed_simgrid_create_container(jed_simgrid_container_t *container, char *name) {
+void jed_simgrid_create_container(jed_simgrid_container_t *container,
+                                  const char *name)
+{
   xbt_assert( name != NULL );
 
   *container = xbt_new0(s_jed_simgrid_container_t,1);
@@ -91,7 +93,7 @@ void jed_simgrid_add_resources(jed_simgrid_container_t parent,
   parent->is_lowest = 1;
   xbt_dynar_free(&parent->container_children);
   parent->container_children = NULL;
-  parent->name2id = xbt_dict_new_homogeneous(xbt_free);
+  parent->name2id = xbt_dict_new_homogeneous(xbt_free_f);
   parent->last_id = 0;
   parent->resource_list = xbt_dynar_new(sizeof(char *), NULL);
 
@@ -241,7 +243,7 @@ void jed_simgrid_get_resource_selection_by_hosts(xbt_dynar_t subset_list,
       // printf("subset parent >>> %s\n", parent->name);
       add_subsets_to(subset_list, hostgroup, parent);
     }
-
+    xbt_dynar_free(&hostgroup);
   }
 
   xbt_dict_free(&parent2hostgroup);
@@ -256,7 +258,7 @@ void jedule_add_meta_info(jedule_t jedule, char *key, char *value) {
   xbt_assert(key != NULL);
   xbt_assert(value != NULL);
 
-  val_cp = strdup(value);
+  val_cp = xbt_strdup(value);
   xbt_dict_set(jedule->jedule_meta_info, key, val_cp, NULL);
 }
 
@@ -272,7 +274,7 @@ void jed_free_jedule(jedule_t jedule) {
   jed_free_container(jedule->root_container);
 
   xbt_dict_free(&jedule->jedule_meta_info);
-  free(jedule);
+  xbt_free(jedule);
 
   xbt_dict_free(&host2_simgrid_parent_container);
   xbt_dict_free(&container_name2container);