X-Git-Url: http://git.iain.cx/?a=blobdiff_plain;f=state%2Fstate.go;h=4815359b6b6817192751b9659963aacfd2857004;hb=7a83b8c7acba48f12c42dfb201bdfe3276173f44;hp=33a86ea89cf5ee511e15824c995ed2e23c54ea93;hpb=23d4cb81352e26f3b76b41858988f8aca5797f41;p=pstop.git

diff --git a/state/state.go b/state/state.go
index 33a86ea..4815359 100644
--- a/state/state.go
+++ b/state/state.go
@@ -43,7 +43,7 @@ type State struct {
 	help                bool
 	hostname            string
 	fsbi                ps_table.Tabler // ufsbi.File_summary_by_instance
-	tiwsbt              tiwsbt.Table_io_waits_summary_by_table
+	tiwsbt              tiwsbt.Object
 	tlwsbt              ps_table.Tabler // tlwsbt.Table_lock_waits_summary_by_table
 	ewsgben             ps_table.Tabler // ewsgben.Events_waits_summary_global_by_event_name
 	essgben             ps_table.Tabler // essgben.Events_stages_summary_global_by_event_name
@@ -63,11 +63,13 @@ func (state *State) Setup(dbh *sql.DB) {
 	state.screen.Initialise()
 
 	state.setup_instruments.EnableMutexMonitoring(dbh)
+	state.setup_instruments.EnableStageMonitoring(dbh)
+
 	_, variables := lib.SelectAllGlobalVariablesByVariableName(state.dbh)
 	// 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.ewsgben = new(ewsgben.Object)
 	state.essgben = new(essgben.Object)
 
 	state.want_relative_stats = true // we show info from the point we start collecting data
@@ -481,7 +483,7 @@ func (state *State) ScreenSetSize(width, height int) {
 func (state *State) Cleanup() {
 	state.screen.Close()
 	if state.dbh != nil {
-		state.setup_instruments.Restore(state.dbh)
+		state.setup_instruments.RestoreConfiguration(state.dbh)
 		_ = state.dbh.Close()
 	}
 }