From ddb5db51001c1a87812be98077c86d290529ca03 Mon Sep 17 00:00:00 2001
From: Takishipp <toufik.boubehziz@gmail.com>
Date: Mon, 17 Jul 2017 10:09:33 +0200
Subject: [PATCH] Replace a function by its contents

---
 src/instr/instr_paje_trace.cpp  | 14 --------------
 src/instr/instr_paje_types.cpp  | 12 ++++++------
 src/instr/instr_paje_values.cpp |  9 ---------
 src/instr/instr_private.h       |  2 --
 src/surf/instr_routing.cpp      |  1 -
 5 files changed, 6 insertions(+), 32 deletions(-)

diff --git a/src/instr/instr_paje_trace.cpp b/src/instr/instr_paje_trace.cpp
index a9761ba768..9a0a954a35 100644
--- a/src/instr/instr_paje_trace.cpp
+++ b/src/instr/instr_paje_trace.cpp
@@ -154,20 +154,6 @@ PajeEvent:: ~PajeEvent()
 {
   XBT_DEBUG("%s not implemented for %p: event_type=%d, timestamp=%f", __FUNCTION__,
       this, (int)event_type, timestamp);
-//  xbt_backtrace_display_current();
-
- /* switch (event->event_type){
-  case PAJE_StartLink:
-    xbt_free (((startLink_t)(event->data))->value);
-    xbt_free (((startLink_t)(event->data))->key);
-    break;
-  case PAJE_EndLink:
-    xbt_free (((endLink_t)(event->data))->value);
-    xbt_free (((endLink_t)(event->data))->key);
-    break;
-  default:
-    break;
-  }*/
 }
 
 void TRACE_paje_start() {
diff --git a/src/instr/instr_paje_types.cpp b/src/instr/instr_paje_types.cpp
index 50df5282eb..551e5c469a 100644
--- a/src/instr/instr_paje_types.cpp
+++ b/src/instr/instr_paje_types.cpp
@@ -10,16 +10,11 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_paje_types, instr, "Paje tracing event sy
 
 static type_t rootType = nullptr;        /* the root type */
 
-void PJ_type_alloc ()
-{
-}
-
 void PJ_type_release ()
 {
   rootType = nullptr;
 }
 
-
 type_t PJ_type_get_root ()
 {
   return rootType;
@@ -56,7 +51,12 @@ void PJ_type_free (type_t type)
   char *value_name;
   xbt_dict_cursor_t cursor = nullptr;
   xbt_dict_foreach(type->values, cursor, value_name, value) {
-    PJ_value_free (value);
+     XBT_DEBUG("free value %s, child of %s", value->name, value->father->name);
+     xbt_free(value->name);
+     xbt_free(value->color);
+     xbt_free(value->id);
+     xbt_free(value);
+    //PJ_value_free (value);
   }
   xbt_dict_free (&type->values);
   xbt_free (type->name);
diff --git a/src/instr/instr_paje_values.cpp b/src/instr/instr_paje_values.cpp
index 7c0505ff23..88ad1bbeb3 100644
--- a/src/instr/instr_paje_values.cpp
+++ b/src/instr/instr_paje_values.cpp
@@ -57,12 +57,3 @@ val_t PJ_value_get (const char *name, type_t father)
   }
   return ret;
 }
-
-void PJ_value_free (val_t value)
-{
-  XBT_DEBUG("free value %s, child of %s", value->name, value->father->name);
-  xbt_free(((val_t)value)->name);
-  xbt_free(((val_t)value)->color);
-  xbt_free(((val_t)value)->id);
-  xbt_free(value);
-}
diff --git a/src/instr/instr_private.h b/src/instr/instr_private.h
index fbff688bca..30855a3ab2 100644
--- a/src/instr/instr_private.h
+++ b/src/instr/instr_private.h
@@ -337,7 +337,6 @@ XBT_PUBLIC(void) PJ_container_free_all (void);
 XBT_PUBLIC(void) PJ_container_remove_from_parent (container_t container);
 
 /* instr_paje_types.c */
-XBT_PRIVATE void PJ_type_alloc ();
 XBT_PRIVATE void PJ_type_release ();
 XBT_PUBLIC(type_t)  PJ_type_get_root ();
 XBT_PRIVATE type_t PJ_type_container_new (const char *name, type_t father);
@@ -354,7 +353,6 @@ XBT_PRIVATE XBT_PRIVATE void PJ_type_free (type_t type);
 XBT_PUBLIC(val_t)  PJ_value_new (const char *name, const char *color, type_t father);
 XBT_PUBLIC(val_t)  PJ_value_get_or_new (const char *name, const char *color, type_t father);
 XBT_PUBLIC(val_t)  PJ_value_get (const char *name, const type_t father);
-XBT_PRIVATE void PJ_value_free (val_t value);
 
 XBT_PRIVATE void TRACE_TI_start();
 XBT_PRIVATE void TRACE_TI_end();
diff --git a/src/surf/instr_routing.cpp b/src/surf/instr_routing.cpp
index d6e4f93fee..420221a19c 100644
--- a/src/surf/instr_routing.cpp
+++ b/src/surf/instr_routing.cpp
@@ -169,7 +169,6 @@ static void sg_instr_AS_begin(simgrid::s4u::NetZone& netzone)
 
   if (PJ_container_get_root() == nullptr){
     PJ_container_alloc ();
-    PJ_type_alloc();
     container_t root = PJ_container_new (id, INSTR_AS, nullptr);
     PJ_container_set_root (root);
 
-- 
2.20.1