Mercurial > emacs

comparison src/alloc.c @ 90596:6823a91487f2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 399-413) - Update from CVS - Rcirc update from Ryan Yeske - Merge from gnus--rel--5.10 - Miscellaneous tq-related fixes. * gnus--rel--5.10 (patch 126-127) - Merge from emacs--devo--0 - Update from CVS Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-105
author Miles Bader <miles@gnu.org>
date Mon, 28 Aug 2006 04:33:45 +0000
parents 7f3f771c85fa 07b45e10e844
children dbe3f29e61d6
comparison
equal deleted inserted replaced
90595:fd59c4164a14 90596:6823a91487f2
128 static pthread_mutex_t alloc_mutex; 128 static pthread_mutex_t alloc_mutex;
129 129
130 #define BLOCK_INPUT_ALLOC \ 130 #define BLOCK_INPUT_ALLOC \
131 do \ 131 do \
132 { \ 132 { \
133 if (!in_sighandler) \ 133 if (pthread_self () == main_thread) \
134 { \ 134 BLOCK_INPUT; \
135 pthread_mutex_lock (&alloc_mutex); \ 135 pthread_mutex_lock (&alloc_mutex); \
136 if (pthread_self () == main_thread) \
137 BLOCK_INPUT; \
138 else \
139 sigblock (sigmask (SIGIO)); \
140 } \
141 } \ 136 } \
142 while (0) 137 while (0)
143 #define UNBLOCK_INPUT_ALLOC \ 138 #define UNBLOCK_INPUT_ALLOC \
144 do \ 139 do \
145 { \ 140 { \
146 if (!in_sighandler) \ 141 pthread_mutex_unlock (&alloc_mutex); \
147 { \ 142 if (pthread_self () == main_thread) \
148 pthread_mutex_unlock (&alloc_mutex); \ 143 UNBLOCK_INPUT; \
149 if (pthread_self () == main_thread) \
150 UNBLOCK_INPUT; \
151 else \
152 sigunblock (sigmask (SIGIO)); \
153 } \
154 } \ 144 } \
155 while (0) 145 while (0)
156 146
157 #else /* SYSTEM_MALLOC || not HAVE_GTK_AND_PTHREAD */ 147 #else /* SYSTEM_MALLOC || not HAVE_GTK_AND_PTHREAD */
158 148