Merge pull request #3 from Ivlyth/add-kernel-3.x-support

Add kernel 3.x support

Author: Ivlyth

README.md

@@ -2,18 +2,21 @@
 it provides a clean terminal UI based on [tview](https://github.com/rivo/tview) (as a CLI tool), and provides a 
 simple API to export data for prometheus (as a long-running task).
 
-![screenshot](./screenshots/pb-v0.1.0.gif)
+
+### Screenshots
+![screenshot-top](./screenshots/pb-v0.3.1.png)
+![screenshot-options](./screenshots/pb-v0.3.1-optons.png)
 
 ### Usage
 in `top` mode, you can open/close settings by press `F4`, exit by press `ESC` or CTRL+C, and pause/resume the update by 
 press `F5`, and you can click on the table header line (currently only support `In`, `Out`, `Total`) to change the sort 
 column and order 
 
-also you can use `tab` to change focus between process's table and connection's table, and you can use up/down keys to  
+also you can use `tab` to change focus between process's table、connection's table and filter input box, and you can use up/down keys to  
 scroll in the table, press the Enter key to choose current process or connection
 
 ### Requirements
-linux kernel version >= 4.18 
+linux kernel version >= 3.10
 
 ### Installation
 please download through GitHub's release page, or you can build your own by just run `make` under the root 
@@ -30,7 +33,7 @@ directory of the project
 ##### filter both (you should check the both)
 > Note: filter processes and connections at the same time it's only meaningful that you filter processes based on connection
 and you want see connections only satisfies the filter for process. so we just use `or` to concat two (or more) filter,
-but we known that one is for process and another is for connection. 
+but we know that one is for process and another is for connection. 
 
 - GetConnections.ConnectionInfo.LocalPort = 2181 or ConnectionInfo.LocalPort = 2181
 

commands/main.go

@@ -37,8 +37,8 @@ var (
 				fmt.Printf("error when get kernel version info: %s\n", err)
 				os.Exit(1)
 			}
-			if kv < kernel.VersionCode(4, 18, 0) {
-				fmt.Printf("Linux Kernel version %v is not supported. Need > 4.18 .\n", kv)
+			if kv < kernel.VersionCode(3, 10, 0) {
+				fmt.Printf("Linux Kernel version %v is not supported. Need >= 3.10 .\n", kv)
 				os.Exit(1)
 			}
 

screenshots/pb-v0.3.1-optons.png

@@ -16,11 +16,11 @@ var pages *tview.Pages
 
 func StartTop() error {
 
-	pTable = initProcessTable()
+	initProcessTable()
 
-	cTable = initConnectionTable()
+	initConnectionTable()
 
-	graphView = initGraphView()
+	initGraphView()
 
 	connectionPanel = tview.NewFlex().
 		SetDirection(tview.FlexRow).
@@ -33,7 +33,7 @@ func StartTop() error {
 
 	infoView = tview.NewTextView().SetDynamicColors(true).SetWrap(false)
 
-	filterPanel := initFilterPanel()
+	initFilterPanel()
 
 	mainPanel := tview.NewFlex().
 		SetDirection(tview.FlexRow).
@@ -56,6 +56,8 @@ func StartTop() error {
 		if event.Key() == tcell.KeyTAB {
 			if pTable.HasFocus() {
 				app.SetFocus(connectionPanel).SetFocus(cTable)
+			} else if cTable.HasFocus() {
+				app.SetFocus(filterPanel).SetFocus(filterInput)
 			} else {
 				app.SetFocus(processPanel).SetFocus(pTable)
 			}

screenshots/pb-v0.3.1.png

@@ -39,13 +39,13 @@ func initConnectionTableHeader() {
 	cTable.SetFixed(1, 1)
 }
 
-func initConnectionTable() *tview.Table {
-	table := tview.NewTable().
+func initConnectionTable() {
+	cTable = tview.NewTable().
 		SetBorders(false).SetSelectable(true, false).SetSeparator(tview.Borders.Vertical)
-	table.SetBorder(true).SetTitle(" Connection's Bandwidth ")
-	table.SetEvaluateAllRows(true)
+	cTable.SetBorder(true).SetTitle(" Connection's Bandwidth ")
+	cTable.SetEvaluateAllRows(true)
 
-	table.SetSelectionChangedFunc(func(row, column int) {
+	cTable.SetSelectionChangedFunc(func(row, column int) {
 		lastUserScrollCTableAt = time.Now()
 
 		if row == 0 {
@@ -78,8 +78,8 @@ func initConnectionTable() *tview.Table {
 	})
 
 	//  set table header
-	table.SetSelectedFunc(func(row int, column int) {
-		v, ok := table.GetCell(row, 0).GetReference().(*engine.Connection)
+	cTable.SetSelectedFunc(func(row int, column int) {
+		v, ok := cTable.GetCell(row, 0).GetReference().(*engine.Connection)
 		if ok {
 			logger.Debugf("select connection inside cTable at row:%d, col:%d, connection fd is %d\n", row, column, v.FD)
 			selectedConnection = v
@@ -91,8 +91,6 @@ func initConnectionTable() *tview.Table {
 		refreshConnectionTable()
 		refreshGraphPanel()
 	})
-
-	return table
 }
 
 func refreshConnectionTable() {

top/app.go

@@ -12,12 +12,15 @@ var filterForProcess = true
 var filterForConnections = false
 var filterErr error
 
-func initFilterPanel() *tview.Flex {
-	input := tview.NewInputField()
+var filterPanel *tview.Flex
+var filterInput *tview.InputField
+
+func initFilterPanel() {
+	filterInput = tview.NewInputField()
 	filterExpr, filterErr = uni_filter.Parse(filterStr)
-	input.SetLabel("Filter: ").SetText(filterStr /*default filter*/).SetInputCapture(func(event *tcell.EventKey) *tcell.EventKey {
+	filterInput.SetLabel("Filter: ").SetText(filterStr /*default filter*/).SetInputCapture(func(event *tcell.EventKey) *tcell.EventKey {
 		if event.Key() == tcell.KeyEnter {
-			filterStr = input.GetText()
+			filterStr = filterInput.GetText()
 			logger.Debugf("enter key pressed, filter text is: %s\n", filterStr)
 			filterExpr, filterErr = uni_filter.Parse(filterStr)
 			if filterErr != nil {
@@ -37,13 +40,11 @@ func initFilterPanel() *tview.Flex {
 	//applyButton := tview.NewButton("<Apply>")
 	//recentButton := tview.NewButton("<Recent>")
 
-	optionsFlex := tview.NewFlex().SetDirection(tview.FlexColumn).
-		AddItem(input, 0, 40, false).
+	filterPanel = tview.NewFlex().SetDirection(tview.FlexColumn).
+		AddItem(filterInput, 0, 40, false).
 		AddItem(nil, 0, 1, false).
 		AddItem(filterProcess, 0, 5, false).
 		AddItem(nil, 0, 1, false).
 		AddItem(filterConnections, 0, 5, false)
-	optionsFlex.SetBorder(true)
-
-	return optionsFlex
+	filterPanel.SetBorder(true)
 }

top/connection_table.go

@@ -11,12 +11,10 @@ import (
 var graphView *tview.TextView
 var histories []engine.RWSnapshot
 
-func initGraphView() *tview.TextView {
-	v := tview.NewTextView().SetDynamicColors(true).SetWrap(false)
-	v.SetBorder(true).SetTitle(" bandwidth graph ")
-	_, _ = v.Write([]byte("waiting for select process or connection"))
-
-	return v
+func initGraphView() {
+	graphView = tview.NewTextView().SetDynamicColors(true).SetWrap(false)
+	graphView.SetBorder(true).SetTitle(" bandwidth graph ")
+	_, _ = graphView.Write([]byte("waiting for select process or connection"))
 }
 
 func refreshGraphPanel() {

top/filter_panel.go

@@ -40,15 +40,15 @@ func initProcessTableHeader() {
 	pTable.SetFixed(1, 1)
 }
 
-func initProcessTable() *tview.Table {
-	table := tview.NewTable().
+func initProcessTable() {
+	pTable = tview.NewTable().
 		SetBorders(false).SetSelectable(true, false).SetSeparator(tview.Borders.Vertical)
-	table.SetBorder(true).SetTitle(" Process's Bandwidth ")
-	table.SetEvaluateAllRows(true)
+	pTable.SetBorder(true).SetTitle(" Process's Bandwidth ")
+	pTable.SetEvaluateAllRows(true)
 
-	table.SetSelectionChangedFunc(func(row, column int) {
+	pTable.SetSelectionChangedFunc(func(row, column int) {
 		lastUserScrollPTableAt = time.Now()
-		v, ok := table.GetCell(row, 0).GetReference().(*engine.Process)
+		v, ok := pTable.GetCell(row, 0).GetReference().(*engine.Process)
 		if ok {
 			infoView.Clear()
 			_, _ = infoView.Write([]byte(v.Cmdline))
@@ -86,9 +86,9 @@ func initProcessTable() *tview.Table {
 		}
 	})
 
-	table.SetSelectedFunc(func(row int, column int) {
+	pTable.SetSelectedFunc(func(row int, column int) {
 		logger.Debugf("ptable selected row:%d, column:%d\n", row, column)
-		v, ok := table.GetCell(row, 0).GetReference().(*engine.Process)
+		v, ok := pTable.GetCell(row, 0).GetReference().(*engine.Process)
 		infoView.Clear()
 		if ok {
 			selectedProcess = v
@@ -107,7 +107,6 @@ func initProcessTable() *tview.Table {
 		refreshConnectionTable()
 		refreshGraphPanel()
 	})
-	return table
 }
 
 func refreshProcessTable() {