[ViewVC] Diff of: cvs/Coro/Coro/State.xs

Comparing Coro/Coro/State.xs (file contents):
Revision 1.328 by root, Tue Nov 25 09:49:43 2008 UTC vs.
Revision 1.341 by root, Mon Dec 15 15:03:31 2008 UTC

…		…
133	#else	133	#else
134	# define dSTACKLEVEL volatile void *stacklevel	134	# define dSTACKLEVEL volatile void *stacklevel
135	# define STACKLEVEL ((void *)&stacklevel)	135	# define STACKLEVEL ((void *)&stacklevel)
136	#endif	136	#endif
137		137
138	#define IN_DESTRUCT (PL_main_cv == Nullcv)	138	#define IN_DESTRUCT PL_dirty
139		139
140	#if __GNUC__ >= 3	140	#if __GNUC__ >= 3
141	# define attribute(x) __attribute__(x)	141	# define attribute(x) __attribute__(x)
142	# define expect(expr,value) __builtin_expect ((expr),(value))	142	# define expect(expr,value) __builtin_expect ((expr),(value))
143	# define INLINE static inline	143	# define INLINE static inline
…		…
238	enum {	238	enum {
239	CF_RUNNING = 0x0001, /* coroutine is running */	239	CF_RUNNING = 0x0001, /* coroutine is running */
240	CF_READY = 0x0002, /* coroutine is ready */	240	CF_READY = 0x0002, /* coroutine is ready */
241	CF_NEW = 0x0004, /* has never been switched to */	241	CF_NEW = 0x0004, /* has never been switched to */
242	CF_DESTROYED = 0x0008, /* coroutine data has been freed */	242	CF_DESTROYED = 0x0008, /* coroutine data has been freed */
		243	CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
243	};	244	};
244		245
245	/* the structure where most of the perl state is stored, overlaid on the cxstack */	246	/* the structure where most of the perl state is stored, overlaid on the cxstack */
246	typedef struct	247	typedef struct
247	{	248	{
…		…
285	/* async_pool */	286	/* async_pool */
286	SV *saved_deffh;	287	SV *saved_deffh;
287	SV *invoke_cb;	288	SV *invoke_cb;
288	AV *invoke_av;	289	AV *invoke_av;
289		290
		291	/* on_enter/on_leave */
		292	AV *on_enter;
		293	AV *on_leave;
		294
290	/* linked list */	295	/* linked list */
291	struct coro next, prev;	296	struct coro next, prev;
292	};	297	};
293		298
294	typedef struct coro *Coro__State;	299	typedef struct coro *Coro__State;
…		…
352	INLINE CV *	357	INLINE CV *
353	coro_sv_2cv (pTHX_ SV *sv)	358	coro_sv_2cv (pTHX_ SV *sv)
354	{	359	{
355	HV *st;	360	HV *st;
356	GV *gvp;	361	GV *gvp;
357	return sv_2cv (sv, &st, &gvp, 0);	362	CV *cv = sv_2cv (sv, &st, &gvp, 0);
		363
		364	if (!cv)
		365	croak ("code reference expected");
		366
		367	return cv;
358	}	368	}
		369
		370	/*****************************************************************************/
		371	/* magic glue */
		372
		373	#define CORO_MAGIC_type_cv 26
		374	#define CORO_MAGIC_type_state PERL_MAGIC_ext
		375
		376	#define CORO_MAGIC_NN(sv, type) \
		377	(expect_true (SvMAGIC (sv)->mg_type == type) \
		378	? SvMAGIC (sv) \
		379	: mg_find (sv, type))
		380
		381	#define CORO_MAGIC(sv, type) \
		382	(expect_true (SvMAGIC (sv)) \
		383	? CORO_MAGIC_NN (sv, type) \
		384	: 0)
		385
		386	#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
		387	#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
		388
		389	INLINE struct coro *
		390	SvSTATE_ (pTHX_ SV *coro)
		391	{
		392	HV *stash;
		393	MAGIC *mg;
		394
		395	if (SvROK (coro))
		396	coro = SvRV (coro);
		397
		398	if (expect_false (SvTYPE (coro) != SVt_PVHV))
		399	croak ("Coro::State object required");
		400
		401	stash = SvSTASH (coro);
		402	if (expect_false (stash != coro_stash && stash != coro_state_stash))
		403	{
		404	/* very slow, but rare, check */
		405	if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
		406	croak ("Coro::State object required");
		407	}
		408
		409	mg = CORO_MAGIC_state (coro);
		410	return (struct coro *)mg->mg_ptr;
		411	}
		412
		413	#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
		414
		415	/* faster than SvSTATE, but expects a coroutine hv */
		416	#define SvSTATE_hv(hv) ((struct coro )CORO_MAGIC_NN ((SV )hv, CORO_MAGIC_type_state)->mg_ptr)
		417	#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
		418
		419	/*****************************************************************************/
		420	/* padlist management and caching */
359		421
360	static AV *	422	static AV *
361	coro_derive_padlist (pTHX_ CV *cv)	423	coro_derive_padlist (pTHX_ CV *cv)
362	{	424	{
363	AV *padlist = CvPADLIST (cv);	425	AV *padlist = CvPADLIST (cv);
…		…
371	Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);	433	Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
372	#endif	434	#endif
373	newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];	435	newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
374	--AvFILLp (padlist);	436	--AvFILLp (padlist);
375		437
376	av_store (newpadlist, 0, SvREFCNT_inc_NN (*av_fetch (padlist, 0, FALSE)));	438	av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0]));
377	av_store (newpadlist, 1, (SV *)newpad);	439	av_store (newpadlist, 1, (SV *)newpad);
378		440
379	return newpadlist;	441	return newpadlist;
380	}	442	}
381		443
382	static void	444	static void
383	free_padlist (pTHX_ AV *padlist)	445	free_padlist (pTHX_ AV *padlist)
384	{	446	{
385	/* may be during global destruction */	447	/* may be during global destruction */
386	if (SvREFCNT (padlist))	448	if (!IN_DESTRUCT)
387	{	449	{
388	I32 i = AvFILLp (padlist);	450	I32 i = AvFILLp (padlist);
389	while (i >= 0)	451
		452	while (i > 0) /* special-case index 0 */
390	{	453	{
391	SV **svp = av_fetch (padlist, i--, FALSE);	454	/* we try to be extra-careful here */
392	if (svp)	455	AV av = (AV )AvARRAY (padlist)[i--];
393	{	456	I32 j = AvFILLp (av);
394	SV *sv;	457
395	while (&PL_sv_undef != (sv = av_pop ((AV )svp)))	458	while (j >= 0)
		459	SvREFCNT_dec (AvARRAY (av)[j--]);
		460
		461	AvFILLp (av) = -1;
396	SvREFCNT_dec (sv);	462	SvREFCNT_dec (av);
397
398	SvREFCNT_dec (*svp);
399	}
400	}	463	}
401		464
		465	SvREFCNT_dec (AvARRAY (padlist)[0]);
		466
		467	AvFILLp (padlist) = -1;
402	SvREFCNT_dec ((SV*)padlist);	468	SvREFCNT_dec ((SV*)padlist);
403	}	469	}
404	}	470	}
405		471
406	static int	472	static int
…		…
415		481
416	SvREFCNT_dec (av); /* sv_magicext increased the refcount */	482	SvREFCNT_dec (av); /* sv_magicext increased the refcount */
417		483
418	return 0;	484	return 0;
419	}	485	}
420
421	#define CORO_MAGIC_type_cv 26
422	#define CORO_MAGIC_type_state PERL_MAGIC_ext
423		486
424	static MGVTBL coro_cv_vtbl = {	487	static MGVTBL coro_cv_vtbl = {
425	0, 0, 0, 0,	488	0, 0, 0, 0,
426	coro_cv_free	489	coro_cv_free
427	};	490	};
428
429	#define CORO_MAGIC_NN(sv, type) \
430	(expect_true (SvMAGIC (sv)->mg_type == type) \
431	? SvMAGIC (sv) \
432	: mg_find (sv, type))
433
434	#define CORO_MAGIC(sv, type) \
435	(expect_true (SvMAGIC (sv)) \
436	? CORO_MAGIC_NN (sv, type) \
437	: 0)
438
439	#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
440	#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
441
442	INLINE struct coro *
443	SvSTATE_ (pTHX_ SV *coro)
444	{
445	HV *stash;
446	MAGIC *mg;
447
448	if (SvROK (coro))
449	coro = SvRV (coro);
450
451	if (expect_false (SvTYPE (coro) != SVt_PVHV))
452	croak ("Coro::State object required");
453
454	stash = SvSTASH (coro);
455	if (expect_false (stash != coro_stash && stash != coro_state_stash))
456	{
457	/* very slow, but rare, check */
458	if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
459	croak ("Coro::State object required");
460	}
461
462	mg = CORO_MAGIC_state (coro);
463	return (struct coro *)mg->mg_ptr;
464	}
465
466	#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
467
468	/* faster than SvSTATE, but expects a coroutine hv */
469	#define SvSTATE_hv(hv) ((struct coro )CORO_MAGIC_NN ((SV )hv, CORO_MAGIC_type_state)->mg_ptr)
470	#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
471		491
472	/* the next two functions merely cache the padlists */	492	/* the next two functions merely cache the padlists */
473	static void	493	static void
474	get_padlist (pTHX_ CV *cv)	494	get_padlist (pTHX_ CV *cv)
475	{	495	{
…		…
503	mg = sv_magicext ((SV )cv, (SV )newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);	523	mg = sv_magicext ((SV )cv, (SV )newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
504		524
505	av = (AV *)mg->mg_obj;	525	av = (AV *)mg->mg_obj;
506		526
507	if (expect_false (AvFILLp (av) >= AvMAX (av)))	527	if (expect_false (AvFILLp (av) >= AvMAX (av)))
508	av_extend (av, AvMAX (av) + 1);	528	av_extend (av, AvFILLp (av) + 1);
509		529
510	AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);	530	AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
511	}	531	}
512		532
513	/ load & save, init *****************************************************/	533	/ load & save, init *****************************************************/
		534
		535	static void
		536	on_enterleave_call (pTHX_ SV *cb);
514		537
515	static void	538	static void
516	load_perl (pTHX_ Coro__State c)	539	load_perl (pTHX_ Coro__State c)
517	{	540	{
518	perl_slots *slot = c->slot;	541	perl_slots *slot = c->slot;
…		…
546	PUTBACK;	569	PUTBACK;
547	}	570	}
548		571
549	slf_frame = c->slf_frame;	572	slf_frame = c->slf_frame;
550	CORO_THROW = c->except;	573	CORO_THROW = c->except;
		574
		575	if (expect_false (c->on_enter))
		576	{
		577	int i;
		578
		579	for (i = 0; i <= AvFILLp (c->on_enter); ++i)
		580	on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
		581	}
551	}	582	}
552		583
553	static void	584	static void
554	save_perl (pTHX_ Coro__State c)	585	save_perl (pTHX_ Coro__State c)
555	{	586	{
		587	if (expect_false (c->on_leave))
		588	{
		589	int i;
		590
		591	for (i = AvFILLp (c->on_leave); i >= 0; --i)
		592	on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
		593	}
		594
556	c->except = CORO_THROW;	595	c->except = CORO_THROW;
557	c->slf_frame = slf_frame;	596	c->slf_frame = slf_frame;
558		597
559	{	598	{
560	dSP;	599	dSP;
…		…
759	#endif	798	#endif
760		799
761	/*	800	/*
762	* This overrides the default magic get method of %SIG elements.	801	* This overrides the default magic get method of %SIG elements.
763	* The original one doesn't provide for reading back of PL_diehook/PL_warnhook	802	* The original one doesn't provide for reading back of PL_diehook/PL_warnhook
764	* and instead of tryign to save and restore the hash elements, we just provide	803	* and instead of trying to save and restore the hash elements, we just provide
765	* readback here.	804	* readback here.
766	* We only do this when the hook is != 0, as they are often set to 0 temporarily,
767	* not expecting this to actually change the hook. This is a potential problem
768	* when a schedule happens then, but we ignore this.
769	*/	805	*/
770	static int	806	static int
771	coro_sigelem_get (pTHX_ SV sv, MAGIC mg)	807	coro_sigelem_get (pTHX_ SV sv, MAGIC mg)
772	{	808	{
773	const char *s = MgPV_nolen_const (mg);	809	const char *s = MgPV_nolen_const (mg);
…		…
826	if (strEQ (s, "__WARN__")) svp = &PL_warnhook;	862	if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
827		863
828	if (svp)	864	if (svp)
829	{	865	{
830	SV old = svp;	866	SV old = svp;
831	*svp = newSVsv (sv);	867	*svp = SvOK (sv) ? newSVsv (sv) : 0;
832	SvREFCNT_dec (old);	868	SvREFCNT_dec (old);
833	return 0;	869	return 0;
834	}	870	}
835	}	871	}
836		872
…		…
928	/* copy throw, in case it was set before coro_setup */	964	/* copy throw, in case it was set before coro_setup */
929	CORO_THROW = coro->except;	965	CORO_THROW = coro->except;
930	}	966	}
931		967
932	static void	968	static void
933	coro_destruct (pTHX_ struct coro *coro)	969	coro_unwind_stacks (pTHX)
934	{	970	{
935	if (!IN_DESTRUCT)	971	if (!IN_DESTRUCT)
936	{	972	{
937	/* restore all saved variables and stuff */	973	/* restore all saved variables and stuff */
938	LEAVE_SCOPE (0);	974	LEAVE_SCOPE (0);
…		…
946	POPSTACK_TO (PL_mainstack);	982	POPSTACK_TO (PL_mainstack);
947		983
948	/* unwind main stack */	984	/* unwind main stack */
949	dounwind (-1);	985	dounwind (-1);
950	}	986	}
		987	}
		988
		989	static void
		990	coro_destruct_perl (pTHX_ struct coro *coro)
		991	{
		992	coro_unwind_stacks (aTHX);
951		993
952	SvREFCNT_dec (GvSV (PL_defgv));	994	SvREFCNT_dec (GvSV (PL_defgv));
953	SvREFCNT_dec (GvAV (PL_defgv));	995	SvREFCNT_dec (GvAV (PL_defgv));
954	SvREFCNT_dec (GvSV (PL_errgv));	996	SvREFCNT_dec (GvSV (PL_errgv));
955	SvREFCNT_dec (PL_defoutgv);	997	SvREFCNT_dec (PL_defoutgv);
…		…
1267	cctx_destroy (coro_cctx *cctx)	1309	cctx_destroy (coro_cctx *cctx)
1268	{	1310	{
1269	if (!cctx)	1311	if (!cctx)
1270	return;	1312	return;
1271		1313
1272	assert (cctx != cctx_current);//D temporary	1314	assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary?
1273		1315
1274	--cctx_count;	1316	--cctx_count;
1275	coro_destroy (&cctx->cctx);	1317	coro_destroy (&cctx->cctx);
1276		1318
1277	/* coro_transfer creates new, empty cctx's */	1319	/* coro_transfer creates new, empty cctx's */
…		…
1341	/* TODO: throwing up here is considered harmful */	1383	/* TODO: throwing up here is considered harmful */
1342		1384
1343	if (expect_true (prev != next))	1385	if (expect_true (prev != next))
1344	{	1386	{
1345	if (expect_false (!(prev->flags & (CF_RUNNING \| CF_NEW))))	1387	if (expect_false (!(prev->flags & (CF_RUNNING \| CF_NEW))))
1346	croak ("Coro::State::transfer called with a suspended prev Coro::State, but can only transfer from running or new states,");	1388	croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1347		1389
1348	if (expect_false (next->flags & CF_RUNNING))
1349	croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states,");
1350
1351	if (expect_false (next->flags & CF_DESTROYED))	1390	if (expect_false (next->flags & (CF_RUNNING \| CF_DESTROYED \| CF_SUSPENDED)))
1352	croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states,");	1391	croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1353		1392
1354	#if !PERL_VERSION_ATLEAST (5,10,0)	1393	#if !PERL_VERSION_ATLEAST (5,10,0)
1355	if (expect_false (PL_lex_state != LEX_NOTPARSING))	1394	if (expect_false (PL_lex_state != LEX_NOTPARSING))
1356	croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");	1395	croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1357	#endif	1396	#endif
…		…
1395	coro_setup (aTHX_ next);	1434	coro_setup (aTHX_ next);
1396	}	1435	}
1397	else	1436	else
1398	load_perl (aTHX_ next);	1437	load_perl (aTHX_ next);
1399		1438
1400	assert (!prev->cctx);//D temporary
1401
1402	/* possibly untie and reuse the cctx */	1439	/* possibly untie and reuse the cctx */
1403	if (expect_true (	1440	if (expect_true (
1404	cctx_current->idle_sp == STACKLEVEL	1441	cctx_current->idle_sp == STACKLEVEL
1405	&& !(cctx_current->flags & CC_TRACE)	1442	&& !(cctx_current->flags & CC_TRACE)
1406	&& !force_cctx	1443	&& !force_cctx
…		…
1461	--coro_nready;	1498	--coro_nready;
1462	}	1499	}
1463	else	1500	else
1464	coro->flags \|= CF_READY; /* make sure it is NOT put into the readyqueue */	1501	coro->flags \|= CF_READY; /* make sure it is NOT put into the readyqueue */
1465		1502
1466	if (coro->mainstack && coro->mainstack != main_mainstack)	1503	if (coro->mainstack
		1504	&& coro->mainstack != main_mainstack
		1505	&& coro->slot
		1506	&& !PL_dirty)
1467	{	1507	{
1468	struct coro temp;	1508	struct coro *current = SvSTATE_current;
1469		1509
1470	assert (("FATAL: tried to destroy currently running coroutine (please report)", !(coro->flags & CF_RUNNING)));	1510	assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1471		1511
1472	save_perl (aTHX_ &temp);	1512	save_perl (aTHX_ current);
1473	load_perl (aTHX_ coro);	1513	load_perl (aTHX_ coro);
1474		1514
1475	coro_destruct (aTHX_ coro);	1515	coro_destruct_perl (aTHX_ coro);
1476		1516
1477	load_perl (aTHX_ &temp);	1517	load_perl (aTHX_ current);
1478		1518
1479	coro->slot = 0;	1519	coro->slot = 0;
1480	}	1520	}
1481		1521
1482	cctx_destroy (coro->cctx);	1522	cctx_destroy (coro->cctx);
…		…
1663	if (expect_true (next_sv))	1703	if (expect_true (next_sv))
1664	{	1704	{
1665	struct coro *next = SvSTATE_hv (next_sv);	1705	struct coro *next = SvSTATE_hv (next_sv);
1666		1706
1667	/* cannot transfer to destroyed coros, skip and look for next */	1707	/* cannot transfer to destroyed coros, skip and look for next */
1668	if (expect_false (next->flags & CF_DESTROYED))	1708	if (expect_false (next->flags & (CF_DESTROYED \| CF_SUSPENDED)))
1669	SvREFCNT_dec (next_sv); /* coro_nready has already been taken care of by destroy */	1709	SvREFCNT_dec (next_sv); /* coro_nready has already been taken care of by destroy */
1670	else	1710	else
1671	{	1711	{
1672	next->flags &= ~CF_READY;	1712	next->flags &= ~CF_READY;
1673	--coro_nready;	1713	--coro_nready;
…		…
1852	av_push (av_destroy, (SV )newRV_inc ((SV )hv)); /* RVinc for perl */	1892	av_push (av_destroy, (SV )newRV_inc ((SV )hv)); /* RVinc for perl */
1853	api_ready (aTHX_ sv_manager);	1893	api_ready (aTHX_ sv_manager);
1854		1894
1855	frame->prepare = prepare_schedule;	1895	frame->prepare = prepare_schedule;
1856	frame->check = slf_check_repeat;	1896	frame->check = slf_check_repeat;
		1897
		1898	/* as a minor optimisation, we could unwind all stacks here */
		1899	/* but that puts extra pressure on pp_slf, and is not worth much */
		1900	/coro_unwind_stacks (aTHX);/
1857	}	1901	}
1858		1902
1859	/*****************************************************************************/	1903	/*****************************************************************************/
1860	/* async pool handler */	1904	/* async pool handler */
1861		1905
…		…
2280		2324
2281	PL_op->op_ppaddr = pp_slf;	2325	PL_op->op_ppaddr = pp_slf;
2282	/PL_op->op_type = OP_CUSTOM; / we do behave like entersub still */	2326	/PL_op->op_type = OP_CUSTOM; / we do behave like entersub still */
2283		2327
2284	PL_op = (OP *)&slf_restore;	2328	PL_op = (OP *)&slf_restore;
		2329	}
		2330
		2331	/*****************************************************************************/
		2332	/* dynamic wind */
		2333
		2334	static void
		2335	on_enterleave_call (pTHX_ SV *cb)
		2336	{
		2337	dSP;
		2338
		2339	PUSHSTACK;
		2340
		2341	PUSHMARK (SP);
		2342	PUTBACK;
		2343	call_sv (cb, G_VOID \| G_DISCARD);
		2344	SPAGAIN;
		2345
		2346	POPSTACK;
		2347	}
		2348
		2349	static SV *
		2350	coro_avp_pop_and_free (pTHX_ AV **avp)
		2351	{
		2352	AV av = avp;
		2353	SV *res = av_pop (av);
		2354
		2355	if (AvFILLp (av) < 0)
		2356	{
		2357	*avp = 0;
		2358	SvREFCNT_dec (av);
		2359	}
		2360
		2361	return res;
		2362	}
		2363
		2364	static void
		2365	coro_pop_on_enter (pTHX_ void *coro)
		2366	{
		2367	SV cb = coro_avp_pop_and_free (aTHX_ &((struct coro )coro)->on_enter);
		2368	SvREFCNT_dec (cb);
		2369	}
		2370
		2371	static void
		2372	coro_pop_on_leave (pTHX_ void *coro)
		2373	{
		2374	SV cb = coro_avp_pop_and_free (aTHX_ &((struct coro )coro)->on_leave);
		2375	on_enterleave_call (aTHX_ sv_2mortal (cb));
2285	}	2376	}
2286		2377
2287	/*****************************************************************************/	2378	/*****************************************************************************/
2288	/* PerlIO::cede */	2379	/* PerlIO::cede */
2289		2380
…		…
2370	SV **ary;	2461	SV **ary;
2371		2462
2372	/* unfortunately, building manually saves memory */	2463	/* unfortunately, building manually saves memory */
2373	Newx (ary, 2, SV *);	2464	Newx (ary, 2, SV *);
2374	AvALLOC (av) = ary;	2465	AvALLOC (av) = ary;
		2466	#if PERL_VERSION_ATLEAST (5,10,0)
2375	/AvARRAY (av) = ary;/	2467	AvARRAY (av) = ary;
		2468	#else
2376	SvPVX ((SV )av) = (char )ary; /* 5.8.8 needs this syntax instead of AvARRAY = ary */	2469	/* 5.8.8 needs this syntax instead of AvARRAY = ary, yet */
		2470	/* -DDEBUGGING flags this as a bug, despite it perfectly working */
		2471	SvPVX ((SV )av) = (char )ary;
		2472	#endif
2377	AvMAX (av) = 1;	2473	AvMAX (av) = 1;
2378	AvFILLp (av) = 0;	2474	AvFILLp (av) = 0;
2379	ary [0] = newSViv (count);	2475	ary [0] = newSViv (count);
2380		2476
2381	return newRV_noinc ((SV *)av);	2477	return newRV_noinc ((SV *)av);
…		…
2910	SV *	3006	SV *
2911	clone (Coro::State coro)	3007	clone (Coro::State coro)
2912	CODE:	3008	CODE:
2913	{	3009	{
2914	#if CORO_CLONE	3010	#if CORO_CLONE
2915	struct coro *ncoro = coro_clone (coro);	3011	struct coro *ncoro = coro_clone (aTHX_ coro);
2916	MAGIC *mg;	3012	MAGIC *mg;
2917	/* TODO: too much duplication */	3013	/* TODO: too much duplication */
2918	ncoro->hv = newHV ();	3014	ncoro->hv = newHV ();
2919	mg = sv_magicext ((SV )ncoro->hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char )ncoro, 0);	3015	mg = sv_magicext ((SV )ncoro->hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char )ncoro, 0);
2920	mg->mg_flags \|= MGf_DUP;	3016	mg->mg_flags \|= MGf_DUP;
…		…
2982	eval = 1	3078	eval = 1
2983	CODE:	3079	CODE:
2984	{	3080	{
2985	if (coro->mainstack && ((coro->flags & CF_RUNNING) \|\| coro->slot))	3081	if (coro->mainstack && ((coro->flags & CF_RUNNING) \|\| coro->slot))
2986	{	3082	{
2987	struct coro temp;	3083	struct coro *current = SvSTATE_current;
2988		3084
2989	if (!(coro->flags & CF_RUNNING))	3085	if (current != coro)
2990	{	3086	{
2991	PUTBACK;	3087	PUTBACK;
2992	save_perl (aTHX_ &temp);	3088	save_perl (aTHX_ current);
2993	load_perl (aTHX_ coro);	3089	load_perl (aTHX_ coro);
		3090	SPAGAIN;
2994	}	3091	}
2995		3092
2996	{
2997	dSP;
2998	ENTER;
2999	SAVETMPS;
3000	PUTBACK;
3001	PUSHSTACK;	3093	PUSHSTACK;
		3094
3002	PUSHMARK (SP);	3095	PUSHMARK (SP);
		3096	PUTBACK;
3003		3097
3004	if (ix)	3098	if (ix)
3005	eval_sv (coderef, 0);	3099	eval_sv (coderef, 0);
3006	else	3100	else
3007	call_sv (coderef, G_KEEPERR \| G_EVAL \| G_VOID \| G_DISCARD);	3101	call_sv (coderef, G_KEEPERR \| G_EVAL \| G_VOID \| G_DISCARD);
3008		3102
		3103	SPAGAIN;
3009	POPSTACK;	3104	POPSTACK;
3010	SPAGAIN;
3011	FREETMPS;
3012	LEAVE;
3013	PUTBACK;
3014	}
3015		3105
3016	if (!(coro->flags & CF_RUNNING))	3106	if (current != coro)
3017	{	3107	{
		3108	PUTBACK;
3018	save_perl (aTHX_ coro);	3109	save_perl (aTHX_ coro);
3019	load_perl (aTHX_ &temp);	3110	load_perl (aTHX_ current);
3020	SPAGAIN;	3111	SPAGAIN;
3021	}	3112	}
3022	}	3113	}
3023	}	3114	}
3024		3115
…		…
3028	ALIAS:	3119	ALIAS:
3029	is_ready = CF_READY	3120	is_ready = CF_READY
3030	is_running = CF_RUNNING	3121	is_running = CF_RUNNING
3031	is_new = CF_NEW	3122	is_new = CF_NEW
3032	is_destroyed = CF_DESTROYED	3123	is_destroyed = CF_DESTROYED
		3124	is_suspended = CF_SUSPENDED
3033	CODE:	3125	CODE:
3034	RETVAL = boolSV (coro->flags & ix);	3126	RETVAL = boolSV (coro->flags & ix);
3035	OUTPUT:	3127	OUTPUT:
3036	RETVAL	3128	RETVAL
3037		3129
…		…
3102	SV dst = ix ? (SV )&self->slot->defav : (SV **)&self->slot->defsv;	3194	SV dst = ix ? (SV )&self->slot->defav : (SV **)&self->slot->defsv;
3103		3195
3104	SV tmp = src; src = dst; *dst = tmp;	3196	SV tmp = src; src = dst; *dst = tmp;
3105	}	3197	}
3106		3198
		3199	void
		3200	cancel (Coro::State self)
		3201	CODE:
		3202	coro_state_destroy (aTHX_ self);
		3203	coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */
		3204
3107		3205
3108	MODULE = Coro::State PACKAGE = Coro	3206	MODULE = Coro::State PACKAGE = Coro
3109		3207
3110	BOOT:	3208	BOOT:
3111	{	3209	{
3112	int i;	3210	int i;
3113		3211
3114	sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);	3212	sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3115	sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);	3213	sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3116	cv_coro_run = get_cv ( "Coro::_terminate", GV_ADD);	3214	cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3117	cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);	3215	cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3118	coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);	3216	coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3119	av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);	3217	av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3120	av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);	3218	av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3121	sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);	3219	sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
…		…
3183		3281
3184	void	3282	void
3185	cede_notself (...)	3283	cede_notself (...)
3186	CODE:	3284	CODE:
3187	CORO_EXECUTE_SLF_XS (slf_init_cede_notself);	3285	CORO_EXECUTE_SLF_XS (slf_init_cede_notself);
3188
3189	void
3190	_cancel (Coro::State self)
3191	CODE:
3192	coro_state_destroy (aTHX_ self);
3193	coro_call_on_destroy (aTHX_ self);
3194		3286
3195	void	3287	void
3196	_set_current (SV *current)	3288	_set_current (SV *current)
3197	PROTOTYPE: $	3289	PROTOTYPE: $
3198	CODE:	3290	CODE:
…		…
3306	rouse_wait (...)	3398	rouse_wait (...)
3307	PROTOTYPE: ;$	3399	PROTOTYPE: ;$
3308	PPCODE:	3400	PPCODE:
3309	CORO_EXECUTE_SLF_XS (slf_init_rouse_wait);	3401	CORO_EXECUTE_SLF_XS (slf_init_rouse_wait);
3310		3402
		3403	void
		3404	on_enter (SV *block)
		3405	ALIAS:
		3406	on_leave = 1
		3407	PROTOTYPE: &
		3408	CODE:
		3409	{
		3410	struct coro *coro = SvSTATE_current;
		3411	AV **avp = ix ? &coro->on_leave : &coro->on_enter;
		3412
		3413	block = (SV *)coro_sv_2cv (aTHX_ block);
		3414
		3415	if (!*avp)
		3416	*avp = newAV ();
		3417
		3418	av_push (*avp, SvREFCNT_inc (block));
		3419
		3420	if (!ix)
		3421	on_enterleave_call (aTHX_ block);
		3422
		3423	LEAVE; /* pp_entersub unfortunately forces an ENTER/LEAVE around xs calls */
		3424	SAVEDESTRUCTOR_X (ix ? coro_pop_on_leave : coro_pop_on_enter, (void *)coro);
		3425	ENTER; /* pp_entersub unfortunately forces an ENTER/LEAVE around xs calls */
		3426	}
		3427
3311		3428
3312	MODULE = Coro::State PACKAGE = PerlIO::cede	3429	MODULE = Coro::State PACKAGE = PerlIO::cede
3313		3430
3314	BOOT:	3431	BOOT:
3315	PerlIO_define_layer (aTHX_ &PerlIO_cede);	3432	PerlIO_define_layer (aTHX_ &PerlIO_cede);

Diff Legend

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

Comparing Coro/Coro/State.xs (file contents): Revision 1.328 by root, Tue Nov 25 09:49:43 2008 UTC vs. Revision 1.341 by root, Mon Dec 15 15:03:31 2008 UTC

Diff Legend

Comparing Coro/Coro/State.xs (file contents):
Revision 1.328 by root, Tue Nov 25 09:49:43 2008 UTC vs.
Revision 1.341 by root, Mon Dec 15 15:03:31 2008 UTC