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.295 by root, Tue Nov 18 10:35:01 2008 UTC vs.
Revision 1.343 by root, Mon Dec 15 16:41:43 2008 UTC

… …
16 16
17#ifdef WIN32 17#ifdef WIN32
18# undef setjmp 18# undef setjmp
19# undef longjmp 19# undef longjmp
20# undef _exit 20# undef _exit
21# define setjmp _setjmp // deep magic, don't ask 21# define setjmp _setjmp /* deep magic */
22#else 22#else
23# include <inttypes.h> /* most portable stdint.h */ 23# include <inttypes.h> /* most portable stdint.h */
24#endif 24#endif
25 25
26#ifdef HAVE_MMAP 26#ifdef HAVE_MMAP
… …
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
… …
145#define expect_true(expr) expect ((expr) != 0, 1) 151#define expect_true(expr) expect ((expr) != 0, 1)
146 152
147#define NOINLINE attribute ((noinline)) 153#define NOINLINE attribute ((noinline))
148 154
149#include "CoroAPI.h" 155#include "CoroAPI.h"
156#define GCoroAPI (&coroapi) /* very sneaky */
150 157
151#ifdef USE_ITHREADS 158#ifdef USE_ITHREADS
152# if CORO_PTHREAD 159# if CORO_PTHREAD
153static void *coro_thx; 160static void *coro_thx;
154# endif 161# endif
… …
166static AV *main_mainstack; /* used to differentiate between $main and others */ 173static AV *main_mainstack; /* used to differentiate between $main and others */
167static JMPENV *main_top_env; 174static JMPENV *main_top_env;
168static HV *coro_state_stash, *coro_stash; 175static HV *coro_state_stash, *coro_stash;
169static volatile SV *coro_mortal; /* will be freed/thrown after next transfer */ 176static volatile SV *coro_mortal; /* will be freed/thrown after next transfer */
170 177
178static AV *av_destroy; /* destruction queue */
179static SV *sv_manager; /* the manager coro */
180static SV *sv_idle; /* $Coro::idle */
181
171static GV *irsgv; /* $/ */ 182static GV *irsgv; /* $/ */
172static GV *stdoutgv; /* *STDOUT */ 183static GV *stdoutgv; /* *STDOUT */
173static SV *rv_diehook; 184static SV *rv_diehook;
174static SV *rv_warnhook; 185static SV *rv_warnhook;
175static HV *hv_sig; /* %SIG */ 186static HV *hv_sig; /* %SIG */
176 187
177/* async_pool helper stuff */ 188/* async_pool helper stuff */
178static SV *sv_pool_rss; 189static SV *sv_pool_rss;
179static SV *sv_pool_size; 190static SV *sv_pool_size;
191static SV *sv_async_pool_idle; /* description string */
180static AV *av_async_pool; 192static AV *av_async_pool; /* idle pool */
193static SV *sv_Coro; /* class string */
194static CV *cv_pool_handler;
195static CV *cv_coro_state_new;
181 196
182/* Coro::AnyEvent */ 197/* Coro::AnyEvent */
183static SV *sv_activity; 198static SV *sv_activity;
184 199
185static struct coro_cctx *cctx_first; 200static struct coro_cctx *cctx_first;
… …
214 int valgrind_id; 229 int valgrind_id;
215#endif 230#endif
216 unsigned char flags; 231 unsigned char flags;
217} coro_cctx; 232} coro_cctx;
218 233
234coro_cctx *cctx_current; /* the currently running cctx */
235
236/*****************************************************************************/
237
219enum { 238enum {
220 CF_RUNNING = 0x0001, /* coroutine is running */ 239 CF_RUNNING = 0x0001, /* coroutine is running */
221 CF_READY = 0x0002, /* coroutine is ready */ 240 CF_READY = 0x0002, /* coroutine is ready */
222 CF_NEW = 0x0004, /* has never been switched to */ 241 CF_NEW = 0x0004, /* has never been switched to */
223 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 242 CF_DESTROYED = 0x0008, /* coroutine data has been freed */
243 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
224}; 244};
225 245
226/* the structure where most of the perl state is stored, overlaid on the cxstack */ 246/* the structure where most of the perl state is stored, overlaid on the cxstack */
227typedef struct 247typedef struct
228{ 248{
229 SV *defsv; 249 SV *defsv;
230 AV *defav; 250 AV *defav;
231 SV *errsv; 251 SV *errsv;
232 SV *irsgv; 252 SV *irsgv;
253 HV *hinthv;
233#define VAR(name,type) type name; 254#define VAR(name,type) type name;
234# include "state.h" 255# include "state.h"
235#undef VAR 256#undef VAR
236} perl_slots; 257} perl_slots;
237 258
… …
245 /* state data */ 266 /* state data */
246 struct CoroSLF slf_frame; /* saved slf frame */ 267 struct CoroSLF slf_frame; /* saved slf frame */
247 AV *mainstack; 268 AV *mainstack;
248 perl_slots *slot; /* basically the saved sp */ 269 perl_slots *slot; /* basically the saved sp */
249 270
271 CV *startcv; /* the CV to execute */
250 AV *args; /* data associated with this coroutine (initial args) */ 272 AV *args; /* data associated with this coroutine (initial args) */
251 int refcnt; /* coroutines are refcounted, yes */ 273 int refcnt; /* coroutines are refcounted, yes */
252 int flags; /* CF_ flags */ 274 int flags; /* CF_ flags */
253 HV *hv; /* the perl hash associated with this coro, if any */ 275 HV *hv; /* the perl hash associated with this coro, if any */
254 void (*on_destroy)(pTHX_ struct coro *coro); 276 void (*on_destroy)(pTHX_ struct coro *coro);
255 277
256 /* statistics */ 278 /* statistics */
257 int usecount; /* number of transfers to this coro */ 279 int usecount; /* number of transfers to this coro */
258 280
259 /* coro process data */ 281 /* coro process data */
260 int prio; 282 int prio;
261 SV *throw; /* exception to be thrown */ 283 SV *except; /* exception to be thrown */
284 SV *rouse_cb;
262 285
263 /* async_pool */ 286 /* async_pool */
264 SV *saved_deffh; 287 SV *saved_deffh;
288 SV *invoke_cb;
289 AV *invoke_av;
290
291 /* on_enter/on_leave */
292 AV *on_enter;
293 AV *on_leave;
265 294
266 /* linked list */ 295 /* linked list */
267 struct coro *next, *prev; 296 struct coro *next, *prev;
268}; 297};
269 298
… …
272 301
273/* the following variables are effectively part of the perl context */ 302/* the following variables are effectively part of the perl context */
274/* and get copied between struct coro and these variables */ 303/* and get copied between struct coro and these variables */
275/* the mainr easonw e don't support windows process emulation */ 304/* the mainr easonw e don't support windows process emulation */
276static struct CoroSLF slf_frame; /* the current slf frame */ 305static struct CoroSLF slf_frame; /* the current slf frame */
277static SV *coro_throw;
278 306
279/** Coro ********************************************************************/ 307/** Coro ********************************************************************/
280 308
281#define PRIO_MAX 3 309#define PRIO_MAX 3
282#define PRIO_HIGH 1 310#define PRIO_HIGH 1
… …
287 315
288/* for Coro.pm */ 316/* for Coro.pm */
289static SV *coro_current; 317static SV *coro_current;
290static SV *coro_readyhook; 318static SV *coro_readyhook;
291static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1]; 319static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1];
320static CV *cv_coro_run, *cv_coro_terminate;
292static struct coro *coro_first; 321static struct coro *coro_first;
293#define coro_nready coroapi.nready 322#define coro_nready coroapi.nready
294 323
295/** lowlevel stuff **********************************************************/ 324/** lowlevel stuff **********************************************************/
296 325
… …
322 get_hv (name, create); 351 get_hv (name, create);
323#endif 352#endif
324 return get_hv (name, create); 353 return get_hv (name, create);
325} 354}
326 355
356/* may croak */
357INLINE CV *
358coro_sv_2cv (pTHX_ SV *sv)
359{
360 HV *st;
361 GV *gvp;
362 CV *cv = sv_2cv (sv, &st, &gvp, 0);
363
364 if (!cv)
365 croak ("code reference expected");
366
367 return cv;
368}
369
370/*****************************************************************************/
371/* magic glue */
372
373#define CORO_MAGIC_type_cv 26
374#define CORO_MAGIC_type_state PERL_MAGIC_ext
375
376#define CORO_MAGIC_NN(sv, type) \
377 (expect_true (SvMAGIC (sv)->mg_type == type) \
378 ? SvMAGIC (sv) \
379 : mg_find (sv, type))
380
381#define CORO_MAGIC(sv, type) \
382 (expect_true (SvMAGIC (sv)) \
383 ? CORO_MAGIC_NN (sv, type) \
384 : 0)
385
386#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
387#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
388
389INLINE struct coro *
390SvSTATE_ (pTHX_ SV *coro)
391{
392 HV *stash;
393 MAGIC *mg;
394
395 if (SvROK (coro))
396 coro = SvRV (coro);
397
398 if (expect_false (SvTYPE (coro) != SVt_PVHV))
399 croak ("Coro::State object required");
400
401 stash = SvSTASH (coro);
402 if (expect_false (stash != coro_stash && stash != coro_state_stash))
403 {
404 /* very slow, but rare, check */
405 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
406 croak ("Coro::State object required");
407 }
408
409 mg = CORO_MAGIC_state (coro);
410 return (struct coro *)mg->mg_ptr;
411}
412
413#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
414
415/* faster than SvSTATE, but expects a coroutine hv */
416#define SvSTATE_hv(hv) ((struct coro *)CORO_MAGIC_NN ((SV *)hv, CORO_MAGIC_type_state)->mg_ptr)
417#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
418
419/*****************************************************************************/
420/* padlist management and caching */
421
327static AV * 422static AV *
328coro_clone_padlist (pTHX_ CV *cv) 423coro_derive_padlist (pTHX_ CV *cv)
329{ 424{
330 AV *padlist = CvPADLIST (cv); 425 AV *padlist = CvPADLIST (cv);
331 AV *newpadlist, *newpad; 426 AV *newpadlist, *newpad;
332 427
333 newpadlist = newAV (); 428 newpadlist = newAV ();
… …
338 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 433 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
339#endif 434#endif
340 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 435 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
341 --AvFILLp (padlist); 436 --AvFILLp (padlist);
342 437
343 av_store (newpadlist, 0, SvREFCNT_inc_NN (*av_fetch (padlist, 0, FALSE))); 438 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0]));
344 av_store (newpadlist, 1, (SV *)newpad); 439 av_store (newpadlist, 1, (SV *)newpad);
345 440
346 return newpadlist; 441 return newpadlist;
347} 442}
348 443
349static void 444static void
350free_padlist (pTHX_ AV *padlist) 445free_padlist (pTHX_ AV *padlist)
351{ 446{
352 /* may be during global destruction */ 447 /* may be during global destruction */
353 if (SvREFCNT (padlist)) 448 if (!IN_DESTRUCT)
354 { 449 {
355 I32 i = AvFILLp (padlist); 450 I32 i = AvFILLp (padlist);
356 while (i >= 0) 451
452 while (i > 0) /* special-case index 0 */
357 { 453 {
358 SV **svp = av_fetch (padlist, i--, FALSE); 454 /* we try to be extra-careful here */
359 if (svp) 455 AV *av = (AV *)AvARRAY (padlist)[i--];
360 { 456 I32 j = AvFILLp (av);
361 SV *sv; 457
362 while (&PL_sv_undef != (sv = av_pop ((AV *)*svp))) 458 while (j >= 0)
459 SvREFCNT_dec (AvARRAY (av)[j--]);
460
461 AvFILLp (av) = -1;
363 SvREFCNT_dec (sv); 462 SvREFCNT_dec (av);
364
365 SvREFCNT_dec (*svp);
366 }
367 } 463 }
368 464
465 SvREFCNT_dec (AvARRAY (padlist)[0]);
466
467 AvFILLp (padlist) = -1;
369 SvREFCNT_dec ((SV*)padlist); 468 SvREFCNT_dec ((SV*)padlist);
370 } 469 }
371} 470}
372 471
373static int 472static int
… …
382 481
383 SvREFCNT_dec (av); /* sv_magicext increased the refcount */ 482 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
384 483
385 return 0; 484 return 0;
386} 485}
387
388#define CORO_MAGIC_type_cv 26
389#define CORO_MAGIC_type_state PERL_MAGIC_ext
390 486
391static MGVTBL coro_cv_vtbl = { 487static MGVTBL coro_cv_vtbl = {
392 0, 0, 0, 0, 488 0, 0, 0, 0,
393 coro_cv_free 489 coro_cv_free
394}; 490};
395
396#define CORO_MAGIC_NN(sv, type) \
397 (expect_true (SvMAGIC (sv)->mg_type == type) \
398 ? SvMAGIC (sv) \
399 : mg_find (sv, type))
400
401#define CORO_MAGIC(sv, type) \
402 (expect_true (SvMAGIC (sv)) \
403 ? CORO_MAGIC_NN (sv, type) \
404 : 0)
405
406#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
407#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
408
409INLINE struct coro *
410SvSTATE_ (pTHX_ SV *coro)
411{
412 HV *stash;
413 MAGIC *mg;
414
415 if (SvROK (coro))
416 coro = SvRV (coro);
417
418 if (expect_false (SvTYPE (coro) != SVt_PVHV))
419 croak ("Coro::State object required");
420
421 stash = SvSTASH (coro);
422 if (expect_false (stash != coro_stash && stash != coro_state_stash))
423 {
424 /* very slow, but rare, check */
425 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
426 croak ("Coro::State object required");
427 }
428
429 mg = CORO_MAGIC_state (coro);
430 return (struct coro *)mg->mg_ptr;
431}
432
433#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
434
435/* faster than SvSTATE, but expects a coroutine hv */
436#define SvSTATE_hv(hv) ((struct coro *)CORO_MAGIC_NN ((SV *)hv, CORO_MAGIC_type_state)->mg_ptr)
437#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
438 491
439/* the next two functions merely cache the padlists */ 492/* the next two functions merely cache the padlists */
440static void 493static void
441get_padlist (pTHX_ CV *cv) 494get_padlist (pTHX_ CV *cv)
442{ 495{
… …
448 else 501 else
449 { 502 {
450#if CORO_PREFER_PERL_FUNCTIONS 503#if CORO_PREFER_PERL_FUNCTIONS
451 /* this is probably cleaner? but also slower! */ 504 /* this is probably cleaner? but also slower! */
452 /* in practise, it seems to be less stable */ 505 /* in practise, it seems to be less stable */
453 CV *cp = Perl_cv_clone (cv); 506 CV *cp = Perl_cv_clone (aTHX_ cv);
454 CvPADLIST (cv) = CvPADLIST (cp); 507 CvPADLIST (cv) = CvPADLIST (cp);
455 CvPADLIST (cp) = 0; 508 CvPADLIST (cp) = 0;
456 SvREFCNT_dec (cp); 509 SvREFCNT_dec (cp);
457#else 510#else
458 CvPADLIST (cv) = coro_clone_padlist (aTHX_ cv); 511 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
459#endif 512#endif
460 } 513 }
461} 514}
462 515
463static void 516static void
… …
470 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 523 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
471 524
472 av = (AV *)mg->mg_obj; 525 av = (AV *)mg->mg_obj;
473 526
474 if (expect_false (AvFILLp (av) >= AvMAX (av))) 527 if (expect_false (AvFILLp (av) >= AvMAX (av)))
475 av_extend (av, AvMAX (av) + 1); 528 av_extend (av, AvFILLp (av) + 1);
476 529
477 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 530 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
478} 531}
479 532
480/** load & save, init *******************************************************/ 533/** load & save, init *******************************************************/
534
535static void
536on_enterleave_call (pTHX_ SV *cb);
481 537
482static void 538static void
483load_perl (pTHX_ Coro__State c) 539load_perl (pTHX_ Coro__State c)
484{ 540{
485 perl_slots *slot = c->slot; 541 perl_slots *slot = c->slot;
486 c->slot = 0; 542 c->slot = 0;
487 543
488 PL_mainstack = c->mainstack; 544 PL_mainstack = c->mainstack;
489 545
490 GvSV (PL_defgv) = slot->defsv; 546 GvSV (PL_defgv) = slot->defsv;
491 GvAV (PL_defgv) = slot->defav; 547 GvAV (PL_defgv) = slot->defav;
492 GvSV (PL_errgv) = slot->errsv; 548 GvSV (PL_errgv) = slot->errsv;
493 GvSV (irsgv) = slot->irsgv; 549 GvSV (irsgv) = slot->irsgv;
550 GvHV (PL_hintgv) = slot->hinthv;
494 551
495 #define VAR(name,type) PL_ ## name = slot->name; 552 #define VAR(name,type) PL_ ## name = slot->name;
496 # include "state.h" 553 # include "state.h"
497 #undef VAR 554 #undef VAR
498 555
… …
511 568
512 PUTBACK; 569 PUTBACK;
513 } 570 }
514 571
515 slf_frame = c->slf_frame; 572 slf_frame = c->slf_frame;
516 coro_throw = c->throw; 573 CORO_THROW = c->except;
574
575 if (expect_false (c->on_enter))
576 {
577 int i;
578
579 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
580 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
581 }
517} 582}
518 583
519static void 584static void
520save_perl (pTHX_ Coro__State c) 585save_perl (pTHX_ Coro__State c)
521{ 586{
522 c->throw = coro_throw; 587 if (expect_false (c->on_leave))
588 {
589 int i;
590
591 for (i = AvFILLp (c->on_leave); i >= 0; --i)
592 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
593 }
594
595 c->except = CORO_THROW;
523 c->slf_frame = slf_frame; 596 c->slf_frame = slf_frame;
524 597
525 { 598 {
526 dSP; 599 dSP;
527 I32 cxix = cxstack_ix; 600 I32 cxix = cxstack_ix;
… …
584 c->mainstack = PL_mainstack; 657 c->mainstack = PL_mainstack;
585 658
586 { 659 {
587 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 660 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
588 661
589 slot->defav = GvAV (PL_defgv); 662 slot->defav = GvAV (PL_defgv);
590 slot->defsv = DEFSV; 663 slot->defsv = DEFSV;
591 slot->errsv = ERRSV; 664 slot->errsv = ERRSV;
592 slot->irsgv = GvSV (irsgv); 665 slot->irsgv = GvSV (irsgv);
666 slot->hinthv = GvHV (PL_hintgv);
593 667
594 #define VAR(name,type) slot->name = PL_ ## name; 668 #define VAR(name,type) slot->name = PL_ ## name;
595 # include "state.h" 669 # include "state.h"
596 #undef VAR 670 #undef VAR
597 } 671 }
… …
602 * of perl.c:init_stacks, except that it uses less memory 676 * of perl.c:init_stacks, except that it uses less memory
603 * on the (sometimes correct) assumption that coroutines do 677 * on the (sometimes correct) assumption that coroutines do
604 * not usually need a lot of stackspace. 678 * not usually need a lot of stackspace.
605 */ 679 */
606#if CORO_PREFER_PERL_FUNCTIONS 680#if CORO_PREFER_PERL_FUNCTIONS
607# define coro_init_stacks init_stacks 681# define coro_init_stacks(thx) init_stacks ()
608#else 682#else
609static void 683static void
610coro_init_stacks (pTHX) 684coro_init_stacks (pTHX)
611{ 685{
612 PL_curstackinfo = new_stackinfo(32, 8); 686 PL_curstackinfo = new_stackinfo(32, 8);
… …
675#if !PERL_VERSION_ATLEAST (5,10,0) 749#if !PERL_VERSION_ATLEAST (5,10,0)
676 Safefree (PL_retstack); 750 Safefree (PL_retstack);
677#endif 751#endif
678} 752}
679 753
754#define CORO_RSS \
755 rss += sizeof (SYM (curstackinfo)); \
756 rss += (SYM (curstackinfo->si_cxmax) + 1) * sizeof (PERL_CONTEXT); \
757 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (SYM (curstack))) * sizeof (SV *); \
758 rss += SYM (tmps_max) * sizeof (SV *); \
759 rss += (SYM (markstack_max) - SYM (markstack_ptr)) * sizeof (I32); \
760 rss += SYM (scopestack_max) * sizeof (I32); \
761 rss += SYM (savestack_max) * sizeof (ANY);
762
680static size_t 763static size_t
681coro_rss (pTHX_ struct coro *coro) 764coro_rss (pTHX_ struct coro *coro)
682{ 765{
683 size_t rss = sizeof (*coro); 766 size_t rss = sizeof (*coro);
684 767
685 if (coro->mainstack) 768 if (coro->mainstack)
686 { 769 {
687 perl_slots tmp_slot;
688 perl_slots *slot;
689
690 if (coro->flags & CF_RUNNING) 770 if (coro->flags & CF_RUNNING)
691 { 771 {
692 slot = &tmp_slot; 772 #define SYM(sym) PL_ ## sym
693 773 CORO_RSS;
694 #define VAR(name,type) slot->name = PL_ ## name;
695 # include "state.h"
696 #undef VAR 774 #undef SYM
697 } 775 }
698 else 776 else
699 slot = coro->slot;
700
701 if (slot)
702 { 777 {
703 rss += sizeof (slot->curstackinfo); 778 #define SYM(sym) coro->slot->sym
704 rss += (slot->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT); 779 CORO_RSS;
705 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (slot->curstack)) * sizeof (SV *); 780 #undef SYM
706 rss += slot->tmps_max * sizeof (SV *);
707 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32);
708 rss += slot->scopestack_max * sizeof (I32);
709 rss += slot->savestack_max * sizeof (ANY);
710
711#if !PERL_VERSION_ATLEAST (5,10,0)
712 rss += slot->retstack_max * sizeof (OP *);
713#endif
714 } 781 }
715 } 782 }
716 783
717 return rss; 784 return rss;
718} 785}
… …
731#endif 798#endif
732 799
733/* 800/*
734 * This overrides the default magic get method of %SIG elements. 801 * This overrides the default magic get method of %SIG elements.
735 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook 802 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
736 * and instead of tryign to save and restore the hash elements, we just provide 803 * and instead of trying to save and restore the hash elements, we just provide
737 * readback here. 804 * readback here.
738 * We only do this when the hook is != 0, as they are often set to 0 temporarily,
739 * not expecting this to actually change the hook. This is a potential problem
740 * when a schedule happens then, but we ignore this.
741 */ 805 */
742static int 806static int
743coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 807coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
744{ 808{
745 const char *s = MgPV_nolen_const (mg); 809 const char *s = MgPV_nolen_const (mg);
… …
798 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 862 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
799 863
800 if (svp) 864 if (svp)
801 { 865 {
802 SV *old = *svp; 866 SV *old = *svp;
803 *svp = newSVsv (sv); 867 *svp = SvOK (sv) ? newSVsv (sv) : 0;
804 SvREFCNT_dec (old); 868 SvREFCNT_dec (old);
805 return 0; 869 return 0;
806 } 870 }
807 } 871 }
808 872
… …
818 882
819static int 883static int
820slf_check_nop (pTHX_ struct CoroSLF *frame) 884slf_check_nop (pTHX_ struct CoroSLF *frame)
821{ 885{
822 return 0; 886 return 0;
887}
888
889static int
890slf_check_repeat (pTHX_ struct CoroSLF *frame)
891{
892 return 1;
823} 893}
824 894
825static UNOP coro_setup_op; 895static UNOP coro_setup_op;
826 896
827static void NOINLINE /* noinline to keep it out of the transfer fast path */ 897static void NOINLINE /* noinline to keep it out of the transfer fast path */
… …
834 904
835 PL_runops = RUNOPS_DEFAULT; 905 PL_runops = RUNOPS_DEFAULT;
836 PL_curcop = &PL_compiling; 906 PL_curcop = &PL_compiling;
837 PL_in_eval = EVAL_NULL; 907 PL_in_eval = EVAL_NULL;
838 PL_comppad = 0; 908 PL_comppad = 0;
909 PL_comppad_name = 0;
910 PL_comppad_name_fill = 0;
911 PL_comppad_name_floor = 0;
839 PL_curpm = 0; 912 PL_curpm = 0;
840 PL_curpad = 0; 913 PL_curpad = 0;
841 PL_localizing = 0; 914 PL_localizing = 0;
842 PL_dirty = 0; 915 PL_dirty = 0;
843 PL_restartop = 0; 916 PL_restartop = 0;
844#if PERL_VERSION_ATLEAST (5,10,0) 917#if PERL_VERSION_ATLEAST (5,10,0)
845 PL_parser = 0; 918 PL_parser = 0;
846#endif 919#endif
920 PL_hints = 0;
847 921
848 /* recreate the die/warn hooks */ 922 /* recreate the die/warn hooks */
849 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 923 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook );
850 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 924 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook);
851 925
852 GvSV (PL_defgv) = newSV (0); 926 GvSV (PL_defgv) = newSV (0);
853 GvAV (PL_defgv) = coro->args; coro->args = 0; 927 GvAV (PL_defgv) = coro->args; coro->args = 0;
854 GvSV (PL_errgv) = newSV (0); 928 GvSV (PL_errgv) = newSV (0);
855 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 929 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
930 GvHV (PL_hintgv) = 0;
856 PL_rs = newSVsv (GvSV (irsgv)); 931 PL_rs = newSVsv (GvSV (irsgv));
857 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 932 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
858 933
859 { 934 {
860 dSP; 935 dSP;
861 UNOP myop; 936 UNOP myop;
862 937
863 Zero (&myop, 1, UNOP); 938 Zero (&myop, 1, UNOP);
864 myop.op_next = Nullop; 939 myop.op_next = Nullop;
940 myop.op_type = OP_ENTERSUB;
865 myop.op_flags = OPf_WANT_VOID; 941 myop.op_flags = OPf_WANT_VOID;
866 942
867 PUSHMARK (SP); 943 PUSHMARK (SP);
868 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv)))); 944 PUSHs ((SV *)coro->startcv);
869 PUTBACK; 945 PUTBACK;
870 PL_op = (OP *)&myop; 946 PL_op = (OP *)&myop;
871 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 947 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
872 SPAGAIN;
873 } 948 }
874 949
875 /* this newly created coroutine might be run on an existing cctx which most 950 /* this newly created coroutine might be run on an existing cctx which most
876 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here. 951 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
877 */ 952 */
878 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 953 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
879 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */ 954 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
880 955
881 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 956 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */
882 coro_setup_op.op_next = PL_op; 957 coro_setup_op.op_next = PL_op;
883 coro_setup_op.op_type = OP_CUSTOM; 958 coro_setup_op.op_type = OP_ENTERSUB;
884 coro_setup_op.op_ppaddr = pp_slf; 959 coro_setup_op.op_ppaddr = pp_slf;
885 /* no flags required, as an init function won't be called */ 960 /* no flags etc. required, as an init function won't be called */
886 961
887 PL_op = (OP *)&coro_setup_op; 962 PL_op = (OP *)&coro_setup_op;
888 963
889 /* copy throw, in case it was set before coro_setup */ 964 /* copy throw, in case it was set before coro_setup */
890 coro_throw = coro->throw; 965 CORO_THROW = coro->except;
891} 966}
892 967
893static void 968static void
894coro_destruct (pTHX_ struct coro *coro) 969coro_unwind_stacks (pTHX)
895{ 970{
896 if (!IN_DESTRUCT) 971 if (!IN_DESTRUCT)
897 { 972 {
898 /* restore all saved variables and stuff */ 973 /* restore all saved variables and stuff */
899 LEAVE_SCOPE (0); 974 LEAVE_SCOPE (0);
… …
907 POPSTACK_TO (PL_mainstack); 982 POPSTACK_TO (PL_mainstack);
908 983
909 /* unwind main stack */ 984 /* unwind main stack */
910 dounwind (-1); 985 dounwind (-1);
911 } 986 }
987}
988
989static void
990coro_destruct_perl (pTHX_ struct coro *coro)
991{
992 coro_unwind_stacks (aTHX);
912 993
913 SvREFCNT_dec (GvSV (PL_defgv)); 994 SvREFCNT_dec (GvSV (PL_defgv));
914 SvREFCNT_dec (GvAV (PL_defgv)); 995 SvREFCNT_dec (GvAV (PL_defgv));
915 SvREFCNT_dec (GvSV (PL_errgv)); 996 SvREFCNT_dec (GvSV (PL_errgv));
916 SvREFCNT_dec (PL_defoutgv); 997 SvREFCNT_dec (PL_defoutgv);
917 SvREFCNT_dec (PL_rs); 998 SvREFCNT_dec (PL_rs);
918 SvREFCNT_dec (GvSV (irsgv)); 999 SvREFCNT_dec (GvSV (irsgv));
1000 SvREFCNT_dec (GvHV (PL_hintgv));
919 1001
920 SvREFCNT_dec (PL_diehook); 1002 SvREFCNT_dec (PL_diehook);
921 SvREFCNT_dec (PL_warnhook); 1003 SvREFCNT_dec (PL_warnhook);
922 1004
923 SvREFCNT_dec (coro->saved_deffh); 1005 SvREFCNT_dec (coro->saved_deffh);
924 SvREFCNT_dec (coro_throw); 1006 SvREFCNT_dec (coro->rouse_cb);
1007 SvREFCNT_dec (coro->invoke_cb);
1008 SvREFCNT_dec (coro->invoke_av);
925 1009
926 coro_destruct_stacks (aTHX); 1010 coro_destruct_stacks (aTHX);
927} 1011}
928 1012
929INLINE void 1013INLINE void
… …
939static int 1023static int
940runops_trace (pTHX) 1024runops_trace (pTHX)
941{ 1025{
942 COP *oldcop = 0; 1026 COP *oldcop = 0;
943 int oldcxix = -2; 1027 int oldcxix = -2;
944 struct coro *coro = SvSTATE_current; /* trace cctx is tied to specific coro */
945 coro_cctx *cctx = coro->cctx;
946 1028
947 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX))) 1029 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX)))
948 { 1030 {
949 PERL_ASYNC_CHECK (); 1031 PERL_ASYNC_CHECK ();
950 1032
951 if (cctx->flags & CC_TRACE_ALL) 1033 if (cctx_current->flags & CC_TRACE_ALL)
952 { 1034 {
953 if (PL_op->op_type == OP_LEAVESUB && cctx->flags & CC_TRACE_SUB) 1035 if (PL_op->op_type == OP_LEAVESUB && cctx_current->flags & CC_TRACE_SUB)
954 { 1036 {
955 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1037 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
956 SV **bot, **top; 1038 SV **bot, **top;
957 AV *av = newAV (); /* return values */ 1039 AV *av = newAV (); /* return values */
958 SV **cb; 1040 SV **cb;
… …
995 1077
996 if (PL_curcop != &PL_compiling) 1078 if (PL_curcop != &PL_compiling)
997 { 1079 {
998 SV **cb; 1080 SV **cb;
999 1081
1000 if (oldcxix != cxstack_ix && cctx->flags & CC_TRACE_SUB) 1082 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB)
1001 { 1083 {
1002 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1084 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1003 1085
1004 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1086 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1005 { 1087 {
1006 runops_proc_t old_runops = PL_runops;
1007 dSP; 1088 dSP;
1008 GV *gv = CvGV (cx->blk_sub.cv); 1089 GV *gv = CvGV (cx->blk_sub.cv);
1009 SV *fullname = sv_2mortal (newSV (0)); 1090 SV *fullname = sv_2mortal (newSV (0));
1010 1091
1011 if (isGV (gv)) 1092 if (isGV (gv))
… …
1016 SAVETMPS; 1097 SAVETMPS;
1017 EXTEND (SP, 3); 1098 EXTEND (SP, 3);
1018 PUSHMARK (SP); 1099 PUSHMARK (SP);
1019 PUSHs (&PL_sv_yes); 1100 PUSHs (&PL_sv_yes);
1020 PUSHs (fullname); 1101 PUSHs (fullname);
1021 PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef); 1102 PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef);
1022 PUTBACK; 1103 PUTBACK;
1023 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0); 1104 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
1024 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 1105 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
1025 SPAGAIN; 1106 SPAGAIN;
1026 FREETMPS; 1107 FREETMPS;
… …
1029 } 1110 }
1030 1111
1031 oldcxix = cxstack_ix; 1112 oldcxix = cxstack_ix;
1032 } 1113 }
1033 1114
1034 if (cctx->flags & CC_TRACE_LINE) 1115 if (cctx_current->flags & CC_TRACE_LINE)
1035 { 1116 {
1036 dSP; 1117 dSP;
1037 1118
1038 PL_runops = RUNOPS_DEFAULT; 1119 PL_runops = RUNOPS_DEFAULT;
1039 ENTER; 1120 ENTER;
… …
1058 1139
1059 TAINT_NOT; 1140 TAINT_NOT;
1060 return 0; 1141 return 0;
1061} 1142}
1062 1143
1063static struct coro_cctx *cctx_ssl_cctx;
1064static struct CoroSLF cctx_ssl_frame; 1144static struct CoroSLF cctx_ssl_frame;
1065 1145
1066static void 1146static void
1067slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta) 1147slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta)
1068{ 1148{
1069 ta->prev = (struct coro *)cctx_ssl_cctx;
1070 ta->next = 0; 1149 ta->prev = 0;
1071} 1150}
1072 1151
1073static int 1152static int
1074slf_check_set_stacklevel (pTHX_ struct CoroSLF *frame) 1153slf_check_set_stacklevel (pTHX_ struct CoroSLF *frame)
1075{ 1154{
… …
1078 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1157 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1079} 1158}
1080 1159
1081/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1160/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1082static void NOINLINE 1161static void NOINLINE
1083cctx_prepare (pTHX_ coro_cctx *cctx) 1162cctx_prepare (pTHX)
1084{ 1163{
1085 PL_top_env = &PL_start_env; 1164 PL_top_env = &PL_start_env;
1086 1165
1087 if (cctx->flags & CC_TRACE) 1166 if (cctx_current->flags & CC_TRACE)
1088 PL_runops = runops_trace; 1167 PL_runops = runops_trace;
1089 1168
1090 /* we already must be executing an SLF op, there is no other valid way 1169 /* we already must be executing an SLF op, there is no other valid way
1091 * that can lead to creation of a new cctx */ 1170 * that can lead to creation of a new cctx */
1092 assert (("FATAL: can't prepare slf-less cctx in Coro module (please report)", 1171 assert (("FATAL: can't prepare slf-less cctx in Coro module (please report)",
1093 slf_frame.prepare && PL_op->op_ppaddr == pp_slf)); 1172 slf_frame.prepare && PL_op->op_ppaddr == pp_slf));
1094 1173
1095 /* we must emulate leaving pp_slf, which is done inside slf_check_set_stacklevel */ 1174 /* we must emulate leaving pp_slf, which is done inside slf_check_set_stacklevel */
1096 cctx_ssl_cctx = cctx;
1097 cctx_ssl_frame = slf_frame; 1175 cctx_ssl_frame = slf_frame;
1098 1176
1099 slf_frame.prepare = slf_prepare_set_stacklevel; 1177 slf_frame.prepare = slf_prepare_set_stacklevel;
1100 slf_frame.check = slf_check_set_stacklevel; 1178 slf_frame.check = slf_check_set_stacklevel;
1101} 1179}
… …
1124 /* normally we would need to skip the entersub here */ 1202 /* normally we would need to skip the entersub here */
1125 /* not doing so will re-execute it, which is exactly what we want */ 1203 /* not doing so will re-execute it, which is exactly what we want */
1126 /* PL_nop = PL_nop->op_next */ 1204 /* PL_nop = PL_nop->op_next */
1127 1205
1128 /* inject a fake subroutine call to cctx_init */ 1206 /* inject a fake subroutine call to cctx_init */
1129 cctx_prepare (aTHX_ (coro_cctx *)arg); 1207 cctx_prepare (aTHX);
1130 1208
1131 /* cctx_run is the alternative tail of transfer() */ 1209 /* cctx_run is the alternative tail of transfer() */
1132 transfer_tail (aTHX); 1210 transfer_tail (aTHX);
1133 1211
1134 /* somebody or something will hit me for both perl_run and PL_restartop */ 1212 /* somebody or something will hit me for both perl_run and PL_restartop */
1135 PL_restartop = PL_op; 1213 PL_restartop = PL_op;
1136 perl_run (PL_curinterp); 1214 perl_run (PL_curinterp);
1215 /*
1216 * Unfortunately, there is no way to get at the return values of the
1217 * coro body here, as perl_run destroys these
1218 */
1137 1219
1138 /* 1220 /*
1139 * If perl-run returns we assume exit() was being called or the coro 1221 * If perl-run returns we assume exit() was being called or the coro
1140 * fell off the end, which seems to be the only valid (non-bug) 1222 * fell off the end, which seems to be the only valid (non-bug)
1141 * reason for perl_run to return. We try to exit by jumping to the 1223 * reason for perl_run to return. We try to exit by jumping to the
1142 * bootstrap-time "top" top_env, as we cannot restore the "main" 1224 * bootstrap-time "top" top_env, as we cannot restore the "main"
1143 * coroutine as Coro has no such concept 1225 * coroutine as Coro has no such concept.
1226 * This actually isn't valid with the pthread backend, but OSes requiring
1227 * that backend are too broken to do it in a standards-compliant way.
1144 */ 1228 */
1145 PL_top_env = main_top_env; 1229 PL_top_env = main_top_env;
1146 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */ 1230 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1147 } 1231 }
1148} 1232}
… …
1225cctx_destroy (coro_cctx *cctx) 1309cctx_destroy (coro_cctx *cctx)
1226{ 1310{
1227 if (!cctx) 1311 if (!cctx)
1228 return; 1312 return;
1229 1313
1314 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary?
1315
1230 --cctx_count; 1316 --cctx_count;
1231 coro_destroy (&cctx->cctx); 1317 coro_destroy (&cctx->cctx);
1232 1318
1233 /* coro_transfer creates new, empty cctx's */ 1319 /* coro_transfer creates new, empty cctx's */
1234 if (cctx->sptr) 1320 if (cctx->sptr)
… …
1297 /* TODO: throwing up here is considered harmful */ 1383 /* TODO: throwing up here is considered harmful */
1298 1384
1299 if (expect_true (prev != next)) 1385 if (expect_true (prev != next))
1300 { 1386 {
1301 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1387 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1302 croak ("Coro::State::transfer called with non-running/new prev Coro::State, but can only transfer from running or new states,"); 1388 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1303 1389
1304 if (expect_false (next->flags & CF_RUNNING))
1305 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states,");
1306
1307 if (expect_false (next->flags & CF_DESTROYED)) 1390 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED)))
1308 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states,"); 1391 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1309 1392
1310#if !PERL_VERSION_ATLEAST (5,10,0) 1393#if !PERL_VERSION_ATLEAST (5,10,0)
1311 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1394 if (expect_false (PL_lex_state != LEX_NOTPARSING))
1312 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,"); 1395 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1313#endif 1396#endif
… …
1319transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1402transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1320{ 1403{
1321 dSTACKLEVEL; 1404 dSTACKLEVEL;
1322 1405
1323 /* sometimes transfer is only called to set idle_sp */ 1406 /* sometimes transfer is only called to set idle_sp */
1324 if (expect_false (!next)) 1407 if (expect_false (!prev))
1325 { 1408 {
1326 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1409 cctx_current->idle_sp = STACKLEVEL;
1327 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1410 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1328 } 1411 }
1329 else if (expect_true (prev != next)) 1412 else if (expect_true (prev != next))
1330 { 1413 {
1331 coro_cctx *prev__cctx; 1414 coro_cctx *cctx_prev;
1332 1415
1333 if (expect_false (prev->flags & CF_NEW)) 1416 if (expect_false (prev->flags & CF_NEW))
1334 { 1417 {
1335 /* create a new empty/source context */ 1418 /* create a new empty/source context */
1336 prev->cctx = cctx_new_empty ();
1337 prev->flags &= ~CF_NEW; 1419 prev->flags &= ~CF_NEW;
1338 prev->flags |= CF_RUNNING; 1420 prev->flags |= CF_RUNNING;
1339 } 1421 }
1340 1422
1341 prev->flags &= ~CF_RUNNING; 1423 prev->flags &= ~CF_RUNNING;
… …
1352 coro_setup (aTHX_ next); 1434 coro_setup (aTHX_ next);
1353 } 1435 }
1354 else 1436 else
1355 load_perl (aTHX_ next); 1437 load_perl (aTHX_ next);
1356 1438
1357 prev__cctx = prev->cctx;
1358
1359 /* possibly untie and reuse the cctx */ 1439 /* possibly untie and reuse the cctx */
1360 if (expect_true ( 1440 if (expect_true (
1361 prev__cctx->idle_sp == STACKLEVEL 1441 cctx_current->idle_sp == STACKLEVEL
1362 && !(prev__cctx->flags & CC_TRACE) 1442 && !(cctx_current->flags & CC_TRACE)
1363 && !force_cctx 1443 && !force_cctx
1364 )) 1444 ))
1365 { 1445 {
1366 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1446 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */
1367 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == prev__cctx->idle_te)); 1447 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1368 1448
1369 prev->cctx = 0;
1370
1371 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */ 1449 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */
1372 /* without this the next cctx_get might destroy the prev__cctx while still in use */ 1450 /* without this the next cctx_get might destroy the running cctx while still in use */
1373 if (expect_false (CCTX_EXPIRED (prev__cctx))) 1451 if (expect_false (CCTX_EXPIRED (cctx_current)))
1374 if (!next->cctx) 1452 if (expect_true (!next->cctx))
1375 next->cctx = cctx_get (aTHX); 1453 next->cctx = cctx_get (aTHX);
1376 1454
1377 cctx_put (prev__cctx); 1455 cctx_put (cctx_current);
1378 } 1456 }
1457 else
1458 prev->cctx = cctx_current;
1379 1459
1380 ++next->usecount; 1460 ++next->usecount;
1381 1461
1382 if (expect_true (!next->cctx)) 1462 cctx_prev = cctx_current;
1383 next->cctx = cctx_get (aTHX); 1463 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1384 1464
1385 if (expect_false (prev__cctx != next->cctx)) 1465 next->cctx = 0;
1466
1467 if (expect_false (cctx_prev != cctx_current))
1386 { 1468 {
1387 prev__cctx->top_env = PL_top_env; 1469 cctx_prev->top_env = PL_top_env;
1388 PL_top_env = next->cctx->top_env; 1470 PL_top_env = cctx_current->top_env;
1389 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1471 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1390 } 1472 }
1391 1473
1392 transfer_tail (aTHX); 1474 transfer_tail (aTHX);
1393 } 1475 }
1394} 1476}
… …
1416 --coro_nready; 1498 --coro_nready;
1417 } 1499 }
1418 else 1500 else
1419 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1501 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1420 1502
1421 if (coro->mainstack && coro->mainstack != main_mainstack) 1503 if (coro->mainstack
1504 && coro->mainstack != main_mainstack
1505 && coro->slot
1506 && !PL_dirty)
1422 { 1507 {
1423 struct coro temp; 1508 struct coro *current = SvSTATE_current;
1424 1509
1425 assert (("FATAL: tried to destroy currently running coroutine (please report)", !(coro->flags & CF_RUNNING))); 1510 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1426 1511
1427 save_perl (aTHX_ &temp); 1512 save_perl (aTHX_ current);
1428 load_perl (aTHX_ coro); 1513 load_perl (aTHX_ coro);
1429 1514
1430 coro_destruct (aTHX_ coro); 1515 coro_destruct_perl (aTHX_ coro);
1431 1516
1432 load_perl (aTHX_ &temp); 1517 load_perl (aTHX_ current);
1433 1518
1434 coro->slot = 0; 1519 coro->slot = 0;
1435 } 1520 }
1436 1521
1437 cctx_destroy (coro->cctx); 1522 cctx_destroy (coro->cctx);
1523 SvREFCNT_dec (coro->startcv);
1438 SvREFCNT_dec (coro->args); 1524 SvREFCNT_dec (coro->args);
1525 SvREFCNT_dec (CORO_THROW);
1439 1526
1440 if (coro->next) coro->next->prev = coro->prev; 1527 if (coro->next) coro->next->prev = coro->prev;
1441 if (coro->prev) coro->prev->next = coro->next; 1528 if (coro->prev) coro->prev->next = coro->next;
1442 if (coro == coro_first) coro_first = coro->next; 1529 if (coro == coro_first) coro_first = coro->next;
1443 1530
… …
1497 1584
1498 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1585 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1499 TRANSFER (ta, 1); 1586 TRANSFER (ta, 1);
1500} 1587}
1501 1588
1589/*****************************************************************************/
1590/* gensub: simple closure generation utility */
1591
1592#define GENSUB_ARG CvXSUBANY (cv).any_ptr
1593
1594/* create a closure from XS, returns a code reference */
1595/* the arg can be accessed via GENSUB_ARG from the callback */
1596/* the callback must use dXSARGS/XSRETURN */
1597static SV *
1598gensub (pTHX_ void (*xsub)(pTHX_ CV *), void *arg)
1599{
1600 CV *cv = (CV *)newSV (0);
1601
1602 sv_upgrade ((SV *)cv, SVt_PVCV);
1603
1604 CvANON_on (cv);
1605 CvISXSUB_on (cv);
1606 CvXSUB (cv) = xsub;
1607 GENSUB_ARG = arg;
1608
1609 return newRV_noinc ((SV *)cv);
1610}
1611
1502/** Coro ********************************************************************/ 1612/** Coro ********************************************************************/
1503 1613
1504INLINE void 1614INLINE void
1505coro_enq (pTHX_ struct coro *coro) 1615coro_enq (pTHX_ struct coro *coro)
1506{ 1616{
… …
1524{ 1634{
1525 struct coro *coro; 1635 struct coro *coro;
1526 SV *sv_hook; 1636 SV *sv_hook;
1527 void (*xs_hook)(void); 1637 void (*xs_hook)(void);
1528 1638
1529 if (SvROK (coro_sv))
1530 coro_sv = SvRV (coro_sv);
1531
1532 coro = SvSTATE (coro_sv); 1639 coro = SvSTATE (coro_sv);
1533 1640
1534 if (coro->flags & CF_READY) 1641 if (coro->flags & CF_READY)
1535 return 0; 1642 return 0;
1536 1643
… …
1567api_is_ready (pTHX_ SV *coro_sv) 1674api_is_ready (pTHX_ SV *coro_sv)
1568{ 1675{
1569 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1676 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1570} 1677}
1571 1678
1679/* expects to own a reference to next->hv */
1572INLINE void 1680INLINE void
1573prepare_schedule (pTHX_ struct coro_transfer_args *ta) 1681prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1574{ 1682{
1575 SV *prev_sv, *next_sv;
1576
1577 for (;;)
1578 {
1579 next_sv = coro_deq (aTHX);
1580
1581 /* nothing to schedule: call the idle handler */
1582 if (expect_false (!next_sv))
1583 {
1584 dSP;
1585
1586 ENTER;
1587 SAVETMPS;
1588
1589 PUSHMARK (SP);
1590 PUTBACK;
1591 call_sv (get_sv ("Coro::idle", FALSE), G_VOID | G_DISCARD);
1592
1593 FREETMPS;
1594 LEAVE;
1595 continue;
1596 }
1597
1598 ta->next = SvSTATE_hv (next_sv);
1599
1600 /* cannot transfer to destroyed coros, skip and look for next */
1601 if (expect_false (ta->next->flags & CF_DESTROYED))
1602 {
1603 SvREFCNT_dec (next_sv);
1604 /* coro_nready has already been taken care of by destroy */
1605 continue;
1606 }
1607
1608 --coro_nready;
1609 break;
1610 }
1611
1612 /* free this only after the transfer */
1613 prev_sv = SvRV (coro_current); 1683 SV *prev_sv = SvRV (coro_current);
1684
1614 ta->prev = SvSTATE_hv (prev_sv); 1685 ta->prev = SvSTATE_hv (prev_sv);
1686 ta->next = next;
1687
1615 TRANSFER_CHECK (*ta); 1688 TRANSFER_CHECK (*ta);
1616 assert (("FATAL: next coroutine isn't marked as ready in Coro (please report)", ta->next->flags & CF_READY)); 1689
1617 ta->next->flags &= ~CF_READY;
1618 SvRV_set (coro_current, next_sv); 1690 SvRV_set (coro_current, (SV *)next->hv);
1619 1691
1620 free_coro_mortal (aTHX); 1692 free_coro_mortal (aTHX);
1621 coro_mortal = prev_sv; 1693 coro_mortal = prev_sv;
1622} 1694}
1623 1695
1696static void
1697prepare_schedule (pTHX_ struct coro_transfer_args *ta)
1698{
1699 for (;;)
1700 {
1701 SV *next_sv = coro_deq (aTHX);
1702
1703 if (expect_true (next_sv))
1704 {
1705 struct coro *next = SvSTATE_hv (next_sv);
1706
1707 /* cannot transfer to destroyed coros, skip and look for next */
1708 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED)))
1709 SvREFCNT_dec (next_sv); /* coro_nready has already been taken care of by destroy */
1710 else
1711 {
1712 next->flags &= ~CF_READY;
1713 --coro_nready;
1714
1715 prepare_schedule_to (aTHX_ ta, next);
1716 break;
1717 }
1718 }
1719 else
1720 {
1721 /* nothing to schedule: call the idle handler */
1722 if (SvROK (sv_idle)
1723 && SvOBJECT (SvRV (sv_idle)))
1724 {
1725 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1726 api_ready (aTHX_ SvRV (sv_idle));
1727 --coro_nready;
1728 }
1729 else
1730 {
1731 dSP;
1732
1733 ENTER;
1734 SAVETMPS;
1735
1736 PUSHMARK (SP);
1737 PUTBACK;
1738 call_sv (sv_idle, G_VOID | G_DISCARD);
1739
1740 FREETMPS;
1741 LEAVE;
1742 }
1743 }
1744 }
1745}
1746
1624INLINE void 1747INLINE void
1625prepare_cede (pTHX_ struct coro_transfer_args *ta) 1748prepare_cede (pTHX_ struct coro_transfer_args *ta)
1626{ 1749{
1627 api_ready (aTHX_ coro_current); 1750 api_ready (aTHX_ coro_current);
1628 prepare_schedule (aTHX_ ta); 1751 prepare_schedule (aTHX_ ta);
… …
1647{ 1770{
1648 struct coro_transfer_args ta; 1771 struct coro_transfer_args ta;
1649 1772
1650 prepare_schedule (aTHX_ &ta); 1773 prepare_schedule (aTHX_ &ta);
1651 TRANSFER (ta, 1); 1774 TRANSFER (ta, 1);
1775}
1776
1777static void
1778api_schedule_to (pTHX_ SV *coro_sv)
1779{
1780 struct coro_transfer_args ta;
1781 struct coro *next = SvSTATE (coro_sv);
1782
1783 SvREFCNT_inc_NN (coro_sv);
1784 prepare_schedule_to (aTHX_ &ta, next);
1652} 1785}
1653 1786
1654static int 1787static int
1655api_cede (pTHX) 1788api_cede (pTHX)
1656{ 1789{
… …
1685static void 1818static void
1686api_trace (pTHX_ SV *coro_sv, int flags) 1819api_trace (pTHX_ SV *coro_sv, int flags)
1687{ 1820{
1688 struct coro *coro = SvSTATE (coro_sv); 1821 struct coro *coro = SvSTATE (coro_sv);
1689 1822
1823 if (coro->flags & CF_RUNNING)
1824 croak ("cannot enable tracing on a running coroutine, caught");
1825
1690 if (flags & CC_TRACE) 1826 if (flags & CC_TRACE)
1691 { 1827 {
1692 if (!coro->cctx) 1828 if (!coro->cctx)
1693 coro->cctx = cctx_new_run (); 1829 coro->cctx = cctx_new_run ();
1694 else if (!(coro->cctx->flags & CC_TRACE)) 1830 else if (!(coro->cctx->flags & CC_TRACE))
1695 croak ("cannot enable tracing on coroutine with custom stack,"); 1831 croak ("cannot enable tracing on coroutine with custom stack, caught");
1696 1832
1697 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL)); 1833 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL));
1698 } 1834 }
1699 else if (coro->cctx && coro->cctx->flags & CC_TRACE) 1835 else if (coro->cctx && coro->cctx->flags & CC_TRACE)
1700 { 1836 {
… …
1703 if (coro->flags & CF_RUNNING) 1839 if (coro->flags & CF_RUNNING)
1704 PL_runops = RUNOPS_DEFAULT; 1840 PL_runops = RUNOPS_DEFAULT;
1705 else 1841 else
1706 coro->slot->runops = RUNOPS_DEFAULT; 1842 coro->slot->runops = RUNOPS_DEFAULT;
1707 } 1843 }
1844}
1845
1846static void
1847coro_call_on_destroy (pTHX_ struct coro *coro)
1848{
1849 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0);
1850 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1851
1852 if (on_destroyp)
1853 {
1854 AV *on_destroy = (AV *)SvRV (*on_destroyp);
1855
1856 while (AvFILLp (on_destroy) >= 0)
1857 {
1858 dSP; /* don't disturb outer sp */
1859 SV *cb = av_pop (on_destroy);
1860
1861 PUSHMARK (SP);
1862
1863 if (statusp)
1864 {
1865 int i;
1866 AV *status = (AV *)SvRV (*statusp);
1867 EXTEND (SP, AvFILLp (status) + 1);
1868
1869 for (i = 0; i <= AvFILLp (status); ++i)
1870 PUSHs (AvARRAY (status)[i]);
1871 }
1872
1873 PUTBACK;
1874 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD);
1875 }
1876 }
1877}
1878
1879static void
1880slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1881{
1882 int i;
1883 HV *hv = (HV *)SvRV (coro_current);
1884 AV *av = newAV ();
1885
1886 av_extend (av, items - 1);
1887 for (i = 0; i < items; ++i)
1888 av_push (av, SvREFCNT_inc_NN (arg [i]));
1889
1890 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0);
1891
1892 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */
1893 api_ready (aTHX_ sv_manager);
1894
1895 frame->prepare = prepare_schedule;
1896 frame->check = slf_check_repeat;
1897
1898 /* as a minor optimisation, we could unwind all stacks here */
1899 /* but that puts extra pressure on pp_slf, and is not worth much */
1900 /*coro_unwind_stacks (aTHX);*/
1901}
1902
1903/*****************************************************************************/
1904/* async pool handler */
1905
1906static int
1907slf_check_pool_handler (pTHX_ struct CoroSLF *frame)
1908{
1909 HV *hv = (HV *)SvRV (coro_current);
1910 struct coro *coro = (struct coro *)frame->data;
1911
1912 if (!coro->invoke_cb)
1913 return 1; /* loop till we have invoke */
1914 else
1915 {
1916 hv_store (hv, "desc", sizeof ("desc") - 1,
1917 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
1918
1919 coro->saved_deffh = SvREFCNT_inc_NN ((SV *)PL_defoutgv);
1920
1921 {
1922 dSP;
1923 XPUSHs (sv_2mortal (coro->invoke_cb)); coro->invoke_cb = 0;
1924 PUTBACK;
1925 }
1926
1927 SvREFCNT_dec (GvAV (PL_defgv));
1928 GvAV (PL_defgv) = coro->invoke_av;
1929 coro->invoke_av = 0;
1930
1931 return 0;
1932 }
1933}
1934
1935static void
1936slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1937{
1938 HV *hv = (HV *)SvRV (coro_current);
1939 struct coro *coro = SvSTATE_hv ((SV *)hv);
1940
1941 if (expect_true (coro->saved_deffh))
1942 {
1943 /* subsequent iteration */
1944 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1945 coro->saved_deffh = 0;
1946
1947 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
1948 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1949 {
1950 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate);
1951 coro->invoke_av = newAV ();
1952
1953 frame->prepare = prepare_nop;
1954 }
1955 else
1956 {
1957 av_clear (GvAV (PL_defgv));
1958 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
1959
1960 coro->prio = 0;
1961
1962 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
1963 api_trace (aTHX_ coro_current, 0);
1964
1965 frame->prepare = prepare_schedule;
1966 av_push (av_async_pool, SvREFCNT_inc (hv));
1967 }
1968 }
1969 else
1970 {
1971 /* first iteration, simply fall through */
1972 frame->prepare = prepare_nop;
1973 }
1974
1975 frame->check = slf_check_pool_handler;
1976 frame->data = (void *)coro;
1977}
1978
1979/*****************************************************************************/
1980/* rouse callback */
1981
1982#define CORO_MAGIC_type_rouse PERL_MAGIC_ext
1983
1984static void
1985coro_rouse_callback (pTHX_ CV *cv)
1986{
1987 dXSARGS;
1988 SV *data = (SV *)GENSUB_ARG;
1989
1990 if (SvTYPE (SvRV (data)) != SVt_PVAV)
1991 {
1992 /* first call, set args */
1993 AV *av = newAV ();
1994 SV *coro = SvRV (data);
1995
1996 SvRV_set (data, (SV *)av);
1997 api_ready (aTHX_ coro);
1998 SvREFCNT_dec (coro);
1999
2000 /* better take a full copy of the arguments */
2001 while (items--)
2002 av_store (av, items, newSVsv (ST (items)));
2003 }
2004
2005 XSRETURN_EMPTY;
2006}
2007
2008static int
2009slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
2010{
2011 SV *data = (SV *)frame->data;
2012
2013 if (CORO_THROW)
2014 return 0;
2015
2016 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2017 return 1;
2018
2019 /* now push all results on the stack */
2020 {
2021 dSP;
2022 AV *av = (AV *)SvRV (data);
2023 int i;
2024
2025 EXTEND (SP, AvFILLp (av) + 1);
2026 for (i = 0; i <= AvFILLp (av); ++i)
2027 PUSHs (sv_2mortal (AvARRAY (av)[i]));
2028
2029 /* we have stolen the elements, so ste length to zero and free */
2030 AvFILLp (av) = -1;
2031 av_undef (av);
2032
2033 PUTBACK;
2034 }
2035
2036 return 0;
2037}
2038
2039static void
2040slf_init_rouse_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2041{
2042 SV *cb;
2043
2044 if (items)
2045 cb = arg [0];
2046 else
2047 {
2048 struct coro *coro = SvSTATE_current;
2049
2050 if (!coro->rouse_cb)
2051 croak ("Coro::rouse_wait called without rouse callback, and no default rouse callback found either,");
2052
2053 cb = sv_2mortal (coro->rouse_cb);
2054 coro->rouse_cb = 0;
2055 }
2056
2057 if (!SvROK (cb)
2058 || SvTYPE (SvRV (cb)) != SVt_PVCV
2059 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2060 croak ("Coro::rouse_wait called with illegal callback argument,");
2061
2062 {
2063 CV *cv = (CV *)SvRV (cb); /* for GENSUB_ARG */
2064 SV *data = (SV *)GENSUB_ARG;
2065
2066 frame->data = (void *)data;
2067 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
2068 frame->check = slf_check_rouse_wait;
2069 }
2070}
2071
2072static SV *
2073coro_new_rouse_cb (pTHX)
2074{
2075 HV *hv = (HV *)SvRV (coro_current);
2076 struct coro *coro = SvSTATE_hv (hv);
2077 SV *data = newRV_inc ((SV *)hv);
2078 SV *cb = gensub (aTHX_ coro_rouse_callback, (void *)data);
2079
2080 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0);
2081 SvREFCNT_dec (data); /* magicext increases the refcount */
2082
2083 SvREFCNT_dec (coro->rouse_cb);
2084 coro->rouse_cb = SvREFCNT_inc_NN (cb);
2085
2086 return cb;
1708} 2087}
1709 2088
1710/*****************************************************************************/ 2089/*****************************************************************************/
1711/* schedule-like-function opcode (SLF) */ 2090/* schedule-like-function opcode (SLF) */
1712 2091
… …
1759static void 2138static void
1760slf_init_schedule (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2139slf_init_schedule (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1761{ 2140{
1762 frame->prepare = prepare_schedule; 2141 frame->prepare = prepare_schedule;
1763 frame->check = slf_check_nop; 2142 frame->check = slf_check_nop;
2143}
2144
2145static void
2146slf_prepare_schedule_to (pTHX_ struct coro_transfer_args *ta)
2147{
2148 struct coro *next = (struct coro *)slf_frame.data;
2149
2150 SvREFCNT_inc_NN (next->hv);
2151 prepare_schedule_to (aTHX_ ta, next);
2152}
2153
2154static void
2155slf_init_schedule_to (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2156{
2157 if (!items)
2158 croak ("Coro::schedule_to expects a coroutine argument, caught");
2159
2160 frame->data = (void *)SvSTATE (arg [0]);
2161 frame->prepare = slf_prepare_schedule_to;
2162 frame->check = slf_check_nop;
2163}
2164
2165static void
2166slf_init_cede_to (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2167{
2168 api_ready (aTHX_ SvRV (coro_current));
2169
2170 slf_init_schedule_to (aTHX_ frame, cv, arg, items);
1764} 2171}
1765 2172
1766static void 2173static void
1767slf_init_cede (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2174slf_init_cede (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1768{ 2175{
… …
1839 } 2246 }
1840 while (slf_frame.check (aTHX_ &slf_frame)); 2247 while (slf_frame.check (aTHX_ &slf_frame));
1841 2248
1842 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */ 2249 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */
1843 2250
2251 /* exception handling */
2252 if (expect_false (CORO_THROW))
2253 {
2254 SV *exception = sv_2mortal (CORO_THROW);
2255
2256 CORO_THROW = 0;
2257 sv_setsv (ERRSV, exception);
2258 croak (0);
2259 }
2260
1844 /* return value handling - mostly like entersub */ 2261 /* return value handling - mostly like entersub */
1845 /* make sure we put something on the stack in scalar context */ 2262 /* make sure we put something on the stack in scalar context */
1846 if (GIMME_V == G_SCALAR) 2263 if (GIMME_V == G_SCALAR)
1847 { 2264 {
1848 dSP; 2265 dSP;
… …
1854 bot [1] = *sp; 2271 bot [1] = *sp;
1855 2272
1856 SP = bot + 1; 2273 SP = bot + 1;
1857 2274
1858 PUTBACK; 2275 PUTBACK;
1859 }
1860
1861 /* exception handling */
1862 if (expect_false (coro_throw))
1863 {
1864 SV *exception = sv_2mortal (coro_throw);
1865
1866 coro_throw = 0;
1867 sv_setsv (ERRSV, exception);
1868 croak (0);
1869 } 2276 }
1870 2277
1871 return NORMAL; 2278 return NORMAL;
1872} 2279}
1873 2280
… …
1914 } 2321 }
1915 else 2322 else
1916 slf_argc = 0; 2323 slf_argc = 0;
1917 2324
1918 PL_op->op_ppaddr = pp_slf; 2325 PL_op->op_ppaddr = pp_slf;
1919 PL_op->op_type = OP_CUSTOM; /* maybe we should leave it at entersub? */ 2326 /*PL_op->op_type = OP_CUSTOM; /* we do behave like entersub still */
1920 2327
1921 PL_op = (OP *)&slf_restore; 2328 PL_op = (OP *)&slf_restore;
2329}
2330
2331/*****************************************************************************/
2332/* dynamic wind */
2333
2334static void
2335on_enterleave_call (pTHX_ SV *cb)
2336{
2337 dSP;
2338
2339 PUSHSTACK;
2340
2341 PUSHMARK (SP);
2342 PUTBACK;
2343 call_sv (cb, G_VOID | G_DISCARD);
2344 SPAGAIN;
2345
2346 POPSTACK;
2347}
2348
2349static SV *
2350coro_avp_pop_and_free (pTHX_ AV **avp)
2351{
2352 AV *av = *avp;
2353 SV *res = av_pop (av);
2354
2355 if (AvFILLp (av) < 0)
2356 {
2357 *avp = 0;
2358 SvREFCNT_dec (av);
2359 }
2360
2361 return res;
2362}
2363
2364static void
2365coro_pop_on_enter (pTHX_ void *coro)
2366{
2367 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_enter);
2368 SvREFCNT_dec (cb);
2369}
2370
2371static void
2372coro_pop_on_leave (pTHX_ void *coro)
2373{
2374 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2375 on_enterleave_call (aTHX_ sv_2mortal (cb));
1922} 2376}
1923 2377
1924/*****************************************************************************/ 2378/*****************************************************************************/
1925/* PerlIO::cede */ 2379/* PerlIO::cede */
1926 2380
… …
1995 PerlIOBuf_get_cnt, 2449 PerlIOBuf_get_cnt,
1996 PerlIOBuf_set_ptrcnt, 2450 PerlIOBuf_set_ptrcnt,
1997}; 2451};
1998 2452
1999/*****************************************************************************/ 2453/*****************************************************************************/
2454/* Coro::Semaphore & Coro::Signal */
2455
2456static SV *
2457coro_waitarray_new (pTHX_ int count)
2458{
2459 /* a semaphore contains a counter IV in $sem->[0] and any waiters after that */
2460 AV *av = newAV ();
2461 SV **ary;
2462
2463 /* unfortunately, building manually saves memory */
2464 Newx (ary, 2, SV *);
2465 AvALLOC (av) = ary;
2466#if PERL_VERSION_ATLEAST (5,10,0)
2467 AvARRAY (av) = ary;
2468#else
2469 /* 5.8.8 needs this syntax instead of AvARRAY = ary, yet */
2470 /* -DDEBUGGING flags this as a bug, despite it perfectly working */
2471 SvPVX ((SV *)av) = (char *)ary;
2472#endif
2473 AvMAX (av) = 1;
2474 AvFILLp (av) = 0;
2475 ary [0] = newSViv (count);
2476
2477 return newRV_noinc ((SV *)av);
2478}
2479
2000/* Coro::Semaphore */ 2480/* semaphore */
2001 2481
2002static void 2482static void
2003coro_semaphore_adjust (pTHX_ AV *av, IV adjust) 2483coro_semaphore_adjust (pTHX_ AV *av, IV adjust)
2004{ 2484{
2005 SV *count_sv = AvARRAY (av)[0]; 2485 SV *count_sv = AvARRAY (av)[0];
… …
2017 AvARRAY (av)[0] = AvARRAY (av)[1]; 2497 AvARRAY (av)[0] = AvARRAY (av)[1];
2018 AvARRAY (av)[1] = count_sv; 2498 AvARRAY (av)[1] = count_sv;
2019 cb = av_shift (av); 2499 cb = av_shift (av);
2020 2500
2021 if (SvOBJECT (cb)) 2501 if (SvOBJECT (cb))
2502 {
2022 api_ready (aTHX_ cb); 2503 api_ready (aTHX_ cb);
2023 else 2504 --count;
2024 croak ("callbacks not yet supported"); 2505 }
2506 else if (SvTYPE (cb) == SVt_PVCV)
2507 {
2508 dSP;
2509 PUSHMARK (SP);
2510 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2511 PUTBACK;
2512 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2513 }
2025 2514
2026 SvREFCNT_dec (cb); 2515 SvREFCNT_dec (cb);
2027
2028 --count;
2029 } 2516 }
2030} 2517}
2031 2518
2032static void 2519static void
2033coro_semaphore_on_destroy (pTHX_ struct coro *coro) 2520coro_semaphore_on_destroy (pTHX_ struct coro *coro)
… …
2035 /* call $sem->adjust (0) to possibly wake up some other waiters */ 2522 /* call $sem->adjust (0) to possibly wake up some other waiters */
2036 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 2523 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0);
2037} 2524}
2038 2525
2039static int 2526static int
2040slf_check_semaphore_down (pTHX_ struct CoroSLF *frame) 2527slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2041{ 2528{
2042 AV *av = (AV *)frame->data; 2529 AV *av = (AV *)frame->data;
2043 SV *count_sv = AvARRAY (av)[0]; 2530 SV *count_sv = AvARRAY (av)[0];
2044 2531
2045 /* if we are about to throw, don't actually acquire the lock, just throw */ 2532 /* if we are about to throw, don't actually acquire the lock, just throw */
2046 if (coro_throw && 0)//D 2533 if (CORO_THROW)
2047 return 0; 2534 return 0;
2048 else if (SvIVX (count_sv) > 0) 2535 else if (SvIVX (count_sv) > 0)
2049 { 2536 {
2050 SvSTATE_current->on_destroy = 0; 2537 SvSTATE_current->on_destroy = 0;
2538
2539 if (acquire)
2051 SvIVX (count_sv) = SvIVX (count_sv) - 1; 2540 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2541 else
2542 coro_semaphore_adjust (aTHX_ av, 0);
2543
2052 return 0; 2544 return 0;
2053 } 2545 }
2054 else 2546 else
2055 { 2547 {
2056 int i; 2548 int i;
… …
2065 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2557 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2066 return 1; 2558 return 1;
2067 } 2559 }
2068} 2560}
2069 2561
2070static void 2562static int
2563slf_check_semaphore_down (pTHX_ struct CoroSLF *frame)
2564{
2565 return slf_check_semaphore_down_or_wait (aTHX_ frame, 1);
2566}
2567
2568static int
2569slf_check_semaphore_wait (pTHX_ struct CoroSLF *frame)
2570{
2571 return slf_check_semaphore_down_or_wait (aTHX_ frame, 0);
2572}
2573
2574static void
2071slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2575slf_init_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2072{ 2576{
2073 AV *av = (AV *)SvRV (arg [0]); 2577 AV *av = (AV *)SvRV (arg [0]);
2074 2578
2075 if (SvIVX (AvARRAY (av)[0]) > 0) 2579 if (SvIVX (AvARRAY (av)[0]) > 0)
2076 { 2580 {
… …
2086 2590
2087 /* to avoid race conditions when a woken-up coro gets terminated */ 2591 /* to avoid race conditions when a woken-up coro gets terminated */
2088 /* we arrange for a temporary on_destroy that calls adjust (0) */ 2592 /* we arrange for a temporary on_destroy that calls adjust (0) */
2089 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 2593 SvSTATE_current->on_destroy = coro_semaphore_on_destroy;
2090 } 2594 }
2595}
2091 2596
2597static void
2598slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2599{
2600 slf_init_semaphore_down_or_wait (aTHX_ frame, cv, arg, items);
2092 frame->check = slf_check_semaphore_down; 2601 frame->check = slf_check_semaphore_down;
2093
2094} 2602}
2095 2603
2096/*****************************************************************************/ 2604static void
2097/* gensub: simple closure generation utility */ 2605slf_init_semaphore_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2098
2099#define GENSUB_ARG CvXSUBANY (cv).any_ptr
2100
2101/* create a closure from XS, returns a code reference */
2102/* the arg can be accessed via GENSUB_ARG from the callback */
2103/* the callback must use dXSARGS/XSRETURN */
2104static SV *
2105gensub (pTHX_ void (*xsub)(pTHX_ CV *), void *arg)
2106{ 2606{
2107 CV *cv = (CV *)newSV (0); 2607 if (items >= 2)
2608 {
2609 /* callback form */
2610 AV *av = (AV *)SvRV (arg [0]);
2611 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]);
2108 2612
2109 sv_upgrade ((SV *)cv, SVt_PVCV); 2613 av_push (av, (SV *)SvREFCNT_inc_NN (cb_cv));
2110 2614
2111 CvANON_on (cv); 2615 if (SvIVX (AvARRAY (av)[0]) > 0)
2112 CvISXSUB_on (cv); 2616 coro_semaphore_adjust (aTHX_ av, 0);
2113 CvXSUB (cv) = xsub;
2114 GENSUB_ARG = arg;
2115 2617
2116 return newRV_noinc ((SV *)cv); 2618 frame->prepare = prepare_nop;
2619 frame->check = slf_check_nop;
2620 }
2621 else
2622 {
2623 slf_init_semaphore_down_or_wait (aTHX_ frame, cv, arg, items);
2624 frame->check = slf_check_semaphore_wait;
2625 }
2626}
2627
2628/* signal */
2629
2630static void
2631coro_signal_wake (pTHX_ AV *av, int count)
2632{
2633 SvIVX (AvARRAY (av)[0]) = 0;
2634
2635 /* now signal count waiters */
2636 while (count > 0 && AvFILLp (av) > 0)
2637 {
2638 SV *cb;
2639
2640 /* swap first two elements so we can shift a waiter */
2641 cb = AvARRAY (av)[0];
2642 AvARRAY (av)[0] = AvARRAY (av)[1];
2643 AvARRAY (av)[1] = cb;
2644
2645 cb = av_shift (av);
2646
2647 api_ready (aTHX_ cb);
2648 sv_setiv (cb, 0); /* signal waiter */
2649 SvREFCNT_dec (cb);
2650
2651 --count;
2652 }
2653}
2654
2655static int
2656slf_check_signal_wait (pTHX_ struct CoroSLF *frame)
2657{
2658 /* if we are about to throw, also stop waiting */
2659 return SvROK ((SV *)frame->data) && !CORO_THROW;
2660}
2661
2662static void
2663slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2664{
2665 AV *av = (AV *)SvRV (arg [0]);
2666
2667 if (SvIVX (AvARRAY (av)[0]))
2668 {
2669 SvIVX (AvARRAY (av)[0]) = 0;
2670 frame->prepare = prepare_nop;
2671 frame->check = slf_check_nop;
2672 }
2673 else
2674 {
2675 SV *waiter = newRV_inc (SvRV (coro_current)); /* owned by signal av */
2676
2677 av_push (av, waiter);
2678
2679 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */
2680 frame->prepare = prepare_schedule;
2681 frame->check = slf_check_signal_wait;
2682 }
2117} 2683}
2118 2684
2119/*****************************************************************************/ 2685/*****************************************************************************/
2120/* Coro::AIO */ 2686/* Coro::AIO */
2121 2687
… …
2136 dXSARGS; 2702 dXSARGS;
2137 AV *state = (AV *)GENSUB_ARG; 2703 AV *state = (AV *)GENSUB_ARG;
2138 SV *coro = av_pop (state); 2704 SV *coro = av_pop (state);
2139 SV *data_sv = newSV (sizeof (struct io_state)); 2705 SV *data_sv = newSV (sizeof (struct io_state));
2140 2706
2141 av_extend (state, items); 2707 av_extend (state, items - 1);
2142 2708
2143 sv_upgrade (data_sv, SVt_PV); 2709 sv_upgrade (data_sv, SVt_PV);
2144 SvCUR_set (data_sv, sizeof (struct io_state)); 2710 SvCUR_set (data_sv, sizeof (struct io_state));
2145 SvPOK_only (data_sv); 2711 SvPOK_only (data_sv);
2146 2712
… …
2171static int 2737static int
2172slf_check_aio_req (pTHX_ struct CoroSLF *frame) 2738slf_check_aio_req (pTHX_ struct CoroSLF *frame)
2173{ 2739{
2174 AV *state = (AV *)frame->data; 2740 AV *state = (AV *)frame->data;
2175 2741
2742 /* if we are about to throw, return early */
2743 /* this does not cancel the aio request, but at least */
2744 /* it quickly returns */
2745 if (CORO_THROW)
2746 return 0;
2747
2176 /* one element that is an RV? repeat! */ 2748 /* one element that is an RV? repeat! */
2177 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0])) 2749 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0]))
2178 return 1; 2750 return 1;
2179 2751
2180 /* restore status */ 2752 /* restore status */
… …
2275 XSRETURN_EMPTY; 2847 XSRETURN_EMPTY;
2276} 2848}
2277 2849
2278/*****************************************************************************/ 2850/*****************************************************************************/
2279 2851
2852#if CORO_CLONE
2853# include "clone.c"
2854#endif
2855
2280MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 2856MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2281 2857
2282PROTOTYPES: DISABLE 2858PROTOTYPES: DISABLE
2283 2859
2284BOOT: 2860BOOT:
… …
2288 coro_thx = PERL_GET_CONTEXT; 2864 coro_thx = PERL_GET_CONTEXT;
2289# endif 2865# endif
2290#endif 2866#endif
2291 BOOT_PAGESIZE; 2867 BOOT_PAGESIZE;
2292 2868
2869 cctx_current = cctx_new_empty ();
2870
2293 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 2871 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
2294 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 2872 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
2295 2873
2296 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 2874 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get;
2297 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set; 2875 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set;
… …
2316 2894
2317 { 2895 {
2318 SV *slf = sv_2mortal (newSViv (PTR2IV (pp_slf))); 2896 SV *slf = sv_2mortal (newSViv (PTR2IV (pp_slf)));
2319 2897
2320 if (!PL_custom_op_names) PL_custom_op_names = newHV (); 2898 if (!PL_custom_op_names) PL_custom_op_names = newHV ();
2321 hv_store_ent (PL_custom_op_names, slf, 2899 hv_store_ent (PL_custom_op_names, slf, newSVpv ("coro_slf", 0), 0);
2322 newSVpv ("coro_slf", 0), 0);
2323 2900
2324 if (!PL_custom_op_descs) PL_custom_op_descs = newHV (); 2901 if (!PL_custom_op_descs) PL_custom_op_descs = newHV ();
2325 hv_store_ent (PL_custom_op_descs, slf, 2902 hv_store_ent (PL_custom_op_descs, slf, newSVpv ("coro schedule like function", 0), 0);
2326 newSVpv ("coro schedule like function", 0), 0);
2327 } 2903 }
2328 2904
2329 coroapi.ver = CORO_API_VERSION; 2905 coroapi.ver = CORO_API_VERSION;
2330 coroapi.rev = CORO_API_REVISION; 2906 coroapi.rev = CORO_API_REVISION;
2331 2907
… …
2350 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 2926 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL));
2351} 2927}
2352 2928
2353SV * 2929SV *
2354new (char *klass, ...) 2930new (char *klass, ...)
2931 ALIAS:
2932 Coro::new = 1
2355 CODE: 2933 CODE:
2356{ 2934{
2357 struct coro *coro; 2935 struct coro *coro;
2358 MAGIC *mg; 2936 MAGIC *mg;
2359 HV *hv; 2937 HV *hv;
2938 CV *cb;
2360 int i; 2939 int i;
2940
2941 if (items > 1)
2942 {
2943 cb = coro_sv_2cv (aTHX_ ST (1));
2944
2945 if (!ix)
2946 {
2947 if (CvISXSUB (cb))
2948 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
2949
2950 if (!CvROOT (cb))
2951 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
2952 }
2953 }
2361 2954
2362 Newz (0, coro, 1, struct coro); 2955 Newz (0, coro, 1, struct coro);
2363 coro->args = newAV (); 2956 coro->args = newAV ();
2364 coro->flags = CF_NEW; 2957 coro->flags = CF_NEW;
2365 2958
… …
2370 coro->hv = hv = newHV (); 2963 coro->hv = hv = newHV ();
2371 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0); 2964 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
2372 mg->mg_flags |= MGf_DUP; 2965 mg->mg_flags |= MGf_DUP;
2373 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 2966 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
2374 2967
2968 if (items > 1)
2969 {
2375 av_extend (coro->args, items - 1); 2970 av_extend (coro->args, items - 1 + ix - 1);
2971
2972 if (ix)
2973 {
2974 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
2975 cb = cv_coro_run;
2976 }
2977
2978 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
2979
2376 for (i = 1; i < items; i++) 2980 for (i = 2; i < items; i++)
2377 av_push (coro->args, newSVsv (ST (i))); 2981 av_push (coro->args, newSVsv (ST (i)));
2982 }
2378} 2983}
2379 OUTPUT: 2984 OUTPUT:
2380 RETVAL 2985 RETVAL
2381 2986
2382void 2987void
… …
2395void 3000void
2396_exit (int code) 3001_exit (int code)
2397 PROTOTYPE: $ 3002 PROTOTYPE: $
2398 CODE: 3003 CODE:
2399 _exit (code); 3004 _exit (code);
3005
3006SV *
3007clone (Coro::State coro)
3008 CODE:
3009{
3010#if CORO_CLONE
3011 struct coro *ncoro = coro_clone (aTHX_ coro);
3012 MAGIC *mg;
3013 /* TODO: too much duplication */
3014 ncoro->hv = newHV ();
3015 mg = sv_magicext ((SV *)ncoro->hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)ncoro, 0);
3016 mg->mg_flags |= MGf_DUP;
3017 RETVAL = sv_bless (newRV_noinc ((SV *)ncoro->hv), SvSTASH (coro->hv));
3018#else
3019 croak ("Coro::State->clone has not been configured into this installation of Coro, realised");
3020#endif
3021}
3022 OUTPUT:
3023 RETVAL
2400 3024
2401int 3025int
2402cctx_stacksize (int new_stacksize = 0) 3026cctx_stacksize (int new_stacksize = 0)
2403 PROTOTYPE: ;$ 3027 PROTOTYPE: ;$
2404 CODE: 3028 CODE:
… …
2454 eval = 1 3078 eval = 1
2455 CODE: 3079 CODE:
2456{ 3080{
2457 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3081 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
2458 { 3082 {
2459 struct coro temp; 3083 struct coro *current = SvSTATE_current;
2460 3084
2461 if (!(coro->flags & CF_RUNNING)) 3085 if (current != coro)
2462 { 3086 {
2463 PUTBACK; 3087 PUTBACK;
2464 save_perl (aTHX_ &temp); 3088 save_perl (aTHX_ current);
2465 load_perl (aTHX_ coro); 3089 load_perl (aTHX_ coro);
3090 SPAGAIN;
2466 } 3091 }
2467 3092
2468 {
2469 dSP;
2470 ENTER;
2471 SAVETMPS;
2472 PUTBACK;
2473 PUSHSTACK; 3093 PUSHSTACK;
3094
2474 PUSHMARK (SP); 3095 PUSHMARK (SP);
3096 PUTBACK;
2475 3097
2476 if (ix) 3098 if (ix)
2477 eval_sv (coderef, 0); 3099 eval_sv (coderef, 0);
2478 else 3100 else
2479 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 3101 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
2480 3102
2481 POPSTACK; 3103 POPSTACK;
2482 SPAGAIN; 3104 SPAGAIN;
2483 FREETMPS;
2484 LEAVE;
2485 PUTBACK;
2486 }
2487 3105
2488 if (!(coro->flags & CF_RUNNING)) 3106 if (current != coro)
2489 { 3107 {
3108 PUTBACK;
2490 save_perl (aTHX_ coro); 3109 save_perl (aTHX_ coro);
2491 load_perl (aTHX_ &temp); 3110 load_perl (aTHX_ current);
2492 SPAGAIN; 3111 SPAGAIN;
2493 } 3112 }
2494 } 3113 }
2495} 3114}
2496 3115
… …
2500 ALIAS: 3119 ALIAS:
2501 is_ready = CF_READY 3120 is_ready = CF_READY
2502 is_running = CF_RUNNING 3121 is_running = CF_RUNNING
2503 is_new = CF_NEW 3122 is_new = CF_NEW
2504 is_destroyed = CF_DESTROYED 3123 is_destroyed = CF_DESTROYED
3124 is_suspended = CF_SUSPENDED
2505 CODE: 3125 CODE:
2506 RETVAL = boolSV (coro->flags & ix); 3126 RETVAL = boolSV (coro->flags & ix);
2507 OUTPUT: 3127 OUTPUT:
2508 RETVAL 3128 RETVAL
2509 3129
… …
2511throw (Coro::State self, SV *throw = &PL_sv_undef) 3131throw (Coro::State self, SV *throw = &PL_sv_undef)
2512 PROTOTYPE: $;$ 3132 PROTOTYPE: $;$
2513 CODE: 3133 CODE:
2514{ 3134{
2515 struct coro *current = SvSTATE_current; 3135 struct coro *current = SvSTATE_current;
2516 SV **throwp = self == current ? &coro_throw : &self->throw; 3136 SV **throwp = self == current ? &CORO_THROW : &self->except;
2517 SvREFCNT_dec (*throwp); 3137 SvREFCNT_dec (*throwp);
2518 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3138 *throwp = SvOK (throw) ? newSVsv (throw) : 0;
2519} 3139}
2520 3140
2521void 3141void
… …
2525 3145
2526SV * 3146SV *
2527has_cctx (Coro::State coro) 3147has_cctx (Coro::State coro)
2528 PROTOTYPE: $ 3148 PROTOTYPE: $
2529 CODE: 3149 CODE:
2530 RETVAL = boolSV (!!coro->cctx); 3150 /* maybe manage the running flag differently */
3151 RETVAL = boolSV (!!coro->cctx || (coro->flags & CF_RUNNING));
2531 OUTPUT: 3152 OUTPUT:
2532 RETVAL 3153 RETVAL
2533 3154
2534int 3155int
2535is_traced (Coro::State coro) 3156is_traced (Coro::State coro)
… …
2555 3176
2556void 3177void
2557force_cctx () 3178force_cctx ()
2558 PROTOTYPE: 3179 PROTOTYPE:
2559 CODE: 3180 CODE:
2560 SvSTATE_current->cctx->idle_sp = 0; 3181 cctx_current->idle_sp = 0;
2561 3182
2562void 3183void
2563swap_defsv (Coro::State self) 3184swap_defsv (Coro::State self)
2564 PROTOTYPE: $ 3185 PROTOTYPE: $
2565 ALIAS: 3186 ALIAS:
… …
2573 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv; 3194 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
2574 3195
2575 SV *tmp = *src; *src = *dst; *dst = tmp; 3196 SV *tmp = *src; *src = *dst; *dst = tmp;
2576 } 3197 }
2577 3198
3199void
3200cancel (Coro::State self)
3201 CODE:
3202 coro_state_destroy (aTHX_ self);
3203 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */
3204
2578 3205
2579MODULE = Coro::State PACKAGE = Coro 3206MODULE = Coro::State PACKAGE = Coro
2580 3207
2581BOOT: 3208BOOT:
2582{ 3209{
2583 int i; 3210 int i;
2584 3211
2585 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
2586 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3212 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
2587 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3213 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
2588 3214 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3215 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
2589 coro_current = coro_get_sv (aTHX_ "Coro::current", FALSE); 3216 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
2590 SvREADONLY_on (coro_current); 3217 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3218 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3219 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3220 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3221
3222 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3223 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3224 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3225 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new);
2591 3226
2592 coro_stash = gv_stashpv ("Coro", TRUE); 3227 coro_stash = gv_stashpv ("Coro", TRUE);
2593 3228
2594 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 3229 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
2595 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 3230 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH));
… …
2603 3238
2604 { 3239 {
2605 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 3240 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
2606 3241
2607 coroapi.schedule = api_schedule; 3242 coroapi.schedule = api_schedule;
3243 coroapi.schedule_to = api_schedule_to;
2608 coroapi.cede = api_cede; 3244 coroapi.cede = api_cede;
2609 coroapi.cede_notself = api_cede_notself; 3245 coroapi.cede_notself = api_cede_notself;
2610 coroapi.ready = api_ready; 3246 coroapi.ready = api_ready;
2611 coroapi.is_ready = api_is_ready; 3247 coroapi.is_ready = api_is_ready;
2612 coroapi.nready = coro_nready; 3248 coroapi.nready = coro_nready;
2613 coroapi.current = coro_current; 3249 coroapi.current = coro_current;
2614 3250
2615 GCoroAPI = &coroapi; 3251 /*GCoroAPI = &coroapi;*/
2616 sv_setiv (sv, (IV)&coroapi); 3252 sv_setiv (sv, (IV)&coroapi);
2617 SvREADONLY_on (sv); 3253 SvREADONLY_on (sv);
2618 } 3254 }
2619} 3255}
3256
3257void
3258terminate (...)
3259 CODE:
3260 CORO_EXECUTE_SLF_XS (slf_init_terminate);
2620 3261
2621void 3262void
2622schedule (...) 3263schedule (...)
2623 CODE: 3264 CODE:
2624 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3265 CORO_EXECUTE_SLF_XS (slf_init_schedule);
3266
3267void
3268schedule_to (...)
3269 CODE:
3270 CORO_EXECUTE_SLF_XS (slf_init_schedule_to);
3271
3272void
3273cede_to (...)
3274 CODE:
3275 CORO_EXECUTE_SLF_XS (slf_init_cede_to);
2625 3276
2626void 3277void
2627cede (...) 3278cede (...)
2628 CODE: 3279 CODE:
2629 CORO_EXECUTE_SLF_XS (slf_init_cede); 3280 CORO_EXECUTE_SLF_XS (slf_init_cede);
… …
2684 CODE: 3335 CODE:
2685 RETVAL = coro_nready; 3336 RETVAL = coro_nready;
2686 OUTPUT: 3337 OUTPUT:
2687 RETVAL 3338 RETVAL
2688 3339
2689# for async_pool speedup
2690void 3340void
2691_pool_1 (SV *cb) 3341_pool_handler (...)
2692 CODE: 3342 CODE:
2693{ 3343 CORO_EXECUTE_SLF_XS (slf_init_pool_handler);
2694 HV *hv = (HV *)SvRV (coro_current);
2695 struct coro *coro = SvSTATE_hv ((SV *)hv);
2696 AV *defav = GvAV (PL_defgv);
2697 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
2698 AV *invoke_av;
2699 int i, len;
2700 3344
2701 if (!invoke) 3345void
3346async_pool (SV *cv, ...)
3347 PROTOTYPE: &@
3348 PPCODE:
3349{
3350 HV *hv = (HV *)av_pop (av_async_pool);
3351 AV *av = newAV ();
3352 SV *cb = ST (0);
3353 int i;
3354
3355 av_extend (av, items - 2);
3356 for (i = 1; i < items; ++i)
3357 av_push (av, SvREFCNT_inc_NN (ST (i)));
3358
3359 if ((SV *)hv == &PL_sv_undef)
2702 { 3360 {
2703 SV *old = PL_diehook; 3361 PUSHMARK (SP);
2704 PL_diehook = 0; 3362 EXTEND (SP, 2);
2705 SvREFCNT_dec (old); 3363 PUSHs (sv_Coro);
2706 croak ("\3async_pool terminate\2\n"); 3364 PUSHs ((SV *)cv_pool_handler);
3365 PUTBACK;
3366 call_sv ((SV *)cv_coro_state_new, G_SCALAR);
3367 SPAGAIN;
3368
3369 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs));
2707 } 3370 }
2708 3371
2709 SvREFCNT_dec (coro->saved_deffh);
2710 coro->saved_deffh = SvREFCNT_inc_NN ((SV *)PL_defoutgv);
2711
2712 hv_store (hv, "desc", sizeof ("desc") - 1,
2713 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
2714
2715 invoke_av = (AV *)SvRV (invoke);
2716 len = av_len (invoke_av);
2717
2718 sv_setsv (cb, AvARRAY (invoke_av)[0]);
2719
2720 if (len > 0)
2721 { 3372 {
2722 av_fill (defav, len - 1); 3373 struct coro *coro = SvSTATE_hv (hv);
2723 for (i = 0; i < len; ++i) 3374
2724 av_store (defav, i, SvREFCNT_inc_NN (AvARRAY (invoke_av)[i + 1])); 3375 assert (!coro->invoke_cb);
3376 assert (!coro->invoke_av);
3377 coro->invoke_cb = SvREFCNT_inc (cb);
3378 coro->invoke_av = av;
2725 } 3379 }
3380
3381 api_ready (aTHX_ (SV *)hv);
3382
3383 if (GIMME_V != G_VOID)
3384 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
3385 else
3386 SvREFCNT_dec (hv);
2726} 3387}
3388
3389SV *
3390rouse_cb ()
3391 PROTOTYPE:
3392 CODE:
3393 RETVAL = coro_new_rouse_cb (aTHX);
3394 OUTPUT:
3395 RETVAL
2727 3396
2728void 3397void
2729_pool_2 (SV *cb) 3398rouse_wait (...)
3399 PROTOTYPE: ;$
3400 PPCODE:
3401 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait);
3402
3403void
3404on_enter (SV *block)
3405 ALIAS:
3406 on_leave = 1
3407 PROTOTYPE: &
2730 CODE: 3408 CODE:
2731{ 3409{
2732 HV *hv = (HV *)SvRV (coro_current);
2733 struct coro *coro = SvSTATE_hv ((SV *)hv); 3410 struct coro *coro = SvSTATE_current;
3411 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
2734 3412
2735 sv_setsv (cb, &PL_sv_undef); 3413 block = (SV *)coro_sv_2cv (aTHX_ block);
2736 3414
2737 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 3415 if (!*avp)
2738 coro->saved_deffh = 0; 3416 *avp = newAV ();
2739 3417
2740 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 3418 av_push (*avp, SvREFCNT_inc (block));
2741 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
2742 {
2743 SV *old = PL_diehook;
2744 PL_diehook = 0;
2745 SvREFCNT_dec (old);
2746 croak ("\3async_pool terminate\2\n");
2747 }
2748 3419
2749 av_clear (GvAV (PL_defgv)); 3420 if (!ix)
2750 hv_store (hv, "desc", sizeof ("desc") - 1, 3421 on_enterleave_call (aTHX_ block);
2751 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
2752 3422
2753 coro->prio = 0; 3423 LEAVE; /* pp_entersub unfortunately forces an ENTER/LEAVE around xs calls */
2754 3424 SAVEDESTRUCTOR_X (ix ? coro_pop_on_leave : coro_pop_on_enter, (void *)coro);
2755 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 3425 ENTER; /* pp_entersub unfortunately forces an ENTER/LEAVE around xs calls */
2756 api_trace (aTHX_ coro_current, 0);
2757
2758 av_push (av_async_pool, newSVsv (coro_current));
2759} 3426}
2760 3427
2761 3428
2762MODULE = Coro::State PACKAGE = PerlIO::cede 3429MODULE = Coro::State PACKAGE = PerlIO::cede
2763 3430
… …
2766 3433
2767 3434
2768MODULE = Coro::State PACKAGE = Coro::Semaphore 3435MODULE = Coro::State PACKAGE = Coro::Semaphore
2769 3436
2770SV * 3437SV *
2771new (SV *klass, SV *count_ = 0) 3438new (SV *klass, SV *count = 0)
2772 CODE: 3439 CODE:
2773{ 3440 RETVAL = sv_bless (
2774 /* a semaphore contains a counter IV in $sem->[0] and any waiters after that */ 3441 coro_waitarray_new (aTHX_ count && SvOK (count) ? SvIV (count) : 1),
2775 AV *av = newAV (); 3442 GvSTASH (CvGV (cv))
2776 SV **ary; 3443 );
3444 OUTPUT:
3445 RETVAL
2777 3446
2778 /* unfortunately, building manually saves memory */ 3447# helper for Coro::Channel and others
2779 Newx (ary, 2, SV *); 3448SV *
2780 AvALLOC (av) = ary; 3449_alloc (int count)
2781 AvARRAY (av) = ary; 3450 CODE:
2782 AvMAX (av) = 1; 3451 RETVAL = coro_waitarray_new (aTHX_ count);
2783 AvFILLp (av) = 0;
2784 ary [0] = newSViv (count_ && SvOK (count_) ? SvIV (count_) : 1);
2785
2786 RETVAL = sv_bless (newRV_noinc ((SV *)av), GvSTASH (CvGV (cv)));
2787}
2788 OUTPUT: 3452 OUTPUT:
2789 RETVAL 3453 RETVAL
2790 3454
2791SV * 3455SV *
2792count (SV *self) 3456count (SV *self)
… …
2801 adjust = 1 3465 adjust = 1
2802 CODE: 3466 CODE:
2803 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1); 3467 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1);
2804 3468
2805void 3469void
2806down (SV *self) 3470down (...)
2807 CODE: 3471 CODE:
2808 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down); 3472 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down);
3473
3474void
3475wait (...)
3476 CODE:
3477 CORO_EXECUTE_SLF_XS (slf_init_semaphore_wait);
2809 3478
2810void 3479void
2811try (SV *self) 3480try (SV *self)
2812 PPCODE: 3481 PPCODE:
2813{ 3482{
… …
2825 XSRETURN_NO; 3494 XSRETURN_NO;
2826} 3495}
2827 3496
2828void 3497void
2829waiters (SV *self) 3498waiters (SV *self)
2830 CODE: 3499 PPCODE:
2831{ 3500{
2832 AV *av = (AV *)SvRV (self); 3501 AV *av = (AV *)SvRV (self);
3502 int wcount = AvFILLp (av) + 1 - 1;
2833 3503
2834 if (GIMME_V == G_SCALAR) 3504 if (GIMME_V == G_SCALAR)
2835 XPUSHs (sv_2mortal (newSVsv (AvARRAY (av)[0]))); 3505 XPUSHs (sv_2mortal (newSViv (wcount)));
2836 else 3506 else
2837 { 3507 {
2838 int i; 3508 int i;
2839 EXTEND (SP, AvFILLp (av) + 1 - 1); 3509 EXTEND (SP, wcount);
2840 for (i = 1; i <= AvFILLp (av); ++i) 3510 for (i = 1; i <= wcount; ++i)
2841 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i]))); 3511 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i])));
2842 } 3512 }
2843} 3513}
3514
3515MODULE = Coro::State PACKAGE = Coro::Signal
3516
3517SV *
3518new (SV *klass)
3519 CODE:
3520 RETVAL = sv_bless (
3521 coro_waitarray_new (aTHX_ 0),
3522 GvSTASH (CvGV (cv))
3523 );
3524 OUTPUT:
3525 RETVAL
3526
3527void
3528wait (...)
3529 CODE:
3530 CORO_EXECUTE_SLF_XS (slf_init_signal_wait);
3531
3532void
3533broadcast (SV *self)
3534 CODE:
3535{
3536 AV *av = (AV *)SvRV (self);
3537 coro_signal_wake (aTHX_ av, AvFILLp (av));
3538}
3539
3540void
3541send (SV *self)
3542 CODE:
3543{
3544 AV *av = (AV *)SvRV (self);
3545
3546 if (AvFILLp (av))
3547 coro_signal_wake (aTHX_ av, 1);
3548 else
3549 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
3550}
3551
3552IV
3553awaited (SV *self)
3554 CODE:
3555 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
3556 OUTPUT:
3557 RETVAL
2844 3558
2845 3559
2846MODULE = Coro::State PACKAGE = Coro::AnyEvent 3560MODULE = Coro::State PACKAGE = Coro::AnyEvent
2847 3561
2848BOOT: 3562BOOT:
… …
2876 3590
2877void 3591void
2878_register (char *target, char *proto, SV *req) 3592_register (char *target, char *proto, SV *req)
2879 CODE: 3593 CODE:
2880{ 3594{
2881 HV *st; 3595 CV *req_cv = coro_sv_2cv (aTHX_ req);
2882 GV *gvp;
2883 CV *req_cv = sv_2cv (req, &st, &gvp, 0);
2884 /* newXSproto doesn't return the CV on 5.8 */ 3596 /* newXSproto doesn't return the CV on 5.8 */
2885 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 3597 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
2886 sv_setpv ((SV *)slf_cv, proto); 3598 sv_setpv ((SV *)slf_cv, proto);
2887 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0); 3599 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
2888} 3600}

Diff Legend

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