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.317 by root, Thu Nov 20 06:28:52 2008 UTC vs.
Revision 1.361 by root, Wed Jul 1 07:26:40 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
170static AV *main_mainstack; /* used to differentiate between $main and others */ 184static AV *main_mainstack; /* used to differentiate between $main and others */
171static JMPENV *main_top_env; 185static JMPENV *main_top_env;
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
189static AV *av_destroy; /* destruction queue */
190static SV *sv_manager; /* the manager coro */
191static SV *sv_idle; /* $Coro::idle */
192
175static GV *irsgv; /* $/ */ 193static GV *irsgv; /* $/ */
176static GV *stdoutgv; /* *STDOUT */ 194static GV *stdoutgv; /* *STDOUT */
177static SV *rv_diehook; 195static SV *rv_diehook;
178static SV *rv_warnhook; 196static SV *rv_warnhook;
179static HV *hv_sig; /* %SIG */ 197static HV *hv_sig; /* %SIG */
180 198
181/* async_pool helper stuff */ 199/* async_pool helper stuff */
182static SV *sv_pool_rss; 200static SV *sv_pool_rss;
183static SV *sv_pool_size; 201static SV *sv_pool_size;
184static SV *sv_async_pool_idle; 202static SV *sv_async_pool_idle; /* description string */
185static AV *av_async_pool; 203static AV *av_async_pool; /* idle pool */
186static SV *sv_Coro; 204static SV *sv_Coro; /* class string */
187static CV *cv_pool_handler; 205static CV *cv_pool_handler;
188static CV *cv_coro_state_new; 206static CV *cv_coro_state_new;
189 207
190/* Coro::AnyEvent */ 208/* Coro::AnyEvent */
191static SV *sv_activity; 209static SV *sv_activity;
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;
192 216
193static struct coro_cctx *cctx_first; 217static struct coro_cctx *cctx_first;
194static int cctx_count, cctx_idle; 218static int cctx_count, cctx_idle;
195 219
196enum { 220enum {
222 int valgrind_id; 246 int valgrind_id;
223#endif 247#endif
224 unsigned char flags; 248 unsigned char flags;
225} coro_cctx; 249} coro_cctx;
226 250
251coro_cctx *cctx_current; /* the currently running cctx */
252
253/*****************************************************************************/
254
227enum { 255enum {
228 CF_RUNNING = 0x0001, /* coroutine is running */ 256 CF_RUNNING = 0x0001, /* coroutine is running */
229 CF_READY = 0x0002, /* coroutine is ready */ 257 CF_READY = 0x0002, /* coroutine is ready */
230 CF_NEW = 0x0004, /* has never been switched to */ 258 CF_NEW = 0x0004, /* has never been switched to */
231 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 */
232}; 261};
233 262
234/* 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 */
235typedef struct 264typedef struct
236{ 265{
237 SV *defsv; 266 SV *defsv;
238 AV *defav; 267 AV *defav;
239 SV *errsv; 268 SV *errsv;
240 SV *irsgv; 269 SV *irsgv;
270 HV *hinthv;
241#define VAR(name,type) type name; 271#define VAR(name,type) type name;
242# include "state.h" 272# include "state.h"
243#undef VAR 273#undef VAR
244} perl_slots; 274} perl_slots;
245 275
247 277
248/* this is a structure representing a perl-level coroutine */ 278/* this is a structure representing a perl-level coroutine */
249struct coro { 279struct coro {
250 /* the C coroutine allocated to this perl coroutine, if any */ 280 /* the C coroutine allocated to this perl coroutine, if any */
251 coro_cctx *cctx; 281 coro_cctx *cctx;
282
283 /* ready queue */
284 struct coro *next_ready;
252 285
253 /* state data */ 286 /* state data */
254 struct CoroSLF slf_frame; /* saved slf frame */ 287 struct CoroSLF slf_frame; /* saved slf frame */
255 AV *mainstack; 288 AV *mainstack;
256 perl_slots *slot; /* basically the saved sp */ 289 perl_slots *slot; /* basically the saved sp */
273 /* async_pool */ 306 /* async_pool */
274 SV *saved_deffh; 307 SV *saved_deffh;
275 SV *invoke_cb; 308 SV *invoke_cb;
276 AV *invoke_av; 309 AV *invoke_av;
277 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
278 /* linked list */ 318 /* linked list */
279 struct coro *next, *prev; 319 struct coro *next, *prev;
280}; 320};
281 321
282typedef struct coro *Coro__State; 322typedef struct coro *Coro__State;
287/* the mainr easonw e don't support windows process emulation */ 327/* the mainr easonw e don't support windows process emulation */
288static struct CoroSLF slf_frame; /* the current slf frame */ 328static struct CoroSLF slf_frame; /* the current slf frame */
289 329
290/** Coro ********************************************************************/ 330/** Coro ********************************************************************/
291 331
292#define PRIO_MAX 3 332#define CORO_PRIO_MAX 3
293#define PRIO_HIGH 1 333#define CORO_PRIO_HIGH 1
294#define PRIO_NORMAL 0 334#define CORO_PRIO_NORMAL 0
295#define PRIO_LOW -1 335#define CORO_PRIO_LOW -1
296#define PRIO_IDLE -3 336#define CORO_PRIO_IDLE -3
297#define PRIO_MIN -4 337#define CORO_PRIO_MIN -4
298 338
299/* for Coro.pm */ 339/* for Coro.pm */
300static SV *coro_current; 340static SV *coro_current;
301static SV *coro_readyhook; 341static SV *coro_readyhook;
302static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1]; 342static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
303static CV *cv_coro_run, *cv_coro_terminate; 343static CV *cv_coro_run, *cv_coro_terminate;
304static struct coro *coro_first; 344static struct coro *coro_first;
305#define coro_nready coroapi.nready 345#define coro_nready coroapi.nready
306 346
307/** lowlevel stuff **********************************************************/ 347/** lowlevel stuff **********************************************************/
340INLINE CV * 380INLINE CV *
341coro_sv_2cv (pTHX_ SV *sv) 381coro_sv_2cv (pTHX_ SV *sv)
342{ 382{
343 HV *st; 383 HV *st;
344 GV *gvp; 384 GV *gvp;
345 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;
346} 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 */
347 491
348static AV * 492static AV *
349coro_clone_padlist (pTHX_ CV *cv) 493coro_derive_padlist (pTHX_ CV *cv)
350{ 494{
351 AV *padlist = CvPADLIST (cv); 495 AV *padlist = CvPADLIST (cv);
352 AV *newpadlist, *newpad; 496 AV *newpadlist, *newpad;
353 497
354 newpadlist = newAV (); 498 newpadlist = newAV ();
359 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 503 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
360#endif 504#endif
361 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 505 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
362 --AvFILLp (padlist); 506 --AvFILLp (padlist);
363 507
364 av_store (newpadlist, 0, SvREFCNT_inc_NN (*av_fetch (padlist, 0, FALSE))); 508 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0]));
365 av_store (newpadlist, 1, (SV *)newpad); 509 av_store (newpadlist, 1, (SV *)newpad);
366 510
367 return newpadlist; 511 return newpadlist;
368} 512}
369 513
370static void 514static void
371free_padlist (pTHX_ AV *padlist) 515free_padlist (pTHX_ AV *padlist)
372{ 516{
373 /* may be during global destruction */ 517 /* may be during global destruction */
374 if (SvREFCNT (padlist)) 518 if (!IN_DESTRUCT)
375 { 519 {
376 I32 i = AvFILLp (padlist); 520 I32 i = AvFILLp (padlist);
377 while (i >= 0) 521
522 while (i > 0) /* special-case index 0 */
378 { 523 {
379 SV **svp = av_fetch (padlist, i--, FALSE); 524 /* we try to be extra-careful here */
380 if (svp) 525 AV *av = (AV *)AvARRAY (padlist)[i--];
381 { 526 I32 j = AvFILLp (av);
382 SV *sv; 527
383 while (&PL_sv_undef != (sv = av_pop ((AV *)*svp))) 528 while (j >= 0)
529 SvREFCNT_dec (AvARRAY (av)[j--]);
530
531 AvFILLp (av) = -1;
384 SvREFCNT_dec (sv); 532 SvREFCNT_dec (av);
385
386 SvREFCNT_dec (*svp);
387 }
388 } 533 }
389 534
535 SvREFCNT_dec (AvARRAY (padlist)[0]);
536
537 AvFILLp (padlist) = -1;
390 SvREFCNT_dec ((SV*)padlist); 538 SvREFCNT_dec ((SV*)padlist);
391 } 539 }
392} 540}
393 541
394static int 542static int
395coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 543coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
396{ 544{
397 AV *padlist; 545 AV *padlist;
398 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;
399 551
400 /* casting is fun. */ 552 /* casting is fun. */
401 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 553 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
402 free_padlist (aTHX_ padlist); 554 free_padlist (aTHX_ padlist);
403 555
404 SvREFCNT_dec (av); /* sv_magicext increased the refcount */ 556 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
405 557
406 return 0; 558 return 0;
407} 559}
408
409#define CORO_MAGIC_type_cv 26
410#define CORO_MAGIC_type_state PERL_MAGIC_ext
411 560
412static MGVTBL coro_cv_vtbl = { 561static MGVTBL coro_cv_vtbl = {
413 0, 0, 0, 0, 562 0, 0, 0, 0,
414 coro_cv_free 563 coro_cv_free
415}; 564};
416
417#define CORO_MAGIC_NN(sv, type) \
418 (expect_true (SvMAGIC (sv)->mg_type == type) \
419 ? SvMAGIC (sv) \
420 : mg_find (sv, type))
421
422#define CORO_MAGIC(sv, type) \
423 (expect_true (SvMAGIC (sv)) \
424 ? CORO_MAGIC_NN (sv, type) \
425 : 0)
426
427#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
428#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
429
430INLINE struct coro *
431SvSTATE_ (pTHX_ SV *coro)
432{
433 HV *stash;
434 MAGIC *mg;
435
436 if (SvROK (coro))
437 coro = SvRV (coro);
438
439 if (expect_false (SvTYPE (coro) != SVt_PVHV))
440 croak ("Coro::State object required");
441
442 stash = SvSTASH (coro);
443 if (expect_false (stash != coro_stash && stash != coro_state_stash))
444 {
445 /* very slow, but rare, check */
446 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
447 croak ("Coro::State object required");
448 }
449
450 mg = CORO_MAGIC_state (coro);
451 return (struct coro *)mg->mg_ptr;
452}
453
454#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
455
456/* faster than SvSTATE, but expects a coroutine hv */
457#define SvSTATE_hv(hv) ((struct coro *)CORO_MAGIC_NN ((SV *)hv, CORO_MAGIC_type_state)->mg_ptr)
458#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
459 565
460/* the next two functions merely cache the padlists */ 566/* the next two functions merely cache the padlists */
461static void 567static void
462get_padlist (pTHX_ CV *cv) 568get_padlist (pTHX_ CV *cv)
463{ 569{
474 CV *cp = Perl_cv_clone (aTHX_ cv); 580 CV *cp = Perl_cv_clone (aTHX_ cv);
475 CvPADLIST (cv) = CvPADLIST (cp); 581 CvPADLIST (cv) = CvPADLIST (cp);
476 CvPADLIST (cp) = 0; 582 CvPADLIST (cp) = 0;
477 SvREFCNT_dec (cp); 583 SvREFCNT_dec (cp);
478#else 584#else
479 CvPADLIST (cv) = coro_clone_padlist (aTHX_ cv); 585 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
480#endif 586#endif
481 } 587 }
482} 588}
483 589
484static void 590static void
491 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);
492 598
493 av = (AV *)mg->mg_obj; 599 av = (AV *)mg->mg_obj;
494 600
495 if (expect_false (AvFILLp (av) >= AvMAX (av))) 601 if (expect_false (AvFILLp (av) >= AvMAX (av)))
496 av_extend (av, AvMAX (av) + 1); 602 av_extend (av, AvFILLp (av) + 1);
497 603
498 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 604 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
499} 605}
500 606
501/** load & save, init *******************************************************/ 607/** load & save, init *******************************************************/
608
609static void
610on_enterleave_call (pTHX_ SV *cb);
502 611
503static void 612static void
504load_perl (pTHX_ Coro__State c) 613load_perl (pTHX_ Coro__State c)
505{ 614{
506 perl_slots *slot = c->slot; 615 perl_slots *slot = c->slot;
507 c->slot = 0; 616 c->slot = 0;
508 617
509 PL_mainstack = c->mainstack; 618 PL_mainstack = c->mainstack;
510 619
511 GvSV (PL_defgv) = slot->defsv; 620 GvSV (PL_defgv) = slot->defsv;
512 GvAV (PL_defgv) = slot->defav; 621 GvAV (PL_defgv) = slot->defav;
513 GvSV (PL_errgv) = slot->errsv; 622 GvSV (PL_errgv) = slot->errsv;
514 GvSV (irsgv) = slot->irsgv; 623 GvSV (irsgv) = slot->irsgv;
624 GvHV (PL_hintgv) = slot->hinthv;
515 625
516 #define VAR(name,type) PL_ ## name = slot->name; 626 #define VAR(name,type) PL_ ## name = slot->name;
517 # include "state.h" 627 # include "state.h"
518 #undef VAR 628 #undef VAR
519 629
533 PUTBACK; 643 PUTBACK;
534 } 644 }
535 645
536 slf_frame = c->slf_frame; 646 slf_frame = c->slf_frame;
537 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 }
538} 664}
539 665
540static void 666static void
541save_perl (pTHX_ Coro__State c) 667save_perl (pTHX_ Coro__State c)
542{ 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
543 c->except = CORO_THROW; 685 c->except = CORO_THROW;
544 c->slf_frame = slf_frame; 686 c->slf_frame = slf_frame;
545 687
546 { 688 {
547 dSP; 689 dSP;
560 { 702 {
561 while (expect_true (cxix >= 0)) 703 while (expect_true (cxix >= 0))
562 { 704 {
563 PERL_CONTEXT *cx = &ccstk[cxix--]; 705 PERL_CONTEXT *cx = &ccstk[cxix--];
564 706
565 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))
566 { 708 {
567 CV *cv = cx->blk_sub.cv; 709 CV *cv = cx->blk_sub.cv;
568 710
569 if (expect_true (CvDEPTH (cv))) 711 if (expect_true (CvDEPTH (cv)))
570 { 712 {
605 c->mainstack = PL_mainstack; 747 c->mainstack = PL_mainstack;
606 748
607 { 749 {
608 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 750 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
609 751
610 slot->defav = GvAV (PL_defgv); 752 slot->defav = GvAV (PL_defgv);
611 slot->defsv = DEFSV; 753 slot->defsv = DEFSV;
612 slot->errsv = ERRSV; 754 slot->errsv = ERRSV;
613 slot->irsgv = GvSV (irsgv); 755 slot->irsgv = GvSV (irsgv);
756 slot->hinthv = GvHV (PL_hintgv);
614 757
615 #define VAR(name,type) slot->name = PL_ ## name; 758 #define VAR(name,type) slot->name = PL_ ## name;
616 # include "state.h" 759 # include "state.h"
617 #undef VAR 760 #undef VAR
618 } 761 }
745#endif 888#endif
746 889
747/* 890/*
748 * This overrides the default magic get method of %SIG elements. 891 * This overrides the default magic get method of %SIG elements.
749 * 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
750 * 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
751 * readback here. 894 * readback here.
752 * We only do this when the hook is != 0, as they are often set to 0 temporarily,
753 * not expecting this to actually change the hook. This is a potential problem
754 * when a schedule happens then, but we ignore this.
755 */ 895 */
756static int 896static int
757coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 897coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
758{ 898{
759 const char *s = MgPV_nolen_const (mg); 899 const char *s = MgPV_nolen_const (mg);
812 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 952 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
813 953
814 if (svp) 954 if (svp)
815 { 955 {
816 SV *old = *svp; 956 SV *old = *svp;
817 *svp = newSVsv (sv); 957 *svp = SvOK (sv) ? newSVsv (sv) : 0;
818 SvREFCNT_dec (old); 958 SvREFCNT_dec (old);
819 return 0; 959 return 0;
820 } 960 }
821 } 961 }
822 962
832 972
833static int 973static int
834slf_check_nop (pTHX_ struct CoroSLF *frame) 974slf_check_nop (pTHX_ struct CoroSLF *frame)
835{ 975{
836 return 0; 976 return 0;
977}
978
979static int
980slf_check_repeat (pTHX_ struct CoroSLF *frame)
981{
982 return 1;
837} 983}
838 984
839static UNOP coro_setup_op; 985static UNOP coro_setup_op;
840 986
841static void NOINLINE /* noinline to keep it out of the transfer fast path */ 987static void NOINLINE /* noinline to keep it out of the transfer fast path */
848 994
849 PL_runops = RUNOPS_DEFAULT; 995 PL_runops = RUNOPS_DEFAULT;
850 PL_curcop = &PL_compiling; 996 PL_curcop = &PL_compiling;
851 PL_in_eval = EVAL_NULL; 997 PL_in_eval = EVAL_NULL;
852 PL_comppad = 0; 998 PL_comppad = 0;
999 PL_comppad_name = 0;
1000 PL_comppad_name_fill = 0;
1001 PL_comppad_name_floor = 0;
853 PL_curpm = 0; 1002 PL_curpm = 0;
854 PL_curpad = 0; 1003 PL_curpad = 0;
855 PL_localizing = 0; 1004 PL_localizing = 0;
856 PL_dirty = 0; 1005 PL_dirty = 0;
857 PL_restartop = 0; 1006 PL_restartop = 0;
858#if PERL_VERSION_ATLEAST (5,10,0) 1007#if PERL_VERSION_ATLEAST (5,10,0)
859 PL_parser = 0; 1008 PL_parser = 0;
860#endif 1009#endif
1010 PL_hints = 0;
861 1011
862 /* recreate the die/warn hooks */ 1012 /* recreate the die/warn hooks */
863 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 );
864 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);
865 1015
866 GvSV (PL_defgv) = newSV (0); 1016 GvSV (PL_defgv) = newSV (0);
867 GvAV (PL_defgv) = coro->args; coro->args = 0; 1017 GvAV (PL_defgv) = coro->args; coro->args = 0;
868 GvSV (PL_errgv) = newSV (0); 1018 GvSV (PL_errgv) = newSV (0);
869 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;
870 PL_rs = newSVsv (GvSV (irsgv)); 1021 PL_rs = newSVsv (GvSV (irsgv));
871 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1022 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
872 1023
873 { 1024 {
874 dSP; 1025 dSP;
892 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1043 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
893 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */ 1044 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
894 1045
895 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1046 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */
896 coro_setup_op.op_next = PL_op; 1047 coro_setup_op.op_next = PL_op;
897 coro_setup_op.op_type = OP_CUSTOM; 1048 coro_setup_op.op_type = OP_ENTERSUB;
898 coro_setup_op.op_ppaddr = pp_slf; 1049 coro_setup_op.op_ppaddr = pp_slf;
899 /* no flags etc. required, as an init function won't be called */ 1050 /* no flags etc. required, as an init function won't be called */
900 1051
901 PL_op = (OP *)&coro_setup_op; 1052 PL_op = (OP *)&coro_setup_op;
902 1053
903 /* copy throw, in case it was set before coro_setup */ 1054 /* copy throw, in case it was set before coro_setup */
904 CORO_THROW = coro->except; 1055 CORO_THROW = coro->except;
905}
906 1056
1057 if (expect_false (enable_times))
1058 {
1059 coro_times_update ();
1060 coro_times_sub (coro);
1061 }
1062}
1063
907static void 1064static void
908coro_destruct (pTHX_ struct coro *coro) 1065coro_unwind_stacks (pTHX)
909{ 1066{
910 if (!IN_DESTRUCT) 1067 if (!IN_DESTRUCT)
911 { 1068 {
912 /* restore all saved variables and stuff */ 1069 /* restore all saved variables and stuff */
913 LEAVE_SCOPE (0); 1070 LEAVE_SCOPE (0);
921 POPSTACK_TO (PL_mainstack); 1078 POPSTACK_TO (PL_mainstack);
922 1079
923 /* unwind main stack */ 1080 /* unwind main stack */
924 dounwind (-1); 1081 dounwind (-1);
925 } 1082 }
1083}
926 1084
927 SvREFCNT_dec (GvSV (PL_defgv)); 1085static void
928 SvREFCNT_dec (GvAV (PL_defgv)); 1086coro_destruct_perl (pTHX_ struct coro *coro)
929 SvREFCNT_dec (GvSV (PL_errgv)); 1087{
930 SvREFCNT_dec (PL_defoutgv); 1088 SV *svf [9];
931 SvREFCNT_dec (PL_rs);
932 SvREFCNT_dec (GvSV (irsgv));
933 1089
934 SvREFCNT_dec (PL_diehook);
935 SvREFCNT_dec (PL_warnhook);
936 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 int i;
1118
1119 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i)
1120 SvREFCNT_dec (svf [i]);
1121
937 SvREFCNT_dec (coro->saved_deffh); 1122 SvREFCNT_dec (coro->saved_deffh);
938 SvREFCNT_dec (coro->rouse_cb); 1123 SvREFCNT_dec (coro->rouse_cb);
939 SvREFCNT_dec (coro->invoke_cb); 1124 SvREFCNT_dec (coro->invoke_cb);
940 SvREFCNT_dec (coro->invoke_av); 1125 SvREFCNT_dec (coro->invoke_av);
941 1126 }
942 coro_destruct_stacks (aTHX);
943} 1127}
944 1128
945INLINE void 1129INLINE void
946free_coro_mortal (pTHX) 1130free_coro_mortal (pTHX)
947{ 1131{
955static int 1139static int
956runops_trace (pTHX) 1140runops_trace (pTHX)
957{ 1141{
958 COP *oldcop = 0; 1142 COP *oldcop = 0;
959 int oldcxix = -2; 1143 int oldcxix = -2;
960 struct coro *coro = SvSTATE_current; /* trace cctx is tied to specific coro */
961 coro_cctx *cctx = coro->cctx;
962 1144
963 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX))) 1145 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX)))
964 { 1146 {
965 PERL_ASYNC_CHECK (); 1147 PERL_ASYNC_CHECK ();
966 1148
967 if (cctx->flags & CC_TRACE_ALL) 1149 if (cctx_current->flags & CC_TRACE_ALL)
968 { 1150 {
969 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)
970 { 1152 {
971 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1153 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
972 SV **bot, **top; 1154 SV **bot, **top;
973 AV *av = newAV (); /* return values */ 1155 AV *av = newAV (); /* return values */
974 SV **cb; 1156 SV **cb;
1011 1193
1012 if (PL_curcop != &PL_compiling) 1194 if (PL_curcop != &PL_compiling)
1013 { 1195 {
1014 SV **cb; 1196 SV **cb;
1015 1197
1016 if (oldcxix != cxstack_ix && cctx->flags & CC_TRACE_SUB) 1198 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB)
1017 { 1199 {
1018 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1200 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1019 1201
1020 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1202 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1021 { 1203 {
1022 runops_proc_t old_runops = PL_runops;
1023 dSP; 1204 dSP;
1024 GV *gv = CvGV (cx->blk_sub.cv); 1205 GV *gv = CvGV (cx->blk_sub.cv);
1025 SV *fullname = sv_2mortal (newSV (0)); 1206 SV *fullname = sv_2mortal (newSV (0));
1026 1207
1027 if (isGV (gv)) 1208 if (isGV (gv))
1045 } 1226 }
1046 1227
1047 oldcxix = cxstack_ix; 1228 oldcxix = cxstack_ix;
1048 } 1229 }
1049 1230
1050 if (cctx->flags & CC_TRACE_LINE) 1231 if (cctx_current->flags & CC_TRACE_LINE)
1051 { 1232 {
1052 dSP; 1233 dSP;
1053 1234
1054 PL_runops = RUNOPS_DEFAULT; 1235 PL_runops = RUNOPS_DEFAULT;
1055 ENTER; 1236 ENTER;
1074 1255
1075 TAINT_NOT; 1256 TAINT_NOT;
1076 return 0; 1257 return 0;
1077} 1258}
1078 1259
1079static struct coro_cctx *cctx_ssl_cctx;
1080static struct CoroSLF cctx_ssl_frame; 1260static struct CoroSLF cctx_ssl_frame;
1081 1261
1082static void 1262static void
1083slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta) 1263slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta)
1084{ 1264{
1085 ta->prev = (struct coro *)cctx_ssl_cctx;
1086 ta->next = 0; 1265 ta->prev = 0;
1087} 1266}
1088 1267
1089static int 1268static int
1090slf_check_set_stacklevel (pTHX_ struct CoroSLF *frame) 1269slf_check_set_stacklevel (pTHX_ struct CoroSLF *frame)
1091{ 1270{
1094 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 */
1095} 1274}
1096 1275
1097/* 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 */
1098static void NOINLINE 1277static void NOINLINE
1099cctx_prepare (pTHX_ coro_cctx *cctx) 1278cctx_prepare (pTHX)
1100{ 1279{
1101 PL_top_env = &PL_start_env; 1280 PL_top_env = &PL_start_env;
1102 1281
1103 if (cctx->flags & CC_TRACE) 1282 if (cctx_current->flags & CC_TRACE)
1104 PL_runops = runops_trace; 1283 PL_runops = runops_trace;
1105 1284
1106 /* 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
1107 * that can lead to creation of a new cctx */ 1286 * that can lead to creation of a new cctx */
1108 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)",
1109 slf_frame.prepare && PL_op->op_ppaddr == pp_slf)); 1288 slf_frame.prepare && PL_op->op_ppaddr == pp_slf));
1110 1289
1111 /* 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 */
1112 cctx_ssl_cctx = cctx;
1113 cctx_ssl_frame = slf_frame; 1291 cctx_ssl_frame = slf_frame;
1114 1292
1115 slf_frame.prepare = slf_prepare_set_stacklevel; 1293 slf_frame.prepare = slf_prepare_set_stacklevel;
1116 slf_frame.check = slf_check_set_stacklevel; 1294 slf_frame.check = slf_check_set_stacklevel;
1117} 1295}
1140 /* normally we would need to skip the entersub here */ 1318 /* normally we would need to skip the entersub here */
1141 /* 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 */
1142 /* PL_nop = PL_nop->op_next */ 1320 /* PL_nop = PL_nop->op_next */
1143 1321
1144 /* inject a fake subroutine call to cctx_init */ 1322 /* inject a fake subroutine call to cctx_init */
1145 cctx_prepare (aTHX_ (coro_cctx *)arg); 1323 cctx_prepare (aTHX);
1146 1324
1147 /* cctx_run is the alternative tail of transfer() */ 1325 /* cctx_run is the alternative tail of transfer() */
1148 transfer_tail (aTHX); 1326 transfer_tail (aTHX);
1149 1327
1150 /* 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 */
1158 /* 1336 /*
1159 * 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
1160 * 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)
1161 * 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
1162 * bootstrap-time "top" top_env, as we cannot restore the "main" 1340 * bootstrap-time "top" top_env, as we cannot restore the "main"
1163 * 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.
1164 */ 1344 */
1165 PL_top_env = main_top_env; 1345 PL_top_env = main_top_env;
1166 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 */
1167 } 1347 }
1168} 1348}
1245cctx_destroy (coro_cctx *cctx) 1425cctx_destroy (coro_cctx *cctx)
1246{ 1426{
1247 if (!cctx) 1427 if (!cctx)
1248 return; 1428 return;
1249 1429
1430 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary?
1431
1250 --cctx_count; 1432 --cctx_count;
1251 coro_destroy (&cctx->cctx); 1433 coro_destroy (&cctx->cctx);
1252 1434
1253 /* coro_transfer creates new, empty cctx's */ 1435 /* coro_transfer creates new, empty cctx's */
1254 if (cctx->sptr) 1436 if (cctx->sptr)
1317 /* TODO: throwing up here is considered harmful */ 1499 /* TODO: throwing up here is considered harmful */
1318 1500
1319 if (expect_true (prev != next)) 1501 if (expect_true (prev != next))
1320 { 1502 {
1321 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1503 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1322 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,");
1323 1505
1324 if (expect_false (next->flags & CF_RUNNING))
1325 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states,");
1326
1327 if (expect_false (next->flags & CF_DESTROYED)) 1506 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED)))
1328 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,");
1329 1508
1330#if !PERL_VERSION_ATLEAST (5,10,0) 1509#if !PERL_VERSION_ATLEAST (5,10,0)
1331 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1510 if (expect_false (PL_lex_state != LEX_NOTPARSING))
1332 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,");
1333#endif 1512#endif
1339transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1518transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1340{ 1519{
1341 dSTACKLEVEL; 1520 dSTACKLEVEL;
1342 1521
1343 /* sometimes transfer is only called to set idle_sp */ 1522 /* sometimes transfer is only called to set idle_sp */
1344 if (expect_false (!next)) 1523 if (expect_false (!prev))
1345 { 1524 {
1346 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1525 cctx_current->idle_sp = STACKLEVEL;
1347 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 */
1348 } 1527 }
1349 else if (expect_true (prev != next)) 1528 else if (expect_true (prev != next))
1350 { 1529 {
1351 coro_cctx *prev__cctx; 1530 coro_cctx *cctx_prev;
1352 1531
1353 if (expect_false (prev->flags & CF_NEW)) 1532 if (expect_false (prev->flags & CF_NEW))
1354 { 1533 {
1355 /* create a new empty/source context */ 1534 /* create a new empty/source context */
1356 prev->cctx = cctx_new_empty ();
1357 prev->flags &= ~CF_NEW; 1535 prev->flags &= ~CF_NEW;
1358 prev->flags |= CF_RUNNING; 1536 prev->flags |= CF_RUNNING;
1359 } 1537 }
1360 1538
1361 prev->flags &= ~CF_RUNNING; 1539 prev->flags &= ~CF_RUNNING;
1372 coro_setup (aTHX_ next); 1550 coro_setup (aTHX_ next);
1373 } 1551 }
1374 else 1552 else
1375 load_perl (aTHX_ next); 1553 load_perl (aTHX_ next);
1376 1554
1377 prev__cctx = prev->cctx;
1378
1379 /* possibly untie and reuse the cctx */ 1555 /* possibly untie and reuse the cctx */
1380 if (expect_true ( 1556 if (expect_true (
1381 prev__cctx->idle_sp == STACKLEVEL 1557 cctx_current->idle_sp == STACKLEVEL
1382 && !(prev__cctx->flags & CC_TRACE) 1558 && !(cctx_current->flags & CC_TRACE)
1383 && !force_cctx 1559 && !force_cctx
1384 )) 1560 ))
1385 { 1561 {
1386 /* 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 */
1387 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));
1388 1564
1389 prev->cctx = 0;
1390
1391 /* 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. */
1392 /* 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 */
1393 if (expect_false (CCTX_EXPIRED (prev__cctx))) 1567 if (expect_false (CCTX_EXPIRED (cctx_current)))
1394 if (!next->cctx) 1568 if (expect_true (!next->cctx))
1395 next->cctx = cctx_get (aTHX); 1569 next->cctx = cctx_get (aTHX);
1396 1570
1397 cctx_put (prev__cctx); 1571 cctx_put (cctx_current);
1398 } 1572 }
1573 else
1574 prev->cctx = cctx_current;
1399 1575
1400 ++next->usecount; 1576 ++next->usecount;
1401 1577
1402 if (expect_true (!next->cctx)) 1578 cctx_prev = cctx_current;
1403 next->cctx = cctx_get (aTHX); 1579 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1404 1580
1405 if (expect_false (prev__cctx != next->cctx)) 1581 next->cctx = 0;
1582
1583 if (expect_false (cctx_prev != cctx_current))
1406 { 1584 {
1407 prev__cctx->top_env = PL_top_env; 1585 cctx_prev->top_env = PL_top_env;
1408 PL_top_env = next->cctx->top_env; 1586 PL_top_env = cctx_current->top_env;
1409 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1587 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1410 } 1588 }
1411 1589
1412 transfer_tail (aTHX); 1590 transfer_tail (aTHX);
1413 } 1591 }
1414} 1592}
1422coro_state_destroy (pTHX_ struct coro *coro) 1600coro_state_destroy (pTHX_ struct coro *coro)
1423{ 1601{
1424 if (coro->flags & CF_DESTROYED) 1602 if (coro->flags & CF_DESTROYED)
1425 return 0; 1603 return 0;
1426 1604
1427 if (coro->on_destroy) 1605 if (coro->on_destroy && !PL_dirty)
1428 coro->on_destroy (aTHX_ coro); 1606 coro->on_destroy (aTHX_ coro);
1429 1607
1430 coro->flags |= CF_DESTROYED; 1608 coro->flags |= CF_DESTROYED;
1431 1609
1432 if (coro->flags & CF_READY) 1610 if (coro->flags & CF_READY)
1436 --coro_nready; 1614 --coro_nready;
1437 } 1615 }
1438 else 1616 else
1439 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 */
1440 1618
1441 if (coro->mainstack && coro->mainstack != main_mainstack) 1619 if (coro->mainstack
1442 { 1620 && coro->mainstack != main_mainstack
1443 struct coro temp; 1621 && coro->slot
1444 1622 && !PL_dirty)
1445 assert (("FATAL: tried to destroy currently running coroutine (please report)", !(coro->flags & CF_RUNNING)));
1446
1447 save_perl (aTHX_ &temp);
1448 load_perl (aTHX_ coro);
1449
1450 coro_destruct (aTHX_ coro); 1623 coro_destruct_perl (aTHX_ coro);
1451
1452 load_perl (aTHX_ &temp);
1453
1454 coro->slot = 0;
1455 }
1456 1624
1457 cctx_destroy (coro->cctx); 1625 cctx_destroy (coro->cctx);
1458 SvREFCNT_dec (coro->startcv); 1626 SvREFCNT_dec (coro->startcv);
1459 SvREFCNT_dec (coro->args); 1627 SvREFCNT_dec (coro->args);
1460 SvREFCNT_dec (CORO_THROW); 1628 SvREFCNT_dec (CORO_THROW);
1547/** Coro ********************************************************************/ 1715/** Coro ********************************************************************/
1548 1716
1549INLINE void 1717INLINE void
1550coro_enq (pTHX_ struct coro *coro) 1718coro_enq (pTHX_ struct coro *coro)
1551{ 1719{
1552 av_push (coro_ready [coro->prio - PRIO_MIN], SvREFCNT_inc_NN (coro->hv)); 1720 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1553}
1554 1721
1555INLINE 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 *
1556coro_deq (pTHX) 1730coro_deq (pTHX)
1557{ 1731{
1558 int prio; 1732 int prio;
1559 1733
1560 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; ) 1734 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
1561 if (AvFILLp (coro_ready [prio]) >= 0) 1735 {
1562 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 }
1563 1745
1564 return 0; 1746 return 0;
1565} 1747}
1566 1748
1567static int 1749static int
1569{ 1751{
1570 struct coro *coro; 1752 struct coro *coro;
1571 SV *sv_hook; 1753 SV *sv_hook;
1572 void (*xs_hook)(void); 1754 void (*xs_hook)(void);
1573 1755
1574 if (SvROK (coro_sv))
1575 coro_sv = SvRV (coro_sv);
1576
1577 coro = SvSTATE (coro_sv); 1756 coro = SvSTATE (coro_sv);
1578 1757
1579 if (coro->flags & CF_READY) 1758 if (coro->flags & CF_READY)
1580 return 0; 1759 return 0;
1581 1760
1634static void 1813static void
1635prepare_schedule (pTHX_ struct coro_transfer_args *ta) 1814prepare_schedule (pTHX_ struct coro_transfer_args *ta)
1636{ 1815{
1637 for (;;) 1816 for (;;)
1638 { 1817 {
1639 SV *next_sv = coro_deq (aTHX); 1818 struct coro *next = coro_deq (aTHX);
1640 1819
1641 if (expect_true (next_sv)) 1820 if (expect_true (next))
1642 { 1821 {
1643 struct coro *next = SvSTATE_hv (next_sv);
1644
1645 /* cannot transfer to destroyed coros, skip and look for next */ 1822 /* cannot transfer to destroyed coros, skip and look for next */
1646 if (expect_false (next->flags & CF_DESTROYED)) 1823 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED)))
1647 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 */
1648 else 1825 else
1649 { 1826 {
1650 next->flags &= ~CF_READY; 1827 next->flags &= ~CF_READY;
1651 --coro_nready; 1828 --coro_nready;
1652 1829
1653 return prepare_schedule_to (aTHX_ ta, next); 1830 prepare_schedule_to (aTHX_ ta, next);
1831 break;
1654 } 1832 }
1655 } 1833 }
1656 else 1834 else
1657 { 1835 {
1658 /* 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 {
1659 dSP; 1846 dSP;
1660 1847
1661 ENTER; 1848 ENTER;
1662 SAVETMPS; 1849 SAVETMPS;
1663 1850
1664 PUSHMARK (SP); 1851 PUSHMARK (SP);
1665 PUTBACK; 1852 PUTBACK;
1666 call_sv (get_sv ("Coro::idle", FALSE), G_VOID | G_DISCARD); 1853 call_sv (sv_idle, G_VOID | G_DISCARD);
1667 1854
1668 FREETMPS; 1855 FREETMPS;
1669 LEAVE; 1856 LEAVE;
1857 }
1670 } 1858 }
1671 } 1859 }
1672} 1860}
1673 1861
1674INLINE void 1862INLINE void
1745static void 1933static void
1746api_trace (pTHX_ SV *coro_sv, int flags) 1934api_trace (pTHX_ SV *coro_sv, int flags)
1747{ 1935{
1748 struct coro *coro = SvSTATE (coro_sv); 1936 struct coro *coro = SvSTATE (coro_sv);
1749 1937
1938 if (coro->flags & CF_RUNNING)
1939 croak ("cannot enable tracing on a running coroutine, caught");
1940
1750 if (flags & CC_TRACE) 1941 if (flags & CC_TRACE)
1751 { 1942 {
1752 if (!coro->cctx) 1943 if (!coro->cctx)
1753 coro->cctx = cctx_new_run (); 1944 coro->cctx = cctx_new_run ();
1754 else if (!(coro->cctx->flags & CC_TRACE)) 1945 else if (!(coro->cctx->flags & CC_TRACE))
1755 croak ("cannot enable tracing on coroutine with custom stack,"); 1946 croak ("cannot enable tracing on coroutine with custom stack, caught");
1756 1947
1757 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL)); 1948 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL));
1758 } 1949 }
1759 else if (coro->cctx && coro->cctx->flags & CC_TRACE) 1950 else if (coro->cctx && coro->cctx->flags & CC_TRACE)
1760 { 1951 {
1763 if (coro->flags & CF_RUNNING) 1954 if (coro->flags & CF_RUNNING)
1764 PL_runops = RUNOPS_DEFAULT; 1955 PL_runops = RUNOPS_DEFAULT;
1765 else 1956 else
1766 coro->slot->runops = RUNOPS_DEFAULT; 1957 coro->slot->runops = RUNOPS_DEFAULT;
1767 } 1958 }
1959}
1960
1961static void
1962coro_call_on_destroy (pTHX_ struct coro *coro)
1963{
1964 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0);
1965 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1966
1967 if (on_destroyp)
1968 {
1969 AV *on_destroy = (AV *)SvRV (*on_destroyp);
1970
1971 while (AvFILLp (on_destroy) >= 0)
1972 {
1973 dSP; /* don't disturb outer sp */
1974 SV *cb = av_pop (on_destroy);
1975
1976 PUSHMARK (SP);
1977
1978 if (statusp)
1979 {
1980 int i;
1981 AV *status = (AV *)SvRV (*statusp);
1982 EXTEND (SP, AvFILLp (status) + 1);
1983
1984 for (i = 0; i <= AvFILLp (status); ++i)
1985 PUSHs (AvARRAY (status)[i]);
1986 }
1987
1988 PUTBACK;
1989 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD);
1990 }
1991 }
1992}
1993
1994static void
1995slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1996{
1997 int i;
1998 HV *hv = (HV *)SvRV (coro_current);
1999 AV *av = newAV ();
2000
2001 av_extend (av, items - 1);
2002 for (i = 0; i < items; ++i)
2003 av_push (av, SvREFCNT_inc_NN (arg [i]));
2004
2005 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0);
2006
2007 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */
2008 api_ready (aTHX_ sv_manager);
2009
2010 frame->prepare = prepare_schedule;
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);*/
1768} 2016}
1769 2017
1770/*****************************************************************************/ 2018/*****************************************************************************/
1771/* async pool handler */ 2019/* async pool handler */
1772 2020
1855 SV *data = (SV *)GENSUB_ARG; 2103 SV *data = (SV *)GENSUB_ARG;
1856 2104
1857 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2105 if (SvTYPE (SvRV (data)) != SVt_PVAV)
1858 { 2106 {
1859 /* first call, set args */ 2107 /* first call, set args */
2108 SV *coro = SvRV (data);
1860 AV *av = newAV (); 2109 AV *av = newAV ();
1861 SV *coro = SvRV (data);
1862 2110
1863 SvRV_set (data, (SV *)av); 2111 SvRV_set (data, (SV *)av);
1864 api_ready (aTHX_ coro);
1865 SvREFCNT_dec (coro);
1866 2112
1867 /* better take a full copy of the arguments */ 2113 /* better take a full copy of the arguments */
1868 while (items--) 2114 while (items--)
1869 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);
1870 } 2119 }
1871 2120
1872 XSRETURN_EMPTY; 2121 XSRETURN_EMPTY;
1873} 2122}
1874 2123
1891 2140
1892 EXTEND (SP, AvFILLp (av) + 1); 2141 EXTEND (SP, AvFILLp (av) + 1);
1893 for (i = 0; i <= AvFILLp (av); ++i) 2142 for (i = 0; i <= AvFILLp (av); ++i)
1894 PUSHs (sv_2mortal (AvARRAY (av)[i])); 2143 PUSHs (sv_2mortal (AvARRAY (av)[i]));
1895 2144
1896 /* 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 */
1897 AvFILLp (av) = -1; 2146 AvFILLp (av) = -1;
1898 av_undef (av); 2147 av_undef (av);
1899 2148
1900 PUTBACK; 2149 PUTBACK;
1901 } 2150 }
2188 } 2437 }
2189 else 2438 else
2190 slf_argc = 0; 2439 slf_argc = 0;
2191 2440
2192 PL_op->op_ppaddr = pp_slf; 2441 PL_op->op_ppaddr = pp_slf;
2193 PL_op->op_type = OP_CUSTOM; /* maybe we should leave it at entersub? */ 2442 /*PL_op->op_type = OP_CUSTOM; /* we do behave like entersub still */
2194 2443
2195 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));
2196} 2492}
2197 2493
2198/*****************************************************************************/ 2494/*****************************************************************************/
2199/* PerlIO::cede */ 2495/* PerlIO::cede */
2200 2496
2274/* Coro::Semaphore & Coro::Signal */ 2570/* Coro::Semaphore & Coro::Signal */
2275 2571
2276static SV * 2572static SV *
2277coro_waitarray_new (pTHX_ int count) 2573coro_waitarray_new (pTHX_ int count)
2278{ 2574{
2279 /* 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 */
2280 AV *av = newAV (); 2576 AV *av = newAV ();
2281 SV **ary; 2577 SV **ary;
2282 2578
2283 /* unfortunately, building manually saves memory */ 2579 /* unfortunately, building manually saves memory */
2284 Newx (ary, 2, SV *); 2580 Newx (ary, 2, SV *);
2285 AvALLOC (av) = ary; 2581 AvALLOC (av) = ary;
2582#if PERL_VERSION_ATLEAST (5,10,0)
2286 /*AvARRAY (av) = ary;*/ 2583 AvARRAY (av) = ary;
2584#else
2287 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
2288 AvMAX (av) = 1; 2589 AvMAX (av) = 1;
2289 AvFILLp (av) = 0; 2590 AvFILLp (av) = 0;
2290 ary [0] = newSViv (count); 2591 ary [0] = newSViv (count);
2291 2592
2292 return newRV_noinc ((SV *)av); 2593 return newRV_noinc ((SV *)av);
2423 { 2724 {
2424 /* callback form */ 2725 /* callback form */
2425 AV *av = (AV *)SvRV (arg [0]); 2726 AV *av = (AV *)SvRV (arg [0]);
2426 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 2727 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]);
2427 2728
2428 av_push (av, (SV *)SvREFCNT_inc_NN (cb_cv)); 2729 av_push (av, SvREFCNT_inc_NN (cb_cv));
2429 2730
2430 if (SvIVX (AvARRAY (av)[0]) > 0) 2731 if (SvIVX (AvARRAY (av)[0]) > 0)
2431 coro_semaphore_adjust (aTHX_ av, 0); 2732 coro_semaphore_adjust (aTHX_ av, 0);
2432 2733
2433 frame->prepare = prepare_nop; 2734 frame->prepare = prepare_nop;
2457 AvARRAY (av)[0] = AvARRAY (av)[1]; 2758 AvARRAY (av)[0] = AvARRAY (av)[1];
2458 AvARRAY (av)[1] = cb; 2759 AvARRAY (av)[1] = cb;
2459 2760
2460 cb = av_shift (av); 2761 cb = av_shift (av);
2461 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 {
2462 api_ready (aTHX_ cb); 2773 api_ready (aTHX_ cb);
2463 sv_setiv (cb, 0); /* signal waiter */ 2774 sv_setiv (cb, 0); /* signal waiter */
2775 }
2776
2464 SvREFCNT_dec (cb); 2777 SvREFCNT_dec (cb);
2465 2778
2466 --count; 2779 --count;
2467 } 2780 }
2468} 2781}
2477static void 2790static void
2478slf_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)
2479{ 2792{
2480 AV *av = (AV *)SvRV (arg [0]); 2793 AV *av = (AV *)SvRV (arg [0]);
2481 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
2482 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]))
2483 { 2807 {
2484 SvIVX (AvARRAY (av)[0]) = 0; 2808 SvIVX (AvARRAY (av)[0]) = 0;
2485 frame->prepare = prepare_nop; 2809 frame->prepare = prepare_nop;
2486 frame->check = slf_check_nop; 2810 frame->check = slf_check_nop;
2487 } 2811 }
2488 else 2812 else
2489 { 2813 {
2490 SV *waiter = newRV_inc (SvRV (coro_current)); /* owned by signal av */ 2814 SV *waiter = newSVsv (coro_current); /* owned by signal av */
2491 2815
2492 av_push (av, waiter); 2816 av_push (av, waiter);
2493 2817
2494 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 */
2495 frame->prepare = prepare_schedule; 2819 frame->prepare = prepare_schedule;
2662 XSRETURN_EMPTY; 2986 XSRETURN_EMPTY;
2663} 2987}
2664 2988
2665/*****************************************************************************/ 2989/*****************************************************************************/
2666 2990
2991#if CORO_CLONE
2992# include "clone.c"
2993#endif
2994
2667MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 2995MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2668 2996
2669PROTOTYPES: DISABLE 2997PROTOTYPES: DISABLE
2670 2998
2671BOOT: 2999BOOT:
2675 coro_thx = PERL_GET_CONTEXT; 3003 coro_thx = PERL_GET_CONTEXT;
2676# endif 3004# endif
2677#endif 3005#endif
2678 BOOT_PAGESIZE; 3006 BOOT_PAGESIZE;
2679 3007
3008 cctx_current = cctx_new_empty ();
3009
2680 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3010 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
2681 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3011 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
2682 3012
2683 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;
2684 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set; 3014 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set;
2703 3033
2704 { 3034 {
2705 SV *slf = sv_2mortal (newSViv (PTR2IV (pp_slf))); 3035 SV *slf = sv_2mortal (newSViv (PTR2IV (pp_slf)));
2706 3036
2707 if (!PL_custom_op_names) PL_custom_op_names = newHV (); 3037 if (!PL_custom_op_names) PL_custom_op_names = newHV ();
2708 hv_store_ent (PL_custom_op_names, slf, 3038 hv_store_ent (PL_custom_op_names, slf, newSVpv ("coro_slf", 0), 0);
2709 newSVpv ("coro_slf", 0), 0);
2710 3039
2711 if (!PL_custom_op_descs) PL_custom_op_descs = newHV (); 3040 if (!PL_custom_op_descs) PL_custom_op_descs = newHV ();
2712 hv_store_ent (PL_custom_op_descs, slf, 3041 hv_store_ent (PL_custom_op_descs, slf, newSVpv ("coro schedule like function", 0), 0);
2713 newSVpv ("coro schedule like function", 0), 0);
2714 } 3042 }
2715 3043
2716 coroapi.ver = CORO_API_VERSION; 3044 coroapi.ver = CORO_API_VERSION;
2717 coroapi.rev = CORO_API_REVISION; 3045 coroapi.rev = CORO_API_REVISION;
2718 3046
2730 3058
2731 if (!svp) croak ("Time::HiRes is required"); 3059 if (!svp) croak ("Time::HiRes is required");
2732 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer"); 3060 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
2733 3061
2734 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 (double (*)(), SvIV (*svp));
2735 } 3066 }
2736 3067
2737 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 3068 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
2738} 3069}
2739 3070
2740SV * 3071SV *
2741new (char *klass, ...) 3072new (char *klass, ...)
2742 ALIAS: 3073 ALIAS:
2811void 3142void
2812_exit (int code) 3143_exit (int code)
2813 PROTOTYPE: $ 3144 PROTOTYPE: $
2814 CODE: 3145 CODE:
2815 _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
2816 3166
2817int 3167int
2818cctx_stacksize (int new_stacksize = 0) 3168cctx_stacksize (int new_stacksize = 0)
2819 PROTOTYPE: ;$ 3169 PROTOTYPE: ;$
2820 CODE: 3170 CODE:
2870 eval = 1 3220 eval = 1
2871 CODE: 3221 CODE:
2872{ 3222{
2873 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3223 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
2874 { 3224 {
2875 struct coro temp; 3225 struct coro *current = SvSTATE_current;
2876 3226
2877 if (!(coro->flags & CF_RUNNING)) 3227 if (current != coro)
2878 { 3228 {
2879 PUTBACK; 3229 PUTBACK;
2880 save_perl (aTHX_ &temp); 3230 save_perl (aTHX_ current);
2881 load_perl (aTHX_ coro); 3231 load_perl (aTHX_ coro);
3232 SPAGAIN;
2882 } 3233 }
2883 3234
2884 {
2885 dSP;
2886 ENTER;
2887 SAVETMPS;
2888 PUTBACK;
2889 PUSHSTACK; 3235 PUSHSTACK;
3236
2890 PUSHMARK (SP); 3237 PUSHMARK (SP);
3238 PUTBACK;
2891 3239
2892 if (ix) 3240 if (ix)
2893 eval_sv (coderef, 0); 3241 eval_sv (coderef, 0);
2894 else 3242 else
2895 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 3243 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
2896 3244
2897 POPSTACK; 3245 POPSTACK;
2898 SPAGAIN; 3246 SPAGAIN;
2899 FREETMPS;
2900 LEAVE;
2901 PUTBACK;
2902 }
2903 3247
2904 if (!(coro->flags & CF_RUNNING)) 3248 if (current != coro)
2905 { 3249 {
3250 PUTBACK;
2906 save_perl (aTHX_ coro); 3251 save_perl (aTHX_ coro);
2907 load_perl (aTHX_ &temp); 3252 load_perl (aTHX_ current);
2908 SPAGAIN; 3253 SPAGAIN;
2909 } 3254 }
2910 } 3255 }
2911} 3256}
2912 3257
2916 ALIAS: 3261 ALIAS:
2917 is_ready = CF_READY 3262 is_ready = CF_READY
2918 is_running = CF_RUNNING 3263 is_running = CF_RUNNING
2919 is_new = CF_NEW 3264 is_new = CF_NEW
2920 is_destroyed = CF_DESTROYED 3265 is_destroyed = CF_DESTROYED
3266 is_suspended = CF_SUSPENDED
2921 CODE: 3267 CODE:
2922 RETVAL = boolSV (coro->flags & ix); 3268 RETVAL = boolSV (coro->flags & ix);
2923 OUTPUT: 3269 OUTPUT:
2924 RETVAL 3270 RETVAL
2925 3271
2929 CODE: 3275 CODE:
2930{ 3276{
2931 struct coro *current = SvSTATE_current; 3277 struct coro *current = SvSTATE_current;
2932 SV **throwp = self == current ? &CORO_THROW : &self->except; 3278 SV **throwp = self == current ? &CORO_THROW : &self->except;
2933 SvREFCNT_dec (*throwp); 3279 SvREFCNT_dec (*throwp);
3280 SvGETMAGIC (throw);
2934 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3281 *throwp = SvOK (throw) ? newSVsv (throw) : 0;
2935} 3282}
2936 3283
2937void 3284void
2938api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3285api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
2941 3288
2942SV * 3289SV *
2943has_cctx (Coro::State coro) 3290has_cctx (Coro::State coro)
2944 PROTOTYPE: $ 3291 PROTOTYPE: $
2945 CODE: 3292 CODE:
2946 RETVAL = boolSV (!!coro->cctx); 3293 /* maybe manage the running flag differently */
3294 RETVAL = boolSV (!!coro->cctx || (coro->flags & CF_RUNNING));
2947 OUTPUT: 3295 OUTPUT:
2948 RETVAL 3296 RETVAL
2949 3297
2950int 3298int
2951is_traced (Coro::State coro) 3299is_traced (Coro::State coro)
2971 3319
2972void 3320void
2973force_cctx () 3321force_cctx ()
2974 PROTOTYPE: 3322 PROTOTYPE:
2975 CODE: 3323 CODE:
2976 SvSTATE_current->cctx->idle_sp = 0; 3324 cctx_current->idle_sp = 0;
2977 3325
2978void 3326void
2979swap_defsv (Coro::State self) 3327swap_defsv (Coro::State self)
2980 PROTOTYPE: $ 3328 PROTOTYPE: $
2981 ALIAS: 3329 ALIAS:
2989 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv; 3337 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
2990 3338
2991 SV *tmp = *src; *src = *dst; *dst = tmp; 3339 SV *tmp = *src; *src = *dst; *dst = tmp;
2992 } 3340 }
2993 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}
2994 3385
2995MODULE = Coro::State PACKAGE = Coro 3386MODULE = Coro::State PACKAGE = Coro
2996 3387
2997BOOT: 3388BOOT:
2998{ 3389{
2999 int i;
3000
3001 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3002 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3390 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3003 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3391 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3004 cv_coro_run = get_cv ( "Coro::_terminate", GV_ADD); 3392 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3005 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD); 3393 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3006 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);
3395 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3396 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3397 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3398 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3007 3399
3008 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);
3009 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3401 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3010 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);
3011 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);
3012 3404
3013 coro_stash = gv_stashpv ("Coro", TRUE); 3405 coro_stash = gv_stashpv ("Coro", TRUE);
3014 3406
3015 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 3407 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3016 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 3408 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3017 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 3409 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
3018 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 3410 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (CORO_PRIO_LOW));
3019 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE)); 3411 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (CORO_PRIO_IDLE));
3020 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN)); 3412 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (CORO_PRIO_MIN));
3021
3022 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
3023 coro_ready[i] = newAV ();
3024 3413
3025 { 3414 {
3026 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 3415 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
3027 3416
3028 coroapi.schedule = api_schedule; 3417 coroapi.schedule = api_schedule;
3039 SvREADONLY_on (sv); 3428 SvREADONLY_on (sv);
3040 } 3429 }
3041} 3430}
3042 3431
3043void 3432void
3433terminate (...)
3434 CODE:
3435 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3436
3437void
3044schedule (...) 3438schedule (...)
3045 CODE: 3439 CODE:
3046 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3440 CORO_EXECUTE_SLF_XS (slf_init_schedule);
3047 3441
3048void 3442void
3075void 3469void
3076_set_readyhook (SV *hook) 3470_set_readyhook (SV *hook)
3077 PROTOTYPE: $ 3471 PROTOTYPE: $
3078 CODE: 3472 CODE:
3079 SvREFCNT_dec (coro_readyhook); 3473 SvREFCNT_dec (coro_readyhook);
3474 SvGETMAGIC (hook);
3080 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0; 3475 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0;
3081 3476
3082int 3477int
3083prio (Coro::State coro, int newprio = 0) 3478prio (Coro::State coro, int newprio = 0)
3084 PROTOTYPE: $;$ 3479 PROTOTYPE: $;$
3091 if (items > 1) 3486 if (items > 1)
3092 { 3487 {
3093 if (ix) 3488 if (ix)
3094 newprio = coro->prio - newprio; 3489 newprio = coro->prio - newprio;
3095 3490
3096 if (newprio < PRIO_MIN) newprio = PRIO_MIN; 3491 if (newprio < CORO_PRIO_MIN) newprio = CORO_PRIO_MIN;
3097 if (newprio > PRIO_MAX) newprio = PRIO_MAX; 3492 if (newprio > CORO_PRIO_MAX) newprio = CORO_PRIO_MAX;
3098 3493
3099 coro->prio = newprio; 3494 coro->prio = newprio;
3100 } 3495 }
3101} 3496}
3102 OUTPUT: 3497 OUTPUT:
3115 PROTOTYPE: 3510 PROTOTYPE:
3116 CODE: 3511 CODE:
3117 RETVAL = coro_nready; 3512 RETVAL = coro_nready;
3118 OUTPUT: 3513 OUTPUT:
3119 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;
3120 3527
3121void 3528void
3122_pool_handler (...) 3529_pool_handler (...)
3123 CODE: 3530 CODE:
3124 CORO_EXECUTE_SLF_XS (slf_init_pool_handler); 3531 CORO_EXECUTE_SLF_XS (slf_init_pool_handler);
3179rouse_wait (...) 3586rouse_wait (...)
3180 PROTOTYPE: ;$ 3587 PROTOTYPE: ;$
3181 PPCODE: 3588 PPCODE:
3182 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait); 3589 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait);
3183 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
3184 3616
3185MODULE = Coro::State PACKAGE = PerlIO::cede 3617MODULE = Coro::State PACKAGE = PerlIO::cede
3186 3618
3187BOOT: 3619BOOT:
3188 PerlIO_define_layer (aTHX_ &PerlIO_cede); 3620 PerlIO_define_layer (aTHX_ &PerlIO_cede);
3191MODULE = Coro::State PACKAGE = Coro::Semaphore 3623MODULE = Coro::State PACKAGE = Coro::Semaphore
3192 3624
3193SV * 3625SV *
3194new (SV *klass, SV *count = 0) 3626new (SV *klass, SV *count = 0)
3195 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
3196 RETVAL = sv_bless ( 3639 RETVAL = sv_bless (
3197 coro_waitarray_new (aTHX_ count && SvOK (count) ? SvIV (count) : 1), 3640 coro_waitarray_new (aTHX_ semcnt),
3198 GvSTASH (CvGV (cv)) 3641 GvSTASH (CvGV (cv))
3199 ); 3642 );
3643}
3200 OUTPUT: 3644 OUTPUT:
3201 RETVAL 3645 RETVAL
3202 3646
3203# helper for Coro::Channel 3647# helper for Coro::Channel and others
3204SV * 3648SV *
3205_alloc (int count) 3649_alloc (int count)
3206 CODE: 3650 CODE:
3207 RETVAL = coro_waitarray_new (aTHX_ count); 3651 RETVAL = coro_waitarray_new (aTHX_ count);
3208 OUTPUT: 3652 OUTPUT:
3266 for (i = 1; i <= wcount; ++i) 3710 for (i = 1; i <= wcount; ++i)
3267 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i]))); 3711 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i])));
3268 } 3712 }
3269} 3713}
3270 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
3271MODULE = Coro::State PACKAGE = Coro::Signal 3731MODULE = Coro::State PACKAGE = Coro::Signal
3272 3732
3273SV * 3733SV *
3274new (SV *klass) 3734new (SV *klass)
3275 CODE: 3735 CODE:

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines