X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/f03c5a86c8c9b1f03d8ced522597c9a9844002b4..662887576254386b8e3481f6f3e6f0289f2500aa:/server/schedule.c
diff --git a/server/schedule.c b/server/schedule.c
index 7776c3c..ec7eddc 100644
--- a/server/schedule.c
+++ b/server/schedule.c
@@ -2,20 +2,18 @@
* This file is part of DisOrder
* Copyright (C) 2008 Richard Kettlewell
*
- * 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 .
*/
/** @file server/schedule.c
@@ -81,28 +79,7 @@
*
* TODO: add disorder-dump support
*/
-
-#include
-#include "types.h"
-
-#include
-#include
-#include
-#include
-
-#include "trackdb.h"
-#include "trackdb-int.h"
-#include "schedule.h"
-#include "table.h"
-#include "kvp.h"
-#include "log.h"
-#include "queue.h"
-#include "server-queue.h"
-#include "state.h"
-#include "play.h"
-#include "mem.h"
-#include "random.h"
-#include "vector.h"
+#include "disorder-server.h"
static int schedule_trigger(ev_source *ev,
const struct timeval *now,
@@ -118,6 +95,9 @@ static const char *const schedule_required[] = {"when", "who", "action"};
/** @brief Parse a scheduled event key and data
* @param k Pointer to key
+ * @param d Pointer to data
+ * @param idp Where to store event ID
+ * @param actiondatap Where to store parsed data
* @param whenp Where to store timestamp
* @return 0 on success, non-0 on error
*
@@ -208,6 +188,7 @@ static int schedule_init_tid(ev_source *ev,
if(priority && !strcmp(priority, "junk")) {
/* Junk actions that are in the past are discarded during startup */
/* TODO recurring events should be handled differently here */
+ info("junk event %s is in the past, discarding", id);
if(cdel(cursor))
goto deadlocked;
/* Skip this time */
@@ -247,10 +228,9 @@ void schedule_init(ev_source *ev) {
/******************************************************************************/
/** @brief Create a scheduled event
- * @param ev Event loop
+ * @param id Event ID
* @param actiondata Action data
- *
- * The caller should set the timeout themselves.
+ * @param tid Containing transaction
*/
static int schedule_add_tid(const char *id,
struct kvp *actiondata,
@@ -262,7 +242,8 @@ static int schedule_add_tid(const char *id,
k.data = (void *)id;
k.size = strlen(id);
switch(err = trackdb_scheduledb->put(trackdb_scheduledb, tid, &k,
- encode_data(&d, actiondata), 0)) {
+ encode_data(&d, actiondata),
+ DB_NOOVERWRITE)) {
case 0:
break;
case DB_LOCK_DEADLOCK:
@@ -285,10 +266,10 @@ static int schedule_add_tid(const char *id,
* is not allowed to perform them or if they are scheduled for a time
* in the past.
*/
-char *schedule_add(ev_source *ev,
- struct kvp *actiondata) {
+const char *schedule_add(ev_source *ev,
+ struct kvp *actiondata) {
int e, n;
- char *id;
+ const char *id;
struct timeval when;
/* TODO: handle recurring events */
@@ -314,7 +295,7 @@ char *schedule_add(ev_source *ev,
id = random_id();
WITH_TRANSACTION(schedule_add_tid(id, actiondata, tid));
} while(e == DB_KEYEXIST);
- ev_timeout(ev, 0/*handlep*/, &when, schedule_trigger, id);
+ ev_timeout(ev, 0/*handlep*/, &when, schedule_trigger, (void *)id);
return id;
}
@@ -393,7 +374,7 @@ static void schedule_play(ev_source *ev,
return;
}
info("scheduled event %s: %s play %s", id, who, track);
- q = queue_add(track, who, WHERE_START);
+ q = queue_add(track, who, WHERE_START, origin_scheduled);
queue_write();
if(q == qhead.next && playing)
prepare(ev, q);
@@ -439,6 +420,7 @@ static struct {
};
/** @brief Look up a scheduled event
+ * @param id Event ID
* @param actiondata Event description
* @return index in schedule_actions[] on success, -1 on error
*
@@ -454,7 +436,7 @@ static int schedule_lookup(const char *id,
int n;
/* Look up the action */
- n = TABLE_FIND(schedule_actions, typeof(schedule_actions[0]), name, action);
+ n = TABLE_FIND(schedule_actions, name, action);
if(n < 0) {
error(0, "scheduled event %s: unrecognized action '%s'", id, action);
return -1;