[svn-commits] russell: branch russell/issue_12658 r163102 - in /team/russell/issue_12658: ....
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Thu Dec 11 11:16:53 CST 2008
Author: russell
Date: Thu Dec 11 11:16:52 2008
New Revision: 163102
URL: http://svn.digium.com/view/asterisk?view=rev&rev=163102
Log:
sync with 1.4
Modified:
team/russell/issue_12658/ (props changed)
team/russell/issue_12658/apps/app_queue.c
team/russell/issue_12658/res/res_agi.c
team/russell/issue_12658/res/res_features.c
Propchange: team/russell/issue_12658/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Dec 11 11:16:52 2008
@@ -1,1 +1,1 @@
-/branches/1.4:1-162973
+/branches/1.4:1-163101
Modified: team/russell/issue_12658/apps/app_queue.c
URL: http://svn.digium.com/view/asterisk/team/russell/issue_12658/apps/app_queue.c?view=diff&rev=163102&r1=163101&r2=163102
==============================================================================
--- team/russell/issue_12658/apps/app_queue.c (original)
+++ team/russell/issue_12658/apps/app_queue.c Thu Dec 11 11:16:52 2008
@@ -2576,7 +2576,7 @@
struct queue_transfer_ds {
struct queue_ent *qe;
struct member *member;
- int starttime;
+ time_t starttime;
int callcompletedinsl;
};
@@ -2603,12 +2603,12 @@
* At the end of this, we want to remove the datastore so that this fixup function is not called on any
* future masquerades of the caller during the current call.
*/
-static void queue_transfer_fixup(void *data, struct ast_channel *old_chan, struct ast_channel *new_chan)
+static void queue_transfer_fixup(void *data, struct ast_channel *old_chan, struct ast_channel *new_chan)
{
struct queue_transfer_ds *qtds = data;
struct queue_ent *qe = qtds->qe;
struct member *member = qtds->member;
- int callstart = qtds->starttime;
+ time_t callstart = qtds->starttime;
int callcompletedinsl = qtds->callcompletedinsl;
struct ast_datastore *datastore;
@@ -2618,13 +2618,11 @@
update_queue(qe->parent, member, callcompletedinsl);
- if (!(datastore = ast_channel_datastore_find(new_chan, &queue_transfer_info, NULL))) {
+ if ((datastore = ast_channel_datastore_find(new_chan, &queue_transfer_info, NULL))) {
+ ast_channel_datastore_remove(new_chan, datastore);
+ } else {
ast_log(LOG_WARNING, "Can't find the queue_transfer datastore.\n");
- return;
- }
-
- ast_channel_datastore_remove(new_chan, datastore);
- ast_channel_datastore_free(datastore);
+ }
}
/*! \brief mechanism to tell if a queue caller was atxferred by a queue member.
@@ -2640,21 +2638,21 @@
/*! \brief create a datastore for storing relevant info to log attended transfers in the queue_log
*/
-static void setup_transfer_datastore(struct queue_ent *qe, struct member *member, int starttime, int callcompletedinsl)
+static struct ast_datastore *setup_transfer_datastore(struct queue_ent *qe, struct member *member, time_t starttime, int callcompletedinsl)
{
struct ast_datastore *ds;
struct queue_transfer_ds *qtds = ast_calloc(1, sizeof(*qtds));
if (!qtds) {
ast_log(LOG_WARNING, "Memory allocation error!\n");
- return;
+ return NULL;
}
ast_channel_lock(qe->chan);
if (!(ds = ast_channel_datastore_alloc(&queue_transfer_info, NULL))) {
ast_channel_unlock(qe->chan);
ast_log(LOG_WARNING, "Unable to create transfer datastore. queue_log will not show attended transfer\n");
- return;
+ return NULL;
}
qtds->qe = qe;
@@ -2665,6 +2663,7 @@
ds->data = qtds;
ast_channel_datastore_add(qe->chan, ds);
ast_channel_unlock(qe->chan);
+ return ds;
}
@@ -2728,7 +2727,7 @@
int forwardsallowed = 1;
int callcompletedinsl;
struct ao2_iterator memi;
- struct ast_datastore *datastore;
+ struct ast_datastore *datastore, *transfer_ds;
ast_channel_lock(qe->chan);
datastore = ast_channel_datastore_find(qe->chan, &dialed_interface_info, NULL);
@@ -3151,11 +3150,11 @@
if (member->status == AST_DEVICE_NOT_INUSE)
ast_log(LOG_WARNING, "The device state of this queue member, %s, is still 'Not in Use' when it probably should not be! Please check UPGRADE.txt for correct configuration settings.\n", member->membername);
- setup_transfer_datastore(qe, member, callstart, callcompletedinsl);
+ transfer_ds = setup_transfer_datastore(qe, member, callstart, callcompletedinsl);
bridge = ast_bridge_call(qe->chan,peer, &bridge_config);
if (bridge != AST_PBX_KEEPALIVE && !attended_transfer_occurred(qe->chan)) {
- struct ast_datastore *transfer_ds;
+ struct ast_datastore *tds;
if (strcasecmp(oldcontext, qe->chan->context) || strcasecmp(oldexten, qe->chan->exten)) {
ast_queue_log(queuename, qe->chan->uniqueid, member->membername, "TRANSFER", "%s|%s|%ld|%ld",
qe->chan->exten, qe->chan->context, (long) (callstart - qe->start),
@@ -3195,15 +3194,16 @@
qe->parent->eventwhencalled == QUEUE_EVENT_VARIABLES ? vars2manager(qe->chan, vars, sizeof(vars)) : "");
}
ast_channel_lock(qe->chan);
- transfer_ds = ast_channel_datastore_find(qe->chan, &queue_transfer_info, NULL);
- if (transfer_ds) {
- ast_channel_datastore_remove(qe->chan, transfer_ds);
- ast_channel_datastore_free(transfer_ds);
+ if ((tds = ast_channel_datastore_find(qe->chan, &queue_transfer_info, NULL))) {
+ ast_channel_datastore_remove(qe->chan, tds);
}
ast_channel_unlock(qe->chan);
update_queue(qe->parent, member, callcompletedinsl);
}
+ if (transfer_ds) {
+ ast_channel_datastore_free(transfer_ds);
+ }
if (bridge != AST_PBX_NO_HANGUP_PEER && bridge != AST_PBX_NO_HANGUP_PEER_PARKED)
ast_hangup(peer);
res = bridge ? bridge : 1;
@@ -3447,7 +3447,7 @@
/* Reload dynamic queue members persisted into the astdb */
static void reload_queue_members(void)
{
- char *cur_ptr;
+ char *cur_ptr;
char *queue_name;
char *member;
char *interface;
Modified: team/russell/issue_12658/res/res_agi.c
URL: http://svn.digium.com/view/asterisk/team/russell/issue_12658/res/res_agi.c?view=diff&rev=163102&r1=163101&r2=163102
==============================================================================
--- team/russell/issue_12658/res/res_agi.c (original)
+++ team/russell/issue_12658/res/res_agi.c Thu Dec 11 11:16:52 2008
@@ -970,7 +970,7 @@
start = ast_tvnow();
while ((ms < 0) || ast_tvdiff_ms(ast_tvnow(), start) < ms) {
- res = ast_waitfor(chan, -1);
+ res = ast_waitfor(chan, ms - ast_tvdiff_ms(ast_tvnow(), start));
if (res < 0) {
ast_closestream(fs);
fdprintf(agi->fd, "200 result=%d (waitfor) endpos=%ld\n", res,sample_offset);
Modified: team/russell/issue_12658/res/res_features.c
URL: http://svn.digium.com/view/asterisk/team/russell/issue_12658/res/res_features.c?view=diff&rev=163102&r1=163101&r2=163102
==============================================================================
--- team/russell/issue_12658/res/res_features.c (original)
+++ team/russell/issue_12658/res/res_features.c Thu Dec 11 11:16:52 2008
@@ -1008,7 +1008,7 @@
};
-static AST_LIST_HEAD_STATIC(feature_list,ast_call_feature);
+static AST_RWLIST_HEAD_STATIC(feature_list, ast_call_feature);
/*! \brief register new feature into feature_list*/
void ast_register_feature(struct ast_call_feature *feature)
@@ -1018,12 +1018,13 @@
return;
}
- AST_LIST_LOCK(&feature_list);
- AST_LIST_INSERT_HEAD(&feature_list,feature,feature_entry);
- AST_LIST_UNLOCK(&feature_list);
-
- if (option_verbose >= 2)
+ AST_RWLIST_WRLOCK(&feature_list);
+ AST_RWLIST_INSERT_HEAD(&feature_list, feature, feature_entry);
+ AST_RWLIST_UNLOCK(&feature_list);
+
+ if (option_verbose >= 2) {
ast_verbose(VERBOSE_PREFIX_2 "Registered Feature '%s'\n",feature->sname);
+ }
}
/*! \brief unregister feature from feature_list */
@@ -1032,9 +1033,10 @@
if (!feature)
return;
- AST_LIST_LOCK(&feature_list);
- AST_LIST_REMOVE(&feature_list,feature,feature_entry);
- AST_LIST_UNLOCK(&feature_list);
+ AST_RWLIST_WRLOCK(&feature_list);
+ AST_RWLIST_REMOVE(&feature_list, feature, feature_entry);
+ AST_RWLIST_UNLOCK(&feature_list);
+
free(feature);
}
@@ -1043,10 +1045,11 @@
{
struct ast_call_feature *feature;
- AST_LIST_LOCK(&feature_list);
- while ((feature = AST_LIST_REMOVE_HEAD(&feature_list,feature_entry)))
+ AST_RWLIST_WRLOCK(&feature_list);
+ while ((feature = AST_LIST_REMOVE_HEAD(&feature_list, feature_entry))) {
free(feature);
- AST_LIST_UNLOCK(&feature_list);
+ }
+ AST_RWLIST_UNLOCK(&feature_list);
}
/*! \brief find a feature by name */
@@ -1054,9 +1057,10 @@
{
struct ast_call_feature *tmp;
- AST_LIST_TRAVERSE(&feature_list, tmp, feature_entry) {
- if (!strcasecmp(tmp->sname, name))
+ AST_RWLIST_TRAVERSE(&feature_list, tmp, feature_entry) {
+ if (!strcasecmp(tmp->sname, name)) {
break;
+ }
}
return tmp;
@@ -1201,9 +1205,9 @@
tmp = ast_strdupa(dynamic_features);
while ((tok = strsep(&tmp, "#"))) {
- AST_LIST_LOCK(&feature_list);
+ AST_RWLIST_RDLOCK(&feature_list);
if (!(feature = find_dynamic_feature(tok))) {
- AST_LIST_UNLOCK(&feature_list);
+ AST_RWLIST_UNLOCK(&feature_list);
continue;
}
@@ -1213,14 +1217,14 @@
ast_verbose(VERBOSE_PREFIX_3 " Feature Found: %s exten: %s\n",feature->sname, tok);
res = feature->operation(chan, peer, config, code, sense, feature);
if (res != FEATURE_RETURN_KEEPTRYING) {
- AST_LIST_UNLOCK(&feature_list);
+ AST_RWLIST_UNLOCK(&feature_list);
break;
}
res = FEATURE_RETURN_PASSDIGITS;
} else if (!strncmp(feature->exten, code, strlen(code)))
res = FEATURE_RETURN_STOREDIGITS;
- AST_LIST_UNLOCK(&feature_list);
+ AST_RWLIST_UNLOCK(&feature_list);
}
return res;
@@ -1255,14 +1259,14 @@
/* while we have a feature */
while ((tok = strsep(&tmp, "#"))) {
- AST_LIST_LOCK(&feature_list);
+ AST_RWLIST_RDLOCK(&feature_list);
if ((feature = find_dynamic_feature(tok)) && ast_test_flag(feature, AST_FEATURE_FLAG_NEEDSDTMF)) {
if (ast_test_flag(feature, AST_FEATURE_FLAG_BYCALLER))
ast_set_flag(config, AST_BRIDGE_DTMF_CHANNEL_0);
if (ast_test_flag(feature, AST_FEATURE_FLAG_BYCALLEE))
ast_set_flag(config, AST_BRIDGE_DTMF_CHANNEL_1);
}
- AST_LIST_UNLOCK(&feature_list);
+ AST_RWLIST_UNLOCK(&feature_list);
}
}
}
@@ -2286,13 +2290,14 @@
ast_cli(fd, "\n");
ast_cli(fd, format, "Dynamic Feature", "Default", "Current");
ast_cli(fd, format, "---------------", "-------", "-------");
- if (AST_LIST_EMPTY(&feature_list))
+ if (AST_RWLIST_EMPTY(&feature_list)) {
ast_cli(fd, "(none)\n");
- else {
- AST_LIST_LOCK(&feature_list);
- AST_LIST_TRAVERSE(&feature_list, feature, feature_entry)
- ast_cli(fd, format, feature->sname, "no def", feature->exten);
- AST_LIST_UNLOCK(&feature_list);
+ } else {
+ AST_RWLIST_RDLOCK(&feature_list);
+ AST_RWLIST_TRAVERSE(&feature_list, feature, feature_entry) {
+ ast_cli(fd, format, feature->sname, "no def", feature->exten);
+ }
+ AST_RWLIST_UNLOCK(&feature_list);
}
ast_cli(fd, "\nCall parking\n");
ast_cli(fd, "------------\n");
@@ -2646,13 +2651,13 @@
continue;
}
- AST_LIST_LOCK(&feature_list);
+ AST_RWLIST_RDLOCK(&feature_list);
if ((feature = find_dynamic_feature(var->name))) {
- AST_LIST_UNLOCK(&feature_list);
+ AST_RWLIST_UNLOCK(&feature_list);
ast_log(LOG_WARNING, "Dynamic Feature '%s' specified more than once!\n", var->name);
continue;
}
- AST_LIST_UNLOCK(&feature_list);
+ AST_RWLIST_UNLOCK(&feature_list);
if (!(feature = ast_calloc(1, sizeof(*feature))))
continue;
More information about the svn-commits
mailing list