Merge lp:~mdcallag/perconatools/tpcc-mysql into lp:~percona-dev/perconatools/tpcc-mysql

[Mark Callaghan]

Do you have any interest in this change?
I don't mind maintaining this as a separate branch but I think the changes will be useful to you too.

The benefits are:
1) it uses millisecond granularity rather than 10 millisecond granularity for response time buckets
2) it uses double instead of float (this will reduce some rounding errors, but probably isn't a big deal)
3) it uses gettimeofday rather than times to count clock ticks. The granularity from times is too coarse -- it provides at best 10 millisecond granularity. I don't know if this is used for portability, but it is too coarse.

Unmerged revisions

27. By Mark Callaghan on 2011-09-02

Use millisecond granularity instead of 10 millisecond granularity.
Use gettimeofday to count ticks instead of times
Use double instead of float

=== modified file 'src/driver.c'
--- src/driver.c	2008-12-04 02:50:59 +0000
+++ src/driver.c	2011-09-02 22:20:20 +0000
@@ -5,7 +5,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <sys/times.h>
+#include <sys/time.h>
 #include "tpc.h"      /* prototypes for misc. functions */
 #include "trans_if.h" /* prototypes for transacation interface calls */
 #include "sequence.h"
@@ -35,7 +35,7 @@
 extern int* retry2[];
 extern int* failure2[];
 
-extern float max_rt[];
+extern double max_rt[];
 
 extern long clk_tck;
 
@@ -47,6 +47,21 @@
 #define RTIME_DELIVERY 80
 #define RTIME_SLEV     20
 
+static unsigned long long clock_ticks()
+{
+  struct timeval tv;
+  unsigned long long res;
+
+  gettimeofday(&tv, NULL);
+  res = tv.tv_sec * 1000000 + tv.tv_usec;
+  return res; 
+}
+
+double ticks_to_secs(unsigned long long t2, unsigned long long t1)
+{
+  return ((double)(t2 - t1)) / (double) clk_tck;
+}
+
 int driver (int t_num)
 {
     int i, j;
@@ -87,9 +102,8 @@
 {
     int c_num;
     int i,ret;
-    clock_t clk1,clk2;
-    float rt;
-    struct tms tbuf;
+    unsigned long long clk1,clk2;
+    double rt;
     int  w_id, d_id, c_id, ol_cnt;
     int  all_local = 1;
     int  notfound = MAXITEMS+1;  /* valid item ids are numbered consecutively
@@ -128,18 +142,18 @@
     }
 
     for (i = 0; i < MAX_RETRY; i++) {
-      clk1 = times( &tbuf );
+      clk1 = clock_ticks();
       ret = neword(t_num, w_id, d_id, c_id, ol_cnt, all_local, itemid, supware, qty);
-      clk2 = times( &tbuf );
+      clk2 = clock_ticks();
 
       if(ret){
 
-	rt = (float)(clk2 - clk1)/(float)clk_tck;
+        rt = ticks_to_secs(clk2, clk1);
 	if(rt > max_rt[0])
 	  max_rt[0]=rt;
 	hist_inc(0, clk2 - clk1);
 	if(counting_on){
-	  if( (clk2 - clk1) / clk_tck < RTIME_NEWORD ){
+	  if( rt < RTIME_NEWORD ){
 	    success[0]++;
 	    success2[0][t_num]++;
 	  }else{
@@ -189,9 +203,8 @@
 {
     int c_num;
     int byname,i,ret;
-    clock_t clk1,clk2;
-    float rt;
-    struct tms tbuf;
+    unsigned long long clk1,clk2;
+    double rt;
     int  w_id, d_id, c_w_id, c_d_id, c_id, h_amount;
     char c_last[17];
 
@@ -220,18 +233,18 @@
     }
 
     for (i = 0; i < MAX_RETRY; i++) {
-      clk1 = times( &tbuf );
+      clk1 = clock_ticks();
       ret = payment(t_num, w_id, d_id, byname, c_w_id, c_d_id, c_id, c_last, h_amount);
-      clk2 = times( &tbuf );
+      clk2 = clock_ticks();
 
       if(ret){
 
-	rt = (float)(clk2 - clk1)/(float)clk_tck;
+        rt = ticks_to_secs(clk2, clk1);
 	if(rt > max_rt[1])
 	  max_rt[1]=rt;
 	hist_inc(1, clk2 - clk1);
 	if(counting_on){
-	  if( (clk2 - clk1) / clk_tck < RTIME_PAYMENT ){
+	  if( rt < RTIME_PAYMENT ){
 	    success[1]++;
 	    success2[1][t_num]++;
 	  }else{
@@ -268,9 +281,8 @@
 {
     int c_num;
     int byname,i,ret;
-    clock_t clk1,clk2;
-    float rt;
-    struct tms tbuf;
+    unsigned long long clk1,clk2;
+    double rt;
     int  w_id, d_id, c_id;
     char c_last[16];
 
@@ -291,18 +303,18 @@
     }
 
     for (i = 0; i < MAX_RETRY; i++) {
-      clk1 = times( &tbuf );
+      clk1 = clock_ticks();
       ret = ordstat(t_num, w_id, d_id, byname, c_id, c_last);
-      clk2 = times( &tbuf );
+      clk2 = clock_ticks();
 
       if(ret){
 
-	rt = (float)(clk2 - clk1)/(float)clk_tck;
+        rt = ticks_to_secs(clk2, clk1);
 	if(rt > max_rt[2])
 	  max_rt[2]=rt;
 	hist_inc(2, clk2 - clk1);
 	if(counting_on){
-	  if( (clk2 - clk1) / clk_tck < RTIME_ORDSTAT ){
+	  if( rt < RTIME_ORDSTAT ){
 	    success[2]++;
 	    success2[2][t_num]++;
 	  }else{
@@ -340,9 +352,8 @@
 {
     int c_num;
     int i,ret;
-    clock_t clk1,clk2;
-    float rt;
-    struct tms tbuf;
+    unsigned long long clk1,clk2;
+    double rt;
     int  w_id, o_carrier_id;
 
     if(num_node==0){
@@ -355,18 +366,18 @@
     o_carrier_id = RandomNumber(1, 10);
 
     for (i = 0; i < MAX_RETRY; i++) {
-      clk1 = times( &tbuf );
+      clk1 = clock_ticks();
       ret = delivery(t_num, w_id, o_carrier_id);
-      clk2 = times( &tbuf );
+      clk2 = clock_ticks();
 
       if(ret){
 
-	rt = (float)(clk2 - clk1)/(float)clk_tck;
+        rt = ticks_to_secs(clk2, clk1);
 	if(rt > max_rt[3])
 	  max_rt[3]=rt;
 	hist_inc(3, clk2 - clk1);
 	if(counting_on){
-	  if( (clk2 - clk1) / clk_tck < RTIME_DELIVERY ){
+	  if( rt < RTIME_DELIVERY ){
 	    success[3]++;
 	    success2[3][t_num]++;
 	  }else{
@@ -404,9 +415,8 @@
 {
     int c_num;
     int i,ret;
-    clock_t clk1,clk2;
-    float rt;
-    struct tms tbuf;
+    unsigned long long clk1,clk2;
+    double rt;
     int  w_id, d_id, level;
 
     if(num_node==0){
@@ -420,18 +430,18 @@
     level = RandomNumber(10, 20); 
 
     for (i = 0; i < MAX_RETRY; i++) {
-      clk1 = times( &tbuf );
+      clk1 = clock_ticks();
       ret = slev(t_num, w_id, d_id, level);
-      clk2 = times( &tbuf );
+      clk2 = clock_ticks();
 
       if(ret){
 
-	rt = (float)(clk2 - clk1)/(float)clk_tck;
+        rt = ticks_to_secs(clk2, clk1);
 	if(rt > max_rt[4])
 	  max_rt[4]=rt;
 	hist_inc(4, clk2 - clk1);
 	if(counting_on){
-	  if( (clk2 - clk1) / clk_tck < RTIME_SLEV ){
+	  if( rt < RTIME_SLEV ){
 	    success[4]++;
 	    success2[4][t_num]++;
 	  }else{

=== modified file 'src/main.c'
--- src/main.c	2011-08-25 22:34:07 +0000
+++ src/main.c	2011-09-02 22:20:20 +0000
@@ -64,7 +64,7 @@
 int prev_s[5];
 int prev_l[5];
 
-float max_rt[5];
+double max_rt[5];
 
 int activate_transaction;
 int counting_on;
@@ -116,7 +116,7 @@
 {
   int i, k, t_num, arg_offset;
   long j;
-  float f;
+  double f;
   pthread_t *t;
   thread_arg *thd_arg;
   timer_t timer;
@@ -173,7 +173,9 @@
     exit(1);
   }
 
-  clk_tck = sysconf(_SC_CLK_TCK);
+  /* clk_tck = sysconf(_SC_CLK_TCK); */
+  clk_tck = 1000000; /* gettimeofday granularity is usec */
+  fprintf(stdout, "clk_tck is %ld\n", clk_tck);
 
   /* Parse args */
 
@@ -437,29 +439,29 @@
     j += (success[i] + late[i]);
   }
 
-  f = 100.0 * (float)(success[1] + late[1])/(float)j;
-  printf("        Payment: %3.2f%% (>=43.0%%)",f);
+  f = 100.0 * (double)(success[1] + late[1])/(double)j;
+  printf("        Payment: %.3f%% (>=43.0%%)",f);
   if ( f >= 43.0 ){
     printf(" [OK]\n");
   }else{
     printf(" [NG] *\n");
   }
-  f = 100.0 * (float)(success[2] + late[2])/(float)j;
-  printf("   Order-Status: %3.2f%% (>= 4.0%%)",f);
-  if ( f >= 4.0 ){
-    printf(" [OK]\n");
-  }else{
-    printf(" [NG] *\n");
-  }
-  f = 100.0 * (float)(success[3] + late[3])/(float)j;
-  printf("       Delivery: %3.2f%% (>= 4.0%%)",f);
-  if ( f >= 4.0 ){
-    printf(" [OK]\n");
-  }else{
-    printf(" [NG] *\n");
-  }
-  f = 100.0 * (float)(success[4] + late[4])/(float)j;
-  printf("    Stock-Level: %3.2f%% (>= 4.0%%)",f);
+  f = 100.0 * (double)(success[2] + late[2])/(double)j;
+  printf("   Order-Status: %.3f%% (>= 4.0%%)",f);
+  if ( f >= 4.0 ){
+    printf(" [OK]\n");
+  }else{
+    printf(" [NG] *\n");
+  }
+  f = 100.0 * (double)(success[3] + late[3])/(double)j;
+  printf("       Delivery: %.3f%% (>= 4.0%%)",f);
+  if ( f >= 4.0 ){
+    printf(" [OK]\n");
+  }else{
+    printf(" [NG] *\n");
+  }
+  f = 100.0 * (double)(success[4] + late[4])/(double)j;
+  printf("    Stock-Level: %.3f%% (>= 4.0%%)",f);
   if ( f >= 4.0 ){
     printf(" [OK]\n");
   }else{
@@ -467,36 +469,36 @@
   }
 
   printf(" [response time (at least 90%% passed)]\n");
-  f = 100.0 * (float)success[0]/(float)(success[0] + late[0]);
-  printf("      New-Order: %3.2f%% ",f);
-  if ( f >= 90.0 ){
-    printf(" [OK]\n");
-  }else{
-    printf(" [NG] *\n");
-  }
-  f = 100.0 * (float)success[1]/(float)(success[1] + late[1]);
-  printf("        Payment: %3.2f%% ",f);
-  if ( f >= 90.0 ){
-    printf(" [OK]\n");
-  }else{
-    printf(" [NG] *\n");
-  }
-  f = 100.0 * (float)success[2]/(float)(success[2] + late[2]);
-  printf("   Order-Status: %3.2f%% ",f);
-  if ( f >= 90.0 ){
-    printf(" [OK]\n");
-  }else{
-    printf(" [NG] *\n");
-  }
-  f = 100.0 * (float)success[3]/(float)(success[3] + late[3]);
-  printf("       Delivery: %3.2f%% ",f);
-  if ( f >= 90.0 ){
-    printf(" [OK]\n");
-  }else{
-    printf(" [NG] *\n");
-  }
-  f = 100.0 * (float)success[4]/(float)(success[4] + late[4]);
-  printf("    Stock-Level: %3.2f%% ",f);
+  f = 100.0 * (double)success[0]/(double)(success[0] + late[0]);
+  printf("      New-Order: %.3f%% ",f);
+  if ( f >= 90.0 ){
+    printf(" [OK]\n");
+  }else{
+    printf(" [NG] *\n");
+  }
+  f = 100.0 * (double)success[1]/(double)(success[1] + late[1]);
+  printf("        Payment: %.3f%% ",f);
+  if ( f >= 90.0 ){
+    printf(" [OK]\n");
+  }else{
+    printf(" [NG] *\n");
+  }
+  f = 100.0 * (double)success[2]/(double)(success[2] + late[2]);
+  printf("   Order-Status: %.3f%% ",f);
+  if ( f >= 90.0 ){
+    printf(" [OK]\n");
+  }else{
+    printf(" [NG] *\n");
+  }
+  f = 100.0 * (double)success[3]/(double)(success[3] + late[3]);
+  printf("       Delivery: %.3f%% ",f);
+  if ( f >= 90.0 ){
+    printf(" [OK]\n");
+  }else{
+    printf(" [NG] *\n");
+  }
+  f = 100.0 * (double)success[4]/(double)(success[4] + late[4]);
+  printf("    Stock-Level: %.3f%% ",f);
   if ( f >= 90.0 ){
     printf(" [OK]\n");
   }else{
@@ -504,8 +506,8 @@
   }
 
   printf("\n<TpmC>\n");
-  f = (float)(success[0] + late[0]) * 60.0
-    / (float)((measure_time / PRINT_INTERVAL) * PRINT_INTERVAL);
+  f = (double)(success[0] + late[0]) * 60.0
+    / (double)((measure_time / PRINT_INTERVAL) * PRINT_INTERVAL);
   printf("                 %.3f TpmC\n",f);
   exit(0);
 
@@ -521,7 +523,7 @@
 {
   int i;
   int s[5],l[5];
-  float rt90[5];
+  double rt90[5];
 
   for( i=0; i<5; i++ ){
     s[i] = success[i];
@@ -530,7 +532,7 @@
   }
 
   time_count += PRINT_INTERVAL;
-  printf("%4d, %d(%d):%.2f, %d(%d):%.2f, %d(%d):%.2f, %d(%d):%.2f, %d(%d):%.2f\n",
+  printf("%4d, %d(%d):%.3f, %d(%d):%.3f, %d(%d):%.3f, %d(%d):%.3f, %d(%d):%.3f\n",
 	 time_count,
 	 ( s[0] + l[0] - prev_s[0] - prev_l[0] ),
 	 ( l[0] - prev_l[0] ),
@@ -560,7 +562,7 @@
 {
   int i;
   int s[5],l[5];
-  float rt90[5];
+  double rt90[5];
 
   for( i=0; i<5; i++ ){
     s[i] = success[i];
@@ -569,7 +571,7 @@
   }
 
   time_count += PRINT_INTERVAL;
-  printf("%4d, %d(%d):%.2f, %d(%d):%.2f, %d(%d):%.2f, %d(%d):%.2f, %d(%d):%.2f\n",
+  printf("%4d, %d(%d):%.3f, %d(%d):%.3f, %d(%d):%.3f, %d(%d):%.3f, %d(%d):%.3f\n",
 	 time_count,
 	 ( s[0] + l[0] - prev_s[0] - prev_l[0] ),
 	 ( l[0] - prev_l[0] ),

=== modified file 'src/rthist.c'
--- src/rthist.c	2011-08-25 22:34:07 +0000
+++ src/rthist.c	2011-09-02 22:20:20 +0000
@@ -4,16 +4,15 @@
  */
 
 #include <stdio.h>
-#include <sys/time.h>
-
-#define MAXREC      320
-#define REC_PER_SEC 100
-
-extern float max_rt[];
+
+#define MAXSEC      32
+#define REC_PER_SEC 1000
+
+extern double max_rt[];
 extern long clk_tck;
 
-int total_hist[5][MAXREC * REC_PER_SEC];
-int cur_hist[5][MAXREC * REC_PER_SEC];
+int total_hist[5][MAXSEC * REC_PER_SEC];
+int cur_hist[5][MAXSEC * REC_PER_SEC];
 
 /* initialize */
 void hist_init()
@@ -21,36 +20,37 @@
   int i,j;
 
   for( i=0; i<5; i++){
-    for( j=0; j<(MAXREC * REC_PER_SEC); j++){
+    for( j=0; j<(MAXSEC * REC_PER_SEC); j++){
       total_hist[i][j] = cur_hist[i][j] = 0;
     }
   }
 }
 
 /* incliment matched one */
-void hist_inc( int transaction, time_t rtclk )
+void hist_inc( int transaction, unsigned long long ticks)
 {
   int i;
 
-  i = ( rtclk * REC_PER_SEC )/clk_tck;
-  if(i >= (MAXREC * REC_PER_SEC)){
-    i = (MAXREC * REC_PER_SEC) - 1;
+  /* "i" is the response time in milliseconds rounded to nearest int */
+  i = ( ticks * REC_PER_SEC )/clk_tck;
+  if(i >= (MAXSEC * REC_PER_SEC)){
+    i = (MAXSEC * REC_PER_SEC) - 1;
   }
   ++cur_hist[transaction][i];
 }
 
 /* check point, add on total histgram, return 90% line */
-float hist_ckp( int transaction )
+double hist_ckp( int transaction )
 {
   int i;
   int total,tmp,line;
 
   total = tmp = 0;
-  line = MAXREC * REC_PER_SEC;
-  for( i=0; i<(MAXREC * REC_PER_SEC); i++){
+  line = MAXSEC * REC_PER_SEC;
+  for( i=0; i<(MAXSEC * REC_PER_SEC); i++){
     total += cur_hist[transaction][i];
   }
-  for( i=(MAXREC * REC_PER_SEC)-1; i >= 0 ; i--){
+  for( i=(MAXSEC * REC_PER_SEC)-1; i >= 0 ; i--){
     tmp += cur_hist[transaction][i];
     total_hist[transaction][i] += cur_hist[transaction][i];
     cur_hist[transaction][i] = 0;
@@ -58,7 +58,7 @@
       line = i;
     }
   }
-  return ( (float)(line)/(float)(REC_PER_SEC) );
+  return ( (double)(line)/(double)(REC_PER_SEC) );
 }
 
 void hist_report()
@@ -68,11 +68,11 @@
 
   for( j=0; j<5; j++){
     total[j] = tmp[j] = 0;
-    line[j] = MAXREC * REC_PER_SEC;
-    for( i=0; i<(MAXREC * REC_PER_SEC); i++){
+    line[j] = MAXSEC * REC_PER_SEC;
+    for( i=0; i<(MAXSEC * REC_PER_SEC); i++){
       total[j] += total_hist[j][i];
     }
-    for( i=(MAXREC * REC_PER_SEC)-1; i >= 0 ; i--){
+    for( i=(MAXSEC * REC_PER_SEC)-1; i >= 0 ; i--){
       tmp[j] += total_hist[j][i];
       if( (tmp[j] * 10) <= total[j] ){
 	line[j] = i;
@@ -99,8 +99,8 @@
     case 4:
       printf("\n5.Stock-Level\n\n");
     }
-    for( i=0; (i<(MAXREC * REC_PER_SEC))&&(i <= line[j]*4); i++){
-      printf("%3.2f, %6d\n",(float)(i+1)/(float)(REC_PER_SEC),total_hist[j][i]);
+    for( i=0; (i<(MAXSEC * REC_PER_SEC))&&(i <= line[j]*4); i++){
+      printf("%.3f, %3d\n",(double)(i+1)/(double)(REC_PER_SEC),total_hist[j][i]);
     }
     printf("\n");
   }
@@ -123,7 +123,7 @@
     case 4:
       printf(" Stock-Level : ");
     }
-    printf("%3.2f  (%.2f)\n",(float)(line[j])/(float)(REC_PER_SEC),max_rt[j]);
+    printf("%.3f  (%.6f)\n",(double)(line[j])/(double)(REC_PER_SEC),max_rt[j]);
   }
 
 }

=== modified file 'src/rthist.h'
--- src/rthist.h	2008-12-04 02:50:59 +0000
+++ src/rthist.h	2011-09-02 22:20:20 +0000
@@ -3,6 +3,6 @@
  */
 
 void hist_init();
-void hist_inc( int transaction, time_t rtclk );
-float hist_ckp( int transaction );
+void hist_inc( int transaction, unsigned long long ticks);
+double hist_ckp( int transaction );
 void hist_report();