[svn-commits] irroot: branch irroot/asterisk-trunk-quack-queue r345362 - /team/irroot/aster...
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Tue Nov 15 06:53:24 CST 2011
Author: irroot
Date: Tue Nov 15 06:47:47 2011
New Revision: 345362
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=345362
Log:
Remove QUEUE_WAITING_COUNT
Modified:
team/irroot/asterisk-trunk-quack-queue/apps/app_queue.c
Modified: team/irroot/asterisk-trunk-quack-queue/apps/app_queue.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/asterisk-trunk-quack-queue/apps/app_queue.c?view=diff&rev=345362&r1=345361&r2=345362
==============================================================================
--- team/irroot/asterisk-trunk-quack-queue/apps/app_queue.c (original)
+++ team/irroot/asterisk-trunk-quack-queue/apps/app_queue.c Tue Nov 15 06:47:47 2011
@@ -269,7 +269,6 @@
<ref type="function">QUEUE_VARIABLES</ref>
<ref type="function">QUEUE_MEMBER</ref>
<ref type="function">QUEUE_EXISTS</ref>
- <ref type="function">QUEUE_WAITING_COUNT</ref>
<ref type="function">QUEUE_MEMBER_LIST</ref>
<ref type="function">QUEUE_MEMBER_PENALTY</ref>
</see-also>
@@ -310,7 +309,6 @@
<ref type="function">QUEUE_VARIABLES</ref>
<ref type="function">QUEUE_MEMBER</ref>
<ref type="function">QUEUE_EXISTS</ref>
- <ref type="function">QUEUE_WAITING_COUNT</ref>
<ref type="function">QUEUE_MEMBER_LIST</ref>
<ref type="function">QUEUE_MEMBER_PENALTY</ref>
</see-also>
@@ -346,7 +344,6 @@
<ref type="function">QUEUE_VARIABLES</ref>
<ref type="function">QUEUE_MEMBER</ref>
<ref type="function">QUEUE_EXISTS</ref>
- <ref type="function">QUEUE_WAITING_COUNT</ref>
<ref type="function">QUEUE_MEMBER_LIST</ref>
<ref type="function">QUEUE_MEMBER_PENALTY</ref>
</see-also>
@@ -389,7 +386,6 @@
<ref type="function">QUEUE_VARIABLES</ref>
<ref type="function">QUEUE_MEMBER</ref>
<ref type="function">QUEUE_EXISTS</ref>
- <ref type="function">QUEUE_WAITING_COUNT</ref>
<ref type="function">QUEUE_MEMBER_LIST</ref>
<ref type="function">QUEUE_MEMBER_PENALTY</ref>
</see-also>
@@ -429,7 +425,6 @@
<ref type="function">QUEUE_VARIABLES</ref>
<ref type="function">QUEUE_MEMBER</ref>
<ref type="function">QUEUE_EXISTS</ref>
- <ref type="function">QUEUE_WAITING_COUNT</ref>
<ref type="function">QUEUE_MEMBER_LIST</ref>
<ref type="function">QUEUE_MEMBER_PENALTY</ref>
</see-also>
@@ -459,7 +454,6 @@
<ref type="function">QUEUE_VARIABLES</ref>
<ref type="function">QUEUE_MEMBER</ref>
<ref type="function">QUEUE_EXISTS</ref>
- <ref type="function">QUEUE_WAITING_COUNT</ref>
<ref type="function">QUEUE_MEMBER_LIST</ref>
<ref type="function">QUEUE_MEMBER_PENALTY</ref>
</see-also>
@@ -512,7 +506,6 @@
<ref type="function">QUEUE_VARIABLES</ref>
<ref type="function">QUEUE_MEMBER</ref>
<ref type="function">QUEUE_EXISTS</ref>
- <ref type="function">QUEUE_WAITING_COUNT</ref>
<ref type="function">QUEUE_MEMBER_LIST</ref>
<ref type="function">QUEUE_MEMBER_PENALTY</ref>
</see-also>
@@ -567,7 +560,6 @@
<ref type="function">QUEUE_VARIABLES</ref>
<ref type="function">QUEUE_MEMBER</ref>
<ref type="function">QUEUE_EXISTS</ref>
- <ref type="function">QUEUE_WAITING_COUNT</ref>
<ref type="function">QUEUE_MEMBER_LIST</ref>
<ref type="function">QUEUE_MEMBER_PENALTY</ref>
</see-also>
@@ -593,33 +585,6 @@
<ref type="function">QUEUE_MEMBER</ref>
<ref type="function">QUEUE_MEMBER_COUNT</ref>
<ref type="function">QUEUE_EXISTS</ref>
- <ref type="function">QUEUE_WAITING_COUNT</ref>
- <ref type="function">QUEUE_MEMBER_LIST</ref>
- <ref type="function">QUEUE_MEMBER_PENALTY</ref>
- </see-also>
- </function>
- <function name="QUEUE_WAITING_COUNT" language="en_US">
- <synopsis>
- Count number of calls currently waiting in a queue.
- </synopsis>
- <syntax>
- <parameter name="queuename" />
- </syntax>
- <description>
- <para>Returns the number of callers currently waiting in the specified <replaceable>queuename</replaceable>.</para>
- </description>
- <see-also>
- <ref type="application">Queue</ref>
- <ref type="application">QueueLog</ref>
- <ref type="application">AddQueueMember</ref>
- <ref type="application">RemoveQueueMember</ref>
- <ref type="application">PauseQueueMember</ref>
- <ref type="application">UnpauseQueueMember</ref>
- <ref type="function">QUEUE_VARIABLES</ref>
- <ref type="function">QUEUE_MEMBER</ref>
- <ref type="function">QUEUE_MEMBER_COUNT</ref>
- <ref type="function">QUEUE_EXISTS</ref>
- <ref type="function">QUEUE_WAITING_COUNT</ref>
<ref type="function">QUEUE_MEMBER_LIST</ref>
<ref type="function">QUEUE_MEMBER_PENALTY</ref>
</see-also>
@@ -645,7 +610,6 @@
<ref type="function">QUEUE_MEMBER</ref>
<ref type="function">QUEUE_MEMBER_COUNT</ref>
<ref type="function">QUEUE_EXISTS</ref>
- <ref type="function">QUEUE_WAITING_COUNT</ref>
<ref type="function">QUEUE_MEMBER_LIST</ref>
<ref type="function">QUEUE_MEMBER_PENALTY</ref>
</see-also>
@@ -673,7 +637,6 @@
<ref type="function">QUEUE_MEMBER</ref>
<ref type="function">QUEUE_MEMBER_COUNT</ref>
<ref type="function">QUEUE_EXISTS</ref>
- <ref type="function">QUEUE_WAITING_COUNT</ref>
<ref type="function">QUEUE_MEMBER_LIST</ref>
<ref type="function">QUEUE_MEMBER_PENALTY</ref>
</see-also>
@@ -6789,40 +6752,6 @@
return ret;
}
-/*! \brief Dialplan function QUEUE_WAITING_COUNT() Get number callers waiting in a specific queue */
-static int queue_function_queuewaitingcount(struct ast_channel *chan, const char *cmd, char *data, char *buf, size_t len)
-{
- int count = 0;
- struct call_queue *q;
- struct ast_variable *var = NULL;
-
- buf[0] = '\0';
-
- if (ast_strlen_zero(data)) {
- ast_log(LOG_ERROR, "QUEUE_WAITING_COUNT requires an argument: queuename\n");
- return -1;
- }
-
- if ((q = ao2_t_find(queues, data, OBJ_KEY, "Find for QUEUE_WAITING_COUNT()"))) {
- ao2_lock(q->data);
- count = q->data->count;
- ao2_unlock(q->data);
- ao2_t_ref(q, -1, "Done with reference in QUEUE_WAITING_COUNT()");
- } else if ((var = ast_load_realtime("queues", "name", data, SENTINEL))) {
- /* if the queue is realtime but was not found in memory, this
- * means that the queue had been deleted from memory since it was
- * "dead." This means it has a 0 waiting count
- */
- count = 0;
- ast_variables_destroy(var);
- } else
- ast_log(LOG_WARNING, "queue %s was not found\n", data);
-
- snprintf(buf, len, "%d", count);
-
- return 0;
-}
-
/*! \brief Dialplan function QUEUE_MEMBER_LIST() Get list of members in a specific queue */
static int queue_function_queuememberlist(struct ast_channel *chan, const char *cmd, char *data, char *buf, size_t len)
{
@@ -6967,11 +6896,6 @@
.name = "QUEUE_MEMBER",
.read = queue_function_mem_read,
.write = queue_function_mem_write,
-};
-
-static struct ast_custom_function queuewaitingcount_function = {
- .name = "QUEUE_WAITING_COUNT",
- .read = queue_function_queuewaitingcount,
};
static struct ast_custom_function queuememberlist_function = {
@@ -9042,7 +8966,6 @@
res |= ast_custom_function_unregister(&queuevar_function);
res |= ast_custom_function_unregister(&queuemembercount_function);
res |= ast_custom_function_unregister(&queuememberlist_function);
- res |= ast_custom_function_unregister(&queuewaitingcount_function);
res |= ast_custom_function_unregister(&queuememberpenalty_function);
res |= ast_data_unregister(NULL);
@@ -9122,7 +9045,6 @@
res |= ast_custom_function_register(&queueexists_function);
res |= ast_custom_function_register(&queuemembercount_function);
res |= ast_custom_function_register(&queuememberlist_function);
- res |= ast_custom_function_register(&queuewaitingcount_function);
res |= ast_custom_function_register(&queuememberpenalty_function);
if (!(devicestate_tps = ast_taskprocessor_get("app_queue", 0))) {
More information about the svn-commits
mailing list