X-Git-Url: http://git.iain.cx/?a=blobdiff_plain;f=state%2Fstate.go;h=124b88425ccfb012db032c08a14d751323986787;hb=99e8324ae6cc0c84dd9ced4486b4d7b6c049790c;hp=7b48221f8fd79fab23c66826aa2afc2842a0461c;hpb=01e5cd73ee698eae5490433c1e9eacc8e35ea502;p=pstop.git

diff --git a/state/state.go b/state/state.go
index 7b48221..124b884 100644
--- a/state/state.go
+++ b/state/state.go
@@ -6,13 +6,15 @@ package state
 import (
 	"database/sql"
 	"fmt"
+	"strings"
 	"time"
 
+	"github.com/sjmudd/pstop/i_s"
 	"github.com/sjmudd/pstop/lib"
-	fsbi "github.com/sjmudd/pstop/performance_schema/file_summary_by_instance"
-	"github.com/sjmudd/pstop/performance_schema/ps_table"
-	tiwsbt "github.com/sjmudd/pstop/performance_schema/table_io_waits_summary_by_table"
-	tlwsbt "github.com/sjmudd/pstop/performance_schema/table_lock_waits_summary_by_table"
+	fsbi "github.com/sjmudd/pstop/p_s/file_summary_by_instance"
+	"github.com/sjmudd/pstop/p_s/ps_table"
+	tiwsbt "github.com/sjmudd/pstop/p_s/table_io_waits_summary_by_table"
+	tlwsbt "github.com/sjmudd/pstop/p_s/table_lock_waits_summary_by_table"
 	"github.com/sjmudd/pstop/screen"
 	"github.com/sjmudd/pstop/version"
 )
@@ -25,6 +27,7 @@ const (
 	showOps     = iota
 	showIO      = iota
 	showLocks   = iota
+	showUsers   = iota
 )
 
 type State struct {
@@ -35,6 +38,7 @@ type State struct {
 	fsbi                ps_table.Tabler // ufsbi.File_summary_by_instance
 	tiwsbt              tiwsbt.Table_io_waits_summary_by_table
 	tlwsbt              ps_table.Tabler // tlwsbt.Table_lock_waits_summary_by_table
+	users               i_s.Processlist
 	screen              screen.TermboxScreen
 	show                Show
 	mysql_version       string
@@ -58,6 +62,8 @@ func (state *State) Setup(dbh *sql.DB) {
 	state.tlwsbt.SetNow()
 	state.tiwsbt.SetWantRelativeStats(state.want_relative_stats)
 	state.tiwsbt.SetNow()
+	state.users.SetWantRelativeStats(state.want_relative_stats) // ignored
+	state.users.SetNow()                                        // ignored
 
 	state.ResetDBStatistics()
 
@@ -65,7 +71,11 @@ func (state *State) Setup(dbh *sql.DB) {
 	state.show = showLatency
 	state.tiwsbt.SetWantsLatency(true)
 
+	// get short name (to save space)
 	_, hostname := lib.SelectGlobalVariableByVariableName(state.dbh, "HOSTNAME")
+	if index := strings.Index(hostname, "."); index >= 0 {
+		hostname = hostname[0:index]
+	}
 	_, mysql_version := lib.SelectGlobalVariableByVariableName(state.dbh, "VERSION")
 	_, datadir := lib.SelectGlobalVariableByVariableName(state.dbh, "DATADIR")
 	state.SetHostname(hostname)
@@ -76,15 +86,15 @@ 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.CollectAll()
-	state.UpdateInitialValues()
+	state.SyncReferenceValues()
 }
 
-func (state *State) UpdateInitialValues() {
+func (state *State) SyncReferenceValues() {
 	start := time.Now()
-	state.fsbi.UpdateInitialValues()
-	state.tlwsbt.UpdateInitialValues()
-	state.tiwsbt.UpdateInitialValues()
-	lib.Logger.Println("state.UpdateInitialValues() took", time.Duration(time.Since(start)).String())
+	state.fsbi.SyncReferenceValues()
+	state.tlwsbt.SyncReferenceValues()
+	state.tiwsbt.SyncReferenceValues()
+	lib.Logger.Println("state.SyncReferenceValues() took", time.Duration(time.Since(start)).String())
 }
 
 // collect all initial values on startup / reset
@@ -105,6 +115,8 @@ func (state *State) Collect() {
 		state.fsbi.Collect(state.dbh)
 	case showLocks:
 		state.tlwsbt.Collect(state.dbh)
+	case showUsers:
+		state.users.Collect(state.dbh)
 	}
 	lib.Logger.Println("state.Collect() took", time.Duration(time.Since(start)).String())
 }
@@ -140,6 +152,8 @@ func (state State) Help() bool {
 	return state.help
 }
 
+// states go: showLatency -> showOps -> showIO -> showLocks -> showUsers
+
 // display the output according to the mode we are in
 func (state *State) Display() {
 	if state.help {
@@ -153,31 +167,50 @@ func (state *State) Display() {
 			state.displayIO()
 		case showLocks:
 			state.displayLocks()
+		case showUsers:
+			state.displayUsers()
 		}
 	}
 }
 
-// change to the next display mode
-func (state *State) DisplayNext() {
-	if state.show == showLocks {
-		state.show = showLatency
-	} else {
-		state.show++
-	}
-	// this needs to be done more cleanly
+// fix_latency_setting() ensures the SetWantsLatency() value is
+// correct. This needs to be done more cleanly.
+func (state *State) fix_latency_setting() {
 	if state.show == showLatency {
 		state.tiwsbt.SetWantsLatency(true)
 	}
 	if state.show == showOps {
 		state.tiwsbt.SetWantsLatency(false)
 	}
+}
+
+// change to the previous display mode
+func (state *State) DisplayPrevious() {
+	if state.show == showLatency {
+		state.show = showUsers
+	} else {
+		state.show--
+	}
+	state.fix_latency_setting()
+	state.screen.Clear()
+	state.screen.Flush()
+}
+
+// change to the next display mode
+func (state *State) DisplayNext() {
+	if state.show == showUsers {
+		state.show = showLatency
+	} else {
+		state.show++
+	}
+	state.fix_latency_setting()
 	state.screen.Clear()
 	state.screen.Flush()
 }
 
 func (state State) displayHeading() {
 	state.displayLine0()
-	state.displayLine1()
+	state.displayDescription()
 }
 
 func (state State) displayLine0() {
@@ -195,8 +228,10 @@ func (state State) displayLine0() {
 			initial = state.fsbi.Last()
 		case showLocks:
 			initial = state.tlwsbt.Last()
+		case showUsers:
+			initial = state.users.Last()
 		default:
-			initial = time.Now() // THIS IS WRONG !!!
+			// should not get here !
 		}
 
 		d := now.Sub(initial)
@@ -208,21 +243,25 @@ func (state State) displayLine0() {
 	state.screen.PrintAt(0, 0, top_line)
 }
 
-func (state State) displayLine1() {
+func (state State) displayDescription() {
+	description := "UNKNOWN"
+
 	switch state.show {
 	case showLatency, showOps:
-		state.screen.PrintAt(0, 1, state.tiwsbt.Description())
+		description = state.tiwsbt.Description()
 	case showIO:
-		state.screen.PrintAt(0, 1, state.fsbi.Description())
+		description = state.fsbi.Description()
 	case showLocks:
-		state.screen.PrintAt(0, 1, state.tlwsbt.Description())
-	default:
-		state.screen.PrintAt(0, 1, "UNKNOWN")
+		description = state.tlwsbt.Description()
+	case showUsers:
+		description = state.users.Description()
 	}
+
+	state.screen.PrintAt(0, 1, description)
 }
 
 func (state *State) displayOpsOrLatency() {
-	state.screen.PrintAt(0, 2, state.tiwsbt.Headings())
+	state.screen.BoldPrintAt(0, 2, state.tiwsbt.Headings())
 
 	max_rows := state.screen.Height() - 3
 	row_content := state.tiwsbt.RowContent(max_rows)
@@ -241,12 +280,12 @@ func (state *State) displayOpsOrLatency() {
 	}
 
 	// print out the totals at the bottom
-	state.screen.PrintAt(0, state.screen.Height()-1, state.tiwsbt.TotalRowContent())
+	state.screen.BoldPrintAt(0, state.screen.Height()-1, state.tiwsbt.TotalRowContent())
 }
 
 // show actual I/O latency values
 func (state State) displayIO() {
-	state.screen.PrintAt(0, 2, state.fsbi.Headings())
+	state.screen.BoldPrintAt(0, 2, state.fsbi.Headings())
 
 	// print out the data
 	max_rows := state.screen.Height() - 3
@@ -266,11 +305,11 @@ func (state State) displayIO() {
 	}
 
 	// print out the totals at the bottom
-	state.screen.PrintAt(0, state.screen.Height()-1, state.fsbi.TotalRowContent())
+	state.screen.BoldPrintAt(0, state.screen.Height()-1, state.fsbi.TotalRowContent())
 }
 
 func (state *State) displayLocks() {
-	state.screen.PrintAt(0, 2, state.tlwsbt.Headings())
+	state.screen.BoldPrintAt(0, 2, state.tlwsbt.Headings())
 
 	// print out the data
 	max_rows := state.screen.Height() - 3
@@ -290,7 +329,31 @@ func (state *State) displayLocks() {
 	}
 
 	// print out the totals at the bottom
-	state.screen.PrintAt(0, state.screen.Height()-1, state.tlwsbt.TotalRowContent())
+	state.screen.BoldPrintAt(0, state.screen.Height()-1, state.tlwsbt.TotalRowContent())
+}
+
+func (state *State) displayUsers() {
+	state.screen.BoldPrintAt(0, 2, state.users.Headings())
+
+	// print out the data
+	max_rows := state.screen.Height() - 3
+	row_content := state.users.RowContent(max_rows)
+
+	// print out rows
+	for k := range row_content {
+		y := 3 + k
+		state.screen.PrintAt(0, y, row_content[k])
+	}
+	// print out empty rows
+	for k := len(row_content); k < (state.screen.Height() - 3); k++ {
+		y := 3 + k
+		if y < state.screen.Height()-1 {
+			state.screen.PrintAt(0, y, state.users.EmptyRowContent())
+		}
+	}
+
+	// print out the totals at the bottom
+	state.screen.BoldPrintAt(0, state.screen.Height()-1, state.users.TotalRowContent())
 }
 
 // do we want to show all p_s data?
@@ -305,8 +368,6 @@ func (state *State) SetWantRelativeStats(want_relative_stats bool) {
 	state.fsbi.SetWantRelativeStats(want_relative_stats)
 	state.tlwsbt.SetWantRelativeStats(state.want_relative_stats)
 	state.tiwsbt.SetWantRelativeStats(state.want_relative_stats)
-
-	state.Display()
 }
 
 // if there's a better way of doing this do it better ...