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.322 by root, Sat Nov 22 05:13:34 2008 UTC vs.
Revision 1.358 by root, Mon Jun 29 04:30:25 2009 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
144#else 144#else
145# define attribute(x) 145# define attribute(x)
146# define expect(expr,value) (expr) 146# define expect(expr,value) (expr)
147# define INLINE static 147# define INLINE static
156#define GCoroAPI (&coroapi) /* very sneaky */ 156#define GCoroAPI (&coroapi) /* very sneaky */
157 157
158#ifdef USE_ITHREADS 158#ifdef USE_ITHREADS
159# if CORO_PTHREAD 159# if CORO_PTHREAD
160static void *coro_thx; 160static void *coro_thx;
161# endif
162#endif
163
164#ifdef __linux
165# include <time.h> /* for timespec */
166# include <syscall.h> /* for SYS_* */
167# ifdef SYS_clock_gettime
168# define coro_clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
169# define CORO_CLOCK_MONOTONIC 1
170# define CORO_CLOCK_THREAD_CPUTIME_ID 3
161# endif 171# endif
162#endif 172#endif
163 173
164static double (*nvtime)(); /* so why doesn't it take void? */ 174static double (*nvtime)(); /* so why doesn't it take void? */
165 175
175static HV *coro_state_stash, *coro_stash; 185static HV *coro_state_stash, *coro_stash;
176static volatile SV *coro_mortal; /* will be freed/thrown after next transfer */ 186static volatile SV *coro_mortal; /* will be freed/thrown after next transfer */
177 187
178static AV *av_destroy; /* destruction queue */ 188static AV *av_destroy; /* destruction queue */
179static SV *sv_manager; /* the manager coro */ 189static SV *sv_manager; /* the manager coro */
190static SV *sv_idle; /* $Coro::idle */
180 191
181static GV *irsgv; /* $/ */ 192static GV *irsgv; /* $/ */
182static GV *stdoutgv; /* *STDOUT */ 193static GV *stdoutgv; /* *STDOUT */
183static SV *rv_diehook; 194static SV *rv_diehook;
184static SV *rv_warnhook; 195static SV *rv_warnhook;
237enum { 248enum {
238 CF_RUNNING = 0x0001, /* coroutine is running */ 249 CF_RUNNING = 0x0001, /* coroutine is running */
239 CF_READY = 0x0002, /* coroutine is ready */ 250 CF_READY = 0x0002, /* coroutine is ready */
240 CF_NEW = 0x0004, /* has never been switched to */ 251 CF_NEW = 0x0004, /* has never been switched to */
241 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 252 CF_DESTROYED = 0x0008, /* coroutine data has been freed */
253 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
242}; 254};
243 255
244/* the structure where most of the perl state is stored, overlaid on the cxstack */ 256/* the structure where most of the perl state is stored, overlaid on the cxstack */
245typedef struct 257typedef struct
246{ 258{
247 SV *defsv; 259 SV *defsv;
248 AV *defav; 260 AV *defav;
249 SV *errsv; 261 SV *errsv;
250 SV *irsgv; 262 SV *irsgv;
263 HV *hinthv;
251#define VAR(name,type) type name; 264#define VAR(name,type) type name;
252# include "state.h" 265# include "state.h"
253#undef VAR 266#undef VAR
254} perl_slots; 267} perl_slots;
255 268
257 270
258/* this is a structure representing a perl-level coroutine */ 271/* this is a structure representing a perl-level coroutine */
259struct coro { 272struct coro {
260 /* the C coroutine allocated to this perl coroutine, if any */ 273 /* the C coroutine allocated to this perl coroutine, if any */
261 coro_cctx *cctx; 274 coro_cctx *cctx;
275
276 /* ready queue */
277 struct coro *next_ready;
262 278
263 /* state data */ 279 /* state data */
264 struct CoroSLF slf_frame; /* saved slf frame */ 280 struct CoroSLF slf_frame; /* saved slf frame */
265 AV *mainstack; 281 AV *mainstack;
266 perl_slots *slot; /* basically the saved sp */ 282 perl_slots *slot; /* basically the saved sp */
283 /* async_pool */ 299 /* async_pool */
284 SV *saved_deffh; 300 SV *saved_deffh;
285 SV *invoke_cb; 301 SV *invoke_cb;
286 AV *invoke_av; 302 AV *invoke_av;
287 303
304 /* on_enter/on_leave */
305 AV *on_enter;
306 AV *on_leave;
307
288 /* linked list */ 308 /* linked list */
289 struct coro *next, *prev; 309 struct coro *next, *prev;
290}; 310};
291 311
292typedef struct coro *Coro__State; 312typedef struct coro *Coro__State;
297/* the mainr easonw e don't support windows process emulation */ 317/* the mainr easonw e don't support windows process emulation */
298static struct CoroSLF slf_frame; /* the current slf frame */ 318static struct CoroSLF slf_frame; /* the current slf frame */
299 319
300/** Coro ********************************************************************/ 320/** Coro ********************************************************************/
301 321
302#define PRIO_MAX 3 322#define CORO_PRIO_MAX 3
303#define PRIO_HIGH 1 323#define CORO_PRIO_HIGH 1
304#define PRIO_NORMAL 0 324#define CORO_PRIO_NORMAL 0
305#define PRIO_LOW -1 325#define CORO_PRIO_LOW -1
306#define PRIO_IDLE -3 326#define CORO_PRIO_IDLE -3
307#define PRIO_MIN -4 327#define CORO_PRIO_MIN -4
308 328
309/* for Coro.pm */ 329/* for Coro.pm */
310static SV *coro_current; 330static SV *coro_current;
311static SV *coro_readyhook; 331static SV *coro_readyhook;
312static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1]; 332static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
313static CV *cv_coro_run, *cv_coro_terminate; 333static CV *cv_coro_run, *cv_coro_terminate;
314static struct coro *coro_first; 334static struct coro *coro_first;
315#define coro_nready coroapi.nready 335#define coro_nready coroapi.nready
316 336
317/** lowlevel stuff **********************************************************/ 337/** lowlevel stuff **********************************************************/
350INLINE CV * 370INLINE CV *
351coro_sv_2cv (pTHX_ SV *sv) 371coro_sv_2cv (pTHX_ SV *sv)
352{ 372{
353 HV *st; 373 HV *st;
354 GV *gvp; 374 GV *gvp;
355 return sv_2cv (sv, &st, &gvp, 0); 375 CV *cv = sv_2cv (sv, &st, &gvp, 0);
376
377 if (!cv)
378 croak ("code reference expected");
379
380 return cv;
356} 381}
382
383/*****************************************************************************/
384/* magic glue */
385
386#define CORO_MAGIC_type_cv 26
387#define CORO_MAGIC_type_state PERL_MAGIC_ext
388
389#define CORO_MAGIC_NN(sv, type) \
390 (expect_true (SvMAGIC (sv)->mg_type == type) \
391 ? SvMAGIC (sv) \
392 : mg_find (sv, type))
393
394#define CORO_MAGIC(sv, type) \
395 (expect_true (SvMAGIC (sv)) \
396 ? CORO_MAGIC_NN (sv, type) \
397 : 0)
398
399#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
400#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
401
402INLINE struct coro *
403SvSTATE_ (pTHX_ SV *coro)
404{
405 HV *stash;
406 MAGIC *mg;
407
408 if (SvROK (coro))
409 coro = SvRV (coro);
410
411 if (expect_false (SvTYPE (coro) != SVt_PVHV))
412 croak ("Coro::State object required");
413
414 stash = SvSTASH (coro);
415 if (expect_false (stash != coro_stash && stash != coro_state_stash))
416 {
417 /* very slow, but rare, check */
418 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
419 croak ("Coro::State object required");
420 }
421
422 mg = CORO_MAGIC_state (coro);
423 return (struct coro *)mg->mg_ptr;
424}
425
426#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
427
428/* faster than SvSTATE, but expects a coroutine hv */
429#define SvSTATE_hv(hv) ((struct coro *)CORO_MAGIC_NN ((SV *)hv, CORO_MAGIC_type_state)->mg_ptr)
430#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
431
432/*****************************************************************************/
433/* padlist management and caching */
357 434
358static AV * 435static AV *
359coro_derive_padlist (pTHX_ CV *cv) 436coro_derive_padlist (pTHX_ CV *cv)
360{ 437{
361 AV *padlist = CvPADLIST (cv); 438 AV *padlist = CvPADLIST (cv);
369 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 446 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
370#endif 447#endif
371 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 448 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
372 --AvFILLp (padlist); 449 --AvFILLp (padlist);
373 450
374 av_store (newpadlist, 0, SvREFCNT_inc_NN (*av_fetch (padlist, 0, FALSE))); 451 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0]));
375 av_store (newpadlist, 1, (SV *)newpad); 452 av_store (newpadlist, 1, (SV *)newpad);
376 453
377 return newpadlist; 454 return newpadlist;
378} 455}
379 456
380static void 457static void
381free_padlist (pTHX_ AV *padlist) 458free_padlist (pTHX_ AV *padlist)
382{ 459{
383 /* may be during global destruction */ 460 /* may be during global destruction */
384 if (SvREFCNT (padlist)) 461 if (!IN_DESTRUCT)
385 { 462 {
386 I32 i = AvFILLp (padlist); 463 I32 i = AvFILLp (padlist);
387 while (i >= 0) 464
465 while (i > 0) /* special-case index 0 */
388 { 466 {
389 SV **svp = av_fetch (padlist, i--, FALSE); 467 /* we try to be extra-careful here */
390 if (svp) 468 AV *av = (AV *)AvARRAY (padlist)[i--];
391 { 469 I32 j = AvFILLp (av);
392 SV *sv; 470
393 while (&PL_sv_undef != (sv = av_pop ((AV *)*svp))) 471 while (j >= 0)
472 SvREFCNT_dec (AvARRAY (av)[j--]);
473
474 AvFILLp (av) = -1;
394 SvREFCNT_dec (sv); 475 SvREFCNT_dec (av);
395
396 SvREFCNT_dec (*svp);
397 }
398 } 476 }
399 477
478 SvREFCNT_dec (AvARRAY (padlist)[0]);
479
480 AvFILLp (padlist) = -1;
400 SvREFCNT_dec ((SV*)padlist); 481 SvREFCNT_dec ((SV*)padlist);
401 } 482 }
402} 483}
403 484
404static int 485static int
405coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 486coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
406{ 487{
407 AV *padlist; 488 AV *padlist;
408 AV *av = (AV *)mg->mg_obj; 489 AV *av = (AV *)mg->mg_obj;
490
491 /* perl manages to free our internal AV and _then_ call us */
492 if (IN_DESTRUCT)
493 return;
409 494
410 /* casting is fun. */ 495 /* casting is fun. */
411 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 496 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
412 free_padlist (aTHX_ padlist); 497 free_padlist (aTHX_ padlist);
413 498
414 SvREFCNT_dec (av); /* sv_magicext increased the refcount */ 499 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
415 500
416 return 0; 501 return 0;
417} 502}
418
419#define CORO_MAGIC_type_cv 26
420#define CORO_MAGIC_type_state PERL_MAGIC_ext
421 503
422static MGVTBL coro_cv_vtbl = { 504static MGVTBL coro_cv_vtbl = {
423 0, 0, 0, 0, 505 0, 0, 0, 0,
424 coro_cv_free 506 coro_cv_free
425}; 507};
426
427#define CORO_MAGIC_NN(sv, type) \
428 (expect_true (SvMAGIC (sv)->mg_type == type) \
429 ? SvMAGIC (sv) \
430 : mg_find (sv, type))
431
432#define CORO_MAGIC(sv, type) \
433 (expect_true (SvMAGIC (sv)) \
434 ? CORO_MAGIC_NN (sv, type) \
435 : 0)
436
437#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
438#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
439
440INLINE struct coro *
441SvSTATE_ (pTHX_ SV *coro)
442{
443 HV *stash;
444 MAGIC *mg;
445
446 if (SvROK (coro))
447 coro = SvRV (coro);
448
449 if (expect_false (SvTYPE (coro) != SVt_PVHV))
450 croak ("Coro::State object required");
451
452 stash = SvSTASH (coro);
453 if (expect_false (stash != coro_stash && stash != coro_state_stash))
454 {
455 /* very slow, but rare, check */
456 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
457 croak ("Coro::State object required");
458 }
459
460 mg = CORO_MAGIC_state (coro);
461 return (struct coro *)mg->mg_ptr;
462}
463
464#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
465
466/* faster than SvSTATE, but expects a coroutine hv */
467#define SvSTATE_hv(hv) ((struct coro *)CORO_MAGIC_NN ((SV *)hv, CORO_MAGIC_type_state)->mg_ptr)
468#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
469 508
470/* the next two functions merely cache the padlists */ 509/* the next two functions merely cache the padlists */
471static void 510static void
472get_padlist (pTHX_ CV *cv) 511get_padlist (pTHX_ CV *cv)
473{ 512{
501 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 540 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
502 541
503 av = (AV *)mg->mg_obj; 542 av = (AV *)mg->mg_obj;
504 543
505 if (expect_false (AvFILLp (av) >= AvMAX (av))) 544 if (expect_false (AvFILLp (av) >= AvMAX (av)))
506 av_extend (av, AvMAX (av) + 1); 545 av_extend (av, AvFILLp (av) + 1);
507 546
508 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 547 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
509} 548}
510 549
511/** load & save, init *******************************************************/ 550/** load & save, init *******************************************************/
551
552static void
553on_enterleave_call (pTHX_ SV *cb);
512 554
513static void 555static void
514load_perl (pTHX_ Coro__State c) 556load_perl (pTHX_ Coro__State c)
515{ 557{
516 perl_slots *slot = c->slot; 558 perl_slots *slot = c->slot;
517 c->slot = 0; 559 c->slot = 0;
518 560
519 PL_mainstack = c->mainstack; 561 PL_mainstack = c->mainstack;
520 562
521 GvSV (PL_defgv) = slot->defsv; 563 GvSV (PL_defgv) = slot->defsv;
522 GvAV (PL_defgv) = slot->defav; 564 GvAV (PL_defgv) = slot->defav;
523 GvSV (PL_errgv) = slot->errsv; 565 GvSV (PL_errgv) = slot->errsv;
524 GvSV (irsgv) = slot->irsgv; 566 GvSV (irsgv) = slot->irsgv;
567 GvHV (PL_hintgv) = slot->hinthv;
525 568
526 #define VAR(name,type) PL_ ## name = slot->name; 569 #define VAR(name,type) PL_ ## name = slot->name;
527 # include "state.h" 570 # include "state.h"
528 #undef VAR 571 #undef VAR
529 572
543 PUTBACK; 586 PUTBACK;
544 } 587 }
545 588
546 slf_frame = c->slf_frame; 589 slf_frame = c->slf_frame;
547 CORO_THROW = c->except; 590 CORO_THROW = c->except;
591
592 if (expect_false (c->on_enter))
593 {
594 int i;
595
596 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
597 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
598 }
548} 599}
549 600
550static void 601static void
551save_perl (pTHX_ Coro__State c) 602save_perl (pTHX_ Coro__State c)
552{ 603{
604 if (expect_false (c->on_leave))
605 {
606 int i;
607
608 for (i = AvFILLp (c->on_leave); i >= 0; --i)
609 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
610 }
611
553 c->except = CORO_THROW; 612 c->except = CORO_THROW;
554 c->slf_frame = slf_frame; 613 c->slf_frame = slf_frame;
555 614
556 { 615 {
557 dSP; 616 dSP;
570 { 629 {
571 while (expect_true (cxix >= 0)) 630 while (expect_true (cxix >= 0))
572 { 631 {
573 PERL_CONTEXT *cx = &ccstk[cxix--]; 632 PERL_CONTEXT *cx = &ccstk[cxix--];
574 633
575 if (expect_true (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT)) 634 if (expect_true (CxTYPE (cx) == CXt_SUB) || expect_false (CxTYPE (cx) == CXt_FORMAT))
576 { 635 {
577 CV *cv = cx->blk_sub.cv; 636 CV *cv = cx->blk_sub.cv;
578 637
579 if (expect_true (CvDEPTH (cv))) 638 if (expect_true (CvDEPTH (cv)))
580 { 639 {
615 c->mainstack = PL_mainstack; 674 c->mainstack = PL_mainstack;
616 675
617 { 676 {
618 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 677 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
619 678
620 slot->defav = GvAV (PL_defgv); 679 slot->defav = GvAV (PL_defgv);
621 slot->defsv = DEFSV; 680 slot->defsv = DEFSV;
622 slot->errsv = ERRSV; 681 slot->errsv = ERRSV;
623 slot->irsgv = GvSV (irsgv); 682 slot->irsgv = GvSV (irsgv);
683 slot->hinthv = GvHV (PL_hintgv);
624 684
625 #define VAR(name,type) slot->name = PL_ ## name; 685 #define VAR(name,type) slot->name = PL_ ## name;
626 # include "state.h" 686 # include "state.h"
627 #undef VAR 687 #undef VAR
628 } 688 }
755#endif 815#endif
756 816
757/* 817/*
758 * This overrides the default magic get method of %SIG elements. 818 * This overrides the default magic get method of %SIG elements.
759 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook 819 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
760 * and instead of tryign to save and restore the hash elements, we just provide 820 * and instead of trying to save and restore the hash elements, we just provide
761 * readback here. 821 * readback here.
762 * We only do this when the hook is != 0, as they are often set to 0 temporarily,
763 * not expecting this to actually change the hook. This is a potential problem
764 * when a schedule happens then, but we ignore this.
765 */ 822 */
766static int 823static int
767coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 824coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
768{ 825{
769 const char *s = MgPV_nolen_const (mg); 826 const char *s = MgPV_nolen_const (mg);
822 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 879 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
823 880
824 if (svp) 881 if (svp)
825 { 882 {
826 SV *old = *svp; 883 SV *old = *svp;
827 *svp = newSVsv (sv); 884 *svp = SvOK (sv) ? newSVsv (sv) : 0;
828 SvREFCNT_dec (old); 885 SvREFCNT_dec (old);
829 return 0; 886 return 0;
830 } 887 }
831 } 888 }
832 889
864 921
865 PL_runops = RUNOPS_DEFAULT; 922 PL_runops = RUNOPS_DEFAULT;
866 PL_curcop = &PL_compiling; 923 PL_curcop = &PL_compiling;
867 PL_in_eval = EVAL_NULL; 924 PL_in_eval = EVAL_NULL;
868 PL_comppad = 0; 925 PL_comppad = 0;
926 PL_comppad_name = 0;
927 PL_comppad_name_fill = 0;
928 PL_comppad_name_floor = 0;
869 PL_curpm = 0; 929 PL_curpm = 0;
870 PL_curpad = 0; 930 PL_curpad = 0;
871 PL_localizing = 0; 931 PL_localizing = 0;
872 PL_dirty = 0; 932 PL_dirty = 0;
873 PL_restartop = 0; 933 PL_restartop = 0;
874#if PERL_VERSION_ATLEAST (5,10,0) 934#if PERL_VERSION_ATLEAST (5,10,0)
875 PL_parser = 0; 935 PL_parser = 0;
876#endif 936#endif
937 PL_hints = 0;
877 938
878 /* recreate the die/warn hooks */ 939 /* recreate the die/warn hooks */
879 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 940 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook );
880 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 941 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook);
881 942
882 GvSV (PL_defgv) = newSV (0); 943 GvSV (PL_defgv) = newSV (0);
883 GvAV (PL_defgv) = coro->args; coro->args = 0; 944 GvAV (PL_defgv) = coro->args; coro->args = 0;
884 GvSV (PL_errgv) = newSV (0); 945 GvSV (PL_errgv) = newSV (0);
885 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 946 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
947 GvHV (PL_hintgv) = 0;
886 PL_rs = newSVsv (GvSV (irsgv)); 948 PL_rs = newSVsv (GvSV (irsgv));
887 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 949 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
888 950
889 { 951 {
890 dSP; 952 dSP;
919 /* copy throw, in case it was set before coro_setup */ 981 /* copy throw, in case it was set before coro_setup */
920 CORO_THROW = coro->except; 982 CORO_THROW = coro->except;
921} 983}
922 984
923static void 985static void
924coro_destruct (pTHX_ struct coro *coro) 986coro_unwind_stacks (pTHX)
925{ 987{
926 if (!IN_DESTRUCT) 988 if (!IN_DESTRUCT)
927 { 989 {
928 /* restore all saved variables and stuff */ 990 /* restore all saved variables and stuff */
929 LEAVE_SCOPE (0); 991 LEAVE_SCOPE (0);
937 POPSTACK_TO (PL_mainstack); 999 POPSTACK_TO (PL_mainstack);
938 1000
939 /* unwind main stack */ 1001 /* unwind main stack */
940 dounwind (-1); 1002 dounwind (-1);
941 } 1003 }
1004}
942 1005
943 SvREFCNT_dec (GvSV (PL_defgv)); 1006static void
944 SvREFCNT_dec (GvAV (PL_defgv)); 1007coro_destruct_perl (pTHX_ struct coro *coro)
945 SvREFCNT_dec (GvSV (PL_errgv)); 1008{
946 SvREFCNT_dec (PL_defoutgv); 1009 SV *svf [9];
947 SvREFCNT_dec (PL_rs);
948 SvREFCNT_dec (GvSV (irsgv));
949 1010
950 SvREFCNT_dec (PL_diehook);
951 SvREFCNT_dec (PL_warnhook);
952 1011 {
1012 struct coro *current = SvSTATE_current;
1013
1014 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1015
1016 save_perl (aTHX_ current);
1017 load_perl (aTHX_ coro);
1018
1019 coro_unwind_stacks (aTHX);
1020 coro_destruct_stacks (aTHX);
1021
1022 // now save some sv's to be free'd later
1023 svf [0] = GvSV (PL_defgv);
1024 svf [1] = (SV *)GvAV (PL_defgv);
1025 svf [2] = GvSV (PL_errgv);
1026 svf [3] = (SV *)PL_defoutgv;
1027 svf [4] = PL_rs;
1028 svf [5] = GvSV (irsgv);
1029 svf [6] = (SV *)GvHV (PL_hintgv);
1030 svf [7] = PL_diehook;
1031 svf [8] = PL_warnhook;
1032 assert (9 == sizeof (svf) / sizeof (*svf));
1033
1034 load_perl (aTHX_ current);
1035 }
1036
1037 {
1038 int i;
1039
1040 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i)
1041 SvREFCNT_dec (svf [i]);
1042
953 SvREFCNT_dec (coro->saved_deffh); 1043 SvREFCNT_dec (coro->saved_deffh);
954 SvREFCNT_dec (coro->rouse_cb); 1044 SvREFCNT_dec (coro->rouse_cb);
955 SvREFCNT_dec (coro->invoke_cb); 1045 SvREFCNT_dec (coro->invoke_cb);
956 SvREFCNT_dec (coro->invoke_av); 1046 SvREFCNT_dec (coro->invoke_av);
957 1047 }
958 coro_destruct_stacks (aTHX);
959} 1048}
960 1049
961INLINE void 1050INLINE void
962free_coro_mortal (pTHX) 1051free_coro_mortal (pTHX)
963{ 1052{
971static int 1060static int
972runops_trace (pTHX) 1061runops_trace (pTHX)
973{ 1062{
974 COP *oldcop = 0; 1063 COP *oldcop = 0;
975 int oldcxix = -2; 1064 int oldcxix = -2;
976 struct coro *coro = SvSTATE_current; /* trace cctx is tied to specific coro */
977 coro_cctx *cctx = coro->cctx;
978 1065
979 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX))) 1066 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX)))
980 { 1067 {
981 PERL_ASYNC_CHECK (); 1068 PERL_ASYNC_CHECK ();
982 1069
983 if (cctx->flags & CC_TRACE_ALL) 1070 if (cctx_current->flags & CC_TRACE_ALL)
984 { 1071 {
985 if (PL_op->op_type == OP_LEAVESUB && cctx->flags & CC_TRACE_SUB) 1072 if (PL_op->op_type == OP_LEAVESUB && cctx_current->flags & CC_TRACE_SUB)
986 { 1073 {
987 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1074 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
988 SV **bot, **top; 1075 SV **bot, **top;
989 AV *av = newAV (); /* return values */ 1076 AV *av = newAV (); /* return values */
990 SV **cb; 1077 SV **cb;
1027 1114
1028 if (PL_curcop != &PL_compiling) 1115 if (PL_curcop != &PL_compiling)
1029 { 1116 {
1030 SV **cb; 1117 SV **cb;
1031 1118
1032 if (oldcxix != cxstack_ix && cctx->flags & CC_TRACE_SUB) 1119 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB)
1033 { 1120 {
1034 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1121 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1035 1122
1036 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1123 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1037 { 1124 {
1060 } 1147 }
1061 1148
1062 oldcxix = cxstack_ix; 1149 oldcxix = cxstack_ix;
1063 } 1150 }
1064 1151
1065 if (cctx->flags & CC_TRACE_LINE) 1152 if (cctx_current->flags & CC_TRACE_LINE)
1066 { 1153 {
1067 dSP; 1154 dSP;
1068 1155
1069 PL_runops = RUNOPS_DEFAULT; 1156 PL_runops = RUNOPS_DEFAULT;
1070 ENTER; 1157 ENTER;
1170 /* 1257 /*
1171 * If perl-run returns we assume exit() was being called or the coro 1258 * If perl-run returns we assume exit() was being called or the coro
1172 * fell off the end, which seems to be the only valid (non-bug) 1259 * fell off the end, which seems to be the only valid (non-bug)
1173 * reason for perl_run to return. We try to exit by jumping to the 1260 * reason for perl_run to return. We try to exit by jumping to the
1174 * bootstrap-time "top" top_env, as we cannot restore the "main" 1261 * bootstrap-time "top" top_env, as we cannot restore the "main"
1175 * coroutine as Coro has no such concept 1262 * coroutine as Coro has no such concept.
1263 * This actually isn't valid with the pthread backend, but OSes requiring
1264 * that backend are too broken to do it in a standards-compliant way.
1176 */ 1265 */
1177 PL_top_env = main_top_env; 1266 PL_top_env = main_top_env;
1178 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */ 1267 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1179 } 1268 }
1180} 1269}
1257cctx_destroy (coro_cctx *cctx) 1346cctx_destroy (coro_cctx *cctx)
1258{ 1347{
1259 if (!cctx) 1348 if (!cctx)
1260 return; 1349 return;
1261 1350
1262 assert (cctx != cctx_current);//D temporary 1351 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary?
1263 1352
1264 --cctx_count; 1353 --cctx_count;
1265 coro_destroy (&cctx->cctx); 1354 coro_destroy (&cctx->cctx);
1266 1355
1267 /* coro_transfer creates new, empty cctx's */ 1356 /* coro_transfer creates new, empty cctx's */
1331 /* TODO: throwing up here is considered harmful */ 1420 /* TODO: throwing up here is considered harmful */
1332 1421
1333 if (expect_true (prev != next)) 1422 if (expect_true (prev != next))
1334 { 1423 {
1335 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1424 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1336 croak ("Coro::State::transfer called with non-running/new prev Coro::State, but can only transfer from running or new states,"); 1425 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1337 1426
1338 if (expect_false (next->flags & CF_RUNNING))
1339 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states,");
1340
1341 if (expect_false (next->flags & CF_DESTROYED)) 1427 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED)))
1342 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states,"); 1428 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1343 1429
1344#if !PERL_VERSION_ATLEAST (5,10,0) 1430#if !PERL_VERSION_ATLEAST (5,10,0)
1345 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1431 if (expect_false (PL_lex_state != LEX_NOTPARSING))
1346 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,"); 1432 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1347#endif 1433#endif
1395 )) 1481 ))
1396 { 1482 {
1397 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1483 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */
1398 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te)); 1484 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1399 1485
1400 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */ 1486 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */
1401 /* without this the next cctx_get might destroy the prev__cctx while still in use */ 1487 /* without this the next cctx_get might destroy the running cctx while still in use */
1402 if (expect_false (CCTX_EXPIRED (cctx_current))) 1488 if (expect_false (CCTX_EXPIRED (cctx_current)))
1403 if (!next->cctx) 1489 if (expect_true (!next->cctx))
1404 next->cctx = cctx_get (aTHX); 1490 next->cctx = cctx_get (aTHX);
1405 1491
1406 cctx_put (cctx_current); 1492 cctx_put (cctx_current);
1407 assert (!prev->cctx);//D temporary
1408 } 1493 }
1409 else 1494 else
1410 prev->cctx = cctx_current; 1495 prev->cctx = cctx_current;
1411 1496
1412 ++next->usecount; 1497 ++next->usecount;
1436coro_state_destroy (pTHX_ struct coro *coro) 1521coro_state_destroy (pTHX_ struct coro *coro)
1437{ 1522{
1438 if (coro->flags & CF_DESTROYED) 1523 if (coro->flags & CF_DESTROYED)
1439 return 0; 1524 return 0;
1440 1525
1441 if (coro->on_destroy) 1526 if (coro->on_destroy && !PL_dirty)
1442 coro->on_destroy (aTHX_ coro); 1527 coro->on_destroy (aTHX_ coro);
1443 1528
1444 coro->flags |= CF_DESTROYED; 1529 coro->flags |= CF_DESTROYED;
1445 1530
1446 if (coro->flags & CF_READY) 1531 if (coro->flags & CF_READY)
1450 --coro_nready; 1535 --coro_nready;
1451 } 1536 }
1452 else 1537 else
1453 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1538 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1454 1539
1455 if (coro->mainstack && coro->mainstack != main_mainstack) 1540 if (coro->mainstack
1456 { 1541 && coro->mainstack != main_mainstack
1457 struct coro temp; 1542 && coro->slot
1458 1543 && !PL_dirty)
1459 assert (("FATAL: tried to destroy currently running coroutine (please report)", !(coro->flags & CF_RUNNING)));
1460
1461 save_perl (aTHX_ &temp);
1462 load_perl (aTHX_ coro);
1463
1464 coro_destruct (aTHX_ coro); 1544 coro_destruct_perl (aTHX_ coro);
1465
1466 load_perl (aTHX_ &temp);
1467
1468 coro->slot = 0;
1469 }
1470 1545
1471 cctx_destroy (coro->cctx); 1546 cctx_destroy (coro->cctx);
1472 SvREFCNT_dec (coro->startcv); 1547 SvREFCNT_dec (coro->startcv);
1473 SvREFCNT_dec (coro->args); 1548 SvREFCNT_dec (coro->args);
1474 SvREFCNT_dec (CORO_THROW); 1549 SvREFCNT_dec (CORO_THROW);
1561/** Coro ********************************************************************/ 1636/** Coro ********************************************************************/
1562 1637
1563INLINE void 1638INLINE void
1564coro_enq (pTHX_ struct coro *coro) 1639coro_enq (pTHX_ struct coro *coro)
1565{ 1640{
1566 av_push (coro_ready [coro->prio - PRIO_MIN], SvREFCNT_inc_NN (coro->hv)); 1641 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1567}
1568 1642
1569INLINE SV * 1643 SvREFCNT_inc_NN (coro->hv);
1644
1645 coro->next_ready = 0;
1646 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1647 ready [1] = coro;
1648}
1649
1650INLINE struct coro *
1570coro_deq (pTHX) 1651coro_deq (pTHX)
1571{ 1652{
1572 int prio; 1653 int prio;
1573 1654
1574 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; ) 1655 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
1575 if (AvFILLp (coro_ready [prio]) >= 0) 1656 {
1576 return av_shift (coro_ready [prio]); 1657 struct coro **ready = coro_ready [prio];
1658
1659 if (ready [0])
1660 {
1661 struct coro *coro = ready [0];
1662 ready [0] = coro->next_ready;
1663 return coro;
1664 }
1665 }
1577 1666
1578 return 0; 1667 return 0;
1579} 1668}
1580 1669
1581static int 1670static int
1583{ 1672{
1584 struct coro *coro; 1673 struct coro *coro;
1585 SV *sv_hook; 1674 SV *sv_hook;
1586 void (*xs_hook)(void); 1675 void (*xs_hook)(void);
1587 1676
1588 if (SvROK (coro_sv))
1589 coro_sv = SvRV (coro_sv);
1590
1591 coro = SvSTATE (coro_sv); 1677 coro = SvSTATE (coro_sv);
1592 1678
1593 if (coro->flags & CF_READY) 1679 if (coro->flags & CF_READY)
1594 return 0; 1680 return 0;
1595 1681
1648static void 1734static void
1649prepare_schedule (pTHX_ struct coro_transfer_args *ta) 1735prepare_schedule (pTHX_ struct coro_transfer_args *ta)
1650{ 1736{
1651 for (;;) 1737 for (;;)
1652 { 1738 {
1653 SV *next_sv = coro_deq (aTHX); 1739 struct coro *next = coro_deq (aTHX);
1654 1740
1655 if (expect_true (next_sv)) 1741 if (expect_true (next))
1656 { 1742 {
1657 struct coro *next = SvSTATE_hv (next_sv);
1658
1659 /* cannot transfer to destroyed coros, skip and look for next */ 1743 /* cannot transfer to destroyed coros, skip and look for next */
1660 if (expect_false (next->flags & CF_DESTROYED)) 1744 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED)))
1661 SvREFCNT_dec (next_sv); /* coro_nready has already been taken care of by destroy */ 1745 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1662 else 1746 else
1663 { 1747 {
1664 next->flags &= ~CF_READY; 1748 next->flags &= ~CF_READY;
1665 --coro_nready; 1749 --coro_nready;
1666 1750
1669 } 1753 }
1670 } 1754 }
1671 else 1755 else
1672 { 1756 {
1673 /* nothing to schedule: call the idle handler */ 1757 /* nothing to schedule: call the idle handler */
1758 if (SvROK (sv_idle)
1759 && SvOBJECT (SvRV (sv_idle)))
1760 {
1761 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1762 api_ready (aTHX_ SvRV (sv_idle));
1763 --coro_nready;
1764 }
1765 else
1766 {
1674 dSP; 1767 dSP;
1675 1768
1676 ENTER; 1769 ENTER;
1677 SAVETMPS; 1770 SAVETMPS;
1678 1771
1679 PUSHMARK (SP); 1772 PUSHMARK (SP);
1680 PUTBACK; 1773 PUTBACK;
1681 call_sv (get_sv ("Coro::idle", FALSE), G_VOID | G_DISCARD); 1774 call_sv (sv_idle, G_VOID | G_DISCARD);
1682 1775
1683 FREETMPS; 1776 FREETMPS;
1684 LEAVE; 1777 LEAVE;
1778 }
1685 } 1779 }
1686 } 1780 }
1687} 1781}
1688 1782
1689INLINE void 1783INLINE void
1760static void 1854static void
1761api_trace (pTHX_ SV *coro_sv, int flags) 1855api_trace (pTHX_ SV *coro_sv, int flags)
1762{ 1856{
1763 struct coro *coro = SvSTATE (coro_sv); 1857 struct coro *coro = SvSTATE (coro_sv);
1764 1858
1859 if (coro->flags & CF_RUNNING)
1860 croak ("cannot enable tracing on a running coroutine, caught");
1861
1765 if (flags & CC_TRACE) 1862 if (flags & CC_TRACE)
1766 { 1863 {
1767 if (!coro->cctx) 1864 if (!coro->cctx)
1768 coro->cctx = cctx_new_run (); 1865 coro->cctx = cctx_new_run ();
1769 else if (!(coro->cctx->flags & CC_TRACE)) 1866 else if (!(coro->cctx->flags & CC_TRACE))
1770 croak ("cannot enable tracing on coroutine with custom stack,"); 1867 croak ("cannot enable tracing on coroutine with custom stack, caught");
1771 1868
1772 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL)); 1869 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL));
1773 } 1870 }
1774 else if (coro->cctx && coro->cctx->flags & CC_TRACE) 1871 else if (coro->cctx && coro->cctx->flags & CC_TRACE)
1775 { 1872 {
1831 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */ 1928 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */
1832 api_ready (aTHX_ sv_manager); 1929 api_ready (aTHX_ sv_manager);
1833 1930
1834 frame->prepare = prepare_schedule; 1931 frame->prepare = prepare_schedule;
1835 frame->check = slf_check_repeat; 1932 frame->check = slf_check_repeat;
1933
1934 /* as a minor optimisation, we could unwind all stacks here */
1935 /* but that puts extra pressure on pp_slf, and is not worth much */
1936 /*coro_unwind_stacks (aTHX);*/
1836} 1937}
1837 1938
1838/*****************************************************************************/ 1939/*****************************************************************************/
1839/* async pool handler */ 1940/* async pool handler */
1840 1941
1923 SV *data = (SV *)GENSUB_ARG; 2024 SV *data = (SV *)GENSUB_ARG;
1924 2025
1925 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2026 if (SvTYPE (SvRV (data)) != SVt_PVAV)
1926 { 2027 {
1927 /* first call, set args */ 2028 /* first call, set args */
2029 SV *coro = SvRV (data);
1928 AV *av = newAV (); 2030 AV *av = newAV ();
1929 SV *coro = SvRV (data);
1930 2031
1931 SvRV_set (data, (SV *)av); 2032 SvRV_set (data, (SV *)av);
1932 api_ready (aTHX_ coro);
1933 SvREFCNT_dec (coro);
1934 2033
1935 /* better take a full copy of the arguments */ 2034 /* better take a full copy of the arguments */
1936 while (items--) 2035 while (items--)
1937 av_store (av, items, newSVsv (ST (items))); 2036 av_store (av, items, newSVsv (ST (items)));
2037
2038 api_ready (aTHX_ coro);
2039 SvREFCNT_dec (coro);
1938 } 2040 }
1939 2041
1940 XSRETURN_EMPTY; 2042 XSRETURN_EMPTY;
1941} 2043}
1942 2044
1959 2061
1960 EXTEND (SP, AvFILLp (av) + 1); 2062 EXTEND (SP, AvFILLp (av) + 1);
1961 for (i = 0; i <= AvFILLp (av); ++i) 2063 for (i = 0; i <= AvFILLp (av); ++i)
1962 PUSHs (sv_2mortal (AvARRAY (av)[i])); 2064 PUSHs (sv_2mortal (AvARRAY (av)[i]));
1963 2065
1964 /* we have stolen the elements, so ste length to zero and free */ 2066 /* we have stolen the elements, so set length to zero and free */
1965 AvFILLp (av) = -1; 2067 AvFILLp (av) = -1;
1966 av_undef (av); 2068 av_undef (av);
1967 2069
1968 PUTBACK; 2070 PUTBACK;
1969 } 2071 }
2259 2361
2260 PL_op->op_ppaddr = pp_slf; 2362 PL_op->op_ppaddr = pp_slf;
2261 /*PL_op->op_type = OP_CUSTOM; /* we do behave like entersub still */ 2363 /*PL_op->op_type = OP_CUSTOM; /* we do behave like entersub still */
2262 2364
2263 PL_op = (OP *)&slf_restore; 2365 PL_op = (OP *)&slf_restore;
2366}
2367
2368/*****************************************************************************/
2369/* dynamic wind */
2370
2371static void
2372on_enterleave_call (pTHX_ SV *cb)
2373{
2374 dSP;
2375
2376 PUSHSTACK;
2377
2378 PUSHMARK (SP);
2379 PUTBACK;
2380 call_sv (cb, G_VOID | G_DISCARD);
2381 SPAGAIN;
2382
2383 POPSTACK;
2384}
2385
2386static SV *
2387coro_avp_pop_and_free (pTHX_ AV **avp)
2388{
2389 AV *av = *avp;
2390 SV *res = av_pop (av);
2391
2392 if (AvFILLp (av) < 0)
2393 {
2394 *avp = 0;
2395 SvREFCNT_dec (av);
2396 }
2397
2398 return res;
2399}
2400
2401static void
2402coro_pop_on_enter (pTHX_ void *coro)
2403{
2404 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_enter);
2405 SvREFCNT_dec (cb);
2406}
2407
2408static void
2409coro_pop_on_leave (pTHX_ void *coro)
2410{
2411 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2412 on_enterleave_call (aTHX_ sv_2mortal (cb));
2264} 2413}
2265 2414
2266/*****************************************************************************/ 2415/*****************************************************************************/
2267/* PerlIO::cede */ 2416/* PerlIO::cede */
2268 2417
2342/* Coro::Semaphore & Coro::Signal */ 2491/* Coro::Semaphore & Coro::Signal */
2343 2492
2344static SV * 2493static SV *
2345coro_waitarray_new (pTHX_ int count) 2494coro_waitarray_new (pTHX_ int count)
2346{ 2495{
2347 /* a semaphore contains a counter IV in $sem->[0] and any waiters after that */ 2496 /* a waitarray=semaphore contains a counter IV in $sem->[0] and any waiters after that */
2348 AV *av = newAV (); 2497 AV *av = newAV ();
2349 SV **ary; 2498 SV **ary;
2350 2499
2351 /* unfortunately, building manually saves memory */ 2500 /* unfortunately, building manually saves memory */
2352 Newx (ary, 2, SV *); 2501 Newx (ary, 2, SV *);
2353 AvALLOC (av) = ary; 2502 AvALLOC (av) = ary;
2503#if PERL_VERSION_ATLEAST (5,10,0)
2354 /*AvARRAY (av) = ary;*/ 2504 AvARRAY (av) = ary;
2505#else
2355 SvPVX ((SV *)av) = (char *)ary; /* 5.8.8 needs this syntax instead of AvARRAY = ary */ 2506 /* 5.8.8 needs this syntax instead of AvARRAY = ary, yet */
2507 /* -DDEBUGGING flags this as a bug, despite it perfectly working */
2508 SvPVX ((SV *)av) = (char *)ary;
2509#endif
2356 AvMAX (av) = 1; 2510 AvMAX (av) = 1;
2357 AvFILLp (av) = 0; 2511 AvFILLp (av) = 0;
2358 ary [0] = newSViv (count); 2512 ary [0] = newSViv (count);
2359 2513
2360 return newRV_noinc ((SV *)av); 2514 return newRV_noinc ((SV *)av);
2491 { 2645 {
2492 /* callback form */ 2646 /* callback form */
2493 AV *av = (AV *)SvRV (arg [0]); 2647 AV *av = (AV *)SvRV (arg [0]);
2494 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 2648 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]);
2495 2649
2496 av_push (av, (SV *)SvREFCNT_inc_NN (cb_cv)); 2650 av_push (av, SvREFCNT_inc_NN (cb_cv));
2497 2651
2498 if (SvIVX (AvARRAY (av)[0]) > 0) 2652 if (SvIVX (AvARRAY (av)[0]) > 0)
2499 coro_semaphore_adjust (aTHX_ av, 0); 2653 coro_semaphore_adjust (aTHX_ av, 0);
2500 2654
2501 frame->prepare = prepare_nop; 2655 frame->prepare = prepare_nop;
2525 AvARRAY (av)[0] = AvARRAY (av)[1]; 2679 AvARRAY (av)[0] = AvARRAY (av)[1];
2526 AvARRAY (av)[1] = cb; 2680 AvARRAY (av)[1] = cb;
2527 2681
2528 cb = av_shift (av); 2682 cb = av_shift (av);
2529 2683
2684 if (SvTYPE (cb) == SVt_PVCV)
2685 {
2686 dSP;
2687 PUSHMARK (SP);
2688 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2689 PUTBACK;
2690 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2691 }
2692 else
2693 {
2530 api_ready (aTHX_ cb); 2694 api_ready (aTHX_ cb);
2531 sv_setiv (cb, 0); /* signal waiter */ 2695 sv_setiv (cb, 0); /* signal waiter */
2696 }
2697
2532 SvREFCNT_dec (cb); 2698 SvREFCNT_dec (cb);
2533 2699
2534 --count; 2700 --count;
2535 } 2701 }
2536} 2702}
2545static void 2711static void
2546slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2712slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2547{ 2713{
2548 AV *av = (AV *)SvRV (arg [0]); 2714 AV *av = (AV *)SvRV (arg [0]);
2549 2715
2716 if (items >= 2)
2717 {
2718 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]);
2719 av_push (av, SvREFCNT_inc_NN (cb_cv));
2720
2550 if (SvIVX (AvARRAY (av)[0])) 2721 if (SvIVX (AvARRAY (av)[0]))
2722 coro_signal_wake (aTHX_ av, 1); /* ust be the only waiter */
2723
2724 frame->prepare = prepare_nop;
2725 frame->check = slf_check_nop;
2726 }
2727 else if (SvIVX (AvARRAY (av)[0]))
2551 { 2728 {
2552 SvIVX (AvARRAY (av)[0]) = 0; 2729 SvIVX (AvARRAY (av)[0]) = 0;
2553 frame->prepare = prepare_nop; 2730 frame->prepare = prepare_nop;
2554 frame->check = slf_check_nop; 2731 frame->check = slf_check_nop;
2555 } 2732 }
2556 else 2733 else
2557 { 2734 {
2558 SV *waiter = newRV_inc (SvRV (coro_current)); /* owned by signal av */ 2735 SV *waiter = newSVsv (coro_current); /* owned by signal av */
2559 2736
2560 av_push (av, waiter); 2737 av_push (av, waiter);
2561 2738
2562 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */ 2739 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */
2563 frame->prepare = prepare_schedule; 2740 frame->prepare = prepare_schedule;
2804 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer"); 2981 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
2805 2982
2806 nvtime = INT2PTR (double (*)(), SvIV (*svp)); 2983 nvtime = INT2PTR (double (*)(), SvIV (*svp));
2807 } 2984 }
2808 2985
2809 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 2986 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
2810} 2987}
2811 2988
2812SV * 2989SV *
2813new (char *klass, ...) 2990new (char *klass, ...)
2814 ALIAS: 2991 ALIAS:
2889SV * 3066SV *
2890clone (Coro::State coro) 3067clone (Coro::State coro)
2891 CODE: 3068 CODE:
2892{ 3069{
2893#if CORO_CLONE 3070#if CORO_CLONE
2894 struct coro *ncoro = coro_clone (coro); 3071 struct coro *ncoro = coro_clone (aTHX_ coro);
2895 MAGIC *mg; 3072 MAGIC *mg;
2896 /* TODO: too much duplication */ 3073 /* TODO: too much duplication */
2897 ncoro->hv = newHV (); 3074 ncoro->hv = newHV ();
2898 mg = sv_magicext ((SV *)ncoro->hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)ncoro, 0); 3075 mg = sv_magicext ((SV *)ncoro->hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)ncoro, 0);
2899 mg->mg_flags |= MGf_DUP; 3076 mg->mg_flags |= MGf_DUP;
2961 eval = 1 3138 eval = 1
2962 CODE: 3139 CODE:
2963{ 3140{
2964 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3141 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
2965 { 3142 {
2966 struct coro temp; 3143 struct coro *current = SvSTATE_current;
2967 3144
2968 if (!(coro->flags & CF_RUNNING)) 3145 if (current != coro)
2969 { 3146 {
2970 PUTBACK; 3147 PUTBACK;
2971 save_perl (aTHX_ &temp); 3148 save_perl (aTHX_ current);
2972 load_perl (aTHX_ coro); 3149 load_perl (aTHX_ coro);
3150 SPAGAIN;
2973 } 3151 }
2974 3152
2975 {
2976 dSP;
2977 ENTER;
2978 SAVETMPS;
2979 PUTBACK;
2980 PUSHSTACK; 3153 PUSHSTACK;
3154
2981 PUSHMARK (SP); 3155 PUSHMARK (SP);
3156 PUTBACK;
2982 3157
2983 if (ix) 3158 if (ix)
2984 eval_sv (coderef, 0); 3159 eval_sv (coderef, 0);
2985 else 3160 else
2986 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 3161 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
2987 3162
2988 POPSTACK; 3163 POPSTACK;
2989 SPAGAIN; 3164 SPAGAIN;
2990 FREETMPS;
2991 LEAVE;
2992 PUTBACK;
2993 }
2994 3165
2995 if (!(coro->flags & CF_RUNNING)) 3166 if (current != coro)
2996 { 3167 {
3168 PUTBACK;
2997 save_perl (aTHX_ coro); 3169 save_perl (aTHX_ coro);
2998 load_perl (aTHX_ &temp); 3170 load_perl (aTHX_ current);
2999 SPAGAIN; 3171 SPAGAIN;
3000 } 3172 }
3001 } 3173 }
3002} 3174}
3003 3175
3007 ALIAS: 3179 ALIAS:
3008 is_ready = CF_READY 3180 is_ready = CF_READY
3009 is_running = CF_RUNNING 3181 is_running = CF_RUNNING
3010 is_new = CF_NEW 3182 is_new = CF_NEW
3011 is_destroyed = CF_DESTROYED 3183 is_destroyed = CF_DESTROYED
3184 is_suspended = CF_SUSPENDED
3012 CODE: 3185 CODE:
3013 RETVAL = boolSV (coro->flags & ix); 3186 RETVAL = boolSV (coro->flags & ix);
3014 OUTPUT: 3187 OUTPUT:
3015 RETVAL 3188 RETVAL
3016 3189
3020 CODE: 3193 CODE:
3021{ 3194{
3022 struct coro *current = SvSTATE_current; 3195 struct coro *current = SvSTATE_current;
3023 SV **throwp = self == current ? &CORO_THROW : &self->except; 3196 SV **throwp = self == current ? &CORO_THROW : &self->except;
3024 SvREFCNT_dec (*throwp); 3197 SvREFCNT_dec (*throwp);
3198 SvGETMAGIC (throw);
3025 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3199 *throwp = SvOK (throw) ? newSVsv (throw) : 0;
3026} 3200}
3027 3201
3028void 3202void
3029api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3203api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3032 3206
3033SV * 3207SV *
3034has_cctx (Coro::State coro) 3208has_cctx (Coro::State coro)
3035 PROTOTYPE: $ 3209 PROTOTYPE: $
3036 CODE: 3210 CODE:
3037 RETVAL = boolSV (!!coro->cctx); 3211 /* maybe manage the running flag differently */
3212 RETVAL = boolSV (!!coro->cctx || (coro->flags & CF_RUNNING));
3038 OUTPUT: 3213 OUTPUT:
3039 RETVAL 3214 RETVAL
3040 3215
3041int 3216int
3042is_traced (Coro::State coro) 3217is_traced (Coro::State coro)
3062 3237
3063void 3238void
3064force_cctx () 3239force_cctx ()
3065 PROTOTYPE: 3240 PROTOTYPE:
3066 CODE: 3241 CODE:
3067 SvSTATE_current->cctx->idle_sp = 0; 3242 cctx_current->idle_sp = 0;
3068 3243
3069void 3244void
3070swap_defsv (Coro::State self) 3245swap_defsv (Coro::State self)
3071 PROTOTYPE: $ 3246 PROTOTYPE: $
3072 ALIAS: 3247 ALIAS:
3080 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv; 3255 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
3081 3256
3082 SV *tmp = *src; *src = *dst; *dst = tmp; 3257 SV *tmp = *src; *src = *dst; *dst = tmp;
3083 } 3258 }
3084 3259
3260void
3261cancel (Coro::State self)
3262 CODE:
3263 coro_state_destroy (aTHX_ self);
3264 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */
3265
3085 3266
3086MODULE = Coro::State PACKAGE = Coro 3267MODULE = Coro::State PACKAGE = Coro
3087 3268
3088BOOT: 3269BOOT:
3089{ 3270{
3090 int i;
3091
3092 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3271 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3093 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3272 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3094 cv_coro_run = get_cv ( "Coro::_terminate", GV_ADD); 3273 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3095 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD); 3274 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3096 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 3275 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3097 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 3276 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3098 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 3277 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3099 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 3278 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3279 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3100 3280
3101 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3281 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3102 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3282 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3103 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 3283 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3104 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new); 3284 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new);
3105 3285
3106 coro_stash = gv_stashpv ("Coro", TRUE); 3286 coro_stash = gv_stashpv ("Coro", TRUE);
3107 3287
3108 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 3288 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3109 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 3289 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3110 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 3290 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
3111 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 3291 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (CORO_PRIO_LOW));
3112 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE)); 3292 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (CORO_PRIO_IDLE));
3113 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN)); 3293 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (CORO_PRIO_MIN));
3114
3115 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
3116 coro_ready[i] = newAV ();
3117 3294
3118 { 3295 {
3119 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 3296 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
3120 3297
3121 coroapi.schedule = api_schedule; 3298 coroapi.schedule = api_schedule;
3162cede_notself (...) 3339cede_notself (...)
3163 CODE: 3340 CODE:
3164 CORO_EXECUTE_SLF_XS (slf_init_cede_notself); 3341 CORO_EXECUTE_SLF_XS (slf_init_cede_notself);
3165 3342
3166void 3343void
3167_cancel (Coro::State self)
3168 CODE:
3169 coro_state_destroy (aTHX_ self);
3170 coro_call_on_destroy (aTHX_ self);
3171
3172void
3173_set_current (SV *current) 3344_set_current (SV *current)
3174 PROTOTYPE: $ 3345 PROTOTYPE: $
3175 CODE: 3346 CODE:
3176 SvREFCNT_dec (SvRV (coro_current)); 3347 SvREFCNT_dec (SvRV (coro_current));
3177 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current))); 3348 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
3179void 3350void
3180_set_readyhook (SV *hook) 3351_set_readyhook (SV *hook)
3181 PROTOTYPE: $ 3352 PROTOTYPE: $
3182 CODE: 3353 CODE:
3183 SvREFCNT_dec (coro_readyhook); 3354 SvREFCNT_dec (coro_readyhook);
3355 SvGETMAGIC (hook);
3184 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0; 3356 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0;
3185 3357
3186int 3358int
3187prio (Coro::State coro, int newprio = 0) 3359prio (Coro::State coro, int newprio = 0)
3188 PROTOTYPE: $;$ 3360 PROTOTYPE: $;$
3219 PROTOTYPE: 3391 PROTOTYPE:
3220 CODE: 3392 CODE:
3221 RETVAL = coro_nready; 3393 RETVAL = coro_nready;
3222 OUTPUT: 3394 OUTPUT:
3223 RETVAL 3395 RETVAL
3396
3397void
3398suspend (Coro::State self)
3399 PROTOTYPE: $
3400 CODE:
3401 self->flags |= CF_SUSPENDED;
3402
3403void
3404resume (Coro::State self)
3405 PROTOTYPE: $
3406 CODE:
3407 self->flags &= ~CF_SUSPENDED;
3224 3408
3225void 3409void
3226_pool_handler (...) 3410_pool_handler (...)
3227 CODE: 3411 CODE:
3228 CORO_EXECUTE_SLF_XS (slf_init_pool_handler); 3412 CORO_EXECUTE_SLF_XS (slf_init_pool_handler);
3283rouse_wait (...) 3467rouse_wait (...)
3284 PROTOTYPE: ;$ 3468 PROTOTYPE: ;$
3285 PPCODE: 3469 PPCODE:
3286 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait); 3470 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait);
3287 3471
3472void
3473on_enter (SV *block)
3474 ALIAS:
3475 on_leave = 1
3476 PROTOTYPE: &
3477 CODE:
3478{
3479 struct coro *coro = SvSTATE_current;
3480 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3481
3482 block = (SV *)coro_sv_2cv (aTHX_ block);
3483
3484 if (!*avp)
3485 *avp = newAV ();
3486
3487 av_push (*avp, SvREFCNT_inc (block));
3488
3489 if (!ix)
3490 on_enterleave_call (aTHX_ block);
3491
3492 LEAVE; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
3493 SAVEDESTRUCTOR_X (ix ? coro_pop_on_leave : coro_pop_on_enter, (void *)coro);
3494 ENTER; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
3495}
3496
3288 3497
3289MODULE = Coro::State PACKAGE = PerlIO::cede 3498MODULE = Coro::State PACKAGE = PerlIO::cede
3290 3499
3291BOOT: 3500BOOT:
3292 PerlIO_define_layer (aTHX_ &PerlIO_cede); 3501 PerlIO_define_layer (aTHX_ &PerlIO_cede);
3295MODULE = Coro::State PACKAGE = Coro::Semaphore 3504MODULE = Coro::State PACKAGE = Coro::Semaphore
3296 3505
3297SV * 3506SV *
3298new (SV *klass, SV *count = 0) 3507new (SV *klass, SV *count = 0)
3299 CODE: 3508 CODE:
3509{
3510 int semcnt = 1;
3511
3512 if (count)
3513 {
3514 SvGETMAGIC (count);
3515
3516 if (SvOK (count))
3517 semcnt = SvIV (count);
3518 }
3519
3300 RETVAL = sv_bless ( 3520 RETVAL = sv_bless (
3301 coro_waitarray_new (aTHX_ count && SvOK (count) ? SvIV (count) : 1), 3521 coro_waitarray_new (aTHX_ semcnt),
3302 GvSTASH (CvGV (cv)) 3522 GvSTASH (CvGV (cv))
3303 ); 3523 );
3524}
3304 OUTPUT: 3525 OUTPUT:
3305 RETVAL 3526 RETVAL
3306 3527
3307# helper for Coro::Channel 3528# helper for Coro::Channel and others
3308SV * 3529SV *
3309_alloc (int count) 3530_alloc (int count)
3310 CODE: 3531 CODE:
3311 RETVAL = coro_waitarray_new (aTHX_ count); 3532 RETVAL = coro_waitarray_new (aTHX_ count);
3312 OUTPUT: 3533 OUTPUT:
3370 for (i = 1; i <= wcount; ++i) 3591 for (i = 1; i <= wcount; ++i)
3371 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i]))); 3592 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i])));
3372 } 3593 }
3373} 3594}
3374 3595
3596MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3597
3598void
3599_may_delete (SV *sem, int count, int extra_refs)
3600 PPCODE:
3601{
3602 AV *av = (AV *)SvRV (sem);
3603
3604 if (SvREFCNT ((SV *)av) == 1 + extra_refs
3605 && AvFILLp (av) == 0 /* no waiters, just count */
3606 && SvIV (AvARRAY (av)[0]) == count)
3607 XSRETURN_YES;
3608
3609 XSRETURN_NO;
3610}
3611
3375MODULE = Coro::State PACKAGE = Coro::Signal 3612MODULE = Coro::State PACKAGE = Coro::Signal
3376 3613
3377SV * 3614SV *
3378new (SV *klass) 3615new (SV *klass)
3379 CODE: 3616 CODE:

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines