kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-08 19:08:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

automerge commit

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@60897 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Automerge Script
2007-04-09 03:54:41 +00:00
parent d5b4a6c3c0
commit d691fa4d17
3 changed files with 22 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
asterisk.c
View File

@@ -795,6 +795,7 @@ int ast_set_priority(int pri)
struct sched_param sched;
memset(&sched, 0, sizeof(sched));
#ifdef __linux__
#undef sched_setscheduler
if (pri) {
sched.sched_priority = 10;
if (sched_setscheduler(0, SCHED_RR, &sched)) {
@@ -805,12 +806,11 @@ int ast_set_priority(int pri)
ast_verbose("Set to realtime thread\n");
} else {
sched.sched_priority = 0;
if (sched_setscheduler(0, SCHED_OTHER, &sched)) {
ast_log(LOG_WARNING, "Unable to set normal priority\n");
return -1;
}
/* According to the manpage, this can never fail, with these parameters. */
sched_setscheduler(0, SCHED_OTHER, &sched);
}
#else
#undef setpriority
if (pri) {
if (setpriority(PRIO_PROCESS, 0, -10) == -1) {
ast_log(LOG_WARNING, "Unable to set high priority\n");
@@ -819,10 +819,8 @@ int ast_set_priority(int pri)
if (option_verbose)
ast_verbose("Set to high priority\n");
} else {
if (setpriority(PRIO_PROCESS, 0, 0) == -1) {
ast_log(LOG_WARNING, "Unable to set normal priority\n");
return -1;
}
/* According to the manpage, this can never fail, with these parameters. */
setpriority(PRIO_PROCESS, 0, 0);
}
#endif
return 0;

13
channels/chan_local.c
View File

@@ -179,6 +179,7 @@ static int local_answer(struct ast_channel *ast)
res = local_queue_frame(p, isoutbound, &answer, ast);
} else
ast_log(LOG_WARNING, "Huh? Local is being asked to answer?\n");
if (!res)
ast_mutex_unlock(&p->lock);
return res;
}
@@ -262,6 +263,7 @@ static int local_write(struct ast_channel *ast, struct ast_frame *f)
ast_log(LOG_DEBUG, "Not posting to queue since already masked on '%s'\n", ast->name);
res = 0;
}
if (!res)
ast_mutex_unlock(&p->lock);
return res;
}
@@ -302,7 +304,7 @@ static int local_indicate(struct ast_channel *ast, int condition)
ast_mutex_lock(&p->lock);
isoutbound = IS_OUTBOUND(ast, p);
f.subclass = condition;
res = local_queue_frame(p, isoutbound, &f, ast);
if (!(res = local_queue_frame(p, isoutbound, &f, ast)))
ast_mutex_unlock(&p->lock);
return res;
}
@@ -320,7 +322,7 @@ static int local_digit(struct ast_channel *ast, char digit)
ast_mutex_lock(&p->lock);
isoutbound = IS_OUTBOUND(ast, p);
f.subclass = digit;
res = local_queue_frame(p, isoutbound, &f, ast);
if (!(res = local_queue_frame(p, isoutbound, &f, ast)))
ast_mutex_unlock(&p->lock);
return res;
}
@@ -340,7 +342,7 @@ static int local_sendhtml(struct ast_channel *ast, int subclass, const char *dat
f.subclass = subclass;
f.data = (char *)data;
f.datalen = datalen;
res = local_queue_frame(p, isoutbound, &f, ast);
if (!(res = local_queue_frame(p, isoutbound, &f, ast)))
ast_mutex_unlock(&p->lock);
return res;
}
@@ -430,7 +432,7 @@ static int local_hangup(struct ast_channel *ast)
struct ast_frame f = { AST_FRAME_CONTROL, AST_CONTROL_HANGUP };
struct local_pvt *cur, *prev=NULL;
struct ast_channel *ochan = NULL;
int glaredetect;
int glaredetect, res = 0;
if (!p)
return -1;
@@ -485,7 +487,8 @@ static int local_hangup(struct ast_channel *ast)
/* Need to actually hangup since there is no PBX */
ochan = p->chan;
else
local_queue_frame(p, isoutbound, &f, NULL);
res = local_queue_frame(p, isoutbound, &f, NULL);
if (!res)
ast_mutex_unlock(&p->lock);
if (ochan)
ast_hangup(ochan);

2
include/asterisk.h
View File

@@ -21,6 +21,8 @@
#define DEFAULT_LANGUAGE "en"
#define AST_CONFIG_MAX_PATH 255
#define setpriority __PLEASE_USE_ast_set_priority_INSTEAD_OF_setpriority__
#define sched_setscheduler __PLEASE_USE_ast_set_priority_INSTEAD_OF_sched_setscheduler__
/* provided in asterisk.c */
extern char ast_config_AST_CONFIG_DIR[AST_CONFIG_MAX_PATH];