X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=blobdiff_plain;f=yarrg%2Fweb%2Fquery_routesearch;h=36e6055b898610a3ccb2910e641203f9923bbddd;hb=fbe374c3592808f9b3f105ec0726b26ada6c0ea0;hp=6f051351ca2f981bf677f2bd2fa4394f78a81459;hpb=8fb8cf52d2bf96beda40c30134e04a352ff988b4;p=ypp-sc-tools.db-live.git
diff --git a/yarrg/web/query_routesearch b/yarrg/web/query_routesearch
index 6f05135..36e6055 100644
--- a/yarrg/web/query_routesearch
+++ b/yarrg/web/query_routesearch
@@ -36,12 +36,12 @@
<%args>
$quri
$dbh
+$queryqf
$islandstring => '';
$capacitystring => '';
$lossperleague => '';
$capitalstring => '';
$distance => '';
-$someresults
$emsgokorprint
@@ -52,11 +52,14 @@ my $emsg;
my @warningfs;
my @islandids;
+my $maxmaxdist=35;
+my $maxcpu=90;
+my $concur_lim=5;
+
my $qa= \%ARGS;
my $routeparams= { EmsgRef => \$emsg, SayRequiredCapacity => 1 };
my $maxdist;
-my $maxcountea=10;
-my $maxcpu=10;
+my $maxcountea=15;
@@ -95,8 +98,8 @@ This feature is not available from the "drop down menus" interface.
<%perl>
-if (!$emsg && $maxdist > 30) {
- $emsg= "Searching for routes of more than 30 leagues is not".
+if (!$emsg && $maxdist > $maxmaxdist) {
+ $emsg= "Searching for routes of more than $maxmaxdist leagues is not".
" supported, sorry.";
}
@@ -118,12 +121,13 @@ my $isleinfo = sub {
my $row= $islandname_stmt->fetchrow_hashref();
local $_= $row->{'islandname'};
s/ Island$//;
- return $_, $row->{'archipelago'};
+ return $_, $row->{'islandname'}, $row->{'archipelago'};
};
#---------- compute the results ----------
-my @rsargs= qw(-DN);
+my @rsargs= ($concur_lim, '-DN');
+my $concur_fail;
foreach my $k (qw(MaxMass MaxVolume MaxCapital)) {
my $v= $routeparams->{$k};
@@ -131,6 +135,7 @@ foreach my $k (qw(MaxMass MaxVolume MaxCapital)) {
}
push @rsargs, defined $routeparams->{LossPerLeaguePct}
? $routeparams->{LossPerLeaguePct}*0.01 : 1e-9;
+push @rsargs, '0';
push @rsargs, 'search',$maxdist, $maxcountea,$maxcountea, 'any', @islandids;
m/[^-.0-9a-zA-Z]/ and die "$_ $& ?" foreach @rsargs;
@@ -141,8 +146,13 @@ if ($qa->{'debug'}) {
<%perl>
}
-unshift @rsargs, sourcebasedir().'/yarrg/routesearch',
- '-d', dbw_filename($qa->{'Ocean'});
+unshift @rsargs,
+ 'nice', sourcebasedir().'/yarrg/routesearch',
+ '-d', dbw_filename($qa->{'Ocean'}),
+ '-C', webdatadir().'/_concur.', '.lock';
+
+# touch _concur.0{0,1,2,3,4}.lock
+# really chgrp www-data _concur.0?.lock
my %results; # $results{$ap}{"5 6 9 10"} = { stuff }
@@ -151,7 +161,7 @@ my $child= $fh->open("-|"); defined $child or die $!;
if (!$child) {
my $cpu= BSD::Resource::RLIMIT_CPU;
my ($soft,$hard)= getrlimit($cpu);
- setrlimit($cpu,$maxcpu,$hard) or die $! if $soft>$maxcpu;
+ setrlimit($cpu,$maxcpu,$hard) or die $! if $hard<=$maxcpu;
exec @rsargs;
die $!;
}
@@ -163,15 +173,20 @@ while (<$fh>) {
<% $_ |h %>
<%perl>
}
- next unless
- m/^ \@ *\d+ ([ap])\# *\d+ \|.*\| *\d+ +(\d+) +(\d+) *\| ([0-9 ]+)$/;
- my ($ap,$isles) = (uc $1,$4);
+ next unless m/^\s*\@/;
+ if (m/^\@\@\@ concurrency limit exceeded/) {
+ $concur_fail= 1;
+ last;
+ }
+ die unless m/^ \@ *\d+ ([ap])\# *\d+ \|.*\| *(\d+)lg *\| *\d+ +(\d+) +(\d+) *\| ([0-9 ]+)$/;
+ my ($ap,$isles) = (uc $1,$5);
next if $results{$ap} && %{$results{$ap}} >= $maxcountea;
- my $item= { A => $2, P => $3 };
- my (@i, @a);
+ my $item= { A => $3, P => $4, Leagues => $2 };
+ my (@i, @fi, @a);
foreach (split / /, $isles) {
- my ($name,$arch)= $isleinfo->($_);
+ my ($name,$fullname,$arch)= $isleinfo->($_);
push @i, $name;
+ push @fi, $fullname;
push @a, $arch unless @a && $a[-1] eq $arch;
}
$item->{Isles}= [ @i ];
@@ -183,6 +198,10 @@ while (<$fh>) {
for ($i=1; $i < @i-1; $i++) {
push @{ $item->{Vias} }, $i[$i];
}
+ my %linkqf= %$queryqf;
+ delete $linkqf{'query'};
+ $linkqf{'routestring'}= join ', ', @fi;
+ $item->{Url}= $quri->(%linkqf);
$results{$ap}{$isles}= $item;
}
@@ -190,22 +209,72 @@ if ($qa->{'debug'}) {
print "\n";
}
+$!=0;
+if (!close $fh) {
+ die $! if $!;
+ die $? if $? != 24; # SIGXCPU but not in POSIX.pm :-/
+
+Search took too long and was terminated
+
+Sorry, but your query resulted in a search that took too long.
+Searches are limited to <% $maxcpu |h %> seconds of CPU time to
+avoid them consuming excessive resources on the server system, and to
+make sure that shorter searches can still happen.
+
+
+Please try a search with a smaller minimum distance, or place more
+restrictions on the route.
+
+<%perl>
+ return;
+}
+
+if ($concur_fail) {
+
+
Server too busy
+
+Sorry, but there are already <% $concur_lim |h %> route searches
+running. We limit the number which can run at once to avoid
+overloading the server system and to make sure that the rest of the
+YARRG website still runs quickly.
+
+
+If you submitted several searches and gave up on them (eg by hitting
+`back' or `stop' in your browser), be aware that that doesn't
+generally stop the search process at the server end. So it's best to
+avoid asking for large searches that you're not sure about.
+
+
+Otherwise, please try later. Searches are limited to <% $maxcpu |h %>
+seconds of CPU time so more processing resources should be available soon.
+
+<%perl>
+ return;
+}
+
% foreach my $ap (qw(A P)) {
-
ap=<% $ap %>
+% if ($ap eq 'A') {
+Best routes for total profit
+% } else {
+Best routes for profit per league
+% }
+
| Profit
+ | Dist.
| Archipelagoes
| Route
|
| Abs.
| Per.lg.
|
+ |
| Start
| Via
| Finish
@@ -219,7 +288,8 @@ if ($qa->{'debug'}) {
|
| <% $item->{A} |h %>
| <% $item->{P} |h %>
- | <% join ', ', @{ $item->{Archs} } |h %>
+ | <% $item->{Leagues} |h %>
+ | <% join ', ', @{ $item->{Archs} } |h %>
| <% $item->{Start} |h %>,
| <% join ' ', map { $_.',' } @{ $item->{Vias} } |h %>
| <% $item->{Finish} |h %>
@@ -228,6 +298,16 @@ if ($qa->{'debug'}) {
% } # $isles
|
% } # $ap
+
+
+
+
Notes
+
+Per league values count each island visited as one
+(additional) league; the `Dist.' column is however the actual distance
+to be sailed. All profit figures are somewhat approximate; get a
+complete trading plan for a route for accurate information.
+
<%perl>