[ViewVC] Diff of: cvs/cvsroot/libcoro/coro.c

Comparing cvsroot/libcoro/coro.c (file contents):
Revision 1.35 by root, Mon Nov 3 16:05:38 2008 UTC vs.
Revision 1.44 by root, Wed Nov 19 02:56:16 2008 UTC

…		…
38	* go to Ralf S. Engelschall <rse@engelschall.com>.	38	* go to Ralf S. Engelschall <rse@engelschall.com>.
39	*/	39	*/
40		40
41	#include "coro.h"	41	#include "coro.h"
42		42
		43	#include <string.h>
		44
		45	/*****************************************************************************/
		46	/* ucontext/setjmp/asm backends */
		47	/*****************************************************************************/
		48	#if CORO_UCONTEXT \|\| CORO_SJLJ \|\| CORO_LOSER \|\| CORO_LINUX \|\| CORO_IRIX \|\| CORO_ASM
		49
		50	# if CORO_UCONTEXT
		51	# include <stddef.h>
		52	# endif
		53
43	#if !defined(STACK_ADJUST_PTR)	54	# if !defined(STACK_ADJUST_PTR)
		55	# if __sgi
44	/* IRIX is decidedly NON-unix */	56	/* IRIX is decidedly NON-unix */
45	# if __sgi
46	# define STACK_ADJUST_PTR(sp,ss) ((char *)(sp) + (ss) - 8)	57	# define STACK_ADJUST_PTR(sp,ss) ((char *)(sp) + (ss) - 8)
47	# define STACK_ADJUST_SIZE(sp,ss) ((ss) - 8)	58	# define STACK_ADJUST_SIZE(sp,ss) ((ss) - 8)
48	# elif (__i386__ && CORO_LINUX) \|\| (_M_IX86 && CORO_LOSER)	59	# elif (__i386__ && CORO_LINUX) \|\| (_M_IX86 && CORO_LOSER)
49	# define STACK_ADJUST_PTR(sp,ss) ((char *)(sp) + (ss))	60	# define STACK_ADJUST_PTR(sp,ss) ((char *)(sp) + (ss))
50	# define STACK_ADJUST_SIZE(sp,ss) (ss)	61	# define STACK_ADJUST_SIZE(sp,ss) (ss)
51	# elif (__amd64__ && CORO_LINUX) \|\| ((_M_AMD64 \|\| _M_IA64) && CORO_LOSER)	62	# elif (__amd64__ && CORO_LINUX) \|\| ((_M_AMD64 \|\| _M_IA64) && CORO_LOSER)
52	# define STACK_ADJUST_PTR(sp,ss) ((char *)(sp) + (ss) - 8)	63	# define STACK_ADJUST_PTR(sp,ss) ((char *)(sp) + (ss) - 8)
53	# define STACK_ADJUST_SIZE(sp,ss) (ss)	64	# define STACK_ADJUST_SIZE(sp,ss) (ss)
54	# else	65	# else
55	# define STACK_ADJUST_PTR(sp,ss) (sp)	66	# define STACK_ADJUST_PTR(sp,ss) (sp)
56	# define STACK_ADJUST_SIZE(sp,ss) (ss)	67	# define STACK_ADJUST_SIZE(sp,ss) (ss)
57	# endif	68	# endif
58	#endif	69	# endif
59		70
60	#if CORO_UCONTEXT
61	# include <stddef.h>
62	#endif
63
64	#if CORO_SJLJ \|\| CORO_LOSER \|\| CORO_LINUX \|\| CORO_IRIX \|\| CORO_ASM
65
66	#include <stdlib.h>	71	# include <stdlib.h>
67		72
68	#if CORO_SJLJ	73	# if CORO_SJLJ
69	# include <stdio.h>	74	# include <stdio.h>
70	# include <signal.h>	75	# include <signal.h>
71	# include <unistd.h>	76	# include <unistd.h>
72	#endif	77	# endif
73		78
74	static volatile coro_func coro_init_func;	79	static coro_func coro_init_func;
75	static volatile void *coro_init_arg;	80	static void *coro_init_arg;
76	static volatile coro_context new_coro, create_coro;	81	static coro_context new_coro, create_coro;
77
78	/* what we really want to detect here is wether we use a new-enough version of GAS */
79	/* instead, check for gcc 3, ELF and GNU/Linux and hope for the best */
80	#if __GNUC__ >= 3 && __ELF__ && __linux__
81	# define HAVE_CFI 1
82	#endif
83		82
84	static void	83	static void
85	coro_init (void)	84	coro_init (void)
86	{	85	{
87	volatile coro_func func = coro_init_func;	86	volatile coro_func func = coro_init_func;
88	volatile void *arg = coro_init_arg;	87	volatile void *arg = coro_init_arg;
89		88
90	coro_transfer ((coro_context )new_coro, (coro_context )create_coro);	89	coro_transfer (new_coro, create_coro);
91		90
92	func ((void *)arg);	91	func ((void *)arg);
93		92
94	/* the new coro returned. bad. just abort() for now */	93	/* the new coro returned. bad. just abort() for now */
95	abort ();	94	abort ();
96	}	95	}
97		96
98	# if CORO_SJLJ	97	# if CORO_SJLJ
99		98
100	static volatile int trampoline_count;	99	static volatile int trampoline_done;
101		100
102	/* trampoline signal handler */	101	/* trampoline signal handler */
103	static void	102	static void
104	trampoline (int sig)	103	trampoline (int sig)
105	{	104	{
106	if (setjmp (((coro_context *)new_coro)->env))	105	if (coro_setjmp (new_coro->env))
107	{
108	#if HAVE_CFI
109	asm (".cfi_startproc");
110	#endif
111	coro_init (); /* start it */	106	coro_init (); /* start it */
112	#if HAVE_CFI
113	asm (".cfi_endproc");
114	#endif
115	}
116	else	107	else
117	trampoline_count++;	108	trampoline_done = 1;
118	}	109	}
119		110
120	# endif
121
122	#endif	111	# endif
123		112
124	#if CORO_ASM	113	# if CORO_ASM
		114
125	asm (	115	asm (
126	".text\n"	116	".text\n"
127	".globl coro_transfer\n"	117	".globl coro_transfer\n"
128	".type coro_transfer, @function\n"	118	".type coro_transfer, @function\n"
129	"coro_transfer:\n"	119	"coro_transfer:\n"
130	#if __amd64	120	#if __amd64
131	# define NUM_SAVED 5	121	#define NUM_SAVED 6
		122	"\tpush %rbp\n"
132	"\tpush %rbx\n"	123	"\tpush %rbx\n"
133	"\tpush %r12\n"	124	"\tpush %r12\n"
134	"\tpush %r13\n"	125	"\tpush %r13\n"
135	"\tpush %r14\n"	126	"\tpush %r14\n"
136	"\tpush %r15\n"	127	"\tpush %r15\n"
137	"\tmov %rsp, (%rdi)\n"	128	"\tmov %rsp, (%rdi)\n"
138	"\tmov (%rsi), %rsp\n"	129	"\tmov (%rsi), %rsp\n"
139	"\tpop %r15\n"	130	"\tpop %r15\n"
140	"\tpop %r14\n"	131	"\tpop %r14\n"
141	"\tpop %r13\n"	132	"\tpop %r13\n"
142	"\tpop %r12\n"	133	"\tpop %r12\n"
143	"\tpop %rbx\n"	134	"\tpop %rbx\n"
		135	"\tpop %rbp\n"
144	#elif __i386	136	#elif __i386
145	# define NUM_SAVED 4	137	#define NUM_SAVED 4
146	"\tpush %ebx\n"
147	"\tpush %esi\n"
148	"\tpush %edi\n"
149	"\tpush %ebp\n"	138	"\tpush %ebp\n"
		139	"\tpush %ebx\n"
		140	"\tpush %esi\n"
		141	"\tpush %edi\n"
150	"\tmov %esp, (%eax)\n"	142	"\tmov %esp, (%eax)\n"
151	"\tmov (%edx), %esp\n"	143	"\tmov (%edx), %esp\n"
152	"\tpop %ebp\n"
153	"\tpop %edi\n"	144	"\tpop %edi\n"
154	"\tpop %esi\n"	145	"\tpop %esi\n"
155	"\tpop %ebx\n"	146	"\tpop %ebx\n"
156	#else	147	"\tpop %ebp\n"
		148	#else
157	# error unsupported architecture	149	#error unsupported architecture
158	#endif	150	#endif
159	"\tret\n"	151	"\tret\n"
160	);	152	);
		153
161	#endif	154	# endif
162		155
		156	void
		157	coro_create (coro_context ctx, coro_func coro, void arg, void *sptr, long ssize)
		158	{
		159	coro_context nctx;
		160	# if CORO_SJLJ
		161	stack_t ostk, nstk;
		162	struct sigaction osa, nsa;
		163	sigset_t nsig, osig;
		164	# endif
		165
		166	if (!coro)
		167	return;
		168
		169	coro_init_func = coro;
		170	coro_init_arg = arg;
		171
		172	new_coro = ctx;
		173	create_coro = &nctx;
		174
		175	# if CORO_SJLJ
		176	/* we use SIGUSR2. first block it, then fiddle with it. */
		177
		178	sigemptyset (&nsig);
		179	sigaddset (&nsig, SIGUSR2);
		180	sigprocmask (SIG_BLOCK, &nsig, &osig);
		181
		182	nsa.sa_handler = trampoline;
		183	sigemptyset (&nsa.sa_mask);
		184	nsa.sa_flags = SA_ONSTACK;
		185
		186	if (sigaction (SIGUSR2, &nsa, &osa))
		187	{
		188	perror ("sigaction");
		189	abort ();
		190	}
		191
		192	/* set the new stack */
		193	nstk.ss_sp = STACK_ADJUST_PTR (sptr,ssize); /* yes, some platforms (IRIX) get this wrong. */
		194	nstk.ss_size = STACK_ADJUST_SIZE (sptr,ssize);
		195	nstk.ss_flags = 0;
		196
		197	if (sigaltstack (&nstk, &ostk) < 0)
		198	{
		199	perror ("sigaltstack");
		200	abort ();
		201	}
		202
		203	trampoline_done = 0;
		204	kill (getpid (), SIGUSR2);
		205	sigfillset (&nsig); sigdelset (&nsig, SIGUSR2);
		206
		207	while (!trampoline_done)
		208	sigsuspend (&nsig);
		209
		210	sigaltstack (0, &nstk);
		211	nstk.ss_flags = SS_DISABLE;
		212	if (sigaltstack (&nstk, 0) < 0)
		213	perror ("sigaltstack");
		214
		215	sigaltstack (0, &nstk);
		216	if (~nstk.ss_flags & SS_DISABLE)
		217	abort ();
		218
		219	if (~ostk.ss_flags & SS_DISABLE)
		220	sigaltstack (&ostk, 0);
		221
		222	sigaction (SIGUSR2, &osa, 0);
		223	sigprocmask (SIG_SETMASK, &osig, 0);
		224
		225	# elif CORO_LOSER
		226
		227	coro_setjmp (ctx->env);
		228	#if __CYGWIN__
		229	ctx->env[7] = (long)((char *)sptr + ssize) - sizeof (long);
		230	ctx->env[8] = (long)coro_init;
		231	#elif defined(_M_IX86)
		232	((_JUMP_BUFFER *)&ctx->env)->Eip = (long)coro_init;
		233	((_JUMP_BUFFER *)&ctx->env)->Esp = (long)STACK_ADJUST_PTR (sptr, ssize) - sizeof (long);
		234	#elif defined(_M_AMD64)
		235	((_JUMP_BUFFER *)&ctx->env)->Rip = (__int64)coro_init;
		236	((_JUMP_BUFFER *)&ctx->env)->Rsp = (__int64)STACK_ADJUST_PTR (sptr, ssize) - sizeof (long);
		237	#elif defined(_M_IA64)
		238	((_JUMP_BUFFER *)&ctx->env)->StIIP = (__int64)coro_init;
		239	((_JUMP_BUFFER *)&ctx->env)->IntSp = (__int64)STACK_ADJUST_PTR (sptr, ssize) - sizeof (long);
		240	#else
		241	#error "microsoft libc or architecture not supported"
		242	#endif
		243
		244	# elif CORO_LINUX
		245
		246	coro_setjmp (ctx->env);
		247	#if __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 0 && defined (JB_PC) && defined (JB_SP)
		248	ctx->env[0].__jmpbuf[JB_PC] = (long)coro_init;
		249	ctx->env[0].__jmpbuf[JB_SP] = (long)STACK_ADJUST_PTR (sptr, ssize) - sizeof (long);
		250	#elif __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 0 && defined (__mc68000__)
		251	ctx->env[0].__jmpbuf[0].__aregs[0] = (long int)coro_init;
		252	ctx->env[0].__jmpbuf[0].__sp = (int )((char )sptr + ssize) - sizeof (long);
		253	#elif defined (__GNU_LIBRARY__) && defined (__i386__)
		254	ctx->env[0].__jmpbuf[0].__pc = (char *)coro_init;
		255	ctx->env[0].__jmpbuf[0].__sp = (void )((char )sptr + ssize) - sizeof (long);
		256	#elif defined (__GNU_LIBRARY__) && defined (__amd64__)
		257	ctx->env[0].__jmpbuf[JB_PC] = (long)coro_init;
		258	ctx->env[0].__jmpbuf[0].__sp = (void )((char )sptr + ssize) - sizeof (long);
		259	#else
		260	#error "linux libc or architecture not supported"
		261	#endif
		262
		263	# elif CORO_IRIX
		264
		265	coro_setjmp (ctx->env, 0);
		266	ctx->env[JB_PC] = (__uint64_t)coro_init;
		267	ctx->env[JB_SP] = (__uint64_t)STACK_ADJUST_PTR (sptr, ssize) - sizeof (long);
		268
		269	# elif CORO_ASM
		270
		271	ctx->sp = (void *)(ssize + (char )sptr);
		272	--ctx->sp = (void )abort; /* needed for alignment only */
		273	--ctx->sp = (void )coro_init;
		274	ctx->sp -= NUM_SAVED;
		275
		276	# elif CORO_UCONTEXT
		277
		278	getcontext (&(ctx->uc));
		279
		280	ctx->uc.uc_link = 0;
		281	ctx->uc.uc_stack.ss_sp = sptr;
		282	ctx->uc.uc_stack.ss_size = (size_t)ssize;
		283	ctx->uc.uc_stack.ss_flags = 0;
		284
		285	makecontext (&(ctx->uc), (void (*)())coro_init, 0);
		286
		287	# endif
		288
		289	coro_transfer (create_coro, new_coro);
		290	}
		291
		292	/*****************************************************************************/
		293	/* pthread backend */
		294	/*****************************************************************************/
163	#if CORO_PTHREAD	295	#elif CORO_PTHREAD
164		296
		297	/* this mutex will be locked by the running coroutine */
		298	pthread_mutex_t coro_mutex = PTHREAD_MUTEX_INITIALIZER;
		299
165	struct coro_init_args {	300	struct coro_init_args
		301	{
166	coro_func func;	302	coro_func func;
167	void *arg;	303	void *arg;
168	coro_context self, main;	304	coro_context self, main;
169	};	305	};
170		306
171	pthread_mutex_t coro_mutex = PTHREAD_MUTEX_INITIALIZER;	307	static pthread_t null_tid;
		308
		309	/* I'd so love to cast pthread_mutex_unlock to void ()(void )... */
		310	static void
		311	mutex_unlock_wrapper (void *arg)
		312	{
		313	pthread_mutex_unlock ((pthread_mutex_t *)arg);
		314	}
172		315
173	static void *	316	static void *
174	trampoline (void *args_)	317	coro_init (void *args_)
175	{	318	{
176	struct coro_init_args args = (struct coro_init_args )args_;	319	struct coro_init_args args = (struct coro_init_args )args_;
177	coro_func func = args->func;	320	coro_func func = args->func;
178	void *arg = args->arg;	321	void *arg = args->arg;
179		322
180	pthread_mutex_lock (&coro_mutex);	323	pthread_mutex_lock (&coro_mutex);
181	pthread_cond_destroy (&args->self->c);	324
		325	/* we try to be good citizens and use deferred cancellation and cleanup handlers */
		326	pthread_cleanup_push (mutex_unlock_wrapper, &coro_mutex);
182	coro_transfer (args->self, args->main);	327	coro_transfer (args->self, args->main);
183	func (arg);	328	func (arg);
184	pthread_mutex_unlock (&coro_mutex);	329	pthread_cleanup_pop (1);
185		330
186	return 0;	331	return 0;
187	}	332	}
188		333
189	asm("");	334	void
190
191	void coro_transfer(coro_context prev, coro_context next)	335	coro_transfer (coro_context prev, coro_context next)
192	{	336	{
193	pthread_cond_init (&prev->c, 0);
194	pthread_cond_signal (&next->c);	337	pthread_cond_signal (&next->cv);
195	pthread_cond_wait (&prev->c, &coro_mutex);	338	pthread_cond_wait (&prev->cv, &coro_mutex);
196	pthread_cond_destroy (&prev->c);	339	#if __FreeBSD__ /* freebsd is of course broken and needs manual testcancel calls... yay... */
197	}	340	pthread_testcancel ();
198
199	#endif	341	#endif
		342	}
200		343
201	/* initialize a machine state */	344	void
202	void coro_create (coro_context *ctx,	345	coro_create (coro_context ctx, coro_func coro, void arg, void *sptr, long ssize)
203	coro_func coro, void *arg,
204	void *sptr, long ssize)
205	{	346	{
206	#if CORO_UCONTEXT
207
208	getcontext (&(ctx->uc));
209
210	ctx->uc.uc_link = 0;
211	ctx->uc.uc_stack.ss_sp = STACK_ADJUST_PTR (sptr,ssize);
212	ctx->uc.uc_stack.ss_size = (size_t) STACK_ADJUST_SIZE (sptr,ssize);
213	ctx->uc.uc_stack.ss_flags = 0;
214
215	makecontext (&(ctx->uc), (void (*)()) coro, 1, arg);
216
217	#elif CORO_SJLJ \|\| CORO_LOSER \|\| CORO_LINUX \|\| CORO_IRIX \|\| CORO_ASM
218
219	# if CORO_SJLJ
220	stack_t ostk, nstk;
221	struct sigaction osa, nsa;
222	sigset_t nsig, osig;
223	# endif
224	coro_context nctx;	347	static coro_context nctx;
225
226	coro_init_func = coro;
227	coro_init_arg = arg;
228
229	new_coro = ctx;
230	create_coro = &nctx;
231
232	# if CORO_SJLJ
233	/* we use SIGUSR2. first block it, then fiddle with it. */
234
235	sigemptyset (&nsig);
236	sigaddset (&nsig, SIGUSR2);
237	sigprocmask (SIG_BLOCK, &nsig, &osig);
238
239	nsa.sa_handler = trampoline;
240	sigemptyset (&nsa.sa_mask);
241	nsa.sa_flags = SA_ONSTACK;
242
243	if (sigaction (SIGUSR2, &nsa, &osa))
244	{
245	perror ("sigaction");
246	abort ();
247	}
248
249	/* set the new stack */
250	nstk.ss_sp = STACK_ADJUST_PTR (sptr,ssize); /* yes, some platforms (IRIX) get this wrong. */
251	nstk.ss_size = STACK_ADJUST_SIZE (sptr,ssize);
252	nstk.ss_flags = 0;
253
254	if (sigaltstack (&nstk, &ostk) < 0)
255	{
256	perror ("sigaltstack");
257	abort ();
258	}
259
260	trampoline_count = 0;
261	kill (getpid (), SIGUSR2);
262	sigfillset (&nsig); sigdelset (&nsig, SIGUSR2);
263
264	while (!trampoline_count)
265	sigsuspend (&nsig);
266
267	sigaltstack (0, &nstk);
268	nstk.ss_flags = SS_DISABLE;
269	if (sigaltstack (&nstk, 0) < 0)
270	perror ("sigaltstack");
271
272	sigaltstack (0, &nstk);
273	if (~nstk.ss_flags & SS_DISABLE)
274	abort ();
275
276	if (~ostk.ss_flags & SS_DISABLE)
277	sigaltstack (&ostk, 0);
278
279	sigaction (SIGUSR2, &osa, 0);
280
281	sigprocmask (SIG_SETMASK, &osig, 0);
282
283	# elif CORO_LOSER
284
285	setjmp (ctx->env);
286	#if __CYGWIN__
287	ctx->env[7] = (long)((char *)sptr + ssize);
288	ctx->env[8] = (long)coro_init;
289	#elif defined(_M_IX86)
290	((_JUMP_BUFFER *)&ctx->env)->Eip = (long)coro_init;
291	((_JUMP_BUFFER *)&ctx->env)->Esp = (long)STACK_ADJUST_PTR (sptr, ssize);
292	#elif defined(_M_AMD64)
293	((_JUMP_BUFFER *)&ctx->env)->Rip = (__int64)coro_init;
294	((_JUMP_BUFFER *)&ctx->env)->Rsp = (__int64)STACK_ADJUST_PTR (sptr, ssize);
295	#elif defined(_M_IA64)
296	((_JUMP_BUFFER *)&ctx->env)->StIIP = (__int64)coro_init;
297	((_JUMP_BUFFER *)&ctx->env)->IntSp = (__int64)STACK_ADJUST_PTR (sptr, ssize);
298	#else
299	# error "microsoft libc or architecture not supported"
300	#endif
301
302	# elif CORO_LINUX
303
304	_setjmp (ctx->env);
305	#if __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 0 && defined (JB_PC) && defined (JB_SP)
306	ctx->env[0].__jmpbuf[JB_PC] = (long)coro_init;
307	ctx->env[0].__jmpbuf[JB_SP] = (long)STACK_ADJUST_PTR (sptr, ssize);
308	#elif __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 0 && defined (__mc68000__)
309	ctx->env[0].__jmpbuf[0].__aregs[0] = (long int)coro_init;
310	ctx->env[0].__jmpbuf[0].__sp = (int )((char )sptr + ssize);
311	#elif defined (__GNU_LIBRARY__) && defined (__i386__)
312	ctx->env[0].__jmpbuf[0].__pc = (char *)coro_init;
313	ctx->env[0].__jmpbuf[0].__sp = (void )((char )sptr + ssize);
314	#elif defined (__GNU_LIBRARY__) && defined (__amd64__)
315	ctx->env[0].__jmpbuf[JB_PC] = (long)coro_init;
316	ctx->env[0].__jmpbuf[JB_RSP] = (long)STACK_ADJUST_PTR (sptr, ssize);
317	#else
318	# error "linux libc or architecture not supported"
319	#endif
320
321	# elif CORO_IRIX
322
323	setjmp (ctx->env);
324	ctx->env[JB_PC] = (__uint64_t)coro_init;
325	ctx->env[JB_SP] = (__uint64_t)STACK_ADJUST_PTR (sptr, ssize);
326
327	# elif CORO_ASM
328
329	ctx->sp = (volatile void *)(ssize + (char )sptr);
330	/* we try to allow for both functions with and without frame pointers */
331	--ctx->sp = (void )coro_init;
332	{
333	int i;
334	for (i = NUM_SAVED; i--; )
335	*--ctx->sp = 0;
336	}
337
338	# endif
339
340	coro_transfer ((coro_context )create_coro, (coro_context )new_coro);
341
342	# elif CORO_PTHREAD
343
344	pthread_t id;
345	pthread_attr_t attr;
346	coro_context nctx;
347	struct coro_init_args args;
348	static int once;	348	static int once;
349		349
350	if (!once)	350	if (!once)
351	{	351	{
		352	once = 1;
		353
352	pthread_mutex_lock (&coro_mutex);	354	pthread_mutex_lock (&coro_mutex);
353	once = 1;	355	pthread_cond_init (&nctx.cv, 0);
		356	null_tid = pthread_self ();
		357	}
		358
		359	pthread_cond_init (&ctx->cv, 0);
		360
		361	if (coro)
354	}	362	{
		363	pthread_attr_t attr;
		364	struct coro_init_args args;
355		365
356	args.func = coro;	366	args.func = coro;
357	args.arg = arg;	367	args.arg = arg;
358	args.self = ctx;	368	args.self = ctx;
359	args.main = &nctx;	369	args.main = &nctx;
360		370
361	pthread_attr_init (&attr);	371	pthread_attr_init (&attr);
362	pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED);
363	pthread_attr_setstack (&attr, sptr, (size_t)ssize);	372	pthread_attr_setstack (&attr, sptr, (size_t)ssize);
		373	pthread_attr_setscope (&attr, PTHREAD_SCOPE_PROCESS);
364	pthread_create (&id, &attr, trampoline, &args);	374	pthread_create (&ctx->id, &attr, coro_init, &args);
365		375
366	pthread_cond_init (&args.self->c, 0);
367	coro_transfer (args.main, args.self);	376	coro_transfer (args.main, args.self);
		377	}
		378	else
		379	ctx->id = null_tid;
		380	}
		381
		382	void
		383	coro_destroy (coro_context *ctx)
		384	{
		385	if (!pthread_equal (ctx->id, null_tid))
		386	{
		387	pthread_cancel (ctx->id);
		388	pthread_mutex_unlock (&coro_mutex);
		389	pthread_join (ctx->id, 0);
		390	pthread_mutex_lock (&coro_mutex);
		391	}
		392
		393	pthread_cond_destroy (&ctx->cv);
		394	}
368		395
369	#else	396	#else
370	# error unsupported backend	397	# error unsupported backend
371	#endif	398	#endif
372	}
373		399

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing cvsroot/libcoro/coro.c (file contents): Revision 1.35 by root, Mon Nov 3 16:05:38 2008 UTC vs. Revision 1.44 by root, Wed Nov 19 02:56:16 2008 UTC

Diff Legend

Comparing cvsroot/libcoro/coro.c (file contents):
Revision 1.35 by root, Mon Nov 3 16:05:38 2008 UTC vs.
Revision 1.44 by root, Wed Nov 19 02:56:16 2008 UTC