procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix last change with thread marking under GC_CHECK_MARKED_OBJECTS

Browse source 
* src/thread.c (primary_thread_p): New function.
* src/alloc.c (mark_object): Use 'primary_thread_p' to bypass tests
meant for thread objects allocated dynamically.
* src/thread.h (primary_thread_p): Add prototype.
This commit is contained in:
Eli Zaretskii 2016-12-22 18:13:16 +02:00
parent 3ec1503374
commit 5fcc777ff3
3 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/alloc.c
View file

@ -6406,7 +6406,7 @@ mark_object (Lisp_Object arg)
#ifdef GC_CHECK_MARKED_OBJECTS
m = mem_find (po);
if (m == MEM_NIL && !SUBRP (obj) && !THREADP (obj))
if (m == MEM_NIL && !SUBRP (obj) && !primary_thread_p (po))
emacs_abort ();
#endif /* GC_CHECK_MARKED_OBJECTS */
@ -6418,7 +6418,7 @@ mark_object (Lisp_Object arg)
if (pvectype != PVEC_SUBR
&& pvectype != PVEC_BUFFER
&& pvectype != PVEC_THREAD)
&& !primary_thread_p (po))
CHECK_LIVE (live_vector_p);
switch (pvectype)

6
src/thread.c
View file

@ -950,6 +950,12 @@ init_primary_thread (void)
primary_thread.event_object = Qnil;
}
bool
primary_thread_p (void *ptr)
{
return (ptr == &primary_thread) ? true : false;
}
void
init_threads_once (void)
{

1
src/thread.h
View file

@ -236,6 +236,7 @@ extern void maybe_reacquire_global_lock (void);
extern void init_threads_once (void);
extern void init_threads (void);
extern void syms_of_threads (void);
extern bool primary_thread_p (void *);
typedef int select_func (int, fd_set *, fd_set *, fd_set *,
const struct timespec *, const sigset_t *);