[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r109264: * alloc.c (Fgarbage_collect)
From: |
Paul Eggert |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r109264: * alloc.c (Fgarbage_collect): Indent as per usual Emacs style. |
Date: |
Sun, 29 Jul 2012 09:00:35 -0700 |
User-agent: |
Bazaar (2.5.0) |
------------------------------------------------------------
revno: 109264
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Sun 2012-07-29 09:00:35 -0700
message:
* alloc.c (Fgarbage_collect): Indent as per usual Emacs style.
modified:
src/ChangeLog
src/alloc.c
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2012-07-29 15:43:09 +0000
+++ b/src/ChangeLog 2012-07-29 16:00:35 +0000
@@ -1,3 +1,7 @@
+2012-07-29 Paul Eggert <address@hidden>
+
+ * alloc.c (Fgarbage_collect): Indent as per usual Emacs style.
+
2012-07-29 Eli Zaretskii <address@hidden>
* makefile.w32-in (LISP_H): Add $(NT_INC)/stdalign.h.
=== modified file 'src/alloc.c'
--- a/src/alloc.c 2012-07-29 13:51:45 +0000
+++ b/src/alloc.c 2012-07-29 16:00:35 +0000
@@ -5706,9 +5706,9 @@
#if GC_MARK_STACK == GC_USE_GCPROS_CHECK_ZOMBIES
{
/* Compute average percentage of zombies. */
- double nlive =
- total_conses + total_symbols + total_markers + total_strings
- + total_vectors + total_floats + total_intervals + total_buffers;
+ double nlive =
+ (total_conses + total_symbols + total_markers + total_strings
+ + total_vectors + total_floats + total_intervals + total_buffers);
avg_live = (avg_live * ngcs + nlive) / (ngcs + 1);
max_live = max (nlive, max_live);
@@ -5727,9 +5727,11 @@
/* Accumulate statistics. */
if (FLOATP (Vgc_elapsed))
- Vgc_elapsed = make_float
- (XFLOAT_DATA (Vgc_elapsed) + EMACS_TIME_TO_DOUBLE
- (sub_emacs_time (current_emacs_time (), start)));
+ {
+ EMACS_TIME since_start = sub_emacs_time (current_emacs_time (), start);
+ Vgc_elapsed = make_float (XFLOAT_DATA (Vgc_elapsed)
+ + EMACS_TIME_TO_DOUBLE (since_start));
+ }
gcs_done++;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r109264: * alloc.c (Fgarbage_collect): Indent as per usual Emacs style.,
Paul Eggert <=