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.463 by root, Wed Jun 22 20:37:27 2016 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
… …
145 140
146static GV *irsgv; /* $/ */ 141static GV *irsgv; /* $/ */
147static GV *stdoutgv; /* *STDOUT */ 142static GV *stdoutgv; /* *STDOUT */
148static SV *rv_diehook; 143static SV *rv_diehook;
149static SV *rv_warnhook; 144static SV *rv_warnhook;
150static HV *hv_sig; /* %SIG */
151 145
152/* async_pool helper stuff */ 146/* async_pool helper stuff */
153static SV *sv_pool_rss; 147static SV *sv_pool_rss;
154static SV *sv_pool_size; 148static SV *sv_pool_size;
155static SV *sv_async_pool_idle; /* description string */ 149static SV *sv_async_pool_idle; /* description string */
… …
183typedef struct coro_cctx 177typedef struct coro_cctx
184{ 178{
185 struct coro_cctx *next; 179 struct coro_cctx *next;
186 180
187 /* the stack */ 181 /* the stack */
188 void *sptr; 182 struct coro_stack stack;
189 size_t ssize;
190 183
191 /* cpu state */ 184 /* cpu state */
192 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 185 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
186#ifndef NDEBUG
193 JMPENV *idle_te; /* same as idle_sp, but for top_env, TODO: remove once stable */ 187 JMPENV *idle_te; /* same as idle_sp, but for top_env */
188#endif
194 JMPENV *top_env; 189 JMPENV *top_env;
195 coro_context cctx; 190 coro_context cctx;
196 191
197 U32 gen; 192 U32 gen;
198#if CORO_USE_VALGRIND 193#if CORO_USE_VALGRIND
… …
218}; 213};
219 214
220/* the structure where most of the perl state is stored, overlaid on the cxstack */ 215/* the structure where most of the perl state is stored, overlaid on the cxstack */
221typedef struct 216typedef struct
222{ 217{
223 SV *defsv;
224 AV *defav;
225 SV *errsv;
226 SV *irsgv;
227 HV *hinthv;
228#define VAR(name,type) type name; 218 #define VARx(name,expr,type) type name;
229# include "state.h" 219 #include "state.h"
230#undef VAR
231} perl_slots; 220} perl_slots;
232 221
233// how many context stack entries do we need for perl_slots 222/* 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)) 223#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
235 224
236/* this is a structure representing a perl-level coroutine */ 225/* this is a structure representing a perl-level coroutine */
237struct coro 226struct coro
238{ 227{
… …
266 SV *saved_deffh; 255 SV *saved_deffh;
267 SV *invoke_cb; 256 SV *invoke_cb;
268 AV *invoke_av; 257 AV *invoke_av;
269 258
270 /* on_enter/on_leave */ 259 /* on_enter/on_leave */
271 AV *on_enter; 260 AV *on_enter; AV *on_enter_xs;
272 AV *on_leave; 261 AV *on_leave; AV *on_leave_xs;
273 262
274 /* swap_sv */ 263 /* swap_sv */
275 AV *swap_sv; 264 AV *swap_sv;
276 265
277 /* times */ 266 /* times */
… …
304static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */ 293static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
305static CV *cv_coro_run; 294static CV *cv_coro_run;
306static struct coro *coro_first; 295static struct coro *coro_first;
307#define coro_nready coroapi.nready 296#define coro_nready coroapi.nready
308 297
298/** JIT *********************************************************************/
299
300#if CORO_JIT
301 /* APPLE doesn't have mmap though */
302 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__)
303 #ifndef CORO_JIT_TYPE
304 #if ECB_AMD64 && CORO_JIT_UNIXY
305 #define CORO_JIT_TYPE "amd64-unix"
306 #elif __i386 && CORO_JIT_UNIXY
307 #define CORO_JIT_TYPE "x86-unix"
308 #endif
309 #endif
310#endif
311
312#if !defined(CORO_JIT_TYPE) || _POSIX_MEMORY_PROTECTION <= 0
313 #undef CORO_JIT
314#endif
315
316#if CORO_JIT
317 typedef void (*load_save_perl_slots_type)(perl_slots *);
318 static load_save_perl_slots_type load_perl_slots, save_perl_slots;
319#endif
320
309/** Coro::Select ************************************************************/ 321/** Coro::Select ************************************************************/
310 322
311static OP *(*coro_old_pp_sselect) (pTHX); 323static OP *(*coro_old_pp_sselect) (pTHX);
312static SV *coro_select_select; 324static SV *coro_select_select;
313 325
… …
328 340
329/** time stuff **************************************************************/ 341/** time stuff **************************************************************/
330 342
331#ifdef HAS_GETTIMEOFDAY 343#ifdef HAS_GETTIMEOFDAY
332 344
333static void 345ecb_inline void
334coro_u2time (pTHX_ UV ret[2]) 346coro_u2time (pTHX_ UV ret[2])
335{ 347{
336 struct timeval tv; 348 struct timeval tv;
337 gettimeofday (&tv, 0); 349 gettimeofday (&tv, 0);
338 350
339 ret [0] = tv.tv_sec; 351 ret [0] = tv.tv_sec;
340 ret [1] = tv.tv_usec; 352 ret [1] = tv.tv_usec;
341} 353}
342 354
343static double 355ecb_inline double
344coro_nvtime () 356coro_nvtime (void)
345{ 357{
346 struct timeval tv; 358 struct timeval tv;
347 gettimeofday (&tv, 0); 359 gettimeofday (&tv, 0);
348 360
349 return tv.tv_sec + tv.tv_usec * 1e-6; 361 return tv.tv_sec + tv.tv_usec * 1e-6;
350} 362}
351 363
352static void 364ecb_inline void
353time_init (pTHX) 365time_init (pTHX)
354{ 366{
355 nvtime = coro_nvtime; 367 nvtime = coro_nvtime;
356 u2time = coro_u2time; 368 u2time = coro_u2time;
357} 369}
358 370
359#else 371#else
360 372
361static void 373ecb_inline void
362time_init (pTHX) 374time_init (pTHX)
363{ 375{
364 SV **svp; 376 SV **svp;
365 377
366 require_pv ("Time/HiRes.pm"); 378 require_pv ("Time/HiRes.pm");
367 379
368 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0); 380 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
369 381
370 if (!svp) croak ("Time::HiRes is required, but missing. Caught"); 382 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
371 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught"); 383 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught");
372 384
… …
378 390
379#endif 391#endif
380 392
381/** lowlevel stuff **********************************************************/ 393/** lowlevel stuff **********************************************************/
382 394
383static SV * 395static SV * ecb_noinline
384coro_get_sv (pTHX_ const char *name, int create) 396coro_get_sv (pTHX_ const char *name, int create)
385{ 397{
386#if PERL_VERSION_ATLEAST (5,10,0) 398#if PERL_VERSION_ATLEAST (5,10,0)
387 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 399 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
388 get_sv (name, create); 400 get_sv (name, create);
389#endif 401#endif
390 return get_sv (name, create); 402 return get_sv (name, create);
391} 403}
392 404
393static AV * 405static AV * ecb_noinline
394coro_get_av (pTHX_ const char *name, int create) 406coro_get_av (pTHX_ const char *name, int create)
395{ 407{
396#if PERL_VERSION_ATLEAST (5,10,0) 408#if PERL_VERSION_ATLEAST (5,10,0)
397 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 409 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
398 get_av (name, create); 410 get_av (name, create);
399#endif 411#endif
400 return get_av (name, create); 412 return get_av (name, create);
401} 413}
402 414
403static HV * 415static HV * ecb_noinline
404coro_get_hv (pTHX_ const char *name, int create) 416coro_get_hv (pTHX_ const char *name, int create)
405{ 417{
406#if PERL_VERSION_ATLEAST (5,10,0) 418#if PERL_VERSION_ATLEAST (5,10,0)
407 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 419 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
408 get_hv (name, create); 420 get_hv (name, create);
409#endif 421#endif
410 return get_hv (name, create); 422 return get_hv (name, create);
411} 423}
412 424
413INLINE void 425ecb_inline void
414coro_times_update () 426coro_times_update (void)
415{ 427{
416#ifdef coro_clock_gettime 428#ifdef coro_clock_gettime
417 struct timespec ts; 429 struct timespec ts;
418 430
419 ts.tv_sec = ts.tv_nsec = 0; 431 ts.tv_sec = ts.tv_nsec = 0;
… …
431 time_real [0] = tv [0]; 443 time_real [0] = tv [0];
432 time_real [1] = tv [1] * 1000; 444 time_real [1] = tv [1] * 1000;
433#endif 445#endif
434} 446}
435 447
436INLINE void 448ecb_inline void
437coro_times_add (struct coro *c) 449coro_times_add (struct coro *c)
438{ 450{
439 c->t_real [1] += time_real [1]; 451 c->t_real [1] += time_real [1];
440 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; } 452 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
441 c->t_real [0] += time_real [0]; 453 c->t_real [0] += time_real [0];
… …
443 c->t_cpu [1] += time_cpu [1]; 455 c->t_cpu [1] += time_cpu [1];
444 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; } 456 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
445 c->t_cpu [0] += time_cpu [0]; 457 c->t_cpu [0] += time_cpu [0];
446} 458}
447 459
448INLINE void 460ecb_inline void
449coro_times_sub (struct coro *c) 461coro_times_sub (struct coro *c)
450{ 462{
451 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; } 463 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]; 464 c->t_real [1] -= time_real [1];
453 c->t_real [0] -= time_real [0]; 465 c->t_real [0] -= time_real [0];
… …
461/* magic glue */ 473/* magic glue */
462 474
463#define CORO_MAGIC_type_cv 26 475#define CORO_MAGIC_type_cv 26
464#define CORO_MAGIC_type_state PERL_MAGIC_ext 476#define CORO_MAGIC_type_state PERL_MAGIC_ext
465 477
466#define CORO_MAGIC_NN(sv, type) \ 478#define CORO_MAGIC_NN(sv, type) \
467 (expect_true (SvMAGIC (sv)->mg_type == type) \ 479 (ecb_expect_true (SvMAGIC (sv)->mg_type == type) \
468 ? SvMAGIC (sv) \ 480 ? SvMAGIC (sv) \
469 : mg_find (sv, type)) 481 : mg_find (sv, type))
470 482
471#define CORO_MAGIC(sv, type) \ 483#define CORO_MAGIC(sv, type) \
472 (expect_true (SvMAGIC (sv)) \ 484 (ecb_expect_true (SvMAGIC (sv)) \
473 ? CORO_MAGIC_NN (sv, type) \ 485 ? CORO_MAGIC_NN (sv, type) \
474 : 0) 486 : 0)
475 487
476#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv) 488#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) 489#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
478 490
479INLINE MAGIC * 491ecb_inline MAGIC *
480SvSTATEhv_p (pTHX_ SV *coro) 492SvSTATEhv_p (pTHX_ SV *coro)
481{ 493{
482 MAGIC *mg; 494 MAGIC *mg;
483 495
484 if (expect_true ( 496 if (ecb_expect_true (
485 SvTYPE (coro) == SVt_PVHV 497 SvTYPE (coro) == SVt_PVHV
486 && (mg = CORO_MAGIC_state (coro)) 498 && (mg = CORO_MAGIC_state (coro))
487 && mg->mg_virtual == &coro_state_vtbl 499 && mg->mg_virtual == &coro_state_vtbl
488 )) 500 ))
489 return mg; 501 return mg;
490 502
491 return 0; 503 return 0;
492} 504}
493 505
494INLINE struct coro * 506ecb_inline struct coro *
495SvSTATE_ (pTHX_ SV *coro) 507SvSTATE_ (pTHX_ SV *coro_sv)
496{ 508{
497 MAGIC *mg; 509 MAGIC *mg;
498 510
499 if (SvROK (coro)) 511 if (SvROK (coro_sv))
500 coro = SvRV (coro); 512 coro_sv = SvRV (coro_sv);
501 513
502 mg = SvSTATEhv_p (aTHX_ coro); 514 mg = SvSTATEhv_p (aTHX_ coro_sv);
503 if (!mg) 515 if (!mg)
504 croak ("Coro::State object required"); 516 croak ("Coro::State object required");
505 517
506 return (struct coro *)mg->mg_ptr; 518 return (struct coro *)mg->mg_ptr;
507} 519}
… …
513#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 525#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
514 526
515/*****************************************************************************/ 527/*****************************************************************************/
516/* padlist management and caching */ 528/* padlist management and caching */
517 529
518static AV * 530ecb_inline PADLIST *
519coro_derive_padlist (pTHX_ CV *cv) 531coro_derive_padlist (pTHX_ CV *cv)
520{ 532{
521 AV *padlist = CvPADLIST (cv); 533 PADLIST *padlist = CvPADLIST (cv);
522 AV *newpadlist, *newpad; 534 PADLIST *newpadlist;
535 PADNAMELIST *padnames;
536 PAD *newpad;
537 PADOFFSET off = PadlistMAX (padlist) + 1;
523 538
524 newpadlist = newAV (); 539#if NEWPADAPI
540
541 /* if we had the original CvDEPTH, we might be able to steal the CvDEPTH+1 entry instead */
542 /* 20131102194744.GA6705@schmorp.de, 20131102195825.2013.qmail@lists-nntp.develooper.com */
543 while (!PadlistARRAY (padlist)[off - 1])
544 --off;
545
546 Perl_pad_push (aTHX_ padlist, off);
547
548 newpad = PadlistARRAY (padlist)[off];
549 PadlistARRAY (padlist)[off] = 0;
550
551#else
552
553#if PERL_VERSION_ATLEAST (5,10,0)
554 Perl_pad_push (aTHX_ padlist, off);
555#else
556 Perl_pad_push (aTHX_ padlist, off, 1);
557#endif
558
559 newpad = PadlistARRAY (padlist)[off];
560 PadlistMAX (padlist) = off - 1;
561
562#endif
563
564 newPADLIST (newpadlist);
565#if !PERL_VERSION_ATLEAST(5,15,3)
566 /* Padlists are AvREAL as of 5.15.3. See perl bug #98092 and perl commit 7d953ba. */
525 AvREAL_off (newpadlist); 567 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 568#endif
531 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
532 --AvFILLp (padlist);
533 569
534 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0])); 570 /* Already extended to 2 elements by newPADLIST. */
535 av_store (newpadlist, 1, (SV *)newpad); 571 PadlistMAX (newpadlist) = 1;
572
573 padnames = PadlistNAMES (padlist);
574 ++PadnamelistREFCNT (padnames);
575 PadlistNAMES (newpadlist) = padnames;
576
577 PadlistARRAY (newpadlist)[1] = newpad;
536 578
537 return newpadlist; 579 return newpadlist;
538} 580}
539 581
540static void 582ecb_inline void
541free_padlist (pTHX_ AV *padlist) 583free_padlist (pTHX_ PADLIST *padlist)
542{ 584{
543 /* may be during global destruction */ 585 /* may be during global destruction */
544 if (!IN_DESTRUCT) 586 if (!IN_DESTRUCT)
545 { 587 {
546 I32 i = AvFILLp (padlist); 588 I32 i = PadlistMAX (padlist);
547 589
548 while (i > 0) /* special-case index 0 */ 590 while (i > 0) /* special-case index 0 */
549 { 591 {
550 /* we try to be extra-careful here */ 592 /* we try to be extra-careful here */
551 AV *av = (AV *)AvARRAY (padlist)[i--]; 593 PAD *pad = PadlistARRAY (padlist)[i--];
552 I32 j = AvFILLp (av);
553 594
595 if (pad)
596 {
597 I32 j = PadMAX (pad);
598
554 while (j >= 0) 599 while (j >= 0)
555 SvREFCNT_dec (AvARRAY (av)[j--]); 600 SvREFCNT_dec (PadARRAY (pad)[j--]);
556 601
557 AvFILLp (av) = -1; 602 PadMAX (pad) = -1;
558 SvREFCNT_dec (av); 603 SvREFCNT_dec (pad);
604 }
559 } 605 }
560 606
561 SvREFCNT_dec (AvARRAY (padlist)[0]); 607 PadnamelistREFCNT_dec (PadlistNAMES (padlist));
562 608
609#if NEWPADAPI
610 Safefree (PadlistARRAY (padlist));
611 Safefree (padlist);
612#else
563 AvFILLp (padlist) = -1; 613 AvFILLp (padlist) = -1;
614 AvREAL_off (padlist);
564 SvREFCNT_dec ((SV*)padlist); 615 SvREFCNT_dec ((SV*)padlist);
616#endif
565 } 617 }
566} 618}
567 619
568static int 620static int
569coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 621coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
570{ 622{
571 AV *padlist; 623 PADLIST *padlist;
572 AV *av = (AV *)mg->mg_obj; 624 PADLIST **padlists = (PADLIST **)(mg->mg_ptr + sizeof(size_t));
625 size_t len = *(size_t *)mg->mg_ptr;
573 626
574 /* perl manages to free our internal AV and _then_ call us */ 627 /* perl manages to free our internal AV and _then_ call us */
575 if (IN_DESTRUCT) 628 if (IN_DESTRUCT)
576 return 0; 629 return 0;
577 630
578 /* casting is fun. */ 631 while (len--)
579 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
580 free_padlist (aTHX_ padlist); 632 free_padlist (aTHX_ padlists[len]);
581
582 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
583 633
584 return 0; 634 return 0;
585} 635}
586 636
587static MGVTBL coro_cv_vtbl = { 637static MGVTBL coro_cv_vtbl = {
588 0, 0, 0, 0, 638 0, 0, 0, 0,
589 coro_cv_free 639 coro_cv_free
590}; 640};
591 641
592/* the next two functions merely cache the padlists */ 642/* the next two functions merely cache the padlists */
593static void 643ecb_inline void
594get_padlist (pTHX_ CV *cv) 644get_padlist (pTHX_ CV *cv)
595{ 645{
596 MAGIC *mg = CORO_MAGIC_cv (cv); 646 MAGIC *mg = CORO_MAGIC_cv (cv);
597 AV *av; 647 size_t *lenp;
598 648
599 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 649 if (ecb_expect_true (mg && *(lenp = (size_t *)mg->mg_ptr)))
600 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 650 CvPADLIST (cv) = ((PADLIST **)(mg->mg_ptr + sizeof(size_t)))[--*lenp];
601 else 651 else
602 { 652 {
603#if CORO_PREFER_PERL_FUNCTIONS 653#if CORO_PREFER_PERL_FUNCTIONS
604 /* this is probably cleaner? but also slower! */ 654 /* this is probably cleaner? but also slower! */
605 /* in practise, it seems to be less stable */ 655 /* in practise, it seems to be less stable */
… …
611 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 661 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
612#endif 662#endif
613 } 663 }
614} 664}
615 665
616static void 666ecb_inline void
617put_padlist (pTHX_ CV *cv) 667put_padlist (pTHX_ CV *cv)
618{ 668{
619 MAGIC *mg = CORO_MAGIC_cv (cv); 669 MAGIC *mg = CORO_MAGIC_cv (cv);
620 AV *av;
621 670
622 if (expect_false (!mg)) 671 if (ecb_expect_false (!mg))
672 {
623 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 673 mg = sv_magicext ((SV *)cv, 0, CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
674 Newz (0, mg->mg_ptr ,sizeof (size_t) + sizeof (PADLIST *), char);
675 mg->mg_len = 1; /* so mg_free frees mg_ptr */
676 }
677 else
678 Renew (mg->mg_ptr,
679 sizeof(size_t) + (*(size_t *)mg->mg_ptr + 1) * sizeof(PADLIST *),
680 char);
624 681
625 av = (AV *)mg->mg_obj; 682 ((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} 683}
632 684
633/** load & save, init *******************************************************/ 685/** load & save, init *******************************************************/
634 686
687ecb_inline void
688swap_sv (SV *a, SV *b)
689{
690 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
691 SV tmp;
692
693 /* swap sv_any */
694 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
695
696 /* swap sv_flags */
697 SvFLAGS (&tmp) = SvFLAGS (a);
698 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
699 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
700
701#if PERL_VERSION_ATLEAST (5,10,0)
702 /* perl 5.10 and later complicates this _quite_ a bit, but it also
703 * is much faster, so no quarrels here. alternatively, we could
704 * sv_upgrade to avoid this.
705 */
706 {
707 /* swap sv_u */
708 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
709
710 /* if SvANY points to the head, we need to adjust the pointers,
711 * as the pointer for a still points to b, and maybe vice versa.
712 */
713 U32 svany_in_head_set = (1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV);
714 #if NVSIZE <= IVSIZE && PERL_VERSION_ATLEAST(5,22,0)
715 svany_in_head_set |= 1 << SVt_NV;
716 #endif
717
718 #define svany_in_head(type) (svany_in_head_set & (1 << (type)))
719
720 if (svany_in_head (SvTYPE (a)))
721 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
722
723 if (svany_in_head (SvTYPE (b)))
724 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
725 }
726#endif
727}
728
635/* swap sv heads, at least logically */ 729/* swap sv heads, at least logically */
636static void 730static void
637swap_svs (pTHX_ Coro__State c) 731swap_svs_enter (pTHX_ Coro__State c)
638{ 732{
639 int i; 733 int i;
640 734
641 for (i = 0; i <= AvFILLp (c->swap_sv); ) 735 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
642 { 736 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} 737}
681 738
739static void
740swap_svs_leave (pTHX_ Coro__State c)
741{
742 int i;
743
744 for (i = AvFILLp (c->swap_sv) - 1; i >= 0; i -= 2)
745 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
746}
747
682#define SWAP_SVS(coro) \ 748#define SWAP_SVS_ENTER(coro) \
683 if (expect_false ((coro)->swap_sv)) \ 749 if (ecb_expect_false ((coro)->swap_sv)) \
684 swap_svs (aTHX_ (coro)) 750 swap_svs_enter (aTHX_ (coro))
751
752#define SWAP_SVS_LEAVE(coro) \
753 if (ecb_expect_false ((coro)->swap_sv)) \
754 swap_svs_leave (aTHX_ (coro))
685 755
686static void 756static void
687on_enterleave_call (pTHX_ SV *cb); 757on_enterleave_call (pTHX_ SV *cb);
688 758
689static void 759static void
… …
692 perl_slots *slot = c->slot; 762 perl_slots *slot = c->slot;
693 c->slot = 0; 763 c->slot = 0;
694 764
695 PL_mainstack = c->mainstack; 765 PL_mainstack = c->mainstack;
696 766
697 GvSV (PL_defgv) = slot->defsv; 767#if CORO_JIT
698 GvAV (PL_defgv) = slot->defav; 768 load_perl_slots (slot);
699 GvSV (PL_errgv) = slot->errsv; 769#else
700 GvSV (irsgv) = slot->irsgv;
701 GvHV (PL_hintgv) = slot->hinthv;
702
703 #define VAR(name,type) PL_ ## name = slot->name; 770 #define VARx(name,expr,type) expr = slot->name;
704 # include "state.h" 771 #include "state.h"
705 #undef VAR 772#endif
706 773
707 { 774 {
708 dSP; 775 dSP;
709 776
710 CV *cv; 777 CV *cv;
711 778
712 /* now do the ugly restore mess */ 779 /* now do the ugly restore mess */
713 while (expect_true (cv = (CV *)POPs)) 780 while (ecb_expect_true (cv = (CV *)POPs))
714 { 781 {
715 put_padlist (aTHX_ cv); /* mark this padlist as available */ 782 put_padlist (aTHX_ cv); /* mark this padlist as available */
716 CvDEPTH (cv) = PTR2IV (POPs); 783 CvDEPTH (cv) = PTR2IV (POPs);
717 CvPADLIST (cv) = (AV *)POPs; 784 CvPADLIST (cv) = (PADLIST *)POPs;
718 } 785 }
719 786
720 PUTBACK; 787 PUTBACK;
721 } 788 }
722 789
723 slf_frame = c->slf_frame; 790 slf_frame = c->slf_frame;
724 CORO_THROW = c->except; 791 CORO_THROW = c->except;
725 792
726 if (expect_false (enable_times)) 793 if (ecb_expect_false (enable_times))
727 { 794 {
728 if (expect_false (!times_valid)) 795 if (ecb_expect_false (!times_valid))
729 coro_times_update (); 796 coro_times_update ();
730 797
731 coro_times_sub (c); 798 coro_times_sub (c);
732 } 799 }
733 800
734 if (expect_false (c->on_enter)) 801 if (ecb_expect_false (c->on_enter))
735 { 802 {
736 int i; 803 int i;
737 804
738 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 805 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
739 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 806 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
740 } 807 }
741 808
809 if (ecb_expect_false (c->on_enter_xs))
810 {
811 int i;
812
813 for (i = 0; i <= AvFILLp (c->on_enter_xs); i += 2)
814 ((coro_enterleave_hook)AvARRAY (c->on_enter_xs)[i]) (aTHX_ AvARRAY (c->on_enter_xs)[i + 1]);
815 }
816
742 SWAP_SVS (c); 817 SWAP_SVS_ENTER (c);
743} 818}
744 819
745static void 820static void
746save_perl (pTHX_ Coro__State c) 821save_perl (pTHX_ Coro__State c)
747{ 822{
748 SWAP_SVS (c); 823 SWAP_SVS_LEAVE (c);
749 824
825 if (ecb_expect_false (c->on_leave_xs))
826 {
827 int i;
828
829 for (i = AvFILLp (c->on_leave_xs) - 1; i >= 0; i -= 2)
830 ((coro_enterleave_hook)AvARRAY (c->on_leave_xs)[i]) (aTHX_ AvARRAY (c->on_leave_xs)[i + 1]);
831 }
832
750 if (expect_false (c->on_leave)) 833 if (ecb_expect_false (c->on_leave))
751 { 834 {
752 int i; 835 int i;
753 836
754 for (i = AvFILLp (c->on_leave); i >= 0; --i) 837 for (i = AvFILLp (c->on_leave); i >= 0; --i)
755 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]); 838 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
756 } 839 }
757 840
758 times_valid = 0; 841 times_valid = 0;
759 842
760 if (expect_false (enable_times)) 843 if (ecb_expect_false (enable_times))
761 { 844 {
762 coro_times_update (); times_valid = 1; 845 coro_times_update (); times_valid = 1;
763 coro_times_add (c); 846 coro_times_add (c);
764 } 847 }
765 848
… …
779 862
780 XPUSHs (Nullsv); 863 XPUSHs (Nullsv);
781 /* this loop was inspired by pp_caller */ 864 /* this loop was inspired by pp_caller */
782 for (;;) 865 for (;;)
783 { 866 {
784 while (expect_true (cxix >= 0)) 867 while (ecb_expect_true (cxix >= 0))
785 { 868 {
786 PERL_CONTEXT *cx = &ccstk[cxix--]; 869 PERL_CONTEXT *cx = &ccstk[cxix--];
787 870
788 if (expect_true (CxTYPE (cx) == CXt_SUB) || expect_false (CxTYPE (cx) == CXt_FORMAT)) 871 if (ecb_expect_true (CxTYPE (cx) == CXt_SUB) || ecb_expect_false (CxTYPE (cx) == CXt_FORMAT))
789 { 872 {
790 CV *cv = cx->blk_sub.cv; 873 CV *cv = cx->blk_sub.cv;
791 874
792 if (expect_true (CvDEPTH (cv))) 875 if (ecb_expect_true (CvDEPTH (cv)))
793 { 876 {
794 EXTEND (SP, 3); 877 EXTEND (SP, 3);
795 PUSHs ((SV *)CvPADLIST (cv)); 878 PUSHs ((SV *)CvPADLIST (cv));
796 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv))); 879 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
797 PUSHs ((SV *)cv); 880 PUSHs ((SV *)cv);
… …
800 get_padlist (aTHX_ cv); 883 get_padlist (aTHX_ cv);
801 } 884 }
802 } 885 }
803 } 886 }
804 887
805 if (expect_true (top_si->si_type == PERLSI_MAIN)) 888 if (ecb_expect_true (top_si->si_type == PERLSI_MAIN))
806 break; 889 break;
807 890
808 top_si = top_si->si_prev; 891 top_si = top_si->si_prev;
809 ccstk = top_si->si_cxstack; 892 ccstk = top_si->si_cxstack;
810 cxix = top_si->si_cxix; 893 cxix = top_si->si_cxix;
… …
812 895
813 PUTBACK; 896 PUTBACK;
814 } 897 }
815 898
816 /* allocate some space on the context stack for our purposes */ 899 /* allocate some space on the context stack for our purposes */
817 if (expect_false (cxstack_ix + SLOT_COUNT >= cxstack_max)) 900 if (ecb_expect_false (cxstack_ix + (int)SLOT_COUNT >= cxstack_max))
818 { 901 {
819 unsigned int i; 902 unsigned int i;
820 903
821 for (i = 0; i < SLOT_COUNT; ++i) 904 for (i = 0; i < SLOT_COUNT; ++i)
822 CXINC; 905 CXINC;
… …
827 c->mainstack = PL_mainstack; 910 c->mainstack = PL_mainstack;
828 911
829 { 912 {
830 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 913 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
831 914
832 slot->defav = GvAV (PL_defgv); 915#if CORO_JIT
833 slot->defsv = DEFSV; 916 save_perl_slots (slot);
834 slot->errsv = ERRSV; 917#else
835 slot->irsgv = GvSV (irsgv);
836 slot->hinthv = GvHV (PL_hintgv);
837
838 #define VAR(name,type) slot->name = PL_ ## name; 918 #define VARx(name,expr,type) slot->name = expr;
839 # include "state.h" 919 #include "state.h"
840 #undef VAR 920#endif
841 } 921 }
842} 922}
843 923
844/* 924/*
845 * allocate various perl stacks. This is almost an exact copy 925 * allocate various perl stacks. This is almost an exact copy
… …
876#endif 956#endif
877 957
878 New(54,PL_scopestack,8,I32); 958 New(54,PL_scopestack,8,I32);
879 PL_scopestack_ix = 0; 959 PL_scopestack_ix = 0;
880 PL_scopestack_max = 8; 960 PL_scopestack_max = 8;
961#if HAS_SCOPESTACK_NAME
962 New(54,PL_scopestack_name,8,const char*);
963#endif
881 964
882 New(54,PL_savestack,24,ANY); 965 New(54,PL_savestack,24,ANY);
883 PL_savestack_ix = 0; 966 PL_savestack_ix = 0;
884 PL_savestack_max = 24; 967 PL_savestack_max = 24;
968#if !PERL_VERSION_ATLEAST (5,24,0)
969 /* perl 5.24 moves SS_MAXPUSH optimisation from */
970 /* the header macros to PL_savestack_max */
971 PL_savestack_max -= SS_MAXPUSH;
972#endif
885 973
886#if !PERL_VERSION_ATLEAST (5,10,0) 974#if !PERL_VERSION_ATLEAST (5,10,0)
887 New(54,PL_retstack,4,OP*); 975 New(54,PL_retstack,4,OP*);
888 PL_retstack_ix = 0; 976 PL_retstack_ix = 0;
889 PL_retstack_max = 4; 977 PL_retstack_max = 4;
… …
913 } 1001 }
914 1002
915 Safefree (PL_tmps_stack); 1003 Safefree (PL_tmps_stack);
916 Safefree (PL_markstack); 1004 Safefree (PL_markstack);
917 Safefree (PL_scopestack); 1005 Safefree (PL_scopestack);
1006#if HAS_SCOPESTACK_NAME
1007 Safefree (PL_scopestack_name);
1008#endif
918 Safefree (PL_savestack); 1009 Safefree (PL_savestack);
919#if !PERL_VERSION_ATLEAST (5,10,0) 1010#if !PERL_VERSION_ATLEAST (5,10,0)
920 Safefree (PL_retstack); 1011 Safefree (PL_retstack);
921#endif 1012#endif
922} 1013}
… …
971 * This overrides the default magic get method of %SIG elements. 1062 * 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 1063 * 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), 1064 * and instead of trying to save and restore the hash elements (extremely slow),
974 * we just provide our own readback here. 1065 * we just provide our own readback here.
975 */ 1066 */
976static int 1067static int ecb_cold
977coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 1068coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
978{ 1069{
979 const char *s = MgPV_nolen_const (mg); 1070 const char *s = MgPV_nolen_const (mg);
980 1071
981 if (*s == '_') 1072 if (*s == '_')
982 { 1073 {
983 SV **svp = 0; 1074 SV **svp = 0;
984 1075
985 if (strEQ (s, "__DIE__" )) svp = &PL_diehook; 1076 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
986 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 1077 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
987 1078
988 if (svp) 1079 if (svp)
989 { 1080 {
990 sv_setsv (sv, *svp ? *svp : &PL_sv_undef); 1081 SV *ssv;
1082
1083 if (!*svp)
1084 ssv = &PL_sv_undef;
1085 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */
1086 ssv = sv_2mortal (newRV_inc (*svp));
1087 else
1088 ssv = *svp;
1089
1090 sv_setsv (sv, ssv);
991 return 0; 1091 return 0;
992 } 1092 }
993 } 1093 }
994 1094
995 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 1095 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
996} 1096}
997 1097
998static int 1098static int ecb_cold
999coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1099coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
1000{ 1100{
1001 const char *s = MgPV_nolen_const (mg); 1101 const char *s = MgPV_nolen_const (mg);
1002 1102
1003 if (*s == '_') 1103 if (*s == '_')
… …
1017 } 1117 }
1018 1118
1019 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0; 1119 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
1020} 1120}
1021 1121
1022static int 1122static int ecb_cold
1023coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1123coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
1024{ 1124{
1025 const char *s = MgPV_nolen_const (mg); 1125 const char *s = MgPV_nolen_const (mg);
1026 1126
1027 if (*s == '_') 1127 if (*s == '_')
… …
1062 return 1; 1162 return 1;
1063} 1163}
1064 1164
1065static UNOP init_perl_op; 1165static UNOP init_perl_op;
1066 1166
1067static void NOINLINE /* noinline to keep it out of the transfer fast path */ 1167ecb_noinline static void /* noinline to keep it out of the transfer fast path */
1068init_perl (pTHX_ struct coro *coro) 1168init_perl (pTHX_ struct coro *coro)
1069{ 1169{
1070 /* 1170 /*
1071 * emulate part of the perl startup here. 1171 * emulate part of the perl startup here.
1072 */ 1172 */
… …
1089 PL_hints = 0; 1189 PL_hints = 0;
1090 1190
1091 /* recreate the die/warn hooks */ 1191 /* recreate the die/warn hooks */
1092 PL_diehook = SvREFCNT_inc (rv_diehook); 1192 PL_diehook = SvREFCNT_inc (rv_diehook);
1093 PL_warnhook = SvREFCNT_inc (rv_warnhook); 1193 PL_warnhook = SvREFCNT_inc (rv_warnhook);
1094 1194
1095 GvSV (PL_defgv) = newSV (0); 1195 GvSV (PL_defgv) = newSV (0);
1096 GvAV (PL_defgv) = coro->args; coro->args = 0; 1196 GvAV (PL_defgv) = coro->args; coro->args = 0;
1097 GvSV (PL_errgv) = newSV (0); 1197 GvSV (PL_errgv) = newSV (0);
1098 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1198 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
1099 GvHV (PL_hintgv) = 0; 1199 GvHV (PL_hintgv) = newHV ();
1200#if PERL_VERSION_ATLEAST (5,10,0)
1201 hv_magic (GvHV (PL_hintgv), 0, PERL_MAGIC_hints);
1202#endif
1100 PL_rs = newSVsv (GvSV (irsgv)); 1203 PL_rs = newSVsv (GvSV (irsgv));
1101 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1204 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
1102 1205
1103 { 1206 {
1104 dSP; 1207 dSP;
… …
1132 PL_op = (OP *)&init_perl_op; 1235 PL_op = (OP *)&init_perl_op;
1133 1236
1134 /* copy throw, in case it was set before init_perl */ 1237 /* copy throw, in case it was set before init_perl */
1135 CORO_THROW = coro->except; 1238 CORO_THROW = coro->except;
1136 1239
1137 SWAP_SVS (coro); 1240 SWAP_SVS_ENTER (coro);
1138 1241
1139 if (expect_false (enable_times)) 1242 if (ecb_expect_false (enable_times))
1140 { 1243 {
1141 coro_times_update (); 1244 coro_times_update ();
1142 coro_times_sub (coro); 1245 coro_times_sub (coro);
1143 } 1246 }
1144} 1247}
… …
1180 /* this will cause transfer_check to croak on block*/ 1283 /* this will cause transfer_check to croak on block*/
1181 SvRV_set (coro_current, (SV *)coro->hv); 1284 SvRV_set (coro_current, (SV *)coro->hv);
1182 1285
1183 load_perl (aTHX_ coro); 1286 load_perl (aTHX_ coro);
1184 1287
1288 /* restore swapped sv's */
1289 SWAP_SVS_LEAVE (coro);
1290
1185 coro_unwind_stacks (aTHX); 1291 coro_unwind_stacks (aTHX);
1186 1292
1187 /* restore swapped sv's */
1188 SWAP_SVS (coro);
1189
1190 coro_destruct_stacks (aTHX); 1293 coro_destruct_stacks (aTHX);
1191 1294
1192 // now save some sv's to be free'd later 1295 /* now save some sv's to be free'd later */
1193 svf [0] = GvSV (PL_defgv); 1296 svf [0] = GvSV (PL_defgv);
1194 svf [1] = (SV *)GvAV (PL_defgv); 1297 svf [1] = (SV *)GvAV (PL_defgv);
1195 svf [2] = GvSV (PL_errgv); 1298 svf [2] = GvSV (PL_errgv);
1196 svf [3] = (SV *)PL_defoutgv; 1299 svf [3] = (SV *)PL_defoutgv;
1197 svf [4] = PL_rs; 1300 svf [4] = PL_rs;
… …
1214 1317
1215 SvREFCNT_dec (coro->saved_deffh); 1318 SvREFCNT_dec (coro->saved_deffh);
1216 SvREFCNT_dec (coro->rouse_cb); 1319 SvREFCNT_dec (coro->rouse_cb);
1217 SvREFCNT_dec (coro->invoke_cb); 1320 SvREFCNT_dec (coro->invoke_cb);
1218 SvREFCNT_dec (coro->invoke_av); 1321 SvREFCNT_dec (coro->invoke_av);
1322 SvREFCNT_dec (coro->on_enter_xs);
1323 SvREFCNT_dec (coro->on_leave_xs);
1219 } 1324 }
1220} 1325}
1221 1326
1222INLINE void 1327ecb_inline void
1223free_coro_mortal (pTHX) 1328free_coro_mortal (pTHX)
1224{ 1329{
1225 if (expect_true (coro_mortal)) 1330 if (ecb_expect_true (coro_mortal))
1226 { 1331 {
1227 SvREFCNT_dec ((SV *)coro_mortal); 1332 SvREFCNT_dec ((SV *)coro_mortal);
1228 coro_mortal = 0; 1333 coro_mortal = 0;
1229 } 1334 }
1230} 1335}
… …
1286 1391
1287 if (PL_curcop != &PL_compiling) 1392 if (PL_curcop != &PL_compiling)
1288 { 1393 {
1289 SV **cb; 1394 SV **cb;
1290 1395
1291 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB) 1396 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB && cxstack_ix >= 0)
1292 { 1397 {
1293 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1398 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1294 1399
1295 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1400 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1296 { 1401 {
… …
1365 1470
1366 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1471 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1367} 1472}
1368 1473
1369/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1474/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1370static void NOINLINE 1475static void ecb_noinline
1371cctx_prepare (pTHX) 1476cctx_prepare (pTHX)
1372{ 1477{
1373 PL_top_env = &PL_start_env; 1478 PL_top_env = &PL_start_env;
1374 1479
1375 if (cctx_current->flags & CC_TRACE) 1480 if (cctx_current->flags & CC_TRACE)
… …
1386 slf_frame.prepare = slf_prepare_set_stacklevel; 1491 slf_frame.prepare = slf_prepare_set_stacklevel;
1387 slf_frame.check = slf_check_set_stacklevel; 1492 slf_frame.check = slf_check_set_stacklevel;
1388} 1493}
1389 1494
1390/* the tail of transfer: execute stuff we can only do after a transfer */ 1495/* the tail of transfer: execute stuff we can only do after a transfer */
1391INLINE void 1496ecb_inline void
1392transfer_tail (pTHX) 1497transfer_tail (pTHX)
1393{ 1498{
1394 free_coro_mortal (aTHX); 1499 free_coro_mortal (aTHX);
1500}
1501
1502/* try to exit the same way perl's main function would do */
1503/* we do not bother resetting the environment or other things *7
1504/* that are not, uhm, essential */
1505/* this obviously also doesn't work when perl is embedded */
1506static void ecb_noinline ecb_cold
1507perlish_exit (pTHX)
1508{
1509 int exitstatus = perl_destruct (PL_curinterp);
1510 perl_free (PL_curinterp);
1511 exit (exitstatus);
1395} 1512}
1396 1513
1397/* 1514/*
1398 * this is a _very_ stripped down perl interpreter ;) 1515 * this is a _very_ stripped down perl interpreter ;)
1399 */ 1516 */
… …
1426 * coro body here, as perl_run destroys these. Likewise, we cannot catch 1543 * coro body here, as perl_run destroys these. Likewise, we cannot catch
1427 * runtime errors here, as this is just a random interpreter, not a thread. 1544 * runtime errors here, as this is just a random interpreter, not a thread.
1428 */ 1545 */
1429 1546
1430 /* 1547 /*
1548 * pp_entersub in 5.24 no longer ENTERs, but perl_destruct
1549 * requires PL_scopestack_ix, so do it here if required.
1550 */
1551 if (!PL_scopestack_ix)
1552 ENTER;
1553
1554 /*
1431 * If perl-run returns we assume exit() was being called or the coro 1555 * 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) 1556 * 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 1557 * 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" 1558 * 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 */ 1559 */
1439 PL_top_env = main_top_env; 1560 perlish_exit (aTHX);
1440 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1441 } 1561 }
1442} 1562}
1443 1563
1444static coro_cctx * 1564static coro_cctx *
1445cctx_new () 1565cctx_new (void)
1446{ 1566{
1447 coro_cctx *cctx; 1567 coro_cctx *cctx;
1448 1568
1449 ++cctx_count; 1569 ++cctx_count;
1450 New (0, cctx, 1, coro_cctx); 1570 New (0, cctx, 1, coro_cctx);
… …
1456 return cctx; 1576 return cctx;
1457} 1577}
1458 1578
1459/* create a new cctx only suitable as source */ 1579/* create a new cctx only suitable as source */
1460static coro_cctx * 1580static coro_cctx *
1461cctx_new_empty () 1581cctx_new_empty (void)
1462{ 1582{
1463 coro_cctx *cctx = cctx_new (); 1583 coro_cctx *cctx = cctx_new ();
1464 1584
1465 cctx->sptr = 0; 1585 cctx->stack.sptr = 0;
1466 coro_create (&cctx->cctx, 0, 0, 0, 0); 1586 coro_create (&cctx->cctx, 0, 0, 0, 0);
1467 1587
1468 return cctx; 1588 return cctx;
1469} 1589}
1470 1590
1471/* create a new cctx suitable as destination/running a perl interpreter */ 1591/* create a new cctx suitable as destination/running a perl interpreter */
1472static coro_cctx * 1592static coro_cctx *
1473cctx_new_run () 1593cctx_new_run (void)
1474{ 1594{
1475 coro_cctx *cctx = cctx_new (); 1595 coro_cctx *cctx = cctx_new ();
1476 void *stack_start;
1477 size_t stack_size;
1478 1596
1479#if HAVE_MMAP 1597 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 } 1598 {
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."); 1599 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1502 _exit (EXIT_FAILURE); 1600 _exit (EXIT_FAILURE);
1503 }
1504
1505 stack_start = cctx->sptr;
1506 stack_size = cctx->ssize;
1507 } 1601 }
1508 1602
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); 1603 coro_create (&cctx->cctx, cctx_run, (void *)cctx, cctx->stack.sptr, cctx->stack.ssze);
1514 1604
1515 return cctx; 1605 return cctx;
1516} 1606}
1517 1607
1518static void 1608static void
… …
1524 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current)); 1614 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1525 1615
1526 --cctx_count; 1616 --cctx_count;
1527 coro_destroy (&cctx->cctx); 1617 coro_destroy (&cctx->cctx);
1528 1618
1529 /* coro_transfer creates new, empty cctx's */ 1619 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 1620
1544 Safefree (cctx); 1621 Safefree (cctx);
1545} 1622}
1546 1623
1547/* wether this cctx should be destructed */ 1624/* wether this cctx should be destructed */
1548#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE)) 1625#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE))
1549 1626
1550static coro_cctx * 1627static coro_cctx *
1551cctx_get (pTHX) 1628cctx_get (pTHX)
1552{ 1629{
1553 while (expect_true (cctx_first)) 1630 while (ecb_expect_true (cctx_first))
1554 { 1631 {
1555 coro_cctx *cctx = cctx_first; 1632 coro_cctx *cctx = cctx_first;
1556 cctx_first = cctx->next; 1633 cctx_first = cctx->next;
1557 --cctx_idle; 1634 --cctx_idle;
1558 1635
1559 if (expect_true (!CCTX_EXPIRED (cctx))) 1636 if (ecb_expect_true (!CCTX_EXPIRED (cctx)))
1560 return cctx; 1637 return cctx;
1561 1638
1562 cctx_destroy (cctx); 1639 cctx_destroy (cctx);
1563 } 1640 }
1564 1641
… …
1566} 1643}
1567 1644
1568static void 1645static void
1569cctx_put (coro_cctx *cctx) 1646cctx_put (coro_cctx *cctx)
1570{ 1647{
1571 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1648 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->stack.sptr));
1572 1649
1573 /* free another cctx if overlimit */ 1650 /* free another cctx if overlimit */
1574 if (expect_false (cctx_idle >= cctx_max_idle)) 1651 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1575 { 1652 {
1576 coro_cctx *first = cctx_first; 1653 coro_cctx *first = cctx_first;
1577 cctx_first = first->next; 1654 cctx_first = first->next;
1578 --cctx_idle; 1655 --cctx_idle;
1579 1656
… …
1590static void 1667static void
1591transfer_check (pTHX_ struct coro *prev, struct coro *next) 1668transfer_check (pTHX_ struct coro *prev, struct coro *next)
1592{ 1669{
1593 /* TODO: throwing up here is considered harmful */ 1670 /* TODO: throwing up here is considered harmful */
1594 1671
1595 if (expect_true (prev != next)) 1672 if (ecb_expect_true (prev != next))
1596 { 1673 {
1597 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1674 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,"); 1675 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1599 1676
1600 if (expect_false (next->flags & (CF_RUNNING | CF_ZOMBIE | CF_SUSPENDED))) 1677 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,"); 1678 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1602 1679
1603#if !PERL_VERSION_ATLEAST (5,10,0) 1680#if !PERL_VERSION_ATLEAST (5,10,0)
1604 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1681 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,"); 1682 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1606#endif 1683#endif
1607 } 1684 }
1608} 1685}
1609 1686
1610/* always use the TRANSFER macro */ 1687/* always use the TRANSFER macro */
1611static void NOINLINE /* noinline so we have a fixed stackframe */ 1688static void ecb_noinline /* noinline so we have a fixed stackframe */
1612transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1689transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1613{ 1690{
1614 dSTACKLEVEL; 1691 dSTACKLEVEL;
1615 1692
1616 /* sometimes transfer is only called to set idle_sp */ 1693 /* sometimes transfer is only called to set idle_sp */
1617 if (expect_false (!prev)) 1694 if (ecb_expect_false (!prev))
1618 { 1695 {
1619 cctx_current->idle_sp = STACKLEVEL; 1696 cctx_current->idle_sp = STACKLEVEL;
1620 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1697 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1621 } 1698 }
1622 else if (expect_true (prev != next)) 1699 else if (ecb_expect_true (prev != next))
1623 { 1700 {
1624 coro_cctx *cctx_prev; 1701 coro_cctx *cctx_prev;
1625 1702
1626 if (expect_false (prev->flags & CF_NEW)) 1703 if (ecb_expect_false (prev->flags & CF_NEW))
1627 { 1704 {
1628 /* create a new empty/source context */ 1705 /* create a new empty/source context */
1629 prev->flags &= ~CF_NEW; 1706 prev->flags &= ~CF_NEW;
1630 prev->flags |= CF_RUNNING; 1707 prev->flags |= CF_RUNNING;
1631 } 1708 }
… …
1634 next->flags |= CF_RUNNING; 1711 next->flags |= CF_RUNNING;
1635 1712
1636 /* first get rid of the old state */ 1713 /* first get rid of the old state */
1637 save_perl (aTHX_ prev); 1714 save_perl (aTHX_ prev);
1638 1715
1639 if (expect_false (next->flags & CF_NEW)) 1716 if (ecb_expect_false (next->flags & CF_NEW))
1640 { 1717 {
1641 /* need to start coroutine */ 1718 /* need to start coroutine */
1642 next->flags &= ~CF_NEW; 1719 next->flags &= ~CF_NEW;
1643 /* setup coroutine call */ 1720 /* setup coroutine call */
1644 init_perl (aTHX_ next); 1721 init_perl (aTHX_ next);
1645 } 1722 }
1646 else 1723 else
1647 load_perl (aTHX_ next); 1724 load_perl (aTHX_ next);
1648 1725
1649 /* possibly untie and reuse the cctx */ 1726 /* possibly untie and reuse the cctx */
1650 if (expect_true ( 1727 if (ecb_expect_true (
1651 cctx_current->idle_sp == STACKLEVEL 1728 cctx_current->idle_sp == STACKLEVEL
1652 && !(cctx_current->flags & CC_TRACE) 1729 && !(cctx_current->flags & CC_TRACE)
1653 && !force_cctx 1730 && !force_cctx
1654 )) 1731 ))
1655 { 1732 {
1656 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1733 /* 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)); 1734 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1658 1735
1659 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */ 1736 /* 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 */ 1737 /* without this the next cctx_get might destroy the running cctx while still in use */
1661 if (expect_false (CCTX_EXPIRED (cctx_current))) 1738 if (ecb_expect_false (CCTX_EXPIRED (cctx_current)))
1662 if (expect_true (!next->cctx)) 1739 if (ecb_expect_true (!next->cctx))
1663 next->cctx = cctx_get (aTHX); 1740 next->cctx = cctx_get (aTHX);
1664 1741
1665 cctx_put (cctx_current); 1742 cctx_put (cctx_current);
1666 } 1743 }
1667 else 1744 else
1668 prev->cctx = cctx_current; 1745 prev->cctx = cctx_current;
1669 1746
1670 ++next->usecount; 1747 ++next->usecount;
1671 1748
1672 cctx_prev = cctx_current; 1749 cctx_prev = cctx_current;
1673 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX); 1750 cctx_current = ecb_expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1674 1751
1675 next->cctx = 0; 1752 next->cctx = 0;
1676 1753
1677 if (expect_false (cctx_prev != cctx_current)) 1754 if (ecb_expect_false (cctx_prev != cctx_current))
1678 { 1755 {
1679 cctx_prev->top_env = PL_top_env; 1756 cctx_prev->top_env = PL_top_env;
1680 PL_top_env = cctx_current->top_env; 1757 PL_top_env = cctx_current->top_env;
1681 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx); 1758 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1682 } 1759 }
… …
1702 return; 1779 return;
1703 1780
1704 slf_destroy (aTHX_ coro); 1781 slf_destroy (aTHX_ coro);
1705 1782
1706 coro->flags |= CF_ZOMBIE; 1783 coro->flags |= CF_ZOMBIE;
1707 1784
1708 if (coro->flags & CF_READY) 1785 if (coro->flags & CF_READY)
1709 { 1786 {
1710 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1787 /* reduce nready, as destroying a ready coro effectively unreadies it */
1711 /* alternative: look through all ready queues and remove the coro */ 1788 /* alternative: look through all ready queues and remove the coro */
1712 --coro_nready; 1789 --coro_nready;
… …
1748 Safefree (coro); 1825 Safefree (coro);
1749 1826
1750 return 0; 1827 return 0;
1751} 1828}
1752 1829
1753static int 1830static int ecb_cold
1754coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1831coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1755{ 1832{
1756 /* called when perl clones the current process the slow way (windows process emulation) */ 1833 /* 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 */ 1834 /* WE SIMply nuke the pointers in the copy, causing perl to croak */
1758 mg->mg_ptr = 0; 1835 mg->mg_ptr = 0;
… …
1789 TRANSFER (ta, 1); 1866 TRANSFER (ta, 1);
1790} 1867}
1791 1868
1792/** Coro ********************************************************************/ 1869/** Coro ********************************************************************/
1793 1870
1794INLINE void 1871ecb_inline void
1795coro_enq (pTHX_ struct coro *coro) 1872coro_enq (pTHX_ struct coro *coro)
1796{ 1873{
1797 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN]; 1874 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1798 1875
1799 SvREFCNT_inc_NN (coro->hv); 1876 SvREFCNT_inc_NN (coro->hv);
… …
1801 coro->next_ready = 0; 1878 coro->next_ready = 0;
1802 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro; 1879 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1803 ready [1] = coro; 1880 ready [1] = coro;
1804} 1881}
1805 1882
1806INLINE struct coro * 1883ecb_inline struct coro *
1807coro_deq (pTHX) 1884coro_deq (pTHX)
1808{ 1885{
1809 int prio; 1886 int prio;
1810 1887
1811 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; ) 1888 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
… …
1864{ 1941{
1865 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1942 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1866} 1943}
1867 1944
1868/* expects to own a reference to next->hv */ 1945/* expects to own a reference to next->hv */
1869INLINE void 1946ecb_inline void
1870prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1947prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1871{ 1948{
1872 SV *prev_sv = SvRV (coro_current); 1949 SV *prev_sv = SvRV (coro_current);
1873 1950
1874 ta->prev = SvSTATE_hv (prev_sv); 1951 ta->prev = SvSTATE_hv (prev_sv);
… …
1887{ 1964{
1888 for (;;) 1965 for (;;)
1889 { 1966 {
1890 struct coro *next = coro_deq (aTHX); 1967 struct coro *next = coro_deq (aTHX);
1891 1968
1892 if (expect_true (next)) 1969 if (ecb_expect_true (next))
1893 { 1970 {
1894 /* cannot transfer to destroyed coros, skip and look for next */ 1971 /* cannot transfer to destroyed coros, skip and look for next */
1895 if (expect_false (next->flags & (CF_ZOMBIE | CF_SUSPENDED))) 1972 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 */ 1973 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1897 else 1974 else
1898 { 1975 {
1899 next->flags &= ~CF_READY; 1976 next->flags &= ~CF_READY;
1900 --coro_nready; 1977 --coro_nready;
… …
1908 /* nothing to schedule: call the idle handler */ 1985 /* nothing to schedule: call the idle handler */
1909 if (SvROK (sv_idle) 1986 if (SvROK (sv_idle)
1910 && SvOBJECT (SvRV (sv_idle))) 1987 && SvOBJECT (SvRV (sv_idle)))
1911 { 1988 {
1912 if (SvRV (sv_idle) == SvRV (coro_current)) 1989 if (SvRV (sv_idle) == SvRV (coro_current))
1990 {
1991 require_pv ("Carp");
1992
1993 {
1994 dSP;
1995
1996 ENTER;
1997 SAVETMPS;
1998
1999 PUSHMARK (SP);
1913 croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught"); 2000 XPUSHs (sv_2mortal (newSVpv ("FATAL: $Coro::idle blocked itself - did you try to block inside an event loop callback? Caught", 0)));
2001 PUTBACK;
2002 call_pv ("Carp::confess", G_VOID | G_DISCARD);
2003
2004 FREETMPS;
2005 LEAVE;
2006 }
2007 }
1914 2008
1915 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 2009 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1916 api_ready (aTHX_ SvRV (sv_idle)); 2010 api_ready (aTHX_ SvRV (sv_idle));
1917 --coro_nready; 2011 --coro_nready;
1918 } 2012 }
… …
1933 } 2027 }
1934 } 2028 }
1935 } 2029 }
1936} 2030}
1937 2031
1938INLINE void 2032ecb_inline void
1939prepare_cede (pTHX_ struct coro_transfer_args *ta) 2033prepare_cede (pTHX_ struct coro_transfer_args *ta)
1940{ 2034{
1941 api_ready (aTHX_ coro_current); 2035 api_ready (aTHX_ coro_current);
1942 prepare_schedule (aTHX_ ta); 2036 prepare_schedule (aTHX_ ta);
1943} 2037}
1944 2038
1945INLINE void 2039ecb_inline void
1946prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 2040prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1947{ 2041{
1948 SV *prev = SvRV (coro_current); 2042 SV *prev = SvRV (coro_current);
1949 2043
1950 if (coro_nready) 2044 if (coro_nready)
… …
1980{ 2074{
1981 struct coro_transfer_args ta; 2075 struct coro_transfer_args ta;
1982 2076
1983 prepare_cede (aTHX_ &ta); 2077 prepare_cede (aTHX_ &ta);
1984 2078
1985 if (expect_true (ta.prev != ta.next)) 2079 if (ecb_expect_true (ta.prev != ta.next))
1986 { 2080 {
1987 TRANSFER (ta, 1); 2081 TRANSFER (ta, 1);
1988 return 1; 2082 return 1;
1989 } 2083 }
1990 else 2084 else
… …
2115{ 2209{
2116 AV *od = coro->on_destroy; 2210 AV *od = coro->on_destroy;
2117 2211
2118 if (!od) 2212 if (!od)
2119 return; 2213 return;
2214
2215 coro->on_destroy = 0;
2216 sv_2mortal ((SV *)od);
2120 2217
2121 while (AvFILLp (od) >= 0) 2218 while (AvFILLp (od) >= 0)
2122 { 2219 {
2123 SV *cb = sv_2mortal (av_pop (od)); 2220 SV *cb = sv_2mortal (av_pop (od));
2124 2221
… …
2145 2242
2146static void 2243static void
2147coro_set_status (pTHX_ struct coro *coro, SV **arg, int items) 2244coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
2148{ 2245{
2149 AV *av; 2246 AV *av;
2150 2247
2151 if (coro->status) 2248 if (coro->status)
2152 { 2249 {
2153 av = coro->status; 2250 av = coro->status;
2154 av_clear (av); 2251 av_clear (av);
2155 } 2252 }
… …
2202 2299
2203 coro = SvSTATE (arg [0]); 2300 coro = SvSTATE (arg [0]);
2204 coro_hv = coro->hv; 2301 coro_hv = coro->hv;
2205 2302
2206 coro_set_status (aTHX_ coro, arg + 1, items - 1); 2303 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2207 2304
2208 if (expect_false (coro->flags & CF_NOCANCEL)) 2305 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2209 { 2306 {
2210 /* coro currently busy cancelling something, so just notify it */ 2307 /* coro currently busy cancelling something, so just notify it */
2211 coro->slf_frame.data = (void *)coro; 2308 coro->slf_frame.data = (void *)coro;
2212 2309
2213 frame->prepare = prepare_nop; 2310 frame->prepare = prepare_nop;
… …
2219 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv); 2316 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2220 } 2317 }
2221 else 2318 else
2222 { 2319 {
2223 struct coro *self = SvSTATE_current; 2320 struct coro *self = SvSTATE_current;
2321
2322 if (!self)
2323 croak ("Coro::cancel called outside of thread content,");
2224 2324
2225 /* otherwise we cancel directly, purely for speed reasons 2325 /* otherwise we cancel directly, purely for speed reasons
2226 * unfortunately, this requires some magic trickery, as 2326 * unfortunately, this requires some magic trickery, as
2227 * somebody else could cancel us, so we have to fight the cancellation. 2327 * somebody else could cancel us, so we have to fight the cancellation.
2228 * this is ugly, and hopefully fully worth the extra speed. 2328 * this is ugly, and hopefully fully worth the extra speed.
… …
2321slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2421slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2322{ 2422{
2323 HV *hv = (HV *)SvRV (coro_current); 2423 HV *hv = (HV *)SvRV (coro_current);
2324 struct coro *coro = SvSTATE_hv ((SV *)hv); 2424 struct coro *coro = SvSTATE_hv ((SV *)hv);
2325 2425
2326 if (expect_true (coro->saved_deffh)) 2426 if (ecb_expect_true (coro->saved_deffh))
2327 { 2427 {
2328 /* subsequent iteration */ 2428 /* subsequent iteration */
2329 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2429 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
2330 coro->saved_deffh = 0; 2430 coro->saved_deffh = 0;
2331 2431
… …
2338 else 2438 else
2339 { 2439 {
2340 av_clear (GvAV (PL_defgv)); 2440 av_clear (GvAV (PL_defgv));
2341 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2441 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
2342 2442
2443 if (ecb_expect_false (coro->swap_sv))
2444 {
2445 swap_svs_leave (coro);
2446 SvREFCNT_dec_NN (coro->swap_sv);
2447 coro->swap_sv = 0;
2448 }
2449
2343 coro->prio = 0; 2450 coro->prio = 0;
2344 2451
2345 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 2452 if (ecb_expect_false (coro->cctx) && ecb_expect_false (coro->cctx->flags & CC_TRACE))
2346 api_trace (aTHX_ coro_current, 0); 2453 api_trace (aTHX_ coro_current, 0);
2347 2454
2348 frame->prepare = prepare_schedule; 2455 frame->prepare = prepare_schedule;
2349 av_push (av_async_pool, SvREFCNT_inc (hv)); 2456 av_push (av_async_pool, SvREFCNT_inc (hv));
2350 } 2457 }
… …
2391 2498
2392static int 2499static int
2393slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2500slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
2394{ 2501{
2395 SV *data = (SV *)frame->data; 2502 SV *data = (SV *)frame->data;
2396 2503
2397 if (CORO_THROW) 2504 if (CORO_THROW)
2398 return 0; 2505 return 0;
2399 2506
2400 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2507 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2401 return 1; 2508 return 1;
… …
2437 cb = sv_2mortal (coro->rouse_cb); 2544 cb = sv_2mortal (coro->rouse_cb);
2438 coro->rouse_cb = 0; 2545 coro->rouse_cb = 0;
2439 } 2546 }
2440 2547
2441 if (!SvROK (cb) 2548 if (!SvROK (cb)
2442 || SvTYPE (SvRV (cb)) != SVt_PVCV 2549 || SvTYPE (SvRV (cb)) != SVt_PVCV
2443 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2550 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2444 croak ("Coro::rouse_wait called with illegal callback argument,"); 2551 croak ("Coro::rouse_wait called with illegal callback argument,");
2445 2552
2446 { 2553 {
2447 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */ 2554 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
… …
2570 2677
2571/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */ 2678/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2572static void 2679static void
2573slf_destroy (pTHX_ struct coro *coro) 2680slf_destroy (pTHX_ struct coro *coro)
2574{ 2681{
2575 /* this callback is reserved for slf functions needing to do cleanup */ 2682 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 2683
2579 /* 2684 /*
2580 * The on_destroy above most likely is from an SLF call. 2685 * The on_destroy below most likely is from an SLF call.
2581 * Since by definition the SLF call will not finish when we destroy 2686 * Since by definition the SLF call will not finish when we destroy
2582 * the coro, we will have to force-finish it here, otherwise 2687 * the coro, we will have to force-finish it here, otherwise
2583 * cleanup functions cannot call SLF functions. 2688 * cleanup functions cannot call SLF functions.
2584 */ 2689 */
2585 coro->slf_frame.prepare = 0; 2690 coro->slf_frame.prepare = 0;
2691
2692 /* this callback is reserved for slf functions needing to do cleanup */
2693 if (frame.destroy && frame.prepare && !PL_dirty)
2694 frame.destroy (aTHX_ &frame);
2586} 2695}
2587 2696
2588/* 2697/*
2589 * these not obviously related functions are all rolled into one 2698 * these not obviously related functions are all rolled into one
2590 * function to increase chances that they all will call transfer with the same 2699 * 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 */ 2706 I32 checkmark; /* mark SP to see how many elements check has pushed */
2598 2707
2599 /* set up the slf frame, unless it has already been set-up */ 2708 /* set up the slf frame, unless it has already been set-up */
2600 /* the latter happens when a new coro has been started */ 2709 /* the latter happens when a new coro has been started */
2601 /* or when a new cctx was attached to an existing coroutine */ 2710 /* or when a new cctx was attached to an existing coroutine */
2602 if (expect_true (!slf_frame.prepare)) 2711 if (ecb_expect_true (!slf_frame.prepare))
2603 { 2712 {
2604 /* first iteration */ 2713 /* first iteration */
2605 dSP; 2714 dSP;
2606 SV **arg = PL_stack_base + TOPMARK + 1; 2715 SV **arg = PL_stack_base + TOPMARK + 1;
2607 int items = SP - arg; /* args without function object */ 2716 int items = SP - arg; /* args without function object */
… …
2648 while (slf_frame.check (aTHX_ &slf_frame)); 2757 while (slf_frame.check (aTHX_ &slf_frame));
2649 2758
2650 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */ 2759 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */
2651 2760
2652 /* exception handling */ 2761 /* exception handling */
2653 if (expect_false (CORO_THROW)) 2762 if (ecb_expect_false (CORO_THROW))
2654 { 2763 {
2655 SV *exception = sv_2mortal (CORO_THROW); 2764 SV *exception = sv_2mortal (CORO_THROW);
2656 2765
2657 CORO_THROW = 0; 2766 CORO_THROW = 0;
2658 sv_setsv (ERRSV, exception); 2767 sv_setsv (ERRSV, exception);
… …
2660 } 2769 }
2661 2770
2662 /* return value handling - mostly like entersub */ 2771 /* return value handling - mostly like entersub */
2663 /* make sure we put something on the stack in scalar context */ 2772 /* make sure we put something on the stack in scalar context */
2664 if (GIMME_V == G_SCALAR 2773 if (GIMME_V == G_SCALAR
2665 && expect_false (PL_stack_sp != PL_stack_base + checkmark + 1)) 2774 && ecb_expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2666 { 2775 {
2667 dSP; 2776 dSP;
2668 SV **bot = PL_stack_base + checkmark; 2777 SV **bot = PL_stack_base + checkmark;
2669 2778
2670 if (sp == bot) /* too few, push undef */ 2779 if (sp == bot) /* too few, push undef */
… …
2775{ 2884{
2776 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave); 2885 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2777 on_enterleave_call (aTHX_ sv_2mortal (cb)); 2886 on_enterleave_call (aTHX_ sv_2mortal (cb));
2778} 2887}
2779 2888
2889static void
2890enterleave_hook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, void *arg)
2891{
2892 if (!hook)
2893 return;
2894
2895 if (!*avp)
2896 {
2897 *avp = newAV ();
2898 AvREAL_off (*avp);
2899 }
2900
2901 av_push (*avp, (SV *)hook);
2902 av_push (*avp, (SV *)arg);
2903}
2904
2905static void
2906enterleave_unhook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, int execute)
2907{
2908 AV *av = *avp;
2909 int i;
2910
2911 if (!av)
2912 return;
2913
2914 for (i = AvFILLp (av) - 1; i >= 0; i -= 2)
2915 if (AvARRAY (av)[i] == (SV *)hook)
2916 {
2917 if (execute)
2918 hook (aTHX_ (void *)AvARRAY (av)[i + 1]);
2919
2920 memmove (AvARRAY (av) + i, AvARRAY (av) + i + 2, AvFILLp (av) - i - 1);
2921 av_pop (av);
2922 av_pop (av);
2923 break;
2924 }
2925
2926 if (AvFILLp (av) >= 0)
2927 {
2928 *avp = 0;
2929 SvREFCNT_dec_NN (av);
2930 }
2931}
2932
2933static void
2934api_enterleave_hook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2935{
2936 struct coro *coro = SvSTATE (coro_sv);
2937
2938 if (SvSTATE_current == coro)
2939 if (enter)
2940 enter (aTHX_ enter_arg);
2941
2942 enterleave_hook_xs (aTHX_ coro, &coro->on_enter_xs, enter, enter_arg);
2943 enterleave_hook_xs (aTHX_ coro, &coro->on_leave_xs, leave, leave_arg);
2944}
2945
2946static void
2947api_enterleave_unhook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, coro_enterleave_hook leave)
2948{
2949 struct coro *coro = SvSTATE (coro_sv);
2950
2951 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2952 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, SvSTATE_current == coro);
2953}
2954
2955static void
2956savedestructor_unhook_enter (pTHX_ coro_enterleave_hook enter)
2957{
2958 struct coro *coro = SvSTATE_current;
2959
2960 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2961}
2962
2963static void
2964savedestructor_unhook_leave (pTHX_ coro_enterleave_hook leave)
2965{
2966 struct coro *coro = SvSTATE_current;
2967
2968 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, 1);
2969}
2970
2971static void
2972api_enterleave_scope_hook (pTHX_ coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2973{
2974 api_enterleave_hook (aTHX_ coro_current, enter, enter_arg, leave, leave_arg);
2975
2976 /* this ought to be much cheaper than malloc + a single destructor call */
2977 if (enter) SAVEDESTRUCTOR_X (savedestructor_unhook_enter, enter);
2978 if (leave) SAVEDESTRUCTOR_X (savedestructor_unhook_leave, leave);
2979}
2980
2780/*****************************************************************************/ 2981/*****************************************************************************/
2781/* PerlIO::cede */ 2982/* PerlIO::cede */
2782 2983
2783typedef struct 2984typedef struct
2784{ 2985{
2785 PerlIOBuf base; 2986 PerlIOBuf base;
2786 NV next, every; 2987 NV next, every;
2787} PerlIOCede; 2988} PerlIOCede;
2788 2989
2789static IV 2990static IV ecb_cold
2790PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab) 2991PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab)
2791{ 2992{
2792 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2993 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2793 2994
2794 self->every = SvCUR (arg) ? SvNV (arg) : 0.01; 2995 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
2795 self->next = nvtime () + self->every; 2996 self->next = nvtime () + self->every;
2796 2997
2797 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab); 2998 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
2798} 2999}
2799 3000
2800static SV * 3001static SV * ecb_cold
2801PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags) 3002PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
2802{ 3003{
2803 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 3004 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2804 3005
2805 return newSVnv (self->every); 3006 return newSVnv (self->every);
… …
2912 XPUSHs (sv_2mortal (newRV_inc ((SV *)av))); 3113 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2913 PUTBACK; 3114 PUTBACK;
2914 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR); 3115 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2915 } 3116 }
2916 3117
2917 SvREFCNT_dec (cb); 3118 SvREFCNT_dec_NN (cb);
2918 } 3119 }
2919} 3120}
2920 3121
2921static void 3122static void
2922coro_semaphore_destroy (pTHX_ struct CoroSLF *frame) 3123coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
… …
2930{ 3131{
2931 AV *av = (AV *)frame->data; 3132 AV *av = (AV *)frame->data;
2932 SV *count_sv = AvARRAY (av)[0]; 3133 SV *count_sv = AvARRAY (av)[0];
2933 SV *coro_hv = SvRV (coro_current); 3134 SV *coro_hv = SvRV (coro_current);
2934 3135
3136 frame->destroy = 0;
3137
2935 /* if we are about to throw, don't actually acquire the lock, just throw */ 3138 /* if we are about to throw, don't actually acquire the lock, just throw */
2936 if (CORO_THROW) 3139 if (ecb_expect_false (CORO_THROW))
3140 {
3141 /* we still might be responsible for the semaphore, so wake up others */
3142 coro_semaphore_adjust (aTHX_ av, 0);
3143
2937 return 0; 3144 return 0;
3145 }
2938 else if (SvIVX (count_sv) > 0) 3146 else if (SvIVX (count_sv) > 0)
2939 { 3147 {
2940 frame->destroy = 0;
2941
2942 if (acquire) 3148 if (acquire)
2943 SvIVX (count_sv) = SvIVX (count_sv) - 1; 3149 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2944 else 3150 else
2945 coro_semaphore_adjust (aTHX_ av, 0); 3151 coro_semaphore_adjust (aTHX_ av, 0);
2946 3152
… …
2950 { 3156 {
2951 int i; 3157 int i;
2952 /* if we were woken up but can't down, we look through the whole */ 3158 /* 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 */ 3159 /* waiters list and only add us if we aren't in there already */
2954 /* this avoids some degenerate memory usage cases */ 3160 /* this avoids some degenerate memory usage cases */
2955 for (i = AvFILLp (av); i > 0; --i) // i > 0 is not an off-by-one bug 3161 for (i = AvFILLp (av); i > 0; --i) /* i > 0 is not an off-by-one bug */
2956 if (AvARRAY (av)[i] == coro_hv) 3162 if (AvARRAY (av)[i] == coro_hv)
2957 return 1; 3163 return 1;
2958 3164
2959 av_push (av, SvREFCNT_inc (coro_hv)); 3165 av_push (av, SvREFCNT_inc (coro_hv));
2960 return 1; 3166 return 1;
… …
3057 { 3263 {
3058 api_ready (aTHX_ cb); 3264 api_ready (aTHX_ cb);
3059 sv_setiv (cb, 0); /* signal waiter */ 3265 sv_setiv (cb, 0); /* signal waiter */
3060 } 3266 }
3061 3267
3062 SvREFCNT_dec (cb); 3268 SvREFCNT_dec_NN (cb);
3063 3269
3064 --count; 3270 --count;
3065 } 3271 }
3066} 3272}
3067 3273
… …
3152 } 3358 }
3153 3359
3154 av_push (state, data_sv); 3360 av_push (state, data_sv);
3155 3361
3156 api_ready (aTHX_ coro); 3362 api_ready (aTHX_ coro);
3157 SvREFCNT_dec (coro); 3363 SvREFCNT_dec_NN (coro);
3158 SvREFCNT_dec ((AV *)state); 3364 SvREFCNT_dec_NN ((AV *)state);
3159} 3365}
3160 3366
3161static int 3367static int
3162slf_check_aio_req (pTHX_ struct CoroSLF *frame) 3368slf_check_aio_req (pTHX_ struct CoroSLF *frame)
3163{ 3369{
… …
3168 /* it quickly returns */ 3374 /* it quickly returns */
3169 if (CORO_THROW) 3375 if (CORO_THROW)
3170 return 0; 3376 return 0;
3171 3377
3172 /* one element that is an RV? repeat! */ 3378 /* one element that is an RV? repeat! */
3173 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0])) 3379 if (AvFILLp (state) == 0 && SvTYPE (AvARRAY (state)[0]) != SVt_PV)
3174 return 1; 3380 return 1;
3175 3381
3176 /* restore status */ 3382 /* restore status */
3177 { 3383 {
3178 SV *data_sv = av_pop (state); 3384 SV *data_sv = av_pop (state);
… …
3181 errno = data->errorno; 3387 errno = data->errorno;
3182 PL_laststype = data->laststype; 3388 PL_laststype = data->laststype;
3183 PL_laststatval = data->laststatval; 3389 PL_laststatval = data->laststatval;
3184 PL_statcache = data->statcache; 3390 PL_statcache = data->statcache;
3185 3391
3186 SvREFCNT_dec (data_sv); 3392 SvREFCNT_dec_NN (data_sv);
3187 } 3393 }
3188 3394
3189 /* push result values */ 3395 /* push result values */
3190 { 3396 {
3191 dSP; 3397 dSP;
… …
3217 dSP; 3423 dSP;
3218 3424
3219 static SV *prio_cv; 3425 static SV *prio_cv;
3220 static SV *prio_sv; 3426 static SV *prio_sv;
3221 3427
3222 if (expect_false (!prio_cv)) 3428 if (ecb_expect_false (!prio_cv))
3223 { 3429 {
3224 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0); 3430 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0);
3225 prio_sv = newSViv (0); 3431 prio_sv = newSViv (0);
3226 } 3432 }
3227 3433
… …
3333 } 3539 }
3334 3540
3335 return coro_sv; 3541 return coro_sv;
3336} 3542}
3337 3543
3544#ifndef __cplusplus
3545ecb_cold XS(boot_Coro__State);
3546#endif
3547
3548#if CORO_JIT
3549
3550static void ecb_noinline ecb_cold
3551pushav_4uv (pTHX_ UV a, UV b, UV c, UV d)
3552{
3553 dSP;
3554 AV *av = newAV ();
3555
3556 av_store (av, 3, newSVuv (d));
3557 av_store (av, 2, newSVuv (c));
3558 av_store (av, 1, newSVuv (b));
3559 av_store (av, 0, newSVuv (a));
3560
3561 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
3562
3563 PUTBACK;
3564}
3565
3566static void ecb_noinline ecb_cold
3567jit_init (pTHX)
3568{
3569 dSP;
3570 SV *load, *save;
3571 char *map_base;
3572 char *load_ptr, *save_ptr;
3573 STRLEN load_len, save_len, map_len;
3574 int count;
3575
3576 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3577
3578 PUSHMARK (SP);
3579 #define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type));
3580 #include "state.h"
3581 count = call_pv ("Coro::State::_jit", G_ARRAY);
3582 SPAGAIN;
3583
3584 save = POPs; save_ptr = SvPVbyte (save, save_len);
3585 load = POPs; load_ptr = SvPVbyte (load, load_len);
3586
3587 map_len = load_len + save_len + 16;
3588
3589 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3590
3591 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3592
3593 load_perl_slots = (load_save_perl_slots_type)map_base;
3594 memcpy (map_base, load_ptr, load_len);
3595
3596 map_base += (load_len + 15) & ~15;
3597
3598 save_perl_slots = (load_save_perl_slots_type)map_base;
3599 memcpy (map_base, save_ptr, save_len);
3600
3601 /* we are good citizens and try to make the page read-only, so the evil evil */
3602 /* hackers might have it a bit more difficult */
3603 mprotect (map_base, map_len, PROT_READ | PROT_EXEC);
3604
3605 PUTBACK;
3606 eval_pv ("undef &Coro::State::_jit", 1);
3607}
3608
3609#endif
3610
3338MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3611MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
3339 3612
3340PROTOTYPES: DISABLE 3613PROTOTYPES: DISABLE
3341 3614
3342BOOT: 3615BOOT:
3343{ 3616{
3617#define VARx(name,expr,type) if (sizeof (type) < sizeof (expr)) croak ("FATAL: Coro thread context slot '" # name "' too small for this version of perl.");
3618#include "state.h"
3344#ifdef USE_ITHREADS 3619#ifdef USE_ITHREADS
3345# if CORO_PTHREAD 3620# if CORO_PTHREAD
3346 coro_thx = PERL_GET_CONTEXT; 3621 coro_thx = PERL_GET_CONTEXT;
3347# endif 3622# endif
3348#endif 3623#endif
3349 BOOT_PAGESIZE; 3624 /* perl defines these to check for existance first, but why it doesn't */
3625 /* just create them one at init time is not clear to me, except for */
3626 /* programs trying to delete them, but... */
3627 /* anyway, we declare this as invalid and make sure they are initialised here */
3628 DEFSV;
3629 ERRSV;
3350 3630
3351 cctx_current = cctx_new_empty (); 3631 cctx_current = cctx_new_empty ();
3352 3632
3353 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3633 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
3354 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3634 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
3355 3635
3356 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 3636 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get;
3357 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set; 3637 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set;
3358 orig_sigelem_clr = PL_vtbl_sigelem.svt_clear; PL_vtbl_sigelem.svt_clear = coro_sigelem_clr; 3638 orig_sigelem_clr = PL_vtbl_sigelem.svt_clear; PL_vtbl_sigelem.svt_clear = coro_sigelem_clr;
3359 3639
3360 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
3361 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV)); 3640 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
3362 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV)); 3641 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
3363 3642
3364 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 3643 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
3365 3644
… …
3397 coroapi.prepare_cede_notself = prepare_cede_notself; 3676 coroapi.prepare_cede_notself = prepare_cede_notself;
3398 3677
3399 time_init (aTHX); 3678 time_init (aTHX);
3400 3679
3401 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL)); 3680 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3681#if CORO_JIT
3682 PUTBACK;
3683 jit_init (aTHX);
3684 SPAGAIN;
3685#endif
3402} 3686}
3403 3687
3404SV * 3688SV *
3405new (SV *klass, ...) 3689new (SV *klass, ...)
3406 ALIAS: 3690 ALIAS:
… …
3413void 3697void
3414transfer (...) 3698transfer (...)
3415 PROTOTYPE: $$ 3699 PROTOTYPE: $$
3416 CODE: 3700 CODE:
3417 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3701 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3418
3419void
3420_exit (int code)
3421 PROTOTYPE: $
3422 CODE:
3423 _exit (code);
3424 3702
3425SV * 3703SV *
3426clone (Coro::State coro) 3704clone (Coro::State coro)
3427 CODE: 3705 CODE:
3428{ 3706{
… …
3483void 3761void
3484list () 3762list ()
3485 PROTOTYPE: 3763 PROTOTYPE:
3486 PPCODE: 3764 PPCODE:
3487{ 3765{
3488 struct coro *coro; 3766 struct coro *coro;
3489 for (coro = coro_first; coro; coro = coro->next) 3767 for (coro = coro_first; coro; coro = coro->next)
3490 if (coro->hv) 3768 if (coro->hv)
3491 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 3769 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
3492} 3770}
3493 3771
… …
3557 RETVAL = boolSV (coro->flags & ix); 3835 RETVAL = boolSV (coro->flags & ix);
3558 OUTPUT: 3836 OUTPUT:
3559 RETVAL 3837 RETVAL
3560 3838
3561void 3839void
3562throw (Coro::State self, SV *exception = &PL_sv_undef) 3840throw (SV *self, SV *exception = &PL_sv_undef)
3563 PROTOTYPE: $;$ 3841 PROTOTYPE: $;$
3564 CODE: 3842 CODE:
3565{ 3843{
3844 struct coro *coro = SvSTATE (self);
3566 struct coro *current = SvSTATE_current; 3845 struct coro *current = SvSTATE_current;
3567 SV **exceptionp = self == current ? &CORO_THROW : &self->except; 3846 SV **exceptionp = coro == current ? &CORO_THROW : &coro->except;
3568 SvREFCNT_dec (*exceptionp); 3847 SvREFCNT_dec (*exceptionp);
3569 SvGETMAGIC (exception); 3848 SvGETMAGIC (exception);
3570 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0; 3849 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3850
3851 api_ready (aTHX_ self);
3571} 3852}
3572 3853
3573void 3854void
3574api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3855api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3575 PROTOTYPE: $;$ 3856 PROTOTYPE: $;$
… …
3652 3933
3653void 3934void
3654times (Coro::State self) 3935times (Coro::State self)
3655 PPCODE: 3936 PPCODE:
3656{ 3937{
3657 struct coro *current = SvSTATE (coro_current); 3938 struct coro *current = SvSTATE (coro_current);
3658 3939
3659 if (expect_false (current == self)) 3940 if (ecb_expect_false (current == self))
3660 { 3941 {
3661 coro_times_update (); 3942 coro_times_update ();
3662 coro_times_add (SvSTATE (coro_current)); 3943 coro_times_add (SvSTATE (coro_current));
3663 } 3944 }
3664 3945
3665 EXTEND (SP, 2); 3946 EXTEND (SP, 2);
3666 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9))); 3947 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))); 3948 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3668 3949
3669 if (expect_false (current == self)) 3950 if (ecb_expect_false (current == self))
3670 coro_times_sub (SvSTATE (coro_current)); 3951 coro_times_sub (SvSTATE (coro_current));
3671} 3952}
3672 3953
3673void 3954void
3674swap_sv (Coro::State coro, SV *sv, SV *swapsv) 3955swap_sv (Coro::State coro, SV *sva, SV *svb)
3675 CODE: 3956 CODE:
3676{ 3957{
3677 struct coro *current = SvSTATE_current; 3958 struct coro *current = SvSTATE_current;
3959 AV *swap_sv;
3960 int i;
3961
3962 sva = SvRV (sva);
3963 svb = SvRV (svb);
3678 3964
3679 if (current == coro) 3965 if (current == coro)
3680 SWAP_SVS (current); 3966 SWAP_SVS_LEAVE (current);
3681 3967
3682 if (!coro->swap_sv) 3968 if (!coro->swap_sv)
3683 coro->swap_sv = newAV (); 3969 coro->swap_sv = newAV ();
3684 3970
3971 swap_sv = coro->swap_sv;
3972
3973 for (i = AvFILLp (swap_sv) - 1; i >= 0; i -= 2)
3974 {
3975 SV *a = AvARRAY (swap_sv)[i ];
3976 SV *b = AvARRAY (swap_sv)[i + 1];
3977
3978 if (a == sva && b == svb)
3979 {
3980 SvREFCNT_dec_NN (a);
3981 SvREFCNT_dec_NN (b);
3982
3983 for (; i <= AvFILLp (swap_sv) - 2; i++)
3984 AvARRAY (swap_sv)[i] = AvARRAY (swap_sv)[i + 2];
3985
3986 AvFILLp (swap_sv) -= 2;
3987
3988 goto removed;
3989 }
3990 }
3991
3685 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv ))); 3992 av_push (swap_sv, SvREFCNT_inc_NN (sva));
3686 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv))); 3993 av_push (swap_sv, SvREFCNT_inc_NN (svb));
3994
3995 removed:
3687 3996
3688 if (current == coro) 3997 if (current == coro)
3689 SWAP_SVS (current); 3998 SWAP_SVS_ENTER (current);
3690} 3999}
3691 4000
3692 4001
3693MODULE = Coro::State PACKAGE = Coro 4002MODULE = Coro::State PACKAGE = Coro
3694 4003
3695BOOT: 4004BOOT:
3696{ 4005{
4006 if (SVt_LAST > 32)
4007 croak ("Coro internal error: SVt_LAST > 32, swap_sv might need adjustment");
4008
3697 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 4009 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3698 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 4010 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3699 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 4011 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3700 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 4012 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); 4013 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
… …
3705 4017
3706 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 4018 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); 4019 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); 4020 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 */ 4021 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3710 4022
3711 coro_stash = gv_stashpv ("Coro", TRUE); 4023 coro_stash = gv_stashpv ("Coro", TRUE);
3712 4024
3713 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 4025 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3714 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 4026 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3715 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL)); 4027 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
… …
3727 coroapi.ready = api_ready; 4039 coroapi.ready = api_ready;
3728 coroapi.is_ready = api_is_ready; 4040 coroapi.is_ready = api_is_ready;
3729 coroapi.nready = coro_nready; 4041 coroapi.nready = coro_nready;
3730 coroapi.current = coro_current; 4042 coroapi.current = coro_current;
3731 4043
4044 coroapi.enterleave_hook = api_enterleave_hook;
4045 coroapi.enterleave_unhook = api_enterleave_unhook;
4046 coroapi.enterleave_scope_hook = api_enterleave_scope_hook;
4047
3732 /*GCoroAPI = &coroapi;*/ 4048 /*GCoroAPI = &coroapi;*/
3733 sv_setiv (sv, (IV)&coroapi); 4049 sv_setiv (sv, (IV)&coroapi);
3734 SvREADONLY_on (sv); 4050 SvREADONLY_on (sv);
3735 } 4051 }
3736} 4052}
… …
3801 4117
3802void 4118void
3803_set_current (SV *current) 4119_set_current (SV *current)
3804 PROTOTYPE: $ 4120 PROTOTYPE: $
3805 CODE: 4121 CODE:
3806 SvREFCNT_dec (SvRV (coro_current)); 4122 SvREFCNT_dec_NN (SvRV (coro_current));
3807 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current))); 4123 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
3808 4124
3809void 4125void
3810_set_readyhook (SV *hook) 4126_set_readyhook (SV *hook)
3811 PROTOTYPE: $ 4127 PROTOTYPE: $
… …
3895 4211
3896 if ((SV *)hv == &PL_sv_undef) 4212 if ((SV *)hv == &PL_sv_undef)
3897 { 4213 {
3898 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1); 4214 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3899 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv)); 4215 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
3900 SvREFCNT_dec (sv); 4216 SvREFCNT_dec_NN (sv);
3901 } 4217 }
3902 4218
3903 { 4219 {
3904 struct coro *coro = SvSTATE_hv (hv); 4220 struct coro *coro = SvSTATE_hv (hv);
3905 4221
… …
3912 api_ready (aTHX_ (SV *)hv); 4228 api_ready (aTHX_ (SV *)hv);
3913 4229
3914 if (GIMME_V != G_VOID) 4230 if (GIMME_V != G_VOID)
3915 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 4231 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
3916 else 4232 else
3917 SvREFCNT_dec (hv); 4233 SvREFCNT_dec_NN (hv);
3918} 4234}
3919 4235
3920SV * 4236SV *
3921rouse_cb () 4237rouse_cb ()
3922 PROTOTYPE: 4238 PROTOTYPE:
… …
3937 on_leave = 1 4253 on_leave = 1
3938 PROTOTYPE: & 4254 PROTOTYPE: &
3939 CODE: 4255 CODE:
3940{ 4256{
3941 struct coro *coro = SvSTATE_current; 4257 struct coro *coro = SvSTATE_current;
3942 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 4258 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3943 4259
3944 block = s_get_cv_croak (block); 4260 block = s_get_cv_croak (block);
3945 4261
3946 if (!*avp) 4262 if (!*avp)
3947 *avp = newAV (); 4263 *avp = newAV ();
… …
3967 4283
3968SV * 4284SV *
3969new (SV *klass, SV *count = 0) 4285new (SV *klass, SV *count = 0)
3970 CODE: 4286 CODE:
3971{ 4287{
3972 int semcnt = 1; 4288 int semcnt = 1;
3973 4289
3974 if (count) 4290 if (count)
3975 { 4291 {
3976 SvGETMAGIC (count); 4292 SvGETMAGIC (count);
3977 4293
… …
4001 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]); 4317 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]);
4002 OUTPUT: 4318 OUTPUT:
4003 RETVAL 4319 RETVAL
4004 4320
4005void 4321void
4006up (SV *self, int adjust = 1) 4322up (SV *self)
4007 ALIAS:
4008 adjust = 1
4009 CODE: 4323 CODE:
4324 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), 1);
4325
4326void
4327adjust (SV *self, int adjust)
4328 CODE:
4010 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1); 4329 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), adjust);
4011 4330
4012void 4331void
4013down (...) 4332down (...)
4014 CODE: 4333 CODE:
4015 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down); 4334 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down);
… …
4037 XSRETURN_NO; 4356 XSRETURN_NO;
4038} 4357}
4039 4358
4040void 4359void
4041waiters (SV *self) 4360waiters (SV *self)
4042 PPCODE: 4361 PPCODE:
4043{ 4362{
4044 AV *av = (AV *)SvRV (self); 4363 AV *av = (AV *)SvRV (self);
4045 int wcount = AvFILLp (av) + 1 - 1; 4364 int wcount = AvFILLp (av) + 1 - 1;
4046 4365
4047 if (GIMME_V == G_SCALAR) 4366 if (GIMME_V == G_SCALAR)
… …
4056} 4375}
4057 4376
4058MODULE = Coro::State PACKAGE = Coro::SemaphoreSet 4377MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
4059 4378
4060void 4379void
4061_may_delete (SV *sem, int count, int extra_refs) 4380_may_delete (SV *sem, int count, unsigned int extra_refs)
4062 PPCODE: 4381 PPCODE:
4063{ 4382{
4064 AV *av = (AV *)SvRV (sem); 4383 AV *av = (AV *)SvRV (sem);
4065 4384
4066 if (SvREFCNT ((SV *)av) == 1 + extra_refs 4385 if (SvREFCNT ((SV *)av) == 1 + extra_refs
4067 && AvFILLp (av) == 0 /* no waiters, just count */ 4386 && AvFILLp (av) == 0 /* no waiters, just count */
4068 && SvIV (AvARRAY (av)[0]) == count) 4387 && SvIV (AvARRAY (av)[0]) == count)
4069 XSRETURN_YES; 4388 XSRETURN_YES;
… …
4090 4409
4091void 4410void
4092broadcast (SV *self) 4411broadcast (SV *self)
4093 CODE: 4412 CODE:
4094{ 4413{
4095 AV *av = (AV *)SvRV (self); 4414 AV *av = (AV *)SvRV (self);
4096 coro_signal_wake (aTHX_ av, AvFILLp (av)); 4415 coro_signal_wake (aTHX_ av, AvFILLp (av));
4097} 4416}
4098 4417
4099void 4418void
4100send (SV *self) 4419send (SV *self)
… …
4108 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */ 4427 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
4109} 4428}
4110 4429
4111IV 4430IV
4112awaited (SV *self) 4431awaited (SV *self)
4113 CODE: 4432 CODE:
4114 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1; 4433 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
4115 OUTPUT: 4434 OUTPUT:
4116 RETVAL 4435 RETVAL
4117 4436
4118 4437
… …
4123 4442
4124void 4443void
4125_schedule (...) 4444_schedule (...)
4126 CODE: 4445 CODE:
4127{ 4446{
4128 static int incede; 4447 static int incede;
4129 4448
4130 api_cede_notself (aTHX); 4449 api_cede_notself (aTHX);
4131 4450
4132 ++incede; 4451 ++incede;
4133 while (coro_nready >= incede && api_cede (aTHX)) 4452 while (coro_nready >= incede && api_cede (aTHX))
… …
4177 { 4496 {
4178 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect; 4497 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
4179 coro_old_pp_sselect = 0; 4498 coro_old_pp_sselect = 0;
4180 } 4499 }
4181 4500
4501MODULE = Coro::State PACKAGE = Coro::Util
4502
4503void
4504_exit (int code)
4505 CODE:
4506 _exit (code);
4507
4508NV
4509time ()
4510 CODE:
4511 RETVAL = nvtime (aTHX);
4512 OUTPUT:
4513 RETVAL
4514
4515NV
4516gettimeofday ()
4517 PPCODE:
4518{
4519 UV tv [2];
4520 u2time (aTHX_ tv);
4521 EXTEND (SP, 2);
4522 PUSHs (sv_2mortal (newSVuv (tv [0])));
4523 PUSHs (sv_2mortal (newSVuv (tv [1])));
4524}
4525

Diff Legend

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