X-Git-Url: http://git.iain.cx/?a=blobdiff_plain;f=state%2Fstate.go;h=52fb6815de70778251fcf1cb5a1c66ae8abb49ce;hb=24183433de0c5d606a4fc1d9f90df0608547bf78;hp=682fb1cd20cccce6b5e1c5d33678d7e13230d09e;hpb=193ae41f5473832680f1969a1e0bc19bc27909b8;p=pstop.git

diff --git a/state/state.go b/state/state.go
index 682fb1c..52fb681 100644
--- a/state/state.go
+++ b/state/state.go
@@ -13,6 +13,8 @@ import (
 	"github.com/sjmudd/pstop/lib"
 	fsbi "github.com/sjmudd/pstop/p_s/file_summary_by_instance"
 	"github.com/sjmudd/pstop/p_s/ps_table"
+	"github.com/sjmudd/pstop/wait_info"
+	ewsgben "github.com/sjmudd/pstop/p_s/events_waits_summary_global_by_event_name"
 	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"
@@ -28,9 +30,11 @@ const (
 	showIO      = iota
 	showLocks   = iota
 	showUsers   = iota
+	showMutex   = iota
 )
 
 type State struct {
+	finished            bool
 	datadir             string
 	dbh                 *sql.DB
 	help                bool
@@ -38,15 +42,18 @@ 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
+	ewsgben             ps_table.Tabler // ewsgben.Events_waits_summary_global_by_event_name
 	users               i_s.Processlist
 	screen              screen.TermboxScreen
 	show                Show
 	mysql_version       string
 	want_relative_stats bool
+	wait_info.WaitInfo // embedded
 }
 
 func (state *State) Setup(dbh *sql.DB) {
 	state.dbh = dbh
+	state.finished = false
 
 	state.screen.Initialise()
 
@@ -54,6 +61,7 @@ func (state *State) Setup(dbh *sql.DB) {
 	// setup to their initial types/values
 	state.fsbi = fsbi.NewFileSummaryByInstance(variables)
 	state.tlwsbt = new(tlwsbt.Table_lock_waits_summary_by_table)
+	state.ewsgben = new(ewsgben.Table_events_waits_summary_global_by_event_name)
 
 	state.want_relative_stats = true // we show info from the point we start collecting data
 	state.fsbi.SetWantRelativeStats(state.want_relative_stats)
@@ -64,6 +72,8 @@ func (state *State) Setup(dbh *sql.DB) {
 	state.tiwsbt.SetNow()
 	state.users.SetWantRelativeStats(state.want_relative_stats) // ignored
 	state.users.SetNow()                                        // ignored
+	state.ewsgben.SetWantRelativeStats(state.want_relative_stats) // ignored
+	state.ewsgben.SetNow()                                        // ignored
 
 	state.ResetDBStatistics()
 
@@ -83,6 +93,16 @@ func (state *State) Setup(dbh *sql.DB) {
 	state.SetDatadir(datadir)
 }
 
+// have we finished ?
+func (state State) Finished() bool {
+	return state.finished
+}
+
+// indicate we have finished
+func (state *State) SetFinished() {
+	state.finished = true
+}
+
 // do a fresh collection of data and then update the initial values based on that.
 func (state *State) ResetDBStatistics() {
 	state.CollectAll()
@@ -117,6 +137,8 @@ func (state *State) Collect() {
 		state.tlwsbt.Collect(state.dbh)
 	case showUsers:
 		state.users.Collect(state.dbh)
+	case showMutex:
+		state.ewsgben.Collect(state.dbh)
 	}
 	lib.Logger.Println("state.Collect() took", time.Duration(time.Since(start)).String())
 }
@@ -152,7 +174,7 @@ func (state State) Help() bool {
 	return state.help
 }
 
-// states go: showLatency -> showOps -> showIO -> showLocks -> showUsers
+// states go: showLatency -> showOps -> showIO -> showLocks -> showUsers -> showMutex
 
 // display the output according to the mode we are in
 func (state *State) Display() {
@@ -169,6 +191,8 @@ func (state *State) Display() {
 			state.displayLocks()
 		case showUsers:
 			state.displayUsers()
+		case showMutex:
+			state.displayMutex()
 		}
 	}
 }
@@ -187,7 +211,7 @@ func (state *State) fix_latency_setting() {
 // change to the previous display mode
 func (state *State) DisplayPrevious() {
 	if state.show == showLatency {
-		state.show = showUsers
+		state.show = showMutex
 	} else {
 		state.show--
 	}
@@ -198,7 +222,7 @@ func (state *State) DisplayPrevious() {
 
 // change to the next display mode
 func (state *State) DisplayNext() {
-	if state.show == showUsers {
+	if state.show == showMutex {
 		state.show = showLatency
 	} else {
 		state.show++
@@ -230,6 +254,8 @@ func (state State) displayLine0() {
 			initial = state.tlwsbt.Last()
 		case showUsers:
 			initial = state.users.Last()
+		case showMutex:
+			initial = state.ewsgben.Last()
 		default:
 			// should not get here !
 		}
@@ -255,13 +281,15 @@ func (state State) displayDescription() {
 		description = state.tlwsbt.Description()
 	case showUsers:
 		description = state.users.Description()
+	case showMutex:
+		description = state.ewsgben.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)
@@ -280,12 +308,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
@@ -305,11 +333,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
@@ -329,11 +357,11 @@ 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.PrintAt(0, 2, state.users.Headings())
+	state.screen.BoldPrintAt(0, 2, state.users.Headings())
 
 	// print out the data
 	max_rows := state.screen.Height() - 3
@@ -353,7 +381,31 @@ func (state *State) displayUsers() {
 	}
 
 	// print out the totals at the bottom
-	state.screen.PrintAt(0, state.screen.Height()-1, state.users.TotalRowContent())
+	state.screen.BoldPrintAt(0, state.screen.Height()-1, state.users.TotalRowContent())
+}
+
+func (state *State) displayMutex() {
+	state.screen.BoldPrintAt(0, 2, state.ewsgben.Headings())
+
+	// print out the data
+	max_rows := state.screen.Height() - 3
+	row_content := state.ewsgben.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.ewsgben.EmptyRowContent())
+		}
+	}
+
+	// print out the totals at the bottom
+	state.screen.BoldPrintAt(0, state.screen.Height()-1, state.ewsgben.TotalRowContent())
 }
 
 // do we want to show all p_s data?
@@ -368,6 +420,7 @@ 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.ewsgben.SetWantRelativeStats(state.want_relative_stats)
 }
 
 // if there's a better way of doing this do it better ...