diff options
| author | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2003-12-09 00:02:06 +0000 |
|---|---|---|
| committer | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2003-12-09 00:02:06 +0000 |
| commit | c6b3ce2a3c1e5434b82d787dfae7b100378b7bef (patch) | |
| tree | 290b9098dcfe884db397ba02bd0dc18b8321d571 | |
| parent | f40977de343309a8a652e9d5a68d96b0d42dae55 (diff) | |
Minor mgcp debuggin changes, sip deadlock improvement
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@1841 f38db490-d61c-443f-a65b-d21fe96a405b
| -rwxr-xr-x | channels/chan_mgcp.c | 9 | ||||
| -rwxr-xr-x | channels/chan_sip.c | 2 |
2 files changed, 7 insertions, 4 deletions
diff --git a/channels/chan_mgcp.c b/channels/chan_mgcp.c index f55141e30..a3efad58a 100755 --- a/channels/chan_mgcp.c +++ b/channels/chan_mgcp.c @@ -1060,13 +1060,16 @@ static struct mgcp_subchannel *find_subchannel(char *name, int msgid, struct soc } p = g->endpoints; while(p) { - ast_log(LOG_DEBUG, "Searching on %s@%s for subchannel\n", p->name, g->name); + if (option_debug) + ast_log(LOG_DEBUG, "Searching on %s@%s for subchannel\n", p->name, g->name); if (msgid) { sub = p->sub; do { - ast_log(LOG_DEBUG, "Searching on %s@%s-%d for subchannel with lastout: %d\n", p->name, g->name, sub->id, msgid); + if (option_debug) + ast_log(LOG_DEBUG, "Searching on %s@%s-%d for subchannel with lastout: %d\n", p->name, g->name, sub->id, msgid); if (sub->lastout == msgid) { - ast_log(LOG_DEBUG, "Found subchannel sub%d to handle request %d sub->lastout: %d\n", sub->id, msgid, sub->lastout); + if (option_debug) + ast_log(LOG_DEBUG, "Found subchannel sub%d to handle request %d sub->lastout: %d\n", sub->id, msgid, sub->lastout); found = 1; break; } diff --git a/channels/chan_sip.c b/channels/chan_sip.c index cefe7abfb..d56479b1c 100755 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -463,7 +463,7 @@ static int retrans_pkt(void *data) } else { ast_log(LOG_WARNING, "Maximum retries exceeded on call %s for seqno %d (%s)\n", pkt->owner->callid, pkt->seqno, pkt->resp ? "Response" : "Request"); pkt->retransid = -1; - while(pkt->owner->owner && ast_mutex_lock(&pkt->owner->owner->lock)) { + while(pkt->owner->owner && ast_mutex_trylock(&pkt->owner->owner->lock)) { ast_mutex_unlock(&pkt->owner->lock); usleep(1); ast_mutex_lock(&pkt->owner->lock); |