proxmox-mirrors/mirror_corosync
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_corosync synced 2025-08-13 20:58:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove priority inversion in logsys.

Browse Source 
git-svn-id: http://svn.fedorahosted.org/svn/corosync/trunk@2130 fd59a12c-fef9-0310-b244-a6a79926bd2f
This commit is contained in:
Steven Dake 2009-04-23 15:24:29 +00:00
parent e512d1f811
commit ed7d054e55
4 changed files with 41 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
exec/logsys.c
View File

@ -1493,6 +1493,17 @@ const char *logsys_tag_name_get (unsigned int tag)
return (NULL);
}
int logsys_thread_priority_set (
int policy,
const struct sched_param *param)
{
int res;
res = pthread_setschedparam (logsys_thread_id, policy, param);
return (res);
}
int logsys_log_rec_store (const char *filename)
{
int fd;

39
exec/main.c
View File

@ -128,6 +128,8 @@ unsigned long long *(*main_clm_get_by_nodeid) (unsigned int node_id);
hdb_handle_t corosync_poll_handle;
struct sched_param global_sched_param;
static void sigusr2_handler (int num)
{
int i;
@ -369,16 +371,15 @@ static void corosync_tty_detach (void)
static void corosync_setscheduler (void)
{
#if ! defined(TS_CLASS) && (defined(COROSYNC_BSD) || defined(COROSYNC_LINUX) || defined(COROSYNC_SOLARIS))
struct sched_param sched_param;
int res;
sched_priority = sched_get_priority_max (SCHED_RR);
if (sched_priority != -1) {
sched_param.sched_priority = sched_priority;
res = sched_setscheduler (0, SCHED_RR, &sched_param);
global_sched_param.sched_priority = sched_priority;
res = sched_setscheduler (0, SCHED_RR, &global_sched_param);
if (res == -1) {
log_printf (LOGSYS_LEVEL_WARNING, "Could not set SCHED_RR at priority %d: %s\n",
sched_param.sched_priority, strerror (errno));
global_sched_param.sched_priority, strerror (errno));
}
} else {
log_printf (LOGSYS_LEVEL_WARNING, "Could not get maximum scheduler priority: %s\n", strerror (errno));
@ -734,6 +735,17 @@ int main (int argc, char **argv)
if (background)
corosync_tty_detach ();
/*
* Set round robin realtime scheduling with priority 99
* Lock all memory to avoid page faults which may interrupt
* application healthchecking
*/
if (setprio) {
corosync_setscheduler ();
}
corosync_mlockall ();
log_printf (LOGSYS_LEVEL_NOTICE, "Corosync Executive Service RELEASE '%s'\n", RELEASE_VERSION);
log_printf (LOGSYS_LEVEL_NOTICE, "Copyright (C) 2002-2006 MontaVista Software, Inc and contributors.\n");
log_printf (LOGSYS_LEVEL_NOTICE, "Copyright (C) 2006-2008 Red Hat, Inc.\n");
@ -840,6 +852,15 @@ int main (int argc, char **argv)
syslog (LOGSYS_LEVEL_ERROR, "%s", error_string);
corosync_exit_error (AIS_DONE_MAINCONFIGREAD);
}
logsys_fork_completed();
if (setprio) {
res = logsys_thread_priority_set (SCHED_RR, &global_sched_param);
if (res == -1) {
log_printf (LOGSYS_LEVEL_ERROR,
"Could not set logsys thread priority. Can't continue because of priority inversions.");
corosync_exit_error (AIS_DONE_LOGSETUP);
}
}
res = totem_config_read (objdb, &totem_config, &error_string);
if (res == -1) {
@ -859,16 +880,6 @@ int main (int argc, char **argv)
corosync_exit_error (AIS_DONE_MAINCONFIGREAD);
}
/*
* Set round robin realtime scheduling with priority 99
* Lock all memory to avoid page faults which may interrupt
* application healthchecking
*/
if (setprio)
corosync_setscheduler ();
corosync_mlockall ();
totem_config.totem_logging_configuration = totem_logging_configuration;
totem_config.totem_logging_configuration.log_subsys_id =
_logsys_subsys_create ("TOTEM");

2
exec/mainconfig.c
View File

@ -722,8 +722,6 @@ int corosync_main_config_read (
add_logsys_config_notification(objdb);
logsys_fork_completed ();
return 0;
parse_error:

5
include/corosync/engine/logsys.h
View File

@ -40,6 +40,7 @@
#include <stdarg.h>
#include <stdlib.h>
#include <syslog.h>
#include <pthread.h>
/*
* All of the LOGSYS_MODE's can be ORed together for combined behavior
@ -251,6 +252,10 @@ extern int logsys_tag_id_get (
extern const char *logsys_tag_name_get (
unsigned int tag);
extern int logsys_thread_priority_set (
int policy,
const struct sched_param *param);
/*
* External definitions
*/