X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/137e36ed2877b136e5fb0b7f5eead77be4d1ae3f..ad08c366a19e95d19e8ee5d66b050530339561e4:/server/trackdb.c diff --git a/server/trackdb.c b/server/trackdb.c index 330f16f..8cfd71f 100644 --- a/server/trackdb.c +++ b/server/trackdb.c @@ -1,6 +1,6 @@ /* * This file is part of DisOrder - * Copyright (C) 2005, 2006 Richard Kettlewell + * Copyright (C) 2005, 2006, 2007 Richard Kettlewell * * 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 @@ -33,6 +33,7 @@ #include #include #include +#include #include "event.h" #include "mem.h" @@ -65,6 +66,10 @@ static int trackdb_alltags_tid(DB_TXN *tid, char ***taglistp); static int trackdb_get_global_tid(const char *name, DB_TXN *tid, const char **rp); +static char **trackdb_new_tid(int *ntracksp, + int maxtracks, + DB_TXN *tid); +static int trackdb_expire_noticed_tid(time_t earliest, DB_TXN *tid); const struct cache_type cache_files_type = { 86400 }; unsigned long cache_files_hits, cache_files_misses; @@ -78,6 +83,7 @@ DB *trackdb_prefsdb; /* preferences */ DB *trackdb_searchdb; /* the search database */ DB *trackdb_tagsdb; /* the tags database */ DB *trackdb_globaldb; /* global preferences */ +DB *trackdb_noticeddb; /* when track noticed */ static pid_t db_deadlock_pid = -1; /* deadlock manager PID */ static pid_t rescan_pid = -1; /* rescanner PID */ static int initialized, opened; /* state */ @@ -124,7 +130,7 @@ void trackdb_init(int recover) { |DB_CREATE |recover_type[recover], 0666))) - fatal(0, "trackdb_env->open: %s", db_strerror(err)); + fatal(0, "trackdb_env->open %s: %s", config->home, db_strerror(err)); trackdb_env->set_errpfx(trackdb_env, "DB"); trackdb_env->set_errfile(trackdb_env, stderr); trackdb_env->set_verbose(trackdb_env, DB_VERB_DEADLOCK, 1); @@ -148,39 +154,35 @@ static int reap_db_deadlock(ev_source attribute((unused)) *ev, return 0; } -static pid_t subprogram(ev_source *ev, const char *prog) { +static pid_t subprogram(ev_source *ev, const char *prog, + int outputfd) { pid_t pid; - int lfd; /* If we're in the background then trap subprocess stdout/stderr */ - if(!isatty(2)) - lfd = logfd(ev, prog); - else - lfd = -1; if(!(pid = xfork())) { exitfn = _exit; ev_signal_atfork(ev); signal(SIGPIPE, SIG_DFL); - if(lfd != -1) { - xdup2(lfd, 1); - xdup2(lfd, 2); + if(outputfd != -1) { + xdup2(outputfd, 1); + xclose(outputfd); } /* If we were negatively niced, undo it. We don't bother checking for * error, it's not that important. */ setpriority(PRIO_PROCESS, 0, 0); execlp(prog, prog, "--config", configfile, debugging ? "--debug" : "--no-debug", + log_default == &log_syslog ? "--syslog" : "--no-syslog", (char *)0); fatal(errno, "error invoking %s", prog); } - if(lfd != -1) xclose(lfd); return pid; } /* start deadlock manager */ void trackdb_master(ev_source *ev) { assert(db_deadlock_pid == -1); - db_deadlock_pid = subprogram(ev, DEADLOCK); + db_deadlock_pid = subprogram(ev, DEADLOCK, -1); ev_child(ev, db_deadlock_pid, 0, reap_db_deadlock, 0); D(("started deadlock manager")); } @@ -247,6 +249,8 @@ void trackdb_open(void) { DB_DUP|DB_DUPSORT, DB_HASH, DB_CREATE, 0666); trackdb_prefsdb = open_db("prefs.db", 0, DB_HASH, DB_CREATE, 0666); trackdb_globaldb = open_db("global.db", 0, DB_HASH, DB_CREATE, 0666); + trackdb_noticeddb = open_db("noticed.db", + DB_DUPSORT, DB_BTREE, DB_CREATE, 0666); D(("opened databases")); } @@ -267,6 +271,8 @@ void trackdb_close(void) { fatal(0, "error closing prefs.db: %s", db_strerror(err)); if((err = trackdb_globaldb->close(trackdb_globaldb, 0))) fatal(0, "error closing global.db: %s", db_strerror(err)); + if((err = trackdb_noticeddb->close(trackdb_noticeddb, 0))) + fatal(0, "error closing noticed.db: %s", db_strerror(err)); trackdb_tracksdb = trackdb_searchdb = trackdb_prefsdb = 0; trackdb_tagsdb = trackdb_globaldb = 0; D(("closed databases")); @@ -673,7 +679,9 @@ done: /* trackdb_notice() **********************************************************/ -/* notice a track */ +/** @brief notice a possibly new track + * @return @c DB_NOTFOUND if new, 0 if already known + */ int trackdb_notice(const char *track, const char *path) { int err; @@ -691,6 +699,9 @@ int trackdb_notice(const char *track, return err; } +/** @brief notice a possibly new track + * @return @c DB_NOTFOUND if new, 0 if already known, @c DB_LOCK_DEADLOCK also + */ int trackdb_notice_tid(const char *track, const char *path, DB_TXN *tid) { @@ -698,13 +709,13 @@ int trackdb_notice_tid(const char *track, struct kvp *t, *a, *p; int t_changed, ret; char *alias, **w; - + /* notice whether the tracks.db entry changes */ t_changed = 0; /* get any existing tracks entry */ if((err = gettrackdata(track, &t, &p, 0, 0, tid)) == DB_LOCK_DEADLOCK) return err; - ret = err; + ret = err; /* 0 or DB_NOTFOUND */ /* this is a real track */ t_changed += kvp_set(&t, "_alias_for", 0); t_changed += kvp_set(&t, "_path", path); @@ -731,6 +742,24 @@ int trackdb_notice_tid(const char *track, /* only store the tracks.db entry if it has changed */ if(t_changed && (err = trackdb_putdata(trackdb_tracksdb, track, t, tid, 0))) return err; + if(ret == DB_NOTFOUND) { + uint32_t timestamp[2]; + time_t now; + DBT key, data; + + time(&now); + timestamp[0] = htonl((uint64_t)now >> 32); + timestamp[1] = htonl((uint32_t)now); + memset(&key, 0, sizeof key); + key.data = timestamp; + key.size = sizeof timestamp; + switch(err = trackdb_noticeddb->put(trackdb_noticeddb, tid, &key, + make_key(&data, track), 0)) { + case 0: break; + case DB_LOCK_DEADLOCK: return err; + default: fatal(0, "error updating noticed.db: %s", db_strerror(err)); + } + } return ret; } @@ -919,7 +948,6 @@ static int search_league(struct vector *v, int count, DB_TXN *tid) { char **trackdb_stats(int *nstatsp) { DB_TXN *tid; struct vector v; - char *s; vector_init(&v); for(;;) { @@ -935,12 +963,6 @@ char **trackdb_stats(int *nstatsp) { if(get_stats(&v, trackdb_prefsdb, SI(hash), tid)) goto fail; vector_append(&v, (char *)""); if(search_league(&v, 10, tid)) goto fail; - vector_append(&v, (char *)""); - vector_append(&v, (char *)"Server stats:"); - byte_xasprintf(&s, "track lookup cache hits: %lu", cache_files_hits); - vector_append(&v, (char *)s); - byte_xasprintf(&s, "track lookup cache misses: %lu", cache_files_misses); - vector_append(&v, (char *)s); vector_terminate(&v); break; fail: @@ -951,6 +973,89 @@ fail: return v.vec; } +struct stats_details { + void (*done)(char *data, void *u); + void *u; + int exited; /* subprocess exited */ + int closed; /* pipe close */ + int wstat; /* wait status from subprocess */ + struct dynstr data[1]; /* data read from pipe */ +}; + +static void stats_complete(struct stats_details *d) { + char *s; + + if(!(d->exited && d->closed)) + return; + byte_xasprintf(&s, "\n" + "Server stats:\n" + "track lookup cache hits: %lu\n" + "track lookup cache misses: %lu\n", + cache_files_hits, + cache_files_misses); + dynstr_append_string(d->data, s); + dynstr_terminate(d->data); + d->done(d->data->vec, d->u); +} + +static int stats_finished(ev_source attribute((unused)) *ev, + pid_t attribute((unused)) pid, + int status, + const struct rusage attribute((unused)) *rusage, + void *u) { + struct stats_details *const d = u; + + d->exited = 1; + if(status) + error(0, "disorder-stats %s", wstat(status)); + stats_complete(d); + return 0; +} + +static int stats_read(ev_source attribute((unused)) *ev, + ev_reader *reader, + void *ptr, + size_t bytes, + int eof, + void *u) { + struct stats_details *const d = u; + + dynstr_append_bytes(d->data, ptr, bytes); + ev_reader_consume(reader, bytes); + if(eof) + d->closed = 1; + stats_complete(d); + return 0; +} + +static int stats_error(ev_source attribute((unused)) *ev, + int errno_value, + void *u) { + struct stats_details *const d = u; + + error(errno_value, "error reading from pipe to disorder-stats"); + d->closed = 1; + stats_complete(d); + return 0; +} + +void trackdb_stats_subprocess(ev_source *ev, + void (*done)(char *data, void *u), + void *u) { + int p[2]; + pid_t pid; + struct stats_details *d = xmalloc(sizeof *d); + + dynstr_init(d->data); + d->done = done; + d->u = u; + xpipe(p); + pid = subprogram(ev, "disorder-stats", p[1]); + xclose(p[1]); + ev_child(ev, pid, 0, stats_finished, d); + ev_reader_new(ev, p[0], stats_read, stats_error, d, "disorder-stats reader"); +} + /* set a pref (remove if value=0) */ int trackdb_set(const char *track, const char *name, @@ -960,6 +1065,10 @@ int trackdb_set(const char *track, int err, cmp; char *oldalias, *newalias, **oldtags = 0, **newtags; + if(value) { + /* TODO: if value matches default then set value=0 */ + } + for(;;) { tid = trackdb_begin_transaction(); if((err = gettrackdata(track, &t, &p, 0, @@ -1278,8 +1387,7 @@ const char *trackdb_random(int tries) { } else { /* No required tags. We pick random record numbers in the database * instead. */ - switch(err = trackdb_tracksdb->stat(trackdb_tracksdb, tid, &sp, - DB_RECORDCOUNT)) { + switch(err = trackdb_tracksdb->stat(trackdb_tracksdb, tid, &sp, 0)) { case 0: break; case DB_LOCK_DEADLOCK: @@ -1649,22 +1757,37 @@ int trackdb_scan(const char *root, DB_TXN *tid) { DBC *cursor; DBT k, d; - size_t root_len = strlen(root); - int err; + const size_t root_len = root ? strlen(root) : 0; + int err, cberr; struct kvp *data; + const char *track; cursor = trackdb_opencursor(trackdb_tracksdb, tid); - err = cursor->c_get(cursor, make_key(&k, root), prepare_data(&d), - DB_SET_RANGE); + if(root) + err = cursor->c_get(cursor, make_key(&k, root), prepare_data(&d), + DB_SET_RANGE); + else { + memset(&k, 0, sizeof k); + err = cursor->c_get(cursor, &k, prepare_data(&d), + DB_FIRST); + } while(!err) { - if(k.size > root_len - && !strncmp(k.data, root, root_len) - && ((char *)k.data)[root_len] == '/') { + if(!root + || (k.size > root_len + && !strncmp(k.data, root, root_len) + && ((char *)k.data)[root_len] == '/')) { data = kvp_urldecode(d.data, d.size); - if(kvp_get(data, "_path")) - if((err = callback(xstrndup(k.data, k.size), data, u, tid))) + if(kvp_get(data, "_path")) { + track = xstrndup(k.data, k.size); + /* Advance to the next track before the callback so that the callback + * may safely delete the track */ + err = cursor->c_get(cursor, &k, &d, DB_NEXT); + if((cberr = callback(track, data, u, tid))) { + err = cberr; break; - err = cursor->c_get(cursor, &k, &d, DB_NEXT); + } + } else + err = cursor->c_get(cursor, &k, &d, DB_NEXT); } else break; } @@ -1698,6 +1821,7 @@ static int reap_rescan(ev_source attribute((unused)) *ev, D(("disorderd-rescan terminate: %s", wstat(status))); /* Our cache of file lookups is out of date now */ cache_clean(&cache_files_type); + eventlog("rescanned", (char *)0); return 0; } @@ -1706,7 +1830,7 @@ void trackdb_rescan(ev_source *ev) { error(0, "rescan already underway"); return; } - rescan_pid = subprogram(ev, RESCAN); + rescan_pid = subprogram(ev, RESCAN, -1); ev_child(ev, rescan_pid, 0, reap_rescan, 0); D(("started rescanner")); @@ -1808,6 +1932,125 @@ static int trackdb_get_global_tid(const char *name, } } +/** @brief Retrieve the most recently added tracks + * @param ntracksp Where to put count, or 0 + * @param maxtracks Maximum number of tracks to retrieve + * @return null-terminated array of track names + * + * The most recently added track is first in the array. + */ +char **trackdb_new(int *ntracksp, + int maxtracks) { + DB_TXN *tid; + char **tracks; + + for(;;) { + tid = trackdb_begin_transaction(); + tracks = trackdb_new_tid(ntracksp, maxtracks, tid); + if(tracks) + break; + trackdb_abort_transaction(tid); + } + trackdb_commit_transaction(tid); + return tracks; +} + +/** @brief Retrieve the most recently added tracks + * @param ntracksp Where to put count, or 0 + * @param maxtracks Maximum number of tracks to retrieve, or 0 for all + * @param tid Transaction ID + * @return null-terminated array of track names, or NULL on deadlock + * + * The most recently added track is first in the array. + */ +static char **trackdb_new_tid(int *ntracksp, + int maxtracks, + DB_TXN *tid) { + DBC *c; + DBT k, d; + int err = 0; + struct vector tracks[1]; + + vector_init(tracks); + c = trackdb_opencursor(trackdb_noticeddb, tid); + while((maxtracks <= 0 || tracks->nvec < maxtracks) + && !(err = c->c_get(c, prepare_data(&k), prepare_data(&d), DB_PREV))) + vector_append(tracks, xstrndup(d.data, d.size)); + switch(err) { + case 0: /* hit maxtracks */ + case DB_NOTFOUND: /* ran out of tracks */ + break; + case DB_LOCK_DEADLOCK: + trackdb_closecursor(c); + return 0; + default: + fatal(0, "error reading noticed.db: %s", db_strerror(err)); + } + if((err = trackdb_closecursor(c))) + return 0; /* deadlock */ + vector_terminate(tracks); + if(ntracksp) + *ntracksp = tracks->nvec; + return tracks->vec; +} + +/** @brief Expire noticed.db + * @param earliest Earliest timestamp to keep + */ +void trackdb_expire_noticed(time_t earliest) { + DB_TXN *tid; + + for(;;) { + tid = trackdb_begin_transaction(); + if(!trackdb_expire_noticed_tid(earliest, tid)) + break; + trackdb_abort_transaction(tid); + } + trackdb_commit_transaction(tid); +} + +/** @brief Expire noticed.db + * @param earliest Earliest timestamp to keep + * @param tid Transaction ID + * @return 0 or DB_LOCK_DEADLOCK + */ +static int trackdb_expire_noticed_tid(time_t earliest, DB_TXN *tid) { + DBC *c; + DBT k, d; + int err = 0, ret; + time_t when; + uint32_t *kk; + int count = 0; + + c = trackdb_opencursor(trackdb_noticeddb, tid); + while(!(err = c->c_get(c, prepare_data(&k), prepare_data(&d), DB_NEXT))) { + kk = k.data; + when = (time_t)(((uint64_t)ntohl(kk[0]) << 32) + ntohl(kk[1])); + if(when >= earliest) + break; + if((err = c->c_del(c, 0))) { + if(err != DB_LOCK_DEADLOCK) + fatal(0, "error deleting expired noticed.db entry: %s", + db_strerror(err)); + break; + } + ++count; + } + if(err == DB_NOTFOUND) + err = 0; + if(err && err != DB_LOCK_DEADLOCK) + fatal(0, "error expiring noticed.db: %s", db_strerror(err)); + ret = err; + if((err = trackdb_closecursor(c))) { + if(err != DB_LOCK_DEADLOCK) + fatal(0, "error closing cursor: %s", db_strerror(err)); + ret = err; + } + if(!ret && count) + info("expired %d tracks from noticed.db", count); + return ret; +} + /* tidying up ****************************************************************/ void trackdb_gc(void) {