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.217 by root, Wed Nov 14 11:32:56 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
138static size_t coro_stacksize = CORO_STACKSIZE; 145static size_t coro_stacksize = CORO_STACKSIZE;
139static struct CoroAPI coroapi; 146static struct CoroAPI coroapi;
140static AV *main_mainstack; /* used to differentiate between $main and others */ 147static AV *main_mainstack; /* used to differentiate between $main and others */
141static JMPENV *main_top_env; 148static JMPENV *main_top_env;
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 volatile 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
669#if 0
670static int (*orig_sigelem_get) (pTHX_ SV *sv, MAGIC *mg);
671
672/*
673 * This overrides the default magic get method of %SIG elements.
674 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
675 * and instead of tryign to save and restore the hash elements, we just provide
676 * readback here.
677 * We only do this when the hook is != 0, as they are often set to 0 temporarily,
678 * not expecting this to actually change the hook. This is a potential problem
679 * when a schedule happens then, but we ignore this.
680 */
681static int
682coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
683{
684 return orig_sigelem_get (aTHX_ sv, mg);
685 const char *s = MgPV_nolen_const (mg);
686
687 if (*s == '_')
688 {
689 if (strEQ (s, "__DIE__" ) && PL_diehook ) return sv_setsv (sv, PL_diehook ), 0;
690 if (strEQ (s, "__WARN__") && PL_warnhook) return sv_setsv (sv, PL_warnhook), 0;
691 }
692
693 return orig_sigelem_get (aTHX_ sv, mg);
694}
695#endif
594 696
595static void 697static void
596coro_setup (pTHX_ struct coro *coro) 698coro_setup (pTHX_ struct coro *coro)
597{ 699{
598 /* 700 /*
603 PL_runops = RUNOPS_DEFAULT; 705 PL_runops = RUNOPS_DEFAULT;
604 PL_curcop = &PL_compiling; 706 PL_curcop = &PL_compiling;
605 PL_in_eval = EVAL_NULL; 707 PL_in_eval = EVAL_NULL;
606 PL_comppad = 0; 708 PL_comppad = 0;
607 PL_curpm = 0; 709 PL_curpm = 0;
710 PL_curpad = 0;
608 PL_localizing = 0; 711 PL_localizing = 0;
609 PL_dirty = 0; 712 PL_dirty = 0;
610 PL_restartop = 0; 713 PL_restartop = 0;
714
715 /* recreate the die/warn hooks */
716 PL_diehook = 0;
717 hv_store (hv_sig, "__DIE__", sizeof ("__DIE__") - 1, newSV (0), 0);
718 PL_diehook = SvREFCNT_inc (rv_diehook);
719
720 PL_warnhook = 0;
721 hv_store (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, newSV (0), 0);
722 PL_warnhook = SvREFCNT_inc (rv_warnhook);
611 723
612 GvSV (PL_defgv) = newSV (0); 724 GvSV (PL_defgv) = newSV (0);
613 GvAV (PL_defgv) = coro->args; coro->args = 0; 725 GvAV (PL_defgv) = coro->args; coro->args = 0;
614 GvSV (PL_errgv) = newSV (0); 726 GvSV (PL_errgv) = newSV (0);
615 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 727 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
616 PL_rs = newSVsv (GvSV (irsgv)); 728 PL_rs = newSVsv (GvSV (irsgv));
617 PL_defoutgv = SvREFCNT_inc (stdoutgv); 729 PL_defoutgv = (GV *)SvREFCNT_inc (stdoutgv);
618
619 ENTER; /* necessary e.g. for dounwind */
620 730
621 { 731 {
622 dSP; 732 dSP;
623 LOGOP myop; 733 LOGOP myop;
624 734
631 PUTBACK; 741 PUTBACK;
632 PL_op = (OP *)&myop; 742 PL_op = (OP *)&myop;
633 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 743 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
634 SPAGAIN; 744 SPAGAIN;
635 } 745 }
746
747 /* this newly created coroutine might be run on an existing cctx which most
748 * likely was suspended in set_stacklevel, called from entersub.
749 * set_stacklevl doesn't do anything on return, but entersub does LEAVE,
750 * so we ENTER here for symmetry
751 */
752 ENTER;
636} 753}
637 754
638static void 755static void
639coro_destroy (pTHX_ struct coro *coro) 756coro_destroy (pTHX_ struct coro *coro)
640{ 757{
660 SvREFCNT_dec (GvSV (PL_errgv)); 777 SvREFCNT_dec (GvSV (PL_errgv));
661 SvREFCNT_dec (PL_defoutgv); 778 SvREFCNT_dec (PL_defoutgv);
662 SvREFCNT_dec (PL_rs); 779 SvREFCNT_dec (PL_rs);
663 SvREFCNT_dec (GvSV (irsgv)); 780 SvREFCNT_dec (GvSV (irsgv));
664 781
782 SvREFCNT_dec (PL_diehook);
783 SvREFCNT_dec (PL_warnhook);
784
665 SvREFCNT_dec (coro->saved_deffh); 785 SvREFCNT_dec (coro->saved_deffh);
666 //SvREFCNT_dec (coro->throw); 786 SvREFCNT_dec (coro->throw);
667 787
668 coro_destroy_stacks (aTHX); 788 coro_destroy_stacks (aTHX);
669} 789}
670 790
671static void 791static void
672free_coro_mortal (pTHX) 792free_coro_mortal (pTHX)
673{ 793{
674 if (coro_mortal) 794 if (expect_true (coro_mortal))
675 { 795 {
676 SvREFCNT_dec (coro_mortal); 796 SvREFCNT_dec (coro_mortal);
677 coro_mortal = 0; 797 coro_mortal = 0;
678 } 798 }
679} 799}
804 924
805/* inject a fake call to Coro::State::_cctx_init into the execution */ 925/* 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 */ 926/* _cctx_init should be careful, as it could be called at almost any time */
807/* during execution of a perl program */ 927/* during execution of a perl program */
808static void NOINLINE 928static void NOINLINE
809prepare_cctx (pTHX_ coro_cctx *cctx) 929cctx_prepare (pTHX_ coro_cctx *cctx)
810{ 930{
811 dSP; 931 dSP;
812 LOGOP myop; 932 LOGOP myop;
813 933
814 PL_top_env = &PL_start_env; 934 PL_top_env = &PL_start_env;
832 952
833/* 953/*
834 * this is a _very_ stripped down perl interpreter ;) 954 * this is a _very_ stripped down perl interpreter ;)
835 */ 955 */
836static void 956static void
837coro_run (void *arg) 957cctx_run (void *arg)
838{ 958{
839 dTHX; 959 dTHX;
840 960
841 /* coro_run is the alternative tail of transfer(), so unlock here. */ 961 /* cctx_run is the alternative tail of transfer(), so unlock here. */
842 UNLOCK; 962 UNLOCK;
843 963
844 /* we now skip the entersub that lead to transfer() */ 964 /* we now skip the entersub that lead to transfer() */
845 PL_op = PL_op->op_next; 965 PL_op = PL_op->op_next;
846 966
847 /* inject a fake subroutine call to cctx_init */ 967 /* inject a fake subroutine call to cctx_init */
848 prepare_cctx (aTHX_ (coro_cctx *)arg); 968 cctx_prepare (aTHX_ (coro_cctx *)arg);
849 969
850 /* somebody or something will hit me for both perl_run and PL_restartop */ 970 /* somebody or something will hit me for both perl_run and PL_restartop */
851 PL_restartop = PL_op; 971 PL_restartop = PL_op;
852 perl_run (PL_curinterp); 972 perl_run (PL_curinterp);
853 973
872 ++cctx_count; 992 ++cctx_count;
873 993
874 Newz (0, cctx, 1, coro_cctx); 994 Newz (0, cctx, 1, coro_cctx);
875 995
876#if HAVE_MMAP 996#if HAVE_MMAP
877
878 cctx->ssize = ((coro_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE; 997 cctx->ssize = ((coro_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
879 /* mmap supposedly does allocate-on-write for us */ 998 /* 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); 999 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
881 1000
882 if (cctx->sptr != (void *)-1) 1001 if (cctx->sptr != (void *)-1)
903 stack_start = cctx->sptr; 1022 stack_start = cctx->sptr;
904 stack_size = cctx->ssize; 1023 stack_size = cctx->ssize;
905 } 1024 }
906 1025
907 REGISTER_STACK (cctx, (char *)stack_start, (char *)stack_start + stack_size); 1026 REGISTER_STACK (cctx, (char *)stack_start, (char *)stack_start + stack_size);
908 coro_create (&cctx->cctx, coro_run, (void *)cctx, stack_start, stack_size); 1027 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size);
909 1028
910 return cctx; 1029 return cctx;
911} 1030}
912 1031
913static void 1032static void
936#define CCTX_EXPIRED(cctx) ((cctx)->ssize < coro_stacksize || ((cctx)->flags & CC_NOREUSE)) 1055#define CCTX_EXPIRED(cctx) ((cctx)->ssize < coro_stacksize || ((cctx)->flags & CC_NOREUSE))
937 1056
938static coro_cctx * 1057static coro_cctx *
939cctx_get (pTHX) 1058cctx_get (pTHX)
940{ 1059{
941 while (cctx_first) 1060 while (expect_true (cctx_first))
942 { 1061 {
943 coro_cctx *cctx = cctx_first; 1062 coro_cctx *cctx = cctx_first;
944 cctx_first = cctx->next; 1063 cctx_first = cctx->next;
945 --cctx_idle; 1064 --cctx_idle;
946 1065
947 if (!CCTX_EXPIRED (cctx)) 1066 if (expect_true (!CCTX_EXPIRED (cctx)))
948 return cctx; 1067 return cctx;
949 1068
950 cctx_destroy (cctx); 1069 cctx_destroy (cctx);
951 } 1070 }
952 1071
955 1074
956static void 1075static void
957cctx_put (coro_cctx *cctx) 1076cctx_put (coro_cctx *cctx)
958{ 1077{
959 /* free another cctx if overlimit */ 1078 /* free another cctx if overlimit */
960 if (cctx_idle >= MAX_IDLE_CCTX) 1079 if (expect_false (cctx_idle >= MAX_IDLE_CCTX))
961 { 1080 {
962 coro_cctx *first = cctx_first; 1081 coro_cctx *first = cctx_first;
963 cctx_first = first->next; 1082 cctx_first = first->next;
964 --cctx_idle; 1083 --cctx_idle;
965 1084
971 cctx_first = cctx; 1090 cctx_first = cctx;
972} 1091}
973 1092
974/** coroutine switching *****************************************************/ 1093/** coroutine switching *****************************************************/
975 1094
976static void NOINLINE 1095static void
977transfer_check (pTHX_ struct coro *prev, struct coro *next) 1096transfer_check (pTHX_ struct coro *prev, struct coro *next)
978{ 1097{
979 if (prev != next) 1098 if (expect_true (prev != next))
980 { 1099 {
981 if (!(prev->flags & (CF_RUNNING | CF_NEW))) 1100 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"); 1101 croak ("Coro::State::transfer called with non-running/new prev Coro::State, but can only transfer from running or new states");
983 1102
984 if (next->flags & CF_RUNNING) 1103 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"); 1104 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states");
986 1105
987 if (next->flags & CF_DESTROYED) 1106 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"); 1107 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states");
989 1108
1109 if (
1110#if PERL_VERSION_ATLEAST (5,9,0)
1111 expect_false (PL_parser)
1112#else
990 if (PL_lex_state != LEX_NOTPARSING) 1113 expect_false (PL_lex_state != LEX_NOTPARSING)
1114#endif
1115 )
991 croak ("Coro::State::transfer called while parsing, but this is not supported"); 1116 croak ("Coro::State::transfer called while parsing, but this is not supported");
992 } 1117 }
993} 1118}
994 1119
995/* always use the TRANSFER macro */ 1120/* always use the TRANSFER macro */
996static void NOINLINE 1121static void NOINLINE
997transfer (pTHX_ struct coro *prev, struct coro *next) 1122transfer (pTHX_ struct coro *prev, struct coro *next)
998{ 1123{
999 dSTACKLEVEL; 1124 dSTACKLEVEL;
1125 static volatile int has_throw;
1000 1126
1001 /* sometimes transfer is only called to set idle_sp */ 1127 /* sometimes transfer is only called to set idle_sp */
1002 if (!next) 1128 if (expect_false (!next))
1003 { 1129 {
1004 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1130 ((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 */ 1131 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1006 } 1132 }
1007 else if (prev != next) 1133 else if (expect_true (prev != next))
1008 { 1134 {
1009 coro_cctx *prev__cctx; 1135 coro_cctx *prev__cctx;
1010 1136
1011 if (prev->flags & CF_NEW) 1137 if (expect_false (prev->flags & CF_NEW))
1012 { 1138 {
1013 /* create a new empty context */ 1139 /* create a new empty context */
1014 Newz (0, prev->cctx, 1, coro_cctx); 1140 Newz (0, prev->cctx, 1, coro_cctx);
1015 prev->flags &= ~CF_NEW; 1141 prev->flags &= ~CF_NEW;
1016 prev->flags |= CF_RUNNING; 1142 prev->flags |= CF_RUNNING;
1019 prev->flags &= ~CF_RUNNING; 1145 prev->flags &= ~CF_RUNNING;
1020 next->flags |= CF_RUNNING; 1146 next->flags |= CF_RUNNING;
1021 1147
1022 LOCK; 1148 LOCK;
1023 1149
1150 /* first get rid of the old state */
1151 save_perl (aTHX_ prev);
1152
1024 if (next->flags & CF_NEW) 1153 if (expect_false (next->flags & CF_NEW))
1025 { 1154 {
1026 /* need to start coroutine */ 1155 /* need to start coroutine */
1027 next->flags &= ~CF_NEW; 1156 next->flags &= ~CF_NEW;
1028 /* first get rid of the old state */
1029 save_perl (aTHX_ prev);
1030 /* setup coroutine call */ 1157 /* setup coroutine call */
1031 coro_setup (aTHX_ next); 1158 coro_setup (aTHX_ next);
1032 } 1159 }
1033 else 1160 else
1034 {
1035 /* coroutine already started */
1036 save_perl (aTHX_ prev);
1037 load_perl (aTHX_ next); 1161 load_perl (aTHX_ next);
1038 }
1039 1162
1040 prev__cctx = prev->cctx; 1163 prev__cctx = prev->cctx;
1041 1164
1042 /* possibly "free" the cctx */ 1165 /* possibly "free" the cctx */
1043 if (prev__cctx->idle_sp == STACKLEVEL && !(prev__cctx->flags & CC_TRACE)) 1166 if (expect_true (prev__cctx->idle_sp == STACKLEVEL && !(prev__cctx->flags & CC_TRACE)))
1044 { 1167 {
1045 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */ 1168 /* 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)); 1169 assert (("ERROR: current top_env must equal previous top_env", PL_top_env == prev__cctx->idle_te));
1047 1170
1048 prev->cctx = 0; 1171 prev->cctx = 0;
1049 1172
1050 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */ 1173 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */
1174 /* without this the next cctx_get might destroy the prev__cctx while still in use */
1051 if (CCTX_EXPIRED (prev__cctx)) 1175 if (expect_false (CCTX_EXPIRED (prev__cctx)))
1176 if (!next->cctx)
1052 next->cctx = cctx_get (aTHX); 1177 next->cctx = cctx_get (aTHX);
1053 1178
1054 cctx_put (prev__cctx); 1179 cctx_put (prev__cctx);
1055 } 1180 }
1056 1181
1057 ++next->usecount; 1182 ++next->usecount;
1058 1183
1059 if (!next->cctx) 1184 if (expect_true (!next->cctx))
1060 next->cctx = cctx_get (aTHX); 1185 next->cctx = cctx_get (aTHX);
1061 1186
1187 has_throw = !!next->throw;
1188
1062 if (prev__cctx != next->cctx) 1189 if (expect_false (prev__cctx != next->cctx))
1063 { 1190 {
1064 prev__cctx->top_env = PL_top_env; 1191 prev__cctx->top_env = PL_top_env;
1065 PL_top_env = next->cctx->top_env; 1192 PL_top_env = next->cctx->top_env;
1066 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1193 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx);
1067 } 1194 }
1068 1195
1069 free_coro_mortal (aTHX); 1196 free_coro_mortal (aTHX);
1070 UNLOCK; 1197 UNLOCK;
1198
1199 if (expect_false (has_throw))
1200 {
1201 struct coro *coro = SvSTATE (coro_current);
1202
1203 if (coro->throw)
1204 {
1205 SV *exception = coro->throw;
1206 coro->throw = 0;
1207 sv_setsv (ERRSV, exception);
1208 croak (0);
1209 }
1210 }
1071 } 1211 }
1072} 1212}
1073 1213
1074struct transfer_args 1214struct transfer_args
1075{ 1215{
1110 save_perl (aTHX_ &temp); 1250 save_perl (aTHX_ &temp);
1111 load_perl (aTHX_ coro); 1251 load_perl (aTHX_ coro);
1112 1252
1113 coro_destroy (aTHX_ coro); 1253 coro_destroy (aTHX_ coro);
1114 1254
1115 load_perl (aTHX_ &temp); /* this will get rid of defsv etc.. */ 1255 load_perl (aTHX_ &temp);
1116 1256
1117 coro->mainstack = 0; 1257 coro->slot = 0;
1118 } 1258 }
1119 1259
1120 cctx_destroy (coro->cctx); 1260 cctx_destroy (coro->cctx);
1121 SvREFCNT_dec (coro->args); 1261 SvREFCNT_dec (coro->args);
1122 1262
1247 { 1387 {
1248 LOCK; 1388 LOCK;
1249 next_sv = coro_deq (aTHX_ PRIO_MIN); 1389 next_sv = coro_deq (aTHX_ PRIO_MIN);
1250 1390
1251 /* nothing to schedule: call the idle handler */ 1391 /* nothing to schedule: call the idle handler */
1252 if (!next_sv) 1392 if (expect_false (!next_sv))
1253 { 1393 {
1254 dSP; 1394 dSP;
1255 UNLOCK; 1395 UNLOCK;
1256 1396
1257 ENTER; 1397 ENTER;
1267 } 1407 }
1268 1408
1269 ta->next = SvSTATE (next_sv); 1409 ta->next = SvSTATE (next_sv);
1270 1410
1271 /* cannot transfer to destroyed coros, skip and look for next */ 1411 /* cannot transfer to destroyed coros, skip and look for next */
1272 if (ta->next->flags & CF_DESTROYED) 1412 if (expect_false (ta->next->flags & CF_DESTROYED))
1273 { 1413 {
1274 UNLOCK; 1414 UNLOCK;
1275 SvREFCNT_dec (next_sv); 1415 SvREFCNT_dec (next_sv);
1276 /* coro_nready is already taken care of by destroy */ 1416 /* coro_nready is already taken care of by destroy */
1277 continue; 1417 continue;
1333 dTHX; 1473 dTHX;
1334 struct transfer_args ta; 1474 struct transfer_args ta;
1335 1475
1336 prepare_cede (aTHX_ &ta); 1476 prepare_cede (aTHX_ &ta);
1337 1477
1338 if (ta.prev != ta.next) 1478 if (expect_true (ta.prev != ta.next))
1339 { 1479 {
1340 TRANSFER (ta); 1480 TRANSFER (ta);
1341 return 1; 1481 return 1;
1342 } 1482 }
1343 else 1483 else
1379 coro->cctx->flags &= ~(CC_TRACE | CC_TRACE_ALL); 1519 coro->cctx->flags &= ~(CC_TRACE | CC_TRACE_ALL);
1380 1520
1381 if (coro->flags & CF_RUNNING) 1521 if (coro->flags & CF_RUNNING)
1382 PL_runops = RUNOPS_DEFAULT; 1522 PL_runops = RUNOPS_DEFAULT;
1383 else 1523 else
1384 coro->runops = RUNOPS_DEFAULT; 1524 coro->slot->runops = RUNOPS_DEFAULT;
1385 } 1525 }
1386} 1526}
1387 1527
1388MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 1528MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
1389 1529
1396#endif 1536#endif
1397 BOOT_PAGESIZE; 1537 BOOT_PAGESIZE;
1398 1538
1399 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 1539 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
1400 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 1540 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
1541#if 0
1542 orig_sigelem_get = PL_vtbl_sigelem.svt_get;
1543 PL_vtbl_sigelem.svt_get = coro_sigelem_get;
1544#endif
1545 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
1546 rv_diehook = SvREFCNT_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
1547 rv_warnhook = SvREFCNT_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
1401 1548
1402 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 1549 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
1403 1550
1404 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE)); 1551 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
1405 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB)); 1552 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));
1411 1558
1412 while (main_top_env->je_prev) 1559 while (main_top_env->je_prev)
1413 main_top_env = main_top_env->je_prev; 1560 main_top_env = main_top_env->je_prev;
1414 1561
1415 coroapi.ver = CORO_API_VERSION; 1562 coroapi.ver = CORO_API_VERSION;
1563 coroapi.rev = CORO_API_REVISION;
1416 coroapi.transfer = api_transfer; 1564 coroapi.transfer = api_transfer;
1417 1565
1418 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 1566 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL));
1419} 1567}
1420 1568
1421SV * 1569SV *
1422new (char *klass, ...) 1570new (char *klass, ...)
1423 CODE: 1571 CODE:
1424{ 1572{
1425 struct coro *coro; 1573 struct coro *coro;
1574 MAGIC *mg;
1426 HV *hv; 1575 HV *hv;
1427 int i; 1576 int i;
1428 1577
1429 Newz (0, coro, 1, struct coro); 1578 Newz (0, coro, 1, struct coro);
1430 coro->args = newAV (); 1579 coro->args = newAV ();
1433 if (coro_first) coro_first->prev = coro; 1582 if (coro_first) coro_first->prev = coro;
1434 coro->next = coro_first; 1583 coro->next = coro_first;
1435 coro_first = coro; 1584 coro_first = coro;
1436 1585
1437 coro->hv = hv = newHV (); 1586 coro->hv = hv = newHV ();
1438 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro, 0)->mg_flags |= MGf_DUP; 1587 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
1588 mg->mg_flags |= MGf_DUP;
1439 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 1589 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
1440 1590
1441 av_extend (coro->args, items - 1); 1591 av_extend (coro->args, items - 1);
1442 for (i = 1; i < items; i++) 1592 for (i = 1; i < items; i++)
1443 av_push (coro->args, newSVsv (ST (i))); 1593 av_push (coro->args, newSVsv (ST (i)));
1487 1637
1488 break; 1638 break;
1489 } 1639 }
1490 1640
1491 BARRIER; 1641 BARRIER;
1642 PUTBACK;
1492 TRANSFER (ta); 1643 TRANSFER (ta);
1493 1644 SPAGAIN; /* might be the sp of a different coroutine now */
1494 if (GIMME_V != G_VOID && ta.next != ta.prev) 1645 /* be extra careful not to ever do anything after TRANSFER */
1495 XSRETURN_YES;
1496} 1646}
1497 1647
1498bool 1648bool
1499_destroy (SV *coro_sv) 1649_destroy (SV *coro_sv)
1500 CODE: 1650 CODE:
1549 CODE: 1699 CODE:
1550{ 1700{
1551 if (coro->mainstack) 1701 if (coro->mainstack)
1552 { 1702 {
1553 struct coro temp; 1703 struct coro temp;
1554 Zero (&temp, 1, struct coro);
1555 1704
1556 if (!(coro->flags & CF_RUNNING)) 1705 if (!(coro->flags & CF_RUNNING))
1557 { 1706 {
1558 save_perl (aTHX_ &temp); 1707 save_perl (aTHX_ &temp);
1559 load_perl (aTHX_ coro); 1708 load_perl (aTHX_ coro);
1561 1710
1562 { 1711 {
1563 dSP; 1712 dSP;
1564 ENTER; 1713 ENTER;
1565 SAVETMPS; 1714 SAVETMPS;
1715 PUTBACK;
1716 PUSHSTACK;
1566 PUSHMARK (SP); 1717 PUSHMARK (SP);
1567 PUTBACK; 1718
1568 if (ix) 1719 if (ix)
1569 eval_sv (coderef, 0); 1720 eval_sv (coderef, 0);
1570 else 1721 else
1571 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 1722 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
1723
1724 POPSTACK;
1572 SPAGAIN; 1725 SPAGAIN;
1573 FREETMPS; 1726 FREETMPS;
1574 LEAVE; 1727 LEAVE;
1575 PUTBACK; 1728 PUTBACK;
1576 } 1729 }
1634 1787
1635BOOT: 1788BOOT:
1636{ 1789{
1637 int i; 1790 int i;
1638 1791
1639 sv_pool_rss = get_sv ("Coro::POOL_RSS" , TRUE); 1792 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
1640 sv_pool_size = get_sv ("Coro::POOL_SIZE" , TRUE); 1793 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
1641 av_async_pool = get_av ("Coro::async_pool", TRUE); 1794 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
1642 1795
1643 coro_current = get_sv ("Coro::current", FALSE); 1796 coro_current = coro_get_sv (aTHX_ "Coro::current", FALSE);
1644 SvREADONLY_on (coro_current); 1797 SvREADONLY_on (coro_current);
1645 1798
1646 coro_stash = gv_stashpv ("Coro", TRUE); 1799 coro_stash = gv_stashpv ("Coro", TRUE);
1647 1800
1648 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 1801 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
1649 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 1802 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH));
1650 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 1803 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL));
1651 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 1804 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW));
1654 1807
1655 for (i = PRIO_MAX - PRIO_MIN + 1; i--; ) 1808 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
1656 coro_ready[i] = newAV (); 1809 coro_ready[i] = newAV ();
1657 1810
1658 { 1811 {
1659 SV *sv = perl_get_sv("Coro::API", 1); 1812 SV *sv = perl_get_sv ("Coro::API", TRUE);
1813 perl_get_sv ("Coro::API", TRUE); /* silence 5.10 warning */
1660 1814
1661 coroapi.schedule = api_schedule; 1815 coroapi.schedule = api_schedule;
1662 coroapi.cede = api_cede; 1816 coroapi.cede = api_cede;
1663 coroapi.cede_notself = api_cede_notself; 1817 coroapi.cede_notself = api_cede_notself;
1664 coroapi.ready = api_ready; 1818 coroapi.ready = api_ready;
1715 CODE: 1869 CODE:
1716 RETVAL = coro_nready; 1870 RETVAL = coro_nready;
1717 OUTPUT: 1871 OUTPUT:
1718 RETVAL 1872 RETVAL
1719 1873
1874void
1875throw (Coro::State self, SV *throw = &PL_sv_undef)
1876 PROTOTYPE: $;$
1877 CODE:
1878 SvREFCNT_dec (self->throw);
1879 self->throw = SvOK (throw) ? newSVsv (throw) : 0;
1880
1720# for async_pool speedup 1881# for async_pool speedup
1721void 1882void
1722_pool_1 (SV *cb) 1883_pool_1 (SV *cb)
1723 CODE: 1884 CODE:
1724{ 1885{
1728 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0); 1889 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
1729 AV *invoke_av; 1890 AV *invoke_av;
1730 int i, len; 1891 int i, len;
1731 1892
1732 if (!invoke) 1893 if (!invoke)
1733 croak ("\3terminate\2\n"); 1894 croak ("\3async_pool terminate\2\n");
1734 1895
1735 SvREFCNT_dec (coro->saved_deffh); 1896 SvREFCNT_dec (coro->saved_deffh);
1736 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv); 1897 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv);
1737 1898
1738 hv_store (hv, "desc", sizeof ("desc") - 1, 1899 hv_store (hv, "desc", sizeof ("desc") - 1,
1764 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 1925 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1765 coro->saved_deffh = 0; 1926 coro->saved_deffh = 0;
1766 1927
1767 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss) 1928 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss)
1768 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 1929 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1769 croak ("\3terminate\2\n"); 1930 croak ("\3async_pool terminate\2\n");
1770 1931
1771 av_clear (GvAV (PL_defgv)); 1932 av_clear (GvAV (PL_defgv));
1772 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1, 1933 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1,
1773 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0); 1934 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
1774 1935

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines