X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d3895264c64b329397e38b3a6a1fc054672f3f55..2fb822c48e7a43db651782eaf2cbaf1e762b32c7:/src/simdag/simdag_private.hpp diff --git a/src/simdag/simdag_private.hpp b/src/simdag/simdag_private.hpp index b5e52f0251..13d55f49f4 100644 --- a/src/simdag/simdag_private.hpp +++ b/src/simdag/simdag_private.hpp @@ -4,11 +4,11 @@ /* 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. */ +#include "simgrid/simdag.h" +#include "surf/surf.hpp" #include #include #include -#include "simgrid/simdag.h" -#include "surf/surf.h" #ifndef SIMDAG_PRIVATE_HPP #define SIMDAG_PRIVATE_HPP @@ -34,11 +34,11 @@ std::set* simulate (double how_long); } } -SG_BEGIN_DECL() +extern "C" { extern XBT_PRIVATE simgrid::sd::Global *sd_global; /* Task */ -typedef struct SD_task { +struct s_SD_task_t { e_SD_task_state_t state; void *data; /* user data */ char *name; @@ -63,7 +63,7 @@ typedef struct SD_task { double *flops_amount; double *bytes_amount; double rate; -} s_SD_task_t; +}; /* SimDag private functions */ XBT_PRIVATE void SD_task_set_state(SD_task_t task, e_SD_task_state_t new_state); @@ -71,5 +71,5 @@ XBT_PRIVATE void SD_task_run(SD_task_t task); XBT_PRIVATE bool acyclic_graph_detail(xbt_dynar_t dag); XBT_PRIVATE void uniq_transfer_task_name(SD_task_t task); XBT_PRIVATE const char *__get_state_name(e_SD_task_state_t state); -SG_END_DECL() +} #endif