diff options
| author | Zach Shaftel | 2025-06-11 15:37:31 -0400 |
|---|---|---|
| committer | Eli Zaretskii | 2025-06-14 17:54:06 +0300 |
| commit | 009cdc8ae09ef060c030feac06578a4ba37cd8c5 (patch) | |
| tree | 29624799ada8ee27f508fd29a395dd0a0de0f9b6 /test/src | |
| parent | e1d0ee1b6b545c82937755dd19787c3d7059eca3 (diff) | |
| download | emacs-009cdc8ae09ef060c030feac06578a4ba37cd8c5.tar.gz emacs-009cdc8ae09ef060c030feac06578a4ba37cd8c5.zip | |
Fix segfault in profiler-cpu-log and profiler-memory-log (bug#78763)
* src/profiler.c (export_log): Check if a log has been allocated first,
and return nil if it hasn't.
(Fprofiler_cpu_log, Fprofiler_memory_log): Doc fix.
* test/src/profiler-tests.el (profiler-tests-cpu-profiler)
(profiler-tests-memory-profiler): New tests.
Diffstat (limited to 'test/src')
| -rw-r--r-- | test/src/profiler-tests.el | 58 |
1 files changed, 58 insertions, 0 deletions
diff --git a/test/src/profiler-tests.el b/test/src/profiler-tests.el new file mode 100644 index 00000000000..fe50de713e2 --- /dev/null +++ b/test/src/profiler-tests.el | |||
| @@ -0,0 +1,58 @@ | |||
| 1 | ;;; profiler-tests.el --- tests for src/profiler.c -*- lexical-binding:t -*- | ||
| 2 | |||
| 3 | ;; Copyright (C) 2025 Free Software Foundation, Inc. | ||
| 4 | |||
| 5 | ;; This file is part of GNU Emacs. | ||
| 6 | |||
| 7 | ;; GNU Emacs is free software: you can redistribute it and/or modify | ||
| 8 | ;; it under the terms of the GNU General Public License as published by | ||
| 9 | ;; the Free Software Foundation, either version 3 of the License, or | ||
| 10 | ;; (at your option) any later version. | ||
| 11 | |||
| 12 | ;; GNU Emacs is distributed in the hope that it will be useful, | ||
| 13 | ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 14 | ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 15 | ;; GNU General Public License for more details. | ||
| 16 | |||
| 17 | ;; You should have received a copy of the GNU General Public License | ||
| 18 | ;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. | ||
| 19 | |||
| 20 | ;;; Commentary: | ||
| 21 | |||
| 22 | ;;; Code: | ||
| 23 | |||
| 24 | (require 'ert) | ||
| 25 | |||
| 26 | (ert-deftest profiler-tests-memory-profiler () | ||
| 27 | (let ((was-running (profiler-memory-running-p))) | ||
| 28 | ;; do this first in case the profiler was already running | ||
| 29 | (should (eq was-running (profiler-memory-stop))) | ||
| 30 | (profiler-memory-start) | ||
| 31 | (should-error (profiler-memory-start)) | ||
| 32 | (should (profiler-memory-running-p)) | ||
| 33 | (should (hash-table-p (profiler-memory-log))) | ||
| 34 | ;; `profiler-memory-log' shouldn't terminate profiling. | ||
| 35 | (should (profiler-memory-running-p)) | ||
| 36 | (profiler-memory-stop) | ||
| 37 | (profiler-memory-log) ;flush the log | ||
| 38 | (should-not (profiler-memory-log)) | ||
| 39 | (when was-running (profiler-memory-start)))) | ||
| 40 | |||
| 41 | (defconst profiler-tests-cpu-sampling-interval 1000000) | ||
| 42 | |||
| 43 | (ert-deftest profiler-tests-cpu-profiler () | ||
| 44 | (skip-unless (fboundp 'profiler-cpu-start)) | ||
| 45 | (let ((was-running (profiler-cpu-running-p))) | ||
| 46 | (should (eq was-running (profiler-cpu-stop))) | ||
| 47 | (profiler-cpu-start profiler-tests-cpu-sampling-interval) | ||
| 48 | (should-error (profiler-cpu-start profiler-tests-cpu-sampling-interval)) | ||
| 49 | (should (hash-table-p (profiler-cpu-log))) | ||
| 50 | (should (profiler-cpu-running-p)) | ||
| 51 | (profiler-cpu-stop) | ||
| 52 | (profiler-cpu-log) | ||
| 53 | (should-not (profiler-cpu-log)) | ||
| 54 | (when was-running | ||
| 55 | (profiler-cpu-start (or (bound-and-true-p profiler-sampling-interval) | ||
| 56 | profiler-tests-cpu-sampling-interval))))) | ||
| 57 | |||
| 58 | ;;; profiler-tests.el ends here | ||