v0.1.3 add support for explicit --defaults-file=xx on command line

[pstop.git] / main.go

diff --git a/main.go b/main.go
index 662743e..53960f2 100644 (file)
--- a/main.go
+++ b/main.go
@@ -1,4 +1,4 @@
-// Top like progream which collects information from MySQL's
+// pstop - Top like progream which collects information from MySQL's
 // performance_schema database.
 package main
 
@@ -22,6 +22,7 @@ import (
        "github.com/sjmudd/pstop/lib"
        "github.com/sjmudd/pstop/state"
        "github.com/sjmudd/pstop/version"
+       "github.com/sjmudd/pstop/wait_info"
 )
 
 const (
@@ -30,20 +31,22 @@ const (
 )
 
 var (
-       flag_version = flag.Bool("version", false, "Show the version of "+lib.MyName())
-       flag_debug   = flag.Bool("debug", false, "Enabling debug logging")
-       flag_help    = flag.Bool("help", false, "Provide some help for "+lib.MyName())
-       cpuprofile   = flag.String("cpuprofile", "", "write cpu profile to file")
+       flag_debug         = flag.Bool("debug", false, "Enabling debug logging")
+       flag_defaults_file = flag.String("defaults-file", "", "Provide a defaults-file to use to connect to MySQL")
+       flag_help          = flag.Bool("help", false, "Provide some help for "+lib.MyName())
+       flag_version       = flag.Bool("version", false, "Show the version of "+lib.MyName())
+       cpuprofile         = flag.String("cpuprofile", "", "write cpu profile to file")
 
        re_valid_version = regexp.MustCompile(`^(5\.[67]\.|10\.[01])`)
 )
 
-func get_db_handle() *sql.DB {
+// Connect to the database with the given defaults-file, or ~/.my.cnf if not provided.
+func get_db_handle( defaults_file string ) *sql.DB {
        var err error
        var dbh *sql.DB
        lib.Logger.Println("get_db_handle() connecting to database")
 
-       dbh, err = mysql_defaults_file.OpenUsingDefaultsFile(sql_driver, "", "performance_schema")
+       dbh, err = mysql_defaults_file.OpenUsingDefaultsFile(sql_driver, defaults_file, "performance_schema")
        if err != nil {
                log.Fatal(err)
        }
@@ -75,8 +78,9 @@ func usage() {
        fmt.Println("Usage: " + lib.MyName() + " <options>")
        fmt.Println("")
        fmt.Println("Options:")
-       fmt.Println("-help      show this help message")
-       fmt.Println("-version   show the version")
+       fmt.Println("-defaults-file=/path/to/defaults.file   Connect to MySQL using given defaults-file" )
+       fmt.Println("-help                                   show this help message")
+       fmt.Println("-version                                show the version")
 }
 
 // pstop requires MySQL 5.6+ or MariaDB 10.0+. Check the version
@@ -85,7 +89,7 @@ func usage() {
 func validate_mysql_version(dbh *sql.DB) error {
        var tables = [...]string{
                "performance_schema.file_summary_by_instance",
-               "performance_Schema.table_io_waits_summary_by_table",
+               "performance_schema.table_io_waits_summary_by_table",
                "performance_schema.table_lock_waits_summary_by_table",
        }
 
@@ -118,6 +122,7 @@ func validate_mysql_version(dbh *sql.DB) error {
 }
 
 func main() {
+       var defaults_file string = ""
        flag.Parse()
 
        // clean me up
@@ -144,13 +149,19 @@ func main() {
 
        lib.Logger.Println("Starting " + lib.MyName())
 
-       dbh := get_db_handle()
+       if flag_defaults_file != nil && *flag_defaults_file != "" {
+               defaults_file = *flag_defaults_file
+       }
+
+       dbh := get_db_handle( defaults_file )
        if err := validate_mysql_version(dbh); err != nil {
                log.Fatal(err)
        }
 
        var state state.State
-       interval := time.Second
+       var wi wait_info.WaitInfo
+       wi.SetWaitInterval(time.Second)
+
        sigChan := make(chan os.Signal, 1)
        done := make(chan struct{})
        defer close(done)
@@ -158,8 +169,6 @@ func main() {
 
        signal.Notify(sigChan, syscall.SIGINT, syscall.SIGTERM)
 
-       ticker := time.NewTicker(interval) // generate a periodic signal
-
        state.Setup(dbh)
 
        finished := false
@@ -171,8 +180,9 @@ func main() {
                case sig := <-sigChan:
                        fmt.Println("Caught a signal", sig)
                        done <- struct{}{}
-               case <-ticker.C:
+               case <-wi.WaitNextPeriod():
                        state.Collect()
+                       wi.CollectedNow()
                        state.Display()
                case event := <-termboxChan:
                        // switch on event type
@@ -181,22 +191,21 @@ func main() {
                                switch event.Key {
                                case termbox.KeyCtrlZ, termbox.KeyCtrlC, termbox.KeyEsc:
                                        finished = true
-                               case termbox.KeyTab: // tab - change display modes
+                               case termbox.KeyArrowLeft: // left arrow change to previous display mode
+                                       state.DisplayPrevious()
+                                       state.Display()
+                               case termbox.KeyTab, termbox.KeyArrowRight: // tab or right arrow - change to next display mode
                                        state.DisplayNext()
                                        state.Display()
                                }
                                switch event.Ch {
                                case '-': // decrease the interval if > 1
-                                       if interval > time.Second {
-                                               ticker.Stop()
-                                               interval -= time.Second
-                                               ticker = time.NewTicker(interval)
+                                       if wi.WaitInterval() > time.Second {
+                                               wi.SetWaitInterval(wi.WaitInterval() - time.Second)
                                        }
                                case '+': // increase interval by creating a new ticker
-                                       ticker.Stop()
-                                       interval += time.Second
-                                       ticker = time.NewTicker(interval)
-                               case 'h': // help
+                                       wi.SetWaitInterval(wi.WaitInterval() + time.Second)
+                               case 'h', '?': // help
                                        state.SetHelp(!state.Help())
                                case 'q': // quit
                                        finished = true
@@ -216,6 +225,5 @@ func main() {
                }
        }
        state.Cleanup()
-       ticker.Stop()
        lib.Logger.Println("Terminating " + lib.MyName())
 }