routesearch: concurrency limit

[ypp-sc-tools.db-live.git] / yarrg / web / query_routesearch

diff --git a/yarrg/web/query_routesearch b/yarrg/web/query_routesearch
index 587a2b6dc9df0a47c1e8f55192a8f2d96123bb43..8937f285e9f9c77e6f3a77585b5471b6bd3de44e 100644 (file)
--- a/yarrg/web/query_routesearch
+++ b/yarrg/web/query_routesearch
@@ -52,11 +52,14 @@ my $emsg;
 my @warningfs;
 my @islandids;
 
 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 $qa= \%ARGS;
 my $routeparams= { EmsgRef => \$emsg, SayRequiredCapacity => 1 };
 my $maxdist;

-my $maxcountea=10;
-my $maxcpu=10;
+my $maxcountea=15;

 
 </%perl>
 
 
 </%perl>
 


@@ -95,8 +98,8 @@ This feature is not available from the "drop down menus" interface.
 </form>
 <%perl>
 
 </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.";
 }
 
                " supported, sorry.";
 }
 


@@ -123,7 +126,8 @@ my $isleinfo = sub {
 
 #---------- compute the results ----------
 
 
 #---------- 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};
 
 foreach my $k (qw(MaxMass MaxVolume MaxCapital)) {
        my $v= $routeparams->{$k};


@@ -142,8 +146,13 @@ if ($qa->{'debug'}) {
 <%perl>
 }
 
 <%perl>
 }
 

-unshift @rsargs, sourcebasedir().'/yarrg/routesearch',
-       '-d', dbw_filename($qa->{'Ocean'});
+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 }
 
 
 my %results; # $results{$ap}{"5 6 9 10"} = { stuff }
 


@@ -152,7 +161,7 @@ my $child= $fh->open("-|"); defined $child or die $!;
 if (!$child) {
        my $cpu= BSD::Resource::RLIMIT_CPU;
        my ($soft,$hard)= getrlimit($cpu);
 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 $!;
 }
        exec @rsargs;
        die $!;
 }


@@ -164,11 +173,15 @@ while (<$fh>) {
 <% $_ |h %>
 <%perl>
        }
 <% $_ |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;
        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->($_);
        my (@i, @a);
        foreach (split / /, $isles) {
                my ($name,$arch)= $isleinfo->($_);


@@ -191,22 +204,48 @@ if ($qa->{'debug'}) {
        print "</pre>\n";
 }
 
        print "</pre>\n";
 }
 

+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>
 <table rules=groups>
 <colgroup span=2>
 <colgroup span=1>
 </%perl>
 % foreach my $ap (qw(A P)) {
 <h2>ap=<% $ap %></h2>
 <table rules=groups>
 <colgroup span=2>
 <colgroup span=1>

+<colgroup span=1>

 <colgroup span=3>
 <tbody>
 <tr>
 <th colspan=2>Profit
 <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>Archipelagoes
 <th colspan=3>Route
 <tr>
 <th>Abs.
 <th>Per.lg.
 <th>

+<th>

 <th>Start
 <th>Via
 <th>Finish
 <th>Start
 <th>Via
 <th>Finish


@@ -220,6 +259,7 @@ if ($qa->{'debug'}) {
 <tr class="datarow<% $datarow %>">
 <td align=right><% $item->{A} |h %>
 <td align=right><% $item->{P} |h %>
 <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><% join ' ', map { $_.',' } @{ $item->{Vias} } |h %>
 <td align=left><% join ', ', @{ $item->{Archs} } |h %>
 <td align=left><% $item->{Start} |h %>,
 <td align=left><% join ' ', map { $_.',' } @{ $item->{Vias} } |h %>