create model.Config interface containing needed config.Config fields

model/base.go

@@ -2,15 +2,13 @@ package model
 
 import (
 	"time"
-
-	"github.com/sjmudd/ps-top/config"
 )
 
 // BaseCollector encapsulates the common collection state and logic for all models.
 // T is the row type (e.g., tableio.Row, memoryusage.Row)
 // R is a slice of T (e.g., []Row, or a named type like Rows)
 type BaseCollector[T any, R ~[]T] struct {
-	config *config.Config
+	config Config
 	db     QueryExecutor
 
 	FirstCollected time.Time
@@ -23,7 +21,7 @@ type BaseCollector[T any, R ~[]T] struct {
 }
 
 // NewBaseCollector creates a new BaseCollector with the given config, database, and process function.
-func NewBaseCollector[T any, R ~[]T](cfg *config.Config, db QueryExecutor, process ProcessFunc[T, R]) *BaseCollector[T, R] {
+func NewBaseCollector[T any, R ~[]T](cfg Config, db QueryExecutor, process ProcessFunc[T, R]) *BaseCollector[T, R] {
 	return &BaseCollector[T, R]{
 		config:  cfg,
 		db:      db,
@@ -86,7 +84,7 @@ func (bc *BaseCollector[T, R]) ResetStatistics() {
 }
 
 // Config returns the collector's configuration
-func (bc *BaseCollector[T, R]) Config() *config.Config {
+func (bc *BaseCollector[T, R]) Config() Config {
 	return bc.config
 }
 

model/fileinfo/fileinfo.go

@@ -2,7 +2,6 @@
 package fileinfo
 
 import (
-	"github.com/sjmudd/ps-top/config"
 	"github.com/sjmudd/ps-top/model"
 )
 
@@ -14,7 +13,7 @@ type FileIoLatency struct {
 // NewFileSummaryByInstance creates a new structure and include various variable values:
 // - datadir, relay_log
 // There's no checking that these are actually provided!
-func NewFileSummaryByInstance(cfg *config.Config, db model.QueryExecutor) *FileIoLatency {
+func NewFileSummaryByInstance(cfg model.Config, db model.QueryExecutor) *FileIoLatency {
 	process := func(last, first Rows) (Rows, Row) {
 		results := make(Rows, len(last))
 		copy(results, last)

model/interfaces.go

@@ -0,0 +1,13 @@
+package model
+
+import (
+	"github.com/sjmudd/ps-top/global"
+	"github.com/sjmudd/ps-top/model/filter"
+)
+
+// Config defines the minimal configuration required by data models.
+type Config interface {
+	WantRelativeStats() bool
+	DatabaseFilter() *filter.DatabaseFilter
+	Variables() *global.Variables
+}

model/memoryusage/memoryusage.go

@@ -3,7 +3,6 @@
 package memoryusage
 
 import (
-	"github.com/sjmudd/ps-top/config"
 	"github.com/sjmudd/ps-top/model"
 )
 
@@ -13,7 +12,7 @@ type MemoryUsage struct {
 }
 
 // NewMemoryUsage returns a pointer to a MemoryUsage struct
-func NewMemoryUsage(cfg *config.Config, db model.QueryExecutor) *MemoryUsage {
+func NewMemoryUsage(cfg model.Config, db model.QueryExecutor) *MemoryUsage {
 	process := func(last, _ []Row) ([]Row, Row) {
 		results := make([]Row, len(last))
 		copy(results, last)

model/mutexlatency/mutexlatency.go

@@ -3,7 +3,6 @@
 package mutexlatency
 
 import (
-	"github.com/sjmudd/ps-top/config"
 	"github.com/sjmudd/ps-top/model"
 	"github.com/sjmudd/ps-top/model/common"
 )
@@ -14,7 +13,7 @@ type MutexLatency struct {
 }
 
 // NewMutexLatency creates a new MutexLatency instance.
-func NewMutexLatency(cfg *config.Config, db model.QueryExecutor) *MutexLatency {
+func NewMutexLatency(cfg model.Config, db model.QueryExecutor) *MutexLatency {
 	process := func(last, first Rows) (Rows, Row) {
 		results := make(Rows, len(last))
 		copy(results, last)

model/stageslatency/stageslatency.go

@@ -2,7 +2,6 @@
 package stageslatency
 
 import (
-	"github.com/sjmudd/ps-top/config"
 	"github.com/sjmudd/ps-top/model"
 	"github.com/sjmudd/ps-top/model/common"
 )
@@ -13,7 +12,7 @@ type StagesLatency struct {
 }
 
 // NewStagesLatency creates a new StagesLatency instance.
-func NewStagesLatency(cfg *config.Config, db model.QueryExecutor) *StagesLatency {
+func NewStagesLatency(cfg model.Config, db model.QueryExecutor) *StagesLatency {
 	process := func(last, first Rows) (Rows, Row) {
 		results := make(Rows, len(last))
 		copy(results, last)

model/tableio/tableio.go

@@ -2,7 +2,6 @@
 package tableio
 
 import (
-	"github.com/sjmudd/ps-top/config"
 	"github.com/sjmudd/ps-top/model"
 	"github.com/sjmudd/ps-top/model/common"
 )
@@ -14,7 +13,7 @@ type TableIo struct {
 }
 
 // NewTableIo creates a new TableIo instance.
-func NewTableIo(cfg *config.Config, db model.QueryExecutor) *TableIo {
+func NewTableIo(cfg model.Config, db model.QueryExecutor) *TableIo {
 	process := func(last, first Rows) (Rows, Row) {
 		results := make(Rows, len(last))
 		copy(results, last)

model/tablelocks/tablelocks.go

@@ -2,7 +2,6 @@
 package tablelocks
 
 import (
-	"github.com/sjmudd/ps-top/config"
 	"github.com/sjmudd/ps-top/model"
 )
 
@@ -12,7 +11,7 @@ type TableLocks struct {
 }
 
 // NewTableLocks creates a new TableLocks instance.
-func NewTableLocks(cfg *config.Config, db model.QueryExecutor) *TableLocks {
+func NewTableLocks(cfg model.Config, db model.QueryExecutor) *TableLocks {
 	process := func(last, first Rows) (Rows, Row) {
 		results := make(Rows, len(last))
 		copy(results, last)

model/userlatency/userlatency.go

@@ -5,7 +5,6 @@ import (
 	"regexp"
 	"strings"
 
-	"github.com/sjmudd/ps-top/config"
 	"github.com/sjmudd/ps-top/model"
 	"github.com/sjmudd/ps-top/model/processlist"
 )
@@ -18,7 +17,7 @@ type UserLatency struct {
 }
 
 // NewUserLatency creates a new UserLatency instance.
-func NewUserLatency(cfg *config.Config, db model.QueryExecutor) *UserLatency {
+func NewUserLatency(cfg model.Config, db model.QueryExecutor) *UserLatency {
 	process := func(last, _ []Row) ([]Row, Row) {
 		// last already contains aggregated rows; just copy and compute totals
 		results := make([]Row, len(last))

presenter/fileinfolatency/fileinfolatency.go

@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"slices"
 
-	"github.com/sjmudd/ps-top/config"
+	"github.com/sjmudd/ps-top/model"
 	"github.com/sjmudd/ps-top/model/fileinfo"
 	"github.com/sjmudd/ps-top/presenter"
 	"github.com/sjmudd/ps-top/utils"
@@ -59,7 +59,7 @@ type Presenter struct {
 }
 
 // NewFileSummaryByInstance creates a presenter for FileIoLatency.
-func NewFileSummaryByInstance(cfg *config.Config, db *sql.DB) *Presenter {
+func NewFileSummaryByInstance(cfg model.Config, db *sql.DB) *Presenter {
 	fiol := fileinfo.NewFileSummaryByInstance(cfg, db)
 	bp := presenter.NewBasePresenter(
 		fiol,

presenter/memoryusage/memoryusage.go

@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"slices"
 
-	"github.com/sjmudd/ps-top/config"
+	"github.com/sjmudd/ps-top/model"
 	"github.com/sjmudd/ps-top/model/memoryusage"
 	"github.com/sjmudd/ps-top/presenter"
 	"github.com/sjmudd/ps-top/utils"
@@ -19,7 +19,7 @@ type Presenter struct {
 }
 
 // NewMemoryUsage creates a presenter for MemoryUsage.
-func NewMemoryUsage(cfg *config.Config, db *sql.DB) *Presenter {
+func NewMemoryUsage(cfg model.Config, db *sql.DB) *Presenter {
 	mu := memoryusage.NewMemoryUsage(cfg, db)
 
 	// Sort by CurrentBytesUsed descending, then Name ascending.

presenter/mutexlatency/mutexlatency.go

@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"slices"
 
-	"github.com/sjmudd/ps-top/config"
+	"github.com/sjmudd/ps-top/model"
 	"github.com/sjmudd/ps-top/model/mutexlatency"
 	"github.com/sjmudd/ps-top/presenter"
 	"github.com/sjmudd/ps-top/utils"
@@ -43,7 +43,7 @@ type Presenter struct {
 }
 
 // NewMutexLatency creates a presenter for mutexlatency.
-func NewMutexLatency(cfg *config.Config, db *sql.DB) *Presenter {
+func NewMutexLatency(cfg model.Config, db *sql.DB) *Presenter {
 	ml := mutexlatency.NewMutexLatency(cfg, db)
 	bp := presenter.NewBasePresenter(
 		ml,

presenter/stageslatency/stageslatency.go

@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"slices"
 
-	"github.com/sjmudd/ps-top/config"
+	"github.com/sjmudd/ps-top/model"
 	"github.com/sjmudd/ps-top/model/stageslatency"
 	"github.com/sjmudd/ps-top/presenter"
 	"github.com/sjmudd/ps-top/utils"
@@ -43,7 +43,7 @@ type Presenter struct {
 }
 
 // NewStagesLatency creates a presenter for stageslatency.
-func NewStagesLatency(cfg *config.Config, db *sql.DB) *Presenter {
+func NewStagesLatency(cfg model.Config, db *sql.DB) *Presenter {
 	sl := stageslatency.NewStagesLatency(cfg, db)
 	bp := presenter.NewBasePresenter(
 		sl,

presenter/tablelocklatency/tablelocklatency.go

@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"slices"
 
-	"github.com/sjmudd/ps-top/config"
+	"github.com/sjmudd/ps-top/model"
 	"github.com/sjmudd/ps-top/model/tablelocks"
 	"github.com/sjmudd/ps-top/presenter"
 	"github.com/sjmudd/ps-top/utils"
@@ -73,7 +73,7 @@ type Presenter struct {
 }
 
 // NewTableLockLatency creates a presenter for TableLockLatency.
-func NewTableLockLatency(cfg *config.Config, db *sql.DB) *Presenter {
+func NewTableLockLatency(cfg model.Config, db *sql.DB) *Presenter {
 	tl := tablelocks.NewTableLocks(cfg, db)
 	bp := presenter.NewBasePresenter(
 		tl,

presenter/userlatency/userlatency.go

@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"slices"
 
-	"github.com/sjmudd/ps-top/config"
+	"github.com/sjmudd/ps-top/model"
 	"github.com/sjmudd/ps-top/model/userlatency"
 	"github.com/sjmudd/ps-top/presenter"
 	"github.com/sjmudd/ps-top/utils"
@@ -106,7 +106,7 @@ type Presenter struct {
 }
 
 // NewUserLatency creates a presenter for UserLatency.
-func NewUserLatency(cfg *config.Config, db *sql.DB) *Presenter {
+func NewUserLatency(cfg model.Config, db *sql.DB) *Presenter {
 	ul := userlatency.NewUserLatency(cfg, db)
 	bp := presenter.NewBasePresenter(
 		ul,

pstable/pstable.go

@@ -6,8 +6,8 @@ import (
 	"database/sql"
 	"time"
 
-	"github.com/sjmudd/ps-top/config"
 	"github.com/sjmudd/ps-top/log"
+	"github.com/sjmudd/ps-top/model"
 	"github.com/sjmudd/ps-top/model/tableio"
 	"github.com/sjmudd/ps-top/presenter/fileinfolatency"
 	"github.com/sjmudd/ps-top/presenter/memoryusage"
@@ -47,7 +47,7 @@ type Tabler interface {
 }
 
 // NewTabler returns a Tabler of the requested tablerType and parameters
-func NewTabler(tablerType TablerType, cfg *config.Config, db *sql.DB) Tabler {
+func NewTabler(tablerType TablerType, cfg model.Config, db *sql.DB) Tabler {
 	var t Tabler
 
 	log.Printf("NewTabler(%v,%v,%v)\n", tablerType, cfg, db)