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

Merged revisions 60849 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r60849 | tilghman | 2007-04-08 21:49:06 -0500 (Sun, 08 Apr 2007) | 2 lines

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).

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@60850 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2007-04-09 03:01:12 +00:00
parent 1d3fbc214a
commit a5872f439b
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/asterisk.h
View File

@@ -35,6 +35,8 @@
#define DEFAULT_SAMPLE_RATE 8000 #define DEFAULT_SAMPLE_RATE 8000
#define DEFAULT_SAMPLES_PER_MS ((DEFAULT_SAMPLE_RATE)/1000) #define DEFAULT_SAMPLES_PER_MS ((DEFAULT_SAMPLE_RATE)/1000)
#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 */ /* provided in asterisk.c */
extern char ast_config_AST_CONFIG_DIR[PATH_MAX]; extern char ast_config_AST_CONFIG_DIR[PATH_MAX];

14
main/asterisk.c
View File

@@ -61,6 +61,8 @@
ASTERISK_FILE_VERSION(__FILE__, "$Revision$") ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#undef sched_setscheduler
#undef setpriority
#include <unistd.h> #include <unistd.h>
#include <stdlib.h> #include <stdlib.h>
#include <sys/time.h> #include <sys/time.h>
@@ -1175,10 +1177,8 @@ int ast_set_priority(int pri)
ast_verbose("Set to realtime thread\n"); ast_verbose("Set to realtime thread\n");
} else { } else {
sched.sched_priority = 0; sched.sched_priority = 0;
if (sched_setscheduler(0, SCHED_OTHER, &sched)) { /* According to the manpage, these parameters can never fail. */
ast_log(LOG_WARNING, "Unable to set normal priority\n"); sched_setscheduler(0, SCHED_OTHER, &sched);
return -1;
}
} }
#else #else
if (pri) { if (pri) {
@@ -1189,10 +1189,8 @@ int ast_set_priority(int pri)
if (option_verbose) if (option_verbose)
ast_verbose("Set to high priority\n"); ast_verbose("Set to high priority\n");
} else { } else {
if (setpriority(PRIO_PROCESS, 0, 0) == -1) { /* According to the manpage, these parameters can never fail. */
ast_log(LOG_WARNING, "Unable to set normal priority\n"); setpriority(PRIO_PROCESS, 0, 0);
return -1;
}
} }
#endif #endif
return 0; return 0;