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.187 by root, Fri Oct 5 20:31:18 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
75/* 5.8.7 */ 77/* 5.8.7 */
76#ifndef SvRV_set 78#ifndef SvRV_set
77# define SvRV_set(s,v) SvRV(s) = (v) 79# define SvRV_set(s,v) SvRV(s) = (v)
78#endif 80#endif
79 81
82/* 5.8.8 */
83#ifndef GV_NOTQUAL
84# define GV_NOTQUAL 0
85#endif
86#ifndef newSV
87# define newSV(l) NEWSV(0,l)
88#endif
89
80#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 90#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
81# undef CORO_STACKGUARD 91# undef CORO_STACKGUARD
82#endif 92#endif
83 93
84#ifndef CORO_STACKGUARD 94#ifndef CORO_STACKGUARD
98#define IN_DESTRUCT (PL_main_cv == Nullcv) 108#define IN_DESTRUCT (PL_main_cv == Nullcv)
99 109
100#if __GNUC__ >= 3 110#if __GNUC__ >= 3
101# define attribute(x) __attribute__(x) 111# define attribute(x) __attribute__(x)
102# define BARRIER __asm__ __volatile__ ("" : : : "memory") 112# define BARRIER __asm__ __volatile__ ("" : : : "memory")
113# define expect(expr,value) __builtin_expect ((expr),(value))
103#else 114#else
104# define attribute(x) 115# define attribute(x)
105# define BARRIER 116# define BARRIER
117# define expect(expr,value) (expr)
106#endif 118#endif
119
120#define expect_false(expr) expect ((expr) != 0, 0)
121#define expect_true(expr) expect ((expr) != 0, 1)
107 122
108#define NOINLINE attribute ((noinline)) 123#define NOINLINE attribute ((noinline))
109 124
110#include "CoroAPI.h" 125#include "CoroAPI.h"
111 126
130static size_t coro_stacksize = CORO_STACKSIZE; 145static size_t coro_stacksize = CORO_STACKSIZE;
131static struct CoroAPI coroapi; 146static struct CoroAPI coroapi;
132static AV *main_mainstack; /* used to differentiate between $main and others */ 147static AV *main_mainstack; /* used to differentiate between $main and others */
133static JMPENV *main_top_env; 148static JMPENV *main_top_env;
134static HV *coro_state_stash, *coro_stash; 149static HV *coro_state_stash, *coro_stash;
135static SV *coro_mortal; /* will be freed after next transfer */ 150static volatile SV *coro_mortal; /* will be freed after next transfer */
136 151
137static GV *irsgv; /* $/ */ 152static GV *irsgv; /* $/ */
153static GV *stdoutgv; /* *STDOUT */
154static SV *rv_diehook;
155static SV *rv_warnhook;
156static HV *hv_sig; /* %SIG */
138 157
139/* async_pool helper stuff */ 158/* async_pool helper stuff */
140static SV *sv_pool_rss; 159static SV *sv_pool_rss;
141static SV *sv_pool_size; 160static SV *sv_pool_size;
142static AV *av_async_pool; 161static AV *av_async_pool;
178 CF_READY = 0x0002, /* coroutine is ready */ 197 CF_READY = 0x0002, /* coroutine is ready */
179 CF_NEW = 0x0004, /* has never been switched to */ 198 CF_NEW = 0x0004, /* has never been switched to */
180 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 199 CF_DESTROYED = 0x0008, /* coroutine data has been freed */
181}; 200};
182 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
183/* this is a structure representing a perl-level coroutine */ 215/* this is a structure representing a perl-level coroutine */
184struct coro { 216struct coro {
185 /* the c coroutine allocated to this perl coroutine, if any */ 217 /* the c coroutine allocated to this perl coroutine, if any */
186 coro_cctx *cctx; 218 coro_cctx *cctx;
187 219
220 /* process data */
221 AV *mainstack;
222 perl_slots *slot; /* basically the saved sp */
223
188 /* data associated with this coroutine (initial args) */ 224 AV *args; /* data associated with this coroutine (initial args) */
189 AV *args; 225 int refcnt; /* coroutines are refcounted, yes */
190 int refcnt;
191 int flags; /* CF_ flags */ 226 int flags; /* CF_ flags */
192 227 HV *hv; /* the perl hash associated with this coro, if any */
193 /* optionally saved, might be zero */
194 AV *defav; /* @_ */
195 SV *defsv; /* $_ */
196 SV *errsv; /* $@ */
197 SV *deffh; /* default filehandle */
198 SV *irssv; /* $/ */
199 SV *irssv_sv; /* real $/ cache */
200
201#define VAR(name,type) type name;
202# include "state.h"
203#undef VAR
204 228
205 /* statistics */ 229 /* statistics */
206 int usecount; /* number of transfers to this coro */ 230 int usecount; /* number of transfers to this coro */
207 231
208 /* coro process data */ 232 /* coro process data */
209 int prio; 233 int prio;
210 //SV *throw; 234 SV *throw; /* exception to be thrown */
211 235
212 /* async_pool */ 236 /* async_pool */
213 SV *saved_deffh; 237 SV *saved_deffh;
214 238
215 /* linked list */ 239 /* linked list */
216 struct coro *next, *prev; 240 struct coro *next, *prev;
217 HV *hv; /* the perl hash associated with this coro, if any */
218}; 241};
219 242
220typedef struct coro *Coro__State; 243typedef struct coro *Coro__State;
221typedef struct coro *Coro__State_or_hashref; 244typedef struct coro *Coro__State_or_hashref;
222 245
234static AV *coro_ready [PRIO_MAX-PRIO_MIN+1]; 257static AV *coro_ready [PRIO_MAX-PRIO_MIN+1];
235static int coro_nready; 258static int coro_nready;
236static struct coro *coro_first; 259static struct coro *coro_first;
237 260
238/** 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}
239 292
240static AV * 293static AV *
241coro_clone_padlist (pTHX_ CV *cv) 294coro_clone_padlist (pTHX_ CV *cv)
242{ 295{
243 AV *padlist = CvPADLIST (cv); 296 AV *padlist = CvPADLIST (cv);
291 344
292 /* casting is fun. */ 345 /* casting is fun. */
293 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 346 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
294 free_padlist (aTHX_ padlist); 347 free_padlist (aTHX_ padlist);
295 348
296 SvREFCNT_dec (av);
297
298 return 0; 349 return 0;
299} 350}
300 351
301#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
302 354
303static 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};
304 359
305#define CORO_MAGIC(cv) \ 360#define CORO_MAGIC(sv,type) \
306 SvMAGIC (cv) \ 361 SvMAGIC (sv) \
307 ? SvMAGIC (cv)->mg_type == PERL_MAGIC_coro \ 362 ? SvMAGIC (sv)->mg_type == type \
308 ? SvMAGIC (cv) \ 363 ? SvMAGIC (sv) \
309 : mg_find ((SV *)cv, PERL_MAGIC_coro) \ 364 : mg_find (sv, type) \
310 : 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)
311 369
312static struct coro * 370static struct coro *
313SvSTATE_ (pTHX_ SV *coro) 371SvSTATE_ (pTHX_ SV *coro)
314{ 372{
315 HV *stash; 373 HV *stash;
316 MAGIC *mg; 374 MAGIC *mg;
317 375
318 if (SvROK (coro)) 376 if (SvROK (coro))
319 coro = SvRV (coro); 377 coro = SvRV (coro);
320 378
321 if (SvTYPE (coro) != SVt_PVHV) 379 if (expect_false (SvTYPE (coro) != SVt_PVHV))
322 croak ("Coro::State object required"); 380 croak ("Coro::State object required");
323 381
324 stash = SvSTASH (coro); 382 stash = SvSTASH (coro);
325 if (stash != coro_stash && stash != coro_state_stash) 383 if (expect_false (stash != coro_stash && stash != coro_state_stash))
326 { 384 {
327 /* very slow, but rare, check */ 385 /* very slow, but rare, check */
328 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State")) 386 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
329 croak ("Coro::State object required"); 387 croak ("Coro::State object required");
330 } 388 }
331 389
332 mg = CORO_MAGIC (coro); 390 mg = CORO_MAGIC_state (coro);
333 return (struct coro *)mg->mg_ptr; 391 return (struct coro *)mg->mg_ptr;
334} 392}
335 393
336#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 394#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
337 395
338/* the next two functions merely cache the padlists */ 396/* the next two functions merely cache the padlists */
339static void 397static void
340get_padlist (pTHX_ CV *cv) 398get_padlist (pTHX_ CV *cv)
341{ 399{
342 MAGIC *mg = CORO_MAGIC (cv); 400 MAGIC *mg = CORO_MAGIC_cv (cv);
343 AV *av; 401 AV *av;
344 402
345 if (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0) 403 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0))
346 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 404 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
347 else 405 else
348 { 406 {
349#if CORO_PREFER_PERL_FUNCTIONS 407#if CORO_PREFER_PERL_FUNCTIONS
350 /* this is probably cleaner, but also slower? */ 408 /* this is probably cleaner, but also slower? */
359} 417}
360 418
361static void 419static void
362put_padlist (pTHX_ CV *cv) 420put_padlist (pTHX_ CV *cv)
363{ 421{
364 MAGIC *mg = CORO_MAGIC (cv); 422 MAGIC *mg = CORO_MAGIC_cv (cv);
365 AV *av; 423 AV *av;
366 424
367 if (!mg) 425 if (expect_false (!mg))
368 { 426 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
369 sv_magic ((SV *)cv, 0, PERL_MAGIC_coro, 0, 0);
370 mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
371 mg->mg_virtual = &vtbl_coro;
372 mg->mg_obj = (SV *)newAV ();
373 }
374 427
375 av = (AV *)mg->mg_obj; 428 av = (AV *)mg->mg_obj;
376 429
377 if (AvFILLp (av) >= AvMAX (av)) 430 if (expect_false (AvFILLp (av) >= AvMAX (av)))
378 av_extend (av, AvMAX (av) + 1); 431 av_extend (av, AvMAX (av) + 1);
379 432
380 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 433 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
381} 434}
382 435
383/** load & save, init *******************************************************/ 436/** load & save, init *******************************************************/
384 437
385static void 438static void
386load_perl (pTHX_ Coro__State c) 439load_perl (pTHX_ Coro__State c)
387{ 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
388#define VAR(name,type) PL_ ## name = c->name; 451 #define VAR(name,type) PL_ ## name = slot->name;
389# include "state.h" 452 # include "state.h"
390#undef VAR 453 #undef VAR
391
392 GvSV (PL_defgv) = c->defsv;
393 GvAV (PL_defgv) = c->defav;
394 GvSV (PL_errgv) = c->errsv;
395 GvSV (irsgv) = c->irssv_sv;
396 454
397 { 455 {
398 dSP; 456 dSP;
457
399 CV *cv; 458 CV *cv;
400 459
401 /* now do the ugly restore mess */ 460 /* now do the ugly restore mess */
402 while ((cv = (CV *)POPs)) 461 while (expect_true (cv = (CV *)POPs))
403 { 462 {
404 put_padlist (aTHX_ cv); /* mark this padlist as available */ 463 put_padlist (aTHX_ cv); /* mark this padlist as available */
405 CvDEPTH (cv) = PTR2IV (POPs); 464 CvDEPTH (cv) = PTR2IV (POPs);
406 CvPADLIST (cv) = (AV *)POPs; 465 CvPADLIST (cv) = (AV *)POPs;
407 } 466 }
426 485
427 XPUSHs (Nullsv); 486 XPUSHs (Nullsv);
428 /* this loop was inspired by pp_caller */ 487 /* this loop was inspired by pp_caller */
429 for (;;) 488 for (;;)
430 { 489 {
431 while (cxix >= 0) 490 while (expect_true (cxix >= 0))
432 { 491 {
433 PERL_CONTEXT *cx = &ccstk[cxix--]; 492 PERL_CONTEXT *cx = &ccstk[cxix--];
434 493
435 if (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT) 494 if (expect_true (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT))
436 { 495 {
437 CV *cv = cx->blk_sub.cv; 496 CV *cv = cx->blk_sub.cv;
438 497
439 if (CvDEPTH (cv)) 498 if (expect_true (CvDEPTH (cv)))
440 { 499 {
441 EXTEND (SP, 3); 500 EXTEND (SP, 3);
442 PUSHs ((SV *)CvPADLIST (cv)); 501 PUSHs ((SV *)CvPADLIST (cv));
443 PUSHs (INT2PTR (SV *, CvDEPTH (cv))); 502 PUSHs (INT2PTR (SV *, CvDEPTH (cv)));
444 PUSHs ((SV *)cv); 503 PUSHs ((SV *)cv);
447 get_padlist (aTHX_ cv); 506 get_padlist (aTHX_ cv);
448 } 507 }
449 } 508 }
450 } 509 }
451 510
452 if (top_si->si_type == PERLSI_MAIN) 511 if (expect_true (top_si->si_type == PERLSI_MAIN))
453 break; 512 break;
454 513
455 top_si = top_si->si_prev; 514 top_si = top_si->si_prev;
456 ccstk = top_si->si_cxstack; 515 ccstk = top_si->si_cxstack;
457 cxix = top_si->si_cxix; 516 cxix = top_si->si_cxix;
458 } 517 }
459 518
460 PUTBACK; 519 PUTBACK;
461 } 520 }
462 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
463 c->defav = GvAV (PL_defgv); 539 slot->defav = GvAV (PL_defgv);
464 c->defsv = DEFSV; 540 slot->defsv = DEFSV;
465 c->errsv = ERRSV; 541 slot->errsv = ERRSV;
466 c->irssv_sv = GvSV (irsgv); 542 slot->irsgv = GvSV (irsgv);
467 543
468#define VAR(name,type)c->name = PL_ ## name; 544 #define VAR(name,type) slot->name = PL_ ## name;
469# include "state.h" 545 # include "state.h"
470#undef VAR 546 #undef VAR
547 }
471} 548}
472 549
473/* 550/*
474 * allocate various perl stacks. This is an exact copy 551 * allocate various perl stacks. This is an exact copy
475 * of perl.c:init_stacks, except that it uses less memory 552 * of perl.c:init_stacks, except that it uses less memory
480# define coro_init_stacks init_stacks 557# define coro_init_stacks init_stacks
481#else 558#else
482static void 559static void
483coro_init_stacks (pTHX) 560coro_init_stacks (pTHX)
484{ 561{
485 PL_curstackinfo = new_stackinfo(64, 6); 562 PL_curstackinfo = new_stackinfo(32, 8);
486 PL_curstackinfo->si_type = PERLSI_MAIN; 563 PL_curstackinfo->si_type = PERLSI_MAIN;
487 PL_curstack = PL_curstackinfo->si_stack; 564 PL_curstack = PL_curstackinfo->si_stack;
488 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 565 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
489 566
490 PL_stack_base = AvARRAY(PL_curstack); 567 PL_stack_base = AvARRAY(PL_curstack);
491 PL_stack_sp = PL_stack_base; 568 PL_stack_sp = PL_stack_base;
492 PL_stack_max = PL_stack_base + AvMAX(PL_curstack); 569 PL_stack_max = PL_stack_base + AvMAX(PL_curstack);
493 570
494 New(50,PL_tmps_stack,64,SV*); 571 New(50,PL_tmps_stack,32,SV*);
495 PL_tmps_floor = -1; 572 PL_tmps_floor = -1;
496 PL_tmps_ix = -1; 573 PL_tmps_ix = -1;
497 PL_tmps_max = 64; 574 PL_tmps_max = 32;
498 575
499 New(54,PL_markstack,16,I32); 576 New(54,PL_markstack,16,I32);
500 PL_markstack_ptr = PL_markstack; 577 PL_markstack_ptr = PL_markstack;
501 PL_markstack_max = PL_markstack + 16; 578 PL_markstack_max = PL_markstack + 16;
502 579
503#ifdef SET_MARK_OFFSET 580#ifdef SET_MARK_OFFSET
504 SET_MARK_OFFSET; 581 SET_MARK_OFFSET;
505#endif 582#endif
506 583
507 New(54,PL_scopestack,16,I32); 584 New(54,PL_scopestack,8,I32);
508 PL_scopestack_ix = 0; 585 PL_scopestack_ix = 0;
509 PL_scopestack_max = 16; 586 PL_scopestack_max = 8;
510 587
511 New(54,PL_savestack,64,ANY); 588 New(54,PL_savestack,24,ANY);
512 PL_savestack_ix = 0; 589 PL_savestack_ix = 0;
513 PL_savestack_max = 64; 590 PL_savestack_max = 24;
514 591
515#if !PERL_VERSION_ATLEAST (5,9,0) 592#if !PERL_VERSION_ATLEAST (5,9,0)
516 New(54,PL_retstack,4,OP*); 593 New(54,PL_retstack,4,OP*);
517 PL_retstack_ix = 0; 594 PL_retstack_ix = 0;
518 PL_retstack_max = 4; 595 PL_retstack_max = 4;
555{ 632{
556 size_t rss = sizeof (*coro); 633 size_t rss = sizeof (*coro);
557 634
558 if (coro->mainstack) 635 if (coro->mainstack)
559 { 636 {
637 perl_slots tmp_slot;
638 perl_slots *slot;
639
560 if (coro->flags & CF_RUNNING) 640 if (coro->flags & CF_RUNNING)
561 { 641 {
642 slot = &tmp_slot;
643
562 #define VAR(name,type)coro->name = PL_ ## name; 644 #define VAR(name,type) slot->name = PL_ ## name;
563 # include "state.h" 645 # include "state.h"
564 #undef VAR 646 #undef VAR
565 } 647 }
648 else
649 slot = coro->slot;
566 650
567 rss += sizeof (coro->curstackinfo); 651 rss += sizeof (slot->curstackinfo);
568 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvFILL (coro->curstackinfo->si_stack)) * sizeof (SV *);
569 rss += (coro->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT); 652 rss += (slot->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT);
570 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 *);
571 rss += coro->tmps_max * sizeof (SV *); 654 rss += slot->tmps_max * sizeof (SV *);
572 rss += (coro->markstack_max - coro->markstack_ptr) * sizeof (I32); 655 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32);
573 rss += coro->scopestack_max * sizeof (I32); 656 rss += slot->scopestack_max * sizeof (I32);
574 rss += coro->savestack_max * sizeof (ANY); 657 rss += slot->savestack_max * sizeof (ANY);
575 658
576#if !PERL_VERSION_ATLEAST (5,9,0) 659#if !PERL_VERSION_ATLEAST (5,9,0)
577 rss += coro->retstack_max * sizeof (OP *); 660 rss += slot->retstack_max * sizeof (OP *);
578#endif 661#endif
579 } 662 }
580 663
581 return rss; 664 return rss;
582} 665}
583 666
584/** 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
585 696
586static void 697static void
587coro_setup (pTHX_ struct coro *coro) 698coro_setup (pTHX_ struct coro *coro)
588{ 699{
589 /* 700 /*
594 PL_runops = RUNOPS_DEFAULT; 705 PL_runops = RUNOPS_DEFAULT;
595 PL_curcop = &PL_compiling; 706 PL_curcop = &PL_compiling;
596 PL_in_eval = EVAL_NULL; 707 PL_in_eval = EVAL_NULL;
597 PL_comppad = 0; 708 PL_comppad = 0;
598 PL_curpm = 0; 709 PL_curpm = 0;
710 PL_curpad = 0;
599 PL_localizing = 0; 711 PL_localizing = 0;
600 PL_dirty = 0; 712 PL_dirty = 0;
601 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);
602 723
603 GvSV (PL_defgv) = NEWSV (0, 0); 724 GvSV (PL_defgv) = newSV (0);
604 GvAV (PL_defgv) = coro->args; coro->args = 0; 725 GvAV (PL_defgv) = coro->args; coro->args = 0;
605 GvSV (PL_errgv) = NEWSV (0, 0); 726 GvSV (PL_errgv) = newSV (0);
606 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);
607 PL_rs = newSVsv (GvSV (irsgv)); 728 PL_rs = newSVsv (GvSV (irsgv));
608 729 PL_defoutgv = (GV *)SvREFCNT_inc (stdoutgv);
609 SvREFCNT_inc (PL_defoutgv);
610 730
611 { 731 {
612 dSP; 732 dSP;
613 LOGOP myop; 733 LOGOP myop;
614 734
615 Zero (&myop, 1, LOGOP); 735 Zero (&myop, 1, LOGOP);
616 myop.op_next = Nullop; 736 myop.op_next = Nullop;
617 myop.op_flags = OPf_WANT_VOID; 737 myop.op_flags = OPf_WANT_VOID;
618 738
619 PUSHMARK (SP); 739 PUSHMARK (SP);
620 XPUSHs (av_shift (GvAV (PL_defgv))); 740 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv))));
621 PUTBACK; 741 PUTBACK;
622 PL_op = (OP *)&myop; 742 PL_op = (OP *)&myop;
623 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 743 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
624 SPAGAIN; 744 SPAGAIN;
625 } 745 }
626 746
627 ENTER; /* necessary e.g. for dounwind */ 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;
628} 753}
629 754
630static void 755static void
631coro_destroy (pTHX_ struct coro *coro) 756coro_destroy (pTHX_ struct coro *coro)
632{ 757{
652 SvREFCNT_dec (GvSV (PL_errgv)); 777 SvREFCNT_dec (GvSV (PL_errgv));
653 SvREFCNT_dec (PL_defoutgv); 778 SvREFCNT_dec (PL_defoutgv);
654 SvREFCNT_dec (PL_rs); 779 SvREFCNT_dec (PL_rs);
655 SvREFCNT_dec (GvSV (irsgv)); 780 SvREFCNT_dec (GvSV (irsgv));
656 781
782 SvREFCNT_dec (PL_diehook);
783 SvREFCNT_dec (PL_warnhook);
784
657 SvREFCNT_dec (coro->saved_deffh); 785 SvREFCNT_dec (coro->saved_deffh);
658 //SvREFCNT_dec (coro->throw); 786 SvREFCNT_dec (coro->throw);
659 787
660 coro_destroy_stacks (aTHX); 788 coro_destroy_stacks (aTHX);
661} 789}
662 790
663static void 791static void
664free_coro_mortal (pTHX) 792free_coro_mortal (pTHX)
665{ 793{
666 if (coro_mortal) 794 if (expect_true (coro_mortal))
667 { 795 {
668 SvREFCNT_dec (coro_mortal); 796 SvREFCNT_dec (coro_mortal);
669 coro_mortal = 0; 797 coro_mortal = 0;
670 } 798 }
671} 799}
700 bot = PL_stack_base + cx->blk_oldsp + 1; 828 bot = PL_stack_base + cx->blk_oldsp + 1;
701 top = cx->blk_gimme == G_ARRAY ? SP + 1 829 top = cx->blk_gimme == G_ARRAY ? SP + 1
702 : cx->blk_gimme == G_SCALAR ? bot + 1 830 : cx->blk_gimme == G_SCALAR ? bot + 1
703 : bot; 831 : bot;
704 832
833 av_extend (av, top - bot);
705 while (bot < top) 834 while (bot < top)
706 av_push (av, SvREFCNT_inc (*bot++)); 835 av_push (av, SvREFCNT_inc (*bot++));
707 836
708 PL_runops = RUNOPS_DEFAULT; 837 PL_runops = RUNOPS_DEFAULT;
709 ENTER; 838 ENTER;
795 924
796/* 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 */
797/* _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 */
798/* during execution of a perl program */ 927/* during execution of a perl program */
799static void NOINLINE 928static void NOINLINE
800prepare_cctx (pTHX_ coro_cctx *cctx) 929cctx_prepare (pTHX_ coro_cctx *cctx)
801{ 930{
802 dSP; 931 dSP;
803 LOGOP myop; 932 LOGOP myop;
804 933
805 PL_top_env = &PL_start_env; 934 PL_top_env = &PL_start_env;
823 952
824/* 953/*
825 * this is a _very_ stripped down perl interpreter ;) 954 * this is a _very_ stripped down perl interpreter ;)
826 */ 955 */
827static void 956static void
828coro_run (void *arg) 957cctx_run (void *arg)
829{ 958{
830 dTHX; 959 dTHX;
831 960
832 /* coro_run is the alternative tail of transfer(), so unlock here. */ 961 /* cctx_run is the alternative tail of transfer(), so unlock here. */
833 UNLOCK; 962 UNLOCK;
834 963
835 /* we now skip the entersub that lead to transfer() */ 964 /* we now skip the entersub that lead to transfer() */
836 PL_op = PL_op->op_next; 965 PL_op = PL_op->op_next;
837 966
838 /* inject a fake subroutine call to cctx_init */ 967 /* inject a fake subroutine call to cctx_init */
839 prepare_cctx (aTHX_ (coro_cctx *)arg); 968 cctx_prepare (aTHX_ (coro_cctx *)arg);
840 969
841 /* 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 */
842 PL_restartop = PL_op; 971 PL_restartop = PL_op;
843 perl_run (PL_curinterp); 972 perl_run (PL_curinterp);
844 973
863 ++cctx_count; 992 ++cctx_count;
864 993
865 Newz (0, cctx, 1, coro_cctx); 994 Newz (0, cctx, 1, coro_cctx);
866 995
867#if HAVE_MMAP 996#if HAVE_MMAP
868
869 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;
870 /* mmap supposedly does allocate-on-write for us */ 998 /* mmap supposedly does allocate-on-write for us */
871 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);
872 1000
873 if (cctx->sptr != (void *)-1) 1001 if (cctx->sptr != (void *)-1)
894 stack_start = cctx->sptr; 1022 stack_start = cctx->sptr;
895 stack_size = cctx->ssize; 1023 stack_size = cctx->ssize;
896 } 1024 }
897 1025
898 REGISTER_STACK (cctx, (char *)stack_start, (char *)stack_start + stack_size); 1026 REGISTER_STACK (cctx, (char *)stack_start, (char *)stack_start + stack_size);
899 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);
900 1028
901 return cctx; 1029 return cctx;
902} 1030}
903 1031
904static void 1032static void
921 Safefree (cctx->sptr); 1049 Safefree (cctx->sptr);
922 1050
923 Safefree (cctx); 1051 Safefree (cctx);
924} 1052}
925 1053
1054/* wether this cctx should be destructed */
1055#define CCTX_EXPIRED(cctx) ((cctx)->ssize < coro_stacksize || ((cctx)->flags & CC_NOREUSE))
1056
926static coro_cctx * 1057static coro_cctx *
927cctx_get (pTHX) 1058cctx_get (pTHX)
928{ 1059{
929 while (cctx_first) 1060 while (expect_true (cctx_first))
930 { 1061 {
931 coro_cctx *cctx = cctx_first; 1062 coro_cctx *cctx = cctx_first;
932 cctx_first = cctx->next; 1063 cctx_first = cctx->next;
933 --cctx_idle; 1064 --cctx_idle;
934 1065
935 if (cctx->ssize >= coro_stacksize && !(cctx->flags & CC_NOREUSE)) 1066 if (expect_true (!CCTX_EXPIRED (cctx)))
936 return cctx; 1067 return cctx;
937 1068
938 cctx_destroy (cctx); 1069 cctx_destroy (cctx);
939 } 1070 }
940 1071
943 1074
944static void 1075static void
945cctx_put (coro_cctx *cctx) 1076cctx_put (coro_cctx *cctx)
946{ 1077{
947 /* free another cctx if overlimit */ 1078 /* free another cctx if overlimit */
948 if (cctx_idle >= MAX_IDLE_CCTX) 1079 if (expect_false (cctx_idle >= MAX_IDLE_CCTX))
949 { 1080 {
950 coro_cctx *first = cctx_first; 1081 coro_cctx *first = cctx_first;
951 cctx_first = first->next; 1082 cctx_first = first->next;
952 --cctx_idle; 1083 --cctx_idle;
953 1084
959 cctx_first = cctx; 1090 cctx_first = cctx;
960} 1091}
961 1092
962/** coroutine switching *****************************************************/ 1093/** coroutine switching *****************************************************/
963 1094
964static void NOINLINE 1095static void
965transfer_check (pTHX_ struct coro *prev, struct coro *next) 1096transfer_check (pTHX_ struct coro *prev, struct coro *next)
966{ 1097{
967 if (prev != next) 1098 if (expect_true (prev != next))
968 { 1099 {
969 if (!(prev->flags & (CF_RUNNING | CF_NEW))) 1100 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
970 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");
971 1102
972 if (next->flags & CF_RUNNING) 1103 if (expect_false (next->flags & CF_RUNNING))
973 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");
974 1105
975 if (next->flags & CF_DESTROYED) 1106 if (expect_false (next->flags & CF_DESTROYED))
976 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");
977 1108
1109 if (
1110#if PERL_VERSION_ATLEAST (5,9,0)
1111 expect_false (PL_parser)
1112#else
978 if (PL_lex_state != LEX_NOTPARSING) 1113 expect_false (PL_lex_state != LEX_NOTPARSING)
1114#endif
1115 )
979 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");
980 } 1117 }
981} 1118}
982 1119
983/* always use the TRANSFER macro */ 1120/* always use the TRANSFER macro */
984static void NOINLINE 1121static void NOINLINE
985transfer (pTHX_ struct coro *prev, struct coro *next) 1122transfer (pTHX_ struct coro *prev, struct coro *next)
986{ 1123{
987 dSTACKLEVEL; 1124 dSTACKLEVEL;
1125 static volatile int has_throw;
988 1126
989 /* sometimes transfer is only called to set idle_sp */ 1127 /* sometimes transfer is only called to set idle_sp */
990 if (!next) 1128 if (expect_false (!next))
991 { 1129 {
992 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1130 ((coro_cctx *)prev)->idle_sp = STACKLEVEL;
993 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 */
994 } 1132 }
995 else if (prev != next) 1133 else if (expect_true (prev != next))
996 { 1134 {
997 coro_cctx *prev__cctx; 1135 coro_cctx *prev__cctx;
998 1136
999 if (prev->flags & CF_NEW) 1137 if (expect_false (prev->flags & CF_NEW))
1000 { 1138 {
1001 /* create a new empty context */ 1139 /* create a new empty context */
1002 Newz (0, prev->cctx, 1, coro_cctx); 1140 Newz (0, prev->cctx, 1, coro_cctx);
1003 prev->flags &= ~CF_NEW; 1141 prev->flags &= ~CF_NEW;
1004 prev->flags |= CF_RUNNING; 1142 prev->flags |= CF_RUNNING;
1007 prev->flags &= ~CF_RUNNING; 1145 prev->flags &= ~CF_RUNNING;
1008 next->flags |= CF_RUNNING; 1146 next->flags |= CF_RUNNING;
1009 1147
1010 LOCK; 1148 LOCK;
1011 1149
1150 /* first get rid of the old state */
1151 save_perl (aTHX_ prev);
1152
1012 if (next->flags & CF_NEW) 1153 if (expect_false (next->flags & CF_NEW))
1013 { 1154 {
1014 /* need to start coroutine */ 1155 /* need to start coroutine */
1015 next->flags &= ~CF_NEW; 1156 next->flags &= ~CF_NEW;
1016 /* first get rid of the old state */
1017 save_perl (aTHX_ prev);
1018 /* setup coroutine call */ 1157 /* setup coroutine call */
1019 coro_setup (aTHX_ next); 1158 coro_setup (aTHX_ next);
1020 } 1159 }
1021 else 1160 else
1022 {
1023 /* coroutine already started */
1024 save_perl (aTHX_ prev);
1025 load_perl (aTHX_ next); 1161 load_perl (aTHX_ next);
1026 }
1027 1162
1028 prev__cctx = prev->cctx; 1163 prev__cctx = prev->cctx;
1029 1164
1030 /* possibly "free" the cctx */ 1165 /* possibly "free" the cctx */
1031 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)))
1032 { 1167 {
1033 /* 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 */
1034 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));
1035 1170
1036 prev->cctx = 0; 1171 prev->cctx = 0;
1037 1172
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 */
1175 if (expect_false (CCTX_EXPIRED (prev__cctx)))
1176 if (!next->cctx)
1177 next->cctx = cctx_get (aTHX);
1178
1038 cctx_put (prev__cctx); 1179 cctx_put (prev__cctx);
1039 } 1180 }
1040 1181
1041 ++next->usecount; 1182 ++next->usecount;
1042 1183
1043 if (!next->cctx) 1184 if (expect_true (!next->cctx))
1044 next->cctx = cctx_get (aTHX); 1185 next->cctx = cctx_get (aTHX);
1045 1186
1187 has_throw = !!next->throw;
1188
1046 if (prev__cctx != next->cctx) 1189 if (expect_false (prev__cctx != next->cctx))
1047 { 1190 {
1048 prev__cctx->top_env = PL_top_env; 1191 prev__cctx->top_env = PL_top_env;
1049 PL_top_env = next->cctx->top_env; 1192 PL_top_env = next->cctx->top_env;
1050 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1193 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx);
1051 } 1194 }
1052 1195
1053 free_coro_mortal (aTHX); 1196 free_coro_mortal (aTHX);
1054 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 }
1055 } 1211 }
1056} 1212}
1057 1213
1058struct transfer_args 1214struct transfer_args
1059{ 1215{
1094 save_perl (aTHX_ &temp); 1250 save_perl (aTHX_ &temp);
1095 load_perl (aTHX_ coro); 1251 load_perl (aTHX_ coro);
1096 1252
1097 coro_destroy (aTHX_ coro); 1253 coro_destroy (aTHX_ coro);
1098 1254
1099 load_perl (aTHX_ &temp); /* this will get rid of defsv etc.. */ 1255 load_perl (aTHX_ &temp);
1100 1256
1101 coro->mainstack = 0; 1257 coro->slot = 0;
1102 } 1258 }
1103 1259
1104 cctx_destroy (coro->cctx); 1260 cctx_destroy (coro->cctx);
1105 SvREFCNT_dec (coro->args); 1261 SvREFCNT_dec (coro->args);
1106 1262
1231 { 1387 {
1232 LOCK; 1388 LOCK;
1233 next_sv = coro_deq (aTHX_ PRIO_MIN); 1389 next_sv = coro_deq (aTHX_ PRIO_MIN);
1234 1390
1235 /* nothing to schedule: call the idle handler */ 1391 /* nothing to schedule: call the idle handler */
1236 if (!next_sv) 1392 if (expect_false (!next_sv))
1237 { 1393 {
1238 dSP; 1394 dSP;
1239 UNLOCK; 1395 UNLOCK;
1240 1396
1241 ENTER; 1397 ENTER;
1251 } 1407 }
1252 1408
1253 ta->next = SvSTATE (next_sv); 1409 ta->next = SvSTATE (next_sv);
1254 1410
1255 /* cannot transfer to destroyed coros, skip and look for next */ 1411 /* cannot transfer to destroyed coros, skip and look for next */
1256 if (ta->next->flags & CF_DESTROYED) 1412 if (expect_false (ta->next->flags & CF_DESTROYED))
1257 { 1413 {
1258 UNLOCK; 1414 UNLOCK;
1259 SvREFCNT_dec (next_sv); 1415 SvREFCNT_dec (next_sv);
1260 /* coro_nready is already taken care of by destroy */ 1416 /* coro_nready is already taken care of by destroy */
1261 continue; 1417 continue;
1317 dTHX; 1473 dTHX;
1318 struct transfer_args ta; 1474 struct transfer_args ta;
1319 1475
1320 prepare_cede (aTHX_ &ta); 1476 prepare_cede (aTHX_ &ta);
1321 1477
1322 if (ta.prev != ta.next) 1478 if (expect_true (ta.prev != ta.next))
1323 { 1479 {
1324 TRANSFER (ta); 1480 TRANSFER (ta);
1325 return 1; 1481 return 1;
1326 } 1482 }
1327 else 1483 else
1363 coro->cctx->flags &= ~(CC_TRACE | CC_TRACE_ALL); 1519 coro->cctx->flags &= ~(CC_TRACE | CC_TRACE_ALL);
1364 1520
1365 if (coro->flags & CF_RUNNING) 1521 if (coro->flags & CF_RUNNING)
1366 PL_runops = RUNOPS_DEFAULT; 1522 PL_runops = RUNOPS_DEFAULT;
1367 else 1523 else
1368 coro->runops = RUNOPS_DEFAULT; 1524 coro->slot->runops = RUNOPS_DEFAULT;
1369 } 1525 }
1370} 1526}
1371 1527
1372MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 1528MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
1373 1529
1378#ifdef USE_ITHREADS 1534#ifdef USE_ITHREADS
1379 MUTEX_INIT (&coro_mutex); 1535 MUTEX_INIT (&coro_mutex);
1380#endif 1536#endif
1381 BOOT_PAGESIZE; 1537 BOOT_PAGESIZE;
1382 1538
1383 irsgv = gv_fetchpv ("/", 1, SVt_PV); 1539 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
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));
1384 1548
1385 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 1549 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
1386 1550
1387 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE)); 1551 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
1388 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB)); 1552 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));
1394 1558
1395 while (main_top_env->je_prev) 1559 while (main_top_env->je_prev)
1396 main_top_env = main_top_env->je_prev; 1560 main_top_env = main_top_env->je_prev;
1397 1561
1398 coroapi.ver = CORO_API_VERSION; 1562 coroapi.ver = CORO_API_VERSION;
1563 coroapi.rev = CORO_API_REVISION;
1399 coroapi.transfer = api_transfer; 1564 coroapi.transfer = api_transfer;
1400 1565
1401 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 1566 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL));
1402} 1567}
1403 1568
1404SV * 1569SV *
1405new (char *klass, ...) 1570new (char *klass, ...)
1406 CODE: 1571 CODE:
1407{ 1572{
1408 struct coro *coro; 1573 struct coro *coro;
1574 MAGIC *mg;
1409 HV *hv; 1575 HV *hv;
1410 int i; 1576 int i;
1411 1577
1412 Newz (0, coro, 1, struct coro); 1578 Newz (0, coro, 1, struct coro);
1413 coro->args = newAV (); 1579 coro->args = newAV ();
1416 if (coro_first) coro_first->prev = coro; 1582 if (coro_first) coro_first->prev = coro;
1417 coro->next = coro_first; 1583 coro->next = coro_first;
1418 coro_first = coro; 1584 coro_first = coro;
1419 1585
1420 coro->hv = hv = newHV (); 1586 coro->hv = hv = newHV ();
1421 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;
1422 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 1589 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
1423 1590
1591 av_extend (coro->args, items - 1);
1424 for (i = 1; i < items; i++) 1592 for (i = 1; i < items; i++)
1425 av_push (coro->args, newSVsv (ST (i))); 1593 av_push (coro->args, newSVsv (ST (i)));
1426} 1594}
1427 OUTPUT: 1595 OUTPUT:
1428 RETVAL 1596 RETVAL
1469 1637
1470 break; 1638 break;
1471 } 1639 }
1472 1640
1473 BARRIER; 1641 BARRIER;
1642 PUTBACK;
1474 TRANSFER (ta); 1643 TRANSFER (ta);
1475 1644 SPAGAIN; /* might be the sp of a different coroutine now */
1476 if (GIMME_V != G_VOID && ta.next != ta.prev) 1645 /* be extra careful not to ever do anything after TRANSFER */
1477 XSRETURN_YES;
1478} 1646}
1479 1647
1480bool 1648bool
1481_destroy (SV *coro_sv) 1649_destroy (SV *coro_sv)
1482 CODE: 1650 CODE:
1531 CODE: 1699 CODE:
1532{ 1700{
1533 if (coro->mainstack) 1701 if (coro->mainstack)
1534 { 1702 {
1535 struct coro temp; 1703 struct coro temp;
1536 Zero (&temp, 1, struct coro);
1537 1704
1538 if (!(coro->flags & CF_RUNNING)) 1705 if (!(coro->flags & CF_RUNNING))
1539 { 1706 {
1540 save_perl (aTHX_ &temp); 1707 save_perl (aTHX_ &temp);
1541 load_perl (aTHX_ coro); 1708 load_perl (aTHX_ coro);
1543 1710
1544 { 1711 {
1545 dSP; 1712 dSP;
1546 ENTER; 1713 ENTER;
1547 SAVETMPS; 1714 SAVETMPS;
1715 PUTBACK;
1716 PUSHSTACK;
1548 PUSHMARK (SP); 1717 PUSHMARK (SP);
1549 PUTBACK; 1718
1550 if (ix) 1719 if (ix)
1551 eval_sv (coderef, 0); 1720 eval_sv (coderef, 0);
1552 else 1721 else
1553 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;
1554 SPAGAIN; 1725 SPAGAIN;
1555 FREETMPS; 1726 FREETMPS;
1556 LEAVE; 1727 LEAVE;
1557 PUTBACK; 1728 PUTBACK;
1558 } 1729 }
1616 1787
1617BOOT: 1788BOOT:
1618{ 1789{
1619 int i; 1790 int i;
1620 1791
1621 sv_pool_rss = get_sv ("Coro::POOL_RSS" , TRUE); 1792 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
1622 sv_pool_size = get_sv ("Coro::POOL_SIZE" , TRUE); 1793 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
1623 av_async_pool = get_av ("Coro::async_pool", TRUE); 1794 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
1624 1795
1625 coro_current = get_sv ("Coro::current", FALSE); 1796 coro_current = coro_get_sv (aTHX_ "Coro::current", FALSE);
1626 SvREADONLY_on (coro_current); 1797 SvREADONLY_on (coro_current);
1627 1798
1628 coro_stash = gv_stashpv ("Coro", TRUE); 1799 coro_stash = gv_stashpv ("Coro", TRUE);
1629 1800
1630 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 1801 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
1631 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 1802 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH));
1632 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 1803 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL));
1633 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 1804 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW));
1636 1807
1637 for (i = PRIO_MAX - PRIO_MIN + 1; i--; ) 1808 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
1638 coro_ready[i] = newAV (); 1809 coro_ready[i] = newAV ();
1639 1810
1640 { 1811 {
1641 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 */
1642 1814
1643 coroapi.schedule = api_schedule; 1815 coroapi.schedule = api_schedule;
1644 coroapi.cede = api_cede; 1816 coroapi.cede = api_cede;
1645 coroapi.cede_notself = api_cede_notself; 1817 coroapi.cede_notself = api_cede_notself;
1646 coroapi.ready = api_ready; 1818 coroapi.ready = api_ready;
1697 CODE: 1869 CODE:
1698 RETVAL = coro_nready; 1870 RETVAL = coro_nready;
1699 OUTPUT: 1871 OUTPUT:
1700 RETVAL 1872 RETVAL
1701 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
1702# for async_pool speedup 1881# for async_pool speedup
1703void 1882void
1704_pool_1 (SV *cb) 1883_pool_1 (SV *cb)
1705 CODE: 1884 CODE:
1706{ 1885{
1710 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0); 1889 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
1711 AV *invoke_av; 1890 AV *invoke_av;
1712 int i, len; 1891 int i, len;
1713 1892
1714 if (!invoke) 1893 if (!invoke)
1715 croak ("\3terminate\2\n"); 1894 croak ("\3async_pool terminate\2\n");
1716 1895
1717 SvREFCNT_dec (coro->saved_deffh); 1896 SvREFCNT_dec (coro->saved_deffh);
1718 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv); 1897 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv);
1719 1898
1720 hv_store (hv, "desc", sizeof ("desc") - 1, 1899 hv_store (hv, "desc", sizeof ("desc") - 1,
1746 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 1925 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1747 coro->saved_deffh = 0; 1926 coro->saved_deffh = 0;
1748 1927
1749 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss) 1928 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss)
1750 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 1929 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1751 croak ("\3terminate\2\n"); 1930 croak ("\3async_pool terminate\2\n");
1752 1931
1753 av_clear (GvAV (PL_defgv)); 1932 av_clear (GvAV (PL_defgv));
1754 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1, 1933 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1,
1755 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0); 1934 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
1756 1935

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines