Output only timing info from GetrUsage, and only if it is available.

This is hard-coded for the moment as #ifdef HAVE_TIME_GETTIMEOFDAY.


git-svn-id: http://svn.cactuscode.org/arrangements/CactusPUGHIO/IOFlexIO/trunk@66 ebee0441-1374-4afa-a3b5-247f3ba15b9a

1 files changed, 8 insertions, 16 deletions

diff --git a/src/RecoverGH.c b/src/RecoverGH.c
index 8472167..7be713f 100644
--- a/src/RecoverGH.c
+++ b/src/RecoverGH.c
@@ -378,41 +378,33 @@ int IOFlexIO_RecoverGH (cGH *GH, const char *basename, int called_from)
 
     printf ("%s timing information for recovery:\n", CCTK_THORNSTRING);
 
+/*** FIXME: select timer to get info from at runtime ***/
+#ifdef HAVE_TIME_GETTIMEOFDAY
     info = CCTK_TimerCreateInfo ();
     if (info) {
 
       if (myGH->recoverVarsTimer >= 0) {
         CCTK_TimerGetI (myGH->recoverVarsTimer, info);
-{
-/*** FIXME: select right timers and value types !!! ***/
-
-#include <assert.h>
-assert (info->n_vals >= 2);
-assert (info->vals [0].type == val_double && info->vals [1].type == val_double);
-}
-        printf ("Time to recover datasets:   %5.1f sec (GetTimeOfDay), "
-                "%5.1f sec (GetrUsage)\n",
-                info->vals [0].val.d, info->vals [1].val.d);
+        printf ("Time to recover datasets:   %5.1f sec\n", info->vals[0].val.d);
       }
 
       if (myGH->recoverParamsTimer >= 0) {
         CCTK_TimerGetI (myGH->recoverParamsTimer, info);
-        printf ("Time to recover parameters: %5.1f sec (GetTimeOfDay), "
-                "%5.1f sec (GetrUsage)\n",
-                info->vals [0].val.d, info->vals [1].val.d);
+        printf ("Time to recover parameters: %5.1f sec\n", info->vals[0].val.d);
       }
 
       if (myGH->recoverTotalTimer >= 0) {
         CCTK_TimerGetI (myGH->recoverTotalTimer, info);
-        printf ("Total time to recover:      %5.1f sec (GetTimeOfDay), "
-                "%5.1f sec (GetrUsage)\n",
-                info->vals [0].val.d, info->vals [1].val.d);
+        printf ("Total time to recover:      %5.1f sec\n", info->vals[0].val.d);
       }
 
       CCTK_TimerDestroyInfo (info);
     } else
       CCTK_WARN (1, "Couldn't create timer info structure ! No timing output "
                     "available.");
+#else
+    CCTK_WARN (1, "No GETTIMEOFDAY timer available.");
+#endif
 
     printf ("----------------------------------------------------------------"
             "---------\n");