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.403 by root, Sun May 22 20:13:33 2011 UTC vs.
Revision 1.454 by root, Tue Jul 7 00:38:03 2015 UTC

1/* this works around a bug in mingw32 providing a non-working setjmp */ 1/* this works around a bug in mingw32 providing a non-working setjmp */
2#define USE_NO_MINGW_SETJMP_TWO_ARGS 2#define USE_NO_MINGW_SETJMP_TWO_ARGS
3 3
4#define NDEBUG 1 4#define NDEBUG 1 /* perl usually disables NDEBUG later */
5 5
6#include "libcoro/coro.c" 6#include "libcoro/coro.c"
7 7
8#define PERL_NO_GET_CONTEXT 8#define PERL_NO_GET_CONTEXT
9#define PERL_EXT 9#define PERL_EXT
… …
13#include "XSUB.h" 13#include "XSUB.h"
14#include "perliol.h" 14#include "perliol.h"
15 15
16#include "schmorp.h" 16#include "schmorp.h"
17 17
18#define ECB_NO_THREADS 1
19#define ECB_NO_LIBM 1
20#include "ecb.h"
21
18#include <stddef.h> 22#include <stddef.h>
19#include <stdio.h> 23#include <stdio.h>
20#include <errno.h> 24#include <errno.h>
21#include <assert.h> 25#include <assert.h>
22 26
27#ifndef SvREFCNT_dec_NN
28 #define SvREFCNT_dec_NN(sv) SvREFCNT_dec (sv)
29#endif
30
31#ifndef SvREFCNT_inc_NN
32 #define SvREFCNT_inc_NN(sv) SvREFCNT_inc (sv)
33#endif
34
23#ifndef SVs_PADSTALE 35#ifndef SVs_PADSTALE
24# define SVs_PADSTALE 0 36# define SVs_PADSTALE 0
37#endif
38
39#ifdef PadARRAY
40# define NEWPADAPI 1
41# define newPADLIST(var) (Newz (0, var, 1, PADLIST), Newx (PadlistARRAY (var), 2, PAD *))
42#else
43typedef AV PADNAMELIST;
44# if !PERL_VERSION_ATLEAST(5,8,0)
45typedef AV PADLIST;
46typedef AV PAD;
47# endif
48# define PadlistARRAY(pl) ((PAD **)AvARRAY (pl))
49# define PadlistMAX(pl) AvFILLp (pl)
50# define PadlistNAMES(pl) (*PadlistARRAY (pl))
51# define PadARRAY AvARRAY
52# define PadMAX AvFILLp
53# define newPADLIST(var) ((var) = newAV (), av_extend (var, 1))
54#endif
55#ifndef PadnamelistREFCNT
56# define PadnamelistREFCNT(pnl) SvREFCNT (pnl)
57#endif
58#ifndef PadnamelistREFCNT_dec
59# define PadnamelistREFCNT_dec(pnl) SvREFCNT_dec (pnl)
60#endif
61
62/* 5.19.something has replaced SVt_BIND by SVt_INVLIST */
63/* we just alias it to SVt_IV, as that is sufficient for swap_sv for now */
64#if PERL_VERSION_ATLEAST(5,19,0)
65# define SVt_BIND SVt_IV
25#endif 66#endif
26 67
27#if defined(_WIN32) 68#if defined(_WIN32)
28# undef HAS_GETTIMEOFDAY 69# undef HAS_GETTIMEOFDAY
29# undef setjmp 70# undef setjmp
… …
32# define setjmp _setjmp /* deep magic */ 73# define setjmp _setjmp /* deep magic */
33#else 74#else
34# include <inttypes.h> /* most portable stdint.h */ 75# include <inttypes.h> /* most portable stdint.h */
35#endif 76#endif
36 77
37#ifdef HAVE_MMAP
38# include <unistd.h>
39# include <sys/mman.h>
40# ifndef MAP_ANONYMOUS
41# ifdef MAP_ANON
42# define MAP_ANONYMOUS MAP_ANON
43# else
44# undef HAVE_MMAP
45# endif
46# endif
47# include <limits.h>
48# ifndef PAGESIZE
49# define PAGESIZE pagesize
50# define BOOT_PAGESIZE pagesize = sysconf (_SC_PAGESIZE)
51static long pagesize;
52# else
53# define BOOT_PAGESIZE (void)0
54# endif
55#else
56# define PAGESIZE 0
57# define BOOT_PAGESIZE (void)0
58#endif
59
60#if CORO_USE_VALGRIND
61# include <valgrind/valgrind.h>
62#endif
63
64/* the maximum number of idle cctx that will be pooled */ 78/* the maximum number of idle cctx that will be pooled */
65static int cctx_max_idle = 4; 79static int cctx_max_idle = 4;
66 80
67#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 81#if defined(DEBUGGING) && PERL_VERSION_ATLEAST(5,12,0)
68# undef CORO_STACKGUARD 82# define HAS_SCOPESTACK_NAME 1
69#endif
70
71#ifndef CORO_STACKGUARD
72# define CORO_STACKGUARD 0
73#endif 83#endif
74 84
75/* prefer perl internal functions over our own? */ 85/* prefer perl internal functions over our own? */
76#ifndef CORO_PREFER_PERL_FUNCTIONS 86#ifndef CORO_PREFER_PERL_FUNCTIONS
77# define CORO_PREFER_PERL_FUNCTIONS 0 87# define CORO_PREFER_PERL_FUNCTIONS 0
… …
87# define STACKLEVEL ((void *)&stacklevel) 97# define STACKLEVEL ((void *)&stacklevel)
88#endif 98#endif
89 99
90#define IN_DESTRUCT PL_dirty 100#define IN_DESTRUCT PL_dirty
91 101
92#if __GNUC__ >= 3
93# define attribute(x) __attribute__(x)
94# define expect(expr,value) __builtin_expect ((expr), (value))
95# define INLINE static inline
96#else
97# define attribute(x)
98# define expect(expr,value) (expr)
99# define INLINE static
100#endif
101
102#define expect_false(expr) expect ((expr) != 0, 0)
103#define expect_true(expr) expect ((expr) != 0, 1)
104
105#define NOINLINE attribute ((noinline))
106
107#include "CoroAPI.h" 102#include "CoroAPI.h"
108#define GCoroAPI (&coroapi) /* very sneaky */ 103#define GCoroAPI (&coroapi) /* very sneaky */
109 104
110#ifdef USE_ITHREADS 105#ifdef USE_ITHREADS
111# if CORO_PTHREAD 106# if CORO_PTHREAD
… …
183typedef struct coro_cctx 178typedef struct coro_cctx
184{ 179{
185 struct coro_cctx *next; 180 struct coro_cctx *next;
186 181
187 /* the stack */ 182 /* the stack */
188 void *sptr; 183 struct coro_stack stack;
189 size_t ssize;
190 184
191 /* cpu state */ 185 /* cpu state */
192 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 186 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
187#ifndef NDEBUG
193 JMPENV *idle_te; /* same as idle_sp, but for top_env, TODO: remove once stable */ 188 JMPENV *idle_te; /* same as idle_sp, but for top_env */
189#endif
194 JMPENV *top_env; 190 JMPENV *top_env;
195 coro_context cctx; 191 coro_context cctx;
196 192
197 U32 gen; 193 U32 gen;
198#if CORO_USE_VALGRIND 194#if CORO_USE_VALGRIND
… …
218}; 214};
219 215
220/* the structure where most of the perl state is stored, overlaid on the cxstack */ 216/* the structure where most of the perl state is stored, overlaid on the cxstack */
221typedef struct 217typedef struct
222{ 218{
223 SV *defsv;
224 AV *defav;
225 SV *errsv;
226 SV *irsgv;
227 HV *hinthv;
228#define VAR(name,type) type name; 219 #define VARx(name,expr,type) type name;
229# include "state.h" 220 #include "state.h"
230#undef VAR
231} perl_slots; 221} perl_slots;
232 222
233// how many context stack entries do we need for perl_slots 223/* how many context stack entries do we need for perl_slots */
234#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT)) 224#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
235 225
236/* this is a structure representing a perl-level coroutine */ 226/* this is a structure representing a perl-level coroutine */
237struct coro 227struct coro
238{ 228{
… …
266 SV *saved_deffh; 256 SV *saved_deffh;
267 SV *invoke_cb; 257 SV *invoke_cb;
268 AV *invoke_av; 258 AV *invoke_av;
269 259
270 /* on_enter/on_leave */ 260 /* on_enter/on_leave */
271 AV *on_enter; 261 AV *on_enter; AV *on_enter_xs;
272 AV *on_leave; 262 AV *on_leave; AV *on_leave_xs;
273 263
274 /* swap_sv */ 264 /* swap_sv */
275 AV *swap_sv; 265 AV *swap_sv;
276 266
277 /* times */ 267 /* times */
… …
304static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */ 294static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
305static CV *cv_coro_run; 295static CV *cv_coro_run;
306static struct coro *coro_first; 296static struct coro *coro_first;
307#define coro_nready coroapi.nready 297#define coro_nready coroapi.nready
308 298
299/** JIT *********************************************************************/
300
301#if CORO_JIT
302 /* APPLE doesn't have mmap though */
303 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__)
304 #ifndef CORO_JIT_TYPE
305 #if ECB_AMD64 && CORO_JIT_UNIXY
306 #define CORO_JIT_TYPE "amd64-unix"
307 #elif __i386 && CORO_JIT_UNIXY
308 #define CORO_JIT_TYPE "x86-unix"
309 #endif
310 #endif
311#endif
312
313#if !defined(CORO_JIT_TYPE) || _POSIX_MEMORY_PROTECTION <= 0
314 #undef CORO_JIT
315#endif
316
317#if CORO_JIT
318 typedef void (*load_save_perl_slots_type)(perl_slots *);
319 static load_save_perl_slots_type load_perl_slots, save_perl_slots;
320#endif
321
309/** Coro::Select ************************************************************/ 322/** Coro::Select ************************************************************/
310 323
311static OP *(*coro_old_pp_sselect) (pTHX); 324static OP *(*coro_old_pp_sselect) (pTHX);
312static SV *coro_select_select; 325static SV *coro_select_select;
313 326
… …
328 341
329/** time stuff **************************************************************/ 342/** time stuff **************************************************************/
330 343
331#ifdef HAS_GETTIMEOFDAY 344#ifdef HAS_GETTIMEOFDAY
332 345
333static void 346ecb_inline void
334coro_u2time (pTHX_ UV ret[2]) 347coro_u2time (pTHX_ UV ret[2])
335{ 348{
336 struct timeval tv; 349 struct timeval tv;
337 gettimeofday (&tv, 0); 350 gettimeofday (&tv, 0);
338 351
339 ret [0] = tv.tv_sec; 352 ret [0] = tv.tv_sec;
340 ret [1] = tv.tv_usec; 353 ret [1] = tv.tv_usec;
341} 354}
342 355
343static double 356ecb_inline double
344coro_nvtime () 357coro_nvtime (void)
345{ 358{
346 struct timeval tv; 359 struct timeval tv;
347 gettimeofday (&tv, 0); 360 gettimeofday (&tv, 0);
348 361
349 return tv.tv_sec + tv.tv_usec * 1e-6; 362 return tv.tv_sec + tv.tv_usec * 1e-6;
350} 363}
351 364
352static void 365ecb_inline void
353time_init (pTHX) 366time_init (pTHX)
354{ 367{
355 nvtime = coro_nvtime; 368 nvtime = coro_nvtime;
356 u2time = coro_u2time; 369 u2time = coro_u2time;
357} 370}
358 371
359#else 372#else
360 373
361static void 374ecb_inline void
362time_init (pTHX) 375time_init (pTHX)
363{ 376{
364 SV **svp; 377 SV **svp;
365 378
366 require_pv ("Time/HiRes.pm"); 379 require_pv ("Time/HiRes.pm");
367 380
368 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0); 381 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
369 382
370 if (!svp) croak ("Time::HiRes is required, but missing. Caught"); 383 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
371 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught"); 384 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught");
372 385
… …
378 391
379#endif 392#endif
380 393
381/** lowlevel stuff **********************************************************/ 394/** lowlevel stuff **********************************************************/
382 395
383static SV * 396static SV * ecb_noinline
384coro_get_sv (pTHX_ const char *name, int create) 397coro_get_sv (pTHX_ const char *name, int create)
385{ 398{
386#if PERL_VERSION_ATLEAST (5,10,0) 399#if PERL_VERSION_ATLEAST (5,10,0)
387 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 400 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
388 get_sv (name, create); 401 get_sv (name, create);
389#endif 402#endif
390 return get_sv (name, create); 403 return get_sv (name, create);
391} 404}
392 405
393static AV * 406static AV * ecb_noinline
394coro_get_av (pTHX_ const char *name, int create) 407coro_get_av (pTHX_ const char *name, int create)
395{ 408{
396#if PERL_VERSION_ATLEAST (5,10,0) 409#if PERL_VERSION_ATLEAST (5,10,0)
397 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 410 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
398 get_av (name, create); 411 get_av (name, create);
399#endif 412#endif
400 return get_av (name, create); 413 return get_av (name, create);
401} 414}
402 415
403static HV * 416static HV * ecb_noinline
404coro_get_hv (pTHX_ const char *name, int create) 417coro_get_hv (pTHX_ const char *name, int create)
405{ 418{
406#if PERL_VERSION_ATLEAST (5,10,0) 419#if PERL_VERSION_ATLEAST (5,10,0)
407 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 420 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
408 get_hv (name, create); 421 get_hv (name, create);
409#endif 422#endif
410 return get_hv (name, create); 423 return get_hv (name, create);
411} 424}
412 425
413INLINE void 426ecb_inline void
414coro_times_update () 427coro_times_update (void)
415{ 428{
416#ifdef coro_clock_gettime 429#ifdef coro_clock_gettime
417 struct timespec ts; 430 struct timespec ts;
418 431
419 ts.tv_sec = ts.tv_nsec = 0; 432 ts.tv_sec = ts.tv_nsec = 0;
… …
431 time_real [0] = tv [0]; 444 time_real [0] = tv [0];
432 time_real [1] = tv [1] * 1000; 445 time_real [1] = tv [1] * 1000;
433#endif 446#endif
434} 447}
435 448
436INLINE void 449ecb_inline void
437coro_times_add (struct coro *c) 450coro_times_add (struct coro *c)
438{ 451{
439 c->t_real [1] += time_real [1]; 452 c->t_real [1] += time_real [1];
440 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; } 453 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
441 c->t_real [0] += time_real [0]; 454 c->t_real [0] += time_real [0];
… …
443 c->t_cpu [1] += time_cpu [1]; 456 c->t_cpu [1] += time_cpu [1];
444 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; } 457 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
445 c->t_cpu [0] += time_cpu [0]; 458 c->t_cpu [0] += time_cpu [0];
446} 459}
447 460
448INLINE void 461ecb_inline void
449coro_times_sub (struct coro *c) 462coro_times_sub (struct coro *c)
450{ 463{
451 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; } 464 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; }
452 c->t_real [1] -= time_real [1]; 465 c->t_real [1] -= time_real [1];
453 c->t_real [0] -= time_real [0]; 466 c->t_real [0] -= time_real [0];
… …
461/* magic glue */ 474/* magic glue */
462 475
463#define CORO_MAGIC_type_cv 26 476#define CORO_MAGIC_type_cv 26
464#define CORO_MAGIC_type_state PERL_MAGIC_ext 477#define CORO_MAGIC_type_state PERL_MAGIC_ext
465 478
466#define CORO_MAGIC_NN(sv, type) \ 479#define CORO_MAGIC_NN(sv, type) \
467 (expect_true (SvMAGIC (sv)->mg_type == type) \ 480 (ecb_expect_true (SvMAGIC (sv)->mg_type == type) \
468 ? SvMAGIC (sv) \ 481 ? SvMAGIC (sv) \
469 : mg_find (sv, type)) 482 : mg_find (sv, type))
470 483
471#define CORO_MAGIC(sv, type) \ 484#define CORO_MAGIC(sv, type) \
472 (expect_true (SvMAGIC (sv)) \ 485 (ecb_expect_true (SvMAGIC (sv)) \
473 ? CORO_MAGIC_NN (sv, type) \ 486 ? CORO_MAGIC_NN (sv, type) \
474 : 0) 487 : 0)
475 488
476#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv) 489#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
477#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state) 490#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
478 491
479INLINE MAGIC * 492ecb_inline MAGIC *
480SvSTATEhv_p (pTHX_ SV *coro) 493SvSTATEhv_p (pTHX_ SV *coro)
481{ 494{
482 MAGIC *mg; 495 MAGIC *mg;
483 496
484 if (expect_true ( 497 if (ecb_expect_true (
485 SvTYPE (coro) == SVt_PVHV 498 SvTYPE (coro) == SVt_PVHV
486 && (mg = CORO_MAGIC_state (coro)) 499 && (mg = CORO_MAGIC_state (coro))
487 && mg->mg_virtual == &coro_state_vtbl 500 && mg->mg_virtual == &coro_state_vtbl
488 )) 501 ))
489 return mg; 502 return mg;
490 503
491 return 0; 504 return 0;
492} 505}
493 506
494INLINE struct coro * 507ecb_inline struct coro *
495SvSTATE_ (pTHX_ SV *coro) 508SvSTATE_ (pTHX_ SV *coro_sv)
496{ 509{
497 MAGIC *mg; 510 MAGIC *mg;
498 511
499 if (SvROK (coro)) 512 if (SvROK (coro_sv))
500 coro = SvRV (coro); 513 coro_sv = SvRV (coro_sv);
501 514
502 mg = SvSTATEhv_p (aTHX_ coro); 515 mg = SvSTATEhv_p (aTHX_ coro_sv);
503 if (!mg) 516 if (!mg)
504 croak ("Coro::State object required"); 517 croak ("Coro::State object required");
505 518
506 return (struct coro *)mg->mg_ptr; 519 return (struct coro *)mg->mg_ptr;
507} 520}
… …
513#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 526#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
514 527
515/*****************************************************************************/ 528/*****************************************************************************/
516/* padlist management and caching */ 529/* padlist management and caching */
517 530
518static AV * 531ecb_inline PADLIST *
519coro_derive_padlist (pTHX_ CV *cv) 532coro_derive_padlist (pTHX_ CV *cv)
520{ 533{
521 AV *padlist = CvPADLIST (cv); 534 PADLIST *padlist = CvPADLIST (cv);
522 AV *newpadlist, *newpad; 535 PADLIST *newpadlist;
536 PADNAMELIST *padnames;
537 PAD *newpad;
538 PADOFFSET off = PadlistMAX (padlist) + 1;
523 539
524 newpadlist = newAV (); 540#if NEWPADAPI
541
542 /* if we had the original CvDEPTH, we might be able to steal the CvDEPTH+1 entry instead */
543 /* 20131102194744.GA6705@schmorp.de, 20131102195825.2013.qmail@lists-nntp.develooper.com */
544 while (!PadlistARRAY (padlist)[off - 1])
545 --off;
546
547 Perl_pad_push (aTHX_ padlist, off);
548
549 newpad = PadlistARRAY (padlist)[off];
550 PadlistARRAY (padlist)[off] = 0;
551
552#else
553
554#if PERL_VERSION_ATLEAST (5,10,0)
555 Perl_pad_push (aTHX_ padlist, off);
556#else
557 Perl_pad_push (aTHX_ padlist, off, 1);
558#endif
559
560 newpad = PadlistARRAY (padlist)[off];
561 PadlistMAX (padlist) = off - 1;
562
563#endif
564
565 newPADLIST (newpadlist);
566#if !PERL_VERSION_ATLEAST(5,15,3)
567 /* Padlists are AvREAL as of 5.15.3. See perl bug #98092 and perl commit 7d953ba. */
525 AvREAL_off (newpadlist); 568 AvREAL_off (newpadlist);
526#if PERL_VERSION_ATLEAST (5,10,0)
527 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1);
528#else
529 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
530#endif 569#endif
531 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
532 --AvFILLp (padlist);
533 570
534 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0])); 571 /* Already extended to 2 elements by newPADLIST. */
535 av_store (newpadlist, 1, (SV *)newpad); 572 PadlistMAX (newpadlist) = 1;
573
574 padnames = PadlistNAMES (padlist);
575 ++PadnamelistREFCNT (padnames);
576 PadlistNAMES (newpadlist) = padnames;
577
578 PadlistARRAY (newpadlist)[1] = newpad;
536 579
537 return newpadlist; 580 return newpadlist;
538} 581}
539 582
540static void 583ecb_inline void
541free_padlist (pTHX_ AV *padlist) 584free_padlist (pTHX_ PADLIST *padlist)
542{ 585{
543 /* may be during global destruction */ 586 /* may be during global destruction */
544 if (!IN_DESTRUCT) 587 if (!IN_DESTRUCT)
545 { 588 {
546 I32 i = AvFILLp (padlist); 589 I32 i = PadlistMAX (padlist);
547 590
548 while (i > 0) /* special-case index 0 */ 591 while (i > 0) /* special-case index 0 */
549 { 592 {
550 /* we try to be extra-careful here */ 593 /* we try to be extra-careful here */
551 AV *av = (AV *)AvARRAY (padlist)[i--]; 594 PAD *pad = PadlistARRAY (padlist)[i--];
552 I32 j = AvFILLp (av);
553 595
596 if (pad)
597 {
598 I32 j = PadMAX (pad);
599
554 while (j >= 0) 600 while (j >= 0)
555 SvREFCNT_dec (AvARRAY (av)[j--]); 601 SvREFCNT_dec (PadARRAY (pad)[j--]);
556 602
557 AvFILLp (av) = -1; 603 PadMAX (pad) = -1;
558 SvREFCNT_dec (av); 604 SvREFCNT_dec (pad);
605 }
559 } 606 }
560 607
561 SvREFCNT_dec (AvARRAY (padlist)[0]); 608 PadnamelistREFCNT_dec (PadlistNAMES (padlist));
562 609
610#if NEWPADAPI
611 Safefree (PadlistARRAY (padlist));
612 Safefree (padlist);
613#else
563 AvFILLp (padlist) = -1; 614 AvFILLp (padlist) = -1;
615 AvREAL_off (padlist);
564 SvREFCNT_dec ((SV*)padlist); 616 SvREFCNT_dec ((SV*)padlist);
617#endif
565 } 618 }
566} 619}
567 620
568static int 621static int
569coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 622coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
570{ 623{
571 AV *padlist; 624 PADLIST *padlist;
572 AV *av = (AV *)mg->mg_obj; 625 PADLIST **padlists = (PADLIST **)(mg->mg_ptr + sizeof(size_t));
626 size_t len = *(size_t *)mg->mg_ptr;
573 627
574 /* perl manages to free our internal AV and _then_ call us */ 628 /* perl manages to free our internal AV and _then_ call us */
575 if (IN_DESTRUCT) 629 if (IN_DESTRUCT)
576 return 0; 630 return 0;
577 631
578 /* casting is fun. */ 632 while (len--)
579 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
580 free_padlist (aTHX_ padlist); 633 free_padlist (aTHX_ padlists[len]);
581
582 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
583 634
584 return 0; 635 return 0;
585} 636}
586 637
587static MGVTBL coro_cv_vtbl = { 638static MGVTBL coro_cv_vtbl = {
588 0, 0, 0, 0, 639 0, 0, 0, 0,
589 coro_cv_free 640 coro_cv_free
590}; 641};
591 642
592/* the next two functions merely cache the padlists */ 643/* the next two functions merely cache the padlists */
593static void 644ecb_inline void
594get_padlist (pTHX_ CV *cv) 645get_padlist (pTHX_ CV *cv)
595{ 646{
596 MAGIC *mg = CORO_MAGIC_cv (cv); 647 MAGIC *mg = CORO_MAGIC_cv (cv);
597 AV *av; 648 size_t *lenp;
598 649
599 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 650 if (ecb_expect_true (mg && *(lenp = (size_t *)mg->mg_ptr)))
600 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 651 CvPADLIST (cv) = ((PADLIST **)(mg->mg_ptr + sizeof(size_t)))[--*lenp];
601 else 652 else
602 { 653 {
603#if CORO_PREFER_PERL_FUNCTIONS 654#if CORO_PREFER_PERL_FUNCTIONS
604 /* this is probably cleaner? but also slower! */ 655 /* this is probably cleaner? but also slower! */
605 /* in practise, it seems to be less stable */ 656 /* in practise, it seems to be less stable */
… …
611 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 662 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
612#endif 663#endif
613 } 664 }
614} 665}
615 666
616static void 667ecb_inline void
617put_padlist (pTHX_ CV *cv) 668put_padlist (pTHX_ CV *cv)
618{ 669{
619 MAGIC *mg = CORO_MAGIC_cv (cv); 670 MAGIC *mg = CORO_MAGIC_cv (cv);
620 AV *av;
621 671
622 if (expect_false (!mg)) 672 if (ecb_expect_false (!mg))
673 {
623 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 674 mg = sv_magicext ((SV *)cv, 0, CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
675 Newz (0, mg->mg_ptr ,sizeof (size_t) + sizeof (PADLIST *), char);
676 mg->mg_len = 1; /* so mg_free frees mg_ptr */
677 }
678 else
679 Renew (mg->mg_ptr,
680 sizeof(size_t) + (*(size_t *)mg->mg_ptr + 1) * sizeof(PADLIST *),
681 char);
624 682
625 av = (AV *)mg->mg_obj; 683 ((PADLIST **)(mg->mg_ptr + sizeof (size_t))) [(*(size_t *)mg->mg_ptr)++] = CvPADLIST (cv);
626
627 if (expect_false (AvFILLp (av) >= AvMAX (av)))
628 av_extend (av, AvFILLp (av) + 1);
629
630 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
631} 684}
632 685
633/** load & save, init *******************************************************/ 686/** load & save, init *******************************************************/
634 687
688ecb_inline void
689swap_sv (SV *a, SV *b)
690{
691 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
692 SV tmp;
693
694 /* swap sv_any */
695 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
696
697 /* swap sv_flags */
698 SvFLAGS (&tmp) = SvFLAGS (a);
699 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
700 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
701
702#if PERL_VERSION_ATLEAST (5,10,0)
703 /* perl 5.10 and later complicates this _quite_ a bit, but it also
704 * is much faster, so no quarrels here. alternatively, we could
705 * sv_upgrade to avoid this.
706 */
707 {
708 /* swap sv_u */
709 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
710
711 /* if SvANY points to the head, we need to adjust the pointers,
712 * as the pointer for a still points to b, and maybe vice versa.
713 */
714 U32 svany_in_head_set = (1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV);
715 #if NVSIZE <= IVSIZE && PERL_VERSION_ATLEAST(5,22,0)
716 svany_in_head_set |= 1 << SVt_NV;
717 #endif
718
719 #define svany_in_head(type) (svany_in_head_set & (1 << (type)))
720
721 if (svany_in_head (SvTYPE (a)))
722 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
723
724 if (svany_in_head (SvTYPE (b)))
725 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
726 }
727#endif
728}
729
635/* swap sv heads, at least logically */ 730/* swap sv heads, at least logically */
636static void 731static void
637swap_svs (pTHX_ Coro__State c) 732swap_svs (pTHX_ Coro__State c)
638{ 733{
639 int i; 734 int i;
640 735
641 for (i = 0; i <= AvFILLp (c->swap_sv); ) 736 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
642 { 737 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
643 SV *a = AvARRAY (c->swap_sv)[i++];
644 SV *b = AvARRAY (c->swap_sv)[i++];
645
646 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
647 SV tmp;
648
649 /* swap sv_any */
650 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
651
652 /* swap sv_flags */
653 SvFLAGS (&tmp) = SvFLAGS (a);
654 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
655 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
656
657#if PERL_VERSION_ATLEAST (5,10,0)
658 /* perl 5.10 complicates this _quite_ a bit, but it also is
659 * much faster, so no quarrels here. alternatively, we could
660 * sv_upgrade to avoid this.
661 */
662 {
663 /* swap sv_u */
664 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
665
666 /* if SvANY points to the head, we need to adjust the pointers,
667 * as the pointer for a still points to b, and maybe vice versa.
668 */
669 #define svany_in_head(type) \
670 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
671
672 if (svany_in_head (SvTYPE (a)))
673 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
674
675 if (svany_in_head (SvTYPE (b)))
676 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
677 }
678#endif
679 }
680} 738}
681 739
682#define SWAP_SVS(coro) \ 740#define SWAP_SVS(coro) \
683 if (expect_false ((coro)->swap_sv)) \ 741 if (ecb_expect_false ((coro)->swap_sv)) \
684 swap_svs (aTHX_ (coro)) 742 swap_svs (aTHX_ (coro))
685 743
686static void 744static void
687on_enterleave_call (pTHX_ SV *cb); 745on_enterleave_call (pTHX_ SV *cb);
688 746
… …
692 perl_slots *slot = c->slot; 750 perl_slots *slot = c->slot;
693 c->slot = 0; 751 c->slot = 0;
694 752
695 PL_mainstack = c->mainstack; 753 PL_mainstack = c->mainstack;
696 754
697 GvSV (PL_defgv) = slot->defsv; 755#if CORO_JIT
698 GvAV (PL_defgv) = slot->defav; 756 load_perl_slots (slot);
699 GvSV (PL_errgv) = slot->errsv; 757#else
700 GvSV (irsgv) = slot->irsgv;
701 GvHV (PL_hintgv) = slot->hinthv;
702
703 #define VAR(name,type) PL_ ## name = slot->name; 758 #define VARx(name,expr,type) expr = slot->name;
704 # include "state.h" 759 #include "state.h"
705 #undef VAR 760#endif
706 761
707 { 762 {
708 dSP; 763 dSP;
709 764
710 CV *cv; 765 CV *cv;
711 766
712 /* now do the ugly restore mess */ 767 /* now do the ugly restore mess */
713 while (expect_true (cv = (CV *)POPs)) 768 while (ecb_expect_true (cv = (CV *)POPs))
714 { 769 {
715 put_padlist (aTHX_ cv); /* mark this padlist as available */ 770 put_padlist (aTHX_ cv); /* mark this padlist as available */
716 CvDEPTH (cv) = PTR2IV (POPs); 771 CvDEPTH (cv) = PTR2IV (POPs);
717 CvPADLIST (cv) = (AV *)POPs; 772 CvPADLIST (cv) = (PADLIST *)POPs;
718 } 773 }
719 774
720 PUTBACK; 775 PUTBACK;
721 } 776 }
722 777
723 slf_frame = c->slf_frame; 778 slf_frame = c->slf_frame;
724 CORO_THROW = c->except; 779 CORO_THROW = c->except;
725 780
726 if (expect_false (enable_times)) 781 if (ecb_expect_false (enable_times))
727 { 782 {
728 if (expect_false (!times_valid)) 783 if (ecb_expect_false (!times_valid))
729 coro_times_update (); 784 coro_times_update ();
730 785
731 coro_times_sub (c); 786 coro_times_sub (c);
732 } 787 }
733 788
734 if (expect_false (c->on_enter)) 789 if (ecb_expect_false (c->on_enter))
735 { 790 {
736 int i; 791 int i;
737 792
738 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 793 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
739 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 794 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
740 } 795 }
741 796
797 if (ecb_expect_false (c->on_enter_xs))
798 {
799 int i;
800
801 for (i = 0; i <= AvFILLp (c->on_enter_xs); i += 2)
802 ((coro_enterleave_hook)AvARRAY (c->on_enter_xs)[i]) (aTHX_ AvARRAY (c->on_enter_xs)[i + 1]);
803 }
804
742 SWAP_SVS (c); 805 SWAP_SVS (c);
743} 806}
744 807
745static void 808static void
746save_perl (pTHX_ Coro__State c) 809save_perl (pTHX_ Coro__State c)
747{ 810{
748 SWAP_SVS (c); 811 SWAP_SVS (c);
749 812
813 if (ecb_expect_false (c->on_leave_xs))
814 {
815 int i;
816
817 for (i = AvFILLp (c->on_leave_xs) - 1; i >= 0; i -= 2)
818 ((coro_enterleave_hook)AvARRAY (c->on_leave_xs)[i]) (aTHX_ AvARRAY (c->on_leave_xs)[i + 1]);
819 }
820
750 if (expect_false (c->on_leave)) 821 if (ecb_expect_false (c->on_leave))
751 { 822 {
752 int i; 823 int i;
753 824
754 for (i = AvFILLp (c->on_leave); i >= 0; --i) 825 for (i = AvFILLp (c->on_leave); i >= 0; --i)
755 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]); 826 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
756 } 827 }
757 828
758 times_valid = 0; 829 times_valid = 0;
759 830
760 if (expect_false (enable_times)) 831 if (ecb_expect_false (enable_times))
761 { 832 {
762 coro_times_update (); times_valid = 1; 833 coro_times_update (); times_valid = 1;
763 coro_times_add (c); 834 coro_times_add (c);
764 } 835 }
765 836
… …
779 850
780 XPUSHs (Nullsv); 851 XPUSHs (Nullsv);
781 /* this loop was inspired by pp_caller */ 852 /* this loop was inspired by pp_caller */
782 for (;;) 853 for (;;)
783 { 854 {
784 while (expect_true (cxix >= 0)) 855 while (ecb_expect_true (cxix >= 0))
785 { 856 {
786 PERL_CONTEXT *cx = &ccstk[cxix--]; 857 PERL_CONTEXT *cx = &ccstk[cxix--];
787 858
788 if (expect_true (CxTYPE (cx) == CXt_SUB) || expect_false (CxTYPE (cx) == CXt_FORMAT)) 859 if (ecb_expect_true (CxTYPE (cx) == CXt_SUB) || ecb_expect_false (CxTYPE (cx) == CXt_FORMAT))
789 { 860 {
790 CV *cv = cx->blk_sub.cv; 861 CV *cv = cx->blk_sub.cv;
791 862
792 if (expect_true (CvDEPTH (cv))) 863 if (ecb_expect_true (CvDEPTH (cv)))
793 { 864 {
794 EXTEND (SP, 3); 865 EXTEND (SP, 3);
795 PUSHs ((SV *)CvPADLIST (cv)); 866 PUSHs ((SV *)CvPADLIST (cv));
796 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv))); 867 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
797 PUSHs ((SV *)cv); 868 PUSHs ((SV *)cv);
… …
800 get_padlist (aTHX_ cv); 871 get_padlist (aTHX_ cv);
801 } 872 }
802 } 873 }
803 } 874 }
804 875
805 if (expect_true (top_si->si_type == PERLSI_MAIN)) 876 if (ecb_expect_true (top_si->si_type == PERLSI_MAIN))
806 break; 877 break;
807 878
808 top_si = top_si->si_prev; 879 top_si = top_si->si_prev;
809 ccstk = top_si->si_cxstack; 880 ccstk = top_si->si_cxstack;
810 cxix = top_si->si_cxix; 881 cxix = top_si->si_cxix;
… …
812 883
813 PUTBACK; 884 PUTBACK;
814 } 885 }
815 886
816 /* allocate some space on the context stack for our purposes */ 887 /* allocate some space on the context stack for our purposes */
817 if (expect_false (cxstack_ix + SLOT_COUNT >= cxstack_max)) 888 if (ecb_expect_false (cxstack_ix + (int)SLOT_COUNT >= cxstack_max))
818 { 889 {
819 unsigned int i; 890 unsigned int i;
820 891
821 for (i = 0; i < SLOT_COUNT; ++i) 892 for (i = 0; i < SLOT_COUNT; ++i)
822 CXINC; 893 CXINC;
… …
827 c->mainstack = PL_mainstack; 898 c->mainstack = PL_mainstack;
828 899
829 { 900 {
830 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 901 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
831 902
832 slot->defav = GvAV (PL_defgv); 903#if CORO_JIT
833 slot->defsv = DEFSV; 904 save_perl_slots (slot);
834 slot->errsv = ERRSV; 905#else
835 slot->irsgv = GvSV (irsgv);
836 slot->hinthv = GvHV (PL_hintgv);
837
838 #define VAR(name,type) slot->name = PL_ ## name; 906 #define VARx(name,expr,type) slot->name = expr;
839 # include "state.h" 907 #include "state.h"
840 #undef VAR 908#endif
841 } 909 }
842} 910}
843 911
844/* 912/*
845 * allocate various perl stacks. This is almost an exact copy 913 * allocate various perl stacks. This is almost an exact copy
… …
876#endif 944#endif
877 945
878 New(54,PL_scopestack,8,I32); 946 New(54,PL_scopestack,8,I32);
879 PL_scopestack_ix = 0; 947 PL_scopestack_ix = 0;
880 PL_scopestack_max = 8; 948 PL_scopestack_max = 8;
949#if HAS_SCOPESTACK_NAME
950 New(54,PL_scopestack_name,8,const char*);
951#endif
881 952
882 New(54,PL_savestack,24,ANY); 953 New(54,PL_savestack,24,ANY);
883 PL_savestack_ix = 0; 954 PL_savestack_ix = 0;
884 PL_savestack_max = 24; 955 PL_savestack_max = 24;
885 956
… …
913 } 984 }
914 985
915 Safefree (PL_tmps_stack); 986 Safefree (PL_tmps_stack);
916 Safefree (PL_markstack); 987 Safefree (PL_markstack);
917 Safefree (PL_scopestack); 988 Safefree (PL_scopestack);
989#if HAS_SCOPESTACK_NAME
990 Safefree (PL_scopestack_name);
991#endif
918 Safefree (PL_savestack); 992 Safefree (PL_savestack);
919#if !PERL_VERSION_ATLEAST (5,10,0) 993#if !PERL_VERSION_ATLEAST (5,10,0)
920 Safefree (PL_retstack); 994 Safefree (PL_retstack);
921#endif 995#endif
922} 996}
… …
971 * This overrides the default magic get method of %SIG elements. 1045 * This overrides the default magic get method of %SIG elements.
972 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook 1046 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
973 * and instead of trying to save and restore the hash elements (extremely slow), 1047 * and instead of trying to save and restore the hash elements (extremely slow),
974 * we just provide our own readback here. 1048 * we just provide our own readback here.
975 */ 1049 */
976static int 1050static int ecb_cold
977coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 1051coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
978{ 1052{
979 const char *s = MgPV_nolen_const (mg); 1053 const char *s = MgPV_nolen_const (mg);
980 1054
981 if (*s == '_') 1055 if (*s == '_')
982 { 1056 {
983 SV **svp = 0; 1057 SV **svp = 0;
984 1058
985 if (strEQ (s, "__DIE__" )) svp = &PL_diehook; 1059 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
986 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 1060 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
987 1061
988 if (svp) 1062 if (svp)
989 { 1063 {
990 sv_setsv (sv, *svp ? *svp : &PL_sv_undef); 1064 SV *ssv;
1065
1066 if (!*svp)
1067 ssv = &PL_sv_undef;
1068 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */
1069 ssv = sv_2mortal (newRV_inc (*svp));
1070 else
1071 ssv = *svp;
1072
1073 sv_setsv (sv, ssv);
991 return 0; 1074 return 0;
992 } 1075 }
993 } 1076 }
994 1077
995 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 1078 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
996} 1079}
997 1080
998static int 1081static int ecb_cold
999coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1082coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
1000{ 1083{
1001 const char *s = MgPV_nolen_const (mg); 1084 const char *s = MgPV_nolen_const (mg);
1002 1085
1003 if (*s == '_') 1086 if (*s == '_')
… …
1017 } 1100 }
1018 1101
1019 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0; 1102 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
1020} 1103}
1021 1104
1022static int 1105static int ecb_cold
1023coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1106coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
1024{ 1107{
1025 const char *s = MgPV_nolen_const (mg); 1108 const char *s = MgPV_nolen_const (mg);
1026 1109
1027 if (*s == '_') 1110 if (*s == '_')
… …
1062 return 1; 1145 return 1;
1063} 1146}
1064 1147
1065static UNOP init_perl_op; 1148static UNOP init_perl_op;
1066 1149
1067static void NOINLINE /* noinline to keep it out of the transfer fast path */ 1150ecb_noinline static void /* noinline to keep it out of the transfer fast path */
1068init_perl (pTHX_ struct coro *coro) 1151init_perl (pTHX_ struct coro *coro)
1069{ 1152{
1070 /* 1153 /*
1071 * emulate part of the perl startup here. 1154 * emulate part of the perl startup here.
1072 */ 1155 */
… …
1089 PL_hints = 0; 1172 PL_hints = 0;
1090 1173
1091 /* recreate the die/warn hooks */ 1174 /* recreate the die/warn hooks */
1092 PL_diehook = SvREFCNT_inc (rv_diehook); 1175 PL_diehook = SvREFCNT_inc (rv_diehook);
1093 PL_warnhook = SvREFCNT_inc (rv_warnhook); 1176 PL_warnhook = SvREFCNT_inc (rv_warnhook);
1094 1177
1095 GvSV (PL_defgv) = newSV (0); 1178 GvSV (PL_defgv) = newSV (0);
1096 GvAV (PL_defgv) = coro->args; coro->args = 0; 1179 GvAV (PL_defgv) = coro->args; coro->args = 0;
1097 GvSV (PL_errgv) = newSV (0); 1180 GvSV (PL_errgv) = newSV (0);
1098 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1181 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
1099 GvHV (PL_hintgv) = 0; 1182 GvHV (PL_hintgv) = newHV ();
1183#if PERL_VERSION_ATLEAST (5,10,0)
1184 hv_magic (GvHV (PL_hintgv), 0, PERL_MAGIC_hints);
1185#endif
1100 PL_rs = newSVsv (GvSV (irsgv)); 1186 PL_rs = newSVsv (GvSV (irsgv));
1101 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1187 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
1102 1188
1103 { 1189 {
1104 dSP; 1190 dSP;
… …
1134 /* copy throw, in case it was set before init_perl */ 1220 /* copy throw, in case it was set before init_perl */
1135 CORO_THROW = coro->except; 1221 CORO_THROW = coro->except;
1136 1222
1137 SWAP_SVS (coro); 1223 SWAP_SVS (coro);
1138 1224
1139 if (expect_false (enable_times)) 1225 if (ecb_expect_false (enable_times))
1140 { 1226 {
1141 coro_times_update (); 1227 coro_times_update ();
1142 coro_times_sub (coro); 1228 coro_times_sub (coro);
1143 } 1229 }
1144} 1230}
… …
1187 /* restore swapped sv's */ 1273 /* restore swapped sv's */
1188 SWAP_SVS (coro); 1274 SWAP_SVS (coro);
1189 1275
1190 coro_destruct_stacks (aTHX); 1276 coro_destruct_stacks (aTHX);
1191 1277
1192 // now save some sv's to be free'd later 1278 /* now save some sv's to be free'd later */
1193 svf [0] = GvSV (PL_defgv); 1279 svf [0] = GvSV (PL_defgv);
1194 svf [1] = (SV *)GvAV (PL_defgv); 1280 svf [1] = (SV *)GvAV (PL_defgv);
1195 svf [2] = GvSV (PL_errgv); 1281 svf [2] = GvSV (PL_errgv);
1196 svf [3] = (SV *)PL_defoutgv; 1282 svf [3] = (SV *)PL_defoutgv;
1197 svf [4] = PL_rs; 1283 svf [4] = PL_rs;
… …
1214 1300
1215 SvREFCNT_dec (coro->saved_deffh); 1301 SvREFCNT_dec (coro->saved_deffh);
1216 SvREFCNT_dec (coro->rouse_cb); 1302 SvREFCNT_dec (coro->rouse_cb);
1217 SvREFCNT_dec (coro->invoke_cb); 1303 SvREFCNT_dec (coro->invoke_cb);
1218 SvREFCNT_dec (coro->invoke_av); 1304 SvREFCNT_dec (coro->invoke_av);
1305 SvREFCNT_dec (coro->on_enter_xs);
1306 SvREFCNT_dec (coro->on_leave_xs);
1219 } 1307 }
1220} 1308}
1221 1309
1222INLINE void 1310ecb_inline void
1223free_coro_mortal (pTHX) 1311free_coro_mortal (pTHX)
1224{ 1312{
1225 if (expect_true (coro_mortal)) 1313 if (ecb_expect_true (coro_mortal))
1226 { 1314 {
1227 SvREFCNT_dec ((SV *)coro_mortal); 1315 SvREFCNT_dec ((SV *)coro_mortal);
1228 coro_mortal = 0; 1316 coro_mortal = 0;
1229 } 1317 }
1230} 1318}
… …
1286 1374
1287 if (PL_curcop != &PL_compiling) 1375 if (PL_curcop != &PL_compiling)
1288 { 1376 {
1289 SV **cb; 1377 SV **cb;
1290 1378
1291 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB) 1379 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB && cxstack_ix >= 0)
1292 { 1380 {
1293 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1381 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1294 1382
1295 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1383 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1296 { 1384 {
… …
1365 1453
1366 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1454 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1367} 1455}
1368 1456
1369/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1457/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1370static void NOINLINE 1458static void ecb_noinline
1371cctx_prepare (pTHX) 1459cctx_prepare (pTHX)
1372{ 1460{
1373 PL_top_env = &PL_start_env; 1461 PL_top_env = &PL_start_env;
1374 1462
1375 if (cctx_current->flags & CC_TRACE) 1463 if (cctx_current->flags & CC_TRACE)
… …
1386 slf_frame.prepare = slf_prepare_set_stacklevel; 1474 slf_frame.prepare = slf_prepare_set_stacklevel;
1387 slf_frame.check = slf_check_set_stacklevel; 1475 slf_frame.check = slf_check_set_stacklevel;
1388} 1476}
1389 1477
1390/* the tail of transfer: execute stuff we can only do after a transfer */ 1478/* the tail of transfer: execute stuff we can only do after a transfer */
1391INLINE void 1479ecb_inline void
1392transfer_tail (pTHX) 1480transfer_tail (pTHX)
1393{ 1481{
1394 free_coro_mortal (aTHX); 1482 free_coro_mortal (aTHX);
1483}
1484
1485/* try to exit the same way perl's main function would do */
1486/* we do not bother resetting the environment or other things *7
1487/* that are not, uhm, essential */
1488/* this obviously also doesn't work when perl is embedded */
1489static void ecb_noinline ecb_cold
1490perlish_exit (pTHX)
1491{
1492 int exitstatus = perl_destruct (PL_curinterp);
1493 perl_free (PL_curinterp);
1494 exit (exitstatus);
1395} 1495}
1396 1496
1397/* 1497/*
1398 * this is a _very_ stripped down perl interpreter ;) 1498 * this is a _very_ stripped down perl interpreter ;)
1399 */ 1499 */
… …
1428 */ 1528 */
1429 1529
1430 /* 1530 /*
1431 * If perl-run returns we assume exit() was being called or the coro 1531 * If perl-run returns we assume exit() was being called or the coro
1432 * fell off the end, which seems to be the only valid (non-bug) 1532 * fell off the end, which seems to be the only valid (non-bug)
1433 * reason for perl_run to return. We try to exit by jumping to the 1533 * reason for perl_run to return. We try to mimic whatever perl is normally
1434 * bootstrap-time "top" top_env, as we cannot restore the "main" 1534 * doing in that case. YMMV.
1435 * coroutine as Coro has no such concept.
1436 * This actually isn't valid with the pthread backend, but OSes requiring
1437 * that backend are too broken to do it in a standards-compliant way.
1438 */ 1535 */
1439 PL_top_env = main_top_env; 1536 perlish_exit (aTHX);
1440 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1441 } 1537 }
1442} 1538}
1443 1539
1444static coro_cctx * 1540static coro_cctx *
1445cctx_new () 1541cctx_new (void)
1446{ 1542{
1447 coro_cctx *cctx; 1543 coro_cctx *cctx;
1448 1544
1449 ++cctx_count; 1545 ++cctx_count;
1450 New (0, cctx, 1, coro_cctx); 1546 New (0, cctx, 1, coro_cctx);
… …
1456 return cctx; 1552 return cctx;
1457} 1553}
1458 1554
1459/* create a new cctx only suitable as source */ 1555/* create a new cctx only suitable as source */
1460static coro_cctx * 1556static coro_cctx *
1461cctx_new_empty () 1557cctx_new_empty (void)
1462{ 1558{
1463 coro_cctx *cctx = cctx_new (); 1559 coro_cctx *cctx = cctx_new ();
1464 1560
1465 cctx->sptr = 0; 1561 cctx->stack.sptr = 0;
1466 coro_create (&cctx->cctx, 0, 0, 0, 0); 1562 coro_create (&cctx->cctx, 0, 0, 0, 0);
1467 1563
1468 return cctx; 1564 return cctx;
1469} 1565}
1470 1566
1471/* create a new cctx suitable as destination/running a perl interpreter */ 1567/* create a new cctx suitable as destination/running a perl interpreter */
1472static coro_cctx * 1568static coro_cctx *
1473cctx_new_run () 1569cctx_new_run (void)
1474{ 1570{
1475 coro_cctx *cctx = cctx_new (); 1571 coro_cctx *cctx = cctx_new ();
1476 void *stack_start;
1477 size_t stack_size;
1478 1572
1479#if HAVE_MMAP 1573 if (!coro_stack_alloc (&cctx->stack, cctx_stacksize))
1480 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1481 /* mmap supposedly does allocate-on-write for us */
1482 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
1483
1484 if (cctx->sptr != (void *)-1)
1485 {
1486 #if CORO_STACKGUARD
1487 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
1488 #endif
1489 stack_start = (char *)cctx->sptr + CORO_STACKGUARD * PAGESIZE;
1490 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
1491 cctx->flags |= CC_MAPPED;
1492 } 1574 {
1493 else
1494#endif
1495 {
1496 cctx->ssize = cctx_stacksize * (long)sizeof (long);
1497 New (0, cctx->sptr, cctx_stacksize, long);
1498
1499 if (!cctx->sptr)
1500 {
1501 perror ("FATAL: unable to allocate stack for coroutine, exiting."); 1575 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1502 _exit (EXIT_FAILURE); 1576 _exit (EXIT_FAILURE);
1503 }
1504
1505 stack_start = cctx->sptr;
1506 stack_size = cctx->ssize;
1507 } 1577 }
1508 1578
1509 #if CORO_USE_VALGRIND
1510 cctx->valgrind_id = VALGRIND_STACK_REGISTER ((char *)stack_start, (char *)stack_start + stack_size);
1511 #endif
1512
1513 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size); 1579 coro_create (&cctx->cctx, cctx_run, (void *)cctx, cctx->stack.sptr, cctx->stack.ssze);
1514 1580
1515 return cctx; 1581 return cctx;
1516} 1582}
1517 1583
1518static void 1584static void
… …
1524 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current)); 1590 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1525 1591
1526 --cctx_count; 1592 --cctx_count;
1527 coro_destroy (&cctx->cctx); 1593 coro_destroy (&cctx->cctx);
1528 1594
1529 /* coro_transfer creates new, empty cctx's */ 1595 coro_stack_free (&cctx->stack);
1530 if (cctx->sptr)
1531 {
1532 #if CORO_USE_VALGRIND
1533 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
1534 #endif
1535
1536#if HAVE_MMAP
1537 if (cctx->flags & CC_MAPPED)
1538 munmap (cctx->sptr, cctx->ssize);
1539 else
1540#endif
1541 Safefree (cctx->sptr);
1542 }
1543 1596
1544 Safefree (cctx); 1597 Safefree (cctx);
1545} 1598}
1546 1599
1547/* wether this cctx should be destructed */ 1600/* wether this cctx should be destructed */
1548#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE)) 1601#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE))
1549 1602
1550static coro_cctx * 1603static coro_cctx *
1551cctx_get (pTHX) 1604cctx_get (pTHX)
1552{ 1605{
1553 while (expect_true (cctx_first)) 1606 while (ecb_expect_true (cctx_first))
1554 { 1607 {
1555 coro_cctx *cctx = cctx_first; 1608 coro_cctx *cctx = cctx_first;
1556 cctx_first = cctx->next; 1609 cctx_first = cctx->next;
1557 --cctx_idle; 1610 --cctx_idle;
1558 1611
1559 if (expect_true (!CCTX_EXPIRED (cctx))) 1612 if (ecb_expect_true (!CCTX_EXPIRED (cctx)))
1560 return cctx; 1613 return cctx;
1561 1614
1562 cctx_destroy (cctx); 1615 cctx_destroy (cctx);
1563 } 1616 }
1564 1617
… …
1566} 1619}
1567 1620
1568static void 1621static void
1569cctx_put (coro_cctx *cctx) 1622cctx_put (coro_cctx *cctx)
1570{ 1623{
1571 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1624 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->stack.sptr));
1572 1625
1573 /* free another cctx if overlimit */ 1626 /* free another cctx if overlimit */
1574 if (expect_false (cctx_idle >= cctx_max_idle)) 1627 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1575 { 1628 {
1576 coro_cctx *first = cctx_first; 1629 coro_cctx *first = cctx_first;
1577 cctx_first = first->next; 1630 cctx_first = first->next;
1578 --cctx_idle; 1631 --cctx_idle;
1579 1632
… …
1590static void 1643static void
1591transfer_check (pTHX_ struct coro *prev, struct coro *next) 1644transfer_check (pTHX_ struct coro *prev, struct coro *next)
1592{ 1645{
1593 /* TODO: throwing up here is considered harmful */ 1646 /* TODO: throwing up here is considered harmful */
1594 1647
1595 if (expect_true (prev != next)) 1648 if (ecb_expect_true (prev != next))
1596 { 1649 {
1597 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1650 if (ecb_expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1598 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,"); 1651 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1599 1652
1600 if (expect_false (next->flags & (CF_RUNNING | CF_ZOMBIE | CF_SUSPENDED))) 1653 if (ecb_expect_false (next->flags & (CF_RUNNING | CF_ZOMBIE | CF_SUSPENDED)))
1601 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,"); 1654 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1602 1655
1603#if !PERL_VERSION_ATLEAST (5,10,0) 1656#if !PERL_VERSION_ATLEAST (5,10,0)
1604 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1657 if (ecb_expect_false (PL_lex_state != LEX_NOTPARSING))
1605 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,"); 1658 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1606#endif 1659#endif
1607 } 1660 }
1608} 1661}
1609 1662
1610/* always use the TRANSFER macro */ 1663/* always use the TRANSFER macro */
1611static void NOINLINE /* noinline so we have a fixed stackframe */ 1664static void ecb_noinline /* noinline so we have a fixed stackframe */
1612transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1665transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1613{ 1666{
1614 dSTACKLEVEL; 1667 dSTACKLEVEL;
1615 1668
1616 /* sometimes transfer is only called to set idle_sp */ 1669 /* sometimes transfer is only called to set idle_sp */
1617 if (expect_false (!prev)) 1670 if (ecb_expect_false (!prev))
1618 { 1671 {
1619 cctx_current->idle_sp = STACKLEVEL; 1672 cctx_current->idle_sp = STACKLEVEL;
1620 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1673 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1621 } 1674 }
1622 else if (expect_true (prev != next)) 1675 else if (ecb_expect_true (prev != next))
1623 { 1676 {
1624 coro_cctx *cctx_prev; 1677 coro_cctx *cctx_prev;
1625 1678
1626 if (expect_false (prev->flags & CF_NEW)) 1679 if (ecb_expect_false (prev->flags & CF_NEW))
1627 { 1680 {
1628 /* create a new empty/source context */ 1681 /* create a new empty/source context */
1629 prev->flags &= ~CF_NEW; 1682 prev->flags &= ~CF_NEW;
1630 prev->flags |= CF_RUNNING; 1683 prev->flags |= CF_RUNNING;
1631 } 1684 }
… …
1634 next->flags |= CF_RUNNING; 1687 next->flags |= CF_RUNNING;
1635 1688
1636 /* first get rid of the old state */ 1689 /* first get rid of the old state */
1637 save_perl (aTHX_ prev); 1690 save_perl (aTHX_ prev);
1638 1691
1639 if (expect_false (next->flags & CF_NEW)) 1692 if (ecb_expect_false (next->flags & CF_NEW))
1640 { 1693 {
1641 /* need to start coroutine */ 1694 /* need to start coroutine */
1642 next->flags &= ~CF_NEW; 1695 next->flags &= ~CF_NEW;
1643 /* setup coroutine call */ 1696 /* setup coroutine call */
1644 init_perl (aTHX_ next); 1697 init_perl (aTHX_ next);
1645 } 1698 }
1646 else 1699 else
1647 load_perl (aTHX_ next); 1700 load_perl (aTHX_ next);
1648 1701
1649 /* possibly untie and reuse the cctx */ 1702 /* possibly untie and reuse the cctx */
1650 if (expect_true ( 1703 if (ecb_expect_true (
1651 cctx_current->idle_sp == STACKLEVEL 1704 cctx_current->idle_sp == STACKLEVEL
1652 && !(cctx_current->flags & CC_TRACE) 1705 && !(cctx_current->flags & CC_TRACE)
1653 && !force_cctx 1706 && !force_cctx
1654 )) 1707 ))
1655 { 1708 {
1656 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1709 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */
1657 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te)); 1710 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1658 1711
1659 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */ 1712 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */
1660 /* without this the next cctx_get might destroy the running cctx while still in use */ 1713 /* without this the next cctx_get might destroy the running cctx while still in use */
1661 if (expect_false (CCTX_EXPIRED (cctx_current))) 1714 if (ecb_expect_false (CCTX_EXPIRED (cctx_current)))
1662 if (expect_true (!next->cctx)) 1715 if (ecb_expect_true (!next->cctx))
1663 next->cctx = cctx_get (aTHX); 1716 next->cctx = cctx_get (aTHX);
1664 1717
1665 cctx_put (cctx_current); 1718 cctx_put (cctx_current);
1666 } 1719 }
1667 else 1720 else
1668 prev->cctx = cctx_current; 1721 prev->cctx = cctx_current;
1669 1722
1670 ++next->usecount; 1723 ++next->usecount;
1671 1724
1672 cctx_prev = cctx_current; 1725 cctx_prev = cctx_current;
1673 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX); 1726 cctx_current = ecb_expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1674 1727
1675 next->cctx = 0; 1728 next->cctx = 0;
1676 1729
1677 if (expect_false (cctx_prev != cctx_current)) 1730 if (ecb_expect_false (cctx_prev != cctx_current))
1678 { 1731 {
1679 cctx_prev->top_env = PL_top_env; 1732 cctx_prev->top_env = PL_top_env;
1680 PL_top_env = cctx_current->top_env; 1733 PL_top_env = cctx_current->top_env;
1681 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx); 1734 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1682 } 1735 }
… …
1702 return; 1755 return;
1703 1756
1704 slf_destroy (aTHX_ coro); 1757 slf_destroy (aTHX_ coro);
1705 1758
1706 coro->flags |= CF_ZOMBIE; 1759 coro->flags |= CF_ZOMBIE;
1707 1760
1708 if (coro->flags & CF_READY) 1761 if (coro->flags & CF_READY)
1709 { 1762 {
1710 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1763 /* reduce nready, as destroying a ready coro effectively unreadies it */
1711 /* alternative: look through all ready queues and remove the coro */ 1764 /* alternative: look through all ready queues and remove the coro */
1712 --coro_nready; 1765 --coro_nready;
… …
1748 Safefree (coro); 1801 Safefree (coro);
1749 1802
1750 return 0; 1803 return 0;
1751} 1804}
1752 1805
1753static int 1806static int ecb_cold
1754coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1807coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1755{ 1808{
1756 /* called when perl clones the current process the slow way (windows process emulation) */ 1809 /* called when perl clones the current process the slow way (windows process emulation) */
1757 /* WE SIMply nuke the pointers in the copy, causing perl to croak */ 1810 /* WE SIMply nuke the pointers in the copy, causing perl to croak */
1758 mg->mg_ptr = 0; 1811 mg->mg_ptr = 0;
… …
1789 TRANSFER (ta, 1); 1842 TRANSFER (ta, 1);
1790} 1843}
1791 1844
1792/** Coro ********************************************************************/ 1845/** Coro ********************************************************************/
1793 1846
1794INLINE void 1847ecb_inline void
1795coro_enq (pTHX_ struct coro *coro) 1848coro_enq (pTHX_ struct coro *coro)
1796{ 1849{
1797 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN]; 1850 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1798 1851
1799 SvREFCNT_inc_NN (coro->hv); 1852 SvREFCNT_inc_NN (coro->hv);
… …
1801 coro->next_ready = 0; 1854 coro->next_ready = 0;
1802 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro; 1855 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1803 ready [1] = coro; 1856 ready [1] = coro;
1804} 1857}
1805 1858
1806INLINE struct coro * 1859ecb_inline struct coro *
1807coro_deq (pTHX) 1860coro_deq (pTHX)
1808{ 1861{
1809 int prio; 1862 int prio;
1810 1863
1811 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; ) 1864 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
… …
1864{ 1917{
1865 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1918 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1866} 1919}
1867 1920
1868/* expects to own a reference to next->hv */ 1921/* expects to own a reference to next->hv */
1869INLINE void 1922ecb_inline void
1870prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1923prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1871{ 1924{
1872 SV *prev_sv = SvRV (coro_current); 1925 SV *prev_sv = SvRV (coro_current);
1873 1926
1874 ta->prev = SvSTATE_hv (prev_sv); 1927 ta->prev = SvSTATE_hv (prev_sv);
… …
1887{ 1940{
1888 for (;;) 1941 for (;;)
1889 { 1942 {
1890 struct coro *next = coro_deq (aTHX); 1943 struct coro *next = coro_deq (aTHX);
1891 1944
1892 if (expect_true (next)) 1945 if (ecb_expect_true (next))
1893 { 1946 {
1894 /* cannot transfer to destroyed coros, skip and look for next */ 1947 /* cannot transfer to destroyed coros, skip and look for next */
1895 if (expect_false (next->flags & (CF_ZOMBIE | CF_SUSPENDED))) 1948 if (ecb_expect_false (next->flags & (CF_ZOMBIE | CF_SUSPENDED)))
1896 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */ 1949 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1897 else 1950 else
1898 { 1951 {
1899 next->flags &= ~CF_READY; 1952 next->flags &= ~CF_READY;
1900 --coro_nready; 1953 --coro_nready;
… …
1908 /* nothing to schedule: call the idle handler */ 1961 /* nothing to schedule: call the idle handler */
1909 if (SvROK (sv_idle) 1962 if (SvROK (sv_idle)
1910 && SvOBJECT (SvRV (sv_idle))) 1963 && SvOBJECT (SvRV (sv_idle)))
1911 { 1964 {
1912 if (SvRV (sv_idle) == SvRV (coro_current)) 1965 if (SvRV (sv_idle) == SvRV (coro_current))
1966 {
1967 require_pv ("Carp");
1968
1969 {
1970 dSP;
1971
1972 ENTER;
1973 SAVETMPS;
1974
1975 PUSHMARK (SP);
1913 croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught"); 1976 XPUSHs (sv_2mortal (newSVpv ("FATAL: $Coro::idle blocked itself - did you try to block inside an event loop callback? Caught", 0)));
1977 PUTBACK;
1978 call_pv ("Carp::confess", G_VOID | G_DISCARD);
1979
1980 FREETMPS;
1981 LEAVE;
1982 }
1983 }
1914 1984
1915 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 1985 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1916 api_ready (aTHX_ SvRV (sv_idle)); 1986 api_ready (aTHX_ SvRV (sv_idle));
1917 --coro_nready; 1987 --coro_nready;
1918 } 1988 }
… …
1933 } 2003 }
1934 } 2004 }
1935 } 2005 }
1936} 2006}
1937 2007
1938INLINE void 2008ecb_inline void
1939prepare_cede (pTHX_ struct coro_transfer_args *ta) 2009prepare_cede (pTHX_ struct coro_transfer_args *ta)
1940{ 2010{
1941 api_ready (aTHX_ coro_current); 2011 api_ready (aTHX_ coro_current);
1942 prepare_schedule (aTHX_ ta); 2012 prepare_schedule (aTHX_ ta);
1943} 2013}
1944 2014
1945INLINE void 2015ecb_inline void
1946prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 2016prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1947{ 2017{
1948 SV *prev = SvRV (coro_current); 2018 SV *prev = SvRV (coro_current);
1949 2019
1950 if (coro_nready) 2020 if (coro_nready)
… …
1980{ 2050{
1981 struct coro_transfer_args ta; 2051 struct coro_transfer_args ta;
1982 2052
1983 prepare_cede (aTHX_ &ta); 2053 prepare_cede (aTHX_ &ta);
1984 2054
1985 if (expect_true (ta.prev != ta.next)) 2055 if (ecb_expect_true (ta.prev != ta.next))
1986 { 2056 {
1987 TRANSFER (ta, 1); 2057 TRANSFER (ta, 1);
1988 return 1; 2058 return 1;
1989 } 2059 }
1990 else 2060 else
… …
2115{ 2185{
2116 AV *od = coro->on_destroy; 2186 AV *od = coro->on_destroy;
2117 2187
2118 if (!od) 2188 if (!od)
2119 return; 2189 return;
2190
2191 coro->on_destroy = 0;
2192 sv_2mortal ((SV *)od);
2120 2193
2121 while (AvFILLp (od) >= 0) 2194 while (AvFILLp (od) >= 0)
2122 { 2195 {
2123 SV *cb = sv_2mortal (av_pop (od)); 2196 SV *cb = sv_2mortal (av_pop (od));
2124 2197
… …
2145 2218
2146static void 2219static void
2147coro_set_status (pTHX_ struct coro *coro, SV **arg, int items) 2220coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
2148{ 2221{
2149 AV *av; 2222 AV *av;
2150 2223
2151 if (coro->status) 2224 if (coro->status)
2152 { 2225 {
2153 av = coro->status; 2226 av = coro->status;
2154 av_clear (av); 2227 av_clear (av);
2155 } 2228 }
… …
2202 2275
2203 coro = SvSTATE (arg [0]); 2276 coro = SvSTATE (arg [0]);
2204 coro_hv = coro->hv; 2277 coro_hv = coro->hv;
2205 2278
2206 coro_set_status (aTHX_ coro, arg + 1, items - 1); 2279 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2207 2280
2208 if (expect_false (coro->flags & CF_NOCANCEL)) 2281 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2209 { 2282 {
2210 /* coro currently busy cancelling something, so just notify it */ 2283 /* coro currently busy cancelling something, so just notify it */
2211 coro->slf_frame.data = (void *)coro; 2284 coro->slf_frame.data = (void *)coro;
2212 2285
2213 frame->prepare = prepare_nop; 2286 frame->prepare = prepare_nop;
… …
2219 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv); 2292 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2220 } 2293 }
2221 else 2294 else
2222 { 2295 {
2223 struct coro *self = SvSTATE_current; 2296 struct coro *self = SvSTATE_current;
2297
2298 if (!self)
2299 croak ("Coro::cancel called outside of thread content,");
2224 2300
2225 /* otherwise we cancel directly, purely for speed reasons 2301 /* otherwise we cancel directly, purely for speed reasons
2226 * unfortunately, this requires some magic trickery, as 2302 * unfortunately, this requires some magic trickery, as
2227 * somebody else could cancel us, so we have to fight the cancellation. 2303 * somebody else could cancel us, so we have to fight the cancellation.
2228 * this is ugly, and hopefully fully worth the extra speed. 2304 * this is ugly, and hopefully fully worth the extra speed.
… …
2321slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2397slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2322{ 2398{
2323 HV *hv = (HV *)SvRV (coro_current); 2399 HV *hv = (HV *)SvRV (coro_current);
2324 struct coro *coro = SvSTATE_hv ((SV *)hv); 2400 struct coro *coro = SvSTATE_hv ((SV *)hv);
2325 2401
2326 if (expect_true (coro->saved_deffh)) 2402 if (ecb_expect_true (coro->saved_deffh))
2327 { 2403 {
2328 /* subsequent iteration */ 2404 /* subsequent iteration */
2329 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2405 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
2330 coro->saved_deffh = 0; 2406 coro->saved_deffh = 0;
2331 2407
… …
2391 2467
2392static int 2468static int
2393slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2469slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
2394{ 2470{
2395 SV *data = (SV *)frame->data; 2471 SV *data = (SV *)frame->data;
2396 2472
2397 if (CORO_THROW) 2473 if (CORO_THROW)
2398 return 0; 2474 return 0;
2399 2475
2400 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2476 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2401 return 1; 2477 return 1;
… …
2437 cb = sv_2mortal (coro->rouse_cb); 2513 cb = sv_2mortal (coro->rouse_cb);
2438 coro->rouse_cb = 0; 2514 coro->rouse_cb = 0;
2439 } 2515 }
2440 2516
2441 if (!SvROK (cb) 2517 if (!SvROK (cb)
2442 || SvTYPE (SvRV (cb)) != SVt_PVCV 2518 || SvTYPE (SvRV (cb)) != SVt_PVCV
2443 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2519 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2444 croak ("Coro::rouse_wait called with illegal callback argument,"); 2520 croak ("Coro::rouse_wait called with illegal callback argument,");
2445 2521
2446 { 2522 {
2447 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */ 2523 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
… …
2570 2646
2571/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */ 2647/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2572static void 2648static void
2573slf_destroy (pTHX_ struct coro *coro) 2649slf_destroy (pTHX_ struct coro *coro)
2574{ 2650{
2575 /* this callback is reserved for slf functions needing to do cleanup */ 2651 struct CoroSLF frame = coro->slf_frame;
2576 if (coro->slf_frame.destroy && coro->slf_frame.prepare && !PL_dirty)
2577 coro->slf_frame.destroy (aTHX_ &coro->slf_frame);
2578 2652
2579 /* 2653 /*
2580 * The on_destroy above most likely is from an SLF call. 2654 * The on_destroy below most likely is from an SLF call.
2581 * Since by definition the SLF call will not finish when we destroy 2655 * Since by definition the SLF call will not finish when we destroy
2582 * the coro, we will have to force-finish it here, otherwise 2656 * the coro, we will have to force-finish it here, otherwise
2583 * cleanup functions cannot call SLF functions. 2657 * cleanup functions cannot call SLF functions.
2584 */ 2658 */
2585 coro->slf_frame.prepare = 0; 2659 coro->slf_frame.prepare = 0;
2660
2661 /* this callback is reserved for slf functions needing to do cleanup */
2662 if (frame.destroy && frame.prepare && !PL_dirty)
2663 frame.destroy (aTHX_ &frame);
2586} 2664}
2587 2665
2588/* 2666/*
2589 * these not obviously related functions are all rolled into one 2667 * these not obviously related functions are all rolled into one
2590 * function to increase chances that they all will call transfer with the same 2668 * function to increase chances that they all will call transfer with the same
… …
2597 I32 checkmark; /* mark SP to see how many elements check has pushed */ 2675 I32 checkmark; /* mark SP to see how many elements check has pushed */
2598 2676
2599 /* set up the slf frame, unless it has already been set-up */ 2677 /* set up the slf frame, unless it has already been set-up */
2600 /* the latter happens when a new coro has been started */ 2678 /* the latter happens when a new coro has been started */
2601 /* or when a new cctx was attached to an existing coroutine */ 2679 /* or when a new cctx was attached to an existing coroutine */
2602 if (expect_true (!slf_frame.prepare)) 2680 if (ecb_expect_true (!slf_frame.prepare))
2603 { 2681 {
2604 /* first iteration */ 2682 /* first iteration */
2605 dSP; 2683 dSP;
2606 SV **arg = PL_stack_base + TOPMARK + 1; 2684 SV **arg = PL_stack_base + TOPMARK + 1;
2607 int items = SP - arg; /* args without function object */ 2685 int items = SP - arg; /* args without function object */
… …
2648 while (slf_frame.check (aTHX_ &slf_frame)); 2726 while (slf_frame.check (aTHX_ &slf_frame));
2649 2727
2650 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */ 2728 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */
2651 2729
2652 /* exception handling */ 2730 /* exception handling */
2653 if (expect_false (CORO_THROW)) 2731 if (ecb_expect_false (CORO_THROW))
2654 { 2732 {
2655 SV *exception = sv_2mortal (CORO_THROW); 2733 SV *exception = sv_2mortal (CORO_THROW);
2656 2734
2657 CORO_THROW = 0; 2735 CORO_THROW = 0;
2658 sv_setsv (ERRSV, exception); 2736 sv_setsv (ERRSV, exception);
… …
2660 } 2738 }
2661 2739
2662 /* return value handling - mostly like entersub */ 2740 /* return value handling - mostly like entersub */
2663 /* make sure we put something on the stack in scalar context */ 2741 /* make sure we put something on the stack in scalar context */
2664 if (GIMME_V == G_SCALAR 2742 if (GIMME_V == G_SCALAR
2665 && expect_false (PL_stack_sp != PL_stack_base + checkmark + 1)) 2743 && ecb_expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2666 { 2744 {
2667 dSP; 2745 dSP;
2668 SV **bot = PL_stack_base + checkmark; 2746 SV **bot = PL_stack_base + checkmark;
2669 2747
2670 if (sp == bot) /* too few, push undef */ 2748 if (sp == bot) /* too few, push undef */
… …
2775{ 2853{
2776 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave); 2854 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2777 on_enterleave_call (aTHX_ sv_2mortal (cb)); 2855 on_enterleave_call (aTHX_ sv_2mortal (cb));
2778} 2856}
2779 2857
2858static void
2859enterleave_hook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, void *arg)
2860{
2861 if (!hook)
2862 return;
2863
2864 if (!*avp)
2865 {
2866 *avp = newAV ();
2867 AvREAL_off (*avp);
2868 }
2869
2870 av_push (*avp, (SV *)hook);
2871 av_push (*avp, (SV *)arg);
2872}
2873
2874static void
2875enterleave_unhook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, int execute)
2876{
2877 AV *av = *avp;
2878 int i;
2879
2880 if (!av)
2881 return;
2882
2883 for (i = AvFILLp (av) - 1; i >= 0; i -= 2)
2884 if (AvARRAY (av)[i] == (SV *)hook)
2885 {
2886 if (execute)
2887 hook (aTHX_ (void *)AvARRAY (av)[i + 1]);
2888
2889 memmove (AvARRAY (av) + i, AvARRAY (av) + i + 2, AvFILLp (av) - i - 1);
2890 av_pop (av);
2891 av_pop (av);
2892 break;
2893 }
2894
2895 if (AvFILLp (av) >= 0)
2896 {
2897 *avp = 0;
2898 SvREFCNT_dec_NN (av);
2899 }
2900}
2901
2902static void
2903api_enterleave_hook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2904{
2905 struct coro *coro = SvSTATE (coro_sv);
2906
2907 if (SvSTATE_current == coro)
2908 if (enter)
2909 enter (aTHX_ enter_arg);
2910
2911 enterleave_hook_xs (aTHX_ coro, &coro->on_enter_xs, enter, enter_arg);
2912 enterleave_hook_xs (aTHX_ coro, &coro->on_leave_xs, leave, leave_arg);
2913}
2914
2915static void
2916api_enterleave_unhook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, coro_enterleave_hook leave)
2917{
2918 struct coro *coro = SvSTATE (coro_sv);
2919
2920 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2921 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, SvSTATE_current == coro);
2922}
2923
2924static void
2925savedestructor_unhook_enter (pTHX_ coro_enterleave_hook enter)
2926{
2927 struct coro *coro = SvSTATE_current;
2928
2929 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2930}
2931
2932static void
2933savedestructor_unhook_leave (pTHX_ coro_enterleave_hook leave)
2934{
2935 struct coro *coro = SvSTATE_current;
2936
2937 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, 1);
2938}
2939
2940static void
2941api_enterleave_scope_hook (pTHX_ coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2942{
2943 api_enterleave_hook (aTHX_ coro_current, enter, enter_arg, leave, leave_arg);
2944
2945 /* this ought to be much cheaper than malloc + a single destructor call */
2946 if (enter) SAVEDESTRUCTOR_X (savedestructor_unhook_enter, enter);
2947 if (leave) SAVEDESTRUCTOR_X (savedestructor_unhook_leave, leave);
2948}
2949
2780/*****************************************************************************/ 2950/*****************************************************************************/
2781/* PerlIO::cede */ 2951/* PerlIO::cede */
2782 2952
2783typedef struct 2953typedef struct
2784{ 2954{
2785 PerlIOBuf base; 2955 PerlIOBuf base;
2786 NV next, every; 2956 NV next, every;
2787} PerlIOCede; 2957} PerlIOCede;
2788 2958
2789static IV 2959static IV ecb_cold
2790PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab) 2960PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab)
2791{ 2961{
2792 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2962 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2793 2963
2794 self->every = SvCUR (arg) ? SvNV (arg) : 0.01; 2964 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
2795 self->next = nvtime () + self->every; 2965 self->next = nvtime () + self->every;
2796 2966
2797 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab); 2967 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
2798} 2968}
2799 2969
2800static SV * 2970static SV * ecb_cold
2801PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags) 2971PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
2802{ 2972{
2803 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2973 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2804 2974
2805 return newSVnv (self->every); 2975 return newSVnv (self->every);
… …
2912 XPUSHs (sv_2mortal (newRV_inc ((SV *)av))); 3082 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2913 PUTBACK; 3083 PUTBACK;
2914 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR); 3084 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2915 } 3085 }
2916 3086
2917 SvREFCNT_dec (cb); 3087 SvREFCNT_dec_NN (cb);
2918 } 3088 }
2919} 3089}
2920 3090
2921static void 3091static void
2922coro_semaphore_destroy (pTHX_ struct CoroSLF *frame) 3092coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
… …
2930{ 3100{
2931 AV *av = (AV *)frame->data; 3101 AV *av = (AV *)frame->data;
2932 SV *count_sv = AvARRAY (av)[0]; 3102 SV *count_sv = AvARRAY (av)[0];
2933 SV *coro_hv = SvRV (coro_current); 3103 SV *coro_hv = SvRV (coro_current);
2934 3104
3105 frame->destroy = 0;
3106
2935 /* if we are about to throw, don't actually acquire the lock, just throw */ 3107 /* if we are about to throw, don't actually acquire the lock, just throw */
2936 if (CORO_THROW) 3108 if (ecb_expect_false (CORO_THROW))
3109 {
3110 /* we still might be responsible for the semaphore, so wake up others */
3111 coro_semaphore_adjust (aTHX_ av, 0);
3112
2937 return 0; 3113 return 0;
3114 }
2938 else if (SvIVX (count_sv) > 0) 3115 else if (SvIVX (count_sv) > 0)
2939 { 3116 {
2940 frame->destroy = 0;
2941
2942 if (acquire) 3117 if (acquire)
2943 SvIVX (count_sv) = SvIVX (count_sv) - 1; 3118 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2944 else 3119 else
2945 coro_semaphore_adjust (aTHX_ av, 0); 3120 coro_semaphore_adjust (aTHX_ av, 0);
2946 3121
… …
2950 { 3125 {
2951 int i; 3126 int i;
2952 /* if we were woken up but can't down, we look through the whole */ 3127 /* if we were woken up but can't down, we look through the whole */
2953 /* waiters list and only add us if we aren't in there already */ 3128 /* waiters list and only add us if we aren't in there already */
2954 /* this avoids some degenerate memory usage cases */ 3129 /* this avoids some degenerate memory usage cases */
2955 for (i = AvFILLp (av); i > 0; --i) // i > 0 is not an off-by-one bug 3130 for (i = AvFILLp (av); i > 0; --i) /* i > 0 is not an off-by-one bug */
2956 if (AvARRAY (av)[i] == coro_hv) 3131 if (AvARRAY (av)[i] == coro_hv)
2957 return 1; 3132 return 1;
2958 3133
2959 av_push (av, SvREFCNT_inc (coro_hv)); 3134 av_push (av, SvREFCNT_inc (coro_hv));
2960 return 1; 3135 return 1;
… …
3057 { 3232 {
3058 api_ready (aTHX_ cb); 3233 api_ready (aTHX_ cb);
3059 sv_setiv (cb, 0); /* signal waiter */ 3234 sv_setiv (cb, 0); /* signal waiter */
3060 } 3235 }
3061 3236
3062 SvREFCNT_dec (cb); 3237 SvREFCNT_dec_NN (cb);
3063 3238
3064 --count; 3239 --count;
3065 } 3240 }
3066} 3241}
3067 3242
… …
3152 } 3327 }
3153 3328
3154 av_push (state, data_sv); 3329 av_push (state, data_sv);
3155 3330
3156 api_ready (aTHX_ coro); 3331 api_ready (aTHX_ coro);
3157 SvREFCNT_dec (coro); 3332 SvREFCNT_dec_NN (coro);
3158 SvREFCNT_dec ((AV *)state); 3333 SvREFCNT_dec_NN ((AV *)state);
3159} 3334}
3160 3335
3161static int 3336static int
3162slf_check_aio_req (pTHX_ struct CoroSLF *frame) 3337slf_check_aio_req (pTHX_ struct CoroSLF *frame)
3163{ 3338{
… …
3168 /* it quickly returns */ 3343 /* it quickly returns */
3169 if (CORO_THROW) 3344 if (CORO_THROW)
3170 return 0; 3345 return 0;
3171 3346
3172 /* one element that is an RV? repeat! */ 3347 /* one element that is an RV? repeat! */
3173 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0])) 3348 if (AvFILLp (state) == 0 && SvTYPE (AvARRAY (state)[0]) != SVt_PV)
3174 return 1; 3349 return 1;
3175 3350
3176 /* restore status */ 3351 /* restore status */
3177 { 3352 {
3178 SV *data_sv = av_pop (state); 3353 SV *data_sv = av_pop (state);
… …
3181 errno = data->errorno; 3356 errno = data->errorno;
3182 PL_laststype = data->laststype; 3357 PL_laststype = data->laststype;
3183 PL_laststatval = data->laststatval; 3358 PL_laststatval = data->laststatval;
3184 PL_statcache = data->statcache; 3359 PL_statcache = data->statcache;
3185 3360
3186 SvREFCNT_dec (data_sv); 3361 SvREFCNT_dec_NN (data_sv);
3187 } 3362 }
3188 3363
3189 /* push result values */ 3364 /* push result values */
3190 { 3365 {
3191 dSP; 3366 dSP;
… …
3217 dSP; 3392 dSP;
3218 3393
3219 static SV *prio_cv; 3394 static SV *prio_cv;
3220 static SV *prio_sv; 3395 static SV *prio_sv;
3221 3396
3222 if (expect_false (!prio_cv)) 3397 if (ecb_expect_false (!prio_cv))
3223 { 3398 {
3224 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0); 3399 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0);
3225 prio_sv = newSViv (0); 3400 prio_sv = newSViv (0);
3226 } 3401 }
3227 3402
… …
3333 } 3508 }
3334 3509
3335 return coro_sv; 3510 return coro_sv;
3336} 3511}
3337 3512
3513#ifndef __cplusplus
3514ecb_cold XS(boot_Coro__State);
3515#endif
3516
3517#if CORO_JIT
3518
3519static void ecb_noinline ecb_cold
3520pushav_4uv (pTHX_ UV a, UV b, UV c, UV d)
3521{
3522 dSP;
3523 AV *av = newAV ();
3524
3525 av_store (av, 3, newSVuv (d));
3526 av_store (av, 2, newSVuv (c));
3527 av_store (av, 1, newSVuv (b));
3528 av_store (av, 0, newSVuv (a));
3529
3530 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
3531
3532 PUTBACK;
3533}
3534
3535static void ecb_noinline ecb_cold
3536jit_init (pTHX)
3537{
3538 dSP;
3539 SV *load, *save;
3540 char *map_base;
3541 char *load_ptr, *save_ptr;
3542 STRLEN load_len, save_len, map_len;
3543 int count;
3544
3545 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3546
3547 PUSHMARK (SP);
3548 #define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type));
3549 #include "state.h"
3550 count = call_pv ("Coro::State::_jit", G_ARRAY);
3551 SPAGAIN;
3552
3553 save = POPs; save_ptr = SvPVbyte (save, save_len);
3554 load = POPs; load_ptr = SvPVbyte (load, load_len);
3555
3556 map_len = load_len + save_len + 16;
3557
3558 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3559
3560 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3561
3562 load_perl_slots = (load_save_perl_slots_type)map_base;
3563 memcpy (map_base, load_ptr, load_len);
3564
3565 map_base += (load_len + 15) & ~15;
3566
3567 save_perl_slots = (load_save_perl_slots_type)map_base;
3568 memcpy (map_base, save_ptr, save_len);
3569
3570 /* we are good citizens and try to make the page read-only, so the evil evil */
3571 /* hackers might have it a bit more difficult */
3572 mprotect (map_base, map_len, PROT_READ | PROT_EXEC);
3573
3574 PUTBACK;
3575 eval_pv ("undef &Coro::State::_jit", 1);
3576}
3577
3578#endif
3579
3338MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3580MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
3339 3581
3340PROTOTYPES: DISABLE 3582PROTOTYPES: DISABLE
3341 3583
3342BOOT: 3584BOOT:
3343{ 3585{
3586#define VARx(name,expr,type) if (sizeof (type) < sizeof (expr)) croak ("FATAL: Coro thread context slot '" # name "' too small for this version of perl.");
3587#include "state.h"
3344#ifdef USE_ITHREADS 3588#ifdef USE_ITHREADS
3345# if CORO_PTHREAD 3589# if CORO_PTHREAD
3346 coro_thx = PERL_GET_CONTEXT; 3590 coro_thx = PERL_GET_CONTEXT;
3347# endif 3591# endif
3348#endif 3592#endif
3349 BOOT_PAGESIZE; 3593 /* perl defines these to check for existance first, but why it doesn't */
3594 /* just create them one at init time is not clear to me, except for */
3595 /* programs trying to delete them, but... */
3596 /* anyway, we declare this as invalid and make sure they are initialised here */
3597 DEFSV;
3598 ERRSV;
3350 3599
3351 cctx_current = cctx_new_empty (); 3600 cctx_current = cctx_new_empty ();
3352 3601
3353 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3602 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
3354 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3603 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
… …
3397 coroapi.prepare_cede_notself = prepare_cede_notself; 3646 coroapi.prepare_cede_notself = prepare_cede_notself;
3398 3647
3399 time_init (aTHX); 3648 time_init (aTHX);
3400 3649
3401 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL)); 3650 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3651#if CORO_JIT
3652 PUTBACK;
3653 jit_init (aTHX);
3654 SPAGAIN;
3655#endif
3402} 3656}
3403 3657
3404SV * 3658SV *
3405new (SV *klass, ...) 3659new (SV *klass, ...)
3406 ALIAS: 3660 ALIAS:
… …
3413void 3667void
3414transfer (...) 3668transfer (...)
3415 PROTOTYPE: $$ 3669 PROTOTYPE: $$
3416 CODE: 3670 CODE:
3417 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3671 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3418
3419void
3420_exit (int code)
3421 PROTOTYPE: $
3422 CODE:
3423 _exit (code);
3424 3672
3425SV * 3673SV *
3426clone (Coro::State coro) 3674clone (Coro::State coro)
3427 CODE: 3675 CODE:
3428{ 3676{
… …
3483void 3731void
3484list () 3732list ()
3485 PROTOTYPE: 3733 PROTOTYPE:
3486 PPCODE: 3734 PPCODE:
3487{ 3735{
3488 struct coro *coro; 3736 struct coro *coro;
3489 for (coro = coro_first; coro; coro = coro->next) 3737 for (coro = coro_first; coro; coro = coro->next)
3490 if (coro->hv) 3738 if (coro->hv)
3491 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 3739 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
3492} 3740}
3493 3741
… …
3557 RETVAL = boolSV (coro->flags & ix); 3805 RETVAL = boolSV (coro->flags & ix);
3558 OUTPUT: 3806 OUTPUT:
3559 RETVAL 3807 RETVAL
3560 3808
3561void 3809void
3562throw (Coro::State self, SV *exception = &PL_sv_undef) 3810throw (SV *self, SV *exception = &PL_sv_undef)
3563 PROTOTYPE: $;$ 3811 PROTOTYPE: $;$
3564 CODE: 3812 CODE:
3565{ 3813{
3814 struct coro *coro = SvSTATE (self);
3566 struct coro *current = SvSTATE_current; 3815 struct coro *current = SvSTATE_current;
3567 SV **exceptionp = self == current ? &CORO_THROW : &self->except; 3816 SV **exceptionp = coro == current ? &CORO_THROW : &coro->except;
3568 SvREFCNT_dec (*exceptionp); 3817 SvREFCNT_dec (*exceptionp);
3569 SvGETMAGIC (exception); 3818 SvGETMAGIC (exception);
3570 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0; 3819 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3820
3821 api_ready (aTHX_ self);
3571} 3822}
3572 3823
3573void 3824void
3574api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3825api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3575 PROTOTYPE: $;$ 3826 PROTOTYPE: $;$
… …
3652 3903
3653void 3904void
3654times (Coro::State self) 3905times (Coro::State self)
3655 PPCODE: 3906 PPCODE:
3656{ 3907{
3657 struct coro *current = SvSTATE (coro_current); 3908 struct coro *current = SvSTATE (coro_current);
3658 3909
3659 if (expect_false (current == self)) 3910 if (ecb_expect_false (current == self))
3660 { 3911 {
3661 coro_times_update (); 3912 coro_times_update ();
3662 coro_times_add (SvSTATE (coro_current)); 3913 coro_times_add (SvSTATE (coro_current));
3663 } 3914 }
3664 3915
3665 EXTEND (SP, 2); 3916 EXTEND (SP, 2);
3666 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9))); 3917 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3667 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9))); 3918 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3668 3919
3669 if (expect_false (current == self)) 3920 if (ecb_expect_false (current == self))
3670 coro_times_sub (SvSTATE (coro_current)); 3921 coro_times_sub (SvSTATE (coro_current));
3671} 3922}
3672 3923
3673void 3924void
3674swap_sv (Coro::State coro, SV *sv, SV *swapsv) 3925swap_sv (Coro::State coro, SV *sv, SV *swapsv)
… …
3692 3943
3693MODULE = Coro::State PACKAGE = Coro 3944MODULE = Coro::State PACKAGE = Coro
3694 3945
3695BOOT: 3946BOOT:
3696{ 3947{
3948 if (SVt_LAST > 32)
3949 croak ("Coro internal error: SVt_LAST > 32, swap_sv might need adjustment");
3950
3697 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3951 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3698 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3952 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3699 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 3953 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3700 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 3954 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3701 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 3955 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
… …
3705 3959
3706 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3960 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3707 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3961 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3708 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 3962 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3709 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */ 3963 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3710 3964
3711 coro_stash = gv_stashpv ("Coro", TRUE); 3965 coro_stash = gv_stashpv ("Coro", TRUE);
3712 3966
3713 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 3967 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3714 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 3968 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3715 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL)); 3969 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
… …
3727 coroapi.ready = api_ready; 3981 coroapi.ready = api_ready;
3728 coroapi.is_ready = api_is_ready; 3982 coroapi.is_ready = api_is_ready;
3729 coroapi.nready = coro_nready; 3983 coroapi.nready = coro_nready;
3730 coroapi.current = coro_current; 3984 coroapi.current = coro_current;
3731 3985
3986 coroapi.enterleave_hook = api_enterleave_hook;
3987 coroapi.enterleave_unhook = api_enterleave_unhook;
3988 coroapi.enterleave_scope_hook = api_enterleave_scope_hook;
3989
3732 /*GCoroAPI = &coroapi;*/ 3990 /*GCoroAPI = &coroapi;*/
3733 sv_setiv (sv, (IV)&coroapi); 3991 sv_setiv (sv, (IV)&coroapi);
3734 SvREADONLY_on (sv); 3992 SvREADONLY_on (sv);
3735 } 3993 }
3736} 3994}
… …
3801 4059
3802void 4060void
3803_set_current (SV *current) 4061_set_current (SV *current)
3804 PROTOTYPE: $ 4062 PROTOTYPE: $
3805 CODE: 4063 CODE:
3806 SvREFCNT_dec (SvRV (coro_current)); 4064 SvREFCNT_dec_NN (SvRV (coro_current));
3807 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current))); 4065 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
3808 4066
3809void 4067void
3810_set_readyhook (SV *hook) 4068_set_readyhook (SV *hook)
3811 PROTOTYPE: $ 4069 PROTOTYPE: $
… …
3895 4153
3896 if ((SV *)hv == &PL_sv_undef) 4154 if ((SV *)hv == &PL_sv_undef)
3897 { 4155 {
3898 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1); 4156 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3899 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv)); 4157 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
3900 SvREFCNT_dec (sv); 4158 SvREFCNT_dec_NN (sv);
3901 } 4159 }
3902 4160
3903 { 4161 {
3904 struct coro *coro = SvSTATE_hv (hv); 4162 struct coro *coro = SvSTATE_hv (hv);
3905 4163
… …
3912 api_ready (aTHX_ (SV *)hv); 4170 api_ready (aTHX_ (SV *)hv);
3913 4171
3914 if (GIMME_V != G_VOID) 4172 if (GIMME_V != G_VOID)
3915 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 4173 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
3916 else 4174 else
3917 SvREFCNT_dec (hv); 4175 SvREFCNT_dec_NN (hv);
3918} 4176}
3919 4177
3920SV * 4178SV *
3921rouse_cb () 4179rouse_cb ()
3922 PROTOTYPE: 4180 PROTOTYPE:
… …
3937 on_leave = 1 4195 on_leave = 1
3938 PROTOTYPE: & 4196 PROTOTYPE: &
3939 CODE: 4197 CODE:
3940{ 4198{
3941 struct coro *coro = SvSTATE_current; 4199 struct coro *coro = SvSTATE_current;
3942 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 4200 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3943 4201
3944 block = s_get_cv_croak (block); 4202 block = s_get_cv_croak (block);
3945 4203
3946 if (!*avp) 4204 if (!*avp)
3947 *avp = newAV (); 4205 *avp = newAV ();
… …
3967 4225
3968SV * 4226SV *
3969new (SV *klass, SV *count = 0) 4227new (SV *klass, SV *count = 0)
3970 CODE: 4228 CODE:
3971{ 4229{
3972 int semcnt = 1; 4230 int semcnt = 1;
3973 4231
3974 if (count) 4232 if (count)
3975 { 4233 {
3976 SvGETMAGIC (count); 4234 SvGETMAGIC (count);
3977 4235
… …
4037 XSRETURN_NO; 4295 XSRETURN_NO;
4038} 4296}
4039 4297
4040void 4298void
4041waiters (SV *self) 4299waiters (SV *self)
4042 PPCODE: 4300 PPCODE:
4043{ 4301{
4044 AV *av = (AV *)SvRV (self); 4302 AV *av = (AV *)SvRV (self);
4045 int wcount = AvFILLp (av) + 1 - 1; 4303 int wcount = AvFILLp (av) + 1 - 1;
4046 4304
4047 if (GIMME_V == G_SCALAR) 4305 if (GIMME_V == G_SCALAR)
… …
4056} 4314}
4057 4315
4058MODULE = Coro::State PACKAGE = Coro::SemaphoreSet 4316MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
4059 4317
4060void 4318void
4061_may_delete (SV *sem, int count, int extra_refs) 4319_may_delete (SV *sem, int count, unsigned int extra_refs)
4062 PPCODE: 4320 PPCODE:
4063{ 4321{
4064 AV *av = (AV *)SvRV (sem); 4322 AV *av = (AV *)SvRV (sem);
4065 4323
4066 if (SvREFCNT ((SV *)av) == 1 + extra_refs 4324 if (SvREFCNT ((SV *)av) == 1 + extra_refs
4067 && AvFILLp (av) == 0 /* no waiters, just count */ 4325 && AvFILLp (av) == 0 /* no waiters, just count */
4068 && SvIV (AvARRAY (av)[0]) == count) 4326 && SvIV (AvARRAY (av)[0]) == count)
4069 XSRETURN_YES; 4327 XSRETURN_YES;
… …
4090 4348
4091void 4349void
4092broadcast (SV *self) 4350broadcast (SV *self)
4093 CODE: 4351 CODE:
4094{ 4352{
4095 AV *av = (AV *)SvRV (self); 4353 AV *av = (AV *)SvRV (self);
4096 coro_signal_wake (aTHX_ av, AvFILLp (av)); 4354 coro_signal_wake (aTHX_ av, AvFILLp (av));
4097} 4355}
4098 4356
4099void 4357void
4100send (SV *self) 4358send (SV *self)
… …
4108 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */ 4366 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
4109} 4367}
4110 4368
4111IV 4369IV
4112awaited (SV *self) 4370awaited (SV *self)
4113 CODE: 4371 CODE:
4114 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1; 4372 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
4115 OUTPUT: 4373 OUTPUT:
4116 RETVAL 4374 RETVAL
4117 4375
4118 4376
… …
4123 4381
4124void 4382void
4125_schedule (...) 4383_schedule (...)
4126 CODE: 4384 CODE:
4127{ 4385{
4128 static int incede; 4386 static int incede;
4129 4387
4130 api_cede_notself (aTHX); 4388 api_cede_notself (aTHX);
4131 4389
4132 ++incede; 4390 ++incede;
4133 while (coro_nready >= incede && api_cede (aTHX)) 4391 while (coro_nready >= incede && api_cede (aTHX))
… …
4177 { 4435 {
4178 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect; 4436 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
4179 coro_old_pp_sselect = 0; 4437 coro_old_pp_sselect = 0;
4180 } 4438 }
4181 4439
4440MODULE = Coro::State PACKAGE = Coro::Util
4441
4442void
4443_exit (int code)
4444 CODE:
4445 _exit (code);
4446
4447NV
4448time ()
4449 CODE:
4450 RETVAL = nvtime (aTHX);
4451 OUTPUT:
4452 RETVAL
4453
4454NV
4455gettimeofday ()
4456 PPCODE:
4457{
4458 UV tv [2];
4459 u2time (aTHX_ tv);
4460 EXTEND (SP, 2);
4461 PUSHs (sv_2mortal (newSVuv (tv [0])));
4462 PUSHs (sv_2mortal (newSVuv (tv [1])));
4463}
4464

Diff Legend

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