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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines