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.309 by root, Wed Nov 19 15:29:57 2008 UTC vs.
Revision 1.356 by root, Sat Jun 27 14:06:59 2009 UTC

… …
55 55
56#define PERL_VERSION_ATLEAST(a,b,c) \ 56#define PERL_VERSION_ATLEAST(a,b,c) \
57 (PERL_REVISION > (a) \ 57 (PERL_REVISION > (a) \
58 || (PERL_REVISION == (a) \ 58 || (PERL_REVISION == (a) \
59 && (PERL_VERSION > (b) \ 59 && (PERL_VERSION > (b) \
60 || (PERL_VERSION == (b) && PERLSUBVERSION >= (c))))) 60 || (PERL_VERSION == (b) && PERL_SUBVERSION >= (c)))))
61 61
62#if !PERL_VERSION_ATLEAST (5,6,0) 62#if !PERL_VERSION_ATLEAST (5,6,0)
63# ifndef PL_ppaddr 63# ifndef PL_ppaddr
64# define PL_ppaddr ppaddr 64# define PL_ppaddr ppaddr
65# endif 65# endif
… …
98# define newSV(l) NEWSV(0,l) 98# define newSV(l) NEWSV(0,l)
99#endif 99#endif
100#ifndef CvISXSUB_on 100#ifndef CvISXSUB_on
101# define CvISXSUB_on(cv) (void)cv 101# define CvISXSUB_on(cv) (void)cv
102#endif 102#endif
103#ifndef CvISXSUB
104# define CvISXSUB(cv) (CvXSUB (cv) ? TRUE : FALSE)
105#endif
106#ifndef Newx
107# define Newx(ptr,nitems,type) New (0,ptr,nitems,type)
108#endif
103 109
104/* 5.8.7 */ 110/* 5.8.7 */
105#ifndef SvRV_set 111#ifndef SvRV_set
106# define SvRV_set(s,v) SvRV(s) = (v) 112# define SvRV_set(s,v) SvRV(s) = (v)
107#endif 113#endif
… …
127#else 133#else
128# define dSTACKLEVEL volatile void *stacklevel 134# define dSTACKLEVEL volatile void *stacklevel
129# define STACKLEVEL ((void *)&stacklevel) 135# define STACKLEVEL ((void *)&stacklevel)
130#endif 136#endif
131 137
132#define IN_DESTRUCT (PL_main_cv == Nullcv) 138#define IN_DESTRUCT PL_dirty
133 139
134#if __GNUC__ >= 3 140#if __GNUC__ >= 3
135# define attribute(x) __attribute__(x) 141# define attribute(x) __attribute__(x)
136# define expect(expr,value) __builtin_expect ((expr),(value)) 142# define expect(expr,value) __builtin_expect ((expr), (value))
137# define INLINE static inline 143# define INLINE static inline
138#else 144#else
139# define attribute(x) 145# define attribute(x)
140# define expect(expr,value) (expr) 146# define expect(expr,value) (expr)
141# define INLINE static 147# define INLINE static
… …
165static size_t cctx_stacksize = CORO_STACKSIZE; 171static size_t cctx_stacksize = CORO_STACKSIZE;
166static struct CoroAPI coroapi; 172static struct CoroAPI coroapi;
167static AV *main_mainstack; /* used to differentiate between $main and others */ 173static AV *main_mainstack; /* used to differentiate between $main and others */
168static JMPENV *main_top_env; 174static JMPENV *main_top_env;
169static HV *coro_state_stash, *coro_stash; 175static HV *coro_state_stash, *coro_stash;
170static CV *coro_run_cv;
171static volatile SV *coro_mortal; /* will be freed/thrown after next transfer */ 176static volatile SV *coro_mortal; /* will be freed/thrown after next transfer */
177
178static AV *av_destroy; /* destruction queue */
179static SV *sv_manager; /* the manager coro */
180static SV *sv_idle; /* $Coro::idle */
172 181
173static GV *irsgv; /* $/ */ 182static GV *irsgv; /* $/ */
174static GV *stdoutgv; /* *STDOUT */ 183static GV *stdoutgv; /* *STDOUT */
175static SV *rv_diehook; 184static SV *rv_diehook;
176static SV *rv_warnhook; 185static SV *rv_warnhook;
177static HV *hv_sig; /* %SIG */ 186static HV *hv_sig; /* %SIG */
178 187
179/* async_pool helper stuff */ 188/* async_pool helper stuff */
180static SV *sv_pool_rss; 189static SV *sv_pool_rss;
181static SV *sv_pool_size; 190static SV *sv_pool_size;
191static SV *sv_async_pool_idle; /* description string */
182static AV *av_async_pool; 192static AV *av_async_pool; /* idle pool */
193static SV *sv_Coro; /* class string */
194static CV *cv_pool_handler;
195static CV *cv_coro_state_new;
183 196
184/* Coro::AnyEvent */ 197/* Coro::AnyEvent */
185static SV *sv_activity; 198static SV *sv_activity;
186 199
187static struct coro_cctx *cctx_first; 200static struct coro_cctx *cctx_first;
… …
216 int valgrind_id; 229 int valgrind_id;
217#endif 230#endif
218 unsigned char flags; 231 unsigned char flags;
219} coro_cctx; 232} coro_cctx;
220 233
234coro_cctx *cctx_current; /* the currently running cctx */
235
236/*****************************************************************************/
237
221enum { 238enum {
222 CF_RUNNING = 0x0001, /* coroutine is running */ 239 CF_RUNNING = 0x0001, /* coroutine is running */
223 CF_READY = 0x0002, /* coroutine is ready */ 240 CF_READY = 0x0002, /* coroutine is ready */
224 CF_NEW = 0x0004, /* has never been switched to */ 241 CF_NEW = 0x0004, /* has never been switched to */
225 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 242 CF_DESTROYED = 0x0008, /* coroutine data has been freed */
243 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
226}; 244};
227 245
228/* the structure where most of the perl state is stored, overlaid on the cxstack */ 246/* the structure where most of the perl state is stored, overlaid on the cxstack */
229typedef struct 247typedef struct
230{ 248{
231 SV *defsv; 249 SV *defsv;
232 AV *defav; 250 AV *defav;
233 SV *errsv; 251 SV *errsv;
234 SV *irsgv; 252 SV *irsgv;
253 HV *hinthv;
235#define VAR(name,type) type name; 254#define VAR(name,type) type name;
236# include "state.h" 255# include "state.h"
237#undef VAR 256#undef VAR
238} perl_slots; 257} perl_slots;
239 258
… …
241 260
242/* this is a structure representing a perl-level coroutine */ 261/* this is a structure representing a perl-level coroutine */
243struct coro { 262struct coro {
244 /* the C coroutine allocated to this perl coroutine, if any */ 263 /* the C coroutine allocated to this perl coroutine, if any */
245 coro_cctx *cctx; 264 coro_cctx *cctx;
265
266 /* ready queue */
267 struct coro *next_ready;
246 268
247 /* state data */ 269 /* state data */
248 struct CoroSLF slf_frame; /* saved slf frame */ 270 struct CoroSLF slf_frame; /* saved slf frame */
249 AV *mainstack; 271 AV *mainstack;
250 perl_slots *slot; /* basically the saved sp */ 272 perl_slots *slot; /* basically the saved sp */
… …
264 SV *except; /* exception to be thrown */ 286 SV *except; /* exception to be thrown */
265 SV *rouse_cb; 287 SV *rouse_cb;
266 288
267 /* async_pool */ 289 /* async_pool */
268 SV *saved_deffh; 290 SV *saved_deffh;
291 SV *invoke_cb;
292 AV *invoke_av;
293
294 /* on_enter/on_leave */
295 AV *on_enter;
296 AV *on_leave;
269 297
270 /* linked list */ 298 /* linked list */
271 struct coro *next, *prev; 299 struct coro *next, *prev;
272}; 300};
273 301
… …
289#define PRIO_MIN -4 317#define PRIO_MIN -4
290 318
291/* for Coro.pm */ 319/* for Coro.pm */
292static SV *coro_current; 320static SV *coro_current;
293static SV *coro_readyhook; 321static SV *coro_readyhook;
294static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1]; 322static struct coro *coro_ready [PRIO_MAX - PRIO_MIN + 1][2]; /* head|tail */
323static CV *cv_coro_run, *cv_coro_terminate;
295static struct coro *coro_first; 324static struct coro *coro_first;
296#define coro_nready coroapi.nready 325#define coro_nready coroapi.nready
297 326
298/** lowlevel stuff **********************************************************/ 327/** lowlevel stuff **********************************************************/
299 328
… …
327 return get_hv (name, create); 356 return get_hv (name, create);
328} 357}
329 358
330/* may croak */ 359/* may croak */
331INLINE CV * 360INLINE CV *
332coro_sv_2cv (SV *sv) 361coro_sv_2cv (pTHX_ SV *sv)
333{ 362{
334 HV *st; 363 HV *st;
335 GV *gvp; 364 GV *gvp;
336 return sv_2cv (sv, &st, &gvp, 0); 365 CV *cv = sv_2cv (sv, &st, &gvp, 0);
366
367 if (!cv)
368 croak ("code reference expected");
369
370 return cv;
337} 371}
372
373/*****************************************************************************/
374/* magic glue */
375
376#define CORO_MAGIC_type_cv 26
377#define CORO_MAGIC_type_state PERL_MAGIC_ext
378
379#define CORO_MAGIC_NN(sv, type) \
380 (expect_true (SvMAGIC (sv)->mg_type == type) \
381 ? SvMAGIC (sv) \
382 : mg_find (sv, type))
383
384#define CORO_MAGIC(sv, type) \
385 (expect_true (SvMAGIC (sv)) \
386 ? CORO_MAGIC_NN (sv, type) \
387 : 0)
388
389#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
390#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
391
392INLINE struct coro *
393SvSTATE_ (pTHX_ SV *coro)
394{
395 HV *stash;
396 MAGIC *mg;
397
398 if (SvROK (coro))
399 coro = SvRV (coro);
400
401 if (expect_false (SvTYPE (coro) != SVt_PVHV))
402 croak ("Coro::State object required");
403
404 stash = SvSTASH (coro);
405 if (expect_false (stash != coro_stash && stash != coro_state_stash))
406 {
407 /* very slow, but rare, check */
408 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
409 croak ("Coro::State object required");
410 }
411
412 mg = CORO_MAGIC_state (coro);
413 return (struct coro *)mg->mg_ptr;
414}
415
416#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
417
418/* faster than SvSTATE, but expects a coroutine hv */
419#define SvSTATE_hv(hv) ((struct coro *)CORO_MAGIC_NN ((SV *)hv, CORO_MAGIC_type_state)->mg_ptr)
420#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
421
422/*****************************************************************************/
423/* padlist management and caching */
338 424
339static AV * 425static AV *
340coro_clone_padlist (pTHX_ CV *cv) 426coro_derive_padlist (pTHX_ CV *cv)
341{ 427{
342 AV *padlist = CvPADLIST (cv); 428 AV *padlist = CvPADLIST (cv);
343 AV *newpadlist, *newpad; 429 AV *newpadlist, *newpad;
344 430
345 newpadlist = newAV (); 431 newpadlist = newAV ();
… …
350 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 436 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
351#endif 437#endif
352 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 438 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
353 --AvFILLp (padlist); 439 --AvFILLp (padlist);
354 440
355 av_store (newpadlist, 0, SvREFCNT_inc_NN (*av_fetch (padlist, 0, FALSE))); 441 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0]));
356 av_store (newpadlist, 1, (SV *)newpad); 442 av_store (newpadlist, 1, (SV *)newpad);
357 443
358 return newpadlist; 444 return newpadlist;
359} 445}
360 446
361static void 447static void
362free_padlist (pTHX_ AV *padlist) 448free_padlist (pTHX_ AV *padlist)
363{ 449{
364 /* may be during global destruction */ 450 /* may be during global destruction */
365 if (SvREFCNT (padlist)) 451 if (!IN_DESTRUCT)
366 { 452 {
367 I32 i = AvFILLp (padlist); 453 I32 i = AvFILLp (padlist);
368 while (i >= 0) 454
455 while (i > 0) /* special-case index 0 */
369 { 456 {
370 SV **svp = av_fetch (padlist, i--, FALSE); 457 /* we try to be extra-careful here */
371 if (svp) 458 AV *av = (AV *)AvARRAY (padlist)[i--];
372 { 459 I32 j = AvFILLp (av);
373 SV *sv; 460
374 while (&PL_sv_undef != (sv = av_pop ((AV *)*svp))) 461 while (j >= 0)
462 SvREFCNT_dec (AvARRAY (av)[j--]);
463
464 AvFILLp (av) = -1;
375 SvREFCNT_dec (sv); 465 SvREFCNT_dec (av);
376
377 SvREFCNT_dec (*svp);
378 }
379 } 466 }
380 467
468 SvREFCNT_dec (AvARRAY (padlist)[0]);
469
470 AvFILLp (padlist) = -1;
381 SvREFCNT_dec ((SV*)padlist); 471 SvREFCNT_dec ((SV*)padlist);
382 } 472 }
383} 473}
384 474
385static int 475static int
… …
394 484
395 SvREFCNT_dec (av); /* sv_magicext increased the refcount */ 485 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
396 486
397 return 0; 487 return 0;
398} 488}
399
400#define CORO_MAGIC_type_cv 26
401#define CORO_MAGIC_type_state PERL_MAGIC_ext
402 489
403static MGVTBL coro_cv_vtbl = { 490static MGVTBL coro_cv_vtbl = {
404 0, 0, 0, 0, 491 0, 0, 0, 0,
405 coro_cv_free 492 coro_cv_free
406}; 493};
407
408#define CORO_MAGIC_NN(sv, type) \
409 (expect_true (SvMAGIC (sv)->mg_type == type) \
410 ? SvMAGIC (sv) \
411 : mg_find (sv, type))
412
413#define CORO_MAGIC(sv, type) \
414 (expect_true (SvMAGIC (sv)) \
415 ? CORO_MAGIC_NN (sv, type) \
416 : 0)
417
418#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
419#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
420
421INLINE struct coro *
422SvSTATE_ (pTHX_ SV *coro)
423{
424 HV *stash;
425 MAGIC *mg;
426
427 if (SvROK (coro))
428 coro = SvRV (coro);
429
430 if (expect_false (SvTYPE (coro) != SVt_PVHV))
431 croak ("Coro::State object required");
432
433 stash = SvSTASH (coro);
434 if (expect_false (stash != coro_stash && stash != coro_state_stash))
435 {
436 /* very slow, but rare, check */
437 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
438 croak ("Coro::State object required");
439 }
440
441 mg = CORO_MAGIC_state (coro);
442 return (struct coro *)mg->mg_ptr;
443}
444
445#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
446
447/* faster than SvSTATE, but expects a coroutine hv */
448#define SvSTATE_hv(hv) ((struct coro *)CORO_MAGIC_NN ((SV *)hv, CORO_MAGIC_type_state)->mg_ptr)
449#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
450 494
451/* the next two functions merely cache the padlists */ 495/* the next two functions merely cache the padlists */
452static void 496static void
453get_padlist (pTHX_ CV *cv) 497get_padlist (pTHX_ CV *cv)
454{ 498{
… …
465 CV *cp = Perl_cv_clone (aTHX_ cv); 509 CV *cp = Perl_cv_clone (aTHX_ cv);
466 CvPADLIST (cv) = CvPADLIST (cp); 510 CvPADLIST (cv) = CvPADLIST (cp);
467 CvPADLIST (cp) = 0; 511 CvPADLIST (cp) = 0;
468 SvREFCNT_dec (cp); 512 SvREFCNT_dec (cp);
469#else 513#else
470 CvPADLIST (cv) = coro_clone_padlist (aTHX_ cv); 514 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
471#endif 515#endif
472 } 516 }
473} 517}
474 518
475static void 519static void
… …
482 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 526 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
483 527
484 av = (AV *)mg->mg_obj; 528 av = (AV *)mg->mg_obj;
485 529
486 if (expect_false (AvFILLp (av) >= AvMAX (av))) 530 if (expect_false (AvFILLp (av) >= AvMAX (av)))
487 av_extend (av, AvMAX (av) + 1); 531 av_extend (av, AvFILLp (av) + 1);
488 532
489 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 533 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
490} 534}
491 535
492/** load & save, init *******************************************************/ 536/** load & save, init *******************************************************/
537
538static void
539on_enterleave_call (pTHX_ SV *cb);
493 540
494static void 541static void
495load_perl (pTHX_ Coro__State c) 542load_perl (pTHX_ Coro__State c)
496{ 543{
497 perl_slots *slot = c->slot; 544 perl_slots *slot = c->slot;
498 c->slot = 0; 545 c->slot = 0;
499 546
500 PL_mainstack = c->mainstack; 547 PL_mainstack = c->mainstack;
501 548
502 GvSV (PL_defgv) = slot->defsv; 549 GvSV (PL_defgv) = slot->defsv;
503 GvAV (PL_defgv) = slot->defav; 550 GvAV (PL_defgv) = slot->defav;
504 GvSV (PL_errgv) = slot->errsv; 551 GvSV (PL_errgv) = slot->errsv;
505 GvSV (irsgv) = slot->irsgv; 552 GvSV (irsgv) = slot->irsgv;
553 GvHV (PL_hintgv) = slot->hinthv;
506 554
507 #define VAR(name,type) PL_ ## name = slot->name; 555 #define VAR(name,type) PL_ ## name = slot->name;
508 # include "state.h" 556 # include "state.h"
509 #undef VAR 557 #undef VAR
510 558
… …
524 PUTBACK; 572 PUTBACK;
525 } 573 }
526 574
527 slf_frame = c->slf_frame; 575 slf_frame = c->slf_frame;
528 CORO_THROW = c->except; 576 CORO_THROW = c->except;
577
578 if (expect_false (c->on_enter))
579 {
580 int i;
581
582 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
583 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
584 }
529} 585}
530 586
531static void 587static void
532save_perl (pTHX_ Coro__State c) 588save_perl (pTHX_ Coro__State c)
533{ 589{
590 if (expect_false (c->on_leave))
591 {
592 int i;
593
594 for (i = AvFILLp (c->on_leave); i >= 0; --i)
595 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
596 }
597
534 c->except = CORO_THROW; 598 c->except = CORO_THROW;
535 c->slf_frame = slf_frame; 599 c->slf_frame = slf_frame;
536 600
537 { 601 {
538 dSP; 602 dSP;
… …
551 { 615 {
552 while (expect_true (cxix >= 0)) 616 while (expect_true (cxix >= 0))
553 { 617 {
554 PERL_CONTEXT *cx = &ccstk[cxix--]; 618 PERL_CONTEXT *cx = &ccstk[cxix--];
555 619
556 if (expect_true (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT)) 620 if (expect_true (CxTYPE (cx) == CXt_SUB) || expect_false (CxTYPE (cx) == CXt_FORMAT))
557 { 621 {
558 CV *cv = cx->blk_sub.cv; 622 CV *cv = cx->blk_sub.cv;
559 623
560 if (expect_true (CvDEPTH (cv))) 624 if (expect_true (CvDEPTH (cv)))
561 { 625 {
… …
596 c->mainstack = PL_mainstack; 660 c->mainstack = PL_mainstack;
597 661
598 { 662 {
599 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 663 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
600 664
601 slot->defav = GvAV (PL_defgv); 665 slot->defav = GvAV (PL_defgv);
602 slot->defsv = DEFSV; 666 slot->defsv = DEFSV;
603 slot->errsv = ERRSV; 667 slot->errsv = ERRSV;
604 slot->irsgv = GvSV (irsgv); 668 slot->irsgv = GvSV (irsgv);
669 slot->hinthv = GvHV (PL_hintgv);
605 670
606 #define VAR(name,type) slot->name = PL_ ## name; 671 #define VAR(name,type) slot->name = PL_ ## name;
607 # include "state.h" 672 # include "state.h"
608 #undef VAR 673 #undef VAR
609 } 674 }
… …
687#if !PERL_VERSION_ATLEAST (5,10,0) 752#if !PERL_VERSION_ATLEAST (5,10,0)
688 Safefree (PL_retstack); 753 Safefree (PL_retstack);
689#endif 754#endif
690} 755}
691 756
757#define CORO_RSS \
758 rss += sizeof (SYM (curstackinfo)); \
759 rss += (SYM (curstackinfo->si_cxmax) + 1) * sizeof (PERL_CONTEXT); \
760 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (SYM (curstack))) * sizeof (SV *); \
761 rss += SYM (tmps_max) * sizeof (SV *); \
762 rss += (SYM (markstack_max) - SYM (markstack_ptr)) * sizeof (I32); \
763 rss += SYM (scopestack_max) * sizeof (I32); \
764 rss += SYM (savestack_max) * sizeof (ANY);
765
692static size_t 766static size_t
693coro_rss (pTHX_ struct coro *coro) 767coro_rss (pTHX_ struct coro *coro)
694{ 768{
695 size_t rss = sizeof (*coro); 769 size_t rss = sizeof (*coro);
696 770
697 if (coro->mainstack) 771 if (coro->mainstack)
698 { 772 {
699 perl_slots tmp_slot;
700 perl_slots *slot;
701
702 if (coro->flags & CF_RUNNING) 773 if (coro->flags & CF_RUNNING)
703 { 774 {
704 slot = &tmp_slot; 775 #define SYM(sym) PL_ ## sym
705 776 CORO_RSS;
706 #define VAR(name,type) slot->name = PL_ ## name;
707 # include "state.h"
708 #undef VAR 777 #undef SYM
709 } 778 }
710 else 779 else
711 slot = coro->slot;
712
713 if (slot)
714 { 780 {
715 rss += sizeof (slot->curstackinfo); 781 #define SYM(sym) coro->slot->sym
716 rss += (slot->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT); 782 CORO_RSS;
717 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (slot->curstack)) * sizeof (SV *); 783 #undef SYM
718 rss += slot->tmps_max * sizeof (SV *);
719 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32);
720 rss += slot->scopestack_max * sizeof (I32);
721 rss += slot->savestack_max * sizeof (ANY);
722
723#if !PERL_VERSION_ATLEAST (5,10,0)
724 rss += slot->retstack_max * sizeof (OP *);
725#endif
726 } 784 }
727 } 785 }
728 786
729 return rss; 787 return rss;
730} 788}
… …
743#endif 801#endif
744 802
745/* 803/*
746 * This overrides the default magic get method of %SIG elements. 804 * This overrides the default magic get method of %SIG elements.
747 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook 805 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
748 * and instead of tryign to save and restore the hash elements, we just provide 806 * and instead of trying to save and restore the hash elements, we just provide
749 * readback here. 807 * readback here.
750 * We only do this when the hook is != 0, as they are often set to 0 temporarily,
751 * not expecting this to actually change the hook. This is a potential problem
752 * when a schedule happens then, but we ignore this.
753 */ 808 */
754static int 809static int
755coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 810coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
756{ 811{
757 const char *s = MgPV_nolen_const (mg); 812 const char *s = MgPV_nolen_const (mg);
… …
810 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 865 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
811 866
812 if (svp) 867 if (svp)
813 { 868 {
814 SV *old = *svp; 869 SV *old = *svp;
815 *svp = newSVsv (sv); 870 *svp = SvOK (sv) ? newSVsv (sv) : 0;
816 SvREFCNT_dec (old); 871 SvREFCNT_dec (old);
817 return 0; 872 return 0;
818 } 873 }
819 } 874 }
820 875
… …
830 885
831static int 886static int
832slf_check_nop (pTHX_ struct CoroSLF *frame) 887slf_check_nop (pTHX_ struct CoroSLF *frame)
833{ 888{
834 return 0; 889 return 0;
890}
891
892static int
893slf_check_repeat (pTHX_ struct CoroSLF *frame)
894{
895 return 1;
835} 896}
836 897
837static UNOP coro_setup_op; 898static UNOP coro_setup_op;
838 899
839static void NOINLINE /* noinline to keep it out of the transfer fast path */ 900static void NOINLINE /* noinline to keep it out of the transfer fast path */
… …
846 907
847 PL_runops = RUNOPS_DEFAULT; 908 PL_runops = RUNOPS_DEFAULT;
848 PL_curcop = &PL_compiling; 909 PL_curcop = &PL_compiling;
849 PL_in_eval = EVAL_NULL; 910 PL_in_eval = EVAL_NULL;
850 PL_comppad = 0; 911 PL_comppad = 0;
912 PL_comppad_name = 0;
913 PL_comppad_name_fill = 0;
914 PL_comppad_name_floor = 0;
851 PL_curpm = 0; 915 PL_curpm = 0;
852 PL_curpad = 0; 916 PL_curpad = 0;
853 PL_localizing = 0; 917 PL_localizing = 0;
854 PL_dirty = 0; 918 PL_dirty = 0;
855 PL_restartop = 0; 919 PL_restartop = 0;
856#if PERL_VERSION_ATLEAST (5,10,0) 920#if PERL_VERSION_ATLEAST (5,10,0)
857 PL_parser = 0; 921 PL_parser = 0;
858#endif 922#endif
923 PL_hints = 0;
859 924
860 /* recreate the die/warn hooks */ 925 /* recreate the die/warn hooks */
861 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 926 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook );
862 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 927 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook);
863 928
864 GvSV (PL_defgv) = newSV (0); 929 GvSV (PL_defgv) = newSV (0);
865 GvAV (PL_defgv) = coro->args; coro->args = 0; 930 GvAV (PL_defgv) = coro->args; coro->args = 0;
866 GvSV (PL_errgv) = newSV (0); 931 GvSV (PL_errgv) = newSV (0);
867 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 932 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
933 GvHV (PL_hintgv) = 0;
868 PL_rs = newSVsv (GvSV (irsgv)); 934 PL_rs = newSVsv (GvSV (irsgv));
869 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 935 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
870 936
871 { 937 {
872 dSP; 938 dSP;
… …
890 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 956 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
891 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */ 957 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
892 958
893 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 959 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */
894 coro_setup_op.op_next = PL_op; 960 coro_setup_op.op_next = PL_op;
895 coro_setup_op.op_type = OP_CUSTOM; 961 coro_setup_op.op_type = OP_ENTERSUB;
896 coro_setup_op.op_ppaddr = pp_slf; 962 coro_setup_op.op_ppaddr = pp_slf;
897 /* no flags etc. required, as an init function won't be called */ 963 /* no flags etc. required, as an init function won't be called */
898 964
899 PL_op = (OP *)&coro_setup_op; 965 PL_op = (OP *)&coro_setup_op;
900 966
901 /* copy throw, in case it was set before coro_setup */ 967 /* copy throw, in case it was set before coro_setup */
902 CORO_THROW = coro->except; 968 CORO_THROW = coro->except;
903} 969}
904 970
905static void 971static void
906coro_destruct (pTHX_ struct coro *coro) 972coro_unwind_stacks (pTHX)
907{ 973{
908 if (!IN_DESTRUCT) 974 if (!IN_DESTRUCT)
909 { 975 {
910 /* restore all saved variables and stuff */ 976 /* restore all saved variables and stuff */
911 LEAVE_SCOPE (0); 977 LEAVE_SCOPE (0);
… …
919 POPSTACK_TO (PL_mainstack); 985 POPSTACK_TO (PL_mainstack);
920 986
921 /* unwind main stack */ 987 /* unwind main stack */
922 dounwind (-1); 988 dounwind (-1);
923 } 989 }
990}
924 991
925 SvREFCNT_dec (GvSV (PL_defgv)); 992static void
926 SvREFCNT_dec (GvAV (PL_defgv)); 993coro_destruct_perl (pTHX_ struct coro *coro)
927 SvREFCNT_dec (GvSV (PL_errgv)); 994{
928 SvREFCNT_dec (PL_defoutgv); 995 SV *svf [9];
929 SvREFCNT_dec (PL_rs);
930 SvREFCNT_dec (GvSV (irsgv));
931 996
932 SvREFCNT_dec (PL_diehook);
933 SvREFCNT_dec (PL_warnhook);
934 997 {
998 struct coro *current = SvSTATE_current;
999
1000 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1001
1002 save_perl (aTHX_ current);
1003 load_perl (aTHX_ coro);
1004
1005 coro_unwind_stacks (aTHX);
1006 coro_destruct_stacks (aTHX);
1007
1008 // now save some sv's to be free'd later
1009 svf [0] = GvSV (PL_defgv);
1010 svf [1] = (SV *)GvAV (PL_defgv);
1011 svf [2] = GvSV (PL_errgv);
1012 svf [3] = (SV *)PL_defoutgv;
1013 svf [4] = PL_rs;
1014 svf [5] = GvSV (irsgv);
1015 svf [6] = (SV *)GvHV (PL_hintgv);
1016 svf [7] = PL_diehook;
1017 svf [8] = PL_warnhook;
1018 assert (9 == sizeof (svf) / sizeof (*svf));
1019
1020 load_perl (aTHX_ current);
1021 }
1022
1023 {
1024 int i;
1025
1026 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i)
1027 SvREFCNT_dec (svf [i]);
1028
935 SvREFCNT_dec (coro->saved_deffh); 1029 SvREFCNT_dec (coro->saved_deffh);
936 SvREFCNT_dec (coro->rouse_cb); 1030 SvREFCNT_dec (coro->rouse_cb);
937 1031 SvREFCNT_dec (coro->invoke_cb);
938 coro_destruct_stacks (aTHX); 1032 SvREFCNT_dec (coro->invoke_av);
1033 }
939} 1034}
940 1035
941INLINE void 1036INLINE void
942free_coro_mortal (pTHX) 1037free_coro_mortal (pTHX)
943{ 1038{
… …
951static int 1046static int
952runops_trace (pTHX) 1047runops_trace (pTHX)
953{ 1048{
954 COP *oldcop = 0; 1049 COP *oldcop = 0;
955 int oldcxix = -2; 1050 int oldcxix = -2;
956 struct coro *coro = SvSTATE_current; /* trace cctx is tied to specific coro */
957 coro_cctx *cctx = coro->cctx;
958 1051
959 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX))) 1052 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX)))
960 { 1053 {
961 PERL_ASYNC_CHECK (); 1054 PERL_ASYNC_CHECK ();
962 1055
963 if (cctx->flags & CC_TRACE_ALL) 1056 if (cctx_current->flags & CC_TRACE_ALL)
964 { 1057 {
965 if (PL_op->op_type == OP_LEAVESUB && cctx->flags & CC_TRACE_SUB) 1058 if (PL_op->op_type == OP_LEAVESUB && cctx_current->flags & CC_TRACE_SUB)
966 { 1059 {
967 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1060 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
968 SV **bot, **top; 1061 SV **bot, **top;
969 AV *av = newAV (); /* return values */ 1062 AV *av = newAV (); /* return values */
970 SV **cb; 1063 SV **cb;
… …
1007 1100
1008 if (PL_curcop != &PL_compiling) 1101 if (PL_curcop != &PL_compiling)
1009 { 1102 {
1010 SV **cb; 1103 SV **cb;
1011 1104
1012 if (oldcxix != cxstack_ix && cctx->flags & CC_TRACE_SUB) 1105 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB)
1013 { 1106 {
1014 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1107 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1015 1108
1016 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1109 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1017 { 1110 {
1018 runops_proc_t old_runops = PL_runops;
1019 dSP; 1111 dSP;
1020 GV *gv = CvGV (cx->blk_sub.cv); 1112 GV *gv = CvGV (cx->blk_sub.cv);
1021 SV *fullname = sv_2mortal (newSV (0)); 1113 SV *fullname = sv_2mortal (newSV (0));
1022 1114
1023 if (isGV (gv)) 1115 if (isGV (gv))
… …
1041 } 1133 }
1042 1134
1043 oldcxix = cxstack_ix; 1135 oldcxix = cxstack_ix;
1044 } 1136 }
1045 1137
1046 if (cctx->flags & CC_TRACE_LINE) 1138 if (cctx_current->flags & CC_TRACE_LINE)
1047 { 1139 {
1048 dSP; 1140 dSP;
1049 1141
1050 PL_runops = RUNOPS_DEFAULT; 1142 PL_runops = RUNOPS_DEFAULT;
1051 ENTER; 1143 ENTER;
… …
1070 1162
1071 TAINT_NOT; 1163 TAINT_NOT;
1072 return 0; 1164 return 0;
1073} 1165}
1074 1166
1075static struct coro_cctx *cctx_ssl_cctx;
1076static struct CoroSLF cctx_ssl_frame; 1167static struct CoroSLF cctx_ssl_frame;
1077 1168
1078static void 1169static void
1079slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta) 1170slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta)
1080{ 1171{
1081 ta->prev = (struct coro *)cctx_ssl_cctx;
1082 ta->next = 0; 1172 ta->prev = 0;
1083} 1173}
1084 1174
1085static int 1175static int
1086slf_check_set_stacklevel (pTHX_ struct CoroSLF *frame) 1176slf_check_set_stacklevel (pTHX_ struct CoroSLF *frame)
1087{ 1177{
… …
1090 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1180 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1091} 1181}
1092 1182
1093/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1183/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1094static void NOINLINE 1184static void NOINLINE
1095cctx_prepare (pTHX_ coro_cctx *cctx) 1185cctx_prepare (pTHX)
1096{ 1186{
1097 PL_top_env = &PL_start_env; 1187 PL_top_env = &PL_start_env;
1098 1188
1099 if (cctx->flags & CC_TRACE) 1189 if (cctx_current->flags & CC_TRACE)
1100 PL_runops = runops_trace; 1190 PL_runops = runops_trace;
1101 1191
1102 /* we already must be executing an SLF op, there is no other valid way 1192 /* we already must be executing an SLF op, there is no other valid way
1103 * that can lead to creation of a new cctx */ 1193 * that can lead to creation of a new cctx */
1104 assert (("FATAL: can't prepare slf-less cctx in Coro module (please report)", 1194 assert (("FATAL: can't prepare slf-less cctx in Coro module (please report)",
1105 slf_frame.prepare && PL_op->op_ppaddr == pp_slf)); 1195 slf_frame.prepare && PL_op->op_ppaddr == pp_slf));
1106 1196
1107 /* we must emulate leaving pp_slf, which is done inside slf_check_set_stacklevel */ 1197 /* we must emulate leaving pp_slf, which is done inside slf_check_set_stacklevel */
1108 cctx_ssl_cctx = cctx;
1109 cctx_ssl_frame = slf_frame; 1198 cctx_ssl_frame = slf_frame;
1110 1199
1111 slf_frame.prepare = slf_prepare_set_stacklevel; 1200 slf_frame.prepare = slf_prepare_set_stacklevel;
1112 slf_frame.check = slf_check_set_stacklevel; 1201 slf_frame.check = slf_check_set_stacklevel;
1113} 1202}
… …
1136 /* normally we would need to skip the entersub here */ 1225 /* normally we would need to skip the entersub here */
1137 /* not doing so will re-execute it, which is exactly what we want */ 1226 /* not doing so will re-execute it, which is exactly what we want */
1138 /* PL_nop = PL_nop->op_next */ 1227 /* PL_nop = PL_nop->op_next */
1139 1228
1140 /* inject a fake subroutine call to cctx_init */ 1229 /* inject a fake subroutine call to cctx_init */
1141 cctx_prepare (aTHX_ (coro_cctx *)arg); 1230 cctx_prepare (aTHX);
1142 1231
1143 /* cctx_run is the alternative tail of transfer() */ 1232 /* cctx_run is the alternative tail of transfer() */
1144 transfer_tail (aTHX); 1233 transfer_tail (aTHX);
1145 1234
1146 /* somebody or something will hit me for both perl_run and PL_restartop */ 1235 /* somebody or something will hit me for both perl_run and PL_restartop */
… …
1154 /* 1243 /*
1155 * If perl-run returns we assume exit() was being called or the coro 1244 * If perl-run returns we assume exit() was being called or the coro
1156 * fell off the end, which seems to be the only valid (non-bug) 1245 * fell off the end, which seems to be the only valid (non-bug)
1157 * reason for perl_run to return. We try to exit by jumping to the 1246 * reason for perl_run to return. We try to exit by jumping to the
1158 * bootstrap-time "top" top_env, as we cannot restore the "main" 1247 * bootstrap-time "top" top_env, as we cannot restore the "main"
1159 * coroutine as Coro has no such concept 1248 * coroutine as Coro has no such concept.
1249 * This actually isn't valid with the pthread backend, but OSes requiring
1250 * that backend are too broken to do it in a standards-compliant way.
1160 */ 1251 */
1161 PL_top_env = main_top_env; 1252 PL_top_env = main_top_env;
1162 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */ 1253 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1163 } 1254 }
1164} 1255}
… …
1241cctx_destroy (coro_cctx *cctx) 1332cctx_destroy (coro_cctx *cctx)
1242{ 1333{
1243 if (!cctx) 1334 if (!cctx)
1244 return; 1335 return;
1245 1336
1337 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary?
1338
1246 --cctx_count; 1339 --cctx_count;
1247 coro_destroy (&cctx->cctx); 1340 coro_destroy (&cctx->cctx);
1248 1341
1249 /* coro_transfer creates new, empty cctx's */ 1342 /* coro_transfer creates new, empty cctx's */
1250 if (cctx->sptr) 1343 if (cctx->sptr)
… …
1313 /* TODO: throwing up here is considered harmful */ 1406 /* TODO: throwing up here is considered harmful */
1314 1407
1315 if (expect_true (prev != next)) 1408 if (expect_true (prev != next))
1316 { 1409 {
1317 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1410 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1318 croak ("Coro::State::transfer called with non-running/new prev Coro::State, but can only transfer from running or new states,"); 1411 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1319 1412
1320 if (expect_false (next->flags & CF_RUNNING))
1321 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states,");
1322
1323 if (expect_false (next->flags & CF_DESTROYED)) 1413 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED)))
1324 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states,"); 1414 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1325 1415
1326#if !PERL_VERSION_ATLEAST (5,10,0) 1416#if !PERL_VERSION_ATLEAST (5,10,0)
1327 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1417 if (expect_false (PL_lex_state != LEX_NOTPARSING))
1328 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,"); 1418 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1329#endif 1419#endif
… …
1335transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1425transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1336{ 1426{
1337 dSTACKLEVEL; 1427 dSTACKLEVEL;
1338 1428
1339 /* sometimes transfer is only called to set idle_sp */ 1429 /* sometimes transfer is only called to set idle_sp */
1340 if (expect_false (!next)) 1430 if (expect_false (!prev))
1341 { 1431 {
1342 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1432 cctx_current->idle_sp = STACKLEVEL;
1343 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1433 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1344 } 1434 }
1345 else if (expect_true (prev != next)) 1435 else if (expect_true (prev != next))
1346 { 1436 {
1347 coro_cctx *prev__cctx; 1437 coro_cctx *cctx_prev;
1348 1438
1349 if (expect_false (prev->flags & CF_NEW)) 1439 if (expect_false (prev->flags & CF_NEW))
1350 { 1440 {
1351 /* create a new empty/source context */ 1441 /* create a new empty/source context */
1352 prev->cctx = cctx_new_empty ();
1353 prev->flags &= ~CF_NEW; 1442 prev->flags &= ~CF_NEW;
1354 prev->flags |= CF_RUNNING; 1443 prev->flags |= CF_RUNNING;
1355 } 1444 }
1356 1445
1357 prev->flags &= ~CF_RUNNING; 1446 prev->flags &= ~CF_RUNNING;
… …
1368 coro_setup (aTHX_ next); 1457 coro_setup (aTHX_ next);
1369 } 1458 }
1370 else 1459 else
1371 load_perl (aTHX_ next); 1460 load_perl (aTHX_ next);
1372 1461
1373 prev__cctx = prev->cctx;
1374
1375 /* possibly untie and reuse the cctx */ 1462 /* possibly untie and reuse the cctx */
1376 if (expect_true ( 1463 if (expect_true (
1377 prev__cctx->idle_sp == STACKLEVEL 1464 cctx_current->idle_sp == STACKLEVEL
1378 && !(prev__cctx->flags & CC_TRACE) 1465 && !(cctx_current->flags & CC_TRACE)
1379 && !force_cctx 1466 && !force_cctx
1380 )) 1467 ))
1381 { 1468 {
1382 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1469 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */
1383 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == prev__cctx->idle_te)); 1470 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1384 1471
1385 prev->cctx = 0;
1386
1387 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */ 1472 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */
1388 /* without this the next cctx_get might destroy the prev__cctx while still in use */ 1473 /* without this the next cctx_get might destroy the running cctx while still in use */
1389 if (expect_false (CCTX_EXPIRED (prev__cctx))) 1474 if (expect_false (CCTX_EXPIRED (cctx_current)))
1390 if (!next->cctx) 1475 if (expect_true (!next->cctx))
1391 next->cctx = cctx_get (aTHX); 1476 next->cctx = cctx_get (aTHX);
1392 1477
1393 cctx_put (prev__cctx); 1478 cctx_put (cctx_current);
1394 } 1479 }
1480 else
1481 prev->cctx = cctx_current;
1395 1482
1396 ++next->usecount; 1483 ++next->usecount;
1397 1484
1398 if (expect_true (!next->cctx)) 1485 cctx_prev = cctx_current;
1399 next->cctx = cctx_get (aTHX); 1486 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1400 1487
1401 if (expect_false (prev__cctx != next->cctx)) 1488 next->cctx = 0;
1489
1490 if (expect_false (cctx_prev != cctx_current))
1402 { 1491 {
1403 prev__cctx->top_env = PL_top_env; 1492 cctx_prev->top_env = PL_top_env;
1404 PL_top_env = next->cctx->top_env; 1493 PL_top_env = cctx_current->top_env;
1405 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1494 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1406 } 1495 }
1407 1496
1408 transfer_tail (aTHX); 1497 transfer_tail (aTHX);
1409 } 1498 }
1410} 1499}
… …
1418coro_state_destroy (pTHX_ struct coro *coro) 1507coro_state_destroy (pTHX_ struct coro *coro)
1419{ 1508{
1420 if (coro->flags & CF_DESTROYED) 1509 if (coro->flags & CF_DESTROYED)
1421 return 0; 1510 return 0;
1422 1511
1423 if (coro->on_destroy) 1512 if (coro->on_destroy && !PL_dirty)
1424 coro->on_destroy (aTHX_ coro); 1513 coro->on_destroy (aTHX_ coro);
1425 1514
1426 coro->flags |= CF_DESTROYED; 1515 coro->flags |= CF_DESTROYED;
1427 1516
1428 if (coro->flags & CF_READY) 1517 if (coro->flags & CF_READY)
… …
1432 --coro_nready; 1521 --coro_nready;
1433 } 1522 }
1434 else 1523 else
1435 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1524 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1436 1525
1437 if (coro->mainstack && coro->mainstack != main_mainstack) 1526 if (coro->mainstack
1438 { 1527 && coro->mainstack != main_mainstack
1439 struct coro temp; 1528 && coro->slot
1440 1529 && !PL_dirty)
1441 assert (("FATAL: tried to destroy currently running coroutine (please report)", !(coro->flags & CF_RUNNING)));
1442
1443 save_perl (aTHX_ &temp);
1444 load_perl (aTHX_ coro);
1445
1446 coro_destruct (aTHX_ coro); 1530 coro_destruct_perl (aTHX_ coro);
1447
1448 load_perl (aTHX_ &temp);
1449
1450 coro->slot = 0;
1451 }
1452 1531
1453 cctx_destroy (coro->cctx); 1532 cctx_destroy (coro->cctx);
1454 SvREFCNT_dec (coro->startcv); 1533 SvREFCNT_dec (coro->startcv);
1455 SvREFCNT_dec (coro->args); 1534 SvREFCNT_dec (coro->args);
1456 SvREFCNT_dec (CORO_THROW); 1535 SvREFCNT_dec (CORO_THROW);
… …
1543/** Coro ********************************************************************/ 1622/** Coro ********************************************************************/
1544 1623
1545INLINE void 1624INLINE void
1546coro_enq (pTHX_ struct coro *coro) 1625coro_enq (pTHX_ struct coro *coro)
1547{ 1626{
1548 av_push (coro_ready [coro->prio - PRIO_MIN], SvREFCNT_inc_NN (coro->hv)); 1627 struct coro **ready = coro_ready [coro->prio - PRIO_MIN];
1549}
1550 1628
1551INLINE SV * 1629 SvREFCNT_inc_NN (coro->hv);
1630
1631 coro->next_ready = 0;
1632 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1633 ready [1] = coro;
1634}
1635
1636INLINE struct coro *
1552coro_deq (pTHX) 1637coro_deq (pTHX)
1553{ 1638{
1554 int prio; 1639 int prio;
1555 1640
1556 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; ) 1641 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; )
1557 if (AvFILLp (coro_ready [prio]) >= 0) 1642 {
1558 return av_shift (coro_ready [prio]); 1643 struct coro **ready = coro_ready [prio];
1644
1645 if (ready [0])
1646 {
1647 struct coro *coro = ready [0];
1648 ready [0] = coro->next_ready;
1649 return coro;
1650 }
1651 }
1559 1652
1560 return 0; 1653 return 0;
1561} 1654}
1562 1655
1563static int 1656static int
… …
1565{ 1658{
1566 struct coro *coro; 1659 struct coro *coro;
1567 SV *sv_hook; 1660 SV *sv_hook;
1568 void (*xs_hook)(void); 1661 void (*xs_hook)(void);
1569 1662
1570 if (SvROK (coro_sv))
1571 coro_sv = SvRV (coro_sv);
1572
1573 coro = SvSTATE (coro_sv); 1663 coro = SvSTATE (coro_sv);
1574 1664
1575 if (coro->flags & CF_READY) 1665 if (coro->flags & CF_READY)
1576 return 0; 1666 return 0;
1577 1667
… …
1608api_is_ready (pTHX_ SV *coro_sv) 1698api_is_ready (pTHX_ SV *coro_sv)
1609{ 1699{
1610 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1700 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1611} 1701}
1612 1702
1703/* expects to own a reference to next->hv */
1613INLINE void 1704INLINE void
1614prepare_schedule (pTHX_ struct coro_transfer_args *ta) 1705prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1615{ 1706{
1616 SV *prev_sv, *next_sv;
1617
1618 for (;;)
1619 {
1620 next_sv = coro_deq (aTHX);
1621
1622 /* nothing to schedule: call the idle handler */
1623 if (expect_false (!next_sv))
1624 {
1625 dSP;
1626
1627 ENTER;
1628 SAVETMPS;
1629
1630 PUSHMARK (SP);
1631 PUTBACK;
1632 call_sv (get_sv ("Coro::idle", FALSE), G_VOID | G_DISCARD);
1633
1634 FREETMPS;
1635 LEAVE;
1636 continue;
1637 }
1638
1639 ta->next = SvSTATE_hv (next_sv);
1640
1641 /* cannot transfer to destroyed coros, skip and look for next */
1642 if (expect_false (ta->next->flags & CF_DESTROYED))
1643 {
1644 SvREFCNT_dec (next_sv);
1645 /* coro_nready has already been taken care of by destroy */
1646 continue;
1647 }
1648
1649 --coro_nready;
1650 break;
1651 }
1652
1653 /* free this only after the transfer */
1654 prev_sv = SvRV (coro_current); 1707 SV *prev_sv = SvRV (coro_current);
1708
1655 ta->prev = SvSTATE_hv (prev_sv); 1709 ta->prev = SvSTATE_hv (prev_sv);
1710 ta->next = next;
1711
1656 TRANSFER_CHECK (*ta); 1712 TRANSFER_CHECK (*ta);
1657 assert (("FATAL: next coroutine isn't marked as ready in Coro (please report)", ta->next->flags & CF_READY)); 1713
1658 ta->next->flags &= ~CF_READY;
1659 SvRV_set (coro_current, next_sv); 1714 SvRV_set (coro_current, (SV *)next->hv);
1660 1715
1661 free_coro_mortal (aTHX); 1716 free_coro_mortal (aTHX);
1662 coro_mortal = prev_sv; 1717 coro_mortal = prev_sv;
1663} 1718}
1664 1719
1720static void
1721prepare_schedule (pTHX_ struct coro_transfer_args *ta)
1722{
1723 for (;;)
1724 {
1725 struct coro *next = coro_deq (aTHX);
1726
1727 if (expect_true (next))
1728 {
1729 /* cannot transfer to destroyed coros, skip and look for next */
1730 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED)))
1731 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1732 else
1733 {
1734 next->flags &= ~CF_READY;
1735 --coro_nready;
1736
1737 prepare_schedule_to (aTHX_ ta, next);
1738 break;
1739 }
1740 }
1741 else
1742 {
1743 /* nothing to schedule: call the idle handler */
1744 if (SvROK (sv_idle)
1745 && SvOBJECT (SvRV (sv_idle)))
1746 {
1747 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1748 api_ready (aTHX_ SvRV (sv_idle));
1749 --coro_nready;
1750 }
1751 else
1752 {
1753 dSP;
1754
1755 ENTER;
1756 SAVETMPS;
1757
1758 PUSHMARK (SP);
1759 PUTBACK;
1760 call_sv (sv_idle, G_VOID | G_DISCARD);
1761
1762 FREETMPS;
1763 LEAVE;
1764 }
1765 }
1766 }
1767}
1768
1665INLINE void 1769INLINE void
1666prepare_cede (pTHX_ struct coro_transfer_args *ta) 1770prepare_cede (pTHX_ struct coro_transfer_args *ta)
1667{ 1771{
1668 api_ready (aTHX_ coro_current); 1772 api_ready (aTHX_ coro_current);
1669 prepare_schedule (aTHX_ ta); 1773 prepare_schedule (aTHX_ ta);
… …
1688{ 1792{
1689 struct coro_transfer_args ta; 1793 struct coro_transfer_args ta;
1690 1794
1691 prepare_schedule (aTHX_ &ta); 1795 prepare_schedule (aTHX_ &ta);
1692 TRANSFER (ta, 1); 1796 TRANSFER (ta, 1);
1797}
1798
1799static void
1800api_schedule_to (pTHX_ SV *coro_sv)
1801{
1802 struct coro_transfer_args ta;
1803 struct coro *next = SvSTATE (coro_sv);
1804
1805 SvREFCNT_inc_NN (coro_sv);
1806 prepare_schedule_to (aTHX_ &ta, next);
1693} 1807}
1694 1808
1695static int 1809static int
1696api_cede (pTHX) 1810api_cede (pTHX)
1697{ 1811{
… …
1726static void 1840static void
1727api_trace (pTHX_ SV *coro_sv, int flags) 1841api_trace (pTHX_ SV *coro_sv, int flags)
1728{ 1842{
1729 struct coro *coro = SvSTATE (coro_sv); 1843 struct coro *coro = SvSTATE (coro_sv);
1730 1844
1845 if (coro->flags & CF_RUNNING)
1846 croak ("cannot enable tracing on a running coroutine, caught");
1847
1731 if (flags & CC_TRACE) 1848 if (flags & CC_TRACE)
1732 { 1849 {
1733 if (!coro->cctx) 1850 if (!coro->cctx)
1734 coro->cctx = cctx_new_run (); 1851 coro->cctx = cctx_new_run ();
1735 else if (!(coro->cctx->flags & CC_TRACE)) 1852 else if (!(coro->cctx->flags & CC_TRACE))
1736 croak ("cannot enable tracing on coroutine with custom stack,"); 1853 croak ("cannot enable tracing on coroutine with custom stack, caught");
1737 1854
1738 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL)); 1855 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL));
1739 } 1856 }
1740 else if (coro->cctx && coro->cctx->flags & CC_TRACE) 1857 else if (coro->cctx && coro->cctx->flags & CC_TRACE)
1741 { 1858 {
… …
1746 else 1863 else
1747 coro->slot->runops = RUNOPS_DEFAULT; 1864 coro->slot->runops = RUNOPS_DEFAULT;
1748 } 1865 }
1749} 1866}
1750 1867
1868static void
1869coro_call_on_destroy (pTHX_ struct coro *coro)
1870{
1871 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0);
1872 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1873
1874 if (on_destroyp)
1875 {
1876 AV *on_destroy = (AV *)SvRV (*on_destroyp);
1877
1878 while (AvFILLp (on_destroy) >= 0)
1879 {
1880 dSP; /* don't disturb outer sp */
1881 SV *cb = av_pop (on_destroy);
1882
1883 PUSHMARK (SP);
1884
1885 if (statusp)
1886 {
1887 int i;
1888 AV *status = (AV *)SvRV (*statusp);
1889 EXTEND (SP, AvFILLp (status) + 1);
1890
1891 for (i = 0; i <= AvFILLp (status); ++i)
1892 PUSHs (AvARRAY (status)[i]);
1893 }
1894
1895 PUTBACK;
1896 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD);
1897 }
1898 }
1899}
1900
1901static void
1902slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1903{
1904 int i;
1905 HV *hv = (HV *)SvRV (coro_current);
1906 AV *av = newAV ();
1907
1908 av_extend (av, items - 1);
1909 for (i = 0; i < items; ++i)
1910 av_push (av, SvREFCNT_inc_NN (arg [i]));
1911
1912 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0);
1913
1914 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */
1915 api_ready (aTHX_ sv_manager);
1916
1917 frame->prepare = prepare_schedule;
1918 frame->check = slf_check_repeat;
1919
1920 /* as a minor optimisation, we could unwind all stacks here */
1921 /* but that puts extra pressure on pp_slf, and is not worth much */
1922 /*coro_unwind_stacks (aTHX);*/
1923}
1924
1925/*****************************************************************************/
1926/* async pool handler */
1927
1928static int
1929slf_check_pool_handler (pTHX_ struct CoroSLF *frame)
1930{
1931 HV *hv = (HV *)SvRV (coro_current);
1932 struct coro *coro = (struct coro *)frame->data;
1933
1934 if (!coro->invoke_cb)
1935 return 1; /* loop till we have invoke */
1936 else
1937 {
1938 hv_store (hv, "desc", sizeof ("desc") - 1,
1939 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
1940
1941 coro->saved_deffh = SvREFCNT_inc_NN ((SV *)PL_defoutgv);
1942
1943 {
1944 dSP;
1945 XPUSHs (sv_2mortal (coro->invoke_cb)); coro->invoke_cb = 0;
1946 PUTBACK;
1947 }
1948
1949 SvREFCNT_dec (GvAV (PL_defgv));
1950 GvAV (PL_defgv) = coro->invoke_av;
1951 coro->invoke_av = 0;
1952
1953 return 0;
1954 }
1955}
1956
1957static void
1958slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1959{
1960 HV *hv = (HV *)SvRV (coro_current);
1961 struct coro *coro = SvSTATE_hv ((SV *)hv);
1962
1963 if (expect_true (coro->saved_deffh))
1964 {
1965 /* subsequent iteration */
1966 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1967 coro->saved_deffh = 0;
1968
1969 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
1970 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1971 {
1972 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate);
1973 coro->invoke_av = newAV ();
1974
1975 frame->prepare = prepare_nop;
1976 }
1977 else
1978 {
1979 av_clear (GvAV (PL_defgv));
1980 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
1981
1982 coro->prio = 0;
1983
1984 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
1985 api_trace (aTHX_ coro_current, 0);
1986
1987 frame->prepare = prepare_schedule;
1988 av_push (av_async_pool, SvREFCNT_inc (hv));
1989 }
1990 }
1991 else
1992 {
1993 /* first iteration, simply fall through */
1994 frame->prepare = prepare_nop;
1995 }
1996
1997 frame->check = slf_check_pool_handler;
1998 frame->data = (void *)coro;
1999}
2000
1751/*****************************************************************************/ 2001/*****************************************************************************/
1752/* rouse callback */ 2002/* rouse callback */
1753 2003
1754#define CORO_MAGIC_type_rouse PERL_MAGIC_ext 2004#define CORO_MAGIC_type_rouse PERL_MAGIC_ext
1755 2005
… …
1760 SV *data = (SV *)GENSUB_ARG; 2010 SV *data = (SV *)GENSUB_ARG;
1761 2011
1762 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2012 if (SvTYPE (SvRV (data)) != SVt_PVAV)
1763 { 2013 {
1764 /* first call, set args */ 2014 /* first call, set args */
1765 int i; 2015 SV *coro = SvRV (data);
1766 AV *av = newAV (); 2016 AV *av = newAV ();
1767 SV *coro = SvRV (data);
1768 2017
1769 SvRV_set (data, (SV *)av); 2018 SvRV_set (data, (SV *)av);
1770 api_ready (aTHX_ coro);
1771 SvREFCNT_dec (coro);
1772 2019
1773 /* better take a full copy of the arguments */ 2020 /* better take a full copy of the arguments */
1774 while (items--) 2021 while (items--)
1775 av_store (av, items, newSVsv (ST (items))); 2022 av_store (av, items, newSVsv (ST (items)));
2023
2024 api_ready (aTHX_ coro);
2025 SvREFCNT_dec (coro);
1776 } 2026 }
1777 2027
1778 XSRETURN_EMPTY; 2028 XSRETURN_EMPTY;
1779} 2029}
1780 2030
… …
1797 2047
1798 EXTEND (SP, AvFILLp (av) + 1); 2048 EXTEND (SP, AvFILLp (av) + 1);
1799 for (i = 0; i <= AvFILLp (av); ++i) 2049 for (i = 0; i <= AvFILLp (av); ++i)
1800 PUSHs (sv_2mortal (AvARRAY (av)[i])); 2050 PUSHs (sv_2mortal (AvARRAY (av)[i]));
1801 2051
1802 /* we have stolen the elements, so ste length to zero and free */ 2052 /* we have stolen the elements, so set length to zero and free */
1803 AvFILLp (av) = -1; 2053 AvFILLp (av) = -1;
1804 av_undef (av); 2054 av_undef (av);
1805 2055
1806 PUTBACK; 2056 PUTBACK;
1807 } 2057 }
… …
1911static void 2161static void
1912slf_init_schedule (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2162slf_init_schedule (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1913{ 2163{
1914 frame->prepare = prepare_schedule; 2164 frame->prepare = prepare_schedule;
1915 frame->check = slf_check_nop; 2165 frame->check = slf_check_nop;
2166}
2167
2168static void
2169slf_prepare_schedule_to (pTHX_ struct coro_transfer_args *ta)
2170{
2171 struct coro *next = (struct coro *)slf_frame.data;
2172
2173 SvREFCNT_inc_NN (next->hv);
2174 prepare_schedule_to (aTHX_ ta, next);
2175}
2176
2177static void
2178slf_init_schedule_to (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2179{
2180 if (!items)
2181 croak ("Coro::schedule_to expects a coroutine argument, caught");
2182
2183 frame->data = (void *)SvSTATE (arg [0]);
2184 frame->prepare = slf_prepare_schedule_to;
2185 frame->check = slf_check_nop;
2186}
2187
2188static void
2189slf_init_cede_to (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2190{
2191 api_ready (aTHX_ SvRV (coro_current));
2192
2193 slf_init_schedule_to (aTHX_ frame, cv, arg, items);
1916} 2194}
1917 2195
1918static void 2196static void
1919slf_init_cede (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2197slf_init_cede (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1920{ 2198{
… …
2066 } 2344 }
2067 else 2345 else
2068 slf_argc = 0; 2346 slf_argc = 0;
2069 2347
2070 PL_op->op_ppaddr = pp_slf; 2348 PL_op->op_ppaddr = pp_slf;
2071 PL_op->op_type = OP_CUSTOM; /* maybe we should leave it at entersub? */ 2349 /*PL_op->op_type = OP_CUSTOM; /* we do behave like entersub still */
2072 2350
2073 PL_op = (OP *)&slf_restore; 2351 PL_op = (OP *)&slf_restore;
2352}
2353
2354/*****************************************************************************/
2355/* dynamic wind */
2356
2357static void
2358on_enterleave_call (pTHX_ SV *cb)
2359{
2360 dSP;
2361
2362 PUSHSTACK;
2363
2364 PUSHMARK (SP);
2365 PUTBACK;
2366 call_sv (cb, G_VOID | G_DISCARD);
2367 SPAGAIN;
2368
2369 POPSTACK;
2370}
2371
2372static SV *
2373coro_avp_pop_and_free (pTHX_ AV **avp)
2374{
2375 AV *av = *avp;
2376 SV *res = av_pop (av);
2377
2378 if (AvFILLp (av) < 0)
2379 {
2380 *avp = 0;
2381 SvREFCNT_dec (av);
2382 }
2383
2384 return res;
2385}
2386
2387static void
2388coro_pop_on_enter (pTHX_ void *coro)
2389{
2390 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_enter);
2391 SvREFCNT_dec (cb);
2392}
2393
2394static void
2395coro_pop_on_leave (pTHX_ void *coro)
2396{
2397 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2398 on_enterleave_call (aTHX_ sv_2mortal (cb));
2074} 2399}
2075 2400
2076/*****************************************************************************/ 2401/*****************************************************************************/
2077/* PerlIO::cede */ 2402/* PerlIO::cede */
2078 2403
… …
2152/* Coro::Semaphore & Coro::Signal */ 2477/* Coro::Semaphore & Coro::Signal */
2153 2478
2154static SV * 2479static SV *
2155coro_waitarray_new (pTHX_ int count) 2480coro_waitarray_new (pTHX_ int count)
2156{ 2481{
2157 /* a semaphore contains a counter IV in $sem->[0] and any waiters after that */ 2482 /* a waitarray=semaphore contains a counter IV in $sem->[0] and any waiters after that */
2158 AV *av = newAV (); 2483 AV *av = newAV ();
2159 SV **ary; 2484 SV **ary;
2160 2485
2161 /* unfortunately, building manually saves memory */ 2486 /* unfortunately, building manually saves memory */
2162 Newx (ary, 2, SV *); 2487 Newx (ary, 2, SV *);
2163 AvALLOC (av) = ary; 2488 AvALLOC (av) = ary;
2489#if PERL_VERSION_ATLEAST (5,10,0)
2164 /*AvARRAY (av) = ary;*/ 2490 AvARRAY (av) = ary;
2491#else
2165 SvPVX ((SV *)av) = (char *)ary; /* 5.8.8 needs this syntax instead of AvARRAY = ary */ 2492 /* 5.8.8 needs this syntax instead of AvARRAY = ary, yet */
2493 /* -DDEBUGGING flags this as a bug, despite it perfectly working */
2494 SvPVX ((SV *)av) = (char *)ary;
2495#endif
2166 AvMAX (av) = 1; 2496 AvMAX (av) = 1;
2167 AvFILLp (av) = 0; 2497 AvFILLp (av) = 0;
2168 ary [0] = newSViv (count); 2498 ary [0] = newSViv (count);
2169 2499
2170 return newRV_noinc ((SV *)av); 2500 return newRV_noinc ((SV *)av);
… …
2299{ 2629{
2300 if (items >= 2) 2630 if (items >= 2)
2301 { 2631 {
2302 /* callback form */ 2632 /* callback form */
2303 AV *av = (AV *)SvRV (arg [0]); 2633 AV *av = (AV *)SvRV (arg [0]);
2304 CV *cb_cv = coro_sv_2cv (arg [1]); 2634 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]);
2305 2635
2306 av_push (av, (SV *)SvREFCNT_inc_NN (cb_cv)); 2636 av_push (av, SvREFCNT_inc_NN (cb_cv));
2307 2637
2308 if (SvIVX (AvARRAY (av)[0]) > 0) 2638 if (SvIVX (AvARRAY (av)[0]) > 0)
2309 coro_semaphore_adjust (aTHX_ av, 0); 2639 coro_semaphore_adjust (aTHX_ av, 0);
2310 2640
2311 frame->prepare = prepare_nop; 2641 frame->prepare = prepare_nop;
… …
2335 AvARRAY (av)[0] = AvARRAY (av)[1]; 2665 AvARRAY (av)[0] = AvARRAY (av)[1];
2336 AvARRAY (av)[1] = cb; 2666 AvARRAY (av)[1] = cb;
2337 2667
2338 cb = av_shift (av); 2668 cb = av_shift (av);
2339 2669
2670 if (SvTYPE (cb) == SVt_PVCV)
2671 {
2672 dSP;
2673 PUSHMARK (SP);
2674 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2675 PUTBACK;
2676 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2677 }
2678 else
2679 {
2340 api_ready (aTHX_ cb); 2680 api_ready (aTHX_ cb);
2341 sv_setiv (cb, 0); /* signal waiter */ 2681 sv_setiv (cb, 0); /* signal waiter */
2682 }
2683
2342 SvREFCNT_dec (cb); 2684 SvREFCNT_dec (cb);
2343 2685
2344 --count; 2686 --count;
2345 } 2687 }
2346} 2688}
… …
2355static void 2697static void
2356slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2698slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2357{ 2699{
2358 AV *av = (AV *)SvRV (arg [0]); 2700 AV *av = (AV *)SvRV (arg [0]);
2359 2701
2702 if (items >= 2)
2703 {
2704 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]);
2705 av_push (av, SvREFCNT_inc_NN (cb_cv));
2706
2360 if (SvIVX (AvARRAY (av)[0])) 2707 if (SvIVX (AvARRAY (av)[0]))
2708 coro_signal_wake (aTHX_ av, 1); /* ust be the only waiter */
2709
2710 frame->prepare = prepare_nop;
2711 frame->check = slf_check_nop;
2712 }
2713 else if (SvIVX (AvARRAY (av)[0]))
2361 { 2714 {
2362 SvIVX (AvARRAY (av)[0]) = 0; 2715 SvIVX (AvARRAY (av)[0]) = 0;
2363 frame->prepare = prepare_nop; 2716 frame->prepare = prepare_nop;
2364 frame->check = slf_check_nop; 2717 frame->check = slf_check_nop;
2365 } 2718 }
2366 else 2719 else
2367 { 2720 {
2368 SV *waiter = newRV_inc (SvRV (coro_current)); /* owned by signal av */ 2721 SV *waiter = newSVsv (coro_current); /* owned by signal av */
2369 2722
2370 av_push (av, waiter); 2723 av_push (av, waiter);
2371 2724
2372 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */ 2725 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */
2373 frame->prepare = prepare_schedule; 2726 frame->prepare = prepare_schedule;
… …
2395 dXSARGS; 2748 dXSARGS;
2396 AV *state = (AV *)GENSUB_ARG; 2749 AV *state = (AV *)GENSUB_ARG;
2397 SV *coro = av_pop (state); 2750 SV *coro = av_pop (state);
2398 SV *data_sv = newSV (sizeof (struct io_state)); 2751 SV *data_sv = newSV (sizeof (struct io_state));
2399 2752
2400 av_extend (state, items); 2753 av_extend (state, items - 1);
2401 2754
2402 sv_upgrade (data_sv, SVt_PV); 2755 sv_upgrade (data_sv, SVt_PV);
2403 SvCUR_set (data_sv, sizeof (struct io_state)); 2756 SvCUR_set (data_sv, sizeof (struct io_state));
2404 SvPOK_only (data_sv); 2757 SvPOK_only (data_sv);
2405 2758
… …
2540 XSRETURN_EMPTY; 2893 XSRETURN_EMPTY;
2541} 2894}
2542 2895
2543/*****************************************************************************/ 2896/*****************************************************************************/
2544 2897
2898#if CORO_CLONE
2899# include "clone.c"
2900#endif
2901
2545MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 2902MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2546 2903
2547PROTOTYPES: DISABLE 2904PROTOTYPES: DISABLE
2548 2905
2549BOOT: 2906BOOT:
… …
2553 coro_thx = PERL_GET_CONTEXT; 2910 coro_thx = PERL_GET_CONTEXT;
2554# endif 2911# endif
2555#endif 2912#endif
2556 BOOT_PAGESIZE; 2913 BOOT_PAGESIZE;
2557 2914
2915 cctx_current = cctx_new_empty ();
2916
2558 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 2917 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
2559 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 2918 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
2560 2919
2561 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 2920 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get;
2562 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set; 2921 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set;
… …
2581 2940
2582 { 2941 {
2583 SV *slf = sv_2mortal (newSViv (PTR2IV (pp_slf))); 2942 SV *slf = sv_2mortal (newSViv (PTR2IV (pp_slf)));
2584 2943
2585 if (!PL_custom_op_names) PL_custom_op_names = newHV (); 2944 if (!PL_custom_op_names) PL_custom_op_names = newHV ();
2586 hv_store_ent (PL_custom_op_names, slf, 2945 hv_store_ent (PL_custom_op_names, slf, newSVpv ("coro_slf", 0), 0);
2587 newSVpv ("coro_slf", 0), 0);
2588 2946
2589 if (!PL_custom_op_descs) PL_custom_op_descs = newHV (); 2947 if (!PL_custom_op_descs) PL_custom_op_descs = newHV ();
2590 hv_store_ent (PL_custom_op_descs, slf, 2948 hv_store_ent (PL_custom_op_descs, slf, newSVpv ("coro schedule like function", 0), 0);
2591 newSVpv ("coro schedule like function", 0), 0);
2592 } 2949 }
2593 2950
2594 coroapi.ver = CORO_API_VERSION; 2951 coroapi.ver = CORO_API_VERSION;
2595 coroapi.rev = CORO_API_REVISION; 2952 coroapi.rev = CORO_API_REVISION;
2596 2953
… …
2627 CV *cb; 2984 CV *cb;
2628 int i; 2985 int i;
2629 2986
2630 if (items > 1) 2987 if (items > 1)
2631 { 2988 {
2632 cb = coro_sv_2cv (ST (1)); 2989 cb = coro_sv_2cv (aTHX_ ST (1));
2633 2990
2991 if (!ix)
2992 {
2634 if (CvISXSUB (cb)) 2993 if (CvISXSUB (cb))
2635 croak ("Coro::State doesn't support XS functions as coroutine start, caught"); 2994 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
2636 2995
2637 if (!CvROOT (cb)) 2996 if (!CvROOT (cb))
2638 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught"); 2997 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
2998 }
2639 } 2999 }
2640 3000
2641 Newz (0, coro, 1, struct coro); 3001 Newz (0, coro, 1, struct coro);
2642 coro->args = newAV (); 3002 coro->args = newAV ();
2643 coro->flags = CF_NEW; 3003 coro->flags = CF_NEW;
… …
2651 mg->mg_flags |= MGf_DUP; 3011 mg->mg_flags |= MGf_DUP;
2652 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 3012 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
2653 3013
2654 if (items > 1) 3014 if (items > 1)
2655 { 3015 {
2656 av_extend (coro->args, items - 1 + ix); 3016 av_extend (coro->args, items - 1 + ix - 1);
2657 3017
2658 if (ix) 3018 if (ix)
2659 { 3019 {
2660 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb)); 3020 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
2661 cb = coro_run_cv; 3021 cb = cv_coro_run;
2662 } 3022 }
2663 3023
2664 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb); 3024 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
2665 3025
2666 for (i = 2; i < items; i++) 3026 for (i = 2; i < items; i++)
… …
2686void 3046void
2687_exit (int code) 3047_exit (int code)
2688 PROTOTYPE: $ 3048 PROTOTYPE: $
2689 CODE: 3049 CODE:
2690 _exit (code); 3050 _exit (code);
3051
3052SV *
3053clone (Coro::State coro)
3054 CODE:
3055{
3056#if CORO_CLONE
3057 struct coro *ncoro = coro_clone (aTHX_ coro);
3058 MAGIC *mg;
3059 /* TODO: too much duplication */
3060 ncoro->hv = newHV ();
3061 mg = sv_magicext ((SV *)ncoro->hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)ncoro, 0);
3062 mg->mg_flags |= MGf_DUP;
3063 RETVAL = sv_bless (newRV_noinc ((SV *)ncoro->hv), SvSTASH (coro->hv));
3064#else
3065 croak ("Coro::State->clone has not been configured into this installation of Coro, realised");
3066#endif
3067}
3068 OUTPUT:
3069 RETVAL
2691 3070
2692int 3071int
2693cctx_stacksize (int new_stacksize = 0) 3072cctx_stacksize (int new_stacksize = 0)
2694 PROTOTYPE: ;$ 3073 PROTOTYPE: ;$
2695 CODE: 3074 CODE:
… …
2745 eval = 1 3124 eval = 1
2746 CODE: 3125 CODE:
2747{ 3126{
2748 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3127 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
2749 { 3128 {
2750 struct coro temp; 3129 struct coro *current = SvSTATE_current;
2751 3130
2752 if (!(coro->flags & CF_RUNNING)) 3131 if (current != coro)
2753 { 3132 {
2754 PUTBACK; 3133 PUTBACK;
2755 save_perl (aTHX_ &temp); 3134 save_perl (aTHX_ current);
2756 load_perl (aTHX_ coro); 3135 load_perl (aTHX_ coro);
3136 SPAGAIN;
2757 } 3137 }
2758 3138
2759 {
2760 dSP;
2761 ENTER;
2762 SAVETMPS;
2763 PUTBACK;
2764 PUSHSTACK; 3139 PUSHSTACK;
3140
2765 PUSHMARK (SP); 3141 PUSHMARK (SP);
3142 PUTBACK;
2766 3143
2767 if (ix) 3144 if (ix)
2768 eval_sv (coderef, 0); 3145 eval_sv (coderef, 0);
2769 else 3146 else
2770 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 3147 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
2771 3148
2772 POPSTACK; 3149 POPSTACK;
2773 SPAGAIN; 3150 SPAGAIN;
2774 FREETMPS;
2775 LEAVE;
2776 PUTBACK;
2777 }
2778 3151
2779 if (!(coro->flags & CF_RUNNING)) 3152 if (current != coro)
2780 { 3153 {
3154 PUTBACK;
2781 save_perl (aTHX_ coro); 3155 save_perl (aTHX_ coro);
2782 load_perl (aTHX_ &temp); 3156 load_perl (aTHX_ current);
2783 SPAGAIN; 3157 SPAGAIN;
2784 } 3158 }
2785 } 3159 }
2786} 3160}
2787 3161
… …
2791 ALIAS: 3165 ALIAS:
2792 is_ready = CF_READY 3166 is_ready = CF_READY
2793 is_running = CF_RUNNING 3167 is_running = CF_RUNNING
2794 is_new = CF_NEW 3168 is_new = CF_NEW
2795 is_destroyed = CF_DESTROYED 3169 is_destroyed = CF_DESTROYED
3170 is_suspended = CF_SUSPENDED
2796 CODE: 3171 CODE:
2797 RETVAL = boolSV (coro->flags & ix); 3172 RETVAL = boolSV (coro->flags & ix);
2798 OUTPUT: 3173 OUTPUT:
2799 RETVAL 3174 RETVAL
2800 3175
… …
2816 3191
2817SV * 3192SV *
2818has_cctx (Coro::State coro) 3193has_cctx (Coro::State coro)
2819 PROTOTYPE: $ 3194 PROTOTYPE: $
2820 CODE: 3195 CODE:
2821 RETVAL = boolSV (!!coro->cctx); 3196 /* maybe manage the running flag differently */
3197 RETVAL = boolSV (!!coro->cctx || (coro->flags & CF_RUNNING));
2822 OUTPUT: 3198 OUTPUT:
2823 RETVAL 3199 RETVAL
2824 3200
2825int 3201int
2826is_traced (Coro::State coro) 3202is_traced (Coro::State coro)
… …
2846 3222
2847void 3223void
2848force_cctx () 3224force_cctx ()
2849 PROTOTYPE: 3225 PROTOTYPE:
2850 CODE: 3226 CODE:
2851 SvSTATE_current->cctx->idle_sp = 0; 3227 cctx_current->idle_sp = 0;
2852 3228
2853void 3229void
2854swap_defsv (Coro::State self) 3230swap_defsv (Coro::State self)
2855 PROTOTYPE: $ 3231 PROTOTYPE: $
2856 ALIAS: 3232 ALIAS:
… …
2864 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv; 3240 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
2865 3241
2866 SV *tmp = *src; *src = *dst; *dst = tmp; 3242 SV *tmp = *src; *src = *dst; *dst = tmp;
2867 } 3243 }
2868 3244
3245void
3246cancel (Coro::State self)
3247 CODE:
3248 coro_state_destroy (aTHX_ self);
3249 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */
3250
2869 3251
2870MODULE = Coro::State PACKAGE = Coro 3252MODULE = Coro::State PACKAGE = Coro
2871 3253
2872BOOT: 3254BOOT:
2873{ 3255{
2874 int i;
2875
2876 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
2877 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3256 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
2878 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3257 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
2879 coro_run_cv = get_cv (aTHX_ "Coro::_terminate", GV_ADD); 3258 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3259 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
2880 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); 3260 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
2881 SvREADONLY_on (coro_current); 3261 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3262 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3263 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3264 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3265
3266 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3267 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3268 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3269 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new);
2882 3270
2883 coro_stash = gv_stashpv ("Coro", TRUE); 3271 coro_stash = gv_stashpv ("Coro", TRUE);
2884 3272
2885 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 3273 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
2886 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 3274 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH));
2887 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 3275 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL));
2888 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 3276 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW));
2889 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE)); 3277 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE));
2890 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN)); 3278 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN));
2891 3279
2892 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
2893 coro_ready[i] = newAV ();
2894
2895 { 3280 {
2896 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 3281 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
2897 3282
2898 coroapi.schedule = api_schedule; 3283 coroapi.schedule = api_schedule;
3284 coroapi.schedule_to = api_schedule_to;
2899 coroapi.cede = api_cede; 3285 coroapi.cede = api_cede;
2900 coroapi.cede_notself = api_cede_notself; 3286 coroapi.cede_notself = api_cede_notself;
2901 coroapi.ready = api_ready; 3287 coroapi.ready = api_ready;
2902 coroapi.is_ready = api_is_ready; 3288 coroapi.is_ready = api_is_ready;
2903 coroapi.nready = coro_nready; 3289 coroapi.nready = coro_nready;
… …
2908 SvREADONLY_on (sv); 3294 SvREADONLY_on (sv);
2909 } 3295 }
2910} 3296}
2911 3297
2912void 3298void
3299terminate (...)
3300 CODE:
3301 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3302
3303void
2913schedule (...) 3304schedule (...)
2914 CODE: 3305 CODE:
2915 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3306 CORO_EXECUTE_SLF_XS (slf_init_schedule);
3307
3308void
3309schedule_to (...)
3310 CODE:
3311 CORO_EXECUTE_SLF_XS (slf_init_schedule_to);
3312
3313void
3314cede_to (...)
3315 CODE:
3316 CORO_EXECUTE_SLF_XS (slf_init_cede_to);
2916 3317
2917void 3318void
2918cede (...) 3319cede (...)
2919 CODE: 3320 CODE:
2920 CORO_EXECUTE_SLF_XS (slf_init_cede); 3321 CORO_EXECUTE_SLF_XS (slf_init_cede);
… …
2975 CODE: 3376 CODE:
2976 RETVAL = coro_nready; 3377 RETVAL = coro_nready;
2977 OUTPUT: 3378 OUTPUT:
2978 RETVAL 3379 RETVAL
2979 3380
2980# for async_pool speedup
2981void 3381void
2982_pool_1 (SV *cb) 3382suspend (Coro::State self)
3383 PROTOTYPE: $
2983 CODE: 3384 CODE:
2984{ 3385 self->flags |= CF_SUSPENDED;
2985 HV *hv = (HV *)SvRV (coro_current);
2986 struct coro *coro = SvSTATE_hv ((SV *)hv);
2987 AV *defav = GvAV (PL_defgv);
2988 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
2989 AV *invoke_av;
2990 int i, len;
2991 3386
2992 if (!invoke) 3387void
3388resume (Coro::State self)
3389 PROTOTYPE: $
3390 CODE:
3391 self->flags &= ~CF_SUSPENDED;
3392
3393void
3394_pool_handler (...)
3395 CODE:
3396 CORO_EXECUTE_SLF_XS (slf_init_pool_handler);
3397
3398void
3399async_pool (SV *cv, ...)
3400 PROTOTYPE: &@
3401 PPCODE:
3402{
3403 HV *hv = (HV *)av_pop (av_async_pool);
3404 AV *av = newAV ();
3405 SV *cb = ST (0);
3406 int i;
3407
3408 av_extend (av, items - 2);
3409 for (i = 1; i < items; ++i)
3410 av_push (av, SvREFCNT_inc_NN (ST (i)));
3411
3412 if ((SV *)hv == &PL_sv_undef)
2993 { 3413 {
2994 SV *old = PL_diehook; 3414 PUSHMARK (SP);
2995 PL_diehook = 0; 3415 EXTEND (SP, 2);
2996 SvREFCNT_dec (old); 3416 PUSHs (sv_Coro);
2997 croak ("\3async_pool terminate\2\n"); 3417 PUSHs ((SV *)cv_pool_handler);
3418 PUTBACK;
3419 call_sv ((SV *)cv_coro_state_new, G_SCALAR);
3420 SPAGAIN;
3421
3422 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs));
2998 } 3423 }
2999 3424
3000 SvREFCNT_dec (coro->saved_deffh);
3001 coro->saved_deffh = SvREFCNT_inc_NN ((SV *)PL_defoutgv);
3002
3003 hv_store (hv, "desc", sizeof ("desc") - 1,
3004 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
3005
3006 invoke_av = (AV *)SvRV (invoke);
3007 len = av_len (invoke_av);
3008
3009 sv_setsv (cb, AvARRAY (invoke_av)[0]);
3010
3011 if (len > 0)
3012 { 3425 {
3013 av_fill (defav, len - 1); 3426 struct coro *coro = SvSTATE_hv (hv);
3014 for (i = 0; i < len; ++i) 3427
3015 av_store (defav, i, SvREFCNT_inc_NN (AvARRAY (invoke_av)[i + 1])); 3428 assert (!coro->invoke_cb);
3429 assert (!coro->invoke_av);
3430 coro->invoke_cb = SvREFCNT_inc (cb);
3431 coro->invoke_av = av;
3016 } 3432 }
3017}
3018 3433
3019void 3434 api_ready (aTHX_ (SV *)hv);
3020_pool_2 (SV *cb)
3021 CODE:
3022{
3023 HV *hv = (HV *)SvRV (coro_current);
3024 struct coro *coro = SvSTATE_hv ((SV *)hv);
3025 3435
3026 sv_setsv (cb, &PL_sv_undef); 3436 if (GIMME_V != G_VOID)
3027 3437 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
3028 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 3438 else
3029 coro->saved_deffh = 0;
3030
3031 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
3032 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
3033 {
3034 SV *old = PL_diehook;
3035 PL_diehook = 0;
3036 SvREFCNT_dec (old); 3439 SvREFCNT_dec (hv);
3037 croak ("\3async_pool terminate\2\n");
3038 }
3039
3040 av_clear (GvAV (PL_defgv));
3041 hv_store (hv, "desc", sizeof ("desc") - 1,
3042 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
3043
3044 coro->prio = 0;
3045
3046 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
3047 api_trace (aTHX_ coro_current, 0);
3048
3049 av_push (av_async_pool, newSVsv (coro_current));
3050} 3440}
3051 3441
3052SV * 3442SV *
3053rouse_cb () 3443rouse_cb ()
3054 PROTOTYPE: 3444 PROTOTYPE:
… …
3061rouse_wait (...) 3451rouse_wait (...)
3062 PROTOTYPE: ;$ 3452 PROTOTYPE: ;$
3063 PPCODE: 3453 PPCODE:
3064 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait); 3454 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait);
3065 3455
3456void
3457on_enter (SV *block)
3458 ALIAS:
3459 on_leave = 1
3460 PROTOTYPE: &
3461 CODE:
3462{
3463 struct coro *coro = SvSTATE_current;
3464 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3465
3466 block = (SV *)coro_sv_2cv (aTHX_ block);
3467
3468 if (!*avp)
3469 *avp = newAV ();
3470
3471 av_push (*avp, SvREFCNT_inc (block));
3472
3473 if (!ix)
3474 on_enterleave_call (aTHX_ block);
3475
3476 LEAVE; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
3477 SAVEDESTRUCTOR_X (ix ? coro_pop_on_leave : coro_pop_on_enter, (void *)coro);
3478 ENTER; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
3479}
3480
3066 3481
3067MODULE = Coro::State PACKAGE = PerlIO::cede 3482MODULE = Coro::State PACKAGE = PerlIO::cede
3068 3483
3069BOOT: 3484BOOT:
3070 PerlIO_define_layer (aTHX_ &PerlIO_cede); 3485 PerlIO_define_layer (aTHX_ &PerlIO_cede);
… …
3073MODULE = Coro::State PACKAGE = Coro::Semaphore 3488MODULE = Coro::State PACKAGE = Coro::Semaphore
3074 3489
3075SV * 3490SV *
3076new (SV *klass, SV *count = 0) 3491new (SV *klass, SV *count = 0)
3077 CODE: 3492 CODE:
3493{
3494 int semcnt = 1;
3495
3496 if (count)
3497 {
3498 SvGETMAGIC (count);
3499
3500 if (SvOK (count))
3501 semcnt = SvIV (count);
3502 }
3503
3078 RETVAL = sv_bless ( 3504 RETVAL = sv_bless (
3079 coro_waitarray_new (aTHX_ count && SvOK (count) ? SvIV (count) : 1), 3505 coro_waitarray_new (aTHX_ semcnt),
3080 GvSTASH (CvGV (cv)) 3506 GvSTASH (CvGV (cv))
3081 ); 3507 );
3508}
3082 OUTPUT: 3509 OUTPUT:
3083 RETVAL 3510 RETVAL
3084 3511
3085# helper for Coro::Channel 3512# helper for Coro::Channel and others
3086SV * 3513SV *
3087_alloc (int count) 3514_alloc (int count)
3088 CODE: 3515 CODE:
3089 RETVAL = coro_waitarray_new (aTHX_ count); 3516 RETVAL = coro_waitarray_new (aTHX_ count);
3090 OUTPUT: 3517 OUTPUT:
… …
3148 for (i = 1; i <= wcount; ++i) 3575 for (i = 1; i <= wcount; ++i)
3149 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i]))); 3576 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i])));
3150 } 3577 }
3151} 3578}
3152 3579
3580MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3581
3582void
3583_may_delete (SV *sem, int count, int extra_refs)
3584 PPCODE:
3585{
3586 AV *av = (AV *)SvRV (sem);
3587
3588 if (SvREFCNT ((SV *)av) == 1 + extra_refs
3589 && AvFILLp (av) == 0 /* no waiters, just count */
3590 && SvIV (AvARRAY (av)[0]) == count)
3591 XSRETURN_YES;
3592
3593 XSRETURN_NO;
3594}
3595
3153MODULE = Coro::State PACKAGE = Coro::Signal 3596MODULE = Coro::State PACKAGE = Coro::Signal
3154 3597
3155SV * 3598SV *
3156new (SV *klass) 3599new (SV *klass)
3157 CODE: 3600 CODE:
… …
3228 3671
3229void 3672void
3230_register (char *target, char *proto, SV *req) 3673_register (char *target, char *proto, SV *req)
3231 CODE: 3674 CODE:
3232{ 3675{
3233 CV *req_cv = coro_sv_2cv (req); 3676 CV *req_cv = coro_sv_2cv (aTHX_ req);
3234 /* newXSproto doesn't return the CV on 5.8 */ 3677 /* newXSproto doesn't return the CV on 5.8 */
3235 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 3678 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3236 sv_setpv ((SV *)slf_cv, proto); 3679 sv_setpv ((SV *)slf_cv, proto);
3237 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0); 3680 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
3238} 3681}

Diff Legend

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