Revision: 23440 http://trac.macosforge.org/projects/launchd/changeset/23440 Author: zarzycki@apple.com Date: 2007-10-08 09:48:45 -0700 (Mon, 08 Oct 2007) Log Message: ----------- <rdar://problem/5528040> Be more conservative about the cost of generating debug log messages Modified Paths: -------------- trunk/launchd/src/launchd_runtime.c Modified: trunk/launchd/src/launchd_runtime.c =================================================================== --- trunk/launchd/src/launchd_runtime.c 2007-10-08 16:27:13 UTC (rev 23439) +++ trunk/launchd/src/launchd_runtime.c 2007-10-08 16:48:45 UTC (rev 23440) @@ -115,6 +115,10 @@ }; static sigset_t sigign_set; +static int internal_mask_pri = LOG_UPTO(LOG_NOTICE); +//static int internal_mask_pri = LOG_UPTO(LOG_DEBUG); + + void launchd_runtime_init(void) { @@ -247,7 +251,7 @@ const char * reboot_flags_to_C_names(unsigned int flags) { -#define MAX_RB_STR "RB_ASKNAME|RB_SINGLE|RB_NOSYNC|RB_KDB|RB_HALT|RB_INITNAME|RB_DFLTROOT|RB_ALTBOOT|RB_UNIPROC|RB_SAFEBOOT|RB_UPSDELAY|0xdeadbeeffeedface" +#define MAX_RB_STR "RB_ASKNAME|RB_SINGLE|RB_NOSYNC|RB_HALT|RB_INITNAME|RB_DFLTROOT|RB_ALTBOOT|RB_UNIPROC|RB_SAFEBOOT|RB_UPSDELAY|0xdeadbeeffeedface" static char flags_buf[sizeof(MAX_RB_STR)]; char *flags_off = NULL; @@ -263,7 +267,6 @@ FLAGIF(RB_ASKNAME) else FLAGIF(RB_SINGLE) else FLAGIF(RB_NOSYNC) - else FLAGIF(RB_KDB) else FLAGIF(RB_HALT) else FLAGIF(RB_INITNAME) else FLAGIF(RB_DFLTROOT) @@ -338,6 +341,10 @@ unsigned short flags = kev->flags; unsigned int fflags = kev->fflags; + if (!(LOG_MASK(level) & internal_mask_pri)) { + return; + } + if (flags) while (flags) { if (flags_off) { *flags_off = '|'; @@ -1118,9 +1125,6 @@ } } -static int internal_mask_pri = LOG_UPTO(LOG_NOTICE); -//static int internal_mask_pri = LOG_UPTO(LOG_DEBUG); - int runtime_setlogmask(int maskpri) {