From: Jonathan Corbet <corbet@lwn.net>
To: linux-doc@vger.kernel.org
Cc: linux-kernel@vger.kernel.org,
"Nícolas F . R . A . Prado" <n@nfraprado.net>,
"Jonathan Corbet" <corbet@lwn.net>
Subject: [PATCH 1/2] docs: automarkup: track failed cross-reference attempts
Date: Thu, 30 Jun 2022 10:36:29 -0600 [thread overview]
Message-ID: <20220630163630.714673-2-corbet@lwn.net> (raw)
In-Reply-To: <20220630163630.714673-1-corbet@lwn.net>
The automarkup code tries to create a lot of cross-references that don't
exist. Cross-reference lookups are expensive, especially in later versions
of Sphinx, so there is value in avoiding unnecessary ones. Remember
attempts that failed and do not retry them.
This improves the htmldocs build time by 5-10% depending on the phase of
the moon and other factors.
Signed-off-by: Jonathan Corbet <corbet@lwn.net>
---
Documentation/sphinx/automarkup.py | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/Documentation/sphinx/automarkup.py b/Documentation/sphinx/automarkup.py
index cc348b219fca..5b1f83e6192f 100644
--- a/Documentation/sphinx/automarkup.py
+++ b/Documentation/sphinx/automarkup.py
@@ -120,6 +120,16 @@ def markup_refs(docname, app, node):
repl.append(nodes.Text(t[done:]))
return repl
+#
+# Keep track of cross-reference lookups that failed so we don't have to
+# do them again.
+#
+failed_lookups = { }
+def failure_seen(target, reftype):
+ return (target + '::' + reftype) in failed_lookups
+def note_failure(target, reftype):
+ failed_lookups[target + '::' + reftype] = True
+
#
# In sphinx3 we can cross-reference to C macro and function, each one with its
# own C role, but both match the same regex, so we try both.
@@ -145,6 +155,8 @@ def markup_func_ref_sphinx3(docname, app, match):
for target in possible_targets:
if target not in Skipfuncs:
for class_s, reftype_s in zip(class_str, reftype_str):
+ if failure_seen(target, reftype_s):
+ continue
lit_text = nodes.literal(classes=['xref', 'c', class_s])
lit_text += target_text
pxref = addnodes.pending_xref('', refdomain = 'c',
@@ -164,6 +176,7 @@ def markup_func_ref_sphinx3(docname, app, match):
if xref:
return xref
+ note_failure(target, reftype_s)
return target_text
--
2.36.1
next prev parent reply other threads:[~2022-06-30 16:37 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-30 16:36 [PATCH 0/2] docs: A couple of automarkup improvements Jonathan Corbet
2022-06-30 16:36 ` Jonathan Corbet [this message]
2022-06-30 16:36 ` [PATCH 2/2] docs: automarkup: do not look up symbols twice Jonathan Corbet
2022-07-02 3:27 ` [PATCH 0/2] docs: A couple of automarkup improvements Akira Yokosawa
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220630163630.714673-2-corbet@lwn.net \
--to=corbet@lwn.net \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=n@nfraprado.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®