Simplify the getStackLineInfo code by passing sourceIndex instead of filename

Now that we changed the place where we send information to this place,
we can simplify it.

Author: canova

src/profile-logic/line-timings.ts

@@ -8,11 +8,10 @@ import type {
   StackTable,
   SamplesLikeTable,
   IndexIntoCallNodeTable,
-  IndexIntoStringTable,
   StackLineInfo,
   LineTimings,
   LineNumber,
-  SourceTable,
+  IndexIntoSourceTable,
 } from 'firefox-profiler/types';
 
 import { getMatchingAncestorStackForInvertedCallNode } from './profile-data';
@@ -59,8 +58,7 @@ export function getStackLineInfo(
   stackTable: StackTable,
   frameTable: FrameTable,
   funcTable: FuncTable,
-  fileNameStringIndex: IndexIntoStringTable,
-  sources: SourceTable
+  sourceViewSourceIndex: IndexIntoSourceTable
 ): StackLineInfo {
   // "self line" == "the line which a stack's self time is contributed to"
   const selfLineForAllStacks = [];
@@ -76,15 +74,13 @@ export function getStackLineInfo(
     const frame = stackTable.frame[stackIndex];
     const prefixStack = stackTable.prefix[stackIndex];
     const func = frameTable.func[frame];
-    const sourceIndex = funcTable.source[func];
-    const fileNameStringIndexOfThisStack =
-      sourceIndex !== null ? (sources.filename[sourceIndex] ?? null) : null;
+    const sourceIndexOfThisStack = funcTable.source[func];
 
     let selfLine: LineNumber | null = null;
     let totalLines: Set<LineNumber> | null =
       prefixStack !== null ? totalLinesForAllStacks[prefixStack] : null;
 
-    if (fileNameStringIndexOfThisStack === fileNameStringIndex) {
+    if (sourceIndexOfThisStack === sourceViewSourceIndex) {
       selfLine = frameTable.line[frame];
       if (selfLine !== null) {
         // Add this stack's line to this stack's totalLines. The rest of this stack's

src/selectors/per-thread/stack-sample.ts

@@ -140,23 +140,15 @@ export function getStackAndSampleSelectorsPerThread(
   const getSourceViewStackLineInfo: Selector<StackLineInfo | null> =
     createSelector(
       threadSelectors.getFilteredThread,
-      ProfileSelectors.getSourceViewFile,
-      ProfileSelectors.getSourceTable,
+      UrlState.getSourceViewSourceIndex,
       (
-        { stackTable, frameTable, funcTable, stringTable }: Thread,
-        sourceViewFile,
-        sources
+        { stackTable, frameTable, funcTable }: Thread,
+        sourceIndex
       ): StackLineInfo | null => {
-        if (sourceViewFile === null) {
+        if (sourceIndex === null) {
           return null;
         }
-        return getStackLineInfo(
-          stackTable,
-          frameTable,
-          funcTable,
-          stringTable.indexForString(sourceViewFile),
-          sources
-        );
+        return getStackLineInfo(stackTable, frameTable, funcTable, sourceIndex);
       }
     );
 

src/test/store/transforms.test.ts

@@ -26,7 +26,6 @@ import {
   changeCallTreeSummaryStrategy,
 } from '../../actions/profile-view';
 import { selectedThreadSelectors } from '../../selectors/per-thread';
-import * as ProfileSelectors from '../../selectors/profile';
 
 describe('"focus-subtree" transform', function () {
   describe('on a call tree', function () {
@@ -1224,13 +1223,13 @@ describe('"collapse-direct-recursion" transform', function () {
       const { stackTable, frameTable, funcTable, samples, stringTable } =
         filteredThread;
       const fileStringIndex = stringTable.indexForString('b');
-      const sources = ProfileSelectors.getSourceTable(getState());
+      const fileSourceIndex =
+        profile.shared.sources.filename.indexOf(fileStringIndex);
       const stackLineInfo = getStackLineInfo(
         stackTable,
         frameTable,
         funcTable,
-        fileStringIndex,
-        sources
+        fileSourceIndex
       );
       const lineTimings = getLineTimings(stackLineInfo, samples);
 
@@ -1408,13 +1407,13 @@ describe('"collapse-recursion" transform', function () {
       const { stackTable, frameTable, funcTable, samples, stringTable } =
         filteredThread;
       const fileStringIndex = stringTable.indexForString('b');
-      const sources = ProfileSelectors.getSourceTable(getState());
+      const fileSourceIndex =
+        profile.shared.sources.filename.indexOf(fileStringIndex);
       const stackLineInfo = getStackLineInfo(
         stackTable,
         frameTable,
         funcTable,
-        fileStringIndex,
-        sources
+        fileSourceIndex
       );
       const lineTimings = getLineTimings(stackLineInfo, samples);
 
@@ -1521,13 +1520,13 @@ describe('"collapse-recursion" transform', function () {
       const { stackTable, frameTable, funcTable, samples, stringTable } =
         filteredThread;
       const fileStringIndex = stringTable.indexForString('b');
-      const sources = ProfileSelectors.getSourceTable(getState());
+      const fileSourceIndex =
+        profile.shared.sources.filename.indexOf(fileStringIndex);
       const stackLineInfo = getStackLineInfo(
         stackTable,
         frameTable,
         funcTable,
-        fileStringIndex,
-        sources
+        fileSourceIndex
       );
       const lineTimings = getLineTimings(stackLineInfo, samples);
 
@@ -1657,13 +1656,13 @@ describe('"collapse-recursion" transform', function () {
       const { stackTable, frameTable, funcTable, samples, stringTable } =
         filteredThread;
       const fileStringIndex = stringTable.indexForString('b');
-      const sources = ProfileSelectors.getSourceTable(getState());
+      const fileSourceIndex =
+        profile.shared.sources.filename.indexOf(fileStringIndex);
       const stackLineInfo = getStackLineInfo(
         stackTable,
         frameTable,
         funcTable,
-        fileStringIndex,
-        sources
+        fileSourceIndex
       );
       const lineTimings = getLineTimings(stackLineInfo, samples);
 

src/test/unit/line-timings.test.ts

@@ -17,7 +17,7 @@ import type {
   CallNodePath,
   Thread,
   IndexIntoCategoryList,
-  SourceTable,
+  Profile,
 } from 'firefox-profiler/types';
 
 describe('getStackLineInfo', function () {
@@ -31,13 +31,14 @@ describe('getStackLineInfo', function () {
     const [thread] = derivedThreads;
     const { stackTable, frameTable, funcTable, stringTable } = thread;
 
-    const fileOne = stringTable.indexForString('one.js');
+    const fileOneStringIndex = stringTable.indexForString('one.js');
+    const fileOneSourceIndex =
+      profile.shared.sources.filename.indexOf(fileOneStringIndex);
     const stackLineInfoOne = getStackLineInfo(
       stackTable,
       frameTable,
       funcTable,
-      fileOne,
-      profile.shared.sources
+      fileOneSourceIndex
     );
 
     // Expect the returned arrays to have the same length as the stackTable.
@@ -48,15 +49,16 @@ describe('getStackLineInfo', function () {
 });
 
 describe('getLineTimings for getStackLineInfo', function () {
-  function getTimings(thread: Thread, file: string, sources: SourceTable) {
+  function getTimings(profile: Profile, thread: Thread, file: string) {
     const { stackTable, frameTable, funcTable, samples, stringTable } = thread;
     const fileStringIndex = stringTable.indexForString(file);
+    const fileSourceIndex =
+      profile.shared.sources.filename.indexOf(fileStringIndex);
     const stackLineInfo = getStackLineInfo(
       stackTable,
       frameTable,
       funcTable,
-      fileStringIndex,
-      sources
+      fileSourceIndex
     );
     return getLineTimings(stackLineInfo, samples);
   }
@@ -69,7 +71,7 @@ describe('getLineTimings for getStackLineInfo', function () {
       B[file:file.js][line:30]
     `);
     const [thread] = derivedThreads;
-    const lineTimings = getTimings(thread, 'file.js', profile.shared.sources);
+    const lineTimings = getTimings(profile, thread, 'file.js');
     expect(lineTimings.totalLineHits.get(20)).toBe(1);
     expect(lineTimings.totalLineHits.get(30)).toBe(1);
     expect(lineTimings.totalLineHits.size).toBe(2); // no other hits
@@ -87,7 +89,7 @@ describe('getLineTimings for getStackLineInfo', function () {
     `);
     const [thread] = derivedThreads;
 
-    const lineTimingsOne = getTimings(thread, 'one.js', profile.shared.sources);
+    const lineTimingsOne = getTimings(profile, thread, 'one.js');
     expect(lineTimingsOne.totalLineHits.get(20)).toBe(2);
     expect(lineTimingsOne.totalLineHits.get(21)).toBe(1);
     // one.js line 30 was hit in every sample, twice in the first sample
@@ -101,7 +103,7 @@ describe('getLineTimings for getStackLineInfo', function () {
     expect(lineTimingsOne.selfLineHits.get(30)).toBe(1);
     expect(lineTimingsOne.selfLineHits.size).toBe(1); // no other hits
 
-    const lineTimingsTwo = getTimings(thread, 'two.js', profile.shared.sources);
+    const lineTimingsTwo = getTimings(profile, thread, 'two.js');
     expect(lineTimingsTwo.totalLineHits.get(10)).toBe(1);
     expect(lineTimingsTwo.totalLineHits.get(11)).toBe(1);
     expect(lineTimingsTwo.totalLineHits.get(40)).toBe(1);