diff options
| author | Dmitry Antipov <dmantipov@yandex.ru> | 2012-07-19 13:50:01 +0400 |
|---|---|---|
| committer | Dmitry Antipov <dmantipov@yandex.ru> | 2012-07-19 13:50:01 +0400 |
| commit | 5b835e1d6e0c6fafc7f27174889358bfde5f2449 (patch) | |
| tree | fe3d98d833f7bee6f04d69b62dd9bd65c56d1a79 /lisp/emacs-lisp/chart.el | |
| parent | 9cd47b72e021f76a6e2481d986ce4b0cb0b859d3 (diff) | |
| download | emacs-5b835e1d6e0c6fafc7f27174889358bfde5f2449.tar.gz | |
Tweak the value returned from Fgarbage_collect again.
* src/alloc.c (Fgarbage_collect): New return value, as confirmed in
http://lists.gnu.org/archive/html/emacs-devel/2012-07/msg00418.html.
Adjust documentation.
(total_vector_bytes): Rename to total_vector_slots, adjust
accounting.
(total_free_vector_bytes): Rename to total_free_vector_slots,
adjust accounting.
(Qstring_bytes, Qvector_slots): New symbols.
(syms_of_alloc): DEFSYM them.
* lisp/emacs-lisp/chart.el (chart-emacs-storage): Adjust again.
Diffstat (limited to 'lisp/emacs-lisp/chart.el')
| -rw-r--r-- | lisp/emacs-lisp/chart.el | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/lisp/emacs-lisp/chart.el b/lisp/emacs-lisp/chart.el index 5699d827d4f..1451e1a2af4 100644 --- a/lisp/emacs-lisp/chart.el +++ b/lisp/emacs-lisp/chart.el @@ -680,18 +680,20 @@ SORT-PRED if desired." (symbol-info (nth 1 data)) (misc-info (nth 2 data)) (string-info (nth 3 data)) - (vector-info (nth 4 data)) - (float-info (nth 5 data)) - (interval-info (nth 6 data)) - (buffer-info (nth 7 data)) + (string-bytes-info (nth 4 data)) + ;; (nth 5 data) is not used + (vector-slots-info (nth 6 data)) + (float-info (nth 7 data)) + (interval-info (nth 8 data)) + (buffer-info (nth 9 data)) (names '("conses" "symbols" "miscs" "strings" "vectors" "floats" "intervals" "buffers")) (nums (list (* (nth 1 cons-info) (nth 2 cons-info)) (* (nth 1 symbol-info) (nth 2 symbol-info)) (* (nth 1 misc-info) (nth 2 misc-info)) (+ (* (nth 1 string-info) (nth 2 string-info)) - (nth 3 string-info)) - (nth 3 vector-info) + (nth 2 string-bytes-info)) + (* (nth 1 vector-slots-info) (nth 2 vector-slots-info)) (* (nth 1 float-info) (nth 2 float-info)) (* (nth 1 interval-info) (nth 2 interval-info)) (* (nth 1 buffer-info) (nth 2 buffer-info))))) |