From 05444a6ebd9ec882723fea0a611be9f2d030e633 Mon Sep 17 00:00:00 2001
From: Anthony Minessale <anthm@freeswitch.org>
Date: Wed, 7 Aug 2013 21:22:26 +0500
Subject: [PATCH] FS-5661 --resolve

---
 src/include/switch_scheduler.h                   |  1 +
 src/mod/applications/mod_commands/mod_commands.c |  6 ++++--
 src/mod/applications/mod_dptools/mod_dptools.c   |  4 +++-
 src/switch_scheduler.c                           | 11 +++++++++++
 4 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/src/include/switch_scheduler.h b/src/include/switch_scheduler.h
index 8d9bd9ca1a..59997a006d 100644
--- a/src/include/switch_scheduler.h
+++ b/src/include/switch_scheduler.h
@@ -43,6 +43,7 @@ SWITCH_BEGIN_EXTERN_C
 	int64_t created;
 	int64_t runtime;
 	uint32_t cmd_id;
+	uint32_t repeat;
 	char *group;
 	void *cmd_arg;
 	uint32_t task_id;
diff --git a/src/mod/applications/mod_commands/mod_commands.c b/src/mod/applications/mod_commands/mod_commands.c
index ef91f36a8d..fc74c3dd65 100644
--- a/src/mod/applications/mod_commands/mod_commands.c
+++ b/src/mod/applications/mod_commands/mod_commands.c
@@ -3164,7 +3164,7 @@ SWITCH_STANDARD_API(uuid_broadcast_function)
 	return SWITCH_STATUS_SUCCESS;
 }
 
-#define SCHED_BROADCAST_SYNTAX "[+]<time> <uuid> <path> [aleg|bleg|both]"
+#define SCHED_BROADCAST_SYNTAX "[[+]<time>|@time] <uuid> <path> [aleg|bleg|both]"
 SWITCH_STANDARD_API(sched_broadcast_function)
 {
 	char *mycmd = NULL, *argv[4] = { 0 };
@@ -3180,7 +3180,9 @@ SWITCH_STANDARD_API(sched_broadcast_function)
 		switch_media_flag_t flags = SMF_NONE;
 		time_t when;
 
-		if (*argv[0] == '+') {
+		if (*argv[0] == '@') {
+			when = atol(argv[0] + 1);
+		} else if (*argv[0] == '+') {
 			when = switch_epoch_time_now(NULL) + atol(argv[0] + 1);
 		} else {
 			when = atol(argv[0]);
diff --git a/src/mod/applications/mod_dptools/mod_dptools.c b/src/mod/applications/mod_dptools/mod_dptools.c
index ede2d5f742..1f910c70ab 100755
--- a/src/mod/applications/mod_dptools/mod_dptools.c
+++ b/src/mod/applications/mod_dptools/mod_dptools.c
@@ -1121,7 +1121,9 @@ SWITCH_STANDARD_APP(sched_broadcast_function)
 			uint32_t id;
 			char ids[80] = "";
 
-			if (*argv[0] == '+') {
+			if (*argv[0] == '@') {
+				when = atol(argv[0] + 1);
+			} else if (*argv[0] == '+') {
 				when = switch_epoch_time_now(NULL) + atol(argv[0] + 1);
 			} else {
 				when = atol(argv[0]);
diff --git a/src/switch_scheduler.c b/src/switch_scheduler.c
index 056d952242..b71821e298 100644
--- a/src/switch_scheduler.c
+++ b/src/switch_scheduler.c
@@ -61,6 +61,10 @@ static void switch_scheduler_execute(switch_scheduler_task_container_t *tp)
 
 	tp->func(&tp->task);
 
+	if (tp->task.repeat) {
+		tp->task.runtime = switch_epoch_time_now(NULL) + tp->task.repeat;
+	}
+
 	if (tp->task.runtime > tp->executed) {
 		tp->executed = 0;
 		if (switch_event_create(&event, SWITCH_EVENT_RE_SCHEDULE) == SWITCH_STATUS_SUCCESS) {
@@ -190,10 +194,17 @@ SWITCH_DECLARE(uint32_t) switch_scheduler_add_task(time_t task_runtime,
 {
 	switch_scheduler_task_container_t *container, *tp;
 	switch_event_t *event;
+	switch_time_t now = switch_epoch_time_now(NULL);
 
 	switch_mutex_lock(globals.task_mutex);
 	switch_zmalloc(container, sizeof(*container));
 	switch_assert(func);
+
+	if (task_runtime < now) {
+		container->task.repeat = task_runtime;
+		task_runtime += now;
+	}
+
 	container->func = func;
 	container->task.created = switch_epoch_time_now(NULL);
 	container->task.runtime = task_runtime;