Merge pull request #11880 from quarto-dev/cleanup/remove-unused-perf-code

[chore] timing - remove unused code

Author: cscheid

src/command/render/filters.ts

@@ -104,8 +104,6 @@ const kMediabagDir = "mediabag-dir";
 
 const kResultsFile = "results-file";
 
-const kTimingFile = "timings-file";
-
 const kHasBootstrap = "has-bootstrap";
 
 const kActiveFilters = "active-filters";
@@ -132,7 +130,6 @@ export async function filterParamsJson(
   filterParams: Record<string, unknown>,
   resultsFile: string,
   dependenciesFile: string,
-  timingFile: string,
 ) {
   // extract include params (possibly mutating it's arguments)
   const includes = options.format.render[kMergeIncludes] !== false
@@ -185,7 +182,6 @@ export async function filterParamsJson(
     ...customFormatParams,
     ...typstFilterParams,
     [kResultsFile]: pandocMetadataPath(resultsFile),
-    [kTimingFile]: pandocMetadataPath(timingFile),
     [kQuartoFilters]: filterSpec,
     [kActiveFilters]: {
       normalization: metadataNormalizationFilterActive(options),

src/command/render/pandoc.ts

@@ -181,12 +181,7 @@ import {
   processFormatResources,
   writeFormatResources,
 } from "./pandoc-dependencies-resources.ts";
-import {
-  ExplicitTimingEntry,
-  getLuaTiming,
-  insertExplicitTimingEntries,
-  withTiming,
-} from "../../core/timing.ts";
+import { withTiming } from "../../core/timing.ts";
 
 import {
   requiresShortcodeUnescapePostprocessor,
@@ -884,7 +879,6 @@ export async function runPandoc(
     formatFilterParams,
     filterResultsFile,
     dependenciesFile,
-    timingResultsFile,
   );
 
   // remove selected args and defaults if we are handling some things on behalf of pandoc
@@ -1186,9 +1180,6 @@ export async function runPandoc(
     );
   }
 
-  // workaround for our wonky Lua timing routines
-  const luaEpoch = await getLuaTiming();
-
   setupPandocEnv();
 
   // run beforePandoc hooks
@@ -1231,24 +1222,6 @@ export async function runPandoc(
     }
   }
 
-  if (existsSync(timingResultsFile)) {
-    const timingResultsJSON = Deno.readTextFileSync(timingResultsFile);
-    if (
-      timingResultsJSON.length > 0 && Deno.env.get("QUARTO_PROFILER_OUTPUT")
-    ) {
-      // workaround for our wonky Lua timing routines
-      const luaNow = await getLuaTiming();
-      const entries = JSON.parse(timingResultsJSON) as ExplicitTimingEntry[];
-
-      insertExplicitTimingEntries(
-        luaEpoch,
-        luaNow,
-        entries,
-        "pandoc",
-      );
-    }
-  }
-
   if (result.success) {
     return {
       inputMetadata: pandocMetadata,

src/core/performance.ts

@@ -1,11 +1,8 @@
 /*
-* timing.ts
-*
-* Copyright (C) 2022 Posit Software, PBC
-*
-*/
-
-import { execProcess } from "./process.ts";
+ * timing.ts
+ *
+ * Copyright (C) 2022 Posit Software, PBC
+ */
 
 interface TimingNode {
   name: string;
@@ -128,19 +125,3 @@ export function insertExplicitTimingEntries(
   prevTime = theirEnd - theirStart + ourStart;
   pop(prevTime);
 }
-
-export async function getLuaTiming(): Promise<[number, number]> {
-  if (Deno.env.get("QUARTO_PROFILER_OUTPUT")) {
-    return [
-      Number(
-        (await execProcess({
-          cmd: ["python", "-c", "import time; print(time.time() * 1000)"],
-          stdout: "piped",
-        })).stdout!,
-      ),
-      performance.now(),
-    ];
-  } else {
-    return [0, 0];
-  }
-}

src/core/timing.ts

@@ -6,11 +6,6 @@ local function resultsFile()
   return pandoc.utils.stringify(param("results-file"))
 end
 
-local function timingsFile()
-  return pandoc.utils.stringify(param("timings-file"))
-end
-
-
 -- write results
 function write_results()
   return {
@@ -23,19 +18,6 @@ function write_results()
       else
         warn('Error writing LUA results file')
       end
-
-      -- FIXME: we don't use this anymore, remove it
-      if os.getenv("QUARTO_PROFILER_OUTPUT") ~= nil then
-
-        local jsonTimings = quarto.json.encode(timing_events)
-        local tfile = io.open(timingsFile(), "w")
-        if tfile then
-          tfile:write(jsonTimings)
-          tfile:close()
-        else
-          warn('Error writing profiler timings JSON')
-        end
-      end
     end
   }
 end