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.430 by root, Wed Dec 19 23:36:16 2012 UTC vs.
Revision 1.444 by root, Thu May 1 08:09:18 2014 UTC

… …
14#include "perliol.h" 14#include "perliol.h"
15 15
16#include "schmorp.h" 16#include "schmorp.h"
17 17
18#define ECB_NO_THREADS 1 18#define ECB_NO_THREADS 1
19#define ECB_NO_LIBM 1
19#include "ecb.h" 20#include "ecb.h"
20 21
21#include <stddef.h> 22#include <stddef.h>
22#include <stdio.h> 23#include <stdio.h>
23#include <errno.h> 24#include <errno.h>
… …
26#ifndef SVs_PADSTALE 27#ifndef SVs_PADSTALE
27# define SVs_PADSTALE 0 28# define SVs_PADSTALE 0
28#endif 29#endif
29 30
30#ifdef PadARRAY 31#ifdef PadARRAY
31# define NEWPADAPI 32# define NEWPADAPI 1
32# define newPADLIST(var) (Newz (0, var, 1, PADLIST), Newx (PadlistARRAY (var), 2, PAD *)) 33# define newPADLIST(var) (Newz (0, var, 1, PADLIST), Newx (PadlistARRAY (var), 2, PAD *))
33#else 34#else
34typedef AV PADNAMELIST; 35typedef AV PADNAMELIST;
35# if !PERL_VERSION_ATLEAST(5,8,0) 36# if !PERL_VERSION_ATLEAST(5,8,0)
36typedef AV PADLIST; 37typedef AV PADLIST;
… …
42# define PadARRAY AvARRAY 43# define PadARRAY AvARRAY
43# define PadMAX AvFILLp 44# define PadMAX AvFILLp
44# define newPADLIST(var) ((var) = newAV (), av_extend (var, 1)) 45# define newPADLIST(var) ((var) = newAV (), av_extend (var, 1))
45#endif 46#endif
46 47
48/* 5.19.something has replaced SVt_BIND by SVt_INVLIST */
49/* we just alias it to SVt_IV, as that is sufficient for swap_sv for now */
50#if PERL_VERSION_ATLEAST(5,19,0)
51# define SVt_BIND SVt_IV
52#endif
53
47#if defined(_WIN32) 54#if defined(_WIN32)
48# undef HAS_GETTIMEOFDAY 55# undef HAS_GETTIMEOFDAY
49# undef setjmp 56# undef setjmp
50# undef longjmp 57# undef longjmp
51# undef _exit 58# undef _exit
… …
511coro_derive_padlist (pTHX_ CV *cv) 518coro_derive_padlist (pTHX_ CV *cv)
512{ 519{
513 PADLIST *padlist = CvPADLIST (cv); 520 PADLIST *padlist = CvPADLIST (cv);
514 PADLIST *newpadlist; 521 PADLIST *newpadlist;
515 PAD *newpad; 522 PAD *newpad;
516 PADOFFSET const off = PadlistMAX (padlist) + 1; 523 PADOFFSET off = PadlistMAX (padlist) + 1;
517 524
518 newPADLIST(newpadlist); 525#if NEWPADAPI
519#if !PERL_VERSION_ATLEAST(5,15,3) 526
520 /* Padlists are AvREAL as of 5.15.3. See perl bug #98092 and perl commit 7d953ba. */ 527 /* if we had the original CvDEPTH, we might be able to steal the CvDEPTH+1 entry instead */
521 AvREAL_off (newpadlist); 528 /* 20131102194744.GA6705@schmorp.de, 20131102195825.2013.qmail@lists-nntp.develooper.com */
522#endif 529 while (!PadlistARRAY (padlist)[off - 1])
530 --off;
531
532 Perl_pad_push (aTHX_ padlist, off);
533
534 newpad = PadlistARRAY (padlist)[off];
535 PadlistARRAY (padlist)[off] = 0;
536
537#else
538
523#if PERL_VERSION_ATLEAST (5,10,0) 539#if PERL_VERSION_ATLEAST (5,10,0)
524 Perl_pad_push (aTHX_ padlist, off); 540 Perl_pad_push (aTHX_ padlist, off);
525#else 541#else
526 Perl_pad_push (aTHX_ padlist, off, 1); 542 Perl_pad_push (aTHX_ padlist, off, 1);
527#endif 543#endif
544
528 newpad = PadlistARRAY (padlist)[off]; 545 newpad = PadlistARRAY (padlist)[off];
529 PadlistMAX (padlist) = off - 1; 546 PadlistMAX (padlist) = off - 1;
547
548#endif
549
550 newPADLIST (newpadlist);
551#if !PERL_VERSION_ATLEAST(5,15,3)
552 /* Padlists are AvREAL as of 5.15.3. See perl bug #98092 and perl commit 7d953ba. */
553 AvREAL_off (newpadlist);
554#endif
530 555
531 /* Already extended to 2 elements by newPADLIST. */ 556 /* Already extended to 2 elements by newPADLIST. */
532 PadlistMAX (newpadlist) = 1; 557 PadlistMAX (newpadlist) = 1;
533 PadlistNAMES (newpadlist) = (PADNAMELIST *)SvREFCNT_inc_NN (PadlistNAMES (padlist)); 558 PadlistNAMES (newpadlist) = (PADNAMELIST *)SvREFCNT_inc_NN (PadlistNAMES (padlist));
534 PadlistARRAY (newpadlist)[1] = newpad; 559 PadlistARRAY (newpadlist)[1] = newpad;
… …
546 571
547 while (i > 0) /* special-case index 0 */ 572 while (i > 0) /* special-case index 0 */
548 { 573 {
549 /* we try to be extra-careful here */ 574 /* we try to be extra-careful here */
550 PAD *pad = PadlistARRAY (padlist)[i--]; 575 PAD *pad = PadlistARRAY (padlist)[i--];
576
577 if (pad)
578 {
551 I32 j = PadMAX (pad); 579 I32 j = PadMAX (pad);
552 580
553 while (j >= 0) 581 while (j >= 0)
554 SvREFCNT_dec (PadARRAY (pad)[j--]); 582 SvREFCNT_dec (PadARRAY (pad)[j--]);
555 583
556 PadMAX (pad) = -1; 584 PadMAX (pad) = -1;
557 SvREFCNT_dec (pad); 585 SvREFCNT_dec (pad);
586 }
558 } 587 }
559 588
560 SvREFCNT_dec (PadlistNAMES (padlist)); 589 SvREFCNT_dec (PadlistNAMES (padlist));
561 590
562#ifdef NEWPADAPI 591#if NEWPADAPI
563 Safefree (PadlistARRAY (padlist)); 592 Safefree (PadlistARRAY (padlist));
564 Safefree (padlist); 593 Safefree (padlist);
565#else 594#else
566 AvFILLp (padlist) = -1; 595 AvFILLp (padlist) = -1;
567 AvREAL_off (padlist); 596 AvREAL_off (padlist);
… …
1888 /* nothing to schedule: call the idle handler */ 1917 /* nothing to schedule: call the idle handler */
1889 if (SvROK (sv_idle) 1918 if (SvROK (sv_idle)
1890 && SvOBJECT (SvRV (sv_idle))) 1919 && SvOBJECT (SvRV (sv_idle)))
1891 { 1920 {
1892 if (SvRV (sv_idle) == SvRV (coro_current)) 1921 if (SvRV (sv_idle) == SvRV (coro_current))
1922 {
1923 require_pv ("Carp");
1924
1925 {
1926 dSP;
1927
1928 ENTER;
1929 SAVETMPS;
1930
1931 PUSHMARK (SP);
1893 croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught"); 1932 XPUSHs (sv_2mortal (newSVpv ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught", 0)));
1933 PUTBACK;
1934 call_pv ("Carp::confess", G_VOID | G_DISCARD);
1935
1936 FREETMPS;
1937 LEAVE;
1938 }
1939 }
1894 1940
1895 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 1941 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1896 api_ready (aTHX_ SvRV (sv_idle)); 1942 api_ready (aTHX_ SvRV (sv_idle));
1897 --coro_nready; 1943 --coro_nready;
1898 } 1944 }
… …
2096 AV *od = coro->on_destroy; 2142 AV *od = coro->on_destroy;
2097 2143
2098 if (!od) 2144 if (!od)
2099 return; 2145 return;
2100 2146
2147 coro->on_destroy = 0;
2148 sv_2mortal ((SV *)od);
2149
2101 while (AvFILLp (od) >= 0) 2150 while (AvFILLp (od) >= 0)
2102 { 2151 {
2103 SV *cb = sv_2mortal (av_pop (od)); 2152 SV *cb = sv_2mortal (av_pop (od));
2104 2153
2105 /* coro hv's (and only hv's at the moment) are supported as well */ 2154 /* coro hv's (and only hv's at the moment) are supported as well */
… …
2199 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv); 2248 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2200 } 2249 }
2201 else 2250 else
2202 { 2251 {
2203 struct coro *self = SvSTATE_current; 2252 struct coro *self = SvSTATE_current;
2253
2254 if (!self)
2255 croak ("Coro::cancel called outside of thread content,");
2204 2256
2205 /* otherwise we cancel directly, purely for speed reasons 2257 /* otherwise we cancel directly, purely for speed reasons
2206 * unfortunately, this requires some magic trickery, as 2258 * unfortunately, this requires some magic trickery, as
2207 * somebody else could cancel us, so we have to fight the cancellation. 2259 * somebody else could cancel us, so we have to fight the cancellation.
2208 * this is ugly, and hopefully fully worth the extra speed. 2260 * this is ugly, and hopefully fully worth the extra speed.
… …
2550 2602
2551/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */ 2603/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2552static void 2604static void
2553slf_destroy (pTHX_ struct coro *coro) 2605slf_destroy (pTHX_ struct coro *coro)
2554{ 2606{
2555 /* this callback is reserved for slf functions needing to do cleanup */ 2607 struct CoroSLF frame = coro->slf_frame;
2556 if (coro->slf_frame.destroy && coro->slf_frame.prepare && !PL_dirty)
2557 coro->slf_frame.destroy (aTHX_ &coro->slf_frame);
2558 2608
2559 /* 2609 /*
2560 * The on_destroy above most likely is from an SLF call. 2610 * The on_destroy below most likely is from an SLF call.
2561 * Since by definition the SLF call will not finish when we destroy 2611 * Since by definition the SLF call will not finish when we destroy
2562 * the coro, we will have to force-finish it here, otherwise 2612 * the coro, we will have to force-finish it here, otherwise
2563 * cleanup functions cannot call SLF functions. 2613 * cleanup functions cannot call SLF functions.
2564 */ 2614 */
2565 coro->slf_frame.prepare = 0; 2615 coro->slf_frame.prepare = 0;
2616
2617 /* this callback is reserved for slf functions needing to do cleanup */
2618 if (frame.destroy && frame.prepare && !PL_dirty)
2619 frame.destroy (aTHX_ &frame);
2566} 2620}
2567 2621
2568/* 2622/*
2569 * these not obviously related functions are all rolled into one 2623 * these not obviously related functions are all rolled into one
2570 * function to increase chances that they all will call transfer with the same 2624 * function to increase chances that they all will call transfer with the same
… …
2910{ 2964{
2911 AV *av = (AV *)frame->data; 2965 AV *av = (AV *)frame->data;
2912 SV *count_sv = AvARRAY (av)[0]; 2966 SV *count_sv = AvARRAY (av)[0];
2913 SV *coro_hv = SvRV (coro_current); 2967 SV *coro_hv = SvRV (coro_current);
2914 2968
2969 frame->destroy = 0;
2970
2915 /* if we are about to throw, don't actually acquire the lock, just throw */ 2971 /* if we are about to throw, don't actually acquire the lock, just throw */
2916 if (CORO_THROW) 2972 if (ecb_expect_false (CORO_THROW))
2973 {
2974 /* we still might be responsible for the semaphore, so wake up others */
2975 coro_semaphore_adjust (aTHX_ av, 0);
2976
2917 return 0; 2977 return 0;
2978 }
2918 else if (SvIVX (count_sv) > 0) 2979 else if (SvIVX (count_sv) > 0)
2919 { 2980 {
2920 frame->destroy = 0;
2921
2922 if (acquire) 2981 if (acquire)
2923 SvIVX (count_sv) = SvIVX (count_sv) - 1; 2982 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2924 else 2983 else
2925 coro_semaphore_adjust (aTHX_ av, 0); 2984 coro_semaphore_adjust (aTHX_ av, 0);
2926 2985
… …
3148 /* it quickly returns */ 3207 /* it quickly returns */
3149 if (CORO_THROW) 3208 if (CORO_THROW)
3150 return 0; 3209 return 0;
3151 3210
3152 /* one element that is an RV? repeat! */ 3211 /* one element that is an RV? repeat! */
3153 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0])) 3212 if (AvFILLp (state) == 0 && SvTYPE (AvARRAY (state)[0]) != SVt_PV)
3154 return 1; 3213 return 1;
3155 3214
3156 /* restore status */ 3215 /* restore status */
3157 { 3216 {
3158 SV *data_sv = av_pop (state); 3217 SV *data_sv = av_pop (state);
… …
3386 3445
3387PROTOTYPES: DISABLE 3446PROTOTYPES: DISABLE
3388 3447
3389BOOT: 3448BOOT:
3390{ 3449{
3450#define VARx(name,expr,type) if (sizeof (type) < sizeof (expr)) croak ("FATAL: Coro thread context slot '" # name "' too small for this version of perl");
3451#include "state.h"
3391#ifdef USE_ITHREADS 3452#ifdef USE_ITHREADS
3392# if CORO_PTHREAD 3453# if CORO_PTHREAD
3393 coro_thx = PERL_GET_CONTEXT; 3454 coro_thx = PERL_GET_CONTEXT;
3394# endif 3455# endif
3395#endif 3456#endif
… …
3470void 3531void
3471transfer (...) 3532transfer (...)
3472 PROTOTYPE: $$ 3533 PROTOTYPE: $$
3473 CODE: 3534 CODE:
3474 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3535 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3475
3476void
3477_exit (int code)
3478 PROTOTYPE: $
3479 CODE:
3480 _exit (code);
3481 3536
3482SV * 3537SV *
3483clone (Coro::State coro) 3538clone (Coro::State coro)
3484 CODE: 3539 CODE:
3485{ 3540{
… …
4237 { 4292 {
4238 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect; 4293 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
4239 coro_old_pp_sselect = 0; 4294 coro_old_pp_sselect = 0;
4240 } 4295 }
4241 4296
4297MODULE = Coro::State PACKAGE = Coro::Util
4298
4299void
4300_exit (int code)
4301 CODE:
4302 _exit (code);
4303
4304NV
4305time ()
4306 CODE:
4307 RETVAL = nvtime (aTHX);
4308 OUTPUT:
4309 RETVAL
4310
4311NV
4312gettimeofday ()
4313 PPCODE:
4314{
4315 UV tv [2];
4316 u2time (aTHX_ tv);
4317 EXTEND (SP, 2);
4318 PUSHs (sv_2mortal (newSVuv (tv [0])));
4319 PUSHs (sv_2mortal (newSVuv (tv [1])));
4320}
4321

Diff Legend

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