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.175 by root, Sun Sep 30 13:43:45 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 */
151
152static GV *irsgv; /* $/ */
153static GV *stdoutgv; /* *STDOUT */
154static SV *rv_diehook;
155static SV *rv_warnhook;
156static HV *hv_sig; /* %SIG */
136 157
137/* async_pool helper stuff */ 158/* async_pool helper stuff */
138static SV *sv_pool_rss; 159static SV *sv_pool_rss;
139static SV *sv_pool_size; 160static SV *sv_pool_size;
140static AV *av_async_pool; 161static AV *av_async_pool;
… …
176 CF_READY = 0x0002, /* coroutine is ready */ 197 CF_READY = 0x0002, /* coroutine is ready */
177 CF_NEW = 0x0004, /* has never been switched to */ 198 CF_NEW = 0x0004, /* has never been switched to */
178 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 199 CF_DESTROYED = 0x0008, /* coroutine data has been freed */
179}; 200};
180 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
181/* this is a structure representing a perl-level coroutine */ 215/* this is a structure representing a perl-level coroutine */
182struct coro { 216struct coro {
183 /* the c coroutine allocated to this perl coroutine, if any */ 217 /* the c coroutine allocated to this perl coroutine, if any */
184 coro_cctx *cctx; 218 coro_cctx *cctx;
185 219
220 /* process data */
221 AV *mainstack;
222 perl_slots *slot; /* basically the saved sp */
223
186 /* data associated with this coroutine (initial args) */ 224 AV *args; /* data associated with this coroutine (initial args) */
187 AV *args; 225 int refcnt; /* coroutines are refcounted, yes */
188 int refcnt;
189 int save; /* CORO_SAVE flags */
190 int flags; /* CF_ flags */ 226 int flags; /* CF_ flags */
191 227 HV *hv; /* the perl hash associated with this coro, if any */
192 /* optionally saved, might be zero */
193 AV *defav; /* @_ */
194 SV *defsv; /* $_ */
195 SV *errsv; /* $@ */
196 GV *deffh; /* default filehandle */
197 SV *irssv; /* $/ */
198 SV *irssv_sv; /* real $/ cache */
199
200#define VAR(name,type) type name;
201# include "state.h"
202#undef VAR
203 228
204 /* statistics */ 229 /* statistics */
205 int usecount; /* number of switches to this coro */ 230 int usecount; /* number of transfers to this coro */
206 231
207 /* coro process data */ 232 /* coro process data */
208 int prio; 233 int prio;
234 SV *throw; /* exception to be thrown */
235
236 /* async_pool */
237 SV *saved_deffh;
209 238
210 /* linked list */ 239 /* linked list */
211 struct coro *next, *prev; 240 struct coro *next, *prev;
212 HV *hv; /* the perl hash associated with this coro, if any */
213}; 241};
214 242
215typedef struct coro *Coro__State; 243typedef struct coro *Coro__State;
216typedef struct coro *Coro__State_or_hashref; 244typedef struct coro *Coro__State_or_hashref;
217 245
… …
229static AV *coro_ready [PRIO_MAX-PRIO_MIN+1]; 257static AV *coro_ready [PRIO_MAX-PRIO_MIN+1];
230static int coro_nready; 258static int coro_nready;
231static struct coro *coro_first; 259static struct coro *coro_first;
232 260
233/** 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}
234 292
235static AV * 293static AV *
236coro_clone_padlist (pTHX_ CV *cv) 294coro_clone_padlist (pTHX_ CV *cv)
237{ 295{
238 AV *padlist = CvPADLIST (cv); 296 AV *padlist = CvPADLIST (cv);
… …
286 344
287 /* casting is fun. */ 345 /* casting is fun. */
288 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 346 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
289 free_padlist (aTHX_ padlist); 347 free_padlist (aTHX_ padlist);
290 348
291 SvREFCNT_dec (av);
292
293 return 0; 349 return 0;
294} 350}
295 351
296#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
297 354
298static 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};
299 359
300#define CORO_MAGIC(cv) \ 360#define CORO_MAGIC(sv,type) \
301 SvMAGIC (cv) \ 361 SvMAGIC (sv) \
302 ? SvMAGIC (cv)->mg_type == PERL_MAGIC_coro \ 362 ? SvMAGIC (sv)->mg_type == type \
303 ? SvMAGIC (cv) \ 363 ? SvMAGIC (sv) \
304 : mg_find ((SV *)cv, PERL_MAGIC_coro) \ 364 : mg_find (sv, type) \
305 : 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)
306 369
307static struct coro * 370static struct coro *
308SvSTATE_ (pTHX_ SV *coro) 371SvSTATE_ (pTHX_ SV *coro)
309{ 372{
310 HV *stash; 373 HV *stash;
311 MAGIC *mg; 374 MAGIC *mg;
312 375
313 if (SvROK (coro)) 376 if (SvROK (coro))
314 coro = SvRV (coro); 377 coro = SvRV (coro);
315 378
316 if (SvTYPE (coro) != SVt_PVHV) 379 if (expect_false (SvTYPE (coro) != SVt_PVHV))
317 croak ("Coro::State object required"); 380 croak ("Coro::State object required");
318 381
319 stash = SvSTASH (coro); 382 stash = SvSTASH (coro);
320 if (stash != coro_stash && stash != coro_state_stash) 383 if (expect_false (stash != coro_stash && stash != coro_state_stash))
321 { 384 {
322 /* very slow, but rare, check */ 385 /* very slow, but rare, check */
323 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State")) 386 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
324 croak ("Coro::State object required"); 387 croak ("Coro::State object required");
325 } 388 }
326 389
327 mg = CORO_MAGIC (coro); 390 mg = CORO_MAGIC_state (coro);
328 return (struct coro *)mg->mg_ptr; 391 return (struct coro *)mg->mg_ptr;
329} 392}
330 393
331#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 394#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
332 395
333/* the next two functions merely cache the padlists */ 396/* the next two functions merely cache the padlists */
334static void 397static void
335get_padlist (pTHX_ CV *cv) 398get_padlist (pTHX_ CV *cv)
336{ 399{
337 MAGIC *mg = CORO_MAGIC (cv); 400 MAGIC *mg = CORO_MAGIC_cv (cv);
338 AV *av; 401 AV *av;
339 402
340 if (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0) 403 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0))
341 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 404 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
342 else 405 else
343 { 406 {
344#if CORO_PREFER_PERL_FUNCTIONS 407#if CORO_PREFER_PERL_FUNCTIONS
345 /* this is probably cleaner, but also slower? */ 408 /* this is probably cleaner, but also slower? */
… …
354} 417}
355 418
356static void 419static void
357put_padlist (pTHX_ CV *cv) 420put_padlist (pTHX_ CV *cv)
358{ 421{
359 MAGIC *mg = CORO_MAGIC (cv); 422 MAGIC *mg = CORO_MAGIC_cv (cv);
360 AV *av; 423 AV *av;
361 424
362 if (!mg) 425 if (expect_false (!mg))
363 { 426 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
364 sv_magic ((SV *)cv, 0, PERL_MAGIC_coro, 0, 0);
365 mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
366 mg->mg_virtual = &vtbl_coro;
367 mg->mg_obj = (SV *)newAV ();
368 }
369 427
370 av = (AV *)mg->mg_obj; 428 av = (AV *)mg->mg_obj;
371 429
372 if (AvFILLp (av) >= AvMAX (av)) 430 if (expect_false (AvFILLp (av) >= AvMAX (av)))
373 av_extend (av, AvMAX (av) + 1); 431 av_extend (av, AvMAX (av) + 1);
374 432
375 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 433 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
376} 434}
377 435
378/** load & save, init *******************************************************/ 436/** load & save, init *******************************************************/
379 437
380#define SB do {
381#define SE } while (0)
382
383#define REPLACE_SV(sv,val) SB SvREFCNT_dec (sv); (sv) = (val); (val) = 0; SE
384
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 if (c->defav) REPLACE_SV (GvAV (PL_defgv), c->defav);
393 if (c->defsv) REPLACE_SV (DEFSV , c->defsv);
394 if (c->errsv) REPLACE_SV (ERRSV , c->errsv);
395 if (c->deffh) REPLACE_SV (PL_defoutgv , c->deffh);
396
397 if (c->irssv)
398 {
399 if (c->irssv == PL_rs || sv_eq (PL_rs, c->irssv))
400 {
401 SvREFCNT_dec (c->irssv);
402 c->irssv = 0;
403 }
404 else
405 {
406 REPLACE_SV (PL_rs, c->irssv);
407 if (!c->irssv_sv) c->irssv_sv = get_sv ("/", 0);
408 sv_setsv (c->irssv_sv, PL_rs);
409 }
410 }
411 454
412 { 455 {
413 dSP; 456 dSP;
457
414 CV *cv; 458 CV *cv;
415 459
416 /* now do the ugly restore mess */ 460 /* now do the ugly restore mess */
417 while ((cv = (CV *)POPs)) 461 while (expect_true (cv = (CV *)POPs))
418 { 462 {
419 put_padlist (aTHX_ cv); /* mark this padlist as available */ 463 put_padlist (aTHX_ cv); /* mark this padlist as available */
420 CvDEPTH (cv) = PTR2IV (POPs); 464 CvDEPTH (cv) = PTR2IV (POPs);
421 CvPADLIST (cv) = (AV *)POPs; 465 CvPADLIST (cv) = (AV *)POPs;
422 } 466 }
… …
441 485
442 XPUSHs (Nullsv); 486 XPUSHs (Nullsv);
443 /* this loop was inspired by pp_caller */ 487 /* this loop was inspired by pp_caller */
444 for (;;) 488 for (;;)
445 { 489 {
446 while (cxix >= 0) 490 while (expect_true (cxix >= 0))
447 { 491 {
448 PERL_CONTEXT *cx = &ccstk[cxix--]; 492 PERL_CONTEXT *cx = &ccstk[cxix--];
449 493
450 if (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT) 494 if (expect_true (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT))
451 { 495 {
452 CV *cv = cx->blk_sub.cv; 496 CV *cv = cx->blk_sub.cv;
453 497
454 if (CvDEPTH (cv)) 498 if (expect_true (CvDEPTH (cv)))
455 { 499 {
456 EXTEND (SP, 3); 500 EXTEND (SP, 3);
457 PUSHs ((SV *)CvPADLIST (cv)); 501 PUSHs ((SV *)CvPADLIST (cv));
458 PUSHs (INT2PTR (SV *, CvDEPTH (cv))); 502 PUSHs (INT2PTR (SV *, CvDEPTH (cv)));
459 PUSHs ((SV *)cv); 503 PUSHs ((SV *)cv);
… …
462 get_padlist (aTHX_ cv); 506 get_padlist (aTHX_ cv);
463 } 507 }
464 } 508 }
465 } 509 }
466 510
467 if (top_si->si_type == PERLSI_MAIN) 511 if (expect_true (top_si->si_type == PERLSI_MAIN))
468 break; 512 break;
469 513
470 top_si = top_si->si_prev; 514 top_si = top_si->si_prev;
471 ccstk = top_si->si_cxstack; 515 ccstk = top_si->si_cxstack;
472 cxix = top_si->si_cxix; 516 cxix = top_si->si_cxix;
473 } 517 }
474 518
475 PUTBACK; 519 PUTBACK;
476 } 520 }
477 521
478 c->defav = c->save & CORO_SAVE_DEFAV ? (AV *)SvREFCNT_inc (GvAV (PL_defgv)) : 0; 522 /* allocate some space on the context stack for our purposes */
479 c->defsv = c->save & CORO_SAVE_DEFSV ? SvREFCNT_inc (DEFSV) : 0; 523 /* we manually unroll here, as usually 2 slots is enough */
480 c->errsv = c->save & CORO_SAVE_ERRSV ? SvREFCNT_inc (ERRSV) : 0; 524 if (SLOT_COUNT >= 1) CXINC;
481 c->deffh = c->save & CORO_SAVE_DEFFH ? (GV *)SvREFCNT_inc (PL_defoutgv) : 0; 525 if (SLOT_COUNT >= 2) CXINC;
482 c->irssv = c->save & CORO_SAVE_IRSSV ? SvREFCNT_inc (PL_rs) : 0; 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 */
483 533
534 c->mainstack = PL_mainstack;
535
536 {
537 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
538
539 slot->defav = GvAV (PL_defgv);
540 slot->defsv = DEFSV;
541 slot->errsv = ERRSV;
542 slot->irsgv = GvSV (irsgv);
543
484#define VAR(name,type)c->name = PL_ ## name; 544 #define VAR(name,type) slot->name = PL_ ## name;
485# include "state.h" 545 # include "state.h"
486#undef VAR 546 #undef VAR
547 }
487} 548}
488 549
489/* 550/*
490 * allocate various perl stacks. This is an exact copy 551 * allocate various perl stacks. This is an exact copy
491 * of perl.c:init_stacks, except that it uses less memory 552 * of perl.c:init_stacks, except that it uses less memory
… …
496# define coro_init_stacks init_stacks 557# define coro_init_stacks init_stacks
497#else 558#else
498static void 559static void
499coro_init_stacks (pTHX) 560coro_init_stacks (pTHX)
500{ 561{
501 PL_curstackinfo = new_stackinfo(64, 6); 562 PL_curstackinfo = new_stackinfo(32, 8);
502 PL_curstackinfo->si_type = PERLSI_MAIN; 563 PL_curstackinfo->si_type = PERLSI_MAIN;
503 PL_curstack = PL_curstackinfo->si_stack; 564 PL_curstack = PL_curstackinfo->si_stack;
504 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 565 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
505 566
506 PL_stack_base = AvARRAY(PL_curstack); 567 PL_stack_base = AvARRAY(PL_curstack);
507 PL_stack_sp = PL_stack_base; 568 PL_stack_sp = PL_stack_base;
508 PL_stack_max = PL_stack_base + AvMAX(PL_curstack); 569 PL_stack_max = PL_stack_base + AvMAX(PL_curstack);
509 570
510 New(50,PL_tmps_stack,64,SV*); 571 New(50,PL_tmps_stack,32,SV*);
511 PL_tmps_floor = -1; 572 PL_tmps_floor = -1;
512 PL_tmps_ix = -1; 573 PL_tmps_ix = -1;
513 PL_tmps_max = 64; 574 PL_tmps_max = 32;
514 575
515 New(54,PL_markstack,16,I32); 576 New(54,PL_markstack,16,I32);
516 PL_markstack_ptr = PL_markstack; 577 PL_markstack_ptr = PL_markstack;
517 PL_markstack_max = PL_markstack + 16; 578 PL_markstack_max = PL_markstack + 16;
518 579
519#ifdef SET_MARK_OFFSET 580#ifdef SET_MARK_OFFSET
520 SET_MARK_OFFSET; 581 SET_MARK_OFFSET;
521#endif 582#endif
522 583
523 New(54,PL_scopestack,16,I32); 584 New(54,PL_scopestack,8,I32);
524 PL_scopestack_ix = 0; 585 PL_scopestack_ix = 0;
525 PL_scopestack_max = 16; 586 PL_scopestack_max = 8;
526 587
527 New(54,PL_savestack,64,ANY); 588 New(54,PL_savestack,24,ANY);
528 PL_savestack_ix = 0; 589 PL_savestack_ix = 0;
529 PL_savestack_max = 64; 590 PL_savestack_max = 24;
530 591
531#if !PERL_VERSION_ATLEAST (5,9,0) 592#if !PERL_VERSION_ATLEAST (5,9,0)
532 New(54,PL_retstack,4,OP*); 593 New(54,PL_retstack,4,OP*);
533 PL_retstack_ix = 0; 594 PL_retstack_ix = 0;
534 PL_retstack_max = 4; 595 PL_retstack_max = 4;
… …
540 * destroy the stacks, the callchain etc... 601 * destroy the stacks, the callchain etc...
541 */ 602 */
542static void 603static void
543coro_destroy_stacks (pTHX) 604coro_destroy_stacks (pTHX)
544{ 605{
545 if (!IN_DESTRUCT)
546 {
547 /* restore all saved variables and stuff */
548 LEAVE_SCOPE (0);
549 assert (PL_tmps_floor == -1);
550
551 /* free all temporaries */
552 FREETMPS;
553 assert (PL_tmps_ix == -1);
554
555 /* unwind all extra stacks */
556 POPSTACK_TO (PL_mainstack);
557
558 /* unwind main stack */
559 dounwind (-1);
560 }
561
562 while (PL_curstackinfo->si_next) 606 while (PL_curstackinfo->si_next)
563 PL_curstackinfo = PL_curstackinfo->si_next; 607 PL_curstackinfo = PL_curstackinfo->si_next;
564 608
565 while (PL_curstackinfo) 609 while (PL_curstackinfo)
566 { 610 {
… …
584} 628}
585 629
586static size_t 630static size_t
587coro_rss (pTHX_ struct coro *coro) 631coro_rss (pTHX_ struct coro *coro)
588{ 632{
589 size_t rss = sizeof (coro); 633 size_t rss = sizeof (*coro);
590 634
591 if (coro->mainstack) 635 if (coro->mainstack)
592 { 636 {
637 perl_slots tmp_slot;
638 perl_slots *slot;
639
593 if (coro->flags & CF_RUNNING) 640 if (coro->flags & CF_RUNNING)
594 { 641 {
642 slot = &tmp_slot;
643
595 #define VAR(name,type)coro->name = PL_ ## name; 644 #define VAR(name,type) slot->name = PL_ ## name;
596 # include "state.h" 645 # include "state.h"
597 #undef VAR 646 #undef VAR
598 } 647 }
648 else
649 slot = coro->slot;
599 650
600 rss += sizeof (coro->curstackinfo); 651 rss += sizeof (slot->curstackinfo);
601 rss += sizeof (struct xpvav) + (1 + AvFILL (coro->curstackinfo->si_stack)) * sizeof (SV *);
602 rss += (coro->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT); 652 rss += (slot->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT);
603 rss += sizeof (struct xpvav) + (1 + AvFILL (coro->curstack)) * sizeof (SV *); 653 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (slot->curstack)) * sizeof (SV *);
604 rss += coro->tmps_max * sizeof (SV *); 654 rss += slot->tmps_max * sizeof (SV *);
605 rss += (coro->markstack_max - coro->markstack_ptr) * sizeof (I32); 655 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32);
606 rss += coro->scopestack_max * sizeof (I32); 656 rss += slot->scopestack_max * sizeof (I32);
607 rss += coro->savestack_max * sizeof (ANY); 657 rss += slot->savestack_max * sizeof (ANY);
608 658
609#if !PERL_VERSION_ATLEAST (5,9,0) 659#if !PERL_VERSION_ATLEAST (5,9,0)
610 rss += coro->retstack_max * sizeof (OP *); 660 rss += slot->retstack_max * sizeof (OP *);
611#endif 661#endif
612 } 662 }
613 663
614 return rss; 664 return rss;
615} 665}
616 666
617/** coroutine stack handling ************************************************/ 667/** coroutine stack handling ************************************************/
618 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 */
619static void 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
696
697static void
620setup_coro (pTHX_ struct coro *coro) 698coro_setup (pTHX_ struct coro *coro)
621{ 699{
622 /* 700 /*
623 * emulate part of the perl startup here. 701 * emulate part of the perl startup here.
624 */ 702 */
625 coro_init_stacks (aTHX); 703 coro_init_stacks (aTHX);
… …
627 PL_runops = RUNOPS_DEFAULT; 705 PL_runops = RUNOPS_DEFAULT;
628 PL_curcop = &PL_compiling; 706 PL_curcop = &PL_compiling;
629 PL_in_eval = EVAL_NULL; 707 PL_in_eval = EVAL_NULL;
630 PL_comppad = 0; 708 PL_comppad = 0;
631 PL_curpm = 0; 709 PL_curpm = 0;
710 PL_curpad = 0;
632 PL_localizing = 0; 711 PL_localizing = 0;
633 PL_dirty = 0; 712 PL_dirty = 0;
634 PL_restartop = 0; 713 PL_restartop = 0;
635 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);
723
724 GvSV (PL_defgv) = newSV (0);
725 GvAV (PL_defgv) = coro->args; coro->args = 0;
726 GvSV (PL_errgv) = newSV (0);
727 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
728 PL_rs = newSVsv (GvSV (irsgv));
729 PL_defoutgv = (GV *)SvREFCNT_inc (stdoutgv);
730
636 { 731 {
637 dSP; 732 dSP;
638 LOGOP myop; 733 LOGOP myop;
639 734
640 SvREFCNT_dec (GvAV (PL_defgv));
641 GvAV (PL_defgv) = coro->args; coro->args = 0;
642
643 Zero (&myop, 1, LOGOP); 735 Zero (&myop, 1, LOGOP);
644 myop.op_next = Nullop; 736 myop.op_next = Nullop;
645 myop.op_flags = OPf_WANT_VOID; 737 myop.op_flags = OPf_WANT_VOID;
646 738
647 PUSHMARK (SP); 739 PUSHMARK (SP);
648 XPUSHs (av_shift (GvAV (PL_defgv))); 740 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv))));
649 PUTBACK; 741 PUTBACK;
650 PL_op = (OP *)&myop; 742 PL_op = (OP *)&myop;
651 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 743 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
652 SPAGAIN; 744 SPAGAIN;
653 } 745 }
654 746
655 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;
753}
754
755static void
756coro_destroy (pTHX_ struct coro *coro)
757{
758 if (!IN_DESTRUCT)
759 {
760 /* restore all saved variables and stuff */
761 LEAVE_SCOPE (0);
762 assert (PL_tmps_floor == -1);
763
764 /* free all temporaries */
765 FREETMPS;
766 assert (PL_tmps_ix == -1);
767
768 /* unwind all extra stacks */
769 POPSTACK_TO (PL_mainstack);
770
771 /* unwind main stack */
772 dounwind (-1);
773 }
774
775 SvREFCNT_dec (GvSV (PL_defgv));
776 SvREFCNT_dec (GvAV (PL_defgv));
777 SvREFCNT_dec (GvSV (PL_errgv));
778 SvREFCNT_dec (PL_defoutgv);
779 SvREFCNT_dec (PL_rs);
780 SvREFCNT_dec (GvSV (irsgv));
781
782 SvREFCNT_dec (PL_diehook);
783 SvREFCNT_dec (PL_warnhook);
784
785 SvREFCNT_dec (coro->saved_deffh);
786 SvREFCNT_dec (coro->throw);
787
788 coro_destroy_stacks (aTHX);
656} 789}
657 790
658static void 791static void
659free_coro_mortal (pTHX) 792free_coro_mortal (pTHX)
660{ 793{
661 if (coro_mortal) 794 if (expect_true (coro_mortal))
662 { 795 {
663 SvREFCNT_dec (coro_mortal); 796 SvREFCNT_dec (coro_mortal);
664 coro_mortal = 0; 797 coro_mortal = 0;
665 } 798 }
666} 799}
… …
695 bot = PL_stack_base + cx->blk_oldsp + 1; 828 bot = PL_stack_base + cx->blk_oldsp + 1;
696 top = cx->blk_gimme == G_ARRAY ? SP + 1 829 top = cx->blk_gimme == G_ARRAY ? SP + 1
697 : cx->blk_gimme == G_SCALAR ? bot + 1 830 : cx->blk_gimme == G_SCALAR ? bot + 1
698 : bot; 831 : bot;
699 832
833 av_extend (av, top - bot);
700 while (bot < top) 834 while (bot < top)
701 av_push (av, SvREFCNT_inc (*bot++)); 835 av_push (av, SvREFCNT_inc (*bot++));
702 836
703 PL_runops = RUNOPS_DEFAULT; 837 PL_runops = RUNOPS_DEFAULT;
704 ENTER; 838 ENTER;
… …
790 924
791/* 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 */
792/* _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 */
793/* during execution of a perl program */ 927/* during execution of a perl program */
794static void NOINLINE 928static void NOINLINE
795prepare_cctx (pTHX_ coro_cctx *cctx) 929cctx_prepare (pTHX_ coro_cctx *cctx)
796{ 930{
797 dSP; 931 dSP;
798 LOGOP myop; 932 LOGOP myop;
799 933
800 PL_top_env = &PL_start_env; 934 PL_top_env = &PL_start_env;
… …
818 952
819/* 953/*
820 * this is a _very_ stripped down perl interpreter ;) 954 * this is a _very_ stripped down perl interpreter ;)
821 */ 955 */
822static void 956static void
823coro_run (void *arg) 957cctx_run (void *arg)
824{ 958{
825 dTHX; 959 dTHX;
826 960
827 /* coro_run is the alternative tail of transfer(), so unlock here. */ 961 /* cctx_run is the alternative tail of transfer(), so unlock here. */
828 UNLOCK; 962 UNLOCK;
829 963
830 /* we now skip the entersub that lead to transfer() */ 964 /* we now skip the entersub that lead to transfer() */
831 PL_op = PL_op->op_next; 965 PL_op = PL_op->op_next;
832 966
833 /* inject a fake subroutine call to cctx_init */ 967 /* inject a fake subroutine call to cctx_init */
834 prepare_cctx (aTHX_ (coro_cctx *)arg); 968 cctx_prepare (aTHX_ (coro_cctx *)arg);
835 969
836 /* 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 */
837 PL_restartop = PL_op; 971 PL_restartop = PL_op;
838 perl_run (PL_curinterp); 972 perl_run (PL_curinterp);
839 973
… …
858 ++cctx_count; 992 ++cctx_count;
859 993
860 Newz (0, cctx, 1, coro_cctx); 994 Newz (0, cctx, 1, coro_cctx);
861 995
862#if HAVE_MMAP 996#if HAVE_MMAP
863
864 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;
865 /* mmap supposedly does allocate-on-write for us */ 998 /* mmap supposedly does allocate-on-write for us */
866 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);
867 1000
868 if (cctx->sptr != (void *)-1) 1001 if (cctx->sptr != (void *)-1)
… …
889 stack_start = cctx->sptr; 1022 stack_start = cctx->sptr;
890 stack_size = cctx->ssize; 1023 stack_size = cctx->ssize;
891 } 1024 }
892 1025
893 REGISTER_STACK (cctx, (char *)stack_start, (char *)stack_start + stack_size); 1026 REGISTER_STACK (cctx, (char *)stack_start, (char *)stack_start + stack_size);
894 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);
895 1028
896 return cctx; 1029 return cctx;
897} 1030}
898 1031
899static void 1032static void
… …
916 Safefree (cctx->sptr); 1049 Safefree (cctx->sptr);
917 1050
918 Safefree (cctx); 1051 Safefree (cctx);
919} 1052}
920 1053
1054/* wether this cctx should be destructed */
1055#define CCTX_EXPIRED(cctx) ((cctx)->ssize < coro_stacksize || ((cctx)->flags & CC_NOREUSE))
1056
921static coro_cctx * 1057static coro_cctx *
922cctx_get (pTHX) 1058cctx_get (pTHX)
923{ 1059{
924 while (cctx_first) 1060 while (expect_true (cctx_first))
925 { 1061 {
926 coro_cctx *cctx = cctx_first; 1062 coro_cctx *cctx = cctx_first;
927 cctx_first = cctx->next; 1063 cctx_first = cctx->next;
928 --cctx_idle; 1064 --cctx_idle;
929 1065
930 if (cctx->ssize >= coro_stacksize && !(cctx->flags & CC_NOREUSE)) 1066 if (expect_true (!CCTX_EXPIRED (cctx)))
931 return cctx; 1067 return cctx;
932 1068
933 cctx_destroy (cctx); 1069 cctx_destroy (cctx);
934 } 1070 }
935 1071
… …
938 1074
939static void 1075static void
940cctx_put (coro_cctx *cctx) 1076cctx_put (coro_cctx *cctx)
941{ 1077{
942 /* free another cctx if overlimit */ 1078 /* free another cctx if overlimit */
943 if (cctx_idle >= MAX_IDLE_CCTX) 1079 if (expect_false (cctx_idle >= MAX_IDLE_CCTX))
944 { 1080 {
945 coro_cctx *first = cctx_first; 1081 coro_cctx *first = cctx_first;
946 cctx_first = first->next; 1082 cctx_first = first->next;
947 --cctx_idle; 1083 --cctx_idle;
948 1084
… …
954 cctx_first = cctx; 1090 cctx_first = cctx;
955} 1091}
956 1092
957/** coroutine switching *****************************************************/ 1093/** coroutine switching *****************************************************/
958 1094
959static void NOINLINE 1095static void
960transfer_check (pTHX_ struct coro *prev, struct coro *next) 1096transfer_check (pTHX_ struct coro *prev, struct coro *next)
961{ 1097{
962 if (prev != next) 1098 if (expect_true (prev != next))
963 { 1099 {
964 if (!(prev->flags & (CF_RUNNING | CF_NEW))) 1100 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
965 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");
966 1102
967 if (next->flags & CF_RUNNING) 1103 if (expect_false (next->flags & CF_RUNNING))
968 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");
969 1105
970 if (next->flags & CF_DESTROYED) 1106 if (expect_false (next->flags & CF_DESTROYED))
971 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");
972 1108
1109 if (
1110#if PERL_VERSION_ATLEAST (5,9,0)
1111 expect_false (PL_parser)
1112#else
973 if (PL_lex_state != LEX_NOTPARSING) 1113 expect_false (PL_lex_state != LEX_NOTPARSING)
1114#endif
1115 )
974 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");
975 } 1117 }
976} 1118}
977 1119
978/* always use the TRANSFER macro */ 1120/* always use the TRANSFER macro */
979static void NOINLINE 1121static void NOINLINE
980transfer (pTHX_ struct coro *prev, struct coro *next) 1122transfer (pTHX_ struct coro *prev, struct coro *next)
981{ 1123{
982 dSTACKLEVEL; 1124 dSTACKLEVEL;
1125 static volatile int has_throw;
983 1126
984 /* sometimes transfer is only called to set idle_sp */ 1127 /* sometimes transfer is only called to set idle_sp */
985 if (!next) 1128 if (expect_false (!next))
986 { 1129 {
987 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1130 ((coro_cctx *)prev)->idle_sp = STACKLEVEL;
988 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 */
989 } 1132 }
990 else if (prev != next) 1133 else if (expect_true (prev != next))
991 { 1134 {
992 coro_cctx *prev__cctx; 1135 coro_cctx *prev__cctx;
993 1136
994 if (prev->flags & CF_NEW) 1137 if (expect_false (prev->flags & CF_NEW))
995 { 1138 {
996 /* create a new empty context */ 1139 /* create a new empty context */
997 Newz (0, prev->cctx, 1, coro_cctx); 1140 Newz (0, prev->cctx, 1, coro_cctx);
998 prev->flags &= ~CF_NEW; 1141 prev->flags &= ~CF_NEW;
999 prev->flags |= CF_RUNNING; 1142 prev->flags |= CF_RUNNING;
… …
1002 prev->flags &= ~CF_RUNNING; 1145 prev->flags &= ~CF_RUNNING;
1003 next->flags |= CF_RUNNING; 1146 next->flags |= CF_RUNNING;
1004 1147
1005 LOCK; 1148 LOCK;
1006 1149
1150 /* first get rid of the old state */
1151 save_perl (aTHX_ prev);
1152
1007 if (next->flags & CF_NEW) 1153 if (expect_false (next->flags & CF_NEW))
1008 { 1154 {
1009 /* need to start coroutine */ 1155 /* need to start coroutine */
1010 next->flags &= ~CF_NEW; 1156 next->flags &= ~CF_NEW;
1011 /* first get rid of the old state */
1012 save_perl (aTHX_ prev);
1013 /* setup coroutine call */ 1157 /* setup coroutine call */
1014 setup_coro (aTHX_ next); 1158 coro_setup (aTHX_ next);
1015 } 1159 }
1016 else 1160 else
1017 {
1018 /* coroutine already started */
1019 save_perl (aTHX_ prev);
1020 load_perl (aTHX_ next); 1161 load_perl (aTHX_ next);
1021 }
1022 1162
1023 prev__cctx = prev->cctx; 1163 prev__cctx = prev->cctx;
1024 1164
1025 /* possibly "free" the cctx */ 1165 /* possibly "free" the cctx */
1026 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)))
1027 { 1167 {
1028 /* 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 */
1029 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));
1030 1170
1031 prev->cctx = 0; 1171 prev->cctx = 0;
1032 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
1033 cctx_put (prev__cctx); 1179 cctx_put (prev__cctx);
1034 } 1180 }
1035 1181
1036 ++next->usecount; 1182 ++next->usecount;
1037 1183
1038 if (!next->cctx) 1184 if (expect_true (!next->cctx))
1039 next->cctx = cctx_get (aTHX); 1185 next->cctx = cctx_get (aTHX);
1040 1186
1187 has_throw = !!next->throw;
1188
1041 if (prev__cctx != next->cctx) 1189 if (expect_false (prev__cctx != next->cctx))
1042 { 1190 {
1043 prev__cctx->top_env = PL_top_env; 1191 prev__cctx->top_env = PL_top_env;
1044 PL_top_env = next->cctx->top_env; 1192 PL_top_env = next->cctx->top_env;
1045 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1193 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx);
1046 } 1194 }
1047 1195
1048 free_coro_mortal (aTHX); 1196 free_coro_mortal (aTHX);
1049 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 }
1050 } 1211 }
1051} 1212}
1052 1213
1053struct transfer_args 1214struct transfer_args
1054{ 1215{
… …
1081 1242
1082 if (coro->mainstack && coro->mainstack != main_mainstack) 1243 if (coro->mainstack && coro->mainstack != main_mainstack)
1083 { 1244 {
1084 struct coro temp; 1245 struct coro temp;
1085 1246
1086 assert (!(coro->flags & CF_RUNNING));
1087
1088 Zero (&temp, 1, struct coro);
1089 temp.save = CORO_SAVE_ALL;
1090
1091 if (coro->flags & CF_RUNNING) 1247 if (coro->flags & CF_RUNNING)
1092 croak ("FATAL: tried to destroy currently running coroutine"); 1248 croak ("FATAL: tried to destroy currently running coroutine");
1093 1249
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_stacks (aTHX); 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
… …
1165 1321
1166 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1322 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1167 TRANSFER (ta); 1323 TRANSFER (ta);
1168} 1324}
1169 1325
1170static int
1171api_save (SV *coro_sv, int new_save)
1172{
1173 dTHX;
1174 struct coro *coro = SvSTATE (coro_sv);
1175 int old_save = coro->save;
1176
1177 if (new_save >= 0)
1178 coro->save = new_save;
1179
1180 return old_save;
1181}
1182
1183/** Coro ********************************************************************/ 1326/** Coro ********************************************************************/
1184 1327
1185static void 1328static void
1186coro_enq (pTHX_ SV *coro_sv) 1329coro_enq (pTHX_ SV *coro_sv)
1187{ 1330{
… …
1244 { 1387 {
1245 LOCK; 1388 LOCK;
1246 next_sv = coro_deq (aTHX_ PRIO_MIN); 1389 next_sv = coro_deq (aTHX_ PRIO_MIN);
1247 1390
1248 /* nothing to schedule: call the idle handler */ 1391 /* nothing to schedule: call the idle handler */
1249 if (!next_sv) 1392 if (expect_false (!next_sv))
1250 { 1393 {
1251 dSP; 1394 dSP;
1252 UNLOCK; 1395 UNLOCK;
1253 1396
1254 ENTER; 1397 ENTER;
… …
1264 } 1407 }
1265 1408
1266 ta->next = SvSTATE (next_sv); 1409 ta->next = SvSTATE (next_sv);
1267 1410
1268 /* cannot transfer to destroyed coros, skip and look for next */ 1411 /* cannot transfer to destroyed coros, skip and look for next */
1269 if (ta->next->flags & CF_DESTROYED) 1412 if (expect_false (ta->next->flags & CF_DESTROYED))
1270 { 1413 {
1271 UNLOCK; 1414 UNLOCK;
1272 SvREFCNT_dec (next_sv); 1415 SvREFCNT_dec (next_sv);
1273 /* coro_nready is already taken care of by destroy */ 1416 /* coro_nready is already taken care of by destroy */
1274 continue; 1417 continue;
… …
1330 dTHX; 1473 dTHX;
1331 struct transfer_args ta; 1474 struct transfer_args ta;
1332 1475
1333 prepare_cede (aTHX_ &ta); 1476 prepare_cede (aTHX_ &ta);
1334 1477
1335 if (ta.prev != ta.next) 1478 if (expect_true (ta.prev != ta.next))
1336 { 1479 {
1337 TRANSFER (ta); 1480 TRANSFER (ta);
1338 return 1; 1481 return 1;
1339 } 1482 }
1340 else 1483 else
… …
1376 coro->cctx->flags &= ~(CC_TRACE | CC_TRACE_ALL); 1519 coro->cctx->flags &= ~(CC_TRACE | CC_TRACE_ALL);
1377 1520
1378 if (coro->flags & CF_RUNNING) 1521 if (coro->flags & CF_RUNNING)
1379 PL_runops = RUNOPS_DEFAULT; 1522 PL_runops = RUNOPS_DEFAULT;
1380 else 1523 else
1381 coro->runops = RUNOPS_DEFAULT; 1524 coro->slot->runops = RUNOPS_DEFAULT;
1382 } 1525 }
1383} 1526}
1384 1527
1385MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 1528MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
1386 1529
… …
1390{ 1533{
1391#ifdef USE_ITHREADS 1534#ifdef USE_ITHREADS
1392 MUTEX_INIT (&coro_mutex); 1535 MUTEX_INIT (&coro_mutex);
1393#endif 1536#endif
1394 BOOT_PAGESIZE; 1537 BOOT_PAGESIZE;
1538
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));
1395 1548
1396 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 1549 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
1397 1550
1398 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE)); 1551 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
1399 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB)); 1552 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));
1400 newCONSTSUB (coro_state_stash, "CC_TRACE_LINE", newSViv (CC_TRACE_LINE)); 1553 newCONSTSUB (coro_state_stash, "CC_TRACE_LINE", newSViv (CC_TRACE_LINE));
1401 newCONSTSUB (coro_state_stash, "CC_TRACE_ALL" , newSViv (CC_TRACE_ALL)); 1554 newCONSTSUB (coro_state_stash, "CC_TRACE_ALL" , newSViv (CC_TRACE_ALL));
1402 1555
1403 newCONSTSUB (coro_state_stash, "SAVE_DEFAV", newSViv (CORO_SAVE_DEFAV));
1404 newCONSTSUB (coro_state_stash, "SAVE_DEFSV", newSViv (CORO_SAVE_DEFSV));
1405 newCONSTSUB (coro_state_stash, "SAVE_ERRSV", newSViv (CORO_SAVE_ERRSV));
1406 newCONSTSUB (coro_state_stash, "SAVE_IRSSV", newSViv (CORO_SAVE_IRSSV));
1407 newCONSTSUB (coro_state_stash, "SAVE_DEFFH", newSViv (CORO_SAVE_DEFFH));
1408 newCONSTSUB (coro_state_stash, "SAVE_DEF", newSViv (CORO_SAVE_DEF));
1409 newCONSTSUB (coro_state_stash, "SAVE_ALL", newSViv (CORO_SAVE_ALL));
1410
1411 main_mainstack = PL_mainstack; 1556 main_mainstack = PL_mainstack;
1412 main_top_env = PL_top_env; 1557 main_top_env = PL_top_env;
1413 1558
1414 while (main_top_env->je_prev) 1559 while (main_top_env->je_prev)
1415 main_top_env = main_top_env->je_prev; 1560 main_top_env = main_top_env->je_prev;
1416 1561
1417 coroapi.ver = CORO_API_VERSION; 1562 coroapi.ver = CORO_API_VERSION;
1563 coroapi.rev = CORO_API_REVISION;
1418 coroapi.transfer = api_transfer; 1564 coroapi.transfer = api_transfer;
1419 1565
1420 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 1566 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL));
1421} 1567}
1422 1568
1423SV * 1569SV *
1424new (char *klass, ...) 1570new (char *klass, ...)
1425 CODE: 1571 CODE:
1426{ 1572{
1427 struct coro *coro; 1573 struct coro *coro;
1574 MAGIC *mg;
1428 HV *hv; 1575 HV *hv;
1429 int i; 1576 int i;
1430 1577
1431 Newz (0, coro, 1, struct coro); 1578 Newz (0, coro, 1, struct coro);
1432 coro->args = newAV (); 1579 coro->args = newAV ();
1433 coro->save = CORO_SAVE_DEF;
1434 coro->flags = CF_NEW; 1580 coro->flags = CF_NEW;
1435 1581
1436 if (coro_first) coro_first->prev = coro; 1582 if (coro_first) coro_first->prev = coro;
1437 coro->next = coro_first; 1583 coro->next = coro_first;
1438 coro_first = coro; 1584 coro_first = coro;
1439 1585
1440 coro->hv = hv = newHV (); 1586 coro->hv = hv = newHV ();
1441 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;
1442 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 1589 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
1443 1590
1591 av_extend (coro->args, items - 1);
1444 for (i = 1; i < items; i++) 1592 for (i = 1; i < items; i++)
1445 av_push (coro->args, newSVsv (ST (i))); 1593 av_push (coro->args, newSVsv (ST (i)));
1446} 1594}
1447 OUTPUT: 1595 OUTPUT:
1448 RETVAL 1596 RETVAL
1449 1597
1450int 1598# these not obviously related functions are all rolled into the same xs
1451save (SV *coro, int new_save = -1) 1599# function to increase chances that they all will call transfer with the same
1452 CODE: 1600# stack offset
1453 RETVAL = api_save (coro, new_save);
1454 OUTPUT:
1455 RETVAL
1456
1457int
1458save_also (SV *coro_sv, int save_also)
1459 CODE:
1460{
1461 struct coro *coro = SvSTATE (coro_sv);
1462 RETVAL = coro->save;
1463 coro->save |= save_also;
1464}
1465 OUTPUT:
1466 RETVAL
1467
1468void 1601void
1469_set_stacklevel (...) 1602_set_stacklevel (...)
1470 ALIAS: 1603 ALIAS:
1471 Coro::State::transfer = 1 1604 Coro::State::transfer = 1
1472 Coro::schedule = 2 1605 Coro::schedule = 2
… …
1504 1637
1505 break; 1638 break;
1506 } 1639 }
1507 1640
1508 BARRIER; 1641 BARRIER;
1642 PUTBACK;
1509 TRANSFER (ta); 1643 TRANSFER (ta);
1510 1644 SPAGAIN; /* might be the sp of a different coroutine now */
1511 if (GIMME_V != G_VOID && ta.next != ta.prev) 1645 /* be extra careful not to ever do anything after TRANSFER */
1512 XSRETURN_YES;
1513} 1646}
1514 1647
1515bool 1648bool
1516_destroy (SV *coro_sv) 1649_destroy (SV *coro_sv)
1517 CODE: 1650 CODE:
… …
1566 CODE: 1699 CODE:
1567{ 1700{
1568 if (coro->mainstack) 1701 if (coro->mainstack)
1569 { 1702 {
1570 struct coro temp; 1703 struct coro temp;
1571 Zero (&temp, 1, struct coro);
1572 temp.save = CORO_SAVE_ALL;
1573 1704
1574 if (!(coro->flags & CF_RUNNING)) 1705 if (!(coro->flags & CF_RUNNING))
1575 { 1706 {
1576 save_perl (aTHX_ &temp); 1707 save_perl (aTHX_ &temp);
1577 load_perl (aTHX_ coro); 1708 load_perl (aTHX_ coro);
… …
1579 1710
1580 { 1711 {
1581 dSP; 1712 dSP;
1582 ENTER; 1713 ENTER;
1583 SAVETMPS; 1714 SAVETMPS;
1715 PUTBACK;
1716 PUSHSTACK;
1584 PUSHMARK (SP); 1717 PUSHMARK (SP);
1585 PUTBACK; 1718
1586 if (ix) 1719 if (ix)
1587 eval_sv (coderef, 0); 1720 eval_sv (coderef, 0);
1588 else 1721 else
1589 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;
1590 SPAGAIN; 1725 SPAGAIN;
1591 FREETMPS; 1726 FREETMPS;
1592 LEAVE; 1727 LEAVE;
1593 PUTBACK; 1728 PUTBACK;
1594 } 1729 }
… …
1652 1787
1653BOOT: 1788BOOT:
1654{ 1789{
1655 int i; 1790 int i;
1656 1791
1657 sv_pool_rss = get_sv ("Coro::POOL_RSS" , TRUE); 1792 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
1658 sv_pool_size = get_sv ("Coro::POOL_SIZE" , TRUE); 1793 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
1659 av_async_pool = get_av ("Coro::async_pool", TRUE); 1794 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
1660 1795
1661 coro_current = get_sv ("Coro::current", FALSE); 1796 coro_current = coro_get_sv (aTHX_ "Coro::current", FALSE);
1662 SvREADONLY_on (coro_current); 1797 SvREADONLY_on (coro_current);
1663 1798
1664 coro_stash = gv_stashpv ("Coro", TRUE); 1799 coro_stash = gv_stashpv ("Coro", TRUE);
1665 1800
1666 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 1801 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
1667 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 1802 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH));
1668 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 1803 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL));
1669 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 1804 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW));
… …
1672 1807
1673 for (i = PRIO_MAX - PRIO_MIN + 1; i--; ) 1808 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
1674 coro_ready[i] = newAV (); 1809 coro_ready[i] = newAV ();
1675 1810
1676 { 1811 {
1677 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 */
1678 1814
1679 coroapi.schedule = api_schedule; 1815 coroapi.schedule = api_schedule;
1680 coroapi.save = api_save;
1681 coroapi.cede = api_cede; 1816 coroapi.cede = api_cede;
1682 coroapi.cede_notself = api_cede_notself; 1817 coroapi.cede_notself = api_cede_notself;
1683 coroapi.ready = api_ready; 1818 coroapi.ready = api_ready;
1684 coroapi.is_ready = api_is_ready; 1819 coroapi.is_ready = api_is_ready;
1685 coroapi.nready = &coro_nready; 1820 coroapi.nready = &coro_nready;
… …
1734 CODE: 1869 CODE:
1735 RETVAL = coro_nready; 1870 RETVAL = coro_nready;
1736 OUTPUT: 1871 OUTPUT:
1737 RETVAL 1872 RETVAL
1738 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
1739# for async_pool speedup 1881# for async_pool speedup
1740void 1882void
1741_pool_1 (SV *cb) 1883_pool_1 (SV *cb)
1742 CODE: 1884 CODE:
1743{ 1885{
1744 int i, len; 1886 struct coro *coro = SvSTATE (coro_current);
1745 HV *hv = (HV *)SvRV (coro_current); 1887 HV *hv = (HV *)SvRV (coro_current);
1746 AV *defav = GvAV (PL_defgv); 1888 AV *defav = GvAV (PL_defgv);
1747 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0); 1889 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
1748 AV *invoke_av; 1890 AV *invoke_av;
1891 int i, len;
1749 1892
1750 if (!invoke) 1893 if (!invoke)
1751 croak ("\3terminate\2\n"); 1894 croak ("\3async_pool terminate\2\n");
1895
1896 SvREFCNT_dec (coro->saved_deffh);
1897 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv);
1752 1898
1753 hv_store (hv, "desc", sizeof ("desc") - 1, 1899 hv_store (hv, "desc", sizeof ("desc") - 1,
1754 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0); 1900 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
1755 1901
1756 invoke_av = (AV *)SvRV (invoke); 1902 invoke_av = (AV *)SvRV (invoke);
… …
1774{ 1920{
1775 struct coro *coro = SvSTATE (coro_current); 1921 struct coro *coro = SvSTATE (coro_current);
1776 1922
1777 sv_setsv (cb, &PL_sv_undef); 1923 sv_setsv (cb, &PL_sv_undef);
1778 1924
1925 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1926 coro->saved_deffh = 0;
1927
1779 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss) 1928 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss)
1780 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 1929 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1781 croak ("\3terminate\2\n"); 1930 croak ("\3async_pool terminate\2\n");
1782 1931
1783 av_clear (GvAV (PL_defgv)); 1932 av_clear (GvAV (PL_defgv));
1784 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1, 1933 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1,
1785 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0); 1934 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
1786 1935
1787 coro->save = CORO_SAVE_DEF;
1788 coro->prio = 0; 1936 coro->prio = 0;
1789 1937
1790 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 1938 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
1791 api_trace (coro_current, 0); 1939 api_trace (coro_current, 0);
1792 1940

Diff Legend

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