Bugfixes

1 files changed, 35 insertions, 17 deletions

diff --git a/src/mintdb/perf_taler_mintdb.c b/src/mintdb/perf_taler_mintdb.c
index 27731f08b..670601e35 100644
--- a/src/mintdb/perf_taler_mintdb.c
+++ b/src/mintdb/perf_taler_mintdb.c
@@ -45,20 +45,19 @@ main (int argc, char ** argv)
   struct PERF_TALER_MINTDB_Cmd benchmark[] =
   {
     // Denomination used to create coins
-    PERF_TALER_MINTDB_INIT_CMD_DEBUG ("00 - Start of interpreter"),
+    PERF_TALER_MINTDB_INIT_CMD_DEBUG ("Initializing database"),
 
     PERF_TALER_MINTDB_INIT_CMD_LOOP ("01 - denomination loop",
                                      NB_DENOMINATION_INIT),
-    PERF_TALER_MINTDB_INIT_CMD_START_TRANSACTION ("01 - start transaction"),
+    PERF_TALER_MINTDB_INIT_CMD_START_TRANSACTION (""),
     PERF_TALER_MINTDB_INIT_CMD_INSERT_DENOMINATION ("01 - denomination"),
-    PERF_TALER_MINTDB_INIT_CMD_COMMIT_TRANSACTION ("01 - commit transaction"),
+    PERF_TALER_MINTDB_INIT_CMD_COMMIT_TRANSACTION (""),
     PERF_TALER_MINTDB_INIT_CMD_SAVE_ARRAY ("01 - save denomination",
                                            "01 - denomination loop",
                                            "01 - denomination",
                                            NB_DENOMINATION_SAVE),
-    PERF_TALER_MINTDB_INIT_CMD_END_LOOP ("01 - denomination loop end",
+    PERF_TALER_MINTDB_INIT_CMD_END_LOOP ("",
                                          "01 - denomination loop"),
-    PERF_TALER_MINTDB_INIT_CMD_DEBUG ("01 - init denomination complete"),
     // End of initialization
     // Reserve initialization
     PERF_TALER_MINTDB_INIT_CMD_LOOP ("02 - init reserve loop",
@@ -68,14 +67,13 @@ main (int argc, char ** argv)
                                            "02 - init reserve loop",
                                            "02 - reserve",
                                            NB_RESERVE_SAVE),
-    PERF_TALER_MINTDB_INIT_CMD_END_LOOP ("02 - init reserve end loop",
+    PERF_TALER_MINTDB_INIT_CMD_END_LOOP ("",
                                          "02 - init reserve loop"),
-    PERF_TALER_MINTDB_INIT_CMD_DEBUG ("02 - reserve init complete"),
     // End reserve init
     // Withdrawal initialization
     PERF_TALER_MINTDB_INIT_CMD_LOOP ("03 - init withdraw loop",
                                      NB_WITHDRAW_INIT),
-    PERF_TALER_MINTDB_INIT_CMD_START_TRANSACTION ("03 - start transaction"),
+    PERF_TALER_MINTDB_INIT_CMD_START_TRANSACTION (""),
     PERF_TALER_MINTDB_INIT_CMD_LOAD_ARRAY ("03 - denomination load",
                                            "03 - init withdraw loop",
                                            "01 - save denomination"),
@@ -85,39 +83,59 @@ main (int argc, char ** argv)
     PERF_TALER_MINTDB_INIT_CMD_INSERT_WITHDRAW ("03 - withdraw",
                                                 "03 - denomination load",
                                                 "03 - reserve load"),
-    PERF_TALER_MINTDB_INIT_CMD_COMMIT_TRANSACTION ("03 - commit transaction"),
+    PERF_TALER_MINTDB_INIT_CMD_COMMIT_TRANSACTION (""),
     PERF_TALER_MINTDB_INIT_CMD_SAVE_ARRAY ("03 - blindcoin array",
                                            "03 - init withdraw loop",
                                            "03 - withdraw",
                                            NB_WITHDRAW_SAVE),
-    PERF_TALER_MINTDB_INIT_CMD_END_LOOP ("03 - withdraw init end loop",
+    PERF_TALER_MINTDB_INIT_CMD_END_LOOP ("",
                                          "03 - init withdraw loop"),
-    PERF_TALER_MINTDB_INIT_CMD_DEBUG ("03 - withdraw init complete"),
     //End of withdrawal initialization
     //Deposit initialization
     PERF_TALER_MINTDB_INIT_CMD_LOOP ("04 - deposit init loop",
                                      NB_DEPOSIT_INIT),
-    PERF_TALER_MINTDB_INIT_CMD_START_TRANSACTION ("04 - start transaction"),
+    PERF_TALER_MINTDB_INIT_CMD_START_TRANSACTION (""),
     PERF_TALER_MINTDB_INIT_CMD_LOAD_ARRAY ("04 - denomination load",
                                            "04 - deposit init loop",
                                            "01 - save denomination"),
     PERF_TALER_MINTDB_INIT_CMD_INSERT_DEPOSIT ("04 - deposit",
                                                "04 - denomination load"),
-    PERF_TALER_MINTDB_INIT_CMD_COMMIT_TRANSACTION ("04 - commit transaction"),
+    PERF_TALER_MINTDB_INIT_CMD_COMMIT_TRANSACTION (""),
     PERF_TALER_MINTDB_INIT_CMD_SAVE_ARRAY ("04 - deposit array",
                                            "04 - deposit init loop",
                                            "04 - deposit",
                                            NB_DEPOSIT_SAVE),
-    PERF_TALER_MINTDB_INIT_CMD_END_LOOP ("04 - deposit init loop end",
+    PERF_TALER_MINTDB_INIT_CMD_END_LOOP ("",
                                          "04 - deposit init loop"),
-    PERF_TALER_MINTDB_INIT_CMD_DEBUG ("04 - deposit init complete"),
+    PERF_TALER_MINTDB_INIT_CMD_DEBUG ("End of initialization"),
     // End of deposit initialization
-    PERF_TALER_MINTDB_INIT_CMD_END ("end"),
+    
+    PERF_TALER_MINTDB_INIT_CMD_GET_TIME ("05 - start"),
+    PERF_TALER_MINTDB_INIT_CMD_LOOP ("05 - loop",
+                                     NB_DEPOSIT_SAVE),
+    PERF_TALER_MINTDB_INIT_CMD_START_TRANSACTION (""),
+    PERF_TALER_MINTDB_INIT_CMD_LOAD_ARRAY ("05 - deposit",
+                                           "05 - loop",
+                                           "04 - deposit array"),
+    PERF_TALER_MINTDB_INIT_CMD_GET_DEPOSIT ("",
+                                            ""),
+    PERF_TALER_MINTDB_INIT_CMD_COMMIT_TRANSACTION (""),
+    PERF_TALER_MINTDB_INIT_CMD_END_LOOP ("",
+                                         "05 - loop"),
+    PERF_TALER_MINTDB_INIT_CMD_GET_TIME ("05 - stop"),
+    PERF_TALER_MINTDB_INIT_CMD_GAUGER ("",
+                                       "05 - start",
+                                       "05 - stop",
+                                       "deposit insertion",
+                                       "deposit/sec",
+                                       NB_DEPOSIT_SAVE),
+    PERF_TALER_MINTDB_INIT_CMD_END (""),
   };
   
   ret = PERF_TALER_MINTDB_run_benchmark ("perf-taler-mintdb",
                                          "./test-mint-db-postgres.conf",
-                                         NULL,
+                                         (struct PERF_TALER_MINTDB_Cmd []) 
+                                         {PERF_TALER_MINTDB_INIT_CMD_END("")},
                                          benchmark);
   if (GNUNET_SYSERR == ret)
     return 1;