[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master d8d5dc4: memory-report: support calculating size for structures
From: |
Lars Ingebrigtsen |
Subject: |
master d8d5dc4: memory-report: support calculating size for structures |
Date: |
Thu, 2 Sep 2021 03:37:18 -0400 (EDT) |
branch: master
commit d8d5dc45656233fdccc3709093a16e2562cd4a40
Author: Yikai Zhao <yikai@z1k.dev>
Commit: Lars Ingebrigtsen <larsi@gnus.org>
memory-report: support calculating size for structures
* lisp/emacs-lisp/memory-report.el (memory-report--object-size-1): Add
support for cl-defstruct types (bug#50301).
---
lisp/emacs-lisp/memory-report.el | 15 ++++++++++++++-
test/lisp/emacs-lisp/memory-report-tests.el | 8 ++++++++
2 files changed, 22 insertions(+), 1 deletion(-)
diff --git a/lisp/emacs-lisp/memory-report.el b/lisp/emacs-lisp/memory-report.el
index aee2a00..3166d33 100644
--- a/lisp/emacs-lisp/memory-report.el
+++ b/lisp/emacs-lisp/memory-report.el
@@ -29,7 +29,7 @@
(require 'seq)
(require 'subr-x)
-(eval-when-compile (require 'cl-lib))
+(require 'cl-lib)
(defvar memory-report--type-size (make-hash-table))
@@ -243,6 +243,19 @@ by counted more than once."
value)
total))
+;; All cl-defstruct types.
+(cl-defmethod memory-report--object-size-1 (counted (value
cl-structure-object))
+ (let ((struct-type (type-of value)))
+ (apply #'+
+ (memory-report--size 'vector)
+ (mapcar (lambda (slot)
+ (if (eq (car slot) 'cl-tag-slot)
+ 0
+ (memory-report--object-size
+ counted
+ (cl-struct-slot-value struct-type (car slot) value))))
+ (cl-struct-slot-info struct-type)))))
+
(defun memory-report--format (bytes)
(setq bytes (/ bytes 1024.0))
(let ((units '("KiB" "MiB" "GiB" "TiB")))
diff --git a/test/lisp/emacs-lisp/memory-report-tests.el
b/test/lisp/emacs-lisp/memory-report-tests.el
index 0c0297b..e352dd1 100644
--- a/test/lisp/emacs-lisp/memory-report-tests.el
+++ b/test/lisp/emacs-lisp/memory-report-tests.el
@@ -68,6 +68,14 @@
(vector string string))
124))))
+(ert-deftest memory-report-sizes-structs ()
+ (cl-defstruct memory-report-test-struct
+ (item0 nil)
+ (item1 nil))
+ (let ((s (make-memory-report-test-struct :item0 "hello" :item1 "world")))
+ (should (= (memory-report-object-size s)
+ 90))))
+
(provide 'memory-report-tests)
;;; memory-report-tests.el ends here
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- master d8d5dc4: memory-report: support calculating size for structures,
Lars Ingebrigtsen <=