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.173 by root, Sun Sep 30 13:41:45 2007 UTC vs.
Revision 1.244 by root, Sun Sep 21 18:29:39 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;
175
176/* Coro::AnyEvent */
177static SV *sv_activity;
141 178
142static struct coro_cctx *cctx_first; 179static struct coro_cctx *cctx_first;
143static int cctx_count, cctx_idle; 180static int cctx_count, cctx_idle;
144 181
145enum { 182enum {
176 CF_READY = 0x0002, /* coroutine is ready */ 213 CF_READY = 0x0002, /* coroutine is ready */
177 CF_NEW = 0x0004, /* has never been switched to */ 214 CF_NEW = 0x0004, /* has never been switched to */
178 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 215 CF_DESTROYED = 0x0008, /* coroutine data has been freed */
179}; 216};
180 217
218/* the structure where most of the perl state is stored, overlaid on the cxstack */
219typedef struct {
220 SV *defsv;
221 AV *defav;
222 SV *errsv;
223 SV *irsgv;
224#define VAR(name,type) type name;
225# include "state.h"
226#undef VAR
227} perl_slots;
228
229#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
230
181/* this is a structure representing a perl-level coroutine */ 231/* this is a structure representing a perl-level coroutine */
182struct coro { 232struct coro {
183 /* the c coroutine allocated to this perl coroutine, if any */ 233 /* the c coroutine allocated to this perl coroutine, if any */
184 coro_cctx *cctx; 234 coro_cctx *cctx;
185 235
236 /* process data */
237 AV *mainstack;
238 perl_slots *slot; /* basically the saved sp */
239
186 /* data associated with this coroutine (initial args) */ 240 AV *args; /* data associated with this coroutine (initial args) */
187 AV *args; 241 int refcnt; /* coroutines are refcounted, yes */
188 int refcnt;
189 int save; /* CORO_SAVE flags */
190 int flags; /* CF_ flags */ 242 int flags; /* CF_ flags */
191 243 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 244
204 /* statistics */ 245 /* statistics */
205 int usecount; /* number of switches to this coro */ 246 int usecount; /* number of transfers to this coro */
206 247
207 /* coro process data */ 248 /* coro process data */
208 int prio; 249 int prio;
250 SV *throw; /* exception to be thrown */
251
252 /* async_pool */
253 SV *saved_deffh;
209 254
210 /* linked list */ 255 /* linked list */
211 struct coro *next, *prev; 256 struct coro *next, *prev;
212 HV *hv; /* the perl hash associated with this coro, if any */
213}; 257};
214 258
215typedef struct coro *Coro__State; 259typedef struct coro *Coro__State;
216typedef struct coro *Coro__State_or_hashref; 260typedef struct coro *Coro__State_or_hashref;
217 261
224#define PRIO_IDLE -3 268#define PRIO_IDLE -3
225#define PRIO_MIN -4 269#define PRIO_MIN -4
226 270
227/* for Coro.pm */ 271/* for Coro.pm */
228static SV *coro_current; 272static SV *coro_current;
273static SV *coro_readyhook;
229static AV *coro_ready [PRIO_MAX-PRIO_MIN+1]; 274static AV *coro_ready [PRIO_MAX-PRIO_MIN+1];
230static int coro_nready; 275static int coro_nready;
231static struct coro *coro_first; 276static struct coro *coro_first;
232 277
233/** lowlevel stuff **********************************************************/ 278/** lowlevel stuff **********************************************************/
234 279
280static SV *
281coro_get_sv (pTHX_ const char *name, int create)
282{
283#if PERL_VERSION_ATLEAST (5,10,0)
284 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
285 get_sv (name, create);
286#endif
287 return get_sv (name, create);
288}
289
290static AV *
291coro_get_av (pTHX_ const char *name, int create)
292{
293#if PERL_VERSION_ATLEAST (5,10,0)
294 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
295 get_av (name, create);
296#endif
297 return get_av (name, create);
298}
299
300static HV *
301coro_get_hv (pTHX_ const char *name, int create)
302{
303#if PERL_VERSION_ATLEAST (5,10,0)
304 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
305 get_hv (name, create);
306#endif
307 return get_hv (name, create);
308}
309
235static AV * 310static AV *
236coro_clone_padlist (pTHX_ CV *cv) 311coro_clone_padlist (pTHX_ CV *cv)
237{ 312{
238 AV *padlist = CvPADLIST (cv); 313 AV *padlist = CvPADLIST (cv);
239 AV *newpadlist, *newpad; 314 AV *newpadlist, *newpad;
240 315
241 newpadlist = newAV (); 316 newpadlist = newAV ();
242 AvREAL_off (newpadlist); 317 AvREAL_off (newpadlist);
243#if PERL_VERSION_ATLEAST (5,9,0) 318#if PERL_VERSION_ATLEAST (5,10,0)
244 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1); 319 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1);
245#else 320#else
246 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 321 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
247#endif 322#endif
248 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 323 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
291 SvREFCNT_dec (av); 366 SvREFCNT_dec (av);
292 367
293 return 0; 368 return 0;
294} 369}
295 370
296#define PERL_MAGIC_coro PERL_MAGIC_ext 371#define CORO_MAGIC_type_cv PERL_MAGIC_ext
372#define CORO_MAGIC_type_state PERL_MAGIC_ext
297 373
298static MGVTBL vtbl_coro = {0, 0, 0, 0, coro_cv_free}; 374static MGVTBL coro_cv_vtbl = {
375 0, 0, 0, 0,
376 coro_cv_free
377};
299 378
300#define CORO_MAGIC(cv) \ 379#define CORO_MAGIC(sv,type) \
301 SvMAGIC (cv) \ 380 SvMAGIC (sv) \
302 ? SvMAGIC (cv)->mg_type == PERL_MAGIC_coro \ 381 ? SvMAGIC (sv)->mg_type == type \
303 ? SvMAGIC (cv) \ 382 ? SvMAGIC (sv) \
304 : mg_find ((SV *)cv, PERL_MAGIC_coro) \ 383 : mg_find (sv, type) \
305 : 0 384 : 0
385
386#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
387#define CORO_MAGIC_state(sv) CORO_MAGIC (((SV *)(sv)), CORO_MAGIC_type_state)
306 388
307static struct coro * 389static struct coro *
308SvSTATE_ (pTHX_ SV *coro) 390SvSTATE_ (pTHX_ SV *coro)
309{ 391{
310 HV *stash; 392 HV *stash;
311 MAGIC *mg; 393 MAGIC *mg;
312 394
313 if (SvROK (coro)) 395 if (SvROK (coro))
314 coro = SvRV (coro); 396 coro = SvRV (coro);
315 397
316 if (SvTYPE (coro) != SVt_PVHV) 398 if (expect_false (SvTYPE (coro) != SVt_PVHV))
317 croak ("Coro::State object required"); 399 croak ("Coro::State object required");
318 400
319 stash = SvSTASH (coro); 401 stash = SvSTASH (coro);
320 if (stash != coro_stash && stash != coro_state_stash) 402 if (expect_false (stash != coro_stash && stash != coro_state_stash))
321 { 403 {
322 /* very slow, but rare, check */ 404 /* very slow, but rare, check */
323 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State")) 405 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
324 croak ("Coro::State object required"); 406 croak ("Coro::State object required");
325 } 407 }
326 408
327 mg = CORO_MAGIC (coro); 409 mg = CORO_MAGIC_state (coro);
328 return (struct coro *)mg->mg_ptr; 410 return (struct coro *)mg->mg_ptr;
329} 411}
330 412
331#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 413#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
332 414
333/* the next two functions merely cache the padlists */ 415/* the next two functions merely cache the padlists */
334static void 416static void
335get_padlist (pTHX_ CV *cv) 417get_padlist (pTHX_ CV *cv)
336{ 418{
337 MAGIC *mg = CORO_MAGIC (cv); 419 MAGIC *mg = CORO_MAGIC_cv (cv);
338 AV *av; 420 AV *av;
339 421
340 if (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0) 422 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0))
341 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 423 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
342 else 424 else
343 { 425 {
344#if CORO_PREFER_PERL_FUNCTIONS 426#if CORO_PREFER_PERL_FUNCTIONS
345 /* this is probably cleaner, but also slower? */ 427 /* this is probably cleaner? but also slower! */
428 /* in practise, it seems to be less stable */
346 CV *cp = Perl_cv_clone (cv); 429 CV *cp = Perl_cv_clone (cv);
347 CvPADLIST (cv) = CvPADLIST (cp); 430 CvPADLIST (cv) = CvPADLIST (cp);
348 CvPADLIST (cp) = 0; 431 CvPADLIST (cp) = 0;
349 SvREFCNT_dec (cp); 432 SvREFCNT_dec (cp);
350#else 433#else
354} 437}
355 438
356static void 439static void
357put_padlist (pTHX_ CV *cv) 440put_padlist (pTHX_ CV *cv)
358{ 441{
359 MAGIC *mg = CORO_MAGIC (cv); 442 MAGIC *mg = CORO_MAGIC_cv (cv);
360 AV *av; 443 AV *av;
361 444
362 if (!mg) 445 if (expect_false (!mg))
363 { 446 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 447
370 av = (AV *)mg->mg_obj; 448 av = (AV *)mg->mg_obj;
371 449
372 if (AvFILLp (av) >= AvMAX (av)) 450 if (expect_false (AvFILLp (av) >= AvMAX (av)))
373 av_extend (av, AvMAX (av) + 1); 451 av_extend (av, AvMAX (av) + 1);
374 452
375 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 453 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
376} 454}
377 455
378/** load & save, init *******************************************************/ 456/** 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 457
385static void 458static void
386load_perl (pTHX_ Coro__State c) 459load_perl (pTHX_ Coro__State c)
387{ 460{
461 perl_slots *slot = c->slot;
462 c->slot = 0;
463
464 PL_mainstack = c->mainstack;
465
466 GvSV (PL_defgv) = slot->defsv;
467 GvAV (PL_defgv) = slot->defav;
468 GvSV (PL_errgv) = slot->errsv;
469 GvSV (irsgv) = slot->irsgv;
470
388#define VAR(name,type) PL_ ## name = c->name; 471 #define VAR(name,type) PL_ ## name = slot->name;
389# include "state.h" 472 # include "state.h"
390#undef VAR 473 #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 474
412 { 475 {
413 dSP; 476 dSP;
477
414 CV *cv; 478 CV *cv;
415 479
416 /* now do the ugly restore mess */ 480 /* now do the ugly restore mess */
417 while ((cv = (CV *)POPs)) 481 while (expect_true (cv = (CV *)POPs))
418 { 482 {
419 put_padlist (aTHX_ cv); /* mark this padlist as available */ 483 put_padlist (aTHX_ cv); /* mark this padlist as available */
420 CvDEPTH (cv) = PTR2IV (POPs); 484 CvDEPTH (cv) = PTR2IV (POPs);
421 CvPADLIST (cv) = (AV *)POPs; 485 CvPADLIST (cv) = (AV *)POPs;
422 } 486 }
441 505
442 XPUSHs (Nullsv); 506 XPUSHs (Nullsv);
443 /* this loop was inspired by pp_caller */ 507 /* this loop was inspired by pp_caller */
444 for (;;) 508 for (;;)
445 { 509 {
446 while (cxix >= 0) 510 while (expect_true (cxix >= 0))
447 { 511 {
448 PERL_CONTEXT *cx = &ccstk[cxix--]; 512 PERL_CONTEXT *cx = &ccstk[cxix--];
449 513
450 if (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT) 514 if (expect_true (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT))
451 { 515 {
452 CV *cv = cx->blk_sub.cv; 516 CV *cv = cx->blk_sub.cv;
453 517
454 if (CvDEPTH (cv)) 518 if (expect_true (CvDEPTH (cv)))
455 { 519 {
456 EXTEND (SP, 3); 520 EXTEND (SP, 3);
457 PUSHs ((SV *)CvPADLIST (cv)); 521 PUSHs ((SV *)CvPADLIST (cv));
458 PUSHs (INT2PTR (SV *, CvDEPTH (cv))); 522 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
459 PUSHs ((SV *)cv); 523 PUSHs ((SV *)cv);
460 524
461 CvDEPTH (cv) = 0; 525 CvDEPTH (cv) = 0;
462 get_padlist (aTHX_ cv); 526 get_padlist (aTHX_ cv);
463 } 527 }
464 } 528 }
465 } 529 }
466 530
467 if (top_si->si_type == PERLSI_MAIN) 531 if (expect_true (top_si->si_type == PERLSI_MAIN))
468 break; 532 break;
469 533
470 top_si = top_si->si_prev; 534 top_si = top_si->si_prev;
471 ccstk = top_si->si_cxstack; 535 ccstk = top_si->si_cxstack;
472 cxix = top_si->si_cxix; 536 cxix = top_si->si_cxix;
473 } 537 }
474 538
475 PUTBACK; 539 PUTBACK;
476 } 540 }
477 541
478 c->defav = c->save & CORO_SAVE_DEFAV ? (AV *)SvREFCNT_inc (GvAV (PL_defgv)) : 0; 542 /* allocate some space on the context stack for our purposes */
479 c->defsv = c->save & CORO_SAVE_DEFSV ? SvREFCNT_inc (DEFSV) : 0; 543 /* we manually unroll here, as usually 2 slots is enough */
480 c->errsv = c->save & CORO_SAVE_ERRSV ? SvREFCNT_inc (ERRSV) : 0; 544 if (SLOT_COUNT >= 1) CXINC;
481 c->deffh = c->save & CORO_SAVE_DEFFH ? (GV *)SvREFCNT_inc (PL_defoutgv) : 0; 545 if (SLOT_COUNT >= 2) CXINC;
482 c->irssv = c->save & CORO_SAVE_IRSSV ? SvREFCNT_inc (PL_rs) : 0; 546 if (SLOT_COUNT >= 3) CXINC;
547 {
548 int i;
549 for (i = 3; i < SLOT_COUNT; ++i)
550 CXINC;
551 }
552 cxstack_ix -= SLOT_COUNT; /* undo allocation */
483 553
554 c->mainstack = PL_mainstack;
555
556 {
557 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
558
559 slot->defav = GvAV (PL_defgv);
560 slot->defsv = DEFSV;
561 slot->errsv = ERRSV;
562 slot->irsgv = GvSV (irsgv);
563
484#define VAR(name,type)c->name = PL_ ## name; 564 #define VAR(name,type) slot->name = PL_ ## name;
485# include "state.h" 565 # include "state.h"
486#undef VAR 566 #undef VAR
567 }
487} 568}
488 569
489/* 570/*
490 * allocate various perl stacks. This is an exact copy 571 * allocate various perl stacks. This is an exact copy
491 * of perl.c:init_stacks, except that it uses less memory 572 * of perl.c:init_stacks, except that it uses less memory
496# define coro_init_stacks init_stacks 577# define coro_init_stacks init_stacks
497#else 578#else
498static void 579static void
499coro_init_stacks (pTHX) 580coro_init_stacks (pTHX)
500{ 581{
501 PL_curstackinfo = new_stackinfo(64, 6); 582 PL_curstackinfo = new_stackinfo(32, 8);
502 PL_curstackinfo->si_type = PERLSI_MAIN; 583 PL_curstackinfo->si_type = PERLSI_MAIN;
503 PL_curstack = PL_curstackinfo->si_stack; 584 PL_curstack = PL_curstackinfo->si_stack;
504 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 585 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
505 586
506 PL_stack_base = AvARRAY(PL_curstack); 587 PL_stack_base = AvARRAY(PL_curstack);
507 PL_stack_sp = PL_stack_base; 588 PL_stack_sp = PL_stack_base;
508 PL_stack_max = PL_stack_base + AvMAX(PL_curstack); 589 PL_stack_max = PL_stack_base + AvMAX(PL_curstack);
509 590
510 New(50,PL_tmps_stack,64,SV*); 591 New(50,PL_tmps_stack,32,SV*);
511 PL_tmps_floor = -1; 592 PL_tmps_floor = -1;
512 PL_tmps_ix = -1; 593 PL_tmps_ix = -1;
513 PL_tmps_max = 64; 594 PL_tmps_max = 32;
514 595
515 New(54,PL_markstack,16,I32); 596 New(54,PL_markstack,16,I32);
516 PL_markstack_ptr = PL_markstack; 597 PL_markstack_ptr = PL_markstack;
517 PL_markstack_max = PL_markstack + 16; 598 PL_markstack_max = PL_markstack + 16;
518 599
519#ifdef SET_MARK_OFFSET 600#ifdef SET_MARK_OFFSET
520 SET_MARK_OFFSET; 601 SET_MARK_OFFSET;
521#endif 602#endif
522 603
523 New(54,PL_scopestack,16,I32); 604 New(54,PL_scopestack,8,I32);
524 PL_scopestack_ix = 0; 605 PL_scopestack_ix = 0;
525 PL_scopestack_max = 16; 606 PL_scopestack_max = 8;
526 607
527 New(54,PL_savestack,64,ANY); 608 New(54,PL_savestack,24,ANY);
528 PL_savestack_ix = 0; 609 PL_savestack_ix = 0;
529 PL_savestack_max = 64; 610 PL_savestack_max = 24;
530 611
531#if !PERL_VERSION_ATLEAST (5,9,0) 612#if !PERL_VERSION_ATLEAST (5,10,0)
532 New(54,PL_retstack,4,OP*); 613 New(54,PL_retstack,4,OP*);
533 PL_retstack_ix = 0; 614 PL_retstack_ix = 0;
534 PL_retstack_max = 4; 615 PL_retstack_max = 4;
535#endif 616#endif
536} 617}
540 * destroy the stacks, the callchain etc... 621 * destroy the stacks, the callchain etc...
541 */ 622 */
542static void 623static void
543coro_destroy_stacks (pTHX) 624coro_destroy_stacks (pTHX)
544{ 625{
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) 626 while (PL_curstackinfo->si_next)
563 PL_curstackinfo = PL_curstackinfo->si_next; 627 PL_curstackinfo = PL_curstackinfo->si_next;
564 628
565 while (PL_curstackinfo) 629 while (PL_curstackinfo)
566 { 630 {
576 640
577 Safefree (PL_tmps_stack); 641 Safefree (PL_tmps_stack);
578 Safefree (PL_markstack); 642 Safefree (PL_markstack);
579 Safefree (PL_scopestack); 643 Safefree (PL_scopestack);
580 Safefree (PL_savestack); 644 Safefree (PL_savestack);
581#if !PERL_VERSION_ATLEAST (5,9,0) 645#if !PERL_VERSION_ATLEAST (5,10,0)
582 Safefree (PL_retstack); 646 Safefree (PL_retstack);
583#endif 647#endif
584} 648}
585 649
586static size_t 650static size_t
587coro_rss (pTHX_ struct coro *coro) 651coro_rss (pTHX_ struct coro *coro)
588{ 652{
589 size_t rss = sizeof (coro); 653 size_t rss = sizeof (*coro);
590 654
591 if (coro->mainstack) 655 if (coro->mainstack)
592 { 656 {
657 perl_slots tmp_slot;
658 perl_slots *slot;
659
593 if (coro->flags & CF_RUNNING) 660 if (coro->flags & CF_RUNNING)
594 { 661 {
662 slot = &tmp_slot;
663
595 #define VAR(name,type)coro->name = PL_ ## name; 664 #define VAR(name,type) slot->name = PL_ ## name;
596 # include "state.h" 665 # include "state.h"
597 #undef VAR 666 #undef VAR
598 } 667 }
668 else
669 slot = coro->slot;
599 670
600 rss += sizeof (coro->curstackinfo); 671 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); 672 rss += (slot->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT);
603 rss += sizeof (struct xpvav) + (1 + AvFILL (coro->curstack)) * sizeof (SV *); 673 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (slot->curstack)) * sizeof (SV *);
604 rss += coro->tmps_max * sizeof (SV *); 674 rss += slot->tmps_max * sizeof (SV *);
605 rss += (coro->markstack_max - coro->markstack_ptr) * sizeof (I32); 675 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32);
606 rss += coro->scopestack_max * sizeof (I32); 676 rss += slot->scopestack_max * sizeof (I32);
607 rss += coro->savestack_max * sizeof (ANY); 677 rss += slot->savestack_max * sizeof (ANY);
608 678
609#if !PERL_VERSION_ATLEAST (5,9,0) 679#if !PERL_VERSION_ATLEAST (5,10,0)
610 rss += coro->retstack_max * sizeof (OP *); 680 rss += slot->retstack_max * sizeof (OP *);
611#endif 681#endif
612 } 682 }
613 683
614 return rss; 684 return rss;
615} 685}
616 686
617/** coroutine stack handling ************************************************/ 687/** coroutine stack handling ************************************************/
618 688
689static int (*orig_sigelem_get) (pTHX_ SV *sv, MAGIC *mg);
690static int (*orig_sigelem_set) (pTHX_ SV *sv, MAGIC *mg);
691static int (*orig_sigelem_clr) (pTHX_ SV *sv, MAGIC *mg);
692
693/* apparently < 5.8.8 */
694#ifndef MgPV_nolen_const
695#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \
696 SvPV_nolen((SV*)((mg)->mg_ptr)) : \
697 (const char*)(mg)->mg_ptr)
698#endif
699
700/*
701 * This overrides the default magic get method of %SIG elements.
702 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
703 * and instead of tryign to save and restore the hash elements, we just provide
704 * readback here.
705 * We only do this when the hook is != 0, as they are often set to 0 temporarily,
706 * not expecting this to actually change the hook. This is a potential problem
707 * when a schedule happens then, but we ignore this.
708 */
709static int
710coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
711{
712 const char *s = MgPV_nolen_const (mg);
713
714 if (*s == '_')
715 {
716 SV **svp = 0;
717
718 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
719 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
720
721 if (svp)
722 {
723 sv_setsv (sv, *svp ? *svp : &PL_sv_undef);
724 return 0;
725 }
726 }
727
728 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
729}
730
731static int
732coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
733{
734 const char *s = MgPV_nolen_const (mg);
735
736 if (*s == '_')
737 {
738 SV **svp = 0;
739
740 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
741 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
742
743 if (svp)
744 {
745 SV *old = *svp;
746 *svp = 0;
747 SvREFCNT_dec (old);
748 return 0;
749 }
750 }
751
752 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
753}
754
755static int
756coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
757{
758 const char *s = MgPV_nolen_const (mg);
759
760 if (*s == '_')
761 {
762 SV **svp = 0;
763
764 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
765 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
766
767 if (svp)
768 {
769 SV *old = *svp;
770 *svp = newSVsv (sv);
771 SvREFCNT_dec (old);
772 return 0;
773 }
774 }
775
776 return orig_sigelem_set ? orig_sigelem_set (aTHX_ sv, mg) : 0;
777}
778
619static void 779static void
620setup_coro (pTHX_ struct coro *coro) 780coro_setup (pTHX_ struct coro *coro)
621{ 781{
622 /* 782 /*
623 * emulate part of the perl startup here. 783 * emulate part of the perl startup here.
624 */ 784 */
625 coro_init_stacks (aTHX); 785 coro_init_stacks (aTHX);
627 PL_runops = RUNOPS_DEFAULT; 787 PL_runops = RUNOPS_DEFAULT;
628 PL_curcop = &PL_compiling; 788 PL_curcop = &PL_compiling;
629 PL_in_eval = EVAL_NULL; 789 PL_in_eval = EVAL_NULL;
630 PL_comppad = 0; 790 PL_comppad = 0;
631 PL_curpm = 0; 791 PL_curpm = 0;
792 PL_curpad = 0;
632 PL_localizing = 0; 793 PL_localizing = 0;
633 PL_dirty = 0; 794 PL_dirty = 0;
634 PL_restartop = 0; 795 PL_restartop = 0;
796#if PERL_VERSION_ATLEAST (5,10,0)
797 PL_parser = 0;
798#endif
799
800 /* recreate the die/warn hooks */
801 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook );
802 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook);
803
804 GvSV (PL_defgv) = newSV (0);
805 GvAV (PL_defgv) = coro->args; coro->args = 0;
806 GvSV (PL_errgv) = newSV (0);
807 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
808 PL_rs = newSVsv (GvSV (irsgv));
809 PL_defoutgv = (GV *)SvREFCNT_inc (stdoutgv);
635 810
636 { 811 {
637 dSP; 812 dSP;
638 LOGOP myop; 813 LOGOP myop;
639 814
640 SvREFCNT_dec (GvAV (PL_defgv));
641 GvAV (PL_defgv) = coro->args; coro->args = 0;
642
643 Zero (&myop, 1, LOGOP); 815 Zero (&myop, 1, LOGOP);
644 myop.op_next = Nullop; 816 myop.op_next = Nullop;
645 myop.op_flags = OPf_WANT_VOID; 817 myop.op_flags = OPf_WANT_VOID;
646 818
647 PUSHMARK (SP); 819 PUSHMARK (SP);
648 XPUSHs (av_shift (GvAV (PL_defgv))); 820 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv))));
649 PUTBACK; 821 PUTBACK;
650 PL_op = (OP *)&myop; 822 PL_op = (OP *)&myop;
651 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 823 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
652 SPAGAIN; 824 SPAGAIN;
653 } 825 }
654 826
655 ENTER; /* necessary e.g. for dounwind */ 827 /* this newly created coroutine might be run on an existing cctx which most
828 * likely was suspended in set_stacklevel, called from entersub.
829 * set_stacklevl doesn't do anything on return, but entersub does LEAVE,
830 * so we ENTER here for symmetry
831 */
832 ENTER;
833}
834
835static void
836coro_destroy (pTHX_ struct coro *coro)
837{
838 if (!IN_DESTRUCT)
839 {
840 /* restore all saved variables and stuff */
841 LEAVE_SCOPE (0);
842 assert (PL_tmps_floor == -1);
843
844 /* free all temporaries */
845 FREETMPS;
846 assert (PL_tmps_ix == -1);
847
848 /* unwind all extra stacks */
849 POPSTACK_TO (PL_mainstack);
850
851 /* unwind main stack */
852 dounwind (-1);
853 }
854
855 SvREFCNT_dec (GvSV (PL_defgv));
856 SvREFCNT_dec (GvAV (PL_defgv));
857 SvREFCNT_dec (GvSV (PL_errgv));
858 SvREFCNT_dec (PL_defoutgv);
859 SvREFCNT_dec (PL_rs);
860 SvREFCNT_dec (GvSV (irsgv));
861
862 SvREFCNT_dec (PL_diehook);
863 SvREFCNT_dec (PL_warnhook);
864
865 SvREFCNT_dec (coro->saved_deffh);
866 SvREFCNT_dec (coro->throw);
867
868 coro_destroy_stacks (aTHX);
656} 869}
657 870
658static void 871static void
659free_coro_mortal (pTHX) 872free_coro_mortal (pTHX)
660{ 873{
661 if (coro_mortal) 874 if (expect_true (coro_mortal))
662 { 875 {
663 SvREFCNT_dec (coro_mortal); 876 SvREFCNT_dec (coro_mortal);
664 coro_mortal = 0; 877 coro_mortal = 0;
665 } 878 }
666} 879}
695 bot = PL_stack_base + cx->blk_oldsp + 1; 908 bot = PL_stack_base + cx->blk_oldsp + 1;
696 top = cx->blk_gimme == G_ARRAY ? SP + 1 909 top = cx->blk_gimme == G_ARRAY ? SP + 1
697 : cx->blk_gimme == G_SCALAR ? bot + 1 910 : cx->blk_gimme == G_SCALAR ? bot + 1
698 : bot; 911 : bot;
699 912
913 av_extend (av, top - bot);
700 while (bot < top) 914 while (bot < top)
701 av_push (av, SvREFCNT_inc (*bot++)); 915 av_push (av, SvREFCNT_inc (*bot++));
702 916
703 PL_runops = RUNOPS_DEFAULT; 917 PL_runops = RUNOPS_DEFAULT;
704 ENTER; 918 ENTER;
744 SAVETMPS; 958 SAVETMPS;
745 EXTEND (SP, 3); 959 EXTEND (SP, 3);
746 PUSHMARK (SP); 960 PUSHMARK (SP);
747 PUSHs (&PL_sv_yes); 961 PUSHs (&PL_sv_yes);
748 PUSHs (fullname); 962 PUSHs (fullname);
749 PUSHs (cx->blk_sub.hasargs ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef); 963 PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef);
750 PUTBACK; 964 PUTBACK;
751 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0); 965 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
752 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 966 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
753 SPAGAIN; 967 SPAGAIN;
754 FREETMPS; 968 FREETMPS;
790 1004
791/* inject a fake call to Coro::State::_cctx_init into the execution */ 1005/* inject a fake call to Coro::State::_cctx_init into the execution */
792/* _cctx_init should be careful, as it could be called at almost any time */ 1006/* _cctx_init should be careful, as it could be called at almost any time */
793/* during execution of a perl program */ 1007/* during execution of a perl program */
794static void NOINLINE 1008static void NOINLINE
795prepare_cctx (pTHX_ coro_cctx *cctx) 1009cctx_prepare (pTHX_ coro_cctx *cctx)
796{ 1010{
797 dSP; 1011 dSP;
798 LOGOP myop; 1012 LOGOP myop;
799 1013
800 PL_top_env = &PL_start_env; 1014 PL_top_env = &PL_start_env;
818 1032
819/* 1033/*
820 * this is a _very_ stripped down perl interpreter ;) 1034 * this is a _very_ stripped down perl interpreter ;)
821 */ 1035 */
822static void 1036static void
823coro_run (void *arg) 1037cctx_run (void *arg)
824{ 1038{
825 dTHX; 1039 dTHX;
826 1040
827 /* coro_run is the alternative tail of transfer(), so unlock here. */ 1041 /* cctx_run is the alternative tail of transfer(), so unlock here. */
828 UNLOCK; 1042 UNLOCK;
829 1043
830 /* we now skip the entersub that lead to transfer() */ 1044 /* we now skip the entersub that lead to transfer() */
831 PL_op = PL_op->op_next; 1045 PL_op = PL_op->op_next;
832 1046
833 /* inject a fake subroutine call to cctx_init */ 1047 /* inject a fake subroutine call to cctx_init */
834 prepare_cctx (aTHX_ (coro_cctx *)arg); 1048 cctx_prepare (aTHX_ (coro_cctx *)arg);
835 1049
836 /* somebody or something will hit me for both perl_run and PL_restartop */ 1050 /* somebody or something will hit me for both perl_run and PL_restartop */
837 PL_restartop = PL_op; 1051 PL_restartop = PL_op;
838 perl_run (PL_curinterp); 1052 perl_run (PL_curinterp);
839 1053
858 ++cctx_count; 1072 ++cctx_count;
859 1073
860 Newz (0, cctx, 1, coro_cctx); 1074 Newz (0, cctx, 1, coro_cctx);
861 1075
862#if HAVE_MMAP 1076#if HAVE_MMAP
863
864 cctx->ssize = ((coro_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE; 1077 cctx->ssize = ((coro_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
865 /* mmap supposedly does allocate-on-write for us */ 1078 /* mmap supposedly does allocate-on-write for us */
866 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0); 1079 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
867 1080
868 if (cctx->sptr != (void *)-1) 1081 if (cctx->sptr != (void *)-1)
889 stack_start = cctx->sptr; 1102 stack_start = cctx->sptr;
890 stack_size = cctx->ssize; 1103 stack_size = cctx->ssize;
891 } 1104 }
892 1105
893 REGISTER_STACK (cctx, (char *)stack_start, (char *)stack_start + stack_size); 1106 REGISTER_STACK (cctx, (char *)stack_start, (char *)stack_start + stack_size);
894 coro_create (&cctx->cctx, coro_run, (void *)cctx, stack_start, stack_size); 1107 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size);
895 1108
896 return cctx; 1109 return cctx;
897} 1110}
898 1111
899static void 1112static void
916 Safefree (cctx->sptr); 1129 Safefree (cctx->sptr);
917 1130
918 Safefree (cctx); 1131 Safefree (cctx);
919} 1132}
920 1133
1134/* wether this cctx should be destructed */
1135#define CCTX_EXPIRED(cctx) ((cctx)->ssize < coro_stacksize || ((cctx)->flags & CC_NOREUSE))
1136
921static coro_cctx * 1137static coro_cctx *
922cctx_get (pTHX) 1138cctx_get (pTHX)
923{ 1139{
924 while (cctx_first) 1140 while (expect_true (cctx_first))
925 { 1141 {
926 coro_cctx *cctx = cctx_first; 1142 coro_cctx *cctx = cctx_first;
927 cctx_first = cctx->next; 1143 cctx_first = cctx->next;
928 --cctx_idle; 1144 --cctx_idle;
929 1145
930 if (cctx->ssize >= coro_stacksize && !(cctx->flags & CC_NOREUSE)) 1146 if (expect_true (!CCTX_EXPIRED (cctx)))
931 return cctx; 1147 return cctx;
932 1148
933 cctx_destroy (cctx); 1149 cctx_destroy (cctx);
934 } 1150 }
935 1151
938 1154
939static void 1155static void
940cctx_put (coro_cctx *cctx) 1156cctx_put (coro_cctx *cctx)
941{ 1157{
942 /* free another cctx if overlimit */ 1158 /* free another cctx if overlimit */
943 if (cctx_idle >= MAX_IDLE_CCTX) 1159 if (expect_false (cctx_idle >= MAX_IDLE_CCTX))
944 { 1160 {
945 coro_cctx *first = cctx_first; 1161 coro_cctx *first = cctx_first;
946 cctx_first = first->next; 1162 cctx_first = first->next;
947 --cctx_idle; 1163 --cctx_idle;
948 1164
954 cctx_first = cctx; 1170 cctx_first = cctx;
955} 1171}
956 1172
957/** coroutine switching *****************************************************/ 1173/** coroutine switching *****************************************************/
958 1174
959static void NOINLINE 1175static void
960transfer_check (pTHX_ struct coro *prev, struct coro *next) 1176transfer_check (pTHX_ struct coro *prev, struct coro *next)
961{ 1177{
962 if (prev != next) 1178 if (expect_true (prev != next))
963 { 1179 {
964 if (!(prev->flags & (CF_RUNNING | CF_NEW))) 1180 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
965 croak ("Coro::State::transfer called with non-running/new prev Coro::State, but can only transfer from running or new states"); 1181 croak ("Coro::State::transfer called with non-running/new prev Coro::State, but can only transfer from running or new states");
966 1182
967 if (next->flags & CF_RUNNING) 1183 if (expect_false (next->flags & CF_RUNNING))
968 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states"); 1184 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states");
969 1185
970 if (next->flags & CF_DESTROYED) 1186 if (expect_false (next->flags & CF_DESTROYED))
971 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states"); 1187 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states");
972 1188
1189#if !PERL_VERSION_ATLEAST (5,10,0)
973 if (PL_lex_state != LEX_NOTPARSING) 1190 if (expect_false (PL_lex_state != LEX_NOTPARSING))
974 croak ("Coro::State::transfer called while parsing, but this is not supported"); 1191 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version");
1192#endif
975 } 1193 }
976} 1194}
977 1195
978/* always use the TRANSFER macro */ 1196/* always use the TRANSFER macro */
979static void NOINLINE 1197static void NOINLINE
980transfer (pTHX_ struct coro *prev, struct coro *next) 1198transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
981{ 1199{
982 dSTACKLEVEL; 1200 dSTACKLEVEL;
1201 static volatile int has_throw;
983 1202
984 /* sometimes transfer is only called to set idle_sp */ 1203 /* sometimes transfer is only called to set idle_sp */
985 if (!next) 1204 if (expect_false (!next))
986 { 1205 {
987 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1206 ((coro_cctx *)prev)->idle_sp = STACKLEVEL;
988 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1207 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
989 } 1208 }
990 else if (prev != next) 1209 else if (expect_true (prev != next))
991 { 1210 {
992 coro_cctx *prev__cctx; 1211 coro_cctx *prev__cctx;
993 1212
994 if (prev->flags & CF_NEW) 1213 if (expect_false (prev->flags & CF_NEW))
995 { 1214 {
996 /* create a new empty context */ 1215 /* create a new empty context */
997 Newz (0, prev->cctx, 1, coro_cctx); 1216 Newz (0, prev->cctx, 1, coro_cctx);
998 prev->flags &= ~CF_NEW; 1217 prev->flags &= ~CF_NEW;
999 prev->flags |= CF_RUNNING; 1218 prev->flags |= CF_RUNNING;
1002 prev->flags &= ~CF_RUNNING; 1221 prev->flags &= ~CF_RUNNING;
1003 next->flags |= CF_RUNNING; 1222 next->flags |= CF_RUNNING;
1004 1223
1005 LOCK; 1224 LOCK;
1006 1225
1226 /* first get rid of the old state */
1227 save_perl (aTHX_ prev);
1228
1007 if (next->flags & CF_NEW) 1229 if (expect_false (next->flags & CF_NEW))
1008 { 1230 {
1009 /* need to start coroutine */ 1231 /* need to start coroutine */
1010 next->flags &= ~CF_NEW; 1232 next->flags &= ~CF_NEW;
1011 /* first get rid of the old state */
1012 save_perl (aTHX_ prev);
1013 /* setup coroutine call */ 1233 /* setup coroutine call */
1014 setup_coro (aTHX_ next); 1234 coro_setup (aTHX_ next);
1015 } 1235 }
1016 else 1236 else
1017 {
1018 /* coroutine already started */
1019 save_perl (aTHX_ prev);
1020 load_perl (aTHX_ next); 1237 load_perl (aTHX_ next);
1021 }
1022 1238
1023 prev__cctx = prev->cctx; 1239 prev__cctx = prev->cctx;
1024 1240
1025 /* possibly "free" the cctx */ 1241 /* possibly "free" the cctx */
1026 if (prev__cctx->idle_sp == STACKLEVEL && !(prev__cctx->flags & CC_TRACE)) 1242 if (expect_true (
1243 prev__cctx->idle_sp == STACKLEVEL
1244 && !(prev__cctx->flags & CC_TRACE)
1245 && !force_cctx
1246 ))
1027 { 1247 {
1028 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */ 1248 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */
1029 assert (("ERROR: current top_env must equal previous top_env", PL_top_env == prev__cctx->idle_te)); 1249 assert (("ERROR: current top_env must equal previous top_env", PL_top_env == prev__cctx->idle_te));
1030 1250
1031 prev->cctx = 0; 1251 prev->cctx = 0;
1032 1252
1253 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */
1254 /* without this the next cctx_get might destroy the prev__cctx while still in use */
1255 if (expect_false (CCTX_EXPIRED (prev__cctx)))
1256 if (!next->cctx)
1257 next->cctx = cctx_get (aTHX);
1258
1033 cctx_put (prev__cctx); 1259 cctx_put (prev__cctx);
1034 } 1260 }
1035 1261
1036 ++next->usecount; 1262 ++next->usecount;
1037 1263
1038 if (!next->cctx) 1264 if (expect_true (!next->cctx))
1039 next->cctx = cctx_get (aTHX); 1265 next->cctx = cctx_get (aTHX);
1040 1266
1267 has_throw = !!next->throw;
1268
1041 if (prev__cctx != next->cctx) 1269 if (expect_false (prev__cctx != next->cctx))
1042 { 1270 {
1043 prev__cctx->top_env = PL_top_env; 1271 prev__cctx->top_env = PL_top_env;
1044 PL_top_env = next->cctx->top_env; 1272 PL_top_env = next->cctx->top_env;
1045 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1273 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx);
1046 } 1274 }
1047 1275
1048 free_coro_mortal (aTHX); 1276 free_coro_mortal (aTHX);
1049 UNLOCK; 1277 UNLOCK;
1278
1279 if (expect_false (has_throw))
1280 {
1281 struct coro *coro = SvSTATE (coro_current);
1282
1283 if (coro->throw)
1284 {
1285 SV *exception = coro->throw;
1286 coro->throw = 0;
1287 sv_setsv (ERRSV, exception);
1288 croak (0);
1289 }
1290 }
1050 } 1291 }
1051} 1292}
1052 1293
1053struct transfer_args 1294struct transfer_args
1054{ 1295{
1055 struct coro *prev, *next; 1296 struct coro *prev, *next;
1056}; 1297};
1057 1298
1058#define TRANSFER(ta) transfer (aTHX_ (ta).prev, (ta).next) 1299#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1059#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1300#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1060 1301
1061/** high level stuff ********************************************************/ 1302/** high level stuff ********************************************************/
1062 1303
1063static int 1304static int
1081 1322
1082 if (coro->mainstack && coro->mainstack != main_mainstack) 1323 if (coro->mainstack && coro->mainstack != main_mainstack)
1083 { 1324 {
1084 struct coro temp; 1325 struct coro temp;
1085 1326
1086 assert (!(coro->flags & CF_RUNNING));
1087
1088 Zero (&temp, 1, struct coro);
1089 temp.save = CORO_SAVE_ALL;
1090
1091 if (coro->flags & CF_RUNNING) 1327 if (coro->flags & CF_RUNNING)
1092 croak ("FATAL: tried to destroy currently running coroutine"); 1328 croak ("FATAL: tried to destroy currently running coroutine");
1093 1329
1094 save_perl (aTHX_ &temp); 1330 save_perl (aTHX_ &temp);
1095 load_perl (aTHX_ coro); 1331 load_perl (aTHX_ coro);
1096 1332
1097 coro_destroy_stacks (aTHX); 1333 coro_destroy (aTHX_ coro);
1098 1334
1099 load_perl (aTHX_ &temp); /* this will get rid of defsv etc.. */ 1335 load_perl (aTHX_ &temp);
1100 1336
1101 coro->mainstack = 0; 1337 coro->slot = 0;
1102 } 1338 }
1103 1339
1104 cctx_destroy (coro->cctx); 1340 cctx_destroy (coro->cctx);
1105 SvREFCNT_dec (coro->args); 1341 SvREFCNT_dec (coro->args);
1106 1342
1162{ 1398{
1163 dTHX; 1399 dTHX;
1164 struct transfer_args ta; 1400 struct transfer_args ta;
1165 1401
1166 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1402 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1167 TRANSFER (ta); 1403 TRANSFER (ta, 1);
1168}
1169
1170static int
1171api_save (SV *coro_sv, int new_save)
1172{
1173 dTHX;
1174 struct coro *coro = SvSTATE (coro_sv);
1175 int old_save = coro->save;
1176
1177 if (new_save >= 0)
1178 coro->save = new_save;
1179
1180 return old_save;
1181} 1404}
1182 1405
1183/** Coro ********************************************************************/ 1406/** Coro ********************************************************************/
1184 1407
1185static void 1408static void
1187{ 1410{
1188 av_push (coro_ready [SvSTATE (coro_sv)->prio - PRIO_MIN], coro_sv); 1411 av_push (coro_ready [SvSTATE (coro_sv)->prio - PRIO_MIN], coro_sv);
1189} 1412}
1190 1413
1191static SV * 1414static SV *
1192coro_deq (pTHX_ int min_prio) 1415coro_deq (pTHX)
1193{ 1416{
1194 int prio = PRIO_MAX - PRIO_MIN; 1417 int prio;
1195 1418
1196 min_prio -= PRIO_MIN;
1197 if (min_prio < 0)
1198 min_prio = 0;
1199
1200 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= min_prio; ) 1419 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; )
1201 if (AvFILLp (coro_ready [prio]) >= 0) 1420 if (AvFILLp (coro_ready [prio]) >= 0)
1202 return av_shift (coro_ready [prio]); 1421 return av_shift (coro_ready [prio]);
1203 1422
1204 return 0; 1423 return 0;
1205} 1424}
1207static int 1426static int
1208api_ready (SV *coro_sv) 1427api_ready (SV *coro_sv)
1209{ 1428{
1210 dTHX; 1429 dTHX;
1211 struct coro *coro; 1430 struct coro *coro;
1431 SV *sv_hook;
1432 void (*xs_hook)(void);
1212 1433
1213 if (SvROK (coro_sv)) 1434 if (SvROK (coro_sv))
1214 coro_sv = SvRV (coro_sv); 1435 coro_sv = SvRV (coro_sv);
1215 1436
1216 coro = SvSTATE (coro_sv); 1437 coro = SvSTATE (coro_sv);
1219 return 0; 1440 return 0;
1220 1441
1221 coro->flags |= CF_READY; 1442 coro->flags |= CF_READY;
1222 1443
1223 LOCK; 1444 LOCK;
1445
1446 sv_hook = coro_nready ? 0 : coro_readyhook;
1447 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1448
1224 coro_enq (aTHX_ SvREFCNT_inc (coro_sv)); 1449 coro_enq (aTHX_ SvREFCNT_inc (coro_sv));
1225 ++coro_nready; 1450 ++coro_nready;
1451
1226 UNLOCK; 1452 UNLOCK;
1453
1454 if (sv_hook)
1455 {
1456 dSP;
1457
1458 ENTER;
1459 SAVETMPS;
1460
1461 PUSHMARK (SP);
1462 PUTBACK;
1463 call_sv (sv_hook, G_DISCARD);
1464 SPAGAIN;
1465
1466 FREETMPS;
1467 LEAVE;
1468 }
1469
1470 if (xs_hook)
1471 xs_hook ();
1227 1472
1228 return 1; 1473 return 1;
1229} 1474}
1230 1475
1231static int 1476static int
1241 SV *prev_sv, *next_sv; 1486 SV *prev_sv, *next_sv;
1242 1487
1243 for (;;) 1488 for (;;)
1244 { 1489 {
1245 LOCK; 1490 LOCK;
1246 next_sv = coro_deq (aTHX_ PRIO_MIN); 1491 next_sv = coro_deq (aTHX);
1247 1492
1248 /* nothing to schedule: call the idle handler */ 1493 /* nothing to schedule: call the idle handler */
1249 if (!next_sv) 1494 if (expect_false (!next_sv))
1250 { 1495 {
1251 dSP; 1496 dSP;
1252 UNLOCK; 1497 UNLOCK;
1253 1498
1254 ENTER; 1499 ENTER;
1255 SAVETMPS; 1500 SAVETMPS;
1256 1501
1257 PUSHMARK (SP); 1502 PUSHMARK (SP);
1258 PUTBACK; 1503 PUTBACK;
1259 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD); 1504 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD);
1505 SPAGAIN;
1260 1506
1261 FREETMPS; 1507 FREETMPS;
1262 LEAVE; 1508 LEAVE;
1263 continue; 1509 continue;
1264 } 1510 }
1265 1511
1266 ta->next = SvSTATE (next_sv); 1512 ta->next = SvSTATE (next_sv);
1267 1513
1268 /* cannot transfer to destroyed coros, skip and look for next */ 1514 /* cannot transfer to destroyed coros, skip and look for next */
1269 if (ta->next->flags & CF_DESTROYED) 1515 if (expect_false (ta->next->flags & CF_DESTROYED))
1270 { 1516 {
1271 UNLOCK; 1517 UNLOCK;
1272 SvREFCNT_dec (next_sv); 1518 SvREFCNT_dec (next_sv);
1273 /* coro_nready is already taken care of by destroy */ 1519 /* coro_nready is already taken care of by destroy */
1274 continue; 1520 continue;
1319{ 1565{
1320 dTHX; 1566 dTHX;
1321 struct transfer_args ta; 1567 struct transfer_args ta;
1322 1568
1323 prepare_schedule (aTHX_ &ta); 1569 prepare_schedule (aTHX_ &ta);
1324 TRANSFER (ta); 1570 TRANSFER (ta, 1);
1325} 1571}
1326 1572
1327static int 1573static int
1328api_cede (void) 1574api_cede (void)
1329{ 1575{
1330 dTHX; 1576 dTHX;
1331 struct transfer_args ta; 1577 struct transfer_args ta;
1332 1578
1333 prepare_cede (aTHX_ &ta); 1579 prepare_cede (aTHX_ &ta);
1334 1580
1335 if (ta.prev != ta.next) 1581 if (expect_true (ta.prev != ta.next))
1336 { 1582 {
1337 TRANSFER (ta); 1583 TRANSFER (ta, 1);
1338 return 1; 1584 return 1;
1339 } 1585 }
1340 else 1586 else
1341 return 0; 1587 return 0;
1342} 1588}
1347 dTHX; 1593 dTHX;
1348 struct transfer_args ta; 1594 struct transfer_args ta;
1349 1595
1350 if (prepare_cede_notself (aTHX_ &ta)) 1596 if (prepare_cede_notself (aTHX_ &ta))
1351 { 1597 {
1352 TRANSFER (ta); 1598 TRANSFER (ta, 1);
1353 return 1; 1599 return 1;
1354 } 1600 }
1355 else 1601 else
1356 return 0; 1602 return 0;
1357} 1603}
1358 1604
1359static void 1605static void
1360api_trace (struct coro *coro, int flags) 1606api_trace (SV *coro_sv, int flags)
1361{ 1607{
1362 dTHX; 1608 dTHX;
1609 struct coro *coro = SvSTATE (coro_sv);
1363 1610
1364 if (flags & CC_TRACE) 1611 if (flags & CC_TRACE)
1365 { 1612 {
1366 if (!coro->cctx) 1613 if (!coro->cctx)
1367 coro->cctx = cctx_new (); 1614 coro->cctx = cctx_new ();
1375 coro->cctx->flags &= ~(CC_TRACE | CC_TRACE_ALL); 1622 coro->cctx->flags &= ~(CC_TRACE | CC_TRACE_ALL);
1376 1623
1377 if (coro->flags & CF_RUNNING) 1624 if (coro->flags & CF_RUNNING)
1378 PL_runops = RUNOPS_DEFAULT; 1625 PL_runops = RUNOPS_DEFAULT;
1379 else 1626 else
1380 coro->runops = RUNOPS_DEFAULT; 1627 coro->slot->runops = RUNOPS_DEFAULT;
1381 } 1628 }
1382} 1629}
1630
1631static int
1632coro_gensub_free (pTHX_ SV *sv, MAGIC *mg)
1633{
1634 AV *padlist;
1635 AV *av = (AV *)mg->mg_obj;
1636
1637 abort ();
1638
1639 return 0;
1640}
1641
1642static MGVTBL coro_gensub_vtbl = {
1643 0, 0, 0, 0,
1644 coro_gensub_free
1645};
1383 1646
1384MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 1647MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
1385 1648
1386PROTOTYPES: DISABLE 1649PROTOTYPES: DISABLE
1387 1650
1389{ 1652{
1390#ifdef USE_ITHREADS 1653#ifdef USE_ITHREADS
1391 MUTEX_INIT (&coro_mutex); 1654 MUTEX_INIT (&coro_mutex);
1392#endif 1655#endif
1393 BOOT_PAGESIZE; 1656 BOOT_PAGESIZE;
1657
1658 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
1659 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
1660
1661 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get;
1662 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set;
1663 orig_sigelem_clr = PL_vtbl_sigelem.svt_clear; PL_vtbl_sigelem.svt_clear = coro_sigelem_clr;
1664
1665 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
1666 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
1667 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
1394 1668
1395 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 1669 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
1396 1670
1397 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE)); 1671 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
1398 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB)); 1672 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));
1399 newCONSTSUB (coro_state_stash, "CC_TRACE_LINE", newSViv (CC_TRACE_LINE)); 1673 newCONSTSUB (coro_state_stash, "CC_TRACE_LINE", newSViv (CC_TRACE_LINE));
1400 newCONSTSUB (coro_state_stash, "CC_TRACE_ALL" , newSViv (CC_TRACE_ALL)); 1674 newCONSTSUB (coro_state_stash, "CC_TRACE_ALL" , newSViv (CC_TRACE_ALL));
1401 1675
1402 newCONSTSUB (coro_state_stash, "SAVE_DEFAV", newSViv (CORO_SAVE_DEFAV));
1403 newCONSTSUB (coro_state_stash, "SAVE_DEFSV", newSViv (CORO_SAVE_DEFSV));
1404 newCONSTSUB (coro_state_stash, "SAVE_ERRSV", newSViv (CORO_SAVE_ERRSV));
1405 newCONSTSUB (coro_state_stash, "SAVE_IRSSV", newSViv (CORO_SAVE_IRSSV));
1406 newCONSTSUB (coro_state_stash, "SAVE_DEFFH", newSViv (CORO_SAVE_DEFFH));
1407 newCONSTSUB (coro_state_stash, "SAVE_DEF", newSViv (CORO_SAVE_DEF));
1408 newCONSTSUB (coro_state_stash, "SAVE_ALL", newSViv (CORO_SAVE_ALL));
1409
1410 main_mainstack = PL_mainstack; 1676 main_mainstack = PL_mainstack;
1411 main_top_env = PL_top_env; 1677 main_top_env = PL_top_env;
1412 1678
1413 while (main_top_env->je_prev) 1679 while (main_top_env->je_prev)
1414 main_top_env = main_top_env->je_prev; 1680 main_top_env = main_top_env->je_prev;
1415 1681
1416 coroapi.ver = CORO_API_VERSION; 1682 coroapi.ver = CORO_API_VERSION;
1683 coroapi.rev = CORO_API_REVISION;
1417 coroapi.transfer = api_transfer; 1684 coroapi.transfer = api_transfer;
1418 1685
1419 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 1686 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL));
1420} 1687}
1421 1688
1422SV * 1689SV *
1423new (char *klass, ...) 1690new (char *klass, ...)
1424 CODE: 1691 CODE:
1425{ 1692{
1426 struct coro *coro; 1693 struct coro *coro;
1694 MAGIC *mg;
1427 HV *hv; 1695 HV *hv;
1428 int i; 1696 int i;
1429 1697
1430 Newz (0, coro, 1, struct coro); 1698 Newz (0, coro, 1, struct coro);
1431 coro->args = newAV (); 1699 coro->args = newAV ();
1432 coro->save = CORO_SAVE_DEF;
1433 coro->flags = CF_NEW; 1700 coro->flags = CF_NEW;
1434 1701
1435 if (coro_first) coro_first->prev = coro; 1702 if (coro_first) coro_first->prev = coro;
1436 coro->next = coro_first; 1703 coro->next = coro_first;
1437 coro_first = coro; 1704 coro_first = coro;
1438 1705
1439 coro->hv = hv = newHV (); 1706 coro->hv = hv = newHV ();
1440 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro, 0)->mg_flags |= MGf_DUP; 1707 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
1708 mg->mg_flags |= MGf_DUP;
1441 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 1709 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
1442 1710
1711 av_extend (coro->args, items - 1);
1443 for (i = 1; i < items; i++) 1712 for (i = 1; i < items; i++)
1444 av_push (coro->args, newSVsv (ST (i))); 1713 av_push (coro->args, newSVsv (ST (i)));
1445} 1714}
1446 OUTPUT: 1715 OUTPUT:
1447 RETVAL 1716 RETVAL
1448 1717
1449int 1718# these not obviously related functions are all rolled into the same xs
1450save (SV *coro, int new_save = -1) 1719# function to increase chances that they all will call transfer with the same
1451 CODE: 1720# stack offset
1452 RETVAL = api_save (coro, new_save);
1453 OUTPUT:
1454 RETVAL
1455
1456int
1457save_also (SV *coro_sv, int save_also)
1458 CODE:
1459{
1460 struct coro *coro = SvSTATE (coro_sv);
1461 RETVAL = coro->save;
1462 coro->save |= save_also;
1463}
1464 OUTPUT:
1465 RETVAL
1466
1467void 1721void
1468_set_stacklevel (...) 1722_set_stacklevel (...)
1469 ALIAS: 1723 ALIAS:
1470 Coro::State::transfer = 1 1724 Coro::State::transfer = 1
1471 Coro::schedule = 2 1725 Coro::schedule = 2
1473 Coro::cede_notself = 4 1727 Coro::cede_notself = 4
1474 CODE: 1728 CODE:
1475{ 1729{
1476 struct transfer_args ta; 1730 struct transfer_args ta;
1477 1731
1732 PUTBACK;
1478 switch (ix) 1733 switch (ix)
1479 { 1734 {
1480 case 0: 1735 case 0:
1481 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0))); 1736 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0)));
1482 ta.next = 0; 1737 ta.next = 0;
1501 if (!prepare_cede_notself (aTHX_ &ta)) 1756 if (!prepare_cede_notself (aTHX_ &ta))
1502 XSRETURN_EMPTY; 1757 XSRETURN_EMPTY;
1503 1758
1504 break; 1759 break;
1505 } 1760 }
1761 SPAGAIN;
1506 1762
1507 BARRIER; 1763 BARRIER;
1764 PUTBACK;
1508 TRANSFER (ta); 1765 TRANSFER (ta, 0);
1509 1766 SPAGAIN; /* might be the sp of a different coroutine now */
1510 if (GIMME_V != G_VOID && ta.next != ta.prev) 1767 /* be extra careful not to ever do anything after TRANSFER */
1511 XSRETURN_YES;
1512} 1768}
1513 1769
1514bool 1770bool
1515_destroy (SV *coro_sv) 1771_destroy (SV *coro_sv)
1516 CODE: 1772 CODE:
1517 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv)); 1773 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
1518 OUTPUT: 1774 OUTPUT:
1519 RETVAL 1775 RETVAL
1520 1776
1521void 1777void
1522_exit (code) 1778_exit (int code)
1523 int code
1524 PROTOTYPE: $ 1779 PROTOTYPE: $
1525 CODE: 1780 CODE:
1526 _exit (code); 1781 _exit (code);
1527 1782
1528int 1783int
1565 CODE: 1820 CODE:
1566{ 1821{
1567 if (coro->mainstack) 1822 if (coro->mainstack)
1568 { 1823 {
1569 struct coro temp; 1824 struct coro temp;
1570 Zero (&temp, 1, struct coro);
1571 temp.save = CORO_SAVE_ALL;
1572 1825
1573 if (!(coro->flags & CF_RUNNING)) 1826 if (!(coro->flags & CF_RUNNING))
1574 { 1827 {
1828 PUTBACK;
1575 save_perl (aTHX_ &temp); 1829 save_perl (aTHX_ &temp);
1576 load_perl (aTHX_ coro); 1830 load_perl (aTHX_ coro);
1577 } 1831 }
1578 1832
1579 { 1833 {
1580 dSP; 1834 dSP;
1581 ENTER; 1835 ENTER;
1582 SAVETMPS; 1836 SAVETMPS;
1837 PUTBACK;
1838 PUSHSTACK;
1583 PUSHMARK (SP); 1839 PUSHMARK (SP);
1584 PUTBACK; 1840
1585 if (ix) 1841 if (ix)
1586 eval_sv (coderef, 0); 1842 eval_sv (coderef, 0);
1587 else 1843 else
1588 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 1844 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
1845
1846 POPSTACK;
1589 SPAGAIN; 1847 SPAGAIN;
1590 FREETMPS; 1848 FREETMPS;
1591 LEAVE; 1849 LEAVE;
1592 PUTBACK; 1850 PUTBACK;
1593 } 1851 }
1594 1852
1595 if (!(coro->flags & CF_RUNNING)) 1853 if (!(coro->flags & CF_RUNNING))
1596 { 1854 {
1597 save_perl (aTHX_ coro); 1855 save_perl (aTHX_ coro);
1598 load_perl (aTHX_ &temp); 1856 load_perl (aTHX_ &temp);
1857 SPAGAIN;
1599 } 1858 }
1600 } 1859 }
1601} 1860}
1602 1861
1603SV * 1862SV *
1612 RETVAL = boolSV (coro->flags & ix); 1871 RETVAL = boolSV (coro->flags & ix);
1613 OUTPUT: 1872 OUTPUT:
1614 RETVAL 1873 RETVAL
1615 1874
1616void 1875void
1617api_trace (Coro::State coro, int flags = CC_TRACE | CC_TRACE_SUB) 1876api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
1618 1877
1619SV * 1878SV *
1620has_stack (Coro::State coro) 1879has_cctx (Coro::State coro)
1621 PROTOTYPE: $ 1880 PROTOTYPE: $
1622 CODE: 1881 CODE:
1623 RETVAL = boolSV (!!coro->cctx); 1882 RETVAL = boolSV (!!coro->cctx);
1624 OUTPUT: 1883 OUTPUT:
1625 RETVAL 1884 RETVAL
1644 case 1: RETVAL = coro->usecount; break; 1903 case 1: RETVAL = coro->usecount; break;
1645 } 1904 }
1646 OUTPUT: 1905 OUTPUT:
1647 RETVAL 1906 RETVAL
1648 1907
1908void
1909force_cctx ()
1910 CODE:
1911 struct coro *coro = SvSTATE (coro_current);
1912 coro->cctx->idle_sp = 0;
1913
1914void
1915throw (Coro::State self, SV *throw = &PL_sv_undef)
1916 PROTOTYPE: $;$
1917 CODE:
1918 SvREFCNT_dec (self->throw);
1919 self->throw = SvOK (throw) ? newSVsv (throw) : 0;
1920
1921void
1922swap_defsv (Coro::State self)
1923 PROTOTYPE: $
1924 ALIAS:
1925 swap_defav = 1
1926 CODE:
1927 if (!self->slot)
1928 croak ("cannot swap state with coroutine that has no saved state");
1929 else
1930 {
1931 SV **src = ix ? (SV **)&GvAV (PL_defgv) : &GvSV (PL_defgv);
1932 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
1933
1934 SV *tmp = *src; *src = *dst; *dst = tmp;
1935 }
1649 1936
1650MODULE = Coro::State PACKAGE = Coro 1937MODULE = Coro::State PACKAGE = Coro
1651 1938
1652BOOT: 1939BOOT:
1653{ 1940{
1654 int i; 1941 int i;
1655 1942
1656 sv_pool_rss = get_sv ("Coro::POOL_RSS" , TRUE);
1657 sv_pool_size = get_sv ("Coro::POOL_SIZE" , TRUE);
1658 av_async_pool = get_av ("Coro::async_pool", TRUE); 1943 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
1944 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
1945 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
1659 1946
1660 coro_current = get_sv ("Coro::current", FALSE); 1947 coro_current = coro_get_sv (aTHX_ "Coro::current", FALSE);
1661 SvREADONLY_on (coro_current); 1948 SvREADONLY_on (coro_current);
1662 1949
1663 coro_stash = gv_stashpv ("Coro", TRUE); 1950 coro_stash = gv_stashpv ("Coro", TRUE);
1664 1951
1665 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 1952 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
1666 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 1953 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH));
1667 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 1954 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL));
1668 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 1955 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW));
1671 1958
1672 for (i = PRIO_MAX - PRIO_MIN + 1; i--; ) 1959 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
1673 coro_ready[i] = newAV (); 1960 coro_ready[i] = newAV ();
1674 1961
1675 { 1962 {
1676 SV *sv = perl_get_sv("Coro::API", 1); 1963 SV *sv = perl_get_sv ("Coro::API", TRUE);
1964 perl_get_sv ("Coro::API", TRUE); /* silence 5.10 warning */
1677 1965
1678 coroapi.schedule = api_schedule; 1966 coroapi.schedule = api_schedule;
1679 coroapi.save = api_save;
1680 coroapi.cede = api_cede; 1967 coroapi.cede = api_cede;
1681 coroapi.cede_notself = api_cede_notself; 1968 coroapi.cede_notself = api_cede_notself;
1682 coroapi.ready = api_ready; 1969 coroapi.ready = api_ready;
1683 coroapi.is_ready = api_is_ready; 1970 coroapi.is_ready = api_is_ready;
1684 coroapi.nready = &coro_nready; 1971 coroapi.nready = &coro_nready;
1694_set_current (SV *current) 1981_set_current (SV *current)
1695 PROTOTYPE: $ 1982 PROTOTYPE: $
1696 CODE: 1983 CODE:
1697 SvREFCNT_dec (SvRV (coro_current)); 1984 SvREFCNT_dec (SvRV (coro_current));
1698 SvRV_set (coro_current, SvREFCNT_inc (SvRV (current))); 1985 SvRV_set (coro_current, SvREFCNT_inc (SvRV (current)));
1986
1987void
1988_set_readyhook (SV *hook)
1989 PROTOTYPE: $
1990 CODE:
1991 LOCK;
1992 SvREFCNT_dec (coro_readyhook);
1993 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0;
1994 UNLOCK;
1699 1995
1700int 1996int
1701prio (Coro::State coro, int newprio = 0) 1997prio (Coro::State coro, int newprio = 0)
1702 ALIAS: 1998 ALIAS:
1703 nice = 1 1999 nice = 1
1738# for async_pool speedup 2034# for async_pool speedup
1739void 2035void
1740_pool_1 (SV *cb) 2036_pool_1 (SV *cb)
1741 CODE: 2037 CODE:
1742{ 2038{
1743 int i, len; 2039 struct coro *coro = SvSTATE (coro_current);
1744 HV *hv = (HV *)SvRV (coro_current); 2040 HV *hv = (HV *)SvRV (coro_current);
1745 AV *defav = GvAV (PL_defgv); 2041 AV *defav = GvAV (PL_defgv);
1746 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0); 2042 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
1747 AV *invoke_av; 2043 AV *invoke_av;
2044 int i, len;
1748 2045
1749 if (!invoke) 2046 if (!invoke)
2047 {
2048 SV *old = PL_diehook;
2049 PL_diehook = 0;
2050 SvREFCNT_dec (old);
1750 croak ("\3terminate\2\n"); 2051 croak ("\3async_pool terminate\2\n");
2052 }
2053
2054 SvREFCNT_dec (coro->saved_deffh);
2055 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv);
1751 2056
1752 hv_store (hv, "desc", sizeof ("desc") - 1, 2057 hv_store (hv, "desc", sizeof ("desc") - 1,
1753 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0); 2058 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
1754 2059
1755 invoke_av = (AV *)SvRV (invoke); 2060 invoke_av = (AV *)SvRV (invoke);
1773{ 2078{
1774 struct coro *coro = SvSTATE (coro_current); 2079 struct coro *coro = SvSTATE (coro_current);
1775 2080
1776 sv_setsv (cb, &PL_sv_undef); 2081 sv_setsv (cb, &PL_sv_undef);
1777 2082
2083 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
2084 coro->saved_deffh = 0;
2085
1778 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss) 2086 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss)
1779 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2087 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
2088 {
2089 SV *old = PL_diehook;
2090 PL_diehook = 0;
2091 SvREFCNT_dec (old);
1780 croak ("\3terminate\2\n"); 2092 croak ("\3async_pool terminate\2\n");
2093 }
1781 2094
1782 av_clear (GvAV (PL_defgv)); 2095 av_clear (GvAV (PL_defgv));
1783 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1, 2096 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1,
1784 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0); 2097 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
1785 coro->save = CORO_SAVE_DEF; 2098
1786 coro->prio = 0; 2099 coro->prio = 0;
1787 2100
1788 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 2101 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
1789 api_trace (coro, 0); 2102 api_trace (coro_current, 0);
1790 2103
1791 av_push (av_async_pool, newSVsv (coro_current)); 2104 av_push (av_async_pool, newSVsv (coro_current));
1792} 2105}
2106
2107#if 0
2108
2109void
2110_generator_call (...)
2111 PROTOTYPE: @
2112 PPCODE:
2113 fprintf (stderr, "call %p\n", CvXSUBANY(cv).any_ptr);
2114 xxxx
2115 abort ();
2116
2117SV *
2118gensub (SV *sub, ...)
2119 PROTOTYPE: &;@
2120 CODE:
2121{
2122 struct coro *coro;
2123 MAGIC *mg;
2124 CV *xcv;
2125 CV *ncv = (CV *)newSV_type (SVt_PVCV);
2126 int i;
2127
2128 CvGV (ncv) = CvGV (cv);
2129 CvFILE (ncv) = CvFILE (cv);
2130
2131 Newz (0, coro, 1, struct coro);
2132 coro->args = newAV ();
2133 coro->flags = CF_NEW;
2134
2135 av_extend (coro->args, items - 1);
2136 for (i = 1; i < items; i++)
2137 av_push (coro->args, newSVsv (ST (i)));
2138
2139 CvISXSUB_on (ncv);
2140 CvXSUBANY (ncv).any_ptr = (void *)coro;
2141
2142 xcv = GvCV (gv_fetchpv ("Coro::_generator_call", 0, SVt_PVCV));
2143
2144 CvXSUB (ncv) = CvXSUB (xcv);
2145 CvANON_on (ncv);
2146
2147 mg = sv_magicext ((SV *)ncv, 0, CORO_MAGIC_type_state, &coro_gensub_vtbl, (char *)coro, 0);
2148 RETVAL = newRV_noinc ((SV *)ncv);
2149}
2150 OUTPUT:
2151 RETVAL
2152
2153#endif
1793 2154
1794 2155
1795MODULE = Coro::State PACKAGE = Coro::AIO 2156MODULE = Coro::State PACKAGE = Coro::AIO
1796 2157
1797SV * 2158SV *
1824 PL_laststype = data->laststype; 2185 PL_laststype = data->laststype;
1825 PL_laststatval = data->laststatval; 2186 PL_laststatval = data->laststatval;
1826 PL_statcache = data->statcache; 2187 PL_statcache = data->statcache;
1827} 2188}
1828 2189
2190
2191MODULE = Coro::State PACKAGE = Coro::AnyEvent
2192
2193BOOT:
2194 sv_activity = coro_get_sv (aTHX_ "Coro::AnyEvent::ACTIVITY", TRUE);
2195
2196SV *
2197_schedule (...)
2198 PROTOTYPE: @
2199 CODE:
2200{
2201 static int incede;
2202
2203 api_cede_notself ();
2204
2205 ++incede;
2206 while (coro_nready >= incede && api_cede ())
2207 ;
2208
2209 sv_setsv (sv_activity, &PL_sv_undef);
2210 if (coro_nready >= incede)
2211 {
2212 PUSHMARK (SP);
2213 PUTBACK;
2214 call_pv ("Coro::AnyEvent::_activity", G_DISCARD | G_EVAL);
2215 SPAGAIN;
2216 }
2217
2218 --incede;
2219}
2220

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines