This file didn't compile

[simgrid.git] / src / include / surf / surf.h

diff --git a/src/include/surf/surf.h b/src/include/surf/surf.h
index 32ba95a..81f5299 100644 (file)
--- a/src/include/surf/surf.h
+++ b/src/include/surf/surf.h
@@ -24,6 +24,14 @@
  */
 typedef struct surf_action *surf_action_t;
 
+/** \brief Resource datatype
+ *  \ingroup SURF_resources
+ *  
+ *  Generic data structure for a resource. The workstations,
+ *  the CPUs and the network links are examples of resources.
+ */
+typedef struct surf_resource *surf_resource_t;
+
 /** \brief Action structure
  * \ingroup SURF_actions
  *
@@ -84,25 +92,6 @@ typedef struct surf_action_state {
 /* Generic resource object */
 /***************************/
 
-/** \brief Resource datatype
- *  \ingroup SURF_resources
- *  
- *  Generic data structure for a resource. The workstations,
- *  the CPUs and the network links are examples of resources.
- */
-typedef struct surf_resource *surf_resource_t;
-
-/** \brief Resource datatype
- *  \ingroup SURF_resources
- *  
- *  Generic data structure for a resource. The workstations,
- *  the CPUs and the network links are examples of resources.
- */
-typedef struct surf_resource {
-  surf_resource_private_t common_private;
-  surf_resource_public_t common_public;
-} s_surf_resource_t;
-
 /** \brief Public data available on all resources
  *  \ingroup SURF_resources
  *
@@ -136,18 +125,20 @@ typedef struct surf_resource_public {
  */
 typedef struct surf_resource_private *surf_resource_private_t;
 
-/**************************************/
-/* Implementations of resource object */
-/**************************************/
-
-/** \brief Timer resource
+/** \brief Resource datatype
  *  \ingroup SURF_resources
+ *  
+ *  Generic data structure for a resource. The workstations,
+ *  the CPUs and the network links are examples of resources.
  */
-typedef struct surf_timer_resource {
+typedef struct surf_resource {
   surf_resource_private_t common_private;
   surf_resource_public_t common_public;
-  surf_timer_resource_extension_public_t extension_public;
-} s_surf_timer_resource_t, *surf_timer_resource_t;
+} s_surf_resource_t;
+
+/**************************************/
+/* Implementations of resource object */
+/**************************************/
 
 /** \brief Timer resource extension public
  * \ingroup SURF_resource
@@ -160,6 +151,15 @@ typedef struct surf_timer_resource_extension_public {
 } s_surf_timer_resource_extension_public_t,
   *surf_timer_resource_extension_public_t;
 
+/** \brief Timer resource
+ *  \ingroup SURF_resources
+ */
+typedef struct surf_timer_resource {
+  surf_resource_private_t common_private;
+  surf_resource_public_t common_public;
+  surf_timer_resource_extension_public_t extension_public;
+} s_surf_timer_resource_t, *surf_timer_resource_t;
+
 /** \brief The timer resource
  *  \ingroup SURF_resources
  */
@@ -180,15 +180,6 @@ typedef enum {
   SURF_CPU_OFF = 0             /**< Running      */
 } e_surf_cpu_state_t;
 
-/** \brief CPU resource datatype
- *  \ingroup SURF_resources
- */
-typedef struct surf_cpu_resource {
-  surf_resource_private_t common_private;
-  surf_resource_public_t common_public;
-  surf_cpu_resource_extension_public_t extension_public;
-} s_surf_cpu_resource_t, *surf_cpu_resource_t;
-
 /** \brief CPU resource extension public
  *  \ingroup SURF_resources
  *  
@@ -203,6 +194,15 @@ typedef struct surf_cpu_resource_extension_public {
 } s_surf_cpu_resource_extension_public_t,
     *surf_cpu_resource_extension_public_t;
 
+/** \brief CPU resource datatype
+ *  \ingroup SURF_resources
+ */
+typedef struct surf_cpu_resource {
+  surf_resource_private_t common_private;
+  surf_resource_public_t common_public;
+  surf_cpu_resource_extension_public_t extension_public;
+} s_surf_cpu_resource_t, *surf_cpu_resource_t;
+
 /** \brief The CPU resource
  *  \ingroup SURF_resources
  */
@@ -220,15 +220,6 @@ void surf_cpu_resource_init_Cas01(const char *filename);
 
 /* Network resource */
 
-/** \brief Network resource datatype
- *  \ingroup SURF_resources
- */
-typedef struct surf_network_resource {
-  surf_resource_private_t common_private;
-  surf_resource_public_t common_public;
-  surf_network_resource_extension_public_t extension_public;
-} s_surf_network_resource_t, *surf_network_resource_t;
-
 /** \brief Network resource extension public
  *  \ingroup SURF_resources
  *
@@ -245,6 +236,15 @@ typedef struct surf_network_resource_extension_public {
 } s_surf_network_resource_extension_public_t,
     *surf_network_resource_extension_public_t;
 
+/** \brief Network resource datatype
+ *  \ingroup SURF_resources
+ */
+typedef struct surf_network_resource {
+  surf_resource_private_t common_private;
+  surf_resource_public_t common_public;
+  surf_network_resource_extension_public_t extension_public;
+} s_surf_network_resource_t, *surf_network_resource_t;
+
 /** \brief The network resource
  *  \ingroup SURF_resources
  *
@@ -266,16 +266,6 @@ extern surf_network_resource_t surf_network_resource;
  */
 void surf_network_resource_init_CM02(const char *filename);
 
-/** \brief Workstation resource datatype.
- *  \ingroup SURF_resources
- *
- */
-typedef struct surf_workstation_resource {
-  surf_resource_private_t common_private;
-  surf_resource_public_t common_public;
-  surf_workstation_resource_extension_public_t extension_public;
-} s_surf_workstation_resource_t, *surf_workstation_resource_t;
-
 /** \brief Workstation resource extension public
  *  \ingroup SURF_resources
  *
@@ -305,6 +295,16 @@ typedef struct surf_workstation_resource_extension_public {
 } s_surf_workstation_resource_extension_public_t,
     *surf_workstation_resource_extension_public_t;
 
+/** \brief Workstation resource datatype.
+ *  \ingroup SURF_resources
+ *
+ */
+typedef struct surf_workstation_resource {
+  surf_resource_private_t common_private;
+  surf_resource_public_t common_public;
+  surf_workstation_resource_extension_public_t extension_public;
+} s_surf_workstation_resource_t, *surf_workstation_resource_t;
+
 /** \brief The workstation resource
  *  \ingroup SURF_resources
  *