X-Git-Url: http://git.iain.cx/?a=blobdiff_plain;f=performance_schema%2Ftable_io_waits_summary_by_table%2Ftable_io_waits_summary_by_table.go;h=6f8a232e5a862a340e26662d02c291a3528b50ef;hb=84f9a5c41e806461c4193db0c7a0ef652b1b1357;hp=0ef79dc56cdfe995e0375058e9c3c8a2d907b233;hpb=38376bf5db9af25660b8183b2c022d079bb2b5ea;p=pstop.git

diff --git a/performance_schema/table_io_waits_summary_by_table/table_io_waits_summary_by_table.go b/performance_schema/table_io_waits_summary_by_table/table_io_waits_summary_by_table.go
index 0ef79dc..6f8a232 100644
--- a/performance_schema/table_io_waits_summary_by_table/table_io_waits_summary_by_table.go
+++ b/performance_schema/table_io_waits_summary_by_table/table_io_waits_summary_by_table.go
@@ -7,6 +7,7 @@ package table_io_waits_summary_by_table
 import (
 	"database/sql"
 	"fmt"
+	"time"
 
 	"github.com/sjmudd/pstop/lib"
 	ps "github.com/sjmudd/pstop/performance_schema"
@@ -35,19 +36,20 @@ func (t Table_io_waits_summary_by_table) WantsLatency() bool {
 // values if needed, and then subtracting initial values if we want
 // relative values, after which it stores totals.
 func (t *Table_io_waits_summary_by_table) Collect(dbh *sql.DB) {
-	lib.Logger.Println("Table_io_waits_summary_by_table.Collect() BEGIN")
+	start := time.Now()
+	// lib.Logger.Println("Table_io_waits_summary_by_table.Collect() BEGIN")
 	t.current = select_tiwsbt_rows(dbh)
-	lib.Logger.Println("- t.current set from", len(t.current), "collected row(s) from SELECT")
+	lib.Logger.Println("t.current collected", len(t.current), "row(s) from SELECT")
 
 	if len(t.initial) == 0 && len(t.current) > 0 {
-		// lib.Logger.Println("- setting t.initial to initial value" )
+		lib.Logger.Println("t.initial: copying from t.current (initial setup)" )
 		t.initial = make(table_io_waits_summary_by_table_rows, len(t.current))
 		copy(t.initial, t.current)
 	}
 
 	// check for reload initial characteristics
 	if t.initial.needs_refresh(t.current) {
-		// lib.Logger.Println( "- t.initial data needs refreshing!" )
+		lib.Logger.Println( "t.initial: copying from t.current (data needs refreshing)" )
 		t.initial = make(table_io_waits_summary_by_table_rows, len(t.current))
 		copy(t.initial, t.current)
 	}
@@ -56,9 +58,11 @@ func (t *Table_io_waits_summary_by_table) Collect(dbh *sql.DB) {
 
 	// lib.Logger.Println( "t.initial:", t.initial )
 	// lib.Logger.Println( "t.current:", t.current )
-	lib.Logger.Println("t.results:", t.results)
-	lib.Logger.Println("t.totals:", t.totals)
-	lib.Logger.Println("Table_io_waits_summary_by_table.Collect() END")
+	lib.Logger.Println("t.initial.totals():", t.initial.totals() )
+	lib.Logger.Println("t.current.totals():", t.current.totals() )
+	// lib.Logger.Println("t.results:", t.results)
+	// lib.Logger.Println("t.totals:", t.totals)
+	lib.Logger.Println("Table_io_waits_summary_by_table.Collect() END, took:", time.Duration(time.Since(start)).String())
 }
 
 func (t *Table_io_waits_summary_by_table) make_results() {
@@ -77,15 +81,15 @@ func (t *Table_io_waits_summary_by_table) make_results() {
 }
 
 // reset the statistics to current values
-func (t *Table_io_waits_summary_by_table) UpdateInitialValues() {
-	// lib.Logger.Println( "Table_io_waits_summary_by_table.UpdateInitialValues() BEGIN" )
+func (t *Table_io_waits_summary_by_table) SyncReferenceValues() {
+	// lib.Logger.Println( "Table_io_waits_summary_by_table.SyncReferenceValues() BEGIN" )
 
 	t.initial = make(table_io_waits_summary_by_table_rows, len(t.current))
 	copy(t.initial, t.current)
 
 	t.make_results()
 
-	// lib.Logger.Println( "Table_io_waits_summary_by_table.UpdateInitialValues() END" )
+	// lib.Logger.Println( "Table_io_waits_summary_by_table.SyncReferenceValues() END" )
 }
 
 func (t *Table_io_waits_summary_by_table) Headings() string {