From 9ad89997a533744695b380b315f1f70293bb30c4 Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Sun, 04 Jun 2023 16:35:45 +0000
Subject: [PATCH] multi-core builds
---
quartz/processors/parse.ts | 100 ++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 84 insertions(+), 16 deletions(-)
diff --git a/quartz/processors/parse.ts b/quartz/processors/parse.ts
index 83a05d4..715a4e9 100644
--- a/quartz/processors/parse.ts
+++ b/quartz/processors/parse.ts
@@ -1,3 +1,4 @@
+import esbuild from 'esbuild'
import remarkParse from 'remark-parse'
import remarkRehype from 'remark-rehype'
import { Processor, unified } from "unified"
@@ -8,6 +9,8 @@
import { read } from 'to-vfile'
import { slugify } from '../path'
import path from 'path'
+import os from 'os'
+import workerpool, { Promise as WorkerPromise } from 'workerpool'
import { QuartzTransformerPlugin } from '../plugins/types'
export type QuartzProcessor = Processor<MDRoot, HTMLRoot, void>
@@ -32,24 +35,89 @@
return processor
}
-export async function parseMarkdown(processor: QuartzProcessor, baseDir: string, fps: string[], verbose: boolean): Promise<ProcessedContent[]> {
- const perf = new PerfTimer()
- const res: ProcessedContent[] = []
- for (const fp of fps) {
- const file = await read(fp)
+function* chunks<T>(arr: T[], n: number) {
+ for (let i = 0; i < arr.length; i += n) {
+ yield arr.slice(i, i + n)
+ }
+}
- // base data properties that plugins may use
- file.data.slug = slugify(path.relative(baseDir, file.path))
- file.data.filePath = fp
-
- const ast = processor.parse(file)
- res.push([await processor.run(ast, file), file])
-
- if (verbose) {
- console.log(`[process] ${fp} -> ${file.data.slug}`)
- }
+async function transpileWorkerScript(verbose: boolean) {
+ // transpile worker script
+ const cacheFile = "./.quartz-cache/transpiled-worker.mjs"
+ const fp = "./quartz/worker.ts"
+ if (verbose) {
+ console.log("Transpiling worker script")
}
- console.log(`Parsed and transformed ${res.length} Markdown files in ${perf.timeSince()}`)
+ await esbuild.build({
+ entryPoints: [fp],
+ outfile: path.join("quartz", cacheFile),
+ bundle: true,
+ keepNames: true,
+ platform: "node",
+ format: "esm",
+ packages: "external",
+ plugins: [
+ {
+ name: 'css-and-scripts-as-text',
+ setup(build) {
+ build.onLoad({ filter: /\.scss$/ }, (_) => ({
+ contents: '',
+ loader: 'text'
+ }))
+ build.onLoad({ filter: /\.inline\.(ts|js)$/ }, (_) => ({
+ contents: '',
+ loader: 'text'
+ }))
+ }
+ }
+ ]
+ })
+}
+
+export async function parseMarkdown(transformers: QuartzTransformerPlugin[], baseDir: string, fps: string[], verbose: boolean): Promise<ProcessedContent[]> {
+ const perf = new PerfTimer()
+
+ const CHUNK_SIZE = 128
+ let concurrency = fps.length < CHUNK_SIZE ? 1 : os.availableParallelism()
+ const res: ProcessedContent[] = []
+ if (concurrency === 1) {
+ // single-thread
+ const processor = createProcessor(transformers)
+ for (const fp of fps) {
+ const file = await read(fp)
+
+ // base data properties that plugins may use
+ file.data.slug = slugify(path.relative(baseDir, file.path))
+ file.data.filePath = fp
+
+ const ast = processor.parse(file)
+ res.push([await processor.run(ast, file), file])
+
+ if (verbose) {
+ console.log(`[process] ${fp} -> ${file.data.slug}`)
+ }
+ }
+ } else {
+ await transpileWorkerScript(verbose)
+ const pool = workerpool.pool(
+ './quartz/bootstrap-worker.mjs',
+ {
+ minWorkers: 'max',
+ maxWorkers: concurrency,
+ workerType: 'thread'
+ }
+ )
+
+ const childPromises: WorkerPromise<ProcessedContent[]>[] = []
+ for (const chunk of chunks(fps, CHUNK_SIZE)) {
+ childPromises.push(pool.exec('parseFiles', [baseDir, chunk, verbose]))
+ }
+ const results: ProcessedContent[][] = await WorkerPromise.all(childPromises)
+ res.push(...results.flat())
+ await pool.terminate()
+ }
+
+ console.log(`Parsed and transformed ${res.length} Markdown files with ${concurrency} cores in ${perf.timeSince()}`)
return res
}
--
Gitblit v1.10.0