X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e694957c5830a9f1407392fa7f76796274aa4d18..638d55dcb8d944f7c74127725f1acb7b8e1449de:/src/simdag/private.h

diff --git a/src/simdag/private.h b/src/simdag/private.h
index 19a9022681..67e9e7beab 100644
--- a/src/simdag/private.h
+++ b/src/simdag/private.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2006, 2007, 2008, 2009, 2010. The SimGrid Team.
+/* Copyright (c) 2006-2014. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -10,8 +10,7 @@
 #include "xbt/dict.h"
 #include "xbt/dynar.h"
 #include "xbt/fifo.h"
-#include "simdag/simdag.h"
-#include "simdag/datatypes.h"
+#include "simgrid/simdag.h"
 #include "surf/surf.h"
 #include "xbt/swag.h"
 #include "xbt/mallocator.h"
@@ -73,8 +72,12 @@ static inline SD_workstation_priv_t SD_workstation_priv(SD_workstation_t host){
 typedef s_xbt_dictelm_t s_SD_storage_t;
 typedef struct SD_storage {
   void *data;                   /* user data */
+  const char *host;
 } s_SD_storage_priv_t, *SD_storage_priv_t;
 
+static inline SD_storage_priv_t SD_storage_priv(SD_storage_t storage){
+  return xbt_lib_get_level(storage, SD_STORAGE_LEVEL);
+}
 
 /* Task */
 typedef struct SD_task {
@@ -106,14 +109,12 @@ typedef struct SD_task {
   /* scheduling parameters (only exist in state SD_SCHEDULED) */
   int workstation_nb;
   SD_workstation_t *workstation_list;   /* surf workstations */
-  double *computation_amount;
-  double *communication_amount;
+  double *flops_amount;
+  double *bytes_amount;
   double rate;
 
-#ifdef HAVE_TRACING
   long long int counter;        /* task unique identifier for instrumentation */
   char *category;               /* sd task category for instrumentation */
-#endif
 } s_SD_task_t;
 
 /* Task dependencies */