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.221 by root, Sun Jan 13 09:47:22 2008 UTC vs.
Revision 1.245 by root, Mon Sep 22 05:40:21 2008 UTC

10#include "patchlevel.h" 10#include "patchlevel.h"
11 11
12#include <stdio.h> 12#include <stdio.h>
13#include <errno.h> 13#include <errno.h>
14#include <assert.h> 14#include <assert.h>
15
16#ifdef WIN32
17# undef setjmp
18# undef longjmp
19# undef _exit
20# define setjmp _setjmp // deep magic, don't ask
21#else
15#include <inttypes.h> /* portable stdint.h */ 22# include <inttypes.h> /* most portable stdint.h */
23#endif
16 24
17#ifdef HAVE_MMAP 25#ifdef HAVE_MMAP
18# include <unistd.h> 26# include <unistd.h>
19# include <sys/mman.h> 27# include <sys/mman.h>
20# ifndef MAP_ANONYMOUS 28# ifndef MAP_ANONYMOUS
72# ifndef IS_PADCONST 80# ifndef IS_PADCONST
73# define IS_PADCONST(v) 0 81# define IS_PADCONST(v) 0
74# endif 82# endif
75#endif 83#endif
76 84
85/* 5.8.8 */
86#ifndef GV_NOTQUAL
87# define GV_NOTQUAL 0
88#endif
89#ifndef newSV
90# define newSV(l) NEWSV(0,l)
91#endif
92
93/* 5.11 */
94#ifndef CxHASARGS
95# define CxHASARGS(cx) (cx)->blk_sub.hasargs
96#endif
97
77/* 5.8.7 */ 98/* 5.8.7 */
78#ifndef SvRV_set 99#ifndef SvRV_set
79# define SvRV_set(s,v) SvRV(s) = (v) 100# define SvRV_set(s,v) SvRV(s) = (v)
80#endif
81
82/* 5.8.8 */
83#ifndef GV_NOTQUAL
84# define GV_NOTQUAL 0
85#endif
86#ifndef newSV
87# define newSV(l) NEWSV(0,l)
88#endif 101#endif
89 102
90#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 103#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
91# undef CORO_STACKGUARD 104# undef CORO_STACKGUARD
92#endif 105#endif
157 170
158/* async_pool helper stuff */ 171/* async_pool helper stuff */
159static SV *sv_pool_rss; 172static SV *sv_pool_rss;
160static SV *sv_pool_size; 173static SV *sv_pool_size;
161static AV *av_async_pool; 174static AV *av_async_pool;
175
176/* Coro::AnyEvent */
177static SV *sv_activity;
162 178
163static struct coro_cctx *cctx_first; 179static struct coro_cctx *cctx_first;
164static int cctx_count, cctx_idle; 180static int cctx_count, cctx_idle;
165 181
166enum { 182enum {
252#define PRIO_IDLE -3 268#define PRIO_IDLE -3
253#define PRIO_MIN -4 269#define PRIO_MIN -4
254 270
255/* for Coro.pm */ 271/* for Coro.pm */
256static SV *coro_current; 272static SV *coro_current;
273static SV *coro_readyhook;
257static AV *coro_ready [PRIO_MAX-PRIO_MIN+1]; 274static AV *coro_ready [PRIO_MAX-PRIO_MIN+1];
258static int coro_nready; 275static int coro_nready;
259static struct coro *coro_first; 276static struct coro *coro_first;
260 277
261/** lowlevel stuff **********************************************************/ 278/** lowlevel stuff **********************************************************/
262 279
263static SV * 280static SV *
264coro_get_sv (pTHX_ const char *name, int create) 281coro_get_sv (pTHX_ const char *name, int create)
265{ 282{
266#if PERL_VERSION_ATLEAST (5,9,0) 283#if PERL_VERSION_ATLEAST (5,10,0)
267 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 284 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
268 get_sv (name, create); 285 get_sv (name, create);
269#endif 286#endif
270 return get_sv (name, create); 287 return get_sv (name, create);
271} 288}
272 289
273static AV * 290static AV *
274coro_get_av (pTHX_ const char *name, int create) 291coro_get_av (pTHX_ const char *name, int create)
275{ 292{
276#if PERL_VERSION_ATLEAST (5,9,0) 293#if PERL_VERSION_ATLEAST (5,10,0)
277 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 294 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
278 get_av (name, create); 295 get_av (name, create);
279#endif 296#endif
280 return get_av (name, create); 297 return get_av (name, create);
281} 298}
282 299
283static HV * 300static HV *
284coro_get_hv (pTHX_ const char *name, int create) 301coro_get_hv (pTHX_ const char *name, int create)
285{ 302{
286#if PERL_VERSION_ATLEAST (5,9,0) 303#if PERL_VERSION_ATLEAST (5,10,0)
287 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 304 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
288 get_hv (name, create); 305 get_hv (name, create);
289#endif 306#endif
290 return get_hv (name, create); 307 return get_hv (name, create);
291} 308}
296 AV *padlist = CvPADLIST (cv); 313 AV *padlist = CvPADLIST (cv);
297 AV *newpadlist, *newpad; 314 AV *newpadlist, *newpad;
298 315
299 newpadlist = newAV (); 316 newpadlist = newAV ();
300 AvREAL_off (newpadlist); 317 AvREAL_off (newpadlist);
301#if PERL_VERSION_ATLEAST (5,9,0) 318#if PERL_VERSION_ATLEAST (5,10,0)
302 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1); 319 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1);
303#else 320#else
304 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 321 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
305#endif 322#endif
306 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 323 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
344 361
345 /* casting is fun. */ 362 /* casting is fun. */
346 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 363 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
347 free_padlist (aTHX_ padlist); 364 free_padlist (aTHX_ padlist);
348 365
366 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
367
349 return 0; 368 return 0;
350} 369}
351 370
352#define CORO_MAGIC_type_cv PERL_MAGIC_ext 371#define CORO_MAGIC_type_cv PERL_MAGIC_ext
353#define CORO_MAGIC_type_state PERL_MAGIC_ext 372#define CORO_MAGIC_type_state PERL_MAGIC_ext
403 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 422 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0))
404 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 423 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
405 else 424 else
406 { 425 {
407#if CORO_PREFER_PERL_FUNCTIONS 426#if CORO_PREFER_PERL_FUNCTIONS
408 /* this is probably cleaner, but also slower? */ 427 /* this is probably cleaner? but also slower! */
428 /* in practise, it seems to be less stable */
409 CV *cp = Perl_cv_clone (cv); 429 CV *cp = Perl_cv_clone (cv);
410 CvPADLIST (cv) = CvPADLIST (cp); 430 CvPADLIST (cv) = CvPADLIST (cp);
411 CvPADLIST (cp) = 0; 431 CvPADLIST (cp) = 0;
412 SvREFCNT_dec (cp); 432 SvREFCNT_dec (cp);
413#else 433#else
497 517
498 if (expect_true (CvDEPTH (cv))) 518 if (expect_true (CvDEPTH (cv)))
499 { 519 {
500 EXTEND (SP, 3); 520 EXTEND (SP, 3);
501 PUSHs ((SV *)CvPADLIST (cv)); 521 PUSHs ((SV *)CvPADLIST (cv));
502 PUSHs (INT2PTR (SV *, CvDEPTH (cv))); 522 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
503 PUSHs ((SV *)cv); 523 PUSHs ((SV *)cv);
504 524
505 CvDEPTH (cv) = 0; 525 CvDEPTH (cv) = 0;
506 get_padlist (aTHX_ cv); 526 get_padlist (aTHX_ cv);
507 } 527 }
587 607
588 New(54,PL_savestack,24,ANY); 608 New(54,PL_savestack,24,ANY);
589 PL_savestack_ix = 0; 609 PL_savestack_ix = 0;
590 PL_savestack_max = 24; 610 PL_savestack_max = 24;
591 611
592#if !PERL_VERSION_ATLEAST (5,9,0) 612#if !PERL_VERSION_ATLEAST (5,10,0)
593 New(54,PL_retstack,4,OP*); 613 New(54,PL_retstack,4,OP*);
594 PL_retstack_ix = 0; 614 PL_retstack_ix = 0;
595 PL_retstack_max = 4; 615 PL_retstack_max = 4;
596#endif 616#endif
597} 617}
620 640
621 Safefree (PL_tmps_stack); 641 Safefree (PL_tmps_stack);
622 Safefree (PL_markstack); 642 Safefree (PL_markstack);
623 Safefree (PL_scopestack); 643 Safefree (PL_scopestack);
624 Safefree (PL_savestack); 644 Safefree (PL_savestack);
625#if !PERL_VERSION_ATLEAST (5,9,0) 645#if !PERL_VERSION_ATLEAST (5,10,0)
626 Safefree (PL_retstack); 646 Safefree (PL_retstack);
627#endif 647#endif
628} 648}
629 649
630static size_t 650static size_t
646 #undef VAR 666 #undef VAR
647 } 667 }
648 else 668 else
649 slot = coro->slot; 669 slot = coro->slot;
650 670
671 if (slot)
672 {
651 rss += sizeof (slot->curstackinfo); 673 rss += sizeof (slot->curstackinfo);
652 rss += (slot->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT); 674 rss += (slot->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT);
653 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (slot->curstack)) * sizeof (SV *); 675 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (slot->curstack)) * sizeof (SV *);
654 rss += slot->tmps_max * sizeof (SV *); 676 rss += slot->tmps_max * sizeof (SV *);
655 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32); 677 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32);
656 rss += slot->scopestack_max * sizeof (I32); 678 rss += slot->scopestack_max * sizeof (I32);
657 rss += slot->savestack_max * sizeof (ANY); 679 rss += slot->savestack_max * sizeof (ANY);
658 680
659#if !PERL_VERSION_ATLEAST (5,9,0) 681#if !PERL_VERSION_ATLEAST (5,10,0)
660 rss += slot->retstack_max * sizeof (OP *); 682 rss += slot->retstack_max * sizeof (OP *);
661#endif 683#endif
684 }
662 } 685 }
663 686
664 return rss; 687 return rss;
665} 688}
666 689
667/** coroutine stack handling ************************************************/ 690/** coroutine stack handling ************************************************/
668 691
669static int (*orig_sigelem_get) (pTHX_ SV *sv, MAGIC *mg); 692static int (*orig_sigelem_get) (pTHX_ SV *sv, MAGIC *mg);
670static int (*orig_sigelem_set) (pTHX_ SV *sv, MAGIC *mg); 693static int (*orig_sigelem_set) (pTHX_ SV *sv, MAGIC *mg);
694static int (*orig_sigelem_clr) (pTHX_ SV *sv, MAGIC *mg);
695
696/* apparently < 5.8.8 */
697#ifndef MgPV_nolen_const
698#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \
699 SvPV_nolen((SV*)((mg)->mg_ptr)) : \
700 (const char*)(mg)->mg_ptr)
701#endif
671 702
672/* 703/*
673 * This overrides the default magic get method of %SIG elements. 704 * This overrides the default magic get method of %SIG elements.
674 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook 705 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
675 * and instead of tryign to save and restore the hash elements, we just provide 706 * and instead of tryign to save and restore the hash elements, we just provide
683{ 714{
684 const char *s = MgPV_nolen_const (mg); 715 const char *s = MgPV_nolen_const (mg);
685 716
686 if (*s == '_') 717 if (*s == '_')
687 { 718 {
688 if (strEQ (s, "__DIE__" ) && PL_diehook ) return sv_setsv (sv, PL_diehook ), 0; 719 SV **svp = 0;
689 if (strEQ (s, "__WARN__") && PL_warnhook) return sv_setsv (sv, PL_warnhook), 0; 720
721 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
722 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
723
724 if (svp)
725 {
726 sv_setsv (sv, *svp ? *svp : &PL_sv_undef);
727 return 0;
728 }
690 } 729 }
691 730
692 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 731 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
732}
733
734static int
735coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
736{
737 const char *s = MgPV_nolen_const (mg);
738
739 if (*s == '_')
740 {
741 SV **svp = 0;
742
743 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
744 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
745
746 if (svp)
747 {
748 SV *old = *svp;
749 *svp = 0;
750 SvREFCNT_dec (old);
751 return 0;
752 }
753 }
754
755 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
693} 756}
694 757
695static int 758static int
696coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 759coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
697{ 760{
707 if (svp) 770 if (svp)
708 { 771 {
709 SV *old = *svp; 772 SV *old = *svp;
710 *svp = newSVsv (sv); 773 *svp = newSVsv (sv);
711 SvREFCNT_dec (old); 774 SvREFCNT_dec (old);
712 return; 775 return 0;
713 } 776 }
714 } 777 }
715 778
716 return orig_sigelem_set ? orig_sigelem_set (aTHX_ sv, mg) : 0; 779 return orig_sigelem_set ? orig_sigelem_set (aTHX_ sv, mg) : 0;
717} 780}
731 PL_curpm = 0; 794 PL_curpm = 0;
732 PL_curpad = 0; 795 PL_curpad = 0;
733 PL_localizing = 0; 796 PL_localizing = 0;
734 PL_dirty = 0; 797 PL_dirty = 0;
735 PL_restartop = 0; 798 PL_restartop = 0;
799#if PERL_VERSION_ATLEAST (5,10,0)
800 PL_parser = 0;
801#endif
736 802
737 /* recreate the die/warn hooks */ 803 /* recreate the die/warn hooks */
738 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 804 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook );
739 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 805 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook);
740 806
895 SAVETMPS; 961 SAVETMPS;
896 EXTEND (SP, 3); 962 EXTEND (SP, 3);
897 PUSHMARK (SP); 963 PUSHMARK (SP);
898 PUSHs (&PL_sv_yes); 964 PUSHs (&PL_sv_yes);
899 PUSHs (fullname); 965 PUSHs (fullname);
900 PUSHs (cx->blk_sub.hasargs ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef); 966 PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef);
901 PUTBACK; 967 PUTBACK;
902 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0); 968 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
903 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 969 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
904 SPAGAIN; 970 SPAGAIN;
905 FREETMPS; 971 FREETMPS;
1121 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states"); 1187 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states");
1122 1188
1123 if (expect_false (next->flags & CF_DESTROYED)) 1189 if (expect_false (next->flags & CF_DESTROYED))
1124 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states"); 1190 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states");
1125 1191
1126 if (
1127#if PERL_VERSION_ATLEAST (5,9,0) 1192#if !PERL_VERSION_ATLEAST (5,10,0)
1128 expect_false (PL_parser)
1129#else
1130 expect_false (PL_lex_state != LEX_NOTPARSING) 1193 if (expect_false (PL_lex_state != LEX_NOTPARSING))
1131#endif
1132 )
1133 croak ("Coro::State::transfer called while parsing, but this is not supported"); 1194 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version");
1195#endif
1134 } 1196 }
1135} 1197}
1136 1198
1137/* always use the TRANSFER macro */ 1199/* always use the TRANSFER macro */
1138static void NOINLINE 1200static void NOINLINE
1139transfer (pTHX_ struct coro *prev, struct coro *next) 1201transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1140{ 1202{
1141 dSTACKLEVEL; 1203 dSTACKLEVEL;
1142 static volatile int has_throw; 1204 static volatile int has_throw;
1143 1205
1144 /* sometimes transfer is only called to set idle_sp */ 1206 /* sometimes transfer is only called to set idle_sp */
1178 load_perl (aTHX_ next); 1240 load_perl (aTHX_ next);
1179 1241
1180 prev__cctx = prev->cctx; 1242 prev__cctx = prev->cctx;
1181 1243
1182 /* possibly "free" the cctx */ 1244 /* possibly "free" the cctx */
1183 if (expect_true (prev__cctx->idle_sp == STACKLEVEL && !(prev__cctx->flags & CC_TRACE))) 1245 if (expect_true (
1246 prev__cctx->idle_sp == STACKLEVEL
1247 && !(prev__cctx->flags & CC_TRACE)
1248 && !force_cctx
1249 ))
1184 { 1250 {
1185 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */ 1251 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */
1186 assert (("ERROR: current top_env must equal previous top_env", PL_top_env == prev__cctx->idle_te)); 1252 assert (("ERROR: current top_env must equal previous top_env", PL_top_env == prev__cctx->idle_te));
1187 1253
1188 prev->cctx = 0; 1254 prev->cctx = 0;
1231struct transfer_args 1297struct transfer_args
1232{ 1298{
1233 struct coro *prev, *next; 1299 struct coro *prev, *next;
1234}; 1300};
1235 1301
1236#define TRANSFER(ta) transfer (aTHX_ (ta).prev, (ta).next) 1302#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1237#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1303#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1238 1304
1239/** high level stuff ********************************************************/ 1305/** high level stuff ********************************************************/
1240 1306
1241static int 1307static int
1335{ 1401{
1336 dTHX; 1402 dTHX;
1337 struct transfer_args ta; 1403 struct transfer_args ta;
1338 1404
1339 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1405 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1340 TRANSFER (ta); 1406 TRANSFER (ta, 1);
1341} 1407}
1342 1408
1343/** Coro ********************************************************************/ 1409/** Coro ********************************************************************/
1344 1410
1345static void 1411static void
1363static int 1429static int
1364api_ready (SV *coro_sv) 1430api_ready (SV *coro_sv)
1365{ 1431{
1366 dTHX; 1432 dTHX;
1367 struct coro *coro; 1433 struct coro *coro;
1434 SV *sv_hook;
1435 void (*xs_hook)(void);
1368 1436
1369 if (SvROK (coro_sv)) 1437 if (SvROK (coro_sv))
1370 coro_sv = SvRV (coro_sv); 1438 coro_sv = SvRV (coro_sv);
1371 1439
1372 coro = SvSTATE (coro_sv); 1440 coro = SvSTATE (coro_sv);
1375 return 0; 1443 return 0;
1376 1444
1377 coro->flags |= CF_READY; 1445 coro->flags |= CF_READY;
1378 1446
1379 LOCK; 1447 LOCK;
1448
1449 sv_hook = coro_nready ? 0 : coro_readyhook;
1450 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1451
1380 coro_enq (aTHX_ SvREFCNT_inc (coro_sv)); 1452 coro_enq (aTHX_ SvREFCNT_inc (coro_sv));
1381 ++coro_nready; 1453 ++coro_nready;
1454
1382 UNLOCK; 1455 UNLOCK;
1456
1457 if (sv_hook)
1458 {
1459 dSP;
1460
1461 ENTER;
1462 SAVETMPS;
1463
1464 PUSHMARK (SP);
1465 PUTBACK;
1466 call_sv (sv_hook, G_DISCARD);
1467 SPAGAIN;
1468
1469 FREETMPS;
1470 LEAVE;
1471 }
1472
1473 if (xs_hook)
1474 xs_hook ();
1383 1475
1384 return 1; 1476 return 1;
1385} 1477}
1386 1478
1387static int 1479static int
1476{ 1568{
1477 dTHX; 1569 dTHX;
1478 struct transfer_args ta; 1570 struct transfer_args ta;
1479 1571
1480 prepare_schedule (aTHX_ &ta); 1572 prepare_schedule (aTHX_ &ta);
1481 TRANSFER (ta); 1573 TRANSFER (ta, 1);
1482} 1574}
1483 1575
1484static int 1576static int
1485api_cede (void) 1577api_cede (void)
1486{ 1578{
1489 1581
1490 prepare_cede (aTHX_ &ta); 1582 prepare_cede (aTHX_ &ta);
1491 1583
1492 if (expect_true (ta.prev != ta.next)) 1584 if (expect_true (ta.prev != ta.next))
1493 { 1585 {
1494 TRANSFER (ta); 1586 TRANSFER (ta, 1);
1495 return 1; 1587 return 1;
1496 } 1588 }
1497 else 1589 else
1498 return 0; 1590 return 0;
1499} 1591}
1504 dTHX; 1596 dTHX;
1505 struct transfer_args ta; 1597 struct transfer_args ta;
1506 1598
1507 if (prepare_cede_notself (aTHX_ &ta)) 1599 if (prepare_cede_notself (aTHX_ &ta))
1508 { 1600 {
1509 TRANSFER (ta); 1601 TRANSFER (ta, 1);
1510 return 1; 1602 return 1;
1511 } 1603 }
1512 else 1604 else
1513 return 0; 1605 return 0;
1514} 1606}
1537 else 1629 else
1538 coro->slot->runops = RUNOPS_DEFAULT; 1630 coro->slot->runops = RUNOPS_DEFAULT;
1539 } 1631 }
1540} 1632}
1541 1633
1634static int
1635coro_gensub_free (pTHX_ SV *sv, MAGIC *mg)
1636{
1637 AV *padlist;
1638 AV *av = (AV *)mg->mg_obj;
1639
1640 abort ();
1641
1642 return 0;
1643}
1644
1645static MGVTBL coro_gensub_vtbl = {
1646 0, 0, 0, 0,
1647 coro_gensub_free
1648};
1649
1542MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 1650MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
1543 1651
1544PROTOTYPES: DISABLE 1652PROTOTYPES: DISABLE
1545 1653
1546BOOT: 1654BOOT:
1551 BOOT_PAGESIZE; 1659 BOOT_PAGESIZE;
1552 1660
1553 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 1661 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
1554 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 1662 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
1555 1663
1556 orig_sigelem_get = PL_vtbl_sigelem.svt_get; 1664 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get;
1557 PL_vtbl_sigelem.svt_get = coro_sigelem_get; 1665 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set;
1558 orig_sigelem_set = PL_vtbl_sigelem.svt_set; 1666 orig_sigelem_clr = PL_vtbl_sigelem.svt_clear; PL_vtbl_sigelem.svt_clear = coro_sigelem_clr;
1559 PL_vtbl_sigelem.svt_set = coro_sigelem_set;
1560 1667
1561 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE); 1668 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
1562 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV)); 1669 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
1563 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV)); 1670 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
1564 1671
1573 main_top_env = PL_top_env; 1680 main_top_env = PL_top_env;
1574 1681
1575 while (main_top_env->je_prev) 1682 while (main_top_env->je_prev)
1576 main_top_env = main_top_env->je_prev; 1683 main_top_env = main_top_env->je_prev;
1577 1684
1578 coroapi.ver = CORO_API_VERSION; 1685 coroapi.ver = CORO_API_VERSION;
1579 coroapi.rev = CORO_API_REVISION; 1686 coroapi.rev = CORO_API_REVISION;
1580 coroapi.transfer = api_transfer; 1687 coroapi.transfer = api_transfer;
1581 1688
1582 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 1689 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL));
1583} 1690}
1584 1691
1585SV * 1692SV *
1656 } 1763 }
1657 SPAGAIN; 1764 SPAGAIN;
1658 1765
1659 BARRIER; 1766 BARRIER;
1660 PUTBACK; 1767 PUTBACK;
1661 TRANSFER (ta); 1768 TRANSFER (ta, 0);
1662 SPAGAIN; /* might be the sp of a different coroutine now */ 1769 SPAGAIN; /* might be the sp of a different coroutine now */
1663 /* be extra careful not to ever do anything after TRANSFER */ 1770 /* be extra careful not to ever do anything after TRANSFER */
1664} 1771}
1665 1772
1666bool 1773bool
1669 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv)); 1776 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
1670 OUTPUT: 1777 OUTPUT:
1671 RETVAL 1778 RETVAL
1672 1779
1673void 1780void
1674_exit (code) 1781_exit (int code)
1675 int code
1676 PROTOTYPE: $ 1782 PROTOTYPE: $
1677 CODE: 1783 CODE:
1678 _exit (code); 1784 _exit (code);
1679 1785
1680int 1786int
1714call (Coro::State coro, SV *coderef) 1820call (Coro::State coro, SV *coderef)
1715 ALIAS: 1821 ALIAS:
1716 eval = 1 1822 eval = 1
1717 CODE: 1823 CODE:
1718{ 1824{
1719 if (coro->mainstack) 1825 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
1720 { 1826 {
1721 struct coro temp; 1827 struct coro temp;
1722 1828
1723 if (!(coro->flags & CF_RUNNING)) 1829 if (!(coro->flags & CF_RUNNING))
1724 { 1830 {
1771 1877
1772void 1878void
1773api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 1879api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
1774 1880
1775SV * 1881SV *
1776has_stack (Coro::State coro) 1882has_cctx (Coro::State coro)
1777 PROTOTYPE: $ 1883 PROTOTYPE: $
1778 CODE: 1884 CODE:
1779 RETVAL = boolSV (!!coro->cctx); 1885 RETVAL = boolSV (!!coro->cctx);
1780 OUTPUT: 1886 OUTPUT:
1781 RETVAL 1887 RETVAL
1800 case 1: RETVAL = coro->usecount; break; 1906 case 1: RETVAL = coro->usecount; break;
1801 } 1907 }
1802 OUTPUT: 1908 OUTPUT:
1803 RETVAL 1909 RETVAL
1804 1910
1911void
1912force_cctx ()
1913 CODE:
1914 struct coro *coro = SvSTATE (coro_current);
1915 coro->cctx->idle_sp = 0;
1916
1917void
1918throw (Coro::State self, SV *throw = &PL_sv_undef)
1919 PROTOTYPE: $;$
1920 CODE:
1921 SvREFCNT_dec (self->throw);
1922 self->throw = SvOK (throw) ? newSVsv (throw) : 0;
1923
1924void
1925swap_defsv (Coro::State self)
1926 PROTOTYPE: $
1927 ALIAS:
1928 swap_defav = 1
1929 CODE:
1930 if (!self->slot)
1931 croak ("cannot swap state with coroutine that has no saved state");
1932 else
1933 {
1934 SV **src = ix ? (SV **)&GvAV (PL_defgv) : &GvSV (PL_defgv);
1935 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
1936
1937 SV *tmp = *src; *src = *dst; *dst = tmp;
1938 }
1805 1939
1806MODULE = Coro::State PACKAGE = Coro 1940MODULE = Coro::State PACKAGE = Coro
1807 1941
1808BOOT: 1942BOOT:
1809{ 1943{
1810 int i; 1944 int i;
1811 1945
1946 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
1812 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 1947 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
1813 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 1948 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
1814 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
1815 1949
1816 coro_current = coro_get_sv (aTHX_ "Coro::current", FALSE); 1950 coro_current = coro_get_sv (aTHX_ "Coro::current", FALSE);
1817 SvREADONLY_on (coro_current); 1951 SvREADONLY_on (coro_current);
1818 1952
1819 coro_stash = gv_stashpv ("Coro", TRUE); 1953 coro_stash = gv_stashpv ("Coro", TRUE);
1851 PROTOTYPE: $ 1985 PROTOTYPE: $
1852 CODE: 1986 CODE:
1853 SvREFCNT_dec (SvRV (coro_current)); 1987 SvREFCNT_dec (SvRV (coro_current));
1854 SvRV_set (coro_current, SvREFCNT_inc (SvRV (current))); 1988 SvRV_set (coro_current, SvREFCNT_inc (SvRV (current)));
1855 1989
1990void
1991_set_readyhook (SV *hook)
1992 PROTOTYPE: $
1993 CODE:
1994 LOCK;
1995 SvREFCNT_dec (coro_readyhook);
1996 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0;
1997 UNLOCK;
1998
1856int 1999int
1857prio (Coro::State coro, int newprio = 0) 2000prio (Coro::State coro, int newprio = 0)
1858 ALIAS: 2001 ALIAS:
1859 nice = 1 2002 nice = 1
1860 CODE: 2003 CODE:
1889 CODE: 2032 CODE:
1890 RETVAL = coro_nready; 2033 RETVAL = coro_nready;
1891 OUTPUT: 2034 OUTPUT:
1892 RETVAL 2035 RETVAL
1893 2036
1894void
1895throw (Coro::State self, SV *throw = &PL_sv_undef)
1896 PROTOTYPE: $;$
1897 CODE:
1898 SvREFCNT_dec (self->throw);
1899 self->throw = SvOK (throw) ? newSVsv (throw) : 0;
1900
1901# for async_pool speedup 2037# for async_pool speedup
1902void 2038void
1903_pool_1 (SV *cb) 2039_pool_1 (SV *cb)
1904 CODE: 2040 CODE:
1905{ 2041{
1910 AV *invoke_av; 2046 AV *invoke_av;
1911 int i, len; 2047 int i, len;
1912 2048
1913 if (!invoke) 2049 if (!invoke)
1914 { 2050 {
1915 SvREFCNT_dec (PL_diehook); PL_diehook = 0; 2051 SV *old = PL_diehook;
2052 PL_diehook = 0;
2053 SvREFCNT_dec (old);
1916 croak ("\3async_pool terminate\2\n"); 2054 croak ("\3async_pool terminate\2\n");
1917 } 2055 }
1918 2056
1919 SvREFCNT_dec (coro->saved_deffh); 2057 SvREFCNT_dec (coro->saved_deffh);
1920 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv); 2058 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv);
1949 coro->saved_deffh = 0; 2087 coro->saved_deffh = 0;
1950 2088
1951 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss) 2089 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss)
1952 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2090 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1953 { 2091 {
1954 SvREFCNT_dec (PL_diehook); PL_diehook = 0; 2092 SV *old = PL_diehook;
2093 PL_diehook = 0;
2094 SvREFCNT_dec (old);
1955 croak ("\3async_pool terminate\2\n"); 2095 croak ("\3async_pool terminate\2\n");
1956 } 2096 }
1957 2097
1958 av_clear (GvAV (PL_defgv)); 2098 av_clear (GvAV (PL_defgv));
1959 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1, 2099 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1,
1964 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 2104 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
1965 api_trace (coro_current, 0); 2105 api_trace (coro_current, 0);
1966 2106
1967 av_push (av_async_pool, newSVsv (coro_current)); 2107 av_push (av_async_pool, newSVsv (coro_current));
1968} 2108}
2109
2110#if 0
2111
2112void
2113_generator_call (...)
2114 PROTOTYPE: @
2115 PPCODE:
2116 fprintf (stderr, "call %p\n", CvXSUBANY(cv).any_ptr);
2117 xxxx
2118 abort ();
2119
2120SV *
2121gensub (SV *sub, ...)
2122 PROTOTYPE: &;@
2123 CODE:
2124{
2125 struct coro *coro;
2126 MAGIC *mg;
2127 CV *xcv;
2128 CV *ncv = (CV *)newSV_type (SVt_PVCV);
2129 int i;
2130
2131 CvGV (ncv) = CvGV (cv);
2132 CvFILE (ncv) = CvFILE (cv);
2133
2134 Newz (0, coro, 1, struct coro);
2135 coro->args = newAV ();
2136 coro->flags = CF_NEW;
2137
2138 av_extend (coro->args, items - 1);
2139 for (i = 1; i < items; i++)
2140 av_push (coro->args, newSVsv (ST (i)));
2141
2142 CvISXSUB_on (ncv);
2143 CvXSUBANY (ncv).any_ptr = (void *)coro;
2144
2145 xcv = GvCV (gv_fetchpv ("Coro::_generator_call", 0, SVt_PVCV));
2146
2147 CvXSUB (ncv) = CvXSUB (xcv);
2148 CvANON_on (ncv);
2149
2150 mg = sv_magicext ((SV *)ncv, 0, CORO_MAGIC_type_state, &coro_gensub_vtbl, (char *)coro, 0);
2151 RETVAL = newRV_noinc ((SV *)ncv);
2152}
2153 OUTPUT:
2154 RETVAL
2155
2156#endif
1969 2157
1970 2158
1971MODULE = Coro::State PACKAGE = Coro::AIO 2159MODULE = Coro::State PACKAGE = Coro::AIO
1972 2160
1973SV * 2161SV *
2000 PL_laststype = data->laststype; 2188 PL_laststype = data->laststype;
2001 PL_laststatval = data->laststatval; 2189 PL_laststatval = data->laststatval;
2002 PL_statcache = data->statcache; 2190 PL_statcache = data->statcache;
2003} 2191}
2004 2192
2193
2194MODULE = Coro::State PACKAGE = Coro::AnyEvent
2195
2196BOOT:
2197 sv_activity = coro_get_sv (aTHX_ "Coro::AnyEvent::ACTIVITY", TRUE);
2198
2199SV *
2200_schedule (...)
2201 PROTOTYPE: @
2202 CODE:
2203{
2204 static int incede;
2205
2206 api_cede_notself ();
2207
2208 ++incede;
2209 while (coro_nready >= incede && api_cede ())
2210 ;
2211
2212 sv_setsv (sv_activity, &PL_sv_undef);
2213 if (coro_nready >= incede)
2214 {
2215 PUSHMARK (SP);
2216 PUTBACK;
2217 call_pv ("Coro::AnyEvent::_activity", G_DISCARD | G_EVAL);
2218 SPAGAIN;
2219 }
2220
2221 --incede;
2222}
2223

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines