From: Eric Wong <e@80x24.org> To: meta@public-inbox.org Subject: [PATCH 17/37] solver: simplify control flow for initial loop Date: Mon, 21 Jan 2019 20:52:33 +0000 Message-ID: <20190121205253.10455-18-e@80x24.org> (raw) In-Reply-To: <20190121205253.10455-1-e@80x24.org> We'll be breaking this up into several steps, too; since searching inboxes for patch blobs can take 10s of milliseconds for me. --- lib/PublicInbox/SolverGit.pm | 28 ++++++++++------------------ 1 file changed, 10 insertions(+), 18 deletions(-) diff --git a/lib/PublicInbox/SolverGit.pm b/lib/PublicInbox/SolverGit.pm index 70d8a93..beafa42 100644 --- a/lib/PublicInbox/SolverGit.pm +++ b/lib/PublicInbox/SolverGit.pm @@ -361,11 +361,13 @@ sub solve ($$$$) { my @todo = ($req); my $found = {}; # { abbrev => [ ::Git, oid_full, type, size, $di ] } my $patches = []; # [ array of $di hashes ] - - my $max = $self->{max_steps} || 200; - my $steps = 0; + my $max = $self->{max_patches} || 200; while (defined(my $want = pop @todo)) { + if (scalar(@$patches) > $max) { + print $out "Aborting, too many steps to $oid_b\n"; + return; + } # see if we can find the blob in an existing git repo: my $want_oid = $want->{oid_b}; if (my $existing = solve_existing($self, $out, $want)) { @@ -373,9 +375,8 @@ sub solve ($$$$) { join("\n", $existing->[0]->pub_urls), "\n"; return $existing if $want_oid eq $oid_b; # DONE! - $found->{$want_oid} = $existing; - next; # ok, one blob resolved, more to go? + last; # ok, one blob resolved, more to go? } # scan through inboxes to look for emails which results in @@ -390,21 +391,12 @@ sub solve ($$$$) { # good, we can find a path to the oid we $want, now # lets see if we need to apply more patches: my $src = $di->{oid_a}; - if ($src !~ /\A0+\z/) { - if (++$steps > $max) { - print $out -"Aborting, too many steps to $oid_b\n"; - return; - } + last if $src =~ /\A0+\z/; - # we have to solve it using another oid, fine: - my $job = { - oid_b => $src, - path_b => $di->{path_a}, - }; - push @todo, $job; - } + # we have to solve it using another oid, fine: + my $job = { oid_b => $src, path_b => $di->{path_a} }; + push @todo, $job; last; # onto the next @todo item } unless ($di) { -- EW
next prev parent reply other threads:[~2019-01-21 20:52 UTC|newest] Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-01-21 20:52 [PATCH 00/37] viewvcs: diff highlighting and more Eric Wong 2019-01-21 20:52 ` [PATCH 01/37] view: disable bold in topic display Eric Wong 2019-01-21 20:52 ` [PATCH 02/37] hval: force monospace for <form> elements, too Eric Wong 2019-01-21 20:52 ` [PATCH 03/37] t/perf-msgview: add test to check msg_html performance Eric Wong 2019-01-21 20:52 ` [PATCH 04/37] solver: initial Perl implementation Eric Wong 2019-01-21 20:52 ` [PATCH 05/37] git: support multiple URL endpoints Eric Wong 2019-01-21 20:52 ` [PATCH 06/37] git: add git_quote Eric Wong 2019-01-21 20:52 ` [PATCH 07/37] git: check saves error on disambiguation Eric Wong 2019-01-21 20:52 ` [PATCH 08/37] solver: various bugfixes and cleanups Eric Wong 2019-01-21 20:52 ` [PATCH 09/37] view: wire up diff and vcs viewers with solver Eric Wong 2019-01-21 20:52 ` [PATCH 10/37] git: disable abbreviations with cat-file hints Eric Wong 2019-01-21 20:52 ` [PATCH 11/37] solver: operate directly on git index Eric Wong 2019-01-21 20:52 ` [PATCH 12/37] view: enable naming hints for raw blob downloads Eric Wong 2019-01-21 20:52 ` [PATCH 13/37] git: support 'ambiguous' result from --batch-check Eric Wong 2019-01-21 20:52 ` [PATCH 14/37] solver: more verbose blob resolution Eric Wong 2019-01-21 20:52 ` [PATCH 15/37] solver: break up patch application steps Eric Wong 2019-01-21 20:52 ` [PATCH 16/37] solver: switch patch application to use a callback Eric Wong 2019-01-21 20:52 ` Eric Wong [this message] 2019-01-21 20:52 ` [PATCH 18/37] solver: break @todo loop into " Eric Wong 2019-01-21 20:52 ` [PATCH 19/37] solver: note the synchronous nature of index preparation Eric Wong 2019-01-21 20:52 ` [PATCH 20/37] solver: add a TODO note about making this fully evented Eric Wong 2019-01-21 20:52 ` [PATCH 21/37] view: enforce trailing slash for /$INBOX/$OID/s/ endpoints Eric Wong 2019-01-21 20:52 ` [PATCH 22/37] solver: restore diagnostics and deal with CRLF Eric Wong 2019-01-21 20:52 ` [PATCH 23/37] www: admin-configurable CSS via "publicinbox.css" Eric Wong 2019-01-21 20:52 ` [PATCH 24/37] $INBOX/_/text/color/ and sample user-side CSS Eric Wong 2019-01-21 20:52 ` [PATCH 25/37] viewdiff: support diff-highlighting w/o coderepo Eric Wong 2019-01-21 20:52 ` [PATCH 26/37] viewdiff: cleanup state transitions a bit Eric Wong 2019-01-21 20:52 ` [PATCH 27/37] viewdiff: quote attributes for Atom feed Eric Wong 2019-01-21 20:52 ` [PATCH 28/37] t/check-www-inbox: use xmlstarlet to validate Atom if available Eric Wong 2019-01-21 20:52 ` [PATCH 29/37] viewdiff: do not link to 0{7,40} blobs (again) Eric Wong 2019-01-21 20:52 ` [PATCH 30/37] viewvcs: disable white-space prewrap in blob view Eric Wong 2019-01-21 20:52 ` [PATCH 31/37] solver: force quoted-printable bodies to LF Eric Wong 2019-01-21 20:52 ` [PATCH 32/37] solver: remove extra "^index $OID..$OID" line Eric Wong 2019-01-21 20:52 ` [PATCH 33/37] config: each_inbox iteration preserves config order Eric Wong 2019-01-21 20:52 ` [PATCH 34/37] t/check-www-inbox: warn on missing Content-Type Eric Wong 2019-01-21 20:52 ` [PATCH 35/37] highlight: initial wrapper and PSGI service Eric Wong 2019-01-21 20:52 ` [PATCH 36/37] hval: split out escape sequences to a separate table Eric Wong 2019-01-21 20:52 ` [PATCH 37/37] t/check-www-inbox: trap SIGINT for File::Temp destruction Eric Wong
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 List information: https://public-inbox.org/README * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20190121205253.10455-18-e@80x24.org \ --to=e@80x24.org \ --cc=meta@public-inbox.org \ /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
user/dev discussion of public-inbox itself This inbox may be cloned and mirrored by anyone: git clone --mirror https://public-inbox.org/meta git clone --mirror http://czquwvybam4bgbro.onion/meta git clone --mirror http://hjrcffqmbrq6wope.onion/meta git clone --mirror http://ou63pmih66umazou.onion/meta # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V1 meta meta/ https://public-inbox.org/meta \ meta@public-inbox.org public-inbox-index meta Example config snippet for mirrors. Newsgroups are available over NNTP: nntp://news.public-inbox.org/inbox.comp.mail.public-inbox.meta nntp://ou63pmih66umazou.onion/inbox.comp.mail.public-inbox.meta nntp://czquwvybam4bgbro.onion/inbox.comp.mail.public-inbox.meta nntp://hjrcffqmbrq6wope.onion/inbox.comp.mail.public-inbox.meta nntp://news.gmane.io/gmane.mail.public-inbox.general note: .onion URLs require Tor: https://www.torproject.org/ code repositories for the project(s) associated with this inbox: https://80x24.org/public-inbox.git AGPL code for this site: git clone https://public-inbox.org/public-inbox.git