os: simplify smart scheduler init process

Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
This commit is contained in:
Tiago Vignatti 2010-08-04 16:12:59 +03:00
parent d9c18c3b9b
commit 7d8cabd027
3 changed files with 6 additions and 9 deletions

View File

@ -136,7 +136,7 @@ extern _X_EXPORT void SmartScheduleStopTimer(void);
#define SMART_MAX_PRIORITY (20)
#define SMART_MIN_PRIORITY (-20)
extern _X_EXPORT Bool SmartScheduleInit(void);
extern _X_EXPORT void SmartScheduleInit(void);
/* This prototype is used pervasively in Xext, dix */

View File

@ -305,9 +305,7 @@ OsInit(void)
* log file name if logging to a file is desired.
*/
LogInit(NULL, NULL);
if (!SmartScheduleDisable)
if (!SmartScheduleInit ())
SmartScheduleDisable = TRUE;
SmartScheduleInit ();
}
void

View File

@ -1155,14 +1155,14 @@ SmartScheduleTimer (int sig)
SmartScheduleTime += SmartScheduleInterval;
}
Bool
void
SmartScheduleInit (void)
{
struct sigaction act;
if (SmartScheduleDisable)
return TRUE;
return;
memset((char *) &act, 0, sizeof(struct sigaction));
/* Set up the timer signal function */
@ -1172,9 +1172,8 @@ SmartScheduleInit (void)
if (sigaction (SIGALRM, &act, 0) < 0)
{
perror ("sigaction for smart scheduler");
return FALSE;
SmartScheduleDisable = TRUE;
}
return TRUE;
}
#ifdef SIG_BLOCK