* 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 "disorder-server.h"
+
+#define BASE_WEIGHT 90000
static DB_TXN *global_tid;
struct kvp *prefs) {
const char *s;
char **track_tags;
- time_t last, now;
+ time_t last, now = time(0);
/* Reject tracks not in any collection (race between edit config and
* rescan) */
/* Reject tracks played within the last 8 hours */
if((s = kvp_get(prefs, "played_time"))) {
last = atoll(s);
- now = time(0);
if(now < last + config->replay_min)
return 0;
}
if((errno == 0 || errno == ERANGE) && n >= 0)
return n;
}
-
- return 90000;
-}
-static unsigned char random_buffer[4096];
-static size_t random_left;
-
-/** @brief Fill [buf, buf+n) with random bytes */
-static void random_bytes(unsigned char *buf, size_t n) {
- while(n > 0) {
- if(random_left > 0) {
- const size_t this_time = n > random_left ? random_left : n;
-
- memcpy(buf, random_buffer + random_left - this_time, this_time);
- n -= this_time;
- random_left -= this_time;
- } else {
- static int fd = -1;
- int r;
-
- if(fd < 0) {
- if((fd = open("/dev/urandom", O_RDONLY)) < 0)
- fatal(errno, "opening /dev/urandom");
- }
- if((r = read(fd, random_buffer, sizeof random_buffer)) < 0)
- fatal(errno, "reading /dev/urandom");
- if((size_t)r < sizeof random_buffer)
- fatal(0, "short read from /dev/urandom");
- random_left = sizeof random_buffer;
- }
+ /* Bias up tracks that were recently added */
+ if((s = kvp_get(data, "_noticed"))) {
+ const time_t noticed = atoll(s);
+
+ if(noticed + config->new_bias_age < now)
+ /* Currently we just step up the weight of tracks that are in range. A
+ * more sophisticated approach would be to linearly decay from new_bias
+ * down to BASE_WEIGHT over the course of the new_bias_age interval
+ * starting when the track is added. */
+ return config->new_bias;
}
+
+ return BASE_WEIGHT;
}
/** @brief Pick a random integer uniformly from [0, 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.
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. */
- random_bytes(buf, nby);
+ random_get(buf, nby);
/* Clobber the top byte. */
buf[0] &= m;
/* 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)