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.193 by root, Fri Oct 5 23:38:40 2007 UTC vs.
Revision 1.214 by root, Sat Oct 13 23:19:10 2007 UTC

1#include "libcoro/coro.c" 1#include "libcoro/coro.c"
2 2
3#define PERL_NO_GET_CONTEXT 3#define PERL_NO_GET_CONTEXT
4#define PERL_EXT
4 5
5#include "EXTERN.h" 6#include "EXTERN.h"
6#include "perl.h" 7#include "perl.h"
7#include "XSUB.h" 8#include "XSUB.h"
8 9
9#include "patchlevel.h" 10#include "patchlevel.h"
10 11
11#include <stdio.h> 12#include <stdio.h>
12#include <errno.h> 13#include <errno.h>
13#include <assert.h> 14#include <assert.h>
15#include <inttypes.h> /* portable stdint.h */
14 16
15#ifdef HAVE_MMAP 17#ifdef HAVE_MMAP
16# include <unistd.h> 18# include <unistd.h>
17# include <sys/mman.h> 19# include <sys/mman.h>
18# ifndef MAP_ANONYMOUS 20# ifndef MAP_ANONYMOUS
106#define IN_DESTRUCT (PL_main_cv == Nullcv) 108#define IN_DESTRUCT (PL_main_cv == Nullcv)
107 109
108#if __GNUC__ >= 3 110#if __GNUC__ >= 3
109# define attribute(x) __attribute__(x) 111# define attribute(x) __attribute__(x)
110# define BARRIER __asm__ __volatile__ ("" : : : "memory") 112# define BARRIER __asm__ __volatile__ ("" : : : "memory")
113# define expect(expr,value) __builtin_expect ((expr),(value))
111#else 114#else
112# define attribute(x) 115# define attribute(x)
113# define BARRIER 116# define BARRIER
117# define expect(expr,value) (expr)
114#endif 118#endif
119
120#define expect_false(expr) expect ((expr) != 0, 0)
121#define expect_true(expr) expect ((expr) != 0, 1)
115 122
116#define NOINLINE attribute ((noinline)) 123#define NOINLINE attribute ((noinline))
117 124
118#include "CoroAPI.h" 125#include "CoroAPI.h"
119 126
142static HV *coro_state_stash, *coro_stash; 149static HV *coro_state_stash, *coro_stash;
143static SV *coro_mortal; /* will be freed after next transfer */ 150static SV *coro_mortal; /* will be freed after next transfer */
144 151
145static GV *irsgv; /* $/ */ 152static GV *irsgv; /* $/ */
146static GV *stdoutgv; /* *STDOUT */ 153static GV *stdoutgv; /* *STDOUT */
154static SV *rv_diehook;
155static SV *rv_warnhook;
156static HV *hv_sig; /* %SIG */
147 157
148/* async_pool helper stuff */ 158/* async_pool helper stuff */
149static SV *sv_pool_rss; 159static SV *sv_pool_rss;
150static SV *sv_pool_size; 160static SV *sv_pool_size;
151static AV *av_async_pool; 161static AV *av_async_pool;
187 CF_READY = 0x0002, /* coroutine is ready */ 197 CF_READY = 0x0002, /* coroutine is ready */
188 CF_NEW = 0x0004, /* has never been switched to */ 198 CF_NEW = 0x0004, /* has never been switched to */
189 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 199 CF_DESTROYED = 0x0008, /* coroutine data has been freed */
190}; 200};
191 201
202/* the structure where most of the perl state is stored, overlaid on the cxstack */
203typedef struct {
204 SV *defsv;
205 AV *defav;
206 SV *errsv;
207 SV *irsgv;
208#define VAR(name,type) type name;
209# include "state.h"
210#undef VAR
211} perl_slots;
212
213#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
214
192/* this is a structure representing a perl-level coroutine */ 215/* this is a structure representing a perl-level coroutine */
193struct coro { 216struct coro {
194 /* the c coroutine allocated to this perl coroutine, if any */ 217 /* the c coroutine allocated to this perl coroutine, if any */
195 coro_cctx *cctx; 218 coro_cctx *cctx;
196 219
220 /* process data */
221 AV *mainstack;
222 perl_slots *slot; /* basically the saved sp */
223
197 /* data associated with this coroutine (initial args) */ 224 AV *args; /* data associated with this coroutine (initial args) */
198 AV *args; 225 int refcnt; /* coroutines are refcounted, yes */
199 int refcnt;
200 int flags; /* CF_ flags */ 226 int flags; /* CF_ flags */
201 227 HV *hv; /* the perl hash associated with this coro, if any */
202 /* optionally saved, might be zero */
203 AV *defav; /* @_ */
204 SV *defsv; /* $_ */
205 SV *errsv; /* $@ */
206 SV *deffh; /* default filehandle */
207 SV *irssv; /* $/ */
208 SV *irssv_sv; /* real $/ cache */
209
210#define VAR(name,type) type name;
211# include "state.h"
212#undef VAR
213 228
214 /* statistics */ 229 /* statistics */
215 int usecount; /* number of transfers to this coro */ 230 int usecount; /* number of transfers to this coro */
216 231
217 /* coro process data */ 232 /* coro process data */
218 int prio; 233 int prio;
219 //SV *throw; 234 SV *throw; /* exception to be thrown */
220 235
221 /* async_pool */ 236 /* async_pool */
222 SV *saved_deffh; 237 SV *saved_deffh;
223 238
224 /* linked list */ 239 /* linked list */
225 struct coro *next, *prev; 240 struct coro *next, *prev;
226 HV *hv; /* the perl hash associated with this coro, if any */
227}; 241};
228 242
229typedef struct coro *Coro__State; 243typedef struct coro *Coro__State;
230typedef struct coro *Coro__State_or_hashref; 244typedef struct coro *Coro__State_or_hashref;
231 245
243static AV *coro_ready [PRIO_MAX-PRIO_MIN+1]; 257static AV *coro_ready [PRIO_MAX-PRIO_MIN+1];
244static int coro_nready; 258static int coro_nready;
245static struct coro *coro_first; 259static struct coro *coro_first;
246 260
247/** lowlevel stuff **********************************************************/ 261/** lowlevel stuff **********************************************************/
262
263static SV *
264coro_get_sv (pTHX_ const char *name, int create)
265{
266#if PERL_VERSION_ATLEAST (5,9,0)
267 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
268 get_sv (name, create);
269#endif
270 return get_sv (name, create);
271}
272
273static AV *
274coro_get_av (pTHX_ const char *name, int create)
275{
276#if PERL_VERSION_ATLEAST (5,9,0)
277 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
278 get_av (name, create);
279#endif
280 return get_av (name, create);
281}
282
283static HV *
284coro_get_hv (pTHX_ const char *name, int create)
285{
286#if PERL_VERSION_ATLEAST (5,9,0)
287 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
288 get_hv (name, create);
289#endif
290 return get_hv (name, create);
291}
248 292
249static AV * 293static AV *
250coro_clone_padlist (pTHX_ CV *cv) 294coro_clone_padlist (pTHX_ CV *cv)
251{ 295{
252 AV *padlist = CvPADLIST (cv); 296 AV *padlist = CvPADLIST (cv);
300 344
301 /* casting is fun. */ 345 /* casting is fun. */
302 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 346 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
303 free_padlist (aTHX_ padlist); 347 free_padlist (aTHX_ padlist);
304 348
305 SvREFCNT_dec (av);
306
307 return 0; 349 return 0;
308} 350}
309 351
310#define PERL_MAGIC_coro PERL_MAGIC_ext 352#define CORO_MAGIC_type_cv PERL_MAGIC_ext
353#define CORO_MAGIC_type_state PERL_MAGIC_ext
311 354
312static MGVTBL vtbl_coro = {0, 0, 0, 0, coro_cv_free}; 355static MGVTBL coro_cv_vtbl = {
356 0, 0, 0, 0,
357 coro_cv_free
358};
313 359
314#define CORO_MAGIC(cv) \ 360#define CORO_MAGIC(sv,type) \
315 SvMAGIC (cv) \ 361 SvMAGIC (sv) \
316 ? SvMAGIC (cv)->mg_type == PERL_MAGIC_coro \ 362 ? SvMAGIC (sv)->mg_type == type \
317 ? SvMAGIC (cv) \ 363 ? SvMAGIC (sv) \
318 : mg_find ((SV *)cv, PERL_MAGIC_coro) \ 364 : mg_find (sv, type) \
319 : 0 365 : 0
366
367#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
368#define CORO_MAGIC_state(sv) CORO_MAGIC (((SV *)(sv)), CORO_MAGIC_type_state)
320 369
321static struct coro * 370static struct coro *
322SvSTATE_ (pTHX_ SV *coro) 371SvSTATE_ (pTHX_ SV *coro)
323{ 372{
324 HV *stash; 373 HV *stash;
325 MAGIC *mg; 374 MAGIC *mg;
326 375
327 if (SvROK (coro)) 376 if (SvROK (coro))
328 coro = SvRV (coro); 377 coro = SvRV (coro);
329 378
330 if (SvTYPE (coro) != SVt_PVHV) 379 if (expect_false (SvTYPE (coro) != SVt_PVHV))
331 croak ("Coro::State object required"); 380 croak ("Coro::State object required");
332 381
333 stash = SvSTASH (coro); 382 stash = SvSTASH (coro);
334 if (stash != coro_stash && stash != coro_state_stash) 383 if (expect_false (stash != coro_stash && stash != coro_state_stash))
335 { 384 {
336 /* very slow, but rare, check */ 385 /* very slow, but rare, check */
337 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State")) 386 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
338 croak ("Coro::State object required"); 387 croak ("Coro::State object required");
339 } 388 }
340 389
341 mg = CORO_MAGIC (coro); 390 mg = CORO_MAGIC_state (coro);
342 return (struct coro *)mg->mg_ptr; 391 return (struct coro *)mg->mg_ptr;
343} 392}
344 393
345#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 394#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
346 395
347/* the next two functions merely cache the padlists */ 396/* the next two functions merely cache the padlists */
348static void 397static void
349get_padlist (pTHX_ CV *cv) 398get_padlist (pTHX_ CV *cv)
350{ 399{
351 MAGIC *mg = CORO_MAGIC (cv); 400 MAGIC *mg = CORO_MAGIC_cv (cv);
352 AV *av; 401 AV *av;
353 402
354 if (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0) 403 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0))
355 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 404 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
356 else 405 else
357 { 406 {
358#if CORO_PREFER_PERL_FUNCTIONS 407#if CORO_PREFER_PERL_FUNCTIONS
359 /* this is probably cleaner, but also slower? */ 408 /* this is probably cleaner, but also slower? */
368} 417}
369 418
370static void 419static void
371put_padlist (pTHX_ CV *cv) 420put_padlist (pTHX_ CV *cv)
372{ 421{
373 MAGIC *mg = CORO_MAGIC (cv); 422 MAGIC *mg = CORO_MAGIC_cv (cv);
374 AV *av; 423 AV *av;
375 424
376 if (!mg) 425 if (expect_false (!mg))
377 { 426 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
378 sv_magic ((SV *)cv, 0, PERL_MAGIC_coro, 0, 0);
379 mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
380 mg->mg_virtual = &vtbl_coro;
381 mg->mg_obj = (SV *)newAV ();
382 }
383 427
384 av = (AV *)mg->mg_obj; 428 av = (AV *)mg->mg_obj;
385 429
386 if (AvFILLp (av) >= AvMAX (av)) 430 if (expect_false (AvFILLp (av) >= AvMAX (av)))
387 av_extend (av, AvMAX (av) + 1); 431 av_extend (av, AvMAX (av) + 1);
388 432
389 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 433 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
390} 434}
391 435
392/** load & save, init *******************************************************/ 436/** load & save, init *******************************************************/
393 437
394static void 438static void
395load_perl (pTHX_ Coro__State c) 439load_perl (pTHX_ Coro__State c)
396{ 440{
441 perl_slots *slot = c->slot;
442 c->slot = 0;
443
444 PL_mainstack = c->mainstack;
445
446 GvSV (PL_defgv) = slot->defsv;
447 GvAV (PL_defgv) = slot->defav;
448 GvSV (PL_errgv) = slot->errsv;
449 GvSV (irsgv) = slot->irsgv;
450
397#define VAR(name,type) PL_ ## name = c->name; 451 #define VAR(name,type) PL_ ## name = slot->name;
398# include "state.h" 452 # include "state.h"
399#undef VAR 453 #undef VAR
400
401 GvSV (PL_defgv) = c->defsv;
402 GvAV (PL_defgv) = c->defav;
403 GvSV (PL_errgv) = c->errsv;
404 GvSV (irsgv) = c->irssv_sv;
405 454
406 { 455 {
407 dSP; 456 dSP;
457
408 CV *cv; 458 CV *cv;
409 459
410 /* now do the ugly restore mess */ 460 /* now do the ugly restore mess */
411 while ((cv = (CV *)POPs)) 461 while (expect_true (cv = (CV *)POPs))
412 { 462 {
413 put_padlist (aTHX_ cv); /* mark this padlist as available */ 463 put_padlist (aTHX_ cv); /* mark this padlist as available */
414 CvDEPTH (cv) = PTR2IV (POPs); 464 CvDEPTH (cv) = PTR2IV (POPs);
415 CvPADLIST (cv) = (AV *)POPs; 465 CvPADLIST (cv) = (AV *)POPs;
416 } 466 }
435 485
436 XPUSHs (Nullsv); 486 XPUSHs (Nullsv);
437 /* this loop was inspired by pp_caller */ 487 /* this loop was inspired by pp_caller */
438 for (;;) 488 for (;;)
439 { 489 {
440 while (cxix >= 0) 490 while (expect_true (cxix >= 0))
441 { 491 {
442 PERL_CONTEXT *cx = &ccstk[cxix--]; 492 PERL_CONTEXT *cx = &ccstk[cxix--];
443 493
444 if (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT) 494 if (expect_true (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT))
445 { 495 {
446 CV *cv = cx->blk_sub.cv; 496 CV *cv = cx->blk_sub.cv;
447 497
448 if (CvDEPTH (cv)) 498 if (expect_true (CvDEPTH (cv)))
449 { 499 {
450 EXTEND (SP, 3); 500 EXTEND (SP, 3);
451 PUSHs ((SV *)CvPADLIST (cv)); 501 PUSHs ((SV *)CvPADLIST (cv));
452 PUSHs (INT2PTR (SV *, CvDEPTH (cv))); 502 PUSHs (INT2PTR (SV *, CvDEPTH (cv)));
453 PUSHs ((SV *)cv); 503 PUSHs ((SV *)cv);
456 get_padlist (aTHX_ cv); 506 get_padlist (aTHX_ cv);
457 } 507 }
458 } 508 }
459 } 509 }
460 510
461 if (top_si->si_type == PERLSI_MAIN) 511 if (expect_true (top_si->si_type == PERLSI_MAIN))
462 break; 512 break;
463 513
464 top_si = top_si->si_prev; 514 top_si = top_si->si_prev;
465 ccstk = top_si->si_cxstack; 515 ccstk = top_si->si_cxstack;
466 cxix = top_si->si_cxix; 516 cxix = top_si->si_cxix;
467 } 517 }
468 518
469 PUTBACK; 519 PUTBACK;
470 } 520 }
471 521
522 /* allocate some space on the context stack for our purposes */
523 /* we manually unroll here, as usually 2 slots is enough */
524 if (SLOT_COUNT >= 1) CXINC;
525 if (SLOT_COUNT >= 2) CXINC;
526 if (SLOT_COUNT >= 3) CXINC;
527 {
528 int i;
529 for (i = 3; i < SLOT_COUNT; ++i)
530 CXINC;
531 }
532 cxstack_ix -= SLOT_COUNT; /* undo allocation */
533
534 c->mainstack = PL_mainstack;
535
536 {
537 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
538
472 c->defav = GvAV (PL_defgv); 539 slot->defav = GvAV (PL_defgv);
473 c->defsv = DEFSV; 540 slot->defsv = DEFSV;
474 c->errsv = ERRSV; 541 slot->errsv = ERRSV;
475 c->irssv_sv = GvSV (irsgv); 542 slot->irsgv = GvSV (irsgv);
476 543
477#define VAR(name,type)c->name = PL_ ## name; 544 #define VAR(name,type) slot->name = PL_ ## name;
478# include "state.h" 545 # include "state.h"
479#undef VAR 546 #undef VAR
547 }
480} 548}
481 549
482/* 550/*
483 * allocate various perl stacks. This is an exact copy 551 * allocate various perl stacks. This is an exact copy
484 * of perl.c:init_stacks, except that it uses less memory 552 * of perl.c:init_stacks, except that it uses less memory
489# define coro_init_stacks init_stacks 557# define coro_init_stacks init_stacks
490#else 558#else
491static void 559static void
492coro_init_stacks (pTHX) 560coro_init_stacks (pTHX)
493{ 561{
494 PL_curstackinfo = new_stackinfo(64, 6); 562 PL_curstackinfo = new_stackinfo(32, 8);
495 PL_curstackinfo->si_type = PERLSI_MAIN; 563 PL_curstackinfo->si_type = PERLSI_MAIN;
496 PL_curstack = PL_curstackinfo->si_stack; 564 PL_curstack = PL_curstackinfo->si_stack;
497 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 565 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
498 566
499 PL_stack_base = AvARRAY(PL_curstack); 567 PL_stack_base = AvARRAY(PL_curstack);
500 PL_stack_sp = PL_stack_base; 568 PL_stack_sp = PL_stack_base;
501 PL_stack_max = PL_stack_base + AvMAX(PL_curstack); 569 PL_stack_max = PL_stack_base + AvMAX(PL_curstack);
502 570
503 New(50,PL_tmps_stack,64,SV*); 571 New(50,PL_tmps_stack,32,SV*);
504 PL_tmps_floor = -1; 572 PL_tmps_floor = -1;
505 PL_tmps_ix = -1; 573 PL_tmps_ix = -1;
506 PL_tmps_max = 64; 574 PL_tmps_max = 32;
507 575
508 New(54,PL_markstack,16,I32); 576 New(54,PL_markstack,16,I32);
509 PL_markstack_ptr = PL_markstack; 577 PL_markstack_ptr = PL_markstack;
510 PL_markstack_max = PL_markstack + 16; 578 PL_markstack_max = PL_markstack + 16;
511 579
512#ifdef SET_MARK_OFFSET 580#ifdef SET_MARK_OFFSET
513 SET_MARK_OFFSET; 581 SET_MARK_OFFSET;
514#endif 582#endif
515 583
516 New(54,PL_scopestack,16,I32); 584 New(54,PL_scopestack,8,I32);
517 PL_scopestack_ix = 0; 585 PL_scopestack_ix = 0;
518 PL_scopestack_max = 16; 586 PL_scopestack_max = 8;
519 587
520 New(54,PL_savestack,64,ANY); 588 New(54,PL_savestack,24,ANY);
521 PL_savestack_ix = 0; 589 PL_savestack_ix = 0;
522 PL_savestack_max = 64; 590 PL_savestack_max = 24;
523 591
524#if !PERL_VERSION_ATLEAST (5,9,0) 592#if !PERL_VERSION_ATLEAST (5,9,0)
525 New(54,PL_retstack,4,OP*); 593 New(54,PL_retstack,4,OP*);
526 PL_retstack_ix = 0; 594 PL_retstack_ix = 0;
527 PL_retstack_max = 4; 595 PL_retstack_max = 4;
564{ 632{
565 size_t rss = sizeof (*coro); 633 size_t rss = sizeof (*coro);
566 634
567 if (coro->mainstack) 635 if (coro->mainstack)
568 { 636 {
637 perl_slots tmp_slot;
638 perl_slots *slot;
639
569 if (coro->flags & CF_RUNNING) 640 if (coro->flags & CF_RUNNING)
570 { 641 {
642 slot = &tmp_slot;
643
571 #define VAR(name,type)coro->name = PL_ ## name; 644 #define VAR(name,type) slot->name = PL_ ## name;
572 # include "state.h" 645 # include "state.h"
573 #undef VAR 646 #undef VAR
574 } 647 }
648 else
649 slot = coro->slot;
575 650
576 rss += sizeof (coro->curstackinfo); 651 rss += sizeof (slot->curstackinfo);
577 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvFILL (coro->curstackinfo->si_stack)) * sizeof (SV *);
578 rss += (coro->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT); 652 rss += (slot->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT);
579 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvFILL (coro->curstack)) * sizeof (SV *); 653 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (slot->curstack)) * sizeof (SV *);
580 rss += coro->tmps_max * sizeof (SV *); 654 rss += slot->tmps_max * sizeof (SV *);
581 rss += (coro->markstack_max - coro->markstack_ptr) * sizeof (I32); 655 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32);
582 rss += coro->scopestack_max * sizeof (I32); 656 rss += slot->scopestack_max * sizeof (I32);
583 rss += coro->savestack_max * sizeof (ANY); 657 rss += slot->savestack_max * sizeof (ANY);
584 658
585#if !PERL_VERSION_ATLEAST (5,9,0) 659#if !PERL_VERSION_ATLEAST (5,9,0)
586 rss += coro->retstack_max * sizeof (OP *); 660 rss += slot->retstack_max * sizeof (OP *);
587#endif 661#endif
588 } 662 }
589 663
590 return rss; 664 return rss;
591} 665}
592 666
593/** coroutine stack handling ************************************************/ 667/** coroutine stack handling ************************************************/
668
669static int (*orig_sigelem_get) (pTHX_ SV *sv, MAGIC *mg);
670
671/*
672 * This overrides the default magic get method of %SIG elements.
673 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
674 * and instead of tryign to save and restore the hash elements, we just provide
675 * readback here.
676 * We only do this when the hook is != 0, as they are often set to 0 temporarily,
677 * not expecting this to actually change the hook. This is a potential problem
678 * when a schedule happens then, but we ignore this.
679 */
680static int
681coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
682{
683 const char *s = MgPV_nolen_const (mg);
684
685 if (*s == '_')
686 {
687 if (strEQ (s, "__DIE__" ) && PL_diehook ) return sv_setsv (sv, PL_diehook ), 0;
688 if (strEQ (s, "__WARN__") && PL_warnhook) return sv_setsv (sv, PL_warnhook), 0;
689 }
690
691 return orig_sigelem_get (aTHX_ sv, mg);
692}
594 693
595static void 694static void
596coro_setup (pTHX_ struct coro *coro) 695coro_setup (pTHX_ struct coro *coro)
597{ 696{
598 /* 697 /*
603 PL_runops = RUNOPS_DEFAULT; 702 PL_runops = RUNOPS_DEFAULT;
604 PL_curcop = &PL_compiling; 703 PL_curcop = &PL_compiling;
605 PL_in_eval = EVAL_NULL; 704 PL_in_eval = EVAL_NULL;
606 PL_comppad = 0; 705 PL_comppad = 0;
607 PL_curpm = 0; 706 PL_curpm = 0;
707 PL_curpad = 0;
608 PL_localizing = 0; 708 PL_localizing = 0;
609 PL_dirty = 0; 709 PL_dirty = 0;
610 PL_restartop = 0; 710 PL_restartop = 0;
711
712 /* recreate the die/warn hooks */
713 PL_diehook = 0;
714 hv_store (hv_sig, "__DIE__", sizeof ("__DIE__") - 1, newSV (0), 0);
715 PL_diehook = SvREFCNT_inc (rv_diehook);
716
717 PL_warnhook = 0;
718 hv_store (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, newSV (0), 0);
719 PL_warnhook = SvREFCNT_inc (rv_warnhook);
611 720
612 GvSV (PL_defgv) = newSV (0); 721 GvSV (PL_defgv) = newSV (0);
613 GvAV (PL_defgv) = coro->args; coro->args = 0; 722 GvAV (PL_defgv) = coro->args; coro->args = 0;
614 GvSV (PL_errgv) = newSV (0); 723 GvSV (PL_errgv) = newSV (0);
615 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 724 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
616 PL_rs = newSVsv (GvSV (irsgv)); 725 PL_rs = newSVsv (GvSV (irsgv));
617 PL_defoutgv = SvREFCNT_inc (stdoutgv); 726 PL_defoutgv = (GV *)SvREFCNT_inc (stdoutgv);
618
619 ENTER; /* necessary e.g. for dounwind */
620 727
621 { 728 {
622 dSP; 729 dSP;
623 LOGOP myop; 730 LOGOP myop;
624 731
631 PUTBACK; 738 PUTBACK;
632 PL_op = (OP *)&myop; 739 PL_op = (OP *)&myop;
633 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 740 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
634 SPAGAIN; 741 SPAGAIN;
635 } 742 }
743
744 /* this newly created coroutine might be run on an existing cctx which most
745 * likely was suspended in set_stacklevel, called from entersub.
746 * set_stacklevl doesn't do anything on return, but entersub does LEAVE,
747 * so we ENTER here for symmetry
748 */
749 ENTER;
636} 750}
637 751
638static void 752static void
639coro_destroy (pTHX_ struct coro *coro) 753coro_destroy (pTHX_ struct coro *coro)
640{ 754{
660 SvREFCNT_dec (GvSV (PL_errgv)); 774 SvREFCNT_dec (GvSV (PL_errgv));
661 SvREFCNT_dec (PL_defoutgv); 775 SvREFCNT_dec (PL_defoutgv);
662 SvREFCNT_dec (PL_rs); 776 SvREFCNT_dec (PL_rs);
663 SvREFCNT_dec (GvSV (irsgv)); 777 SvREFCNT_dec (GvSV (irsgv));
664 778
779 SvREFCNT_dec (PL_diehook);
780 SvREFCNT_dec (PL_warnhook);
781
665 SvREFCNT_dec (coro->saved_deffh); 782 SvREFCNT_dec (coro->saved_deffh);
666 //SvREFCNT_dec (coro->throw); 783 SvREFCNT_dec (coro->throw);
667 784
668 coro_destroy_stacks (aTHX); 785 coro_destroy_stacks (aTHX);
669} 786}
670 787
671static void 788static void
672free_coro_mortal (pTHX) 789free_coro_mortal (pTHX)
673{ 790{
674 if (coro_mortal) 791 if (expect_true (coro_mortal))
675 { 792 {
676 SvREFCNT_dec (coro_mortal); 793 SvREFCNT_dec (coro_mortal);
677 coro_mortal = 0; 794 coro_mortal = 0;
678 } 795 }
679} 796}
804 921
805/* inject a fake call to Coro::State::_cctx_init into the execution */ 922/* inject a fake call to Coro::State::_cctx_init into the execution */
806/* _cctx_init should be careful, as it could be called at almost any time */ 923/* _cctx_init should be careful, as it could be called at almost any time */
807/* during execution of a perl program */ 924/* during execution of a perl program */
808static void NOINLINE 925static void NOINLINE
809prepare_cctx (pTHX_ coro_cctx *cctx) 926cctx_prepare (pTHX_ coro_cctx *cctx)
810{ 927{
811 dSP; 928 dSP;
812 LOGOP myop; 929 LOGOP myop;
813 930
814 PL_top_env = &PL_start_env; 931 PL_top_env = &PL_start_env;
832 949
833/* 950/*
834 * this is a _very_ stripped down perl interpreter ;) 951 * this is a _very_ stripped down perl interpreter ;)
835 */ 952 */
836static void 953static void
837coro_run (void *arg) 954cctx_run (void *arg)
838{ 955{
839 dTHX; 956 dTHX;
840 957
841 /* coro_run is the alternative tail of transfer(), so unlock here. */ 958 /* cctx_run is the alternative tail of transfer(), so unlock here. */
842 UNLOCK; 959 UNLOCK;
843 960
844 /* we now skip the entersub that lead to transfer() */ 961 /* we now skip the entersub that lead to transfer() */
845 PL_op = PL_op->op_next; 962 PL_op = PL_op->op_next;
846 963
847 /* inject a fake subroutine call to cctx_init */ 964 /* inject a fake subroutine call to cctx_init */
848 prepare_cctx (aTHX_ (coro_cctx *)arg); 965 cctx_prepare (aTHX_ (coro_cctx *)arg);
849 966
850 /* somebody or something will hit me for both perl_run and PL_restartop */ 967 /* somebody or something will hit me for both perl_run and PL_restartop */
851 PL_restartop = PL_op; 968 PL_restartop = PL_op;
852 perl_run (PL_curinterp); 969 perl_run (PL_curinterp);
853 970
872 ++cctx_count; 989 ++cctx_count;
873 990
874 Newz (0, cctx, 1, coro_cctx); 991 Newz (0, cctx, 1, coro_cctx);
875 992
876#if HAVE_MMAP 993#if HAVE_MMAP
877
878 cctx->ssize = ((coro_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE; 994 cctx->ssize = ((coro_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
879 /* mmap supposedly does allocate-on-write for us */ 995 /* mmap supposedly does allocate-on-write for us */
880 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0); 996 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
881 997
882 if (cctx->sptr != (void *)-1) 998 if (cctx->sptr != (void *)-1)
903 stack_start = cctx->sptr; 1019 stack_start = cctx->sptr;
904 stack_size = cctx->ssize; 1020 stack_size = cctx->ssize;
905 } 1021 }
906 1022
907 REGISTER_STACK (cctx, (char *)stack_start, (char *)stack_start + stack_size); 1023 REGISTER_STACK (cctx, (char *)stack_start, (char *)stack_start + stack_size);
908 coro_create (&cctx->cctx, coro_run, (void *)cctx, stack_start, stack_size); 1024 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size);
909 1025
910 return cctx; 1026 return cctx;
911} 1027}
912 1028
913static void 1029static void
936#define CCTX_EXPIRED(cctx) ((cctx)->ssize < coro_stacksize || ((cctx)->flags & CC_NOREUSE)) 1052#define CCTX_EXPIRED(cctx) ((cctx)->ssize < coro_stacksize || ((cctx)->flags & CC_NOREUSE))
937 1053
938static coro_cctx * 1054static coro_cctx *
939cctx_get (pTHX) 1055cctx_get (pTHX)
940{ 1056{
941 while (cctx_first) 1057 while (expect_true (cctx_first))
942 { 1058 {
943 coro_cctx *cctx = cctx_first; 1059 coro_cctx *cctx = cctx_first;
944 cctx_first = cctx->next; 1060 cctx_first = cctx->next;
945 --cctx_idle; 1061 --cctx_idle;
946 1062
947 if (!CCTX_EXPIRED (cctx)) 1063 if (expect_true (!CCTX_EXPIRED (cctx)))
948 return cctx; 1064 return cctx;
949 1065
950 cctx_destroy (cctx); 1066 cctx_destroy (cctx);
951 } 1067 }
952 1068
955 1071
956static void 1072static void
957cctx_put (coro_cctx *cctx) 1073cctx_put (coro_cctx *cctx)
958{ 1074{
959 /* free another cctx if overlimit */ 1075 /* free another cctx if overlimit */
960 if (cctx_idle >= MAX_IDLE_CCTX) 1076 if (expect_false (cctx_idle >= MAX_IDLE_CCTX))
961 { 1077 {
962 coro_cctx *first = cctx_first; 1078 coro_cctx *first = cctx_first;
963 cctx_first = first->next; 1079 cctx_first = first->next;
964 --cctx_idle; 1080 --cctx_idle;
965 1081
971 cctx_first = cctx; 1087 cctx_first = cctx;
972} 1088}
973 1089
974/** coroutine switching *****************************************************/ 1090/** coroutine switching *****************************************************/
975 1091
976static void NOINLINE 1092static void
977transfer_check (pTHX_ struct coro *prev, struct coro *next) 1093transfer_check (pTHX_ struct coro *prev, struct coro *next)
978{ 1094{
979 if (prev != next) 1095 if (expect_true (prev != next))
980 { 1096 {
981 if (!(prev->flags & (CF_RUNNING | CF_NEW))) 1097 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
982 croak ("Coro::State::transfer called with non-running/new prev Coro::State, but can only transfer from running or new states"); 1098 croak ("Coro::State::transfer called with non-running/new prev Coro::State, but can only transfer from running or new states");
983 1099
984 if (next->flags & CF_RUNNING) 1100 if (expect_false (next->flags & CF_RUNNING))
985 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states"); 1101 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states");
986 1102
987 if (next->flags & CF_DESTROYED) 1103 if (expect_false (next->flags & CF_DESTROYED))
988 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states"); 1104 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states");
989 1105
1106 if (
1107#if PERL_VERSION_ATLEAST (5,9,0)
1108 expect_false (PL_parser)
1109#else
990 if (PL_lex_state != LEX_NOTPARSING) 1110 expect_false (PL_lex_state != LEX_NOTPARSING)
1111#endif
1112 )
991 croak ("Coro::State::transfer called while parsing, but this is not supported"); 1113 croak ("Coro::State::transfer called while parsing, but this is not supported");
992 } 1114 }
993} 1115}
994 1116
995/* always use the TRANSFER macro */ 1117/* always use the TRANSFER macro */
997transfer (pTHX_ struct coro *prev, struct coro *next) 1119transfer (pTHX_ struct coro *prev, struct coro *next)
998{ 1120{
999 dSTACKLEVEL; 1121 dSTACKLEVEL;
1000 1122
1001 /* sometimes transfer is only called to set idle_sp */ 1123 /* sometimes transfer is only called to set idle_sp */
1002 if (!next) 1124 if (expect_false (!next))
1003 { 1125 {
1004 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1126 ((coro_cctx *)prev)->idle_sp = STACKLEVEL;
1005 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1127 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1006 } 1128 }
1007 else if (prev != next) 1129 else if (expect_true (prev != next))
1008 { 1130 {
1009 coro_cctx *prev__cctx; 1131 coro_cctx *prev__cctx;
1010 1132
1011 if (prev->flags & CF_NEW) 1133 if (expect_false (prev->flags & CF_NEW))
1012 { 1134 {
1013 /* create a new empty context */ 1135 /* create a new empty context */
1014 Newz (0, prev->cctx, 1, coro_cctx); 1136 Newz (0, prev->cctx, 1, coro_cctx);
1015 prev->flags &= ~CF_NEW; 1137 prev->flags &= ~CF_NEW;
1016 prev->flags |= CF_RUNNING; 1138 prev->flags |= CF_RUNNING;
1019 prev->flags &= ~CF_RUNNING; 1141 prev->flags &= ~CF_RUNNING;
1020 next->flags |= CF_RUNNING; 1142 next->flags |= CF_RUNNING;
1021 1143
1022 LOCK; 1144 LOCK;
1023 1145
1146 /* first get rid of the old state */
1147 save_perl (aTHX_ prev);
1148
1024 if (next->flags & CF_NEW) 1149 if (expect_false (next->flags & CF_NEW))
1025 { 1150 {
1026 /* need to start coroutine */ 1151 /* need to start coroutine */
1027 next->flags &= ~CF_NEW; 1152 next->flags &= ~CF_NEW;
1028 /* first get rid of the old state */
1029 save_perl (aTHX_ prev);
1030 /* setup coroutine call */ 1153 /* setup coroutine call */
1031 coro_setup (aTHX_ next); 1154 coro_setup (aTHX_ next);
1032 } 1155 }
1033 else 1156 else
1034 {
1035 /* coroutine already started */
1036 save_perl (aTHX_ prev);
1037 load_perl (aTHX_ next); 1157 load_perl (aTHX_ next);
1038 }
1039 1158
1040 prev__cctx = prev->cctx; 1159 prev__cctx = prev->cctx;
1041 1160
1042 /* possibly "free" the cctx */ 1161 /* possibly "free" the cctx */
1043 if (prev__cctx->idle_sp == STACKLEVEL && !(prev__cctx->flags & CC_TRACE)) 1162 if (expect_true (prev__cctx->idle_sp == STACKLEVEL && !(prev__cctx->flags & CC_TRACE)))
1044 { 1163 {
1045 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */ 1164 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */
1046 assert (("ERROR: current top_env must equal previous top_env", PL_top_env == prev__cctx->idle_te)); 1165 assert (("ERROR: current top_env must equal previous top_env", PL_top_env == prev__cctx->idle_te));
1047 1166
1048 prev->cctx = 0; 1167 prev->cctx = 0;
1049 1168
1050 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */ 1169 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */
1170 /* without this the next cctx_get might destroy the prev__cctx while still in use */
1051 if (CCTX_EXPIRED (prev__cctx)) 1171 if (expect_false (CCTX_EXPIRED (prev__cctx)))
1172 if (!next->cctx)
1052 next->cctx = cctx_get (aTHX); 1173 next->cctx = cctx_get (aTHX);
1053 1174
1054 cctx_put (prev__cctx); 1175 cctx_put (prev__cctx);
1055 } 1176 }
1056 1177
1057 ++next->usecount; 1178 ++next->usecount;
1058 1179
1059 if (!next->cctx) 1180 if (expect_true (!next->cctx))
1060 next->cctx = cctx_get (aTHX); 1181 next->cctx = cctx_get (aTHX);
1061 1182
1062 if (prev__cctx != next->cctx) 1183 if (expect_false (prev__cctx != next->cctx))
1063 { 1184 {
1064 prev__cctx->top_env = PL_top_env; 1185 prev__cctx->top_env = PL_top_env;
1065 PL_top_env = next->cctx->top_env; 1186 PL_top_env = next->cctx->top_env;
1066 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1187 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx);
1067 } 1188 }
1068 1189
1069 free_coro_mortal (aTHX); 1190 free_coro_mortal (aTHX);
1070 UNLOCK; 1191 UNLOCK;
1192
1193 if (expect_false (prev->throw || next->throw))
1194 {
1195 struct coro *coro = SvSTATE (coro_current);
1196
1197 if (coro->throw)
1198 {
1199 SV *exception = coro->throw;
1200 coro->throw = 0;
1201 sv_setsv (ERRSV, exception);
1202 croak (0);
1203 }
1204 }
1071 } 1205 }
1072} 1206}
1073 1207
1074struct transfer_args 1208struct transfer_args
1075{ 1209{
1110 save_perl (aTHX_ &temp); 1244 save_perl (aTHX_ &temp);
1111 load_perl (aTHX_ coro); 1245 load_perl (aTHX_ coro);
1112 1246
1113 coro_destroy (aTHX_ coro); 1247 coro_destroy (aTHX_ coro);
1114 1248
1115 load_perl (aTHX_ &temp); /* this will get rid of defsv etc.. */ 1249 load_perl (aTHX_ &temp);
1116 1250
1117 coro->mainstack = 0; 1251 coro->slot = 0;
1118 } 1252 }
1119 1253
1120 cctx_destroy (coro->cctx); 1254 cctx_destroy (coro->cctx);
1121 SvREFCNT_dec (coro->args); 1255 SvREFCNT_dec (coro->args);
1122 1256
1247 { 1381 {
1248 LOCK; 1382 LOCK;
1249 next_sv = coro_deq (aTHX_ PRIO_MIN); 1383 next_sv = coro_deq (aTHX_ PRIO_MIN);
1250 1384
1251 /* nothing to schedule: call the idle handler */ 1385 /* nothing to schedule: call the idle handler */
1252 if (!next_sv) 1386 if (expect_false (!next_sv))
1253 { 1387 {
1254 dSP; 1388 dSP;
1255 UNLOCK; 1389 UNLOCK;
1256 1390
1257 ENTER; 1391 ENTER;
1267 } 1401 }
1268 1402
1269 ta->next = SvSTATE (next_sv); 1403 ta->next = SvSTATE (next_sv);
1270 1404
1271 /* cannot transfer to destroyed coros, skip and look for next */ 1405 /* cannot transfer to destroyed coros, skip and look for next */
1272 if (ta->next->flags & CF_DESTROYED) 1406 if (expect_false (ta->next->flags & CF_DESTROYED))
1273 { 1407 {
1274 UNLOCK; 1408 UNLOCK;
1275 SvREFCNT_dec (next_sv); 1409 SvREFCNT_dec (next_sv);
1276 /* coro_nready is already taken care of by destroy */ 1410 /* coro_nready is already taken care of by destroy */
1277 continue; 1411 continue;
1333 dTHX; 1467 dTHX;
1334 struct transfer_args ta; 1468 struct transfer_args ta;
1335 1469
1336 prepare_cede (aTHX_ &ta); 1470 prepare_cede (aTHX_ &ta);
1337 1471
1338 if (ta.prev != ta.next) 1472 if (expect_true (ta.prev != ta.next))
1339 { 1473 {
1340 TRANSFER (ta); 1474 TRANSFER (ta);
1341 return 1; 1475 return 1;
1342 } 1476 }
1343 else 1477 else
1379 coro->cctx->flags &= ~(CC_TRACE | CC_TRACE_ALL); 1513 coro->cctx->flags &= ~(CC_TRACE | CC_TRACE_ALL);
1380 1514
1381 if (coro->flags & CF_RUNNING) 1515 if (coro->flags & CF_RUNNING)
1382 PL_runops = RUNOPS_DEFAULT; 1516 PL_runops = RUNOPS_DEFAULT;
1383 else 1517 else
1384 coro->runops = RUNOPS_DEFAULT; 1518 coro->slot->runops = RUNOPS_DEFAULT;
1385 } 1519 }
1386} 1520}
1387 1521
1388MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 1522MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
1389 1523
1396#endif 1530#endif
1397 BOOT_PAGESIZE; 1531 BOOT_PAGESIZE;
1398 1532
1399 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 1533 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
1400 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 1534 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
1535
1536 orig_sigelem_get = PL_vtbl_sigelem.svt_get;
1537 PL_vtbl_sigelem.svt_get = coro_sigelem_get;
1538
1539 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
1540 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
1541 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
1401 1542
1402 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 1543 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
1403 1544
1404 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE)); 1545 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
1405 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB)); 1546 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));
1411 1552
1412 while (main_top_env->je_prev) 1553 while (main_top_env->je_prev)
1413 main_top_env = main_top_env->je_prev; 1554 main_top_env = main_top_env->je_prev;
1414 1555
1415 coroapi.ver = CORO_API_VERSION; 1556 coroapi.ver = CORO_API_VERSION;
1557 coroapi.rev = CORO_API_REVISION;
1416 coroapi.transfer = api_transfer; 1558 coroapi.transfer = api_transfer;
1417 1559
1418 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 1560 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL));
1419} 1561}
1420 1562
1421SV * 1563SV *
1422new (char *klass, ...) 1564new (char *klass, ...)
1423 CODE: 1565 CODE:
1424{ 1566{
1425 struct coro *coro; 1567 struct coro *coro;
1568 MAGIC *mg;
1426 HV *hv; 1569 HV *hv;
1427 int i; 1570 int i;
1428 1571
1429 Newz (0, coro, 1, struct coro); 1572 Newz (0, coro, 1, struct coro);
1430 coro->args = newAV (); 1573 coro->args = newAV ();
1433 if (coro_first) coro_first->prev = coro; 1576 if (coro_first) coro_first->prev = coro;
1434 coro->next = coro_first; 1577 coro->next = coro_first;
1435 coro_first = coro; 1578 coro_first = coro;
1436 1579
1437 coro->hv = hv = newHV (); 1580 coro->hv = hv = newHV ();
1438 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro, 0)->mg_flags |= MGf_DUP; 1581 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
1582 mg->mg_flags |= MGf_DUP;
1439 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 1583 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
1440 1584
1441 av_extend (coro->args, items - 1); 1585 av_extend (coro->args, items - 1);
1442 for (i = 1; i < items; i++) 1586 for (i = 1; i < items; i++)
1443 av_push (coro->args, newSVsv (ST (i))); 1587 av_push (coro->args, newSVsv (ST (i)));
1487 1631
1488 break; 1632 break;
1489 } 1633 }
1490 1634
1491 BARRIER; 1635 BARRIER;
1636 PUTBACK;
1492 TRANSFER (ta); 1637 TRANSFER (ta);
1493 1638 SPAGAIN; /* might be the sp of a different coroutine now */
1494 if (GIMME_V != G_VOID && ta.next != ta.prev) 1639 /* be extra careful not to ever do anything after TRANSFER */
1495 XSRETURN_YES;
1496} 1640}
1497 1641
1498bool 1642bool
1499_destroy (SV *coro_sv) 1643_destroy (SV *coro_sv)
1500 CODE: 1644 CODE:
1549 CODE: 1693 CODE:
1550{ 1694{
1551 if (coro->mainstack) 1695 if (coro->mainstack)
1552 { 1696 {
1553 struct coro temp; 1697 struct coro temp;
1554 Zero (&temp, 1, struct coro);
1555 1698
1556 if (!(coro->flags & CF_RUNNING)) 1699 if (!(coro->flags & CF_RUNNING))
1557 { 1700 {
1558 save_perl (aTHX_ &temp); 1701 save_perl (aTHX_ &temp);
1559 load_perl (aTHX_ coro); 1702 load_perl (aTHX_ coro);
1561 1704
1562 { 1705 {
1563 dSP; 1706 dSP;
1564 ENTER; 1707 ENTER;
1565 SAVETMPS; 1708 SAVETMPS;
1709 PUTBACK;
1710 PUSHSTACK;
1566 PUSHMARK (SP); 1711 PUSHMARK (SP);
1567 PUTBACK; 1712
1568 if (ix) 1713 if (ix)
1569 eval_sv (coderef, 0); 1714 eval_sv (coderef, 0);
1570 else 1715 else
1571 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 1716 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
1717
1718 POPSTACK;
1572 SPAGAIN; 1719 SPAGAIN;
1573 FREETMPS; 1720 FREETMPS;
1574 LEAVE; 1721 LEAVE;
1575 PUTBACK; 1722 PUTBACK;
1576 } 1723 }
1634 1781
1635BOOT: 1782BOOT:
1636{ 1783{
1637 int i; 1784 int i;
1638 1785
1639 sv_pool_rss = get_sv ("Coro::POOL_RSS" , TRUE); 1786 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
1640 sv_pool_size = get_sv ("Coro::POOL_SIZE" , TRUE); 1787 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
1641 av_async_pool = get_av ("Coro::async_pool", TRUE); 1788 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
1642 1789
1643 coro_current = get_sv ("Coro::current", FALSE); 1790 coro_current = coro_get_sv (aTHX_ "Coro::current", FALSE);
1644 SvREADONLY_on (coro_current); 1791 SvREADONLY_on (coro_current);
1645 1792
1646 coro_stash = gv_stashpv ("Coro", TRUE); 1793 coro_stash = gv_stashpv ("Coro", TRUE);
1647 1794
1648 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 1795 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
1649 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 1796 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH));
1650 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 1797 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL));
1651 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 1798 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW));
1654 1801
1655 for (i = PRIO_MAX - PRIO_MIN + 1; i--; ) 1802 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
1656 coro_ready[i] = newAV (); 1803 coro_ready[i] = newAV ();
1657 1804
1658 { 1805 {
1659 SV *sv = perl_get_sv("Coro::API", 1); 1806 SV *sv = perl_get_sv ("Coro::API", TRUE);
1807 perl_get_sv ("Coro::API", TRUE); /* silence 5.10 warning */
1660 1808
1661 coroapi.schedule = api_schedule; 1809 coroapi.schedule = api_schedule;
1662 coroapi.cede = api_cede; 1810 coroapi.cede = api_cede;
1663 coroapi.cede_notself = api_cede_notself; 1811 coroapi.cede_notself = api_cede_notself;
1664 coroapi.ready = api_ready; 1812 coroapi.ready = api_ready;
1715 CODE: 1863 CODE:
1716 RETVAL = coro_nready; 1864 RETVAL = coro_nready;
1717 OUTPUT: 1865 OUTPUT:
1718 RETVAL 1866 RETVAL
1719 1867
1868void
1869throw (Coro::State self, SV *throw = &PL_sv_undef)
1870 PROTOTYPE: $;$
1871 CODE:
1872 SvREFCNT_dec (self->throw);
1873 self->throw = SvOK (throw) ? newSVsv (throw) : 0;
1874
1720# for async_pool speedup 1875# for async_pool speedup
1721void 1876void
1722_pool_1 (SV *cb) 1877_pool_1 (SV *cb)
1723 CODE: 1878 CODE:
1724{ 1879{
1728 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0); 1883 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
1729 AV *invoke_av; 1884 AV *invoke_av;
1730 int i, len; 1885 int i, len;
1731 1886
1732 if (!invoke) 1887 if (!invoke)
1733 croak ("\3terminate\2\n"); 1888 croak ("\3async_pool terminate\2\n");
1734 1889
1735 SvREFCNT_dec (coro->saved_deffh); 1890 SvREFCNT_dec (coro->saved_deffh);
1736 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv); 1891 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv);
1737 1892
1738 hv_store (hv, "desc", sizeof ("desc") - 1, 1893 hv_store (hv, "desc", sizeof ("desc") - 1,
1764 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 1919 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1765 coro->saved_deffh = 0; 1920 coro->saved_deffh = 0;
1766 1921
1767 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss) 1922 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss)
1768 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 1923 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1769 croak ("\3terminate\2\n"); 1924 croak ("\3async_pool terminate\2\n");
1770 1925
1771 av_clear (GvAV (PL_defgv)); 1926 av_clear (GvAV (PL_defgv));
1772 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1, 1927 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1,
1773 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0); 1928 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
1774 1929

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines