From ebd52028c2194917411f95740a03ef01d88570a8 Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Wed, 11 Nov 2009 10:55:48 +0100 Subject: [PATCH] Remove desired_buffer from the thread_state struct. --- src/thread.c | 13 +------------ src/thread.h | 4 ---- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/src/thread.c b/src/thread.c index ca8317822ab..b142c8e679f 100644 --- a/src/thread.c +++ b/src/thread.c @@ -229,8 +229,7 @@ run_thread (void *state) typically wait for the parent thread to release it first. */ XSETBUFFER (buffer, self->m_current_buffer); GCPRO1 (buffer); - self->desired_buffer = (struct buffer *) buffer; - self->m_current_buffer = 0; + self->m_current_buffer = (struct buffer *) buffer; pthread_mutex_lock (&global_lock); @@ -402,16 +401,6 @@ thread_notify_kill_buffer (register struct buffer *b) struct thread_state *it = all_threads; for (; it; it = it->next_thread) { - if (b == it->desired_buffer) - { - register Lisp_Object buf; - XSETBUFFER (buf, it->desired_buffer); - tem = Fother_buffer (buf, Qnil, Qnil); - it->desired_buffer = XBUFFER (tem); - if (b == it->desired_buffer) - return Qnil; - } - if (b == it->m_current_buffer) { register Lisp_Object buf; diff --git a/src/thread.h b/src/thread.h index df98276fc81..e58d2bebfde 100644 --- a/src/thread.h +++ b/src/thread.h @@ -111,10 +111,6 @@ struct thread_state pthread_t pthread_id; - /* Used internally by the scheduler, the buffer that the thread wants a lock - for. */ - struct buffer *desired_buffer; - /* If nonzero the thread is blocked on a wait so it is not schedulable. */ int blocked; }; -- 2.11.4.GIT