diff options
| author | hinder <hinder@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 2012-01-31 19:18:30 +0000 |
|---|---|---|
| committer | hinder <hinder@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 2012-01-31 19:18:30 +0000 |
| commit | 100c3733a8d90eadc785becbd48494c7dfa67c73 (patch) | |
| tree | a2212ae951d3132ea646b98329d799929ea8e8f2 /src/include | |
| parent | a2309eb58c5107a4afdac9aaa2d044a7680242ce (diff) | |
Merge branch 'NewSchedule' into trunk
This provides support for specifying READS and WRITES clauses for each
function scheduled in schedule.ccl. These list the variables which
the scheduled function reads from or writes to. This supports future
dependency-based scheduling. See
https://docs.einsteintoolkit.org/et-docs/Adding_requirements_to_the_Cactus_scheduler
for more information.
git-svn-id: http://svn.cactuscode.org/flesh/trunk@4788 17b73243-c579-4c4c-a9d2-2d5706c11dac
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/cctk_Schedule.h | 11 | ||||
| -rw-r--r-- | src/include/cctki_ScheduleBindings.h | 4 |
2 files changed, 15 insertions, 0 deletions
diff --git a/src/include/cctk_Schedule.h b/src/include/cctk_Schedule.h index b9ce40e6..5a2da202 100644 --- a/src/include/cctk_Schedule.h +++ b/src/include/cctk_Schedule.h @@ -46,10 +46,19 @@ typedef struct int loop_singlemap; int loop_local; + int tags; + /* The last items should be considered volatile and may not stay here */ int n_TriggerGroups; int *TriggerGroups; + +#define CACTUS_HAS_READS_CLAUSES + int n_WritesClauses; + const char **WritesClauses; + int n_ReadsClauses; + const char **ReadsClauses; + char *where; char *routine; char *thorn; @@ -88,6 +97,8 @@ int CCTK_ScheduleFunction(void *function, int n_trigger_groups, int n_before, int n_after, + int n_writes, + int n_reads, int n_while, int n_if, ...); diff --git a/src/include/cctki_ScheduleBindings.h b/src/include/cctki_ScheduleBindings.h index a87fb301..3495d11b 100644 --- a/src/include/cctki_ScheduleBindings.h +++ b/src/include/cctki_ScheduleBindings.h @@ -29,6 +29,8 @@ int CCTKi_ScheduleFunction(void *function, int n_comm_groups, int n_trigger_groups, int n_sync_groups, + int n_writes, + int n_reads, int n_options, int n_before, int n_after, @@ -47,6 +49,8 @@ int CCTKi_ScheduleGroup(const char *realname, int n_comm_groups, int n_trigger_groups, int n_sync_groups, + int n_writes, + int n_reads, int n_options, int n_before, int n_after, |