Merge branch 'main' into fix/issue11893

dev-docs/performance-monitoring/linux-performance.md

@@ -0,0 +1,35 @@
+# Notes for monitoring performance on Linux
+
+Context: I've been having trouble getting consistent performance measurements on my MacBook Pro, so I decided to try my luck on an Intel Linux desktop running Ubuntu 24.
+
+## `perf` settings
+
+We'll want to monitor some performance counters that have potential security implications, so we need to disable some settings. ONLY DO THIS ON A MACHINE YOU TRUST AND THAT WILL NOT RUN POTENTIALLY-MALICIOUS THIRD-PARTY CODE!
+
+### Source `scripts/linux-perf-settings.sh`
+
+(These come from <https://easyperf.net/blog/2019/08/02/Perf-measurement-environment-on-Linux>)
+
+### `sysctl.conf` settings
+
+```
+$ cat /proc/sys/kernel/perf_event_paranoid
+```
+
+If the result isn't `-1`, then add this to `/etc/sysctl.conf`:
+
+```
+kernel.perf_event_paranoid = -1
+```
+
+```
+$ cat /proc/sys/kernel/kptr_restrict
+```
+
+If the result isn't `0`, then add this to `/etc/sysctl.conf`:
+
+```
+kernel.kptr_restrict = 0
+```
+
+After these changes, you'll need to reboot.

dev-docs/performance-monitoring/scripts/linux-perf-settings.sh

@@ -0,0 +1,16 @@
+#!/bin/bash
+
+# This assumes intel processors!!
+
+# Intel
+echo 1 > /sys/devices/system/cpu/intel_pstate/no_turbo
+# AMD
+# echo 0 > /sys/devices/system/cpu/cpufreq/boost
+
+for i in /sys/devices/system/cpu/cpu*/cpufreq/scaling_governor
+do
+  echo performance > $i
+done
+
+echo 0 > /proc/sys/kernel/randomize_va_space
+

src/command/render/pandoc.ts

@@ -204,6 +204,7 @@ import {
 import { kFieldCategories } from "../../project/types/website/listing/website-listing-shared.ts";
 import { isWindows } from "../../deno_ral/platform.ts";
 import { appendToCombinedLuaProfile } from "../../core/performance/perfetto-utils.ts";
+import { makeTimedFunctionAsync } from "../../core/performance/function-times.ts";
 
 // in case we are running multiple pandoc processes
 // we need to make sure we capture all of the trace files
@@ -1233,14 +1234,18 @@ export async function runPandoc(
 
   setupPandocEnv();
 
+  const pandocRender = makeTimedFunctionAsync("pandoc-render", async () => {
+    return await execProcess(
+      {
+        cmd,
+        cwd,
+        env: pandocEnv,
+      },
+    );
+  });
+
   // run pandoc
-  const result = await execProcess(
-    {
-      cmd,
-      cwd,
-      env: pandocEnv,
-    },
-  );
+  const result = await pandocRender();
 
   // run afterPandoc hooks
   for (const hook of afterPandocHooks) {

src/resources/filters/ast/customnodes.lua

@@ -41,7 +41,7 @@ function is_regular_node(node, name)
   return node
 end
 
-function run_emulated_filter(doc, filter, traverse)
+function run_emulated_filter(doc, filter, traverser)
   if doc == nil then
     return nil
   end
@@ -82,10 +82,10 @@ function run_emulated_filter(doc, filter, traverse)
     elseif type(traverser) == 'function' then
       _quarto.traverser = traverser
     else
-      warn('Unknown traverse method: ' .. tostring(traverse))
+      warn('Unknown traverse method: ' .. tostring(traverser))
     end
     local result = _quarto.traverser(node, filter_param)
-    _quarto.traverse = old_traverse
+    _quarto.traverser = old_traverse
 
     return result
   end

src/resources/filters/normalize/astpipeline.lua

@@ -3,22 +3,15 @@
 
 function quarto_ast_pipeline()
   local function warn_on_stray_triple_colons()
-    local function block_handler(block)
-      _quarto.ast.walk(block, {
-        Str = function(el)
+    return {
+      Str = function(el)
           if string.match(el.text, ":::(:*)") then 
             local error_message = 
               "\nThe following string was found in the document: " .. el.text .. 
-              "\nThis string was found in a block element with the following content:\n\n" .. pandoc.utils.stringify(block) .. 
               "\n\nThis usually indicates a problem with a fenced div in the document. Please check the document for errors."
             warn(error_message)
           end
-        end
-      })
-  end
-    return {
-      Para = block_handler,
-      Plain = block_handler,
+      end
     }
   end
   return {