[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 2/3] Add garbage-collect-maybe function
From: |
Spencer Baugh |
Subject: |
[PATCH v2 2/3] Add garbage-collect-maybe function |
Date: |
Sun, 22 Nov 2020 00:08:28 -0500 |
---
src/alloc.c | 37 +++++++++++++++++++++++++++++++++++++
src/lisp.h | 1 +
2 files changed, 38 insertions(+)
diff --git a/src/alloc.c b/src/alloc.c
index fd572c0175..cc48acb17a 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -5961,6 +5961,23 @@ maybe_garbage_collect (void)
garbage_collect ();
}
+/* Like maybe_garbage_collect, but with the GC threshold reduced by
+ FACTOR, so that we'll GC sooner than we would otherwise.
+ Returns true if we GC'd. */
+bool
+maybe_garbage_collect_eagerly (EMACS_INT factor)
+{
+ bump_consing_until_gc (gc_cons_threshold, Vgc_cons_percentage);
+ EMACS_INT since_gc = gc_threshold - consing_until_gc;
+ if (factor >= 1 && since_gc > gc_threshold / factor)
+ {
+ garbage_collect ();
+ return true;
+ }
+ else
+ return false;
+}
+
/* Subroutine of Fgarbage_collect that does most of the work. */
void
garbage_collect (void)
@@ -6215,6 +6232,25 @@ See Info node `(elisp)Garbage Collection'. */)
return CALLMANY (Flist, total);
}
+DEFUN ("garbage-collect-maybe", Fgarbage_collect_maybe,
+Sgarbage_collect_maybe, 1, 1, "",
+ doc: /* Call `garbage-collect' if enough allocation happened.
+FACTOR determines what "enough" means here:
+If FACTOR is a positive number N, it means to run GC if more than
+1/Nth of the allocations needed to triger automatic allocation took
+place.
+Therefore, as N gets higher, this is more likely to perform a GC.
+Returns t if GC happened, and nil otherwise. */)
+ (Lisp_Object factor)
+{
+ CHECK_FIXNAT (factor);
+ EMACS_INT fact = XFIXNAT (factor);
+ if (maybe_garbage_collect_eagerly (fact))
+ return Qt;
+ else
+ return Qnil;
+}
+
/* Mark Lisp objects in glyph matrix MATRIX. Currently the
only interesting objects referenced from glyphs are strings. */
@@ -7564,6 +7600,7 @@ N should be nonnegative. */);
defsubr (&Smake_finalizer);
defsubr (&Spurecopy);
defsubr (&Sgarbage_collect);
+ defsubr (&Sgarbage_collect_maybe);
defsubr (&Smemory_info);
defsubr (&Smemory_use_counts);
#ifdef GNU_LINUX
diff --git a/src/lisp.h b/src/lisp.h
index 76d74200ac..5ef47fa234 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -3793,6 +3793,7 @@ flush_stack_call_func (void (*func) (void *arg), void
*arg)
extern void garbage_collect (void);
extern void maybe_garbage_collect (void);
+extern bool maybe_garbage_collect_eagerly (EMACS_INT factor);
extern const char *pending_malloc_warning;
extern Lisp_Object zero_vector;
extern EMACS_INT consing_until_gc;
--
2.28.0
- Re: Eager garbage collection, (continued)
- Re: Eager garbage collection, Spencer Baugh, 2020/11/18
- Re: Eager garbage collection, Andrea Corallo, 2020/11/18
- Re: Eager garbage collection, Stefan Monnier, 2020/11/18
- Re: Eager garbage collection, Andrea Corallo, 2020/11/18
- Re: Eager garbage collection, Eli Zaretskii, 2020/11/18
- Re: Eager garbage collection, Eli Zaretskii, 2020/11/18
- Re: Eager garbage collection, Spencer Baugh, 2020/11/22
- [PATCH v2 1/3] Add gc-estimated-time variable, Spencer Baugh, 2020/11/22
- Re: [PATCH v2 1/3] Add gc-estimated-time variable, Eli Zaretskii, 2020/11/22
- Re: [PATCH v2 1/3] Add gc-estimated-time variable, Stefan Monnier, 2020/11/22
- [PATCH v2 2/3] Add garbage-collect-maybe function,
Spencer Baugh <=
- Re: [PATCH v2 2/3] Add garbage-collect-maybe function, Eli Zaretskii, 2020/11/22
- [PATCH v2 3/3] Start opportunistic GC timer at startup, Spencer Baugh, 2020/11/22
- Re: Eager garbage collection, Eli Zaretskii, 2020/11/22
- Re: Eager garbage collection, yyoncho, 2020/11/18
- Re: Eager garbage collection, Eli Zaretskii, 2020/11/18
- Re: Eager garbage collection, Stefan Monnier, 2020/11/18
- Re: Eager garbage collection, Stefan Monnier, 2020/11/18