X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=blobdiff_plain;f=yarrg%2Fweb%2Fquery_routesearch;h=e5e7c6b98619c48174328badb9e501623113df47;hb=86042accde3ae9cb5bbafa172c23b59ce0480fd3;hp=34fbc22e38d25584a078afd1caf05b78ed1b7497;hpb=9ba8a1cde5d1f2045acf2e30aea821c3ed9d4527;p=ypp-sc-tools.web-live.git

diff --git a/yarrg/web/query_routesearch b/yarrg/web/query_routesearch
index 34fbc22..e5e7c6b 100644
--- a/yarrg/web/query_routesearch
+++ b/yarrg/web/query_routesearch
@@ -52,10 +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 $maxcountea=15;
 
 </%perl>
 
@@ -94,8 +98,8 @@ This feature is not available from the "drop down menus" interface.
 </form>
 <%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.";
 }
 
@@ -122,7 +126,8 @@ my $isleinfo = sub {
 
 #---------- compute the results ----------
 
-my @rsargs;
+my @rsargs= ($concur_lim, '-DN');
+my $concur_fail;
 
 foreach my $k (qw(MaxMass MaxVolume MaxCapital)) {
 	my $v= $routeparams->{$k};
@@ -130,20 +135,24 @@ foreach my $k (qw(MaxMass MaxVolume MaxCapital)) {
 }
 push @rsargs, defined $routeparams->{LossPerLeaguePct}
 	? $routeparams->{LossPerLeaguePct}*0.01 : 1e-9;
-push @rsargs, 'search', $maxcountea,$maxcountea, $maxdist, 'any', @islandids;
+push @rsargs, '0';
+push @rsargs, 'search',$maxdist, $maxcountea,$maxcountea, 'any', @islandids;
 
 m/[^-.0-9a-zA-Z]/ and die "$_ $& ?" foreach @rsargs;
 
-unshift @rsargs, dbw_filename($qa->{'Ocean'});
-unshift @rsargs, qw(-DN);
-
 if ($qa->{'debug'}) {
 </%perl>
 [[ <% "@rsargs" |h %> ]]<br><pre>
 <%perl>
 }
 
-unshift @rsargs, sourcebasedir().'/yarrg/routesearch';
+unshift @rsargs,
+	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 }
 
@@ -152,8 +161,7 @@ my $child= $fh->open("-|"); defined $child or die $!;
 if (!$child) {
 	my $cpu= BSD::Resource::RLIMIT_CPU;
 	my ($soft,$hard)= getrlimit($cpu);
-	my $max=10;
-	setrlimit($cpu,$max,$hard) or die $! if $soft>$max;
+	setrlimit($cpu,$maxcpu,$hard) or die $! if $hard<=$maxcpu;
 	exec @rsargs;
 	die $!;
 }
@@ -165,11 +173,15 @@ 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 $item= { A => $3, P => $4, Leagues => $2 };
 	my (@i, @a);
 	foreach (split / /, $isles) {
 		my ($name,$arch)= $isleinfo->($_);
@@ -192,22 +204,72 @@ if ($qa->{'debug'}) {
 	print "</pre>\n";
 }
 
+$!=0;
+if (!close $fh) {
+	die $! if $!;
+	die $? if $? != 24; # SIGXCPU but not in POSIX.pm :-/
+</%perl>
+<h2>Search took too long and was terminated</h2>
+
+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.
+
+<p>
+Please try a search with a smaller minimum distance, or place more
+restrictions on the route.
+
+<%perl>
+	return;
+}
+
+if ($concur_fail) {
+</%perl>
+<h2>Server too busy</h2>
+
+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.
+<p>
+
+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.
+
+<p>
+Otherwise, please try later.  Searches are limited to <% $maxcpu |h %>
+seconds of CPU time so more processing resources should be available soon.
+
+<%perl>
+	return;
+}
+
 </%perl>
 % foreach my $ap (qw(A P)) {
-<h2>ap=<% $ap %></h2>
+%	if ($ap eq 'A') {
+<h2>Best routes for total profit</h2>
+%	} else {
+<h2>Best routes for profit per league</h2>
+%	}
 <table rules=groups>
 <colgroup span=2>
 <colgroup span=1>
+<colgroup span=1>
 <colgroup span=3>
 <tbody>
 <tr>
 <th colspan=2>Profit
+<th>Dist.
 <th>Archipelagoes
 <th colspan=3>Route
 <tr>
 <th>Abs.
 <th>Per.lg.
 <th>
+<th>
 <th>Start
 <th>Via
 <th>Finish
@@ -221,8 +283,9 @@ if ($qa->{'debug'}) {
 <tr class="datarow<% $datarow %>">
 <td align=right><% $item->{A} |h %>
 <td align=right><% $item->{P} |h %>
+<td align=right><% $item->{Leagues} |h %>
 <td align=left><% join ', ', @{ $item->{Archs} } |h %>
-<td align=left><% $item->{Start} |h %>, 
+<td align=left><% $item->{Start} |h %>,
 <td align=left><% join ' ', map { $_.',' } @{ $item->{Vias} } |h %>
 <td align=left><% $item->{Finish} |h %>
 </td>
@@ -230,6 +293,16 @@ if ($qa->{'debug'}) {
 %	} # $isles
 </table>
 % } # $ap
+
+<p>
+
+<h2>Notes</h2>
+
+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>