mirror of
git://git.sv.gnu.org/emacs.git
synced 2026-01-02 02:10:46 -08:00
* src/composite.c (autocmp_chars): * src/conf_post.h (DebPrint) [HAVE_NTGUI && !DebPrint && !EMACSDEBUG]: Use simpler ((void) 0) for no-op expression returning void. * src/dispextern.h [HAVE_WINDOW_SYSTEM]: Include fontset.h, for face_for_char. (FACE_SUITABLE_FOR_ASCII_CHAR_P, FACE_FOR_CHAR): Now inline functions instead of macros. This avoids the need for all those casts to void. (FACE_SUITABLE_FOR_ASCII_CHAR_P): Omit 2nd (unused) arg. All uses changed. * src/frame.c (Ficonify_frame, Fset_frame_position): * src/xdisp.c (Fmove_point_visually, show_mouse_face): * src/xdisp.c (note_mode_line_or_margin_highlight) (note_mouse_highlight): Assume HAVE_WINDOW_SYSTEM for simplicity, since the code should now work either way without generating warnings. * src/frame.c (display_available) [HAVE_WINDOW_SYSTEM]: New function. (window_system_available) [HAVE_WINDOW_SYSTEM]: Move to frame.h. (decode_window_system_frame): Use check_window_system instead of rolling the code ourself. Return needed only if HAVE_WINDOW_SYSTEM. (decode_window_system_frame, check_window_system): Merge the HAVE_WINDOW_SYSTEM and !HAVE_WINDOW_SYSTEM versions into one. * src/frame.c (Ficonify_frame, Fset_frame_position): * src/xdisp.c (show_mouse_face, define_frame_cursor1) (note_mouse_highlight): Narrow the scope of the HAVE_WINDOW_SYSTEM #ifdef; this is a better way to pacify GCC. * src/xdisp.c (x_set_left_fringe, x_set_right_fringe) (x_set_right_divider_width, x_set_bottom_divider_width): * src/xfns.c (x_set_internal_border_width): Don’t use what are now function calls as lvalues. * src/frame.h (WINDOW_SYSTEM_RETURN): New macro. (decode_window_system_frame, check_window_system): Use it, to avoid the need for duplicate declarations. (window_system_available): Now an inline function. (display_available): New decl. (frame_dimension): New inline function. (FRAME_FRINGE_COLS, FRAME_LEFT_FRINGE_WIDTH) (FRAME_RIGHT_FRINGE_WIDTH, FRAME_TOTAL_FRINGE_WIDTH) (FRAME_INTERNAL_BORDER_WIDTH, FRAME_RIGHT_DIVIDER_WIDTH) (FRAME_BOTTOM_DIVIDER_WIDTH): Use it, to avoid the need for duplicate definitions. Now inline functions instead of macros. * src/gnutls.c (gnutls_log_function2i): Remove. * src/gnutls.h (GNUTLS_LOG2i): Use ‘message’ directly. This avoids complaints about gnutls_log_function2i being defined and not used on older platforms that do not need to call GNUTLS_LOG2i. * src/image.c (DefaultDepthOfScreen) [0]: Remove unused macro. * src/lisp.h (AUTO_STRING_WITH_LEN): Revert change from ‘type id = expr’ to ‘type id; id = expr’, as this would suppress valid jump-misses-init diagnostics. Let’s find a better way to address the problem. * src/vm-limit.c (__MALLOC_HOOK_VOLATILE): Define only if needed. * src/xdisp.c (handle_single_display_spec): Simplify fringe_bitmap computation. (define_frame_cursor1): Do nothing unless in a window system. All callers changed and simplified. * src/xfaces.c (realize_default_face): Use a simpler way to pacify GCC when a return value is not used on some platforms.
220 lines
5.8 KiB
C
220 lines
5.8 KiB
C
/* Functions for memory limit warnings.
|
||
Copyright (C) 1990, 1992, 2001-2016 Free Software Foundation, Inc.
|
||
|
||
This file is part of GNU Emacs.
|
||
|
||
GNU Emacs is free software: you can redistribute it and/or modify
|
||
it under the terms of the GNU General Public License as published by
|
||
the Free Software Foundation, either version 3 of the License, or (at
|
||
your option) any later version.
|
||
|
||
GNU Emacs is distributed in the hope that it will be useful,
|
||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||
GNU General Public License for more details.
|
||
|
||
You should have received a copy of the GNU General Public License
|
||
along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
|
||
|
||
#include <config.h>
|
||
#include <unistd.h> /* for 'environ', on AIX */
|
||
#include "lisp.h"
|
||
|
||
#ifdef MSDOS
|
||
#include "dosfns.h"
|
||
extern int etext;
|
||
#endif
|
||
|
||
/* Some systems need this before <sys/resource.h>. */
|
||
#include <sys/types.h>
|
||
|
||
#ifdef HAVE_SYS_RESOURCE_H
|
||
# include <sys/time.h>
|
||
# include <sys/resource.h>
|
||
#else
|
||
# if HAVE_SYS_VLIMIT_H
|
||
# include <sys/vlimit.h> /* Obsolete, says glibc */
|
||
# endif
|
||
#endif
|
||
|
||
/* Start of data. It is OK if this is approximate; it's used only as
|
||
a heuristic. */
|
||
#ifdef DATA_START
|
||
# define data_start ((char *) DATA_START)
|
||
#else
|
||
extern char data_start[];
|
||
# ifndef HAVE_DATA_START
|
||
/* Initialize to nonzero, so that it's put into data and not bss.
|
||
Link this file's object code first, so that this symbol is near the
|
||
start of data. */
|
||
char data_start[1] = { 1 };
|
||
# endif
|
||
#endif
|
||
|
||
#ifdef HAVE_MALLOC_H
|
||
# include <malloc.h>
|
||
#endif
|
||
#ifndef HAVE_MALLOC_H
|
||
# ifndef __MALLOC_HOOK_VOLATILE
|
||
# define __MALLOC_HOOK_VOLATILE volatile
|
||
# endif
|
||
extern void *(*__morecore) (ptrdiff_t);
|
||
extern void (*__MALLOC_HOOK_VOLATILE __after_morecore_hook) (void);
|
||
#endif
|
||
|
||
/* From ralloc.c. */
|
||
#ifdef REL_ALLOC
|
||
extern void *(*real_morecore) (ptrdiff_t);
|
||
#endif
|
||
|
||
/*
|
||
Level number of warnings already issued.
|
||
0 -- no warnings issued.
|
||
1 -- 75% warning already issued.
|
||
2 -- 85% warning already issued.
|
||
3 -- 95% warning issued; keep warning frequently.
|
||
*/
|
||
enum warnlevel { not_warned, warned_75, warned_85, warned_95 };
|
||
static enum warnlevel warnlevel;
|
||
|
||
/* Function to call to issue a warning;
|
||
0 means don't issue them. */
|
||
static void (*warn_function) (const char *);
|
||
|
||
/* Start of data space; can be changed by calling memory_warnings. */
|
||
static char *data_space_start;
|
||
|
||
/* Number of bytes of writable memory we can expect to be able to get. */
|
||
static size_t lim_data;
|
||
|
||
#ifdef HAVE_GETRLIMIT
|
||
|
||
# ifndef RLIMIT_AS
|
||
# define RLIMIT_AS RLIMIT_DATA
|
||
# endif
|
||
|
||
static void
|
||
get_lim_data (void)
|
||
{
|
||
/* Set LIM_DATA to the minimum of the maximum object size and the
|
||
maximum address space. Don't bother to check for values like
|
||
RLIM_INFINITY since in practice they are not much less than SIZE_MAX. */
|
||
struct rlimit rlimit;
|
||
lim_data
|
||
= (getrlimit (RLIMIT_AS, &rlimit) == 0 && rlimit.rlim_cur <= SIZE_MAX
|
||
? rlimit.rlim_cur
|
||
: SIZE_MAX);
|
||
}
|
||
|
||
#elif defined WINDOWSNT
|
||
|
||
#include "w32heap.h"
|
||
|
||
static void
|
||
get_lim_data (void)
|
||
{
|
||
extern size_t reserved_heap_size;
|
||
lim_data = reserved_heap_size;
|
||
}
|
||
|
||
#elif defined MSDOS
|
||
|
||
void
|
||
get_lim_data (void)
|
||
{
|
||
unsigned long totalram, freeram, totalswap, freeswap;
|
||
|
||
dos_memory_info (&totalram, &freeram, &totalswap, &freeswap);
|
||
lim_data = freeram;
|
||
/* Don't believe they will give us more that 0.5 GB. */
|
||
if (lim_data > 512U * 1024U * 1024U)
|
||
lim_data = 512U * 1024U * 1024U;
|
||
}
|
||
|
||
unsigned long
|
||
ret_lim_data (void)
|
||
{
|
||
get_lim_data ();
|
||
return lim_data;
|
||
}
|
||
#else
|
||
# error "get_lim_data not implemented on this machine"
|
||
#endif
|
||
|
||
/* Verify amount of memory available, complaining if we're near the end. */
|
||
|
||
static void
|
||
check_memory_limits (void)
|
||
{
|
||
#ifndef REL_ALLOC
|
||
void *(*real_morecore) (ptrdiff_t) = 0;
|
||
#endif
|
||
|
||
char *cp;
|
||
size_t five_percent;
|
||
size_t data_size;
|
||
enum warnlevel new_warnlevel;
|
||
|
||
if (lim_data == 0)
|
||
get_lim_data ();
|
||
five_percent = lim_data / 20;
|
||
|
||
/* Find current end of memory and issue warning if getting near max */
|
||
cp = (real_morecore ? real_morecore : __morecore) (0);
|
||
data_size = cp - data_space_start;
|
||
|
||
if (!warn_function)
|
||
return;
|
||
|
||
/* What level of warning does current memory usage demand? */
|
||
new_warnlevel
|
||
= (data_size > five_percent * 19) ? warned_95
|
||
: (data_size > five_percent * 17) ? warned_85
|
||
: (data_size > five_percent * 15) ? warned_75
|
||
: not_warned;
|
||
|
||
/* If we have gone up a level, give the appropriate warning. */
|
||
if (new_warnlevel > warnlevel || new_warnlevel == warned_95)
|
||
{
|
||
warnlevel = new_warnlevel;
|
||
static char const *const warn_diagnostic[] =
|
||
{
|
||
"Warning: past 75% of memory limit",
|
||
"Warning: past 85% of memory limit",
|
||
"Warning: past 95% of memory limit"
|
||
};
|
||
warn_function (warn_diagnostic[warnlevel - 1]);
|
||
}
|
||
/* Handle going down in usage levels, with some hysteresis. */
|
||
else
|
||
{
|
||
/* If we go down below 70% full, issue another 75% warning
|
||
when we go up again. */
|
||
if (data_size < five_percent * 14)
|
||
warnlevel = not_warned;
|
||
/* If we go down below 80% full, issue another 85% warning
|
||
when we go up again. */
|
||
else if (warnlevel > warned_75 && data_size < five_percent * 16)
|
||
warnlevel = warned_75;
|
||
/* If we go down below 90% full, issue another 95% warning
|
||
when we go up again. */
|
||
else if (warnlevel > warned_85 && data_size < five_percent * 18)
|
||
warnlevel = warned_85;
|
||
}
|
||
}
|
||
|
||
/* Enable memory usage warnings.
|
||
START says where the end of pure storage is.
|
||
WARNFUN specifies the function to call to issue a warning. */
|
||
|
||
void
|
||
memory_warnings (void *start, void (*warnfun) (const char *))
|
||
{
|
||
data_space_start = start ? start : data_start;
|
||
|
||
warn_function = warnfun;
|
||
__after_morecore_hook = check_memory_limits;
|
||
|
||
/* Force data limit to be recalculated on each run. */
|
||
lim_data = 0;
|
||
}
|