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.439 by root, Tue Nov 19 05:16:01 2013 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
17#include "ecb.h" 19#include "ecb.h"
18 20
19#include <stddef.h> 21#include <stddef.h>
20#include <stdio.h> 22#include <stdio.h>
21#include <errno.h> 23#include <errno.h>
22#include <assert.h> 24#include <assert.h>
23 25
24#ifndef SVs_PADSTALE 26#ifndef SVs_PADSTALE
25# define SVs_PADSTALE 0 27# define SVs_PADSTALE 0
28#endif
29
30#ifdef PadARRAY
31# define NEWPADAPI 1
32# define newPADLIST(var) (Newz (0, var, 1, PADLIST), Newx (PadlistARRAY (var), 2, PAD *))
33#else
34typedef AV PADNAMELIST;
35# if !PERL_VERSION_ATLEAST(5,8,0)
36typedef AV PADLIST;
37typedef AV PAD;
38# endif
39# define PadlistARRAY(pl) ((PAD **)AvARRAY (pl))
40# define PadlistMAX(pl) AvFILLp (pl)
41# define PadlistNAMES(pl) (*PadlistARRAY (pl))
42# define PadARRAY AvARRAY
43# define PadMAX AvFILLp
44# define newPADLIST(var) ((var) = newAV (), av_extend (var, 1))
45#endif
46
47/* 5.19.something has replaced SVt_BIND by SVt_INVLIST */
48/* we just alias it to SVt_IV, as that is sufficient for swap_sv for now */
49#if PERL_VERSION_ATLEAST(5,19,0)
50# define SVt_BIND SVt_IV
26#endif 51#endif
27 52
28#if defined(_WIN32) 53#if defined(_WIN32)
29# undef HAS_GETTIMEOFDAY 54# undef HAS_GETTIMEOFDAY
30# undef setjmp 55# undef setjmp
… …
33# define setjmp _setjmp /* deep magic */ 58# define setjmp _setjmp /* deep magic */
34#else 59#else
35# include <inttypes.h> /* most portable stdint.h */ 60# include <inttypes.h> /* most portable stdint.h */
36#endif 61#endif
37 62
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 */ 63/* the maximum number of idle cctx that will be pooled */
66static int cctx_max_idle = 4; 64static int cctx_max_idle = 4;
67 65
68#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 66#if defined(DEBUGGING) && PERL_VERSION_ATLEAST(5,12,0)
69# undef CORO_STACKGUARD 67# define HAS_SCOPESTACK_NAME 1
70#endif
71
72#ifndef CORO_STACKGUARD
73# define CORO_STACKGUARD 0
74#endif 68#endif
75 69
76/* prefer perl internal functions over our own? */ 70/* prefer perl internal functions over our own? */
77#ifndef CORO_PREFER_PERL_FUNCTIONS 71#ifndef CORO_PREFER_PERL_FUNCTIONS
78# define CORO_PREFER_PERL_FUNCTIONS 0 72# define CORO_PREFER_PERL_FUNCTIONS 0
… …
169typedef struct coro_cctx 163typedef struct coro_cctx
170{ 164{
171 struct coro_cctx *next; 165 struct coro_cctx *next;
172 166
173 /* the stack */ 167 /* the stack */
174 void *sptr; 168 struct coro_stack stack;
175 size_t ssize;
176 169
177 /* cpu state */ 170 /* cpu state */
178 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 171 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
172#ifndef NDEBUG
179 JMPENV *idle_te; /* same as idle_sp, but for top_env, TODO: remove once stable */ 173 JMPENV *idle_te; /* same as idle_sp, but for top_env */
174#endif
180 JMPENV *top_env; 175 JMPENV *top_env;
181 coro_context cctx; 176 coro_context cctx;
182 177
183 U32 gen; 178 U32 gen;
184#if CORO_USE_VALGRIND 179#if CORO_USE_VALGRIND
… …
204}; 199};
205 200
206/* the structure where most of the perl state is stored, overlaid on the cxstack */ 201/* the structure where most of the perl state is stored, overlaid on the cxstack */
207typedef struct 202typedef struct
208{ 203{
209 SV *defsv;
210 AV *defav;
211 SV *errsv;
212 SV *irsgv;
213 HV *hinthv;
214#define VAR(name,type) type name; 204 #define VARx(name,expr,type) type name;
215# include "state.h" 205 #include "state.h"
216#undef VAR
217} perl_slots; 206} perl_slots;
218 207
219// how many context stack entries do we need for perl_slots 208/* 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)) 209#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
221 210
222/* this is a structure representing a perl-level coroutine */ 211/* this is a structure representing a perl-level coroutine */
223struct coro 212struct coro
224{ 213{
… …
290static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */ 279static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
291static CV *cv_coro_run; 280static CV *cv_coro_run;
292static struct coro *coro_first; 281static struct coro *coro_first;
293#define coro_nready coroapi.nready 282#define coro_nready coroapi.nready
294 283
284/** JIT *********************************************************************/
285
286#if CORO_JIT
287 /* APPLE doesn't have mmap though */
288 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__)
289 #ifndef CORO_JIT_TYPE
290 #if ECB_AMD64 && CORO_JIT_UNIXY
291 #define CORO_JIT_TYPE "amd64-unix"
292 #elif __i386 && CORO_JIT_UNIXY
293 #define CORO_JIT_TYPE "x86-unix"
294 #endif
295 #endif
296#endif
297
298#if !defined(CORO_JIT_TYPE) || _POSIX_MEMORY_PROTECTION <= 0
299 #undef CORO_JIT
300#endif
301
302#if CORO_JIT
303 typedef void (*load_save_perl_slots_type)(perl_slots *);
304 static load_save_perl_slots_type load_perl_slots, save_perl_slots;
305#endif
306
295/** Coro::Select ************************************************************/ 307/** Coro::Select ************************************************************/
296 308
297static OP *(*coro_old_pp_sselect) (pTHX); 309static OP *(*coro_old_pp_sselect) (pTHX);
298static SV *coro_select_select; 310static SV *coro_select_select;
299 311
… …
314 326
315/** time stuff **************************************************************/ 327/** time stuff **************************************************************/
316 328
317#ifdef HAS_GETTIMEOFDAY 329#ifdef HAS_GETTIMEOFDAY
318 330
319ECB_INLINE void 331ecb_inline void
320coro_u2time (pTHX_ UV ret[2]) 332coro_u2time (pTHX_ UV ret[2])
321{ 333{
322 struct timeval tv; 334 struct timeval tv;
323 gettimeofday (&tv, 0); 335 gettimeofday (&tv, 0);
324 336
325 ret [0] = tv.tv_sec; 337 ret [0] = tv.tv_sec;
326 ret [1] = tv.tv_usec; 338 ret [1] = tv.tv_usec;
327} 339}
328 340
329ECB_INLINE double 341ecb_inline double
330coro_nvtime () 342coro_nvtime (void)
331{ 343{
332 struct timeval tv; 344 struct timeval tv;
333 gettimeofday (&tv, 0); 345 gettimeofday (&tv, 0);
334 346
335 return tv.tv_sec + tv.tv_usec * 1e-6; 347 return tv.tv_sec + tv.tv_usec * 1e-6;
336} 348}
337 349
338ECB_INLINE void 350ecb_inline void
339time_init (pTHX) 351time_init (pTHX)
340{ 352{
341 nvtime = coro_nvtime; 353 nvtime = coro_nvtime;
342 u2time = coro_u2time; 354 u2time = coro_u2time;
343} 355}
344 356
345#else 357#else
346 358
347ECB_INLINE void 359ecb_inline void
348time_init (pTHX) 360time_init (pTHX)
349{ 361{
350 SV **svp; 362 SV **svp;
351 363
352 require_pv ("Time/HiRes.pm"); 364 require_pv ("Time/HiRes.pm");
353 365
354 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0); 366 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
355 367
356 if (!svp) croak ("Time::HiRes is required, but missing. Caught"); 368 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
357 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught"); 369 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught");
358 370
… …
394 get_hv (name, create); 406 get_hv (name, create);
395#endif 407#endif
396 return get_hv (name, create); 408 return get_hv (name, create);
397} 409}
398 410
399ECB_INLINE void 411ecb_inline void
400coro_times_update () 412coro_times_update (void)
401{ 413{
402#ifdef coro_clock_gettime 414#ifdef coro_clock_gettime
403 struct timespec ts; 415 struct timespec ts;
404 416
405 ts.tv_sec = ts.tv_nsec = 0; 417 ts.tv_sec = ts.tv_nsec = 0;
… …
417 time_real [0] = tv [0]; 429 time_real [0] = tv [0];
418 time_real [1] = tv [1] * 1000; 430 time_real [1] = tv [1] * 1000;
419#endif 431#endif
420} 432}
421 433
422ECB_INLINE void 434ecb_inline void
423coro_times_add (struct coro *c) 435coro_times_add (struct coro *c)
424{ 436{
425 c->t_real [1] += time_real [1]; 437 c->t_real [1] += time_real [1];
426 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; } 438 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
427 c->t_real [0] += time_real [0]; 439 c->t_real [0] += time_real [0];
… …
429 c->t_cpu [1] += time_cpu [1]; 441 c->t_cpu [1] += time_cpu [1];
430 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; } 442 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
431 c->t_cpu [0] += time_cpu [0]; 443 c->t_cpu [0] += time_cpu [0];
432} 444}
433 445
434ECB_INLINE void 446ecb_inline void
435coro_times_sub (struct coro *c) 447coro_times_sub (struct coro *c)
436{ 448{
437 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; } 449 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]; 450 c->t_real [1] -= time_real [1];
439 c->t_real [0] -= time_real [0]; 451 c->t_real [0] -= time_real [0];
… …
460 : 0) 472 : 0)
461 473
462#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv) 474#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) 475#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
464 476
465ECB_INLINE MAGIC * 477ecb_inline MAGIC *
466SvSTATEhv_p (pTHX_ SV *coro) 478SvSTATEhv_p (pTHX_ SV *coro)
467{ 479{
468 MAGIC *mg; 480 MAGIC *mg;
469 481
470 if (ecb_expect_true ( 482 if (ecb_expect_true (
… …
475 return mg; 487 return mg;
476 488
477 return 0; 489 return 0;
478} 490}
479 491
480ECB_INLINE struct coro * 492ecb_inline struct coro *
481SvSTATE_ (pTHX_ SV *coro) 493SvSTATE_ (pTHX_ SV *coro)
482{ 494{
483 MAGIC *mg; 495 MAGIC *mg;
484 496
485 if (SvROK (coro)) 497 if (SvROK (coro))
… …
499#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 511#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
500 512
501/*****************************************************************************/ 513/*****************************************************************************/
502/* padlist management and caching */ 514/* padlist management and caching */
503 515
504ECB_INLINE AV * 516ecb_inline PADLIST *
505coro_derive_padlist (pTHX_ CV *cv) 517coro_derive_padlist (pTHX_ CV *cv)
506{ 518{
507 AV *padlist = CvPADLIST (cv); 519 PADLIST *padlist = CvPADLIST (cv);
508 AV *newpadlist, *newpad; 520 PADLIST *newpadlist;
521 PAD *newpad;
522 PADOFFSET off = PadlistMAX (padlist) + 1;
509 523
510 newpadlist = newAV (); 524#if NEWPADAPI
525
526 /* if we had the original CvDEPTH, we might be able to steal the CvDEPTH+1 entry instead */
527 /* 20131102194744.GA6705@schmorp.de, 20131102195825.2013.qmail@lists-nntp.develooper.com */
528 while (!PadlistARRAY (padlist)[off - 1])
529 --off;
530
531 Perl_pad_push (aTHX_ padlist, off);
532
533 newpad = PadlistARRAY (padlist)[off];
534 PadlistARRAY (padlist)[off] = 0;
535
536#else
537
538#if PERL_VERSION_ATLEAST (5,10,0)
539 Perl_pad_push (aTHX_ padlist, off);
540#else
541 Perl_pad_push (aTHX_ padlist, off, 1);
542#endif
543
544 newpad = PadlistARRAY (padlist)[off];
545 PadlistMAX (padlist) = off - 1;
546
547#endif
548
549 newPADLIST (newpadlist);
550#if !PERL_VERSION_ATLEAST(5,15,3)
551 /* Padlists are AvREAL as of 5.15.3. See perl bug #98092 and perl commit 7d953ba. */
511 AvREAL_off (newpadlist); 552 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 553#endif
517 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
518 --AvFILLp (padlist);
519 554
520 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0])); 555 /* Already extended to 2 elements by newPADLIST. */
521 av_store (newpadlist, 1, (SV *)newpad); 556 PadlistMAX (newpadlist) = 1;
557 PadlistNAMES (newpadlist) = (PADNAMELIST *)SvREFCNT_inc_NN (PadlistNAMES (padlist));
558 PadlistARRAY (newpadlist)[1] = newpad;
522 559
523 return newpadlist; 560 return newpadlist;
524} 561}
525 562
526ECB_INLINE void 563ecb_inline void
527free_padlist (pTHX_ AV *padlist) 564free_padlist (pTHX_ PADLIST *padlist)
528{ 565{
529 /* may be during global destruction */ 566 /* may be during global destruction */
530 if (!IN_DESTRUCT) 567 if (!IN_DESTRUCT)
531 { 568 {
532 I32 i = AvFILLp (padlist); 569 I32 i = PadlistMAX (padlist);
533 570
534 while (i > 0) /* special-case index 0 */ 571 while (i > 0) /* special-case index 0 */
535 { 572 {
536 /* we try to be extra-careful here */ 573 /* we try to be extra-careful here */
537 AV *av = (AV *)AvARRAY (padlist)[i--]; 574 PAD *pad = PadlistARRAY (padlist)[i--];
538 I32 j = AvFILLp (av);
539 575
576 if (pad)
577 {
578 I32 j = PadMAX (pad);
579
540 while (j >= 0) 580 while (j >= 0)
541 SvREFCNT_dec (AvARRAY (av)[j--]); 581 SvREFCNT_dec (PadARRAY (pad)[j--]);
542 582
543 AvFILLp (av) = -1; 583 PadMAX (pad) = -1;
544 SvREFCNT_dec (av); 584 SvREFCNT_dec (pad);
585 }
545 } 586 }
546 587
547 SvREFCNT_dec (AvARRAY (padlist)[0]); 588 SvREFCNT_dec (PadlistNAMES (padlist));
548 589
590#if NEWPADAPI
591 Safefree (PadlistARRAY (padlist));
592 Safefree (padlist);
593#else
549 AvFILLp (padlist) = -1; 594 AvFILLp (padlist) = -1;
595 AvREAL_off (padlist);
550 SvREFCNT_dec ((SV*)padlist); 596 SvREFCNT_dec ((SV*)padlist);
597#endif
551 } 598 }
552} 599}
553 600
554static int 601static int
555coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 602coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
556{ 603{
557 AV *padlist; 604 PADLIST *padlist;
558 AV *av = (AV *)mg->mg_obj; 605 PADLIST **padlists = (PADLIST **)(mg->mg_ptr + sizeof(size_t));
606 size_t len = *(size_t *)mg->mg_ptr;
559 607
560 /* perl manages to free our internal AV and _then_ call us */ 608 /* perl manages to free our internal AV and _then_ call us */
561 if (IN_DESTRUCT) 609 if (IN_DESTRUCT)
562 return 0; 610 return 0;
563 611
564 /* casting is fun. */ 612 while (len--)
565 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
566 free_padlist (aTHX_ padlist); 613 free_padlist (aTHX_ padlists[len]);
567
568 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
569 614
570 return 0; 615 return 0;
571} 616}
572 617
573static MGVTBL coro_cv_vtbl = { 618static MGVTBL coro_cv_vtbl = {
574 0, 0, 0, 0, 619 0, 0, 0, 0,
575 coro_cv_free 620 coro_cv_free
576}; 621};
577 622
578/* the next two functions merely cache the padlists */ 623/* the next two functions merely cache the padlists */
579ECB_INLINE void 624ecb_inline void
580get_padlist (pTHX_ CV *cv) 625get_padlist (pTHX_ CV *cv)
581{ 626{
582 MAGIC *mg = CORO_MAGIC_cv (cv); 627 MAGIC *mg = CORO_MAGIC_cv (cv);
583 AV *av; 628 size_t *lenp;
584 629
585 if (ecb_expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 630 if (ecb_expect_true (mg && *(lenp = (size_t *)mg->mg_ptr)))
586 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 631 CvPADLIST (cv) = ((PADLIST **)(mg->mg_ptr + sizeof(size_t)))[--*lenp];
587 else 632 else
588 { 633 {
589#if CORO_PREFER_PERL_FUNCTIONS 634#if CORO_PREFER_PERL_FUNCTIONS
590 /* this is probably cleaner? but also slower! */ 635 /* this is probably cleaner? but also slower! */
591 /* in practise, it seems to be less stable */ 636 /* in practise, it seems to be less stable */
… …
597 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 642 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
598#endif 643#endif
599 } 644 }
600} 645}
601 646
602ECB_INLINE void 647ecb_inline void
603put_padlist (pTHX_ CV *cv) 648put_padlist (pTHX_ CV *cv)
604{ 649{
605 MAGIC *mg = CORO_MAGIC_cv (cv); 650 MAGIC *mg = CORO_MAGIC_cv (cv);
606 AV *av;
607 651
608 if (ecb_expect_false (!mg)) 652 if (ecb_expect_false (!mg))
653 {
609 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 654 mg = sv_magicext ((SV *)cv, 0, CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
655 Newz (0, mg->mg_ptr ,sizeof (size_t) + sizeof (PADLIST *), char);
656 mg->mg_len = 1; /* so mg_free frees mg_ptr */
657 }
658 else
659 Renew (mg->mg_ptr,
660 sizeof(size_t) + (*(size_t *)mg->mg_ptr + 1) * sizeof(PADLIST *),
661 char);
610 662
611 av = (AV *)mg->mg_obj; 663 ((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} 664}
618 665
619/** load & save, init *******************************************************/ 666/** load & save, init *******************************************************/
620 667
668ecb_inline void
669swap_sv (SV *a, SV *b)
670{
671 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
672 SV tmp;
673
674 /* swap sv_any */
675 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
676
677 /* swap sv_flags */
678 SvFLAGS (&tmp) = SvFLAGS (a);
679 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
680 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
681
682#if PERL_VERSION_ATLEAST (5,10,0)
683 /* perl 5.10 and later complicates this _quite_ a bit, but it also
684 * is much faster, so no quarrels here. alternatively, we could
685 * sv_upgrade to avoid this.
686 */
687 {
688 /* swap sv_u */
689 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
690
691 /* if SvANY points to the head, we need to adjust the pointers,
692 * as the pointer for a still points to b, and maybe vice versa.
693 */
694 #define svany_in_head(type) \
695 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
696
697 if (svany_in_head (SvTYPE (a)))
698 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
699
700 if (svany_in_head (SvTYPE (b)))
701 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
702 }
703#endif
704}
705
621/* swap sv heads, at least logically */ 706/* swap sv heads, at least logically */
622static void 707static void
623swap_svs (pTHX_ Coro__State c) 708swap_svs (pTHX_ Coro__State c)
624{ 709{
625 int i; 710 int i;
626 711
627 for (i = 0; i <= AvFILLp (c->swap_sv); ) 712 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
628 { 713 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} 714}
667 715
668#define SWAP_SVS(coro) \ 716#define SWAP_SVS(coro) \
669 if (ecb_expect_false ((coro)->swap_sv)) \ 717 if (ecb_expect_false ((coro)->swap_sv)) \
670 swap_svs (aTHX_ (coro)) 718 swap_svs (aTHX_ (coro))
… …
678 perl_slots *slot = c->slot; 726 perl_slots *slot = c->slot;
679 c->slot = 0; 727 c->slot = 0;
680 728
681 PL_mainstack = c->mainstack; 729 PL_mainstack = c->mainstack;
682 730
683 GvSV (PL_defgv) = slot->defsv; 731#if CORO_JIT
684 GvAV (PL_defgv) = slot->defav; 732 load_perl_slots (slot);
685 GvSV (PL_errgv) = slot->errsv; 733#else
686 GvSV (irsgv) = slot->irsgv;
687 GvHV (PL_hintgv) = slot->hinthv;
688
689 #define VAR(name,type) PL_ ## name = slot->name; 734 #define VARx(name,expr,type) expr = slot->name;
690 # include "state.h" 735 #include "state.h"
691 #undef VAR 736#endif
692 737
693 { 738 {
694 dSP; 739 dSP;
695 740
696 CV *cv; 741 CV *cv;
… …
698 /* now do the ugly restore mess */ 743 /* now do the ugly restore mess */
699 while (ecb_expect_true (cv = (CV *)POPs)) 744 while (ecb_expect_true (cv = (CV *)POPs))
700 { 745 {
701 put_padlist (aTHX_ cv); /* mark this padlist as available */ 746 put_padlist (aTHX_ cv); /* mark this padlist as available */
702 CvDEPTH (cv) = PTR2IV (POPs); 747 CvDEPTH (cv) = PTR2IV (POPs);
703 CvPADLIST (cv) = (AV *)POPs; 748 CvPADLIST (cv) = (PADLIST *)POPs;
704 } 749 }
705 750
706 PUTBACK; 751 PUTBACK;
707 } 752 }
708 753
… …
798 843
799 PUTBACK; 844 PUTBACK;
800 } 845 }
801 846
802 /* allocate some space on the context stack for our purposes */ 847 /* allocate some space on the context stack for our purposes */
803 if (ecb_expect_false (cxstack_ix + SLOT_COUNT >= cxstack_max)) 848 if (ecb_expect_false (cxstack_ix + (int)SLOT_COUNT >= cxstack_max))
804 { 849 {
805 unsigned int i; 850 unsigned int i;
806 851
807 for (i = 0; i < SLOT_COUNT; ++i) 852 for (i = 0; i < SLOT_COUNT; ++i)
808 CXINC; 853 CXINC;
… …
813 c->mainstack = PL_mainstack; 858 c->mainstack = PL_mainstack;
814 859
815 { 860 {
816 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 861 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
817 862
818 slot->defav = GvAV (PL_defgv); 863#if CORO_JIT
819 slot->defsv = DEFSV; 864 save_perl_slots (slot);
820 slot->errsv = ERRSV; 865#else
821 slot->irsgv = GvSV (irsgv);
822 slot->hinthv = GvHV (PL_hintgv);
823
824 #define VAR(name,type) slot->name = PL_ ## name; 866 #define VARx(name,expr,type) slot->name = expr;
825 # include "state.h" 867 #include "state.h"
826 #undef VAR 868#endif
827 } 869 }
828} 870}
829 871
830/* 872/*
831 * allocate various perl stacks. This is almost an exact copy 873 * allocate various perl stacks. This is almost an exact copy
… …
862#endif 904#endif
863 905
864 New(54,PL_scopestack,8,I32); 906 New(54,PL_scopestack,8,I32);
865 PL_scopestack_ix = 0; 907 PL_scopestack_ix = 0;
866 PL_scopestack_max = 8; 908 PL_scopestack_max = 8;
909#if HAS_SCOPESTACK_NAME
910 New(54,PL_scopestack_name,8,const char*);
911#endif
867 912
868 New(54,PL_savestack,24,ANY); 913 New(54,PL_savestack,24,ANY);
869 PL_savestack_ix = 0; 914 PL_savestack_ix = 0;
870 PL_savestack_max = 24; 915 PL_savestack_max = 24;
871 916
… …
899 } 944 }
900 945
901 Safefree (PL_tmps_stack); 946 Safefree (PL_tmps_stack);
902 Safefree (PL_markstack); 947 Safefree (PL_markstack);
903 Safefree (PL_scopestack); 948 Safefree (PL_scopestack);
949#if HAS_SCOPESTACK_NAME
950 Safefree (PL_scopestack_name);
951#endif
904 Safefree (PL_savestack); 952 Safefree (PL_savestack);
905#if !PERL_VERSION_ATLEAST (5,10,0) 953#if !PERL_VERSION_ATLEAST (5,10,0)
906 Safefree (PL_retstack); 954 Safefree (PL_retstack);
907#endif 955#endif
908} 956}
… …
968 { 1016 {
969 SV **svp = 0; 1017 SV **svp = 0;
970 1018
971 if (strEQ (s, "__DIE__" )) svp = &PL_diehook; 1019 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
972 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 1020 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
973 1021
974 if (svp) 1022 if (svp)
975 { 1023 {
976 sv_setsv (sv, *svp ? *svp : &PL_sv_undef); 1024 SV *ssv;
1025
1026 if (!*svp)
1027 ssv = &PL_sv_undef;
1028 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */
1029 ssv = sv_2mortal (newRV_inc (*svp));
1030 else
1031 ssv = *svp;
1032
1033 sv_setsv (sv, ssv);
977 return 0; 1034 return 0;
978 } 1035 }
979 } 1036 }
980 1037
981 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 1038 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
… …
1075 PL_hints = 0; 1132 PL_hints = 0;
1076 1133
1077 /* recreate the die/warn hooks */ 1134 /* recreate the die/warn hooks */
1078 PL_diehook = SvREFCNT_inc (rv_diehook); 1135 PL_diehook = SvREFCNT_inc (rv_diehook);
1079 PL_warnhook = SvREFCNT_inc (rv_warnhook); 1136 PL_warnhook = SvREFCNT_inc (rv_warnhook);
1080 1137
1081 GvSV (PL_defgv) = newSV (0); 1138 GvSV (PL_defgv) = newSV (0);
1082 GvAV (PL_defgv) = coro->args; coro->args = 0; 1139 GvAV (PL_defgv) = coro->args; coro->args = 0;
1083 GvSV (PL_errgv) = newSV (0); 1140 GvSV (PL_errgv) = newSV (0);
1084 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1141 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
1085 GvHV (PL_hintgv) = 0; 1142 GvHV (PL_hintgv) = 0;
… …
1173 /* restore swapped sv's */ 1230 /* restore swapped sv's */
1174 SWAP_SVS (coro); 1231 SWAP_SVS (coro);
1175 1232
1176 coro_destruct_stacks (aTHX); 1233 coro_destruct_stacks (aTHX);
1177 1234
1178 // now save some sv's to be free'd later 1235 /* now save some sv's to be free'd later */
1179 svf [0] = GvSV (PL_defgv); 1236 svf [0] = GvSV (PL_defgv);
1180 svf [1] = (SV *)GvAV (PL_defgv); 1237 svf [1] = (SV *)GvAV (PL_defgv);
1181 svf [2] = GvSV (PL_errgv); 1238 svf [2] = GvSV (PL_errgv);
1182 svf [3] = (SV *)PL_defoutgv; 1239 svf [3] = (SV *)PL_defoutgv;
1183 svf [4] = PL_rs; 1240 svf [4] = PL_rs;
… …
1203 SvREFCNT_dec (coro->invoke_cb); 1260 SvREFCNT_dec (coro->invoke_cb);
1204 SvREFCNT_dec (coro->invoke_av); 1261 SvREFCNT_dec (coro->invoke_av);
1205 } 1262 }
1206} 1263}
1207 1264
1208ECB_INLINE void 1265ecb_inline void
1209free_coro_mortal (pTHX) 1266free_coro_mortal (pTHX)
1210{ 1267{
1211 if (ecb_expect_true (coro_mortal)) 1268 if (ecb_expect_true (coro_mortal))
1212 { 1269 {
1213 SvREFCNT_dec ((SV *)coro_mortal); 1270 SvREFCNT_dec ((SV *)coro_mortal);
… …
1372 slf_frame.prepare = slf_prepare_set_stacklevel; 1429 slf_frame.prepare = slf_prepare_set_stacklevel;
1373 slf_frame.check = slf_check_set_stacklevel; 1430 slf_frame.check = slf_check_set_stacklevel;
1374} 1431}
1375 1432
1376/* the tail of transfer: execute stuff we can only do after a transfer */ 1433/* the tail of transfer: execute stuff we can only do after a transfer */
1377ECB_INLINE void 1434ecb_inline void
1378transfer_tail (pTHX) 1435transfer_tail (pTHX)
1379{ 1436{
1380 free_coro_mortal (aTHX); 1437 free_coro_mortal (aTHX);
1438}
1439
1440/* try to exit the same way perl's main function would do */
1441/* we do not bother resetting the environment or other things *7
1442/* that are not, uhm, essential */
1443/* this obviously also doesn't work when perl is embedded */
1444static void ecb_noinline ecb_cold
1445perlish_exit (pTHX)
1446{
1447 int exitstatus = perl_destruct (PL_curinterp);
1448 perl_free (PL_curinterp);
1449 exit (exitstatus);
1381} 1450}
1382 1451
1383/* 1452/*
1384 * this is a _very_ stripped down perl interpreter ;) 1453 * this is a _very_ stripped down perl interpreter ;)
1385 */ 1454 */
… …
1414 */ 1483 */
1415 1484
1416 /* 1485 /*
1417 * If perl-run returns we assume exit() was being called or the coro 1486 * 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) 1487 * 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 1488 * 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" 1489 * 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 */ 1490 */
1425 PL_top_env = main_top_env; 1491 perlish_exit (aTHX);
1426 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1427 } 1492 }
1428} 1493}
1429 1494
1430static coro_cctx * 1495static coro_cctx *
1431cctx_new () 1496cctx_new (void)
1432{ 1497{
1433 coro_cctx *cctx; 1498 coro_cctx *cctx;
1434 1499
1435 ++cctx_count; 1500 ++cctx_count;
1436 New (0, cctx, 1, coro_cctx); 1501 New (0, cctx, 1, coro_cctx);
… …
1442 return cctx; 1507 return cctx;
1443} 1508}
1444 1509
1445/* create a new cctx only suitable as source */ 1510/* create a new cctx only suitable as source */
1446static coro_cctx * 1511static coro_cctx *
1447cctx_new_empty () 1512cctx_new_empty (void)
1448{ 1513{
1449 coro_cctx *cctx = cctx_new (); 1514 coro_cctx *cctx = cctx_new ();
1450 1515
1451 cctx->sptr = 0; 1516 cctx->stack.sptr = 0;
1452 coro_create (&cctx->cctx, 0, 0, 0, 0); 1517 coro_create (&cctx->cctx, 0, 0, 0, 0);
1453 1518
1454 return cctx; 1519 return cctx;
1455} 1520}
1456 1521
1457/* create a new cctx suitable as destination/running a perl interpreter */ 1522/* create a new cctx suitable as destination/running a perl interpreter */
1458static coro_cctx * 1523static coro_cctx *
1459cctx_new_run () 1524cctx_new_run (void)
1460{ 1525{
1461 coro_cctx *cctx = cctx_new (); 1526 coro_cctx *cctx = cctx_new ();
1462 void *stack_start;
1463 size_t stack_size;
1464 1527
1465#if HAVE_MMAP 1528 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 } 1529 {
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."); 1530 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1488 _exit (EXIT_FAILURE); 1531 _exit (EXIT_FAILURE);
1489 }
1490
1491 stack_start = cctx->sptr;
1492 stack_size = cctx->ssize;
1493 } 1532 }
1494 1533
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); 1534 coro_create (&cctx->cctx, cctx_run, (void *)cctx, cctx->stack.sptr, cctx->stack.ssze);
1500 1535
1501 return cctx; 1536 return cctx;
1502} 1537}
1503 1538
1504static void 1539static void
… …
1510 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current)); 1545 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1511 1546
1512 --cctx_count; 1547 --cctx_count;
1513 coro_destroy (&cctx->cctx); 1548 coro_destroy (&cctx->cctx);
1514 1549
1515 /* coro_transfer creates new, empty cctx's */ 1550 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 1551
1530 Safefree (cctx); 1552 Safefree (cctx);
1531} 1553}
1532 1554
1533/* wether this cctx should be destructed */ 1555/* wether this cctx should be destructed */
… …
1552} 1574}
1553 1575
1554static void 1576static void
1555cctx_put (coro_cctx *cctx) 1577cctx_put (coro_cctx *cctx)
1556{ 1578{
1557 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1579 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->stack.sptr));
1558 1580
1559 /* free another cctx if overlimit */ 1581 /* free another cctx if overlimit */
1560 if (ecb_expect_false (cctx_idle >= cctx_max_idle)) 1582 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1561 { 1583 {
1562 coro_cctx *first = cctx_first; 1584 coro_cctx *first = cctx_first;
… …
1688 return; 1710 return;
1689 1711
1690 slf_destroy (aTHX_ coro); 1712 slf_destroy (aTHX_ coro);
1691 1713
1692 coro->flags |= CF_ZOMBIE; 1714 coro->flags |= CF_ZOMBIE;
1693 1715
1694 if (coro->flags & CF_READY) 1716 if (coro->flags & CF_READY)
1695 { 1717 {
1696 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1718 /* reduce nready, as destroying a ready coro effectively unreadies it */
1697 /* alternative: look through all ready queues and remove the coro */ 1719 /* alternative: look through all ready queues and remove the coro */
1698 --coro_nready; 1720 --coro_nready;
… …
1775 TRANSFER (ta, 1); 1797 TRANSFER (ta, 1);
1776} 1798}
1777 1799
1778/** Coro ********************************************************************/ 1800/** Coro ********************************************************************/
1779 1801
1780ECB_INLINE void 1802ecb_inline void
1781coro_enq (pTHX_ struct coro *coro) 1803coro_enq (pTHX_ struct coro *coro)
1782{ 1804{
1783 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN]; 1805 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1784 1806
1785 SvREFCNT_inc_NN (coro->hv); 1807 SvREFCNT_inc_NN (coro->hv);
… …
1787 coro->next_ready = 0; 1809 coro->next_ready = 0;
1788 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro; 1810 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1789 ready [1] = coro; 1811 ready [1] = coro;
1790} 1812}
1791 1813
1792ECB_INLINE struct coro * 1814ecb_inline struct coro *
1793coro_deq (pTHX) 1815coro_deq (pTHX)
1794{ 1816{
1795 int prio; 1817 int prio;
1796 1818
1797 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; ) 1819 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
… …
1850{ 1872{
1851 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1873 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1852} 1874}
1853 1875
1854/* expects to own a reference to next->hv */ 1876/* expects to own a reference to next->hv */
1855ECB_INLINE void 1877ecb_inline void
1856prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1878prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1857{ 1879{
1858 SV *prev_sv = SvRV (coro_current); 1880 SV *prev_sv = SvRV (coro_current);
1859 1881
1860 ta->prev = SvSTATE_hv (prev_sv); 1882 ta->prev = SvSTATE_hv (prev_sv);
… …
1894 /* nothing to schedule: call the idle handler */ 1916 /* nothing to schedule: call the idle handler */
1895 if (SvROK (sv_idle) 1917 if (SvROK (sv_idle)
1896 && SvOBJECT (SvRV (sv_idle))) 1918 && SvOBJECT (SvRV (sv_idle)))
1897 { 1919 {
1898 if (SvRV (sv_idle) == SvRV (coro_current)) 1920 if (SvRV (sv_idle) == SvRV (coro_current))
1921 {
1922 require_pv ("Carp");
1923
1924 {
1925 dSP;
1926
1927 ENTER;
1928 SAVETMPS;
1929
1930 PUSHMARK (SP);
1899 croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught"); 1931 XPUSHs (sv_2mortal (newSVpv ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught", 0)));
1932 PUTBACK;
1933 call_pv ("Carp::confess", G_VOID | G_DISCARD);
1934
1935 FREETMPS;
1936 LEAVE;
1937 }
1938 }
1900 1939
1901 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 1940 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1902 api_ready (aTHX_ SvRV (sv_idle)); 1941 api_ready (aTHX_ SvRV (sv_idle));
1903 --coro_nready; 1942 --coro_nready;
1904 } 1943 }
… …
1919 } 1958 }
1920 } 1959 }
1921 } 1960 }
1922} 1961}
1923 1962
1924ECB_INLINE void 1963ecb_inline void
1925prepare_cede (pTHX_ struct coro_transfer_args *ta) 1964prepare_cede (pTHX_ struct coro_transfer_args *ta)
1926{ 1965{
1927 api_ready (aTHX_ coro_current); 1966 api_ready (aTHX_ coro_current);
1928 prepare_schedule (aTHX_ ta); 1967 prepare_schedule (aTHX_ ta);
1929} 1968}
1930 1969
1931ECB_INLINE void 1970ecb_inline void
1932prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 1971prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1933{ 1972{
1934 SV *prev = SvRV (coro_current); 1973 SV *prev = SvRV (coro_current);
1935 1974
1936 if (coro_nready) 1975 if (coro_nready)
… …
2101{ 2140{
2102 AV *od = coro->on_destroy; 2141 AV *od = coro->on_destroy;
2103 2142
2104 if (!od) 2143 if (!od)
2105 return; 2144 return;
2145
2146 coro->on_destroy = 0;
2147 sv_2mortal ((SV *)od);
2106 2148
2107 while (AvFILLp (od) >= 0) 2149 while (AvFILLp (od) >= 0)
2108 { 2150 {
2109 SV *cb = sv_2mortal (av_pop (od)); 2151 SV *cb = sv_2mortal (av_pop (od));
2110 2152
… …
2131 2173
2132static void 2174static void
2133coro_set_status (pTHX_ struct coro *coro, SV **arg, int items) 2175coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
2134{ 2176{
2135 AV *av; 2177 AV *av;
2136 2178
2137 if (coro->status) 2179 if (coro->status)
2138 { 2180 {
2139 av = coro->status; 2181 av = coro->status;
2140 av_clear (av); 2182 av_clear (av);
2141 } 2183 }
… …
2188 2230
2189 coro = SvSTATE (arg [0]); 2231 coro = SvSTATE (arg [0]);
2190 coro_hv = coro->hv; 2232 coro_hv = coro->hv;
2191 2233
2192 coro_set_status (aTHX_ coro, arg + 1, items - 1); 2234 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2193 2235
2194 if (ecb_expect_false (coro->flags & CF_NOCANCEL)) 2236 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2195 { 2237 {
2196 /* coro currently busy cancelling something, so just notify it */ 2238 /* coro currently busy cancelling something, so just notify it */
2197 coro->slf_frame.data = (void *)coro; 2239 coro->slf_frame.data = (void *)coro;
2198 2240
… …
2377 2419
2378static int 2420static int
2379slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2421slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
2380{ 2422{
2381 SV *data = (SV *)frame->data; 2423 SV *data = (SV *)frame->data;
2382 2424
2383 if (CORO_THROW) 2425 if (CORO_THROW)
2384 return 0; 2426 return 0;
2385 2427
2386 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2428 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2387 return 1; 2429 return 1;
… …
2423 cb = sv_2mortal (coro->rouse_cb); 2465 cb = sv_2mortal (coro->rouse_cb);
2424 coro->rouse_cb = 0; 2466 coro->rouse_cb = 0;
2425 } 2467 }
2426 2468
2427 if (!SvROK (cb) 2469 if (!SvROK (cb)
2428 || SvTYPE (SvRV (cb)) != SVt_PVCV 2470 || SvTYPE (SvRV (cb)) != SVt_PVCV
2429 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2471 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2430 croak ("Coro::rouse_wait called with illegal callback argument,"); 2472 croak ("Coro::rouse_wait called with illegal callback argument,");
2431 2473
2432 { 2474 {
2433 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */ 2475 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
… …
2936 { 2978 {
2937 int i; 2979 int i;
2938 /* if we were woken up but can't down, we look through the whole */ 2980 /* 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 */ 2981 /* waiters list and only add us if we aren't in there already */
2940 /* this avoids some degenerate memory usage cases */ 2982 /* this avoids some degenerate memory usage cases */
2941 for (i = AvFILLp (av); i > 0; --i) // i > 0 is not an off-by-one bug 2983 for (i = AvFILLp (av); i > 0; --i) /* i > 0 is not an off-by-one bug */
2942 if (AvARRAY (av)[i] == coro_hv) 2984 if (AvARRAY (av)[i] == coro_hv)
2943 return 1; 2985 return 1;
2944 2986
2945 av_push (av, SvREFCNT_inc (coro_hv)); 2987 av_push (av, SvREFCNT_inc (coro_hv));
2946 return 1; 2988 return 1;
… …
3154 /* it quickly returns */ 3196 /* it quickly returns */
3155 if (CORO_THROW) 3197 if (CORO_THROW)
3156 return 0; 3198 return 0;
3157 3199
3158 /* one element that is an RV? repeat! */ 3200 /* one element that is an RV? repeat! */
3159 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0])) 3201 if (AvFILLp (state) == 0 && SvTYPE (AvARRAY (state)[0]) != SVt_PV)
3160 return 1; 3202 return 1;
3161 3203
3162 /* restore status */ 3204 /* restore status */
3163 { 3205 {
3164 SV *data_sv = av_pop (state); 3206 SV *data_sv = av_pop (state);
… …
3323 3365
3324#ifndef __cplusplus 3366#ifndef __cplusplus
3325ecb_cold XS(boot_Coro__State); 3367ecb_cold XS(boot_Coro__State);
3326#endif 3368#endif
3327 3369
3370#if CORO_JIT
3371
3372static void ecb_noinline ecb_cold
3373pushav_4uv (pTHX_ UV a, UV b, UV c, UV d)
3374{
3375 dSP;
3376 AV *av = newAV ();
3377
3378 av_store (av, 3, newSVuv (d));
3379 av_store (av, 2, newSVuv (c));
3380 av_store (av, 1, newSVuv (b));
3381 av_store (av, 0, newSVuv (a));
3382
3383 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
3384
3385 PUTBACK;
3386}
3387
3388static void ecb_noinline ecb_cold
3389jit_init (pTHX)
3390{
3391 dSP;
3392 SV *load, *save;
3393 char *map_base;
3394 char *load_ptr, *save_ptr;
3395 STRLEN load_len, save_len, map_len;
3396 int count;
3397
3398 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3399
3400 PUSHMARK (SP);
3401 #define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type));
3402 #include "state.h"
3403 count = call_pv ("Coro::State::_jit", G_ARRAY);
3404 SPAGAIN;
3405
3406 save = POPs; save_ptr = SvPVbyte (save, save_len);
3407 load = POPs; load_ptr = SvPVbyte (load, load_len);
3408
3409 map_len = load_len + save_len + 16;
3410
3411 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3412
3413 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3414
3415 load_perl_slots = (load_save_perl_slots_type)map_base;
3416 memcpy (map_base, load_ptr, load_len);
3417
3418 map_base += (load_len + 15) & ~15;
3419
3420 save_perl_slots = (load_save_perl_slots_type)map_base;
3421 memcpy (map_base, save_ptr, save_len);
3422
3423 /* we are good citizens and try to make the page read-only, so the evil evil */
3424 /* hackers might have it a bit more difficult */
3425 mprotect (map_base, map_len, PROT_READ | PROT_EXEC);
3426
3427 PUTBACK;
3428 eval_pv ("undef &Coro::State::_jit", 1);
3429}
3430
3431#endif
3432
3328MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3433MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
3329 3434
3330PROTOTYPES: DISABLE 3435PROTOTYPES: DISABLE
3331 3436
3332BOOT: 3437BOOT:
… …
3334#ifdef USE_ITHREADS 3439#ifdef USE_ITHREADS
3335# if CORO_PTHREAD 3440# if CORO_PTHREAD
3336 coro_thx = PERL_GET_CONTEXT; 3441 coro_thx = PERL_GET_CONTEXT;
3337# endif 3442# endif
3338#endif 3443#endif
3339 BOOT_PAGESIZE; 3444 /* perl defines these to check for existance first, but why it doesn't */
3445 /* just create them one at init time is not clear to me, except for */
3446 /* programs trying to delete them, but... */
3447 /* anyway, we declare this as invalid and make sure they are initialised here */
3448 DEFSV;
3449 ERRSV;
3340 3450
3341 cctx_current = cctx_new_empty (); 3451 cctx_current = cctx_new_empty ();
3342 3452
3343 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3453 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
3344 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3454 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
… …
3387 coroapi.prepare_cede_notself = prepare_cede_notself; 3497 coroapi.prepare_cede_notself = prepare_cede_notself;
3388 3498
3389 time_init (aTHX); 3499 time_init (aTHX);
3390 3500
3391 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL)); 3501 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3502#if CORO_JIT
3503 PUTBACK;
3504 jit_init (aTHX);
3505 SPAGAIN;
3506#endif
3392} 3507}
3393 3508
3394SV * 3509SV *
3395new (SV *klass, ...) 3510new (SV *klass, ...)
3396 ALIAS: 3511 ALIAS:
… …
3403void 3518void
3404transfer (...) 3519transfer (...)
3405 PROTOTYPE: $$ 3520 PROTOTYPE: $$
3406 CODE: 3521 CODE:
3407 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3522 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3408
3409void
3410_exit (int code)
3411 PROTOTYPE: $
3412 CODE:
3413 _exit (code);
3414 3523
3415SV * 3524SV *
3416clone (Coro::State coro) 3525clone (Coro::State coro)
3417 CODE: 3526 CODE:
3418{ 3527{
… …
3473void 3582void
3474list () 3583list ()
3475 PROTOTYPE: 3584 PROTOTYPE:
3476 PPCODE: 3585 PPCODE:
3477{ 3586{
3478 struct coro *coro; 3587 struct coro *coro;
3479 for (coro = coro_first; coro; coro = coro->next) 3588 for (coro = coro_first; coro; coro = coro->next)
3480 if (coro->hv) 3589 if (coro->hv)
3481 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 3590 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
3482} 3591}
3483 3592
… …
3547 RETVAL = boolSV (coro->flags & ix); 3656 RETVAL = boolSV (coro->flags & ix);
3548 OUTPUT: 3657 OUTPUT:
3549 RETVAL 3658 RETVAL
3550 3659
3551void 3660void
3552throw (Coro::State self, SV *exception = &PL_sv_undef) 3661throw (SV *self, SV *exception = &PL_sv_undef)
3553 PROTOTYPE: $;$ 3662 PROTOTYPE: $;$
3554 CODE: 3663 CODE:
3555{ 3664{
3665 struct coro *coro = SvSTATE (self);
3556 struct coro *current = SvSTATE_current; 3666 struct coro *current = SvSTATE_current;
3557 SV **exceptionp = self == current ? &CORO_THROW : &self->except; 3667 SV **exceptionp = coro == current ? &CORO_THROW : &coro->except;
3558 SvREFCNT_dec (*exceptionp); 3668 SvREFCNT_dec (*exceptionp);
3559 SvGETMAGIC (exception); 3669 SvGETMAGIC (exception);
3560 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0; 3670 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3671
3672 api_ready (aTHX_ self);
3561} 3673}
3562 3674
3563void 3675void
3564api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3676api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3565 PROTOTYPE: $;$ 3677 PROTOTYPE: $;$
… …
3642 3754
3643void 3755void
3644times (Coro::State self) 3756times (Coro::State self)
3645 PPCODE: 3757 PPCODE:
3646{ 3758{
3647 struct coro *current = SvSTATE (coro_current); 3759 struct coro *current = SvSTATE (coro_current);
3648 3760
3649 if (ecb_expect_false (current == self)) 3761 if (ecb_expect_false (current == self))
3650 { 3762 {
3651 coro_times_update (); 3763 coro_times_update ();
3652 coro_times_add (SvSTATE (coro_current)); 3764 coro_times_add (SvSTATE (coro_current));
… …
3695 3807
3696 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3808 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); 3809 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); 3810 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 */ 3811 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3700 3812
3701 coro_stash = gv_stashpv ("Coro", TRUE); 3813 coro_stash = gv_stashpv ("Coro", TRUE);
3702 3814
3703 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 3815 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3704 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 3816 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3705 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL)); 3817 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
… …
3927 on_leave = 1 4039 on_leave = 1
3928 PROTOTYPE: & 4040 PROTOTYPE: &
3929 CODE: 4041 CODE:
3930{ 4042{
3931 struct coro *coro = SvSTATE_current; 4043 struct coro *coro = SvSTATE_current;
3932 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 4044 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3933 4045
3934 block = s_get_cv_croak (block); 4046 block = s_get_cv_croak (block);
3935 4047
3936 if (!*avp) 4048 if (!*avp)
3937 *avp = newAV (); 4049 *avp = newAV ();
… …
3957 4069
3958SV * 4070SV *
3959new (SV *klass, SV *count = 0) 4071new (SV *klass, SV *count = 0)
3960 CODE: 4072 CODE:
3961{ 4073{
3962 int semcnt = 1; 4074 int semcnt = 1;
3963 4075
3964 if (count) 4076 if (count)
3965 { 4077 {
3966 SvGETMAGIC (count); 4078 SvGETMAGIC (count);
3967 4079
… …
4027 XSRETURN_NO; 4139 XSRETURN_NO;
4028} 4140}
4029 4141
4030void 4142void
4031waiters (SV *self) 4143waiters (SV *self)
4032 PPCODE: 4144 PPCODE:
4033{ 4145{
4034 AV *av = (AV *)SvRV (self); 4146 AV *av = (AV *)SvRV (self);
4035 int wcount = AvFILLp (av) + 1 - 1; 4147 int wcount = AvFILLp (av) + 1 - 1;
4036 4148
4037 if (GIMME_V == G_SCALAR) 4149 if (GIMME_V == G_SCALAR)
… …
4046} 4158}
4047 4159
4048MODULE = Coro::State PACKAGE = Coro::SemaphoreSet 4160MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
4049 4161
4050void 4162void
4051_may_delete (SV *sem, int count, int extra_refs) 4163_may_delete (SV *sem, int count, unsigned int extra_refs)
4052 PPCODE: 4164 PPCODE:
4053{ 4165{
4054 AV *av = (AV *)SvRV (sem); 4166 AV *av = (AV *)SvRV (sem);
4055 4167
4056 if (SvREFCNT ((SV *)av) == 1 + extra_refs 4168 if (SvREFCNT ((SV *)av) == 1 + extra_refs
4057 && AvFILLp (av) == 0 /* no waiters, just count */ 4169 && AvFILLp (av) == 0 /* no waiters, just count */
4058 && SvIV (AvARRAY (av)[0]) == count) 4170 && SvIV (AvARRAY (av)[0]) == count)
4059 XSRETURN_YES; 4171 XSRETURN_YES;
… …
4080 4192
4081void 4193void
4082broadcast (SV *self) 4194broadcast (SV *self)
4083 CODE: 4195 CODE:
4084{ 4196{
4085 AV *av = (AV *)SvRV (self); 4197 AV *av = (AV *)SvRV (self);
4086 coro_signal_wake (aTHX_ av, AvFILLp (av)); 4198 coro_signal_wake (aTHX_ av, AvFILLp (av));
4087} 4199}
4088 4200
4089void 4201void
4090send (SV *self) 4202send (SV *self)
… …
4098 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */ 4210 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
4099} 4211}
4100 4212
4101IV 4213IV
4102awaited (SV *self) 4214awaited (SV *self)
4103 CODE: 4215 CODE:
4104 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1; 4216 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
4105 OUTPUT: 4217 OUTPUT:
4106 RETVAL 4218 RETVAL
4107 4219
4108 4220
… …
4113 4225
4114void 4226void
4115_schedule (...) 4227_schedule (...)
4116 CODE: 4228 CODE:
4117{ 4229{
4118 static int incede; 4230 static int incede;
4119 4231
4120 api_cede_notself (aTHX); 4232 api_cede_notself (aTHX);
4121 4233
4122 ++incede; 4234 ++incede;
4123 while (coro_nready >= incede && api_cede (aTHX)) 4235 while (coro_nready >= incede && api_cede (aTHX))
… …
4167 { 4279 {
4168 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect; 4280 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
4169 coro_old_pp_sselect = 0; 4281 coro_old_pp_sselect = 0;
4170 } 4282 }
4171 4283
4284MODULE = Coro::State PACKAGE = Coro::Util
4285
4286void
4287_exit (int code)
4288 CODE:
4289 _exit (code);
4290
4291NV
4292time ()
4293 CODE:
4294 RETVAL = nvtime (aTHX);
4295 OUTPUT:
4296 RETVAL
4297
4298NV
4299gettimeofday ()
4300 PPCODE:
4301{
4302 UV tv [2];
4303 u2time (aTHX_ tv);
4304 EXTEND (SP, 2);
4305 PUSHs (sv_2mortal (newSVuv (tv [0])));
4306 PUSHs (sv_2mortal (newSVuv (tv [1])));
4307}
4308

Diff Legend

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