simplify/fix lock retry, and fix comment

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2@29764 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin P. Fleming
2006-05-23 18:16:40 +00:00
parent f84891dfbb
commit d6873875cc

View File

@@ -11199,7 +11199,7 @@ static int sipsock_read(int *id, int fd, short events, void *ignore)
int nounlock;
int recount = 0;
char iabuf[INET_ADDRSTRLEN];
int lockretrycount = 0;
unsigned int lockretry = 100;
len = sizeof(sin);
memset(&req, 0, sizeof(req));
@@ -11252,13 +11252,12 @@ retrylock:
ast_log(LOG_DEBUG, "Failed to grab lock, trying again...\n");
ast_mutex_unlock(&p->lock);
ast_mutex_unlock(&netlock);
/* Sleep infintismly short amount of time */
/* Sleep for a very short amount of time */
usleep(1);
lockretrycount++;
if (lockretrycount < 100)
if (--lockretry)
goto retrylock;
}
if (lockretrycount > 100) {
if (!lockretry) {
ast_log(LOG_ERROR, "We could NOT get the channel lock for %s! \n", p->owner->name);
ast_log(LOG_ERROR, "SIP MESSAGE JUST IGNORED: %s \n", req.data);
ast_log(LOG_ERROR, "BAD! BAD! BAD!\n");