Make result channels query contextual

spacez320 · Jan 2, 2024 · 4a54469 · 4a54469
1 parent dc24c9d
commit 4a54469
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 13 deletions.
diff --git a/internal/lib/results.go b/internal/lib/results.go
@@ -238,6 +238,11 @@ func AddResult(query, result string) {
 	store.Put(query, result, TokenizeResult(result)...)
 }
 
+// Retrieves a next result.
+func GetResult(query string) storage.Result {
+	return <-storage.PutEvents[query]
+}
+
 // Creates a result with filtered values.
 func FilterResult(result storage.Result, labels, filters []string) storage.Result {
 	var (
@@ -318,7 +323,7 @@ func Results(resultMode ResultMode, query string, labels, filters []string, inpu
 	switch resultMode {
 	case RESULT_MODE_RAW:
 		mode = DISPLAY_RAW
-		RawResults()
+		RawResults(query)
 	case RESULT_MODE_STREAM:
 		mode = DISPLAY_TVIEW
 		StreamResults(query)
@@ -341,10 +346,10 @@ func Results(resultMode ResultMode, query string, labels, filters []string, inpu
 }
 
 // Presents raw output.
-func RawResults() {
+func RawResults(query string) {
 	go func() {
 		for {
-			fmt.Println(<-storage.PutEvents)
+			fmt.Println(GetResult(query))
 		}
 	}()
 }
@@ -398,7 +403,7 @@ func StreamResults(query string) {
 
 			// Print results.
 			for {
-				fmt.Fprintln(resultsView, (<-storage.PutEvents).Value)
+				fmt.Fprintln(resultsView, (GetResult(query)).Value)
 			}
 		},
 	)
@@ -475,7 +480,7 @@ func TableResults(query string, filters []string) {
 			for {
 				/* slog.Debug(fmt.Sprintf("Receiving value %v", <-storage.PutEvents)) */
 				// Retrieve specific next values.
-				values := FilterSlice((<-storage.PutEvents).Values, valueIndexes)
+				values := FilterSlice((GetResult(query)).Values, valueIndexes)
 				// Row to contain the result.
 				row := resultsView.InsertRow(i)
 
@@ -539,7 +544,7 @@ func GraphResults(query string, filters []string) {
 	display(
 		func() {
 			for {
-				value := (<-storage.PutEvents).Values[valueIndex]
+				value := (GetResult(query)).Values[valueIndex]
 
 				switch value.(type) {
 				case int64:

diff --git a/pkg/storage/storage.go b/pkg/storage/storage.go
@@ -53,8 +53,12 @@ type Storage map[string]*Results
 //
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-// Channel for broadcasting Put calls.
-var PutEvents = make(chan Result, 128)
+const (
+	PUT_EVENT_CHANNEL_SIZE = 128 // Size of Put channels.
+)
+
+// Channels for broadcasting Put calls.
+var PutEvents = make(map[string](chan Result))
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 //
@@ -98,17 +102,16 @@ func (r *Results) getValueIndex(filter string) int {
 }
 
 // Put a new compound result.
-func (r *Results) put(value string, values ...interface{}) []interface{} {
+func (r *Results) put(value string, values ...interface{}) Result {
 	next := Result{
 		Time:   time.Now(),
 		Value:  value,
 		Values: values,
 	}
 
 	(*r).Results = append((*r).Results, next)
-	PutEvents <- next
 
-	return values
+	return next
 }
 
 // Show all currently stored results.
@@ -155,13 +158,16 @@ func (s *Storage) NewResults(query string) {
 	if _, ok := (*s)[query]; !ok {
 		// This is a new query, initialize an empty results.
 		(*s)[query] = &Results{}
+		PutEvents[query] = make(chan Result, PUT_EVENT_CHANNEL_SIZE)
 	}
 }
 
 // Put a new compound result.
-func (s *Storage) Put(query string, value string, values ...interface{}) []interface{} {
+func (s *Storage) Put(query string, value string, values ...interface{}) Result {
 	s.NewResults(query)
-	return (*s)[query].put(value, values...)
+	result := (*s)[query].put(value, values...)
+	PutEvents[query] <- result
+	return result
 }
 
 // Assigns labels to a results series.