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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines