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.301 by root, Wed Nov 19 02:41:31 2008 UTC vs.
Revision 1.351 by root, Sat Jun 20 08:58:25 2009 UTC

… …
16 16
17#ifdef WIN32 17#ifdef WIN32
18# undef setjmp 18# undef setjmp
19# undef longjmp 19# undef longjmp
20# undef _exit 20# undef _exit
21# define setjmp _setjmp // deep magic, don't ask 21# define setjmp _setjmp /* deep magic */
22#else 22#else
23# include <inttypes.h> /* most portable stdint.h */ 23# include <inttypes.h> /* most portable stdint.h */
24#endif 24#endif
25 25
26#ifdef HAVE_MMAP 26#ifdef HAVE_MMAP
… …
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
260 /* coro process data */ 284 /* coro process data */
261 int prio; 285 int prio;
262 SV *except; /* exception to be thrown */ 286 SV *except; /* exception to be thrown */
287 SV *rouse_cb;
263 288
264 /* async_pool */ 289 /* async_pool */
265 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;
266 297
267 /* linked list */ 298 /* linked list */
268 struct coro *next, *prev; 299 struct coro *next, *prev;
269}; 300};
270 301
… …
286#define PRIO_MIN -4 317#define PRIO_MIN -4
287 318
288/* for Coro.pm */ 319/* for Coro.pm */
289static SV *coro_current; 320static SV *coro_current;
290static SV *coro_readyhook; 321static SV *coro_readyhook;
291static 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;
292static struct coro *coro_first; 324static struct coro *coro_first;
293#define coro_nready coroapi.nready 325#define coro_nready coroapi.nready
294 326
295/** lowlevel stuff **********************************************************/ 327/** lowlevel stuff **********************************************************/
296 328
… …
322 get_hv (name, create); 354 get_hv (name, create);
323#endif 355#endif
324 return get_hv (name, create); 356 return get_hv (name, create);
325} 357}
326 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
327static AV * 425static AV *
328coro_clone_padlist (pTHX_ CV *cv) 426coro_derive_padlist (pTHX_ CV *cv)
329{ 427{
330 AV *padlist = CvPADLIST (cv); 428 AV *padlist = CvPADLIST (cv);
331 AV *newpadlist, *newpad; 429 AV *newpadlist, *newpad;
332 430
333 newpadlist = newAV (); 431 newpadlist = newAV ();
… …
338 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 436 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
339#endif 437#endif
340 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 438 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
341 --AvFILLp (padlist); 439 --AvFILLp (padlist);
342 440
343 av_store (newpadlist, 0, SvREFCNT_inc_NN (*av_fetch (padlist, 0, FALSE))); 441 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0]));
344 av_store (newpadlist, 1, (SV *)newpad); 442 av_store (newpadlist, 1, (SV *)newpad);
345 443
346 return newpadlist; 444 return newpadlist;
347} 445}
348 446
349static void 447static void
350free_padlist (pTHX_ AV *padlist) 448free_padlist (pTHX_ AV *padlist)
351{ 449{
352 /* may be during global destruction */ 450 /* may be during global destruction */
353 if (SvREFCNT (padlist)) 451 if (!IN_DESTRUCT)
354 { 452 {
355 I32 i = AvFILLp (padlist); 453 I32 i = AvFILLp (padlist);
356 while (i >= 0) 454
455 while (i > 0) /* special-case index 0 */
357 { 456 {
358 SV **svp = av_fetch (padlist, i--, FALSE); 457 /* we try to be extra-careful here */
359 if (svp) 458 AV *av = (AV *)AvARRAY (padlist)[i--];
360 { 459 I32 j = AvFILLp (av);
361 SV *sv; 460
362 while (&PL_sv_undef != (sv = av_pop ((AV *)*svp))) 461 while (j >= 0)
462 SvREFCNT_dec (AvARRAY (av)[j--]);
463
464 AvFILLp (av) = -1;
363 SvREFCNT_dec (sv); 465 SvREFCNT_dec (av);
364
365 SvREFCNT_dec (*svp);
366 }
367 } 466 }
368 467
468 SvREFCNT_dec (AvARRAY (padlist)[0]);
469
470 AvFILLp (padlist) = -1;
369 SvREFCNT_dec ((SV*)padlist); 471 SvREFCNT_dec ((SV*)padlist);
370 } 472 }
371} 473}
372 474
373static int 475static int
… …
382 484
383 SvREFCNT_dec (av); /* sv_magicext increased the refcount */ 485 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
384 486
385 return 0; 487 return 0;
386} 488}
387
388#define CORO_MAGIC_type_cv 26
389#define CORO_MAGIC_type_state PERL_MAGIC_ext
390 489
391static MGVTBL coro_cv_vtbl = { 490static MGVTBL coro_cv_vtbl = {
392 0, 0, 0, 0, 491 0, 0, 0, 0,
393 coro_cv_free 492 coro_cv_free
394}; 493};
395
396#define CORO_MAGIC_NN(sv, type) \
397 (expect_true (SvMAGIC (sv)->mg_type == type) \
398 ? SvMAGIC (sv) \
399 : mg_find (sv, type))
400
401#define CORO_MAGIC(sv, type) \
402 (expect_true (SvMAGIC (sv)) \
403 ? CORO_MAGIC_NN (sv, type) \
404 : 0)
405
406#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
407#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
408
409INLINE struct coro *
410SvSTATE_ (pTHX_ SV *coro)
411{
412 HV *stash;
413 MAGIC *mg;
414
415 if (SvROK (coro))
416 coro = SvRV (coro);
417
418 if (expect_false (SvTYPE (coro) != SVt_PVHV))
419 croak ("Coro::State object required");
420
421 stash = SvSTASH (coro);
422 if (expect_false (stash != coro_stash && stash != coro_state_stash))
423 {
424 /* very slow, but rare, check */
425 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
426 croak ("Coro::State object required");
427 }
428
429 mg = CORO_MAGIC_state (coro);
430 return (struct coro *)mg->mg_ptr;
431}
432
433#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
434
435/* faster than SvSTATE, but expects a coroutine hv */
436#define SvSTATE_hv(hv) ((struct coro *)CORO_MAGIC_NN ((SV *)hv, CORO_MAGIC_type_state)->mg_ptr)
437#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
438 494
439/* the next two functions merely cache the padlists */ 495/* the next two functions merely cache the padlists */
440static void 496static void
441get_padlist (pTHX_ CV *cv) 497get_padlist (pTHX_ CV *cv)
442{ 498{
… …
448 else 504 else
449 { 505 {
450#if CORO_PREFER_PERL_FUNCTIONS 506#if CORO_PREFER_PERL_FUNCTIONS
451 /* this is probably cleaner? but also slower! */ 507 /* this is probably cleaner? but also slower! */
452 /* in practise, it seems to be less stable */ 508 /* in practise, it seems to be less stable */
453 CV *cp = Perl_cv_clone (cv); 509 CV *cp = Perl_cv_clone (aTHX_ cv);
454 CvPADLIST (cv) = CvPADLIST (cp); 510 CvPADLIST (cv) = CvPADLIST (cp);
455 CvPADLIST (cp) = 0; 511 CvPADLIST (cp) = 0;
456 SvREFCNT_dec (cp); 512 SvREFCNT_dec (cp);
457#else 513#else
458 CvPADLIST (cv) = coro_clone_padlist (aTHX_ cv); 514 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
459#endif 515#endif
460 } 516 }
461} 517}
462 518
463static void 519static void
… …
470 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);
471 527
472 av = (AV *)mg->mg_obj; 528 av = (AV *)mg->mg_obj;
473 529
474 if (expect_false (AvFILLp (av) >= AvMAX (av))) 530 if (expect_false (AvFILLp (av) >= AvMAX (av)))
475 av_extend (av, AvMAX (av) + 1); 531 av_extend (av, AvFILLp (av) + 1);
476 532
477 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 533 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
478} 534}
479 535
480/** load & save, init *******************************************************/ 536/** load & save, init *******************************************************/
537
538static void
539on_enterleave_call (pTHX_ SV *cb);
481 540
482static void 541static void
483load_perl (pTHX_ Coro__State c) 542load_perl (pTHX_ Coro__State c)
484{ 543{
485 perl_slots *slot = c->slot; 544 perl_slots *slot = c->slot;
486 c->slot = 0; 545 c->slot = 0;
487 546
488 PL_mainstack = c->mainstack; 547 PL_mainstack = c->mainstack;
489 548
490 GvSV (PL_defgv) = slot->defsv; 549 GvSV (PL_defgv) = slot->defsv;
491 GvAV (PL_defgv) = slot->defav; 550 GvAV (PL_defgv) = slot->defav;
492 GvSV (PL_errgv) = slot->errsv; 551 GvSV (PL_errgv) = slot->errsv;
493 GvSV (irsgv) = slot->irsgv; 552 GvSV (irsgv) = slot->irsgv;
553 GvHV (PL_hintgv) = slot->hinthv;
494 554
495 #define VAR(name,type) PL_ ## name = slot->name; 555 #define VAR(name,type) PL_ ## name = slot->name;
496 # include "state.h" 556 # include "state.h"
497 #undef VAR 557 #undef VAR
498 558
… …
512 PUTBACK; 572 PUTBACK;
513 } 573 }
514 574
515 slf_frame = c->slf_frame; 575 slf_frame = c->slf_frame;
516 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 }
517} 585}
518 586
519static void 587static void
520save_perl (pTHX_ Coro__State c) 588save_perl (pTHX_ Coro__State c)
521{ 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
522 c->except = CORO_THROW; 598 c->except = CORO_THROW;
523 c->slf_frame = slf_frame; 599 c->slf_frame = slf_frame;
524 600
525 { 601 {
526 dSP; 602 dSP;
… …
584 c->mainstack = PL_mainstack; 660 c->mainstack = PL_mainstack;
585 661
586 { 662 {
587 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 663 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
588 664
589 slot->defav = GvAV (PL_defgv); 665 slot->defav = GvAV (PL_defgv);
590 slot->defsv = DEFSV; 666 slot->defsv = DEFSV;
591 slot->errsv = ERRSV; 667 slot->errsv = ERRSV;
592 slot->irsgv = GvSV (irsgv); 668 slot->irsgv = GvSV (irsgv);
669 slot->hinthv = GvHV (PL_hintgv);
593 670
594 #define VAR(name,type) slot->name = PL_ ## name; 671 #define VAR(name,type) slot->name = PL_ ## name;
595 # include "state.h" 672 # include "state.h"
596 #undef VAR 673 #undef VAR
597 } 674 }
… …
602 * of perl.c:init_stacks, except that it uses less memory 679 * of perl.c:init_stacks, except that it uses less memory
603 * on the (sometimes correct) assumption that coroutines do 680 * on the (sometimes correct) assumption that coroutines do
604 * not usually need a lot of stackspace. 681 * not usually need a lot of stackspace.
605 */ 682 */
606#if CORO_PREFER_PERL_FUNCTIONS 683#if CORO_PREFER_PERL_FUNCTIONS
607# define coro_init_stacks init_stacks 684# define coro_init_stacks(thx) init_stacks ()
608#else 685#else
609static void 686static void
610coro_init_stacks (pTHX) 687coro_init_stacks (pTHX)
611{ 688{
612 PL_curstackinfo = new_stackinfo(32, 8); 689 PL_curstackinfo = new_stackinfo(32, 8);
… …
675#if !PERL_VERSION_ATLEAST (5,10,0) 752#if !PERL_VERSION_ATLEAST (5,10,0)
676 Safefree (PL_retstack); 753 Safefree (PL_retstack);
677#endif 754#endif
678} 755}
679 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
680static size_t 766static size_t
681coro_rss (pTHX_ struct coro *coro) 767coro_rss (pTHX_ struct coro *coro)
682{ 768{
683 size_t rss = sizeof (*coro); 769 size_t rss = sizeof (*coro);
684 770
685 if (coro->mainstack) 771 if (coro->mainstack)
686 { 772 {
687 perl_slots tmp_slot;
688 perl_slots *slot;
689
690 if (coro->flags & CF_RUNNING) 773 if (coro->flags & CF_RUNNING)
691 { 774 {
692 slot = &tmp_slot; 775 #define SYM(sym) PL_ ## sym
693 776 CORO_RSS;
694 #define VAR(name,type) slot->name = PL_ ## name;
695 # include "state.h"
696 #undef VAR 777 #undef SYM
697 } 778 }
698 else 779 else
699 slot = coro->slot;
700
701 if (slot)
702 { 780 {
703 rss += sizeof (slot->curstackinfo); 781 #define SYM(sym) coro->slot->sym
704 rss += (slot->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT); 782 CORO_RSS;
705 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (slot->curstack)) * sizeof (SV *); 783 #undef SYM
706 rss += slot->tmps_max * sizeof (SV *);
707 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32);
708 rss += slot->scopestack_max * sizeof (I32);
709 rss += slot->savestack_max * sizeof (ANY);
710
711#if !PERL_VERSION_ATLEAST (5,10,0)
712 rss += slot->retstack_max * sizeof (OP *);
713#endif
714 } 784 }
715 } 785 }
716 786
717 return rss; 787 return rss;
718} 788}
… …
731#endif 801#endif
732 802
733/* 803/*
734 * This overrides the default magic get method of %SIG elements. 804 * This overrides the default magic get method of %SIG elements.
735 * 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
736 * 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
737 * readback here. 807 * readback here.
738 * We only do this when the hook is != 0, as they are often set to 0 temporarily,
739 * not expecting this to actually change the hook. This is a potential problem
740 * when a schedule happens then, but we ignore this.
741 */ 808 */
742static int 809static int
743coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 810coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
744{ 811{
745 const char *s = MgPV_nolen_const (mg); 812 const char *s = MgPV_nolen_const (mg);
… …
798 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 865 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
799 866
800 if (svp) 867 if (svp)
801 { 868 {
802 SV *old = *svp; 869 SV *old = *svp;
803 *svp = newSVsv (sv); 870 *svp = SvOK (sv) ? newSVsv (sv) : 0;
804 SvREFCNT_dec (old); 871 SvREFCNT_dec (old);
805 return 0; 872 return 0;
806 } 873 }
807 } 874 }
808 875
… …
818 885
819static int 886static int
820slf_check_nop (pTHX_ struct CoroSLF *frame) 887slf_check_nop (pTHX_ struct CoroSLF *frame)
821{ 888{
822 return 0; 889 return 0;
890}
891
892static int
893slf_check_repeat (pTHX_ struct CoroSLF *frame)
894{
895 return 1;
823} 896}
824 897
825static UNOP coro_setup_op; 898static UNOP coro_setup_op;
826 899
827static 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 */
… …
834 907
835 PL_runops = RUNOPS_DEFAULT; 908 PL_runops = RUNOPS_DEFAULT;
836 PL_curcop = &PL_compiling; 909 PL_curcop = &PL_compiling;
837 PL_in_eval = EVAL_NULL; 910 PL_in_eval = EVAL_NULL;
838 PL_comppad = 0; 911 PL_comppad = 0;
912 PL_comppad_name = 0;
913 PL_comppad_name_fill = 0;
914 PL_comppad_name_floor = 0;
839 PL_curpm = 0; 915 PL_curpm = 0;
840 PL_curpad = 0; 916 PL_curpad = 0;
841 PL_localizing = 0; 917 PL_localizing = 0;
842 PL_dirty = 0; 918 PL_dirty = 0;
843 PL_restartop = 0; 919 PL_restartop = 0;
844#if PERL_VERSION_ATLEAST (5,10,0) 920#if PERL_VERSION_ATLEAST (5,10,0)
845 PL_parser = 0; 921 PL_parser = 0;
846#endif 922#endif
923 PL_hints = 0;
847 924
848 /* recreate the die/warn hooks */ 925 /* recreate the die/warn hooks */
849 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 );
850 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);
851 928
852 GvSV (PL_defgv) = newSV (0); 929 GvSV (PL_defgv) = newSV (0);
853 GvAV (PL_defgv) = coro->args; coro->args = 0; 930 GvAV (PL_defgv) = coro->args; coro->args = 0;
854 GvSV (PL_errgv) = newSV (0); 931 GvSV (PL_errgv) = newSV (0);
855 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;
856 PL_rs = newSVsv (GvSV (irsgv)); 934 PL_rs = newSVsv (GvSV (irsgv));
857 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 935 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
858 936
859 { 937 {
860 dSP; 938 dSP;
861 UNOP myop; 939 UNOP myop;
862 940
863 Zero (&myop, 1, UNOP); 941 Zero (&myop, 1, UNOP);
864 myop.op_next = Nullop; 942 myop.op_next = Nullop;
943 myop.op_type = OP_ENTERSUB;
865 myop.op_flags = OPf_WANT_VOID; 944 myop.op_flags = OPf_WANT_VOID;
866 945
867 PUSHMARK (SP); 946 PUSHMARK (SP);
868 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv)))); 947 PUSHs ((SV *)coro->startcv);
869 PUTBACK; 948 PUTBACK;
870 PL_op = (OP *)&myop; 949 PL_op = (OP *)&myop;
871 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 950 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
872 SPAGAIN;
873 } 951 }
874 952
875 /* 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
876 * 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.
877 */ 955 */
878 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 */
879 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 */
880 958
881 /* 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 */
882 coro_setup_op.op_next = PL_op; 960 coro_setup_op.op_next = PL_op;
883 coro_setup_op.op_type = OP_CUSTOM; 961 coro_setup_op.op_type = OP_ENTERSUB;
884 coro_setup_op.op_ppaddr = pp_slf; 962 coro_setup_op.op_ppaddr = pp_slf;
885 /* no flags required, as an init function won't be called */ 963 /* no flags etc. required, as an init function won't be called */
886 964
887 PL_op = (OP *)&coro_setup_op; 965 PL_op = (OP *)&coro_setup_op;
888 966
889 /* copy throw, in case it was set before coro_setup */ 967 /* copy throw, in case it was set before coro_setup */
890 CORO_THROW = coro->except; 968 CORO_THROW = coro->except;
891} 969}
892 970
893static void 971static void
894coro_destruct (pTHX_ struct coro *coro) 972coro_unwind_stacks (pTHX)
895{ 973{
896 if (!IN_DESTRUCT) 974 if (!IN_DESTRUCT)
897 { 975 {
898 /* restore all saved variables and stuff */ 976 /* restore all saved variables and stuff */
899 LEAVE_SCOPE (0); 977 LEAVE_SCOPE (0);
… …
907 POPSTACK_TO (PL_mainstack); 985 POPSTACK_TO (PL_mainstack);
908 986
909 /* unwind main stack */ 987 /* unwind main stack */
910 dounwind (-1); 988 dounwind (-1);
911 } 989 }
990}
912 991
913 SvREFCNT_dec (GvSV (PL_defgv)); 992static void
914 SvREFCNT_dec (GvAV (PL_defgv)); 993coro_destruct_perl (pTHX_ struct coro *coro)
915 SvREFCNT_dec (GvSV (PL_errgv)); 994{
916 SvREFCNT_dec (PL_defoutgv); 995 SV *svf [9];
917 SvREFCNT_dec (PL_rs);
918 SvREFCNT_dec (GvSV (irsgv));
919 996
920 SvREFCNT_dec (PL_diehook);
921 SvREFCNT_dec (PL_warnhook);
922 997 {
998 struct coro *current = SvSTATE_current;
999
1000 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1001
1002 save_perl (aTHX_ current);
1003 load_perl (aTHX_ coro);
1004 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
923 SvREFCNT_dec (coro->saved_deffh); 1028 SvREFCNT_dec (coro->saved_deffh);
924 SvREFCNT_dec (CORO_THROW); 1029 SvREFCNT_dec (coro->rouse_cb);
925 1030 SvREFCNT_dec (coro->invoke_cb);
926 coro_destruct_stacks (aTHX); 1031 SvREFCNT_dec (coro->invoke_av);
1032 }
927} 1033}
928 1034
929INLINE void 1035INLINE void
930free_coro_mortal (pTHX) 1036free_coro_mortal (pTHX)
931{ 1037{
… …
939static int 1045static int
940runops_trace (pTHX) 1046runops_trace (pTHX)
941{ 1047{
942 COP *oldcop = 0; 1048 COP *oldcop = 0;
943 int oldcxix = -2; 1049 int oldcxix = -2;
944 struct coro *coro = SvSTATE_current; /* trace cctx is tied to specific coro */
945 coro_cctx *cctx = coro->cctx;
946 1050
947 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX))) 1051 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX)))
948 { 1052 {
949 PERL_ASYNC_CHECK (); 1053 PERL_ASYNC_CHECK ();
950 1054
951 if (cctx->flags & CC_TRACE_ALL) 1055 if (cctx_current->flags & CC_TRACE_ALL)
952 { 1056 {
953 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)
954 { 1058 {
955 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1059 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
956 SV **bot, **top; 1060 SV **bot, **top;
957 AV *av = newAV (); /* return values */ 1061 AV *av = newAV (); /* return values */
958 SV **cb; 1062 SV **cb;
… …
995 1099
996 if (PL_curcop != &PL_compiling) 1100 if (PL_curcop != &PL_compiling)
997 { 1101 {
998 SV **cb; 1102 SV **cb;
999 1103
1000 if (oldcxix != cxstack_ix && cctx->flags & CC_TRACE_SUB) 1104 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB)
1001 { 1105 {
1002 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1106 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1003 1107
1004 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1108 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1005 { 1109 {
1006 runops_proc_t old_runops = PL_runops;
1007 dSP; 1110 dSP;
1008 GV *gv = CvGV (cx->blk_sub.cv); 1111 GV *gv = CvGV (cx->blk_sub.cv);
1009 SV *fullname = sv_2mortal (newSV (0)); 1112 SV *fullname = sv_2mortal (newSV (0));
1010 1113
1011 if (isGV (gv)) 1114 if (isGV (gv))
… …
1016 SAVETMPS; 1119 SAVETMPS;
1017 EXTEND (SP, 3); 1120 EXTEND (SP, 3);
1018 PUSHMARK (SP); 1121 PUSHMARK (SP);
1019 PUSHs (&PL_sv_yes); 1122 PUSHs (&PL_sv_yes);
1020 PUSHs (fullname); 1123 PUSHs (fullname);
1021 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);
1022 PUTBACK; 1125 PUTBACK;
1023 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);
1024 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);
1025 SPAGAIN; 1128 SPAGAIN;
1026 FREETMPS; 1129 FREETMPS;
… …
1029 } 1132 }
1030 1133
1031 oldcxix = cxstack_ix; 1134 oldcxix = cxstack_ix;
1032 } 1135 }
1033 1136
1034 if (cctx->flags & CC_TRACE_LINE) 1137 if (cctx_current->flags & CC_TRACE_LINE)
1035 { 1138 {
1036 dSP; 1139 dSP;
1037 1140
1038 PL_runops = RUNOPS_DEFAULT; 1141 PL_runops = RUNOPS_DEFAULT;
1039 ENTER; 1142 ENTER;
… …
1058 1161
1059 TAINT_NOT; 1162 TAINT_NOT;
1060 return 0; 1163 return 0;
1061} 1164}
1062 1165
1063static struct coro_cctx *cctx_ssl_cctx;
1064static struct CoroSLF cctx_ssl_frame; 1166static struct CoroSLF cctx_ssl_frame;
1065 1167
1066static void 1168static void
1067slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta) 1169slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta)
1068{ 1170{
1069 ta->prev = (struct coro *)cctx_ssl_cctx;
1070 ta->next = 0; 1171 ta->prev = 0;
1071} 1172}
1072 1173
1073static int 1174static int
1074slf_check_set_stacklevel (pTHX_ struct CoroSLF *frame) 1175slf_check_set_stacklevel (pTHX_ struct CoroSLF *frame)
1075{ 1176{
… …
1078 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 */
1079} 1180}
1080 1181
1081/* 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 */
1082static void NOINLINE 1183static void NOINLINE
1083cctx_prepare (pTHX_ coro_cctx *cctx) 1184cctx_prepare (pTHX)
1084{ 1185{
1085 PL_top_env = &PL_start_env; 1186 PL_top_env = &PL_start_env;
1086 1187
1087 if (cctx->flags & CC_TRACE) 1188 if (cctx_current->flags & CC_TRACE)
1088 PL_runops = runops_trace; 1189 PL_runops = runops_trace;
1089 1190
1090 /* 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
1091 * that can lead to creation of a new cctx */ 1192 * that can lead to creation of a new cctx */
1092 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)",
1093 slf_frame.prepare && PL_op->op_ppaddr == pp_slf)); 1194 slf_frame.prepare && PL_op->op_ppaddr == pp_slf));
1094 1195
1095 /* 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 */
1096 cctx_ssl_cctx = cctx;
1097 cctx_ssl_frame = slf_frame; 1197 cctx_ssl_frame = slf_frame;
1098 1198
1099 slf_frame.prepare = slf_prepare_set_stacklevel; 1199 slf_frame.prepare = slf_prepare_set_stacklevel;
1100 slf_frame.check = slf_check_set_stacklevel; 1200 slf_frame.check = slf_check_set_stacklevel;
1101} 1201}
… …
1124 /* normally we would need to skip the entersub here */ 1224 /* normally we would need to skip the entersub here */
1125 /* 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 */
1126 /* PL_nop = PL_nop->op_next */ 1226 /* PL_nop = PL_nop->op_next */
1127 1227
1128 /* inject a fake subroutine call to cctx_init */ 1228 /* inject a fake subroutine call to cctx_init */
1129 cctx_prepare (aTHX_ (coro_cctx *)arg); 1229 cctx_prepare (aTHX);
1130 1230
1131 /* cctx_run is the alternative tail of transfer() */ 1231 /* cctx_run is the alternative tail of transfer() */
1132 transfer_tail (aTHX); 1232 transfer_tail (aTHX);
1133 1233
1134 /* 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 */
1135 PL_restartop = PL_op; 1235 PL_restartop = PL_op;
1136 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 */
1137 1241
1138 /* 1242 /*
1139 * 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
1140 * 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)
1141 * 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
1142 * bootstrap-time "top" top_env, as we cannot restore the "main" 1246 * bootstrap-time "top" top_env, as we cannot restore the "main"
1143 * 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.
1144 */ 1250 */
1145 PL_top_env = main_top_env; 1251 PL_top_env = main_top_env;
1146 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 */
1147 } 1253 }
1148} 1254}
… …
1225cctx_destroy (coro_cctx *cctx) 1331cctx_destroy (coro_cctx *cctx)
1226{ 1332{
1227 if (!cctx) 1333 if (!cctx)
1228 return; 1334 return;
1229 1335
1336 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary?
1337
1230 --cctx_count; 1338 --cctx_count;
1231 coro_destroy (&cctx->cctx); 1339 coro_destroy (&cctx->cctx);
1232 1340
1233 /* coro_transfer creates new, empty cctx's */ 1341 /* coro_transfer creates new, empty cctx's */
1234 if (cctx->sptr) 1342 if (cctx->sptr)
… …
1297 /* TODO: throwing up here is considered harmful */ 1405 /* TODO: throwing up here is considered harmful */
1298 1406
1299 if (expect_true (prev != next)) 1407 if (expect_true (prev != next))
1300 { 1408 {
1301 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1409 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1302 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,");
1303 1411
1304 if (expect_false (next->flags & CF_RUNNING))
1305 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states,");
1306
1307 if (expect_false (next->flags & CF_DESTROYED)) 1412 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED)))
1308 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,");
1309 1414
1310#if !PERL_VERSION_ATLEAST (5,10,0) 1415#if !PERL_VERSION_ATLEAST (5,10,0)
1311 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1416 if (expect_false (PL_lex_state != LEX_NOTPARSING))
1312 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,");
1313#endif 1418#endif
… …
1319transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1424transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1320{ 1425{
1321 dSTACKLEVEL; 1426 dSTACKLEVEL;
1322 1427
1323 /* sometimes transfer is only called to set idle_sp */ 1428 /* sometimes transfer is only called to set idle_sp */
1324 if (expect_false (!next)) 1429 if (expect_false (!prev))
1325 { 1430 {
1326 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1431 cctx_current->idle_sp = STACKLEVEL;
1327 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 */
1328 } 1433 }
1329 else if (expect_true (prev != next)) 1434 else if (expect_true (prev != next))
1330 { 1435 {
1331 coro_cctx *prev__cctx; 1436 coro_cctx *cctx_prev;
1332 1437
1333 if (expect_false (prev->flags & CF_NEW)) 1438 if (expect_false (prev->flags & CF_NEW))
1334 { 1439 {
1335 /* create a new empty/source context */ 1440 /* create a new empty/source context */
1336 prev->cctx = cctx_new_empty ();
1337 prev->flags &= ~CF_NEW; 1441 prev->flags &= ~CF_NEW;
1338 prev->flags |= CF_RUNNING; 1442 prev->flags |= CF_RUNNING;
1339 } 1443 }
1340 1444
1341 prev->flags &= ~CF_RUNNING; 1445 prev->flags &= ~CF_RUNNING;
… …
1352 coro_setup (aTHX_ next); 1456 coro_setup (aTHX_ next);
1353 } 1457 }
1354 else 1458 else
1355 load_perl (aTHX_ next); 1459 load_perl (aTHX_ next);
1356 1460
1357 prev__cctx = prev->cctx;
1358
1359 /* possibly untie and reuse the cctx */ 1461 /* possibly untie and reuse the cctx */
1360 if (expect_true ( 1462 if (expect_true (
1361 prev__cctx->idle_sp == STACKLEVEL 1463 cctx_current->idle_sp == STACKLEVEL
1362 && !(prev__cctx->flags & CC_TRACE) 1464 && !(cctx_current->flags & CC_TRACE)
1363 && !force_cctx 1465 && !force_cctx
1364 )) 1466 ))
1365 { 1467 {
1366 /* 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 */
1367 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));
1368 1470
1369 prev->cctx = 0;
1370
1371 /* 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. */
1372 /* 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 */
1373 if (expect_false (CCTX_EXPIRED (prev__cctx))) 1473 if (expect_false (CCTX_EXPIRED (cctx_current)))
1374 if (!next->cctx) 1474 if (expect_true (!next->cctx))
1375 next->cctx = cctx_get (aTHX); 1475 next->cctx = cctx_get (aTHX);
1376 1476
1377 cctx_put (prev__cctx); 1477 cctx_put (cctx_current);
1378 } 1478 }
1479 else
1480 prev->cctx = cctx_current;
1379 1481
1380 ++next->usecount; 1482 ++next->usecount;
1381 1483
1382 if (expect_true (!next->cctx)) 1484 cctx_prev = cctx_current;
1383 next->cctx = cctx_get (aTHX); 1485 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1384 1486
1385 if (expect_false (prev__cctx != next->cctx)) 1487 next->cctx = 0;
1488
1489 if (expect_false (cctx_prev != cctx_current))
1386 { 1490 {
1387 prev__cctx->top_env = PL_top_env; 1491 cctx_prev->top_env = PL_top_env;
1388 PL_top_env = next->cctx->top_env; 1492 PL_top_env = cctx_current->top_env;
1389 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1493 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1390 } 1494 }
1391 1495
1392 transfer_tail (aTHX); 1496 transfer_tail (aTHX);
1393 } 1497 }
1394} 1498}
… …
1402coro_state_destroy (pTHX_ struct coro *coro) 1506coro_state_destroy (pTHX_ struct coro *coro)
1403{ 1507{
1404 if (coro->flags & CF_DESTROYED) 1508 if (coro->flags & CF_DESTROYED)
1405 return 0; 1509 return 0;
1406 1510
1407 if (coro->on_destroy) 1511 if (coro->on_destroy && !PL_dirty)
1408 coro->on_destroy (aTHX_ coro); 1512 coro->on_destroy (aTHX_ coro);
1409 1513
1410 coro->flags |= CF_DESTROYED; 1514 coro->flags |= CF_DESTROYED;
1411 1515
1412 if (coro->flags & CF_READY) 1516 if (coro->flags & CF_READY)
… …
1416 --coro_nready; 1520 --coro_nready;
1417 } 1521 }
1418 else 1522 else
1419 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 */
1420 1524
1421 if (coro->mainstack && coro->mainstack != main_mainstack) 1525 if (coro->mainstack
1422 { 1526 && coro->mainstack != main_mainstack
1423 struct coro temp; 1527 && coro->slot
1424 1528 && !PL_dirty)
1425 assert (("FATAL: tried to destroy currently running coroutine (please report)", !(coro->flags & CF_RUNNING)));
1426
1427 save_perl (aTHX_ &temp);
1428 load_perl (aTHX_ coro);
1429
1430 coro_destruct (aTHX_ coro); 1529 coro_destruct_perl (aTHX_ coro);
1431
1432 load_perl (aTHX_ &temp);
1433
1434 coro->slot = 0;
1435 }
1436 1530
1437 cctx_destroy (coro->cctx); 1531 cctx_destroy (coro->cctx);
1532 SvREFCNT_dec (coro->startcv);
1438 SvREFCNT_dec (coro->args); 1533 SvREFCNT_dec (coro->args);
1534 SvREFCNT_dec (CORO_THROW);
1439 1535
1440 if (coro->next) coro->next->prev = coro->prev; 1536 if (coro->next) coro->next->prev = coro->prev;
1441 if (coro->prev) coro->prev->next = coro->next; 1537 if (coro->prev) coro->prev->next = coro->next;
1442 if (coro == coro_first) coro_first = coro->next; 1538 if (coro == coro_first) coro_first = coro->next;
1443 1539
… …
1497 1593
1498 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1594 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1499 TRANSFER (ta, 1); 1595 TRANSFER (ta, 1);
1500} 1596}
1501 1597
1598/*****************************************************************************/
1599/* gensub: simple closure generation utility */
1600
1601#define GENSUB_ARG CvXSUBANY (cv).any_ptr
1602
1603/* create a closure from XS, returns a code reference */
1604/* the arg can be accessed via GENSUB_ARG from the callback */
1605/* the callback must use dXSARGS/XSRETURN */
1606static SV *
1607gensub (pTHX_ void (*xsub)(pTHX_ CV *), void *arg)
1608{
1609 CV *cv = (CV *)newSV (0);
1610
1611 sv_upgrade ((SV *)cv, SVt_PVCV);
1612
1613 CvANON_on (cv);
1614 CvISXSUB_on (cv);
1615 CvXSUB (cv) = xsub;
1616 GENSUB_ARG = arg;
1617
1618 return newRV_noinc ((SV *)cv);
1619}
1620
1502/** Coro ********************************************************************/ 1621/** Coro ********************************************************************/
1503 1622
1504INLINE void 1623INLINE void
1505coro_enq (pTHX_ struct coro *coro) 1624coro_enq (pTHX_ struct coro *coro)
1506{ 1625{
1507 av_push (coro_ready [coro->prio - PRIO_MIN], SvREFCNT_inc_NN (coro->hv)); 1626 struct coro **ready = coro_ready [coro->prio - PRIO_MIN];
1508}
1509 1627
1510INLINE 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 *
1511coro_deq (pTHX) 1636coro_deq (pTHX)
1512{ 1637{
1513 int prio; 1638 int prio;
1514 1639
1515 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; ) 1640 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; )
1516 if (AvFILLp (coro_ready [prio]) >= 0) 1641 {
1517 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 }
1518 1651
1519 return 0; 1652 return 0;
1520} 1653}
1521 1654
1522static int 1655static int
… …
1524{ 1657{
1525 struct coro *coro; 1658 struct coro *coro;
1526 SV *sv_hook; 1659 SV *sv_hook;
1527 void (*xs_hook)(void); 1660 void (*xs_hook)(void);
1528 1661
1529 if (SvROK (coro_sv))
1530 coro_sv = SvRV (coro_sv);
1531
1532 coro = SvSTATE (coro_sv); 1662 coro = SvSTATE (coro_sv);
1533 1663
1534 if (coro->flags & CF_READY) 1664 if (coro->flags & CF_READY)
1535 return 0; 1665 return 0;
1536 1666
… …
1567api_is_ready (pTHX_ SV *coro_sv) 1697api_is_ready (pTHX_ SV *coro_sv)
1568{ 1698{
1569 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1699 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1570} 1700}
1571 1701
1702/* expects to own a reference to next->hv */
1572INLINE void 1703INLINE void
1573prepare_schedule (pTHX_ struct coro_transfer_args *ta) 1704prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1574{ 1705{
1575 SV *prev_sv, *next_sv;
1576
1577 for (;;)
1578 {
1579 next_sv = coro_deq (aTHX);
1580
1581 /* nothing to schedule: call the idle handler */
1582 if (expect_false (!next_sv))
1583 {
1584 dSP;
1585
1586 ENTER;
1587 SAVETMPS;
1588
1589 PUSHMARK (SP);
1590 PUTBACK;
1591 call_sv (get_sv ("Coro::idle", FALSE), G_VOID | G_DISCARD);
1592
1593 FREETMPS;
1594 LEAVE;
1595 continue;
1596 }
1597
1598 ta->next = SvSTATE_hv (next_sv);
1599
1600 /* cannot transfer to destroyed coros, skip and look for next */
1601 if (expect_false (ta->next->flags & CF_DESTROYED))
1602 {
1603 SvREFCNT_dec (next_sv);
1604 /* coro_nready has already been taken care of by destroy */
1605 continue;
1606 }
1607
1608 --coro_nready;
1609 break;
1610 }
1611
1612 /* free this only after the transfer */
1613 prev_sv = SvRV (coro_current); 1706 SV *prev_sv = SvRV (coro_current);
1707
1614 ta->prev = SvSTATE_hv (prev_sv); 1708 ta->prev = SvSTATE_hv (prev_sv);
1709 ta->next = next;
1710
1615 TRANSFER_CHECK (*ta); 1711 TRANSFER_CHECK (*ta);
1616 assert (("FATAL: next coroutine isn't marked as ready in Coro (please report)", ta->next->flags & CF_READY)); 1712
1617 ta->next->flags &= ~CF_READY;
1618 SvRV_set (coro_current, next_sv); 1713 SvRV_set (coro_current, (SV *)next->hv);
1619 1714
1620 free_coro_mortal (aTHX); 1715 free_coro_mortal (aTHX);
1621 coro_mortal = prev_sv; 1716 coro_mortal = prev_sv;
1622} 1717}
1623 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
1624INLINE void 1768INLINE void
1625prepare_cede (pTHX_ struct coro_transfer_args *ta) 1769prepare_cede (pTHX_ struct coro_transfer_args *ta)
1626{ 1770{
1627 api_ready (aTHX_ coro_current); 1771 api_ready (aTHX_ coro_current);
1628 prepare_schedule (aTHX_ ta); 1772 prepare_schedule (aTHX_ ta);
… …
1647{ 1791{
1648 struct coro_transfer_args ta; 1792 struct coro_transfer_args ta;
1649 1793
1650 prepare_schedule (aTHX_ &ta); 1794 prepare_schedule (aTHX_ &ta);
1651 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);
1652} 1806}
1653 1807
1654static int 1808static int
1655api_cede (pTHX) 1809api_cede (pTHX)
1656{ 1810{
… …
1685static void 1839static void
1686api_trace (pTHX_ SV *coro_sv, int flags) 1840api_trace (pTHX_ SV *coro_sv, int flags)
1687{ 1841{
1688 struct coro *coro = SvSTATE (coro_sv); 1842 struct coro *coro = SvSTATE (coro_sv);
1689 1843
1844 if (coro->flags & CF_RUNNING)
1845 croak ("cannot enable tracing on a running coroutine, caught");
1846
1690 if (flags & CC_TRACE) 1847 if (flags & CC_TRACE)
1691 { 1848 {
1692 if (!coro->cctx) 1849 if (!coro->cctx)
1693 coro->cctx = cctx_new_run (); 1850 coro->cctx = cctx_new_run ();
1694 else if (!(coro->cctx->flags & CC_TRACE)) 1851 else if (!(coro->cctx->flags & CC_TRACE))
1695 croak ("cannot enable tracing on coroutine with custom stack,"); 1852 croak ("cannot enable tracing on coroutine with custom stack, caught");
1696 1853
1697 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL)); 1854 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL));
1698 } 1855 }
1699 else if (coro->cctx && coro->cctx->flags & CC_TRACE) 1856 else if (coro->cctx && coro->cctx->flags & CC_TRACE)
1700 { 1857 {
… …
1703 if (coro->flags & CF_RUNNING) 1860 if (coro->flags & CF_RUNNING)
1704 PL_runops = RUNOPS_DEFAULT; 1861 PL_runops = RUNOPS_DEFAULT;
1705 else 1862 else
1706 coro->slot->runops = RUNOPS_DEFAULT; 1863 coro->slot->runops = RUNOPS_DEFAULT;
1707 } 1864 }
1865}
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
2000/*****************************************************************************/
2001/* rouse callback */
2002
2003#define CORO_MAGIC_type_rouse PERL_MAGIC_ext
2004
2005static void
2006coro_rouse_callback (pTHX_ CV *cv)
2007{
2008 dXSARGS;
2009 SV *data = (SV *)GENSUB_ARG;
2010
2011 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2012 {
2013 /* first call, set args */
2014 SV *coro = SvRV (data);
2015 AV *av = newAV ();
2016
2017 SvRV_set (data, (SV *)av);
2018
2019 /* better take a full copy of the arguments */
2020 while (items--)
2021 av_store (av, items, newSVsv (ST (items)));
2022
2023 api_ready (aTHX_ coro);
2024 SvREFCNT_dec (coro);
2025 }
2026
2027 XSRETURN_EMPTY;
2028}
2029
2030static int
2031slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
2032{
2033 SV *data = (SV *)frame->data;
2034
2035 if (CORO_THROW)
2036 return 0;
2037
2038 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2039 return 1;
2040
2041 /* now push all results on the stack */
2042 {
2043 dSP;
2044 AV *av = (AV *)SvRV (data);
2045 int i;
2046
2047 EXTEND (SP, AvFILLp (av) + 1);
2048 for (i = 0; i <= AvFILLp (av); ++i)
2049 PUSHs (sv_2mortal (AvARRAY (av)[i]));
2050
2051 /* we have stolen the elements, so set length to zero and free */
2052 AvFILLp (av) = -1;
2053 av_undef (av);
2054
2055 PUTBACK;
2056 }
2057
2058 return 0;
2059}
2060
2061static void
2062slf_init_rouse_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2063{
2064 SV *cb;
2065
2066 if (items)
2067 cb = arg [0];
2068 else
2069 {
2070 struct coro *coro = SvSTATE_current;
2071
2072 if (!coro->rouse_cb)
2073 croak ("Coro::rouse_wait called without rouse callback, and no default rouse callback found either,");
2074
2075 cb = sv_2mortal (coro->rouse_cb);
2076 coro->rouse_cb = 0;
2077 }
2078
2079 if (!SvROK (cb)
2080 || SvTYPE (SvRV (cb)) != SVt_PVCV
2081 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2082 croak ("Coro::rouse_wait called with illegal callback argument,");
2083
2084 {
2085 CV *cv = (CV *)SvRV (cb); /* for GENSUB_ARG */
2086 SV *data = (SV *)GENSUB_ARG;
2087
2088 frame->data = (void *)data;
2089 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
2090 frame->check = slf_check_rouse_wait;
2091 }
2092}
2093
2094static SV *
2095coro_new_rouse_cb (pTHX)
2096{
2097 HV *hv = (HV *)SvRV (coro_current);
2098 struct coro *coro = SvSTATE_hv (hv);
2099 SV *data = newRV_inc ((SV *)hv);
2100 SV *cb = gensub (aTHX_ coro_rouse_callback, (void *)data);
2101
2102 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0);
2103 SvREFCNT_dec (data); /* magicext increases the refcount */
2104
2105 SvREFCNT_dec (coro->rouse_cb);
2106 coro->rouse_cb = SvREFCNT_inc_NN (cb);
2107
2108 return cb;
1708} 2109}
1709 2110
1710/*****************************************************************************/ 2111/*****************************************************************************/
1711/* schedule-like-function opcode (SLF) */ 2112/* schedule-like-function opcode (SLF) */
1712 2113
… …
1759static void 2160static void
1760slf_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)
1761{ 2162{
1762 frame->prepare = prepare_schedule; 2163 frame->prepare = prepare_schedule;
1763 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);
1764} 2193}
1765 2194
1766static void 2195static void
1767slf_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)
1768{ 2197{
… …
1914 } 2343 }
1915 else 2344 else
1916 slf_argc = 0; 2345 slf_argc = 0;
1917 2346
1918 PL_op->op_ppaddr = pp_slf; 2347 PL_op->op_ppaddr = pp_slf;
1919 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 */
1920 2349
1921 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));
1922} 2398}
1923 2399
1924/*****************************************************************************/ 2400/*****************************************************************************/
1925/* PerlIO::cede */ 2401/* PerlIO::cede */
1926 2402
… …
2007 SV **ary; 2483 SV **ary;
2008 2484
2009 /* unfortunately, building manually saves memory */ 2485 /* unfortunately, building manually saves memory */
2010 Newx (ary, 2, SV *); 2486 Newx (ary, 2, SV *);
2011 AvALLOC (av) = ary; 2487 AvALLOC (av) = ary;
2488#if PERL_VERSION_ATLEAST (5,10,0)
2012 AvARRAY (av) = ary; 2489 AvARRAY (av) = ary;
2490#else
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
2013 AvMAX (av) = 1; 2495 AvMAX (av) = 1;
2014 AvFILLp (av) = 0; 2496 AvFILLp (av) = 0;
2015 ary [0] = newSViv (count); 2497 ary [0] = newSViv (count);
2016 2498
2017 return newRV_noinc ((SV *)av); 2499 return newRV_noinc ((SV *)av);
… …
2037 AvARRAY (av)[0] = AvARRAY (av)[1]; 2519 AvARRAY (av)[0] = AvARRAY (av)[1];
2038 AvARRAY (av)[1] = count_sv; 2520 AvARRAY (av)[1] = count_sv;
2039 cb = av_shift (av); 2521 cb = av_shift (av);
2040 2522
2041 if (SvOBJECT (cb)) 2523 if (SvOBJECT (cb))
2524 {
2042 api_ready (aTHX_ cb); 2525 api_ready (aTHX_ cb);
2043 else 2526 --count;
2044 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 }
2045 2536
2046 SvREFCNT_dec (cb); 2537 SvREFCNT_dec (cb);
2047
2048 --count;
2049 } 2538 }
2050} 2539}
2051 2540
2052static void 2541static void
2053coro_semaphore_on_destroy (pTHX_ struct coro *coro) 2542coro_semaphore_on_destroy (pTHX_ struct coro *coro)
… …
2135} 2624}
2136 2625
2137static void 2626static void
2138slf_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)
2139{ 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 {
2140 slf_init_semaphore_down_or_wait (aTHX_ frame, cv, arg, items); 2645 slf_init_semaphore_down_or_wait (aTHX_ frame, cv, arg, items);
2141 frame->check = slf_check_semaphore_wait; 2646 frame->check = slf_check_semaphore_wait;
2647 }
2142} 2648}
2143 2649
2144/* signal */ 2650/* signal */
2145 2651
2146static void 2652static void
… …
2194 2700
2195 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */ 2701 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */
2196 frame->prepare = prepare_schedule; 2702 frame->prepare = prepare_schedule;
2197 frame->check = slf_check_signal_wait; 2703 frame->check = slf_check_signal_wait;
2198 } 2704 }
2199}
2200
2201/*****************************************************************************/
2202/* gensub: simple closure generation utility */
2203
2204#define GENSUB_ARG CvXSUBANY (cv).any_ptr
2205
2206/* create a closure from XS, returns a code reference */
2207/* the arg can be accessed via GENSUB_ARG from the callback */
2208/* the callback must use dXSARGS/XSRETURN */
2209static SV *
2210gensub (pTHX_ void (*xsub)(pTHX_ CV *), void *arg)
2211{
2212 CV *cv = (CV *)newSV (0);
2213
2214 sv_upgrade ((SV *)cv, SVt_PVCV);
2215
2216 CvANON_on (cv);
2217 CvISXSUB_on (cv);
2218 CvXSUB (cv) = xsub;
2219 GENSUB_ARG = arg;
2220
2221 return newRV_noinc ((SV *)cv);
2222} 2705}
2223 2706
2224/*****************************************************************************/ 2707/*****************************************************************************/
2225/* Coro::AIO */ 2708/* Coro::AIO */
2226 2709
… …
2241 dXSARGS; 2724 dXSARGS;
2242 AV *state = (AV *)GENSUB_ARG; 2725 AV *state = (AV *)GENSUB_ARG;
2243 SV *coro = av_pop (state); 2726 SV *coro = av_pop (state);
2244 SV *data_sv = newSV (sizeof (struct io_state)); 2727 SV *data_sv = newSV (sizeof (struct io_state));
2245 2728
2246 av_extend (state, items); 2729 av_extend (state, items - 1);
2247 2730
2248 sv_upgrade (data_sv, SVt_PV); 2731 sv_upgrade (data_sv, SVt_PV);
2249 SvCUR_set (data_sv, sizeof (struct io_state)); 2732 SvCUR_set (data_sv, sizeof (struct io_state));
2250 SvPOK_only (data_sv); 2733 SvPOK_only (data_sv);
2251 2734
… …
2386 XSRETURN_EMPTY; 2869 XSRETURN_EMPTY;
2387} 2870}
2388 2871
2389/*****************************************************************************/ 2872/*****************************************************************************/
2390 2873
2874#if CORO_CLONE
2875# include "clone.c"
2876#endif
2877
2391MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 2878MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2392 2879
2393PROTOTYPES: DISABLE 2880PROTOTYPES: DISABLE
2394 2881
2395BOOT: 2882BOOT:
… …
2399 coro_thx = PERL_GET_CONTEXT; 2886 coro_thx = PERL_GET_CONTEXT;
2400# endif 2887# endif
2401#endif 2888#endif
2402 BOOT_PAGESIZE; 2889 BOOT_PAGESIZE;
2403 2890
2891 cctx_current = cctx_new_empty ();
2892
2404 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 2893 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
2405 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 2894 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
2406 2895
2407 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;
2408 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;
… …
2427 2916
2428 { 2917 {
2429 SV *slf = sv_2mortal (newSViv (PTR2IV (pp_slf))); 2918 SV *slf = sv_2mortal (newSViv (PTR2IV (pp_slf)));
2430 2919
2431 if (!PL_custom_op_names) PL_custom_op_names = newHV (); 2920 if (!PL_custom_op_names) PL_custom_op_names = newHV ();
2432 hv_store_ent (PL_custom_op_names, slf, 2921 hv_store_ent (PL_custom_op_names, slf, newSVpv ("coro_slf", 0), 0);
2433 newSVpv ("coro_slf", 0), 0);
2434 2922
2435 if (!PL_custom_op_descs) PL_custom_op_descs = newHV (); 2923 if (!PL_custom_op_descs) PL_custom_op_descs = newHV ();
2436 hv_store_ent (PL_custom_op_descs, slf, 2924 hv_store_ent (PL_custom_op_descs, slf, newSVpv ("coro schedule like function", 0), 0);
2437 newSVpv ("coro schedule like function", 0), 0);
2438 } 2925 }
2439 2926
2440 coroapi.ver = CORO_API_VERSION; 2927 coroapi.ver = CORO_API_VERSION;
2441 coroapi.rev = CORO_API_REVISION; 2928 coroapi.rev = CORO_API_REVISION;
2442 2929
… …
2461 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 2948 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL));
2462} 2949}
2463 2950
2464SV * 2951SV *
2465new (char *klass, ...) 2952new (char *klass, ...)
2953 ALIAS:
2954 Coro::new = 1
2466 CODE: 2955 CODE:
2467{ 2956{
2468 struct coro *coro; 2957 struct coro *coro;
2469 MAGIC *mg; 2958 MAGIC *mg;
2470 HV *hv; 2959 HV *hv;
2960 CV *cb;
2471 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 }
2472 2976
2473 Newz (0, coro, 1, struct coro); 2977 Newz (0, coro, 1, struct coro);
2474 coro->args = newAV (); 2978 coro->args = newAV ();
2475 coro->flags = CF_NEW; 2979 coro->flags = CF_NEW;
2476 2980
… …
2481 coro->hv = hv = newHV (); 2985 coro->hv = hv = newHV ();
2482 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);
2483 mg->mg_flags |= MGf_DUP; 2987 mg->mg_flags |= MGf_DUP;
2484 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 2988 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
2485 2989
2990 if (items > 1)
2991 {
2486 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
2487 for (i = 1; i < items; i++) 3002 for (i = 2; i < items; i++)
2488 av_push (coro->args, newSVsv (ST (i))); 3003 av_push (coro->args, newSVsv (ST (i)));
3004 }
2489} 3005}
2490 OUTPUT: 3006 OUTPUT:
2491 RETVAL 3007 RETVAL
2492 3008
2493void 3009void
… …
2506void 3022void
2507_exit (int code) 3023_exit (int code)
2508 PROTOTYPE: $ 3024 PROTOTYPE: $
2509 CODE: 3025 CODE:
2510 _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
2511 3046
2512int 3047int
2513cctx_stacksize (int new_stacksize = 0) 3048cctx_stacksize (int new_stacksize = 0)
2514 PROTOTYPE: ;$ 3049 PROTOTYPE: ;$
2515 CODE: 3050 CODE:
… …
2565 eval = 1 3100 eval = 1
2566 CODE: 3101 CODE:
2567{ 3102{
2568 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3103 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
2569 { 3104 {
2570 struct coro temp; 3105 struct coro *current = SvSTATE_current;
2571 3106
2572 if (!(coro->flags & CF_RUNNING)) 3107 if (current != coro)
2573 { 3108 {
2574 PUTBACK; 3109 PUTBACK;
2575 save_perl (aTHX_ &temp); 3110 save_perl (aTHX_ current);
2576 load_perl (aTHX_ coro); 3111 load_perl (aTHX_ coro);
3112 SPAGAIN;
2577 } 3113 }
2578 3114
2579 {
2580 dSP;
2581 ENTER;
2582 SAVETMPS;
2583 PUTBACK;
2584 PUSHSTACK; 3115 PUSHSTACK;
3116
2585 PUSHMARK (SP); 3117 PUSHMARK (SP);
3118 PUTBACK;
2586 3119
2587 if (ix) 3120 if (ix)
2588 eval_sv (coderef, 0); 3121 eval_sv (coderef, 0);
2589 else 3122 else
2590 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 3123 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
2591 3124
2592 POPSTACK; 3125 POPSTACK;
2593 SPAGAIN; 3126 SPAGAIN;
2594 FREETMPS;
2595 LEAVE;
2596 PUTBACK;
2597 }
2598 3127
2599 if (!(coro->flags & CF_RUNNING)) 3128 if (current != coro)
2600 { 3129 {
3130 PUTBACK;
2601 save_perl (aTHX_ coro); 3131 save_perl (aTHX_ coro);
2602 load_perl (aTHX_ &temp); 3132 load_perl (aTHX_ current);
2603 SPAGAIN; 3133 SPAGAIN;
2604 } 3134 }
2605 } 3135 }
2606} 3136}
2607 3137
… …
2611 ALIAS: 3141 ALIAS:
2612 is_ready = CF_READY 3142 is_ready = CF_READY
2613 is_running = CF_RUNNING 3143 is_running = CF_RUNNING
2614 is_new = CF_NEW 3144 is_new = CF_NEW
2615 is_destroyed = CF_DESTROYED 3145 is_destroyed = CF_DESTROYED
3146 is_suspended = CF_SUSPENDED
2616 CODE: 3147 CODE:
2617 RETVAL = boolSV (coro->flags & ix); 3148 RETVAL = boolSV (coro->flags & ix);
2618 OUTPUT: 3149 OUTPUT:
2619 RETVAL 3150 RETVAL
2620 3151
… …
2636 3167
2637SV * 3168SV *
2638has_cctx (Coro::State coro) 3169has_cctx (Coro::State coro)
2639 PROTOTYPE: $ 3170 PROTOTYPE: $
2640 CODE: 3171 CODE:
2641 RETVAL = boolSV (!!coro->cctx); 3172 /* maybe manage the running flag differently */
3173 RETVAL = boolSV (!!coro->cctx || (coro->flags & CF_RUNNING));
2642 OUTPUT: 3174 OUTPUT:
2643 RETVAL 3175 RETVAL
2644 3176
2645int 3177int
2646is_traced (Coro::State coro) 3178is_traced (Coro::State coro)
… …
2666 3198
2667void 3199void
2668force_cctx () 3200force_cctx ()
2669 PROTOTYPE: 3201 PROTOTYPE:
2670 CODE: 3202 CODE:
2671 SvSTATE_current->cctx->idle_sp = 0; 3203 cctx_current->idle_sp = 0;
2672 3204
2673void 3205void
2674swap_defsv (Coro::State self) 3206swap_defsv (Coro::State self)
2675 PROTOTYPE: $ 3207 PROTOTYPE: $
2676 ALIAS: 3208 ALIAS:
… …
2684 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv; 3216 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
2685 3217
2686 SV *tmp = *src; *src = *dst; *dst = tmp; 3218 SV *tmp = *src; *src = *dst; *dst = tmp;
2687 } 3219 }
2688 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
2689 3227
2690MODULE = Coro::State PACKAGE = Coro 3228MODULE = Coro::State PACKAGE = Coro
2691 3229
2692BOOT: 3230BOOT:
2693{ 3231{
2694 int i;
2695
2696 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
2697 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3232 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
2698 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3233 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
2699 3234 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3235 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
2700 coro_current = coro_get_sv (aTHX_ "Coro::current", FALSE); 3236 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
2701 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);
2702 3246
2703 coro_stash = gv_stashpv ("Coro", TRUE); 3247 coro_stash = gv_stashpv ("Coro", TRUE);
2704 3248
2705 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 3249 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
2706 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 3250 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH));
2707 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 3251 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL));
2708 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 3252 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW));
2709 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE)); 3253 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE));
2710 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN)); 3254 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN));
2711 3255
2712 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
2713 coro_ready[i] = newAV ();
2714
2715 { 3256 {
2716 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 3257 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
2717 3258
2718 coroapi.schedule = api_schedule; 3259 coroapi.schedule = api_schedule;
3260 coroapi.schedule_to = api_schedule_to;
2719 coroapi.cede = api_cede; 3261 coroapi.cede = api_cede;
2720 coroapi.cede_notself = api_cede_notself; 3262 coroapi.cede_notself = api_cede_notself;
2721 coroapi.ready = api_ready; 3263 coroapi.ready = api_ready;
2722 coroapi.is_ready = api_is_ready; 3264 coroapi.is_ready = api_is_ready;
2723 coroapi.nready = coro_nready; 3265 coroapi.nready = coro_nready;
… …
2728 SvREADONLY_on (sv); 3270 SvREADONLY_on (sv);
2729 } 3271 }
2730} 3272}
2731 3273
2732void 3274void
3275terminate (...)
3276 CODE:
3277 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3278
3279void
2733schedule (...) 3280schedule (...)
2734 CODE: 3281 CODE:
2735 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);
2736 3293
2737void 3294void
2738cede (...) 3295cede (...)
2739 CODE: 3296 CODE:
2740 CORO_EXECUTE_SLF_XS (slf_init_cede); 3297 CORO_EXECUTE_SLF_XS (slf_init_cede);
… …
2795 CODE: 3352 CODE:
2796 RETVAL = coro_nready; 3353 RETVAL = coro_nready;
2797 OUTPUT: 3354 OUTPUT:
2798 RETVAL 3355 RETVAL
2799 3356
2800# for async_pool speedup
2801void 3357void
2802_pool_1 (SV *cb) 3358suspend (Coro::State self)
3359 PROTOTYPE: $
2803 CODE: 3360 CODE:
2804{ 3361 self->flags |= CF_SUSPENDED;
2805 HV *hv = (HV *)SvRV (coro_current);
2806 struct coro *coro = SvSTATE_hv ((SV *)hv);
2807 AV *defav = GvAV (PL_defgv);
2808 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
2809 AV *invoke_av;
2810 int i, len;
2811 3362
2812 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)
2813 { 3389 {
2814 SV *old = PL_diehook; 3390 PUSHMARK (SP);
2815 PL_diehook = 0; 3391 EXTEND (SP, 2);
2816 SvREFCNT_dec (old); 3392 PUSHs (sv_Coro);
2817 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));
2818 } 3399 }
2819 3400
2820 SvREFCNT_dec (coro->saved_deffh);
2821 coro->saved_deffh = SvREFCNT_inc_NN ((SV *)PL_defoutgv);
2822
2823 hv_store (hv, "desc", sizeof ("desc") - 1,
2824 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
2825
2826 invoke_av = (AV *)SvRV (invoke);
2827 len = av_len (invoke_av);
2828
2829 sv_setsv (cb, AvARRAY (invoke_av)[0]);
2830
2831 if (len > 0)
2832 { 3401 {
2833 av_fill (defav, len - 1); 3402 struct coro *coro = SvSTATE_hv (hv);
2834 for (i = 0; i < len; ++i) 3403
2835 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;
2836 } 3408 }
3409
3410 api_ready (aTHX_ (SV *)hv);
3411
3412 if (GIMME_V != G_VOID)
3413 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
3414 else
3415 SvREFCNT_dec (hv);
2837} 3416}
3417
3418SV *
3419rouse_cb ()
3420 PROTOTYPE:
3421 CODE:
3422 RETVAL = coro_new_rouse_cb (aTHX);
3423 OUTPUT:
3424 RETVAL
2838 3425
2839void 3426void
2840_pool_2 (SV *cb) 3427rouse_wait (...)
3428 PROTOTYPE: ;$
3429 PPCODE:
3430 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait);
3431
3432void
3433on_enter (SV *block)
3434 ALIAS:
3435 on_leave = 1
3436 PROTOTYPE: &
2841 CODE: 3437 CODE:
2842{ 3438{
2843 HV *hv = (HV *)SvRV (coro_current);
2844 struct coro *coro = SvSTATE_hv ((SV *)hv); 3439 struct coro *coro = SvSTATE_current;
3440 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
2845 3441
2846 sv_setsv (cb, &PL_sv_undef); 3442 block = (SV *)coro_sv_2cv (aTHX_ block);
2847 3443
2848 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 3444 if (!*avp)
2849 coro->saved_deffh = 0; 3445 *avp = newAV ();
2850 3446
2851 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 3447 av_push (*avp, SvREFCNT_inc (block));
2852 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
2853 {
2854 SV *old = PL_diehook;
2855 PL_diehook = 0;
2856 SvREFCNT_dec (old);
2857 croak ("\3async_pool terminate\2\n");
2858 }
2859 3448
2860 av_clear (GvAV (PL_defgv)); 3449 if (!ix)
2861 hv_store (hv, "desc", sizeof ("desc") - 1, 3450 on_enterleave_call (aTHX_ block);
2862 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
2863 3451
2864 coro->prio = 0; 3452 LEAVE; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
2865 3453 SAVEDESTRUCTOR_X (ix ? coro_pop_on_leave : coro_pop_on_enter, (void *)coro);
2866 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 3454 ENTER; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
2867 api_trace (aTHX_ coro_current, 0);
2868
2869 av_push (av_async_pool, newSVsv (coro_current));
2870} 3455}
2871 3456
2872 3457
2873MODULE = Coro::State PACKAGE = PerlIO::cede 3458MODULE = Coro::State PACKAGE = PerlIO::cede
2874 3459
… …
2886 GvSTASH (CvGV (cv)) 3471 GvSTASH (CvGV (cv))
2887 ); 3472 );
2888 OUTPUT: 3473 OUTPUT:
2889 RETVAL 3474 RETVAL
2890 3475
2891# helper for Coro::Channel 3476# helper for Coro::Channel and others
2892SV * 3477SV *
2893_alloc (int count) 3478_alloc (int count)
2894 CODE: 3479 CODE:
2895 RETVAL = coro_waitarray_new (aTHX_ count); 3480 RETVAL = coro_waitarray_new (aTHX_ count);
2896 OUTPUT: 3481 OUTPUT:
… …
2909 adjust = 1 3494 adjust = 1
2910 CODE: 3495 CODE:
2911 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1); 3496 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1);
2912 3497
2913void 3498void
2914down (SV *self) 3499down (...)
2915 CODE: 3500 CODE:
2916 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down); 3501 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down);
2917 3502
2918void 3503void
2919wait (SV *self) 3504wait (...)
2920 CODE: 3505 CODE:
2921 CORO_EXECUTE_SLF_XS (slf_init_semaphore_wait); 3506 CORO_EXECUTE_SLF_XS (slf_init_semaphore_wait);
2922 3507
2923void 3508void
2924try (SV *self) 3509try (SV *self)
… …
2954 for (i = 1; i <= wcount; ++i) 3539 for (i = 1; i <= wcount; ++i)
2955 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i]))); 3540 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i])));
2956 } 3541 }
2957} 3542}
2958 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
2959MODULE = Coro::State PACKAGE = Coro::Signal 3560MODULE = Coro::State PACKAGE = Coro::Signal
2960 3561
2961SV * 3562SV *
2962new (SV *klass) 3563new (SV *klass)
2963 CODE: 3564 CODE:
… …
2967 ); 3568 );
2968 OUTPUT: 3569 OUTPUT:
2969 RETVAL 3570 RETVAL
2970 3571
2971void 3572void
2972wait (SV *self) 3573wait (...)
2973 CODE: 3574 CODE:
2974 CORO_EXECUTE_SLF_XS (slf_init_signal_wait); 3575 CORO_EXECUTE_SLF_XS (slf_init_signal_wait);
2975 3576
2976void 3577void
2977broadcast (SV *self) 3578broadcast (SV *self)
… …
3034 3635
3035void 3636void
3036_register (char *target, char *proto, SV *req) 3637_register (char *target, char *proto, SV *req)
3037 CODE: 3638 CODE:
3038{ 3639{
3039 HV *st; 3640 CV *req_cv = coro_sv_2cv (aTHX_ req);
3040 GV *gvp;
3041 CV *req_cv = sv_2cv (req, &st, &gvp, 0);
3042 /* newXSproto doesn't return the CV on 5.8 */ 3641 /* newXSproto doesn't return the CV on 5.8 */
3043 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 3642 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3044 sv_setpv ((SV *)slf_cv, proto); 3643 sv_setpv ((SV *)slf_cv, proto);
3045 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);
3046} 3645}

Diff Legend

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