Some more stuff for the calling function things.

Tom


git-svn-id: http://svn.cactuscode.org/flesh/trunk@1310 17b73243-c579-4c4c-a9d2-2d5706c11dac

1 files changed, 17 insertions, 12 deletions

diff --git a/src/main/ScheduleInterface.c b/src/main/ScheduleInterface.c
index cb98c5df..c3570873 100644
--- a/src/main/ScheduleInterface.c
+++ b/src/main/ScheduleInterface.c
@@ -15,6 +15,7 @@ static char *rcsid = "$Header$";
 
 #include "cctk.h"
 #include "cctk_Schedule.h"
+#include "cctki_ScheduleBindings.h"
 #include "cctki_Schedule.h"
 
 #include "cctk_Flesh.h"
@@ -67,7 +68,6 @@ typedef struct
 
   int done_entry;
 
-  int func_type;
 } t_attribute;
 
 typedef struct
@@ -79,6 +79,11 @@ typedef struct
 
   t_TimerInfo *info;
   int print_headers;
+
+  /* Stuff passed in in user calls */
+
+  int (*CallFunction)(cFunctionData *, void *);
+
 } t_sched_data;
 
 
@@ -381,22 +386,22 @@ int CCTKi_ScheduleGroupComm(const char *group)
 
 int CCTKi_ScheduleTraverse(const char *where, 
 			   void *GH,   
-			   int (*calling_function)(void *, void *, void *))
+			   int (*CallFunction)(cFunctionData *, void *))
 {
   t_sched_data data;
 
+  int (*calling_function)(void *, t_attribute *, t_sched_data *);
+
   data.GH = (cGH *)GH;
+  data.CallFunction = CallFunction;
 
-  if(!calling_function)
+  if(CCTK_Equals(where, "CCTK_STARTUP"))
   {
-    if(CCTK_Equals(where, "CCTK_STARTUP"))
-    {
-      calling_function = CCTKi_ScheduleStartupFunction;
-    }
-    else
-    {
-      calling_function = CCTKi_ScheduleCallFunction;
-    }
+    calling_function = CCTKi_ScheduleStartupFunction;
+  }
+  else
+  {
+    calling_function = CCTKi_ScheduleCallFunction;
   }
 
   if(CCTK_Equals(where, "CCTK_ANALYSIS"))
@@ -752,7 +757,7 @@ static t_sched_modifier *CreateTypedModifier(t_sched_modifier *modifier,
   {
     item = va_arg(*ap, const char *);
 
-    modifier = CCTKi_DoScheduleAddModifier(modifier, type, item);
+    modifier = CCTKi_ScheduleAddModifier(modifier, type, item);
   }
 
   return modifier;