NOTE: This patch has been committed. src/ChangeLog addition: 2005-12-25 Aidan Kehoe <kehoea(a)parhasard.net&gt; * alloc.c: * alloc.c (malloc_warning): * alloc.c (MALLOC_BEGIN): * alloc.c (FREE_OR_REALLOC_BEGIN): Revert the alloc warning bugfix, in response to Stephen's mail 87acepzl6e.fsf(a)tleepslib.sk.tsukuba.ac.jp . XEmacs Trunk source patch: Diff command: cvs -q diff -u Files affected: src/alloc.c Index: src/alloc.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/alloc.c,v retrieving revision 1.121 diff -u -u -r1.121 alloc.c --- src/alloc.c 2005/12/24 19:06:05 1.121 +++ src/alloc.c 2005/12/25 11:20:32 ＠＠ -231,6 +231,22 ＠＠ } #endif /* not MC_ALLOC */ +/* malloc calls this if it finds we are near exhausting storage */ +void +malloc_warning (const char *str) +{ + if (ignore_malloc_warnings) + return; + + warn_when_safe + (Qmemory, Qemergency, + "%s\n" + "Killing some buffers may delay running out of memory.\n" + "However, certainly by the time you receive the 95%% warning,\n" + "you should clean up, kill this Emacs, and start a new one.", + str); +} + /* Called if malloc returns zero */ DOESNT_RETURN memory_full (void) ＠＠ -274,21 +290,18 ＠＠ } #ifdef ERROR_CHECK_MALLOC -static int in_malloc, in_malloc_warning; +static int in_malloc; extern int regex_malloc_disallowed; #define MALLOC_BEGIN() \ do \ { \ - assert (!in_malloc || in_malloc_warning); \ + assert (!in_malloc); \ assert (!regex_malloc_disallowed); \ in_malloc = 1; \ } \ while (0) -#define MALLOC_WARNING_BEGIN() (++in_malloc_warning) -#define MALLOC_WARNING_END() (--in_malloc_warning) - #ifdef MC_ALLOC #define FREE_OR_REALLOC_BEGIN(block) \ do \ ＠＠ -328,33 +341,10 ＠＠ #else /* ERROR_CHECK_MALLOC */ #define MALLOC_BEGIN() -#define MALLOC_WARNING_BEGIN() -#define MALLOC_WARNING_END() #define FREE_OR_REALLOC_BEGIN(block) #define MALLOC_END() #endif /* ERROR_CHECK_MALLOC */ - -/* malloc calls this if it finds we are near exhausting storage */ -void -malloc_warning (const char *str) -{ - if (ignore_malloc_warnings) - return; - - MALLOC_WARNING_BEGIN(); - - warn_when_safe - (Qmemory, Qemergency, - "%s\n" - "Killing some buffers may delay running out of memory.\n" - "However, certainly by the time you receive the 95%% warning,\n" - "you should clean up, kill this Emacs, and start a new one.\n" - "On Unix, look into your resource limits; ulimit -d, especially.", - str); - - MALLOC_WARNING_END(); -} static void malloc_after (void *val, Bytecount size) -- I AM IN JAIL AND ALLOWED SEND ONLY ONE CABLE SINCE WAS ARRESTED WHILE MEASURING FIFTEEN FOOT WALL OUTSIDE PALACE AND HAVE JUST FINISHED COUNTING THIRTY EIGHT THOUSAND FIVE HUNDERED TWENTY TWO NAMES WHOS WHO IN MIDEAST.