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.312 by root, Thu Nov 20 03:10:30 2008 UTC vs.
Revision 1.361 by root, Wed Jul 1 07:26:40 2009 UTC

98# define newSV(l) NEWSV(0,l) 98# define newSV(l) NEWSV(0,l)
99#endif 99#endif
100#ifndef CvISXSUB_on 100#ifndef CvISXSUB_on
101# define CvISXSUB_on(cv) (void)cv 101# define CvISXSUB_on(cv) (void)cv
102#endif 102#endif
103#ifndef CvISXSUB
104# define CvISXSUB(cv) (CvXSUB (cv) ? TRUE : FALSE)
105#endif
106#ifndef Newx
107# define Newx(ptr,nitems,type) New (0,ptr,nitems,type)
108#endif
103 109
104/* 5.8.7 */ 110/* 5.8.7 */
105#ifndef SvRV_set 111#ifndef SvRV_set
106# define SvRV_set(s,v) SvRV(s) = (v) 112# define SvRV_set(s,v) SvRV(s) = (v)
107#endif 113#endif
127#else 133#else
128# define dSTACKLEVEL volatile void *stacklevel 134# define dSTACKLEVEL volatile void *stacklevel
129# define STACKLEVEL ((void *)&stacklevel) 135# define STACKLEVEL ((void *)&stacklevel)
130#endif 136#endif
131 137
132#define IN_DESTRUCT (PL_main_cv == Nullcv) 138#define IN_DESTRUCT PL_dirty
133 139
134#if __GNUC__ >= 3 140#if __GNUC__ >= 3
135# define attribute(x) __attribute__(x) 141# define attribute(x) __attribute__(x)
136# define expect(expr,value) __builtin_expect ((expr),(value)) 142# define expect(expr,value) __builtin_expect ((expr), (value))
137# define INLINE static inline 143# define INLINE static inline
138#else 144#else
139# define attribute(x) 145# define attribute(x)
140# define expect(expr,value) (expr) 146# define expect(expr,value) (expr)
141# define INLINE static 147# define INLINE static
153# if CORO_PTHREAD 159# if CORO_PTHREAD
154static void *coro_thx; 160static void *coro_thx;
155# endif 161# endif
156#endif 162#endif
157 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
158static 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]);
159 176
160/* we hijack an hopefully unused CV flag for our purposes */ 177/* we hijack an hopefully unused CV flag for our purposes */
161#define CVf_SLF 0x4000 178#define CVf_SLF 0x4000
162static OP *pp_slf (pTHX); 179static OP *pp_slf (pTHX);
163 180
167static AV *main_mainstack; /* used to differentiate between $main and others */ 184static AV *main_mainstack; /* used to differentiate between $main and others */
168static JMPENV *main_top_env; 185static JMPENV *main_top_env;
169static HV *coro_state_stash, *coro_stash; 186static HV *coro_state_stash, *coro_stash;
170static volatile SV *coro_mortal; /* will be freed/thrown after next transfer */ 187static volatile SV *coro_mortal; /* will be freed/thrown after next transfer */
171 188
189static AV *av_destroy; /* destruction queue */
190static SV *sv_manager; /* the manager coro */
191static SV *sv_idle; /* $Coro::idle */
192
172static GV *irsgv; /* $/ */ 193static GV *irsgv; /* $/ */
173static GV *stdoutgv; /* *STDOUT */ 194static GV *stdoutgv; /* *STDOUT */
174static SV *rv_diehook; 195static SV *rv_diehook;
175static SV *rv_warnhook; 196static SV *rv_warnhook;
176static HV *hv_sig; /* %SIG */ 197static HV *hv_sig; /* %SIG */
177 198
178/* async_pool helper stuff */ 199/* async_pool helper stuff */
179static SV *sv_pool_rss; 200static SV *sv_pool_rss;
180static SV *sv_pool_size; 201static SV *sv_pool_size;
181static SV *sv_async_pool_idle; 202static SV *sv_async_pool_idle; /* description string */
182static AV *av_async_pool; 203static AV *av_async_pool; /* idle pool */
183static SV *sv_Coro; 204static SV *sv_Coro; /* class string */
184static CV *cv_pool_handler; 205static CV *cv_pool_handler;
185static CV *cv_coro_new; 206static CV *cv_coro_state_new;
186 207
187/* Coro::AnyEvent */ 208/* Coro::AnyEvent */
188static 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;
189 216
190static struct coro_cctx *cctx_first; 217static struct coro_cctx *cctx_first;
191static int cctx_count, cctx_idle; 218static int cctx_count, cctx_idle;
192 219
193enum { 220enum {
219 int valgrind_id; 246 int valgrind_id;
220#endif 247#endif
221 unsigned char flags; 248 unsigned char flags;
222} coro_cctx; 249} coro_cctx;
223 250
251coro_cctx *cctx_current; /* the currently running cctx */
252
253/*****************************************************************************/
254
224enum { 255enum {
225 CF_RUNNING = 0x0001, /* coroutine is running */ 256 CF_RUNNING = 0x0001, /* coroutine is running */
226 CF_READY = 0x0002, /* coroutine is ready */ 257 CF_READY = 0x0002, /* coroutine is ready */
227 CF_NEW = 0x0004, /* has never been switched to */ 258 CF_NEW = 0x0004, /* has never been switched to */
228 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 */
229}; 261};
230 262
231/* 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 */
232typedef struct 264typedef struct
233{ 265{
234 SV *defsv; 266 SV *defsv;
235 AV *defav; 267 AV *defav;
236 SV *errsv; 268 SV *errsv;
237 SV *irsgv; 269 SV *irsgv;
270 HV *hinthv;
238#define VAR(name,type) type name; 271#define VAR(name,type) type name;
239# include "state.h" 272# include "state.h"
240#undef VAR 273#undef VAR
241} perl_slots; 274} perl_slots;
242 275
244 277
245/* this is a structure representing a perl-level coroutine */ 278/* this is a structure representing a perl-level coroutine */
246struct coro { 279struct coro {
247 /* the C coroutine allocated to this perl coroutine, if any */ 280 /* the C coroutine allocated to this perl coroutine, if any */
248 coro_cctx *cctx; 281 coro_cctx *cctx;
282
283 /* ready queue */
284 struct coro *next_ready;
249 285
250 /* state data */ 286 /* state data */
251 struct CoroSLF slf_frame; /* saved slf frame */ 287 struct CoroSLF slf_frame; /* saved slf frame */
252 AV *mainstack; 288 AV *mainstack;
253 perl_slots *slot; /* basically the saved sp */ 289 perl_slots *slot; /* basically the saved sp */
270 /* async_pool */ 306 /* async_pool */
271 SV *saved_deffh; 307 SV *saved_deffh;
272 SV *invoke_cb; 308 SV *invoke_cb;
273 AV *invoke_av; 309 AV *invoke_av;
274 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
275 /* linked list */ 318 /* linked list */
276 struct coro *next, *prev; 319 struct coro *next, *prev;
277}; 320};
278 321
279typedef struct coro *Coro__State; 322typedef struct coro *Coro__State;
284/* the mainr easonw e don't support windows process emulation */ 327/* the mainr easonw e don't support windows process emulation */
285static struct CoroSLF slf_frame; /* the current slf frame */ 328static struct CoroSLF slf_frame; /* the current slf frame */
286 329
287/** Coro ********************************************************************/ 330/** Coro ********************************************************************/
288 331
289#define PRIO_MAX 3 332#define CORO_PRIO_MAX 3
290#define PRIO_HIGH 1 333#define CORO_PRIO_HIGH 1
291#define PRIO_NORMAL 0 334#define CORO_PRIO_NORMAL 0
292#define PRIO_LOW -1 335#define CORO_PRIO_LOW -1
293#define PRIO_IDLE -3 336#define CORO_PRIO_IDLE -3
294#define PRIO_MIN -4 337#define CORO_PRIO_MIN -4
295 338
296/* for Coro.pm */ 339/* for Coro.pm */
297static SV *coro_current; 340static SV *coro_current;
298static SV *coro_readyhook; 341static SV *coro_readyhook;
299static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1]; 342static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
300static CV *cv_coro_run, *cv_coro_terminate; 343static CV *cv_coro_run, *cv_coro_terminate;
301static struct coro *coro_first; 344static struct coro *coro_first;
302#define coro_nready coroapi.nready 345#define coro_nready coroapi.nready
303 346
304/** lowlevel stuff **********************************************************/ 347/** lowlevel stuff **********************************************************/
337INLINE CV * 380INLINE CV *
338coro_sv_2cv (pTHX_ SV *sv) 381coro_sv_2cv (pTHX_ SV *sv)
339{ 382{
340 HV *st; 383 HV *st;
341 GV *gvp; 384 GV *gvp;
342 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;
343} 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 */
344 491
345static AV * 492static AV *
346coro_clone_padlist (pTHX_ CV *cv) 493coro_derive_padlist (pTHX_ CV *cv)
347{ 494{
348 AV *padlist = CvPADLIST (cv); 495 AV *padlist = CvPADLIST (cv);
349 AV *newpadlist, *newpad; 496 AV *newpadlist, *newpad;
350 497
351 newpadlist = newAV (); 498 newpadlist = newAV ();
356 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 503 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
357#endif 504#endif
358 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 505 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
359 --AvFILLp (padlist); 506 --AvFILLp (padlist);
360 507
361 av_store (newpadlist, 0, SvREFCNT_inc_NN (*av_fetch (padlist, 0, FALSE))); 508 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0]));
362 av_store (newpadlist, 1, (SV *)newpad); 509 av_store (newpadlist, 1, (SV *)newpad);
363 510
364 return newpadlist; 511 return newpadlist;
365} 512}
366 513
367static void 514static void
368free_padlist (pTHX_ AV *padlist) 515free_padlist (pTHX_ AV *padlist)
369{ 516{
370 /* may be during global destruction */ 517 /* may be during global destruction */
371 if (SvREFCNT (padlist)) 518 if (!IN_DESTRUCT)
372 { 519 {
373 I32 i = AvFILLp (padlist); 520 I32 i = AvFILLp (padlist);
374 while (i >= 0) 521
522 while (i > 0) /* special-case index 0 */
375 { 523 {
376 SV **svp = av_fetch (padlist, i--, FALSE); 524 /* we try to be extra-careful here */
377 if (svp) 525 AV *av = (AV *)AvARRAY (padlist)[i--];
378 { 526 I32 j = AvFILLp (av);
379 SV *sv; 527
380 while (&PL_sv_undef != (sv = av_pop ((AV *)*svp))) 528 while (j >= 0)
529 SvREFCNT_dec (AvARRAY (av)[j--]);
530
531 AvFILLp (av) = -1;
381 SvREFCNT_dec (sv); 532 SvREFCNT_dec (av);
382
383 SvREFCNT_dec (*svp);
384 }
385 } 533 }
386 534
535 SvREFCNT_dec (AvARRAY (padlist)[0]);
536
537 AvFILLp (padlist) = -1;
387 SvREFCNT_dec ((SV*)padlist); 538 SvREFCNT_dec ((SV*)padlist);
388 } 539 }
389} 540}
390 541
391static int 542static int
392coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 543coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
393{ 544{
394 AV *padlist; 545 AV *padlist;
395 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;
396 551
397 /* casting is fun. */ 552 /* casting is fun. */
398 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 553 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
399 free_padlist (aTHX_ padlist); 554 free_padlist (aTHX_ padlist);
400 555
401 SvREFCNT_dec (av); /* sv_magicext increased the refcount */ 556 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
402 557
403 return 0; 558 return 0;
404} 559}
405
406#define CORO_MAGIC_type_cv 26
407#define CORO_MAGIC_type_state PERL_MAGIC_ext
408 560
409static MGVTBL coro_cv_vtbl = { 561static MGVTBL coro_cv_vtbl = {
410 0, 0, 0, 0, 562 0, 0, 0, 0,
411 coro_cv_free 563 coro_cv_free
412}; 564};
413
414#define CORO_MAGIC_NN(sv, type) \
415 (expect_true (SvMAGIC (sv)->mg_type == type) \
416 ? SvMAGIC (sv) \
417 : mg_find (sv, type))
418
419#define CORO_MAGIC(sv, type) \
420 (expect_true (SvMAGIC (sv)) \
421 ? CORO_MAGIC_NN (sv, type) \
422 : 0)
423
424#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
425#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
426
427INLINE struct coro *
428SvSTATE_ (pTHX_ SV *coro)
429{
430 HV *stash;
431 MAGIC *mg;
432
433 if (SvROK (coro))
434 coro = SvRV (coro);
435
436 if (expect_false (SvTYPE (coro) != SVt_PVHV))
437 croak ("Coro::State object required");
438
439 stash = SvSTASH (coro);
440 if (expect_false (stash != coro_stash && stash != coro_state_stash))
441 {
442 /* very slow, but rare, check */
443 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
444 croak ("Coro::State object required");
445 }
446
447 mg = CORO_MAGIC_state (coro);
448 return (struct coro *)mg->mg_ptr;
449}
450
451#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
452
453/* faster than SvSTATE, but expects a coroutine hv */
454#define SvSTATE_hv(hv) ((struct coro *)CORO_MAGIC_NN ((SV *)hv, CORO_MAGIC_type_state)->mg_ptr)
455#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
456 565
457/* the next two functions merely cache the padlists */ 566/* the next two functions merely cache the padlists */
458static void 567static void
459get_padlist (pTHX_ CV *cv) 568get_padlist (pTHX_ CV *cv)
460{ 569{
471 CV *cp = Perl_cv_clone (aTHX_ cv); 580 CV *cp = Perl_cv_clone (aTHX_ cv);
472 CvPADLIST (cv) = CvPADLIST (cp); 581 CvPADLIST (cv) = CvPADLIST (cp);
473 CvPADLIST (cp) = 0; 582 CvPADLIST (cp) = 0;
474 SvREFCNT_dec (cp); 583 SvREFCNT_dec (cp);
475#else 584#else
476 CvPADLIST (cv) = coro_clone_padlist (aTHX_ cv); 585 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
477#endif 586#endif
478 } 587 }
479} 588}
480 589
481static void 590static void
488 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);
489 598
490 av = (AV *)mg->mg_obj; 599 av = (AV *)mg->mg_obj;
491 600
492 if (expect_false (AvFILLp (av) >= AvMAX (av))) 601 if (expect_false (AvFILLp (av) >= AvMAX (av)))
493 av_extend (av, AvMAX (av) + 1); 602 av_extend (av, AvFILLp (av) + 1);
494 603
495 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 604 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
496} 605}
497 606
498/** load & save, init *******************************************************/ 607/** load & save, init *******************************************************/
608
609static void
610on_enterleave_call (pTHX_ SV *cb);
499 611
500static void 612static void
501load_perl (pTHX_ Coro__State c) 613load_perl (pTHX_ Coro__State c)
502{ 614{
503 perl_slots *slot = c->slot; 615 perl_slots *slot = c->slot;
504 c->slot = 0; 616 c->slot = 0;
505 617
506 PL_mainstack = c->mainstack; 618 PL_mainstack = c->mainstack;
507 619
508 GvSV (PL_defgv) = slot->defsv; 620 GvSV (PL_defgv) = slot->defsv;
509 GvAV (PL_defgv) = slot->defav; 621 GvAV (PL_defgv) = slot->defav;
510 GvSV (PL_errgv) = slot->errsv; 622 GvSV (PL_errgv) = slot->errsv;
511 GvSV (irsgv) = slot->irsgv; 623 GvSV (irsgv) = slot->irsgv;
624 GvHV (PL_hintgv) = slot->hinthv;
512 625
513 #define VAR(name,type) PL_ ## name = slot->name; 626 #define VAR(name,type) PL_ ## name = slot->name;
514 # include "state.h" 627 # include "state.h"
515 #undef VAR 628 #undef VAR
516 629
530 PUTBACK; 643 PUTBACK;
531 } 644 }
532 645
533 slf_frame = c->slf_frame; 646 slf_frame = c->slf_frame;
534 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 }
535} 664}
536 665
537static void 666static void
538save_perl (pTHX_ Coro__State c) 667save_perl (pTHX_ Coro__State c)
539{ 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
540 c->except = CORO_THROW; 685 c->except = CORO_THROW;
541 c->slf_frame = slf_frame; 686 c->slf_frame = slf_frame;
542 687
543 { 688 {
544 dSP; 689 dSP;
557 { 702 {
558 while (expect_true (cxix >= 0)) 703 while (expect_true (cxix >= 0))
559 { 704 {
560 PERL_CONTEXT *cx = &ccstk[cxix--]; 705 PERL_CONTEXT *cx = &ccstk[cxix--];
561 706
562 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))
563 { 708 {
564 CV *cv = cx->blk_sub.cv; 709 CV *cv = cx->blk_sub.cv;
565 710
566 if (expect_true (CvDEPTH (cv))) 711 if (expect_true (CvDEPTH (cv)))
567 { 712 {
602 c->mainstack = PL_mainstack; 747 c->mainstack = PL_mainstack;
603 748
604 { 749 {
605 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 750 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
606 751
607 slot->defav = GvAV (PL_defgv); 752 slot->defav = GvAV (PL_defgv);
608 slot->defsv = DEFSV; 753 slot->defsv = DEFSV;
609 slot->errsv = ERRSV; 754 slot->errsv = ERRSV;
610 slot->irsgv = GvSV (irsgv); 755 slot->irsgv = GvSV (irsgv);
756 slot->hinthv = GvHV (PL_hintgv);
611 757
612 #define VAR(name,type) slot->name = PL_ ## name; 758 #define VAR(name,type) slot->name = PL_ ## name;
613 # include "state.h" 759 # include "state.h"
614 #undef VAR 760 #undef VAR
615 } 761 }
742#endif 888#endif
743 889
744/* 890/*
745 * This overrides the default magic get method of %SIG elements. 891 * This overrides the default magic get method of %SIG elements.
746 * 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
747 * 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
748 * readback here. 894 * readback here.
749 * We only do this when the hook is != 0, as they are often set to 0 temporarily,
750 * not expecting this to actually change the hook. This is a potential problem
751 * when a schedule happens then, but we ignore this.
752 */ 895 */
753static int 896static int
754coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 897coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
755{ 898{
756 const char *s = MgPV_nolen_const (mg); 899 const char *s = MgPV_nolen_const (mg);
809 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 952 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
810 953
811 if (svp) 954 if (svp)
812 { 955 {
813 SV *old = *svp; 956 SV *old = *svp;
814 *svp = newSVsv (sv); 957 *svp = SvOK (sv) ? newSVsv (sv) : 0;
815 SvREFCNT_dec (old); 958 SvREFCNT_dec (old);
816 return 0; 959 return 0;
817 } 960 }
818 } 961 }
819 962
829 972
830static int 973static int
831slf_check_nop (pTHX_ struct CoroSLF *frame) 974slf_check_nop (pTHX_ struct CoroSLF *frame)
832{ 975{
833 return 0; 976 return 0;
977}
978
979static int
980slf_check_repeat (pTHX_ struct CoroSLF *frame)
981{
982 return 1;
834} 983}
835 984
836static UNOP coro_setup_op; 985static UNOP coro_setup_op;
837 986
838static 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 */
845 994
846 PL_runops = RUNOPS_DEFAULT; 995 PL_runops = RUNOPS_DEFAULT;
847 PL_curcop = &PL_compiling; 996 PL_curcop = &PL_compiling;
848 PL_in_eval = EVAL_NULL; 997 PL_in_eval = EVAL_NULL;
849 PL_comppad = 0; 998 PL_comppad = 0;
999 PL_comppad_name = 0;
1000 PL_comppad_name_fill = 0;
1001 PL_comppad_name_floor = 0;
850 PL_curpm = 0; 1002 PL_curpm = 0;
851 PL_curpad = 0; 1003 PL_curpad = 0;
852 PL_localizing = 0; 1004 PL_localizing = 0;
853 PL_dirty = 0; 1005 PL_dirty = 0;
854 PL_restartop = 0; 1006 PL_restartop = 0;
855#if PERL_VERSION_ATLEAST (5,10,0) 1007#if PERL_VERSION_ATLEAST (5,10,0)
856 PL_parser = 0; 1008 PL_parser = 0;
857#endif 1009#endif
1010 PL_hints = 0;
858 1011
859 /* recreate the die/warn hooks */ 1012 /* recreate the die/warn hooks */
860 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 );
861 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);
862 1015
863 GvSV (PL_defgv) = newSV (0); 1016 GvSV (PL_defgv) = newSV (0);
864 GvAV (PL_defgv) = coro->args; coro->args = 0; 1017 GvAV (PL_defgv) = coro->args; coro->args = 0;
865 GvSV (PL_errgv) = newSV (0); 1018 GvSV (PL_errgv) = newSV (0);
866 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;
867 PL_rs = newSVsv (GvSV (irsgv)); 1021 PL_rs = newSVsv (GvSV (irsgv));
868 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1022 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
869 1023
870 { 1024 {
871 dSP; 1025 dSP;
889 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 */
890 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 */
891 1045
892 /* 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 */
893 coro_setup_op.op_next = PL_op; 1047 coro_setup_op.op_next = PL_op;
894 coro_setup_op.op_type = OP_CUSTOM; 1048 coro_setup_op.op_type = OP_ENTERSUB;
895 coro_setup_op.op_ppaddr = pp_slf; 1049 coro_setup_op.op_ppaddr = pp_slf;
896 /* 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 */
897 1051
898 PL_op = (OP *)&coro_setup_op; 1052 PL_op = (OP *)&coro_setup_op;
899 1053
900 /* copy throw, in case it was set before coro_setup */ 1054 /* copy throw, in case it was set before coro_setup */
901 CORO_THROW = coro->except; 1055 CORO_THROW = coro->except;
902}
903 1056
1057 if (expect_false (enable_times))
1058 {
1059 coro_times_update ();
1060 coro_times_sub (coro);
1061 }
1062}
1063
904static void 1064static void
905coro_destruct (pTHX_ struct coro *coro) 1065coro_unwind_stacks (pTHX)
906{ 1066{
907 if (!IN_DESTRUCT) 1067 if (!IN_DESTRUCT)
908 { 1068 {
909 /* restore all saved variables and stuff */ 1069 /* restore all saved variables and stuff */
910 LEAVE_SCOPE (0); 1070 LEAVE_SCOPE (0);
918 POPSTACK_TO (PL_mainstack); 1078 POPSTACK_TO (PL_mainstack);
919 1079
920 /* unwind main stack */ 1080 /* unwind main stack */
921 dounwind (-1); 1081 dounwind (-1);
922 } 1082 }
1083}
923 1084
924 SvREFCNT_dec (GvSV (PL_defgv)); 1085static void
925 SvREFCNT_dec (GvAV (PL_defgv)); 1086coro_destruct_perl (pTHX_ struct coro *coro)
926 SvREFCNT_dec (GvSV (PL_errgv)); 1087{
927 SvREFCNT_dec (PL_defoutgv); 1088 SV *svf [9];
928 SvREFCNT_dec (PL_rs);
929 SvREFCNT_dec (GvSV (irsgv));
930 1089
931 SvREFCNT_dec (PL_diehook);
932 SvREFCNT_dec (PL_warnhook);
933 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
934 SvREFCNT_dec (coro->saved_deffh); 1122 SvREFCNT_dec (coro->saved_deffh);
935 SvREFCNT_dec (coro->rouse_cb); 1123 SvREFCNT_dec (coro->rouse_cb);
936 SvREFCNT_dec (coro->invoke_cb); 1124 SvREFCNT_dec (coro->invoke_cb);
937 SvREFCNT_dec (coro->invoke_av); 1125 SvREFCNT_dec (coro->invoke_av);
938 1126 }
939 coro_destruct_stacks (aTHX);
940} 1127}
941 1128
942INLINE void 1129INLINE void
943free_coro_mortal (pTHX) 1130free_coro_mortal (pTHX)
944{ 1131{
952static int 1139static int
953runops_trace (pTHX) 1140runops_trace (pTHX)
954{ 1141{
955 COP *oldcop = 0; 1142 COP *oldcop = 0;
956 int oldcxix = -2; 1143 int oldcxix = -2;
957 struct coro *coro = SvSTATE_current; /* trace cctx is tied to specific coro */
958 coro_cctx *cctx = coro->cctx;
959 1144
960 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX))) 1145 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX)))
961 { 1146 {
962 PERL_ASYNC_CHECK (); 1147 PERL_ASYNC_CHECK ();
963 1148
964 if (cctx->flags & CC_TRACE_ALL) 1149 if (cctx_current->flags & CC_TRACE_ALL)
965 { 1150 {
966 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)
967 { 1152 {
968 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1153 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
969 SV **bot, **top; 1154 SV **bot, **top;
970 AV *av = newAV (); /* return values */ 1155 AV *av = newAV (); /* return values */
971 SV **cb; 1156 SV **cb;
1008 1193
1009 if (PL_curcop != &PL_compiling) 1194 if (PL_curcop != &PL_compiling)
1010 { 1195 {
1011 SV **cb; 1196 SV **cb;
1012 1197
1013 if (oldcxix != cxstack_ix && cctx->flags & CC_TRACE_SUB) 1198 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB)
1014 { 1199 {
1015 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1200 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1016 1201
1017 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1202 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1018 { 1203 {
1019 runops_proc_t old_runops = PL_runops;
1020 dSP; 1204 dSP;
1021 GV *gv = CvGV (cx->blk_sub.cv); 1205 GV *gv = CvGV (cx->blk_sub.cv);
1022 SV *fullname = sv_2mortal (newSV (0)); 1206 SV *fullname = sv_2mortal (newSV (0));
1023 1207
1024 if (isGV (gv)) 1208 if (isGV (gv))
1042 } 1226 }
1043 1227
1044 oldcxix = cxstack_ix; 1228 oldcxix = cxstack_ix;
1045 } 1229 }
1046 1230
1047 if (cctx->flags & CC_TRACE_LINE) 1231 if (cctx_current->flags & CC_TRACE_LINE)
1048 { 1232 {
1049 dSP; 1233 dSP;
1050 1234
1051 PL_runops = RUNOPS_DEFAULT; 1235 PL_runops = RUNOPS_DEFAULT;
1052 ENTER; 1236 ENTER;
1071 1255
1072 TAINT_NOT; 1256 TAINT_NOT;
1073 return 0; 1257 return 0;
1074} 1258}
1075 1259
1076static struct coro_cctx *cctx_ssl_cctx;
1077static struct CoroSLF cctx_ssl_frame; 1260static struct CoroSLF cctx_ssl_frame;
1078 1261
1079static void 1262static void
1080slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta) 1263slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta)
1081{ 1264{
1082 ta->prev = (struct coro *)cctx_ssl_cctx;
1083 ta->next = 0; 1265 ta->prev = 0;
1084} 1266}
1085 1267
1086static int 1268static int
1087slf_check_set_stacklevel (pTHX_ struct CoroSLF *frame) 1269slf_check_set_stacklevel (pTHX_ struct CoroSLF *frame)
1088{ 1270{
1091 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 */
1092} 1274}
1093 1275
1094/* 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 */
1095static void NOINLINE 1277static void NOINLINE
1096cctx_prepare (pTHX_ coro_cctx *cctx) 1278cctx_prepare (pTHX)
1097{ 1279{
1098 PL_top_env = &PL_start_env; 1280 PL_top_env = &PL_start_env;
1099 1281
1100 if (cctx->flags & CC_TRACE) 1282 if (cctx_current->flags & CC_TRACE)
1101 PL_runops = runops_trace; 1283 PL_runops = runops_trace;
1102 1284
1103 /* 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
1104 * that can lead to creation of a new cctx */ 1286 * that can lead to creation of a new cctx */
1105 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)",
1106 slf_frame.prepare && PL_op->op_ppaddr == pp_slf)); 1288 slf_frame.prepare && PL_op->op_ppaddr == pp_slf));
1107 1289
1108 /* 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 */
1109 cctx_ssl_cctx = cctx;
1110 cctx_ssl_frame = slf_frame; 1291 cctx_ssl_frame = slf_frame;
1111 1292
1112 slf_frame.prepare = slf_prepare_set_stacklevel; 1293 slf_frame.prepare = slf_prepare_set_stacklevel;
1113 slf_frame.check = slf_check_set_stacklevel; 1294 slf_frame.check = slf_check_set_stacklevel;
1114} 1295}
1137 /* normally we would need to skip the entersub here */ 1318 /* normally we would need to skip the entersub here */
1138 /* 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 */
1139 /* PL_nop = PL_nop->op_next */ 1320 /* PL_nop = PL_nop->op_next */
1140 1321
1141 /* inject a fake subroutine call to cctx_init */ 1322 /* inject a fake subroutine call to cctx_init */
1142 cctx_prepare (aTHX_ (coro_cctx *)arg); 1323 cctx_prepare (aTHX);
1143 1324
1144 /* cctx_run is the alternative tail of transfer() */ 1325 /* cctx_run is the alternative tail of transfer() */
1145 transfer_tail (aTHX); 1326 transfer_tail (aTHX);
1146 1327
1147 /* 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 */
1155 /* 1336 /*
1156 * 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
1157 * 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)
1158 * 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
1159 * bootstrap-time "top" top_env, as we cannot restore the "main" 1340 * bootstrap-time "top" top_env, as we cannot restore the "main"
1160 * 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.
1161 */ 1344 */
1162 PL_top_env = main_top_env; 1345 PL_top_env = main_top_env;
1163 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 */
1164 } 1347 }
1165} 1348}
1242cctx_destroy (coro_cctx *cctx) 1425cctx_destroy (coro_cctx *cctx)
1243{ 1426{
1244 if (!cctx) 1427 if (!cctx)
1245 return; 1428 return;
1246 1429
1430 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary?
1431
1247 --cctx_count; 1432 --cctx_count;
1248 coro_destroy (&cctx->cctx); 1433 coro_destroy (&cctx->cctx);
1249 1434
1250 /* coro_transfer creates new, empty cctx's */ 1435 /* coro_transfer creates new, empty cctx's */
1251 if (cctx->sptr) 1436 if (cctx->sptr)
1314 /* TODO: throwing up here is considered harmful */ 1499 /* TODO: throwing up here is considered harmful */
1315 1500
1316 if (expect_true (prev != next)) 1501 if (expect_true (prev != next))
1317 { 1502 {
1318 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1503 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1319 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,");
1320 1505
1321 if (expect_false (next->flags & CF_RUNNING))
1322 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states,");
1323
1324 if (expect_false (next->flags & CF_DESTROYED)) 1506 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED)))
1325 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,");
1326 1508
1327#if !PERL_VERSION_ATLEAST (5,10,0) 1509#if !PERL_VERSION_ATLEAST (5,10,0)
1328 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1510 if (expect_false (PL_lex_state != LEX_NOTPARSING))
1329 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,");
1330#endif 1512#endif
1336transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1518transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1337{ 1519{
1338 dSTACKLEVEL; 1520 dSTACKLEVEL;
1339 1521
1340 /* sometimes transfer is only called to set idle_sp */ 1522 /* sometimes transfer is only called to set idle_sp */
1341 if (expect_false (!next)) 1523 if (expect_false (!prev))
1342 { 1524 {
1343 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1525 cctx_current->idle_sp = STACKLEVEL;
1344 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 */
1345 } 1527 }
1346 else if (expect_true (prev != next)) 1528 else if (expect_true (prev != next))
1347 { 1529 {
1348 coro_cctx *prev__cctx; 1530 coro_cctx *cctx_prev;
1349 1531
1350 if (expect_false (prev->flags & CF_NEW)) 1532 if (expect_false (prev->flags & CF_NEW))
1351 { 1533 {
1352 /* create a new empty/source context */ 1534 /* create a new empty/source context */
1353 prev->cctx = cctx_new_empty ();
1354 prev->flags &= ~CF_NEW; 1535 prev->flags &= ~CF_NEW;
1355 prev->flags |= CF_RUNNING; 1536 prev->flags |= CF_RUNNING;
1356 } 1537 }
1357 1538
1358 prev->flags &= ~CF_RUNNING; 1539 prev->flags &= ~CF_RUNNING;
1369 coro_setup (aTHX_ next); 1550 coro_setup (aTHX_ next);
1370 } 1551 }
1371 else 1552 else
1372 load_perl (aTHX_ next); 1553 load_perl (aTHX_ next);
1373 1554
1374 prev__cctx = prev->cctx;
1375
1376 /* possibly untie and reuse the cctx */ 1555 /* possibly untie and reuse the cctx */
1377 if (expect_true ( 1556 if (expect_true (
1378 prev__cctx->idle_sp == STACKLEVEL 1557 cctx_current->idle_sp == STACKLEVEL
1379 && !(prev__cctx->flags & CC_TRACE) 1558 && !(cctx_current->flags & CC_TRACE)
1380 && !force_cctx 1559 && !force_cctx
1381 )) 1560 ))
1382 { 1561 {
1383 /* 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 */
1384 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));
1385 1564
1386 prev->cctx = 0;
1387
1388 /* 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. */
1389 /* 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 */
1390 if (expect_false (CCTX_EXPIRED (prev__cctx))) 1567 if (expect_false (CCTX_EXPIRED (cctx_current)))
1391 if (!next->cctx) 1568 if (expect_true (!next->cctx))
1392 next->cctx = cctx_get (aTHX); 1569 next->cctx = cctx_get (aTHX);
1393 1570
1394 cctx_put (prev__cctx); 1571 cctx_put (cctx_current);
1395 } 1572 }
1573 else
1574 prev->cctx = cctx_current;
1396 1575
1397 ++next->usecount; 1576 ++next->usecount;
1398 1577
1399 if (expect_true (!next->cctx)) 1578 cctx_prev = cctx_current;
1400 next->cctx = cctx_get (aTHX); 1579 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1401 1580
1402 if (expect_false (prev__cctx != next->cctx)) 1581 next->cctx = 0;
1582
1583 if (expect_false (cctx_prev != cctx_current))
1403 { 1584 {
1404 prev__cctx->top_env = PL_top_env; 1585 cctx_prev->top_env = PL_top_env;
1405 PL_top_env = next->cctx->top_env; 1586 PL_top_env = cctx_current->top_env;
1406 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1587 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1407 } 1588 }
1408 1589
1409 transfer_tail (aTHX); 1590 transfer_tail (aTHX);
1410 } 1591 }
1411} 1592}
1419coro_state_destroy (pTHX_ struct coro *coro) 1600coro_state_destroy (pTHX_ struct coro *coro)
1420{ 1601{
1421 if (coro->flags & CF_DESTROYED) 1602 if (coro->flags & CF_DESTROYED)
1422 return 0; 1603 return 0;
1423 1604
1424 if (coro->on_destroy) 1605 if (coro->on_destroy && !PL_dirty)
1425 coro->on_destroy (aTHX_ coro); 1606 coro->on_destroy (aTHX_ coro);
1426 1607
1427 coro->flags |= CF_DESTROYED; 1608 coro->flags |= CF_DESTROYED;
1428 1609
1429 if (coro->flags & CF_READY) 1610 if (coro->flags & CF_READY)
1433 --coro_nready; 1614 --coro_nready;
1434 } 1615 }
1435 else 1616 else
1436 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 */
1437 1618
1438 if (coro->mainstack && coro->mainstack != main_mainstack) 1619 if (coro->mainstack
1439 { 1620 && coro->mainstack != main_mainstack
1440 struct coro temp; 1621 && coro->slot
1441 1622 && !PL_dirty)
1442 assert (("FATAL: tried to destroy currently running coroutine (please report)", !(coro->flags & CF_RUNNING)));
1443
1444 save_perl (aTHX_ &temp);
1445 load_perl (aTHX_ coro);
1446
1447 coro_destruct (aTHX_ coro); 1623 coro_destruct_perl (aTHX_ coro);
1448
1449 load_perl (aTHX_ &temp);
1450
1451 coro->slot = 0;
1452 }
1453 1624
1454 cctx_destroy (coro->cctx); 1625 cctx_destroy (coro->cctx);
1455 SvREFCNT_dec (coro->startcv); 1626 SvREFCNT_dec (coro->startcv);
1456 SvREFCNT_dec (coro->args); 1627 SvREFCNT_dec (coro->args);
1457 SvREFCNT_dec (CORO_THROW); 1628 SvREFCNT_dec (CORO_THROW);
1544/** Coro ********************************************************************/ 1715/** Coro ********************************************************************/
1545 1716
1546INLINE void 1717INLINE void
1547coro_enq (pTHX_ struct coro *coro) 1718coro_enq (pTHX_ struct coro *coro)
1548{ 1719{
1549 av_push (coro_ready [coro->prio - PRIO_MIN], SvREFCNT_inc_NN (coro->hv)); 1720 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1550}
1551 1721
1552INLINE 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 *
1553coro_deq (pTHX) 1730coro_deq (pTHX)
1554{ 1731{
1555 int prio; 1732 int prio;
1556 1733
1557 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; ) 1734 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
1558 if (AvFILLp (coro_ready [prio]) >= 0) 1735 {
1559 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 }
1560 1745
1561 return 0; 1746 return 0;
1562} 1747}
1563 1748
1564static int 1749static int
1566{ 1751{
1567 struct coro *coro; 1752 struct coro *coro;
1568 SV *sv_hook; 1753 SV *sv_hook;
1569 void (*xs_hook)(void); 1754 void (*xs_hook)(void);
1570 1755
1571 if (SvROK (coro_sv))
1572 coro_sv = SvRV (coro_sv);
1573
1574 coro = SvSTATE (coro_sv); 1756 coro = SvSTATE (coro_sv);
1575 1757
1576 if (coro->flags & CF_READY) 1758 if (coro->flags & CF_READY)
1577 return 0; 1759 return 0;
1578 1760
1609api_is_ready (pTHX_ SV *coro_sv) 1791api_is_ready (pTHX_ SV *coro_sv)
1610{ 1792{
1611 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1793 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1612} 1794}
1613 1795
1796/* expects to own a reference to next->hv */
1614INLINE void 1797INLINE void
1615prepare_schedule (pTHX_ struct coro_transfer_args *ta) 1798prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1616{ 1799{
1617 SV *prev_sv, *next_sv;
1618
1619 for (;;)
1620 {
1621 next_sv = coro_deq (aTHX);
1622
1623 /* nothing to schedule: call the idle handler */
1624 if (expect_false (!next_sv))
1625 {
1626 dSP;
1627
1628 ENTER;
1629 SAVETMPS;
1630
1631 PUSHMARK (SP);
1632 PUTBACK;
1633 call_sv (get_sv ("Coro::idle", FALSE), G_VOID | G_DISCARD);
1634
1635 FREETMPS;
1636 LEAVE;
1637 continue;
1638 }
1639
1640 ta->next = SvSTATE_hv (next_sv);
1641
1642 /* cannot transfer to destroyed coros, skip and look for next */
1643 if (expect_false (ta->next->flags & CF_DESTROYED))
1644 {
1645 SvREFCNT_dec (next_sv);
1646 /* coro_nready has already been taken care of by destroy */
1647 continue;
1648 }
1649
1650 --coro_nready;
1651 break;
1652 }
1653
1654 /* free this only after the transfer */
1655 prev_sv = SvRV (coro_current); 1800 SV *prev_sv = SvRV (coro_current);
1801
1656 ta->prev = SvSTATE_hv (prev_sv); 1802 ta->prev = SvSTATE_hv (prev_sv);
1803 ta->next = next;
1804
1657 TRANSFER_CHECK (*ta); 1805 TRANSFER_CHECK (*ta);
1658 assert (("FATAL: next coroutine isn't marked as ready in Coro (please report)", ta->next->flags & CF_READY)); 1806
1659 ta->next->flags &= ~CF_READY;
1660 SvRV_set (coro_current, next_sv); 1807 SvRV_set (coro_current, (SV *)next->hv);
1661 1808
1662 free_coro_mortal (aTHX); 1809 free_coro_mortal (aTHX);
1663 coro_mortal = prev_sv; 1810 coro_mortal = prev_sv;
1664} 1811}
1665 1812
1813static void
1814prepare_schedule (pTHX_ struct coro_transfer_args *ta)
1815{
1816 for (;;)
1817 {
1818 struct coro *next = coro_deq (aTHX);
1819
1820 if (expect_true (next))
1821 {
1822 /* cannot transfer to destroyed coros, skip and look for next */
1823 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED)))
1824 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1825 else
1826 {
1827 next->flags &= ~CF_READY;
1828 --coro_nready;
1829
1830 prepare_schedule_to (aTHX_ ta, next);
1831 break;
1832 }
1833 }
1834 else
1835 {
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 {
1846 dSP;
1847
1848 ENTER;
1849 SAVETMPS;
1850
1851 PUSHMARK (SP);
1852 PUTBACK;
1853 call_sv (sv_idle, G_VOID | G_DISCARD);
1854
1855 FREETMPS;
1856 LEAVE;
1857 }
1858 }
1859 }
1860}
1861
1666INLINE void 1862INLINE void
1667prepare_cede (pTHX_ struct coro_transfer_args *ta) 1863prepare_cede (pTHX_ struct coro_transfer_args *ta)
1668{ 1864{
1669 api_ready (aTHX_ coro_current); 1865 api_ready (aTHX_ coro_current);
1670 prepare_schedule (aTHX_ ta); 1866 prepare_schedule (aTHX_ ta);
1689{ 1885{
1690 struct coro_transfer_args ta; 1886 struct coro_transfer_args ta;
1691 1887
1692 prepare_schedule (aTHX_ &ta); 1888 prepare_schedule (aTHX_ &ta);
1693 TRANSFER (ta, 1); 1889 TRANSFER (ta, 1);
1890}
1891
1892static void
1893api_schedule_to (pTHX_ SV *coro_sv)
1894{
1895 struct coro_transfer_args ta;
1896 struct coro *next = SvSTATE (coro_sv);
1897
1898 SvREFCNT_inc_NN (coro_sv);
1899 prepare_schedule_to (aTHX_ &ta, next);
1694} 1900}
1695 1901
1696static int 1902static int
1697api_cede (pTHX) 1903api_cede (pTHX)
1698{ 1904{
1727static void 1933static void
1728api_trace (pTHX_ SV *coro_sv, int flags) 1934api_trace (pTHX_ SV *coro_sv, int flags)
1729{ 1935{
1730 struct coro *coro = SvSTATE (coro_sv); 1936 struct coro *coro = SvSTATE (coro_sv);
1731 1937
1938 if (coro->flags & CF_RUNNING)
1939 croak ("cannot enable tracing on a running coroutine, caught");
1940
1732 if (flags & CC_TRACE) 1941 if (flags & CC_TRACE)
1733 { 1942 {
1734 if (!coro->cctx) 1943 if (!coro->cctx)
1735 coro->cctx = cctx_new_run (); 1944 coro->cctx = cctx_new_run ();
1736 else if (!(coro->cctx->flags & CC_TRACE)) 1945 else if (!(coro->cctx->flags & CC_TRACE))
1737 croak ("cannot enable tracing on coroutine with custom stack,"); 1946 croak ("cannot enable tracing on coroutine with custom stack, caught");
1738 1947
1739 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL)); 1948 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL));
1740 } 1949 }
1741 else if (coro->cctx && coro->cctx->flags & CC_TRACE) 1950 else if (coro->cctx && coro->cctx->flags & CC_TRACE)
1742 { 1951 {
1747 else 1956 else
1748 coro->slot->runops = RUNOPS_DEFAULT; 1957 coro->slot->runops = RUNOPS_DEFAULT;
1749 } 1958 }
1750} 1959}
1751 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);*/
2016}
2017
1752/*****************************************************************************/ 2018/*****************************************************************************/
1753/* async pool handler */ 2019/* async pool handler */
1754 2020
1755static int 2021static int
1756slf_check_pool_handler (pTHX_ struct CoroSLF *frame) 2022slf_check_pool_handler (pTHX_ struct CoroSLF *frame)
1760 2026
1761 if (!coro->invoke_cb) 2027 if (!coro->invoke_cb)
1762 return 1; /* loop till we have invoke */ 2028 return 1; /* loop till we have invoke */
1763 else 2029 else
1764 { 2030 {
1765 int i, len;
1766
1767 hv_store (hv, "desc", sizeof ("desc") - 1, 2031 hv_store (hv, "desc", sizeof ("desc") - 1,
1768 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0); 2032 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
1769 2033
1770 coro->saved_deffh = SvREFCNT_inc_NN ((SV *)PL_defoutgv); 2034 coro->saved_deffh = SvREFCNT_inc_NN ((SV *)PL_defoutgv);
1771
1772 len = av_len (coro->invoke_av);
1773 2035
1774 { 2036 {
1775 dSP; 2037 dSP;
1776 XPUSHs (sv_2mortal (coro->invoke_cb)); coro->invoke_cb = 0; 2038 XPUSHs (sv_2mortal (coro->invoke_cb)); coro->invoke_cb = 0;
1777 PUTBACK; 2039 PUTBACK;
1841 SV *data = (SV *)GENSUB_ARG; 2103 SV *data = (SV *)GENSUB_ARG;
1842 2104
1843 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2105 if (SvTYPE (SvRV (data)) != SVt_PVAV)
1844 { 2106 {
1845 /* first call, set args */ 2107 /* first call, set args */
1846 int i; 2108 SV *coro = SvRV (data);
1847 AV *av = newAV (); 2109 AV *av = newAV ();
1848 SV *coro = SvRV (data);
1849 2110
1850 SvRV_set (data, (SV *)av); 2111 SvRV_set (data, (SV *)av);
1851 api_ready (aTHX_ coro);
1852 SvREFCNT_dec (coro);
1853 2112
1854 /* better take a full copy of the arguments */ 2113 /* better take a full copy of the arguments */
1855 while (items--) 2114 while (items--)
1856 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);
1857 } 2119 }
1858 2120
1859 XSRETURN_EMPTY; 2121 XSRETURN_EMPTY;
1860} 2122}
1861 2123
1878 2140
1879 EXTEND (SP, AvFILLp (av) + 1); 2141 EXTEND (SP, AvFILLp (av) + 1);
1880 for (i = 0; i <= AvFILLp (av); ++i) 2142 for (i = 0; i <= AvFILLp (av); ++i)
1881 PUSHs (sv_2mortal (AvARRAY (av)[i])); 2143 PUSHs (sv_2mortal (AvARRAY (av)[i]));
1882 2144
1883 /* 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 */
1884 AvFILLp (av) = -1; 2146 AvFILLp (av) = -1;
1885 av_undef (av); 2147 av_undef (av);
1886 2148
1887 PUTBACK; 2149 PUTBACK;
1888 } 2150 }
1992static void 2254static void
1993slf_init_schedule (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2255slf_init_schedule (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1994{ 2256{
1995 frame->prepare = prepare_schedule; 2257 frame->prepare = prepare_schedule;
1996 frame->check = slf_check_nop; 2258 frame->check = slf_check_nop;
2259}
2260
2261static void
2262slf_prepare_schedule_to (pTHX_ struct coro_transfer_args *ta)
2263{
2264 struct coro *next = (struct coro *)slf_frame.data;
2265
2266 SvREFCNT_inc_NN (next->hv);
2267 prepare_schedule_to (aTHX_ ta, next);
2268}
2269
2270static void
2271slf_init_schedule_to (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2272{
2273 if (!items)
2274 croak ("Coro::schedule_to expects a coroutine argument, caught");
2275
2276 frame->data = (void *)SvSTATE (arg [0]);
2277 frame->prepare = slf_prepare_schedule_to;
2278 frame->check = slf_check_nop;
2279}
2280
2281static void
2282slf_init_cede_to (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2283{
2284 api_ready (aTHX_ SvRV (coro_current));
2285
2286 slf_init_schedule_to (aTHX_ frame, cv, arg, items);
1997} 2287}
1998 2288
1999static void 2289static void
2000slf_init_cede (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2290slf_init_cede (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2001{ 2291{
2147 } 2437 }
2148 else 2438 else
2149 slf_argc = 0; 2439 slf_argc = 0;
2150 2440
2151 PL_op->op_ppaddr = pp_slf; 2441 PL_op->op_ppaddr = pp_slf;
2152 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 */
2153 2443
2154 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));
2155} 2492}
2156 2493
2157/*****************************************************************************/ 2494/*****************************************************************************/
2158/* PerlIO::cede */ 2495/* PerlIO::cede */
2159 2496
2233/* Coro::Semaphore & Coro::Signal */ 2570/* Coro::Semaphore & Coro::Signal */
2234 2571
2235static SV * 2572static SV *
2236coro_waitarray_new (pTHX_ int count) 2573coro_waitarray_new (pTHX_ int count)
2237{ 2574{
2238 /* 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 */
2239 AV *av = newAV (); 2576 AV *av = newAV ();
2240 SV **ary; 2577 SV **ary;
2241 2578
2242 /* unfortunately, building manually saves memory */ 2579 /* unfortunately, building manually saves memory */
2243 Newx (ary, 2, SV *); 2580 Newx (ary, 2, SV *);
2244 AvALLOC (av) = ary; 2581 AvALLOC (av) = ary;
2582#if PERL_VERSION_ATLEAST (5,10,0)
2245 /*AvARRAY (av) = ary;*/ 2583 AvARRAY (av) = ary;
2584#else
2246 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
2247 AvMAX (av) = 1; 2589 AvMAX (av) = 1;
2248 AvFILLp (av) = 0; 2590 AvFILLp (av) = 0;
2249 ary [0] = newSViv (count); 2591 ary [0] = newSViv (count);
2250 2592
2251 return newRV_noinc ((SV *)av); 2593 return newRV_noinc ((SV *)av);
2382 { 2724 {
2383 /* callback form */ 2725 /* callback form */
2384 AV *av = (AV *)SvRV (arg [0]); 2726 AV *av = (AV *)SvRV (arg [0]);
2385 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 2727 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]);
2386 2728
2387 av_push (av, (SV *)SvREFCNT_inc_NN (cb_cv)); 2729 av_push (av, SvREFCNT_inc_NN (cb_cv));
2388 2730
2389 if (SvIVX (AvARRAY (av)[0]) > 0) 2731 if (SvIVX (AvARRAY (av)[0]) > 0)
2390 coro_semaphore_adjust (aTHX_ av, 0); 2732 coro_semaphore_adjust (aTHX_ av, 0);
2391 2733
2392 frame->prepare = prepare_nop; 2734 frame->prepare = prepare_nop;
2416 AvARRAY (av)[0] = AvARRAY (av)[1]; 2758 AvARRAY (av)[0] = AvARRAY (av)[1];
2417 AvARRAY (av)[1] = cb; 2759 AvARRAY (av)[1] = cb;
2418 2760
2419 cb = av_shift (av); 2761 cb = av_shift (av);
2420 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 {
2421 api_ready (aTHX_ cb); 2773 api_ready (aTHX_ cb);
2422 sv_setiv (cb, 0); /* signal waiter */ 2774 sv_setiv (cb, 0); /* signal waiter */
2775 }
2776
2423 SvREFCNT_dec (cb); 2777 SvREFCNT_dec (cb);
2424 2778
2425 --count; 2779 --count;
2426 } 2780 }
2427} 2781}
2436static void 2790static void
2437slf_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)
2438{ 2792{
2439 AV *av = (AV *)SvRV (arg [0]); 2793 AV *av = (AV *)SvRV (arg [0]);
2440 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
2441 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]))
2442 { 2807 {
2443 SvIVX (AvARRAY (av)[0]) = 0; 2808 SvIVX (AvARRAY (av)[0]) = 0;
2444 frame->prepare = prepare_nop; 2809 frame->prepare = prepare_nop;
2445 frame->check = slf_check_nop; 2810 frame->check = slf_check_nop;
2446 } 2811 }
2447 else 2812 else
2448 { 2813 {
2449 SV *waiter = newRV_inc (SvRV (coro_current)); /* owned by signal av */ 2814 SV *waiter = newSVsv (coro_current); /* owned by signal av */
2450 2815
2451 av_push (av, waiter); 2816 av_push (av, waiter);
2452 2817
2453 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 */
2454 frame->prepare = prepare_schedule; 2819 frame->prepare = prepare_schedule;
2621 XSRETURN_EMPTY; 2986 XSRETURN_EMPTY;
2622} 2987}
2623 2988
2624/*****************************************************************************/ 2989/*****************************************************************************/
2625 2990
2991#if CORO_CLONE
2992# include "clone.c"
2993#endif
2994
2626MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 2995MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2627 2996
2628PROTOTYPES: DISABLE 2997PROTOTYPES: DISABLE
2629 2998
2630BOOT: 2999BOOT:
2634 coro_thx = PERL_GET_CONTEXT; 3003 coro_thx = PERL_GET_CONTEXT;
2635# endif 3004# endif
2636#endif 3005#endif
2637 BOOT_PAGESIZE; 3006 BOOT_PAGESIZE;
2638 3007
3008 cctx_current = cctx_new_empty ();
3009
2639 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3010 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
2640 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3011 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
2641 3012
2642 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;
2643 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;
2662 3033
2663 { 3034 {
2664 SV *slf = sv_2mortal (newSViv (PTR2IV (pp_slf))); 3035 SV *slf = sv_2mortal (newSViv (PTR2IV (pp_slf)));
2665 3036
2666 if (!PL_custom_op_names) PL_custom_op_names = newHV (); 3037 if (!PL_custom_op_names) PL_custom_op_names = newHV ();
2667 hv_store_ent (PL_custom_op_names, slf, 3038 hv_store_ent (PL_custom_op_names, slf, newSVpv ("coro_slf", 0), 0);
2668 newSVpv ("coro_slf", 0), 0);
2669 3039
2670 if (!PL_custom_op_descs) PL_custom_op_descs = newHV (); 3040 if (!PL_custom_op_descs) PL_custom_op_descs = newHV ();
2671 hv_store_ent (PL_custom_op_descs, slf, 3041 hv_store_ent (PL_custom_op_descs, slf, newSVpv ("coro schedule like function", 0), 0);
2672 newSVpv ("coro schedule like function", 0), 0);
2673 } 3042 }
2674 3043
2675 coroapi.ver = CORO_API_VERSION; 3044 coroapi.ver = CORO_API_VERSION;
2676 coroapi.rev = CORO_API_REVISION; 3045 coroapi.rev = CORO_API_REVISION;
2677 3046
2689 3058
2690 if (!svp) croak ("Time::HiRes is required"); 3059 if (!svp) croak ("Time::HiRes is required");
2691 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer"); 3060 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
2692 3061
2693 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));
2694 } 3066 }
2695 3067
2696 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 3068 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
2697} 3069}
2698 3070
2699SV * 3071SV *
2700new (char *klass, ...) 3072new (char *klass, ...)
2701 ALIAS: 3073 ALIAS:
2770void 3142void
2771_exit (int code) 3143_exit (int code)
2772 PROTOTYPE: $ 3144 PROTOTYPE: $
2773 CODE: 3145 CODE:
2774 _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
2775 3166
2776int 3167int
2777cctx_stacksize (int new_stacksize = 0) 3168cctx_stacksize (int new_stacksize = 0)
2778 PROTOTYPE: ;$ 3169 PROTOTYPE: ;$
2779 CODE: 3170 CODE:
2829 eval = 1 3220 eval = 1
2830 CODE: 3221 CODE:
2831{ 3222{
2832 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3223 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
2833 { 3224 {
2834 struct coro temp; 3225 struct coro *current = SvSTATE_current;
2835 3226
2836 if (!(coro->flags & CF_RUNNING)) 3227 if (current != coro)
2837 { 3228 {
2838 PUTBACK; 3229 PUTBACK;
2839 save_perl (aTHX_ &temp); 3230 save_perl (aTHX_ current);
2840 load_perl (aTHX_ coro); 3231 load_perl (aTHX_ coro);
3232 SPAGAIN;
2841 } 3233 }
2842 3234
2843 {
2844 dSP;
2845 ENTER;
2846 SAVETMPS;
2847 PUTBACK;
2848 PUSHSTACK; 3235 PUSHSTACK;
3236
2849 PUSHMARK (SP); 3237 PUSHMARK (SP);
3238 PUTBACK;
2850 3239
2851 if (ix) 3240 if (ix)
2852 eval_sv (coderef, 0); 3241 eval_sv (coderef, 0);
2853 else 3242 else
2854 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 3243 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
2855 3244
2856 POPSTACK; 3245 POPSTACK;
2857 SPAGAIN; 3246 SPAGAIN;
2858 FREETMPS;
2859 LEAVE;
2860 PUTBACK;
2861 }
2862 3247
2863 if (!(coro->flags & CF_RUNNING)) 3248 if (current != coro)
2864 { 3249 {
3250 PUTBACK;
2865 save_perl (aTHX_ coro); 3251 save_perl (aTHX_ coro);
2866 load_perl (aTHX_ &temp); 3252 load_perl (aTHX_ current);
2867 SPAGAIN; 3253 SPAGAIN;
2868 } 3254 }
2869 } 3255 }
2870} 3256}
2871 3257
2875 ALIAS: 3261 ALIAS:
2876 is_ready = CF_READY 3262 is_ready = CF_READY
2877 is_running = CF_RUNNING 3263 is_running = CF_RUNNING
2878 is_new = CF_NEW 3264 is_new = CF_NEW
2879 is_destroyed = CF_DESTROYED 3265 is_destroyed = CF_DESTROYED
3266 is_suspended = CF_SUSPENDED
2880 CODE: 3267 CODE:
2881 RETVAL = boolSV (coro->flags & ix); 3268 RETVAL = boolSV (coro->flags & ix);
2882 OUTPUT: 3269 OUTPUT:
2883 RETVAL 3270 RETVAL
2884 3271
2888 CODE: 3275 CODE:
2889{ 3276{
2890 struct coro *current = SvSTATE_current; 3277 struct coro *current = SvSTATE_current;
2891 SV **throwp = self == current ? &CORO_THROW : &self->except; 3278 SV **throwp = self == current ? &CORO_THROW : &self->except;
2892 SvREFCNT_dec (*throwp); 3279 SvREFCNT_dec (*throwp);
3280 SvGETMAGIC (throw);
2893 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3281 *throwp = SvOK (throw) ? newSVsv (throw) : 0;
2894} 3282}
2895 3283
2896void 3284void
2897api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3285api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
2900 3288
2901SV * 3289SV *
2902has_cctx (Coro::State coro) 3290has_cctx (Coro::State coro)
2903 PROTOTYPE: $ 3291 PROTOTYPE: $
2904 CODE: 3292 CODE:
2905 RETVAL = boolSV (!!coro->cctx); 3293 /* maybe manage the running flag differently */
3294 RETVAL = boolSV (!!coro->cctx || (coro->flags & CF_RUNNING));
2906 OUTPUT: 3295 OUTPUT:
2907 RETVAL 3296 RETVAL
2908 3297
2909int 3298int
2910is_traced (Coro::State coro) 3299is_traced (Coro::State coro)
2930 3319
2931void 3320void
2932force_cctx () 3321force_cctx ()
2933 PROTOTYPE: 3322 PROTOTYPE:
2934 CODE: 3323 CODE:
2935 SvSTATE_current->cctx->idle_sp = 0; 3324 cctx_current->idle_sp = 0;
2936 3325
2937void 3326void
2938swap_defsv (Coro::State self) 3327swap_defsv (Coro::State self)
2939 PROTOTYPE: $ 3328 PROTOTYPE: $
2940 ALIAS: 3329 ALIAS:
2948 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv; 3337 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
2949 3338
2950 SV *tmp = *src; *src = *dst; *dst = tmp; 3339 SV *tmp = *src; *src = *dst; *dst = tmp;
2951 } 3340 }
2952 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}
2953 3385
2954MODULE = Coro::State PACKAGE = Coro 3386MODULE = Coro::State PACKAGE = Coro
2955 3387
2956BOOT: 3388BOOT:
2957{ 3389{
2958 int i;
2959
2960 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
2961 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3390 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
2962 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3391 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
2963 cv_coro_run = get_cv ( "Coro::_terminate", GV_ADD); 3392 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
2964 cv_coro_terminate = get_cv ( "Coro::terminate", GV_ADD); 3393 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
2965 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); 3394 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
2966 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);
2967 3399
2968 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);
2969 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3401 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
2970 cv_pool_handler = get_cv ("Coro::_pool_handler", 0); SvREADONLY_on (cv_pool_handler); 3402 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
2971 cv_coro_new = get_cv ("Coro::new", 0); SvREADONLY_on (cv_coro_new); 3403 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new);
2972 3404
2973 coro_stash = gv_stashpv ("Coro", TRUE); 3405 coro_stash = gv_stashpv ("Coro", TRUE);
2974 3406
2975 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 3407 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
2976 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 3408 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
2977 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 3409 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
2978 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 3410 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (CORO_PRIO_LOW));
2979 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE)); 3411 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (CORO_PRIO_IDLE));
2980 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN)); 3412 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (CORO_PRIO_MIN));
2981
2982 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
2983 coro_ready[i] = newAV ();
2984 3413
2985 { 3414 {
2986 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 3415 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
2987 3416
2988 coroapi.schedule = api_schedule; 3417 coroapi.schedule = api_schedule;
3418 coroapi.schedule_to = api_schedule_to;
2989 coroapi.cede = api_cede; 3419 coroapi.cede = api_cede;
2990 coroapi.cede_notself = api_cede_notself; 3420 coroapi.cede_notself = api_cede_notself;
2991 coroapi.ready = api_ready; 3421 coroapi.ready = api_ready;
2992 coroapi.is_ready = api_is_ready; 3422 coroapi.is_ready = api_is_ready;
2993 coroapi.nready = coro_nready; 3423 coroapi.nready = coro_nready;
2998 SvREADONLY_on (sv); 3428 SvREADONLY_on (sv);
2999 } 3429 }
3000} 3430}
3001 3431
3002void 3432void
3433terminate (...)
3434 CODE:
3435 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3436
3437void
3003schedule (...) 3438schedule (...)
3004 CODE: 3439 CODE:
3005 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3440 CORO_EXECUTE_SLF_XS (slf_init_schedule);
3441
3442void
3443schedule_to (...)
3444 CODE:
3445 CORO_EXECUTE_SLF_XS (slf_init_schedule_to);
3446
3447void
3448cede_to (...)
3449 CODE:
3450 CORO_EXECUTE_SLF_XS (slf_init_cede_to);
3006 3451
3007void 3452void
3008cede (...) 3453cede (...)
3009 CODE: 3454 CODE:
3010 CORO_EXECUTE_SLF_XS (slf_init_cede); 3455 CORO_EXECUTE_SLF_XS (slf_init_cede);
3024void 3469void
3025_set_readyhook (SV *hook) 3470_set_readyhook (SV *hook)
3026 PROTOTYPE: $ 3471 PROTOTYPE: $
3027 CODE: 3472 CODE:
3028 SvREFCNT_dec (coro_readyhook); 3473 SvREFCNT_dec (coro_readyhook);
3474 SvGETMAGIC (hook);
3029 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0; 3475 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0;
3030 3476
3031int 3477int
3032prio (Coro::State coro, int newprio = 0) 3478prio (Coro::State coro, int newprio = 0)
3033 PROTOTYPE: $;$ 3479 PROTOTYPE: $;$
3040 if (items > 1) 3486 if (items > 1)
3041 { 3487 {
3042 if (ix) 3488 if (ix)
3043 newprio = coro->prio - newprio; 3489 newprio = coro->prio - newprio;
3044 3490
3045 if (newprio < PRIO_MIN) newprio = PRIO_MIN; 3491 if (newprio < CORO_PRIO_MIN) newprio = CORO_PRIO_MIN;
3046 if (newprio > PRIO_MAX) newprio = PRIO_MAX; 3492 if (newprio > CORO_PRIO_MAX) newprio = CORO_PRIO_MAX;
3047 3493
3048 coro->prio = newprio; 3494 coro->prio = newprio;
3049 } 3495 }
3050} 3496}
3051 OUTPUT: 3497 OUTPUT:
3066 RETVAL = coro_nready; 3512 RETVAL = coro_nready;
3067 OUTPUT: 3513 OUTPUT:
3068 RETVAL 3514 RETVAL
3069 3515
3070void 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;
3527
3528void
3071_pool_handler (...) 3529_pool_handler (...)
3072 CODE: 3530 CODE:
3073 CORO_EXECUTE_SLF_XS (slf_init_pool_handler); 3531 CORO_EXECUTE_SLF_XS (slf_init_pool_handler);
3074 3532
3075void 3533void
3091 PUSHMARK (SP); 3549 PUSHMARK (SP);
3092 EXTEND (SP, 2); 3550 EXTEND (SP, 2);
3093 PUSHs (sv_Coro); 3551 PUSHs (sv_Coro);
3094 PUSHs ((SV *)cv_pool_handler); 3552 PUSHs ((SV *)cv_pool_handler);
3095 PUTBACK; 3553 PUTBACK;
3096 call_sv (cv_coro_new, G_SCALAR); 3554 call_sv ((SV *)cv_coro_state_new, G_SCALAR);
3097 SPAGAIN; 3555 SPAGAIN;
3098 3556
3099 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs)); 3557 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs));
3100 } 3558 }
3101 3559
3106 assert (!coro->invoke_av); 3564 assert (!coro->invoke_av);
3107 coro->invoke_cb = SvREFCNT_inc (cb); 3565 coro->invoke_cb = SvREFCNT_inc (cb);
3108 coro->invoke_av = av; 3566 coro->invoke_av = av;
3109 } 3567 }
3110 3568
3111 api_ready ((SV *)hv); 3569 api_ready (aTHX_ (SV *)hv);
3112 3570
3113 if (GIMME_V != G_VOID) 3571 if (GIMME_V != G_VOID)
3114 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 3572 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
3115 else 3573 else
3116 SvREFCNT_dec (hv); 3574 SvREFCNT_dec (hv);
3128rouse_wait (...) 3586rouse_wait (...)
3129 PROTOTYPE: ;$ 3587 PROTOTYPE: ;$
3130 PPCODE: 3588 PPCODE:
3131 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait); 3589 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait);
3132 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
3133 3616
3134MODULE = Coro::State PACKAGE = PerlIO::cede 3617MODULE = Coro::State PACKAGE = PerlIO::cede
3135 3618
3136BOOT: 3619BOOT:
3137 PerlIO_define_layer (aTHX_ &PerlIO_cede); 3620 PerlIO_define_layer (aTHX_ &PerlIO_cede);
3140MODULE = Coro::State PACKAGE = Coro::Semaphore 3623MODULE = Coro::State PACKAGE = Coro::Semaphore
3141 3624
3142SV * 3625SV *
3143new (SV *klass, SV *count = 0) 3626new (SV *klass, SV *count = 0)
3144 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
3145 RETVAL = sv_bless ( 3639 RETVAL = sv_bless (
3146 coro_waitarray_new (aTHX_ count && SvOK (count) ? SvIV (count) : 1), 3640 coro_waitarray_new (aTHX_ semcnt),
3147 GvSTASH (CvGV (cv)) 3641 GvSTASH (CvGV (cv))
3148 ); 3642 );
3643}
3149 OUTPUT: 3644 OUTPUT:
3150 RETVAL 3645 RETVAL
3151 3646
3152# helper for Coro::Channel 3647# helper for Coro::Channel and others
3153SV * 3648SV *
3154_alloc (int count) 3649_alloc (int count)
3155 CODE: 3650 CODE:
3156 RETVAL = coro_waitarray_new (aTHX_ count); 3651 RETVAL = coro_waitarray_new (aTHX_ count);
3157 OUTPUT: 3652 OUTPUT:
3215 for (i = 1; i <= wcount; ++i) 3710 for (i = 1; i <= wcount; ++i)
3216 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i]))); 3711 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i])));
3217 } 3712 }
3218} 3713}
3219 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
3220MODULE = Coro::State PACKAGE = Coro::Signal 3731MODULE = Coro::State PACKAGE = Coro::Signal
3221 3732
3222SV * 3733SV *
3223new (SV *klass) 3734new (SV *klass)
3224 CODE: 3735 CODE:

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines