[asterisk-commits] trunk r30837 - in /trunk: UPGRADE.txt apps/app_queue.c

[asterisk-commits at lists.digium.com]

Author: kpfleming
Date: Tue May 30 12:52:49 2006
New Revision: 30837

URL: http://svn.digium.com/view/asterisk?rev=30837&view=rev
Log:
officially deprecate the 'roundrobin' queue strategy in favor of 'rrmemory'

Modified:
    trunk/UPGRADE.txt
    trunk/apps/app_queue.c

Modified: trunk/UPGRADE.txt
URL: http://svn.digium.com/view/asterisk/trunk/UPGRADE.txt?rev=30837&r1=30836&r2=30837&view=diff
==============================================================================
--- trunk/UPGRADE.txt (original)
+++ trunk/UPGRADE.txt Tue May 30 12:52:49 2006
@@ -119,6 +119,11 @@
   record conversations queue members are having with queue callers. Please
   see configs/queues.conf.sample for more information on this option.
 
+* The app_queue application strategy called 'roundrobin' has been deprecated
+  for this release. Users are encouraged to use 'rrmemory' instead, since it
+  provides more 'true' round-robin call delivery. For the Asterisk 1.6 release,
+  'rrmemory' will be renamed 'roundrobin'.
+
 * app_meetme: The 'm' option (monitor) is renamed to 'l' (listen only), and
   the 'm' option now provides the functionality of "initially muted". 
   In practice, most existing dialplans using the 'm' flag should not notice

Modified: trunk/apps/app_queue.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_queue.c?rev=30837&r1=30836&r2=30837&view=diff
==============================================================================
--- trunk/apps/app_queue.c (original)
+++ trunk/apps/app_queue.c Tue May 30 12:52:49 2006
@@ -394,6 +394,16 @@
 static AST_LIST_HEAD_STATIC(queues, ast_call_queue);
 
 static int set_member_paused(char *queuename, char *interface, int paused);
+
+static void rr_dep_warning(void)
+{
+	static unsigned int warned = 0;
+
+	if (!warned) {
+		ast_log(LOG_NOTICE, "The 'roundrobin' queue strategy is deprecated. Please use the 'rrmemory' strategy instead.\n");
+		warned = 1;
+	}
+}
 
 static void set_queue_result(struct ast_channel *chan, enum queue_result res)
 {
@@ -1027,6 +1037,9 @@
 		queue_set_param(q, tmp_name, v->value, -1, 0);
 		v = v->next;
 	}
+
+	if (q->strategy == QUEUE_STRATEGY_ROUNDROBIN)
+		rr_dep_warning();
 
 	/* Temporarily set non-dynamic members dead so we can detect deleted ones. */
 	m = q->members;
@@ -3692,6 +3705,9 @@
 					}
 				}
 
+				if (q->strategy == QUEUE_STRATEGY_ROUNDROBIN)
+					rr_dep_warning();
+
 				if (new) {
 					AST_LIST_INSERT_HEAD(&queues, q, list);
 				} else