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.319 by root, Thu Nov 20 07:25:01 2008 UTC vs.
Revision 1.360 by root, Mon Jun 29 06:14:23 2009 UTC

101# define CvISXSUB_on(cv) (void)cv 101# define CvISXSUB_on(cv) (void)cv
102#endif 102#endif
103#ifndef CvISXSUB 103#ifndef CvISXSUB
104# define CvISXSUB(cv) (CvXSUB (cv) ? TRUE : FALSE) 104# define CvISXSUB(cv) (CvXSUB (cv) ? TRUE : FALSE)
105#endif 105#endif
106#ifndef Newx
107# define Newx(ptr,nitems,type) New (0,ptr,nitems,type)
108#endif
106 109
107/* 5.8.7 */ 110/* 5.8.7 */
108#ifndef SvRV_set 111#ifndef SvRV_set
109# define SvRV_set(s,v) SvRV(s) = (v) 112# define SvRV_set(s,v) SvRV(s) = (v)
110#endif 113#endif
130#else 133#else
131# define dSTACKLEVEL volatile void *stacklevel 134# define dSTACKLEVEL volatile void *stacklevel
132# define STACKLEVEL ((void *)&stacklevel) 135# define STACKLEVEL ((void *)&stacklevel)
133#endif 136#endif
134 137
135#define IN_DESTRUCT (PL_main_cv == Nullcv) 138#define IN_DESTRUCT PL_dirty
136 139
137#if __GNUC__ >= 3 140#if __GNUC__ >= 3
138# define attribute(x) __attribute__(x) 141# define attribute(x) __attribute__(x)
139# define expect(expr,value) __builtin_expect ((expr),(value)) 142# define expect(expr,value) __builtin_expect ((expr), (value))
140# define INLINE static inline 143# define INLINE static inline
141#else 144#else
142# define attribute(x) 145# define attribute(x)
143# define expect(expr,value) (expr) 146# define expect(expr,value) (expr)
144# define INLINE static 147# define INLINE static
156# if CORO_PTHREAD 159# if CORO_PTHREAD
157static void *coro_thx; 160static void *coro_thx;
158# endif 161# endif
159#endif 162#endif
160 163
164#ifdef __linux
165# include <time.h> /* for timespec */
166# include <syscall.h> /* for SYS_* */
167# ifdef SYS_clock_gettime
168# define coro_clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
169# define CORO_CLOCK_MONOTONIC 1
170# define CORO_CLOCK_THREAD_CPUTIME_ID 3
171# endif
172#endif
173
161static double (*nvtime)(); /* so why doesn't it take void? */ 174static double (*nvtime)(); /* so why doesn't it take void? */
175static void (*u2time)(pTHX_ UV ret[2]);
162 176
163/* we hijack an hopefully unused CV flag for our purposes */ 177/* we hijack an hopefully unused CV flag for our purposes */
164#define CVf_SLF 0x4000 178#define CVf_SLF 0x4000
165static OP *pp_slf (pTHX); 179static OP *pp_slf (pTHX);
166 180
172static HV *coro_state_stash, *coro_stash; 186static HV *coro_state_stash, *coro_stash;
173static volatile SV *coro_mortal; /* will be freed/thrown after next transfer */ 187static volatile SV *coro_mortal; /* will be freed/thrown after next transfer */
174 188
175static AV *av_destroy; /* destruction queue */ 189static AV *av_destroy; /* destruction queue */
176static SV *sv_manager; /* the manager coro */ 190static SV *sv_manager; /* the manager coro */
191static SV *sv_idle; /* $Coro::idle */
177 192
178static GV *irsgv; /* $/ */ 193static GV *irsgv; /* $/ */
179static GV *stdoutgv; /* *STDOUT */ 194static GV *stdoutgv; /* *STDOUT */
180static SV *rv_diehook; 195static SV *rv_diehook;
181static SV *rv_warnhook; 196static SV *rv_warnhook;
191static CV *cv_coro_state_new; 206static CV *cv_coro_state_new;
192 207
193/* Coro::AnyEvent */ 208/* Coro::AnyEvent */
194static SV *sv_activity; 209static SV *sv_activity;
195 210
211/* enable processtime/realtime profiling */
212static char enable_times;
213typedef U32 coro_ts[2];
214static coro_ts time_real, time_cpu;
215static char times_valid;
216
196static struct coro_cctx *cctx_first; 217static struct coro_cctx *cctx_first;
197static int cctx_count, cctx_idle; 218static int cctx_count, cctx_idle;
198 219
199enum { 220enum {
200 CC_MAPPED = 0x01, 221 CC_MAPPED = 0x01,
225 int valgrind_id; 246 int valgrind_id;
226#endif 247#endif
227 unsigned char flags; 248 unsigned char flags;
228} coro_cctx; 249} coro_cctx;
229 250
251coro_cctx *cctx_current; /* the currently running cctx */
252
253/*****************************************************************************/
254
230enum { 255enum {
231 CF_RUNNING = 0x0001, /* coroutine is running */ 256 CF_RUNNING = 0x0001, /* coroutine is running */
232 CF_READY = 0x0002, /* coroutine is ready */ 257 CF_READY = 0x0002, /* coroutine is ready */
233 CF_NEW = 0x0004, /* has never been switched to */ 258 CF_NEW = 0x0004, /* has never been switched to */
234 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 259 CF_DESTROYED = 0x0008, /* coroutine data has been freed */
260 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
235}; 261};
236 262
237/* the structure where most of the perl state is stored, overlaid on the cxstack */ 263/* the structure where most of the perl state is stored, overlaid on the cxstack */
238typedef struct 264typedef struct
239{ 265{
240 SV *defsv; 266 SV *defsv;
241 AV *defav; 267 AV *defav;
242 SV *errsv; 268 SV *errsv;
243 SV *irsgv; 269 SV *irsgv;
270 HV *hinthv;
244#define VAR(name,type) type name; 271#define VAR(name,type) type name;
245# include "state.h" 272# include "state.h"
246#undef VAR 273#undef VAR
247} perl_slots; 274} perl_slots;
248 275
250 277
251/* this is a structure representing a perl-level coroutine */ 278/* this is a structure representing a perl-level coroutine */
252struct coro { 279struct coro {
253 /* the C coroutine allocated to this perl coroutine, if any */ 280 /* the C coroutine allocated to this perl coroutine, if any */
254 coro_cctx *cctx; 281 coro_cctx *cctx;
282
283 /* ready queue */
284 struct coro *next_ready;
255 285
256 /* state data */ 286 /* state data */
257 struct CoroSLF slf_frame; /* saved slf frame */ 287 struct CoroSLF slf_frame; /* saved slf frame */
258 AV *mainstack; 288 AV *mainstack;
259 perl_slots *slot; /* basically the saved sp */ 289 perl_slots *slot; /* basically the saved sp */
276 /* async_pool */ 306 /* async_pool */
277 SV *saved_deffh; 307 SV *saved_deffh;
278 SV *invoke_cb; 308 SV *invoke_cb;
279 AV *invoke_av; 309 AV *invoke_av;
280 310
311 /* on_enter/on_leave */
312 AV *on_enter;
313 AV *on_leave;
314
315 /* times */
316 coro_ts t_cpu, t_real;
317
281 /* linked list */ 318 /* linked list */
282 struct coro *next, *prev; 319 struct coro *next, *prev;
283}; 320};
284 321
285typedef struct coro *Coro__State; 322typedef struct coro *Coro__State;
290/* the mainr easonw e don't support windows process emulation */ 327/* the mainr easonw e don't support windows process emulation */
291static struct CoroSLF slf_frame; /* the current slf frame */ 328static struct CoroSLF slf_frame; /* the current slf frame */
292 329
293/** Coro ********************************************************************/ 330/** Coro ********************************************************************/
294 331
295#define PRIO_MAX 3 332#define CORO_PRIO_MAX 3
296#define PRIO_HIGH 1 333#define CORO_PRIO_HIGH 1
297#define PRIO_NORMAL 0 334#define CORO_PRIO_NORMAL 0
298#define PRIO_LOW -1 335#define CORO_PRIO_LOW -1
299#define PRIO_IDLE -3 336#define CORO_PRIO_IDLE -3
300#define PRIO_MIN -4 337#define CORO_PRIO_MIN -4
301 338
302/* for Coro.pm */ 339/* for Coro.pm */
303static SV *coro_current; 340static SV *coro_current;
304static SV *coro_readyhook; 341static SV *coro_readyhook;
305static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1]; 342static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
306static CV *cv_coro_run, *cv_coro_terminate; 343static CV *cv_coro_run, *cv_coro_terminate;
307static struct coro *coro_first; 344static struct coro *coro_first;
308#define coro_nready coroapi.nready 345#define coro_nready coroapi.nready
309 346
310/** lowlevel stuff **********************************************************/ 347/** lowlevel stuff **********************************************************/
343INLINE CV * 380INLINE CV *
344coro_sv_2cv (pTHX_ SV *sv) 381coro_sv_2cv (pTHX_ SV *sv)
345{ 382{
346 HV *st; 383 HV *st;
347 GV *gvp; 384 GV *gvp;
348 return sv_2cv (sv, &st, &gvp, 0); 385 CV *cv = sv_2cv (sv, &st, &gvp, 0);
386
387 if (!cv)
388 croak ("code reference expected");
389
390 return cv;
349} 391}
392
393INLINE void
394coro_times_update ()
395{
396#ifdef coro_clock_gettime
397 struct timespec ts;
398
399 ts.tv_sec = ts.tv_nsec = 0;
400 coro_clock_gettime (CORO_CLOCK_THREAD_CPUTIME_ID, &ts);
401 time_cpu [0] = ts.tv_sec; time_cpu [1] = ts.tv_nsec;
402
403 ts.tv_sec = ts.tv_nsec = 0;
404 coro_clock_gettime (CORO_CLOCK_MONOTONIC, &ts);
405 time_real [0] = ts.tv_sec; time_real [1] = ts.tv_nsec;
406#else
407 UV tv[2];
408
409 u2time (aTHX_ &tv);
410 time_real [0] = tv [0];
411 time_real [1] = tv [1] * 1000;
412#endif
413}
414
415INLINE void
416coro_times_add (struct coro *c)
417{
418 c->t_real [1] += time_real [1];
419 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
420 c->t_real [0] += time_real [0];
421
422 c->t_cpu [1] += time_cpu [1];
423 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
424 c->t_cpu [0] += time_cpu [0];
425}
426
427INLINE void
428coro_times_sub (struct coro *c)
429{
430 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; }
431 c->t_real [1] -= time_real [1];
432 c->t_real [0] -= time_real [0];
433
434 if (c->t_cpu [1] < time_cpu [1]) { c->t_cpu [1] += 1000000000; --c->t_cpu [0]; }
435 c->t_cpu [1] -= time_cpu [1];
436 c->t_cpu [0] -= time_cpu [0];
437}
438
439/*****************************************************************************/
440/* magic glue */
441
442#define CORO_MAGIC_type_cv 26
443#define CORO_MAGIC_type_state PERL_MAGIC_ext
444
445#define CORO_MAGIC_NN(sv, type) \
446 (expect_true (SvMAGIC (sv)->mg_type == type) \
447 ? SvMAGIC (sv) \
448 : mg_find (sv, type))
449
450#define CORO_MAGIC(sv, type) \
451 (expect_true (SvMAGIC (sv)) \
452 ? CORO_MAGIC_NN (sv, type) \
453 : 0)
454
455#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
456#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
457
458INLINE struct coro *
459SvSTATE_ (pTHX_ SV *coro)
460{
461 HV *stash;
462 MAGIC *mg;
463
464 if (SvROK (coro))
465 coro = SvRV (coro);
466
467 if (expect_false (SvTYPE (coro) != SVt_PVHV))
468 croak ("Coro::State object required");
469
470 stash = SvSTASH (coro);
471 if (expect_false (stash != coro_stash && stash != coro_state_stash))
472 {
473 /* very slow, but rare, check */
474 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
475 croak ("Coro::State object required");
476 }
477
478 mg = CORO_MAGIC_state (coro);
479 return (struct coro *)mg->mg_ptr;
480}
481
482#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
483
484/* faster than SvSTATE, but expects a coroutine hv */
485#define SvSTATE_hv(hv) ((struct coro *)CORO_MAGIC_NN ((SV *)hv, CORO_MAGIC_type_state)->mg_ptr)
486#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
487
488/*****************************************************************************/
489/* padlist management and caching */
350 490
351static AV * 491static AV *
352coro_clone_padlist (pTHX_ CV *cv) 492coro_derive_padlist (pTHX_ CV *cv)
353{ 493{
354 AV *padlist = CvPADLIST (cv); 494 AV *padlist = CvPADLIST (cv);
355 AV *newpadlist, *newpad; 495 AV *newpadlist, *newpad;
356 496
357 newpadlist = newAV (); 497 newpadlist = newAV ();
362 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 502 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
363#endif 503#endif
364 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 504 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
365 --AvFILLp (padlist); 505 --AvFILLp (padlist);
366 506
367 av_store (newpadlist, 0, SvREFCNT_inc_NN (*av_fetch (padlist, 0, FALSE))); 507 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0]));
368 av_store (newpadlist, 1, (SV *)newpad); 508 av_store (newpadlist, 1, (SV *)newpad);
369 509
370 return newpadlist; 510 return newpadlist;
371} 511}
372 512
373static void 513static void
374free_padlist (pTHX_ AV *padlist) 514free_padlist (pTHX_ AV *padlist)
375{ 515{
376 /* may be during global destruction */ 516 /* may be during global destruction */
377 if (SvREFCNT (padlist)) 517 if (!IN_DESTRUCT)
378 { 518 {
379 I32 i = AvFILLp (padlist); 519 I32 i = AvFILLp (padlist);
380 while (i >= 0) 520
521 while (i > 0) /* special-case index 0 */
381 { 522 {
382 SV **svp = av_fetch (padlist, i--, FALSE); 523 /* we try to be extra-careful here */
383 if (svp) 524 AV *av = (AV *)AvARRAY (padlist)[i--];
384 { 525 I32 j = AvFILLp (av);
385 SV *sv; 526
386 while (&PL_sv_undef != (sv = av_pop ((AV *)*svp))) 527 while (j >= 0)
528 SvREFCNT_dec (AvARRAY (av)[j--]);
529
530 AvFILLp (av) = -1;
387 SvREFCNT_dec (sv); 531 SvREFCNT_dec (av);
388
389 SvREFCNT_dec (*svp);
390 }
391 } 532 }
392 533
534 SvREFCNT_dec (AvARRAY (padlist)[0]);
535
536 AvFILLp (padlist) = -1;
393 SvREFCNT_dec ((SV*)padlist); 537 SvREFCNT_dec ((SV*)padlist);
394 } 538 }
395} 539}
396 540
397static int 541static int
398coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 542coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
399{ 543{
400 AV *padlist; 544 AV *padlist;
401 AV *av = (AV *)mg->mg_obj; 545 AV *av = (AV *)mg->mg_obj;
546
547 /* perl manages to free our internal AV and _then_ call us */
548 if (IN_DESTRUCT)
549 return;
402 550
403 /* casting is fun. */ 551 /* casting is fun. */
404 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 552 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
405 free_padlist (aTHX_ padlist); 553 free_padlist (aTHX_ padlist);
406 554
407 SvREFCNT_dec (av); /* sv_magicext increased the refcount */ 555 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
408 556
409 return 0; 557 return 0;
410} 558}
411
412#define CORO_MAGIC_type_cv 26
413#define CORO_MAGIC_type_state PERL_MAGIC_ext
414 559
415static MGVTBL coro_cv_vtbl = { 560static MGVTBL coro_cv_vtbl = {
416 0, 0, 0, 0, 561 0, 0, 0, 0,
417 coro_cv_free 562 coro_cv_free
418}; 563};
419
420#define CORO_MAGIC_NN(sv, type) \
421 (expect_true (SvMAGIC (sv)->mg_type == type) \
422 ? SvMAGIC (sv) \
423 : mg_find (sv, type))
424
425#define CORO_MAGIC(sv, type) \
426 (expect_true (SvMAGIC (sv)) \
427 ? CORO_MAGIC_NN (sv, type) \
428 : 0)
429
430#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
431#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
432
433INLINE struct coro *
434SvSTATE_ (pTHX_ SV *coro)
435{
436 HV *stash;
437 MAGIC *mg;
438
439 if (SvROK (coro))
440 coro = SvRV (coro);
441
442 if (expect_false (SvTYPE (coro) != SVt_PVHV))
443 croak ("Coro::State object required");
444
445 stash = SvSTASH (coro);
446 if (expect_false (stash != coro_stash && stash != coro_state_stash))
447 {
448 /* very slow, but rare, check */
449 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
450 croak ("Coro::State object required");
451 }
452
453 mg = CORO_MAGIC_state (coro);
454 return (struct coro *)mg->mg_ptr;
455}
456
457#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
458
459/* faster than SvSTATE, but expects a coroutine hv */
460#define SvSTATE_hv(hv) ((struct coro *)CORO_MAGIC_NN ((SV *)hv, CORO_MAGIC_type_state)->mg_ptr)
461#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
462 564
463/* the next two functions merely cache the padlists */ 565/* the next two functions merely cache the padlists */
464static void 566static void
465get_padlist (pTHX_ CV *cv) 567get_padlist (pTHX_ CV *cv)
466{ 568{
477 CV *cp = Perl_cv_clone (aTHX_ cv); 579 CV *cp = Perl_cv_clone (aTHX_ cv);
478 CvPADLIST (cv) = CvPADLIST (cp); 580 CvPADLIST (cv) = CvPADLIST (cp);
479 CvPADLIST (cp) = 0; 581 CvPADLIST (cp) = 0;
480 SvREFCNT_dec (cp); 582 SvREFCNT_dec (cp);
481#else 583#else
482 CvPADLIST (cv) = coro_clone_padlist (aTHX_ cv); 584 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
483#endif 585#endif
484 } 586 }
485} 587}
486 588
487static void 589static void
494 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 596 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
495 597
496 av = (AV *)mg->mg_obj; 598 av = (AV *)mg->mg_obj;
497 599
498 if (expect_false (AvFILLp (av) >= AvMAX (av))) 600 if (expect_false (AvFILLp (av) >= AvMAX (av)))
499 av_extend (av, AvMAX (av) + 1); 601 av_extend (av, AvFILLp (av) + 1);
500 602
501 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 603 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
502} 604}
503 605
504/** load & save, init *******************************************************/ 606/** load & save, init *******************************************************/
607
608static void
609on_enterleave_call (pTHX_ SV *cb);
505 610
506static void 611static void
507load_perl (pTHX_ Coro__State c) 612load_perl (pTHX_ Coro__State c)
508{ 613{
509 perl_slots *slot = c->slot; 614 perl_slots *slot = c->slot;
510 c->slot = 0; 615 c->slot = 0;
511 616
512 PL_mainstack = c->mainstack; 617 PL_mainstack = c->mainstack;
513 618
514 GvSV (PL_defgv) = slot->defsv; 619 GvSV (PL_defgv) = slot->defsv;
515 GvAV (PL_defgv) = slot->defav; 620 GvAV (PL_defgv) = slot->defav;
516 GvSV (PL_errgv) = slot->errsv; 621 GvSV (PL_errgv) = slot->errsv;
517 GvSV (irsgv) = slot->irsgv; 622 GvSV (irsgv) = slot->irsgv;
623 GvHV (PL_hintgv) = slot->hinthv;
518 624
519 #define VAR(name,type) PL_ ## name = slot->name; 625 #define VAR(name,type) PL_ ## name = slot->name;
520 # include "state.h" 626 # include "state.h"
521 #undef VAR 627 #undef VAR
522 628
536 PUTBACK; 642 PUTBACK;
537 } 643 }
538 644
539 slf_frame = c->slf_frame; 645 slf_frame = c->slf_frame;
540 CORO_THROW = c->except; 646 CORO_THROW = c->except;
647
648 if (expect_false (enable_times))
649 {
650 if (expect_false (!times_valid))
651 coro_times_update ();
652
653 coro_times_sub (c);
654 }
655
656 if (expect_false (c->on_enter))
657 {
658 int i;
659
660 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
661 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
662 }
541} 663}
542 664
543static void 665static void
544save_perl (pTHX_ Coro__State c) 666save_perl (pTHX_ Coro__State c)
545{ 667{
668 if (expect_false (c->on_leave))
669 {
670 int i;
671
672 for (i = AvFILLp (c->on_leave); i >= 0; --i)
673 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
674 }
675
676 times_valid = 0;
677
678 if (expect_false (enable_times))
679 {
680 coro_times_update (); times_valid = 1;
681 coro_times_add (c);
682 }
683
546 c->except = CORO_THROW; 684 c->except = CORO_THROW;
547 c->slf_frame = slf_frame; 685 c->slf_frame = slf_frame;
548 686
549 { 687 {
550 dSP; 688 dSP;
563 { 701 {
564 while (expect_true (cxix >= 0)) 702 while (expect_true (cxix >= 0))
565 { 703 {
566 PERL_CONTEXT *cx = &ccstk[cxix--]; 704 PERL_CONTEXT *cx = &ccstk[cxix--];
567 705
568 if (expect_true (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT)) 706 if (expect_true (CxTYPE (cx) == CXt_SUB) || expect_false (CxTYPE (cx) == CXt_FORMAT))
569 { 707 {
570 CV *cv = cx->blk_sub.cv; 708 CV *cv = cx->blk_sub.cv;
571 709
572 if (expect_true (CvDEPTH (cv))) 710 if (expect_true (CvDEPTH (cv)))
573 { 711 {
608 c->mainstack = PL_mainstack; 746 c->mainstack = PL_mainstack;
609 747
610 { 748 {
611 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 749 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
612 750
613 slot->defav = GvAV (PL_defgv); 751 slot->defav = GvAV (PL_defgv);
614 slot->defsv = DEFSV; 752 slot->defsv = DEFSV;
615 slot->errsv = ERRSV; 753 slot->errsv = ERRSV;
616 slot->irsgv = GvSV (irsgv); 754 slot->irsgv = GvSV (irsgv);
755 slot->hinthv = GvHV (PL_hintgv);
617 756
618 #define VAR(name,type) slot->name = PL_ ## name; 757 #define VAR(name,type) slot->name = PL_ ## name;
619 # include "state.h" 758 # include "state.h"
620 #undef VAR 759 #undef VAR
621 } 760 }
748#endif 887#endif
749 888
750/* 889/*
751 * This overrides the default magic get method of %SIG elements. 890 * This overrides the default magic get method of %SIG elements.
752 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook 891 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
753 * and instead of tryign to save and restore the hash elements, we just provide 892 * and instead of trying to save and restore the hash elements, we just provide
754 * readback here. 893 * readback here.
755 * We only do this when the hook is != 0, as they are often set to 0 temporarily,
756 * not expecting this to actually change the hook. This is a potential problem
757 * when a schedule happens then, but we ignore this.
758 */ 894 */
759static int 895static int
760coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 896coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
761{ 897{
762 const char *s = MgPV_nolen_const (mg); 898 const char *s = MgPV_nolen_const (mg);
815 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 951 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
816 952
817 if (svp) 953 if (svp)
818 { 954 {
819 SV *old = *svp; 955 SV *old = *svp;
820 *svp = newSVsv (sv); 956 *svp = SvOK (sv) ? newSVsv (sv) : 0;
821 SvREFCNT_dec (old); 957 SvREFCNT_dec (old);
822 return 0; 958 return 0;
823 } 959 }
824 } 960 }
825 961
857 993
858 PL_runops = RUNOPS_DEFAULT; 994 PL_runops = RUNOPS_DEFAULT;
859 PL_curcop = &PL_compiling; 995 PL_curcop = &PL_compiling;
860 PL_in_eval = EVAL_NULL; 996 PL_in_eval = EVAL_NULL;
861 PL_comppad = 0; 997 PL_comppad = 0;
998 PL_comppad_name = 0;
999 PL_comppad_name_fill = 0;
1000 PL_comppad_name_floor = 0;
862 PL_curpm = 0; 1001 PL_curpm = 0;
863 PL_curpad = 0; 1002 PL_curpad = 0;
864 PL_localizing = 0; 1003 PL_localizing = 0;
865 PL_dirty = 0; 1004 PL_dirty = 0;
866 PL_restartop = 0; 1005 PL_restartop = 0;
867#if PERL_VERSION_ATLEAST (5,10,0) 1006#if PERL_VERSION_ATLEAST (5,10,0)
868 PL_parser = 0; 1007 PL_parser = 0;
869#endif 1008#endif
1009 PL_hints = 0;
870 1010
871 /* recreate the die/warn hooks */ 1011 /* recreate the die/warn hooks */
872 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1012 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook );
873 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1013 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook);
874 1014
875 GvSV (PL_defgv) = newSV (0); 1015 GvSV (PL_defgv) = newSV (0);
876 GvAV (PL_defgv) = coro->args; coro->args = 0; 1016 GvAV (PL_defgv) = coro->args; coro->args = 0;
877 GvSV (PL_errgv) = newSV (0); 1017 GvSV (PL_errgv) = newSV (0);
878 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1018 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
1019 GvHV (PL_hintgv) = 0;
879 PL_rs = newSVsv (GvSV (irsgv)); 1020 PL_rs = newSVsv (GvSV (irsgv));
880 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1021 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
881 1022
882 { 1023 {
883 dSP; 1024 dSP;
901 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1042 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
902 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */ 1043 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
903 1044
904 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1045 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */
905 coro_setup_op.op_next = PL_op; 1046 coro_setup_op.op_next = PL_op;
906 coro_setup_op.op_type = OP_CUSTOM; 1047 coro_setup_op.op_type = OP_ENTERSUB;
907 coro_setup_op.op_ppaddr = pp_slf; 1048 coro_setup_op.op_ppaddr = pp_slf;
908 /* no flags etc. required, as an init function won't be called */ 1049 /* no flags etc. required, as an init function won't be called */
909 1050
910 PL_op = (OP *)&coro_setup_op; 1051 PL_op = (OP *)&coro_setup_op;
911 1052
912 /* copy throw, in case it was set before coro_setup */ 1053 /* copy throw, in case it was set before coro_setup */
913 CORO_THROW = coro->except; 1054 CORO_THROW = coro->except;
914}
915 1055
1056 if (expect_false (enable_times))
1057 {
1058 coro_times_update ();
1059 coro_times_sub (coro);
1060 }
1061}
1062
916static void 1063static void
917coro_destruct (pTHX_ struct coro *coro) 1064coro_unwind_stacks (pTHX)
918{ 1065{
919 if (!IN_DESTRUCT) 1066 if (!IN_DESTRUCT)
920 { 1067 {
921 /* restore all saved variables and stuff */ 1068 /* restore all saved variables and stuff */
922 LEAVE_SCOPE (0); 1069 LEAVE_SCOPE (0);
930 POPSTACK_TO (PL_mainstack); 1077 POPSTACK_TO (PL_mainstack);
931 1078
932 /* unwind main stack */ 1079 /* unwind main stack */
933 dounwind (-1); 1080 dounwind (-1);
934 } 1081 }
1082}
935 1083
936 SvREFCNT_dec (GvSV (PL_defgv)); 1084static void
937 SvREFCNT_dec (GvAV (PL_defgv)); 1085coro_destruct_perl (pTHX_ struct coro *coro)
938 SvREFCNT_dec (GvSV (PL_errgv)); 1086{
939 SvREFCNT_dec (PL_defoutgv); 1087 SV *svf [9];
940 SvREFCNT_dec (PL_rs);
941 SvREFCNT_dec (GvSV (irsgv));
942 1088
943 SvREFCNT_dec (PL_diehook);
944 SvREFCNT_dec (PL_warnhook);
945 1089 {
1090 struct coro *current = SvSTATE_current;
1091
1092 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1093
1094 save_perl (aTHX_ current);
1095 load_perl (aTHX_ coro);
1096
1097 coro_unwind_stacks (aTHX);
1098 coro_destruct_stacks (aTHX);
1099
1100 // now save some sv's to be free'd later
1101 svf [0] = GvSV (PL_defgv);
1102 svf [1] = (SV *)GvAV (PL_defgv);
1103 svf [2] = GvSV (PL_errgv);
1104 svf [3] = (SV *)PL_defoutgv;
1105 svf [4] = PL_rs;
1106 svf [5] = GvSV (irsgv);
1107 svf [6] = (SV *)GvHV (PL_hintgv);
1108 svf [7] = PL_diehook;
1109 svf [8] = PL_warnhook;
1110 assert (9 == sizeof (svf) / sizeof (*svf));
1111
1112 load_perl (aTHX_ current);
1113 }
1114
1115 {
1116 int i;
1117
1118 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i)
1119 SvREFCNT_dec (svf [i]);
1120
946 SvREFCNT_dec (coro->saved_deffh); 1121 SvREFCNT_dec (coro->saved_deffh);
947 SvREFCNT_dec (coro->rouse_cb); 1122 SvREFCNT_dec (coro->rouse_cb);
948 SvREFCNT_dec (coro->invoke_cb); 1123 SvREFCNT_dec (coro->invoke_cb);
949 SvREFCNT_dec (coro->invoke_av); 1124 SvREFCNT_dec (coro->invoke_av);
950 1125 }
951 coro_destruct_stacks (aTHX);
952} 1126}
953 1127
954INLINE void 1128INLINE void
955free_coro_mortal (pTHX) 1129free_coro_mortal (pTHX)
956{ 1130{
964static int 1138static int
965runops_trace (pTHX) 1139runops_trace (pTHX)
966{ 1140{
967 COP *oldcop = 0; 1141 COP *oldcop = 0;
968 int oldcxix = -2; 1142 int oldcxix = -2;
969 struct coro *coro = SvSTATE_current; /* trace cctx is tied to specific coro */
970 coro_cctx *cctx = coro->cctx;
971 1143
972 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX))) 1144 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX)))
973 { 1145 {
974 PERL_ASYNC_CHECK (); 1146 PERL_ASYNC_CHECK ();
975 1147
976 if (cctx->flags & CC_TRACE_ALL) 1148 if (cctx_current->flags & CC_TRACE_ALL)
977 { 1149 {
978 if (PL_op->op_type == OP_LEAVESUB && cctx->flags & CC_TRACE_SUB) 1150 if (PL_op->op_type == OP_LEAVESUB && cctx_current->flags & CC_TRACE_SUB)
979 { 1151 {
980 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1152 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
981 SV **bot, **top; 1153 SV **bot, **top;
982 AV *av = newAV (); /* return values */ 1154 AV *av = newAV (); /* return values */
983 SV **cb; 1155 SV **cb;
1020 1192
1021 if (PL_curcop != &PL_compiling) 1193 if (PL_curcop != &PL_compiling)
1022 { 1194 {
1023 SV **cb; 1195 SV **cb;
1024 1196
1025 if (oldcxix != cxstack_ix && cctx->flags & CC_TRACE_SUB) 1197 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB)
1026 { 1198 {
1027 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1199 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1028 1200
1029 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1201 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1030 { 1202 {
1053 } 1225 }
1054 1226
1055 oldcxix = cxstack_ix; 1227 oldcxix = cxstack_ix;
1056 } 1228 }
1057 1229
1058 if (cctx->flags & CC_TRACE_LINE) 1230 if (cctx_current->flags & CC_TRACE_LINE)
1059 { 1231 {
1060 dSP; 1232 dSP;
1061 1233
1062 PL_runops = RUNOPS_DEFAULT; 1234 PL_runops = RUNOPS_DEFAULT;
1063 ENTER; 1235 ENTER;
1082 1254
1083 TAINT_NOT; 1255 TAINT_NOT;
1084 return 0; 1256 return 0;
1085} 1257}
1086 1258
1087static struct coro_cctx *cctx_ssl_cctx;
1088static struct CoroSLF cctx_ssl_frame; 1259static struct CoroSLF cctx_ssl_frame;
1089 1260
1090static void 1261static void
1091slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta) 1262slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta)
1092{ 1263{
1093 ta->prev = (struct coro *)cctx_ssl_cctx;
1094 ta->next = 0; 1264 ta->prev = 0;
1095} 1265}
1096 1266
1097static int 1267static int
1098slf_check_set_stacklevel (pTHX_ struct CoroSLF *frame) 1268slf_check_set_stacklevel (pTHX_ struct CoroSLF *frame)
1099{ 1269{
1102 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1272 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1103} 1273}
1104 1274
1105/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1275/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1106static void NOINLINE 1276static void NOINLINE
1107cctx_prepare (pTHX_ coro_cctx *cctx) 1277cctx_prepare (pTHX)
1108{ 1278{
1109 PL_top_env = &PL_start_env; 1279 PL_top_env = &PL_start_env;
1110 1280
1111 if (cctx->flags & CC_TRACE) 1281 if (cctx_current->flags & CC_TRACE)
1112 PL_runops = runops_trace; 1282 PL_runops = runops_trace;
1113 1283
1114 /* we already must be executing an SLF op, there is no other valid way 1284 /* we already must be executing an SLF op, there is no other valid way
1115 * that can lead to creation of a new cctx */ 1285 * that can lead to creation of a new cctx */
1116 assert (("FATAL: can't prepare slf-less cctx in Coro module (please report)", 1286 assert (("FATAL: can't prepare slf-less cctx in Coro module (please report)",
1117 slf_frame.prepare && PL_op->op_ppaddr == pp_slf)); 1287 slf_frame.prepare && PL_op->op_ppaddr == pp_slf));
1118 1288
1119 /* we must emulate leaving pp_slf, which is done inside slf_check_set_stacklevel */ 1289 /* we must emulate leaving pp_slf, which is done inside slf_check_set_stacklevel */
1120 cctx_ssl_cctx = cctx;
1121 cctx_ssl_frame = slf_frame; 1290 cctx_ssl_frame = slf_frame;
1122 1291
1123 slf_frame.prepare = slf_prepare_set_stacklevel; 1292 slf_frame.prepare = slf_prepare_set_stacklevel;
1124 slf_frame.check = slf_check_set_stacklevel; 1293 slf_frame.check = slf_check_set_stacklevel;
1125} 1294}
1148 /* normally we would need to skip the entersub here */ 1317 /* normally we would need to skip the entersub here */
1149 /* not doing so will re-execute it, which is exactly what we want */ 1318 /* not doing so will re-execute it, which is exactly what we want */
1150 /* PL_nop = PL_nop->op_next */ 1319 /* PL_nop = PL_nop->op_next */
1151 1320
1152 /* inject a fake subroutine call to cctx_init */ 1321 /* inject a fake subroutine call to cctx_init */
1153 cctx_prepare (aTHX_ (coro_cctx *)arg); 1322 cctx_prepare (aTHX);
1154 1323
1155 /* cctx_run is the alternative tail of transfer() */ 1324 /* cctx_run is the alternative tail of transfer() */
1156 transfer_tail (aTHX); 1325 transfer_tail (aTHX);
1157 1326
1158 /* somebody or something will hit me for both perl_run and PL_restartop */ 1327 /* somebody or something will hit me for both perl_run and PL_restartop */
1166 /* 1335 /*
1167 * If perl-run returns we assume exit() was being called or the coro 1336 * If perl-run returns we assume exit() was being called or the coro
1168 * fell off the end, which seems to be the only valid (non-bug) 1337 * fell off the end, which seems to be the only valid (non-bug)
1169 * reason for perl_run to return. We try to exit by jumping to the 1338 * reason for perl_run to return. We try to exit by jumping to the
1170 * bootstrap-time "top" top_env, as we cannot restore the "main" 1339 * bootstrap-time "top" top_env, as we cannot restore the "main"
1171 * coroutine as Coro has no such concept 1340 * coroutine as Coro has no such concept.
1341 * This actually isn't valid with the pthread backend, but OSes requiring
1342 * that backend are too broken to do it in a standards-compliant way.
1172 */ 1343 */
1173 PL_top_env = main_top_env; 1344 PL_top_env = main_top_env;
1174 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */ 1345 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1175 } 1346 }
1176} 1347}
1253cctx_destroy (coro_cctx *cctx) 1424cctx_destroy (coro_cctx *cctx)
1254{ 1425{
1255 if (!cctx) 1426 if (!cctx)
1256 return; 1427 return;
1257 1428
1429 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary?
1430
1258 --cctx_count; 1431 --cctx_count;
1259 coro_destroy (&cctx->cctx); 1432 coro_destroy (&cctx->cctx);
1260 1433
1261 /* coro_transfer creates new, empty cctx's */ 1434 /* coro_transfer creates new, empty cctx's */
1262 if (cctx->sptr) 1435 if (cctx->sptr)
1325 /* TODO: throwing up here is considered harmful */ 1498 /* TODO: throwing up here is considered harmful */
1326 1499
1327 if (expect_true (prev != next)) 1500 if (expect_true (prev != next))
1328 { 1501 {
1329 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1502 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1330 croak ("Coro::State::transfer called with non-running/new prev Coro::State, but can only transfer from running or new states,"); 1503 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1331 1504
1332 if (expect_false (next->flags & CF_RUNNING))
1333 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states,");
1334
1335 if (expect_false (next->flags & CF_DESTROYED)) 1505 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED)))
1336 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states,"); 1506 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1337 1507
1338#if !PERL_VERSION_ATLEAST (5,10,0) 1508#if !PERL_VERSION_ATLEAST (5,10,0)
1339 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1509 if (expect_false (PL_lex_state != LEX_NOTPARSING))
1340 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,"); 1510 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1341#endif 1511#endif
1347transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1517transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1348{ 1518{
1349 dSTACKLEVEL; 1519 dSTACKLEVEL;
1350 1520
1351 /* sometimes transfer is only called to set idle_sp */ 1521 /* sometimes transfer is only called to set idle_sp */
1352 if (expect_false (!next)) 1522 if (expect_false (!prev))
1353 { 1523 {
1354 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1524 cctx_current->idle_sp = STACKLEVEL;
1355 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1525 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1356 } 1526 }
1357 else if (expect_true (prev != next)) 1527 else if (expect_true (prev != next))
1358 { 1528 {
1359 coro_cctx *prev__cctx; 1529 coro_cctx *cctx_prev;
1360 1530
1361 if (expect_false (prev->flags & CF_NEW)) 1531 if (expect_false (prev->flags & CF_NEW))
1362 { 1532 {
1363 /* create a new empty/source context */ 1533 /* create a new empty/source context */
1364 prev->cctx = cctx_new_empty ();
1365 prev->flags &= ~CF_NEW; 1534 prev->flags &= ~CF_NEW;
1366 prev->flags |= CF_RUNNING; 1535 prev->flags |= CF_RUNNING;
1367 } 1536 }
1368 1537
1369 prev->flags &= ~CF_RUNNING; 1538 prev->flags &= ~CF_RUNNING;
1380 coro_setup (aTHX_ next); 1549 coro_setup (aTHX_ next);
1381 } 1550 }
1382 else 1551 else
1383 load_perl (aTHX_ next); 1552 load_perl (aTHX_ next);
1384 1553
1385 prev__cctx = prev->cctx;
1386
1387 /* possibly untie and reuse the cctx */ 1554 /* possibly untie and reuse the cctx */
1388 if (expect_true ( 1555 if (expect_true (
1389 prev__cctx->idle_sp == STACKLEVEL 1556 cctx_current->idle_sp == STACKLEVEL
1390 && !(prev__cctx->flags & CC_TRACE) 1557 && !(cctx_current->flags & CC_TRACE)
1391 && !force_cctx 1558 && !force_cctx
1392 )) 1559 ))
1393 { 1560 {
1394 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1561 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */
1395 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == prev__cctx->idle_te)); 1562 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1396 1563
1397 prev->cctx = 0;
1398
1399 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */ 1564 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */
1400 /* without this the next cctx_get might destroy the prev__cctx while still in use */ 1565 /* without this the next cctx_get might destroy the running cctx while still in use */
1401 if (expect_false (CCTX_EXPIRED (prev__cctx))) 1566 if (expect_false (CCTX_EXPIRED (cctx_current)))
1402 if (!next->cctx) 1567 if (expect_true (!next->cctx))
1403 next->cctx = cctx_get (aTHX); 1568 next->cctx = cctx_get (aTHX);
1404 1569
1405 cctx_put (prev__cctx); 1570 cctx_put (cctx_current);
1406 } 1571 }
1572 else
1573 prev->cctx = cctx_current;
1407 1574
1408 ++next->usecount; 1575 ++next->usecount;
1409 1576
1410 if (expect_true (!next->cctx)) 1577 cctx_prev = cctx_current;
1411 next->cctx = cctx_get (aTHX); 1578 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1412 1579
1413 if (expect_false (prev__cctx != next->cctx)) 1580 next->cctx = 0;
1581
1582 if (expect_false (cctx_prev != cctx_current))
1414 { 1583 {
1415 prev__cctx->top_env = PL_top_env; 1584 cctx_prev->top_env = PL_top_env;
1416 PL_top_env = next->cctx->top_env; 1585 PL_top_env = cctx_current->top_env;
1417 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1586 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1418 } 1587 }
1419 1588
1420 transfer_tail (aTHX); 1589 transfer_tail (aTHX);
1421 } 1590 }
1422} 1591}
1430coro_state_destroy (pTHX_ struct coro *coro) 1599coro_state_destroy (pTHX_ struct coro *coro)
1431{ 1600{
1432 if (coro->flags & CF_DESTROYED) 1601 if (coro->flags & CF_DESTROYED)
1433 return 0; 1602 return 0;
1434 1603
1435 if (coro->on_destroy) 1604 if (coro->on_destroy && !PL_dirty)
1436 coro->on_destroy (aTHX_ coro); 1605 coro->on_destroy (aTHX_ coro);
1437 1606
1438 coro->flags |= CF_DESTROYED; 1607 coro->flags |= CF_DESTROYED;
1439 1608
1440 if (coro->flags & CF_READY) 1609 if (coro->flags & CF_READY)
1444 --coro_nready; 1613 --coro_nready;
1445 } 1614 }
1446 else 1615 else
1447 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1616 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1448 1617
1449 if (coro->mainstack && coro->mainstack != main_mainstack) 1618 if (coro->mainstack
1450 { 1619 && coro->mainstack != main_mainstack
1451 struct coro temp; 1620 && coro->slot
1452 1621 && !PL_dirty)
1453 assert (("FATAL: tried to destroy currently running coroutine (please report)", !(coro->flags & CF_RUNNING)));
1454
1455 save_perl (aTHX_ &temp);
1456 load_perl (aTHX_ coro);
1457
1458 coro_destruct (aTHX_ coro); 1622 coro_destruct_perl (aTHX_ coro);
1459
1460 load_perl (aTHX_ &temp);
1461
1462 coro->slot = 0;
1463 }
1464 1623
1465 cctx_destroy (coro->cctx); 1624 cctx_destroy (coro->cctx);
1466 SvREFCNT_dec (coro->startcv); 1625 SvREFCNT_dec (coro->startcv);
1467 SvREFCNT_dec (coro->args); 1626 SvREFCNT_dec (coro->args);
1468 SvREFCNT_dec (CORO_THROW); 1627 SvREFCNT_dec (CORO_THROW);
1555/** Coro ********************************************************************/ 1714/** Coro ********************************************************************/
1556 1715
1557INLINE void 1716INLINE void
1558coro_enq (pTHX_ struct coro *coro) 1717coro_enq (pTHX_ struct coro *coro)
1559{ 1718{
1560 av_push (coro_ready [coro->prio - PRIO_MIN], SvREFCNT_inc_NN (coro->hv)); 1719 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1561}
1562 1720
1563INLINE SV * 1721 SvREFCNT_inc_NN (coro->hv);
1722
1723 coro->next_ready = 0;
1724 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1725 ready [1] = coro;
1726}
1727
1728INLINE struct coro *
1564coro_deq (pTHX) 1729coro_deq (pTHX)
1565{ 1730{
1566 int prio; 1731 int prio;
1567 1732
1568 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; ) 1733 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
1569 if (AvFILLp (coro_ready [prio]) >= 0) 1734 {
1570 return av_shift (coro_ready [prio]); 1735 struct coro **ready = coro_ready [prio];
1736
1737 if (ready [0])
1738 {
1739 struct coro *coro = ready [0];
1740 ready [0] = coro->next_ready;
1741 return coro;
1742 }
1743 }
1571 1744
1572 return 0; 1745 return 0;
1573} 1746}
1574 1747
1575static int 1748static int
1577{ 1750{
1578 struct coro *coro; 1751 struct coro *coro;
1579 SV *sv_hook; 1752 SV *sv_hook;
1580 void (*xs_hook)(void); 1753 void (*xs_hook)(void);
1581 1754
1582 if (SvROK (coro_sv))
1583 coro_sv = SvRV (coro_sv);
1584
1585 coro = SvSTATE (coro_sv); 1755 coro = SvSTATE (coro_sv);
1586 1756
1587 if (coro->flags & CF_READY) 1757 if (coro->flags & CF_READY)
1588 return 0; 1758 return 0;
1589 1759
1642static void 1812static void
1643prepare_schedule (pTHX_ struct coro_transfer_args *ta) 1813prepare_schedule (pTHX_ struct coro_transfer_args *ta)
1644{ 1814{
1645 for (;;) 1815 for (;;)
1646 { 1816 {
1647 SV *next_sv = coro_deq (aTHX); 1817 struct coro *next = coro_deq (aTHX);
1648 1818
1649 if (expect_true (next_sv)) 1819 if (expect_true (next))
1650 { 1820 {
1651 struct coro *next = SvSTATE_hv (next_sv);
1652
1653 /* cannot transfer to destroyed coros, skip and look for next */ 1821 /* cannot transfer to destroyed coros, skip and look for next */
1654 if (expect_false (next->flags & CF_DESTROYED)) 1822 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED)))
1655 SvREFCNT_dec (next_sv); /* coro_nready has already been taken care of by destroy */ 1823 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1656 else 1824 else
1657 { 1825 {
1658 next->flags &= ~CF_READY; 1826 next->flags &= ~CF_READY;
1659 --coro_nready; 1827 --coro_nready;
1660 1828
1663 } 1831 }
1664 } 1832 }
1665 else 1833 else
1666 { 1834 {
1667 /* nothing to schedule: call the idle handler */ 1835 /* nothing to schedule: call the idle handler */
1836 if (SvROK (sv_idle)
1837 && SvOBJECT (SvRV (sv_idle)))
1838 {
1839 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1840 api_ready (aTHX_ SvRV (sv_idle));
1841 --coro_nready;
1842 }
1843 else
1844 {
1668 dSP; 1845 dSP;
1669 1846
1670 ENTER; 1847 ENTER;
1671 SAVETMPS; 1848 SAVETMPS;
1672 1849
1673 PUSHMARK (SP); 1850 PUSHMARK (SP);
1674 PUTBACK; 1851 PUTBACK;
1675 call_sv (get_sv ("Coro::idle", FALSE), G_VOID | G_DISCARD); 1852 call_sv (sv_idle, G_VOID | G_DISCARD);
1676 1853
1677 FREETMPS; 1854 FREETMPS;
1678 LEAVE; 1855 LEAVE;
1856 }
1679 } 1857 }
1680 } 1858 }
1681} 1859}
1682 1860
1683INLINE void 1861INLINE void
1754static void 1932static void
1755api_trace (pTHX_ SV *coro_sv, int flags) 1933api_trace (pTHX_ SV *coro_sv, int flags)
1756{ 1934{
1757 struct coro *coro = SvSTATE (coro_sv); 1935 struct coro *coro = SvSTATE (coro_sv);
1758 1936
1937 if (coro->flags & CF_RUNNING)
1938 croak ("cannot enable tracing on a running coroutine, caught");
1939
1759 if (flags & CC_TRACE) 1940 if (flags & CC_TRACE)
1760 { 1941 {
1761 if (!coro->cctx) 1942 if (!coro->cctx)
1762 coro->cctx = cctx_new_run (); 1943 coro->cctx = cctx_new_run ();
1763 else if (!(coro->cctx->flags & CC_TRACE)) 1944 else if (!(coro->cctx->flags & CC_TRACE))
1764 croak ("cannot enable tracing on coroutine with custom stack,"); 1945 croak ("cannot enable tracing on coroutine with custom stack, caught");
1765 1946
1766 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL)); 1947 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL));
1767 } 1948 }
1768 else if (coro->cctx && coro->cctx->flags & CC_TRACE) 1949 else if (coro->cctx && coro->cctx->flags & CC_TRACE)
1769 { 1950 {
1825 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */ 2006 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */
1826 api_ready (aTHX_ sv_manager); 2007 api_ready (aTHX_ sv_manager);
1827 2008
1828 frame->prepare = prepare_schedule; 2009 frame->prepare = prepare_schedule;
1829 frame->check = slf_check_repeat; 2010 frame->check = slf_check_repeat;
2011
2012 /* as a minor optimisation, we could unwind all stacks here */
2013 /* but that puts extra pressure on pp_slf, and is not worth much */
2014 /*coro_unwind_stacks (aTHX);*/
1830} 2015}
1831 2016
1832/*****************************************************************************/ 2017/*****************************************************************************/
1833/* async pool handler */ 2018/* async pool handler */
1834 2019
1917 SV *data = (SV *)GENSUB_ARG; 2102 SV *data = (SV *)GENSUB_ARG;
1918 2103
1919 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2104 if (SvTYPE (SvRV (data)) != SVt_PVAV)
1920 { 2105 {
1921 /* first call, set args */ 2106 /* first call, set args */
2107 SV *coro = SvRV (data);
1922 AV *av = newAV (); 2108 AV *av = newAV ();
1923 SV *coro = SvRV (data);
1924 2109
1925 SvRV_set (data, (SV *)av); 2110 SvRV_set (data, (SV *)av);
1926 api_ready (aTHX_ coro);
1927 SvREFCNT_dec (coro);
1928 2111
1929 /* better take a full copy of the arguments */ 2112 /* better take a full copy of the arguments */
1930 while (items--) 2113 while (items--)
1931 av_store (av, items, newSVsv (ST (items))); 2114 av_store (av, items, newSVsv (ST (items)));
2115
2116 api_ready (aTHX_ coro);
2117 SvREFCNT_dec (coro);
1932 } 2118 }
1933 2119
1934 XSRETURN_EMPTY; 2120 XSRETURN_EMPTY;
1935} 2121}
1936 2122
1953 2139
1954 EXTEND (SP, AvFILLp (av) + 1); 2140 EXTEND (SP, AvFILLp (av) + 1);
1955 for (i = 0; i <= AvFILLp (av); ++i) 2141 for (i = 0; i <= AvFILLp (av); ++i)
1956 PUSHs (sv_2mortal (AvARRAY (av)[i])); 2142 PUSHs (sv_2mortal (AvARRAY (av)[i]));
1957 2143
1958 /* we have stolen the elements, so ste length to zero and free */ 2144 /* we have stolen the elements, so set length to zero and free */
1959 AvFILLp (av) = -1; 2145 AvFILLp (av) = -1;
1960 av_undef (av); 2146 av_undef (av);
1961 2147
1962 PUTBACK; 2148 PUTBACK;
1963 } 2149 }
2250 } 2436 }
2251 else 2437 else
2252 slf_argc = 0; 2438 slf_argc = 0;
2253 2439
2254 PL_op->op_ppaddr = pp_slf; 2440 PL_op->op_ppaddr = pp_slf;
2255 PL_op->op_type = OP_CUSTOM; /* maybe we should leave it at entersub? */ 2441 /*PL_op->op_type = OP_CUSTOM; /* we do behave like entersub still */
2256 2442
2257 PL_op = (OP *)&slf_restore; 2443 PL_op = (OP *)&slf_restore;
2444}
2445
2446/*****************************************************************************/
2447/* dynamic wind */
2448
2449static void
2450on_enterleave_call (pTHX_ SV *cb)
2451{
2452 dSP;
2453
2454 PUSHSTACK;
2455
2456 PUSHMARK (SP);
2457 PUTBACK;
2458 call_sv (cb, G_VOID | G_DISCARD);
2459 SPAGAIN;
2460
2461 POPSTACK;
2462}
2463
2464static SV *
2465coro_avp_pop_and_free (pTHX_ AV **avp)
2466{
2467 AV *av = *avp;
2468 SV *res = av_pop (av);
2469
2470 if (AvFILLp (av) < 0)
2471 {
2472 *avp = 0;
2473 SvREFCNT_dec (av);
2474 }
2475
2476 return res;
2477}
2478
2479static void
2480coro_pop_on_enter (pTHX_ void *coro)
2481{
2482 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_enter);
2483 SvREFCNT_dec (cb);
2484}
2485
2486static void
2487coro_pop_on_leave (pTHX_ void *coro)
2488{
2489 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2490 on_enterleave_call (aTHX_ sv_2mortal (cb));
2258} 2491}
2259 2492
2260/*****************************************************************************/ 2493/*****************************************************************************/
2261/* PerlIO::cede */ 2494/* PerlIO::cede */
2262 2495
2336/* Coro::Semaphore & Coro::Signal */ 2569/* Coro::Semaphore & Coro::Signal */
2337 2570
2338static SV * 2571static SV *
2339coro_waitarray_new (pTHX_ int count) 2572coro_waitarray_new (pTHX_ int count)
2340{ 2573{
2341 /* a semaphore contains a counter IV in $sem->[0] and any waiters after that */ 2574 /* a waitarray=semaphore contains a counter IV in $sem->[0] and any waiters after that */
2342 AV *av = newAV (); 2575 AV *av = newAV ();
2343 SV **ary; 2576 SV **ary;
2344 2577
2345 /* unfortunately, building manually saves memory */ 2578 /* unfortunately, building manually saves memory */
2346 Newx (ary, 2, SV *); 2579 Newx (ary, 2, SV *);
2347 AvALLOC (av) = ary; 2580 AvALLOC (av) = ary;
2581#if PERL_VERSION_ATLEAST (5,10,0)
2348 /*AvARRAY (av) = ary;*/ 2582 AvARRAY (av) = ary;
2583#else
2349 SvPVX ((SV *)av) = (char *)ary; /* 5.8.8 needs this syntax instead of AvARRAY = ary */ 2584 /* 5.8.8 needs this syntax instead of AvARRAY = ary, yet */
2585 /* -DDEBUGGING flags this as a bug, despite it perfectly working */
2586 SvPVX ((SV *)av) = (char *)ary;
2587#endif
2350 AvMAX (av) = 1; 2588 AvMAX (av) = 1;
2351 AvFILLp (av) = 0; 2589 AvFILLp (av) = 0;
2352 ary [0] = newSViv (count); 2590 ary [0] = newSViv (count);
2353 2591
2354 return newRV_noinc ((SV *)av); 2592 return newRV_noinc ((SV *)av);
2485 { 2723 {
2486 /* callback form */ 2724 /* callback form */
2487 AV *av = (AV *)SvRV (arg [0]); 2725 AV *av = (AV *)SvRV (arg [0]);
2488 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 2726 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]);
2489 2727
2490 av_push (av, (SV *)SvREFCNT_inc_NN (cb_cv)); 2728 av_push (av, SvREFCNT_inc_NN (cb_cv));
2491 2729
2492 if (SvIVX (AvARRAY (av)[0]) > 0) 2730 if (SvIVX (AvARRAY (av)[0]) > 0)
2493 coro_semaphore_adjust (aTHX_ av, 0); 2731 coro_semaphore_adjust (aTHX_ av, 0);
2494 2732
2495 frame->prepare = prepare_nop; 2733 frame->prepare = prepare_nop;
2519 AvARRAY (av)[0] = AvARRAY (av)[1]; 2757 AvARRAY (av)[0] = AvARRAY (av)[1];
2520 AvARRAY (av)[1] = cb; 2758 AvARRAY (av)[1] = cb;
2521 2759
2522 cb = av_shift (av); 2760 cb = av_shift (av);
2523 2761
2762 if (SvTYPE (cb) == SVt_PVCV)
2763 {
2764 dSP;
2765 PUSHMARK (SP);
2766 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2767 PUTBACK;
2768 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2769 }
2770 else
2771 {
2524 api_ready (aTHX_ cb); 2772 api_ready (aTHX_ cb);
2525 sv_setiv (cb, 0); /* signal waiter */ 2773 sv_setiv (cb, 0); /* signal waiter */
2774 }
2775
2526 SvREFCNT_dec (cb); 2776 SvREFCNT_dec (cb);
2527 2777
2528 --count; 2778 --count;
2529 } 2779 }
2530} 2780}
2539static void 2789static void
2540slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2790slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2541{ 2791{
2542 AV *av = (AV *)SvRV (arg [0]); 2792 AV *av = (AV *)SvRV (arg [0]);
2543 2793
2794 if (items >= 2)
2795 {
2796 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]);
2797 av_push (av, SvREFCNT_inc_NN (cb_cv));
2798
2544 if (SvIVX (AvARRAY (av)[0])) 2799 if (SvIVX (AvARRAY (av)[0]))
2800 coro_signal_wake (aTHX_ av, 1); /* ust be the only waiter */
2801
2802 frame->prepare = prepare_nop;
2803 frame->check = slf_check_nop;
2804 }
2805 else if (SvIVX (AvARRAY (av)[0]))
2545 { 2806 {
2546 SvIVX (AvARRAY (av)[0]) = 0; 2807 SvIVX (AvARRAY (av)[0]) = 0;
2547 frame->prepare = prepare_nop; 2808 frame->prepare = prepare_nop;
2548 frame->check = slf_check_nop; 2809 frame->check = slf_check_nop;
2549 } 2810 }
2550 else 2811 else
2551 { 2812 {
2552 SV *waiter = newRV_inc (SvRV (coro_current)); /* owned by signal av */ 2813 SV *waiter = newSVsv (coro_current); /* owned by signal av */
2553 2814
2554 av_push (av, waiter); 2815 av_push (av, waiter);
2555 2816
2556 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */ 2817 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */
2557 frame->prepare = prepare_schedule; 2818 frame->prepare = prepare_schedule;
2724 XSRETURN_EMPTY; 2985 XSRETURN_EMPTY;
2725} 2986}
2726 2987
2727/*****************************************************************************/ 2988/*****************************************************************************/
2728 2989
2990#if CORO_CLONE
2991# include "clone.c"
2992#endif
2993
2729MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 2994MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2730 2995
2731PROTOTYPES: DISABLE 2996PROTOTYPES: DISABLE
2732 2997
2733BOOT: 2998BOOT:
2736# if CORO_PTHREAD 3001# if CORO_PTHREAD
2737 coro_thx = PERL_GET_CONTEXT; 3002 coro_thx = PERL_GET_CONTEXT;
2738# endif 3003# endif
2739#endif 3004#endif
2740 BOOT_PAGESIZE; 3005 BOOT_PAGESIZE;
3006
3007 cctx_current = cctx_new_empty ();
2741 3008
2742 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3009 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
2743 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3010 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
2744 3011
2745 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 3012 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get;
2790 3057
2791 if (!svp) croak ("Time::HiRes is required"); 3058 if (!svp) croak ("Time::HiRes is required");
2792 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer"); 3059 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
2793 3060
2794 nvtime = INT2PTR (double (*)(), SvIV (*svp)); 3061 nvtime = INT2PTR (double (*)(), SvIV (*svp));
3062
3063 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
3064 u2time = INT2PTR (double (*)(), SvIV (*svp));
2795 } 3065 }
2796 3066
2797 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 3067 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
2798} 3068}
2799 3069
2800SV * 3070SV *
2801new (char *klass, ...) 3071new (char *klass, ...)
2802 ALIAS: 3072 ALIAS:
2871void 3141void
2872_exit (int code) 3142_exit (int code)
2873 PROTOTYPE: $ 3143 PROTOTYPE: $
2874 CODE: 3144 CODE:
2875 _exit (code); 3145 _exit (code);
3146
3147SV *
3148clone (Coro::State coro)
3149 CODE:
3150{
3151#if CORO_CLONE
3152 struct coro *ncoro = coro_clone (aTHX_ coro);
3153 MAGIC *mg;
3154 /* TODO: too much duplication */
3155 ncoro->hv = newHV ();
3156 mg = sv_magicext ((SV *)ncoro->hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)ncoro, 0);
3157 mg->mg_flags |= MGf_DUP;
3158 RETVAL = sv_bless (newRV_noinc ((SV *)ncoro->hv), SvSTASH (coro->hv));
3159#else
3160 croak ("Coro::State->clone has not been configured into this installation of Coro, realised");
3161#endif
3162}
3163 OUTPUT:
3164 RETVAL
2876 3165
2877int 3166int
2878cctx_stacksize (int new_stacksize = 0) 3167cctx_stacksize (int new_stacksize = 0)
2879 PROTOTYPE: ;$ 3168 PROTOTYPE: ;$
2880 CODE: 3169 CODE:
2930 eval = 1 3219 eval = 1
2931 CODE: 3220 CODE:
2932{ 3221{
2933 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3222 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
2934 { 3223 {
2935 struct coro temp; 3224 struct coro *current = SvSTATE_current;
2936 3225
2937 if (!(coro->flags & CF_RUNNING)) 3226 if (current != coro)
2938 { 3227 {
2939 PUTBACK; 3228 PUTBACK;
2940 save_perl (aTHX_ &temp); 3229 save_perl (aTHX_ current);
2941 load_perl (aTHX_ coro); 3230 load_perl (aTHX_ coro);
3231 SPAGAIN;
2942 } 3232 }
2943 3233
2944 {
2945 dSP;
2946 ENTER;
2947 SAVETMPS;
2948 PUTBACK;
2949 PUSHSTACK; 3234 PUSHSTACK;
3235
2950 PUSHMARK (SP); 3236 PUSHMARK (SP);
3237 PUTBACK;
2951 3238
2952 if (ix) 3239 if (ix)
2953 eval_sv (coderef, 0); 3240 eval_sv (coderef, 0);
2954 else 3241 else
2955 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 3242 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
2956 3243
2957 POPSTACK; 3244 POPSTACK;
2958 SPAGAIN; 3245 SPAGAIN;
2959 FREETMPS;
2960 LEAVE;
2961 PUTBACK;
2962 }
2963 3246
2964 if (!(coro->flags & CF_RUNNING)) 3247 if (current != coro)
2965 { 3248 {
3249 PUTBACK;
2966 save_perl (aTHX_ coro); 3250 save_perl (aTHX_ coro);
2967 load_perl (aTHX_ &temp); 3251 load_perl (aTHX_ current);
2968 SPAGAIN; 3252 SPAGAIN;
2969 } 3253 }
2970 } 3254 }
2971} 3255}
2972 3256
2976 ALIAS: 3260 ALIAS:
2977 is_ready = CF_READY 3261 is_ready = CF_READY
2978 is_running = CF_RUNNING 3262 is_running = CF_RUNNING
2979 is_new = CF_NEW 3263 is_new = CF_NEW
2980 is_destroyed = CF_DESTROYED 3264 is_destroyed = CF_DESTROYED
3265 is_suspended = CF_SUSPENDED
2981 CODE: 3266 CODE:
2982 RETVAL = boolSV (coro->flags & ix); 3267 RETVAL = boolSV (coro->flags & ix);
2983 OUTPUT: 3268 OUTPUT:
2984 RETVAL 3269 RETVAL
2985 3270
2989 CODE: 3274 CODE:
2990{ 3275{
2991 struct coro *current = SvSTATE_current; 3276 struct coro *current = SvSTATE_current;
2992 SV **throwp = self == current ? &CORO_THROW : &self->except; 3277 SV **throwp = self == current ? &CORO_THROW : &self->except;
2993 SvREFCNT_dec (*throwp); 3278 SvREFCNT_dec (*throwp);
3279 SvGETMAGIC (throw);
2994 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3280 *throwp = SvOK (throw) ? newSVsv (throw) : 0;
2995} 3281}
2996 3282
2997void 3283void
2998api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3284api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3001 3287
3002SV * 3288SV *
3003has_cctx (Coro::State coro) 3289has_cctx (Coro::State coro)
3004 PROTOTYPE: $ 3290 PROTOTYPE: $
3005 CODE: 3291 CODE:
3006 RETVAL = boolSV (!!coro->cctx); 3292 /* maybe manage the running flag differently */
3293 RETVAL = boolSV (!!coro->cctx || (coro->flags & CF_RUNNING));
3007 OUTPUT: 3294 OUTPUT:
3008 RETVAL 3295 RETVAL
3009 3296
3010int 3297int
3011is_traced (Coro::State coro) 3298is_traced (Coro::State coro)
3031 3318
3032void 3319void
3033force_cctx () 3320force_cctx ()
3034 PROTOTYPE: 3321 PROTOTYPE:
3035 CODE: 3322 CODE:
3036 SvSTATE_current->cctx->idle_sp = 0; 3323 cctx_current->idle_sp = 0;
3037 3324
3038void 3325void
3039swap_defsv (Coro::State self) 3326swap_defsv (Coro::State self)
3040 PROTOTYPE: $ 3327 PROTOTYPE: $
3041 ALIAS: 3328 ALIAS:
3049 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv; 3336 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
3050 3337
3051 SV *tmp = *src; *src = *dst; *dst = tmp; 3338 SV *tmp = *src; *src = *dst; *dst = tmp;
3052 } 3339 }
3053 3340
3341void
3342cancel (Coro::State self)
3343 CODE:
3344 coro_state_destroy (aTHX_ self);
3345 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */
3346
3347
3348SV *
3349enable_times (int enabled = enable_times)
3350 CODE:
3351{
3352 RETVAL = boolSV (enable_times);
3353
3354 if (enabled != enable_times)
3355 {
3356 enable_times = enabled;
3357
3358 coro_times_update ();
3359 (enabled ? coro_times_sub : coro_times_add)(SvSTATE (coro_current));
3360 }
3361}
3362 OUTPUT:
3363 RETVAL
3364
3365void
3366times (Coro::State self)
3367 PPCODE:
3368{
3369 struct coro *current = SvSTATE (coro_current);
3370
3371 if (expect_false (current == self))
3372 {
3373 coro_times_update ();
3374 coro_times_add (SvSTATE (coro_current));
3375 }
3376
3377 EXTEND (SP, 2);
3378 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3379 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3380
3381 if (expect_false (current == self))
3382 coro_times_sub (SvSTATE (coro_current));
3383}
3054 3384
3055MODULE = Coro::State PACKAGE = Coro 3385MODULE = Coro::State PACKAGE = Coro
3056 3386
3057BOOT: 3387BOOT:
3058{ 3388{
3059 int i;
3060
3061 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3389 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3062 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3390 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3063 cv_coro_run = get_cv ( "Coro::_terminate", GV_ADD); 3391 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3064 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD); 3392 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3065 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 3393 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3066 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 3394 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3067 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 3395 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3068 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 3396 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3397 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3069 3398
3070 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3399 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3071 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3400 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3072 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 3401 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3073 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new); 3402 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new);
3074 3403
3075 coro_stash = gv_stashpv ("Coro", TRUE); 3404 coro_stash = gv_stashpv ("Coro", TRUE);
3076 3405
3077 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 3406 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3078 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 3407 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3079 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 3408 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
3080 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 3409 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (CORO_PRIO_LOW));
3081 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE)); 3410 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (CORO_PRIO_IDLE));
3082 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN)); 3411 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (CORO_PRIO_MIN));
3083
3084 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
3085 coro_ready[i] = newAV ();
3086 3412
3087 { 3413 {
3088 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 3414 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
3089 3415
3090 coroapi.schedule = api_schedule; 3416 coroapi.schedule = api_schedule;
3131cede_notself (...) 3457cede_notself (...)
3132 CODE: 3458 CODE:
3133 CORO_EXECUTE_SLF_XS (slf_init_cede_notself); 3459 CORO_EXECUTE_SLF_XS (slf_init_cede_notself);
3134 3460
3135void 3461void
3136_cancel (Coro::State self)
3137 CODE:
3138 coro_state_destroy (aTHX_ self);
3139 coro_call_on_destroy (aTHX_ self);
3140
3141void
3142_set_current (SV *current) 3462_set_current (SV *current)
3143 PROTOTYPE: $ 3463 PROTOTYPE: $
3144 CODE: 3464 CODE:
3145 SvREFCNT_dec (SvRV (coro_current)); 3465 SvREFCNT_dec (SvRV (coro_current));
3146 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current))); 3466 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
3148void 3468void
3149_set_readyhook (SV *hook) 3469_set_readyhook (SV *hook)
3150 PROTOTYPE: $ 3470 PROTOTYPE: $
3151 CODE: 3471 CODE:
3152 SvREFCNT_dec (coro_readyhook); 3472 SvREFCNT_dec (coro_readyhook);
3473 SvGETMAGIC (hook);
3153 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0; 3474 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0;
3154 3475
3155int 3476int
3156prio (Coro::State coro, int newprio = 0) 3477prio (Coro::State coro, int newprio = 0)
3157 PROTOTYPE: $;$ 3478 PROTOTYPE: $;$
3164 if (items > 1) 3485 if (items > 1)
3165 { 3486 {
3166 if (ix) 3487 if (ix)
3167 newprio = coro->prio - newprio; 3488 newprio = coro->prio - newprio;
3168 3489
3169 if (newprio < PRIO_MIN) newprio = PRIO_MIN; 3490 if (newprio < CORO_PRIO_MIN) newprio = CORO_PRIO_MIN;
3170 if (newprio > PRIO_MAX) newprio = PRIO_MAX; 3491 if (newprio > CORO_PRIO_MAX) newprio = CORO_PRIO_MAX;
3171 3492
3172 coro->prio = newprio; 3493 coro->prio = newprio;
3173 } 3494 }
3174} 3495}
3175 OUTPUT: 3496 OUTPUT:
3188 PROTOTYPE: 3509 PROTOTYPE:
3189 CODE: 3510 CODE:
3190 RETVAL = coro_nready; 3511 RETVAL = coro_nready;
3191 OUTPUT: 3512 OUTPUT:
3192 RETVAL 3513 RETVAL
3514
3515void
3516suspend (Coro::State self)
3517 PROTOTYPE: $
3518 CODE:
3519 self->flags |= CF_SUSPENDED;
3520
3521void
3522resume (Coro::State self)
3523 PROTOTYPE: $
3524 CODE:
3525 self->flags &= ~CF_SUSPENDED;
3193 3526
3194void 3527void
3195_pool_handler (...) 3528_pool_handler (...)
3196 CODE: 3529 CODE:
3197 CORO_EXECUTE_SLF_XS (slf_init_pool_handler); 3530 CORO_EXECUTE_SLF_XS (slf_init_pool_handler);
3252rouse_wait (...) 3585rouse_wait (...)
3253 PROTOTYPE: ;$ 3586 PROTOTYPE: ;$
3254 PPCODE: 3587 PPCODE:
3255 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait); 3588 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait);
3256 3589
3590void
3591on_enter (SV *block)
3592 ALIAS:
3593 on_leave = 1
3594 PROTOTYPE: &
3595 CODE:
3596{
3597 struct coro *coro = SvSTATE_current;
3598 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3599
3600 block = (SV *)coro_sv_2cv (aTHX_ block);
3601
3602 if (!*avp)
3603 *avp = newAV ();
3604
3605 av_push (*avp, SvREFCNT_inc (block));
3606
3607 if (!ix)
3608 on_enterleave_call (aTHX_ block);
3609
3610 LEAVE; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
3611 SAVEDESTRUCTOR_X (ix ? coro_pop_on_leave : coro_pop_on_enter, (void *)coro);
3612 ENTER; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
3613}
3614
3257 3615
3258MODULE = Coro::State PACKAGE = PerlIO::cede 3616MODULE = Coro::State PACKAGE = PerlIO::cede
3259 3617
3260BOOT: 3618BOOT:
3261 PerlIO_define_layer (aTHX_ &PerlIO_cede); 3619 PerlIO_define_layer (aTHX_ &PerlIO_cede);
3264MODULE = Coro::State PACKAGE = Coro::Semaphore 3622MODULE = Coro::State PACKAGE = Coro::Semaphore
3265 3623
3266SV * 3624SV *
3267new (SV *klass, SV *count = 0) 3625new (SV *klass, SV *count = 0)
3268 CODE: 3626 CODE:
3627{
3628 int semcnt = 1;
3629
3630 if (count)
3631 {
3632 SvGETMAGIC (count);
3633
3634 if (SvOK (count))
3635 semcnt = SvIV (count);
3636 }
3637
3269 RETVAL = sv_bless ( 3638 RETVAL = sv_bless (
3270 coro_waitarray_new (aTHX_ count && SvOK (count) ? SvIV (count) : 1), 3639 coro_waitarray_new (aTHX_ semcnt),
3271 GvSTASH (CvGV (cv)) 3640 GvSTASH (CvGV (cv))
3272 ); 3641 );
3642}
3273 OUTPUT: 3643 OUTPUT:
3274 RETVAL 3644 RETVAL
3275 3645
3276# helper for Coro::Channel 3646# helper for Coro::Channel and others
3277SV * 3647SV *
3278_alloc (int count) 3648_alloc (int count)
3279 CODE: 3649 CODE:
3280 RETVAL = coro_waitarray_new (aTHX_ count); 3650 RETVAL = coro_waitarray_new (aTHX_ count);
3281 OUTPUT: 3651 OUTPUT:
3339 for (i = 1; i <= wcount; ++i) 3709 for (i = 1; i <= wcount; ++i)
3340 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i]))); 3710 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i])));
3341 } 3711 }
3342} 3712}
3343 3713
3714MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3715
3716void
3717_may_delete (SV *sem, int count, int extra_refs)
3718 PPCODE:
3719{
3720 AV *av = (AV *)SvRV (sem);
3721
3722 if (SvREFCNT ((SV *)av) == 1 + extra_refs
3723 && AvFILLp (av) == 0 /* no waiters, just count */
3724 && SvIV (AvARRAY (av)[0]) == count)
3725 XSRETURN_YES;
3726
3727 XSRETURN_NO;
3728}
3729
3344MODULE = Coro::State PACKAGE = Coro::Signal 3730MODULE = Coro::State PACKAGE = Coro::Signal
3345 3731
3346SV * 3732SV *
3347new (SV *klass) 3733new (SV *klass)
3348 CODE: 3734 CODE:

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines