kill two empty files

diff --git a/buildtools/Cmake/DefinePackages.cmake b/buildtools/Cmake/DefinePackages.cmake
index 8f95a15..01daaf5 100644 (file)
--- a/buildtools/Cmake/DefinePackages.cmake
+++ b/buildtools/Cmake/DefinePackages.cmake
@@ -15,8 +15,6 @@ set(EXTRA_DIST
   src/include/surf/maxmin.h
   src/include/surf/random_mgr.h
   src/include/surf/surf.h
-  src/include/surf/surf_resource.h
-  src/include/surf/surf_resource_lmm.h
   src/include/surf/surfxml_parse_values.h
   src/include/surf/trace_mgr.h
   src/include/xbt/win32_ucontext.h

diff --git a/src/include/surf/surf_resource.h b/src/include/surf/surf_resource.h
deleted file mode 100644 (file)
index 38df8be..0000000
--- a/src/include/surf/surf_resource.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-/* Copyright (c) 2009-2014. 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 "surf/surf.h"
-#ifndef SURF_RESOURCE_H
-#define SURF_RESOURCE_H
-
-/*FIXME:DELETEstatic XBT_INLINE
-    surf_resource_t surf_resource_new(size_t childsize,
-                                      surf_model_t model, const char *name,
-                                      xbt_dict_t props, void_f_pvoid_t free_f)
-{
-  surf_resource_t res = xbt_malloc0(childsize);
-  res->model = model;
-  res->name = xbt_strdup(name);
-  res->properties = props;
-  res->free_f=free_f;
-  return res;
-}
-
-static XBT_INLINE void surf_resource_free(void *r)
-{
-  surf_resource_t resource = r;
-  if(resource->free_f)
-    resource->free_f(r);
-  free(resource->name);
-  xbt_dict_free(&resource->properties);
-  free(resource);
-}
-
-static XBT_INLINE const char *surf_resource_name(const void *resource)
-{
-  return ((surf_resource_t) resource)->name;
-}
-
-static XBT_INLINE xbt_dict_t surf_resource_properties(const void *resource)
-{
-  return ((surf_resource_t) resource)->properties;
-}*/
-
-#endif                          /* SURF_RESOURCE_H */

diff --git a/src/include/surf/surf_resource_lmm.h b/src/include/surf/surf_resource_lmm.h
deleted file mode 100644 (file)
index b0d7e33..0000000
--- a/src/include/surf/surf_resource_lmm.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-/* Copyright (c) 2009-2014. 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. */
-
-#ifndef SURF_RESOURCE_LMM_H
-#define SURF_RESOURCE_LMM_H
-#include "surf/surf.h"
-#include "surf/trace_mgr.h"
-#include "surf/surf_resource.h"
-
-#ifdef TOMATO
-static XBT_INLINE
-    surf_resource_lmm_t surf_resource_lmm_new(size_t childsize,
-                                              /* for superclass */
-                                              surf_model_t model,
-                                              const char *name, xbt_dict_t props,
-                                              lmm_system_t system,
-                                              double constraint_value,
-                                              tmgr_history_t history,
-                                              e_surf_resource_state_t state_init,
-                                              tmgr_trace_t state_trace,
-                                              double metric_peak,
-                                              tmgr_trace_t metric_trace)
-{
-
-  surf_resource_lmm_t res =
-      (surf_resource_lmm_t) surf_resource_new(childsize, model, name,
-                                              props, NULL);
-
-  res->constraint = lmm_constraint_new(system, res, constraint_value);
-  res->state_current = state_init;
-  if (state_trace)
-    res->state_event =
-        tmgr_history_add_trace(history, state_trace, 0.0, 0, res);
-
-  res->power.scale = 1.0;
-  res->power.peak = metric_peak;
-  if (metric_trace)
-    res->power.event =
-        tmgr_history_add_trace(history, metric_trace, 0.0, 0, res);
-  return res;
-}
-#endif
-
-static XBT_INLINE e_surf_resource_state_t surf_resource_lmm_get_state(void
-                                                                      *r)
-{
-  surf_resource_lmm_t resource = (surf_resource_lmm_t) r;
-  return (resource)->state_current;
-}
-#endif                          /* SURF_RESOURCE_LMM_H */

diff --git a/src/simdag/sd_link.c b/src/simdag/sd_link.c
index a79cd28..7f5da90 100644 (file)
--- a/src/simdag/sd_link.c
+++ b/src/simdag/sd_link.c
@@ -9,7 +9,6 @@
 #include "xbt/dict.h"
 #include "xbt/sysdep.h"
 #include "surf/surf.h"
-#include "surf/surf_resource.h"
 
 
 /* Creates a link and registers it in SD.

diff --git a/src/simdag/sd_workstation.c b/src/simdag/sd_workstation.c
index ac506cc..bfe57d9 100644 (file)
--- a/src/simdag/sd_workstation.c
+++ b/src/simdag/sd_workstation.c
@@ -10,7 +10,6 @@
 #include "xbt/lib.h"
 #include "xbt/sysdep.h"
 #include "surf/surf.h"
-#include "surf/surf_resource.h"
 #include "simgrid/msg.h" //FIXME: why?
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(sd_workstation, sd,