X-Git-Url: http://git.iain.cx/?a=blobdiff_plain;f=state%2Fstate.go;h=88983311b10cea39a485e8a9b94764ecaa3cb7c5;hb=bba62c7e1fa806db54a4bb0e898b1cc5e952b2c8;hp=03d99381891f3909c8a5d75e1b394adc09e74bc4;hpb=38376bf5db9af25660b8183b2c022d079bb2b5ea;p=pstop.git

diff --git a/state/state.go b/state/state.go
index 03d9938..8898331 100644
--- a/state/state.go
+++ b/state/state.go
@@ -75,14 +75,24 @@ func (state *State) Setup(dbh *sql.DB) {
 
 // do a fresh collection of data and then update the initial values based on that.
 func (state *State) ResetDBStatistics() {
-	state.fsbi.Collect(state.dbh)
-	state.fsbi.UpdateInitialValues()
+	state.Collect()
+	state.UpdateInitialValues()
+}
 
-	state.tlwsbt.Collect(state.dbh)
+func (state *State) UpdateInitialValues() {
+	start := time.Now()
+	state.fsbi.UpdateInitialValues()
 	state.tlwsbt.UpdateInitialValues()
+	state.tiwsbt.UpdateInitialValues()
+	lib.Logger.Println("state.UpdateInitialValues() took", time.Duration(time.Since(start)).String())
+}
 
+func (state *State) Collect() {
+	start := time.Now()
+	state.fsbi.Collect(state.dbh)
+	state.tlwsbt.Collect(state.dbh)
 	state.tiwsbt.Collect(state.dbh)
-	state.tiwsbt.UpdateInitialValues()
+	lib.Logger.Println("state.Collect() took", time.Duration(time.Since(start)).String())
 }
 
 func (state State) MySQLVersion() string {
@@ -198,8 +208,6 @@ func (state State) displayLine1() {
 }
 
 func (state *State) displayOpsOrLatency() {
-	state.tiwsbt.Collect(state.dbh)
-
 	state.screen.PrintAt(0, 2, state.tiwsbt.Headings())
 
 	max_rows := state.screen.Height() - 3
@@ -224,8 +232,6 @@ func (state *State) displayOpsOrLatency() {
 
 // show actual I/O latency values
 func (state State) displayIO() {
-	state.fsbi.Collect(state.dbh)
-
 	state.screen.PrintAt(0, 2, state.fsbi.Headings())
 
 	// print out the data
@@ -250,8 +256,6 @@ func (state State) displayIO() {
 }
 
 func (state *State) displayLocks() {
-	state.tlwsbt.Collect(state.dbh)
-
 	state.screen.PrintAt(0, 2, state.tlwsbt.Headings())
 
 	// print out the data