Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
use proper type for task kind
authorFrederic Suter <frederic.suter@cc.in2p3.fr>
Wed, 13 Jan 2016 09:29:29 +0000 (10:29 +0100)
committerFrederic Suter <frederic.suter@cc.in2p3.fr>
Thu, 14 Jan 2016 11:10:05 +0000 (12:10 +0100)
include/simgrid/simdag.h
src/simdag/sd_task.cpp
src/simdag/simdag_private.h

index 573d411..a1e997f 100644 (file)
@@ -256,8 +256,8 @@ XBT_PUBLIC(double) SD_task_get_execution_time(SD_task_t task,
                                               const SD_workstation_t *
                                               workstation_list,
                                               const double *flops_amount,
                                               const SD_workstation_t *
                                               workstation_list,
                                               const double *flops_amount,
-                                                                                         const double *bytes_amount);
-XBT_PUBLIC(int) SD_task_get_kind(SD_task_t task);
+                                              const double *bytes_amount);
+XBT_PUBLIC(e_SD_task_kind_t) SD_task_get_kind(SD_task_t task);
 XBT_PUBLIC(void) SD_task_schedule(SD_task_t task, int workstation_nb,
                                   const SD_workstation_t *
                                   workstation_list,
 XBT_PUBLIC(void) SD_task_schedule(SD_task_t task, int workstation_nb,
                                   const SD_workstation_t *
                                   workstation_list,
index 89c3c78..63d2fe3 100644 (file)
@@ -530,7 +530,7 @@ double SD_task_get_remaining_amount(SD_task_t task)
     return task->remains;
 }
 
     return task->remains;
 }
 
-int SD_task_get_kind(SD_task_t task)
+e_SD_task_kind_t SD_task_get_kind(SD_task_t task)
 {
   return task->kind;
 }
 {
   return task->kind;
 }
index 8b62ba2..bd796b9 100644 (file)
@@ -70,7 +70,7 @@ typedef struct SD_task {
   e_SD_task_state_t state;
   void *data;                   /* user data */
   char *name;
   e_SD_task_state_t state;
   void *data;                   /* user data */
   char *name;
-  int kind;
+  e_SD_task_kind_t kind;
   double amount;
   double alpha;          /* used by typed parallel tasks */
   double remains;
   double amount;
   double alpha;          /* used by typed parallel tasks */
   double remains;