X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e1f0c9d399e27b4620f3497e5a90a22fee96ab21..985adefb9840db3a67c9d92856e861baa8a7b032:/include/simdag/datatypes.h

diff --git a/include/simdag/datatypes.h b/include/simdag/datatypes.h
index 01b272afc9..f80d5ef6df 100644
--- a/include/simdag/datatypes.h
+++ b/include/simdag/datatypes.h
@@ -1,10 +1,12 @@
-/* Copyright (c) 2007-2009 Da SimGrid Team.  All rights reserved.           */
+/* Copyright (c) 2006, 2008-2013. 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 SIMDAG_DATATYPES_H
 #define SIMDAG_DATATYPES_H
+#include "xbt/dict.h"
 
 /** @brief Workstation datatype
     @ingroup SD_datatypes_management
@@ -14,7 +16,7 @@
     resource with computing capabilities</em> and has a <em>name</em>.
 
     @see SD_workstation_management */
-typedef struct SD_workstation *SD_workstation_t;
+typedef xbt_dictelm_t SD_workstation_t;
 
 /** @brief Workstation access mode
     @ingroup SD_datatypes_management
@@ -64,13 +66,14 @@ typedef struct SD_task *SD_task_t;
     @see SD_task_management */
 typedef enum {
   SD_NOT_SCHEDULED = 0,      /**< @brief Initial state (not valid for SD_watch and SD_unwatch). */
-  SD_SCHEDULED = 0x0001,     /**< @brief A task becomes SD_SCHEDULED when you call function
-				SD_task_schedule. SD_simulate will execute it when it becomes SD_READY. */
-  SD_READY = 0x0002,         /**< @brief A scheduled task becomes ready is SD_simulate as soon as its dependencies are satisfied. */
-  SD_IN_FIFO = 0x0004,       /**< @brief A ready task can have to wait in a workstation fifo if the workstation is sequential */
-  SD_RUNNING = 0x0008,       /**< @brief An SD_READY or SD_IN_FIFO becomes SD_RUNNING when it is launched. */
-  SD_DONE = 0x0010,          /**< @brief The task is successfuly finished. */
-  SD_FAILED = 0x0020         /**< @brief A problem occured during the execution of the task. */
+  SD_SCHEDULABLE = 0x0001,               /**< @brief A task becomes SD_SCHEDULABLE as soon as its dependencies are satisfied */
+  SD_SCHEDULED = 0x0002,     /**< @brief A task becomes SD_SCHEDULED when you call function
+                                  SD_task_schedule. SD_simulate will execute it when it becomes SD_RUNNABLE. */
+  SD_RUNNABLE = 0x0004,      /**< @brief A scheduled task becomes runnable is SD_simulate as soon as its dependencies are satisfied. */
+  SD_IN_FIFO = 0x0008,       /**< @brief A runnable task can have to wait in a workstation fifo if the workstation is sequential */
+  SD_RUNNING = 0x0010,       /**< @brief An SD_RUNNABLE or SD_IN_FIFO becomes SD_RUNNING when it is launched. */
+  SD_DONE = 0x0020,          /**< @brief The task is successfully finished. */
+  SD_FAILED = 0x0040         /**< @brief A problem occurred during the execution of the task. */
 } e_SD_task_state_t;
 
 /** @brief Task kinds
@@ -78,10 +81,20 @@ typedef enum {
 
     @see SD_task_management */
 typedef enum {
-  /* leave 0 for "not typed" */
-  SD_TASK_COMM_E2E  = 1,      /**< @brief end to end communication */
-  SD_TASK_COMP_SEQ  = 2,      /**< @brief sequential computation */
+  SD_TASK_NOT_TYPED = 0,      /**< @brief no specified type */
+  SD_TASK_COMM_E2E = 1,       /**< @brief end to end communication */
+  SD_TASK_COMP_SEQ = 2,        /**< @brief sequential computation */
+  SD_TASK_COMP_PAR_AMDAHL = 3, /**< @brief parallel computation (Amdahl's law) */
+  SD_TASK_COMM_PAR_MXN_1D_BLOCK = 4 /**< @brief MxN data redistribution (1D Block distribution) */
 } e_SD_task_kind_t;
 
 
+/** @brief Storage datatype
+    @ingroup SD_datatypes_management
+
+ TODO PV: comment it !
+
+    @see SD_storage_management */
+typedef xbt_dictelm_t SD_storage_t;
+
 #endif