X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/fcdff1398b72c97915b11975046865fbdf2f8713..d8b957853160200fe6b00d8c0e8c61a3f62ecd7c:/server/choose.c

diff --git a/server/choose.c b/server/choose.c
index 927d613..138462c 100644
--- a/server/choose.c
+++ b/server/choose.c
@@ -26,37 +26,7 @@
  * deadlock - it just exits and expects the server to try again.
  */
 
-#include <config.h>
-#include "types.h"
-
-#include <getopt.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <db.h>
-#include <locale.h>
-#include <errno.h>
-#include <sys/types.h>
-#include <unistd.h>
-#include <pcre.h>
-#include <string.h>
-#include <fcntl.h>
-#include <syslog.h>
-#include <time.h>
-
-#include "configuration.h"
-#include "log.h"
-#include "defs.h"
-#include "mem.h"
-#include "kvp.h"
-#include "syscalls.h"
-#include "printf.h"
-#include "trackdb.h"
-#include "trackdb-int.h"
-#include "version.h"
-#include "trackname.h"
-#include "queue.h"
-#include "server-queue.h"
-#include "random.h"
+#include "disorder-server.h"
 
 #define BASE_WEIGHT 90000
 
@@ -84,7 +54,7 @@ static void help(void) {
 	  "  --debug, -d             Turn on debugging\n"
           "  --[no-]syslog           Enable/disable logging to syslog\n"
           "\n"
-          "Track choose for DisOrder.  Not intended to be run\n"
+          "Track chooser for DisOrder.  Not intended to be run\n"
           "directly.\n");
   xfclose(stdout);
   exit(0);
@@ -196,7 +166,7 @@ static unsigned long long pick_weight(unsigned long long limit) {
   unsigned long long t, r, slop;
   int i, nby, nbi;
 
-  //info("pick_weight: limit = %llu", limit);
+  D(("pick_weight: limit = %#016llx", limit));
 
   /* First, decide how many bits of output we actually need; do bytes first
    * (they're quicker) and then bits.
@@ -213,7 +183,7 @@ static unsigned long long pick_weight(unsigned long long limit) {
   if (t >> 2) { t >>= 2; nbi += 2; }
   if (t >> 1) { t >>= 1; nbi += 1; }
   nbi++;
-  //info("nby = %d; nbi = %d", nby, nbi);
+  D(("nby = %d; nbi = %d", nby, nbi));
 
   /* Main randomness collection loop.  We read a number of bytes from the
    * randomness source, and glue them together into an integer (dropping
@@ -227,10 +197,10 @@ static unsigned long long pick_weight(unsigned long long limit) {
    * limit > 0; if r < slop then we try again, otherwise r - slop is our
    * winner.
    */
-  slop = (2 << (nbi - 1)) - limit;
+  slop = ((unsigned long long)2 << (nbi - 1)) - limit;
   m = nbi & 7 ? (1 << (nbi & 7)) - 1 : 0xff;
-  //info("slop = %llu", slop);
-  //info("m = 0x%02x", m);
+  D(("slop = %#016llx", slop));
+  D(("m = 0x%02x", m));
 
   do {
     /* Actually get some random data. */
@@ -242,9 +212,10 @@ static unsigned long long pick_weight(unsigned long long limit) {
     /* Turn it into an integer.  */
     for (r = 0, i = 0; i < nby; i++)
       r = (r << 8) | buf[i];
-    //info("r = %llu", r);
+    D(("r = %#016llx", r));
   } while (r < slop);
 
+  D(("  result=%#016llx", r - slop));
   return r - slop;
 }
 
@@ -279,6 +250,7 @@ static int collect_tracks_callback(const char *track,
    * choose thing i, for 0 <= i < n - 1, is w_i/c_{n-1} (induction
    * hypothesis); undoing the conditioning gives the desired result.
    */
+  D(("consider %s", track));
   if(weight) {
     total_weight += weight;
     if (pick_weight(total_weight) < weight)
@@ -330,7 +302,7 @@ int main(int argc, char **argv) {
   trackdb_commit_transaction(global_tid);
   trackdb_close();
   trackdb_deinit();
-  //info("ntracks=%ld total_weight=%lld", ntracks, total_weight);
+  D(("ntracks=%ld total_weight=%lld", ntracks, total_weight));
   if(!total_weight)
     fatal(0, "no tracks match random choice criteria");
   if(!winning)