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.308 by root, Wed Nov 19 15:09:57 2008 UTC vs.
Revision 1.358 by root, Mon Jun 29 04:30:25 2009 UTC

… …
55 55
56#define PERL_VERSION_ATLEAST(a,b,c) \ 56#define PERL_VERSION_ATLEAST(a,b,c) \
57 (PERL_REVISION > (a) \ 57 (PERL_REVISION > (a) \
58 || (PERL_REVISION == (a) \ 58 || (PERL_REVISION == (a) \
59 && (PERL_VERSION > (b) \ 59 && (PERL_VERSION > (b) \
60 || (PERL_VERSION == (b) && PERLSUBVERSION >= (c))))) 60 || (PERL_VERSION == (b) && PERL_SUBVERSION >= (c)))))
61 61
62#if !PERL_VERSION_ATLEAST (5,6,0) 62#if !PERL_VERSION_ATLEAST (5,6,0)
63# ifndef PL_ppaddr 63# ifndef PL_ppaddr
64# define PL_ppaddr ppaddr 64# define PL_ppaddr ppaddr
65# endif 65# endif
… …
98# define newSV(l) NEWSV(0,l) 98# define newSV(l) NEWSV(0,l)
99#endif 99#endif
100#ifndef CvISXSUB_on 100#ifndef CvISXSUB_on
101# define CvISXSUB_on(cv) (void)cv 101# define CvISXSUB_on(cv) (void)cv
102#endif 102#endif
103#ifndef CvISXSUB
104# define CvISXSUB(cv) (CvXSUB (cv) ? TRUE : FALSE)
105#endif
106#ifndef Newx
107# define Newx(ptr,nitems,type) New (0,ptr,nitems,type)
108#endif
103 109
104/* 5.8.7 */ 110/* 5.8.7 */
105#ifndef SvRV_set 111#ifndef SvRV_set
106# define SvRV_set(s,v) SvRV(s) = (v) 112# define SvRV_set(s,v) SvRV(s) = (v)
107#endif 113#endif
… …
127#else 133#else
128# define dSTACKLEVEL volatile void *stacklevel 134# define dSTACKLEVEL volatile void *stacklevel
129# define STACKLEVEL ((void *)&stacklevel) 135# define STACKLEVEL ((void *)&stacklevel)
130#endif 136#endif
131 137
132#define IN_DESTRUCT (PL_main_cv == Nullcv) 138#define IN_DESTRUCT PL_dirty
133 139
134#if __GNUC__ >= 3 140#if __GNUC__ >= 3
135# define attribute(x) __attribute__(x) 141# define attribute(x) __attribute__(x)
136# define expect(expr,value) __builtin_expect ((expr),(value)) 142# define expect(expr,value) __builtin_expect ((expr), (value))
137# define INLINE static inline 143# define INLINE static inline
138#else 144#else
139# define attribute(x) 145# define attribute(x)
140# define expect(expr,value) (expr) 146# define expect(expr,value) (expr)
141# define INLINE static 147# define INLINE static
… …
150#define GCoroAPI (&coroapi) /* very sneaky */ 156#define GCoroAPI (&coroapi) /* very sneaky */
151 157
152#ifdef USE_ITHREADS 158#ifdef USE_ITHREADS
153# if CORO_PTHREAD 159# if CORO_PTHREAD
154static void *coro_thx; 160static void *coro_thx;
161# endif
162#endif
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
155# endif 171# endif
156#endif 172#endif
157 173
158static double (*nvtime)(); /* so why doesn't it take void? */ 174static double (*nvtime)(); /* so why doesn't it take void? */
159 175
… …
167static AV *main_mainstack; /* used to differentiate between $main and others */ 183static AV *main_mainstack; /* used to differentiate between $main and others */
168static JMPENV *main_top_env; 184static JMPENV *main_top_env;
169static HV *coro_state_stash, *coro_stash; 185static HV *coro_state_stash, *coro_stash;
170static volatile SV *coro_mortal; /* will be freed/thrown after next transfer */ 186static volatile SV *coro_mortal; /* will be freed/thrown after next transfer */
171 187
188static AV *av_destroy; /* destruction queue */
189static SV *sv_manager; /* the manager coro */
190static SV *sv_idle; /* $Coro::idle */
191
172static GV *irsgv; /* $/ */ 192static GV *irsgv; /* $/ */
173static GV *stdoutgv; /* *STDOUT */ 193static GV *stdoutgv; /* *STDOUT */
174static SV *rv_diehook; 194static SV *rv_diehook;
175static SV *rv_warnhook; 195static SV *rv_warnhook;
176static HV *hv_sig; /* %SIG */ 196static HV *hv_sig; /* %SIG */
177 197
178/* async_pool helper stuff */ 198/* async_pool helper stuff */
179static SV *sv_pool_rss; 199static SV *sv_pool_rss;
180static SV *sv_pool_size; 200static SV *sv_pool_size;
201static SV *sv_async_pool_idle; /* description string */
181static AV *av_async_pool; 202static AV *av_async_pool; /* idle pool */
203static SV *sv_Coro; /* class string */
204static CV *cv_pool_handler;
205static CV *cv_coro_state_new;
182 206
183/* Coro::AnyEvent */ 207/* Coro::AnyEvent */
184static SV *sv_activity; 208static SV *sv_activity;
185 209
186static struct coro_cctx *cctx_first; 210static struct coro_cctx *cctx_first;
… …
215 int valgrind_id; 239 int valgrind_id;
216#endif 240#endif
217 unsigned char flags; 241 unsigned char flags;
218} coro_cctx; 242} coro_cctx;
219 243
244coro_cctx *cctx_current; /* the currently running cctx */
245
246/*****************************************************************************/
247
220enum { 248enum {
221 CF_RUNNING = 0x0001, /* coroutine is running */ 249 CF_RUNNING = 0x0001, /* coroutine is running */
222 CF_READY = 0x0002, /* coroutine is ready */ 250 CF_READY = 0x0002, /* coroutine is ready */
223 CF_NEW = 0x0004, /* has never been switched to */ 251 CF_NEW = 0x0004, /* has never been switched to */
224 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 252 CF_DESTROYED = 0x0008, /* coroutine data has been freed */
253 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
225}; 254};
226 255
227/* the structure where most of the perl state is stored, overlaid on the cxstack */ 256/* the structure where most of the perl state is stored, overlaid on the cxstack */
228typedef struct 257typedef struct
229{ 258{
230 SV *defsv; 259 SV *defsv;
231 AV *defav; 260 AV *defav;
232 SV *errsv; 261 SV *errsv;
233 SV *irsgv; 262 SV *irsgv;
263 HV *hinthv;
234#define VAR(name,type) type name; 264#define VAR(name,type) type name;
235# include "state.h" 265# include "state.h"
236#undef VAR 266#undef VAR
237} perl_slots; 267} perl_slots;
238 268
… …
240 270
241/* this is a structure representing a perl-level coroutine */ 271/* this is a structure representing a perl-level coroutine */
242struct coro { 272struct coro {
243 /* the C coroutine allocated to this perl coroutine, if any */ 273 /* the C coroutine allocated to this perl coroutine, if any */
244 coro_cctx *cctx; 274 coro_cctx *cctx;
275
276 /* ready queue */
277 struct coro *next_ready;
245 278
246 /* state data */ 279 /* state data */
247 struct CoroSLF slf_frame; /* saved slf frame */ 280 struct CoroSLF slf_frame; /* saved slf frame */
248 AV *mainstack; 281 AV *mainstack;
249 perl_slots *slot; /* basically the saved sp */ 282 perl_slots *slot; /* basically the saved sp */
… …
263 SV *except; /* exception to be thrown */ 296 SV *except; /* exception to be thrown */
264 SV *rouse_cb; 297 SV *rouse_cb;
265 298
266 /* async_pool */ 299 /* async_pool */
267 SV *saved_deffh; 300 SV *saved_deffh;
301 SV *invoke_cb;
302 AV *invoke_av;
303
304 /* on_enter/on_leave */
305 AV *on_enter;
306 AV *on_leave;
268 307
269 /* linked list */ 308 /* linked list */
270 struct coro *next, *prev; 309 struct coro *next, *prev;
271}; 310};
272 311
… …
278/* the mainr easonw e don't support windows process emulation */ 317/* the mainr easonw e don't support windows process emulation */
279static struct CoroSLF slf_frame; /* the current slf frame */ 318static struct CoroSLF slf_frame; /* the current slf frame */
280 319
281/** Coro ********************************************************************/ 320/** Coro ********************************************************************/
282 321
283#define PRIO_MAX 3 322#define CORO_PRIO_MAX 3
284#define PRIO_HIGH 1 323#define CORO_PRIO_HIGH 1
285#define PRIO_NORMAL 0 324#define CORO_PRIO_NORMAL 0
286#define PRIO_LOW -1 325#define CORO_PRIO_LOW -1
287#define PRIO_IDLE -3 326#define CORO_PRIO_IDLE -3
288#define PRIO_MIN -4 327#define CORO_PRIO_MIN -4
289 328
290/* for Coro.pm */ 329/* for Coro.pm */
291static SV *coro_current; 330static SV *coro_current;
292static SV *coro_readyhook; 331static SV *coro_readyhook;
293static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1]; 332static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
333static CV *cv_coro_run, *cv_coro_terminate;
294static struct coro *coro_first; 334static struct coro *coro_first;
295#define coro_nready coroapi.nready 335#define coro_nready coroapi.nready
296 336
297/** lowlevel stuff **********************************************************/ 337/** lowlevel stuff **********************************************************/
298 338
… …
326 return get_hv (name, create); 366 return get_hv (name, create);
327} 367}
328 368
329/* may croak */ 369/* may croak */
330INLINE CV * 370INLINE CV *
331coro_sv_2cv (SV *sv) 371coro_sv_2cv (pTHX_ SV *sv)
332{ 372{
333 HV *st; 373 HV *st;
334 GV *gvp; 374 GV *gvp;
335 return sv_2cv (sv, &st, &gvp, 0); 375 CV *cv = sv_2cv (sv, &st, &gvp, 0);
376
377 if (!cv)
378 croak ("code reference expected");
379
380 return cv;
336} 381}
382
383/*****************************************************************************/
384/* magic glue */
385
386#define CORO_MAGIC_type_cv 26
387#define CORO_MAGIC_type_state PERL_MAGIC_ext
388
389#define CORO_MAGIC_NN(sv, type) \
390 (expect_true (SvMAGIC (sv)->mg_type == type) \
391 ? SvMAGIC (sv) \
392 : mg_find (sv, type))
393
394#define CORO_MAGIC(sv, type) \
395 (expect_true (SvMAGIC (sv)) \
396 ? CORO_MAGIC_NN (sv, type) \
397 : 0)
398
399#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
400#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
401
402INLINE struct coro *
403SvSTATE_ (pTHX_ SV *coro)
404{
405 HV *stash;
406 MAGIC *mg;
407
408 if (SvROK (coro))
409 coro = SvRV (coro);
410
411 if (expect_false (SvTYPE (coro) != SVt_PVHV))
412 croak ("Coro::State object required");
413
414 stash = SvSTASH (coro);
415 if (expect_false (stash != coro_stash && stash != coro_state_stash))
416 {
417 /* very slow, but rare, check */
418 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
419 croak ("Coro::State object required");
420 }
421
422 mg = CORO_MAGIC_state (coro);
423 return (struct coro *)mg->mg_ptr;
424}
425
426#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
427
428/* faster than SvSTATE, but expects a coroutine hv */
429#define SvSTATE_hv(hv) ((struct coro *)CORO_MAGIC_NN ((SV *)hv, CORO_MAGIC_type_state)->mg_ptr)
430#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
431
432/*****************************************************************************/
433/* padlist management and caching */
337 434
338static AV * 435static AV *
339coro_clone_padlist (pTHX_ CV *cv) 436coro_derive_padlist (pTHX_ CV *cv)
340{ 437{
341 AV *padlist = CvPADLIST (cv); 438 AV *padlist = CvPADLIST (cv);
342 AV *newpadlist, *newpad; 439 AV *newpadlist, *newpad;
343 440
344 newpadlist = newAV (); 441 newpadlist = newAV ();
… …
349 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 446 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
350#endif 447#endif
351 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 448 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
352 --AvFILLp (padlist); 449 --AvFILLp (padlist);
353 450
354 av_store (newpadlist, 0, SvREFCNT_inc_NN (*av_fetch (padlist, 0, FALSE))); 451 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0]));
355 av_store (newpadlist, 1, (SV *)newpad); 452 av_store (newpadlist, 1, (SV *)newpad);
356 453
357 return newpadlist; 454 return newpadlist;
358} 455}
359 456
360static void 457static void
361free_padlist (pTHX_ AV *padlist) 458free_padlist (pTHX_ AV *padlist)
362{ 459{
363 /* may be during global destruction */ 460 /* may be during global destruction */
364 if (SvREFCNT (padlist)) 461 if (!IN_DESTRUCT)
365 { 462 {
366 I32 i = AvFILLp (padlist); 463 I32 i = AvFILLp (padlist);
367 while (i >= 0) 464
465 while (i > 0) /* special-case index 0 */
368 { 466 {
369 SV **svp = av_fetch (padlist, i--, FALSE); 467 /* we try to be extra-careful here */
370 if (svp) 468 AV *av = (AV *)AvARRAY (padlist)[i--];
371 { 469 I32 j = AvFILLp (av);
372 SV *sv; 470
373 while (&PL_sv_undef != (sv = av_pop ((AV *)*svp))) 471 while (j >= 0)
472 SvREFCNT_dec (AvARRAY (av)[j--]);
473
474 AvFILLp (av) = -1;
374 SvREFCNT_dec (sv); 475 SvREFCNT_dec (av);
375
376 SvREFCNT_dec (*svp);
377 }
378 } 476 }
379 477
478 SvREFCNT_dec (AvARRAY (padlist)[0]);
479
480 AvFILLp (padlist) = -1;
380 SvREFCNT_dec ((SV*)padlist); 481 SvREFCNT_dec ((SV*)padlist);
381 } 482 }
382} 483}
383 484
384static int 485static int
385coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 486coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
386{ 487{
387 AV *padlist; 488 AV *padlist;
388 AV *av = (AV *)mg->mg_obj; 489 AV *av = (AV *)mg->mg_obj;
490
491 /* perl manages to free our internal AV and _then_ call us */
492 if (IN_DESTRUCT)
493 return;
389 494
390 /* casting is fun. */ 495 /* casting is fun. */
391 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 496 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
392 free_padlist (aTHX_ padlist); 497 free_padlist (aTHX_ padlist);
393 498
394 SvREFCNT_dec (av); /* sv_magicext increased the refcount */ 499 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
395 500
396 return 0; 501 return 0;
397} 502}
398
399#define CORO_MAGIC_type_cv 26
400#define CORO_MAGIC_type_state PERL_MAGIC_ext
401 503
402static MGVTBL coro_cv_vtbl = { 504static MGVTBL coro_cv_vtbl = {
403 0, 0, 0, 0, 505 0, 0, 0, 0,
404 coro_cv_free 506 coro_cv_free
405}; 507};
406
407#define CORO_MAGIC_NN(sv, type) \
408 (expect_true (SvMAGIC (sv)->mg_type == type) \
409 ? SvMAGIC (sv) \
410 : mg_find (sv, type))
411
412#define CORO_MAGIC(sv, type) \
413 (expect_true (SvMAGIC (sv)) \
414 ? CORO_MAGIC_NN (sv, type) \
415 : 0)
416
417#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
418#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
419
420INLINE struct coro *
421SvSTATE_ (pTHX_ SV *coro)
422{
423 HV *stash;
424 MAGIC *mg;
425
426 if (SvROK (coro))
427 coro = SvRV (coro);
428
429 if (expect_false (SvTYPE (coro) != SVt_PVHV))
430 croak ("Coro::State object required");
431
432 stash = SvSTASH (coro);
433 if (expect_false (stash != coro_stash && stash != coro_state_stash))
434 {
435 /* very slow, but rare, check */
436 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
437 croak ("Coro::State object required");
438 }
439
440 mg = CORO_MAGIC_state (coro);
441 return (struct coro *)mg->mg_ptr;
442}
443
444#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
445
446/* faster than SvSTATE, but expects a coroutine hv */
447#define SvSTATE_hv(hv) ((struct coro *)CORO_MAGIC_NN ((SV *)hv, CORO_MAGIC_type_state)->mg_ptr)
448#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
449 508
450/* the next two functions merely cache the padlists */ 509/* the next two functions merely cache the padlists */
451static void 510static void
452get_padlist (pTHX_ CV *cv) 511get_padlist (pTHX_ CV *cv)
453{ 512{
… …
464 CV *cp = Perl_cv_clone (aTHX_ cv); 523 CV *cp = Perl_cv_clone (aTHX_ cv);
465 CvPADLIST (cv) = CvPADLIST (cp); 524 CvPADLIST (cv) = CvPADLIST (cp);
466 CvPADLIST (cp) = 0; 525 CvPADLIST (cp) = 0;
467 SvREFCNT_dec (cp); 526 SvREFCNT_dec (cp);
468#else 527#else
469 CvPADLIST (cv) = coro_clone_padlist (aTHX_ cv); 528 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
470#endif 529#endif
471 } 530 }
472} 531}
473 532
474static void 533static void
… …
481 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 540 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
482 541
483 av = (AV *)mg->mg_obj; 542 av = (AV *)mg->mg_obj;
484 543
485 if (expect_false (AvFILLp (av) >= AvMAX (av))) 544 if (expect_false (AvFILLp (av) >= AvMAX (av)))
486 av_extend (av, AvMAX (av) + 1); 545 av_extend (av, AvFILLp (av) + 1);
487 546
488 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 547 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
489} 548}
490 549
491/** load & save, init *******************************************************/ 550/** load & save, init *******************************************************/
551
552static void
553on_enterleave_call (pTHX_ SV *cb);
492 554
493static void 555static void
494load_perl (pTHX_ Coro__State c) 556load_perl (pTHX_ Coro__State c)
495{ 557{
496 perl_slots *slot = c->slot; 558 perl_slots *slot = c->slot;
497 c->slot = 0; 559 c->slot = 0;
498 560
499 PL_mainstack = c->mainstack; 561 PL_mainstack = c->mainstack;
500 562
501 GvSV (PL_defgv) = slot->defsv; 563 GvSV (PL_defgv) = slot->defsv;
502 GvAV (PL_defgv) = slot->defav; 564 GvAV (PL_defgv) = slot->defav;
503 GvSV (PL_errgv) = slot->errsv; 565 GvSV (PL_errgv) = slot->errsv;
504 GvSV (irsgv) = slot->irsgv; 566 GvSV (irsgv) = slot->irsgv;
567 GvHV (PL_hintgv) = slot->hinthv;
505 568
506 #define VAR(name,type) PL_ ## name = slot->name; 569 #define VAR(name,type) PL_ ## name = slot->name;
507 # include "state.h" 570 # include "state.h"
508 #undef VAR 571 #undef VAR
509 572
… …
523 PUTBACK; 586 PUTBACK;
524 } 587 }
525 588
526 slf_frame = c->slf_frame; 589 slf_frame = c->slf_frame;
527 CORO_THROW = c->except; 590 CORO_THROW = c->except;
591
592 if (expect_false (c->on_enter))
593 {
594 int i;
595
596 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
597 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
598 }
528} 599}
529 600
530static void 601static void
531save_perl (pTHX_ Coro__State c) 602save_perl (pTHX_ Coro__State c)
532{ 603{
604 if (expect_false (c->on_leave))
605 {
606 int i;
607
608 for (i = AvFILLp (c->on_leave); i >= 0; --i)
609 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
610 }
611
533 c->except = CORO_THROW; 612 c->except = CORO_THROW;
534 c->slf_frame = slf_frame; 613 c->slf_frame = slf_frame;
535 614
536 { 615 {
537 dSP; 616 dSP;
… …
550 { 629 {
551 while (expect_true (cxix >= 0)) 630 while (expect_true (cxix >= 0))
552 { 631 {
553 PERL_CONTEXT *cx = &ccstk[cxix--]; 632 PERL_CONTEXT *cx = &ccstk[cxix--];
554 633
555 if (expect_true (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT)) 634 if (expect_true (CxTYPE (cx) == CXt_SUB) || expect_false (CxTYPE (cx) == CXt_FORMAT))
556 { 635 {
557 CV *cv = cx->blk_sub.cv; 636 CV *cv = cx->blk_sub.cv;
558 637
559 if (expect_true (CvDEPTH (cv))) 638 if (expect_true (CvDEPTH (cv)))
560 { 639 {
… …
595 c->mainstack = PL_mainstack; 674 c->mainstack = PL_mainstack;
596 675
597 { 676 {
598 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 677 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
599 678
600 slot->defav = GvAV (PL_defgv); 679 slot->defav = GvAV (PL_defgv);
601 slot->defsv = DEFSV; 680 slot->defsv = DEFSV;
602 slot->errsv = ERRSV; 681 slot->errsv = ERRSV;
603 slot->irsgv = GvSV (irsgv); 682 slot->irsgv = GvSV (irsgv);
683 slot->hinthv = GvHV (PL_hintgv);
604 684
605 #define VAR(name,type) slot->name = PL_ ## name; 685 #define VAR(name,type) slot->name = PL_ ## name;
606 # include "state.h" 686 # include "state.h"
607 #undef VAR 687 #undef VAR
608 } 688 }
… …
686#if !PERL_VERSION_ATLEAST (5,10,0) 766#if !PERL_VERSION_ATLEAST (5,10,0)
687 Safefree (PL_retstack); 767 Safefree (PL_retstack);
688#endif 768#endif
689} 769}
690 770
771#define CORO_RSS \
772 rss += sizeof (SYM (curstackinfo)); \
773 rss += (SYM (curstackinfo->si_cxmax) + 1) * sizeof (PERL_CONTEXT); \
774 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (SYM (curstack))) * sizeof (SV *); \
775 rss += SYM (tmps_max) * sizeof (SV *); \
776 rss += (SYM (markstack_max) - SYM (markstack_ptr)) * sizeof (I32); \
777 rss += SYM (scopestack_max) * sizeof (I32); \
778 rss += SYM (savestack_max) * sizeof (ANY);
779
691static size_t 780static size_t
692coro_rss (pTHX_ struct coro *coro) 781coro_rss (pTHX_ struct coro *coro)
693{ 782{
694 size_t rss = sizeof (*coro); 783 size_t rss = sizeof (*coro);
695 784
696 if (coro->mainstack) 785 if (coro->mainstack)
697 { 786 {
698 perl_slots tmp_slot;
699 perl_slots *slot;
700
701 if (coro->flags & CF_RUNNING) 787 if (coro->flags & CF_RUNNING)
702 { 788 {
703 slot = &tmp_slot; 789 #define SYM(sym) PL_ ## sym
704 790 CORO_RSS;
705 #define VAR(name,type) slot->name = PL_ ## name;
706 # include "state.h"
707 #undef VAR 791 #undef SYM
708 } 792 }
709 else 793 else
710 slot = coro->slot;
711
712 if (slot)
713 { 794 {
714 rss += sizeof (slot->curstackinfo); 795 #define SYM(sym) coro->slot->sym
715 rss += (slot->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT); 796 CORO_RSS;
716 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (slot->curstack)) * sizeof (SV *); 797 #undef SYM
717 rss += slot->tmps_max * sizeof (SV *);
718 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32);
719 rss += slot->scopestack_max * sizeof (I32);
720 rss += slot->savestack_max * sizeof (ANY);
721
722#if !PERL_VERSION_ATLEAST (5,10,0)
723 rss += slot->retstack_max * sizeof (OP *);
724#endif
725 } 798 }
726 } 799 }
727 800
728 return rss; 801 return rss;
729} 802}
… …
742#endif 815#endif
743 816
744/* 817/*
745 * This overrides the default magic get method of %SIG elements. 818 * 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 819 * 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 820 * and instead of trying to save and restore the hash elements, we just provide
748 * readback here. 821 * 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 */ 822 */
753static int 823static int
754coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 824coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
755{ 825{
756 const char *s = MgPV_nolen_const (mg); 826 const char *s = MgPV_nolen_const (mg);
… …
809 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 879 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
810 880
811 if (svp) 881 if (svp)
812 { 882 {
813 SV *old = *svp; 883 SV *old = *svp;
814 *svp = newSVsv (sv); 884 *svp = SvOK (sv) ? newSVsv (sv) : 0;
815 SvREFCNT_dec (old); 885 SvREFCNT_dec (old);
816 return 0; 886 return 0;
817 } 887 }
818 } 888 }
819 889
… …
829 899
830static int 900static int
831slf_check_nop (pTHX_ struct CoroSLF *frame) 901slf_check_nop (pTHX_ struct CoroSLF *frame)
832{ 902{
833 return 0; 903 return 0;
904}
905
906static int
907slf_check_repeat (pTHX_ struct CoroSLF *frame)
908{
909 return 1;
834} 910}
835 911
836static UNOP coro_setup_op; 912static UNOP coro_setup_op;
837 913
838static void NOINLINE /* noinline to keep it out of the transfer fast path */ 914static void NOINLINE /* noinline to keep it out of the transfer fast path */
… …
845 921
846 PL_runops = RUNOPS_DEFAULT; 922 PL_runops = RUNOPS_DEFAULT;
847 PL_curcop = &PL_compiling; 923 PL_curcop = &PL_compiling;
848 PL_in_eval = EVAL_NULL; 924 PL_in_eval = EVAL_NULL;
849 PL_comppad = 0; 925 PL_comppad = 0;
926 PL_comppad_name = 0;
927 PL_comppad_name_fill = 0;
928 PL_comppad_name_floor = 0;
850 PL_curpm = 0; 929 PL_curpm = 0;
851 PL_curpad = 0; 930 PL_curpad = 0;
852 PL_localizing = 0; 931 PL_localizing = 0;
853 PL_dirty = 0; 932 PL_dirty = 0;
854 PL_restartop = 0; 933 PL_restartop = 0;
855#if PERL_VERSION_ATLEAST (5,10,0) 934#if PERL_VERSION_ATLEAST (5,10,0)
856 PL_parser = 0; 935 PL_parser = 0;
857#endif 936#endif
937 PL_hints = 0;
858 938
859 /* recreate the die/warn hooks */ 939 /* recreate the die/warn hooks */
860 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 940 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); 941 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook);
862 942
863 GvSV (PL_defgv) = newSV (0); 943 GvSV (PL_defgv) = newSV (0);
864 GvAV (PL_defgv) = coro->args; coro->args = 0; 944 GvAV (PL_defgv) = coro->args; coro->args = 0;
865 GvSV (PL_errgv) = newSV (0); 945 GvSV (PL_errgv) = newSV (0);
866 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 946 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
947 GvHV (PL_hintgv) = 0;
867 PL_rs = newSVsv (GvSV (irsgv)); 948 PL_rs = newSVsv (GvSV (irsgv));
868 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 949 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
869 950
870 { 951 {
871 dSP; 952 dSP;
… …
889 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 970 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 */ 971 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
891 972
892 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 973 /* 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; 974 coro_setup_op.op_next = PL_op;
894 coro_setup_op.op_type = OP_CUSTOM; 975 coro_setup_op.op_type = OP_ENTERSUB;
895 coro_setup_op.op_ppaddr = pp_slf; 976 coro_setup_op.op_ppaddr = pp_slf;
896 /* no flags etc. required, as an init function won't be called */ 977 /* no flags etc. required, as an init function won't be called */
897 978
898 PL_op = (OP *)&coro_setup_op; 979 PL_op = (OP *)&coro_setup_op;
899 980
900 /* copy throw, in case it was set before coro_setup */ 981 /* copy throw, in case it was set before coro_setup */
901 CORO_THROW = coro->except; 982 CORO_THROW = coro->except;
902} 983}
903 984
904static void 985static void
905coro_destruct (pTHX_ struct coro *coro) 986coro_unwind_stacks (pTHX)
906{ 987{
907 if (!IN_DESTRUCT) 988 if (!IN_DESTRUCT)
908 { 989 {
909 /* restore all saved variables and stuff */ 990 /* restore all saved variables and stuff */
910 LEAVE_SCOPE (0); 991 LEAVE_SCOPE (0);
… …
918 POPSTACK_TO (PL_mainstack); 999 POPSTACK_TO (PL_mainstack);
919 1000
920 /* unwind main stack */ 1001 /* unwind main stack */
921 dounwind (-1); 1002 dounwind (-1);
922 } 1003 }
1004}
923 1005
924 SvREFCNT_dec (GvSV (PL_defgv)); 1006static void
925 SvREFCNT_dec (GvAV (PL_defgv)); 1007coro_destruct_perl (pTHX_ struct coro *coro)
926 SvREFCNT_dec (GvSV (PL_errgv)); 1008{
927 SvREFCNT_dec (PL_defoutgv); 1009 SV *svf [9];
928 SvREFCNT_dec (PL_rs);
929 SvREFCNT_dec (GvSV (irsgv));
930 1010
931 SvREFCNT_dec (PL_diehook);
932 SvREFCNT_dec (PL_warnhook);
933 1011 {
1012 struct coro *current = SvSTATE_current;
1013
1014 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1015
1016 save_perl (aTHX_ current);
1017 load_perl (aTHX_ coro);
1018
1019 coro_unwind_stacks (aTHX);
1020 coro_destruct_stacks (aTHX);
1021
1022 // now save some sv's to be free'd later
1023 svf [0] = GvSV (PL_defgv);
1024 svf [1] = (SV *)GvAV (PL_defgv);
1025 svf [2] = GvSV (PL_errgv);
1026 svf [3] = (SV *)PL_defoutgv;
1027 svf [4] = PL_rs;
1028 svf [5] = GvSV (irsgv);
1029 svf [6] = (SV *)GvHV (PL_hintgv);
1030 svf [7] = PL_diehook;
1031 svf [8] = PL_warnhook;
1032 assert (9 == sizeof (svf) / sizeof (*svf));
1033
1034 load_perl (aTHX_ current);
1035 }
1036
1037 {
1038 int i;
1039
1040 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i)
1041 SvREFCNT_dec (svf [i]);
1042
934 SvREFCNT_dec (coro->saved_deffh); 1043 SvREFCNT_dec (coro->saved_deffh);
935 SvREFCNT_dec (coro->rouse_cb); 1044 SvREFCNT_dec (coro->rouse_cb);
936 1045 SvREFCNT_dec (coro->invoke_cb);
937 coro_destruct_stacks (aTHX); 1046 SvREFCNT_dec (coro->invoke_av);
1047 }
938} 1048}
939 1049
940INLINE void 1050INLINE void
941free_coro_mortal (pTHX) 1051free_coro_mortal (pTHX)
942{ 1052{
… …
950static int 1060static int
951runops_trace (pTHX) 1061runops_trace (pTHX)
952{ 1062{
953 COP *oldcop = 0; 1063 COP *oldcop = 0;
954 int oldcxix = -2; 1064 int oldcxix = -2;
955 struct coro *coro = SvSTATE_current; /* trace cctx is tied to specific coro */
956 coro_cctx *cctx = coro->cctx;
957 1065
958 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX))) 1066 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX)))
959 { 1067 {
960 PERL_ASYNC_CHECK (); 1068 PERL_ASYNC_CHECK ();
961 1069
962 if (cctx->flags & CC_TRACE_ALL) 1070 if (cctx_current->flags & CC_TRACE_ALL)
963 { 1071 {
964 if (PL_op->op_type == OP_LEAVESUB && cctx->flags & CC_TRACE_SUB) 1072 if (PL_op->op_type == OP_LEAVESUB && cctx_current->flags & CC_TRACE_SUB)
965 { 1073 {
966 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1074 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
967 SV **bot, **top; 1075 SV **bot, **top;
968 AV *av = newAV (); /* return values */ 1076 AV *av = newAV (); /* return values */
969 SV **cb; 1077 SV **cb;
… …
1006 1114
1007 if (PL_curcop != &PL_compiling) 1115 if (PL_curcop != &PL_compiling)
1008 { 1116 {
1009 SV **cb; 1117 SV **cb;
1010 1118
1011 if (oldcxix != cxstack_ix && cctx->flags & CC_TRACE_SUB) 1119 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB)
1012 { 1120 {
1013 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1121 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1014 1122
1015 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1123 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1016 { 1124 {
1017 runops_proc_t old_runops = PL_runops;
1018 dSP; 1125 dSP;
1019 GV *gv = CvGV (cx->blk_sub.cv); 1126 GV *gv = CvGV (cx->blk_sub.cv);
1020 SV *fullname = sv_2mortal (newSV (0)); 1127 SV *fullname = sv_2mortal (newSV (0));
1021 1128
1022 if (isGV (gv)) 1129 if (isGV (gv))
… …
1040 } 1147 }
1041 1148
1042 oldcxix = cxstack_ix; 1149 oldcxix = cxstack_ix;
1043 } 1150 }
1044 1151
1045 if (cctx->flags & CC_TRACE_LINE) 1152 if (cctx_current->flags & CC_TRACE_LINE)
1046 { 1153 {
1047 dSP; 1154 dSP;
1048 1155
1049 PL_runops = RUNOPS_DEFAULT; 1156 PL_runops = RUNOPS_DEFAULT;
1050 ENTER; 1157 ENTER;
… …
1069 1176
1070 TAINT_NOT; 1177 TAINT_NOT;
1071 return 0; 1178 return 0;
1072} 1179}
1073 1180
1074static struct coro_cctx *cctx_ssl_cctx;
1075static struct CoroSLF cctx_ssl_frame; 1181static struct CoroSLF cctx_ssl_frame;
1076 1182
1077static void 1183static void
1078slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta) 1184slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta)
1079{ 1185{
1080 ta->prev = (struct coro *)cctx_ssl_cctx;
1081 ta->next = 0; 1186 ta->prev = 0;
1082} 1187}
1083 1188
1084static int 1189static int
1085slf_check_set_stacklevel (pTHX_ struct CoroSLF *frame) 1190slf_check_set_stacklevel (pTHX_ struct CoroSLF *frame)
1086{ 1191{
… …
1089 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1194 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1090} 1195}
1091 1196
1092/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1197/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1093static void NOINLINE 1198static void NOINLINE
1094cctx_prepare (pTHX_ coro_cctx *cctx) 1199cctx_prepare (pTHX)
1095{ 1200{
1096 PL_top_env = &PL_start_env; 1201 PL_top_env = &PL_start_env;
1097 1202
1098 if (cctx->flags & CC_TRACE) 1203 if (cctx_current->flags & CC_TRACE)
1099 PL_runops = runops_trace; 1204 PL_runops = runops_trace;
1100 1205
1101 /* we already must be executing an SLF op, there is no other valid way 1206 /* we already must be executing an SLF op, there is no other valid way
1102 * that can lead to creation of a new cctx */ 1207 * that can lead to creation of a new cctx */
1103 assert (("FATAL: can't prepare slf-less cctx in Coro module (please report)", 1208 assert (("FATAL: can't prepare slf-less cctx in Coro module (please report)",
1104 slf_frame.prepare && PL_op->op_ppaddr == pp_slf)); 1209 slf_frame.prepare && PL_op->op_ppaddr == pp_slf));
1105 1210
1106 /* we must emulate leaving pp_slf, which is done inside slf_check_set_stacklevel */ 1211 /* we must emulate leaving pp_slf, which is done inside slf_check_set_stacklevel */
1107 cctx_ssl_cctx = cctx;
1108 cctx_ssl_frame = slf_frame; 1212 cctx_ssl_frame = slf_frame;
1109 1213
1110 slf_frame.prepare = slf_prepare_set_stacklevel; 1214 slf_frame.prepare = slf_prepare_set_stacklevel;
1111 slf_frame.check = slf_check_set_stacklevel; 1215 slf_frame.check = slf_check_set_stacklevel;
1112} 1216}
… …
1135 /* normally we would need to skip the entersub here */ 1239 /* normally we would need to skip the entersub here */
1136 /* not doing so will re-execute it, which is exactly what we want */ 1240 /* not doing so will re-execute it, which is exactly what we want */
1137 /* PL_nop = PL_nop->op_next */ 1241 /* PL_nop = PL_nop->op_next */
1138 1242
1139 /* inject a fake subroutine call to cctx_init */ 1243 /* inject a fake subroutine call to cctx_init */
1140 cctx_prepare (aTHX_ (coro_cctx *)arg); 1244 cctx_prepare (aTHX);
1141 1245
1142 /* cctx_run is the alternative tail of transfer() */ 1246 /* cctx_run is the alternative tail of transfer() */
1143 transfer_tail (aTHX); 1247 transfer_tail (aTHX);
1144 1248
1145 /* somebody or something will hit me for both perl_run and PL_restartop */ 1249 /* somebody or something will hit me for both perl_run and PL_restartop */
… …
1153 /* 1257 /*
1154 * If perl-run returns we assume exit() was being called or the coro 1258 * If perl-run returns we assume exit() was being called or the coro
1155 * fell off the end, which seems to be the only valid (non-bug) 1259 * fell off the end, which seems to be the only valid (non-bug)
1156 * reason for perl_run to return. We try to exit by jumping to the 1260 * reason for perl_run to return. We try to exit by jumping to the
1157 * bootstrap-time "top" top_env, as we cannot restore the "main" 1261 * bootstrap-time "top" top_env, as we cannot restore the "main"
1158 * coroutine as Coro has no such concept 1262 * coroutine as Coro has no such concept.
1263 * This actually isn't valid with the pthread backend, but OSes requiring
1264 * that backend are too broken to do it in a standards-compliant way.
1159 */ 1265 */
1160 PL_top_env = main_top_env; 1266 PL_top_env = main_top_env;
1161 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */ 1267 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1162 } 1268 }
1163} 1269}
… …
1240cctx_destroy (coro_cctx *cctx) 1346cctx_destroy (coro_cctx *cctx)
1241{ 1347{
1242 if (!cctx) 1348 if (!cctx)
1243 return; 1349 return;
1244 1350
1351 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary?
1352
1245 --cctx_count; 1353 --cctx_count;
1246 coro_destroy (&cctx->cctx); 1354 coro_destroy (&cctx->cctx);
1247 1355
1248 /* coro_transfer creates new, empty cctx's */ 1356 /* coro_transfer creates new, empty cctx's */
1249 if (cctx->sptr) 1357 if (cctx->sptr)
… …
1312 /* TODO: throwing up here is considered harmful */ 1420 /* TODO: throwing up here is considered harmful */
1313 1421
1314 if (expect_true (prev != next)) 1422 if (expect_true (prev != next))
1315 { 1423 {
1316 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1424 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1317 croak ("Coro::State::transfer called with non-running/new prev Coro::State, but can only transfer from running or new states,"); 1425 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1318 1426
1319 if (expect_false (next->flags & CF_RUNNING))
1320 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states,");
1321
1322 if (expect_false (next->flags & CF_DESTROYED)) 1427 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED)))
1323 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states,"); 1428 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1324 1429
1325#if !PERL_VERSION_ATLEAST (5,10,0) 1430#if !PERL_VERSION_ATLEAST (5,10,0)
1326 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1431 if (expect_false (PL_lex_state != LEX_NOTPARSING))
1327 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,"); 1432 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1328#endif 1433#endif
… …
1334transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1439transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1335{ 1440{
1336 dSTACKLEVEL; 1441 dSTACKLEVEL;
1337 1442
1338 /* sometimes transfer is only called to set idle_sp */ 1443 /* sometimes transfer is only called to set idle_sp */
1339 if (expect_false (!next)) 1444 if (expect_false (!prev))
1340 { 1445 {
1341 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1446 cctx_current->idle_sp = STACKLEVEL;
1342 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1447 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1343 } 1448 }
1344 else if (expect_true (prev != next)) 1449 else if (expect_true (prev != next))
1345 { 1450 {
1346 coro_cctx *prev__cctx; 1451 coro_cctx *cctx_prev;
1347 1452
1348 if (expect_false (prev->flags & CF_NEW)) 1453 if (expect_false (prev->flags & CF_NEW))
1349 { 1454 {
1350 /* create a new empty/source context */ 1455 /* create a new empty/source context */
1351 prev->cctx = cctx_new_empty ();
1352 prev->flags &= ~CF_NEW; 1456 prev->flags &= ~CF_NEW;
1353 prev->flags |= CF_RUNNING; 1457 prev->flags |= CF_RUNNING;
1354 } 1458 }
1355 1459
1356 prev->flags &= ~CF_RUNNING; 1460 prev->flags &= ~CF_RUNNING;
… …
1367 coro_setup (aTHX_ next); 1471 coro_setup (aTHX_ next);
1368 } 1472 }
1369 else 1473 else
1370 load_perl (aTHX_ next); 1474 load_perl (aTHX_ next);
1371 1475
1372 prev__cctx = prev->cctx;
1373
1374 /* possibly untie and reuse the cctx */ 1476 /* possibly untie and reuse the cctx */
1375 if (expect_true ( 1477 if (expect_true (
1376 prev__cctx->idle_sp == STACKLEVEL 1478 cctx_current->idle_sp == STACKLEVEL
1377 && !(prev__cctx->flags & CC_TRACE) 1479 && !(cctx_current->flags & CC_TRACE)
1378 && !force_cctx 1480 && !force_cctx
1379 )) 1481 ))
1380 { 1482 {
1381 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1483 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */
1382 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == prev__cctx->idle_te)); 1484 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1383 1485
1384 prev->cctx = 0;
1385
1386 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */ 1486 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */
1387 /* without this the next cctx_get might destroy the prev__cctx while still in use */ 1487 /* without this the next cctx_get might destroy the running cctx while still in use */
1388 if (expect_false (CCTX_EXPIRED (prev__cctx))) 1488 if (expect_false (CCTX_EXPIRED (cctx_current)))
1389 if (!next->cctx) 1489 if (expect_true (!next->cctx))
1390 next->cctx = cctx_get (aTHX); 1490 next->cctx = cctx_get (aTHX);
1391 1491
1392 cctx_put (prev__cctx); 1492 cctx_put (cctx_current);
1393 } 1493 }
1494 else
1495 prev->cctx = cctx_current;
1394 1496
1395 ++next->usecount; 1497 ++next->usecount;
1396 1498
1397 if (expect_true (!next->cctx)) 1499 cctx_prev = cctx_current;
1398 next->cctx = cctx_get (aTHX); 1500 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1399 1501
1400 if (expect_false (prev__cctx != next->cctx)) 1502 next->cctx = 0;
1503
1504 if (expect_false (cctx_prev != cctx_current))
1401 { 1505 {
1402 prev__cctx->top_env = PL_top_env; 1506 cctx_prev->top_env = PL_top_env;
1403 PL_top_env = next->cctx->top_env; 1507 PL_top_env = cctx_current->top_env;
1404 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1508 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1405 } 1509 }
1406 1510
1407 transfer_tail (aTHX); 1511 transfer_tail (aTHX);
1408 } 1512 }
1409} 1513}
… …
1417coro_state_destroy (pTHX_ struct coro *coro) 1521coro_state_destroy (pTHX_ struct coro *coro)
1418{ 1522{
1419 if (coro->flags & CF_DESTROYED) 1523 if (coro->flags & CF_DESTROYED)
1420 return 0; 1524 return 0;
1421 1525
1422 if (coro->on_destroy) 1526 if (coro->on_destroy && !PL_dirty)
1423 coro->on_destroy (aTHX_ coro); 1527 coro->on_destroy (aTHX_ coro);
1424 1528
1425 coro->flags |= CF_DESTROYED; 1529 coro->flags |= CF_DESTROYED;
1426 1530
1427 if (coro->flags & CF_READY) 1531 if (coro->flags & CF_READY)
… …
1431 --coro_nready; 1535 --coro_nready;
1432 } 1536 }
1433 else 1537 else
1434 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1538 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1435 1539
1436 if (coro->mainstack && coro->mainstack != main_mainstack) 1540 if (coro->mainstack
1437 { 1541 && coro->mainstack != main_mainstack
1438 struct coro temp; 1542 && coro->slot
1439 1543 && !PL_dirty)
1440 assert (("FATAL: tried to destroy currently running coroutine (please report)", !(coro->flags & CF_RUNNING)));
1441
1442 save_perl (aTHX_ &temp);
1443 load_perl (aTHX_ coro);
1444
1445 coro_destruct (aTHX_ coro); 1544 coro_destruct_perl (aTHX_ coro);
1446
1447 load_perl (aTHX_ &temp);
1448
1449 coro->slot = 0;
1450 }
1451 1545
1452 cctx_destroy (coro->cctx); 1546 cctx_destroy (coro->cctx);
1453 SvREFCNT_dec (coro->startcv); 1547 SvREFCNT_dec (coro->startcv);
1454 SvREFCNT_dec (coro->args); 1548 SvREFCNT_dec (coro->args);
1455 SvREFCNT_dec (CORO_THROW); 1549 SvREFCNT_dec (CORO_THROW);
… …
1542/** Coro ********************************************************************/ 1636/** Coro ********************************************************************/
1543 1637
1544INLINE void 1638INLINE void
1545coro_enq (pTHX_ struct coro *coro) 1639coro_enq (pTHX_ struct coro *coro)
1546{ 1640{
1547 av_push (coro_ready [coro->prio - PRIO_MIN], SvREFCNT_inc_NN (coro->hv)); 1641 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1548}
1549 1642
1550INLINE SV * 1643 SvREFCNT_inc_NN (coro->hv);
1644
1645 coro->next_ready = 0;
1646 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1647 ready [1] = coro;
1648}
1649
1650INLINE struct coro *
1551coro_deq (pTHX) 1651coro_deq (pTHX)
1552{ 1652{
1553 int prio; 1653 int prio;
1554 1654
1555 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; ) 1655 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
1556 if (AvFILLp (coro_ready [prio]) >= 0) 1656 {
1557 return av_shift (coro_ready [prio]); 1657 struct coro **ready = coro_ready [prio];
1658
1659 if (ready [0])
1660 {
1661 struct coro *coro = ready [0];
1662 ready [0] = coro->next_ready;
1663 return coro;
1664 }
1665 }
1558 1666
1559 return 0; 1667 return 0;
1560} 1668}
1561 1669
1562static int 1670static int
… …
1564{ 1672{
1565 struct coro *coro; 1673 struct coro *coro;
1566 SV *sv_hook; 1674 SV *sv_hook;
1567 void (*xs_hook)(void); 1675 void (*xs_hook)(void);
1568 1676
1569 if (SvROK (coro_sv))
1570 coro_sv = SvRV (coro_sv);
1571
1572 coro = SvSTATE (coro_sv); 1677 coro = SvSTATE (coro_sv);
1573 1678
1574 if (coro->flags & CF_READY) 1679 if (coro->flags & CF_READY)
1575 return 0; 1680 return 0;
1576 1681
… …
1607api_is_ready (pTHX_ SV *coro_sv) 1712api_is_ready (pTHX_ SV *coro_sv)
1608{ 1713{
1609 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1714 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1610} 1715}
1611 1716
1717/* expects to own a reference to next->hv */
1612INLINE void 1718INLINE void
1613prepare_schedule (pTHX_ struct coro_transfer_args *ta) 1719prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1614{ 1720{
1615 SV *prev_sv, *next_sv;
1616
1617 for (;;)
1618 {
1619 next_sv = coro_deq (aTHX);
1620
1621 /* nothing to schedule: call the idle handler */
1622 if (expect_false (!next_sv))
1623 {
1624 dSP;
1625
1626 ENTER;
1627 SAVETMPS;
1628
1629 PUSHMARK (SP);
1630 PUTBACK;
1631 call_sv (get_sv ("Coro::idle", FALSE), G_VOID | G_DISCARD);
1632
1633 FREETMPS;
1634 LEAVE;
1635 continue;
1636 }
1637
1638 ta->next = SvSTATE_hv (next_sv);
1639
1640 /* cannot transfer to destroyed coros, skip and look for next */
1641 if (expect_false (ta->next->flags & CF_DESTROYED))
1642 {
1643 SvREFCNT_dec (next_sv);
1644 /* coro_nready has already been taken care of by destroy */
1645 continue;
1646 }
1647
1648 --coro_nready;
1649 break;
1650 }
1651
1652 /* free this only after the transfer */
1653 prev_sv = SvRV (coro_current); 1721 SV *prev_sv = SvRV (coro_current);
1722
1654 ta->prev = SvSTATE_hv (prev_sv); 1723 ta->prev = SvSTATE_hv (prev_sv);
1724 ta->next = next;
1725
1655 TRANSFER_CHECK (*ta); 1726 TRANSFER_CHECK (*ta);
1656 assert (("FATAL: next coroutine isn't marked as ready in Coro (please report)", ta->next->flags & CF_READY)); 1727
1657 ta->next->flags &= ~CF_READY;
1658 SvRV_set (coro_current, next_sv); 1728 SvRV_set (coro_current, (SV *)next->hv);
1659 1729
1660 free_coro_mortal (aTHX); 1730 free_coro_mortal (aTHX);
1661 coro_mortal = prev_sv; 1731 coro_mortal = prev_sv;
1662} 1732}
1663 1733
1734static void
1735prepare_schedule (pTHX_ struct coro_transfer_args *ta)
1736{
1737 for (;;)
1738 {
1739 struct coro *next = coro_deq (aTHX);
1740
1741 if (expect_true (next))
1742 {
1743 /* cannot transfer to destroyed coros, skip and look for next */
1744 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED)))
1745 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1746 else
1747 {
1748 next->flags &= ~CF_READY;
1749 --coro_nready;
1750
1751 prepare_schedule_to (aTHX_ ta, next);
1752 break;
1753 }
1754 }
1755 else
1756 {
1757 /* nothing to schedule: call the idle handler */
1758 if (SvROK (sv_idle)
1759 && SvOBJECT (SvRV (sv_idle)))
1760 {
1761 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1762 api_ready (aTHX_ SvRV (sv_idle));
1763 --coro_nready;
1764 }
1765 else
1766 {
1767 dSP;
1768
1769 ENTER;
1770 SAVETMPS;
1771
1772 PUSHMARK (SP);
1773 PUTBACK;
1774 call_sv (sv_idle, G_VOID | G_DISCARD);
1775
1776 FREETMPS;
1777 LEAVE;
1778 }
1779 }
1780 }
1781}
1782
1664INLINE void 1783INLINE void
1665prepare_cede (pTHX_ struct coro_transfer_args *ta) 1784prepare_cede (pTHX_ struct coro_transfer_args *ta)
1666{ 1785{
1667 api_ready (aTHX_ coro_current); 1786 api_ready (aTHX_ coro_current);
1668 prepare_schedule (aTHX_ ta); 1787 prepare_schedule (aTHX_ ta);
… …
1687{ 1806{
1688 struct coro_transfer_args ta; 1807 struct coro_transfer_args ta;
1689 1808
1690 prepare_schedule (aTHX_ &ta); 1809 prepare_schedule (aTHX_ &ta);
1691 TRANSFER (ta, 1); 1810 TRANSFER (ta, 1);
1811}
1812
1813static void
1814api_schedule_to (pTHX_ SV *coro_sv)
1815{
1816 struct coro_transfer_args ta;
1817 struct coro *next = SvSTATE (coro_sv);
1818
1819 SvREFCNT_inc_NN (coro_sv);
1820 prepare_schedule_to (aTHX_ &ta, next);
1692} 1821}
1693 1822
1694static int 1823static int
1695api_cede (pTHX) 1824api_cede (pTHX)
1696{ 1825{
… …
1725static void 1854static void
1726api_trace (pTHX_ SV *coro_sv, int flags) 1855api_trace (pTHX_ SV *coro_sv, int flags)
1727{ 1856{
1728 struct coro *coro = SvSTATE (coro_sv); 1857 struct coro *coro = SvSTATE (coro_sv);
1729 1858
1859 if (coro->flags & CF_RUNNING)
1860 croak ("cannot enable tracing on a running coroutine, caught");
1861
1730 if (flags & CC_TRACE) 1862 if (flags & CC_TRACE)
1731 { 1863 {
1732 if (!coro->cctx) 1864 if (!coro->cctx)
1733 coro->cctx = cctx_new_run (); 1865 coro->cctx = cctx_new_run ();
1734 else if (!(coro->cctx->flags & CC_TRACE)) 1866 else if (!(coro->cctx->flags & CC_TRACE))
1735 croak ("cannot enable tracing on coroutine with custom stack,"); 1867 croak ("cannot enable tracing on coroutine with custom stack, caught");
1736 1868
1737 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL)); 1869 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL));
1738 } 1870 }
1739 else if (coro->cctx && coro->cctx->flags & CC_TRACE) 1871 else if (coro->cctx && coro->cctx->flags & CC_TRACE)
1740 { 1872 {
… …
1745 else 1877 else
1746 coro->slot->runops = RUNOPS_DEFAULT; 1878 coro->slot->runops = RUNOPS_DEFAULT;
1747 } 1879 }
1748} 1880}
1749 1881
1882static void
1883coro_call_on_destroy (pTHX_ struct coro *coro)
1884{
1885 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0);
1886 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1887
1888 if (on_destroyp)
1889 {
1890 AV *on_destroy = (AV *)SvRV (*on_destroyp);
1891
1892 while (AvFILLp (on_destroy) >= 0)
1893 {
1894 dSP; /* don't disturb outer sp */
1895 SV *cb = av_pop (on_destroy);
1896
1897 PUSHMARK (SP);
1898
1899 if (statusp)
1900 {
1901 int i;
1902 AV *status = (AV *)SvRV (*statusp);
1903 EXTEND (SP, AvFILLp (status) + 1);
1904
1905 for (i = 0; i <= AvFILLp (status); ++i)
1906 PUSHs (AvARRAY (status)[i]);
1907 }
1908
1909 PUTBACK;
1910 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD);
1911 }
1912 }
1913}
1914
1915static void
1916slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1917{
1918 int i;
1919 HV *hv = (HV *)SvRV (coro_current);
1920 AV *av = newAV ();
1921
1922 av_extend (av, items - 1);
1923 for (i = 0; i < items; ++i)
1924 av_push (av, SvREFCNT_inc_NN (arg [i]));
1925
1926 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0);
1927
1928 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */
1929 api_ready (aTHX_ sv_manager);
1930
1931 frame->prepare = prepare_schedule;
1932 frame->check = slf_check_repeat;
1933
1934 /* as a minor optimisation, we could unwind all stacks here */
1935 /* but that puts extra pressure on pp_slf, and is not worth much */
1936 /*coro_unwind_stacks (aTHX);*/
1937}
1938
1939/*****************************************************************************/
1940/* async pool handler */
1941
1942static int
1943slf_check_pool_handler (pTHX_ struct CoroSLF *frame)
1944{
1945 HV *hv = (HV *)SvRV (coro_current);
1946 struct coro *coro = (struct coro *)frame->data;
1947
1948 if (!coro->invoke_cb)
1949 return 1; /* loop till we have invoke */
1950 else
1951 {
1952 hv_store (hv, "desc", sizeof ("desc") - 1,
1953 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
1954
1955 coro->saved_deffh = SvREFCNT_inc_NN ((SV *)PL_defoutgv);
1956
1957 {
1958 dSP;
1959 XPUSHs (sv_2mortal (coro->invoke_cb)); coro->invoke_cb = 0;
1960 PUTBACK;
1961 }
1962
1963 SvREFCNT_dec (GvAV (PL_defgv));
1964 GvAV (PL_defgv) = coro->invoke_av;
1965 coro->invoke_av = 0;
1966
1967 return 0;
1968 }
1969}
1970
1971static void
1972slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1973{
1974 HV *hv = (HV *)SvRV (coro_current);
1975 struct coro *coro = SvSTATE_hv ((SV *)hv);
1976
1977 if (expect_true (coro->saved_deffh))
1978 {
1979 /* subsequent iteration */
1980 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1981 coro->saved_deffh = 0;
1982
1983 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
1984 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1985 {
1986 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate);
1987 coro->invoke_av = newAV ();
1988
1989 frame->prepare = prepare_nop;
1990 }
1991 else
1992 {
1993 av_clear (GvAV (PL_defgv));
1994 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
1995
1996 coro->prio = 0;
1997
1998 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
1999 api_trace (aTHX_ coro_current, 0);
2000
2001 frame->prepare = prepare_schedule;
2002 av_push (av_async_pool, SvREFCNT_inc (hv));
2003 }
2004 }
2005 else
2006 {
2007 /* first iteration, simply fall through */
2008 frame->prepare = prepare_nop;
2009 }
2010
2011 frame->check = slf_check_pool_handler;
2012 frame->data = (void *)coro;
2013}
2014
1750/*****************************************************************************/ 2015/*****************************************************************************/
1751/* rouse callback */ 2016/* rouse callback */
1752 2017
1753#define CORO_MAGIC_type_rouse PERL_MAGIC_ext 2018#define CORO_MAGIC_type_rouse PERL_MAGIC_ext
1754 2019
… …
1759 SV *data = (SV *)GENSUB_ARG; 2024 SV *data = (SV *)GENSUB_ARG;
1760 2025
1761 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2026 if (SvTYPE (SvRV (data)) != SVt_PVAV)
1762 { 2027 {
1763 /* first call, set args */ 2028 /* first call, set args */
1764 int i; 2029 SV *coro = SvRV (data);
1765 AV *av = newAV (); 2030 AV *av = newAV ();
1766 SV *coro = SvRV (data);
1767 2031
1768 SvRV_set (data, (SV *)av); 2032 SvRV_set (data, (SV *)av);
1769 api_ready (aTHX_ coro);
1770 SvREFCNT_dec (coro);
1771 2033
1772 /* better take a full copy of the arguments */ 2034 /* better take a full copy of the arguments */
1773 while (items--) 2035 while (items--)
1774 av_store (av, items, newSVsv (ST (items))); 2036 av_store (av, items, newSVsv (ST (items)));
2037
2038 api_ready (aTHX_ coro);
2039 SvREFCNT_dec (coro);
1775 } 2040 }
1776 2041
1777 XSRETURN_EMPTY; 2042 XSRETURN_EMPTY;
1778} 2043}
1779 2044
… …
1796 2061
1797 EXTEND (SP, AvFILLp (av) + 1); 2062 EXTEND (SP, AvFILLp (av) + 1);
1798 for (i = 0; i <= AvFILLp (av); ++i) 2063 for (i = 0; i <= AvFILLp (av); ++i)
1799 PUSHs (sv_2mortal (AvARRAY (av)[i])); 2064 PUSHs (sv_2mortal (AvARRAY (av)[i]));
1800 2065
1801 /* we have stolen the elements, so ste length to zero and free */ 2066 /* we have stolen the elements, so set length to zero and free */
1802 AvFILLp (av) = -1; 2067 AvFILLp (av) = -1;
1803 av_undef (av); 2068 av_undef (av);
1804 2069
1805 PUTBACK; 2070 PUTBACK;
1806 } 2071 }
… …
1910static void 2175static void
1911slf_init_schedule (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2176slf_init_schedule (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1912{ 2177{
1913 frame->prepare = prepare_schedule; 2178 frame->prepare = prepare_schedule;
1914 frame->check = slf_check_nop; 2179 frame->check = slf_check_nop;
2180}
2181
2182static void
2183slf_prepare_schedule_to (pTHX_ struct coro_transfer_args *ta)
2184{
2185 struct coro *next = (struct coro *)slf_frame.data;
2186
2187 SvREFCNT_inc_NN (next->hv);
2188 prepare_schedule_to (aTHX_ ta, next);
2189}
2190
2191static void
2192slf_init_schedule_to (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2193{
2194 if (!items)
2195 croak ("Coro::schedule_to expects a coroutine argument, caught");
2196
2197 frame->data = (void *)SvSTATE (arg [0]);
2198 frame->prepare = slf_prepare_schedule_to;
2199 frame->check = slf_check_nop;
2200}
2201
2202static void
2203slf_init_cede_to (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2204{
2205 api_ready (aTHX_ SvRV (coro_current));
2206
2207 slf_init_schedule_to (aTHX_ frame, cv, arg, items);
1915} 2208}
1916 2209
1917static void 2210static void
1918slf_init_cede (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2211slf_init_cede (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1919{ 2212{
… …
2065 } 2358 }
2066 else 2359 else
2067 slf_argc = 0; 2360 slf_argc = 0;
2068 2361
2069 PL_op->op_ppaddr = pp_slf; 2362 PL_op->op_ppaddr = pp_slf;
2070 PL_op->op_type = OP_CUSTOM; /* maybe we should leave it at entersub? */ 2363 /*PL_op->op_type = OP_CUSTOM; /* we do behave like entersub still */
2071 2364
2072 PL_op = (OP *)&slf_restore; 2365 PL_op = (OP *)&slf_restore;
2366}
2367
2368/*****************************************************************************/
2369/* dynamic wind */
2370
2371static void
2372on_enterleave_call (pTHX_ SV *cb)
2373{
2374 dSP;
2375
2376 PUSHSTACK;
2377
2378 PUSHMARK (SP);
2379 PUTBACK;
2380 call_sv (cb, G_VOID | G_DISCARD);
2381 SPAGAIN;
2382
2383 POPSTACK;
2384}
2385
2386static SV *
2387coro_avp_pop_and_free (pTHX_ AV **avp)
2388{
2389 AV *av = *avp;
2390 SV *res = av_pop (av);
2391
2392 if (AvFILLp (av) < 0)
2393 {
2394 *avp = 0;
2395 SvREFCNT_dec (av);
2396 }
2397
2398 return res;
2399}
2400
2401static void
2402coro_pop_on_enter (pTHX_ void *coro)
2403{
2404 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_enter);
2405 SvREFCNT_dec (cb);
2406}
2407
2408static void
2409coro_pop_on_leave (pTHX_ void *coro)
2410{
2411 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2412 on_enterleave_call (aTHX_ sv_2mortal (cb));
2073} 2413}
2074 2414
2075/*****************************************************************************/ 2415/*****************************************************************************/
2076/* PerlIO::cede */ 2416/* PerlIO::cede */
2077 2417
… …
2151/* Coro::Semaphore & Coro::Signal */ 2491/* Coro::Semaphore & Coro::Signal */
2152 2492
2153static SV * 2493static SV *
2154coro_waitarray_new (pTHX_ int count) 2494coro_waitarray_new (pTHX_ int count)
2155{ 2495{
2156 /* a semaphore contains a counter IV in $sem->[0] and any waiters after that */ 2496 /* a waitarray=semaphore contains a counter IV in $sem->[0] and any waiters after that */
2157 AV *av = newAV (); 2497 AV *av = newAV ();
2158 SV **ary; 2498 SV **ary;
2159 2499
2160 /* unfortunately, building manually saves memory */ 2500 /* unfortunately, building manually saves memory */
2161 Newx (ary, 2, SV *); 2501 Newx (ary, 2, SV *);
2162 AvALLOC (av) = ary; 2502 AvALLOC (av) = ary;
2503#if PERL_VERSION_ATLEAST (5,10,0)
2163 /*AvARRAY (av) = ary;*/ 2504 AvARRAY (av) = ary;
2505#else
2164 SvPVX ((SV *)av) = (char *)ary; /* 5.8.8 needs this syntax instead of AvARRAY = ary */ 2506 /* 5.8.8 needs this syntax instead of AvARRAY = ary, yet */
2507 /* -DDEBUGGING flags this as a bug, despite it perfectly working */
2508 SvPVX ((SV *)av) = (char *)ary;
2509#endif
2165 AvMAX (av) = 1; 2510 AvMAX (av) = 1;
2166 AvFILLp (av) = 0; 2511 AvFILLp (av) = 0;
2167 ary [0] = newSViv (count); 2512 ary [0] = newSViv (count);
2168 2513
2169 return newRV_noinc ((SV *)av); 2514 return newRV_noinc ((SV *)av);
… …
2298{ 2643{
2299 if (items >= 2) 2644 if (items >= 2)
2300 { 2645 {
2301 /* callback form */ 2646 /* callback form */
2302 AV *av = (AV *)SvRV (arg [0]); 2647 AV *av = (AV *)SvRV (arg [0]);
2303 CV *cb_cv = coro_sv_2cv (arg [1]); 2648 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]);
2304 2649
2305 av_push (av, (SV *)SvREFCNT_inc_NN (cb_cv)); 2650 av_push (av, SvREFCNT_inc_NN (cb_cv));
2306 2651
2307 if (SvIVX (AvARRAY (av)[0]) > 0) 2652 if (SvIVX (AvARRAY (av)[0]) > 0)
2308 coro_semaphore_adjust (aTHX_ av, 0); 2653 coro_semaphore_adjust (aTHX_ av, 0);
2309 2654
2310 frame->prepare = prepare_nop; 2655 frame->prepare = prepare_nop;
… …
2334 AvARRAY (av)[0] = AvARRAY (av)[1]; 2679 AvARRAY (av)[0] = AvARRAY (av)[1];
2335 AvARRAY (av)[1] = cb; 2680 AvARRAY (av)[1] = cb;
2336 2681
2337 cb = av_shift (av); 2682 cb = av_shift (av);
2338 2683
2684 if (SvTYPE (cb) == SVt_PVCV)
2685 {
2686 dSP;
2687 PUSHMARK (SP);
2688 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2689 PUTBACK;
2690 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2691 }
2692 else
2693 {
2339 api_ready (aTHX_ cb); 2694 api_ready (aTHX_ cb);
2340 sv_setiv (cb, 0); /* signal waiter */ 2695 sv_setiv (cb, 0); /* signal waiter */
2696 }
2697
2341 SvREFCNT_dec (cb); 2698 SvREFCNT_dec (cb);
2342 2699
2343 --count; 2700 --count;
2344 } 2701 }
2345} 2702}
… …
2354static void 2711static void
2355slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2712slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2356{ 2713{
2357 AV *av = (AV *)SvRV (arg [0]); 2714 AV *av = (AV *)SvRV (arg [0]);
2358 2715
2716 if (items >= 2)
2717 {
2718 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]);
2719 av_push (av, SvREFCNT_inc_NN (cb_cv));
2720
2359 if (SvIVX (AvARRAY (av)[0])) 2721 if (SvIVX (AvARRAY (av)[0]))
2722 coro_signal_wake (aTHX_ av, 1); /* ust be the only waiter */
2723
2724 frame->prepare = prepare_nop;
2725 frame->check = slf_check_nop;
2726 }
2727 else if (SvIVX (AvARRAY (av)[0]))
2360 { 2728 {
2361 SvIVX (AvARRAY (av)[0]) = 0; 2729 SvIVX (AvARRAY (av)[0]) = 0;
2362 frame->prepare = prepare_nop; 2730 frame->prepare = prepare_nop;
2363 frame->check = slf_check_nop; 2731 frame->check = slf_check_nop;
2364 } 2732 }
2365 else 2733 else
2366 { 2734 {
2367 SV *waiter = newRV_inc (SvRV (coro_current)); /* owned by signal av */ 2735 SV *waiter = newSVsv (coro_current); /* owned by signal av */
2368 2736
2369 av_push (av, waiter); 2737 av_push (av, waiter);
2370 2738
2371 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */ 2739 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */
2372 frame->prepare = prepare_schedule; 2740 frame->prepare = prepare_schedule;
… …
2394 dXSARGS; 2762 dXSARGS;
2395 AV *state = (AV *)GENSUB_ARG; 2763 AV *state = (AV *)GENSUB_ARG;
2396 SV *coro = av_pop (state); 2764 SV *coro = av_pop (state);
2397 SV *data_sv = newSV (sizeof (struct io_state)); 2765 SV *data_sv = newSV (sizeof (struct io_state));
2398 2766
2399 av_extend (state, items); 2767 av_extend (state, items - 1);
2400 2768
2401 sv_upgrade (data_sv, SVt_PV); 2769 sv_upgrade (data_sv, SVt_PV);
2402 SvCUR_set (data_sv, sizeof (struct io_state)); 2770 SvCUR_set (data_sv, sizeof (struct io_state));
2403 SvPOK_only (data_sv); 2771 SvPOK_only (data_sv);
2404 2772
… …
2539 XSRETURN_EMPTY; 2907 XSRETURN_EMPTY;
2540} 2908}
2541 2909
2542/*****************************************************************************/ 2910/*****************************************************************************/
2543 2911
2912#if CORO_CLONE
2913# include "clone.c"
2914#endif
2915
2544MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 2916MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2545 2917
2546PROTOTYPES: DISABLE 2918PROTOTYPES: DISABLE
2547 2919
2548BOOT: 2920BOOT:
… …
2552 coro_thx = PERL_GET_CONTEXT; 2924 coro_thx = PERL_GET_CONTEXT;
2553# endif 2925# endif
2554#endif 2926#endif
2555 BOOT_PAGESIZE; 2927 BOOT_PAGESIZE;
2556 2928
2929 cctx_current = cctx_new_empty ();
2930
2557 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 2931 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
2558 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 2932 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
2559 2933
2560 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 2934 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get;
2561 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set; 2935 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set;
… …
2580 2954
2581 { 2955 {
2582 SV *slf = sv_2mortal (newSViv (PTR2IV (pp_slf))); 2956 SV *slf = sv_2mortal (newSViv (PTR2IV (pp_slf)));
2583 2957
2584 if (!PL_custom_op_names) PL_custom_op_names = newHV (); 2958 if (!PL_custom_op_names) PL_custom_op_names = newHV ();
2585 hv_store_ent (PL_custom_op_names, slf, 2959 hv_store_ent (PL_custom_op_names, slf, newSVpv ("coro_slf", 0), 0);
2586 newSVpv ("coro_slf", 0), 0);
2587 2960
2588 if (!PL_custom_op_descs) PL_custom_op_descs = newHV (); 2961 if (!PL_custom_op_descs) PL_custom_op_descs = newHV ();
2589 hv_store_ent (PL_custom_op_descs, slf, 2962 hv_store_ent (PL_custom_op_descs, slf, newSVpv ("coro schedule like function", 0), 0);
2590 newSVpv ("coro schedule like function", 0), 0);
2591 } 2963 }
2592 2964
2593 coroapi.ver = CORO_API_VERSION; 2965 coroapi.ver = CORO_API_VERSION;
2594 coroapi.rev = CORO_API_REVISION; 2966 coroapi.rev = CORO_API_REVISION;
2595 2967
… …
2609 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer"); 2981 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
2610 2982
2611 nvtime = INT2PTR (double (*)(), SvIV (*svp)); 2983 nvtime = INT2PTR (double (*)(), SvIV (*svp));
2612 } 2984 }
2613 2985
2614 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 2986 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
2615} 2987}
2616 2988
2617SV * 2989SV *
2618new (char *klass, ...) 2990new (char *klass, ...)
2991 ALIAS:
2992 Coro::new = 1
2619 CODE: 2993 CODE:
2620{ 2994{
2621 struct coro *coro; 2995 struct coro *coro;
2622 MAGIC *mg; 2996 MAGIC *mg;
2623 HV *hv; 2997 HV *hv;
2624 CV *cb; 2998 CV *cb;
2625 int i; 2999 int i;
2626 3000
2627 if (items > 1) 3001 if (items > 1)
2628 { 3002 {
2629 cb = coro_sv_2cv (ST (1)); 3003 cb = coro_sv_2cv (aTHX_ ST (1));
2630 3004
3005 if (!ix)
3006 {
2631 if (CvISXSUB (cb)) 3007 if (CvISXSUB (cb))
2632 croak ("Coro::State doesn't support XS functions as coroutine start, caught"); 3008 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
2633 3009
2634 if (!CvROOT (cb)) 3010 if (!CvROOT (cb))
2635 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught"); 3011 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
3012 }
2636 } 3013 }
2637 3014
2638 Newz (0, coro, 1, struct coro); 3015 Newz (0, coro, 1, struct coro);
2639 coro->args = newAV (); 3016 coro->args = newAV ();
2640 coro->flags = CF_NEW; 3017 coro->flags = CF_NEW;
… …
2648 mg->mg_flags |= MGf_DUP; 3025 mg->mg_flags |= MGf_DUP;
2649 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 3026 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
2650 3027
2651 if (items > 1) 3028 if (items > 1)
2652 { 3029 {
2653 coro->startcv = SvREFCNT_inc_NN (cb);
2654
2655 av_extend (coro->args, items - 1); 3030 av_extend (coro->args, items - 1 + ix - 1);
3031
3032 if (ix)
3033 {
3034 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
3035 cb = cv_coro_run;
3036 }
3037
3038 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3039
2656 for (i = 2; i < items; i++) 3040 for (i = 2; i < items; i++)
2657 av_push (coro->args, newSVsv (ST (i))); 3041 av_push (coro->args, newSVsv (ST (i)));
2658 } 3042 }
2659} 3043}
2660 OUTPUT: 3044 OUTPUT:
… …
2676void 3060void
2677_exit (int code) 3061_exit (int code)
2678 PROTOTYPE: $ 3062 PROTOTYPE: $
2679 CODE: 3063 CODE:
2680 _exit (code); 3064 _exit (code);
3065
3066SV *
3067clone (Coro::State coro)
3068 CODE:
3069{
3070#if CORO_CLONE
3071 struct coro *ncoro = coro_clone (aTHX_ coro);
3072 MAGIC *mg;
3073 /* TODO: too much duplication */
3074 ncoro->hv = newHV ();
3075 mg = sv_magicext ((SV *)ncoro->hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)ncoro, 0);
3076 mg->mg_flags |= MGf_DUP;
3077 RETVAL = sv_bless (newRV_noinc ((SV *)ncoro->hv), SvSTASH (coro->hv));
3078#else
3079 croak ("Coro::State->clone has not been configured into this installation of Coro, realised");
3080#endif
3081}
3082 OUTPUT:
3083 RETVAL
2681 3084
2682int 3085int
2683cctx_stacksize (int new_stacksize = 0) 3086cctx_stacksize (int new_stacksize = 0)
2684 PROTOTYPE: ;$ 3087 PROTOTYPE: ;$
2685 CODE: 3088 CODE:
… …
2735 eval = 1 3138 eval = 1
2736 CODE: 3139 CODE:
2737{ 3140{
2738 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3141 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
2739 { 3142 {
2740 struct coro temp; 3143 struct coro *current = SvSTATE_current;
2741 3144
2742 if (!(coro->flags & CF_RUNNING)) 3145 if (current != coro)
2743 { 3146 {
2744 PUTBACK; 3147 PUTBACK;
2745 save_perl (aTHX_ &temp); 3148 save_perl (aTHX_ current);
2746 load_perl (aTHX_ coro); 3149 load_perl (aTHX_ coro);
3150 SPAGAIN;
2747 } 3151 }
2748 3152
2749 {
2750 dSP;
2751 ENTER;
2752 SAVETMPS;
2753 PUTBACK;
2754 PUSHSTACK; 3153 PUSHSTACK;
3154
2755 PUSHMARK (SP); 3155 PUSHMARK (SP);
3156 PUTBACK;
2756 3157
2757 if (ix) 3158 if (ix)
2758 eval_sv (coderef, 0); 3159 eval_sv (coderef, 0);
2759 else 3160 else
2760 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 3161 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
2761 3162
2762 POPSTACK; 3163 POPSTACK;
2763 SPAGAIN; 3164 SPAGAIN;
2764 FREETMPS;
2765 LEAVE;
2766 PUTBACK;
2767 }
2768 3165
2769 if (!(coro->flags & CF_RUNNING)) 3166 if (current != coro)
2770 { 3167 {
3168 PUTBACK;
2771 save_perl (aTHX_ coro); 3169 save_perl (aTHX_ coro);
2772 load_perl (aTHX_ &temp); 3170 load_perl (aTHX_ current);
2773 SPAGAIN; 3171 SPAGAIN;
2774 } 3172 }
2775 } 3173 }
2776} 3174}
2777 3175
… …
2781 ALIAS: 3179 ALIAS:
2782 is_ready = CF_READY 3180 is_ready = CF_READY
2783 is_running = CF_RUNNING 3181 is_running = CF_RUNNING
2784 is_new = CF_NEW 3182 is_new = CF_NEW
2785 is_destroyed = CF_DESTROYED 3183 is_destroyed = CF_DESTROYED
3184 is_suspended = CF_SUSPENDED
2786 CODE: 3185 CODE:
2787 RETVAL = boolSV (coro->flags & ix); 3186 RETVAL = boolSV (coro->flags & ix);
2788 OUTPUT: 3187 OUTPUT:
2789 RETVAL 3188 RETVAL
2790 3189
… …
2794 CODE: 3193 CODE:
2795{ 3194{
2796 struct coro *current = SvSTATE_current; 3195 struct coro *current = SvSTATE_current;
2797 SV **throwp = self == current ? &CORO_THROW : &self->except; 3196 SV **throwp = self == current ? &CORO_THROW : &self->except;
2798 SvREFCNT_dec (*throwp); 3197 SvREFCNT_dec (*throwp);
3198 SvGETMAGIC (throw);
2799 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3199 *throwp = SvOK (throw) ? newSVsv (throw) : 0;
2800} 3200}
2801 3201
2802void 3202void
2803api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3203api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
… …
2806 3206
2807SV * 3207SV *
2808has_cctx (Coro::State coro) 3208has_cctx (Coro::State coro)
2809 PROTOTYPE: $ 3209 PROTOTYPE: $
2810 CODE: 3210 CODE:
2811 RETVAL = boolSV (!!coro->cctx); 3211 /* maybe manage the running flag differently */
3212 RETVAL = boolSV (!!coro->cctx || (coro->flags & CF_RUNNING));
2812 OUTPUT: 3213 OUTPUT:
2813 RETVAL 3214 RETVAL
2814 3215
2815int 3216int
2816is_traced (Coro::State coro) 3217is_traced (Coro::State coro)
… …
2836 3237
2837void 3238void
2838force_cctx () 3239force_cctx ()
2839 PROTOTYPE: 3240 PROTOTYPE:
2840 CODE: 3241 CODE:
2841 SvSTATE_current->cctx->idle_sp = 0; 3242 cctx_current->idle_sp = 0;
2842 3243
2843void 3244void
2844swap_defsv (Coro::State self) 3245swap_defsv (Coro::State self)
2845 PROTOTYPE: $ 3246 PROTOTYPE: $
2846 ALIAS: 3247 ALIAS:
… …
2854 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv; 3255 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
2855 3256
2856 SV *tmp = *src; *src = *dst; *dst = tmp; 3257 SV *tmp = *src; *src = *dst; *dst = tmp;
2857 } 3258 }
2858 3259
3260void
3261cancel (Coro::State self)
3262 CODE:
3263 coro_state_destroy (aTHX_ self);
3264 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */
3265
2859 3266
2860MODULE = Coro::State PACKAGE = Coro 3267MODULE = Coro::State PACKAGE = Coro
2861 3268
2862BOOT: 3269BOOT:
2863{ 3270{
2864 int i;
2865
2866 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
2867 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3271 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
2868 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3272 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
2869 3273 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3274 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
2870 coro_current = coro_get_sv (aTHX_ "Coro::current", FALSE); 3275 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
2871 SvREADONLY_on (coro_current); 3276 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3277 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3278 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3279 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3280
3281 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3282 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3283 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3284 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new);
2872 3285
2873 coro_stash = gv_stashpv ("Coro", TRUE); 3286 coro_stash = gv_stashpv ("Coro", TRUE);
2874 3287
2875 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 3288 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
2876 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 3289 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
2877 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 3290 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
2878 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 3291 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (CORO_PRIO_LOW));
2879 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE)); 3292 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (CORO_PRIO_IDLE));
2880 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN)); 3293 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (CORO_PRIO_MIN));
2881
2882 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
2883 coro_ready[i] = newAV ();
2884 3294
2885 { 3295 {
2886 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 3296 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
2887 3297
2888 coroapi.schedule = api_schedule; 3298 coroapi.schedule = api_schedule;
3299 coroapi.schedule_to = api_schedule_to;
2889 coroapi.cede = api_cede; 3300 coroapi.cede = api_cede;
2890 coroapi.cede_notself = api_cede_notself; 3301 coroapi.cede_notself = api_cede_notself;
2891 coroapi.ready = api_ready; 3302 coroapi.ready = api_ready;
2892 coroapi.is_ready = api_is_ready; 3303 coroapi.is_ready = api_is_ready;
2893 coroapi.nready = coro_nready; 3304 coroapi.nready = coro_nready;
… …
2898 SvREADONLY_on (sv); 3309 SvREADONLY_on (sv);
2899 } 3310 }
2900} 3311}
2901 3312
2902void 3313void
3314terminate (...)
3315 CODE:
3316 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3317
3318void
2903schedule (...) 3319schedule (...)
2904 CODE: 3320 CODE:
2905 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3321 CORO_EXECUTE_SLF_XS (slf_init_schedule);
3322
3323void
3324schedule_to (...)
3325 CODE:
3326 CORO_EXECUTE_SLF_XS (slf_init_schedule_to);
3327
3328void
3329cede_to (...)
3330 CODE:
3331 CORO_EXECUTE_SLF_XS (slf_init_cede_to);
2906 3332
2907void 3333void
2908cede (...) 3334cede (...)
2909 CODE: 3335 CODE:
2910 CORO_EXECUTE_SLF_XS (slf_init_cede); 3336 CORO_EXECUTE_SLF_XS (slf_init_cede);
… …
2924void 3350void
2925_set_readyhook (SV *hook) 3351_set_readyhook (SV *hook)
2926 PROTOTYPE: $ 3352 PROTOTYPE: $
2927 CODE: 3353 CODE:
2928 SvREFCNT_dec (coro_readyhook); 3354 SvREFCNT_dec (coro_readyhook);
3355 SvGETMAGIC (hook);
2929 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0; 3356 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0;
2930 3357
2931int 3358int
2932prio (Coro::State coro, int newprio = 0) 3359prio (Coro::State coro, int newprio = 0)
2933 PROTOTYPE: $;$ 3360 PROTOTYPE: $;$
… …
2965 CODE: 3392 CODE:
2966 RETVAL = coro_nready; 3393 RETVAL = coro_nready;
2967 OUTPUT: 3394 OUTPUT:
2968 RETVAL 3395 RETVAL
2969 3396
2970# for async_pool speedup
2971void 3397void
2972_pool_1 (SV *cb) 3398suspend (Coro::State self)
3399 PROTOTYPE: $
2973 CODE: 3400 CODE:
2974{ 3401 self->flags |= CF_SUSPENDED;
2975 HV *hv = (HV *)SvRV (coro_current);
2976 struct coro *coro = SvSTATE_hv ((SV *)hv);
2977 AV *defav = GvAV (PL_defgv);
2978 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
2979 AV *invoke_av;
2980 int i, len;
2981 3402
2982 if (!invoke) 3403void
3404resume (Coro::State self)
3405 PROTOTYPE: $
3406 CODE:
3407 self->flags &= ~CF_SUSPENDED;
3408
3409void
3410_pool_handler (...)
3411 CODE:
3412 CORO_EXECUTE_SLF_XS (slf_init_pool_handler);
3413
3414void
3415async_pool (SV *cv, ...)
3416 PROTOTYPE: &@
3417 PPCODE:
3418{
3419 HV *hv = (HV *)av_pop (av_async_pool);
3420 AV *av = newAV ();
3421 SV *cb = ST (0);
3422 int i;
3423
3424 av_extend (av, items - 2);
3425 for (i = 1; i < items; ++i)
3426 av_push (av, SvREFCNT_inc_NN (ST (i)));
3427
3428 if ((SV *)hv == &PL_sv_undef)
2983 { 3429 {
2984 SV *old = PL_diehook; 3430 PUSHMARK (SP);
2985 PL_diehook = 0; 3431 EXTEND (SP, 2);
2986 SvREFCNT_dec (old); 3432 PUSHs (sv_Coro);
2987 croak ("\3async_pool terminate\2\n"); 3433 PUSHs ((SV *)cv_pool_handler);
3434 PUTBACK;
3435 call_sv ((SV *)cv_coro_state_new, G_SCALAR);
3436 SPAGAIN;
3437
3438 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs));
2988 } 3439 }
2989 3440
2990 SvREFCNT_dec (coro->saved_deffh);
2991 coro->saved_deffh = SvREFCNT_inc_NN ((SV *)PL_defoutgv);
2992
2993 hv_store (hv, "desc", sizeof ("desc") - 1,
2994 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
2995
2996 invoke_av = (AV *)SvRV (invoke);
2997 len = av_len (invoke_av);
2998
2999 sv_setsv (cb, AvARRAY (invoke_av)[0]);
3000
3001 if (len > 0)
3002 { 3441 {
3003 av_fill (defav, len - 1); 3442 struct coro *coro = SvSTATE_hv (hv);
3004 for (i = 0; i < len; ++i) 3443
3005 av_store (defav, i, SvREFCNT_inc_NN (AvARRAY (invoke_av)[i + 1])); 3444 assert (!coro->invoke_cb);
3445 assert (!coro->invoke_av);
3446 coro->invoke_cb = SvREFCNT_inc (cb);
3447 coro->invoke_av = av;
3006 } 3448 }
3007}
3008 3449
3009void 3450 api_ready (aTHX_ (SV *)hv);
3010_pool_2 (SV *cb)
3011 CODE:
3012{
3013 HV *hv = (HV *)SvRV (coro_current);
3014 struct coro *coro = SvSTATE_hv ((SV *)hv);
3015 3451
3016 sv_setsv (cb, &PL_sv_undef); 3452 if (GIMME_V != G_VOID)
3017 3453 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
3018 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 3454 else
3019 coro->saved_deffh = 0;
3020
3021 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
3022 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
3023 {
3024 SV *old = PL_diehook;
3025 PL_diehook = 0;
3026 SvREFCNT_dec (old); 3455 SvREFCNT_dec (hv);
3027 croak ("\3async_pool terminate\2\n");
3028 }
3029
3030 av_clear (GvAV (PL_defgv));
3031 hv_store (hv, "desc", sizeof ("desc") - 1,
3032 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
3033
3034 coro->prio = 0;
3035
3036 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
3037 api_trace (aTHX_ coro_current, 0);
3038
3039 av_push (av_async_pool, newSVsv (coro_current));
3040} 3456}
3041 3457
3042SV * 3458SV *
3043rouse_cb () 3459rouse_cb ()
3044 PROTOTYPE: 3460 PROTOTYPE:
… …
3051rouse_wait (...) 3467rouse_wait (...)
3052 PROTOTYPE: ;$ 3468 PROTOTYPE: ;$
3053 PPCODE: 3469 PPCODE:
3054 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait); 3470 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait);
3055 3471
3472void
3473on_enter (SV *block)
3474 ALIAS:
3475 on_leave = 1
3476 PROTOTYPE: &
3477 CODE:
3478{
3479 struct coro *coro = SvSTATE_current;
3480 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3481
3482 block = (SV *)coro_sv_2cv (aTHX_ block);
3483
3484 if (!*avp)
3485 *avp = newAV ();
3486
3487 av_push (*avp, SvREFCNT_inc (block));
3488
3489 if (!ix)
3490 on_enterleave_call (aTHX_ block);
3491
3492 LEAVE; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
3493 SAVEDESTRUCTOR_X (ix ? coro_pop_on_leave : coro_pop_on_enter, (void *)coro);
3494 ENTER; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
3495}
3496
3056 3497
3057MODULE = Coro::State PACKAGE = PerlIO::cede 3498MODULE = Coro::State PACKAGE = PerlIO::cede
3058 3499
3059BOOT: 3500BOOT:
3060 PerlIO_define_layer (aTHX_ &PerlIO_cede); 3501 PerlIO_define_layer (aTHX_ &PerlIO_cede);
… …
3063MODULE = Coro::State PACKAGE = Coro::Semaphore 3504MODULE = Coro::State PACKAGE = Coro::Semaphore
3064 3505
3065SV * 3506SV *
3066new (SV *klass, SV *count = 0) 3507new (SV *klass, SV *count = 0)
3067 CODE: 3508 CODE:
3509{
3510 int semcnt = 1;
3511
3512 if (count)
3513 {
3514 SvGETMAGIC (count);
3515
3516 if (SvOK (count))
3517 semcnt = SvIV (count);
3518 }
3519
3068 RETVAL = sv_bless ( 3520 RETVAL = sv_bless (
3069 coro_waitarray_new (aTHX_ count && SvOK (count) ? SvIV (count) : 1), 3521 coro_waitarray_new (aTHX_ semcnt),
3070 GvSTASH (CvGV (cv)) 3522 GvSTASH (CvGV (cv))
3071 ); 3523 );
3524}
3072 OUTPUT: 3525 OUTPUT:
3073 RETVAL 3526 RETVAL
3074 3527
3075# helper for Coro::Channel 3528# helper for Coro::Channel and others
3076SV * 3529SV *
3077_alloc (int count) 3530_alloc (int count)
3078 CODE: 3531 CODE:
3079 RETVAL = coro_waitarray_new (aTHX_ count); 3532 RETVAL = coro_waitarray_new (aTHX_ count);
3080 OUTPUT: 3533 OUTPUT:
… …
3138 for (i = 1; i <= wcount; ++i) 3591 for (i = 1; i <= wcount; ++i)
3139 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i]))); 3592 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i])));
3140 } 3593 }
3141} 3594}
3142 3595
3596MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3597
3598void
3599_may_delete (SV *sem, int count, int extra_refs)
3600 PPCODE:
3601{
3602 AV *av = (AV *)SvRV (sem);
3603
3604 if (SvREFCNT ((SV *)av) == 1 + extra_refs
3605 && AvFILLp (av) == 0 /* no waiters, just count */
3606 && SvIV (AvARRAY (av)[0]) == count)
3607 XSRETURN_YES;
3608
3609 XSRETURN_NO;
3610}
3611
3143MODULE = Coro::State PACKAGE = Coro::Signal 3612MODULE = Coro::State PACKAGE = Coro::Signal
3144 3613
3145SV * 3614SV *
3146new (SV *klass) 3615new (SV *klass)
3147 CODE: 3616 CODE:
… …
3218 3687
3219void 3688void
3220_register (char *target, char *proto, SV *req) 3689_register (char *target, char *proto, SV *req)
3221 CODE: 3690 CODE:
3222{ 3691{
3223 CV *req_cv = coro_sv_2cv (req); 3692 CV *req_cv = coro_sv_2cv (aTHX_ req);
3224 /* newXSproto doesn't return the CV on 5.8 */ 3693 /* newXSproto doesn't return the CV on 5.8 */
3225 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 3694 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3226 sv_setpv ((SV *)slf_cv, proto); 3695 sv_setpv ((SV *)slf_cv, proto);
3227 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0); 3696 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
3228} 3697}

Diff Legend

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