* Copyright (C) 2008 Richard Kettlewell
* Copyright (C) 2008 Mark Wooding
*
- * This program is free software; you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * 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
- * General Public License for more details.
- *
+ *
+ * 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 General Public License for more details.
+ *
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-/** @file choose.c
+/** @file server/choose.c
* @brief Random track chooser
*
* Picks a track at random and writes it to standard output. If for
* 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
" --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);
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.
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
* 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. */
/* 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;
}
* 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)
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)