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.303 by root, Wed Nov 19 05:52:42 2008 UTC vs.
Revision 1.347 by root, Wed Jun 10 00:00:02 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{
… …
449 else 504 else
450 { 505 {
451#if CORO_PREFER_PERL_FUNCTIONS 506#if CORO_PREFER_PERL_FUNCTIONS
452 /* this is probably cleaner? but also slower! */ 507 /* this is probably cleaner? but also slower! */
453 /* in practise, it seems to be less stable */ 508 /* in practise, it seems to be less stable */
454 CV *cp = Perl_cv_clone (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 }
… …
603 * of perl.c:init_stacks, except that it uses less memory 679 * of perl.c:init_stacks, except that it uses less memory
604 * on the (sometimes correct) assumption that coroutines do 680 * on the (sometimes correct) assumption that coroutines do
605 * not usually need a lot of stackspace. 681 * not usually need a lot of stackspace.
606 */ 682 */
607#if CORO_PREFER_PERL_FUNCTIONS 683#if CORO_PREFER_PERL_FUNCTIONS
608# define coro_init_stacks init_stacks 684# define coro_init_stacks(thx) init_stacks ()
609#else 685#else
610static void 686static void
611coro_init_stacks (pTHX) 687coro_init_stacks (pTHX)
612{ 688{
613 PL_curstackinfo = new_stackinfo(32, 8); 689 PL_curstackinfo = new_stackinfo(32, 8);
… …
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}
991
992static void
993coro_destruct_perl (pTHX_ struct coro *coro)
994{
995 coro_unwind_stacks (aTHX);
913 996
914 SvREFCNT_dec (GvSV (PL_defgv)); 997 SvREFCNT_dec (GvSV (PL_defgv));
915 SvREFCNT_dec (GvAV (PL_defgv)); 998 SvREFCNT_dec (GvAV (PL_defgv));
916 SvREFCNT_dec (GvSV (PL_errgv)); 999 SvREFCNT_dec (GvSV (PL_errgv));
917 SvREFCNT_dec (PL_defoutgv); 1000 SvREFCNT_dec (PL_defoutgv);
918 SvREFCNT_dec (PL_rs); 1001 SvREFCNT_dec (PL_rs);
919 SvREFCNT_dec (GvSV (irsgv)); 1002 SvREFCNT_dec (GvSV (irsgv));
1003 SvREFCNT_dec (GvHV (PL_hintgv));
920 1004
921 SvREFCNT_dec (PL_diehook); 1005 SvREFCNT_dec (PL_diehook);
922 SvREFCNT_dec (PL_warnhook); 1006 SvREFCNT_dec (PL_warnhook);
923 1007
924 SvREFCNT_dec (CORO_THROW);
925 SvREFCNT_dec (coro->saved_deffh); 1008 SvREFCNT_dec (coro->saved_deffh);
926 SvREFCNT_dec (coro->rouse_cb); 1009 SvREFCNT_dec (coro->rouse_cb);
1010 SvREFCNT_dec (coro->invoke_cb);
1011 SvREFCNT_dec (coro->invoke_av);
927 1012
928 coro_destruct_stacks (aTHX); 1013 coro_destruct_stacks (aTHX);
929} 1014}
930 1015
931INLINE void 1016INLINE void
… …
941static int 1026static int
942runops_trace (pTHX) 1027runops_trace (pTHX)
943{ 1028{
944 COP *oldcop = 0; 1029 COP *oldcop = 0;
945 int oldcxix = -2; 1030 int oldcxix = -2;
946 struct coro *coro = SvSTATE_current; /* trace cctx is tied to specific coro */
947 coro_cctx *cctx = coro->cctx;
948 1031
949 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX))) 1032 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX)))
950 { 1033 {
951 PERL_ASYNC_CHECK (); 1034 PERL_ASYNC_CHECK ();
952 1035
953 if (cctx->flags & CC_TRACE_ALL) 1036 if (cctx_current->flags & CC_TRACE_ALL)
954 { 1037 {
955 if (PL_op->op_type == OP_LEAVESUB && cctx->flags & CC_TRACE_SUB) 1038 if (PL_op->op_type == OP_LEAVESUB && cctx_current->flags & CC_TRACE_SUB)
956 { 1039 {
957 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1040 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
958 SV **bot, **top; 1041 SV **bot, **top;
959 AV *av = newAV (); /* return values */ 1042 AV *av = newAV (); /* return values */
960 SV **cb; 1043 SV **cb;
… …
997 1080
998 if (PL_curcop != &PL_compiling) 1081 if (PL_curcop != &PL_compiling)
999 { 1082 {
1000 SV **cb; 1083 SV **cb;
1001 1084
1002 if (oldcxix != cxstack_ix && cctx->flags & CC_TRACE_SUB) 1085 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB)
1003 { 1086 {
1004 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1087 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1005 1088
1006 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1089 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1007 { 1090 {
1008 runops_proc_t old_runops = PL_runops;
1009 dSP; 1091 dSP;
1010 GV *gv = CvGV (cx->blk_sub.cv); 1092 GV *gv = CvGV (cx->blk_sub.cv);
1011 SV *fullname = sv_2mortal (newSV (0)); 1093 SV *fullname = sv_2mortal (newSV (0));
1012 1094
1013 if (isGV (gv)) 1095 if (isGV (gv))
… …
1018 SAVETMPS; 1100 SAVETMPS;
1019 EXTEND (SP, 3); 1101 EXTEND (SP, 3);
1020 PUSHMARK (SP); 1102 PUSHMARK (SP);
1021 PUSHs (&PL_sv_yes); 1103 PUSHs (&PL_sv_yes);
1022 PUSHs (fullname); 1104 PUSHs (fullname);
1023 PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef); 1105 PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef);
1024 PUTBACK; 1106 PUTBACK;
1025 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0); 1107 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); 1108 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
1027 SPAGAIN; 1109 SPAGAIN;
1028 FREETMPS; 1110 FREETMPS;
… …
1031 } 1113 }
1032 1114
1033 oldcxix = cxstack_ix; 1115 oldcxix = cxstack_ix;
1034 } 1116 }
1035 1117
1036 if (cctx->flags & CC_TRACE_LINE) 1118 if (cctx_current->flags & CC_TRACE_LINE)
1037 { 1119 {
1038 dSP; 1120 dSP;
1039 1121
1040 PL_runops = RUNOPS_DEFAULT; 1122 PL_runops = RUNOPS_DEFAULT;
1041 ENTER; 1123 ENTER;
… …
1060 1142
1061 TAINT_NOT; 1143 TAINT_NOT;
1062 return 0; 1144 return 0;
1063} 1145}
1064 1146
1065static struct coro_cctx *cctx_ssl_cctx;
1066static struct CoroSLF cctx_ssl_frame; 1147static struct CoroSLF cctx_ssl_frame;
1067 1148
1068static void 1149static void
1069slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta) 1150slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta)
1070{ 1151{
1071 ta->prev = (struct coro *)cctx_ssl_cctx;
1072 ta->next = 0; 1152 ta->prev = 0;
1073} 1153}
1074 1154
1075static int 1155static int
1076slf_check_set_stacklevel (pTHX_ struct CoroSLF *frame) 1156slf_check_set_stacklevel (pTHX_ struct CoroSLF *frame)
1077{ 1157{
… …
1080 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1160 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1081} 1161}
1082 1162
1083/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1163/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1084static void NOINLINE 1164static void NOINLINE
1085cctx_prepare (pTHX_ coro_cctx *cctx) 1165cctx_prepare (pTHX)
1086{ 1166{
1087 PL_top_env = &PL_start_env; 1167 PL_top_env = &PL_start_env;
1088 1168
1089 if (cctx->flags & CC_TRACE) 1169 if (cctx_current->flags & CC_TRACE)
1090 PL_runops = runops_trace; 1170 PL_runops = runops_trace;
1091 1171
1092 /* we already must be executing an SLF op, there is no other valid way 1172 /* we already must be executing an SLF op, there is no other valid way
1093 * that can lead to creation of a new cctx */ 1173 * that can lead to creation of a new cctx */
1094 assert (("FATAL: can't prepare slf-less cctx in Coro module (please report)", 1174 assert (("FATAL: can't prepare slf-less cctx in Coro module (please report)",
1095 slf_frame.prepare && PL_op->op_ppaddr == pp_slf)); 1175 slf_frame.prepare && PL_op->op_ppaddr == pp_slf));
1096 1176
1097 /* we must emulate leaving pp_slf, which is done inside slf_check_set_stacklevel */ 1177 /* 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; 1178 cctx_ssl_frame = slf_frame;
1100 1179
1101 slf_frame.prepare = slf_prepare_set_stacklevel; 1180 slf_frame.prepare = slf_prepare_set_stacklevel;
1102 slf_frame.check = slf_check_set_stacklevel; 1181 slf_frame.check = slf_check_set_stacklevel;
1103} 1182}
… …
1126 /* normally we would need to skip the entersub here */ 1205 /* normally we would need to skip the entersub here */
1127 /* not doing so will re-execute it, which is exactly what we want */ 1206 /* not doing so will re-execute it, which is exactly what we want */
1128 /* PL_nop = PL_nop->op_next */ 1207 /* PL_nop = PL_nop->op_next */
1129 1208
1130 /* inject a fake subroutine call to cctx_init */ 1209 /* inject a fake subroutine call to cctx_init */
1131 cctx_prepare (aTHX_ (coro_cctx *)arg); 1210 cctx_prepare (aTHX);
1132 1211
1133 /* cctx_run is the alternative tail of transfer() */ 1212 /* cctx_run is the alternative tail of transfer() */
1134 transfer_tail (aTHX); 1213 transfer_tail (aTHX);
1135 1214
1136 /* somebody or something will hit me for both perl_run and PL_restartop */ 1215 /* somebody or something will hit me for both perl_run and PL_restartop */
1137 PL_restartop = PL_op; 1216 PL_restartop = PL_op;
1138 perl_run (PL_curinterp); 1217 perl_run (PL_curinterp);
1218 /*
1219 * Unfortunately, there is no way to get at the return values of the
1220 * coro body here, as perl_run destroys these
1221 */
1139 1222
1140 /* 1223 /*
1141 * If perl-run returns we assume exit() was being called or the coro 1224 * 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) 1225 * 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 1226 * 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" 1227 * bootstrap-time "top" top_env, as we cannot restore the "main"
1145 * coroutine as Coro has no such concept 1228 * coroutine as Coro has no such concept.
1229 * This actually isn't valid with the pthread backend, but OSes requiring
1230 * that backend are too broken to do it in a standards-compliant way.
1146 */ 1231 */
1147 PL_top_env = main_top_env; 1232 PL_top_env = main_top_env;
1148 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */ 1233 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1149 } 1234 }
1150} 1235}
… …
1227cctx_destroy (coro_cctx *cctx) 1312cctx_destroy (coro_cctx *cctx)
1228{ 1313{
1229 if (!cctx) 1314 if (!cctx)
1230 return; 1315 return;
1231 1316
1317 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary?
1318
1232 --cctx_count; 1319 --cctx_count;
1233 coro_destroy (&cctx->cctx); 1320 coro_destroy (&cctx->cctx);
1234 1321
1235 /* coro_transfer creates new, empty cctx's */ 1322 /* coro_transfer creates new, empty cctx's */
1236 if (cctx->sptr) 1323 if (cctx->sptr)
… …
1299 /* TODO: throwing up here is considered harmful */ 1386 /* TODO: throwing up here is considered harmful */
1300 1387
1301 if (expect_true (prev != next)) 1388 if (expect_true (prev != next))
1302 { 1389 {
1303 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1390 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,"); 1391 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1305 1392
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)) 1393 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,"); 1394 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1311 1395
1312#if !PERL_VERSION_ATLEAST (5,10,0) 1396#if !PERL_VERSION_ATLEAST (5,10,0)
1313 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1397 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,"); 1398 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1315#endif 1399#endif
… …
1321transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1405transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1322{ 1406{
1323 dSTACKLEVEL; 1407 dSTACKLEVEL;
1324 1408
1325 /* sometimes transfer is only called to set idle_sp */ 1409 /* sometimes transfer is only called to set idle_sp */
1326 if (expect_false (!next)) 1410 if (expect_false (!prev))
1327 { 1411 {
1328 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1412 cctx_current->idle_sp = STACKLEVEL;
1329 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1413 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1330 } 1414 }
1331 else if (expect_true (prev != next)) 1415 else if (expect_true (prev != next))
1332 { 1416 {
1333 coro_cctx *prev__cctx; 1417 coro_cctx *cctx_prev;
1334 1418
1335 if (expect_false (prev->flags & CF_NEW)) 1419 if (expect_false (prev->flags & CF_NEW))
1336 { 1420 {
1337 /* create a new empty/source context */ 1421 /* create a new empty/source context */
1338 prev->cctx = cctx_new_empty ();
1339 prev->flags &= ~CF_NEW; 1422 prev->flags &= ~CF_NEW;
1340 prev->flags |= CF_RUNNING; 1423 prev->flags |= CF_RUNNING;
1341 } 1424 }
1342 1425
1343 prev->flags &= ~CF_RUNNING; 1426 prev->flags &= ~CF_RUNNING;
… …
1354 coro_setup (aTHX_ next); 1437 coro_setup (aTHX_ next);
1355 } 1438 }
1356 else 1439 else
1357 load_perl (aTHX_ next); 1440 load_perl (aTHX_ next);
1358 1441
1359 prev__cctx = prev->cctx;
1360
1361 /* possibly untie and reuse the cctx */ 1442 /* possibly untie and reuse the cctx */
1362 if (expect_true ( 1443 if (expect_true (
1363 prev__cctx->idle_sp == STACKLEVEL 1444 cctx_current->idle_sp == STACKLEVEL
1364 && !(prev__cctx->flags & CC_TRACE) 1445 && !(cctx_current->flags & CC_TRACE)
1365 && !force_cctx 1446 && !force_cctx
1366 )) 1447 ))
1367 { 1448 {
1368 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1449 /* 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)); 1450 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1370 1451
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 */ 1452 /* 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 */ 1453 /* without this the next cctx_get might destroy the running cctx while still in use */
1375 if (expect_false (CCTX_EXPIRED (prev__cctx))) 1454 if (expect_false (CCTX_EXPIRED (cctx_current)))
1376 if (!next->cctx) 1455 if (expect_true (!next->cctx))
1377 next->cctx = cctx_get (aTHX); 1456 next->cctx = cctx_get (aTHX);
1378 1457
1379 cctx_put (prev__cctx); 1458 cctx_put (cctx_current);
1380 } 1459 }
1460 else
1461 prev->cctx = cctx_current;
1381 1462
1382 ++next->usecount; 1463 ++next->usecount;
1383 1464
1384 if (expect_true (!next->cctx)) 1465 cctx_prev = cctx_current;
1385 next->cctx = cctx_get (aTHX); 1466 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1386 1467
1387 if (expect_false (prev__cctx != next->cctx)) 1468 next->cctx = 0;
1469
1470 if (expect_false (cctx_prev != cctx_current))
1388 { 1471 {
1389 prev__cctx->top_env = PL_top_env; 1472 cctx_prev->top_env = PL_top_env;
1390 PL_top_env = next->cctx->top_env; 1473 PL_top_env = cctx_current->top_env;
1391 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1474 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1392 } 1475 }
1393 1476
1394 transfer_tail (aTHX); 1477 transfer_tail (aTHX);
1395 } 1478 }
1396} 1479}
… …
1404coro_state_destroy (pTHX_ struct coro *coro) 1487coro_state_destroy (pTHX_ struct coro *coro)
1405{ 1488{
1406 if (coro->flags & CF_DESTROYED) 1489 if (coro->flags & CF_DESTROYED)
1407 return 0; 1490 return 0;
1408 1491
1409 if (coro->on_destroy) 1492 if (coro->on_destroy && !PL_dirty)
1410 coro->on_destroy (aTHX_ coro); 1493 coro->on_destroy (aTHX_ coro);
1411 1494
1412 coro->flags |= CF_DESTROYED; 1495 coro->flags |= CF_DESTROYED;
1413 1496
1414 if (coro->flags & CF_READY) 1497 if (coro->flags & CF_READY)
… …
1418 --coro_nready; 1501 --coro_nready;
1419 } 1502 }
1420 else 1503 else
1421 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1504 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1422 1505
1423 if (coro->mainstack && coro->mainstack != main_mainstack) 1506 if (coro->mainstack
1507 && coro->mainstack != main_mainstack
1508 && coro->slot
1509 && !PL_dirty)
1424 { 1510 {
1425 struct coro temp; 1511 struct coro *current = SvSTATE_current;
1426 1512
1427 assert (("FATAL: tried to destroy currently running coroutine (please report)", !(coro->flags & CF_RUNNING))); 1513 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1428 1514
1429 save_perl (aTHX_ &temp); 1515 save_perl (aTHX_ current);
1430 load_perl (aTHX_ coro); 1516 load_perl (aTHX_ coro);
1431 1517
1432 coro_destruct (aTHX_ coro); 1518 coro_destruct_perl (aTHX_ coro);
1433 1519
1434 load_perl (aTHX_ &temp); 1520 load_perl (aTHX_ current);
1435 1521
1436 coro->slot = 0; 1522 coro->slot = 0;
1437 } 1523 }
1438 1524
1439 cctx_destroy (coro->cctx); 1525 cctx_destroy (coro->cctx);
1526 SvREFCNT_dec (coro->startcv);
1440 SvREFCNT_dec (coro->args); 1527 SvREFCNT_dec (coro->args);
1528 SvREFCNT_dec (CORO_THROW);
1441 1529
1442 if (coro->next) coro->next->prev = coro->prev; 1530 if (coro->next) coro->next->prev = coro->prev;
1443 if (coro->prev) coro->prev->next = coro->next; 1531 if (coro->prev) coro->prev->next = coro->next;
1444 if (coro == coro_first) coro_first = coro->next; 1532 if (coro == coro_first) coro_first = coro->next;
1445 1533
… …
1527/** Coro ********************************************************************/ 1615/** Coro ********************************************************************/
1528 1616
1529INLINE void 1617INLINE void
1530coro_enq (pTHX_ struct coro *coro) 1618coro_enq (pTHX_ struct coro *coro)
1531{ 1619{
1532 av_push (coro_ready [coro->prio - PRIO_MIN], SvREFCNT_inc_NN (coro->hv)); 1620 struct coro **ready = coro_ready [coro->prio - PRIO_MIN];
1533}
1534 1621
1535INLINE SV * 1622 SvREFCNT_inc_NN (coro->hv);
1623
1624 coro->next_ready = 0;
1625 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1626 ready [1] = coro;
1627}
1628
1629INLINE struct coro *
1536coro_deq (pTHX) 1630coro_deq (pTHX)
1537{ 1631{
1538 int prio; 1632 int prio;
1539 1633
1540 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; ) 1634 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; )
1541 if (AvFILLp (coro_ready [prio]) >= 0) 1635 {
1542 return av_shift (coro_ready [prio]); 1636 struct coro **ready = coro_ready [prio];
1543 1637
1544 return 0; 1638 if (ready [0])
1639 {
1640 struct coro *coro = ready [0];
1641 ready [0] = coro->next_ready;
1642 return coro;
1643 }
1644 }
1545} 1645}
1546 1646
1547static int 1647static int
1548api_ready (pTHX_ SV *coro_sv) 1648api_ready (pTHX_ SV *coro_sv)
1549{ 1649{
1550 struct coro *coro; 1650 struct coro *coro;
1551 SV *sv_hook; 1651 SV *sv_hook;
1552 void (*xs_hook)(void); 1652 void (*xs_hook)(void);
1553 1653
1554 if (SvROK (coro_sv))
1555 coro_sv = SvRV (coro_sv);
1556
1557 coro = SvSTATE (coro_sv); 1654 coro = SvSTATE (coro_sv);
1558 1655
1559 if (coro->flags & CF_READY) 1656 if (coro->flags & CF_READY)
1560 return 0; 1657 return 0;
1561 1658
… …
1592api_is_ready (pTHX_ SV *coro_sv) 1689api_is_ready (pTHX_ SV *coro_sv)
1593{ 1690{
1594 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1691 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1595} 1692}
1596 1693
1694/* expects to own a reference to next->hv */
1597INLINE void 1695INLINE void
1598prepare_schedule (pTHX_ struct coro_transfer_args *ta) 1696prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1599{ 1697{
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); 1698 SV *prev_sv = SvRV (coro_current);
1699
1639 ta->prev = SvSTATE_hv (prev_sv); 1700 ta->prev = SvSTATE_hv (prev_sv);
1701 ta->next = next;
1702
1640 TRANSFER_CHECK (*ta); 1703 TRANSFER_CHECK (*ta);
1641 assert (("FATAL: next coroutine isn't marked as ready in Coro (please report)", ta->next->flags & CF_READY)); 1704
1642 ta->next->flags &= ~CF_READY;
1643 SvRV_set (coro_current, next_sv); 1705 SvRV_set (coro_current, (SV *)next->hv);
1644 1706
1645 free_coro_mortal (aTHX); 1707 free_coro_mortal (aTHX);
1646 coro_mortal = prev_sv; 1708 coro_mortal = prev_sv;
1647} 1709}
1648 1710
1711static void
1712prepare_schedule (pTHX_ struct coro_transfer_args *ta)
1713{
1714 for (;;)
1715 {
1716 struct coro *next = coro_deq (aTHX);
1717
1718 if (expect_true (next))
1719 {
1720 /* cannot transfer to destroyed coros, skip and look for next */
1721 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED)))
1722 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1723 else
1724 {
1725 next->flags &= ~CF_READY;
1726 --coro_nready;
1727
1728 prepare_schedule_to (aTHX_ ta, next);
1729 break;
1730 }
1731 }
1732 else
1733 {
1734 /* nothing to schedule: call the idle handler */
1735 if (SvROK (sv_idle)
1736 && SvOBJECT (SvRV (sv_idle)))
1737 {
1738 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1739 api_ready (aTHX_ SvRV (sv_idle));
1740 --coro_nready;
1741 }
1742 else
1743 {
1744 dSP;
1745
1746 ENTER;
1747 SAVETMPS;
1748
1749 PUSHMARK (SP);
1750 PUTBACK;
1751 call_sv (sv_idle, G_VOID | G_DISCARD);
1752
1753 FREETMPS;
1754 LEAVE;
1755 }
1756 }
1757 }
1758}
1759
1649INLINE void 1760INLINE void
1650prepare_cede (pTHX_ struct coro_transfer_args *ta) 1761prepare_cede (pTHX_ struct coro_transfer_args *ta)
1651{ 1762{
1652 api_ready (aTHX_ coro_current); 1763 api_ready (aTHX_ coro_current);
1653 prepare_schedule (aTHX_ ta); 1764 prepare_schedule (aTHX_ ta);
… …
1672{ 1783{
1673 struct coro_transfer_args ta; 1784 struct coro_transfer_args ta;
1674 1785
1675 prepare_schedule (aTHX_ &ta); 1786 prepare_schedule (aTHX_ &ta);
1676 TRANSFER (ta, 1); 1787 TRANSFER (ta, 1);
1788}
1789
1790static void
1791api_schedule_to (pTHX_ SV *coro_sv)
1792{
1793 struct coro_transfer_args ta;
1794 struct coro *next = SvSTATE (coro_sv);
1795
1796 SvREFCNT_inc_NN (coro_sv);
1797 prepare_schedule_to (aTHX_ &ta, next);
1677} 1798}
1678 1799
1679static int 1800static int
1680api_cede (pTHX) 1801api_cede (pTHX)
1681{ 1802{
… …
1710static void 1831static void
1711api_trace (pTHX_ SV *coro_sv, int flags) 1832api_trace (pTHX_ SV *coro_sv, int flags)
1712{ 1833{
1713 struct coro *coro = SvSTATE (coro_sv); 1834 struct coro *coro = SvSTATE (coro_sv);
1714 1835
1836 if (coro->flags & CF_RUNNING)
1837 croak ("cannot enable tracing on a running coroutine, caught");
1838
1715 if (flags & CC_TRACE) 1839 if (flags & CC_TRACE)
1716 { 1840 {
1717 if (!coro->cctx) 1841 if (!coro->cctx)
1718 coro->cctx = cctx_new_run (); 1842 coro->cctx = cctx_new_run ();
1719 else if (!(coro->cctx->flags & CC_TRACE)) 1843 else if (!(coro->cctx->flags & CC_TRACE))
1720 croak ("cannot enable tracing on coroutine with custom stack,"); 1844 croak ("cannot enable tracing on coroutine with custom stack, caught");
1721 1845
1722 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL)); 1846 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL));
1723 } 1847 }
1724 else if (coro->cctx && coro->cctx->flags & CC_TRACE) 1848 else if (coro->cctx && coro->cctx->flags & CC_TRACE)
1725 { 1849 {
… …
1730 else 1854 else
1731 coro->slot->runops = RUNOPS_DEFAULT; 1855 coro->slot->runops = RUNOPS_DEFAULT;
1732 } 1856 }
1733} 1857}
1734 1858
1859static void
1860coro_call_on_destroy (pTHX_ struct coro *coro)
1861{
1862 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0);
1863 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1864
1865 if (on_destroyp)
1866 {
1867 AV *on_destroy = (AV *)SvRV (*on_destroyp);
1868
1869 while (AvFILLp (on_destroy) >= 0)
1870 {
1871 dSP; /* don't disturb outer sp */
1872 SV *cb = av_pop (on_destroy);
1873
1874 PUSHMARK (SP);
1875
1876 if (statusp)
1877 {
1878 int i;
1879 AV *status = (AV *)SvRV (*statusp);
1880 EXTEND (SP, AvFILLp (status) + 1);
1881
1882 for (i = 0; i <= AvFILLp (status); ++i)
1883 PUSHs (AvARRAY (status)[i]);
1884 }
1885
1886 PUTBACK;
1887 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD);
1888 }
1889 }
1890}
1891
1892static void
1893slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1894{
1895 int i;
1896 HV *hv = (HV *)SvRV (coro_current);
1897 AV *av = newAV ();
1898
1899 av_extend (av, items - 1);
1900 for (i = 0; i < items; ++i)
1901 av_push (av, SvREFCNT_inc_NN (arg [i]));
1902
1903 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0);
1904
1905 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */
1906 api_ready (aTHX_ sv_manager);
1907
1908 frame->prepare = prepare_schedule;
1909 frame->check = slf_check_repeat;
1910
1911 /* as a minor optimisation, we could unwind all stacks here */
1912 /* but that puts extra pressure on pp_slf, and is not worth much */
1913 /*coro_unwind_stacks (aTHX);*/
1914}
1915
1916/*****************************************************************************/
1917/* async pool handler */
1918
1919static int
1920slf_check_pool_handler (pTHX_ struct CoroSLF *frame)
1921{
1922 HV *hv = (HV *)SvRV (coro_current);
1923 struct coro *coro = (struct coro *)frame->data;
1924
1925 if (!coro->invoke_cb)
1926 return 1; /* loop till we have invoke */
1927 else
1928 {
1929 hv_store (hv, "desc", sizeof ("desc") - 1,
1930 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
1931
1932 coro->saved_deffh = SvREFCNT_inc_NN ((SV *)PL_defoutgv);
1933
1934 {
1935 dSP;
1936 XPUSHs (sv_2mortal (coro->invoke_cb)); coro->invoke_cb = 0;
1937 PUTBACK;
1938 }
1939
1940 SvREFCNT_dec (GvAV (PL_defgv));
1941 GvAV (PL_defgv) = coro->invoke_av;
1942 coro->invoke_av = 0;
1943
1944 return 0;
1945 }
1946}
1947
1948static void
1949slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1950{
1951 HV *hv = (HV *)SvRV (coro_current);
1952 struct coro *coro = SvSTATE_hv ((SV *)hv);
1953
1954 if (expect_true (coro->saved_deffh))
1955 {
1956 /* subsequent iteration */
1957 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1958 coro->saved_deffh = 0;
1959
1960 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
1961 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1962 {
1963 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate);
1964 coro->invoke_av = newAV ();
1965
1966 frame->prepare = prepare_nop;
1967 }
1968 else
1969 {
1970 av_clear (GvAV (PL_defgv));
1971 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
1972
1973 coro->prio = 0;
1974
1975 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
1976 api_trace (aTHX_ coro_current, 0);
1977
1978 frame->prepare = prepare_schedule;
1979 av_push (av_async_pool, SvREFCNT_inc (hv));
1980 }
1981 }
1982 else
1983 {
1984 /* first iteration, simply fall through */
1985 frame->prepare = prepare_nop;
1986 }
1987
1988 frame->check = slf_check_pool_handler;
1989 frame->data = (void *)coro;
1990}
1991
1735/*****************************************************************************/ 1992/*****************************************************************************/
1736/* rouse callback */ 1993/* rouse callback */
1737 1994
1738#define CORO_MAGIC_type_rouse PERL_MAGIC_ext 1995#define CORO_MAGIC_type_rouse PERL_MAGIC_ext
1739 1996
… …
1744 SV *data = (SV *)GENSUB_ARG; 2001 SV *data = (SV *)GENSUB_ARG;
1745 2002
1746 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2003 if (SvTYPE (SvRV (data)) != SVt_PVAV)
1747 { 2004 {
1748 /* first call, set args */ 2005 /* first call, set args */
1749 int i; 2006 SV *coro = SvRV (data);
1750 AV *av = newAV (); 2007 AV *av = newAV ();
1751 SV *coro = SvRV (data);
1752 2008
1753 SvRV_set (data, (SV *)av); 2009 SvRV_set (data, (SV *)av);
1754 api_ready (aTHX_ coro);
1755 SvREFCNT_dec (coro);
1756 2010
1757 /* better take a full copy of the arguments */ 2011 /* better take a full copy of the arguments */
1758 while (items--) 2012 while (items--)
1759 av_store (av, items, newSVsv (ST (items))); 2013 av_store (av, items, newSVsv (ST (items)));
2014
2015 api_ready (aTHX_ coro);
2016 SvREFCNT_dec (coro);
1760 } 2017 }
1761 2018
1762 XSRETURN_EMPTY; 2019 XSRETURN_EMPTY;
1763} 2020}
1764 2021
… …
1781 2038
1782 EXTEND (SP, AvFILLp (av) + 1); 2039 EXTEND (SP, AvFILLp (av) + 1);
1783 for (i = 0; i <= AvFILLp (av); ++i) 2040 for (i = 0; i <= AvFILLp (av); ++i)
1784 PUSHs (sv_2mortal (AvARRAY (av)[i])); 2041 PUSHs (sv_2mortal (AvARRAY (av)[i]));
1785 2042
1786 /* we have stolen the elements, so ste length to zero and free */ 2043 /* we have stolen the elements, so set length to zero and free */
1787 AvFILLp (av) = -1; 2044 AvFILLp (av) = -1;
1788 av_undef (av); 2045 av_undef (av);
1789 2046
1790 PUTBACK; 2047 PUTBACK;
1791 } 2048 }
… …
1895static void 2152static void
1896slf_init_schedule (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2153slf_init_schedule (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1897{ 2154{
1898 frame->prepare = prepare_schedule; 2155 frame->prepare = prepare_schedule;
1899 frame->check = slf_check_nop; 2156 frame->check = slf_check_nop;
2157}
2158
2159static void
2160slf_prepare_schedule_to (pTHX_ struct coro_transfer_args *ta)
2161{
2162 struct coro *next = (struct coro *)slf_frame.data;
2163
2164 SvREFCNT_inc_NN (next->hv);
2165 prepare_schedule_to (aTHX_ ta, next);
2166}
2167
2168static void
2169slf_init_schedule_to (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2170{
2171 if (!items)
2172 croak ("Coro::schedule_to expects a coroutine argument, caught");
2173
2174 frame->data = (void *)SvSTATE (arg [0]);
2175 frame->prepare = slf_prepare_schedule_to;
2176 frame->check = slf_check_nop;
2177}
2178
2179static void
2180slf_init_cede_to (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2181{
2182 api_ready (aTHX_ SvRV (coro_current));
2183
2184 slf_init_schedule_to (aTHX_ frame, cv, arg, items);
1900} 2185}
1901 2186
1902static void 2187static void
1903slf_init_cede (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2188slf_init_cede (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1904{ 2189{
… …
2050 } 2335 }
2051 else 2336 else
2052 slf_argc = 0; 2337 slf_argc = 0;
2053 2338
2054 PL_op->op_ppaddr = pp_slf; 2339 PL_op->op_ppaddr = pp_slf;
2055 PL_op->op_type = OP_CUSTOM; /* maybe we should leave it at entersub? */ 2340 /*PL_op->op_type = OP_CUSTOM; /* we do behave like entersub still */
2056 2341
2057 PL_op = (OP *)&slf_restore; 2342 PL_op = (OP *)&slf_restore;
2343}
2344
2345/*****************************************************************************/
2346/* dynamic wind */
2347
2348static void
2349on_enterleave_call (pTHX_ SV *cb)
2350{
2351 dSP;
2352
2353 PUSHSTACK;
2354
2355 PUSHMARK (SP);
2356 PUTBACK;
2357 call_sv (cb, G_VOID | G_DISCARD);
2358 SPAGAIN;
2359
2360 POPSTACK;
2361}
2362
2363static SV *
2364coro_avp_pop_and_free (pTHX_ AV **avp)
2365{
2366 AV *av = *avp;
2367 SV *res = av_pop (av);
2368
2369 if (AvFILLp (av) < 0)
2370 {
2371 *avp = 0;
2372 SvREFCNT_dec (av);
2373 }
2374
2375 return res;
2376}
2377
2378static void
2379coro_pop_on_enter (pTHX_ void *coro)
2380{
2381 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_enter);
2382 SvREFCNT_dec (cb);
2383}
2384
2385static void
2386coro_pop_on_leave (pTHX_ void *coro)
2387{
2388 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2389 on_enterleave_call (aTHX_ sv_2mortal (cb));
2058} 2390}
2059 2391
2060/*****************************************************************************/ 2392/*****************************************************************************/
2061/* PerlIO::cede */ 2393/* PerlIO::cede */
2062 2394
… …
2143 SV **ary; 2475 SV **ary;
2144 2476
2145 /* unfortunately, building manually saves memory */ 2477 /* unfortunately, building manually saves memory */
2146 Newx (ary, 2, SV *); 2478 Newx (ary, 2, SV *);
2147 AvALLOC (av) = ary; 2479 AvALLOC (av) = ary;
2480#if PERL_VERSION_ATLEAST (5,10,0)
2148 AvARRAY (av) = ary; 2481 AvARRAY (av) = ary;
2482#else
2483 /* 5.8.8 needs this syntax instead of AvARRAY = ary, yet */
2484 /* -DDEBUGGING flags this as a bug, despite it perfectly working */
2485 SvPVX ((SV *)av) = (char *)ary;
2486#endif
2149 AvMAX (av) = 1; 2487 AvMAX (av) = 1;
2150 AvFILLp (av) = 0; 2488 AvFILLp (av) = 0;
2151 ary [0] = newSViv (count); 2489 ary [0] = newSViv (count);
2152 2490
2153 return newRV_noinc ((SV *)av); 2491 return newRV_noinc ((SV *)av);
… …
2173 AvARRAY (av)[0] = AvARRAY (av)[1]; 2511 AvARRAY (av)[0] = AvARRAY (av)[1];
2174 AvARRAY (av)[1] = count_sv; 2512 AvARRAY (av)[1] = count_sv;
2175 cb = av_shift (av); 2513 cb = av_shift (av);
2176 2514
2177 if (SvOBJECT (cb)) 2515 if (SvOBJECT (cb))
2516 {
2178 api_ready (aTHX_ cb); 2517 api_ready (aTHX_ cb);
2179 else 2518 --count;
2180 croak ("callbacks not yet supported"); 2519 }
2520 else if (SvTYPE (cb) == SVt_PVCV)
2521 {
2522 dSP;
2523 PUSHMARK (SP);
2524 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2525 PUTBACK;
2526 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2527 }
2181 2528
2182 SvREFCNT_dec (cb); 2529 SvREFCNT_dec (cb);
2183
2184 --count;
2185 } 2530 }
2186} 2531}
2187 2532
2188static void 2533static void
2189coro_semaphore_on_destroy (pTHX_ struct coro *coro) 2534coro_semaphore_on_destroy (pTHX_ struct coro *coro)
… …
2271} 2616}
2272 2617
2273static void 2618static void
2274slf_init_semaphore_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2619slf_init_semaphore_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2275{ 2620{
2621 if (items >= 2)
2622 {
2623 /* callback form */
2624 AV *av = (AV *)SvRV (arg [0]);
2625 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]);
2626
2627 av_push (av, (SV *)SvREFCNT_inc_NN (cb_cv));
2628
2629 if (SvIVX (AvARRAY (av)[0]) > 0)
2630 coro_semaphore_adjust (aTHX_ av, 0);
2631
2632 frame->prepare = prepare_nop;
2633 frame->check = slf_check_nop;
2634 }
2635 else
2636 {
2276 slf_init_semaphore_down_or_wait (aTHX_ frame, cv, arg, items); 2637 slf_init_semaphore_down_or_wait (aTHX_ frame, cv, arg, items);
2277 frame->check = slf_check_semaphore_wait; 2638 frame->check = slf_check_semaphore_wait;
2639 }
2278} 2640}
2279 2641
2280/* signal */ 2642/* signal */
2281 2643
2282static void 2644static void
… …
2354 dXSARGS; 2716 dXSARGS;
2355 AV *state = (AV *)GENSUB_ARG; 2717 AV *state = (AV *)GENSUB_ARG;
2356 SV *coro = av_pop (state); 2718 SV *coro = av_pop (state);
2357 SV *data_sv = newSV (sizeof (struct io_state)); 2719 SV *data_sv = newSV (sizeof (struct io_state));
2358 2720
2359 av_extend (state, items); 2721 av_extend (state, items - 1);
2360 2722
2361 sv_upgrade (data_sv, SVt_PV); 2723 sv_upgrade (data_sv, SVt_PV);
2362 SvCUR_set (data_sv, sizeof (struct io_state)); 2724 SvCUR_set (data_sv, sizeof (struct io_state));
2363 SvPOK_only (data_sv); 2725 SvPOK_only (data_sv);
2364 2726
… …
2499 XSRETURN_EMPTY; 2861 XSRETURN_EMPTY;
2500} 2862}
2501 2863
2502/*****************************************************************************/ 2864/*****************************************************************************/
2503 2865
2866#if CORO_CLONE
2867# include "clone.c"
2868#endif
2869
2504MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 2870MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2505 2871
2506PROTOTYPES: DISABLE 2872PROTOTYPES: DISABLE
2507 2873
2508BOOT: 2874BOOT:
… …
2512 coro_thx = PERL_GET_CONTEXT; 2878 coro_thx = PERL_GET_CONTEXT;
2513# endif 2879# endif
2514#endif 2880#endif
2515 BOOT_PAGESIZE; 2881 BOOT_PAGESIZE;
2516 2882
2883 cctx_current = cctx_new_empty ();
2884
2517 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 2885 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
2518 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 2886 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
2519 2887
2520 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 2888 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get;
2521 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set; 2889 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set;
… …
2540 2908
2541 { 2909 {
2542 SV *slf = sv_2mortal (newSViv (PTR2IV (pp_slf))); 2910 SV *slf = sv_2mortal (newSViv (PTR2IV (pp_slf)));
2543 2911
2544 if (!PL_custom_op_names) PL_custom_op_names = newHV (); 2912 if (!PL_custom_op_names) PL_custom_op_names = newHV ();
2545 hv_store_ent (PL_custom_op_names, slf, 2913 hv_store_ent (PL_custom_op_names, slf, newSVpv ("coro_slf", 0), 0);
2546 newSVpv ("coro_slf", 0), 0);
2547 2914
2548 if (!PL_custom_op_descs) PL_custom_op_descs = newHV (); 2915 if (!PL_custom_op_descs) PL_custom_op_descs = newHV ();
2549 hv_store_ent (PL_custom_op_descs, slf, 2916 hv_store_ent (PL_custom_op_descs, slf, newSVpv ("coro schedule like function", 0), 0);
2550 newSVpv ("coro schedule like function", 0), 0);
2551 } 2917 }
2552 2918
2553 coroapi.ver = CORO_API_VERSION; 2919 coroapi.ver = CORO_API_VERSION;
2554 coroapi.rev = CORO_API_REVISION; 2920 coroapi.rev = CORO_API_REVISION;
2555 2921
… …
2574 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 2940 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL));
2575} 2941}
2576 2942
2577SV * 2943SV *
2578new (char *klass, ...) 2944new (char *klass, ...)
2945 ALIAS:
2946 Coro::new = 1
2579 CODE: 2947 CODE:
2580{ 2948{
2581 struct coro *coro; 2949 struct coro *coro;
2582 MAGIC *mg; 2950 MAGIC *mg;
2583 HV *hv; 2951 HV *hv;
2952 CV *cb;
2584 int i; 2953 int i;
2954
2955 if (items > 1)
2956 {
2957 cb = coro_sv_2cv (aTHX_ ST (1));
2958
2959 if (!ix)
2960 {
2961 if (CvISXSUB (cb))
2962 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
2963
2964 if (!CvROOT (cb))
2965 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
2966 }
2967 }
2585 2968
2586 Newz (0, coro, 1, struct coro); 2969 Newz (0, coro, 1, struct coro);
2587 coro->args = newAV (); 2970 coro->args = newAV ();
2588 coro->flags = CF_NEW; 2971 coro->flags = CF_NEW;
2589 2972
… …
2594 coro->hv = hv = newHV (); 2977 coro->hv = hv = newHV ();
2595 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0); 2978 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
2596 mg->mg_flags |= MGf_DUP; 2979 mg->mg_flags |= MGf_DUP;
2597 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 2980 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
2598 2981
2982 if (items > 1)
2983 {
2599 av_extend (coro->args, items - 1); 2984 av_extend (coro->args, items - 1 + ix - 1);
2985
2986 if (ix)
2987 {
2988 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
2989 cb = cv_coro_run;
2990 }
2991
2992 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
2993
2600 for (i = 1; i < items; i++) 2994 for (i = 2; i < items; i++)
2601 av_push (coro->args, newSVsv (ST (i))); 2995 av_push (coro->args, newSVsv (ST (i)));
2996 }
2602} 2997}
2603 OUTPUT: 2998 OUTPUT:
2604 RETVAL 2999 RETVAL
2605 3000
2606void 3001void
… …
2619void 3014void
2620_exit (int code) 3015_exit (int code)
2621 PROTOTYPE: $ 3016 PROTOTYPE: $
2622 CODE: 3017 CODE:
2623 _exit (code); 3018 _exit (code);
3019
3020SV *
3021clone (Coro::State coro)
3022 CODE:
3023{
3024#if CORO_CLONE
3025 struct coro *ncoro = coro_clone (aTHX_ coro);
3026 MAGIC *mg;
3027 /* TODO: too much duplication */
3028 ncoro->hv = newHV ();
3029 mg = sv_magicext ((SV *)ncoro->hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)ncoro, 0);
3030 mg->mg_flags |= MGf_DUP;
3031 RETVAL = sv_bless (newRV_noinc ((SV *)ncoro->hv), SvSTASH (coro->hv));
3032#else
3033 croak ("Coro::State->clone has not been configured into this installation of Coro, realised");
3034#endif
3035}
3036 OUTPUT:
3037 RETVAL
2624 3038
2625int 3039int
2626cctx_stacksize (int new_stacksize = 0) 3040cctx_stacksize (int new_stacksize = 0)
2627 PROTOTYPE: ;$ 3041 PROTOTYPE: ;$
2628 CODE: 3042 CODE:
… …
2678 eval = 1 3092 eval = 1
2679 CODE: 3093 CODE:
2680{ 3094{
2681 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3095 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
2682 { 3096 {
2683 struct coro temp; 3097 struct coro *current = SvSTATE_current;
2684 3098
2685 if (!(coro->flags & CF_RUNNING)) 3099 if (current != coro)
2686 { 3100 {
2687 PUTBACK; 3101 PUTBACK;
2688 save_perl (aTHX_ &temp); 3102 save_perl (aTHX_ current);
2689 load_perl (aTHX_ coro); 3103 load_perl (aTHX_ coro);
3104 SPAGAIN;
2690 } 3105 }
2691 3106
2692 {
2693 dSP;
2694 ENTER;
2695 SAVETMPS;
2696 PUTBACK;
2697 PUSHSTACK; 3107 PUSHSTACK;
3108
2698 PUSHMARK (SP); 3109 PUSHMARK (SP);
3110 PUTBACK;
2699 3111
2700 if (ix) 3112 if (ix)
2701 eval_sv (coderef, 0); 3113 eval_sv (coderef, 0);
2702 else 3114 else
2703 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 3115 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
2704 3116
2705 POPSTACK; 3117 POPSTACK;
2706 SPAGAIN; 3118 SPAGAIN;
2707 FREETMPS;
2708 LEAVE;
2709 PUTBACK;
2710 }
2711 3119
2712 if (!(coro->flags & CF_RUNNING)) 3120 if (current != coro)
2713 { 3121 {
3122 PUTBACK;
2714 save_perl (aTHX_ coro); 3123 save_perl (aTHX_ coro);
2715 load_perl (aTHX_ &temp); 3124 load_perl (aTHX_ current);
2716 SPAGAIN; 3125 SPAGAIN;
2717 } 3126 }
2718 } 3127 }
2719} 3128}
2720 3129
… …
2724 ALIAS: 3133 ALIAS:
2725 is_ready = CF_READY 3134 is_ready = CF_READY
2726 is_running = CF_RUNNING 3135 is_running = CF_RUNNING
2727 is_new = CF_NEW 3136 is_new = CF_NEW
2728 is_destroyed = CF_DESTROYED 3137 is_destroyed = CF_DESTROYED
3138 is_suspended = CF_SUSPENDED
2729 CODE: 3139 CODE:
2730 RETVAL = boolSV (coro->flags & ix); 3140 RETVAL = boolSV (coro->flags & ix);
2731 OUTPUT: 3141 OUTPUT:
2732 RETVAL 3142 RETVAL
2733 3143
… …
2749 3159
2750SV * 3160SV *
2751has_cctx (Coro::State coro) 3161has_cctx (Coro::State coro)
2752 PROTOTYPE: $ 3162 PROTOTYPE: $
2753 CODE: 3163 CODE:
2754 RETVAL = boolSV (!!coro->cctx); 3164 /* maybe manage the running flag differently */
3165 RETVAL = boolSV (!!coro->cctx || (coro->flags & CF_RUNNING));
2755 OUTPUT: 3166 OUTPUT:
2756 RETVAL 3167 RETVAL
2757 3168
2758int 3169int
2759is_traced (Coro::State coro) 3170is_traced (Coro::State coro)
… …
2779 3190
2780void 3191void
2781force_cctx () 3192force_cctx ()
2782 PROTOTYPE: 3193 PROTOTYPE:
2783 CODE: 3194 CODE:
2784 SvSTATE_current->cctx->idle_sp = 0; 3195 cctx_current->idle_sp = 0;
2785 3196
2786void 3197void
2787swap_defsv (Coro::State self) 3198swap_defsv (Coro::State self)
2788 PROTOTYPE: $ 3199 PROTOTYPE: $
2789 ALIAS: 3200 ALIAS:
… …
2797 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv; 3208 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
2798 3209
2799 SV *tmp = *src; *src = *dst; *dst = tmp; 3210 SV *tmp = *src; *src = *dst; *dst = tmp;
2800 } 3211 }
2801 3212
3213void
3214cancel (Coro::State self)
3215 CODE:
3216 coro_state_destroy (aTHX_ self);
3217 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */
3218
2802 3219
2803MODULE = Coro::State PACKAGE = Coro 3220MODULE = Coro::State PACKAGE = Coro
2804 3221
2805BOOT: 3222BOOT:
2806{ 3223{
2807 int i; 3224 int i;
2808 3225
2809 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
2810 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3226 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
2811 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3227 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
2812 3228 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3229 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
2813 coro_current = coro_get_sv (aTHX_ "Coro::current", FALSE); 3230 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
2814 SvREADONLY_on (coro_current); 3231 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3232 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3233 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3234 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3235
3236 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3237 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3238 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3239 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new);
2815 3240
2816 coro_stash = gv_stashpv ("Coro", TRUE); 3241 coro_stash = gv_stashpv ("Coro", TRUE);
2817 3242
2818 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 3243 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
2819 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 3244 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH));
2820 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 3245 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL));
2821 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 3246 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW));
2822 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE)); 3247 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE));
2823 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN)); 3248 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN));
2824 3249
2825 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
2826 coro_ready[i] = newAV ();
2827
2828 { 3250 {
2829 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 3251 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
2830 3252
2831 coroapi.schedule = api_schedule; 3253 coroapi.schedule = api_schedule;
3254 coroapi.schedule_to = api_schedule_to;
2832 coroapi.cede = api_cede; 3255 coroapi.cede = api_cede;
2833 coroapi.cede_notself = api_cede_notself; 3256 coroapi.cede_notself = api_cede_notself;
2834 coroapi.ready = api_ready; 3257 coroapi.ready = api_ready;
2835 coroapi.is_ready = api_is_ready; 3258 coroapi.is_ready = api_is_ready;
2836 coroapi.nready = coro_nready; 3259 coroapi.nready = coro_nready;
… …
2841 SvREADONLY_on (sv); 3264 SvREADONLY_on (sv);
2842 } 3265 }
2843} 3266}
2844 3267
2845void 3268void
3269terminate (...)
3270 CODE:
3271 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3272
3273void
2846schedule (...) 3274schedule (...)
2847 CODE: 3275 CODE:
2848 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3276 CORO_EXECUTE_SLF_XS (slf_init_schedule);
3277
3278void
3279schedule_to (...)
3280 CODE:
3281 CORO_EXECUTE_SLF_XS (slf_init_schedule_to);
3282
3283void
3284cede_to (...)
3285 CODE:
3286 CORO_EXECUTE_SLF_XS (slf_init_cede_to);
2849 3287
2850void 3288void
2851cede (...) 3289cede (...)
2852 CODE: 3290 CODE:
2853 CORO_EXECUTE_SLF_XS (slf_init_cede); 3291 CORO_EXECUTE_SLF_XS (slf_init_cede);
… …
2908 CODE: 3346 CODE:
2909 RETVAL = coro_nready; 3347 RETVAL = coro_nready;
2910 OUTPUT: 3348 OUTPUT:
2911 RETVAL 3349 RETVAL
2912 3350
2913# for async_pool speedup
2914void 3351void
2915_pool_1 (SV *cb) 3352suspend (Coro::State self)
3353 PROTOTYPE: $
2916 CODE: 3354 CODE:
2917{ 3355 self->flags |= CF_SUSPENDED;
2918 HV *hv = (HV *)SvRV (coro_current);
2919 struct coro *coro = SvSTATE_hv ((SV *)hv);
2920 AV *defav = GvAV (PL_defgv);
2921 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
2922 AV *invoke_av;
2923 int i, len;
2924 3356
2925 if (!invoke) 3357void
3358resume (Coro::State self)
3359 PROTOTYPE: $
3360 CODE:
3361 self->flags &= ~CF_SUSPENDED;
3362
3363void
3364_pool_handler (...)
3365 CODE:
3366 CORO_EXECUTE_SLF_XS (slf_init_pool_handler);
3367
3368void
3369async_pool (SV *cv, ...)
3370 PROTOTYPE: &@
3371 PPCODE:
3372{
3373 HV *hv = (HV *)av_pop (av_async_pool);
3374 AV *av = newAV ();
3375 SV *cb = ST (0);
3376 int i;
3377
3378 av_extend (av, items - 2);
3379 for (i = 1; i < items; ++i)
3380 av_push (av, SvREFCNT_inc_NN (ST (i)));
3381
3382 if ((SV *)hv == &PL_sv_undef)
2926 { 3383 {
2927 SV *old = PL_diehook; 3384 PUSHMARK (SP);
2928 PL_diehook = 0; 3385 EXTEND (SP, 2);
2929 SvREFCNT_dec (old); 3386 PUSHs (sv_Coro);
2930 croak ("\3async_pool terminate\2\n"); 3387 PUSHs ((SV *)cv_pool_handler);
3388 PUTBACK;
3389 call_sv ((SV *)cv_coro_state_new, G_SCALAR);
3390 SPAGAIN;
3391
3392 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs));
2931 } 3393 }
2932 3394
2933 SvREFCNT_dec (coro->saved_deffh);
2934 coro->saved_deffh = SvREFCNT_inc_NN ((SV *)PL_defoutgv);
2935
2936 hv_store (hv, "desc", sizeof ("desc") - 1,
2937 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
2938
2939 invoke_av = (AV *)SvRV (invoke);
2940 len = av_len (invoke_av);
2941
2942 sv_setsv (cb, AvARRAY (invoke_av)[0]);
2943
2944 if (len > 0)
2945 { 3395 {
2946 av_fill (defav, len - 1); 3396 struct coro *coro = SvSTATE_hv (hv);
2947 for (i = 0; i < len; ++i) 3397
2948 av_store (defav, i, SvREFCNT_inc_NN (AvARRAY (invoke_av)[i + 1])); 3398 assert (!coro->invoke_cb);
3399 assert (!coro->invoke_av);
3400 coro->invoke_cb = SvREFCNT_inc (cb);
3401 coro->invoke_av = av;
2949 } 3402 }
2950}
2951 3403
2952void 3404 api_ready (aTHX_ (SV *)hv);
2953_pool_2 (SV *cb)
2954 CODE:
2955{
2956 HV *hv = (HV *)SvRV (coro_current);
2957 struct coro *coro = SvSTATE_hv ((SV *)hv);
2958 3405
2959 sv_setsv (cb, &PL_sv_undef); 3406 if (GIMME_V != G_VOID)
2960 3407 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
2961 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 3408 else
2962 coro->saved_deffh = 0;
2963
2964 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
2965 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
2966 {
2967 SV *old = PL_diehook;
2968 PL_diehook = 0;
2969 SvREFCNT_dec (old); 3409 SvREFCNT_dec (hv);
2970 croak ("\3async_pool terminate\2\n");
2971 }
2972
2973 av_clear (GvAV (PL_defgv));
2974 hv_store (hv, "desc", sizeof ("desc") - 1,
2975 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
2976
2977 coro->prio = 0;
2978
2979 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
2980 api_trace (aTHX_ coro_current, 0);
2981
2982 av_push (av_async_pool, newSVsv (coro_current));
2983} 3410}
2984 3411
2985SV * 3412SV *
2986rouse_cb () 3413rouse_cb ()
2987 PROTOTYPE: 3414 PROTOTYPE:
… …
2989 RETVAL = coro_new_rouse_cb (aTHX); 3416 RETVAL = coro_new_rouse_cb (aTHX);
2990 OUTPUT: 3417 OUTPUT:
2991 RETVAL 3418 RETVAL
2992 3419
2993void 3420void
2994rouse_wait (SV *cb = 0) 3421rouse_wait (...)
2995 PROTOTYPE: ;$ 3422 PROTOTYPE: ;$
2996 PPCODE: 3423 PPCODE:
2997 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait); 3424 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait);
3425
3426void
3427on_enter (SV *block)
3428 ALIAS:
3429 on_leave = 1
3430 PROTOTYPE: &
3431 CODE:
3432{
3433 struct coro *coro = SvSTATE_current;
3434 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3435
3436 block = (SV *)coro_sv_2cv (aTHX_ block);
3437
3438 if (!*avp)
3439 *avp = newAV ();
3440
3441 av_push (*avp, SvREFCNT_inc (block));
3442
3443 if (!ix)
3444 on_enterleave_call (aTHX_ block);
3445
3446 LEAVE; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
3447 SAVEDESTRUCTOR_X (ix ? coro_pop_on_leave : coro_pop_on_enter, (void *)coro);
3448 ENTER; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
3449}
2998 3450
2999 3451
3000MODULE = Coro::State PACKAGE = PerlIO::cede 3452MODULE = Coro::State PACKAGE = PerlIO::cede
3001 3453
3002BOOT: 3454BOOT:
… …
3013 GvSTASH (CvGV (cv)) 3465 GvSTASH (CvGV (cv))
3014 ); 3466 );
3015 OUTPUT: 3467 OUTPUT:
3016 RETVAL 3468 RETVAL
3017 3469
3018# helper for Coro::Channel 3470# helper for Coro::Channel and others
3019SV * 3471SV *
3020_alloc (int count) 3472_alloc (int count)
3021 CODE: 3473 CODE:
3022 RETVAL = coro_waitarray_new (aTHX_ count); 3474 RETVAL = coro_waitarray_new (aTHX_ count);
3023 OUTPUT: 3475 OUTPUT:
… …
3036 adjust = 1 3488 adjust = 1
3037 CODE: 3489 CODE:
3038 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1); 3490 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1);
3039 3491
3040void 3492void
3041down (SV *self) 3493down (...)
3042 CODE: 3494 CODE:
3043 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down); 3495 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down);
3044 3496
3045void 3497void
3046wait (SV *self) 3498wait (...)
3047 CODE: 3499 CODE:
3048 CORO_EXECUTE_SLF_XS (slf_init_semaphore_wait); 3500 CORO_EXECUTE_SLF_XS (slf_init_semaphore_wait);
3049 3501
3050void 3502void
3051try (SV *self) 3503try (SV *self)
… …
3081 for (i = 1; i <= wcount; ++i) 3533 for (i = 1; i <= wcount; ++i)
3082 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i]))); 3534 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i])));
3083 } 3535 }
3084} 3536}
3085 3537
3538MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3539
3540void
3541_may_delete (SV *sem, int count, int extra_refs)
3542 PPCODE:
3543{
3544 AV *av = (AV *)SvRV (sem);
3545
3546 if (SvREFCNT ((SV *)av) == 1 + extra_refs
3547 && AvFILLp (av) == 0 /* no waiters, just count */
3548 && SvIV (AvARRAY (av)[0]) == count)
3549 XSRETURN_YES;
3550
3551 XSRETURN_NO;
3552}
3553
3086MODULE = Coro::State PACKAGE = Coro::Signal 3554MODULE = Coro::State PACKAGE = Coro::Signal
3087 3555
3088SV * 3556SV *
3089new (SV *klass) 3557new (SV *klass)
3090 CODE: 3558 CODE:
… …
3094 ); 3562 );
3095 OUTPUT: 3563 OUTPUT:
3096 RETVAL 3564 RETVAL
3097 3565
3098void 3566void
3099wait (SV *self) 3567wait (...)
3100 CODE: 3568 CODE:
3101 CORO_EXECUTE_SLF_XS (slf_init_signal_wait); 3569 CORO_EXECUTE_SLF_XS (slf_init_signal_wait);
3102 3570
3103void 3571void
3104broadcast (SV *self) 3572broadcast (SV *self)
… …
3161 3629
3162void 3630void
3163_register (char *target, char *proto, SV *req) 3631_register (char *target, char *proto, SV *req)
3164 CODE: 3632 CODE:
3165{ 3633{
3166 HV *st; 3634 CV *req_cv = coro_sv_2cv (aTHX_ req);
3167 GV *gvp;
3168 CV *req_cv = sv_2cv (req, &st, &gvp, 0);
3169 /* newXSproto doesn't return the CV on 5.8 */ 3635 /* newXSproto doesn't return the CV on 5.8 */
3170 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 3636 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3171 sv_setpv ((SV *)slf_cv, proto); 3637 sv_setpv ((SV *)slf_cv, proto);
3172 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0); 3638 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
3173} 3639}

Diff Legend

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