On Wed, May 10, 2006 at 07:11:42PM +0100, Colm MacCarthaigh wrote:
> On Wed, May 10, 2006 at 10:53:50AM -0700, Garrett Rooney wrote:
> > I would personally prefer abort to exit...
>
> is write()'ing a static error message an option too?
I don't know if more effort than this is required to make write()
available on non-Unix platforms, if this is enough I'll commit it:
Index: server/main.c
===================================================================
--- server/main.c (revision 405449)
+++ server/main.c (working copy)
@@ -40,6 +40,10 @@
#include "ap_mpm.h"
#include "mpm_common.h"
+#if APR_HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
/* WARNING: Win32 binds http_main.c dynamically to the server. Please place
* extern functions and global data in another appropriate module.
*
@@ -261,6 +265,16 @@
exit(process_exit_value);
}
+#define OOM_MESSAGE "[crit] Memory allocation failed, aborting process.\n"
+
+/* APR callback invoked if allocation fails. */
+static int abort_on_oom(int retcode)
+{
+ write(STDERR_FILENO, OOM_MESSAGE, strlen(OOM_MESSAGE));
+ abort();
+ return retcode; /* unreachable, hopefully. */
+}
+
static process_rec *create_process(int argc, const char * const *argv)
{
process_rec *process;
@@ -279,6 +293,7 @@
exit(1);
}
+ apr_pool_abort_set(abort_on_oom, cntx);
apr_pool_tag(cntx, "process");
ap_open_stderr_log(cntx);
@@ -449,6 +464,10 @@
pconf = process->pconf;
ap_server_argv0 = process->short_name;
+ /* Set up the OOM callback in the global pool, so all pools should
+ * by default inherit it. */
+ apr_pool_abort_set(abort_on_oom, apr_pool_parent_get(process->pool));
+
#if APR_CHARSET_EBCDIC
if (ap_init_ebcdic(pglobal) != APR_SUCCESS) {
destroy_and_exit_process(process, 1);
