kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-18 18:58:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't check for error when lowering priority (according to the manpage, it should never happen anyway). It might could happen, though, if another thread messed with the priority, so safeguard against that (reported via -dev list).

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2@60849 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2007-04-09 02:49:06 +00:00
parent b9ec441aa9
commit 2eaae45f81
2 changed files with 8 additions and 8 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;

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];