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.167 by root, Thu Sep 27 15:52:31 2007 UTC vs.
Revision 1.232 by root, Thu Apr 24 12:40:38 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# define setjmp _setjmp // deep magic, don't ask
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 */
240 HV *hv; /* the perl hash associated with this coro, if any */
191 241
192 /* optionally saved, might be zero */ 242 /* statistics */
193 AV *defav; /* @_ */ 243 int usecount; /* number of transfers to this coro */
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 244
204 /* coro process data */ 245 /* coro process data */
205 int prio; 246 int prio;
247 SV *throw; /* exception to be thrown */
248
249 /* async_pool */
250 SV *saved_deffh;
206 251
207 /* linked list */ 252 /* linked list */
208 struct coro *next, *prev; 253 struct coro *next, *prev;
209 HV *hv; /* the perl hash associated with this coro, if any */
210}; 254};
211 255
212typedef struct coro *Coro__State; 256typedef struct coro *Coro__State;
213typedef struct coro *Coro__State_or_hashref; 257typedef struct coro *Coro__State_or_hashref;
214 258
… …
227static int coro_nready; 271static int coro_nready;
228static struct coro *coro_first; 272static struct coro *coro_first;
229 273
230/** lowlevel stuff **********************************************************/ 274/** lowlevel stuff **********************************************************/
231 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
232static AV * 306static AV *
233coro_clone_padlist (pTHX_ CV *cv) 307coro_clone_padlist (pTHX_ CV *cv)
234{ 308{
235 AV *padlist = CvPADLIST (cv); 309 AV *padlist = CvPADLIST (cv);
236 AV *newpadlist, *newpad; 310 AV *newpadlist, *newpad;
237 311
238 newpadlist = newAV (); 312 newpadlist = newAV ();
239 AvREAL_off (newpadlist); 313 AvREAL_off (newpadlist);
240#if PERL_VERSION_ATLEAST (5,9,0) 314#if PERL_VERSION_ATLEAST (5,10,0)
241 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1); 315 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1);
242#else 316#else
243 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 317 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
244#endif 318#endif
245 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 319 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
… …
283 357
284 /* casting is fun. */ 358 /* casting is fun. */
285 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 359 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
286 free_padlist (aTHX_ padlist); 360 free_padlist (aTHX_ padlist);
287 361
288 SvREFCNT_dec (av);
289
290 return 0; 362 return 0;
291} 363}
292 364
293#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
294 367
295static 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};
296 372
297#define CORO_MAGIC(cv) \ 373#define CORO_MAGIC(sv,type) \
298 SvMAGIC (cv) \ 374 SvMAGIC (sv) \
299 ? SvMAGIC (cv)->mg_type == PERL_MAGIC_coro \ 375 ? SvMAGIC (sv)->mg_type == type \
300 ? SvMAGIC (cv) \ 376 ? SvMAGIC (sv) \
301 : mg_find ((SV *)cv, PERL_MAGIC_coro) \ 377 : mg_find (sv, type) \
302 : 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)
382
383static struct coro *
384SvSTATE_ (pTHX_ SV *coro)
385{
386 HV *stash;
387 MAGIC *mg;
388
389 if (SvROK (coro))
390 coro = SvRV (coro);
391
392 if (expect_false (SvTYPE (coro) != SVt_PVHV))
393 croak ("Coro::State object required");
394
395 stash = SvSTASH (coro);
396 if (expect_false (stash != coro_stash && stash != coro_state_stash))
397 {
398 /* very slow, but rare, check */
399 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
400 croak ("Coro::State object required");
401 }
402
403 mg = CORO_MAGIC_state (coro);
404 return (struct coro *)mg->mg_ptr;
405}
406
407#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
303 408
304/* the next two functions merely cache the padlists */ 409/* the next two functions merely cache the padlists */
305static void 410static void
306get_padlist (pTHX_ CV *cv) 411get_padlist (pTHX_ CV *cv)
307{ 412{
308 MAGIC *mg = CORO_MAGIC (cv); 413 MAGIC *mg = CORO_MAGIC_cv (cv);
309 AV *av; 414 AV *av;
310 415
311 if (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0) 416 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0))
312 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 417 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
313 else 418 else
314 { 419 {
315#if CORO_PREFER_PERL_FUNCTIONS 420#if CORO_PREFER_PERL_FUNCTIONS
316 /* this is probably cleaner, but also slower? */ 421 /* this is probably cleaner, but also slower? */
… …
325} 430}
326 431
327static void 432static void
328put_padlist (pTHX_ CV *cv) 433put_padlist (pTHX_ CV *cv)
329{ 434{
330 MAGIC *mg = CORO_MAGIC (cv); 435 MAGIC *mg = CORO_MAGIC_cv (cv);
331 AV *av; 436 AV *av;
332 437
333 if (!mg) 438 if (expect_false (!mg))
334 { 439 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
335 sv_magic ((SV *)cv, 0, PERL_MAGIC_coro, 0, 0);
336 mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
337 mg->mg_virtual = &vtbl_coro;
338 mg->mg_obj = (SV *)newAV ();
339 }
340 440
341 av = (AV *)mg->mg_obj; 441 av = (AV *)mg->mg_obj;
342 442
343 if (AvFILLp (av) >= AvMAX (av)) 443 if (expect_false (AvFILLp (av) >= AvMAX (av)))
344 av_extend (av, AvMAX (av) + 1); 444 av_extend (av, AvMAX (av) + 1);
345 445
346 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 446 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
347} 447}
348 448
349/** load & save, init *******************************************************/ 449/** load & save, init *******************************************************/
350
351#define SB do {
352#define SE } while (0)
353
354#define REPLACE_SV(sv,val) SB SvREFCNT_dec (sv); (sv) = (val); (val) = 0; SE
355 450
356static void 451static void
357load_perl (pTHX_ Coro__State c) 452load_perl (pTHX_ Coro__State c)
358{ 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
359#define VAR(name,type) PL_ ## name = c->name; 464 #define VAR(name,type) PL_ ## name = slot->name;
360# include "state.h" 465 # include "state.h"
361#undef VAR 466 #undef VAR
362
363 if (c->defav) REPLACE_SV (GvAV (PL_defgv), c->defav);
364 if (c->defsv) REPLACE_SV (DEFSV , c->defsv);
365 if (c->errsv) REPLACE_SV (ERRSV , c->errsv);
366 if (c->deffh) REPLACE_SV (PL_defoutgv , c->deffh);
367
368 if (c->irssv)
369 {
370 if (c->irssv == PL_rs || sv_eq (PL_rs, c->irssv))
371 {
372 SvREFCNT_dec (c->irssv);
373 c->irssv = 0;
374 }
375 else
376 {
377 REPLACE_SV (PL_rs, c->irssv);
378 if (!c->irssv_sv) c->irssv_sv = get_sv ("/", 0);
379 sv_setsv (c->irssv_sv, PL_rs);
380 }
381 }
382 467
383 { 468 {
384 dSP; 469 dSP;
470
385 CV *cv; 471 CV *cv;
386 472
387 /* now do the ugly restore mess */ 473 /* now do the ugly restore mess */
388 while ((cv = (CV *)POPs)) 474 while (expect_true (cv = (CV *)POPs))
389 { 475 {
390 put_padlist (aTHX_ cv); /* mark this padlist as available */ 476 put_padlist (aTHX_ cv); /* mark this padlist as available */
391 CvDEPTH (cv) = PTR2IV (POPs); 477 CvDEPTH (cv) = PTR2IV (POPs);
392 CvPADLIST (cv) = (AV *)POPs; 478 CvPADLIST (cv) = (AV *)POPs;
393 } 479 }
… …
412 498
413 XPUSHs (Nullsv); 499 XPUSHs (Nullsv);
414 /* this loop was inspired by pp_caller */ 500 /* this loop was inspired by pp_caller */
415 for (;;) 501 for (;;)
416 { 502 {
417 while (cxix >= 0) 503 while (expect_true (cxix >= 0))
418 { 504 {
419 PERL_CONTEXT *cx = &ccstk[cxix--]; 505 PERL_CONTEXT *cx = &ccstk[cxix--];
420 506
421 if (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT) 507 if (expect_true (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT))
422 { 508 {
423 CV *cv = cx->blk_sub.cv; 509 CV *cv = cx->blk_sub.cv;
424 510
425 if (CvDEPTH (cv)) 511 if (expect_true (CvDEPTH (cv)))
426 { 512 {
427 EXTEND (SP, 3); 513 EXTEND (SP, 3);
428 PUSHs ((SV *)CvPADLIST (cv)); 514 PUSHs ((SV *)CvPADLIST (cv));
429 PUSHs (INT2PTR (SV *, CvDEPTH (cv))); 515 PUSHs (INT2PTR (SV *, CvDEPTH (cv)));
430 PUSHs ((SV *)cv); 516 PUSHs ((SV *)cv);
… …
433 get_padlist (aTHX_ cv); 519 get_padlist (aTHX_ cv);
434 } 520 }
435 } 521 }
436 } 522 }
437 523
438 if (top_si->si_type == PERLSI_MAIN) 524 if (expect_true (top_si->si_type == PERLSI_MAIN))
439 break; 525 break;
440 526
441 top_si = top_si->si_prev; 527 top_si = top_si->si_prev;
442 ccstk = top_si->si_cxstack; 528 ccstk = top_si->si_cxstack;
443 cxix = top_si->si_cxix; 529 cxix = top_si->si_cxix;
444 } 530 }
445 531
446 PUTBACK; 532 PUTBACK;
447 } 533 }
448 534
449 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 */
450 c->defsv = c->save & CORO_SAVE_DEFSV ? SvREFCNT_inc (DEFSV) : 0; 536 /* we manually unroll here, as usually 2 slots is enough */
451 c->errsv = c->save & CORO_SAVE_ERRSV ? SvREFCNT_inc (ERRSV) : 0; 537 if (SLOT_COUNT >= 1) CXINC;
452 c->deffh = c->save & CORO_SAVE_DEFFH ? (GV *)SvREFCNT_inc (PL_defoutgv) : 0; 538 if (SLOT_COUNT >= 2) CXINC;
453 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 */
454 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
455#define VAR(name,type)c->name = PL_ ## name; 557 #define VAR(name,type) slot->name = PL_ ## name;
456# include "state.h" 558 # include "state.h"
457#undef VAR 559 #undef VAR
560 }
458} 561}
459 562
460/* 563/*
461 * allocate various perl stacks. This is an exact copy 564 * allocate various perl stacks. This is an exact copy
462 * of perl.c:init_stacks, except that it uses less memory 565 * of perl.c:init_stacks, except that it uses less memory
… …
467# define coro_init_stacks init_stacks 570# define coro_init_stacks init_stacks
468#else 571#else
469static void 572static void
470coro_init_stacks (pTHX) 573coro_init_stacks (pTHX)
471{ 574{
472 PL_curstackinfo = new_stackinfo(64, 6); 575 PL_curstackinfo = new_stackinfo(32, 8);
473 PL_curstackinfo->si_type = PERLSI_MAIN; 576 PL_curstackinfo->si_type = PERLSI_MAIN;
474 PL_curstack = PL_curstackinfo->si_stack; 577 PL_curstack = PL_curstackinfo->si_stack;
475 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 578 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
476 579
477 PL_stack_base = AvARRAY(PL_curstack); 580 PL_stack_base = AvARRAY(PL_curstack);
478 PL_stack_sp = PL_stack_base; 581 PL_stack_sp = PL_stack_base;
479 PL_stack_max = PL_stack_base + AvMAX(PL_curstack); 582 PL_stack_max = PL_stack_base + AvMAX(PL_curstack);
480 583
481 New(50,PL_tmps_stack,64,SV*); 584 New(50,PL_tmps_stack,32,SV*);
482 PL_tmps_floor = -1; 585 PL_tmps_floor = -1;
483 PL_tmps_ix = -1; 586 PL_tmps_ix = -1;
484 PL_tmps_max = 64; 587 PL_tmps_max = 32;
485 588
486 New(54,PL_markstack,16,I32); 589 New(54,PL_markstack,16,I32);
487 PL_markstack_ptr = PL_markstack; 590 PL_markstack_ptr = PL_markstack;
488 PL_markstack_max = PL_markstack + 16; 591 PL_markstack_max = PL_markstack + 16;
489 592
490#ifdef SET_MARK_OFFSET 593#ifdef SET_MARK_OFFSET
491 SET_MARK_OFFSET; 594 SET_MARK_OFFSET;
492#endif 595#endif
493 596
494 New(54,PL_scopestack,16,I32); 597 New(54,PL_scopestack,8,I32);
495 PL_scopestack_ix = 0; 598 PL_scopestack_ix = 0;
496 PL_scopestack_max = 16; 599 PL_scopestack_max = 8;
497 600
498 New(54,PL_savestack,64,ANY); 601 New(54,PL_savestack,24,ANY);
499 PL_savestack_ix = 0; 602 PL_savestack_ix = 0;
500 PL_savestack_max = 64; 603 PL_savestack_max = 24;
501 604
502#if !PERL_VERSION_ATLEAST (5,9,0) 605#if !PERL_VERSION_ATLEAST (5,10,0)
503 New(54,PL_retstack,4,OP*); 606 New(54,PL_retstack,4,OP*);
504 PL_retstack_ix = 0; 607 PL_retstack_ix = 0;
505 PL_retstack_max = 4; 608 PL_retstack_max = 4;
506#endif 609#endif
507} 610}
… …
511 * destroy the stacks, the callchain etc... 614 * destroy the stacks, the callchain etc...
512 */ 615 */
513static void 616static void
514coro_destroy_stacks (pTHX) 617coro_destroy_stacks (pTHX)
515{ 618{
516 if (!IN_DESTRUCT)
517 {
518 /* restore all saved variables and stuff */
519 LEAVE_SCOPE (0);
520 assert (PL_tmps_floor == -1);
521
522 /* free all temporaries */
523 FREETMPS;
524 assert (PL_tmps_ix == -1);
525
526 /* unwind all extra stacks */
527 POPSTACK_TO (PL_mainstack);
528
529 /* unwind main stack */
530 dounwind (-1);
531 }
532
533 while (PL_curstackinfo->si_next) 619 while (PL_curstackinfo->si_next)
534 PL_curstackinfo = PL_curstackinfo->si_next; 620 PL_curstackinfo = PL_curstackinfo->si_next;
535 621
536 while (PL_curstackinfo) 622 while (PL_curstackinfo)
537 { 623 {
… …
547 633
548 Safefree (PL_tmps_stack); 634 Safefree (PL_tmps_stack);
549 Safefree (PL_markstack); 635 Safefree (PL_markstack);
550 Safefree (PL_scopestack); 636 Safefree (PL_scopestack);
551 Safefree (PL_savestack); 637 Safefree (PL_savestack);
552#if !PERL_VERSION_ATLEAST (5,9,0) 638#if !PERL_VERSION_ATLEAST (5,10,0)
553 Safefree (PL_retstack); 639 Safefree (PL_retstack);
554#endif 640#endif
555} 641}
556 642
557static size_t 643static size_t
558coro_rss (struct coro *coro) 644coro_rss (pTHX_ struct coro *coro)
559{ 645{
560 size_t rss = sizeof (coro); 646 size_t rss = sizeof (*coro);
561 647
562 if (coro->mainstack) 648 if (coro->mainstack)
563 { 649 {
650 perl_slots tmp_slot;
651 perl_slots *slot;
652
564 if (coro->flags & CF_RUNNING) 653 if (coro->flags & CF_RUNNING)
565 { 654 {
655 slot = &tmp_slot;
656
566 #define VAR(name,type)coro->name = PL_ ## name; 657 #define VAR(name,type) slot->name = PL_ ## name;
567 # include "state.h" 658 # include "state.h"
568 #undef VAR 659 #undef VAR
569 } 660 }
661 else
662 slot = coro->slot;
570 663
571 rss += sizeof (coro->curstackinfo); 664 rss += sizeof (slot->curstackinfo);
572 rss += sizeof (struct xpvav) + (1 + AvFILL (coro->curstackinfo->si_stack)) * sizeof (SV *);
573 rss += (coro->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT); 665 rss += (slot->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT);
574 rss += sizeof (struct xpvav) + (1 + AvFILL (coro->curstack)) * sizeof (SV *); 666 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (slot->curstack)) * sizeof (SV *);
575 rss += coro->tmps_max * sizeof (SV *); 667 rss += slot->tmps_max * sizeof (SV *);
576 rss += (coro->markstack_max - coro->markstack_ptr) * sizeof (I32); 668 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32);
577 rss += coro->scopestack_max * sizeof (I32); 669 rss += slot->scopestack_max * sizeof (I32);
578 rss += coro->savestack_max * sizeof (ANY); 670 rss += slot->savestack_max * sizeof (ANY);
579 671
580#if !PERL_VERSION_ATLEAST (5,9,0) 672#if !PERL_VERSION_ATLEAST (5,10,0)
581 rss += coro->retstack_max * sizeof (OP *); 673 rss += slot->retstack_max * sizeof (OP *);
582#endif 674#endif
583 } 675 }
584 676
585 return rss; 677 return rss;
586} 678}
587 679
588/** coroutine stack handling ************************************************/ 680/** coroutine stack handling ************************************************/
589 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
590static void 732static void
591setup_coro (pTHX_ struct coro *coro) 733coro_setup (pTHX_ struct coro *coro)
592{ 734{
593 /* 735 /*
594 * emulate part of the perl startup here. 736 * emulate part of the perl startup here.
595 */ 737 */
596 coro_init_stacks (aTHX); 738 coro_init_stacks (aTHX);
597 739
740 PL_runops = RUNOPS_DEFAULT;
598 PL_curcop = &PL_compiling; 741 PL_curcop = &PL_compiling;
599 PL_in_eval = EVAL_NULL; 742 PL_in_eval = EVAL_NULL;
600 PL_comppad = 0; 743 PL_comppad = 0;
601 PL_curpm = 0; 744 PL_curpm = 0;
745 PL_curpad = 0;
602 PL_localizing = 0; 746 PL_localizing = 0;
603 PL_dirty = 0; 747 PL_dirty = 0;
604 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);
605 763
606 { 764 {
607 dSP; 765 dSP;
608 LOGOP myop; 766 LOGOP myop;
609 767
610 SvREFCNT_dec (GvAV (PL_defgv));
611 GvAV (PL_defgv) = coro->args; coro->args = 0;
612
613 Zero (&myop, 1, LOGOP); 768 Zero (&myop, 1, LOGOP);
614 myop.op_next = Nullop; 769 myop.op_next = Nullop;
615 myop.op_flags = OPf_WANT_VOID; 770 myop.op_flags = OPf_WANT_VOID;
616 771
617 PUSHMARK (SP); 772 PUSHMARK (SP);
618 XPUSHs (av_shift (GvAV (PL_defgv))); 773 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv))));
619 PUTBACK; 774 PUTBACK;
620 PL_op = (OP *)&myop; 775 PL_op = (OP *)&myop;
621 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 776 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
622 SPAGAIN; 777 SPAGAIN;
623 } 778 }
624 779
625 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);
626} 822}
627 823
628static void 824static void
629free_coro_mortal (pTHX) 825free_coro_mortal (pTHX)
630{ 826{
631 if (coro_mortal) 827 if (expect_true (coro_mortal))
632 { 828 {
633 SvREFCNT_dec (coro_mortal); 829 SvREFCNT_dec (coro_mortal);
634 coro_mortal = 0; 830 coro_mortal = 0;
635 } 831 }
636} 832}
637 833
638static int 834static int
639runops_coro (pTHX) 835runops_trace (pTHX)
640{ 836{
641 COP *oldcop = 0; 837 COP *oldcop = 0;
642 int oldcxix = -2; 838 int oldcxix = -2;
839 struct coro *coro = SvSTATE (coro_current); /* trace cctx is tied to specific coro */
840 coro_cctx *cctx = coro->cctx;
643 841
644 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX))) 842 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX)))
645 { 843 {
646 PERL_ASYNC_CHECK (); 844 PERL_ASYNC_CHECK ();
647 845
648 if (PL_op->op_type == OP_LEAVESUB) 846 if (cctx->flags & CC_TRACE_ALL)
649 { 847 {
650 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 848 if (PL_op->op_type == OP_LEAVESUB && cctx->flags & CC_TRACE_SUB)
651 SV **bot, **top;
652 AV *av = newAV (); /* return values */
653 runops_proc_t old_runops = PL_runops;
654 dSP;
655 ENTER;
656 SAVETMPS;
657 EXTEND (SP, 3);
658 PL_runops = RUNOPS_DEFAULT;
659
660 GV *gv = CvGV (cx->blk_sub.cv);
661 SV *fullname = sv_2mortal (newSV (0));
662 if (isGV (gv))
663 gv_efullname3 (fullname, gv, 0);
664
665 bot = PL_stack_base + cx->blk_oldsp + 1;
666 top = cx->blk_gimme == G_ARRAY ? SP + 1
667 : cx->blk_gimme == G_SCALAR ? bot + 1
668 : bot;
669
670 while (bot < top)
671 av_push (av, SvREFCNT_inc (*bot++));
672
673 PUSHMARK (SP);
674 PUSHs (&PL_sv_no);
675 PUSHs (fullname);
676 PUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
677 PUTBACK;
678 call_pv ("Coro::_do_trace_sub", G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
679 SPAGAIN;
680
681 FREETMPS;
682 LEAVE;
683 PL_runops = old_runops;
684 }
685
686 if (oldcop != PL_curcop)
687 {
688 oldcop = PL_curcop;
689
690 if (PL_curcop != &PL_compiling)
691 { 849 {
692 runops_proc_t old_runops = PL_runops; 850 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
851 SV **bot, **top;
852 AV *av = newAV (); /* return values */
853 SV **cb;
693 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;
694 ENTER; 871 ENTER;
695 SAVETMPS; 872 SAVETMPS;
696 EXTEND (SP, 3); 873 EXTEND (SP, 3);
697 PL_runops = RUNOPS_DEFAULT;
698
699 if (oldcxix != cxstack_ix)
700 {
701 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
702
703 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
704 {
705 GV *gv = CvGV (cx->blk_sub.cv);
706 SV *fullname = sv_2mortal (newSV (0));
707 if (isGV (gv))
708 gv_efullname3 (fullname, gv, 0);
709
710 PUSHMARK (SP);
711 PUSHs (&PL_sv_yes);
712 PUSHs (fullname);
713 PUSHs (cx->blk_sub.hasargs ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef);
714 PUTBACK;
715 call_pv ("Coro::_do_trace_sub", G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
716 SPAGAIN;
717 }
718
719 oldcxix = cxstack_ix;
720 }
721
722 if (0) {
723 PUSHMARK (SP); 874 PUSHMARK (SP);
724 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0))); 875 PUSHs (&PL_sv_no);
725 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop)))); 876 PUSHs (fullname);
877 PUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
726 PUTBACK; 878 PUTBACK;
879 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
727 call_pv ("Coro::_do_trace_line", G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 880 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
728 SPAGAIN; 881 SPAGAIN;
729 }
730
731 FREETMPS; 882 FREETMPS;
732 LEAVE; 883 LEAVE;
733 PL_runops = old_runops; 884 PL_runops = runops_trace;
885 }
886
887 if (oldcop != PL_curcop)
888 {
889 oldcop = PL_curcop;
890
891 if (PL_curcop != &PL_compiling)
892 {
893 SV **cb;
894
895 if (oldcxix != cxstack_ix && cctx->flags & CC_TRACE_SUB)
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;
903 GV *gv = CvGV (cx->blk_sub.cv);
904 SV *fullname = sv_2mortal (newSV (0));
905
906 if (isGV (gv))
907 gv_efullname3 (fullname, gv, 0);
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;
938 PUSHMARK (SP);
939 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0)));
940 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop))));
941 PUTBACK;
942 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_line_cb", sizeof ("_trace_line_cb") - 1, 0);
943 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
944 SPAGAIN;
945 FREETMPS;
946 LEAVE;
947 PL_runops = runops_trace;
948 }
949 }
734 } 950 }
735 } 951 }
736 } 952 }
737 953
738 TAINT_NOT; 954 TAINT_NOT;
… …
741 957
742/* 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 */
743/* _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 */
744/* during execution of a perl program */ 960/* during execution of a perl program */
745static void NOINLINE 961static void NOINLINE
746prepare_cctx (pTHX_ coro_cctx *cctx) 962cctx_prepare (pTHX_ coro_cctx *cctx)
747{ 963{
748 dSP; 964 dSP;
749 LOGOP myop; 965 LOGOP myop;
750 966
751 PL_top_env = &PL_start_env; 967 PL_top_env = &PL_start_env;
752 968
753 if (cctx->flags & CC_TRACE) 969 if (cctx->flags & CC_TRACE)
754 PL_runops = runops_coro; 970 PL_runops = runops_trace;
755 971
756 Zero (&myop, 1, LOGOP); 972 Zero (&myop, 1, LOGOP);
757 myop.op_next = PL_op; 973 myop.op_next = PL_op;
758 myop.op_flags = OPf_WANT_VOID | OPf_STACKED; 974 myop.op_flags = OPf_WANT_VOID | OPf_STACKED;
759 975
… …
769 985
770/* 986/*
771 * this is a _very_ stripped down perl interpreter ;) 987 * this is a _very_ stripped down perl interpreter ;)
772 */ 988 */
773static void 989static void
774coro_run (void *arg) 990cctx_run (void *arg)
775{ 991{
776 dTHX; 992 dTHX;
777 993
778 /* coro_run is the alternative tail of transfer(), so unlock here. */ 994 /* cctx_run is the alternative tail of transfer(), so unlock here. */
779 UNLOCK; 995 UNLOCK;
780 996
781 /* we now skip the entersub that lead to transfer() */ 997 /* we now skip the entersub that lead to transfer() */
782 PL_op = PL_op->op_next; 998 PL_op = PL_op->op_next;
783 999
784 /* inject a fake subroutine call to cctx_init */ 1000 /* inject a fake subroutine call to cctx_init */
785 prepare_cctx (aTHX_ (coro_cctx *)arg); 1001 cctx_prepare (aTHX_ (coro_cctx *)arg);
786 1002
787 /* 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 */
788 PL_restartop = PL_op; 1004 PL_restartop = PL_op;
789 perl_run (PL_curinterp); 1005 perl_run (PL_curinterp);
790 1006
… …
809 ++cctx_count; 1025 ++cctx_count;
810 1026
811 Newz (0, cctx, 1, coro_cctx); 1027 Newz (0, cctx, 1, coro_cctx);
812 1028
813#if HAVE_MMAP 1029#if HAVE_MMAP
814
815 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;
816 /* mmap supposedly does allocate-on-write for us */ 1031 /* mmap supposedly does allocate-on-write for us */
817 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);
818 1033
819 if (cctx->sptr != (void *)-1) 1034 if (cctx->sptr != (void *)-1)
… …
840 stack_start = cctx->sptr; 1055 stack_start = cctx->sptr;
841 stack_size = cctx->ssize; 1056 stack_size = cctx->ssize;
842 } 1057 }
843 1058
844 REGISTER_STACK (cctx, (char *)stack_start, (char *)stack_start + stack_size); 1059 REGISTER_STACK (cctx, (char *)stack_start, (char *)stack_start + stack_size);
845 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);
846 1061
847 return cctx; 1062 return cctx;
848} 1063}
849 1064
850static void 1065static void
… …
867 Safefree (cctx->sptr); 1082 Safefree (cctx->sptr);
868 1083
869 Safefree (cctx); 1084 Safefree (cctx);
870} 1085}
871 1086
1087/* wether this cctx should be destructed */
1088#define CCTX_EXPIRED(cctx) ((cctx)->ssize < coro_stacksize || ((cctx)->flags & CC_NOREUSE))
1089
872static coro_cctx * 1090static coro_cctx *
873cctx_get (pTHX) 1091cctx_get (pTHX)
874{ 1092{
875 while (cctx_first) 1093 while (expect_true (cctx_first))
876 { 1094 {
877 coro_cctx *cctx = cctx_first; 1095 coro_cctx *cctx = cctx_first;
878 cctx_first = cctx->next; 1096 cctx_first = cctx->next;
879 --cctx_idle; 1097 --cctx_idle;
880 1098
881 if (cctx->ssize >= coro_stacksize && !(cctx->flags & CC_NOREUSE)) 1099 if (expect_true (!CCTX_EXPIRED (cctx)))
882 return cctx; 1100 return cctx;
883 1101
884 cctx_destroy (cctx); 1102 cctx_destroy (cctx);
885 } 1103 }
886 1104
… …
889 1107
890static void 1108static void
891cctx_put (coro_cctx *cctx) 1109cctx_put (coro_cctx *cctx)
892{ 1110{
893 /* free another cctx if overlimit */ 1111 /* free another cctx if overlimit */
894 if (cctx_idle >= MAX_IDLE_CCTX) 1112 if (expect_false (cctx_idle >= MAX_IDLE_CCTX))
895 { 1113 {
896 coro_cctx *first = cctx_first; 1114 coro_cctx *first = cctx_first;
897 cctx_first = first->next; 1115 cctx_first = first->next;
898 --cctx_idle; 1116 --cctx_idle;
899 1117
… …
905 cctx_first = cctx; 1123 cctx_first = cctx;
906} 1124}
907 1125
908/** coroutine switching *****************************************************/ 1126/** coroutine switching *****************************************************/
909 1127
910/* never call directly, always through the coro_state_transfer global variable */ 1128static void
1129transfer_check (pTHX_ struct coro *prev, struct coro *next)
1130{
1131 if (expect_true (prev != next))
1132 {
1133 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1134 croak ("Coro::State::transfer called with non-running/new prev Coro::State, but can only transfer from running or new states");
1135
1136 if (expect_false (next->flags & CF_RUNNING))
1137 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states");
1138
1139 if (expect_false (next->flags & CF_DESTROYED))
1140 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states");
1141
1142#if !PERL_VERSION_ATLEAST (5,10,0)
1143 if (expect_false (PL_lex_state != LEX_NOTPARSING))
1144 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version");
1145#endif
1146 }
1147}
1148
1149/* always use the TRANSFER macro */
911static void NOINLINE 1150static void NOINLINE
912transfer (pTHX_ struct coro *prev, struct coro *next) 1151transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
913{ 1152{
914 dSTACKLEVEL; 1153 dSTACKLEVEL;
1154 static volatile int has_throw;
915 1155
916 /* sometimes transfer is only called to set idle_sp */ 1156 /* sometimes transfer is only called to set idle_sp */
917 if (!next) 1157 if (expect_false (!next))
918 { 1158 {
919 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1159 ((coro_cctx *)prev)->idle_sp = STACKLEVEL;
920 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 */
921 } 1161 }
922 else if (prev != next) 1162 else if (expect_true (prev != next))
923 { 1163 {
924 coro_cctx *prev__cctx; 1164 coro_cctx *prev__cctx;
925 1165
926 if (prev->flags & CF_NEW) 1166 if (expect_false (prev->flags & CF_NEW))
927 { 1167 {
928 /* create a new empty context */ 1168 /* create a new empty context */
929 Newz (0, prev->cctx, 1, coro_cctx); 1169 Newz (0, prev->cctx, 1, coro_cctx);
930 prev->flags &= ~CF_NEW; 1170 prev->flags &= ~CF_NEW;
931 prev->flags |= CF_RUNNING; 1171 prev->flags |= CF_RUNNING;
932 } 1172 }
933 1173
934 /*TODO: must not croak here */
935 if (!prev->flags & CF_RUNNING)
936 croak ("Coro::State::transfer called with non-running prev Coro::State, but can only transfer from running states");
937
938 if (next->flags & CF_RUNNING)
939 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states");
940
941 if (next->flags & CF_DESTROYED)
942 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states");
943
944 prev->flags &= ~CF_RUNNING; 1174 prev->flags &= ~CF_RUNNING;
945 next->flags |= CF_RUNNING; 1175 next->flags |= CF_RUNNING;
946 1176
947 LOCK; 1177 LOCK;
948 1178
1179 /* first get rid of the old state */
1180 save_perl (aTHX_ prev);
1181
949 if (next->flags & CF_NEW) 1182 if (expect_false (next->flags & CF_NEW))
950 { 1183 {
951 /* need to start coroutine */ 1184 /* need to start coroutine */
952 next->flags &= ~CF_NEW; 1185 next->flags &= ~CF_NEW;
953 /* first get rid of the old state */
954 save_perl (aTHX_ prev);
955 /* setup coroutine call */ 1186 /* setup coroutine call */
956 setup_coro (aTHX_ next); 1187 coro_setup (aTHX_ next);
957 } 1188 }
958 else 1189 else
959 {
960 /* coroutine already started */
961 save_perl (aTHX_ prev);
962 load_perl (aTHX_ next); 1190 load_perl (aTHX_ next);
963 }
964 1191
965 prev__cctx = prev->cctx; 1192 prev__cctx = prev->cctx;
966 1193
967 /* possibly "free" the cctx */ 1194 /* possibly "free" the cctx */
1195 if (expect_true (
968 if (prev__cctx->idle_sp == STACKLEVEL) 1196 prev__cctx->idle_sp == STACKLEVEL
1197 && !(prev__cctx->flags & CC_TRACE)
1198 && !force_cctx
1199 ))
969 { 1200 {
970 /* 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 */
971 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));
972 1203
973 prev->cctx = 0; 1204 prev->cctx = 0;
974 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
975 cctx_put (prev__cctx); 1212 cctx_put (prev__cctx);
976 } 1213 }
977 1214
1215 ++next->usecount;
1216
978 if (!next->cctx) 1217 if (expect_true (!next->cctx))
979 next->cctx = cctx_get (aTHX); 1218 next->cctx = cctx_get (aTHX);
980 1219
1220 has_throw = !!next->throw;
1221
981 if (prev__cctx != next->cctx) 1222 if (expect_false (prev__cctx != next->cctx))
982 { 1223 {
983 prev__cctx->top_env = PL_top_env; 1224 prev__cctx->top_env = PL_top_env;
984 PL_top_env = next->cctx->top_env; 1225 PL_top_env = next->cctx->top_env;
985 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1226 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx);
986 } 1227 }
987 1228
988 free_coro_mortal (aTHX); 1229 free_coro_mortal (aTHX);
989 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 }
990 } 1244 }
991} 1245}
992 1246
993struct transfer_args 1247struct transfer_args
994{ 1248{
995 struct coro *prev, *next; 1249 struct coro *prev, *next;
996}; 1250};
997 1251
1252#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
998#define TRANSFER(ta) transfer (aTHX_ (ta).prev, (ta).next) 1253#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
999 1254
1000/** high level stuff ********************************************************/ 1255/** high level stuff ********************************************************/
1001 1256
1002static int 1257static int
1003coro_state_destroy (pTHX_ struct coro *coro) 1258coro_state_destroy (pTHX_ struct coro *coro)
… …
1020 1275
1021 if (coro->mainstack && coro->mainstack != main_mainstack) 1276 if (coro->mainstack && coro->mainstack != main_mainstack)
1022 { 1277 {
1023 struct coro temp; 1278 struct coro temp;
1024 1279
1025 assert (!(coro->flags & CF_RUNNING));
1026
1027 Zero (&temp, 1, struct coro);
1028 temp.save = CORO_SAVE_ALL;
1029
1030 if (coro->flags & CF_RUNNING) 1280 if (coro->flags & CF_RUNNING)
1031 croak ("FATAL: tried to destroy currently running coroutine"); 1281 croak ("FATAL: tried to destroy currently running coroutine");
1032 1282
1033 save_perl (aTHX_ &temp); 1283 save_perl (aTHX_ &temp);
1034 load_perl (aTHX_ coro); 1284 load_perl (aTHX_ coro);
1035 1285
1036 coro_destroy_stacks (aTHX); 1286 coro_destroy (aTHX_ coro);
1037 1287
1038 load_perl (aTHX_ &temp); /* this will get rid of defsv etc.. */ 1288 load_perl (aTHX_ &temp);
1039 1289
1040 coro->mainstack = 0; 1290 coro->slot = 0;
1041 } 1291 }
1042 1292
1043 cctx_destroy (coro->cctx); 1293 cctx_destroy (coro->cctx);
1044 SvREFCNT_dec (coro->args); 1294 SvREFCNT_dec (coro->args);
1045 1295
… …
1086#else 1336#else
1087# define MGf_DUP 0 1337# define MGf_DUP 0
1088#endif 1338#endif
1089}; 1339};
1090 1340
1091static struct coro *
1092SvSTATE_ (pTHX_ SV *coro)
1093{
1094 HV *stash;
1095 MAGIC *mg;
1096
1097 if (SvROK (coro))
1098 coro = SvRV (coro);
1099
1100 stash = SvSTASH (coro);
1101 if (stash != coro_stash && stash != coro_state_stash)
1102 {
1103 /* very slow, but rare, check */
1104 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
1105 croak ("Coro::State object required");
1106 }
1107
1108 mg = CORO_MAGIC (coro);
1109 return (struct coro *)mg->mg_ptr;
1110}
1111
1112#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
1113
1114static void 1341static void
1115prepare_transfer (pTHX_ struct transfer_args *ta, SV *prev_sv, SV *next_sv) 1342prepare_transfer (pTHX_ struct transfer_args *ta, SV *prev_sv, SV *next_sv)
1116{ 1343{
1117 ta->prev = SvSTATE (prev_sv); 1344 ta->prev = SvSTATE (prev_sv);
1118 ta->next = SvSTATE (next_sv); 1345 ta->next = SvSTATE (next_sv);
1346 TRANSFER_CHECK (*ta);
1119} 1347}
1120 1348
1121static void 1349static void
1122api_transfer (SV *prev_sv, SV *next_sv) 1350api_transfer (SV *prev_sv, SV *next_sv)
1123{ 1351{
1124 dTHX; 1352 dTHX;
1125 struct transfer_args ta; 1353 struct transfer_args ta;
1126 1354
1127 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1355 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1128 TRANSFER (ta); 1356 TRANSFER (ta, 1);
1129}
1130
1131static int
1132api_save (SV *coro_sv, int new_save)
1133{
1134 dTHX;
1135 struct coro *coro = SvSTATE (coro_sv);
1136 int old_save = coro->save;
1137
1138 if (new_save >= 0)
1139 coro->save = new_save;
1140
1141 return old_save;
1142} 1357}
1143 1358
1144/** Coro ********************************************************************/ 1359/** Coro ********************************************************************/
1145 1360
1146static void 1361static void
… …
1148{ 1363{
1149 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);
1150} 1365}
1151 1366
1152static SV * 1367static SV *
1153coro_deq (pTHX_ int min_prio) 1368coro_deq (pTHX)
1154{ 1369{
1155 int prio = PRIO_MAX - PRIO_MIN; 1370 int prio;
1156 1371
1157 min_prio -= PRIO_MIN;
1158 if (min_prio < 0)
1159 min_prio = 0;
1160
1161 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= min_prio; ) 1372 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; )
1162 if (AvFILLp (coro_ready [prio]) >= 0) 1373 if (AvFILLp (coro_ready [prio]) >= 0)
1163 return av_shift (coro_ready [prio]); 1374 return av_shift (coro_ready [prio]);
1164 1375
1165 return 0; 1376 return 0;
1166} 1377}
… …
1202 SV *prev_sv, *next_sv; 1413 SV *prev_sv, *next_sv;
1203 1414
1204 for (;;) 1415 for (;;)
1205 { 1416 {
1206 LOCK; 1417 LOCK;
1207 next_sv = coro_deq (aTHX_ PRIO_MIN); 1418 next_sv = coro_deq (aTHX);
1208 1419
1209 /* nothing to schedule: call the idle handler */ 1420 /* nothing to schedule: call the idle handler */
1210 if (!next_sv) 1421 if (expect_false (!next_sv))
1211 { 1422 {
1212 dSP; 1423 dSP;
1213 UNLOCK; 1424 UNLOCK;
1214 1425
1215 ENTER; 1426 ENTER;
1216 SAVETMPS; 1427 SAVETMPS;
1217 1428
1218 PUSHMARK (SP); 1429 PUSHMARK (SP);
1219 PUTBACK; 1430 PUTBACK;
1220 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD); 1431 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD);
1432 SPAGAIN;
1221 1433
1222 FREETMPS; 1434 FREETMPS;
1223 LEAVE; 1435 LEAVE;
1224 continue; 1436 continue;
1225 } 1437 }
1226 1438
1227 ta->next = SvSTATE (next_sv); 1439 ta->next = SvSTATE (next_sv);
1228 1440
1229 /* cannot transfer to destroyed coros, skip and look for next */ 1441 /* cannot transfer to destroyed coros, skip and look for next */
1230 if (ta->next->flags & CF_DESTROYED) 1442 if (expect_false (ta->next->flags & CF_DESTROYED))
1231 { 1443 {
1232 UNLOCK; 1444 UNLOCK;
1233 SvREFCNT_dec (next_sv); 1445 SvREFCNT_dec (next_sv);
1234 /* coro_nready is already taken care of by destroy */ 1446 /* coro_nready is already taken care of by destroy */
1235 continue; 1447 continue;
… …
1240 break; 1452 break;
1241 } 1453 }
1242 1454
1243 /* free this only after the transfer */ 1455 /* free this only after the transfer */
1244 prev_sv = SvRV (coro_current); 1456 prev_sv = SvRV (coro_current);
1245 SvRV_set (coro_current, next_sv);
1246 ta->prev = SvSTATE (prev_sv); 1457 ta->prev = SvSTATE (prev_sv);
1247 1458 TRANSFER_CHECK (*ta);
1248 assert (ta->next->flags & CF_READY); 1459 assert (ta->next->flags & CF_READY);
1249 ta->next->flags &= ~CF_READY; 1460 ta->next->flags &= ~CF_READY;
1461 SvRV_set (coro_current, next_sv);
1250 1462
1251 LOCK; 1463 LOCK;
1252 free_coro_mortal (aTHX); 1464 free_coro_mortal (aTHX);
1253 coro_mortal = prev_sv; 1465 coro_mortal = prev_sv;
1254 UNLOCK; 1466 UNLOCK;
… …
1280{ 1492{
1281 dTHX; 1493 dTHX;
1282 struct transfer_args ta; 1494 struct transfer_args ta;
1283 1495
1284 prepare_schedule (aTHX_ &ta); 1496 prepare_schedule (aTHX_ &ta);
1285 TRANSFER (ta); 1497 TRANSFER (ta, 1);
1286} 1498}
1287 1499
1288static int 1500static int
1289api_cede (void) 1501api_cede (void)
1290{ 1502{
1291 dTHX; 1503 dTHX;
1292 struct transfer_args ta; 1504 struct transfer_args ta;
1293 1505
1294 prepare_cede (aTHX_ &ta); 1506 prepare_cede (aTHX_ &ta);
1295 1507
1296 if (ta.prev != ta.next) 1508 if (expect_true (ta.prev != ta.next))
1297 { 1509 {
1298 TRANSFER (ta); 1510 TRANSFER (ta, 1);
1299 return 1; 1511 return 1;
1300 } 1512 }
1301 else 1513 else
1302 return 0; 1514 return 0;
1303} 1515}
… …
1308 dTHX; 1520 dTHX;
1309 struct transfer_args ta; 1521 struct transfer_args ta;
1310 1522
1311 if (prepare_cede_notself (aTHX_ &ta)) 1523 if (prepare_cede_notself (aTHX_ &ta))
1312 { 1524 {
1313 TRANSFER (ta); 1525 TRANSFER (ta, 1);
1314 return 1; 1526 return 1;
1315 } 1527 }
1316 else 1528 else
1317 return 0; 1529 return 0;
1318} 1530}
1319 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
1320MODULE = Coro::State PACKAGE = Coro::State 1558MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
1321 1559
1322PROTOTYPES: DISABLE 1560PROTOTYPES: DISABLE
1323 1561
1324BOOT: 1562BOOT:
1325{ 1563{
1326#ifdef USE_ITHREADS 1564#ifdef USE_ITHREADS
1327 MUTEX_INIT (&coro_mutex); 1565 MUTEX_INIT (&coro_mutex);
1328#endif 1566#endif
1329 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));
1330 1580
1331 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 1581 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
1332 1582
1333 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE)); 1583 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
1334 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB)); 1584 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));
1335 newCONSTSUB (coro_state_stash, "CC_TRACE_LINE", newSViv (CC_TRACE_LINE)); 1585 newCONSTSUB (coro_state_stash, "CC_TRACE_LINE", newSViv (CC_TRACE_LINE));
1336 newCONSTSUB (coro_state_stash, "CC_TRACE_ALL" , newSViv (CC_TRACE_ALL)); 1586 newCONSTSUB (coro_state_stash, "CC_TRACE_ALL" , newSViv (CC_TRACE_ALL));
1337 1587
1338 newCONSTSUB (coro_state_stash, "SAVE_DEFAV", newSViv (CORO_SAVE_DEFAV));
1339 newCONSTSUB (coro_state_stash, "SAVE_DEFSV", newSViv (CORO_SAVE_DEFSV));
1340 newCONSTSUB (coro_state_stash, "SAVE_ERRSV", newSViv (CORO_SAVE_ERRSV));
1341 newCONSTSUB (coro_state_stash, "SAVE_IRSSV", newSViv (CORO_SAVE_IRSSV));
1342 newCONSTSUB (coro_state_stash, "SAVE_DEFFH", newSViv (CORO_SAVE_DEFFH));
1343 newCONSTSUB (coro_state_stash, "SAVE_DEF", newSViv (CORO_SAVE_DEF));
1344 newCONSTSUB (coro_state_stash, "SAVE_ALL", newSViv (CORO_SAVE_ALL));
1345
1346 main_mainstack = PL_mainstack; 1588 main_mainstack = PL_mainstack;
1347 main_top_env = PL_top_env; 1589 main_top_env = PL_top_env;
1348 1590
1349 while (main_top_env->je_prev) 1591 while (main_top_env->je_prev)
1350 main_top_env = main_top_env->je_prev; 1592 main_top_env = main_top_env->je_prev;
1351 1593
1352 coroapi.ver = CORO_API_VERSION; 1594 coroapi.ver = CORO_API_VERSION;
1595 coroapi.rev = CORO_API_REVISION;
1353 coroapi.transfer = api_transfer; 1596 coroapi.transfer = api_transfer;
1354 1597
1355 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 1598 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL));
1356} 1599}
1357 1600
1358SV * 1601SV *
1359new (char *klass, ...) 1602new (char *klass, ...)
1360 CODE: 1603 CODE:
1361{ 1604{
1362 struct coro *coro; 1605 struct coro *coro;
1606 MAGIC *mg;
1363 HV *hv; 1607 HV *hv;
1364 int i; 1608 int i;
1365 1609
1366 Newz (0, coro, 1, struct coro); 1610 Newz (0, coro, 1, struct coro);
1367 coro->args = newAV (); 1611 coro->args = newAV ();
1368 coro->save = CORO_SAVE_DEF;
1369 coro->flags = CF_NEW; 1612 coro->flags = CF_NEW;
1370 1613
1371 if (coro_first) coro_first->prev = coro; 1614 if (coro_first) coro_first->prev = coro;
1372 coro->next = coro_first; 1615 coro->next = coro_first;
1373 coro_first = coro; 1616 coro_first = coro;
1374 1617
1375 coro->hv = hv = newHV (); 1618 coro->hv = hv = newHV ();
1376 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;
1377 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 1621 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
1378 1622
1623 av_extend (coro->args, items - 1);
1379 for (i = 1; i < items; i++) 1624 for (i = 1; i < items; i++)
1380 av_push (coro->args, newSVsv (ST (i))); 1625 av_push (coro->args, newSVsv (ST (i)));
1381} 1626}
1382 OUTPUT: 1627 OUTPUT:
1383 RETVAL 1628 RETVAL
1384 1629
1385int 1630# these not obviously related functions are all rolled into the same xs
1386save (SV *coro, int new_save = -1) 1631# function to increase chances that they all will call transfer with the same
1387 CODE: 1632# stack offset
1388 RETVAL = api_save (coro, new_save);
1389 OUTPUT:
1390 RETVAL
1391
1392int
1393save_also (SV *coro_sv, int save_also)
1394 CODE:
1395{
1396 struct coro *coro = SvSTATE (coro_sv);
1397 RETVAL = coro->save;
1398 coro->save |= save_also;
1399}
1400 OUTPUT:
1401 RETVAL
1402
1403void 1633void
1404_set_stacklevel (...) 1634_set_stacklevel (...)
1405 ALIAS: 1635 ALIAS:
1406 Coro::State::transfer = 1 1636 Coro::State::transfer = 1
1407 Coro::schedule = 2 1637 Coro::schedule = 2
… …
1409 Coro::cede_notself = 4 1639 Coro::cede_notself = 4
1410 CODE: 1640 CODE:
1411{ 1641{
1412 struct transfer_args ta; 1642 struct transfer_args ta;
1413 1643
1644 PUTBACK;
1414 switch (ix) 1645 switch (ix)
1415 { 1646 {
1416 case 0: 1647 case 0:
1417 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0))); 1648 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0)));
1418 ta.next = 0; 1649 ta.next = 0;
… …
1437 if (!prepare_cede_notself (aTHX_ &ta)) 1668 if (!prepare_cede_notself (aTHX_ &ta))
1438 XSRETURN_EMPTY; 1669 XSRETURN_EMPTY;
1439 1670
1440 break; 1671 break;
1441 } 1672 }
1673 SPAGAIN;
1442 1674
1443 BARRIER; 1675 BARRIER;
1676 PUTBACK;
1444 TRANSFER (ta); 1677 TRANSFER (ta, 0);
1445 1678 SPAGAIN; /* might be the sp of a different coroutine now */
1446 if (GIMME_V != G_VOID && ta.next != ta.prev) 1679 /* be extra careful not to ever do anything after TRANSFER */
1447 XSRETURN_YES;
1448} 1680}
1449 1681
1450bool 1682bool
1451_destroy (SV *coro_sv) 1683_destroy (SV *coro_sv)
1452 CODE: 1684 CODE:
… …
1501 CODE: 1733 CODE:
1502{ 1734{
1503 if (coro->mainstack) 1735 if (coro->mainstack)
1504 { 1736 {
1505 struct coro temp; 1737 struct coro temp;
1506 Zero (&temp, 1, struct coro);
1507 temp.save = CORO_SAVE_ALL;
1508 1738
1509 if (!(coro->flags & CF_RUNNING)) 1739 if (!(coro->flags & CF_RUNNING))
1510 { 1740 {
1741 PUTBACK;
1511 save_perl (aTHX_ &temp); 1742 save_perl (aTHX_ &temp);
1512 load_perl (aTHX_ coro); 1743 load_perl (aTHX_ coro);
1513 } 1744 }
1514 1745
1515 { 1746 {
1516 dSP; 1747 dSP;
1517 ENTER; 1748 ENTER;
1518 SAVETMPS; 1749 SAVETMPS;
1750 PUTBACK;
1751 PUSHSTACK;
1519 PUSHMARK (SP); 1752 PUSHMARK (SP);
1520 PUTBACK; 1753
1521 if (ix) 1754 if (ix)
1522 eval_sv (coderef, 0); 1755 eval_sv (coderef, 0);
1523 else 1756 else
1524 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;
1525 SPAGAIN; 1760 SPAGAIN;
1526 FREETMPS; 1761 FREETMPS;
1527 LEAVE; 1762 LEAVE;
1528 PUTBACK; 1763 PUTBACK;
1529 } 1764 }
1530 1765
1531 if (!(coro->flags & CF_RUNNING)) 1766 if (!(coro->flags & CF_RUNNING))
1532 { 1767 {
1533 save_perl (aTHX_ coro); 1768 save_perl (aTHX_ coro);
1534 load_perl (aTHX_ &temp); 1769 load_perl (aTHX_ &temp);
1770 SPAGAIN;
1535 } 1771 }
1536 } 1772 }
1537} 1773}
1538 1774
1539SV * 1775SV *
1540is_ready (Coro::State coro) 1776is_ready (Coro::State coro)
1541 PROTOTYPE: $ 1777 PROTOTYPE: $
1542 ALIAS: 1778 ALIAS:
1543 is_ready = CF_READY 1779 is_ready = CF_READY
… …
1548 RETVAL = boolSV (coro->flags & ix); 1784 RETVAL = boolSV (coro->flags & ix);
1549 OUTPUT: 1785 OUTPUT:
1550 RETVAL 1786 RETVAL
1551 1787
1552void 1788void
1553trace (Coro::State coro, int flags = CC_TRACE | CC_TRACE_SUB) 1789api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
1554 CODE:
1555 if (flags & CC_TRACE)
1556 {
1557 if (!coro->cctx)
1558 coro->cctx = cctx_new ();
1559 else if (!(coro->cctx->flags & CC_TRACE))
1560 croak ("cannot enable tracing on coroutine with custom stack");
1561
1562 coro->cctx->flags |= flags & (CC_TRACE | CC_TRACE_ALL);
1563 }
1564 else
1565 if (coro->cctx && coro->cctx->flags & CC_TRACE)
1566 {
1567 coro->cctx->flags &= ~(CC_TRACE | CC_TRACE_ALL);
1568 coro->cctx->flags |= CC_NOREUSE;
1569 }
1570 1790
1571SV * 1791SV *
1572has_stack (Coro::State coro) 1792has_stack (Coro::State coro)
1573 PROTOTYPE: $ 1793 PROTOTYPE: $
1574 CODE: 1794 CODE:
… …
1585 RETVAL 1805 RETVAL
1586 1806
1587IV 1807IV
1588rss (Coro::State coro) 1808rss (Coro::State coro)
1589 PROTOTYPE: $ 1809 PROTOTYPE: $
1810 ALIAS:
1811 usecount = 1
1590 CODE: 1812 CODE:
1591 RETVAL = coro_rss (coro); 1813 switch (ix)
1814 {
1815 case 0: RETVAL = coro_rss (aTHX_ coro); break;
1816 case 1: RETVAL = coro->usecount; break;
1817 }
1592 OUTPUT: 1818 OUTPUT:
1593 RETVAL 1819 RETVAL
1594 1820
1821void
1822force_cctx ()
1823 CODE:
1824 struct coro *coro = SvSTATE (coro_current);
1825 coro->cctx->idle_sp = 0;
1595 1826
1596MODULE = Coro::State PACKAGE = Coro 1827MODULE = Coro::State PACKAGE = Coro
1597 1828
1598BOOT: 1829BOOT:
1599{ 1830{
1600 int i; 1831 int i;
1601 1832
1602 sv_pool_rss = get_sv ("Coro::POOL_RSS" , TRUE); 1833 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
1603 sv_pool_size = get_sv ("Coro::POOL_SIZE" , TRUE); 1834 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
1604 av_async_pool = get_av ("Coro::async_pool", TRUE); 1835 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
1605 1836
1606 coro_current = get_sv ("Coro::current", FALSE); 1837 coro_current = coro_get_sv (aTHX_ "Coro::current", FALSE);
1607 SvREADONLY_on (coro_current); 1838 SvREADONLY_on (coro_current);
1608 1839
1609 coro_stash = gv_stashpv ("Coro", TRUE); 1840 coro_stash = gv_stashpv ("Coro", TRUE);
1610 1841
1611 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 1842 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
1612 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 1843 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH));
1613 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 1844 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL));
1614 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 1845 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW));
… …
1617 1848
1618 for (i = PRIO_MAX - PRIO_MIN + 1; i--; ) 1849 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
1619 coro_ready[i] = newAV (); 1850 coro_ready[i] = newAV ();
1620 1851
1621 { 1852 {
1622 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 */
1623 1855
1624 coroapi.schedule = api_schedule; 1856 coroapi.schedule = api_schedule;
1625 coroapi.save = api_save;
1626 coroapi.cede = api_cede; 1857 coroapi.cede = api_cede;
1627 coroapi.cede_notself = api_cede_notself; 1858 coroapi.cede_notself = api_cede_notself;
1628 coroapi.ready = api_ready; 1859 coroapi.ready = api_ready;
1629 coroapi.is_ready = api_is_ready; 1860 coroapi.is_ready = api_is_ready;
1630 coroapi.nready = &coro_nready; 1861 coroapi.nready = &coro_nready;
… …
1679 CODE: 1910 CODE:
1680 RETVAL = coro_nready; 1911 RETVAL = coro_nready;
1681 OUTPUT: 1912 OUTPUT:
1682 RETVAL 1913 RETVAL
1683 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
1684# for async_pool speedup 1938# for async_pool speedup
1685void 1939void
1686_pool_1 (SV *cb) 1940_pool_1 (SV *cb)
1687 CODE: 1941 CODE:
1688{ 1942{
1689 int i, len; 1943 struct coro *coro = SvSTATE (coro_current);
1690 HV *hv = (HV *)SvRV (coro_current); 1944 HV *hv = (HV *)SvRV (coro_current);
1691 AV *defav = GvAV (PL_defgv); 1945 AV *defav = GvAV (PL_defgv);
1692 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0); 1946 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
1693 AV *invoke_av; 1947 AV *invoke_av;
1948 int i, len;
1694 1949
1695 if (!invoke) 1950 if (!invoke)
1951 {
1952 SvREFCNT_dec (PL_diehook); PL_diehook = 0;
1696 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);
1697 1958
1698 hv_store (hv, "desc", sizeof ("desc") - 1, 1959 hv_store (hv, "desc", sizeof ("desc") - 1,
1699 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0); 1960 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
1700 1961
1701 invoke_av = (AV *)SvRV (invoke); 1962 invoke_av = (AV *)SvRV (invoke);
… …
1719{ 1980{
1720 struct coro *coro = SvSTATE (coro_current); 1981 struct coro *coro = SvSTATE (coro_current);
1721 1982
1722 sv_setsv (cb, &PL_sv_undef); 1983 sv_setsv (cb, &PL_sv_undef);
1723 1984
1985 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1986 coro->saved_deffh = 0;
1987
1724 if (coro_rss (coro) > SvIV (sv_pool_rss) 1988 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss)
1725 || 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;
1726 croak ("\3terminate\2\n"); 1992 croak ("\3async_pool terminate\2\n");
1993 }
1727 1994
1728 av_clear (GvAV (PL_defgv)); 1995 av_clear (GvAV (PL_defgv));
1729 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1, 1996 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1,
1730 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0); 1997 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
1731 coro->save = CORO_SAVE_DEF; 1998
1732 coro->prio = 0; 1999 coro->prio = 0;
2000
2001 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
2002 api_trace (coro_current, 0);
2003
1733 av_push (av_async_pool, newSVsv (coro_current)); 2004 av_push (av_async_pool, newSVsv (coro_current));
1734} 2005}
1735 2006
1736 2007
1737MODULE = Coro::State PACKAGE = Coro::AIO 2008MODULE = Coro::State PACKAGE = Coro::AIO

Diff Legend

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