Simplifying timelines flow-id

Author: jpmonettas

src-inst/flow_storm/runtime/debuggers_api.cljc

@@ -824,7 +824,7 @@
                       (-> entry
                           index-api/as-immutable
                           (ensure-indexes i)
-                          (assoc :flow-id (index-protos/flow-id tl i)
+                          (assoc :flow-id (index-protos/flow-id tl)
                                  :thread-id (index-protos/thread-id tl i))
                           reference-timeline-entry!)                    
                       (recur (next-fn i))))))))

src-inst/flow_storm/runtime/indexes/api.cljc

@@ -723,7 +723,7 @@
                                                              (if backward?
                                                                (dec (count timeline))
                                                                0))
-                                                flow-id (index-protos/flow-id timeline curr-idx)
+                                                flow-id (index-protos/flow-id timeline)
                                                 thread-id (index-protos/thread-id timeline curr-idx)
                                                 to-idx (if backward?
                                                          (max (- curr-idx batch-size) 0)
@@ -1129,9 +1129,16 @@
   [x]
   (fn-return-trace/fn-end-trace? x))
 
+(defn timeline-flow-id
+  "Given a timeline returns its flow-id"
+  [timeline]
+  (index-protos/flow-id timeline))
+
 (defn timeline-thread-id
   "Given a timeline and a idx, returns the thread-id associated to the entry.
   On single thread timelines all index are going to return the same thread-id, which
   is not the case for total order timelines."
   [timeline idx]
   (index-protos/thread-id timeline idx))
+
+

src-inst/flow_storm/runtime/indexes/protocols.cljc

@@ -15,7 +15,7 @@
   (reset-build-stack [_]))
 
 (defprotocol TimelineP
-  (flow-id [_ idx])
+  (flow-id [_])
   (thread-id [_ idx]))
 
 (defprotocol TimelineEntryP

src-inst/flow_storm/runtime/indexes/thread_registry.cljc

@@ -51,7 +51,7 @@
 
   (register-thread-indexes [this flow-id thread-id thread-name form-id indexes]
     (when-not (index-protos/flow-exists? this flow-id)
-      (swap! total-order-timelines assoc flow-id (total-order-timeline/make-total-order-timeline)))
+      (swap! total-order-timelines assoc flow-id (total-order-timeline/make-total-order-timeline flow-id)))
 
     (swap! registry update flow-id
            (fn [threads]               

src-inst/flow_storm/runtime/indexes/timeline_index.cljc

@@ -46,7 +46,7 @@
 
 (defn- print-it [timeline]
   (utils/format "#flow-storm/timeline [flow-id: %d thread-id: %d count: %d]"
-                (index-protos/flow-id timeline 0)
+                (index-protos/flow-id timeline)
                 (index-protos/thread-id timeline 0)
                 (count timeline)))
 
@@ -78,7 +78,7 @@
                                 ]
 
   index-protos/TimelineP
-  (flow-id [_ _] flow-id)
+  (flow-id [_] flow-id)
   (thread-id [_ _] tid)
 
   index-protos/ThreadTimelineRecorderP                                       

src-inst/flow_storm/runtime/indexes/total_order_timeline.cljc

@@ -42,15 +42,12 @@
    (defmethod print-method TotalOrderTimelineEntry [tote ^java.io.Writer w]
      (.write w ^String (print-tote tote))))
 
-(deftype TotalOrderTimeline [mt-timeline]
+(deftype TotalOrderTimeline [flow-id mt-timeline]
 
   index-protos/TimelineP
 
-  (flow-id [this idx]
-    (locking this
-      (let [tote (ml-get mt-timeline idx)
-            th-tl (index-protos/tote-thread-timeline tote)]
-        (index-protos/flow-id th-tl 0))))
+  (flow-id [_]
+    flow-id)
 
   (thread-id [this idx]
     (locking this
@@ -121,8 +118,8 @@
        (-nth [_ n] (ml-get mt-timeline n))
        (-nth [_ n not-found] (or (ml-get mt-timeline n) not-found))]))
 
-(defn make-total-order-timeline []
-  (TotalOrderTimeline. (make-mutable-list)))
+(defn make-total-order-timeline [flow-id]
+  (TotalOrderTimeline. flow-id (make-mutable-list)))
 
 (defn make-detailed-timeline-mapper [forms-registry]
   (let [threads-stacks (atom {})]