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.305 by root, Wed Nov 19 10:44:41 2008 UTC vs.
Revision 1.351 by root, Sat Jun 20 08:58:25 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
… …
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 volatile SV *coro_mortal; /* will be freed/thrown after next transfer */ 176static volatile SV *coro_mortal; /* will be freed/thrown after next transfer */
171 177
178static AV *av_destroy; /* destruction queue */
179static SV *sv_manager; /* the manager coro */
180static SV *sv_idle; /* $Coro::idle */
181
172static GV *irsgv; /* $/ */ 182static GV *irsgv; /* $/ */
173static GV *stdoutgv; /* *STDOUT */ 183static GV *stdoutgv; /* *STDOUT */
174static SV *rv_diehook; 184static SV *rv_diehook;
175static SV *rv_warnhook; 185static SV *rv_warnhook;
176static HV *hv_sig; /* %SIG */ 186static HV *hv_sig; /* %SIG */
177 187
178/* async_pool helper stuff */ 188/* async_pool helper stuff */
179static SV *sv_pool_rss; 189static SV *sv_pool_rss;
180static SV *sv_pool_size; 190static SV *sv_pool_size;
191static SV *sv_async_pool_idle; /* description string */
181static 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;
182 196
183/* Coro::AnyEvent */ 197/* Coro::AnyEvent */
184static SV *sv_activity; 198static SV *sv_activity;
185 199
186static struct coro_cctx *cctx_first; 200static struct coro_cctx *cctx_first;
… …
215 int valgrind_id; 229 int valgrind_id;
216#endif 230#endif
217 unsigned char flags; 231 unsigned char flags;
218} coro_cctx; 232} coro_cctx;
219 233
234coro_cctx *cctx_current; /* the currently running cctx */
235
236/*****************************************************************************/
237
220enum { 238enum {
221 CF_RUNNING = 0x0001, /* coroutine is running */ 239 CF_RUNNING = 0x0001, /* coroutine is running */
222 CF_READY = 0x0002, /* coroutine is ready */ 240 CF_READY = 0x0002, /* coroutine is ready */
223 CF_NEW = 0x0004, /* has never been switched to */ 241 CF_NEW = 0x0004, /* has never been switched to */
224 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 */
225}; 244};
226 245
227/* 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 */
228typedef struct 247typedef struct
229{ 248{
230 SV *defsv; 249 SV *defsv;
231 AV *defav; 250 AV *defav;
232 SV *errsv; 251 SV *errsv;
233 SV *irsgv; 252 SV *irsgv;
253 HV *hinthv;
234#define VAR(name,type) type name; 254#define VAR(name,type) type name;
235# include "state.h" 255# include "state.h"
236#undef VAR 256#undef VAR
237} perl_slots; 257} perl_slots;
238 258
… …
241/* this is a structure representing a perl-level coroutine */ 261/* this is a structure representing a perl-level coroutine */
242struct coro { 262struct coro {
243 /* the C coroutine allocated to this perl coroutine, if any */ 263 /* the C coroutine allocated to this perl coroutine, if any */
244 coro_cctx *cctx; 264 coro_cctx *cctx;
245 265
266 /* ready queue */
267 struct coro *next_ready;
268
246 /* state data */ 269 /* state data */
247 struct CoroSLF slf_frame; /* saved slf frame */ 270 struct CoroSLF slf_frame; /* saved slf frame */
248 AV *mainstack; 271 AV *mainstack;
249 perl_slots *slot; /* basically the saved sp */ 272 perl_slots *slot; /* basically the saved sp */
250 273
274 CV *startcv; /* the CV to execute */
251 AV *args; /* data associated with this coroutine (initial args) */ 275 AV *args; /* data associated with this coroutine (initial args) */
252 int refcnt; /* coroutines are refcounted, yes */ 276 int refcnt; /* coroutines are refcounted, yes */
253 int flags; /* CF_ flags */ 277 int flags; /* CF_ flags */
254 HV *hv; /* the perl hash associated with this coro, if any */ 278 HV *hv; /* the perl hash associated with this coro, if any */
255 void (*on_destroy)(pTHX_ struct coro *coro); 279 void (*on_destroy)(pTHX_ struct coro *coro);
256 280
257 /* statistics */ 281 /* statistics */
258 int usecount; /* number of transfers to this coro */ 282 int usecount; /* number of transfers to this coro */
259 283
… …
262 SV *except; /* exception to be thrown */ 286 SV *except; /* exception to be thrown */
263 SV *rouse_cb; 287 SV *rouse_cb;
264 288
265 /* async_pool */ 289 /* async_pool */
266 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;
267 297
268 /* linked list */ 298 /* linked list */
269 struct coro *next, *prev; 299 struct coro *next, *prev;
270}; 300};
271 301
… …
287#define PRIO_MIN -4 317#define PRIO_MIN -4
288 318
289/* for Coro.pm */ 319/* for Coro.pm */
290static SV *coro_current; 320static SV *coro_current;
291static SV *coro_readyhook; 321static SV *coro_readyhook;
292static 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;
293static struct coro *coro_first; 324static struct coro *coro_first;
294#define coro_nready coroapi.nready 325#define coro_nready coroapi.nready
295 326
296/** lowlevel stuff **********************************************************/ 327/** lowlevel stuff **********************************************************/
297 328
… …
323 get_hv (name, create); 354 get_hv (name, create);
324#endif 355#endif
325 return get_hv (name, create); 356 return get_hv (name, create);
326} 357}
327 358
359/* may croak */
360INLINE CV *
361coro_sv_2cv (pTHX_ SV *sv)
362{
363 HV *st;
364 GV *gvp;
365 CV *cv = sv_2cv (sv, &st, &gvp, 0);
366
367 if (!cv)
368 croak ("code reference expected");
369
370 return cv;
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 */
424
328static AV * 425static AV *
329coro_clone_padlist (pTHX_ CV *cv) 426coro_derive_padlist (pTHX_ CV *cv)
330{ 427{
331 AV *padlist = CvPADLIST (cv); 428 AV *padlist = CvPADLIST (cv);
332 AV *newpadlist, *newpad; 429 AV *newpadlist, *newpad;
333 430
334 newpadlist = newAV (); 431 newpadlist = newAV ();
… …
339 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 436 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
340#endif 437#endif
341 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 438 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
342 --AvFILLp (padlist); 439 --AvFILLp (padlist);
343 440
344 av_store (newpadlist, 0, SvREFCNT_inc_NN (*av_fetch (padlist, 0, FALSE))); 441 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0]));
345 av_store (newpadlist, 1, (SV *)newpad); 442 av_store (newpadlist, 1, (SV *)newpad);
346 443
347 return newpadlist; 444 return newpadlist;
348} 445}
349 446
350static void 447static void
351free_padlist (pTHX_ AV *padlist) 448free_padlist (pTHX_ AV *padlist)
352{ 449{
353 /* may be during global destruction */ 450 /* may be during global destruction */
354 if (SvREFCNT (padlist)) 451 if (!IN_DESTRUCT)
355 { 452 {
356 I32 i = AvFILLp (padlist); 453 I32 i = AvFILLp (padlist);
357 while (i >= 0) 454
455 while (i > 0) /* special-case index 0 */
358 { 456 {
359 SV **svp = av_fetch (padlist, i--, FALSE); 457 /* we try to be extra-careful here */
360 if (svp) 458 AV *av = (AV *)AvARRAY (padlist)[i--];
361 { 459 I32 j = AvFILLp (av);
362 SV *sv; 460
363 while (&PL_sv_undef != (sv = av_pop ((AV *)*svp))) 461 while (j >= 0)
462 SvREFCNT_dec (AvARRAY (av)[j--]);
463
464 AvFILLp (av) = -1;
364 SvREFCNT_dec (sv); 465 SvREFCNT_dec (av);
365
366 SvREFCNT_dec (*svp);
367 }
368 } 466 }
369 467
468 SvREFCNT_dec (AvARRAY (padlist)[0]);
469
470 AvFILLp (padlist) = -1;
370 SvREFCNT_dec ((SV*)padlist); 471 SvREFCNT_dec ((SV*)padlist);
371 } 472 }
372} 473}
373 474
374static int 475static int
… …
383 484
384 SvREFCNT_dec (av); /* sv_magicext increased the refcount */ 485 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
385 486
386 return 0; 487 return 0;
387} 488}
388
389#define CORO_MAGIC_type_cv 26
390#define CORO_MAGIC_type_state PERL_MAGIC_ext
391 489
392static MGVTBL coro_cv_vtbl = { 490static MGVTBL coro_cv_vtbl = {
393 0, 0, 0, 0, 491 0, 0, 0, 0,
394 coro_cv_free 492 coro_cv_free
395}; 493};
396
397#define CORO_MAGIC_NN(sv, type) \
398 (expect_true (SvMAGIC (sv)->mg_type == type) \
399 ? SvMAGIC (sv) \
400 : mg_find (sv, type))
401
402#define CORO_MAGIC(sv, type) \
403 (expect_true (SvMAGIC (sv)) \
404 ? CORO_MAGIC_NN (sv, type) \
405 : 0)
406
407#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
408#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
409
410INLINE struct coro *
411SvSTATE_ (pTHX_ SV *coro)
412{
413 HV *stash;
414 MAGIC *mg;
415
416 if (SvROK (coro))
417 coro = SvRV (coro);
418
419 if (expect_false (SvTYPE (coro) != SVt_PVHV))
420 croak ("Coro::State object required");
421
422 stash = SvSTASH (coro);
423 if (expect_false (stash != coro_stash && stash != coro_state_stash))
424 {
425 /* very slow, but rare, check */
426 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
427 croak ("Coro::State object required");
428 }
429
430 mg = CORO_MAGIC_state (coro);
431 return (struct coro *)mg->mg_ptr;
432}
433
434#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
435
436/* faster than SvSTATE, but expects a coroutine hv */
437#define SvSTATE_hv(hv) ((struct coro *)CORO_MAGIC_NN ((SV *)hv, CORO_MAGIC_type_state)->mg_ptr)
438#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
439 494
440/* the next two functions merely cache the padlists */ 495/* the next two functions merely cache the padlists */
441static void 496static void
442get_padlist (pTHX_ CV *cv) 497get_padlist (pTHX_ CV *cv)
443{ 498{
… …
454 CV *cp = Perl_cv_clone (aTHX_ cv); 509 CV *cp = Perl_cv_clone (aTHX_ cv);
455 CvPADLIST (cv) = CvPADLIST (cp); 510 CvPADLIST (cv) = CvPADLIST (cp);
456 CvPADLIST (cp) = 0; 511 CvPADLIST (cp) = 0;
457 SvREFCNT_dec (cp); 512 SvREFCNT_dec (cp);
458#else 513#else
459 CvPADLIST (cv) = coro_clone_padlist (aTHX_ cv); 514 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
460#endif 515#endif
461 } 516 }
462} 517}
463 518
464static void 519static void
… …
471 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);
472 527
473 av = (AV *)mg->mg_obj; 528 av = (AV *)mg->mg_obj;
474 529
475 if (expect_false (AvFILLp (av) >= AvMAX (av))) 530 if (expect_false (AvFILLp (av) >= AvMAX (av)))
476 av_extend (av, AvMAX (av) + 1); 531 av_extend (av, AvFILLp (av) + 1);
477 532
478 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 533 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
479} 534}
480 535
481/** load & save, init *******************************************************/ 536/** load & save, init *******************************************************/
537
538static void
539on_enterleave_call (pTHX_ SV *cb);
482 540
483static void 541static void
484load_perl (pTHX_ Coro__State c) 542load_perl (pTHX_ Coro__State c)
485{ 543{
486 perl_slots *slot = c->slot; 544 perl_slots *slot = c->slot;
487 c->slot = 0; 545 c->slot = 0;
488 546
489 PL_mainstack = c->mainstack; 547 PL_mainstack = c->mainstack;
490 548
491 GvSV (PL_defgv) = slot->defsv; 549 GvSV (PL_defgv) = slot->defsv;
492 GvAV (PL_defgv) = slot->defav; 550 GvAV (PL_defgv) = slot->defav;
493 GvSV (PL_errgv) = slot->errsv; 551 GvSV (PL_errgv) = slot->errsv;
494 GvSV (irsgv) = slot->irsgv; 552 GvSV (irsgv) = slot->irsgv;
553 GvHV (PL_hintgv) = slot->hinthv;
495 554
496 #define VAR(name,type) PL_ ## name = slot->name; 555 #define VAR(name,type) PL_ ## name = slot->name;
497 # include "state.h" 556 # include "state.h"
498 #undef VAR 557 #undef VAR
499 558
… …
513 PUTBACK; 572 PUTBACK;
514 } 573 }
515 574
516 slf_frame = c->slf_frame; 575 slf_frame = c->slf_frame;
517 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 }
518} 585}
519 586
520static void 587static void
521save_perl (pTHX_ Coro__State c) 588save_perl (pTHX_ Coro__State c)
522{ 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
523 c->except = CORO_THROW; 598 c->except = CORO_THROW;
524 c->slf_frame = slf_frame; 599 c->slf_frame = slf_frame;
525 600
526 { 601 {
527 dSP; 602 dSP;
… …
585 c->mainstack = PL_mainstack; 660 c->mainstack = PL_mainstack;
586 661
587 { 662 {
588 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 663 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
589 664
590 slot->defav = GvAV (PL_defgv); 665 slot->defav = GvAV (PL_defgv);
591 slot->defsv = DEFSV; 666 slot->defsv = DEFSV;
592 slot->errsv = ERRSV; 667 slot->errsv = ERRSV;
593 slot->irsgv = GvSV (irsgv); 668 slot->irsgv = GvSV (irsgv);
669 slot->hinthv = GvHV (PL_hintgv);
594 670
595 #define VAR(name,type) slot->name = PL_ ## name; 671 #define VAR(name,type) slot->name = PL_ ## name;
596 # include "state.h" 672 # include "state.h"
597 #undef VAR 673 #undef VAR
598 } 674 }
… …
676#if !PERL_VERSION_ATLEAST (5,10,0) 752#if !PERL_VERSION_ATLEAST (5,10,0)
677 Safefree (PL_retstack); 753 Safefree (PL_retstack);
678#endif 754#endif
679} 755}
680 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
681static size_t 766static size_t
682coro_rss (pTHX_ struct coro *coro) 767coro_rss (pTHX_ struct coro *coro)
683{ 768{
684 size_t rss = sizeof (*coro); 769 size_t rss = sizeof (*coro);
685 770
686 if (coro->mainstack) 771 if (coro->mainstack)
687 { 772 {
688 perl_slots tmp_slot;
689 perl_slots *slot;
690
691 if (coro->flags & CF_RUNNING) 773 if (coro->flags & CF_RUNNING)
692 { 774 {
693 slot = &tmp_slot; 775 #define SYM(sym) PL_ ## sym
694 776 CORO_RSS;
695 #define VAR(name,type) slot->name = PL_ ## name;
696 # include "state.h"
697 #undef VAR 777 #undef SYM
698 } 778 }
699 else 779 else
700 slot = coro->slot;
701
702 if (slot)
703 { 780 {
704 rss += sizeof (slot->curstackinfo); 781 #define SYM(sym) coro->slot->sym
705 rss += (slot->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT); 782 CORO_RSS;
706 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (slot->curstack)) * sizeof (SV *); 783 #undef SYM
707 rss += slot->tmps_max * sizeof (SV *);
708 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32);
709 rss += slot->scopestack_max * sizeof (I32);
710 rss += slot->savestack_max * sizeof (ANY);
711
712#if !PERL_VERSION_ATLEAST (5,10,0)
713 rss += slot->retstack_max * sizeof (OP *);
714#endif
715 } 784 }
716 } 785 }
717 786
718 return rss; 787 return rss;
719} 788}
… …
732#endif 801#endif
733 802
734/* 803/*
735 * This overrides the default magic get method of %SIG elements. 804 * This overrides the default magic get method of %SIG elements.
736 * 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
737 * 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
738 * readback here. 807 * readback here.
739 * We only do this when the hook is != 0, as they are often set to 0 temporarily,
740 * not expecting this to actually change the hook. This is a potential problem
741 * when a schedule happens then, but we ignore this.
742 */ 808 */
743static int 809static int
744coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 810coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
745{ 811{
746 const char *s = MgPV_nolen_const (mg); 812 const char *s = MgPV_nolen_const (mg);
… …
799 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 865 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
800 866
801 if (svp) 867 if (svp)
802 { 868 {
803 SV *old = *svp; 869 SV *old = *svp;
804 *svp = newSVsv (sv); 870 *svp = SvOK (sv) ? newSVsv (sv) : 0;
805 SvREFCNT_dec (old); 871 SvREFCNT_dec (old);
806 return 0; 872 return 0;
807 } 873 }
808 } 874 }
809 875
… …
819 885
820static int 886static int
821slf_check_nop (pTHX_ struct CoroSLF *frame) 887slf_check_nop (pTHX_ struct CoroSLF *frame)
822{ 888{
823 return 0; 889 return 0;
890}
891
892static int
893slf_check_repeat (pTHX_ struct CoroSLF *frame)
894{
895 return 1;
824} 896}
825 897
826static UNOP coro_setup_op; 898static UNOP coro_setup_op;
827 899
828static 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 */
… …
835 907
836 PL_runops = RUNOPS_DEFAULT; 908 PL_runops = RUNOPS_DEFAULT;
837 PL_curcop = &PL_compiling; 909 PL_curcop = &PL_compiling;
838 PL_in_eval = EVAL_NULL; 910 PL_in_eval = EVAL_NULL;
839 PL_comppad = 0; 911 PL_comppad = 0;
912 PL_comppad_name = 0;
913 PL_comppad_name_fill = 0;
914 PL_comppad_name_floor = 0;
840 PL_curpm = 0; 915 PL_curpm = 0;
841 PL_curpad = 0; 916 PL_curpad = 0;
842 PL_localizing = 0; 917 PL_localizing = 0;
843 PL_dirty = 0; 918 PL_dirty = 0;
844 PL_restartop = 0; 919 PL_restartop = 0;
845#if PERL_VERSION_ATLEAST (5,10,0) 920#if PERL_VERSION_ATLEAST (5,10,0)
846 PL_parser = 0; 921 PL_parser = 0;
847#endif 922#endif
923 PL_hints = 0;
848 924
849 /* recreate the die/warn hooks */ 925 /* recreate the die/warn hooks */
850 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 );
851 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);
852 928
853 GvSV (PL_defgv) = newSV (0); 929 GvSV (PL_defgv) = newSV (0);
854 GvAV (PL_defgv) = coro->args; coro->args = 0; 930 GvAV (PL_defgv) = coro->args; coro->args = 0;
855 GvSV (PL_errgv) = newSV (0); 931 GvSV (PL_errgv) = newSV (0);
856 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;
857 PL_rs = newSVsv (GvSV (irsgv)); 934 PL_rs = newSVsv (GvSV (irsgv));
858 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 935 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
859 936
860 { 937 {
861 dSP; 938 dSP;
862 UNOP myop; 939 UNOP myop;
863 940
864 Zero (&myop, 1, UNOP); 941 Zero (&myop, 1, UNOP);
865 myop.op_next = Nullop; 942 myop.op_next = Nullop;
943 myop.op_type = OP_ENTERSUB;
866 myop.op_flags = OPf_WANT_VOID; 944 myop.op_flags = OPf_WANT_VOID;
867 945
868 PUSHMARK (SP); 946 PUSHMARK (SP);
869 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv)))); 947 PUSHs ((SV *)coro->startcv);
870 PUTBACK; 948 PUTBACK;
871 PL_op = (OP *)&myop; 949 PL_op = (OP *)&myop;
872 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 950 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
873 SPAGAIN;
874 } 951 }
875 952
876 /* this newly created coroutine might be run on an existing cctx which most 953 /* this newly created coroutine might be run on an existing cctx which most
877 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here. 954 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
878 */ 955 */
879 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 */
880 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 */
881 958
882 /* 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 */
883 coro_setup_op.op_next = PL_op; 960 coro_setup_op.op_next = PL_op;
884 coro_setup_op.op_type = OP_CUSTOM; 961 coro_setup_op.op_type = OP_ENTERSUB;
885 coro_setup_op.op_ppaddr = pp_slf; 962 coro_setup_op.op_ppaddr = pp_slf;
886 /* no flags required, as an init function won't be called */ 963 /* no flags etc. required, as an init function won't be called */
887 964
888 PL_op = (OP *)&coro_setup_op; 965 PL_op = (OP *)&coro_setup_op;
889 966
890 /* copy throw, in case it was set before coro_setup */ 967 /* copy throw, in case it was set before coro_setup */
891 CORO_THROW = coro->except; 968 CORO_THROW = coro->except;
892} 969}
893 970
894static void 971static void
895coro_destruct (pTHX_ struct coro *coro) 972coro_unwind_stacks (pTHX)
896{ 973{
897 if (!IN_DESTRUCT) 974 if (!IN_DESTRUCT)
898 { 975 {
899 /* restore all saved variables and stuff */ 976 /* restore all saved variables and stuff */
900 LEAVE_SCOPE (0); 977 LEAVE_SCOPE (0);
… …
908 POPSTACK_TO (PL_mainstack); 985 POPSTACK_TO (PL_mainstack);
909 986
910 /* unwind main stack */ 987 /* unwind main stack */
911 dounwind (-1); 988 dounwind (-1);
912 } 989 }
990}
913 991
914 SvREFCNT_dec (GvSV (PL_defgv)); 992static void
915 SvREFCNT_dec (GvAV (PL_defgv)); 993coro_destruct_perl (pTHX_ struct coro *coro)
916 SvREFCNT_dec (GvSV (PL_errgv)); 994{
917 SvREFCNT_dec (PL_defoutgv); 995 SV *svf [9];
918 SvREFCNT_dec (PL_rs);
919 SvREFCNT_dec (GvSV (irsgv));
920 996
921 SvREFCNT_dec (PL_diehook);
922 SvREFCNT_dec (PL_warnhook);
923 997 {
924 SvREFCNT_dec (CORO_THROW); 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 coro_unwind_stacks (aTHX);
1005 coro_destruct_stacks (aTHX);
1006
1007 // now save some sv's to be free'd later
1008 svf [0] = GvSV (PL_defgv);
1009 svf [1] = (SV *)GvAV (PL_defgv);
1010 svf [2] = GvSV (PL_errgv);
1011 svf [3] = (SV *)PL_defoutgv;
1012 svf [4] = PL_rs;
1013 svf [5] = GvSV (irsgv);
1014 svf [6] = (SV *)GvHV (PL_hintgv);
1015 svf [7] = PL_diehook;
1016 svf [8] = PL_warnhook;
1017 assert (9 == sizeof (svf) / sizeof (*svf));
1018
1019 load_perl (aTHX_ current);
1020 }
1021
1022 {
1023 int i;
1024
1025 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i)
1026 SvREFCNT_dec (svf [i]);
1027
925 SvREFCNT_dec (coro->saved_deffh); 1028 SvREFCNT_dec (coro->saved_deffh);
926 SvREFCNT_dec (coro->rouse_cb); 1029 SvREFCNT_dec (coro->rouse_cb);
927 1030 SvREFCNT_dec (coro->invoke_cb);
928 coro_destruct_stacks (aTHX); 1031 SvREFCNT_dec (coro->invoke_av);
1032 }
929} 1033}
930 1034
931INLINE void 1035INLINE void
932free_coro_mortal (pTHX) 1036free_coro_mortal (pTHX)
933{ 1037{
… …
941static int 1045static int
942runops_trace (pTHX) 1046runops_trace (pTHX)
943{ 1047{
944 COP *oldcop = 0; 1048 COP *oldcop = 0;
945 int oldcxix = -2; 1049 int oldcxix = -2;
946 struct coro *coro = SvSTATE_current; /* trace cctx is tied to specific coro */
947 coro_cctx *cctx = coro->cctx;
948 1050
949 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX))) 1051 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX)))
950 { 1052 {
951 PERL_ASYNC_CHECK (); 1053 PERL_ASYNC_CHECK ();
952 1054
953 if (cctx->flags & CC_TRACE_ALL) 1055 if (cctx_current->flags & CC_TRACE_ALL)
954 { 1056 {
955 if (PL_op->op_type == OP_LEAVESUB && cctx->flags & CC_TRACE_SUB) 1057 if (PL_op->op_type == OP_LEAVESUB && cctx_current->flags & CC_TRACE_SUB)
956 { 1058 {
957 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1059 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
958 SV **bot, **top; 1060 SV **bot, **top;
959 AV *av = newAV (); /* return values */ 1061 AV *av = newAV (); /* return values */
960 SV **cb; 1062 SV **cb;
… …
997 1099
998 if (PL_curcop != &PL_compiling) 1100 if (PL_curcop != &PL_compiling)
999 { 1101 {
1000 SV **cb; 1102 SV **cb;
1001 1103
1002 if (oldcxix != cxstack_ix && cctx->flags & CC_TRACE_SUB) 1104 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB)
1003 { 1105 {
1004 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1106 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1005 1107
1006 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1108 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1007 { 1109 {
1008 runops_proc_t old_runops = PL_runops;
1009 dSP; 1110 dSP;
1010 GV *gv = CvGV (cx->blk_sub.cv); 1111 GV *gv = CvGV (cx->blk_sub.cv);
1011 SV *fullname = sv_2mortal (newSV (0)); 1112 SV *fullname = sv_2mortal (newSV (0));
1012 1113
1013 if (isGV (gv)) 1114 if (isGV (gv))
… …
1018 SAVETMPS; 1119 SAVETMPS;
1019 EXTEND (SP, 3); 1120 EXTEND (SP, 3);
1020 PUSHMARK (SP); 1121 PUSHMARK (SP);
1021 PUSHs (&PL_sv_yes); 1122 PUSHs (&PL_sv_yes);
1022 PUSHs (fullname); 1123 PUSHs (fullname);
1023 PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef); 1124 PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef);
1024 PUTBACK; 1125 PUTBACK;
1025 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0); 1126 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
1026 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 1127 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
1027 SPAGAIN; 1128 SPAGAIN;
1028 FREETMPS; 1129 FREETMPS;
… …
1031 } 1132 }
1032 1133
1033 oldcxix = cxstack_ix; 1134 oldcxix = cxstack_ix;
1034 } 1135 }
1035 1136
1036 if (cctx->flags & CC_TRACE_LINE) 1137 if (cctx_current->flags & CC_TRACE_LINE)
1037 { 1138 {
1038 dSP; 1139 dSP;
1039 1140
1040 PL_runops = RUNOPS_DEFAULT; 1141 PL_runops = RUNOPS_DEFAULT;
1041 ENTER; 1142 ENTER;
… …
1060 1161
1061 TAINT_NOT; 1162 TAINT_NOT;
1062 return 0; 1163 return 0;
1063} 1164}
1064 1165
1065static struct coro_cctx *cctx_ssl_cctx;
1066static struct CoroSLF cctx_ssl_frame; 1166static struct CoroSLF cctx_ssl_frame;
1067 1167
1068static void 1168static void
1069slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta) 1169slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta)
1070{ 1170{
1071 ta->prev = (struct coro *)cctx_ssl_cctx;
1072 ta->next = 0; 1171 ta->prev = 0;
1073} 1172}
1074 1173
1075static int 1174static int
1076slf_check_set_stacklevel (pTHX_ struct CoroSLF *frame) 1175slf_check_set_stacklevel (pTHX_ struct CoroSLF *frame)
1077{ 1176{
… …
1080 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1179 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1081} 1180}
1082 1181
1083/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1182/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1084static void NOINLINE 1183static void NOINLINE
1085cctx_prepare (pTHX_ coro_cctx *cctx) 1184cctx_prepare (pTHX)
1086{ 1185{
1087 PL_top_env = &PL_start_env; 1186 PL_top_env = &PL_start_env;
1088 1187
1089 if (cctx->flags & CC_TRACE) 1188 if (cctx_current->flags & CC_TRACE)
1090 PL_runops = runops_trace; 1189 PL_runops = runops_trace;
1091 1190
1092 /* we already must be executing an SLF op, there is no other valid way 1191 /* we already must be executing an SLF op, there is no other valid way
1093 * that can lead to creation of a new cctx */ 1192 * that can lead to creation of a new cctx */
1094 assert (("FATAL: can't prepare slf-less cctx in Coro module (please report)", 1193 assert (("FATAL: can't prepare slf-less cctx in Coro module (please report)",
1095 slf_frame.prepare && PL_op->op_ppaddr == pp_slf)); 1194 slf_frame.prepare && PL_op->op_ppaddr == pp_slf));
1096 1195
1097 /* we must emulate leaving pp_slf, which is done inside slf_check_set_stacklevel */ 1196 /* we must emulate leaving pp_slf, which is done inside slf_check_set_stacklevel */
1098 cctx_ssl_cctx = cctx;
1099 cctx_ssl_frame = slf_frame; 1197 cctx_ssl_frame = slf_frame;
1100 1198
1101 slf_frame.prepare = slf_prepare_set_stacklevel; 1199 slf_frame.prepare = slf_prepare_set_stacklevel;
1102 slf_frame.check = slf_check_set_stacklevel; 1200 slf_frame.check = slf_check_set_stacklevel;
1103} 1201}
… …
1126 /* normally we would need to skip the entersub here */ 1224 /* normally we would need to skip the entersub here */
1127 /* not doing so will re-execute it, which is exactly what we want */ 1225 /* not doing so will re-execute it, which is exactly what we want */
1128 /* PL_nop = PL_nop->op_next */ 1226 /* PL_nop = PL_nop->op_next */
1129 1227
1130 /* inject a fake subroutine call to cctx_init */ 1228 /* inject a fake subroutine call to cctx_init */
1131 cctx_prepare (aTHX_ (coro_cctx *)arg); 1229 cctx_prepare (aTHX);
1132 1230
1133 /* cctx_run is the alternative tail of transfer() */ 1231 /* cctx_run is the alternative tail of transfer() */
1134 transfer_tail (aTHX); 1232 transfer_tail (aTHX);
1135 1233
1136 /* somebody or something will hit me for both perl_run and PL_restartop */ 1234 /* somebody or something will hit me for both perl_run and PL_restartop */
1137 PL_restartop = PL_op; 1235 PL_restartop = PL_op;
1138 perl_run (PL_curinterp); 1236 perl_run (PL_curinterp);
1237 /*
1238 * Unfortunately, there is no way to get at the return values of the
1239 * coro body here, as perl_run destroys these
1240 */
1139 1241
1140 /* 1242 /*
1141 * If perl-run returns we assume exit() was being called or the coro 1243 * If perl-run returns we assume exit() was being called or the coro
1142 * fell off the end, which seems to be the only valid (non-bug) 1244 * fell off the end, which seems to be the only valid (non-bug)
1143 * reason for perl_run to return. We try to exit by jumping to the 1245 * reason for perl_run to return. We try to exit by jumping to the
1144 * bootstrap-time "top" top_env, as we cannot restore the "main" 1246 * bootstrap-time "top" top_env, as we cannot restore the "main"
1145 * coroutine as Coro has no such concept 1247 * coroutine as Coro has no such concept.
1248 * This actually isn't valid with the pthread backend, but OSes requiring
1249 * that backend are too broken to do it in a standards-compliant way.
1146 */ 1250 */
1147 PL_top_env = main_top_env; 1251 PL_top_env = main_top_env;
1148 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */ 1252 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1149 } 1253 }
1150} 1254}
… …
1227cctx_destroy (coro_cctx *cctx) 1331cctx_destroy (coro_cctx *cctx)
1228{ 1332{
1229 if (!cctx) 1333 if (!cctx)
1230 return; 1334 return;
1231 1335
1336 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary?
1337
1232 --cctx_count; 1338 --cctx_count;
1233 coro_destroy (&cctx->cctx); 1339 coro_destroy (&cctx->cctx);
1234 1340
1235 /* coro_transfer creates new, empty cctx's */ 1341 /* coro_transfer creates new, empty cctx's */
1236 if (cctx->sptr) 1342 if (cctx->sptr)
… …
1299 /* TODO: throwing up here is considered harmful */ 1405 /* TODO: throwing up here is considered harmful */
1300 1406
1301 if (expect_true (prev != next)) 1407 if (expect_true (prev != next))
1302 { 1408 {
1303 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1409 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1304 croak ("Coro::State::transfer called with non-running/new prev Coro::State, but can only transfer from running or new states,"); 1410 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1305 1411
1306 if (expect_false (next->flags & CF_RUNNING))
1307 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states,");
1308
1309 if (expect_false (next->flags & CF_DESTROYED)) 1412 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED)))
1310 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states,"); 1413 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1311 1414
1312#if !PERL_VERSION_ATLEAST (5,10,0) 1415#if !PERL_VERSION_ATLEAST (5,10,0)
1313 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1416 if (expect_false (PL_lex_state != LEX_NOTPARSING))
1314 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,"); 1417 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1315#endif 1418#endif
… …
1321transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1424transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1322{ 1425{
1323 dSTACKLEVEL; 1426 dSTACKLEVEL;
1324 1427
1325 /* sometimes transfer is only called to set idle_sp */ 1428 /* sometimes transfer is only called to set idle_sp */
1326 if (expect_false (!next)) 1429 if (expect_false (!prev))
1327 { 1430 {
1328 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1431 cctx_current->idle_sp = STACKLEVEL;
1329 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1432 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1330 } 1433 }
1331 else if (expect_true (prev != next)) 1434 else if (expect_true (prev != next))
1332 { 1435 {
1333 coro_cctx *prev__cctx; 1436 coro_cctx *cctx_prev;
1334 1437
1335 if (expect_false (prev->flags & CF_NEW)) 1438 if (expect_false (prev->flags & CF_NEW))
1336 { 1439 {
1337 /* create a new empty/source context */ 1440 /* create a new empty/source context */
1338 prev->cctx = cctx_new_empty ();
1339 prev->flags &= ~CF_NEW; 1441 prev->flags &= ~CF_NEW;
1340 prev->flags |= CF_RUNNING; 1442 prev->flags |= CF_RUNNING;
1341 } 1443 }
1342 1444
1343 prev->flags &= ~CF_RUNNING; 1445 prev->flags &= ~CF_RUNNING;
… …
1354 coro_setup (aTHX_ next); 1456 coro_setup (aTHX_ next);
1355 } 1457 }
1356 else 1458 else
1357 load_perl (aTHX_ next); 1459 load_perl (aTHX_ next);
1358 1460
1359 prev__cctx = prev->cctx;
1360
1361 /* possibly untie and reuse the cctx */ 1461 /* possibly untie and reuse the cctx */
1362 if (expect_true ( 1462 if (expect_true (
1363 prev__cctx->idle_sp == STACKLEVEL 1463 cctx_current->idle_sp == STACKLEVEL
1364 && !(prev__cctx->flags & CC_TRACE) 1464 && !(cctx_current->flags & CC_TRACE)
1365 && !force_cctx 1465 && !force_cctx
1366 )) 1466 ))
1367 { 1467 {
1368 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1468 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */
1369 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == prev__cctx->idle_te)); 1469 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1370 1470
1371 prev->cctx = 0;
1372
1373 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */ 1471 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */
1374 /* without this the next cctx_get might destroy the prev__cctx while still in use */ 1472 /* without this the next cctx_get might destroy the running cctx while still in use */
1375 if (expect_false (CCTX_EXPIRED (prev__cctx))) 1473 if (expect_false (CCTX_EXPIRED (cctx_current)))
1376 if (!next->cctx) 1474 if (expect_true (!next->cctx))
1377 next->cctx = cctx_get (aTHX); 1475 next->cctx = cctx_get (aTHX);
1378 1476
1379 cctx_put (prev__cctx); 1477 cctx_put (cctx_current);
1380 } 1478 }
1479 else
1480 prev->cctx = cctx_current;
1381 1481
1382 ++next->usecount; 1482 ++next->usecount;
1383 1483
1384 if (expect_true (!next->cctx)) 1484 cctx_prev = cctx_current;
1385 next->cctx = cctx_get (aTHX); 1485 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1386 1486
1387 if (expect_false (prev__cctx != next->cctx)) 1487 next->cctx = 0;
1488
1489 if (expect_false (cctx_prev != cctx_current))
1388 { 1490 {
1389 prev__cctx->top_env = PL_top_env; 1491 cctx_prev->top_env = PL_top_env;
1390 PL_top_env = next->cctx->top_env; 1492 PL_top_env = cctx_current->top_env;
1391 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1493 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1392 } 1494 }
1393 1495
1394 transfer_tail (aTHX); 1496 transfer_tail (aTHX);
1395 } 1497 }
1396} 1498}
… …
1404coro_state_destroy (pTHX_ struct coro *coro) 1506coro_state_destroy (pTHX_ struct coro *coro)
1405{ 1507{
1406 if (coro->flags & CF_DESTROYED) 1508 if (coro->flags & CF_DESTROYED)
1407 return 0; 1509 return 0;
1408 1510
1409 if (coro->on_destroy) 1511 if (coro->on_destroy && !PL_dirty)
1410 coro->on_destroy (aTHX_ coro); 1512 coro->on_destroy (aTHX_ coro);
1411 1513
1412 coro->flags |= CF_DESTROYED; 1514 coro->flags |= CF_DESTROYED;
1413 1515
1414 if (coro->flags & CF_READY) 1516 if (coro->flags & CF_READY)
… …
1418 --coro_nready; 1520 --coro_nready;
1419 } 1521 }
1420 else 1522 else
1421 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1523 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1422 1524
1423 if (coro->mainstack && coro->mainstack != main_mainstack) 1525 if (coro->mainstack
1424 { 1526 && coro->mainstack != main_mainstack
1425 struct coro temp; 1527 && coro->slot
1426 1528 && !PL_dirty)
1427 assert (("FATAL: tried to destroy currently running coroutine (please report)", !(coro->flags & CF_RUNNING)));
1428
1429 save_perl (aTHX_ &temp);
1430 load_perl (aTHX_ coro);
1431
1432 coro_destruct (aTHX_ coro); 1529 coro_destruct_perl (aTHX_ coro);
1433
1434 load_perl (aTHX_ &temp);
1435
1436 coro->slot = 0;
1437 }
1438 1530
1439 cctx_destroy (coro->cctx); 1531 cctx_destroy (coro->cctx);
1532 SvREFCNT_dec (coro->startcv);
1440 SvREFCNT_dec (coro->args); 1533 SvREFCNT_dec (coro->args);
1534 SvREFCNT_dec (CORO_THROW);
1441 1535
1442 if (coro->next) coro->next->prev = coro->prev; 1536 if (coro->next) coro->next->prev = coro->prev;
1443 if (coro->prev) coro->prev->next = coro->next; 1537 if (coro->prev) coro->prev->next = coro->next;
1444 if (coro == coro_first) coro_first = coro->next; 1538 if (coro == coro_first) coro_first = coro->next;
1445 1539
… …
1527/** Coro ********************************************************************/ 1621/** Coro ********************************************************************/
1528 1622
1529INLINE void 1623INLINE void
1530coro_enq (pTHX_ struct coro *coro) 1624coro_enq (pTHX_ struct coro *coro)
1531{ 1625{
1532 av_push (coro_ready [coro->prio - PRIO_MIN], SvREFCNT_inc_NN (coro->hv)); 1626 struct coro **ready = coro_ready [coro->prio - PRIO_MIN];
1533}
1534 1627
1535INLINE SV * 1628 SvREFCNT_inc_NN (coro->hv);
1629
1630 coro->next_ready = 0;
1631 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1632 ready [1] = coro;
1633}
1634
1635INLINE struct coro *
1536coro_deq (pTHX) 1636coro_deq (pTHX)
1537{ 1637{
1538 int prio; 1638 int prio;
1539 1639
1540 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; ) 1640 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; )
1541 if (AvFILLp (coro_ready [prio]) >= 0) 1641 {
1542 return av_shift (coro_ready [prio]); 1642 struct coro **ready = coro_ready [prio];
1643
1644 if (ready [0])
1645 {
1646 struct coro *coro = ready [0];
1647 ready [0] = coro->next_ready;
1648 return coro;
1649 }
1650 }
1543 1651
1544 return 0; 1652 return 0;
1545} 1653}
1546 1654
1547static int 1655static int
… …
1549{ 1657{
1550 struct coro *coro; 1658 struct coro *coro;
1551 SV *sv_hook; 1659 SV *sv_hook;
1552 void (*xs_hook)(void); 1660 void (*xs_hook)(void);
1553 1661
1554 if (SvROK (coro_sv))
1555 coro_sv = SvRV (coro_sv);
1556
1557 coro = SvSTATE (coro_sv); 1662 coro = SvSTATE (coro_sv);
1558 1663
1559 if (coro->flags & CF_READY) 1664 if (coro->flags & CF_READY)
1560 return 0; 1665 return 0;
1561 1666
… …
1592api_is_ready (pTHX_ SV *coro_sv) 1697api_is_ready (pTHX_ SV *coro_sv)
1593{ 1698{
1594 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1699 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1595} 1700}
1596 1701
1702/* expects to own a reference to next->hv */
1597INLINE void 1703INLINE void
1598prepare_schedule (pTHX_ struct coro_transfer_args *ta) 1704prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1599{ 1705{
1600 SV *prev_sv, *next_sv;
1601
1602 for (;;)
1603 {
1604 next_sv = coro_deq (aTHX);
1605
1606 /* nothing to schedule: call the idle handler */
1607 if (expect_false (!next_sv))
1608 {
1609 dSP;
1610
1611 ENTER;
1612 SAVETMPS;
1613
1614 PUSHMARK (SP);
1615 PUTBACK;
1616 call_sv (get_sv ("Coro::idle", FALSE), G_VOID | G_DISCARD);
1617
1618 FREETMPS;
1619 LEAVE;
1620 continue;
1621 }
1622
1623 ta->next = SvSTATE_hv (next_sv);
1624
1625 /* cannot transfer to destroyed coros, skip and look for next */
1626 if (expect_false (ta->next->flags & CF_DESTROYED))
1627 {
1628 SvREFCNT_dec (next_sv);
1629 /* coro_nready has already been taken care of by destroy */
1630 continue;
1631 }
1632
1633 --coro_nready;
1634 break;
1635 }
1636
1637 /* free this only after the transfer */
1638 prev_sv = SvRV (coro_current); 1706 SV *prev_sv = SvRV (coro_current);
1707
1639 ta->prev = SvSTATE_hv (prev_sv); 1708 ta->prev = SvSTATE_hv (prev_sv);
1709 ta->next = next;
1710
1640 TRANSFER_CHECK (*ta); 1711 TRANSFER_CHECK (*ta);
1641 assert (("FATAL: next coroutine isn't marked as ready in Coro (please report)", ta->next->flags & CF_READY)); 1712
1642 ta->next->flags &= ~CF_READY;
1643 SvRV_set (coro_current, next_sv); 1713 SvRV_set (coro_current, (SV *)next->hv);
1644 1714
1645 free_coro_mortal (aTHX); 1715 free_coro_mortal (aTHX);
1646 coro_mortal = prev_sv; 1716 coro_mortal = prev_sv;
1647} 1717}
1648 1718
1719static void
1720prepare_schedule (pTHX_ struct coro_transfer_args *ta)
1721{
1722 for (;;)
1723 {
1724 struct coro *next = coro_deq (aTHX);
1725
1726 if (expect_true (next))
1727 {
1728 /* cannot transfer to destroyed coros, skip and look for next */
1729 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED)))
1730 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1731 else
1732 {
1733 next->flags &= ~CF_READY;
1734 --coro_nready;
1735
1736 prepare_schedule_to (aTHX_ ta, next);
1737 break;
1738 }
1739 }
1740 else
1741 {
1742 /* nothing to schedule: call the idle handler */
1743 if (SvROK (sv_idle)
1744 && SvOBJECT (SvRV (sv_idle)))
1745 {
1746 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1747 api_ready (aTHX_ SvRV (sv_idle));
1748 --coro_nready;
1749 }
1750 else
1751 {
1752 dSP;
1753
1754 ENTER;
1755 SAVETMPS;
1756
1757 PUSHMARK (SP);
1758 PUTBACK;
1759 call_sv (sv_idle, G_VOID | G_DISCARD);
1760
1761 FREETMPS;
1762 LEAVE;
1763 }
1764 }
1765 }
1766}
1767
1649INLINE void 1768INLINE void
1650prepare_cede (pTHX_ struct coro_transfer_args *ta) 1769prepare_cede (pTHX_ struct coro_transfer_args *ta)
1651{ 1770{
1652 api_ready (aTHX_ coro_current); 1771 api_ready (aTHX_ coro_current);
1653 prepare_schedule (aTHX_ ta); 1772 prepare_schedule (aTHX_ ta);
… …
1672{ 1791{
1673 struct coro_transfer_args ta; 1792 struct coro_transfer_args ta;
1674 1793
1675 prepare_schedule (aTHX_ &ta); 1794 prepare_schedule (aTHX_ &ta);
1676 TRANSFER (ta, 1); 1795 TRANSFER (ta, 1);
1796}
1797
1798static void
1799api_schedule_to (pTHX_ SV *coro_sv)
1800{
1801 struct coro_transfer_args ta;
1802 struct coro *next = SvSTATE (coro_sv);
1803
1804 SvREFCNT_inc_NN (coro_sv);
1805 prepare_schedule_to (aTHX_ &ta, next);
1677} 1806}
1678 1807
1679static int 1808static int
1680api_cede (pTHX) 1809api_cede (pTHX)
1681{ 1810{
… …
1710static void 1839static void
1711api_trace (pTHX_ SV *coro_sv, int flags) 1840api_trace (pTHX_ SV *coro_sv, int flags)
1712{ 1841{
1713 struct coro *coro = SvSTATE (coro_sv); 1842 struct coro *coro = SvSTATE (coro_sv);
1714 1843
1844 if (coro->flags & CF_RUNNING)
1845 croak ("cannot enable tracing on a running coroutine, caught");
1846
1715 if (flags & CC_TRACE) 1847 if (flags & CC_TRACE)
1716 { 1848 {
1717 if (!coro->cctx) 1849 if (!coro->cctx)
1718 coro->cctx = cctx_new_run (); 1850 coro->cctx = cctx_new_run ();
1719 else if (!(coro->cctx->flags & CC_TRACE)) 1851 else if (!(coro->cctx->flags & CC_TRACE))
1720 croak ("cannot enable tracing on coroutine with custom stack,"); 1852 croak ("cannot enable tracing on coroutine with custom stack, caught");
1721 1853
1722 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL)); 1854 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL));
1723 } 1855 }
1724 else if (coro->cctx && coro->cctx->flags & CC_TRACE) 1856 else if (coro->cctx && coro->cctx->flags & CC_TRACE)
1725 { 1857 {
… …
1730 else 1862 else
1731 coro->slot->runops = RUNOPS_DEFAULT; 1863 coro->slot->runops = RUNOPS_DEFAULT;
1732 } 1864 }
1733} 1865}
1734 1866
1867static void
1868coro_call_on_destroy (pTHX_ struct coro *coro)
1869{
1870 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0);
1871 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1872
1873 if (on_destroyp)
1874 {
1875 AV *on_destroy = (AV *)SvRV (*on_destroyp);
1876
1877 while (AvFILLp (on_destroy) >= 0)
1878 {
1879 dSP; /* don't disturb outer sp */
1880 SV *cb = av_pop (on_destroy);
1881
1882 PUSHMARK (SP);
1883
1884 if (statusp)
1885 {
1886 int i;
1887 AV *status = (AV *)SvRV (*statusp);
1888 EXTEND (SP, AvFILLp (status) + 1);
1889
1890 for (i = 0; i <= AvFILLp (status); ++i)
1891 PUSHs (AvARRAY (status)[i]);
1892 }
1893
1894 PUTBACK;
1895 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD);
1896 }
1897 }
1898}
1899
1900static void
1901slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1902{
1903 int i;
1904 HV *hv = (HV *)SvRV (coro_current);
1905 AV *av = newAV ();
1906
1907 av_extend (av, items - 1);
1908 for (i = 0; i < items; ++i)
1909 av_push (av, SvREFCNT_inc_NN (arg [i]));
1910
1911 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0);
1912
1913 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */
1914 api_ready (aTHX_ sv_manager);
1915
1916 frame->prepare = prepare_schedule;
1917 frame->check = slf_check_repeat;
1918
1919 /* as a minor optimisation, we could unwind all stacks here */
1920 /* but that puts extra pressure on pp_slf, and is not worth much */
1921 /*coro_unwind_stacks (aTHX);*/
1922}
1923
1924/*****************************************************************************/
1925/* async pool handler */
1926
1927static int
1928slf_check_pool_handler (pTHX_ struct CoroSLF *frame)
1929{
1930 HV *hv = (HV *)SvRV (coro_current);
1931 struct coro *coro = (struct coro *)frame->data;
1932
1933 if (!coro->invoke_cb)
1934 return 1; /* loop till we have invoke */
1935 else
1936 {
1937 hv_store (hv, "desc", sizeof ("desc") - 1,
1938 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
1939
1940 coro->saved_deffh = SvREFCNT_inc_NN ((SV *)PL_defoutgv);
1941
1942 {
1943 dSP;
1944 XPUSHs (sv_2mortal (coro->invoke_cb)); coro->invoke_cb = 0;
1945 PUTBACK;
1946 }
1947
1948 SvREFCNT_dec (GvAV (PL_defgv));
1949 GvAV (PL_defgv) = coro->invoke_av;
1950 coro->invoke_av = 0;
1951
1952 return 0;
1953 }
1954}
1955
1956static void
1957slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1958{
1959 HV *hv = (HV *)SvRV (coro_current);
1960 struct coro *coro = SvSTATE_hv ((SV *)hv);
1961
1962 if (expect_true (coro->saved_deffh))
1963 {
1964 /* subsequent iteration */
1965 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1966 coro->saved_deffh = 0;
1967
1968 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
1969 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1970 {
1971 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate);
1972 coro->invoke_av = newAV ();
1973
1974 frame->prepare = prepare_nop;
1975 }
1976 else
1977 {
1978 av_clear (GvAV (PL_defgv));
1979 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
1980
1981 coro->prio = 0;
1982
1983 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
1984 api_trace (aTHX_ coro_current, 0);
1985
1986 frame->prepare = prepare_schedule;
1987 av_push (av_async_pool, SvREFCNT_inc (hv));
1988 }
1989 }
1990 else
1991 {
1992 /* first iteration, simply fall through */
1993 frame->prepare = prepare_nop;
1994 }
1995
1996 frame->check = slf_check_pool_handler;
1997 frame->data = (void *)coro;
1998}
1999
1735/*****************************************************************************/ 2000/*****************************************************************************/
1736/* rouse callback */ 2001/* rouse callback */
1737 2002
1738#define CORO_MAGIC_type_rouse PERL_MAGIC_ext 2003#define CORO_MAGIC_type_rouse PERL_MAGIC_ext
1739 2004
… …
1744 SV *data = (SV *)GENSUB_ARG; 2009 SV *data = (SV *)GENSUB_ARG;
1745 2010
1746 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2011 if (SvTYPE (SvRV (data)) != SVt_PVAV)
1747 { 2012 {
1748 /* first call, set args */ 2013 /* first call, set args */
1749 int i; 2014 SV *coro = SvRV (data);
1750 AV *av = newAV (); 2015 AV *av = newAV ();
1751 SV *coro = SvRV (data);
1752 2016
1753 SvRV_set (data, (SV *)av); 2017 SvRV_set (data, (SV *)av);
1754 api_ready (aTHX_ coro);
1755 SvREFCNT_dec (coro);
1756 2018
1757 /* better take a full copy of the arguments */ 2019 /* better take a full copy of the arguments */
1758 while (items--) 2020 while (items--)
1759 av_store (av, items, newSVsv (ST (items))); 2021 av_store (av, items, newSVsv (ST (items)));
2022
2023 api_ready (aTHX_ coro);
2024 SvREFCNT_dec (coro);
1760 } 2025 }
1761 2026
1762 XSRETURN_EMPTY; 2027 XSRETURN_EMPTY;
1763} 2028}
1764 2029
… …
1781 2046
1782 EXTEND (SP, AvFILLp (av) + 1); 2047 EXTEND (SP, AvFILLp (av) + 1);
1783 for (i = 0; i <= AvFILLp (av); ++i) 2048 for (i = 0; i <= AvFILLp (av); ++i)
1784 PUSHs (sv_2mortal (AvARRAY (av)[i])); 2049 PUSHs (sv_2mortal (AvARRAY (av)[i]));
1785 2050
1786 /* we have stolen the elements, so ste length to zero and free */ 2051 /* we have stolen the elements, so set length to zero and free */
1787 AvFILLp (av) = -1; 2052 AvFILLp (av) = -1;
1788 av_undef (av); 2053 av_undef (av);
1789 2054
1790 PUTBACK; 2055 PUTBACK;
1791 } 2056 }
… …
1895static void 2160static void
1896slf_init_schedule (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2161slf_init_schedule (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1897{ 2162{
1898 frame->prepare = prepare_schedule; 2163 frame->prepare = prepare_schedule;
1899 frame->check = slf_check_nop; 2164 frame->check = slf_check_nop;
2165}
2166
2167static void
2168slf_prepare_schedule_to (pTHX_ struct coro_transfer_args *ta)
2169{
2170 struct coro *next = (struct coro *)slf_frame.data;
2171
2172 SvREFCNT_inc_NN (next->hv);
2173 prepare_schedule_to (aTHX_ ta, next);
2174}
2175
2176static void
2177slf_init_schedule_to (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2178{
2179 if (!items)
2180 croak ("Coro::schedule_to expects a coroutine argument, caught");
2181
2182 frame->data = (void *)SvSTATE (arg [0]);
2183 frame->prepare = slf_prepare_schedule_to;
2184 frame->check = slf_check_nop;
2185}
2186
2187static void
2188slf_init_cede_to (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2189{
2190 api_ready (aTHX_ SvRV (coro_current));
2191
2192 slf_init_schedule_to (aTHX_ frame, cv, arg, items);
1900} 2193}
1901 2194
1902static void 2195static void
1903slf_init_cede (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2196slf_init_cede (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1904{ 2197{
… …
2050 } 2343 }
2051 else 2344 else
2052 slf_argc = 0; 2345 slf_argc = 0;
2053 2346
2054 PL_op->op_ppaddr = pp_slf; 2347 PL_op->op_ppaddr = pp_slf;
2055 PL_op->op_type = OP_CUSTOM; /* maybe we should leave it at entersub? */ 2348 /*PL_op->op_type = OP_CUSTOM; /* we do behave like entersub still */
2056 2349
2057 PL_op = (OP *)&slf_restore; 2350 PL_op = (OP *)&slf_restore;
2351}
2352
2353/*****************************************************************************/
2354/* dynamic wind */
2355
2356static void
2357on_enterleave_call (pTHX_ SV *cb)
2358{
2359 dSP;
2360
2361 PUSHSTACK;
2362
2363 PUSHMARK (SP);
2364 PUTBACK;
2365 call_sv (cb, G_VOID | G_DISCARD);
2366 SPAGAIN;
2367
2368 POPSTACK;
2369}
2370
2371static SV *
2372coro_avp_pop_and_free (pTHX_ AV **avp)
2373{
2374 AV *av = *avp;
2375 SV *res = av_pop (av);
2376
2377 if (AvFILLp (av) < 0)
2378 {
2379 *avp = 0;
2380 SvREFCNT_dec (av);
2381 }
2382
2383 return res;
2384}
2385
2386static void
2387coro_pop_on_enter (pTHX_ void *coro)
2388{
2389 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_enter);
2390 SvREFCNT_dec (cb);
2391}
2392
2393static void
2394coro_pop_on_leave (pTHX_ void *coro)
2395{
2396 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2397 on_enterleave_call (aTHX_ sv_2mortal (cb));
2058} 2398}
2059 2399
2060/*****************************************************************************/ 2400/*****************************************************************************/
2061/* PerlIO::cede */ 2401/* PerlIO::cede */
2062 2402
… …
2143 SV **ary; 2483 SV **ary;
2144 2484
2145 /* unfortunately, building manually saves memory */ 2485 /* unfortunately, building manually saves memory */
2146 Newx (ary, 2, SV *); 2486 Newx (ary, 2, SV *);
2147 AvALLOC (av) = ary; 2487 AvALLOC (av) = ary;
2488#if PERL_VERSION_ATLEAST (5,10,0)
2148 /*AvARRAY (av) = ary;*/ 2489 AvARRAY (av) = ary;
2490#else
2149 SvPVX ((SV *)av) = (char *)ary; /* 5.8.8 needs this syntax instead of AvARRAY = ary */ 2491 /* 5.8.8 needs this syntax instead of AvARRAY = ary, yet */
2492 /* -DDEBUGGING flags this as a bug, despite it perfectly working */
2493 SvPVX ((SV *)av) = (char *)ary;
2494#endif
2150 AvMAX (av) = 1; 2495 AvMAX (av) = 1;
2151 AvFILLp (av) = 0; 2496 AvFILLp (av) = 0;
2152 ary [0] = newSViv (count); 2497 ary [0] = newSViv (count);
2153 2498
2154 return newRV_noinc ((SV *)av); 2499 return newRV_noinc ((SV *)av);
… …
2174 AvARRAY (av)[0] = AvARRAY (av)[1]; 2519 AvARRAY (av)[0] = AvARRAY (av)[1];
2175 AvARRAY (av)[1] = count_sv; 2520 AvARRAY (av)[1] = count_sv;
2176 cb = av_shift (av); 2521 cb = av_shift (av);
2177 2522
2178 if (SvOBJECT (cb)) 2523 if (SvOBJECT (cb))
2524 {
2179 api_ready (aTHX_ cb); 2525 api_ready (aTHX_ cb);
2180 else 2526 --count;
2181 croak ("callbacks not yet supported"); 2527 }
2528 else if (SvTYPE (cb) == SVt_PVCV)
2529 {
2530 dSP;
2531 PUSHMARK (SP);
2532 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2533 PUTBACK;
2534 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2535 }
2182 2536
2183 SvREFCNT_dec (cb); 2537 SvREFCNT_dec (cb);
2184
2185 --count;
2186 } 2538 }
2187} 2539}
2188 2540
2189static void 2541static void
2190coro_semaphore_on_destroy (pTHX_ struct coro *coro) 2542coro_semaphore_on_destroy (pTHX_ struct coro *coro)
… …
2272} 2624}
2273 2625
2274static void 2626static void
2275slf_init_semaphore_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2627slf_init_semaphore_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2276{ 2628{
2629 if (items >= 2)
2630 {
2631 /* callback form */
2632 AV *av = (AV *)SvRV (arg [0]);
2633 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]);
2634
2635 av_push (av, (SV *)SvREFCNT_inc_NN (cb_cv));
2636
2637 if (SvIVX (AvARRAY (av)[0]) > 0)
2638 coro_semaphore_adjust (aTHX_ av, 0);
2639
2640 frame->prepare = prepare_nop;
2641 frame->check = slf_check_nop;
2642 }
2643 else
2644 {
2277 slf_init_semaphore_down_or_wait (aTHX_ frame, cv, arg, items); 2645 slf_init_semaphore_down_or_wait (aTHX_ frame, cv, arg, items);
2278 frame->check = slf_check_semaphore_wait; 2646 frame->check = slf_check_semaphore_wait;
2647 }
2279} 2648}
2280 2649
2281/* signal */ 2650/* signal */
2282 2651
2283static void 2652static void
… …
2355 dXSARGS; 2724 dXSARGS;
2356 AV *state = (AV *)GENSUB_ARG; 2725 AV *state = (AV *)GENSUB_ARG;
2357 SV *coro = av_pop (state); 2726 SV *coro = av_pop (state);
2358 SV *data_sv = newSV (sizeof (struct io_state)); 2727 SV *data_sv = newSV (sizeof (struct io_state));
2359 2728
2360 av_extend (state, items); 2729 av_extend (state, items - 1);
2361 2730
2362 sv_upgrade (data_sv, SVt_PV); 2731 sv_upgrade (data_sv, SVt_PV);
2363 SvCUR_set (data_sv, sizeof (struct io_state)); 2732 SvCUR_set (data_sv, sizeof (struct io_state));
2364 SvPOK_only (data_sv); 2733 SvPOK_only (data_sv);
2365 2734
… …
2500 XSRETURN_EMPTY; 2869 XSRETURN_EMPTY;
2501} 2870}
2502 2871
2503/*****************************************************************************/ 2872/*****************************************************************************/
2504 2873
2874#if CORO_CLONE
2875# include "clone.c"
2876#endif
2877
2505MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 2878MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2506 2879
2507PROTOTYPES: DISABLE 2880PROTOTYPES: DISABLE
2508 2881
2509BOOT: 2882BOOT:
… …
2513 coro_thx = PERL_GET_CONTEXT; 2886 coro_thx = PERL_GET_CONTEXT;
2514# endif 2887# endif
2515#endif 2888#endif
2516 BOOT_PAGESIZE; 2889 BOOT_PAGESIZE;
2517 2890
2891 cctx_current = cctx_new_empty ();
2892
2518 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 2893 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
2519 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 2894 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
2520 2895
2521 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 2896 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get;
2522 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set; 2897 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set;
… …
2541 2916
2542 { 2917 {
2543 SV *slf = sv_2mortal (newSViv (PTR2IV (pp_slf))); 2918 SV *slf = sv_2mortal (newSViv (PTR2IV (pp_slf)));
2544 2919
2545 if (!PL_custom_op_names) PL_custom_op_names = newHV (); 2920 if (!PL_custom_op_names) PL_custom_op_names = newHV ();
2546 hv_store_ent (PL_custom_op_names, slf, 2921 hv_store_ent (PL_custom_op_names, slf, newSVpv ("coro_slf", 0), 0);
2547 newSVpv ("coro_slf", 0), 0);
2548 2922
2549 if (!PL_custom_op_descs) PL_custom_op_descs = newHV (); 2923 if (!PL_custom_op_descs) PL_custom_op_descs = newHV ();
2550 hv_store_ent (PL_custom_op_descs, slf, 2924 hv_store_ent (PL_custom_op_descs, slf, newSVpv ("coro schedule like function", 0), 0);
2551 newSVpv ("coro schedule like function", 0), 0);
2552 } 2925 }
2553 2926
2554 coroapi.ver = CORO_API_VERSION; 2927 coroapi.ver = CORO_API_VERSION;
2555 coroapi.rev = CORO_API_REVISION; 2928 coroapi.rev = CORO_API_REVISION;
2556 2929
… …
2575 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 2948 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL));
2576} 2949}
2577 2950
2578SV * 2951SV *
2579new (char *klass, ...) 2952new (char *klass, ...)
2953 ALIAS:
2954 Coro::new = 1
2580 CODE: 2955 CODE:
2581{ 2956{
2582 struct coro *coro; 2957 struct coro *coro;
2583 MAGIC *mg; 2958 MAGIC *mg;
2584 HV *hv; 2959 HV *hv;
2960 CV *cb;
2585 int i; 2961 int i;
2962
2963 if (items > 1)
2964 {
2965 cb = coro_sv_2cv (aTHX_ ST (1));
2966
2967 if (!ix)
2968 {
2969 if (CvISXSUB (cb))
2970 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
2971
2972 if (!CvROOT (cb))
2973 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
2974 }
2975 }
2586 2976
2587 Newz (0, coro, 1, struct coro); 2977 Newz (0, coro, 1, struct coro);
2588 coro->args = newAV (); 2978 coro->args = newAV ();
2589 coro->flags = CF_NEW; 2979 coro->flags = CF_NEW;
2590 2980
… …
2595 coro->hv = hv = newHV (); 2985 coro->hv = hv = newHV ();
2596 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0); 2986 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
2597 mg->mg_flags |= MGf_DUP; 2987 mg->mg_flags |= MGf_DUP;
2598 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 2988 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
2599 2989
2990 if (items > 1)
2991 {
2600 av_extend (coro->args, items - 1); 2992 av_extend (coro->args, items - 1 + ix - 1);
2993
2994 if (ix)
2995 {
2996 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
2997 cb = cv_coro_run;
2998 }
2999
3000 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3001
2601 for (i = 1; i < items; i++) 3002 for (i = 2; i < items; i++)
2602 av_push (coro->args, newSVsv (ST (i))); 3003 av_push (coro->args, newSVsv (ST (i)));
3004 }
2603} 3005}
2604 OUTPUT: 3006 OUTPUT:
2605 RETVAL 3007 RETVAL
2606 3008
2607void 3009void
… …
2620void 3022void
2621_exit (int code) 3023_exit (int code)
2622 PROTOTYPE: $ 3024 PROTOTYPE: $
2623 CODE: 3025 CODE:
2624 _exit (code); 3026 _exit (code);
3027
3028SV *
3029clone (Coro::State coro)
3030 CODE:
3031{
3032#if CORO_CLONE
3033 struct coro *ncoro = coro_clone (aTHX_ coro);
3034 MAGIC *mg;
3035 /* TODO: too much duplication */
3036 ncoro->hv = newHV ();
3037 mg = sv_magicext ((SV *)ncoro->hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)ncoro, 0);
3038 mg->mg_flags |= MGf_DUP;
3039 RETVAL = sv_bless (newRV_noinc ((SV *)ncoro->hv), SvSTASH (coro->hv));
3040#else
3041 croak ("Coro::State->clone has not been configured into this installation of Coro, realised");
3042#endif
3043}
3044 OUTPUT:
3045 RETVAL
2625 3046
2626int 3047int
2627cctx_stacksize (int new_stacksize = 0) 3048cctx_stacksize (int new_stacksize = 0)
2628 PROTOTYPE: ;$ 3049 PROTOTYPE: ;$
2629 CODE: 3050 CODE:
… …
2679 eval = 1 3100 eval = 1
2680 CODE: 3101 CODE:
2681{ 3102{
2682 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3103 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
2683 { 3104 {
2684 struct coro temp; 3105 struct coro *current = SvSTATE_current;
2685 3106
2686 if (!(coro->flags & CF_RUNNING)) 3107 if (current != coro)
2687 { 3108 {
2688 PUTBACK; 3109 PUTBACK;
2689 save_perl (aTHX_ &temp); 3110 save_perl (aTHX_ current);
2690 load_perl (aTHX_ coro); 3111 load_perl (aTHX_ coro);
3112 SPAGAIN;
2691 } 3113 }
2692 3114
2693 {
2694 dSP;
2695 ENTER;
2696 SAVETMPS;
2697 PUTBACK;
2698 PUSHSTACK; 3115 PUSHSTACK;
3116
2699 PUSHMARK (SP); 3117 PUSHMARK (SP);
3118 PUTBACK;
2700 3119
2701 if (ix) 3120 if (ix)
2702 eval_sv (coderef, 0); 3121 eval_sv (coderef, 0);
2703 else 3122 else
2704 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 3123 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
2705 3124
2706 POPSTACK; 3125 POPSTACK;
2707 SPAGAIN; 3126 SPAGAIN;
2708 FREETMPS;
2709 LEAVE;
2710 PUTBACK;
2711 }
2712 3127
2713 if (!(coro->flags & CF_RUNNING)) 3128 if (current != coro)
2714 { 3129 {
3130 PUTBACK;
2715 save_perl (aTHX_ coro); 3131 save_perl (aTHX_ coro);
2716 load_perl (aTHX_ &temp); 3132 load_perl (aTHX_ current);
2717 SPAGAIN; 3133 SPAGAIN;
2718 } 3134 }
2719 } 3135 }
2720} 3136}
2721 3137
… …
2725 ALIAS: 3141 ALIAS:
2726 is_ready = CF_READY 3142 is_ready = CF_READY
2727 is_running = CF_RUNNING 3143 is_running = CF_RUNNING
2728 is_new = CF_NEW 3144 is_new = CF_NEW
2729 is_destroyed = CF_DESTROYED 3145 is_destroyed = CF_DESTROYED
3146 is_suspended = CF_SUSPENDED
2730 CODE: 3147 CODE:
2731 RETVAL = boolSV (coro->flags & ix); 3148 RETVAL = boolSV (coro->flags & ix);
2732 OUTPUT: 3149 OUTPUT:
2733 RETVAL 3150 RETVAL
2734 3151
… …
2750 3167
2751SV * 3168SV *
2752has_cctx (Coro::State coro) 3169has_cctx (Coro::State coro)
2753 PROTOTYPE: $ 3170 PROTOTYPE: $
2754 CODE: 3171 CODE:
2755 RETVAL = boolSV (!!coro->cctx); 3172 /* maybe manage the running flag differently */
3173 RETVAL = boolSV (!!coro->cctx || (coro->flags & CF_RUNNING));
2756 OUTPUT: 3174 OUTPUT:
2757 RETVAL 3175 RETVAL
2758 3176
2759int 3177int
2760is_traced (Coro::State coro) 3178is_traced (Coro::State coro)
… …
2780 3198
2781void 3199void
2782force_cctx () 3200force_cctx ()
2783 PROTOTYPE: 3201 PROTOTYPE:
2784 CODE: 3202 CODE:
2785 SvSTATE_current->cctx->idle_sp = 0; 3203 cctx_current->idle_sp = 0;
2786 3204
2787void 3205void
2788swap_defsv (Coro::State self) 3206swap_defsv (Coro::State self)
2789 PROTOTYPE: $ 3207 PROTOTYPE: $
2790 ALIAS: 3208 ALIAS:
… …
2798 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv; 3216 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
2799 3217
2800 SV *tmp = *src; *src = *dst; *dst = tmp; 3218 SV *tmp = *src; *src = *dst; *dst = tmp;
2801 } 3219 }
2802 3220
3221void
3222cancel (Coro::State self)
3223 CODE:
3224 coro_state_destroy (aTHX_ self);
3225 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */
3226
2803 3227
2804MODULE = Coro::State PACKAGE = Coro 3228MODULE = Coro::State PACKAGE = Coro
2805 3229
2806BOOT: 3230BOOT:
2807{ 3231{
2808 int i;
2809
2810 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
2811 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3232 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
2812 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3233 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
2813 3234 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3235 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
2814 coro_current = coro_get_sv (aTHX_ "Coro::current", FALSE); 3236 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
2815 SvREADONLY_on (coro_current); 3237 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3238 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3239 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3240 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3241
3242 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3243 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3244 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3245 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new);
2816 3246
2817 coro_stash = gv_stashpv ("Coro", TRUE); 3247 coro_stash = gv_stashpv ("Coro", TRUE);
2818 3248
2819 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 3249 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
2820 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 3250 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH));
2821 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 3251 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL));
2822 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 3252 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW));
2823 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE)); 3253 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE));
2824 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN)); 3254 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN));
2825 3255
2826 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
2827 coro_ready[i] = newAV ();
2828
2829 { 3256 {
2830 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 3257 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
2831 3258
2832 coroapi.schedule = api_schedule; 3259 coroapi.schedule = api_schedule;
3260 coroapi.schedule_to = api_schedule_to;
2833 coroapi.cede = api_cede; 3261 coroapi.cede = api_cede;
2834 coroapi.cede_notself = api_cede_notself; 3262 coroapi.cede_notself = api_cede_notself;
2835 coroapi.ready = api_ready; 3263 coroapi.ready = api_ready;
2836 coroapi.is_ready = api_is_ready; 3264 coroapi.is_ready = api_is_ready;
2837 coroapi.nready = coro_nready; 3265 coroapi.nready = coro_nready;
… …
2842 SvREADONLY_on (sv); 3270 SvREADONLY_on (sv);
2843 } 3271 }
2844} 3272}
2845 3273
2846void 3274void
3275terminate (...)
3276 CODE:
3277 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3278
3279void
2847schedule (...) 3280schedule (...)
2848 CODE: 3281 CODE:
2849 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3282 CORO_EXECUTE_SLF_XS (slf_init_schedule);
3283
3284void
3285schedule_to (...)
3286 CODE:
3287 CORO_EXECUTE_SLF_XS (slf_init_schedule_to);
3288
3289void
3290cede_to (...)
3291 CODE:
3292 CORO_EXECUTE_SLF_XS (slf_init_cede_to);
2850 3293
2851void 3294void
2852cede (...) 3295cede (...)
2853 CODE: 3296 CODE:
2854 CORO_EXECUTE_SLF_XS (slf_init_cede); 3297 CORO_EXECUTE_SLF_XS (slf_init_cede);
… …
2909 CODE: 3352 CODE:
2910 RETVAL = coro_nready; 3353 RETVAL = coro_nready;
2911 OUTPUT: 3354 OUTPUT:
2912 RETVAL 3355 RETVAL
2913 3356
2914# for async_pool speedup
2915void 3357void
2916_pool_1 (SV *cb) 3358suspend (Coro::State self)
3359 PROTOTYPE: $
2917 CODE: 3360 CODE:
2918{ 3361 self->flags |= CF_SUSPENDED;
2919 HV *hv = (HV *)SvRV (coro_current);
2920 struct coro *coro = SvSTATE_hv ((SV *)hv);
2921 AV *defav = GvAV (PL_defgv);
2922 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
2923 AV *invoke_av;
2924 int i, len;
2925 3362
2926 if (!invoke) 3363void
3364resume (Coro::State self)
3365 PROTOTYPE: $
3366 CODE:
3367 self->flags &= ~CF_SUSPENDED;
3368
3369void
3370_pool_handler (...)
3371 CODE:
3372 CORO_EXECUTE_SLF_XS (slf_init_pool_handler);
3373
3374void
3375async_pool (SV *cv, ...)
3376 PROTOTYPE: &@
3377 PPCODE:
3378{
3379 HV *hv = (HV *)av_pop (av_async_pool);
3380 AV *av = newAV ();
3381 SV *cb = ST (0);
3382 int i;
3383
3384 av_extend (av, items - 2);
3385 for (i = 1; i < items; ++i)
3386 av_push (av, SvREFCNT_inc_NN (ST (i)));
3387
3388 if ((SV *)hv == &PL_sv_undef)
2927 { 3389 {
2928 SV *old = PL_diehook; 3390 PUSHMARK (SP);
2929 PL_diehook = 0; 3391 EXTEND (SP, 2);
2930 SvREFCNT_dec (old); 3392 PUSHs (sv_Coro);
2931 croak ("\3async_pool terminate\2\n"); 3393 PUSHs ((SV *)cv_pool_handler);
3394 PUTBACK;
3395 call_sv ((SV *)cv_coro_state_new, G_SCALAR);
3396 SPAGAIN;
3397
3398 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs));
2932 } 3399 }
2933 3400
2934 SvREFCNT_dec (coro->saved_deffh);
2935 coro->saved_deffh = SvREFCNT_inc_NN ((SV *)PL_defoutgv);
2936
2937 hv_store (hv, "desc", sizeof ("desc") - 1,
2938 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
2939
2940 invoke_av = (AV *)SvRV (invoke);
2941 len = av_len (invoke_av);
2942
2943 sv_setsv (cb, AvARRAY (invoke_av)[0]);
2944
2945 if (len > 0)
2946 { 3401 {
2947 av_fill (defav, len - 1); 3402 struct coro *coro = SvSTATE_hv (hv);
2948 for (i = 0; i < len; ++i) 3403
2949 av_store (defav, i, SvREFCNT_inc_NN (AvARRAY (invoke_av)[i + 1])); 3404 assert (!coro->invoke_cb);
3405 assert (!coro->invoke_av);
3406 coro->invoke_cb = SvREFCNT_inc (cb);
3407 coro->invoke_av = av;
2950 } 3408 }
2951}
2952 3409
2953void 3410 api_ready (aTHX_ (SV *)hv);
2954_pool_2 (SV *cb)
2955 CODE:
2956{
2957 HV *hv = (HV *)SvRV (coro_current);
2958 struct coro *coro = SvSTATE_hv ((SV *)hv);
2959 3411
2960 sv_setsv (cb, &PL_sv_undef); 3412 if (GIMME_V != G_VOID)
2961 3413 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
2962 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 3414 else
2963 coro->saved_deffh = 0;
2964
2965 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
2966 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
2967 {
2968 SV *old = PL_diehook;
2969 PL_diehook = 0;
2970 SvREFCNT_dec (old); 3415 SvREFCNT_dec (hv);
2971 croak ("\3async_pool terminate\2\n");
2972 }
2973
2974 av_clear (GvAV (PL_defgv));
2975 hv_store (hv, "desc", sizeof ("desc") - 1,
2976 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
2977
2978 coro->prio = 0;
2979
2980 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
2981 api_trace (aTHX_ coro_current, 0);
2982
2983 av_push (av_async_pool, newSVsv (coro_current));
2984} 3416}
2985 3417
2986SV * 3418SV *
2987rouse_cb () 3419rouse_cb ()
2988 PROTOTYPE: 3420 PROTOTYPE:
… …
2990 RETVAL = coro_new_rouse_cb (aTHX); 3422 RETVAL = coro_new_rouse_cb (aTHX);
2991 OUTPUT: 3423 OUTPUT:
2992 RETVAL 3424 RETVAL
2993 3425
2994void 3426void
2995rouse_wait (SV *cb = 0) 3427rouse_wait (...)
2996 PROTOTYPE: ;$ 3428 PROTOTYPE: ;$
2997 PPCODE: 3429 PPCODE:
2998 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait); 3430 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait);
3431
3432void
3433on_enter (SV *block)
3434 ALIAS:
3435 on_leave = 1
3436 PROTOTYPE: &
3437 CODE:
3438{
3439 struct coro *coro = SvSTATE_current;
3440 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3441
3442 block = (SV *)coro_sv_2cv (aTHX_ block);
3443
3444 if (!*avp)
3445 *avp = newAV ();
3446
3447 av_push (*avp, SvREFCNT_inc (block));
3448
3449 if (!ix)
3450 on_enterleave_call (aTHX_ block);
3451
3452 LEAVE; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
3453 SAVEDESTRUCTOR_X (ix ? coro_pop_on_leave : coro_pop_on_enter, (void *)coro);
3454 ENTER; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
3455}
2999 3456
3000 3457
3001MODULE = Coro::State PACKAGE = PerlIO::cede 3458MODULE = Coro::State PACKAGE = PerlIO::cede
3002 3459
3003BOOT: 3460BOOT:
… …
3014 GvSTASH (CvGV (cv)) 3471 GvSTASH (CvGV (cv))
3015 ); 3472 );
3016 OUTPUT: 3473 OUTPUT:
3017 RETVAL 3474 RETVAL
3018 3475
3019# helper for Coro::Channel 3476# helper for Coro::Channel and others
3020SV * 3477SV *
3021_alloc (int count) 3478_alloc (int count)
3022 CODE: 3479 CODE:
3023 RETVAL = coro_waitarray_new (aTHX_ count); 3480 RETVAL = coro_waitarray_new (aTHX_ count);
3024 OUTPUT: 3481 OUTPUT:
… …
3037 adjust = 1 3494 adjust = 1
3038 CODE: 3495 CODE:
3039 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1); 3496 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1);
3040 3497
3041void 3498void
3042down (SV *self) 3499down (...)
3043 CODE: 3500 CODE:
3044 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down); 3501 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down);
3045 3502
3046void 3503void
3047wait (SV *self) 3504wait (...)
3048 CODE: 3505 CODE:
3049 CORO_EXECUTE_SLF_XS (slf_init_semaphore_wait); 3506 CORO_EXECUTE_SLF_XS (slf_init_semaphore_wait);
3050 3507
3051void 3508void
3052try (SV *self) 3509try (SV *self)
… …
3082 for (i = 1; i <= wcount; ++i) 3539 for (i = 1; i <= wcount; ++i)
3083 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i]))); 3540 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i])));
3084 } 3541 }
3085} 3542}
3086 3543
3544MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3545
3546void
3547_may_delete (SV *sem, int count, int extra_refs)
3548 PPCODE:
3549{
3550 AV *av = (AV *)SvRV (sem);
3551
3552 if (SvREFCNT ((SV *)av) == 1 + extra_refs
3553 && AvFILLp (av) == 0 /* no waiters, just count */
3554 && SvIV (AvARRAY (av)[0]) == count)
3555 XSRETURN_YES;
3556
3557 XSRETURN_NO;
3558}
3559
3087MODULE = Coro::State PACKAGE = Coro::Signal 3560MODULE = Coro::State PACKAGE = Coro::Signal
3088 3561
3089SV * 3562SV *
3090new (SV *klass) 3563new (SV *klass)
3091 CODE: 3564 CODE:
… …
3095 ); 3568 );
3096 OUTPUT: 3569 OUTPUT:
3097 RETVAL 3570 RETVAL
3098 3571
3099void 3572void
3100wait (SV *self) 3573wait (...)
3101 CODE: 3574 CODE:
3102 CORO_EXECUTE_SLF_XS (slf_init_signal_wait); 3575 CORO_EXECUTE_SLF_XS (slf_init_signal_wait);
3103 3576
3104void 3577void
3105broadcast (SV *self) 3578broadcast (SV *self)
… …
3162 3635
3163void 3636void
3164_register (char *target, char *proto, SV *req) 3637_register (char *target, char *proto, SV *req)
3165 CODE: 3638 CODE:
3166{ 3639{
3167 HV *st; 3640 CV *req_cv = coro_sv_2cv (aTHX_ req);
3168 GV *gvp;
3169 CV *req_cv = sv_2cv (req, &st, &gvp, 0);
3170 /* newXSproto doesn't return the CV on 5.8 */ 3641 /* newXSproto doesn't return the CV on 5.8 */
3171 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 3642 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3172 sv_setpv ((SV *)slf_cv, proto); 3643 sv_setpv ((SV *)slf_cv, proto);
3173 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0); 3644 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
3174} 3645}

Diff Legend

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