1 files changed, 37 insertions, 65 deletions

diff --git a/src/testing/testing_api_cmd_stat.c b/src/testing/testing_api_cmd_stat.c
index 9461a22cf..8723aac0d 100644
--- a/src/testing/testing_api_cmd_stat.c
+++ b/src/testing/testing_api_cmd_stat.c
@@ -28,43 +28,16 @@
 
 
 /**
- * Cleanup the state from a "stat service" CMD.
+ * Run a "stat" CMD.
  *
  * @param cls closure.
- * @param cmd the command which is being cleaned up.
+ * @param cmd the command being run.
+ * @param is the interpreter state.
  */
 static void
-stat_cleanup (void *cls,
-              const struct TALER_TESTING_Command *cmd)
-{
-  (void) cls;
-  (void) cmd;
-  /* nothing to clean.  */
-}
-
-
-/**
- * No traits to offer, just provide a stub to be called when
- * some CMDs iterates through the list of all the commands.
- *
- * @param cls closure.
- * @param[out] ret result.
- * @param trait name of the trait.
- * @param index index number of the trait to return.
- * @return #GNUNET_OK on success.
- */
-static int
-stat_traits (void *cls,
-             const void **ret,
-             const char *trait,
-             unsigned int index)
-{
-  (void) cls;
-  (void) ret;
-  (void) trait;
-  (void) index;
-  return GNUNET_NO;
-}
+stat_run (void *cls,
+          const struct TALER_TESTING_Command *cmd,
+          struct TALER_TESTING_Interpreter *is);
 
 
 /**
@@ -80,9 +53,20 @@ stat_cmd (struct TALER_TESTING_Timer *timings,
   struct GNUNET_TIME_Relative duration;
   struct GNUNET_TIME_Relative lat;
 
-  if (cmd->start_time.abs_value_us > cmd->finish_time.abs_value_us)
+  if (GNUNET_TIME_absolute_cmp (cmd->start_time,
+                                >,
+                                cmd->finish_time))
   {
-    GNUNET_break (0);
+    /* This is a problem, except of course for
+       this command itself, as we clearly did not yet
+       finish... */
+    if (cmd->run != &stat_run)
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                  "Bad timings for `%s'\n",
+                  cmd->label);
+      GNUNET_break (0);
+    }
     return;
   }
   duration = GNUNET_TIME_absolute_get_difference (cmd->start_time,
@@ -114,36 +98,35 @@ stat_cmd (struct TALER_TESTING_Timer *timings,
 /**
  * Obtain statistics for @a timings of @a cmd
  *
- * @param timings what timings to get
+ * @param[in,out] cls what timings to get
  * @param cmd command to process
  */
 static void
-do_stat (struct TALER_TESTING_Timer *timings,
+do_stat (void *cls,
          const struct TALER_TESTING_Command *cmd)
 {
+  struct TALER_TESTING_Timer *timings = cls;
+
   if (TALER_TESTING_cmd_is_batch (cmd))
   {
-#define BATCH_INDEX 1
     struct TALER_TESTING_Command *bcmd;
 
     if (GNUNET_OK !=
-        TALER_TESTING_get_trait_cmd (cmd,
-                                     BATCH_INDEX,
-                                     &bcmd))
+        TALER_TESTING_get_trait_batch_cmds (cmd,
+                                            &bcmd))
     {
       GNUNET_break (0);
       return;
     }
-
-    for (unsigned int j = 0; NULL != bcmd[j].label; j++)
+    for (unsigned int j = 0;
+         NULL != bcmd[j].label;
+         j++)
       do_stat (timings,
                &bcmd[j]);
+    return;
   }
-  else
-  {
-    stat_cmd (timings,
-              cmd);
-  }
+  stat_cmd (timings,
+            cmd);
 }
 
 
@@ -161,31 +144,20 @@ stat_run (void *cls,
 {
   struct TALER_TESTING_Timer *timings = cls;
 
-  for (unsigned int i = 0; NULL != is->commands[i].label; i++)
-  {
-    if (cmd == &is->commands[i])
-      break; /* skip at our current command */
-    do_stat (timings,
-             &is->commands[i]);
-  }
+  TALER_TESTING_iterate (is,
+                         true,
+                         &do_stat,
+                         timings);
   TALER_TESTING_interpreter_next (is);
 }
 
 
-/**
- * Obtain performance data from the interpreter.
- *
- * @param timers what commands (by label) to obtain runtimes for
- * @return the command
- */
 struct TALER_TESTING_Command
 TALER_TESTING_cmd_stat (struct TALER_TESTING_Timer *timers)
 {
   struct TALER_TESTING_Command cmd = {
     .label = "stat",
-    .run = stat_run,
-    .cleanup = stat_cleanup,
-    .traits = stat_traits,
+    .run = &stat_run,
     .cls = (void *) timers
   };
 
@@ -193,4 +165,4 @@ TALER_TESTING_cmd_stat (struct TALER_TESTING_Timer *timers)
 }
 
 
-/* end of testing_api_cmd_sleep.c  */
+/* end of testing_api_cmd_stat.c  */