X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.db-test.git;a=blobdiff_plain;f=yarrg%2Frsmain.c;h=67d338b502d961dc3279874cacb1344ab173e4ba;hp=976aa5a29e4d3a1ed81c44945dcb102a3950b293;hb=7d38bda05d74767d4c8ab7127f72e3704350bf28;hpb=8dd381ffb993692b376e48eaa4b9ab506b3568e2

diff --git a/yarrg/rsmain.c b/yarrg/rsmain.c
index 976aa5a..67d338b 100644
--- a/yarrg/rsmain.c
+++ b/yarrg/rsmain.c
@@ -1,4 +1,29 @@
-/**/
+/*
+ * Route searcher - command line parsing and result printing
+ */
+/*
+ *  This is part of the YARRG website, a tool for assisting
+ *  players of Yohoho Puzzle Pirates.
+ * 
+ *  Copyright (C) 2009 Ian Jackson <ijackson@chiark.greenend.org.uk>
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *  
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Affero General Public License for more details.
+ *  
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *  
+ *  Yohoho and Puzzle Pirates are probably trademarks of Three Rings and
+ *  are used without permission.  This program is not endorsed or
+ *  sponsored by Three Rings.
+ */
 
 #include "rscommon.h"
 
@@ -7,7 +32,7 @@
 int o_quiet= 0;
 double max_mass=-1, max_volu=-1, max_capi=-1;
 double distance_loss_factor_per_league;
-int max_dist= -1;
+int max_dist=-1, min_trade_maxprofit=0;
 
 FILE *debug_file;
 FILE *output;
@@ -21,7 +46,7 @@ FILE *output;
 #undef CTR
 #undef CTRA
 
-static PotentialResult ****results[GRANUS];
+static Bucket ****results[GRANUS];
   /* results[GRANUS][start_isle_ix][finalisle][midisle]-> */
 
 static pid_t debugoutpid;
@@ -30,6 +55,9 @@ int main(int argc, const char **argv) {
   const char *arg;
   int i, ap;
   int granui;
+  const char *database=0;
+  const char *concur_base=0, *concur_rhs=0;
+  int concur_lim=-1;
 
 #ifndef debug_flags
   debug_flags= ~( dbg_sql2 );
@@ -38,12 +66,22 @@ int main(int argc, const char **argv) {
   for (;;) {
     arg= *++argv;
     if (arg[0] != '-') break;
+    if (!strcmp(arg,"-d")) {
+      database= *++argv;
+    } else if (!strcmp(arg,"-C")) {
+      concur_base= *++argv;
+      concur_rhs= *++argv;
+      concur_lim= atoi(*++argv);
+    } else if (!strcmp(arg,"-g")) {
+      granus= atoi(*++argv);
+      assert(granus>=1 && granus<=GRANUS);
 #ifndef debug_flags
-    if (!strcmp(arg,"-DN")) {
+    } else if (!strcmp(arg,"-DN")) {
       debug_flags= 0;
-    } else
+    } else if (!strcmp(arg,"-D1")) {
+      debug_flags= ~(dbg_sql2|dbg_lp|dbg_value2);
 #endif
-    {
+    } else {
       abort();
     }
   }
@@ -75,8 +113,6 @@ int main(int argc, const char **argv) {
     debug_file= stderr;
   }
 
-  const char *database= *argv++;
-
   sysassert( !setvbuf(debug,0,_IOLBF,0) );
 
   max_mass= atof(*argv++);
@@ -85,6 +121,30 @@ int main(int argc, const char **argv) {
   double loss_per_league= atof(*argv++);
   distance_loss_factor_per_league= 1.0 - loss_per_league;
 
+  min_trade_maxprofit= atoi(*argv++);
+
+  if (concur_base) {
+    for (i=0; i<concur_lim; i++) {
+      char *concfn= masprintf("%s%02d%s", concur_base, i, concur_rhs);
+      int concfd, r;
+      sysassert( (concfd= open(concfn, O_RDWR|O_CREAT|O_TRUNC, 0600)) >= 0);
+      struct flock fl;
+      memset(&fl,0,sizeof(fl));
+      fl.l_type= F_WRLCK;
+      r= fcntl(concfd, F_SETLK, &fl);
+      free(concfn);
+      if (!r) goto concur_ok;
+      sysassert( errno == EWOULDBLOCK );
+      close(concfd);
+    }
+    fprintf(output,"@@@ concurrency limit exceeded (%d)\n", concur_lim);
+    exit(0);
+
+  concur_ok:
+    /* deliberately leak concfd */
+    fprintf(output,"concurrency slot %d\n", i);
+  }
+
   setup_sql(database);
   setup_value();
   setup_search();
@@ -126,7 +186,7 @@ int main(int argc, const char **argv) {
       else final_isle= atoi(final_isle_spec);
       assert(final_isle);
 
-      PotentialResult ****buckets_base_io[GRANUS];
+      Bucket ****buckets_base_io[GRANUS];
       for (granui=0; granui<GRANUS; granui++)
 	buckets_base_io[granui]= &results[granui][resultsix];
 	
@@ -138,9 +198,9 @@ int main(int argc, const char **argv) {
     for (granui=0; granui<granus; granui++) {
       fprintf(output,"\n");
       for (i=0; i<resultsix; i++) {
-	tabdebugf("========== start #%d granui%d %s [PARTIAL] ==========\n",
+	tabdebugf("========== start #%d granui%d %s ==========\n",
 		  i, granui, argv[i]);
-	PotentialResult ***buckets_resultsix= results[granui][i];
+	Bucket ***buckets_resultsix= results[granui][i];
 	if (!buckets_resultsix) continue;
 	tabdebugf("    ");
 	for (mid=0; mid<granusz_mid[granui]; mid++) {
@@ -148,17 +208,17 @@ int main(int argc, const char **argv) {
 	}
 	tabdebugf("\n");
 	for (fin=0; fin<granusz_fin[granui]; fin++) {
-	  PotentialResult **buckets_fin= buckets_resultsix[fin];
+	  Bucket **buckets_fin= buckets_resultsix[fin];
 	  if (!buckets_fin) continue;
 	  tabdebugf("f%-3d",fin);
 	  for (mid=0; mid<granusz_mid[granui]; mid++) {
-	    PotentialResult *result= buckets_fin[mid];
+	    Bucket *result= buckets_fin[mid];
 	    if (!result) {
 	      tabdebugf("|          ");
 	    } else {
-	      tabdebugf("|%5d",(int)(result->value[A]));
+	      tabdebugf("|%5d",(int)(result->prs[A].value[A]));
 	      tabdebugf(" ");
-	      tabdebugf("%4d",(int)(result->value[P]));
+	      tabdebugf("%4d",(int)(result->prs[P].value[P]));
 	    }
 	  }
 	  tabdebugf("\n");
@@ -169,11 +229,12 @@ int main(int argc, const char **argv) {
 	int pos;
 	fprintf(output,"============== granui%d ap=%d ==============\n",
 		granui, ap);
-	for (pos=0; pos<nhighscores[granui][ap]; pos++) {
+	for (pos=nhighscores[granui][ap]-1; pos>=0; pos--) {
 	  HighScoreEntry *hs= &highscores[granui][ap][pos];
-	  PotentialResult *pr= hs->pr;
-	  if (!pr) continue;
-	  const int *const ports= pr->ports[ap];
+	  Bucket *bucket= hs->bucket;
+	  if (!bucket) continue;
+	  OnePotentialResult *pr= &bucket->prs[ap];
+	  const int *const ports= pr->ports;
 	  int nports;
 	  for (nports=0; nports<MAX_ROUTELEN && ports[nports]>=0; nports++);
 	  int finisle= ports[nports-1];
@@ -181,9 +242,10 @@ int main(int argc, const char **argv) {
 	  int midisle= ports[nports/2];
 	  int midarch= route2midarch(ports,nports);
 	  fprintf(output,
-		  " @%2d #%2d | start%3d mid%d:%3d f%d:%3d | %5d %5d %4d |",
-		  pos, nhighscores[granui][ap] - 1 - pos,
-		  ports[0], midarch,midisle, finarch,finisle,
+		  " @%2d %c#%2d | start%3d mid%d:%3d f%d:%3d"
+		  " | %3dlg | %5d %5d %4d |",
+		  pos, "ap"[ap], nhighscores[granui][ap] - pos,
+		  ports[0], midarch,midisle, finarch,finisle, pr->length,
 		  (int)hs->value, (int)pr->value[A], (int)pr->value[P]);
 	  for (i=0; i<nports; i++) fprintf(output," %d",ports[i]);
 	  fprintf(output,"\n");