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.178 by root, Wed Oct 3 01:48:06 2007 UTC vs.
Revision 1.230 by root, Mon Apr 14 11:28:59 2008 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
70# ifndef IS_PADCONST 72# ifndef IS_PADCONST
71# define IS_PADCONST(v) 0 73# define IS_PADCONST(v) 0
72# endif 74# endif
73#endif 75#endif
74 76
77/* 5.8.8 */
78#ifndef GV_NOTQUAL
79# define GV_NOTQUAL 0
80#endif
81#ifndef newSV
82# define newSV(l) NEWSV(0,l)
83#endif
84
85/* 5.11 */
86#ifndef CxHASARGS
87# define CxHASARGS(cx) (cx)->blk_sub.hasargs
88#endif
89
75/* 5.8.7 */ 90/* 5.8.7 */
76#ifndef SvRV_set 91#ifndef SvRV_set
77# define SvRV_set(s,v) SvRV(s) = (v) 92# define SvRV_set(s,v) SvRV(s) = (v)
78#endif 93#endif
79 94
98#define IN_DESTRUCT (PL_main_cv == Nullcv) 113#define IN_DESTRUCT (PL_main_cv == Nullcv)
99 114
100#if __GNUC__ >= 3 115#if __GNUC__ >= 3
101# define attribute(x) __attribute__(x) 116# define attribute(x) __attribute__(x)
102# define BARRIER __asm__ __volatile__ ("" : : : "memory") 117# define BARRIER __asm__ __volatile__ ("" : : : "memory")
118# define expect(expr,value) __builtin_expect ((expr),(value))
103#else 119#else
104# define attribute(x) 120# define attribute(x)
105# define BARRIER 121# define BARRIER
122# define expect(expr,value) (expr)
106#endif 123#endif
124
125#define expect_false(expr) expect ((expr) != 0, 0)
126#define expect_true(expr) expect ((expr) != 0, 1)
107 127
108#define NOINLINE attribute ((noinline)) 128#define NOINLINE attribute ((noinline))
109 129
110#include "CoroAPI.h" 130#include "CoroAPI.h"
111 131
130static size_t coro_stacksize = CORO_STACKSIZE; 150static size_t coro_stacksize = CORO_STACKSIZE;
131static struct CoroAPI coroapi; 151static struct CoroAPI coroapi;
132static AV *main_mainstack; /* used to differentiate between $main and others */ 152static AV *main_mainstack; /* used to differentiate between $main and others */
133static JMPENV *main_top_env; 153static JMPENV *main_top_env;
134static HV *coro_state_stash, *coro_stash; 154static HV *coro_state_stash, *coro_stash;
135static SV *coro_mortal; /* will be freed after next transfer */ 155static volatile SV *coro_mortal; /* will be freed after next transfer */
136 156
137static GV *irsgv; /* $/ */ 157static GV *irsgv; /* $/ */
158static GV *stdoutgv; /* *STDOUT */
159static SV *rv_diehook;
160static SV *rv_warnhook;
161static HV *hv_sig; /* %SIG */
138 162
139/* async_pool helper stuff */ 163/* async_pool helper stuff */
140static SV *sv_pool_rss; 164static SV *sv_pool_rss;
141static SV *sv_pool_size; 165static SV *sv_pool_size;
142static AV *av_async_pool; 166static AV *av_async_pool;
178 CF_READY = 0x0002, /* coroutine is ready */ 202 CF_READY = 0x0002, /* coroutine is ready */
179 CF_NEW = 0x0004, /* has never been switched to */ 203 CF_NEW = 0x0004, /* has never been switched to */
180 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 204 CF_DESTROYED = 0x0008, /* coroutine data has been freed */
181}; 205};
182 206
207/* the structure where most of the perl state is stored, overlaid on the cxstack */
208typedef struct {
209 SV *defsv;
210 AV *defav;
211 SV *errsv;
212 SV *irsgv;
213#define VAR(name,type) type name;
214# include "state.h"
215#undef VAR
216} perl_slots;
217
218#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
219
183/* this is a structure representing a perl-level coroutine */ 220/* this is a structure representing a perl-level coroutine */
184struct coro { 221struct coro {
185 /* the c coroutine allocated to this perl coroutine, if any */ 222 /* the c coroutine allocated to this perl coroutine, if any */
186 coro_cctx *cctx; 223 coro_cctx *cctx;
187 224
225 /* process data */
226 AV *mainstack;
227 perl_slots *slot; /* basically the saved sp */
228
188 /* data associated with this coroutine (initial args) */ 229 AV *args; /* data associated with this coroutine (initial args) */
189 AV *args; 230 int refcnt; /* coroutines are refcounted, yes */
190 int refcnt;
191 int flags; /* CF_ flags */ 231 int flags; /* CF_ flags */
192 232 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 IO *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 233
205 /* statistics */ 234 /* statistics */
206 int usecount; /* number of switches to this coro */ 235 int usecount; /* number of transfers to this coro */
207 236
208 /* coro process data */ 237 /* coro process data */
209 int prio; 238 int prio;
239 SV *throw; /* exception to be thrown */
240
241 /* async_pool */
242 SV *saved_deffh;
210 243
211 /* linked list */ 244 /* linked list */
212 struct coro *next, *prev; 245 struct coro *next, *prev;
213 HV *hv; /* the perl hash associated with this coro, if any */
214}; 246};
215 247
216typedef struct coro *Coro__State; 248typedef struct coro *Coro__State;
217typedef struct coro *Coro__State_or_hashref; 249typedef struct coro *Coro__State_or_hashref;
218 250
231static int coro_nready; 263static int coro_nready;
232static struct coro *coro_first; 264static struct coro *coro_first;
233 265
234/** lowlevel stuff **********************************************************/ 266/** lowlevel stuff **********************************************************/
235 267
268static SV *
269coro_get_sv (pTHX_ const char *name, int create)
270{
271#if PERL_VERSION_ATLEAST (5,10,0)
272 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
273 get_sv (name, create);
274#endif
275 return get_sv (name, create);
276}
277
278static AV *
279coro_get_av (pTHX_ const char *name, int create)
280{
281#if PERL_VERSION_ATLEAST (5,10,0)
282 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
283 get_av (name, create);
284#endif
285 return get_av (name, create);
286}
287
288static HV *
289coro_get_hv (pTHX_ const char *name, int create)
290{
291#if PERL_VERSION_ATLEAST (5,10,0)
292 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
293 get_hv (name, create);
294#endif
295 return get_hv (name, create);
296}
297
236static AV * 298static AV *
237coro_clone_padlist (pTHX_ CV *cv) 299coro_clone_padlist (pTHX_ CV *cv)
238{ 300{
239 AV *padlist = CvPADLIST (cv); 301 AV *padlist = CvPADLIST (cv);
240 AV *newpadlist, *newpad; 302 AV *newpadlist, *newpad;
241 303
242 newpadlist = newAV (); 304 newpadlist = newAV ();
243 AvREAL_off (newpadlist); 305 AvREAL_off (newpadlist);
244#if PERL_VERSION_ATLEAST (5,9,0) 306#if PERL_VERSION_ATLEAST (5,10,0)
245 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1); 307 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1);
246#else 308#else
247 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 309 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
248#endif 310#endif
249 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 311 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
287 349
288 /* casting is fun. */ 350 /* casting is fun. */
289 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 351 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
290 free_padlist (aTHX_ padlist); 352 free_padlist (aTHX_ padlist);
291 353
292 SvREFCNT_dec (av);
293
294 return 0; 354 return 0;
295} 355}
296 356
297#define PERL_MAGIC_coro PERL_MAGIC_ext 357#define CORO_MAGIC_type_cv PERL_MAGIC_ext
358#define CORO_MAGIC_type_state PERL_MAGIC_ext
298 359
299static MGVTBL vtbl_coro = {0, 0, 0, 0, coro_cv_free}; 360static MGVTBL coro_cv_vtbl = {
361 0, 0, 0, 0,
362 coro_cv_free
363};
300 364
301#define CORO_MAGIC(cv) \ 365#define CORO_MAGIC(sv,type) \
302 SvMAGIC (cv) \ 366 SvMAGIC (sv) \
303 ? SvMAGIC (cv)->mg_type == PERL_MAGIC_coro \ 367 ? SvMAGIC (sv)->mg_type == type \
304 ? SvMAGIC (cv) \ 368 ? SvMAGIC (sv) \
305 : mg_find ((SV *)cv, PERL_MAGIC_coro) \ 369 : mg_find (sv, type) \
306 : 0 370 : 0
371
372#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
373#define CORO_MAGIC_state(sv) CORO_MAGIC (((SV *)(sv)), CORO_MAGIC_type_state)
307 374
308static struct coro * 375static struct coro *
309SvSTATE_ (pTHX_ SV *coro) 376SvSTATE_ (pTHX_ SV *coro)
310{ 377{
311 HV *stash; 378 HV *stash;
312 MAGIC *mg; 379 MAGIC *mg;
313 380
314 if (SvROK (coro)) 381 if (SvROK (coro))
315 coro = SvRV (coro); 382 coro = SvRV (coro);
316 383
317 if (SvTYPE (coro) != SVt_PVHV) 384 if (expect_false (SvTYPE (coro) != SVt_PVHV))
318 croak ("Coro::State object required"); 385 croak ("Coro::State object required");
319 386
320 stash = SvSTASH (coro); 387 stash = SvSTASH (coro);
321 if (stash != coro_stash && stash != coro_state_stash) 388 if (expect_false (stash != coro_stash && stash != coro_state_stash))
322 { 389 {
323 /* very slow, but rare, check */ 390 /* very slow, but rare, check */
324 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State")) 391 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
325 croak ("Coro::State object required"); 392 croak ("Coro::State object required");
326 } 393 }
327 394
328 mg = CORO_MAGIC (coro); 395 mg = CORO_MAGIC_state (coro);
329 return (struct coro *)mg->mg_ptr; 396 return (struct coro *)mg->mg_ptr;
330} 397}
331 398
332#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 399#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
333 400
334/* the next two functions merely cache the padlists */ 401/* the next two functions merely cache the padlists */
335static void 402static void
336get_padlist (pTHX_ CV *cv) 403get_padlist (pTHX_ CV *cv)
337{ 404{
338 MAGIC *mg = CORO_MAGIC (cv); 405 MAGIC *mg = CORO_MAGIC_cv (cv);
339 AV *av; 406 AV *av;
340 407
341 if (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0) 408 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0))
342 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 409 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
343 else 410 else
344 { 411 {
345#if CORO_PREFER_PERL_FUNCTIONS 412#if CORO_PREFER_PERL_FUNCTIONS
346 /* this is probably cleaner, but also slower? */ 413 /* this is probably cleaner, but also slower? */
355} 422}
356 423
357static void 424static void
358put_padlist (pTHX_ CV *cv) 425put_padlist (pTHX_ CV *cv)
359{ 426{
360 MAGIC *mg = CORO_MAGIC (cv); 427 MAGIC *mg = CORO_MAGIC_cv (cv);
361 AV *av; 428 AV *av;
362 429
363 if (!mg) 430 if (expect_false (!mg))
364 { 431 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
365 sv_magic ((SV *)cv, 0, PERL_MAGIC_coro, 0, 0);
366 mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
367 mg->mg_virtual = &vtbl_coro;
368 mg->mg_obj = (SV *)newAV ();
369 }
370 432
371 av = (AV *)mg->mg_obj; 433 av = (AV *)mg->mg_obj;
372 434
373 if (AvFILLp (av) >= AvMAX (av)) 435 if (expect_false (AvFILLp (av) >= AvMAX (av)))
374 av_extend (av, AvMAX (av) + 1); 436 av_extend (av, AvMAX (av) + 1);
375 437
376 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 438 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
377} 439}
378 440
379/** load & save, init *******************************************************/ 441/** load & save, init *******************************************************/
380 442
381static void 443static void
382load_perl (pTHX_ Coro__State c) 444load_perl (pTHX_ Coro__State c)
383{ 445{
446 perl_slots *slot = c->slot;
447 c->slot = 0;
448
449 PL_mainstack = c->mainstack;
450
451 GvSV (PL_defgv) = slot->defsv;
452 GvAV (PL_defgv) = slot->defav;
453 GvSV (PL_errgv) = slot->errsv;
454 GvSV (irsgv) = slot->irsgv;
455
384#define VAR(name,type) PL_ ## name = c->name; 456 #define VAR(name,type) PL_ ## name = slot->name;
385# include "state.h" 457 # include "state.h"
386#undef VAR 458 #undef VAR
387
388 GvSV (PL_defgv) = c->defsv;
389 GvAV (PL_defgv) = c->defav;
390 GvSV (PL_errgv) = c->errsv;
391 GvIOp(PL_defoutgv) = c->deffh;
392 PL_rs = c->irssv;
393 GvSV (irsgv) = c->irssv_sv;
394 459
395 { 460 {
396 dSP; 461 dSP;
462
397 CV *cv; 463 CV *cv;
398 464
399 /* now do the ugly restore mess */ 465 /* now do the ugly restore mess */
400 while ((cv = (CV *)POPs)) 466 while (expect_true (cv = (CV *)POPs))
401 { 467 {
402 put_padlist (aTHX_ cv); /* mark this padlist as available */ 468 put_padlist (aTHX_ cv); /* mark this padlist as available */
403 CvDEPTH (cv) = PTR2IV (POPs); 469 CvDEPTH (cv) = PTR2IV (POPs);
404 CvPADLIST (cv) = (AV *)POPs; 470 CvPADLIST (cv) = (AV *)POPs;
405 } 471 }
424 490
425 XPUSHs (Nullsv); 491 XPUSHs (Nullsv);
426 /* this loop was inspired by pp_caller */ 492 /* this loop was inspired by pp_caller */
427 for (;;) 493 for (;;)
428 { 494 {
429 while (cxix >= 0) 495 while (expect_true (cxix >= 0))
430 { 496 {
431 PERL_CONTEXT *cx = &ccstk[cxix--]; 497 PERL_CONTEXT *cx = &ccstk[cxix--];
432 498
433 if (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT) 499 if (expect_true (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT))
434 { 500 {
435 CV *cv = cx->blk_sub.cv; 501 CV *cv = cx->blk_sub.cv;
436 502
437 if (CvDEPTH (cv)) 503 if (expect_true (CvDEPTH (cv)))
438 { 504 {
439 EXTEND (SP, 3); 505 EXTEND (SP, 3);
440 PUSHs ((SV *)CvPADLIST (cv)); 506 PUSHs ((SV *)CvPADLIST (cv));
441 PUSHs (INT2PTR (SV *, CvDEPTH (cv))); 507 PUSHs (INT2PTR (SV *, CvDEPTH (cv)));
442 PUSHs ((SV *)cv); 508 PUSHs ((SV *)cv);
445 get_padlist (aTHX_ cv); 511 get_padlist (aTHX_ cv);
446 } 512 }
447 } 513 }
448 } 514 }
449 515
450 if (top_si->si_type == PERLSI_MAIN) 516 if (expect_true (top_si->si_type == PERLSI_MAIN))
451 break; 517 break;
452 518
453 top_si = top_si->si_prev; 519 top_si = top_si->si_prev;
454 ccstk = top_si->si_cxstack; 520 ccstk = top_si->si_cxstack;
455 cxix = top_si->si_cxix; 521 cxix = top_si->si_cxix;
456 } 522 }
457 523
458 PUTBACK; 524 PUTBACK;
459 } 525 }
460 526
527 /* allocate some space on the context stack for our purposes */
528 /* we manually unroll here, as usually 2 slots is enough */
529 if (SLOT_COUNT >= 1) CXINC;
530 if (SLOT_COUNT >= 2) CXINC;
531 if (SLOT_COUNT >= 3) CXINC;
532 {
533 int i;
534 for (i = 3; i < SLOT_COUNT; ++i)
535 CXINC;
536 }
537 cxstack_ix -= SLOT_COUNT; /* undo allocation */
538
539 c->mainstack = PL_mainstack;
540
541 {
542 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
543
461 c->defav = GvAV (PL_defgv); 544 slot->defav = GvAV (PL_defgv);
462 c->defsv = DEFSV; 545 slot->defsv = DEFSV;
463 c->errsv = ERRSV; 546 slot->errsv = ERRSV;
464 c->deffh = GvIOp (PL_defoutgv);
465 c->irssv = PL_rs;
466 c->irssv_sv = GvSV (irsgv); 547 slot->irsgv = GvSV (irsgv);
467 548
468#define VAR(name,type)c->name = PL_ ## name; 549 #define VAR(name,type) slot->name = PL_ ## name;
469# include "state.h" 550 # include "state.h"
470#undef VAR 551 #undef VAR
552 }
471} 553}
472 554
473/* 555/*
474 * allocate various perl stacks. This is an exact copy 556 * allocate various perl stacks. This is an exact copy
475 * of perl.c:init_stacks, except that it uses less memory 557 * of perl.c:init_stacks, except that it uses less memory
480# define coro_init_stacks init_stacks 562# define coro_init_stacks init_stacks
481#else 563#else
482static void 564static void
483coro_init_stacks (pTHX) 565coro_init_stacks (pTHX)
484{ 566{
485 PL_curstackinfo = new_stackinfo(64, 6); 567 PL_curstackinfo = new_stackinfo(32, 8);
486 PL_curstackinfo->si_type = PERLSI_MAIN; 568 PL_curstackinfo->si_type = PERLSI_MAIN;
487 PL_curstack = PL_curstackinfo->si_stack; 569 PL_curstack = PL_curstackinfo->si_stack;
488 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 570 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
489 571
490 PL_stack_base = AvARRAY(PL_curstack); 572 PL_stack_base = AvARRAY(PL_curstack);
491 PL_stack_sp = PL_stack_base; 573 PL_stack_sp = PL_stack_base;
492 PL_stack_max = PL_stack_base + AvMAX(PL_curstack); 574 PL_stack_max = PL_stack_base + AvMAX(PL_curstack);
493 575
494 New(50,PL_tmps_stack,64,SV*); 576 New(50,PL_tmps_stack,32,SV*);
495 PL_tmps_floor = -1; 577 PL_tmps_floor = -1;
496 PL_tmps_ix = -1; 578 PL_tmps_ix = -1;
497 PL_tmps_max = 64; 579 PL_tmps_max = 32;
498 580
499 New(54,PL_markstack,16,I32); 581 New(54,PL_markstack,16,I32);
500 PL_markstack_ptr = PL_markstack; 582 PL_markstack_ptr = PL_markstack;
501 PL_markstack_max = PL_markstack + 16; 583 PL_markstack_max = PL_markstack + 16;
502 584
503#ifdef SET_MARK_OFFSET 585#ifdef SET_MARK_OFFSET
504 SET_MARK_OFFSET; 586 SET_MARK_OFFSET;
505#endif 587#endif
506 588
507 New(54,PL_scopestack,16,I32); 589 New(54,PL_scopestack,8,I32);
508 PL_scopestack_ix = 0; 590 PL_scopestack_ix = 0;
509 PL_scopestack_max = 16; 591 PL_scopestack_max = 8;
510 592
511 New(54,PL_savestack,64,ANY); 593 New(54,PL_savestack,24,ANY);
512 PL_savestack_ix = 0; 594 PL_savestack_ix = 0;
513 PL_savestack_max = 64; 595 PL_savestack_max = 24;
514 596
515#if !PERL_VERSION_ATLEAST (5,9,0) 597#if !PERL_VERSION_ATLEAST (5,10,0)
516 New(54,PL_retstack,4,OP*); 598 New(54,PL_retstack,4,OP*);
517 PL_retstack_ix = 0; 599 PL_retstack_ix = 0;
518 PL_retstack_max = 4; 600 PL_retstack_max = 4;
519#endif 601#endif
520} 602}
543 625
544 Safefree (PL_tmps_stack); 626 Safefree (PL_tmps_stack);
545 Safefree (PL_markstack); 627 Safefree (PL_markstack);
546 Safefree (PL_scopestack); 628 Safefree (PL_scopestack);
547 Safefree (PL_savestack); 629 Safefree (PL_savestack);
548#if !PERL_VERSION_ATLEAST (5,9,0) 630#if !PERL_VERSION_ATLEAST (5,10,0)
549 Safefree (PL_retstack); 631 Safefree (PL_retstack);
550#endif 632#endif
551} 633}
552 634
553static size_t 635static size_t
554coro_rss (pTHX_ struct coro *coro) 636coro_rss (pTHX_ struct coro *coro)
555{ 637{
556 size_t rss = sizeof (coro); 638 size_t rss = sizeof (*coro);
557 639
558 if (coro->mainstack) 640 if (coro->mainstack)
559 { 641 {
642 perl_slots tmp_slot;
643 perl_slots *slot;
644
560 if (coro->flags & CF_RUNNING) 645 if (coro->flags & CF_RUNNING)
561 { 646 {
647 slot = &tmp_slot;
648
562 #define VAR(name,type)coro->name = PL_ ## name; 649 #define VAR(name,type) slot->name = PL_ ## name;
563 # include "state.h" 650 # include "state.h"
564 #undef VAR 651 #undef VAR
565 } 652 }
653 else
654 slot = coro->slot;
566 655
567 rss += sizeof (coro->curstackinfo); 656 rss += sizeof (slot->curstackinfo);
568 rss += sizeof (struct xpvav) + (1 + AvFILL (coro->curstackinfo->si_stack)) * sizeof (SV *);
569 rss += (coro->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT); 657 rss += (slot->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT);
570 rss += sizeof (struct xpvav) + (1 + AvFILL (coro->curstack)) * sizeof (SV *); 658 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (slot->curstack)) * sizeof (SV *);
571 rss += coro->tmps_max * sizeof (SV *); 659 rss += slot->tmps_max * sizeof (SV *);
572 rss += (coro->markstack_max - coro->markstack_ptr) * sizeof (I32); 660 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32);
573 rss += coro->scopestack_max * sizeof (I32); 661 rss += slot->scopestack_max * sizeof (I32);
574 rss += coro->savestack_max * sizeof (ANY); 662 rss += slot->savestack_max * sizeof (ANY);
575 663
576#if !PERL_VERSION_ATLEAST (5,9,0) 664#if !PERL_VERSION_ATLEAST (5,10,0)
577 rss += coro->retstack_max * sizeof (OP *); 665 rss += slot->retstack_max * sizeof (OP *);
578#endif 666#endif
579 } 667 }
580 668
581 return rss; 669 return rss;
582} 670}
583 671
584/** coroutine stack handling ************************************************/ 672/** coroutine stack handling ************************************************/
585 673
674static int (*orig_sigelem_get) (pTHX_ SV *sv, MAGIC *mg);
675static int (*orig_sigelem_set) (pTHX_ SV *sv, MAGIC *mg);
676
677/*
678 * This overrides the default magic get method of %SIG elements.
679 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
680 * and instead of tryign to save and restore the hash elements, we just provide
681 * readback here.
682 * We only do this when the hook is != 0, as they are often set to 0 temporarily,
683 * not expecting this to actually change the hook. This is a potential problem
684 * when a schedule happens then, but we ignore this.
685 */
686static int
687coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
688{
689 const char *s = MgPV_nolen_const (mg);
690
691 if (*s == '_')
692 {
693 if (strEQ (s, "__DIE__" ) && PL_diehook ) return sv_setsv (sv, PL_diehook ), 0;
694 if (strEQ (s, "__WARN__") && PL_warnhook) return sv_setsv (sv, PL_warnhook), 0;
695 }
696
697 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
698}
699
700static int
701coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
702{
703 const char *s = MgPV_nolen_const (mg);
704
705 if (*s == '_')
706 {
707 SV **svp = 0;
708
709 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
710 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
711
712 if (svp)
713 {
714 SV *old = *svp;
715 *svp = newSVsv (sv);
716 SvREFCNT_dec (old);
717 return;
718 }
719 }
720
721 return orig_sigelem_set ? orig_sigelem_set (aTHX_ sv, mg) : 0;
722}
723
586static void 724static void
587setup_coro (pTHX_ struct coro *coro) 725coro_setup (pTHX_ struct coro *coro)
588{ 726{
589 /* 727 /*
590 * emulate part of the perl startup here. 728 * emulate part of the perl startup here.
591 */ 729 */
592 coro_init_stacks (aTHX); 730 coro_init_stacks (aTHX);
594 PL_runops = RUNOPS_DEFAULT; 732 PL_runops = RUNOPS_DEFAULT;
595 PL_curcop = &PL_compiling; 733 PL_curcop = &PL_compiling;
596 PL_in_eval = EVAL_NULL; 734 PL_in_eval = EVAL_NULL;
597 PL_comppad = 0; 735 PL_comppad = 0;
598 PL_curpm = 0; 736 PL_curpm = 0;
737 PL_curpad = 0;
599 PL_localizing = 0; 738 PL_localizing = 0;
600 PL_dirty = 0; 739 PL_dirty = 0;
601 PL_restartop = 0; 740 PL_restartop = 0;
741#if PERL_VERSION_ATLEAST (5,10,0)
742 PL_parser = 0;
743#endif
744
745 /* recreate the die/warn hooks */
746 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook );
747 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook);
602 748
603 GvSV (PL_defgv) = NEWSV (0, 0); 749 GvSV (PL_defgv) = newSV (0);
604 GvAV (PL_defgv) = coro->args; coro->args = 0; 750 GvAV (PL_defgv) = coro->args; coro->args = 0;
605 GvSV (PL_errgv) = NEWSV (0, 0); 751 GvSV (PL_errgv) = newSV (0);
606 GvSV (irsgv) = newSVsv (PL_rs); 752 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
607 PL_rs = newSVpvn ("\n", 1); 753 PL_rs = newSVsv (GvSV (irsgv));
608 754 PL_defoutgv = (GV *)SvREFCNT_inc (stdoutgv);
609 {
610 IO *io = newIO ();
611 GvIOp(PL_defoutgv) = io;
612 IoTYPE (io) = IoTYPE_WRONLY;
613 IoOFP (io) = IoIFP (io) = PerlIO_stdout ();
614 IoFLAGS (io) |= IOf_FLUSH;
615 }
616 755
617 { 756 {
618 dSP; 757 dSP;
619 LOGOP myop; 758 LOGOP myop;
620 759
621 Zero (&myop, 1, LOGOP); 760 Zero (&myop, 1, LOGOP);
622 myop.op_next = Nullop; 761 myop.op_next = Nullop;
623 myop.op_flags = OPf_WANT_VOID; 762 myop.op_flags = OPf_WANT_VOID;
624 763
625 PUSHMARK (SP); 764 PUSHMARK (SP);
626 XPUSHs (av_shift (GvAV (PL_defgv))); 765 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv))));
627 PUTBACK; 766 PUTBACK;
628 PL_op = (OP *)&myop; 767 PL_op = (OP *)&myop;
629 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 768 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
630 SPAGAIN; 769 SPAGAIN;
631 } 770 }
632 771
633 ENTER; /* necessary e.g. for dounwind */ 772 /* this newly created coroutine might be run on an existing cctx which most
773 * likely was suspended in set_stacklevel, called from entersub.
774 * set_stacklevl doesn't do anything on return, but entersub does LEAVE,
775 * so we ENTER here for symmetry
776 */
777 ENTER;
634} 778}
635 779
636static void 780static void
637destroy_coro (pTHX_ struct coro *coro) 781coro_destroy (pTHX_ struct coro *coro)
638{ 782{
639 if (!IN_DESTRUCT) 783 if (!IN_DESTRUCT)
640 { 784 {
641 /* restore all saved variables and stuff */ 785 /* restore all saved variables and stuff */
642 LEAVE_SCOPE (0); 786 LEAVE_SCOPE (0);
654 } 798 }
655 799
656 SvREFCNT_dec (GvSV (PL_defgv)); 800 SvREFCNT_dec (GvSV (PL_defgv));
657 SvREFCNT_dec (GvAV (PL_defgv)); 801 SvREFCNT_dec (GvAV (PL_defgv));
658 SvREFCNT_dec (GvSV (PL_errgv)); 802 SvREFCNT_dec (GvSV (PL_errgv));
659 SvREFCNT_dec (GvIOp(PL_defoutgv)); 803 SvREFCNT_dec (PL_defoutgv);
660 SvREFCNT_dec (PL_rs); 804 SvREFCNT_dec (PL_rs);
661 SvREFCNT_dec (GvSV (irsgv)); 805 SvREFCNT_dec (GvSV (irsgv));
662 806
807 SvREFCNT_dec (PL_diehook);
808 SvREFCNT_dec (PL_warnhook);
809
810 SvREFCNT_dec (coro->saved_deffh);
811 SvREFCNT_dec (coro->throw);
812
663 coro_destroy_stacks (aTHX); 813 coro_destroy_stacks (aTHX);
664} 814}
665 815
666static void 816static void
667free_coro_mortal (pTHX) 817free_coro_mortal (pTHX)
668{ 818{
669 if (coro_mortal) 819 if (expect_true (coro_mortal))
670 { 820 {
671 SvREFCNT_dec (coro_mortal); 821 SvREFCNT_dec (coro_mortal);
672 coro_mortal = 0; 822 coro_mortal = 0;
673 } 823 }
674} 824}
703 bot = PL_stack_base + cx->blk_oldsp + 1; 853 bot = PL_stack_base + cx->blk_oldsp + 1;
704 top = cx->blk_gimme == G_ARRAY ? SP + 1 854 top = cx->blk_gimme == G_ARRAY ? SP + 1
705 : cx->blk_gimme == G_SCALAR ? bot + 1 855 : cx->blk_gimme == G_SCALAR ? bot + 1
706 : bot; 856 : bot;
707 857
858 av_extend (av, top - bot);
708 while (bot < top) 859 while (bot < top)
709 av_push (av, SvREFCNT_inc (*bot++)); 860 av_push (av, SvREFCNT_inc (*bot++));
710 861
711 PL_runops = RUNOPS_DEFAULT; 862 PL_runops = RUNOPS_DEFAULT;
712 ENTER; 863 ENTER;
752 SAVETMPS; 903 SAVETMPS;
753 EXTEND (SP, 3); 904 EXTEND (SP, 3);
754 PUSHMARK (SP); 905 PUSHMARK (SP);
755 PUSHs (&PL_sv_yes); 906 PUSHs (&PL_sv_yes);
756 PUSHs (fullname); 907 PUSHs (fullname);
757 PUSHs (cx->blk_sub.hasargs ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef); 908 PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef);
758 PUTBACK; 909 PUTBACK;
759 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0); 910 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
760 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 911 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
761 SPAGAIN; 912 SPAGAIN;
762 FREETMPS; 913 FREETMPS;
798 949
799/* inject a fake call to Coro::State::_cctx_init into the execution */ 950/* inject a fake call to Coro::State::_cctx_init into the execution */
800/* _cctx_init should be careful, as it could be called at almost any time */ 951/* _cctx_init should be careful, as it could be called at almost any time */
801/* during execution of a perl program */ 952/* during execution of a perl program */
802static void NOINLINE 953static void NOINLINE
803prepare_cctx (pTHX_ coro_cctx *cctx) 954cctx_prepare (pTHX_ coro_cctx *cctx)
804{ 955{
805 dSP; 956 dSP;
806 LOGOP myop; 957 LOGOP myop;
807 958
808 PL_top_env = &PL_start_env; 959 PL_top_env = &PL_start_env;
826 977
827/* 978/*
828 * this is a _very_ stripped down perl interpreter ;) 979 * this is a _very_ stripped down perl interpreter ;)
829 */ 980 */
830static void 981static void
831coro_run (void *arg) 982cctx_run (void *arg)
832{ 983{
833 dTHX; 984 dTHX;
834 985
835 /* coro_run is the alternative tail of transfer(), so unlock here. */ 986 /* cctx_run is the alternative tail of transfer(), so unlock here. */
836 UNLOCK; 987 UNLOCK;
837 988
838 /* we now skip the entersub that lead to transfer() */ 989 /* we now skip the entersub that lead to transfer() */
839 PL_op = PL_op->op_next; 990 PL_op = PL_op->op_next;
840 991
841 /* inject a fake subroutine call to cctx_init */ 992 /* inject a fake subroutine call to cctx_init */
842 prepare_cctx (aTHX_ (coro_cctx *)arg); 993 cctx_prepare (aTHX_ (coro_cctx *)arg);
843 994
844 /* somebody or something will hit me for both perl_run and PL_restartop */ 995 /* somebody or something will hit me for both perl_run and PL_restartop */
845 PL_restartop = PL_op; 996 PL_restartop = PL_op;
846 perl_run (PL_curinterp); 997 perl_run (PL_curinterp);
847 998
866 ++cctx_count; 1017 ++cctx_count;
867 1018
868 Newz (0, cctx, 1, coro_cctx); 1019 Newz (0, cctx, 1, coro_cctx);
869 1020
870#if HAVE_MMAP 1021#if HAVE_MMAP
871
872 cctx->ssize = ((coro_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE; 1022 cctx->ssize = ((coro_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
873 /* mmap supposedly does allocate-on-write for us */ 1023 /* mmap supposedly does allocate-on-write for us */
874 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0); 1024 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
875 1025
876 if (cctx->sptr != (void *)-1) 1026 if (cctx->sptr != (void *)-1)
897 stack_start = cctx->sptr; 1047 stack_start = cctx->sptr;
898 stack_size = cctx->ssize; 1048 stack_size = cctx->ssize;
899 } 1049 }
900 1050
901 REGISTER_STACK (cctx, (char *)stack_start, (char *)stack_start + stack_size); 1051 REGISTER_STACK (cctx, (char *)stack_start, (char *)stack_start + stack_size);
902 coro_create (&cctx->cctx, coro_run, (void *)cctx, stack_start, stack_size); 1052 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size);
903 1053
904 return cctx; 1054 return cctx;
905} 1055}
906 1056
907static void 1057static void
924 Safefree (cctx->sptr); 1074 Safefree (cctx->sptr);
925 1075
926 Safefree (cctx); 1076 Safefree (cctx);
927} 1077}
928 1078
1079/* wether this cctx should be destructed */
1080#define CCTX_EXPIRED(cctx) ((cctx)->ssize < coro_stacksize || ((cctx)->flags & CC_NOREUSE))
1081
929static coro_cctx * 1082static coro_cctx *
930cctx_get (pTHX) 1083cctx_get (pTHX)
931{ 1084{
932 while (cctx_first) 1085 while (expect_true (cctx_first))
933 { 1086 {
934 coro_cctx *cctx = cctx_first; 1087 coro_cctx *cctx = cctx_first;
935 cctx_first = cctx->next; 1088 cctx_first = cctx->next;
936 --cctx_idle; 1089 --cctx_idle;
937 1090
938 if (cctx->ssize >= coro_stacksize && !(cctx->flags & CC_NOREUSE)) 1091 if (expect_true (!CCTX_EXPIRED (cctx)))
939 return cctx; 1092 return cctx;
940 1093
941 cctx_destroy (cctx); 1094 cctx_destroy (cctx);
942 } 1095 }
943 1096
946 1099
947static void 1100static void
948cctx_put (coro_cctx *cctx) 1101cctx_put (coro_cctx *cctx)
949{ 1102{
950 /* free another cctx if overlimit */ 1103 /* free another cctx if overlimit */
951 if (cctx_idle >= MAX_IDLE_CCTX) 1104 if (expect_false (cctx_idle >= MAX_IDLE_CCTX))
952 { 1105 {
953 coro_cctx *first = cctx_first; 1106 coro_cctx *first = cctx_first;
954 cctx_first = first->next; 1107 cctx_first = first->next;
955 --cctx_idle; 1108 --cctx_idle;
956 1109
962 cctx_first = cctx; 1115 cctx_first = cctx;
963} 1116}
964 1117
965/** coroutine switching *****************************************************/ 1118/** coroutine switching *****************************************************/
966 1119
967static void NOINLINE 1120static void
968transfer_check (pTHX_ struct coro *prev, struct coro *next) 1121transfer_check (pTHX_ struct coro *prev, struct coro *next)
969{ 1122{
970 if (prev != next) 1123 if (expect_true (prev != next))
971 { 1124 {
972 if (!(prev->flags & (CF_RUNNING | CF_NEW))) 1125 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
973 croak ("Coro::State::transfer called with non-running/new prev Coro::State, but can only transfer from running or new states"); 1126 croak ("Coro::State::transfer called with non-running/new prev Coro::State, but can only transfer from running or new states");
974 1127
975 if (next->flags & CF_RUNNING) 1128 if (expect_false (next->flags & CF_RUNNING))
976 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states"); 1129 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states");
977 1130
978 if (next->flags & CF_DESTROYED) 1131 if (expect_false (next->flags & CF_DESTROYED))
979 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states"); 1132 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states");
980 1133
1134#if !PERL_VERSION_ATLEAST (5,10,0)
981 if (PL_lex_state != LEX_NOTPARSING) 1135 if (expect_false (PL_lex_state != LEX_NOTPARSING))
982 croak ("Coro::State::transfer called while parsing, but this is not supported"); 1136 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version");
1137#endif
983 } 1138 }
984} 1139}
985 1140
986/* always use the TRANSFER macro */ 1141/* always use the TRANSFER macro */
987static void NOINLINE 1142static void NOINLINE
988transfer (pTHX_ struct coro *prev, struct coro *next) 1143transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
989{ 1144{
990 dSTACKLEVEL; 1145 dSTACKLEVEL;
1146 static volatile int has_throw;
991 1147
992 /* sometimes transfer is only called to set idle_sp */ 1148 /* sometimes transfer is only called to set idle_sp */
993 if (!next) 1149 if (expect_false (!next))
994 { 1150 {
995 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1151 ((coro_cctx *)prev)->idle_sp = STACKLEVEL;
996 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1152 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
997 } 1153 }
998 else if (prev != next) 1154 else if (expect_true (prev != next))
999 { 1155 {
1000 coro_cctx *prev__cctx; 1156 coro_cctx *prev__cctx;
1001 1157
1002 if (prev->flags & CF_NEW) 1158 if (expect_false (prev->flags & CF_NEW))
1003 { 1159 {
1004 /* create a new empty context */ 1160 /* create a new empty context */
1005 Newz (0, prev->cctx, 1, coro_cctx); 1161 Newz (0, prev->cctx, 1, coro_cctx);
1006 prev->flags &= ~CF_NEW; 1162 prev->flags &= ~CF_NEW;
1007 prev->flags |= CF_RUNNING; 1163 prev->flags |= CF_RUNNING;
1010 prev->flags &= ~CF_RUNNING; 1166 prev->flags &= ~CF_RUNNING;
1011 next->flags |= CF_RUNNING; 1167 next->flags |= CF_RUNNING;
1012 1168
1013 LOCK; 1169 LOCK;
1014 1170
1171 /* first get rid of the old state */
1172 save_perl (aTHX_ prev);
1173
1015 if (next->flags & CF_NEW) 1174 if (expect_false (next->flags & CF_NEW))
1016 { 1175 {
1017 /* need to start coroutine */ 1176 /* need to start coroutine */
1018 next->flags &= ~CF_NEW; 1177 next->flags &= ~CF_NEW;
1019 /* first get rid of the old state */
1020 save_perl (aTHX_ prev);
1021 /* setup coroutine call */ 1178 /* setup coroutine call */
1022 setup_coro (aTHX_ next); 1179 coro_setup (aTHX_ next);
1023 } 1180 }
1024 else 1181 else
1025 {
1026 /* coroutine already started */
1027 save_perl (aTHX_ prev);
1028 load_perl (aTHX_ next); 1182 load_perl (aTHX_ next);
1029 }
1030 1183
1031 prev__cctx = prev->cctx; 1184 prev__cctx = prev->cctx;
1032 1185
1033 /* possibly "free" the cctx */ 1186 /* possibly "free" the cctx */
1034 if (prev__cctx->idle_sp == STACKLEVEL && !(prev__cctx->flags & CC_TRACE)) 1187 if (expect_true (
1188 prev__cctx->idle_sp == STACKLEVEL
1189 && !(prev__cctx->flags & CC_TRACE)
1190 && !force_cctx
1191 ))
1035 { 1192 {
1036 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */ 1193 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */
1037 assert (("ERROR: current top_env must equal previous top_env", PL_top_env == prev__cctx->idle_te)); 1194 assert (("ERROR: current top_env must equal previous top_env", PL_top_env == prev__cctx->idle_te));
1038 1195
1039 prev->cctx = 0; 1196 prev->cctx = 0;
1040 1197
1198 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */
1199 /* without this the next cctx_get might destroy the prev__cctx while still in use */
1200 if (expect_false (CCTX_EXPIRED (prev__cctx)))
1201 if (!next->cctx)
1202 next->cctx = cctx_get (aTHX);
1203
1041 cctx_put (prev__cctx); 1204 cctx_put (prev__cctx);
1042 } 1205 }
1043 1206
1044 ++next->usecount; 1207 ++next->usecount;
1045 1208
1046 if (!next->cctx) 1209 if (expect_true (!next->cctx))
1047 next->cctx = cctx_get (aTHX); 1210 next->cctx = cctx_get (aTHX);
1048 1211
1212 has_throw = !!next->throw;
1213
1049 if (prev__cctx != next->cctx) 1214 if (expect_false (prev__cctx != next->cctx))
1050 { 1215 {
1051 prev__cctx->top_env = PL_top_env; 1216 prev__cctx->top_env = PL_top_env;
1052 PL_top_env = next->cctx->top_env; 1217 PL_top_env = next->cctx->top_env;
1053 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1218 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx);
1054 } 1219 }
1055 1220
1056 free_coro_mortal (aTHX); 1221 free_coro_mortal (aTHX);
1057 UNLOCK; 1222 UNLOCK;
1223
1224 if (expect_false (has_throw))
1225 {
1226 struct coro *coro = SvSTATE (coro_current);
1227
1228 if (coro->throw)
1229 {
1230 SV *exception = coro->throw;
1231 coro->throw = 0;
1232 sv_setsv (ERRSV, exception);
1233 croak (0);
1234 }
1235 }
1058 } 1236 }
1059} 1237}
1060 1238
1061struct transfer_args 1239struct transfer_args
1062{ 1240{
1063 struct coro *prev, *next; 1241 struct coro *prev, *next;
1064}; 1242};
1065 1243
1066#define TRANSFER(ta) transfer (aTHX_ (ta).prev, (ta).next) 1244#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1067#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1245#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1068 1246
1069/** high level stuff ********************************************************/ 1247/** high level stuff ********************************************************/
1070 1248
1071static int 1249static int
1095 croak ("FATAL: tried to destroy currently running coroutine"); 1273 croak ("FATAL: tried to destroy currently running coroutine");
1096 1274
1097 save_perl (aTHX_ &temp); 1275 save_perl (aTHX_ &temp);
1098 load_perl (aTHX_ coro); 1276 load_perl (aTHX_ coro);
1099 1277
1100 destroy_coro (aTHX_ coro); 1278 coro_destroy (aTHX_ coro);
1101 1279
1102 load_perl (aTHX_ &temp); /* this will get rid of defsv etc.. */ 1280 load_perl (aTHX_ &temp);
1103 1281
1104 coro->mainstack = 0; 1282 coro->slot = 0;
1105 } 1283 }
1106 1284
1107 cctx_destroy (coro->cctx); 1285 cctx_destroy (coro->cctx);
1108 SvREFCNT_dec (coro->args); 1286 SvREFCNT_dec (coro->args);
1109 1287
1165{ 1343{
1166 dTHX; 1344 dTHX;
1167 struct transfer_args ta; 1345 struct transfer_args ta;
1168 1346
1169 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1347 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1170 TRANSFER (ta); 1348 TRANSFER (ta, 1);
1171} 1349}
1172 1350
1173/** Coro ********************************************************************/ 1351/** Coro ********************************************************************/
1174 1352
1175static void 1353static void
1177{ 1355{
1178 av_push (coro_ready [SvSTATE (coro_sv)->prio - PRIO_MIN], coro_sv); 1356 av_push (coro_ready [SvSTATE (coro_sv)->prio - PRIO_MIN], coro_sv);
1179} 1357}
1180 1358
1181static SV * 1359static SV *
1182coro_deq (pTHX_ int min_prio) 1360coro_deq (pTHX)
1183{ 1361{
1184 int prio = PRIO_MAX - PRIO_MIN; 1362 int prio;
1185 1363
1186 min_prio -= PRIO_MIN;
1187 if (min_prio < 0)
1188 min_prio = 0;
1189
1190 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= min_prio; ) 1364 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; )
1191 if (AvFILLp (coro_ready [prio]) >= 0) 1365 if (AvFILLp (coro_ready [prio]) >= 0)
1192 return av_shift (coro_ready [prio]); 1366 return av_shift (coro_ready [prio]);
1193 1367
1194 return 0; 1368 return 0;
1195} 1369}
1231 SV *prev_sv, *next_sv; 1405 SV *prev_sv, *next_sv;
1232 1406
1233 for (;;) 1407 for (;;)
1234 { 1408 {
1235 LOCK; 1409 LOCK;
1236 next_sv = coro_deq (aTHX_ PRIO_MIN); 1410 next_sv = coro_deq (aTHX);
1237 1411
1238 /* nothing to schedule: call the idle handler */ 1412 /* nothing to schedule: call the idle handler */
1239 if (!next_sv) 1413 if (expect_false (!next_sv))
1240 { 1414 {
1241 dSP; 1415 dSP;
1242 UNLOCK; 1416 UNLOCK;
1243 1417
1244 ENTER; 1418 ENTER;
1245 SAVETMPS; 1419 SAVETMPS;
1246 1420
1247 PUSHMARK (SP); 1421 PUSHMARK (SP);
1248 PUTBACK; 1422 PUTBACK;
1249 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD); 1423 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD);
1424 SPAGAIN;
1250 1425
1251 FREETMPS; 1426 FREETMPS;
1252 LEAVE; 1427 LEAVE;
1253 continue; 1428 continue;
1254 } 1429 }
1255 1430
1256 ta->next = SvSTATE (next_sv); 1431 ta->next = SvSTATE (next_sv);
1257 1432
1258 /* cannot transfer to destroyed coros, skip and look for next */ 1433 /* cannot transfer to destroyed coros, skip and look for next */
1259 if (ta->next->flags & CF_DESTROYED) 1434 if (expect_false (ta->next->flags & CF_DESTROYED))
1260 { 1435 {
1261 UNLOCK; 1436 UNLOCK;
1262 SvREFCNT_dec (next_sv); 1437 SvREFCNT_dec (next_sv);
1263 /* coro_nready is already taken care of by destroy */ 1438 /* coro_nready is already taken care of by destroy */
1264 continue; 1439 continue;
1309{ 1484{
1310 dTHX; 1485 dTHX;
1311 struct transfer_args ta; 1486 struct transfer_args ta;
1312 1487
1313 prepare_schedule (aTHX_ &ta); 1488 prepare_schedule (aTHX_ &ta);
1314 TRANSFER (ta); 1489 TRANSFER (ta, 1);
1315} 1490}
1316 1491
1317static int 1492static int
1318api_cede (void) 1493api_cede (void)
1319{ 1494{
1320 dTHX; 1495 dTHX;
1321 struct transfer_args ta; 1496 struct transfer_args ta;
1322 1497
1323 prepare_cede (aTHX_ &ta); 1498 prepare_cede (aTHX_ &ta);
1324 1499
1325 if (ta.prev != ta.next) 1500 if (expect_true (ta.prev != ta.next))
1326 { 1501 {
1327 TRANSFER (ta); 1502 TRANSFER (ta, 1);
1328 return 1; 1503 return 1;
1329 } 1504 }
1330 else 1505 else
1331 return 0; 1506 return 0;
1332} 1507}
1337 dTHX; 1512 dTHX;
1338 struct transfer_args ta; 1513 struct transfer_args ta;
1339 1514
1340 if (prepare_cede_notself (aTHX_ &ta)) 1515 if (prepare_cede_notself (aTHX_ &ta))
1341 { 1516 {
1342 TRANSFER (ta); 1517 TRANSFER (ta, 1);
1343 return 1; 1518 return 1;
1344 } 1519 }
1345 else 1520 else
1346 return 0; 1521 return 0;
1347} 1522}
1366 coro->cctx->flags &= ~(CC_TRACE | CC_TRACE_ALL); 1541 coro->cctx->flags &= ~(CC_TRACE | CC_TRACE_ALL);
1367 1542
1368 if (coro->flags & CF_RUNNING) 1543 if (coro->flags & CF_RUNNING)
1369 PL_runops = RUNOPS_DEFAULT; 1544 PL_runops = RUNOPS_DEFAULT;
1370 else 1545 else
1371 coro->runops = RUNOPS_DEFAULT; 1546 coro->slot->runops = RUNOPS_DEFAULT;
1372 } 1547 }
1373} 1548}
1374 1549
1375MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 1550MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
1376 1551
1381#ifdef USE_ITHREADS 1556#ifdef USE_ITHREADS
1382 MUTEX_INIT (&coro_mutex); 1557 MUTEX_INIT (&coro_mutex);
1383#endif 1558#endif
1384 BOOT_PAGESIZE; 1559 BOOT_PAGESIZE;
1385 1560
1386 irsgv = gv_fetchpv ("/", 1, SVt_PV); 1561 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
1562 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
1563
1564 orig_sigelem_get = PL_vtbl_sigelem.svt_get;
1565 PL_vtbl_sigelem.svt_get = coro_sigelem_get;
1566 orig_sigelem_set = PL_vtbl_sigelem.svt_set;
1567 PL_vtbl_sigelem.svt_set = coro_sigelem_set;
1568
1569 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
1570 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
1571 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
1387 1572
1388 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 1573 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
1389 1574
1390 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE)); 1575 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
1391 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB)); 1576 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));
1397 1582
1398 while (main_top_env->je_prev) 1583 while (main_top_env->je_prev)
1399 main_top_env = main_top_env->je_prev; 1584 main_top_env = main_top_env->je_prev;
1400 1585
1401 coroapi.ver = CORO_API_VERSION; 1586 coroapi.ver = CORO_API_VERSION;
1587 coroapi.rev = CORO_API_REVISION;
1402 coroapi.transfer = api_transfer; 1588 coroapi.transfer = api_transfer;
1403 1589
1404 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 1590 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL));
1405} 1591}
1406 1592
1407SV * 1593SV *
1408new (char *klass, ...) 1594new (char *klass, ...)
1409 CODE: 1595 CODE:
1410{ 1596{
1411 struct coro *coro; 1597 struct coro *coro;
1598 MAGIC *mg;
1412 HV *hv; 1599 HV *hv;
1413 int i; 1600 int i;
1414 1601
1415 Newz (0, coro, 1, struct coro); 1602 Newz (0, coro, 1, struct coro);
1416 coro->args = newAV (); 1603 coro->args = newAV ();
1419 if (coro_first) coro_first->prev = coro; 1606 if (coro_first) coro_first->prev = coro;
1420 coro->next = coro_first; 1607 coro->next = coro_first;
1421 coro_first = coro; 1608 coro_first = coro;
1422 1609
1423 coro->hv = hv = newHV (); 1610 coro->hv = hv = newHV ();
1424 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro, 0)->mg_flags |= MGf_DUP; 1611 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
1612 mg->mg_flags |= MGf_DUP;
1425 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 1613 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
1426 1614
1615 av_extend (coro->args, items - 1);
1427 for (i = 1; i < items; i++) 1616 for (i = 1; i < items; i++)
1428 av_push (coro->args, newSVsv (ST (i))); 1617 av_push (coro->args, newSVsv (ST (i)));
1429} 1618}
1430 OUTPUT: 1619 OUTPUT:
1431 RETVAL 1620 RETVAL
1442 Coro::cede_notself = 4 1631 Coro::cede_notself = 4
1443 CODE: 1632 CODE:
1444{ 1633{
1445 struct transfer_args ta; 1634 struct transfer_args ta;
1446 1635
1636 PUTBACK;
1447 switch (ix) 1637 switch (ix)
1448 { 1638 {
1449 case 0: 1639 case 0:
1450 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0))); 1640 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0)));
1451 ta.next = 0; 1641 ta.next = 0;
1470 if (!prepare_cede_notself (aTHX_ &ta)) 1660 if (!prepare_cede_notself (aTHX_ &ta))
1471 XSRETURN_EMPTY; 1661 XSRETURN_EMPTY;
1472 1662
1473 break; 1663 break;
1474 } 1664 }
1665 SPAGAIN;
1475 1666
1476 BARRIER; 1667 BARRIER;
1668 PUTBACK;
1477 TRANSFER (ta); 1669 TRANSFER (ta, 0);
1478 1670 SPAGAIN; /* might be the sp of a different coroutine now */
1479 if (GIMME_V != G_VOID && ta.next != ta.prev) 1671 /* be extra careful not to ever do anything after TRANSFER */
1480 XSRETURN_YES;
1481} 1672}
1482 1673
1483bool 1674bool
1484_destroy (SV *coro_sv) 1675_destroy (SV *coro_sv)
1485 CODE: 1676 CODE:
1534 CODE: 1725 CODE:
1535{ 1726{
1536 if (coro->mainstack) 1727 if (coro->mainstack)
1537 { 1728 {
1538 struct coro temp; 1729 struct coro temp;
1539 Zero (&temp, 1, struct coro);
1540 1730
1541 if (!(coro->flags & CF_RUNNING)) 1731 if (!(coro->flags & CF_RUNNING))
1542 { 1732 {
1733 PUTBACK;
1543 save_perl (aTHX_ &temp); 1734 save_perl (aTHX_ &temp);
1544 load_perl (aTHX_ coro); 1735 load_perl (aTHX_ coro);
1545 } 1736 }
1546 1737
1547 { 1738 {
1548 dSP; 1739 dSP;
1549 ENTER; 1740 ENTER;
1550 SAVETMPS; 1741 SAVETMPS;
1742 PUTBACK;
1743 PUSHSTACK;
1551 PUSHMARK (SP); 1744 PUSHMARK (SP);
1552 PUTBACK; 1745
1553 if (ix) 1746 if (ix)
1554 eval_sv (coderef, 0); 1747 eval_sv (coderef, 0);
1555 else 1748 else
1556 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 1749 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
1750
1751 POPSTACK;
1557 SPAGAIN; 1752 SPAGAIN;
1558 FREETMPS; 1753 FREETMPS;
1559 LEAVE; 1754 LEAVE;
1560 PUTBACK; 1755 PUTBACK;
1561 } 1756 }
1562 1757
1563 if (!(coro->flags & CF_RUNNING)) 1758 if (!(coro->flags & CF_RUNNING))
1564 { 1759 {
1565 save_perl (aTHX_ coro); 1760 save_perl (aTHX_ coro);
1566 load_perl (aTHX_ &temp); 1761 load_perl (aTHX_ &temp);
1762 SPAGAIN;
1567 } 1763 }
1568 } 1764 }
1569} 1765}
1570 1766
1571SV * 1767SV *
1612 case 1: RETVAL = coro->usecount; break; 1808 case 1: RETVAL = coro->usecount; break;
1613 } 1809 }
1614 OUTPUT: 1810 OUTPUT:
1615 RETVAL 1811 RETVAL
1616 1812
1813void
1814force_cctx ()
1815 CODE:
1816 struct coro *coro = SvSTATE (coro_current);
1817 coro->cctx->idle_sp = 0;
1617 1818
1618MODULE = Coro::State PACKAGE = Coro 1819MODULE = Coro::State PACKAGE = Coro
1619 1820
1620BOOT: 1821BOOT:
1621{ 1822{
1622 int i; 1823 int i;
1623 1824
1624 sv_pool_rss = get_sv ("Coro::POOL_RSS" , TRUE); 1825 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
1625 sv_pool_size = get_sv ("Coro::POOL_SIZE" , TRUE); 1826 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
1626 av_async_pool = get_av ("Coro::async_pool", TRUE); 1827 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
1627 1828
1628 coro_current = get_sv ("Coro::current", FALSE); 1829 coro_current = coro_get_sv (aTHX_ "Coro::current", FALSE);
1629 SvREADONLY_on (coro_current); 1830 SvREADONLY_on (coro_current);
1630 1831
1631 coro_stash = gv_stashpv ("Coro", TRUE); 1832 coro_stash = gv_stashpv ("Coro", TRUE);
1632 1833
1633 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 1834 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
1634 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 1835 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH));
1635 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 1836 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL));
1636 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 1837 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW));
1639 1840
1640 for (i = PRIO_MAX - PRIO_MIN + 1; i--; ) 1841 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
1641 coro_ready[i] = newAV (); 1842 coro_ready[i] = newAV ();
1642 1843
1643 { 1844 {
1644 SV *sv = perl_get_sv("Coro::API", 1); 1845 SV *sv = perl_get_sv ("Coro::API", TRUE);
1846 perl_get_sv ("Coro::API", TRUE); /* silence 5.10 warning */
1645 1847
1646 coroapi.schedule = api_schedule; 1848 coroapi.schedule = api_schedule;
1647 coroapi.cede = api_cede; 1849 coroapi.cede = api_cede;
1648 coroapi.cede_notself = api_cede_notself; 1850 coroapi.cede_notself = api_cede_notself;
1649 coroapi.ready = api_ready; 1851 coroapi.ready = api_ready;
1700 CODE: 1902 CODE:
1701 RETVAL = coro_nready; 1903 RETVAL = coro_nready;
1702 OUTPUT: 1904 OUTPUT:
1703 RETVAL 1905 RETVAL
1704 1906
1907void
1908throw (Coro::State self, SV *throw = &PL_sv_undef)
1909 PROTOTYPE: $;$
1910 CODE:
1911 SvREFCNT_dec (self->throw);
1912 self->throw = SvOK (throw) ? newSVsv (throw) : 0;
1913
1914void
1915swap_defsv (Coro::State self)
1916 PROTOTYPE: $
1917 ALIAS:
1918 swap_defav = 1
1919 CODE:
1920 if (!self->slot)
1921 croak ("cannot swap state with coroutine that has no saved state");
1922 else
1923 {
1924 SV **src = ix ? (SV **)&GvAV (PL_defgv) : &GvSV (PL_defgv);
1925 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
1926
1927 SV *tmp = *src; *src = *dst; *dst = tmp;
1928 }
1929
1705# for async_pool speedup 1930# for async_pool speedup
1706void 1931void
1707_pool_1 (SV *cb) 1932_pool_1 (SV *cb)
1708 CODE: 1933 CODE:
1709{ 1934{
1710 int i, len; 1935 struct coro *coro = SvSTATE (coro_current);
1711 HV *hv = (HV *)SvRV (coro_current); 1936 HV *hv = (HV *)SvRV (coro_current);
1712 AV *defav = GvAV (PL_defgv); 1937 AV *defav = GvAV (PL_defgv);
1713 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0); 1938 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
1714 AV *invoke_av; 1939 AV *invoke_av;
1940 int i, len;
1715 1941
1716 if (!invoke) 1942 if (!invoke)
1943 {
1944 SvREFCNT_dec (PL_diehook); PL_diehook = 0;
1717 croak ("\3terminate\2\n"); 1945 croak ("\3async_pool terminate\2\n");
1946 }
1947
1948 SvREFCNT_dec (coro->saved_deffh);
1949 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv);
1718 1950
1719 hv_store (hv, "desc", sizeof ("desc") - 1, 1951 hv_store (hv, "desc", sizeof ("desc") - 1,
1720 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0); 1952 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
1721 1953
1722 invoke_av = (AV *)SvRV (invoke); 1954 invoke_av = (AV *)SvRV (invoke);
1740{ 1972{
1741 struct coro *coro = SvSTATE (coro_current); 1973 struct coro *coro = SvSTATE (coro_current);
1742 1974
1743 sv_setsv (cb, &PL_sv_undef); 1975 sv_setsv (cb, &PL_sv_undef);
1744 1976
1977 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1978 coro->saved_deffh = 0;
1979
1745 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss) 1980 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss)
1746 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 1981 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1982 {
1983 SvREFCNT_dec (PL_diehook); PL_diehook = 0;
1747 croak ("\3terminate\2\n"); 1984 croak ("\3async_pool terminate\2\n");
1985 }
1748 1986
1749 av_clear (GvAV (PL_defgv)); 1987 av_clear (GvAV (PL_defgv));
1750 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1, 1988 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1,
1751 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0); 1989 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
1752 1990

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines