diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2019-09-12 08:25:13 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2019-09-12 08:25:36 -0400 |
| commit | 997415504c37b4dc1f486b9d9925c4e16ade015c (patch) | |
| tree | 81bdd63738eb07ce2476309d9f0077494202e7fc /src/profiler.c | |
| parent | c19f5dcd474bfc883fc7555eef7d8f50a0df3157 (diff) | |
| download | emacs-997415504c37b4dc1f486b9d9925c4e16ade015c.tar.gz | |
* src/profiler.c: Leave `key` hashslots as Qunbound (bug#37382)
Now that "key == Qunbound" is used to determine if a hash table entry
is available, we can't stash pre-allocated vectors into the `key` slot
anymore, so use the `value` slot instead.
(make_log): Pre-fill the `value` slots i.s.o `key`.
(evict_lower_half): Stash key back into `value`, i.s.o `key`.
(record_backtrace): Get pre-allocated vector for `value` i.s.o `key`.
Diffstat (limited to 'src/profiler.c')
| -rw-r--r-- | src/profiler.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/profiler.c b/src/profiler.c index 6943905062c..84583cec765 100644 --- a/src/profiler.c +++ b/src/profiler.c @@ -66,11 +66,11 @@ make_log (void) Qnil, false); struct Lisp_Hash_Table *h = XHASH_TABLE (log); - /* What is special about our hash-tables is that the keys are pre-filled - with the vectors we'll put in them. */ + /* What is special about our hash-tables is that the values are pre-filled + with the vectors we'll use as keys. */ ptrdiff_t i = ASIZE (h->key_and_value) >> 1; while (i > 0) - set_hash_key_slot (h, --i, make_nil_vector (max_stack_depth)); + set_hash_value_slot (h, --i, make_nil_vector (max_stack_depth)); return log; } @@ -132,13 +132,14 @@ static void evict_lower_half (log_t *log) XSET_HASH_TABLE (tmp, log); /* FIXME: Use make_lisp_ptr. */ Fremhash (key, tmp); } + eassert (EQ (Qunbound, HASH_KEY (log, i))); eassert (log->next_free == i); eassert (VECTORP (key)); for (ptrdiff_t j = 0; j < ASIZE (key); j++) ASET (key, j, Qnil); - set_hash_key_slot (log, i, key); + set_hash_value_slot (log, i, key); } } @@ -156,7 +157,8 @@ record_backtrace (log_t *log, EMACS_INT count) ptrdiff_t index = log->next_free; /* Get a "working memory" vector. */ - Lisp_Object backtrace = HASH_KEY (log, index); + Lisp_Object backtrace = HASH_VALUE (log, index); + eassert (EQ (Qunbound, HASH_KEY (log, index))); get_backtrace (backtrace); { /* We basically do a `gethash+puthash' here, except that we have to be |