mv surf_timer.c surf_model_timer.c

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

diff --git a/src/Makefile.am b/src/Makefile.am
index 890be63..73db507 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -42,7 +42,6 @@ EXTRA_DIST= \
        surf/surf_private.h \
        surf/cpu_private.h \
        surf/workstation_private.h \
        surf/surf_private.h \
        surf/cpu_private.h \
        surf/workstation_private.h \

-       surf/surf_timer_private.h \

        surf/surfxml_parse.c \
        surf/simgrid_dtd.l \
        surf/simgrid_dtd.c \
        surf/surfxml_parse.c \
        surf/simgrid_dtd.l \
        surf/simgrid_dtd.c \


@@ -180,7 +179,7 @@ SURF_SRC= \
   surf/surf.c                                                                \
   surf/surfxml_parse.c                                                       \
   surf/cpu.c   surf/network.c surf/network_constant.c surf/workstation.c     \
   surf/surf.c                                                                \
   surf/surfxml_parse.c                                                       \
   surf/cpu.c   surf/network.c surf/network_constant.c surf/workstation.c     \

-  surf/surf_timer.c                                                          \
+  surf/surf_model_timer.c                                                    \

   surf/workstation_ptask_L07.c                                               \
   xbt/xbt_sg_stubs.c
 
   surf/workstation_ptask_L07.c                                               \
   xbt/xbt_sg_stubs.c
 

diff --git a/src/surf/surf_timer.c b/src/surf/surf_model_timer.c
similarity index 94%
rename from src/surf/surf_timer.c
rename to src/surf/surf_model_timer.c
index a6e3852..5a3a740 100644 (file)
--- a/src/surf/surf_timer.c
+++ b/src/surf/surf_model_timer.c
@@ -6,11 +6,20 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "xbt/ex.h"
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "xbt/ex.h"

-#include "surf_timer_private.h"
+#include "surf_private.h"
+#include "xbt/dict.h"

 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_timer, surf,
                                 "Logging specific to SURF (timer)");
 
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_timer, surf,
                                 "Logging specific to SURF (timer)");
 

+typedef struct command {
+  s_surf_resource_t generic_resource; /* Must remain first, since we add this to a trace */
+  void *function;
+  void *args;
+  s_xbt_swag_hookup_t command_set_hookup;
+} s_command_t, *command_t;
+
+

 surf_model_t surf_timer_model = NULL;
 static tmgr_trace_t empty_trace = NULL;
 static xbt_swag_t command_pending = NULL;
 surf_model_t surf_timer_model = NULL;
 static tmgr_trace_t empty_trace = NULL;
 static xbt_swag_t command_pending = NULL;

diff --git a/src/surf/surf_timer_private.h b/src/surf/surf_timer_private.h
deleted file mode 100644 (file)
index eaa055c..0000000
--- a/src/surf/surf_timer_private.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*     $Id$     */
-
-/* Copyright (c) 2005 Arnaud Legrand. 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_TIMER_PRIVATE_H
-#define _SURF_TIMER_PRIVATE_H
-
-#include "surf_private.h"
-#include "xbt/dict.h"
-
-typedef struct command {
-  s_surf_resource_t generic_resource; /* Must remain first, since we add this to a trace */
-  void *function;
-  void *args;
-  s_xbt_swag_hookup_t command_set_hookup;
-} s_command_t, *command_t;
-
-extern xbt_dict_t command_set;
-
-#endif /* _SURF_TIMER_PRIVATE_H */