fix

1 files changed, 49 insertions, 22 deletions

diff --git a/internal/flamegraph/worker.go b/internal/flamegraph/worker.go
index d10e0bf..6c2b9cd 100644
--- a/internal/flamegraph/worker.go
+++ b/internal/flamegraph/worker.go
@@ -10,42 +10,29 @@ import (
 
 type worker struct {
 	collapsed collapsed
-	id        iorData
+	iod       iorData
 	done      chan struct{}
 }
 
 func newWorker() worker {
 	return worker{
-		collapsed: make(collapsed), // TODO: Retire
-		id:        newIorData(),    // TODO: Implement fully
+		collapsed: make(collapsed), // COLLAPSED: Retire ocne newIorData implemented
+		iod:       newIorData(),
 	}
 }
 
-// Run until ch is closed or has no more events and ctx is done.
 func (w worker) run(ctx context.Context, wg *sync.WaitGroup, ch <-chan *event.Pair) {
 	defer wg.Done()
 
 	for {
 		select {
 		case ev := <-ch:
-			var filePath string
-			if ev.File == nil {
-				filePath = "N:file"
-			} else {
-				filePath = ev.File.Name()
-			}
-			pathMap, ok := w.collapsed[filePath]
-			if !ok {
-				pathMap = make(map[types.TraceId]counter)
-			}
-
-			traceId := ev.EnterEv.GetTraceId()
-			cnt := pathMap[traceId]
-			cnt.count++
-			cnt.duration += ev.Duration
-			pathMap[traceId] = cnt
-
-			w.collapsed[filePath] = pathMap
+			// var filePath string
+			// if ev.File == nil {
+			// 	filePath = "N:file"
+			// } else {
+			// 	filePath = ev.File.Name()
+			// }
 			ev.Recycle()
 
 		default:
@@ -58,3 +45,43 @@ func (w worker) run(ctx context.Context, wg *sync.WaitGroup, ch <-chan *event.Pa
 		}
 	}
 }
+
+// TODO: Retire collapsed
+func (w worker) runCollapsed(ctx context.Context, wg *sync.WaitGroup, ch <-chan *event.Pair) {
+	{
+		defer wg.Done()
+
+		for {
+			select {
+			case ev := <-ch:
+				var filePath string
+				if ev.File == nil {
+					filePath = "N:file"
+				} else {
+					filePath = ev.File.Name()
+				}
+				pathMap, ok := w.collapsed[filePath]
+				if !ok {
+					pathMap = make(map[types.TraceId]collapsedCounter)
+				}
+
+				traceId := ev.EnterEv.GetTraceId()
+				cnt := pathMap[traceId]
+				cnt.count++
+				cnt.duration += ev.Duration
+				pathMap[traceId] = cnt
+
+				w.collapsed[filePath] = pathMap
+				ev.Recycle()
+
+			default:
+				select {
+				case <-ctx.Done():
+					return
+				default:
+					time.Sleep(time.Millisecond * 10)
+				}
+			}
+		}
+	}
+}