* [PATCH 15/18] xap_helper: better variable naming for key buffer
2023-11-13 13:15 6% [PATCH 00/18] cindex: some --associate work Eric Wong
@ 2023-11-13 13:15 7% ` Eric Wong
0 siblings, 0 replies; 2+ results
From: Eric Wong @ 2023-11-13 13:15 UTC (permalink / raw)
To: meta
We'll use `kbuf' for the search object key, since we already use
the `fbuf' term in `struct fbuf'. This also adds an extra check
for open_memstream(3) failures in case of ENOMEM.
---
lib/PublicInbox/xap_helper.h | 33 ++++++++++++++++-----------------
1 file changed, 16 insertions(+), 17 deletions(-)
diff --git a/lib/PublicInbox/xap_helper.h b/lib/PublicInbox/xap_helper.h
index 1380ffd0..0a652abd 100644
--- a/lib/PublicInbox/xap_helper.h
+++ b/lib/PublicInbox/xap_helper.h
@@ -762,7 +762,7 @@ static void dispatch(struct req *req)
union {
struct srch *srch;
char *ptr;
- } fbuf;
+ } kbuf;
char *end;
FILE *kfp;
struct srch **s;
@@ -776,8 +776,9 @@ static void dispatch(struct req *req)
}
if (!req->fn) ABORT("not handled: `%s'", req->argv[0]);
- kfp = open_memstream(&fbuf.ptr, &size);
- // write padding, first
+ kfp = open_memstream(&kbuf.ptr, &size);
+ if (!kfp) err(EXIT_FAILURE, "open_memstream(kbuf)");
+ // write padding, first (contents don't matter)
fwrite(&req->argv[0], offsetof(struct srch, paths), 1, kfp);
// global getopt variables:
@@ -824,26 +825,24 @@ static void dispatch(struct req *req)
default: ABORT("bad switch `-%c'", c);
}
}
- if (ferror(kfp) | fclose(kfp))
+ if (ferror(kfp) | fclose(kfp)) /* sets kbuf.srch */
err(EXIT_FAILURE, "ferror|fclose"); // likely ENOMEM
- fbuf.srch->db = NULL;
- fbuf.srch->qp = NULL;
- fbuf.srch->paths_len = size - offsetof(struct srch, paths);
- if (fbuf.srch->paths_len <= 0) {
- free_srch(fbuf.srch);
+ kbuf.srch->db = NULL;
+ kbuf.srch->qp = NULL;
+ kbuf.srch->paths_len = size - offsetof(struct srch, paths);
+ if (kbuf.srch->paths_len <= 0)
ABORT("no -d args");
- }
- s = (struct srch **)tsearch(fbuf.srch, &srch_tree, srch_cmp);
+ s = (struct srch **)tsearch(kbuf.srch, &srch_tree, srch_cmp);
if (!s) err(EXIT_FAILURE, "tsearch"); // likely ENOMEM
req->srch = *s;
- if (req->srch != fbuf.srch) { // reuse existing
- free_srch(fbuf.srch);
+ if (req->srch != kbuf.srch) { // reuse existing
+ free_srch(kbuf.srch);
} else if (!srch_init(req)) {
- assert(fbuf.srch == *((struct srch **)tfind(
- fbuf.srch, &srch_tree, srch_cmp)));
- void *del = tdelete(fbuf.srch, &srch_tree, srch_cmp);
+ assert(kbuf.srch == *((struct srch **)tfind(
+ kbuf.srch, &srch_tree, srch_cmp)));
+ void *del = tdelete(kbuf.srch, &srch_tree, srch_cmp);
assert(del);
- free_srch(fbuf.srch);
+ free_srch(kbuf.srch);
goto cmd_err; // srch_init already warned
}
try {
^ permalink raw reply related [relevance 7%]
* [PATCH 00/18] cindex: some --associate work
@ 2023-11-13 13:15 6% Eric Wong
2023-11-13 13:15 7% ` [PATCH 15/18] xap_helper: better variable naming for key buffer Eric Wong
0 siblings, 1 reply; 2+ results
From: Eric Wong @ 2023-11-13 13:15 UTC (permalink / raw)
To: meta
Still very much in flux, but some treewide cleanups in there...
And I've been wondering if "join" is a better word than
"associate" to denote the relationship between inboxes
and coderepos.
But "join" (even if we use join(1) internally) probably
implies strict relationships, whereas our current "associate"
is always going to be fuzzy due to patchids being fuzzy
and blobs OIDs being abbreviated in patches.
I'm also thinking about moving --associate-* CLI switches
into suboptions (e.g. what getsubopt(3) supports), so:
--associate=aggressive,prefixes=patchid+dfblob
But Perl doesn't ship with getsubopt(3) emulation
out-of-the-box
Eric Wong (18):
cindex: check `say' errors w/ close or ->flush
tmpfile: check `stat' errors, use autodie for unlink
cindex: use `local' for pipes between processes
xap_helper_cxx: use write_file helper
xap_helper_cxx: make the build process ccache-friendly
xap_helper_cxx: use -pipe by default in CXXFLAGS
xap_client: spawn C++ xap_helper directly
treewide: update read_all to avoid eof|close checks
spawn: don't append to scalarrefs on stdout/stderr
cindex: imply --all with --associate w/o -I/--only
cindex: delay associate until prune+indexing finish
xap_helper: Perl dump_ibx respects `-m MAX'
cidx_xap_helper_aux: complain about truncated inputs
xap_helper: stricter and harsher error handling
xap_helper: better variable naming for key buffer
cindex: do not guess integer maximum for Xapian
cindex: rename associate-max => window
cindex: support --associate-aggressive shortcut
lib/PublicInbox/CidxComm.pm | 6 +-
lib/PublicInbox/CidxXapHelperAux.pm | 6 +-
lib/PublicInbox/CodeSearchIdx.pm | 122 ++++++++++-----
lib/PublicInbox/Gcf2.pm | 3 +-
lib/PublicInbox/IO.pm | 18 ++-
lib/PublicInbox/LeiInput.pm | 10 +-
lib/PublicInbox/LeiMirror.pm | 10 +-
lib/PublicInbox/LeiToMail.pm | 3 +-
lib/PublicInbox/Spawn.pm | 4 +-
lib/PublicInbox/TestCommon.pm | 6 +-
lib/PublicInbox/Tmpfile.pm | 10 +-
lib/PublicInbox/XapClient.pm | 28 ++--
lib/PublicInbox/XapHelper.pm | 30 ++--
lib/PublicInbox/XapHelperCxx.pm | 55 +++----
lib/PublicInbox/xap_helper.h | 233 ++++++++++++----------------
script/public-inbox-cindex | 3 +-
script/public-inbox-learn | 2 +-
script/public-inbox-mda | 2 +-
script/public-inbox-purge | 2 +-
t/spawn.t | 2 +-
t/xap_helper.t | 27 ++--
21 files changed, 287 insertions(+), 295 deletions(-)
Yay, less code!
^ permalink raw reply [relevance 6%]
Results 1-2 of 2 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2023-11-13 13:15 6% [PATCH 00/18] cindex: some --associate work Eric Wong
2023-11-13 13:15 7% ` [PATCH 15/18] xap_helper: better variable naming for key buffer Eric Wong
Code repositories for project(s) associated with this public inbox
https://80x24.org/public-inbox.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).