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
setup a mallocator for the simdag tasks. The gain is quite disapointing, but not...
[simgrid.git]
/
src
/
simdag
/
private.h
diff --git
a/src/simdag/private.h
b/src/simdag/private.h
index
dce5fd6
..
88bb0a9
100644
(file)
--- a/
src/simdag/private.h
+++ b/
src/simdag/private.h
@@
-13,10
+13,12
@@
#include "simdag/simdag.h"
#include "simdag/datatypes.h"
#include "surf/surf.h"
#include "simdag/simdag.h"
#include "simdag/datatypes.h"
#include "surf/surf.h"
+#include "xbt/swag.h"
+#include "xbt/mallocator.h"
#include <stdbool.h>
#define SD_INITIALISED() (sd_global != NULL)
#include <stdbool.h>
#define SD_INITIALISED() (sd_global != NULL)
-#define SD_CHECK_INIT_DONE() xbt_assert
0
(SD_INITIALISED(), "Call SD_init() first");
+#define SD_CHECK_INIT_DONE() xbt_assert(SD_INITIALISED(), "Call SD_init() first");
/* Global variables */
/* Global variables */
@@
-28,6
+30,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 */
@@
-40,6
+44,7
@@
typedef struct SD_global {
xbt_swag_t done_task_set;
xbt_swag_t failed_task_set;
xbt_swag_t done_task_set;
xbt_swag_t failed_task_set;
+ xbt_swag_t return_set;
int task_number;
} s_SD_global_t, *SD_global_t;
int task_number;
} s_SD_global_t, *SD_global_t;
@@
-66,6
+71,7
@@
typedef struct SD_workstation {
/* Task */
typedef struct SD_task {
s_xbt_swag_hookup_t state_hookup;
/* Task */
typedef struct SD_task {
s_xbt_swag_hookup_t state_hookup;
+ s_xbt_swag_hookup_t return_hookup;
xbt_swag_t state_set;
e_SD_task_state_t state;
void *data; /* user data */
xbt_swag_t state_set;
e_SD_task_state_t state;
void *data; /* user data */
@@
-110,6
+116,8
@@
typedef struct SD_dependency {
} s_SD_dependency_t, *SD_dependency_t;
/* SimDag private functions */
} s_SD_dependency_t, *SD_dependency_t;
/* SimDag private functions */
+XBT_PUBLIC(xbt_swag_t) SD_simulate_swag(double how_long); /* could be public, but you need to see the internals of the SD_task_t to use it */
+
SD_link_t __SD_link_create(void *surf_link, void *data);
void __SD_link_destroy(void *link);
SD_link_t __SD_link_create(void *surf_link, void *data);
void __SD_link_destroy(void *link);
@@
-125,6
+133,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. */