ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/Coro/Coro/State.xs
(Generate patch)

Comparing Coro/Coro/State.xs (file contents):
Revision 1.361 by root, Wed Jul 1 07:26:40 2009 UTC vs.
Revision 1.363 by root, Tue Jul 14 00:55:10 2009 UTC

… …
6#include "EXTERN.h" 6#include "EXTERN.h"
7#include "perl.h" 7#include "perl.h"
8#include "XSUB.h" 8#include "XSUB.h"
9#include "perliol.h" 9#include "perliol.h"
10 10
11#include "patchlevel.h" 11#include "schmorp.h"
12 12
13#include <stdio.h> 13#include <stdio.h>
14#include <errno.h> 14#include <errno.h>
15#include <assert.h> 15#include <assert.h>
16 16
… …
51#endif 51#endif
52 52
53/* the maximum number of idle cctx that will be pooled */ 53/* the maximum number of idle cctx that will be pooled */
54static int cctx_max_idle = 4; 54static int cctx_max_idle = 4;
55 55
56#define PERL_VERSION_ATLEAST(a,b,c) \
57 (PERL_REVISION > (a) \
58 || (PERL_REVISION == (a) \
59 && (PERL_VERSION > (b) \
60 || (PERL_VERSION == (b) && PERL_SUBVERSION >= (c)))))
61
62#if !PERL_VERSION_ATLEAST (5,6,0)
63# ifndef PL_ppaddr
64# define PL_ppaddr ppaddr
65# endif
66# ifndef call_sv
67# define call_sv perl_call_sv
68# endif
69# ifndef get_sv
70# define get_sv perl_get_sv
71# endif
72# ifndef get_cv
73# define get_cv perl_get_cv
74# endif
75# ifndef IS_PADGV
76# define IS_PADGV(v) 0
77# endif
78# ifndef IS_PADCONST
79# define IS_PADCONST(v) 0
80# endif
81#endif
82
83/* 5.11 */
84#ifndef CxHASARGS
85# define CxHASARGS(cx) (cx)->blk_sub.hasargs
86#endif
87
88/* 5.10.0 */
89#ifndef SvREFCNT_inc_NN
90# define SvREFCNT_inc_NN(sv) SvREFCNT_inc (sv)
91#endif
92
93/* 5.8.8 */
94#ifndef GV_NOTQUAL
95# define GV_NOTQUAL 0
96#endif
97#ifndef newSV
98# define newSV(l) NEWSV(0,l)
99#endif
100#ifndef CvISXSUB_on
101# define CvISXSUB_on(cv) (void)cv
102#endif
103#ifndef CvISXSUB
104# define CvISXSUB(cv) (CvXSUB (cv) ? TRUE : FALSE)
105#endif
106#ifndef Newx
107# define Newx(ptr,nitems,type) New (0,ptr,nitems,type)
108#endif
109
110/* 5.8.7 */
111#ifndef SvRV_set
112# define SvRV_set(s,v) SvRV(s) = (v)
113#endif
114
115#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 56#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
116# undef CORO_STACKGUARD 57# undef CORO_STACKGUARD
117#endif 58#endif
118 59
119#ifndef CORO_STACKGUARD 60#ifndef CORO_STACKGUARD
… …
374 get_hv (name, create); 315 get_hv (name, create);
375#endif 316#endif
376 return get_hv (name, create); 317 return get_hv (name, create);
377} 318}
378 319
379/* may croak */
380INLINE CV *
381coro_sv_2cv (pTHX_ SV *sv)
382{
383 HV *st;
384 GV *gvp;
385 CV *cv = sv_2cv (sv, &st, &gvp, 0);
386
387 if (!cv)
388 croak ("code reference expected");
389
390 return cv;
391}
392
393INLINE void 320INLINE void
394coro_times_update () 321coro_times_update ()
395{ 322{
396#ifdef coro_clock_gettime 323#ifdef coro_clock_gettime
397 struct timespec ts; 324 struct timespec ts;
… …
405 time_real [0] = ts.tv_sec; time_real [1] = ts.tv_nsec; 332 time_real [0] = ts.tv_sec; time_real [1] = ts.tv_nsec;
406#else 333#else
407 dTHX; 334 dTHX;
408 UV tv[2]; 335 UV tv[2];
409 336
410 u2time (aTHX_ &tv); 337 u2time (aTHX_ tv);
411 time_real [0] = tv [0]; 338 time_real [0] = tv [0];
412 time_real [1] = tv [1] * 1000; 339 time_real [1] = tv [1] * 1000;
413#endif 340#endif
414} 341}
415 342
… …
545 AV *padlist; 472 AV *padlist;
546 AV *av = (AV *)mg->mg_obj; 473 AV *av = (AV *)mg->mg_obj;
547 474
548 /* perl manages to free our internal AV and _then_ call us */ 475 /* perl manages to free our internal AV and _then_ call us */
549 if (IN_DESTRUCT) 476 if (IN_DESTRUCT)
550 return; 477 return 0;
551 478
552 /* casting is fun. */ 479 /* casting is fun. */
553 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 480 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
554 free_padlist (aTHX_ padlist); 481 free_padlist (aTHX_ padlist);
555 482
… …
736 /* we manually unroll here, as usually 2 slots is enough */ 663 /* we manually unroll here, as usually 2 slots is enough */
737 if (SLOT_COUNT >= 1) CXINC; 664 if (SLOT_COUNT >= 1) CXINC;
738 if (SLOT_COUNT >= 2) CXINC; 665 if (SLOT_COUNT >= 2) CXINC;
739 if (SLOT_COUNT >= 3) CXINC; 666 if (SLOT_COUNT >= 3) CXINC;
740 { 667 {
741 int i; 668 unsigned int i;
742 for (i = 3; i < SLOT_COUNT; ++i) 669 for (i = 3; i < SLOT_COUNT; ++i)
743 CXINC; 670 CXINC;
744 } 671 }
745 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 672 cxstack_ix -= SLOT_COUNT; /* undo allocation */
746 673
… …
1112 1039
1113 load_perl (aTHX_ current); 1040 load_perl (aTHX_ current);
1114 } 1041 }
1115 1042
1116 { 1043 {
1117 int i; 1044 unsigned int i;
1118 1045
1119 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i) 1046 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i)
1120 SvREFCNT_dec (svf [i]); 1047 SvREFCNT_dec (svf [i]);
1121 1048
1122 SvREFCNT_dec (coro->saved_deffh); 1049 SvREFCNT_dec (coro->saved_deffh);
… …
1687 1614
1688 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1615 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1689 TRANSFER (ta, 1); 1616 TRANSFER (ta, 1);
1690} 1617}
1691 1618
1692/*****************************************************************************/
1693/* gensub: simple closure generation utility */
1694
1695#define GENSUB_ARG CvXSUBANY (cv).any_ptr
1696
1697/* create a closure from XS, returns a code reference */
1698/* the arg can be accessed via GENSUB_ARG from the callback */
1699/* the callback must use dXSARGS/XSRETURN */
1700static SV *
1701gensub (pTHX_ void (*xsub)(pTHX_ CV *), void *arg)
1702{
1703 CV *cv = (CV *)newSV (0);
1704
1705 sv_upgrade ((SV *)cv, SVt_PVCV);
1706
1707 CvANON_on (cv);
1708 CvISXSUB_on (cv);
1709 CvXSUB (cv) = xsub;
1710 GENSUB_ARG = arg;
1711
1712 return newRV_noinc ((SV *)cv);
1713}
1714
1715/** Coro ********************************************************************/ 1619/** Coro ********************************************************************/
1716 1620
1717INLINE void 1621INLINE void
1718coro_enq (pTHX_ struct coro *coro) 1622coro_enq (pTHX_ struct coro *coro)
1719{ 1623{
… …
2098 2002
2099static void 2003static void
2100coro_rouse_callback (pTHX_ CV *cv) 2004coro_rouse_callback (pTHX_ CV *cv)
2101{ 2005{
2102 dXSARGS; 2006 dXSARGS;
2103 SV *data = (SV *)GENSUB_ARG; 2007 SV *data = (SV *)S_GENSUB_ARG;
2104 2008
2105 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2009 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2106 { 2010 {
2107 /* first call, set args */ 2011 /* first call, set args */
2108 SV *coro = SvRV (data); 2012 SV *coro = SvRV (data);
… …
2174 || SvTYPE (SvRV (cb)) != SVt_PVCV 2078 || SvTYPE (SvRV (cb)) != SVt_PVCV
2175 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2079 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2176 croak ("Coro::rouse_wait called with illegal callback argument,"); 2080 croak ("Coro::rouse_wait called with illegal callback argument,");
2177 2081
2178 { 2082 {
2179 CV *cv = (CV *)SvRV (cb); /* for GENSUB_ARG */ 2083 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
2180 SV *data = (SV *)GENSUB_ARG; 2084 SV *data = (SV *)S_GENSUB_ARG;
2181 2085
2182 frame->data = (void *)data; 2086 frame->data = (void *)data;
2183 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule; 2087 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
2184 frame->check = slf_check_rouse_wait; 2088 frame->check = slf_check_rouse_wait;
2185 } 2089 }
… …
2189coro_new_rouse_cb (pTHX) 2093coro_new_rouse_cb (pTHX)
2190{ 2094{
2191 HV *hv = (HV *)SvRV (coro_current); 2095 HV *hv = (HV *)SvRV (coro_current);
2192 struct coro *coro = SvSTATE_hv (hv); 2096 struct coro *coro = SvSTATE_hv (hv);
2193 SV *data = newRV_inc ((SV *)hv); 2097 SV *data = newRV_inc ((SV *)hv);
2194 SV *cb = gensub (aTHX_ coro_rouse_callback, (void *)data); 2098 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
2195 2099
2196 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0); 2100 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0);
2197 SvREFCNT_dec (data); /* magicext increases the refcount */ 2101 SvREFCNT_dec (data); /* magicext increases the refcount */
2198 2102
2199 SvREFCNT_dec (coro->rouse_cb); 2103 SvREFCNT_dec (coro->rouse_cb);
… …
2722{ 2626{
2723 if (items >= 2) 2627 if (items >= 2)
2724 { 2628 {
2725 /* callback form */ 2629 /* callback form */
2726 AV *av = (AV *)SvRV (arg [0]); 2630 AV *av = (AV *)SvRV (arg [0]);
2727 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 2631 SV *cb_cv = s_get_cv_croak (arg [1]);
2728 2632
2729 av_push (av, SvREFCNT_inc_NN (cb_cv)); 2633 av_push (av, SvREFCNT_inc_NN (cb_cv));
2730 2634
2731 if (SvIVX (AvARRAY (av)[0]) > 0) 2635 if (SvIVX (AvARRAY (av)[0]) > 0)
2732 coro_semaphore_adjust (aTHX_ av, 0); 2636 coro_semaphore_adjust (aTHX_ av, 0);
… …
2792{ 2696{
2793 AV *av = (AV *)SvRV (arg [0]); 2697 AV *av = (AV *)SvRV (arg [0]);
2794 2698
2795 if (items >= 2) 2699 if (items >= 2)
2796 { 2700 {
2797 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 2701 SV *cb_cv = s_get_cv_croak (arg [1]);
2798 av_push (av, SvREFCNT_inc_NN (cb_cv)); 2702 av_push (av, SvREFCNT_inc_NN (cb_cv));
2799 2703
2800 if (SvIVX (AvARRAY (av)[0])) 2704 if (SvIVX (AvARRAY (av)[0]))
2801 coro_signal_wake (aTHX_ av, 1); /* ust be the only waiter */ 2705 coro_signal_wake (aTHX_ av, 1); /* ust be the only waiter */
2802 2706
… …
2837 2741
2838static void 2742static void
2839coro_aio_callback (pTHX_ CV *cv) 2743coro_aio_callback (pTHX_ CV *cv)
2840{ 2744{
2841 dXSARGS; 2745 dXSARGS;
2842 AV *state = (AV *)GENSUB_ARG; 2746 AV *state = (AV *)S_GENSUB_ARG;
2843 SV *coro = av_pop (state); 2747 SV *coro = av_pop (state);
2844 SV *data_sv = newSV (sizeof (struct io_state)); 2748 SV *data_sv = newSV (sizeof (struct io_state));
2845 2749
2846 av_extend (state, items - 1); 2750 av_extend (state, items - 1);
2847 2751
… …
2961 2865
2962 for (i = 0; i < items; ++i) 2866 for (i = 0; i < items; ++i)
2963 PUSHs (arg [i]); 2867 PUSHs (arg [i]);
2964 2868
2965 /* now push the callback closure */ 2869 /* now push the callback closure */
2966 PUSHs (sv_2mortal (gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state)))); 2870 PUSHs (sv_2mortal (s_gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state))));
2967 2871
2968 /* now call the AIO function - we assume our request is uncancelable */ 2872 /* now call the AIO function - we assume our request is uncancelable */
2969 PUTBACK; 2873 PUTBACK;
2970 call_sv ((SV *)req, G_VOID | G_DISCARD); 2874 call_sv ((SV *)req, G_VOID | G_DISCARD);
2971 } 2875 }
… …
3060 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer"); 2964 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
3061 2965
3062 nvtime = INT2PTR (double (*)(), SvIV (*svp)); 2966 nvtime = INT2PTR (double (*)(), SvIV (*svp));
3063 2967
3064 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0); 2968 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
3065 u2time = INT2PTR (double (*)(), SvIV (*svp)); 2969 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
3066 } 2970 }
3067 2971
3068 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL)); 2972 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3069} 2973}
3070 2974
… …
3075 CODE: 2979 CODE:
3076{ 2980{
3077 struct coro *coro; 2981 struct coro *coro;
3078 MAGIC *mg; 2982 MAGIC *mg;
3079 HV *hv; 2983 HV *hv;
3080 CV *cb; 2984 SV *cb;
3081 int i; 2985 int i;
3082 2986
3083 if (items > 1) 2987 if (items > 1)
3084 { 2988 {
3085 cb = coro_sv_2cv (aTHX_ ST (1)); 2989 cb = s_get_cv_croak (ST (1));
3086 2990
3087 if (!ix) 2991 if (!ix)
3088 { 2992 {
3089 if (CvISXSUB (cb)) 2993 if (CvISXSUB (cb))
3090 croak ("Coro::State doesn't support XS functions as coroutine start, caught"); 2994 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
… …
3112 av_extend (coro->args, items - 1 + ix - 1); 3016 av_extend (coro->args, items - 1 + ix - 1);
3113 3017
3114 if (ix) 3018 if (ix)
3115 { 3019 {
3116 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb)); 3020 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
3117 cb = cv_coro_run; 3021 cb = (SV *)cv_coro_run;
3118 } 3022 }
3119 3023
3120 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb); 3024 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3121 3025
3122 for (i = 2; i < items; i++) 3026 for (i = 2; i < items; i++)
… …
3596 CODE: 3500 CODE:
3597{ 3501{
3598 struct coro *coro = SvSTATE_current; 3502 struct coro *coro = SvSTATE_current;
3599 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 3503 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3600 3504
3601 block = (SV *)coro_sv_2cv (aTHX_ block); 3505 block = s_get_cv_croak (block);
3602 3506
3603 if (!*avp) 3507 if (!*avp)
3604 *avp = newAV (); 3508 *avp = newAV ();
3605 3509
3606 av_push (*avp, SvREFCNT_inc (block)); 3510 av_push (*avp, SvREFCNT_inc (block));
… …
3806 3710
3807void 3711void
3808_register (char *target, char *proto, SV *req) 3712_register (char *target, char *proto, SV *req)
3809 CODE: 3713 CODE:
3810{ 3714{
3811 CV *req_cv = coro_sv_2cv (aTHX_ req); 3715 SV *req_cv = s_get_cv_croak (req);
3812 /* newXSproto doesn't return the CV on 5.8 */ 3716 /* newXSproto doesn't return the CV on 5.8 */
3813 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 3717 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3814 sv_setpv ((SV *)slf_cv, proto); 3718 sv_setpv ((SV *)slf_cv, proto);
3815 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0); 3719 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
3816} 3720}

Diff Legend

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