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.404 by root, Fri Jun 10 12:27:02 2011 UTC vs.
Revision 1.452 by root, Tue Jun 30 12:42:45 2015 UTC

1/* this works around a bug in mingw32 providing a non-working setjmp */ 1/* this works around a bug in mingw32 providing a non-working setjmp */
2#define USE_NO_MINGW_SETJMP_TWO_ARGS 2#define USE_NO_MINGW_SETJMP_TWO_ARGS
3 3
4#define NDEBUG 1 4#define NDEBUG 1 /* perl usually disables NDEBUG later */
5 5
6#include "libcoro/coro.c" 6#include "libcoro/coro.c"
7 7
8#define PERL_NO_GET_CONTEXT 8#define PERL_NO_GET_CONTEXT
9#define PERL_EXT 9#define PERL_EXT
12#include "perl.h" 12#include "perl.h"
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
18#define ECB_NO_THREADS 1
19#define ECB_NO_LIBM 1
17#include "ecb.h" 20#include "ecb.h"
18 21
19#include <stddef.h> 22#include <stddef.h>
20#include <stdio.h> 23#include <stdio.h>
21#include <errno.h> 24#include <errno.h>
22#include <assert.h> 25#include <assert.h>
23 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
24#ifndef SVs_PADSTALE 35#ifndef SVs_PADSTALE
25# 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
26#endif 66#endif
27 67
28#if defined(_WIN32) 68#if defined(_WIN32)
29# undef HAS_GETTIMEOFDAY 69# undef HAS_GETTIMEOFDAY
30# undef setjmp 70# undef setjmp
33# define setjmp _setjmp /* deep magic */ 73# define setjmp _setjmp /* deep magic */
34#else 74#else
35# include <inttypes.h> /* most portable stdint.h */ 75# include <inttypes.h> /* most portable stdint.h */
36#endif 76#endif
37 77
38#ifdef HAVE_MMAP
39# include <unistd.h>
40# include <sys/mman.h>
41# ifndef MAP_ANONYMOUS
42# ifdef MAP_ANON
43# define MAP_ANONYMOUS MAP_ANON
44# else
45# undef HAVE_MMAP
46# endif
47# endif
48# include <limits.h>
49# ifndef PAGESIZE
50# define PAGESIZE pagesize
51# define BOOT_PAGESIZE pagesize = sysconf (_SC_PAGESIZE)
52static long pagesize;
53# else
54# define BOOT_PAGESIZE (void)0
55# endif
56#else
57# define PAGESIZE 0
58# define BOOT_PAGESIZE (void)0
59#endif
60
61#if CORO_USE_VALGRIND
62# include <valgrind/valgrind.h>
63#endif
64
65/* the maximum number of idle cctx that will be pooled */ 78/* the maximum number of idle cctx that will be pooled */
66static int cctx_max_idle = 4; 79static int cctx_max_idle = 4;
67 80
68#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 81#if defined(DEBUGGING) && PERL_VERSION_ATLEAST(5,12,0)
69# undef CORO_STACKGUARD 82# define HAS_SCOPESTACK_NAME 1
70#endif
71
72#ifndef CORO_STACKGUARD
73# define CORO_STACKGUARD 0
74#endif 83#endif
75 84
76/* prefer perl internal functions over our own? */ 85/* prefer perl internal functions over our own? */
77#ifndef CORO_PREFER_PERL_FUNCTIONS 86#ifndef CORO_PREFER_PERL_FUNCTIONS
78# define CORO_PREFER_PERL_FUNCTIONS 0 87# define CORO_PREFER_PERL_FUNCTIONS 0
169typedef struct coro_cctx 178typedef struct coro_cctx
170{ 179{
171 struct coro_cctx *next; 180 struct coro_cctx *next;
172 181
173 /* the stack */ 182 /* the stack */
174 void *sptr; 183 struct coro_stack stack;
175 size_t ssize;
176 184
177 /* cpu state */ 185 /* cpu state */
178 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 186 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
187#ifndef NDEBUG
179 JMPENV *idle_te; /* same as idle_sp, but for top_env, TODO: remove once stable */ 188 JMPENV *idle_te; /* same as idle_sp, but for top_env */
189#endif
180 JMPENV *top_env; 190 JMPENV *top_env;
181 coro_context cctx; 191 coro_context cctx;
182 192
183 U32 gen; 193 U32 gen;
184#if CORO_USE_VALGRIND 194#if CORO_USE_VALGRIND
204}; 214};
205 215
206/* the structure where most of the perl state is stored, overlaid on the cxstack */ 216/* the structure where most of the perl state is stored, overlaid on the cxstack */
207typedef struct 217typedef struct
208{ 218{
209 SV *defsv;
210 AV *defav;
211 SV *errsv;
212 SV *irsgv;
213 HV *hinthv;
214#define VAR(name,type) type name; 219 #define VARx(name,expr,type) type name;
215# include "state.h" 220 #include "state.h"
216#undef VAR
217} perl_slots; 221} perl_slots;
218 222
219// how many context stack entries do we need for perl_slots 223/* how many context stack entries do we need for perl_slots */
220#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT)) 224#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
221 225
222/* this is a structure representing a perl-level coroutine */ 226/* this is a structure representing a perl-level coroutine */
223struct coro 227struct coro
224{ 228{
252 SV *saved_deffh; 256 SV *saved_deffh;
253 SV *invoke_cb; 257 SV *invoke_cb;
254 AV *invoke_av; 258 AV *invoke_av;
255 259
256 /* on_enter/on_leave */ 260 /* on_enter/on_leave */
257 AV *on_enter; 261 AV *on_enter; AV *on_enter_xs;
258 AV *on_leave; 262 AV *on_leave; AV *on_leave_xs;
259 263
260 /* swap_sv */ 264 /* swap_sv */
261 AV *swap_sv; 265 AV *swap_sv;
262 266
263 /* times */ 267 /* times */
290static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */ 294static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
291static CV *cv_coro_run; 295static CV *cv_coro_run;
292static struct coro *coro_first; 296static struct coro *coro_first;
293#define coro_nready coroapi.nready 297#define coro_nready coroapi.nready
294 298
299/** JIT *********************************************************************/
300
301#if CORO_JIT
302 /* APPLE doesn't have mmap though */
303 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__)
304 #ifndef CORO_JIT_TYPE
305 #if ECB_AMD64 && CORO_JIT_UNIXY
306 #define CORO_JIT_TYPE "amd64-unix"
307 #elif __i386 && CORO_JIT_UNIXY
308 #define CORO_JIT_TYPE "x86-unix"
309 #endif
310 #endif
311#endif
312
313#if !defined(CORO_JIT_TYPE) || _POSIX_MEMORY_PROTECTION <= 0
314 #undef CORO_JIT
315#endif
316
317#if CORO_JIT
318 typedef void (*load_save_perl_slots_type)(perl_slots *);
319 static load_save_perl_slots_type load_perl_slots, save_perl_slots;
320#endif
321
295/** Coro::Select ************************************************************/ 322/** Coro::Select ************************************************************/
296 323
297static OP *(*coro_old_pp_sselect) (pTHX); 324static OP *(*coro_old_pp_sselect) (pTHX);
298static SV *coro_select_select; 325static SV *coro_select_select;
299 326
314 341
315/** time stuff **************************************************************/ 342/** time stuff **************************************************************/
316 343
317#ifdef HAS_GETTIMEOFDAY 344#ifdef HAS_GETTIMEOFDAY
318 345
319ECB_INLINE void 346ecb_inline void
320coro_u2time (pTHX_ UV ret[2]) 347coro_u2time (pTHX_ UV ret[2])
321{ 348{
322 struct timeval tv; 349 struct timeval tv;
323 gettimeofday (&tv, 0); 350 gettimeofday (&tv, 0);
324 351
325 ret [0] = tv.tv_sec; 352 ret [0] = tv.tv_sec;
326 ret [1] = tv.tv_usec; 353 ret [1] = tv.tv_usec;
327} 354}
328 355
329ECB_INLINE double 356ecb_inline double
330coro_nvtime () 357coro_nvtime (void)
331{ 358{
332 struct timeval tv; 359 struct timeval tv;
333 gettimeofday (&tv, 0); 360 gettimeofday (&tv, 0);
334 361
335 return tv.tv_sec + tv.tv_usec * 1e-6; 362 return tv.tv_sec + tv.tv_usec * 1e-6;
336} 363}
337 364
338ECB_INLINE void 365ecb_inline void
339time_init (pTHX) 366time_init (pTHX)
340{ 367{
341 nvtime = coro_nvtime; 368 nvtime = coro_nvtime;
342 u2time = coro_u2time; 369 u2time = coro_u2time;
343} 370}
344 371
345#else 372#else
346 373
347ECB_INLINE void 374ecb_inline void
348time_init (pTHX) 375time_init (pTHX)
349{ 376{
350 SV **svp; 377 SV **svp;
351 378
352 require_pv ("Time/HiRes.pm"); 379 require_pv ("Time/HiRes.pm");
353 380
354 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0); 381 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
355 382
356 if (!svp) croak ("Time::HiRes is required, but missing. Caught"); 383 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
357 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught"); 384 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught");
358 385
394 get_hv (name, create); 421 get_hv (name, create);
395#endif 422#endif
396 return get_hv (name, create); 423 return get_hv (name, create);
397} 424}
398 425
399ECB_INLINE void 426ecb_inline void
400coro_times_update () 427coro_times_update (void)
401{ 428{
402#ifdef coro_clock_gettime 429#ifdef coro_clock_gettime
403 struct timespec ts; 430 struct timespec ts;
404 431
405 ts.tv_sec = ts.tv_nsec = 0; 432 ts.tv_sec = ts.tv_nsec = 0;
417 time_real [0] = tv [0]; 444 time_real [0] = tv [0];
418 time_real [1] = tv [1] * 1000; 445 time_real [1] = tv [1] * 1000;
419#endif 446#endif
420} 447}
421 448
422ECB_INLINE void 449ecb_inline void
423coro_times_add (struct coro *c) 450coro_times_add (struct coro *c)
424{ 451{
425 c->t_real [1] += time_real [1]; 452 c->t_real [1] += time_real [1];
426 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; } 453 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
427 c->t_real [0] += time_real [0]; 454 c->t_real [0] += time_real [0];
429 c->t_cpu [1] += time_cpu [1]; 456 c->t_cpu [1] += time_cpu [1];
430 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; } 457 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
431 c->t_cpu [0] += time_cpu [0]; 458 c->t_cpu [0] += time_cpu [0];
432} 459}
433 460
434ECB_INLINE void 461ecb_inline void
435coro_times_sub (struct coro *c) 462coro_times_sub (struct coro *c)
436{ 463{
437 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; } 464 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; }
438 c->t_real [1] -= time_real [1]; 465 c->t_real [1] -= time_real [1];
439 c->t_real [0] -= time_real [0]; 466 c->t_real [0] -= time_real [0];
460 : 0) 487 : 0)
461 488
462#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv) 489#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
463#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state) 490#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
464 491
465ECB_INLINE MAGIC * 492ecb_inline MAGIC *
466SvSTATEhv_p (pTHX_ SV *coro) 493SvSTATEhv_p (pTHX_ SV *coro)
467{ 494{
468 MAGIC *mg; 495 MAGIC *mg;
469 496
470 if (ecb_expect_true ( 497 if (ecb_expect_true (
475 return mg; 502 return mg;
476 503
477 return 0; 504 return 0;
478} 505}
479 506
480ECB_INLINE struct coro * 507ecb_inline struct coro *
481SvSTATE_ (pTHX_ SV *coro) 508SvSTATE_ (pTHX_ SV *coro_sv)
482{ 509{
483 MAGIC *mg; 510 MAGIC *mg;
484 511
485 if (SvROK (coro)) 512 if (SvROK (coro_sv))
486 coro = SvRV (coro); 513 coro_sv = SvRV (coro_sv);
487 514
488 mg = SvSTATEhv_p (aTHX_ coro); 515 mg = SvSTATEhv_p (aTHX_ coro_sv);
489 if (!mg) 516 if (!mg)
490 croak ("Coro::State object required"); 517 croak ("Coro::State object required");
491 518
492 return (struct coro *)mg->mg_ptr; 519 return (struct coro *)mg->mg_ptr;
493} 520}
499#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 526#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
500 527
501/*****************************************************************************/ 528/*****************************************************************************/
502/* padlist management and caching */ 529/* padlist management and caching */
503 530
504ECB_INLINE AV * 531ecb_inline PADLIST *
505coro_derive_padlist (pTHX_ CV *cv) 532coro_derive_padlist (pTHX_ CV *cv)
506{ 533{
507 AV *padlist = CvPADLIST (cv); 534 PADLIST *padlist = CvPADLIST (cv);
508 AV *newpadlist, *newpad; 535 PADLIST *newpadlist;
536 PADNAMELIST *padnames;
537 PAD *newpad;
538 PADOFFSET off = PadlistMAX (padlist) + 1;
509 539
510 newpadlist = newAV (); 540#if NEWPADAPI
541
542 /* if we had the original CvDEPTH, we might be able to steal the CvDEPTH+1 entry instead */
543 /* 20131102194744.GA6705@schmorp.de, 20131102195825.2013.qmail@lists-nntp.develooper.com */
544 while (!PadlistARRAY (padlist)[off - 1])
545 --off;
546
547 Perl_pad_push (aTHX_ padlist, off);
548
549 newpad = PadlistARRAY (padlist)[off];
550 PadlistARRAY (padlist)[off] = 0;
551
552#else
553
554#if PERL_VERSION_ATLEAST (5,10,0)
555 Perl_pad_push (aTHX_ padlist, off);
556#else
557 Perl_pad_push (aTHX_ padlist, off, 1);
558#endif
559
560 newpad = PadlistARRAY (padlist)[off];
561 PadlistMAX (padlist) = off - 1;
562
563#endif
564
565 newPADLIST (newpadlist);
566#if !PERL_VERSION_ATLEAST(5,15,3)
567 /* Padlists are AvREAL as of 5.15.3. See perl bug #98092 and perl commit 7d953ba. */
511 AvREAL_off (newpadlist); 568 AvREAL_off (newpadlist);
512#if PERL_VERSION_ATLEAST (5,10,0)
513 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1);
514#else
515 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
516#endif 569#endif
517 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
518 --AvFILLp (padlist);
519 570
520 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0])); 571 /* Already extended to 2 elements by newPADLIST. */
521 av_store (newpadlist, 1, (SV *)newpad); 572 PadlistMAX (newpadlist) = 1;
573
574 padnames = PadlistNAMES (padlist);
575 ++PadnamelistREFCNT (padnames);
576 PadlistNAMES (newpadlist) = padnames;
577
578 PadlistARRAY (newpadlist)[1] = newpad;
522 579
523 return newpadlist; 580 return newpadlist;
524} 581}
525 582
526ECB_INLINE void 583ecb_inline void
527free_padlist (pTHX_ AV *padlist) 584free_padlist (pTHX_ PADLIST *padlist)
528{ 585{
529 /* may be during global destruction */ 586 /* may be during global destruction */
530 if (!IN_DESTRUCT) 587 if (!IN_DESTRUCT)
531 { 588 {
532 I32 i = AvFILLp (padlist); 589 I32 i = PadlistMAX (padlist);
533 590
534 while (i > 0) /* special-case index 0 */ 591 while (i > 0) /* special-case index 0 */
535 { 592 {
536 /* we try to be extra-careful here */ 593 /* we try to be extra-careful here */
537 AV *av = (AV *)AvARRAY (padlist)[i--]; 594 PAD *pad = PadlistARRAY (padlist)[i--];
538 I32 j = AvFILLp (av);
539 595
596 if (pad)
597 {
598 I32 j = PadMAX (pad);
599
540 while (j >= 0) 600 while (j >= 0)
541 SvREFCNT_dec (AvARRAY (av)[j--]); 601 SvREFCNT_dec (PadARRAY (pad)[j--]);
542 602
543 AvFILLp (av) = -1; 603 PadMAX (pad) = -1;
544 SvREFCNT_dec (av); 604 SvREFCNT_dec (pad);
605 }
545 } 606 }
546 607
547 SvREFCNT_dec (AvARRAY (padlist)[0]); 608 PadnamelistREFCNT_dec (PadlistNAMES (padlist));
548 609
610#if NEWPADAPI
611 Safefree (PadlistARRAY (padlist));
612 Safefree (padlist);
613#else
549 AvFILLp (padlist) = -1; 614 AvFILLp (padlist) = -1;
615 AvREAL_off (padlist);
550 SvREFCNT_dec ((SV*)padlist); 616 SvREFCNT_dec ((SV*)padlist);
617#endif
551 } 618 }
552} 619}
553 620
554static int 621static int
555coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 622coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
556{ 623{
557 AV *padlist; 624 PADLIST *padlist;
558 AV *av = (AV *)mg->mg_obj; 625 PADLIST **padlists = (PADLIST **)(mg->mg_ptr + sizeof(size_t));
626 size_t len = *(size_t *)mg->mg_ptr;
559 627
560 /* perl manages to free our internal AV and _then_ call us */ 628 /* perl manages to free our internal AV and _then_ call us */
561 if (IN_DESTRUCT) 629 if (IN_DESTRUCT)
562 return 0; 630 return 0;
563 631
564 /* casting is fun. */ 632 while (len--)
565 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
566 free_padlist (aTHX_ padlist); 633 free_padlist (aTHX_ padlists[len]);
567
568 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
569 634
570 return 0; 635 return 0;
571} 636}
572 637
573static MGVTBL coro_cv_vtbl = { 638static MGVTBL coro_cv_vtbl = {
574 0, 0, 0, 0, 639 0, 0, 0, 0,
575 coro_cv_free 640 coro_cv_free
576}; 641};
577 642
578/* the next two functions merely cache the padlists */ 643/* the next two functions merely cache the padlists */
579ECB_INLINE void 644ecb_inline void
580get_padlist (pTHX_ CV *cv) 645get_padlist (pTHX_ CV *cv)
581{ 646{
582 MAGIC *mg = CORO_MAGIC_cv (cv); 647 MAGIC *mg = CORO_MAGIC_cv (cv);
583 AV *av; 648 size_t *lenp;
584 649
585 if (ecb_expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 650 if (ecb_expect_true (mg && *(lenp = (size_t *)mg->mg_ptr)))
586 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 651 CvPADLIST (cv) = ((PADLIST **)(mg->mg_ptr + sizeof(size_t)))[--*lenp];
587 else 652 else
588 { 653 {
589#if CORO_PREFER_PERL_FUNCTIONS 654#if CORO_PREFER_PERL_FUNCTIONS
590 /* this is probably cleaner? but also slower! */ 655 /* this is probably cleaner? but also slower! */
591 /* in practise, it seems to be less stable */ 656 /* in practise, it seems to be less stable */
597 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 662 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
598#endif 663#endif
599 } 664 }
600} 665}
601 666
602ECB_INLINE void 667ecb_inline void
603put_padlist (pTHX_ CV *cv) 668put_padlist (pTHX_ CV *cv)
604{ 669{
605 MAGIC *mg = CORO_MAGIC_cv (cv); 670 MAGIC *mg = CORO_MAGIC_cv (cv);
606 AV *av;
607 671
608 if (ecb_expect_false (!mg)) 672 if (ecb_expect_false (!mg))
673 {
609 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 674 mg = sv_magicext ((SV *)cv, 0, CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
675 Newz (0, mg->mg_ptr ,sizeof (size_t) + sizeof (PADLIST *), char);
676 mg->mg_len = 1; /* so mg_free frees mg_ptr */
677 }
678 else
679 Renew (mg->mg_ptr,
680 sizeof(size_t) + (*(size_t *)mg->mg_ptr + 1) * sizeof(PADLIST *),
681 char);
610 682
611 av = (AV *)mg->mg_obj; 683 ((PADLIST **)(mg->mg_ptr + sizeof (size_t))) [(*(size_t *)mg->mg_ptr)++] = CvPADLIST (cv);
612
613 if (ecb_expect_false (AvFILLp (av) >= AvMAX (av)))
614 av_extend (av, AvFILLp (av) + 1);
615
616 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
617} 684}
618 685
619/** load & save, init *******************************************************/ 686/** load & save, init *******************************************************/
620 687
688ecb_inline void
689swap_sv (SV *a, SV *b)
690{
691 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
692 SV tmp;
693
694 /* swap sv_any */
695 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
696
697 /* swap sv_flags */
698 SvFLAGS (&tmp) = SvFLAGS (a);
699 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
700 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
701
702#if PERL_VERSION_ATLEAST (5,10,0)
703 /* perl 5.10 and later complicates this _quite_ a bit, but it also
704 * is much faster, so no quarrels here. alternatively, we could
705 * sv_upgrade to avoid this.
706 */
707 {
708 /* swap sv_u */
709 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
710
711 /* if SvANY points to the head, we need to adjust the pointers,
712 * as the pointer for a still points to b, and maybe vice versa.
713 */
714 #define svany_in_head(type) \
715 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
716
717 if (svany_in_head (SvTYPE (a)))
718 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
719
720 if (svany_in_head (SvTYPE (b)))
721 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
722 }
723#endif
724}
725
621/* swap sv heads, at least logically */ 726/* swap sv heads, at least logically */
622static void 727static void
623swap_svs (pTHX_ Coro__State c) 728swap_svs (pTHX_ Coro__State c)
624{ 729{
625 int i; 730 int i;
626 731
627 for (i = 0; i <= AvFILLp (c->swap_sv); ) 732 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
628 { 733 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
629 SV *a = AvARRAY (c->swap_sv)[i++];
630 SV *b = AvARRAY (c->swap_sv)[i++];
631
632 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
633 SV tmp;
634
635 /* swap sv_any */
636 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
637
638 /* swap sv_flags */
639 SvFLAGS (&tmp) = SvFLAGS (a);
640 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
641 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
642
643#if PERL_VERSION_ATLEAST (5,10,0)
644 /* perl 5.10 complicates this _quite_ a bit, but it also is
645 * much faster, so no quarrels here. alternatively, we could
646 * sv_upgrade to avoid this.
647 */
648 {
649 /* swap sv_u */
650 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
651
652 /* if SvANY points to the head, we need to adjust the pointers,
653 * as the pointer for a still points to b, and maybe vice versa.
654 */
655 #define svany_in_head(type) \
656 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
657
658 if (svany_in_head (SvTYPE (a)))
659 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
660
661 if (svany_in_head (SvTYPE (b)))
662 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
663 }
664#endif
665 }
666} 734}
667 735
668#define SWAP_SVS(coro) \ 736#define SWAP_SVS(coro) \
669 if (ecb_expect_false ((coro)->swap_sv)) \ 737 if (ecb_expect_false ((coro)->swap_sv)) \
670 swap_svs (aTHX_ (coro)) 738 swap_svs (aTHX_ (coro))
678 perl_slots *slot = c->slot; 746 perl_slots *slot = c->slot;
679 c->slot = 0; 747 c->slot = 0;
680 748
681 PL_mainstack = c->mainstack; 749 PL_mainstack = c->mainstack;
682 750
683 GvSV (PL_defgv) = slot->defsv; 751#if CORO_JIT
684 GvAV (PL_defgv) = slot->defav; 752 load_perl_slots (slot);
685 GvSV (PL_errgv) = slot->errsv; 753#else
686 GvSV (irsgv) = slot->irsgv;
687 GvHV (PL_hintgv) = slot->hinthv;
688
689 #define VAR(name,type) PL_ ## name = slot->name; 754 #define VARx(name,expr,type) expr = slot->name;
690 # include "state.h" 755 #include "state.h"
691 #undef VAR 756#endif
692 757
693 { 758 {
694 dSP; 759 dSP;
695 760
696 CV *cv; 761 CV *cv;
698 /* now do the ugly restore mess */ 763 /* now do the ugly restore mess */
699 while (ecb_expect_true (cv = (CV *)POPs)) 764 while (ecb_expect_true (cv = (CV *)POPs))
700 { 765 {
701 put_padlist (aTHX_ cv); /* mark this padlist as available */ 766 put_padlist (aTHX_ cv); /* mark this padlist as available */
702 CvDEPTH (cv) = PTR2IV (POPs); 767 CvDEPTH (cv) = PTR2IV (POPs);
703 CvPADLIST (cv) = (AV *)POPs; 768 CvPADLIST (cv) = (PADLIST *)POPs;
704 } 769 }
705 770
706 PUTBACK; 771 PUTBACK;
707 } 772 }
708 773
723 788
724 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 789 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
725 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 790 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
726 } 791 }
727 792
793 if (ecb_expect_false (c->on_enter_xs))
794 {
795 int i;
796
797 for (i = 0; i <= AvFILLp (c->on_enter_xs); i += 2)
798 ((coro_enterleave_hook)AvARRAY (c->on_enter_xs)[i]) (aTHX_ AvARRAY (c->on_enter_xs)[i + 1]);
799 }
800
728 SWAP_SVS (c); 801 SWAP_SVS (c);
729} 802}
730 803
731static void 804static void
732save_perl (pTHX_ Coro__State c) 805save_perl (pTHX_ Coro__State c)
733{ 806{
734 SWAP_SVS (c); 807 SWAP_SVS (c);
808
809 if (ecb_expect_false (c->on_leave_xs))
810 {
811 int i;
812
813 for (i = AvFILLp (c->on_leave_xs) - 1; i >= 0; i -= 2)
814 ((coro_enterleave_hook)AvARRAY (c->on_leave_xs)[i]) (aTHX_ AvARRAY (c->on_leave_xs)[i + 1]);
815 }
735 816
736 if (ecb_expect_false (c->on_leave)) 817 if (ecb_expect_false (c->on_leave))
737 { 818 {
738 int i; 819 int i;
739 820
798 879
799 PUTBACK; 880 PUTBACK;
800 } 881 }
801 882
802 /* allocate some space on the context stack for our purposes */ 883 /* allocate some space on the context stack for our purposes */
803 if (ecb_expect_false (cxstack_ix + SLOT_COUNT >= cxstack_max)) 884 if (ecb_expect_false (cxstack_ix + (int)SLOT_COUNT >= cxstack_max))
804 { 885 {
805 unsigned int i; 886 unsigned int i;
806 887
807 for (i = 0; i < SLOT_COUNT; ++i) 888 for (i = 0; i < SLOT_COUNT; ++i)
808 CXINC; 889 CXINC;
813 c->mainstack = PL_mainstack; 894 c->mainstack = PL_mainstack;
814 895
815 { 896 {
816 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 897 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
817 898
818 slot->defav = GvAV (PL_defgv); 899#if CORO_JIT
819 slot->defsv = DEFSV; 900 save_perl_slots (slot);
820 slot->errsv = ERRSV; 901#else
821 slot->irsgv = GvSV (irsgv);
822 slot->hinthv = GvHV (PL_hintgv);
823
824 #define VAR(name,type) slot->name = PL_ ## name; 902 #define VARx(name,expr,type) slot->name = expr;
825 # include "state.h" 903 #include "state.h"
826 #undef VAR 904#endif
827 } 905 }
828} 906}
829 907
830/* 908/*
831 * allocate various perl stacks. This is almost an exact copy 909 * allocate various perl stacks. This is almost an exact copy
862#endif 940#endif
863 941
864 New(54,PL_scopestack,8,I32); 942 New(54,PL_scopestack,8,I32);
865 PL_scopestack_ix = 0; 943 PL_scopestack_ix = 0;
866 PL_scopestack_max = 8; 944 PL_scopestack_max = 8;
945#if HAS_SCOPESTACK_NAME
946 New(54,PL_scopestack_name,8,const char*);
947#endif
867 948
868 New(54,PL_savestack,24,ANY); 949 New(54,PL_savestack,24,ANY);
869 PL_savestack_ix = 0; 950 PL_savestack_ix = 0;
870 PL_savestack_max = 24; 951 PL_savestack_max = 24;
871 952
899 } 980 }
900 981
901 Safefree (PL_tmps_stack); 982 Safefree (PL_tmps_stack);
902 Safefree (PL_markstack); 983 Safefree (PL_markstack);
903 Safefree (PL_scopestack); 984 Safefree (PL_scopestack);
985#if HAS_SCOPESTACK_NAME
986 Safefree (PL_scopestack_name);
987#endif
904 Safefree (PL_savestack); 988 Safefree (PL_savestack);
905#if !PERL_VERSION_ATLEAST (5,10,0) 989#if !PERL_VERSION_ATLEAST (5,10,0)
906 Safefree (PL_retstack); 990 Safefree (PL_retstack);
907#endif 991#endif
908} 992}
968 { 1052 {
969 SV **svp = 0; 1053 SV **svp = 0;
970 1054
971 if (strEQ (s, "__DIE__" )) svp = &PL_diehook; 1055 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
972 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 1056 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
973 1057
974 if (svp) 1058 if (svp)
975 { 1059 {
976 sv_setsv (sv, *svp ? *svp : &PL_sv_undef); 1060 SV *ssv;
1061
1062 if (!*svp)
1063 ssv = &PL_sv_undef;
1064 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */
1065 ssv = sv_2mortal (newRV_inc (*svp));
1066 else
1067 ssv = *svp;
1068
1069 sv_setsv (sv, ssv);
977 return 0; 1070 return 0;
978 } 1071 }
979 } 1072 }
980 1073
981 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 1074 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
1075 PL_hints = 0; 1168 PL_hints = 0;
1076 1169
1077 /* recreate the die/warn hooks */ 1170 /* recreate the die/warn hooks */
1078 PL_diehook = SvREFCNT_inc (rv_diehook); 1171 PL_diehook = SvREFCNT_inc (rv_diehook);
1079 PL_warnhook = SvREFCNT_inc (rv_warnhook); 1172 PL_warnhook = SvREFCNT_inc (rv_warnhook);
1080 1173
1081 GvSV (PL_defgv) = newSV (0); 1174 GvSV (PL_defgv) = newSV (0);
1082 GvAV (PL_defgv) = coro->args; coro->args = 0; 1175 GvAV (PL_defgv) = coro->args; coro->args = 0;
1083 GvSV (PL_errgv) = newSV (0); 1176 GvSV (PL_errgv) = newSV (0);
1084 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1177 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
1085 GvHV (PL_hintgv) = 0; 1178 GvHV (PL_hintgv) = newHV ();
1179#if PERL_VERSION_ATLEAST (5,10,0)
1180 hv_magic (GvHV (PL_hintgv), 0, PERL_MAGIC_hints);
1181#endif
1086 PL_rs = newSVsv (GvSV (irsgv)); 1182 PL_rs = newSVsv (GvSV (irsgv));
1087 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1183 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
1088 1184
1089 { 1185 {
1090 dSP; 1186 dSP;
1173 /* restore swapped sv's */ 1269 /* restore swapped sv's */
1174 SWAP_SVS (coro); 1270 SWAP_SVS (coro);
1175 1271
1176 coro_destruct_stacks (aTHX); 1272 coro_destruct_stacks (aTHX);
1177 1273
1178 // now save some sv's to be free'd later 1274 /* now save some sv's to be free'd later */
1179 svf [0] = GvSV (PL_defgv); 1275 svf [0] = GvSV (PL_defgv);
1180 svf [1] = (SV *)GvAV (PL_defgv); 1276 svf [1] = (SV *)GvAV (PL_defgv);
1181 svf [2] = GvSV (PL_errgv); 1277 svf [2] = GvSV (PL_errgv);
1182 svf [3] = (SV *)PL_defoutgv; 1278 svf [3] = (SV *)PL_defoutgv;
1183 svf [4] = PL_rs; 1279 svf [4] = PL_rs;
1200 1296
1201 SvREFCNT_dec (coro->saved_deffh); 1297 SvREFCNT_dec (coro->saved_deffh);
1202 SvREFCNT_dec (coro->rouse_cb); 1298 SvREFCNT_dec (coro->rouse_cb);
1203 SvREFCNT_dec (coro->invoke_cb); 1299 SvREFCNT_dec (coro->invoke_cb);
1204 SvREFCNT_dec (coro->invoke_av); 1300 SvREFCNT_dec (coro->invoke_av);
1301 SvREFCNT_dec (coro->on_enter_xs);
1302 SvREFCNT_dec (coro->on_leave_xs);
1205 } 1303 }
1206} 1304}
1207 1305
1208ECB_INLINE void 1306ecb_inline void
1209free_coro_mortal (pTHX) 1307free_coro_mortal (pTHX)
1210{ 1308{
1211 if (ecb_expect_true (coro_mortal)) 1309 if (ecb_expect_true (coro_mortal))
1212 { 1310 {
1213 SvREFCNT_dec ((SV *)coro_mortal); 1311 SvREFCNT_dec ((SV *)coro_mortal);
1272 1370
1273 if (PL_curcop != &PL_compiling) 1371 if (PL_curcop != &PL_compiling)
1274 { 1372 {
1275 SV **cb; 1373 SV **cb;
1276 1374
1277 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB) 1375 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB && cxstack_ix >= 0)
1278 { 1376 {
1279 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1377 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1280 1378
1281 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1379 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1282 { 1380 {
1372 slf_frame.prepare = slf_prepare_set_stacklevel; 1470 slf_frame.prepare = slf_prepare_set_stacklevel;
1373 slf_frame.check = slf_check_set_stacklevel; 1471 slf_frame.check = slf_check_set_stacklevel;
1374} 1472}
1375 1473
1376/* the tail of transfer: execute stuff we can only do after a transfer */ 1474/* the tail of transfer: execute stuff we can only do after a transfer */
1377ECB_INLINE void 1475ecb_inline void
1378transfer_tail (pTHX) 1476transfer_tail (pTHX)
1379{ 1477{
1380 free_coro_mortal (aTHX); 1478 free_coro_mortal (aTHX);
1479}
1480
1481/* try to exit the same way perl's main function would do */
1482/* we do not bother resetting the environment or other things *7
1483/* that are not, uhm, essential */
1484/* this obviously also doesn't work when perl is embedded */
1485static void ecb_noinline ecb_cold
1486perlish_exit (pTHX)
1487{
1488 int exitstatus = perl_destruct (PL_curinterp);
1489 perl_free (PL_curinterp);
1490 exit (exitstatus);
1381} 1491}
1382 1492
1383/* 1493/*
1384 * this is a _very_ stripped down perl interpreter ;) 1494 * this is a _very_ stripped down perl interpreter ;)
1385 */ 1495 */
1414 */ 1524 */
1415 1525
1416 /* 1526 /*
1417 * If perl-run returns we assume exit() was being called or the coro 1527 * If perl-run returns we assume exit() was being called or the coro
1418 * fell off the end, which seems to be the only valid (non-bug) 1528 * fell off the end, which seems to be the only valid (non-bug)
1419 * reason for perl_run to return. We try to exit by jumping to the 1529 * reason for perl_run to return. We try to mimic whatever perl is normally
1420 * bootstrap-time "top" top_env, as we cannot restore the "main" 1530 * doing in that case. YMMV.
1421 * coroutine as Coro has no such concept.
1422 * This actually isn't valid with the pthread backend, but OSes requiring
1423 * that backend are too broken to do it in a standards-compliant way.
1424 */ 1531 */
1425 PL_top_env = main_top_env; 1532 perlish_exit (aTHX);
1426 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1427 } 1533 }
1428} 1534}
1429 1535
1430static coro_cctx * 1536static coro_cctx *
1431cctx_new () 1537cctx_new (void)
1432{ 1538{
1433 coro_cctx *cctx; 1539 coro_cctx *cctx;
1434 1540
1435 ++cctx_count; 1541 ++cctx_count;
1436 New (0, cctx, 1, coro_cctx); 1542 New (0, cctx, 1, coro_cctx);
1442 return cctx; 1548 return cctx;
1443} 1549}
1444 1550
1445/* create a new cctx only suitable as source */ 1551/* create a new cctx only suitable as source */
1446static coro_cctx * 1552static coro_cctx *
1447cctx_new_empty () 1553cctx_new_empty (void)
1448{ 1554{
1449 coro_cctx *cctx = cctx_new (); 1555 coro_cctx *cctx = cctx_new ();
1450 1556
1451 cctx->sptr = 0; 1557 cctx->stack.sptr = 0;
1452 coro_create (&cctx->cctx, 0, 0, 0, 0); 1558 coro_create (&cctx->cctx, 0, 0, 0, 0);
1453 1559
1454 return cctx; 1560 return cctx;
1455} 1561}
1456 1562
1457/* create a new cctx suitable as destination/running a perl interpreter */ 1563/* create a new cctx suitable as destination/running a perl interpreter */
1458static coro_cctx * 1564static coro_cctx *
1459cctx_new_run () 1565cctx_new_run (void)
1460{ 1566{
1461 coro_cctx *cctx = cctx_new (); 1567 coro_cctx *cctx = cctx_new ();
1462 void *stack_start;
1463 size_t stack_size;
1464 1568
1465#if HAVE_MMAP 1569 if (!coro_stack_alloc (&cctx->stack, cctx_stacksize))
1466 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1467 /* mmap supposedly does allocate-on-write for us */
1468 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
1469
1470 if (cctx->sptr != (void *)-1)
1471 {
1472 #if CORO_STACKGUARD
1473 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
1474 #endif
1475 stack_start = (char *)cctx->sptr + CORO_STACKGUARD * PAGESIZE;
1476 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
1477 cctx->flags |= CC_MAPPED;
1478 } 1570 {
1479 else
1480#endif
1481 {
1482 cctx->ssize = cctx_stacksize * (long)sizeof (long);
1483 New (0, cctx->sptr, cctx_stacksize, long);
1484
1485 if (!cctx->sptr)
1486 {
1487 perror ("FATAL: unable to allocate stack for coroutine, exiting."); 1571 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1488 _exit (EXIT_FAILURE); 1572 _exit (EXIT_FAILURE);
1489 }
1490
1491 stack_start = cctx->sptr;
1492 stack_size = cctx->ssize;
1493 } 1573 }
1494 1574
1495 #if CORO_USE_VALGRIND
1496 cctx->valgrind_id = VALGRIND_STACK_REGISTER ((char *)stack_start, (char *)stack_start + stack_size);
1497 #endif
1498
1499 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size); 1575 coro_create (&cctx->cctx, cctx_run, (void *)cctx, cctx->stack.sptr, cctx->stack.ssze);
1500 1576
1501 return cctx; 1577 return cctx;
1502} 1578}
1503 1579
1504static void 1580static void
1510 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current)); 1586 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1511 1587
1512 --cctx_count; 1588 --cctx_count;
1513 coro_destroy (&cctx->cctx); 1589 coro_destroy (&cctx->cctx);
1514 1590
1515 /* coro_transfer creates new, empty cctx's */ 1591 coro_stack_free (&cctx->stack);
1516 if (cctx->sptr)
1517 {
1518 #if CORO_USE_VALGRIND
1519 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
1520 #endif
1521
1522#if HAVE_MMAP
1523 if (cctx->flags & CC_MAPPED)
1524 munmap (cctx->sptr, cctx->ssize);
1525 else
1526#endif
1527 Safefree (cctx->sptr);
1528 }
1529 1592
1530 Safefree (cctx); 1593 Safefree (cctx);
1531} 1594}
1532 1595
1533/* wether this cctx should be destructed */ 1596/* wether this cctx should be destructed */
1552} 1615}
1553 1616
1554static void 1617static void
1555cctx_put (coro_cctx *cctx) 1618cctx_put (coro_cctx *cctx)
1556{ 1619{
1557 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1620 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->stack.sptr));
1558 1621
1559 /* free another cctx if overlimit */ 1622 /* free another cctx if overlimit */
1560 if (ecb_expect_false (cctx_idle >= cctx_max_idle)) 1623 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1561 { 1624 {
1562 coro_cctx *first = cctx_first; 1625 coro_cctx *first = cctx_first;
1688 return; 1751 return;
1689 1752
1690 slf_destroy (aTHX_ coro); 1753 slf_destroy (aTHX_ coro);
1691 1754
1692 coro->flags |= CF_ZOMBIE; 1755 coro->flags |= CF_ZOMBIE;
1693 1756
1694 if (coro->flags & CF_READY) 1757 if (coro->flags & CF_READY)
1695 { 1758 {
1696 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1759 /* reduce nready, as destroying a ready coro effectively unreadies it */
1697 /* alternative: look through all ready queues and remove the coro */ 1760 /* alternative: look through all ready queues and remove the coro */
1698 --coro_nready; 1761 --coro_nready;
1775 TRANSFER (ta, 1); 1838 TRANSFER (ta, 1);
1776} 1839}
1777 1840
1778/** Coro ********************************************************************/ 1841/** Coro ********************************************************************/
1779 1842
1780ECB_INLINE void 1843ecb_inline void
1781coro_enq (pTHX_ struct coro *coro) 1844coro_enq (pTHX_ struct coro *coro)
1782{ 1845{
1783 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN]; 1846 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1784 1847
1785 SvREFCNT_inc_NN (coro->hv); 1848 SvREFCNT_inc_NN (coro->hv);
1787 coro->next_ready = 0; 1850 coro->next_ready = 0;
1788 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro; 1851 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1789 ready [1] = coro; 1852 ready [1] = coro;
1790} 1853}
1791 1854
1792ECB_INLINE struct coro * 1855ecb_inline struct coro *
1793coro_deq (pTHX) 1856coro_deq (pTHX)
1794{ 1857{
1795 int prio; 1858 int prio;
1796 1859
1797 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; ) 1860 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
1850{ 1913{
1851 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1914 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1852} 1915}
1853 1916
1854/* expects to own a reference to next->hv */ 1917/* expects to own a reference to next->hv */
1855ECB_INLINE void 1918ecb_inline void
1856prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1919prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1857{ 1920{
1858 SV *prev_sv = SvRV (coro_current); 1921 SV *prev_sv = SvRV (coro_current);
1859 1922
1860 ta->prev = SvSTATE_hv (prev_sv); 1923 ta->prev = SvSTATE_hv (prev_sv);
1894 /* nothing to schedule: call the idle handler */ 1957 /* nothing to schedule: call the idle handler */
1895 if (SvROK (sv_idle) 1958 if (SvROK (sv_idle)
1896 && SvOBJECT (SvRV (sv_idle))) 1959 && SvOBJECT (SvRV (sv_idle)))
1897 { 1960 {
1898 if (SvRV (sv_idle) == SvRV (coro_current)) 1961 if (SvRV (sv_idle) == SvRV (coro_current))
1962 {
1963 require_pv ("Carp");
1964
1965 {
1966 dSP;
1967
1968 ENTER;
1969 SAVETMPS;
1970
1971 PUSHMARK (SP);
1899 croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught"); 1972 XPUSHs (sv_2mortal (newSVpv ("FATAL: $Coro::idle blocked itself - did you try to block inside an event loop callback? Caught", 0)));
1973 PUTBACK;
1974 call_pv ("Carp::confess", G_VOID | G_DISCARD);
1975
1976 FREETMPS;
1977 LEAVE;
1978 }
1979 }
1900 1980
1901 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 1981 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1902 api_ready (aTHX_ SvRV (sv_idle)); 1982 api_ready (aTHX_ SvRV (sv_idle));
1903 --coro_nready; 1983 --coro_nready;
1904 } 1984 }
1919 } 1999 }
1920 } 2000 }
1921 } 2001 }
1922} 2002}
1923 2003
1924ECB_INLINE void 2004ecb_inline void
1925prepare_cede (pTHX_ struct coro_transfer_args *ta) 2005prepare_cede (pTHX_ struct coro_transfer_args *ta)
1926{ 2006{
1927 api_ready (aTHX_ coro_current); 2007 api_ready (aTHX_ coro_current);
1928 prepare_schedule (aTHX_ ta); 2008 prepare_schedule (aTHX_ ta);
1929} 2009}
1930 2010
1931ECB_INLINE void 2011ecb_inline void
1932prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 2012prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1933{ 2013{
1934 SV *prev = SvRV (coro_current); 2014 SV *prev = SvRV (coro_current);
1935 2015
1936 if (coro_nready) 2016 if (coro_nready)
2101{ 2181{
2102 AV *od = coro->on_destroy; 2182 AV *od = coro->on_destroy;
2103 2183
2104 if (!od) 2184 if (!od)
2105 return; 2185 return;
2186
2187 coro->on_destroy = 0;
2188 sv_2mortal ((SV *)od);
2106 2189
2107 while (AvFILLp (od) >= 0) 2190 while (AvFILLp (od) >= 0)
2108 { 2191 {
2109 SV *cb = sv_2mortal (av_pop (od)); 2192 SV *cb = sv_2mortal (av_pop (od));
2110 2193
2131 2214
2132static void 2215static void
2133coro_set_status (pTHX_ struct coro *coro, SV **arg, int items) 2216coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
2134{ 2217{
2135 AV *av; 2218 AV *av;
2136 2219
2137 if (coro->status) 2220 if (coro->status)
2138 { 2221 {
2139 av = coro->status; 2222 av = coro->status;
2140 av_clear (av); 2223 av_clear (av);
2141 } 2224 }
2188 2271
2189 coro = SvSTATE (arg [0]); 2272 coro = SvSTATE (arg [0]);
2190 coro_hv = coro->hv; 2273 coro_hv = coro->hv;
2191 2274
2192 coro_set_status (aTHX_ coro, arg + 1, items - 1); 2275 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2193 2276
2194 if (ecb_expect_false (coro->flags & CF_NOCANCEL)) 2277 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2195 { 2278 {
2196 /* coro currently busy cancelling something, so just notify it */ 2279 /* coro currently busy cancelling something, so just notify it */
2197 coro->slf_frame.data = (void *)coro; 2280 coro->slf_frame.data = (void *)coro;
2198 2281
2205 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv); 2288 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2206 } 2289 }
2207 else 2290 else
2208 { 2291 {
2209 struct coro *self = SvSTATE_current; 2292 struct coro *self = SvSTATE_current;
2293
2294 if (!self)
2295 croak ("Coro::cancel called outside of thread content,");
2210 2296
2211 /* otherwise we cancel directly, purely for speed reasons 2297 /* otherwise we cancel directly, purely for speed reasons
2212 * unfortunately, this requires some magic trickery, as 2298 * unfortunately, this requires some magic trickery, as
2213 * somebody else could cancel us, so we have to fight the cancellation. 2299 * somebody else could cancel us, so we have to fight the cancellation.
2214 * this is ugly, and hopefully fully worth the extra speed. 2300 * this is ugly, and hopefully fully worth the extra speed.
2377 2463
2378static int 2464static int
2379slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2465slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
2380{ 2466{
2381 SV *data = (SV *)frame->data; 2467 SV *data = (SV *)frame->data;
2382 2468
2383 if (CORO_THROW) 2469 if (CORO_THROW)
2384 return 0; 2470 return 0;
2385 2471
2386 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2472 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2387 return 1; 2473 return 1;
2423 cb = sv_2mortal (coro->rouse_cb); 2509 cb = sv_2mortal (coro->rouse_cb);
2424 coro->rouse_cb = 0; 2510 coro->rouse_cb = 0;
2425 } 2511 }
2426 2512
2427 if (!SvROK (cb) 2513 if (!SvROK (cb)
2428 || SvTYPE (SvRV (cb)) != SVt_PVCV 2514 || SvTYPE (SvRV (cb)) != SVt_PVCV
2429 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2515 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2430 croak ("Coro::rouse_wait called with illegal callback argument,"); 2516 croak ("Coro::rouse_wait called with illegal callback argument,");
2431 2517
2432 { 2518 {
2433 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */ 2519 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
2556 2642
2557/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */ 2643/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2558static void 2644static void
2559slf_destroy (pTHX_ struct coro *coro) 2645slf_destroy (pTHX_ struct coro *coro)
2560{ 2646{
2561 /* this callback is reserved for slf functions needing to do cleanup */ 2647 struct CoroSLF frame = coro->slf_frame;
2562 if (coro->slf_frame.destroy && coro->slf_frame.prepare && !PL_dirty)
2563 coro->slf_frame.destroy (aTHX_ &coro->slf_frame);
2564 2648
2565 /* 2649 /*
2566 * The on_destroy above most likely is from an SLF call. 2650 * The on_destroy below most likely is from an SLF call.
2567 * Since by definition the SLF call will not finish when we destroy 2651 * Since by definition the SLF call will not finish when we destroy
2568 * the coro, we will have to force-finish it here, otherwise 2652 * the coro, we will have to force-finish it here, otherwise
2569 * cleanup functions cannot call SLF functions. 2653 * cleanup functions cannot call SLF functions.
2570 */ 2654 */
2571 coro->slf_frame.prepare = 0; 2655 coro->slf_frame.prepare = 0;
2656
2657 /* this callback is reserved for slf functions needing to do cleanup */
2658 if (frame.destroy && frame.prepare && !PL_dirty)
2659 frame.destroy (aTHX_ &frame);
2572} 2660}
2573 2661
2574/* 2662/*
2575 * these not obviously related functions are all rolled into one 2663 * these not obviously related functions are all rolled into one
2576 * function to increase chances that they all will call transfer with the same 2664 * function to increase chances that they all will call transfer with the same
2759static void 2847static void
2760coro_pop_on_leave (pTHX_ void *coro) 2848coro_pop_on_leave (pTHX_ void *coro)
2761{ 2849{
2762 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave); 2850 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2763 on_enterleave_call (aTHX_ sv_2mortal (cb)); 2851 on_enterleave_call (aTHX_ sv_2mortal (cb));
2852}
2853
2854static void
2855enterleave_hook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, void *arg)
2856{
2857 if (!hook)
2858 return;
2859
2860 if (!*avp)
2861 {
2862 *avp = newAV ();
2863 AvREAL_off (*avp);
2864 }
2865
2866 av_push (*avp, (SV *)hook);
2867 av_push (*avp, (SV *)arg);
2868}
2869
2870static void
2871enterleave_unhook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, int execute)
2872{
2873 AV *av = *avp;
2874 int i;
2875
2876 if (!av)
2877 return;
2878
2879 for (i = AvFILLp (av) - 1; i >= 0; i -= 2)
2880 if (AvARRAY (av)[i] == (SV *)hook)
2881 {
2882 if (execute)
2883 hook (aTHX_ (void *)AvARRAY (av)[i + 1]);
2884
2885 memmove (AvARRAY (av) + i, AvARRAY (av) + i + 2, AvFILLp (av) - i - 1);
2886 av_pop (av);
2887 av_pop (av);
2888 break;
2889 }
2890
2891 if (AvFILLp (av) >= 0)
2892 {
2893 *avp = 0;
2894 SvREFCNT_dec_NN (av);
2895 }
2896}
2897
2898static void
2899api_enterleave_hook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2900{
2901 struct coro *coro = SvSTATE (coro_sv);
2902
2903 if (SvSTATE_current == coro)
2904 if (enter)
2905 enter (aTHX_ enter_arg);
2906
2907 enterleave_hook_xs (aTHX_ coro, &coro->on_enter_xs, enter, enter_arg);
2908 enterleave_hook_xs (aTHX_ coro, &coro->on_leave_xs, leave, leave_arg);
2909}
2910
2911static void
2912api_enterleave_unhook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, coro_enterleave_hook leave)
2913{
2914 struct coro *coro = SvSTATE (coro_sv);
2915
2916 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2917 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, SvSTATE_current == coro);
2918}
2919
2920static void
2921savedestructor_unhook_enter (pTHX_ coro_enterleave_hook enter)
2922{
2923 struct coro *coro = SvSTATE_current;
2924
2925 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2926}
2927
2928static void
2929savedestructor_unhook_leave (pTHX_ coro_enterleave_hook leave)
2930{
2931 struct coro *coro = SvSTATE_current;
2932
2933 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, 1);
2934}
2935
2936static void
2937api_enterleave_scope_hook (pTHX_ coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2938{
2939 api_enterleave_hook (aTHX_ coro_current, enter, enter_arg, leave, leave_arg);
2940
2941 /* this ought to be much cheaper than malloc + a single destructor call */
2942 if (enter) SAVEDESTRUCTOR_X (savedestructor_unhook_enter, enter);
2943 if (leave) SAVEDESTRUCTOR_X (savedestructor_unhook_leave, leave);
2764} 2944}
2765 2945
2766/*****************************************************************************/ 2946/*****************************************************************************/
2767/* PerlIO::cede */ 2947/* PerlIO::cede */
2768 2948
2898 XPUSHs (sv_2mortal (newRV_inc ((SV *)av))); 3078 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2899 PUTBACK; 3079 PUTBACK;
2900 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR); 3080 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2901 } 3081 }
2902 3082
2903 SvREFCNT_dec (cb); 3083 SvREFCNT_dec_NN (cb);
2904 } 3084 }
2905} 3085}
2906 3086
2907static void 3087static void
2908coro_semaphore_destroy (pTHX_ struct CoroSLF *frame) 3088coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2916{ 3096{
2917 AV *av = (AV *)frame->data; 3097 AV *av = (AV *)frame->data;
2918 SV *count_sv = AvARRAY (av)[0]; 3098 SV *count_sv = AvARRAY (av)[0];
2919 SV *coro_hv = SvRV (coro_current); 3099 SV *coro_hv = SvRV (coro_current);
2920 3100
3101 frame->destroy = 0;
3102
2921 /* if we are about to throw, don't actually acquire the lock, just throw */ 3103 /* if we are about to throw, don't actually acquire the lock, just throw */
2922 if (CORO_THROW) 3104 if (ecb_expect_false (CORO_THROW))
3105 {
3106 /* we still might be responsible for the semaphore, so wake up others */
3107 coro_semaphore_adjust (aTHX_ av, 0);
3108
2923 return 0; 3109 return 0;
3110 }
2924 else if (SvIVX (count_sv) > 0) 3111 else if (SvIVX (count_sv) > 0)
2925 { 3112 {
2926 frame->destroy = 0;
2927
2928 if (acquire) 3113 if (acquire)
2929 SvIVX (count_sv) = SvIVX (count_sv) - 1; 3114 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2930 else 3115 else
2931 coro_semaphore_adjust (aTHX_ av, 0); 3116 coro_semaphore_adjust (aTHX_ av, 0);
2932 3117
2936 { 3121 {
2937 int i; 3122 int i;
2938 /* if we were woken up but can't down, we look through the whole */ 3123 /* if we were woken up but can't down, we look through the whole */
2939 /* waiters list and only add us if we aren't in there already */ 3124 /* waiters list and only add us if we aren't in there already */
2940 /* this avoids some degenerate memory usage cases */ 3125 /* this avoids some degenerate memory usage cases */
2941 for (i = AvFILLp (av); i > 0; --i) // i > 0 is not an off-by-one bug 3126 for (i = AvFILLp (av); i > 0; --i) /* i > 0 is not an off-by-one bug */
2942 if (AvARRAY (av)[i] == coro_hv) 3127 if (AvARRAY (av)[i] == coro_hv)
2943 return 1; 3128 return 1;
2944 3129
2945 av_push (av, SvREFCNT_inc (coro_hv)); 3130 av_push (av, SvREFCNT_inc (coro_hv));
2946 return 1; 3131 return 1;
3043 { 3228 {
3044 api_ready (aTHX_ cb); 3229 api_ready (aTHX_ cb);
3045 sv_setiv (cb, 0); /* signal waiter */ 3230 sv_setiv (cb, 0); /* signal waiter */
3046 } 3231 }
3047 3232
3048 SvREFCNT_dec (cb); 3233 SvREFCNT_dec_NN (cb);
3049 3234
3050 --count; 3235 --count;
3051 } 3236 }
3052} 3237}
3053 3238
3138 } 3323 }
3139 3324
3140 av_push (state, data_sv); 3325 av_push (state, data_sv);
3141 3326
3142 api_ready (aTHX_ coro); 3327 api_ready (aTHX_ coro);
3143 SvREFCNT_dec (coro); 3328 SvREFCNT_dec_NN (coro);
3144 SvREFCNT_dec ((AV *)state); 3329 SvREFCNT_dec_NN ((AV *)state);
3145} 3330}
3146 3331
3147static int 3332static int
3148slf_check_aio_req (pTHX_ struct CoroSLF *frame) 3333slf_check_aio_req (pTHX_ struct CoroSLF *frame)
3149{ 3334{
3154 /* it quickly returns */ 3339 /* it quickly returns */
3155 if (CORO_THROW) 3340 if (CORO_THROW)
3156 return 0; 3341 return 0;
3157 3342
3158 /* one element that is an RV? repeat! */ 3343 /* one element that is an RV? repeat! */
3159 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0])) 3344 if (AvFILLp (state) == 0 && SvTYPE (AvARRAY (state)[0]) != SVt_PV)
3160 return 1; 3345 return 1;
3161 3346
3162 /* restore status */ 3347 /* restore status */
3163 { 3348 {
3164 SV *data_sv = av_pop (state); 3349 SV *data_sv = av_pop (state);
3167 errno = data->errorno; 3352 errno = data->errorno;
3168 PL_laststype = data->laststype; 3353 PL_laststype = data->laststype;
3169 PL_laststatval = data->laststatval; 3354 PL_laststatval = data->laststatval;
3170 PL_statcache = data->statcache; 3355 PL_statcache = data->statcache;
3171 3356
3172 SvREFCNT_dec (data_sv); 3357 SvREFCNT_dec_NN (data_sv);
3173 } 3358 }
3174 3359
3175 /* push result values */ 3360 /* push result values */
3176 { 3361 {
3177 dSP; 3362 dSP;
3323 3508
3324#ifndef __cplusplus 3509#ifndef __cplusplus
3325ecb_cold XS(boot_Coro__State); 3510ecb_cold XS(boot_Coro__State);
3326#endif 3511#endif
3327 3512
3513#if CORO_JIT
3514
3515static void ecb_noinline ecb_cold
3516pushav_4uv (pTHX_ UV a, UV b, UV c, UV d)
3517{
3518 dSP;
3519 AV *av = newAV ();
3520
3521 av_store (av, 3, newSVuv (d));
3522 av_store (av, 2, newSVuv (c));
3523 av_store (av, 1, newSVuv (b));
3524 av_store (av, 0, newSVuv (a));
3525
3526 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
3527
3528 PUTBACK;
3529}
3530
3531static void ecb_noinline ecb_cold
3532jit_init (pTHX)
3533{
3534 dSP;
3535 SV *load, *save;
3536 char *map_base;
3537 char *load_ptr, *save_ptr;
3538 STRLEN load_len, save_len, map_len;
3539 int count;
3540
3541 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3542
3543 PUSHMARK (SP);
3544 #define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type));
3545 #include "state.h"
3546 count = call_pv ("Coro::State::_jit", G_ARRAY);
3547 SPAGAIN;
3548
3549 save = POPs; save_ptr = SvPVbyte (save, save_len);
3550 load = POPs; load_ptr = SvPVbyte (load, load_len);
3551
3552 map_len = load_len + save_len + 16;
3553
3554 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3555
3556 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3557
3558 load_perl_slots = (load_save_perl_slots_type)map_base;
3559 memcpy (map_base, load_ptr, load_len);
3560
3561 map_base += (load_len + 15) & ~15;
3562
3563 save_perl_slots = (load_save_perl_slots_type)map_base;
3564 memcpy (map_base, save_ptr, save_len);
3565
3566 /* we are good citizens and try to make the page read-only, so the evil evil */
3567 /* hackers might have it a bit more difficult */
3568 mprotect (map_base, map_len, PROT_READ | PROT_EXEC);
3569
3570 PUTBACK;
3571 eval_pv ("undef &Coro::State::_jit", 1);
3572}
3573
3574#endif
3575
3328MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3576MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
3329 3577
3330PROTOTYPES: DISABLE 3578PROTOTYPES: DISABLE
3331 3579
3332BOOT: 3580BOOT:
3333{ 3581{
3582#define VARx(name,expr,type) if (sizeof (type) < sizeof (expr)) croak ("FATAL: Coro thread context slot '" # name "' too small for this version of perl.");
3583#include "state.h"
3334#ifdef USE_ITHREADS 3584#ifdef USE_ITHREADS
3335# if CORO_PTHREAD 3585# if CORO_PTHREAD
3336 coro_thx = PERL_GET_CONTEXT; 3586 coro_thx = PERL_GET_CONTEXT;
3337# endif 3587# endif
3338#endif 3588#endif
3339 BOOT_PAGESIZE; 3589 /* perl defines these to check for existance first, but why it doesn't */
3590 /* just create them one at init time is not clear to me, except for */
3591 /* programs trying to delete them, but... */
3592 /* anyway, we declare this as invalid and make sure they are initialised here */
3593 DEFSV;
3594 ERRSV;
3340 3595
3341 cctx_current = cctx_new_empty (); 3596 cctx_current = cctx_new_empty ();
3342 3597
3343 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3598 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
3344 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3599 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
3387 coroapi.prepare_cede_notself = prepare_cede_notself; 3642 coroapi.prepare_cede_notself = prepare_cede_notself;
3388 3643
3389 time_init (aTHX); 3644 time_init (aTHX);
3390 3645
3391 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL)); 3646 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3647#if CORO_JIT
3648 PUTBACK;
3649 jit_init (aTHX);
3650 SPAGAIN;
3651#endif
3392} 3652}
3393 3653
3394SV * 3654SV *
3395new (SV *klass, ...) 3655new (SV *klass, ...)
3396 ALIAS: 3656 ALIAS:
3403void 3663void
3404transfer (...) 3664transfer (...)
3405 PROTOTYPE: $$ 3665 PROTOTYPE: $$
3406 CODE: 3666 CODE:
3407 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3667 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3408
3409void
3410_exit (int code)
3411 PROTOTYPE: $
3412 CODE:
3413 _exit (code);
3414 3668
3415SV * 3669SV *
3416clone (Coro::State coro) 3670clone (Coro::State coro)
3417 CODE: 3671 CODE:
3418{ 3672{
3473void 3727void
3474list () 3728list ()
3475 PROTOTYPE: 3729 PROTOTYPE:
3476 PPCODE: 3730 PPCODE:
3477{ 3731{
3478 struct coro *coro; 3732 struct coro *coro;
3479 for (coro = coro_first; coro; coro = coro->next) 3733 for (coro = coro_first; coro; coro = coro->next)
3480 if (coro->hv) 3734 if (coro->hv)
3481 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 3735 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
3482} 3736}
3483 3737
3547 RETVAL = boolSV (coro->flags & ix); 3801 RETVAL = boolSV (coro->flags & ix);
3548 OUTPUT: 3802 OUTPUT:
3549 RETVAL 3803 RETVAL
3550 3804
3551void 3805void
3552throw (Coro::State self, SV *exception = &PL_sv_undef) 3806throw (SV *self, SV *exception = &PL_sv_undef)
3553 PROTOTYPE: $;$ 3807 PROTOTYPE: $;$
3554 CODE: 3808 CODE:
3555{ 3809{
3810 struct coro *coro = SvSTATE (self);
3556 struct coro *current = SvSTATE_current; 3811 struct coro *current = SvSTATE_current;
3557 SV **exceptionp = self == current ? &CORO_THROW : &self->except; 3812 SV **exceptionp = coro == current ? &CORO_THROW : &coro->except;
3558 SvREFCNT_dec (*exceptionp); 3813 SvREFCNT_dec (*exceptionp);
3559 SvGETMAGIC (exception); 3814 SvGETMAGIC (exception);
3560 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0; 3815 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3816
3817 api_ready (aTHX_ self);
3561} 3818}
3562 3819
3563void 3820void
3564api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3821api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3565 PROTOTYPE: $;$ 3822 PROTOTYPE: $;$
3642 3899
3643void 3900void
3644times (Coro::State self) 3901times (Coro::State self)
3645 PPCODE: 3902 PPCODE:
3646{ 3903{
3647 struct coro *current = SvSTATE (coro_current); 3904 struct coro *current = SvSTATE (coro_current);
3648 3905
3649 if (ecb_expect_false (current == self)) 3906 if (ecb_expect_false (current == self))
3650 { 3907 {
3651 coro_times_update (); 3908 coro_times_update ();
3652 coro_times_add (SvSTATE (coro_current)); 3909 coro_times_add (SvSTATE (coro_current));
3695 3952
3696 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3953 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3697 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3954 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3698 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 3955 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3699 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */ 3956 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3700 3957
3701 coro_stash = gv_stashpv ("Coro", TRUE); 3958 coro_stash = gv_stashpv ("Coro", TRUE);
3702 3959
3703 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 3960 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3704 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 3961 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3705 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL)); 3962 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
3717 coroapi.ready = api_ready; 3974 coroapi.ready = api_ready;
3718 coroapi.is_ready = api_is_ready; 3975 coroapi.is_ready = api_is_ready;
3719 coroapi.nready = coro_nready; 3976 coroapi.nready = coro_nready;
3720 coroapi.current = coro_current; 3977 coroapi.current = coro_current;
3721 3978
3979 coroapi.enterleave_hook = api_enterleave_hook;
3980 coroapi.enterleave_unhook = api_enterleave_unhook;
3981 coroapi.enterleave_scope_hook = api_enterleave_scope_hook;
3982
3722 /*GCoroAPI = &coroapi;*/ 3983 /*GCoroAPI = &coroapi;*/
3723 sv_setiv (sv, (IV)&coroapi); 3984 sv_setiv (sv, (IV)&coroapi);
3724 SvREADONLY_on (sv); 3985 SvREADONLY_on (sv);
3725 } 3986 }
3726} 3987}
3791 4052
3792void 4053void
3793_set_current (SV *current) 4054_set_current (SV *current)
3794 PROTOTYPE: $ 4055 PROTOTYPE: $
3795 CODE: 4056 CODE:
3796 SvREFCNT_dec (SvRV (coro_current)); 4057 SvREFCNT_dec_NN (SvRV (coro_current));
3797 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current))); 4058 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
3798 4059
3799void 4060void
3800_set_readyhook (SV *hook) 4061_set_readyhook (SV *hook)
3801 PROTOTYPE: $ 4062 PROTOTYPE: $
3885 4146
3886 if ((SV *)hv == &PL_sv_undef) 4147 if ((SV *)hv == &PL_sv_undef)
3887 { 4148 {
3888 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1); 4149 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3889 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv)); 4150 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
3890 SvREFCNT_dec (sv); 4151 SvREFCNT_dec_NN (sv);
3891 } 4152 }
3892 4153
3893 { 4154 {
3894 struct coro *coro = SvSTATE_hv (hv); 4155 struct coro *coro = SvSTATE_hv (hv);
3895 4156
3902 api_ready (aTHX_ (SV *)hv); 4163 api_ready (aTHX_ (SV *)hv);
3903 4164
3904 if (GIMME_V != G_VOID) 4165 if (GIMME_V != G_VOID)
3905 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 4166 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
3906 else 4167 else
3907 SvREFCNT_dec (hv); 4168 SvREFCNT_dec_NN (hv);
3908} 4169}
3909 4170
3910SV * 4171SV *
3911rouse_cb () 4172rouse_cb ()
3912 PROTOTYPE: 4173 PROTOTYPE:
3927 on_leave = 1 4188 on_leave = 1
3928 PROTOTYPE: & 4189 PROTOTYPE: &
3929 CODE: 4190 CODE:
3930{ 4191{
3931 struct coro *coro = SvSTATE_current; 4192 struct coro *coro = SvSTATE_current;
3932 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 4193 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3933 4194
3934 block = s_get_cv_croak (block); 4195 block = s_get_cv_croak (block);
3935 4196
3936 if (!*avp) 4197 if (!*avp)
3937 *avp = newAV (); 4198 *avp = newAV ();
3957 4218
3958SV * 4219SV *
3959new (SV *klass, SV *count = 0) 4220new (SV *klass, SV *count = 0)
3960 CODE: 4221 CODE:
3961{ 4222{
3962 int semcnt = 1; 4223 int semcnt = 1;
3963 4224
3964 if (count) 4225 if (count)
3965 { 4226 {
3966 SvGETMAGIC (count); 4227 SvGETMAGIC (count);
3967 4228
4027 XSRETURN_NO; 4288 XSRETURN_NO;
4028} 4289}
4029 4290
4030void 4291void
4031waiters (SV *self) 4292waiters (SV *self)
4032 PPCODE: 4293 PPCODE:
4033{ 4294{
4034 AV *av = (AV *)SvRV (self); 4295 AV *av = (AV *)SvRV (self);
4035 int wcount = AvFILLp (av) + 1 - 1; 4296 int wcount = AvFILLp (av) + 1 - 1;
4036 4297
4037 if (GIMME_V == G_SCALAR) 4298 if (GIMME_V == G_SCALAR)
4046} 4307}
4047 4308
4048MODULE = Coro::State PACKAGE = Coro::SemaphoreSet 4309MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
4049 4310
4050void 4311void
4051_may_delete (SV *sem, int count, int extra_refs) 4312_may_delete (SV *sem, int count, unsigned int extra_refs)
4052 PPCODE: 4313 PPCODE:
4053{ 4314{
4054 AV *av = (AV *)SvRV (sem); 4315 AV *av = (AV *)SvRV (sem);
4055 4316
4056 if (SvREFCNT ((SV *)av) == 1 + extra_refs 4317 if (SvREFCNT ((SV *)av) == 1 + extra_refs
4057 && AvFILLp (av) == 0 /* no waiters, just count */ 4318 && AvFILLp (av) == 0 /* no waiters, just count */
4058 && SvIV (AvARRAY (av)[0]) == count) 4319 && SvIV (AvARRAY (av)[0]) == count)
4059 XSRETURN_YES; 4320 XSRETURN_YES;
4080 4341
4081void 4342void
4082broadcast (SV *self) 4343broadcast (SV *self)
4083 CODE: 4344 CODE:
4084{ 4345{
4085 AV *av = (AV *)SvRV (self); 4346 AV *av = (AV *)SvRV (self);
4086 coro_signal_wake (aTHX_ av, AvFILLp (av)); 4347 coro_signal_wake (aTHX_ av, AvFILLp (av));
4087} 4348}
4088 4349
4089void 4350void
4090send (SV *self) 4351send (SV *self)
4098 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */ 4359 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
4099} 4360}
4100 4361
4101IV 4362IV
4102awaited (SV *self) 4363awaited (SV *self)
4103 CODE: 4364 CODE:
4104 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1; 4365 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
4105 OUTPUT: 4366 OUTPUT:
4106 RETVAL 4367 RETVAL
4107 4368
4108 4369
4113 4374
4114void 4375void
4115_schedule (...) 4376_schedule (...)
4116 CODE: 4377 CODE:
4117{ 4378{
4118 static int incede; 4379 static int incede;
4119 4380
4120 api_cede_notself (aTHX); 4381 api_cede_notself (aTHX);
4121 4382
4122 ++incede; 4383 ++incede;
4123 while (coro_nready >= incede && api_cede (aTHX)) 4384 while (coro_nready >= incede && api_cede (aTHX))
4167 { 4428 {
4168 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect; 4429 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
4169 coro_old_pp_sselect = 0; 4430 coro_old_pp_sselect = 0;
4170 } 4431 }
4171 4432
4433MODULE = Coro::State PACKAGE = Coro::Util
4434
4435void
4436_exit (int code)
4437 CODE:
4438 _exit (code);
4439
4440NV
4441time ()
4442 CODE:
4443 RETVAL = nvtime (aTHX);
4444 OUTPUT:
4445 RETVAL
4446
4447NV
4448gettimeofday ()
4449 PPCODE:
4450{
4451 UV tv [2];
4452 u2time (aTHX_ tv);
4453 EXTEND (SP, 2);
4454 PUSHs (sv_2mortal (newSVuv (tv [0])));
4455 PUSHs (sv_2mortal (newSVuv (tv [1])));
4456}
4457

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines