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.298 by root, Tue Nov 18 23:20:41 2008 UTC vs.
Revision 1.356 by root, Sat Jun 27 14:06:59 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
138#else 144#else
139# define attribute(x) 145# define attribute(x)
140# define expect(expr,value) (expr) 146# define expect(expr,value) (expr)
141# define INLINE static 147# define INLINE static
… …
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;
… …
539 { 615 {
540 while (expect_true (cxix >= 0)) 616 while (expect_true (cxix >= 0))
541 { 617 {
542 PERL_CONTEXT *cx = &ccstk[cxix--]; 618 PERL_CONTEXT *cx = &ccstk[cxix--];
543 619
544 if (expect_true (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT)) 620 if (expect_true (CxTYPE (cx) == CXt_SUB) || expect_false (CxTYPE (cx) == CXt_FORMAT))
545 { 621 {
546 CV *cv = cx->blk_sub.cv; 622 CV *cv = cx->blk_sub.cv;
547 623
548 if (expect_true (CvDEPTH (cv))) 624 if (expect_true (CvDEPTH (cv)))
549 { 625 {
… …
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
1005 coro_unwind_stacks (aTHX);
1006 coro_destruct_stacks (aTHX);
1007
1008 // now save some sv's to be free'd later
1009 svf [0] = GvSV (PL_defgv);
1010 svf [1] = (SV *)GvAV (PL_defgv);
1011 svf [2] = GvSV (PL_errgv);
1012 svf [3] = (SV *)PL_defoutgv;
1013 svf [4] = PL_rs;
1014 svf [5] = GvSV (irsgv);
1015 svf [6] = (SV *)GvHV (PL_hintgv);
1016 svf [7] = PL_diehook;
1017 svf [8] = PL_warnhook;
1018 assert (9 == sizeof (svf) / sizeof (*svf));
1019
1020 load_perl (aTHX_ current);
1021 }
1022
1023 {
1024 int i;
1025
1026 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i)
1027 SvREFCNT_dec (svf [i]);
1028
923 SvREFCNT_dec (coro->saved_deffh); 1029 SvREFCNT_dec (coro->saved_deffh);
924 SvREFCNT_dec (CORO_THROW); 1030 SvREFCNT_dec (coro->rouse_cb);
925 1031 SvREFCNT_dec (coro->invoke_cb);
926 coro_destruct_stacks (aTHX); 1032 SvREFCNT_dec (coro->invoke_av);
1033 }
927} 1034}
928 1035
929INLINE void 1036INLINE void
930free_coro_mortal (pTHX) 1037free_coro_mortal (pTHX)
931{ 1038{
… …
939static int 1046static int
940runops_trace (pTHX) 1047runops_trace (pTHX)
941{ 1048{
942 COP *oldcop = 0; 1049 COP *oldcop = 0;
943 int oldcxix = -2; 1050 int oldcxix = -2;
944 struct coro *coro = SvSTATE_current; /* trace cctx is tied to specific coro */
945 coro_cctx *cctx = coro->cctx;
946 1051
947 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX))) 1052 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX)))
948 { 1053 {
949 PERL_ASYNC_CHECK (); 1054 PERL_ASYNC_CHECK ();
950 1055
951 if (cctx->flags & CC_TRACE_ALL) 1056 if (cctx_current->flags & CC_TRACE_ALL)
952 { 1057 {
953 if (PL_op->op_type == OP_LEAVESUB && cctx->flags & CC_TRACE_SUB) 1058 if (PL_op->op_type == OP_LEAVESUB && cctx_current->flags & CC_TRACE_SUB)
954 { 1059 {
955 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1060 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
956 SV **bot, **top; 1061 SV **bot, **top;
957 AV *av = newAV (); /* return values */ 1062 AV *av = newAV (); /* return values */
958 SV **cb; 1063 SV **cb;
… …
995 1100
996 if (PL_curcop != &PL_compiling) 1101 if (PL_curcop != &PL_compiling)
997 { 1102 {
998 SV **cb; 1103 SV **cb;
999 1104
1000 if (oldcxix != cxstack_ix && cctx->flags & CC_TRACE_SUB) 1105 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB)
1001 { 1106 {
1002 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1107 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1003 1108
1004 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1109 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1005 { 1110 {
1006 runops_proc_t old_runops = PL_runops;
1007 dSP; 1111 dSP;
1008 GV *gv = CvGV (cx->blk_sub.cv); 1112 GV *gv = CvGV (cx->blk_sub.cv);
1009 SV *fullname = sv_2mortal (newSV (0)); 1113 SV *fullname = sv_2mortal (newSV (0));
1010 1114
1011 if (isGV (gv)) 1115 if (isGV (gv))
… …
1016 SAVETMPS; 1120 SAVETMPS;
1017 EXTEND (SP, 3); 1121 EXTEND (SP, 3);
1018 PUSHMARK (SP); 1122 PUSHMARK (SP);
1019 PUSHs (&PL_sv_yes); 1123 PUSHs (&PL_sv_yes);
1020 PUSHs (fullname); 1124 PUSHs (fullname);
1021 PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef); 1125 PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef);
1022 PUTBACK; 1126 PUTBACK;
1023 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0); 1127 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); 1128 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
1025 SPAGAIN; 1129 SPAGAIN;
1026 FREETMPS; 1130 FREETMPS;
… …
1029 } 1133 }
1030 1134
1031 oldcxix = cxstack_ix; 1135 oldcxix = cxstack_ix;
1032 } 1136 }
1033 1137
1034 if (cctx->flags & CC_TRACE_LINE) 1138 if (cctx_current->flags & CC_TRACE_LINE)
1035 { 1139 {
1036 dSP; 1140 dSP;
1037 1141
1038 PL_runops = RUNOPS_DEFAULT; 1142 PL_runops = RUNOPS_DEFAULT;
1039 ENTER; 1143 ENTER;
… …
1058 1162
1059 TAINT_NOT; 1163 TAINT_NOT;
1060 return 0; 1164 return 0;
1061} 1165}
1062 1166
1063static struct coro_cctx *cctx_ssl_cctx;
1064static struct CoroSLF cctx_ssl_frame; 1167static struct CoroSLF cctx_ssl_frame;
1065 1168
1066static void 1169static void
1067slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta) 1170slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta)
1068{ 1171{
1069 ta->prev = (struct coro *)cctx_ssl_cctx;
1070 ta->next = 0; 1172 ta->prev = 0;
1071} 1173}
1072 1174
1073static int 1175static int
1074slf_check_set_stacklevel (pTHX_ struct CoroSLF *frame) 1176slf_check_set_stacklevel (pTHX_ struct CoroSLF *frame)
1075{ 1177{
… …
1078 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1180 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1079} 1181}
1080 1182
1081/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1183/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1082static void NOINLINE 1184static void NOINLINE
1083cctx_prepare (pTHX_ coro_cctx *cctx) 1185cctx_prepare (pTHX)
1084{ 1186{
1085 PL_top_env = &PL_start_env; 1187 PL_top_env = &PL_start_env;
1086 1188
1087 if (cctx->flags & CC_TRACE) 1189 if (cctx_current->flags & CC_TRACE)
1088 PL_runops = runops_trace; 1190 PL_runops = runops_trace;
1089 1191
1090 /* we already must be executing an SLF op, there is no other valid way 1192 /* we already must be executing an SLF op, there is no other valid way
1091 * that can lead to creation of a new cctx */ 1193 * that can lead to creation of a new cctx */
1092 assert (("FATAL: can't prepare slf-less cctx in Coro module (please report)", 1194 assert (("FATAL: can't prepare slf-less cctx in Coro module (please report)",
1093 slf_frame.prepare && PL_op->op_ppaddr == pp_slf)); 1195 slf_frame.prepare && PL_op->op_ppaddr == pp_slf));
1094 1196
1095 /* we must emulate leaving pp_slf, which is done inside slf_check_set_stacklevel */ 1197 /* we must emulate leaving pp_slf, which is done inside slf_check_set_stacklevel */
1096 cctx_ssl_cctx = cctx;
1097 cctx_ssl_frame = slf_frame; 1198 cctx_ssl_frame = slf_frame;
1098 1199
1099 slf_frame.prepare = slf_prepare_set_stacklevel; 1200 slf_frame.prepare = slf_prepare_set_stacklevel;
1100 slf_frame.check = slf_check_set_stacklevel; 1201 slf_frame.check = slf_check_set_stacklevel;
1101} 1202}
… …
1124 /* normally we would need to skip the entersub here */ 1225 /* normally we would need to skip the entersub here */
1125 /* not doing so will re-execute it, which is exactly what we want */ 1226 /* not doing so will re-execute it, which is exactly what we want */
1126 /* PL_nop = PL_nop->op_next */ 1227 /* PL_nop = PL_nop->op_next */
1127 1228
1128 /* inject a fake subroutine call to cctx_init */ 1229 /* inject a fake subroutine call to cctx_init */
1129 cctx_prepare (aTHX_ (coro_cctx *)arg); 1230 cctx_prepare (aTHX);
1130 1231
1131 /* cctx_run is the alternative tail of transfer() */ 1232 /* cctx_run is the alternative tail of transfer() */
1132 transfer_tail (aTHX); 1233 transfer_tail (aTHX);
1133 1234
1134 /* somebody or something will hit me for both perl_run and PL_restartop */ 1235 /* somebody or something will hit me for both perl_run and PL_restartop */
1135 PL_restartop = PL_op; 1236 PL_restartop = PL_op;
1136 perl_run (PL_curinterp); 1237 perl_run (PL_curinterp);
1238 /*
1239 * Unfortunately, there is no way to get at the return values of the
1240 * coro body here, as perl_run destroys these
1241 */
1137 1242
1138 /* 1243 /*
1139 * If perl-run returns we assume exit() was being called or the coro 1244 * If perl-run returns we assume exit() was being called or the coro
1140 * fell off the end, which seems to be the only valid (non-bug) 1245 * fell off the end, which seems to be the only valid (non-bug)
1141 * reason for perl_run to return. We try to exit by jumping to the 1246 * reason for perl_run to return. We try to exit by jumping to the
1142 * bootstrap-time "top" top_env, as we cannot restore the "main" 1247 * bootstrap-time "top" top_env, as we cannot restore the "main"
1143 * coroutine as Coro has no such concept 1248 * coroutine as Coro has no such concept.
1249 * This actually isn't valid with the pthread backend, but OSes requiring
1250 * that backend are too broken to do it in a standards-compliant way.
1144 */ 1251 */
1145 PL_top_env = main_top_env; 1252 PL_top_env = main_top_env;
1146 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */ 1253 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1147 } 1254 }
1148} 1255}
… …
1225cctx_destroy (coro_cctx *cctx) 1332cctx_destroy (coro_cctx *cctx)
1226{ 1333{
1227 if (!cctx) 1334 if (!cctx)
1228 return; 1335 return;
1229 1336
1337 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary?
1338
1230 --cctx_count; 1339 --cctx_count;
1231 coro_destroy (&cctx->cctx); 1340 coro_destroy (&cctx->cctx);
1232 1341
1233 /* coro_transfer creates new, empty cctx's */ 1342 /* coro_transfer creates new, empty cctx's */
1234 if (cctx->sptr) 1343 if (cctx->sptr)
… …
1297 /* TODO: throwing up here is considered harmful */ 1406 /* TODO: throwing up here is considered harmful */
1298 1407
1299 if (expect_true (prev != next)) 1408 if (expect_true (prev != next))
1300 { 1409 {
1301 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1410 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,"); 1411 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1303 1412
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)) 1413 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,"); 1414 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1309 1415
1310#if !PERL_VERSION_ATLEAST (5,10,0) 1416#if !PERL_VERSION_ATLEAST (5,10,0)
1311 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1417 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,"); 1418 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1313#endif 1419#endif
… …
1319transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1425transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1320{ 1426{
1321 dSTACKLEVEL; 1427 dSTACKLEVEL;
1322 1428
1323 /* sometimes transfer is only called to set idle_sp */ 1429 /* sometimes transfer is only called to set idle_sp */
1324 if (expect_false (!next)) 1430 if (expect_false (!prev))
1325 { 1431 {
1326 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1432 cctx_current->idle_sp = STACKLEVEL;
1327 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1433 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1328 } 1434 }
1329 else if (expect_true (prev != next)) 1435 else if (expect_true (prev != next))
1330 { 1436 {
1331 coro_cctx *prev__cctx; 1437 coro_cctx *cctx_prev;
1332 1438
1333 if (expect_false (prev->flags & CF_NEW)) 1439 if (expect_false (prev->flags & CF_NEW))
1334 { 1440 {
1335 /* create a new empty/source context */ 1441 /* create a new empty/source context */
1336 prev->cctx = cctx_new_empty ();
1337 prev->flags &= ~CF_NEW; 1442 prev->flags &= ~CF_NEW;
1338 prev->flags |= CF_RUNNING; 1443 prev->flags |= CF_RUNNING;
1339 } 1444 }
1340 1445
1341 prev->flags &= ~CF_RUNNING; 1446 prev->flags &= ~CF_RUNNING;
… …
1352 coro_setup (aTHX_ next); 1457 coro_setup (aTHX_ next);
1353 } 1458 }
1354 else 1459 else
1355 load_perl (aTHX_ next); 1460 load_perl (aTHX_ next);
1356 1461
1357 prev__cctx = prev->cctx;
1358
1359 /* possibly untie and reuse the cctx */ 1462 /* possibly untie and reuse the cctx */
1360 if (expect_true ( 1463 if (expect_true (
1361 prev__cctx->idle_sp == STACKLEVEL 1464 cctx_current->idle_sp == STACKLEVEL
1362 && !(prev__cctx->flags & CC_TRACE) 1465 && !(cctx_current->flags & CC_TRACE)
1363 && !force_cctx 1466 && !force_cctx
1364 )) 1467 ))
1365 { 1468 {
1366 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1469 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */
1367 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == prev__cctx->idle_te)); 1470 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1368 1471
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 */ 1472 /* 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 */ 1473 /* without this the next cctx_get might destroy the running cctx while still in use */
1373 if (expect_false (CCTX_EXPIRED (prev__cctx))) 1474 if (expect_false (CCTX_EXPIRED (cctx_current)))
1374 if (!next->cctx) 1475 if (expect_true (!next->cctx))
1375 next->cctx = cctx_get (aTHX); 1476 next->cctx = cctx_get (aTHX);
1376 1477
1377 cctx_put (prev__cctx); 1478 cctx_put (cctx_current);
1378 } 1479 }
1480 else
1481 prev->cctx = cctx_current;
1379 1482
1380 ++next->usecount; 1483 ++next->usecount;
1381 1484
1382 if (expect_true (!next->cctx)) 1485 cctx_prev = cctx_current;
1383 next->cctx = cctx_get (aTHX); 1486 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1384 1487
1385 if (expect_false (prev__cctx != next->cctx)) 1488 next->cctx = 0;
1489
1490 if (expect_false (cctx_prev != cctx_current))
1386 { 1491 {
1387 prev__cctx->top_env = PL_top_env; 1492 cctx_prev->top_env = PL_top_env;
1388 PL_top_env = next->cctx->top_env; 1493 PL_top_env = cctx_current->top_env;
1389 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1494 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1390 } 1495 }
1391 1496
1392 transfer_tail (aTHX); 1497 transfer_tail (aTHX);
1393 } 1498 }
1394} 1499}
… …
1402coro_state_destroy (pTHX_ struct coro *coro) 1507coro_state_destroy (pTHX_ struct coro *coro)
1403{ 1508{
1404 if (coro->flags & CF_DESTROYED) 1509 if (coro->flags & CF_DESTROYED)
1405 return 0; 1510 return 0;
1406 1511
1407 if (coro->on_destroy) 1512 if (coro->on_destroy && !PL_dirty)
1408 coro->on_destroy (aTHX_ coro); 1513 coro->on_destroy (aTHX_ coro);
1409 1514
1410 coro->flags |= CF_DESTROYED; 1515 coro->flags |= CF_DESTROYED;
1411 1516
1412 if (coro->flags & CF_READY) 1517 if (coro->flags & CF_READY)
… …
1416 --coro_nready; 1521 --coro_nready;
1417 } 1522 }
1418 else 1523 else
1419 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1524 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1420 1525
1421 if (coro->mainstack && coro->mainstack != main_mainstack) 1526 if (coro->mainstack
1422 { 1527 && coro->mainstack != main_mainstack
1423 struct coro temp; 1528 && coro->slot
1424 1529 && !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); 1530 coro_destruct_perl (aTHX_ coro);
1431
1432 load_perl (aTHX_ &temp);
1433
1434 coro->slot = 0;
1435 }
1436 1531
1437 cctx_destroy (coro->cctx); 1532 cctx_destroy (coro->cctx);
1533 SvREFCNT_dec (coro->startcv);
1438 SvREFCNT_dec (coro->args); 1534 SvREFCNT_dec (coro->args);
1535 SvREFCNT_dec (CORO_THROW);
1439 1536
1440 if (coro->next) coro->next->prev = coro->prev; 1537 if (coro->next) coro->next->prev = coro->prev;
1441 if (coro->prev) coro->prev->next = coro->next; 1538 if (coro->prev) coro->prev->next = coro->next;
1442 if (coro == coro_first) coro_first = coro->next; 1539 if (coro == coro_first) coro_first = coro->next;
1443 1540
… …
1497 1594
1498 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1595 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1499 TRANSFER (ta, 1); 1596 TRANSFER (ta, 1);
1500} 1597}
1501 1598
1599/*****************************************************************************/
1600/* gensub: simple closure generation utility */
1601
1602#define GENSUB_ARG CvXSUBANY (cv).any_ptr
1603
1604/* create a closure from XS, returns a code reference */
1605/* the arg can be accessed via GENSUB_ARG from the callback */
1606/* the callback must use dXSARGS/XSRETURN */
1607static SV *
1608gensub (pTHX_ void (*xsub)(pTHX_ CV *), void *arg)
1609{
1610 CV *cv = (CV *)newSV (0);
1611
1612 sv_upgrade ((SV *)cv, SVt_PVCV);
1613
1614 CvANON_on (cv);
1615 CvISXSUB_on (cv);
1616 CvXSUB (cv) = xsub;
1617 GENSUB_ARG = arg;
1618
1619 return newRV_noinc ((SV *)cv);
1620}
1621
1502/** Coro ********************************************************************/ 1622/** Coro ********************************************************************/
1503 1623
1504INLINE void 1624INLINE void
1505coro_enq (pTHX_ struct coro *coro) 1625coro_enq (pTHX_ struct coro *coro)
1506{ 1626{
1507 av_push (coro_ready [coro->prio - PRIO_MIN], SvREFCNT_inc_NN (coro->hv)); 1627 struct coro **ready = coro_ready [coro->prio - PRIO_MIN];
1508}
1509 1628
1510INLINE SV * 1629 SvREFCNT_inc_NN (coro->hv);
1630
1631 coro->next_ready = 0;
1632 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1633 ready [1] = coro;
1634}
1635
1636INLINE struct coro *
1511coro_deq (pTHX) 1637coro_deq (pTHX)
1512{ 1638{
1513 int prio; 1639 int prio;
1514 1640
1515 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; ) 1641 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; )
1516 if (AvFILLp (coro_ready [prio]) >= 0) 1642 {
1517 return av_shift (coro_ready [prio]); 1643 struct coro **ready = coro_ready [prio];
1644
1645 if (ready [0])
1646 {
1647 struct coro *coro = ready [0];
1648 ready [0] = coro->next_ready;
1649 return coro;
1650 }
1651 }
1518 1652
1519 return 0; 1653 return 0;
1520} 1654}
1521 1655
1522static int 1656static int
… …
1524{ 1658{
1525 struct coro *coro; 1659 struct coro *coro;
1526 SV *sv_hook; 1660 SV *sv_hook;
1527 void (*xs_hook)(void); 1661 void (*xs_hook)(void);
1528 1662
1529 if (SvROK (coro_sv))
1530 coro_sv = SvRV (coro_sv);
1531
1532 coro = SvSTATE (coro_sv); 1663 coro = SvSTATE (coro_sv);
1533 1664
1534 if (coro->flags & CF_READY) 1665 if (coro->flags & CF_READY)
1535 return 0; 1666 return 0;
1536 1667
… …
1567api_is_ready (pTHX_ SV *coro_sv) 1698api_is_ready (pTHX_ SV *coro_sv)
1568{ 1699{
1569 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1700 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1570} 1701}
1571 1702
1703/* expects to own a reference to next->hv */
1572INLINE void 1704INLINE void
1573prepare_schedule (pTHX_ struct coro_transfer_args *ta) 1705prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1574{ 1706{
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); 1707 SV *prev_sv = SvRV (coro_current);
1708
1614 ta->prev = SvSTATE_hv (prev_sv); 1709 ta->prev = SvSTATE_hv (prev_sv);
1710 ta->next = next;
1711
1615 TRANSFER_CHECK (*ta); 1712 TRANSFER_CHECK (*ta);
1616 assert (("FATAL: next coroutine isn't marked as ready in Coro (please report)", ta->next->flags & CF_READY)); 1713
1617 ta->next->flags &= ~CF_READY;
1618 SvRV_set (coro_current, next_sv); 1714 SvRV_set (coro_current, (SV *)next->hv);
1619 1715
1620 free_coro_mortal (aTHX); 1716 free_coro_mortal (aTHX);
1621 coro_mortal = prev_sv; 1717 coro_mortal = prev_sv;
1622} 1718}
1623 1719
1720static void
1721prepare_schedule (pTHX_ struct coro_transfer_args *ta)
1722{
1723 for (;;)
1724 {
1725 struct coro *next = coro_deq (aTHX);
1726
1727 if (expect_true (next))
1728 {
1729 /* cannot transfer to destroyed coros, skip and look for next */
1730 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED)))
1731 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1732 else
1733 {
1734 next->flags &= ~CF_READY;
1735 --coro_nready;
1736
1737 prepare_schedule_to (aTHX_ ta, next);
1738 break;
1739 }
1740 }
1741 else
1742 {
1743 /* nothing to schedule: call the idle handler */
1744 if (SvROK (sv_idle)
1745 && SvOBJECT (SvRV (sv_idle)))
1746 {
1747 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1748 api_ready (aTHX_ SvRV (sv_idle));
1749 --coro_nready;
1750 }
1751 else
1752 {
1753 dSP;
1754
1755 ENTER;
1756 SAVETMPS;
1757
1758 PUSHMARK (SP);
1759 PUTBACK;
1760 call_sv (sv_idle, G_VOID | G_DISCARD);
1761
1762 FREETMPS;
1763 LEAVE;
1764 }
1765 }
1766 }
1767}
1768
1624INLINE void 1769INLINE void
1625prepare_cede (pTHX_ struct coro_transfer_args *ta) 1770prepare_cede (pTHX_ struct coro_transfer_args *ta)
1626{ 1771{
1627 api_ready (aTHX_ coro_current); 1772 api_ready (aTHX_ coro_current);
1628 prepare_schedule (aTHX_ ta); 1773 prepare_schedule (aTHX_ ta);
… …
1647{ 1792{
1648 struct coro_transfer_args ta; 1793 struct coro_transfer_args ta;
1649 1794
1650 prepare_schedule (aTHX_ &ta); 1795 prepare_schedule (aTHX_ &ta);
1651 TRANSFER (ta, 1); 1796 TRANSFER (ta, 1);
1797}
1798
1799static void
1800api_schedule_to (pTHX_ SV *coro_sv)
1801{
1802 struct coro_transfer_args ta;
1803 struct coro *next = SvSTATE (coro_sv);
1804
1805 SvREFCNT_inc_NN (coro_sv);
1806 prepare_schedule_to (aTHX_ &ta, next);
1652} 1807}
1653 1808
1654static int 1809static int
1655api_cede (pTHX) 1810api_cede (pTHX)
1656{ 1811{
… …
1685static void 1840static void
1686api_trace (pTHX_ SV *coro_sv, int flags) 1841api_trace (pTHX_ SV *coro_sv, int flags)
1687{ 1842{
1688 struct coro *coro = SvSTATE (coro_sv); 1843 struct coro *coro = SvSTATE (coro_sv);
1689 1844
1845 if (coro->flags & CF_RUNNING)
1846 croak ("cannot enable tracing on a running coroutine, caught");
1847
1690 if (flags & CC_TRACE) 1848 if (flags & CC_TRACE)
1691 { 1849 {
1692 if (!coro->cctx) 1850 if (!coro->cctx)
1693 coro->cctx = cctx_new_run (); 1851 coro->cctx = cctx_new_run ();
1694 else if (!(coro->cctx->flags & CC_TRACE)) 1852 else if (!(coro->cctx->flags & CC_TRACE))
1695 croak ("cannot enable tracing on coroutine with custom stack,"); 1853 croak ("cannot enable tracing on coroutine with custom stack, caught");
1696 1854
1697 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL)); 1855 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL));
1698 } 1856 }
1699 else if (coro->cctx && coro->cctx->flags & CC_TRACE) 1857 else if (coro->cctx && coro->cctx->flags & CC_TRACE)
1700 { 1858 {
… …
1703 if (coro->flags & CF_RUNNING) 1861 if (coro->flags & CF_RUNNING)
1704 PL_runops = RUNOPS_DEFAULT; 1862 PL_runops = RUNOPS_DEFAULT;
1705 else 1863 else
1706 coro->slot->runops = RUNOPS_DEFAULT; 1864 coro->slot->runops = RUNOPS_DEFAULT;
1707 } 1865 }
1866}
1867
1868static void
1869coro_call_on_destroy (pTHX_ struct coro *coro)
1870{
1871 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0);
1872 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1873
1874 if (on_destroyp)
1875 {
1876 AV *on_destroy = (AV *)SvRV (*on_destroyp);
1877
1878 while (AvFILLp (on_destroy) >= 0)
1879 {
1880 dSP; /* don't disturb outer sp */
1881 SV *cb = av_pop (on_destroy);
1882
1883 PUSHMARK (SP);
1884
1885 if (statusp)
1886 {
1887 int i;
1888 AV *status = (AV *)SvRV (*statusp);
1889 EXTEND (SP, AvFILLp (status) + 1);
1890
1891 for (i = 0; i <= AvFILLp (status); ++i)
1892 PUSHs (AvARRAY (status)[i]);
1893 }
1894
1895 PUTBACK;
1896 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD);
1897 }
1898 }
1899}
1900
1901static void
1902slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1903{
1904 int i;
1905 HV *hv = (HV *)SvRV (coro_current);
1906 AV *av = newAV ();
1907
1908 av_extend (av, items - 1);
1909 for (i = 0; i < items; ++i)
1910 av_push (av, SvREFCNT_inc_NN (arg [i]));
1911
1912 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0);
1913
1914 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */
1915 api_ready (aTHX_ sv_manager);
1916
1917 frame->prepare = prepare_schedule;
1918 frame->check = slf_check_repeat;
1919
1920 /* as a minor optimisation, we could unwind all stacks here */
1921 /* but that puts extra pressure on pp_slf, and is not worth much */
1922 /*coro_unwind_stacks (aTHX);*/
1923}
1924
1925/*****************************************************************************/
1926/* async pool handler */
1927
1928static int
1929slf_check_pool_handler (pTHX_ struct CoroSLF *frame)
1930{
1931 HV *hv = (HV *)SvRV (coro_current);
1932 struct coro *coro = (struct coro *)frame->data;
1933
1934 if (!coro->invoke_cb)
1935 return 1; /* loop till we have invoke */
1936 else
1937 {
1938 hv_store (hv, "desc", sizeof ("desc") - 1,
1939 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
1940
1941 coro->saved_deffh = SvREFCNT_inc_NN ((SV *)PL_defoutgv);
1942
1943 {
1944 dSP;
1945 XPUSHs (sv_2mortal (coro->invoke_cb)); coro->invoke_cb = 0;
1946 PUTBACK;
1947 }
1948
1949 SvREFCNT_dec (GvAV (PL_defgv));
1950 GvAV (PL_defgv) = coro->invoke_av;
1951 coro->invoke_av = 0;
1952
1953 return 0;
1954 }
1955}
1956
1957static void
1958slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1959{
1960 HV *hv = (HV *)SvRV (coro_current);
1961 struct coro *coro = SvSTATE_hv ((SV *)hv);
1962
1963 if (expect_true (coro->saved_deffh))
1964 {
1965 /* subsequent iteration */
1966 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1967 coro->saved_deffh = 0;
1968
1969 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
1970 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1971 {
1972 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate);
1973 coro->invoke_av = newAV ();
1974
1975 frame->prepare = prepare_nop;
1976 }
1977 else
1978 {
1979 av_clear (GvAV (PL_defgv));
1980 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
1981
1982 coro->prio = 0;
1983
1984 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
1985 api_trace (aTHX_ coro_current, 0);
1986
1987 frame->prepare = prepare_schedule;
1988 av_push (av_async_pool, SvREFCNT_inc (hv));
1989 }
1990 }
1991 else
1992 {
1993 /* first iteration, simply fall through */
1994 frame->prepare = prepare_nop;
1995 }
1996
1997 frame->check = slf_check_pool_handler;
1998 frame->data = (void *)coro;
1999}
2000
2001/*****************************************************************************/
2002/* rouse callback */
2003
2004#define CORO_MAGIC_type_rouse PERL_MAGIC_ext
2005
2006static void
2007coro_rouse_callback (pTHX_ CV *cv)
2008{
2009 dXSARGS;
2010 SV *data = (SV *)GENSUB_ARG;
2011
2012 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2013 {
2014 /* first call, set args */
2015 SV *coro = SvRV (data);
2016 AV *av = newAV ();
2017
2018 SvRV_set (data, (SV *)av);
2019
2020 /* better take a full copy of the arguments */
2021 while (items--)
2022 av_store (av, items, newSVsv (ST (items)));
2023
2024 api_ready (aTHX_ coro);
2025 SvREFCNT_dec (coro);
2026 }
2027
2028 XSRETURN_EMPTY;
2029}
2030
2031static int
2032slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
2033{
2034 SV *data = (SV *)frame->data;
2035
2036 if (CORO_THROW)
2037 return 0;
2038
2039 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2040 return 1;
2041
2042 /* now push all results on the stack */
2043 {
2044 dSP;
2045 AV *av = (AV *)SvRV (data);
2046 int i;
2047
2048 EXTEND (SP, AvFILLp (av) + 1);
2049 for (i = 0; i <= AvFILLp (av); ++i)
2050 PUSHs (sv_2mortal (AvARRAY (av)[i]));
2051
2052 /* we have stolen the elements, so set length to zero and free */
2053 AvFILLp (av) = -1;
2054 av_undef (av);
2055
2056 PUTBACK;
2057 }
2058
2059 return 0;
2060}
2061
2062static void
2063slf_init_rouse_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2064{
2065 SV *cb;
2066
2067 if (items)
2068 cb = arg [0];
2069 else
2070 {
2071 struct coro *coro = SvSTATE_current;
2072
2073 if (!coro->rouse_cb)
2074 croak ("Coro::rouse_wait called without rouse callback, and no default rouse callback found either,");
2075
2076 cb = sv_2mortal (coro->rouse_cb);
2077 coro->rouse_cb = 0;
2078 }
2079
2080 if (!SvROK (cb)
2081 || SvTYPE (SvRV (cb)) != SVt_PVCV
2082 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2083 croak ("Coro::rouse_wait called with illegal callback argument,");
2084
2085 {
2086 CV *cv = (CV *)SvRV (cb); /* for GENSUB_ARG */
2087 SV *data = (SV *)GENSUB_ARG;
2088
2089 frame->data = (void *)data;
2090 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
2091 frame->check = slf_check_rouse_wait;
2092 }
2093}
2094
2095static SV *
2096coro_new_rouse_cb (pTHX)
2097{
2098 HV *hv = (HV *)SvRV (coro_current);
2099 struct coro *coro = SvSTATE_hv (hv);
2100 SV *data = newRV_inc ((SV *)hv);
2101 SV *cb = gensub (aTHX_ coro_rouse_callback, (void *)data);
2102
2103 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0);
2104 SvREFCNT_dec (data); /* magicext increases the refcount */
2105
2106 SvREFCNT_dec (coro->rouse_cb);
2107 coro->rouse_cb = SvREFCNT_inc_NN (cb);
2108
2109 return cb;
1708} 2110}
1709 2111
1710/*****************************************************************************/ 2112/*****************************************************************************/
1711/* schedule-like-function opcode (SLF) */ 2113/* schedule-like-function opcode (SLF) */
1712 2114
… …
1759static void 2161static void
1760slf_init_schedule (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2162slf_init_schedule (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1761{ 2163{
1762 frame->prepare = prepare_schedule; 2164 frame->prepare = prepare_schedule;
1763 frame->check = slf_check_nop; 2165 frame->check = slf_check_nop;
2166}
2167
2168static void
2169slf_prepare_schedule_to (pTHX_ struct coro_transfer_args *ta)
2170{
2171 struct coro *next = (struct coro *)slf_frame.data;
2172
2173 SvREFCNT_inc_NN (next->hv);
2174 prepare_schedule_to (aTHX_ ta, next);
2175}
2176
2177static void
2178slf_init_schedule_to (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2179{
2180 if (!items)
2181 croak ("Coro::schedule_to expects a coroutine argument, caught");
2182
2183 frame->data = (void *)SvSTATE (arg [0]);
2184 frame->prepare = slf_prepare_schedule_to;
2185 frame->check = slf_check_nop;
2186}
2187
2188static void
2189slf_init_cede_to (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2190{
2191 api_ready (aTHX_ SvRV (coro_current));
2192
2193 slf_init_schedule_to (aTHX_ frame, cv, arg, items);
1764} 2194}
1765 2195
1766static void 2196static void
1767slf_init_cede (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2197slf_init_cede (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1768{ 2198{
… …
1914 } 2344 }
1915 else 2345 else
1916 slf_argc = 0; 2346 slf_argc = 0;
1917 2347
1918 PL_op->op_ppaddr = pp_slf; 2348 PL_op->op_ppaddr = pp_slf;
1919 PL_op->op_type = OP_CUSTOM; /* maybe we should leave it at entersub? */ 2349 /*PL_op->op_type = OP_CUSTOM; /* we do behave like entersub still */
1920 2350
1921 PL_op = (OP *)&slf_restore; 2351 PL_op = (OP *)&slf_restore;
2352}
2353
2354/*****************************************************************************/
2355/* dynamic wind */
2356
2357static void
2358on_enterleave_call (pTHX_ SV *cb)
2359{
2360 dSP;
2361
2362 PUSHSTACK;
2363
2364 PUSHMARK (SP);
2365 PUTBACK;
2366 call_sv (cb, G_VOID | G_DISCARD);
2367 SPAGAIN;
2368
2369 POPSTACK;
2370}
2371
2372static SV *
2373coro_avp_pop_and_free (pTHX_ AV **avp)
2374{
2375 AV *av = *avp;
2376 SV *res = av_pop (av);
2377
2378 if (AvFILLp (av) < 0)
2379 {
2380 *avp = 0;
2381 SvREFCNT_dec (av);
2382 }
2383
2384 return res;
2385}
2386
2387static void
2388coro_pop_on_enter (pTHX_ void *coro)
2389{
2390 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_enter);
2391 SvREFCNT_dec (cb);
2392}
2393
2394static void
2395coro_pop_on_leave (pTHX_ void *coro)
2396{
2397 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2398 on_enterleave_call (aTHX_ sv_2mortal (cb));
1922} 2399}
1923 2400
1924/*****************************************************************************/ 2401/*****************************************************************************/
1925/* PerlIO::cede */ 2402/* PerlIO::cede */
1926 2403
… …
1995 PerlIOBuf_get_cnt, 2472 PerlIOBuf_get_cnt,
1996 PerlIOBuf_set_ptrcnt, 2473 PerlIOBuf_set_ptrcnt,
1997}; 2474};
1998 2475
1999/*****************************************************************************/ 2476/*****************************************************************************/
2477/* Coro::Semaphore & Coro::Signal */
2478
2479static SV *
2480coro_waitarray_new (pTHX_ int count)
2481{
2482 /* a waitarray=semaphore contains a counter IV in $sem->[0] and any waiters after that */
2483 AV *av = newAV ();
2484 SV **ary;
2485
2486 /* unfortunately, building manually saves memory */
2487 Newx (ary, 2, SV *);
2488 AvALLOC (av) = ary;
2489#if PERL_VERSION_ATLEAST (5,10,0)
2490 AvARRAY (av) = ary;
2491#else
2492 /* 5.8.8 needs this syntax instead of AvARRAY = ary, yet */
2493 /* -DDEBUGGING flags this as a bug, despite it perfectly working */
2494 SvPVX ((SV *)av) = (char *)ary;
2495#endif
2496 AvMAX (av) = 1;
2497 AvFILLp (av) = 0;
2498 ary [0] = newSViv (count);
2499
2500 return newRV_noinc ((SV *)av);
2501}
2502
2000/* Coro::Semaphore */ 2503/* semaphore */
2001 2504
2002static void 2505static void
2003coro_semaphore_adjust (pTHX_ AV *av, IV adjust) 2506coro_semaphore_adjust (pTHX_ AV *av, IV adjust)
2004{ 2507{
2005 SV *count_sv = AvARRAY (av)[0]; 2508 SV *count_sv = AvARRAY (av)[0];
… …
2017 AvARRAY (av)[0] = AvARRAY (av)[1]; 2520 AvARRAY (av)[0] = AvARRAY (av)[1];
2018 AvARRAY (av)[1] = count_sv; 2521 AvARRAY (av)[1] = count_sv;
2019 cb = av_shift (av); 2522 cb = av_shift (av);
2020 2523
2021 if (SvOBJECT (cb)) 2524 if (SvOBJECT (cb))
2525 {
2022 api_ready (aTHX_ cb); 2526 api_ready (aTHX_ cb);
2023 else 2527 --count;
2024 croak ("callbacks not yet supported"); 2528 }
2529 else if (SvTYPE (cb) == SVt_PVCV)
2530 {
2531 dSP;
2532 PUSHMARK (SP);
2533 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2534 PUTBACK;
2535 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2536 }
2025 2537
2026 SvREFCNT_dec (cb); 2538 SvREFCNT_dec (cb);
2027
2028 --count;
2029 } 2539 }
2030} 2540}
2031 2541
2032static void 2542static void
2033coro_semaphore_on_destroy (pTHX_ struct coro *coro) 2543coro_semaphore_on_destroy (pTHX_ struct coro *coro)
… …
2115} 2625}
2116 2626
2117static void 2627static void
2118slf_init_semaphore_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2628slf_init_semaphore_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2119{ 2629{
2630 if (items >= 2)
2631 {
2632 /* callback form */
2633 AV *av = (AV *)SvRV (arg [0]);
2634 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]);
2635
2636 av_push (av, SvREFCNT_inc_NN (cb_cv));
2637
2638 if (SvIVX (AvARRAY (av)[0]) > 0)
2639 coro_semaphore_adjust (aTHX_ av, 0);
2640
2641 frame->prepare = prepare_nop;
2642 frame->check = slf_check_nop;
2643 }
2644 else
2645 {
2120 slf_init_semaphore_down_or_wait (aTHX_ frame, cv, arg, items); 2646 slf_init_semaphore_down_or_wait (aTHX_ frame, cv, arg, items);
2121 frame->check = slf_check_semaphore_wait; 2647 frame->check = slf_check_semaphore_wait;
2648 }
2122} 2649}
2123 2650
2124/*****************************************************************************/ 2651/* signal */
2125/* gensub: simple closure generation utility */
2126 2652
2127#define GENSUB_ARG CvXSUBANY (cv).any_ptr 2653static void
2128 2654coro_signal_wake (pTHX_ AV *av, int count)
2129/* create a closure from XS, returns a code reference */
2130/* the arg can be accessed via GENSUB_ARG from the callback */
2131/* the callback must use dXSARGS/XSRETURN */
2132static SV *
2133gensub (pTHX_ void (*xsub)(pTHX_ CV *), void *arg)
2134{ 2655{
2135 CV *cv = (CV *)newSV (0); 2656 SvIVX (AvARRAY (av)[0]) = 0;
2136 2657
2137 sv_upgrade ((SV *)cv, SVt_PVCV); 2658 /* now signal count waiters */
2659 while (count > 0 && AvFILLp (av) > 0)
2660 {
2661 SV *cb;
2138 2662
2139 CvANON_on (cv); 2663 /* swap first two elements so we can shift a waiter */
2140 CvISXSUB_on (cv); 2664 cb = AvARRAY (av)[0];
2141 CvXSUB (cv) = xsub; 2665 AvARRAY (av)[0] = AvARRAY (av)[1];
2142 GENSUB_ARG = arg; 2666 AvARRAY (av)[1] = cb;
2143 2667
2144 return newRV_noinc ((SV *)cv); 2668 cb = av_shift (av);
2669
2670 if (SvTYPE (cb) == SVt_PVCV)
2671 {
2672 dSP;
2673 PUSHMARK (SP);
2674 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2675 PUTBACK;
2676 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2677 }
2678 else
2679 {
2680 api_ready (aTHX_ cb);
2681 sv_setiv (cb, 0); /* signal waiter */
2682 }
2683
2684 SvREFCNT_dec (cb);
2685
2686 --count;
2687 }
2688}
2689
2690static int
2691slf_check_signal_wait (pTHX_ struct CoroSLF *frame)
2692{
2693 /* if we are about to throw, also stop waiting */
2694 return SvROK ((SV *)frame->data) && !CORO_THROW;
2695}
2696
2697static void
2698slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2699{
2700 AV *av = (AV *)SvRV (arg [0]);
2701
2702 if (items >= 2)
2703 {
2704 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]);
2705 av_push (av, SvREFCNT_inc_NN (cb_cv));
2706
2707 if (SvIVX (AvARRAY (av)[0]))
2708 coro_signal_wake (aTHX_ av, 1); /* ust be the only waiter */
2709
2710 frame->prepare = prepare_nop;
2711 frame->check = slf_check_nop;
2712 }
2713 else if (SvIVX (AvARRAY (av)[0]))
2714 {
2715 SvIVX (AvARRAY (av)[0]) = 0;
2716 frame->prepare = prepare_nop;
2717 frame->check = slf_check_nop;
2718 }
2719 else
2720 {
2721 SV *waiter = newSVsv (coro_current); /* owned by signal av */
2722
2723 av_push (av, waiter);
2724
2725 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */
2726 frame->prepare = prepare_schedule;
2727 frame->check = slf_check_signal_wait;
2728 }
2145} 2729}
2146 2730
2147/*****************************************************************************/ 2731/*****************************************************************************/
2148/* Coro::AIO */ 2732/* Coro::AIO */
2149 2733
… …
2164 dXSARGS; 2748 dXSARGS;
2165 AV *state = (AV *)GENSUB_ARG; 2749 AV *state = (AV *)GENSUB_ARG;
2166 SV *coro = av_pop (state); 2750 SV *coro = av_pop (state);
2167 SV *data_sv = newSV (sizeof (struct io_state)); 2751 SV *data_sv = newSV (sizeof (struct io_state));
2168 2752
2169 av_extend (state, items); 2753 av_extend (state, items - 1);
2170 2754
2171 sv_upgrade (data_sv, SVt_PV); 2755 sv_upgrade (data_sv, SVt_PV);
2172 SvCUR_set (data_sv, sizeof (struct io_state)); 2756 SvCUR_set (data_sv, sizeof (struct io_state));
2173 SvPOK_only (data_sv); 2757 SvPOK_only (data_sv);
2174 2758
… …
2309 XSRETURN_EMPTY; 2893 XSRETURN_EMPTY;
2310} 2894}
2311 2895
2312/*****************************************************************************/ 2896/*****************************************************************************/
2313 2897
2898#if CORO_CLONE
2899# include "clone.c"
2900#endif
2901
2314MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 2902MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2315 2903
2316PROTOTYPES: DISABLE 2904PROTOTYPES: DISABLE
2317 2905
2318BOOT: 2906BOOT:
… …
2322 coro_thx = PERL_GET_CONTEXT; 2910 coro_thx = PERL_GET_CONTEXT;
2323# endif 2911# endif
2324#endif 2912#endif
2325 BOOT_PAGESIZE; 2913 BOOT_PAGESIZE;
2326 2914
2915 cctx_current = cctx_new_empty ();
2916
2327 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 2917 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
2328 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 2918 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
2329 2919
2330 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 2920 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get;
2331 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set; 2921 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set;
… …
2350 2940
2351 { 2941 {
2352 SV *slf = sv_2mortal (newSViv (PTR2IV (pp_slf))); 2942 SV *slf = sv_2mortal (newSViv (PTR2IV (pp_slf)));
2353 2943
2354 if (!PL_custom_op_names) PL_custom_op_names = newHV (); 2944 if (!PL_custom_op_names) PL_custom_op_names = newHV ();
2355 hv_store_ent (PL_custom_op_names, slf, 2945 hv_store_ent (PL_custom_op_names, slf, newSVpv ("coro_slf", 0), 0);
2356 newSVpv ("coro_slf", 0), 0);
2357 2946
2358 if (!PL_custom_op_descs) PL_custom_op_descs = newHV (); 2947 if (!PL_custom_op_descs) PL_custom_op_descs = newHV ();
2359 hv_store_ent (PL_custom_op_descs, slf, 2948 hv_store_ent (PL_custom_op_descs, slf, newSVpv ("coro schedule like function", 0), 0);
2360 newSVpv ("coro schedule like function", 0), 0);
2361 } 2949 }
2362 2950
2363 coroapi.ver = CORO_API_VERSION; 2951 coroapi.ver = CORO_API_VERSION;
2364 coroapi.rev = CORO_API_REVISION; 2952 coroapi.rev = CORO_API_REVISION;
2365 2953
… …
2384 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 2972 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL));
2385} 2973}
2386 2974
2387SV * 2975SV *
2388new (char *klass, ...) 2976new (char *klass, ...)
2977 ALIAS:
2978 Coro::new = 1
2389 CODE: 2979 CODE:
2390{ 2980{
2391 struct coro *coro; 2981 struct coro *coro;
2392 MAGIC *mg; 2982 MAGIC *mg;
2393 HV *hv; 2983 HV *hv;
2984 CV *cb;
2394 int i; 2985 int i;
2986
2987 if (items > 1)
2988 {
2989 cb = coro_sv_2cv (aTHX_ ST (1));
2990
2991 if (!ix)
2992 {
2993 if (CvISXSUB (cb))
2994 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
2995
2996 if (!CvROOT (cb))
2997 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
2998 }
2999 }
2395 3000
2396 Newz (0, coro, 1, struct coro); 3001 Newz (0, coro, 1, struct coro);
2397 coro->args = newAV (); 3002 coro->args = newAV ();
2398 coro->flags = CF_NEW; 3003 coro->flags = CF_NEW;
2399 3004
… …
2404 coro->hv = hv = newHV (); 3009 coro->hv = hv = newHV ();
2405 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0); 3010 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
2406 mg->mg_flags |= MGf_DUP; 3011 mg->mg_flags |= MGf_DUP;
2407 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 3012 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
2408 3013
3014 if (items > 1)
3015 {
2409 av_extend (coro->args, items - 1); 3016 av_extend (coro->args, items - 1 + ix - 1);
3017
3018 if (ix)
3019 {
3020 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
3021 cb = cv_coro_run;
3022 }
3023
3024 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3025
2410 for (i = 1; i < items; i++) 3026 for (i = 2; i < items; i++)
2411 av_push (coro->args, newSVsv (ST (i))); 3027 av_push (coro->args, newSVsv (ST (i)));
3028 }
2412} 3029}
2413 OUTPUT: 3030 OUTPUT:
2414 RETVAL 3031 RETVAL
2415 3032
2416void 3033void
… …
2429void 3046void
2430_exit (int code) 3047_exit (int code)
2431 PROTOTYPE: $ 3048 PROTOTYPE: $
2432 CODE: 3049 CODE:
2433 _exit (code); 3050 _exit (code);
3051
3052SV *
3053clone (Coro::State coro)
3054 CODE:
3055{
3056#if CORO_CLONE
3057 struct coro *ncoro = coro_clone (aTHX_ coro);
3058 MAGIC *mg;
3059 /* TODO: too much duplication */
3060 ncoro->hv = newHV ();
3061 mg = sv_magicext ((SV *)ncoro->hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)ncoro, 0);
3062 mg->mg_flags |= MGf_DUP;
3063 RETVAL = sv_bless (newRV_noinc ((SV *)ncoro->hv), SvSTASH (coro->hv));
3064#else
3065 croak ("Coro::State->clone has not been configured into this installation of Coro, realised");
3066#endif
3067}
3068 OUTPUT:
3069 RETVAL
2434 3070
2435int 3071int
2436cctx_stacksize (int new_stacksize = 0) 3072cctx_stacksize (int new_stacksize = 0)
2437 PROTOTYPE: ;$ 3073 PROTOTYPE: ;$
2438 CODE: 3074 CODE:
… …
2488 eval = 1 3124 eval = 1
2489 CODE: 3125 CODE:
2490{ 3126{
2491 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3127 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
2492 { 3128 {
2493 struct coro temp; 3129 struct coro *current = SvSTATE_current;
2494 3130
2495 if (!(coro->flags & CF_RUNNING)) 3131 if (current != coro)
2496 { 3132 {
2497 PUTBACK; 3133 PUTBACK;
2498 save_perl (aTHX_ &temp); 3134 save_perl (aTHX_ current);
2499 load_perl (aTHX_ coro); 3135 load_perl (aTHX_ coro);
3136 SPAGAIN;
2500 } 3137 }
2501 3138
2502 {
2503 dSP;
2504 ENTER;
2505 SAVETMPS;
2506 PUTBACK;
2507 PUSHSTACK; 3139 PUSHSTACK;
3140
2508 PUSHMARK (SP); 3141 PUSHMARK (SP);
3142 PUTBACK;
2509 3143
2510 if (ix) 3144 if (ix)
2511 eval_sv (coderef, 0); 3145 eval_sv (coderef, 0);
2512 else 3146 else
2513 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 3147 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
2514 3148
2515 POPSTACK; 3149 POPSTACK;
2516 SPAGAIN; 3150 SPAGAIN;
2517 FREETMPS;
2518 LEAVE;
2519 PUTBACK;
2520 }
2521 3151
2522 if (!(coro->flags & CF_RUNNING)) 3152 if (current != coro)
2523 { 3153 {
3154 PUTBACK;
2524 save_perl (aTHX_ coro); 3155 save_perl (aTHX_ coro);
2525 load_perl (aTHX_ &temp); 3156 load_perl (aTHX_ current);
2526 SPAGAIN; 3157 SPAGAIN;
2527 } 3158 }
2528 } 3159 }
2529} 3160}
2530 3161
… …
2534 ALIAS: 3165 ALIAS:
2535 is_ready = CF_READY 3166 is_ready = CF_READY
2536 is_running = CF_RUNNING 3167 is_running = CF_RUNNING
2537 is_new = CF_NEW 3168 is_new = CF_NEW
2538 is_destroyed = CF_DESTROYED 3169 is_destroyed = CF_DESTROYED
3170 is_suspended = CF_SUSPENDED
2539 CODE: 3171 CODE:
2540 RETVAL = boolSV (coro->flags & ix); 3172 RETVAL = boolSV (coro->flags & ix);
2541 OUTPUT: 3173 OUTPUT:
2542 RETVAL 3174 RETVAL
2543 3175
… …
2559 3191
2560SV * 3192SV *
2561has_cctx (Coro::State coro) 3193has_cctx (Coro::State coro)
2562 PROTOTYPE: $ 3194 PROTOTYPE: $
2563 CODE: 3195 CODE:
2564 RETVAL = boolSV (!!coro->cctx); 3196 /* maybe manage the running flag differently */
3197 RETVAL = boolSV (!!coro->cctx || (coro->flags & CF_RUNNING));
2565 OUTPUT: 3198 OUTPUT:
2566 RETVAL 3199 RETVAL
2567 3200
2568int 3201int
2569is_traced (Coro::State coro) 3202is_traced (Coro::State coro)
… …
2589 3222
2590void 3223void
2591force_cctx () 3224force_cctx ()
2592 PROTOTYPE: 3225 PROTOTYPE:
2593 CODE: 3226 CODE:
2594 SvSTATE_current->cctx->idle_sp = 0; 3227 cctx_current->idle_sp = 0;
2595 3228
2596void 3229void
2597swap_defsv (Coro::State self) 3230swap_defsv (Coro::State self)
2598 PROTOTYPE: $ 3231 PROTOTYPE: $
2599 ALIAS: 3232 ALIAS:
… …
2607 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv; 3240 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
2608 3241
2609 SV *tmp = *src; *src = *dst; *dst = tmp; 3242 SV *tmp = *src; *src = *dst; *dst = tmp;
2610 } 3243 }
2611 3244
3245void
3246cancel (Coro::State self)
3247 CODE:
3248 coro_state_destroy (aTHX_ self);
3249 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */
3250
2612 3251
2613MODULE = Coro::State PACKAGE = Coro 3252MODULE = Coro::State PACKAGE = Coro
2614 3253
2615BOOT: 3254BOOT:
2616{ 3255{
2617 int i;
2618
2619 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
2620 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3256 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
2621 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3257 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
2622 3258 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3259 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
2623 coro_current = coro_get_sv (aTHX_ "Coro::current", FALSE); 3260 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
2624 SvREADONLY_on (coro_current); 3261 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3262 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3263 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3264 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3265
3266 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3267 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3268 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3269 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new);
2625 3270
2626 coro_stash = gv_stashpv ("Coro", TRUE); 3271 coro_stash = gv_stashpv ("Coro", TRUE);
2627 3272
2628 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 3273 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
2629 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 3274 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH));
2630 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 3275 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL));
2631 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 3276 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW));
2632 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE)); 3277 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE));
2633 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN)); 3278 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN));
2634 3279
2635 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
2636 coro_ready[i] = newAV ();
2637
2638 { 3280 {
2639 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 3281 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
2640 3282
2641 coroapi.schedule = api_schedule; 3283 coroapi.schedule = api_schedule;
3284 coroapi.schedule_to = api_schedule_to;
2642 coroapi.cede = api_cede; 3285 coroapi.cede = api_cede;
2643 coroapi.cede_notself = api_cede_notself; 3286 coroapi.cede_notself = api_cede_notself;
2644 coroapi.ready = api_ready; 3287 coroapi.ready = api_ready;
2645 coroapi.is_ready = api_is_ready; 3288 coroapi.is_ready = api_is_ready;
2646 coroapi.nready = coro_nready; 3289 coroapi.nready = coro_nready;
… …
2651 SvREADONLY_on (sv); 3294 SvREADONLY_on (sv);
2652 } 3295 }
2653} 3296}
2654 3297
2655void 3298void
3299terminate (...)
3300 CODE:
3301 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3302
3303void
2656schedule (...) 3304schedule (...)
2657 CODE: 3305 CODE:
2658 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3306 CORO_EXECUTE_SLF_XS (slf_init_schedule);
3307
3308void
3309schedule_to (...)
3310 CODE:
3311 CORO_EXECUTE_SLF_XS (slf_init_schedule_to);
3312
3313void
3314cede_to (...)
3315 CODE:
3316 CORO_EXECUTE_SLF_XS (slf_init_cede_to);
2659 3317
2660void 3318void
2661cede (...) 3319cede (...)
2662 CODE: 3320 CODE:
2663 CORO_EXECUTE_SLF_XS (slf_init_cede); 3321 CORO_EXECUTE_SLF_XS (slf_init_cede);
… …
2718 CODE: 3376 CODE:
2719 RETVAL = coro_nready; 3377 RETVAL = coro_nready;
2720 OUTPUT: 3378 OUTPUT:
2721 RETVAL 3379 RETVAL
2722 3380
2723# for async_pool speedup
2724void 3381void
2725_pool_1 (SV *cb) 3382suspend (Coro::State self)
3383 PROTOTYPE: $
2726 CODE: 3384 CODE:
2727{ 3385 self->flags |= CF_SUSPENDED;
2728 HV *hv = (HV *)SvRV (coro_current);
2729 struct coro *coro = SvSTATE_hv ((SV *)hv);
2730 AV *defav = GvAV (PL_defgv);
2731 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
2732 AV *invoke_av;
2733 int i, len;
2734 3386
2735 if (!invoke) 3387void
3388resume (Coro::State self)
3389 PROTOTYPE: $
3390 CODE:
3391 self->flags &= ~CF_SUSPENDED;
3392
3393void
3394_pool_handler (...)
3395 CODE:
3396 CORO_EXECUTE_SLF_XS (slf_init_pool_handler);
3397
3398void
3399async_pool (SV *cv, ...)
3400 PROTOTYPE: &@
3401 PPCODE:
3402{
3403 HV *hv = (HV *)av_pop (av_async_pool);
3404 AV *av = newAV ();
3405 SV *cb = ST (0);
3406 int i;
3407
3408 av_extend (av, items - 2);
3409 for (i = 1; i < items; ++i)
3410 av_push (av, SvREFCNT_inc_NN (ST (i)));
3411
3412 if ((SV *)hv == &PL_sv_undef)
2736 { 3413 {
2737 SV *old = PL_diehook; 3414 PUSHMARK (SP);
2738 PL_diehook = 0; 3415 EXTEND (SP, 2);
2739 SvREFCNT_dec (old); 3416 PUSHs (sv_Coro);
2740 croak ("\3async_pool terminate\2\n"); 3417 PUSHs ((SV *)cv_pool_handler);
3418 PUTBACK;
3419 call_sv ((SV *)cv_coro_state_new, G_SCALAR);
3420 SPAGAIN;
3421
3422 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs));
2741 } 3423 }
2742 3424
2743 SvREFCNT_dec (coro->saved_deffh);
2744 coro->saved_deffh = SvREFCNT_inc_NN ((SV *)PL_defoutgv);
2745
2746 hv_store (hv, "desc", sizeof ("desc") - 1,
2747 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
2748
2749 invoke_av = (AV *)SvRV (invoke);
2750 len = av_len (invoke_av);
2751
2752 sv_setsv (cb, AvARRAY (invoke_av)[0]);
2753
2754 if (len > 0)
2755 { 3425 {
2756 av_fill (defav, len - 1); 3426 struct coro *coro = SvSTATE_hv (hv);
2757 for (i = 0; i < len; ++i) 3427
2758 av_store (defav, i, SvREFCNT_inc_NN (AvARRAY (invoke_av)[i + 1])); 3428 assert (!coro->invoke_cb);
3429 assert (!coro->invoke_av);
3430 coro->invoke_cb = SvREFCNT_inc (cb);
3431 coro->invoke_av = av;
2759 } 3432 }
3433
3434 api_ready (aTHX_ (SV *)hv);
3435
3436 if (GIMME_V != G_VOID)
3437 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
3438 else
3439 SvREFCNT_dec (hv);
2760} 3440}
3441
3442SV *
3443rouse_cb ()
3444 PROTOTYPE:
3445 CODE:
3446 RETVAL = coro_new_rouse_cb (aTHX);
3447 OUTPUT:
3448 RETVAL
2761 3449
2762void 3450void
2763_pool_2 (SV *cb) 3451rouse_wait (...)
3452 PROTOTYPE: ;$
3453 PPCODE:
3454 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait);
3455
3456void
3457on_enter (SV *block)
3458 ALIAS:
3459 on_leave = 1
3460 PROTOTYPE: &
2764 CODE: 3461 CODE:
2765{ 3462{
2766 HV *hv = (HV *)SvRV (coro_current);
2767 struct coro *coro = SvSTATE_hv ((SV *)hv); 3463 struct coro *coro = SvSTATE_current;
3464 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
2768 3465
2769 sv_setsv (cb, &PL_sv_undef); 3466 block = (SV *)coro_sv_2cv (aTHX_ block);
2770 3467
2771 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 3468 if (!*avp)
2772 coro->saved_deffh = 0; 3469 *avp = newAV ();
2773 3470
2774 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 3471 av_push (*avp, SvREFCNT_inc (block));
2775 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
2776 {
2777 SV *old = PL_diehook;
2778 PL_diehook = 0;
2779 SvREFCNT_dec (old);
2780 croak ("\3async_pool terminate\2\n");
2781 }
2782 3472
2783 av_clear (GvAV (PL_defgv)); 3473 if (!ix)
2784 hv_store (hv, "desc", sizeof ("desc") - 1, 3474 on_enterleave_call (aTHX_ block);
2785 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
2786 3475
2787 coro->prio = 0; 3476 LEAVE; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
2788 3477 SAVEDESTRUCTOR_X (ix ? coro_pop_on_leave : coro_pop_on_enter, (void *)coro);
2789 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 3478 ENTER; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
2790 api_trace (aTHX_ coro_current, 0);
2791
2792 av_push (av_async_pool, newSVsv (coro_current));
2793} 3479}
2794 3480
2795 3481
2796MODULE = Coro::State PACKAGE = PerlIO::cede 3482MODULE = Coro::State PACKAGE = PerlIO::cede
2797 3483
… …
2800 3486
2801 3487
2802MODULE = Coro::State PACKAGE = Coro::Semaphore 3488MODULE = Coro::State PACKAGE = Coro::Semaphore
2803 3489
2804SV * 3490SV *
2805new (SV *klass, SV *count_ = 0) 3491new (SV *klass, SV *count = 0)
2806 CODE: 3492 CODE:
2807{ 3493{
2808 /* a semaphore contains a counter IV in $sem->[0] and any waiters after that */ 3494 int semcnt = 1;
2809 AV *av = newAV ();
2810 SV **ary;
2811 3495
2812 /* unfortunately, building manually saves memory */ 3496 if (count)
2813 Newx (ary, 2, SV *); 3497 {
2814 AvALLOC (av) = ary; 3498 SvGETMAGIC (count);
2815 AvARRAY (av) = ary;
2816 AvMAX (av) = 1;
2817 AvFILLp (av) = 0;
2818 ary [0] = newSViv (count_ && SvOK (count_) ? SvIV (count_) : 1);
2819 3499
2820 RETVAL = sv_bless (newRV_noinc ((SV *)av), GvSTASH (CvGV (cv))); 3500 if (SvOK (count))
3501 semcnt = SvIV (count);
3502 }
3503
3504 RETVAL = sv_bless (
3505 coro_waitarray_new (aTHX_ semcnt),
3506 GvSTASH (CvGV (cv))
3507 );
2821} 3508}
3509 OUTPUT:
3510 RETVAL
3511
3512# helper for Coro::Channel and others
3513SV *
3514_alloc (int count)
3515 CODE:
3516 RETVAL = coro_waitarray_new (aTHX_ count);
2822 OUTPUT: 3517 OUTPUT:
2823 RETVAL 3518 RETVAL
2824 3519
2825SV * 3520SV *
2826count (SV *self) 3521count (SV *self)
… …
2835 adjust = 1 3530 adjust = 1
2836 CODE: 3531 CODE:
2837 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1); 3532 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1);
2838 3533
2839void 3534void
2840down (SV *self) 3535down (...)
2841 CODE: 3536 CODE:
2842 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down); 3537 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down);
2843 3538
2844void 3539void
2845wait (SV *self) 3540wait (...)
2846 CODE: 3541 CODE:
2847 CORO_EXECUTE_SLF_XS (slf_init_semaphore_wait); 3542 CORO_EXECUTE_SLF_XS (slf_init_semaphore_wait);
2848 3543
2849void 3544void
2850try (SV *self) 3545try (SV *self)
… …
2864 XSRETURN_NO; 3559 XSRETURN_NO;
2865} 3560}
2866 3561
2867void 3562void
2868waiters (SV *self) 3563waiters (SV *self)
2869 CODE: 3564 PPCODE:
2870{ 3565{
2871 AV *av = (AV *)SvRV (self); 3566 AV *av = (AV *)SvRV (self);
3567 int wcount = AvFILLp (av) + 1 - 1;
2872 3568
2873 if (GIMME_V == G_SCALAR) 3569 if (GIMME_V == G_SCALAR)
2874 XPUSHs (sv_2mortal (newSVsv (AvARRAY (av)[0]))); 3570 XPUSHs (sv_2mortal (newSViv (wcount)));
2875 else 3571 else
2876 { 3572 {
2877 int i; 3573 int i;
2878 EXTEND (SP, AvFILLp (av) + 1 - 1); 3574 EXTEND (SP, wcount);
2879 for (i = 1; i <= AvFILLp (av); ++i) 3575 for (i = 1; i <= wcount; ++i)
2880 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i]))); 3576 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i])));
2881 } 3577 }
2882} 3578}
3579
3580MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3581
3582void
3583_may_delete (SV *sem, int count, int extra_refs)
3584 PPCODE:
3585{
3586 AV *av = (AV *)SvRV (sem);
3587
3588 if (SvREFCNT ((SV *)av) == 1 + extra_refs
3589 && AvFILLp (av) == 0 /* no waiters, just count */
3590 && SvIV (AvARRAY (av)[0]) == count)
3591 XSRETURN_YES;
3592
3593 XSRETURN_NO;
3594}
3595
3596MODULE = Coro::State PACKAGE = Coro::Signal
3597
3598SV *
3599new (SV *klass)
3600 CODE:
3601 RETVAL = sv_bless (
3602 coro_waitarray_new (aTHX_ 0),
3603 GvSTASH (CvGV (cv))
3604 );
3605 OUTPUT:
3606 RETVAL
3607
3608void
3609wait (...)
3610 CODE:
3611 CORO_EXECUTE_SLF_XS (slf_init_signal_wait);
3612
3613void
3614broadcast (SV *self)
3615 CODE:
3616{
3617 AV *av = (AV *)SvRV (self);
3618 coro_signal_wake (aTHX_ av, AvFILLp (av));
3619}
3620
3621void
3622send (SV *self)
3623 CODE:
3624{
3625 AV *av = (AV *)SvRV (self);
3626
3627 if (AvFILLp (av))
3628 coro_signal_wake (aTHX_ av, 1);
3629 else
3630 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
3631}
3632
3633IV
3634awaited (SV *self)
3635 CODE:
3636 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
3637 OUTPUT:
3638 RETVAL
2883 3639
2884 3640
2885MODULE = Coro::State PACKAGE = Coro::AnyEvent 3641MODULE = Coro::State PACKAGE = Coro::AnyEvent
2886 3642
2887BOOT: 3643BOOT:
… …
2915 3671
2916void 3672void
2917_register (char *target, char *proto, SV *req) 3673_register (char *target, char *proto, SV *req)
2918 CODE: 3674 CODE:
2919{ 3675{
2920 HV *st; 3676 CV *req_cv = coro_sv_2cv (aTHX_ req);
2921 GV *gvp;
2922 CV *req_cv = sv_2cv (req, &st, &gvp, 0);
2923 /* newXSproto doesn't return the CV on 5.8 */ 3677 /* newXSproto doesn't return the CV on 5.8 */
2924 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 3678 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
2925 sv_setpv ((SV *)slf_cv, proto); 3679 sv_setpv ((SV *)slf_cv, proto);
2926 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0); 3680 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
2927} 3681}

Diff Legend

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