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

Diff Legend

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