2004-11-26 Andrew J. Schorr <ajschorr@alumni.princeton.edu>

* log.c, log.h, memory.c: Change function name from zlog_backtrace_safe
	  to the more self-explanatory zlog_backtrace_sigsafe.
This commit is contained in:
ajs 2004-11-26 20:52:59 +00:00
parent 5b85facc63
commit 48d6c69b34
4 changed files with 10 additions and 5 deletions

View File

@ -1,3 +1,8 @@
2004-11-26 Andrew J. Schorr <ajschorr@alumni.princeton.edu>
* log.c, log.h, memory.c: Change function name from zlog_backtrace_safe
to the more self-explanatory zlog_backtrace_sigsafe.
2004-11-26 Andrew J. Schorr <ajschorr@alumni.princeton.edu> 2004-11-26 Andrew J. Schorr <ajschorr@alumni.princeton.edu>
* debug.[ch]: Remove unused files. * debug.[ch]: Remove unused files.

View File

@ -226,14 +226,14 @@ zlog_signal(int signo, const char *action)
} }
#undef DUMP #undef DUMP
zlog_backtrace_safe(LOG_ERR); zlog_backtrace_sigsafe(LOG_ERR);
#undef LOC #undef LOC
} }
/* Log a backtrace using only async-signal-safe functions. /* Log a backtrace using only async-signal-safe functions.
Needs to be enhanced to support syslog logging. */ Needs to be enhanced to support syslog logging. */
void void
zlog_backtrace_safe(int priority) zlog_backtrace_sigsafe(int priority)
{ {
#ifdef HAVE_GLIBC_BACKTRACE #ifdef HAVE_GLIBC_BACKTRACE
void *array[20]; void *array[20];

View File

@ -132,6 +132,6 @@ extern void zlog_backtrace(int priority);
called unless the program is about to exit or abort, since it messes called unless the program is about to exit or abort, since it messes
up the state of zlog file pointers. This function needs to be enhanced up the state of zlog file pointers. This function needs to be enhanced
to support syslog logging. */ to support syslog logging. */
extern void zlog_backtrace_safe(int priority); extern void zlog_backtrace_sigsafe(int priority);
#endif /* _ZEBRA_LOG_H */ #endif /* _ZEBRA_LOG_H */

View File

@ -46,9 +46,9 @@ zerror (const char *fname, int type, size_t size)
zlog_err ("%s : can't allocate memory for `%s' size %d: %s\n", zlog_err ("%s : can't allocate memory for `%s' size %d: %s\n",
fname, lookup (mstr, type), (int) size, safe_strerror(errno)); fname, lookup (mstr, type), (int) size, safe_strerror(errno));
log_memstats(LOG_WARNING); log_memstats(LOG_WARNING);
/* N.B. It might be preferable to call zlog_backtrace_safe here, since /* N.B. It might be preferable to call zlog_backtrace_sigsafe here, since
that function should definitely be safe in an OOM condition. But that function should definitely be safe in an OOM condition. But
unfortunately zlog_backtrace_safe does not support syslog logging at unfortunately zlog_backtrace_sigsafe does not support syslog logging at
this time... */ this time... */
zlog_backtrace(LOG_WARNING); zlog_backtrace(LOG_WARNING);
abort(); abort();