A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add a tag cabinet to write new kind of cluster. See meta_cluster.xml
[simgrid.git]
/
src
/
simdag
/
private.h
diff --git
a/src/simdag/private.h
b/src/simdag/private.h
index
6939eca
..
db39ef4
100644
(file)
--- a/
src/simdag/private.h
+++ b/
src/simdag/private.h
@@
-14,11
+14,9
@@
#include "simdag/datatypes.h"
#include "surf/surf.h"
#include "xbt/swag.h"
#include "simdag/datatypes.h"
#include "surf/surf.h"
#include "xbt/swag.h"
+#include "xbt/mallocator.h"
#include <stdbool.h>
#include <stdbool.h>
-#define SD_INITIALISED() (sd_global != NULL)
-#define SD_CHECK_INIT_DONE() xbt_assert(SD_INITIALISED(), "Call SD_init() first");
-
/* Global variables */
typedef struct SD_global {
/* Global variables */
typedef struct SD_global {
@@
-29,6
+27,8
@@
typedef struct SD_global {
SD_link_t *recyclable_route; /* array returned by SD_route_get_list
and mallocated only once */
SD_link_t *recyclable_route; /* array returned by SD_route_get_list
and mallocated only once */
+ xbt_mallocator_t task_mallocator; /* to not remalloc new tasks */
+
int watch_point_reached; /* has a task just reached a watch point? */
/* task state sets */
int watch_point_reached; /* has a task just reached a watch point? */
/* task state sets */
@@
-75,6
+75,7
@@
typedef struct SD_task {
char *name;
int kind;
double amount;
char *name;
int kind;
double amount;
+ double alpha; /* used by typed parallel tasks */
double remains;
double start_time;
double finish_time;
double remains;
double start_time;
double finish_time;
@@
-117,7
+118,7
@@
XBT_PUBLIC(xbt_swag_t) SD_simulate_swag(double how_long); /* could be public, bu
SD_link_t __SD_link_create(void *surf_link, void *data);
SD_link_t __SD_link_create(void *surf_link, void *data);
-void __SD_link_destroy(void *link);
+#define __SD_link_destroy xbt_free_f
SD_workstation_t __SD_workstation_create(void *surf_workstation,
void *data);
SD_workstation_t __SD_workstation_create(void *surf_workstation,
void *data);
@@
-130,6
+131,11
@@
int __SD_task_try_to_run(SD_task_t task);
void __SD_task_just_done(SD_task_t task);
bool acyclic_graph_detail(xbt_dynar_t dag);
void __SD_task_just_done(SD_task_t task);
bool acyclic_graph_detail(xbt_dynar_t dag);
+/* Task mallocator functions */
+void* SD_task_new_f(void);
+void SD_task_recycle_f(void *t);
+void SD_task_free_f(void *t);
+
/* Functions to test if the task is in a given state. */
/* Returns whether the given task is scheduled or runnable. */
/* Functions to test if the task is in a given state. */
/* Returns whether the given task is scheduled or runnable. */