inline the accessors of surf_resource_t

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@6449 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/src/Makefile.am b/src/Makefile.am
index 9c4b175..6c73acd 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -37,6 +37,7 @@ EXTRA_DIST= \
        xbt/ex_interface.h \
         xbt/backtrace_linux.c xbt/backtrace_windows.c xbt/backtrace_dummy.c \
         \
+        surf/surf_resource.h  \
        surf/maxmin_private.h \
        surf/trace_mgr_private.h \
        surf/surf_private.h \
@@ -169,7 +170,6 @@ XBT_SG_SRC = \
 
 SURF_SRC= \
   surf/surf_model.c                                                          \
-  surf/surf_resource.c                                                       \
   surf/surf_action.c                                                         \
   surf/surf_routing.c                                                        \
   surf/surf_config.c                                                         \

diff --git a/src/include/surf/surf.h b/src/include/surf/surf.h
index fe6e62f..43ab9a4 100644 (file)
--- a/src/include/surf/surf.h
+++ b/src/include/surf/surf.h
@@ -253,9 +253,6 @@ XBT_PUBLIC(int) find_model_description(s_surf_model_description_t * table,
        xbt_dict_t properties;
      } s_surf_resource_t, *surf_resource_t;
 
-     XBT_PUBLIC(const char*) surf_resource_name(const void *resource);
-XBT_PUBLIC(void) surf_resource_free(void* resource);
-
 /**
  * Resource which have a metric handled by a maxmin system
  */
@@ -607,6 +604,7 @@ XBT_PUBLIC_DATA(xbt_dict_t) trace_connect_list_latency;
 
 XBT_PUBLIC(double) get_cpu_power(const char *power);
 
+#include "surf/surf_resource.h"
 
 SG_END_DECL()
 #endif /* _SURF_SURF_H */

diff --git a/src/surf/surf_resource.c b/src/include/surf/surf_resource.h
similarity index 62%
rename from src/surf/surf_resource.c
rename to src/include/surf/surf_resource.h
index aa36741..8fb6861 100644 (file)
--- a/src/surf/surf_resource.c
+++ b/src/include/surf/surf_resource.h
@@ -4,10 +4,11 @@
 /* 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_private.h"
-#include "xbt/dict.h"
+#include "surf/surf.h"
+#ifndef SURF_RESOURCE_H
+#define SURF_RESOURCE_H
 
-void surf_resource_free(void* r) {
+static XBT_INLINE void surf_resource_free(void* r) {
   surf_resource_t resource = r;
   if (resource->name)
     free(resource->name);
@@ -16,10 +17,12 @@ void surf_resource_free(void* r) {
   free(resource);
 }
 
-const char *surf_resource_name(const void *resource) {
+static XBT_INLINE const char *surf_resource_name(const void *resource) {
   return ((surf_resource_t)resource)->name;
 }
 
-xbt_dict_t surf_resource_properties(const void *resource) {
+static XBT_INLINE xbt_dict_t surf_resource_properties(const void *resource) {
   return ((surf_resource_t)resource)->properties;
 }
+
+#endif /* SURF_RESOURCE_H */