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.429 by root, Fri Dec 7 14:21:09 2012 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
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))
26#endif 45#endif
27 46
28#if defined(_WIN32) 47#if defined(_WIN32)
29# undef HAS_GETTIMEOFDAY 48# undef HAS_GETTIMEOFDAY
30# undef setjmp 49# undef setjmp
… …
33# define setjmp _setjmp /* deep magic */ 52# define setjmp _setjmp /* deep magic */
34#else 53#else
35# include <inttypes.h> /* most portable stdint.h */ 54# include <inttypes.h> /* most portable stdint.h */
36#endif 55#endif
37 56
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 */ 57/* the maximum number of idle cctx that will be pooled */
66static int cctx_max_idle = 4; 58static int cctx_max_idle = 4;
67 59
68#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 60#if defined(DEBUGGING) && PERL_VERSION_ATLEAST(5,12,0)
69# undef CORO_STACKGUARD 61# define HAS_SCOPESTACK_NAME 1
70#endif
71
72#ifndef CORO_STACKGUARD
73# define CORO_STACKGUARD 0
74#endif 62#endif
75 63
76/* prefer perl internal functions over our own? */ 64/* prefer perl internal functions over our own? */
77#ifndef CORO_PREFER_PERL_FUNCTIONS 65#ifndef CORO_PREFER_PERL_FUNCTIONS
78# define CORO_PREFER_PERL_FUNCTIONS 0 66# define CORO_PREFER_PERL_FUNCTIONS 0
… …
169typedef struct coro_cctx 157typedef struct coro_cctx
170{ 158{
171 struct coro_cctx *next; 159 struct coro_cctx *next;
172 160
173 /* the stack */ 161 /* the stack */
174 void *sptr; 162 struct coro_stack stack;
175 size_t ssize;
176 163
177 /* cpu state */ 164 /* cpu state */
178 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 165 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
166#ifndef NDEBUG
179 JMPENV *idle_te; /* same as idle_sp, but for top_env, TODO: remove once stable */ 167 JMPENV *idle_te; /* same as idle_sp, but for top_env */
168#endif
180 JMPENV *top_env; 169 JMPENV *top_env;
181 coro_context cctx; 170 coro_context cctx;
182 171
183 U32 gen; 172 U32 gen;
184#if CORO_USE_VALGRIND 173#if CORO_USE_VALGRIND
… …
204}; 193};
205 194
206/* the structure where most of the perl state is stored, overlaid on the cxstack */ 195/* the structure where most of the perl state is stored, overlaid on the cxstack */
207typedef struct 196typedef struct
208{ 197{
209 SV *defsv;
210 AV *defav;
211 SV *errsv;
212 SV *irsgv;
213 HV *hinthv;
214#define VAR(name,type) type name; 198 #define VARx(name,expr,type) type name;
215# include "state.h" 199 #include "state.h"
216#undef VAR
217} perl_slots; 200} perl_slots;
218 201
219// how many context stack entries do we need for perl_slots 202/* 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)) 203#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
221 204
222/* this is a structure representing a perl-level coroutine */ 205/* this is a structure representing a perl-level coroutine */
223struct coro 206struct coro
224{ 207{
… …
290static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */ 273static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
291static CV *cv_coro_run; 274static CV *cv_coro_run;
292static struct coro *coro_first; 275static struct coro *coro_first;
293#define coro_nready coroapi.nready 276#define coro_nready coroapi.nready
294 277
278/** JIT *********************************************************************/
279
280#if CORO_JIT
281 /* APPLE doesn't have mmap though */
282 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__)
283 #ifndef CORO_JIT_TYPE
284 #if __x86_64 && CORO_JIT_UNIXY
285 #define CORO_JIT_TYPE "amd64-unix"
286 #elif __i386 && CORO_JIT_UNIXY
287 #define CORO_JIT_TYPE "x86-unix"
288 #endif
289 #endif
290#endif
291
292#if !defined(CORO_JIT_TYPE) || _POSIX_MEMORY_PROTECTION <= 0
293 #undef CORO_JIT
294#endif
295
296#if CORO_JIT
297 typedef void (*load_save_perl_slots_type)(perl_slots *);
298 static load_save_perl_slots_type load_perl_slots, save_perl_slots;
299#endif
300
295/** Coro::Select ************************************************************/ 301/** Coro::Select ************************************************************/
296 302
297static OP *(*coro_old_pp_sselect) (pTHX); 303static OP *(*coro_old_pp_sselect) (pTHX);
298static SV *coro_select_select; 304static SV *coro_select_select;
299 305
… …
314 320
315/** time stuff **************************************************************/ 321/** time stuff **************************************************************/
316 322
317#ifdef HAS_GETTIMEOFDAY 323#ifdef HAS_GETTIMEOFDAY
318 324
319ECB_INLINE void 325ecb_inline void
320coro_u2time (pTHX_ UV ret[2]) 326coro_u2time (pTHX_ UV ret[2])
321{ 327{
322 struct timeval tv; 328 struct timeval tv;
323 gettimeofday (&tv, 0); 329 gettimeofday (&tv, 0);
324 330
325 ret [0] = tv.tv_sec; 331 ret [0] = tv.tv_sec;
326 ret [1] = tv.tv_usec; 332 ret [1] = tv.tv_usec;
327} 333}
328 334
329ECB_INLINE double 335ecb_inline double
330coro_nvtime () 336coro_nvtime (void)
331{ 337{
332 struct timeval tv; 338 struct timeval tv;
333 gettimeofday (&tv, 0); 339 gettimeofday (&tv, 0);
334 340
335 return tv.tv_sec + tv.tv_usec * 1e-6; 341 return tv.tv_sec + tv.tv_usec * 1e-6;
336} 342}
337 343
338ECB_INLINE void 344ecb_inline void
339time_init (pTHX) 345time_init (pTHX)
340{ 346{
341 nvtime = coro_nvtime; 347 nvtime = coro_nvtime;
342 u2time = coro_u2time; 348 u2time = coro_u2time;
343} 349}
344 350
345#else 351#else
346 352
347ECB_INLINE void 353ecb_inline void
348time_init (pTHX) 354time_init (pTHX)
349{ 355{
350 SV **svp; 356 SV **svp;
351 357
352 require_pv ("Time/HiRes.pm"); 358 require_pv ("Time/HiRes.pm");
353 359
354 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0); 360 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
355 361
356 if (!svp) croak ("Time::HiRes is required, but missing. Caught"); 362 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
357 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught"); 363 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught");
358 364
… …
394 get_hv (name, create); 400 get_hv (name, create);
395#endif 401#endif
396 return get_hv (name, create); 402 return get_hv (name, create);
397} 403}
398 404
399ECB_INLINE void 405ecb_inline void
400coro_times_update () 406coro_times_update (void)
401{ 407{
402#ifdef coro_clock_gettime 408#ifdef coro_clock_gettime
403 struct timespec ts; 409 struct timespec ts;
404 410
405 ts.tv_sec = ts.tv_nsec = 0; 411 ts.tv_sec = ts.tv_nsec = 0;
… …
417 time_real [0] = tv [0]; 423 time_real [0] = tv [0];
418 time_real [1] = tv [1] * 1000; 424 time_real [1] = tv [1] * 1000;
419#endif 425#endif
420} 426}
421 427
422ECB_INLINE void 428ecb_inline void
423coro_times_add (struct coro *c) 429coro_times_add (struct coro *c)
424{ 430{
425 c->t_real [1] += time_real [1]; 431 c->t_real [1] += time_real [1];
426 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; } 432 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
427 c->t_real [0] += time_real [0]; 433 c->t_real [0] += time_real [0];
… …
429 c->t_cpu [1] += time_cpu [1]; 435 c->t_cpu [1] += time_cpu [1];
430 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; } 436 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
431 c->t_cpu [0] += time_cpu [0]; 437 c->t_cpu [0] += time_cpu [0];
432} 438}
433 439
434ECB_INLINE void 440ecb_inline void
435coro_times_sub (struct coro *c) 441coro_times_sub (struct coro *c)
436{ 442{
437 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; } 443 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]; 444 c->t_real [1] -= time_real [1];
439 c->t_real [0] -= time_real [0]; 445 c->t_real [0] -= time_real [0];
… …
460 : 0) 466 : 0)
461 467
462#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv) 468#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) 469#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
464 470
465ECB_INLINE MAGIC * 471ecb_inline MAGIC *
466SvSTATEhv_p (pTHX_ SV *coro) 472SvSTATEhv_p (pTHX_ SV *coro)
467{ 473{
468 MAGIC *mg; 474 MAGIC *mg;
469 475
470 if (ecb_expect_true ( 476 if (ecb_expect_true (
… …
475 return mg; 481 return mg;
476 482
477 return 0; 483 return 0;
478} 484}
479 485
480ECB_INLINE struct coro * 486ecb_inline struct coro *
481SvSTATE_ (pTHX_ SV *coro) 487SvSTATE_ (pTHX_ SV *coro)
482{ 488{
483 MAGIC *mg; 489 MAGIC *mg;
484 490
485 if (SvROK (coro)) 491 if (SvROK (coro))
… …
499#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 505#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
500 506
501/*****************************************************************************/ 507/*****************************************************************************/
502/* padlist management and caching */ 508/* padlist management and caching */
503 509
504ECB_INLINE AV * 510ecb_inline PADLIST *
505coro_derive_padlist (pTHX_ CV *cv) 511coro_derive_padlist (pTHX_ CV *cv)
506{ 512{
507 AV *padlist = CvPADLIST (cv); 513 PADLIST *padlist = CvPADLIST (cv);
508 AV *newpadlist, *newpad; 514 PADLIST *newpadlist;
515 PAD *newpad;
516 PADOFFSET const off = PadlistMAX (padlist) + 1;
509 517
510 newpadlist = newAV (); 518 newPADLIST(newpadlist);
519#if !PERL_VERSION_ATLEAST(5,15,3)
520 /* Padlists are AvREAL as of 5.15.3. See perl bug #98092 and perl commit 7d953ba. */
511 AvREAL_off (newpadlist); 521 AvREAL_off (newpadlist);
522#endif
512#if PERL_VERSION_ATLEAST (5,10,0) 523#if PERL_VERSION_ATLEAST (5,10,0)
513 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1); 524 Perl_pad_push (aTHX_ padlist, off);
514#else 525#else
515 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 526 Perl_pad_push (aTHX_ padlist, off, 1);
516#endif 527#endif
517 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 528 newpad = PadlistARRAY (padlist)[off];
518 --AvFILLp (padlist); 529 PadlistMAX (padlist) = off - 1;
519 530
520 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0])); 531 /* Already extended to 2 elements by newPADLIST. */
521 av_store (newpadlist, 1, (SV *)newpad); 532 PadlistMAX (newpadlist) = 1;
533 PadlistNAMES (newpadlist) = (PADNAMELIST *)SvREFCNT_inc_NN (PadlistNAMES (padlist));
534 PadlistARRAY (newpadlist)[1] = newpad;
522 535
523 return newpadlist; 536 return newpadlist;
524} 537}
525 538
526ECB_INLINE void 539ecb_inline void
527free_padlist (pTHX_ AV *padlist) 540free_padlist (pTHX_ PADLIST *padlist)
528{ 541{
529 /* may be during global destruction */ 542 /* may be during global destruction */
530 if (!IN_DESTRUCT) 543 if (!IN_DESTRUCT)
531 { 544 {
532 I32 i = AvFILLp (padlist); 545 I32 i = PadlistMAX (padlist);
533 546
534 while (i > 0) /* special-case index 0 */ 547 while (i > 0) /* special-case index 0 */
535 { 548 {
536 /* we try to be extra-careful here */ 549 /* we try to be extra-careful here */
537 AV *av = (AV *)AvARRAY (padlist)[i--]; 550 PAD *pad = PadlistARRAY (padlist)[i--];
538 I32 j = AvFILLp (av); 551 I32 j = PadMAX (pad);
539 552
540 while (j >= 0) 553 while (j >= 0)
541 SvREFCNT_dec (AvARRAY (av)[j--]); 554 SvREFCNT_dec (PadARRAY (pad)[j--]);
542 555
543 AvFILLp (av) = -1; 556 PadMAX (pad) = -1;
544 SvREFCNT_dec (av); 557 SvREFCNT_dec (pad);
545 } 558 }
546 559
547 SvREFCNT_dec (AvARRAY (padlist)[0]); 560 SvREFCNT_dec (PadlistNAMES (padlist));
548 561
562#ifdef NEWPADAPI
563 Safefree (PadlistARRAY (padlist));
564 Safefree (padlist);
565#else
549 AvFILLp (padlist) = -1; 566 AvFILLp (padlist) = -1;
567 AvREAL_off (padlist);
550 SvREFCNT_dec ((SV*)padlist); 568 SvREFCNT_dec ((SV*)padlist);
569#endif
551 } 570 }
552} 571}
553 572
554static int 573static int
555coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 574coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
556{ 575{
557 AV *padlist; 576 PADLIST *padlist;
558 AV *av = (AV *)mg->mg_obj; 577 PADLIST **padlists = (PADLIST **)(mg->mg_ptr + sizeof(size_t));
578 size_t len = *(size_t *)mg->mg_ptr;
559 579
560 /* perl manages to free our internal AV and _then_ call us */ 580 /* perl manages to free our internal AV and _then_ call us */
561 if (IN_DESTRUCT) 581 if (IN_DESTRUCT)
562 return 0; 582 return 0;
563 583
564 /* casting is fun. */ 584 while (len--)
565 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
566 free_padlist (aTHX_ padlist); 585 free_padlist (aTHX_ padlists[len]);
567
568 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
569 586
570 return 0; 587 return 0;
571} 588}
572 589
573static MGVTBL coro_cv_vtbl = { 590static MGVTBL coro_cv_vtbl = {
574 0, 0, 0, 0, 591 0, 0, 0, 0,
575 coro_cv_free 592 coro_cv_free
576}; 593};
577 594
578/* the next two functions merely cache the padlists */ 595/* the next two functions merely cache the padlists */
579ECB_INLINE void 596ecb_inline void
580get_padlist (pTHX_ CV *cv) 597get_padlist (pTHX_ CV *cv)
581{ 598{
582 MAGIC *mg = CORO_MAGIC_cv (cv); 599 MAGIC *mg = CORO_MAGIC_cv (cv);
583 AV *av; 600 size_t *lenp;
584 601
585 if (ecb_expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 602 if (ecb_expect_true (mg && *(lenp = (size_t *)mg->mg_ptr)))
586 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 603 CvPADLIST (cv) = ((PADLIST **)(mg->mg_ptr + sizeof(size_t)))[--*lenp];
587 else 604 else
588 { 605 {
589#if CORO_PREFER_PERL_FUNCTIONS 606#if CORO_PREFER_PERL_FUNCTIONS
590 /* this is probably cleaner? but also slower! */ 607 /* this is probably cleaner? but also slower! */
591 /* in practise, it seems to be less stable */ 608 /* in practise, it seems to be less stable */
… …
597 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 614 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
598#endif 615#endif
599 } 616 }
600} 617}
601 618
602ECB_INLINE void 619ecb_inline void
603put_padlist (pTHX_ CV *cv) 620put_padlist (pTHX_ CV *cv)
604{ 621{
605 MAGIC *mg = CORO_MAGIC_cv (cv); 622 MAGIC *mg = CORO_MAGIC_cv (cv);
606 AV *av;
607 623
608 if (ecb_expect_false (!mg)) 624 if (ecb_expect_false (!mg))
625 {
609 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 626 mg = sv_magicext ((SV *)cv, 0, CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
627 Newz (0, mg->mg_ptr ,sizeof (size_t) + sizeof (PADLIST *), char);
628 mg->mg_len = 1; /* so mg_free frees mg_ptr */
629 }
630 else
631 Renew (mg->mg_ptr,
632 sizeof(size_t) + (*(size_t *)mg->mg_ptr + 1) * sizeof(PADLIST *),
633 char);
610 634
611 av = (AV *)mg->mg_obj; 635 ((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} 636}
618 637
619/** load & save, init *******************************************************/ 638/** load & save, init *******************************************************/
620 639
640ecb_inline void
641swap_sv (SV *a, SV *b)
642{
643 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
644 SV tmp;
645
646 /* swap sv_any */
647 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
648
649 /* swap sv_flags */
650 SvFLAGS (&tmp) = SvFLAGS (a);
651 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
652 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
653
654#if PERL_VERSION_ATLEAST (5,10,0)
655 /* perl 5.10 and later complicates this _quite_ a bit, but it also
656 * is much faster, so no quarrels here. alternatively, we could
657 * sv_upgrade to avoid this.
658 */
659 {
660 /* swap sv_u */
661 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
662
663 /* if SvANY points to the head, we need to adjust the pointers,
664 * as the pointer for a still points to b, and maybe vice versa.
665 */
666 #define svany_in_head(type) \
667 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
668
669 if (svany_in_head (SvTYPE (a)))
670 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
671
672 if (svany_in_head (SvTYPE (b)))
673 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
674 }
675#endif
676}
677
621/* swap sv heads, at least logically */ 678/* swap sv heads, at least logically */
622static void 679static void
623swap_svs (pTHX_ Coro__State c) 680swap_svs (pTHX_ Coro__State c)
624{ 681{
625 int i; 682 int i;
626 683
627 for (i = 0; i <= AvFILLp (c->swap_sv); ) 684 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
628 { 685 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} 686}
667 687
668#define SWAP_SVS(coro) \ 688#define SWAP_SVS(coro) \
669 if (ecb_expect_false ((coro)->swap_sv)) \ 689 if (ecb_expect_false ((coro)->swap_sv)) \
670 swap_svs (aTHX_ (coro)) 690 swap_svs (aTHX_ (coro))
… …
678 perl_slots *slot = c->slot; 698 perl_slots *slot = c->slot;
679 c->slot = 0; 699 c->slot = 0;
680 700
681 PL_mainstack = c->mainstack; 701 PL_mainstack = c->mainstack;
682 702
683 GvSV (PL_defgv) = slot->defsv; 703#if CORO_JIT
684 GvAV (PL_defgv) = slot->defav; 704 load_perl_slots (slot);
685 GvSV (PL_errgv) = slot->errsv; 705#else
686 GvSV (irsgv) = slot->irsgv;
687 GvHV (PL_hintgv) = slot->hinthv;
688
689 #define VAR(name,type) PL_ ## name = slot->name; 706 #define VARx(name,expr,type) expr = slot->name;
690 # include "state.h" 707 #include "state.h"
691 #undef VAR 708#endif
692 709
693 { 710 {
694 dSP; 711 dSP;
695 712
696 CV *cv; 713 CV *cv;
… …
698 /* now do the ugly restore mess */ 715 /* now do the ugly restore mess */
699 while (ecb_expect_true (cv = (CV *)POPs)) 716 while (ecb_expect_true (cv = (CV *)POPs))
700 { 717 {
701 put_padlist (aTHX_ cv); /* mark this padlist as available */ 718 put_padlist (aTHX_ cv); /* mark this padlist as available */
702 CvDEPTH (cv) = PTR2IV (POPs); 719 CvDEPTH (cv) = PTR2IV (POPs);
703 CvPADLIST (cv) = (AV *)POPs; 720 CvPADLIST (cv) = (PADLIST *)POPs;
704 } 721 }
705 722
706 PUTBACK; 723 PUTBACK;
707 } 724 }
708 725
… …
798 815
799 PUTBACK; 816 PUTBACK;
800 } 817 }
801 818
802 /* allocate some space on the context stack for our purposes */ 819 /* allocate some space on the context stack for our purposes */
803 if (ecb_expect_false (cxstack_ix + SLOT_COUNT >= cxstack_max)) 820 if (ecb_expect_false (cxstack_ix + (int)SLOT_COUNT >= cxstack_max))
804 { 821 {
805 unsigned int i; 822 unsigned int i;
806 823
807 for (i = 0; i < SLOT_COUNT; ++i) 824 for (i = 0; i < SLOT_COUNT; ++i)
808 CXINC; 825 CXINC;
… …
813 c->mainstack = PL_mainstack; 830 c->mainstack = PL_mainstack;
814 831
815 { 832 {
816 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 833 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
817 834
818 slot->defav = GvAV (PL_defgv); 835#if CORO_JIT
819 slot->defsv = DEFSV; 836 save_perl_slots (slot);
820 slot->errsv = ERRSV; 837#else
821 slot->irsgv = GvSV (irsgv);
822 slot->hinthv = GvHV (PL_hintgv);
823
824 #define VAR(name,type) slot->name = PL_ ## name; 838 #define VARx(name,expr,type) slot->name = expr;
825 # include "state.h" 839 #include "state.h"
826 #undef VAR 840#endif
827 } 841 }
828} 842}
829 843
830/* 844/*
831 * allocate various perl stacks. This is almost an exact copy 845 * allocate various perl stacks. This is almost an exact copy
… …
862#endif 876#endif
863 877
864 New(54,PL_scopestack,8,I32); 878 New(54,PL_scopestack,8,I32);
865 PL_scopestack_ix = 0; 879 PL_scopestack_ix = 0;
866 PL_scopestack_max = 8; 880 PL_scopestack_max = 8;
881#if HAS_SCOPESTACK_NAME
882 New(54,PL_scopestack_name,8,const char*);
883#endif
867 884
868 New(54,PL_savestack,24,ANY); 885 New(54,PL_savestack,24,ANY);
869 PL_savestack_ix = 0; 886 PL_savestack_ix = 0;
870 PL_savestack_max = 24; 887 PL_savestack_max = 24;
871 888
… …
899 } 916 }
900 917
901 Safefree (PL_tmps_stack); 918 Safefree (PL_tmps_stack);
902 Safefree (PL_markstack); 919 Safefree (PL_markstack);
903 Safefree (PL_scopestack); 920 Safefree (PL_scopestack);
921#if HAS_SCOPESTACK_NAME
922 Safefree (PL_scopestack_name);
923#endif
904 Safefree (PL_savestack); 924 Safefree (PL_savestack);
905#if !PERL_VERSION_ATLEAST (5,10,0) 925#if !PERL_VERSION_ATLEAST (5,10,0)
906 Safefree (PL_retstack); 926 Safefree (PL_retstack);
907#endif 927#endif
908} 928}
… …
968 { 988 {
969 SV **svp = 0; 989 SV **svp = 0;
970 990
971 if (strEQ (s, "__DIE__" )) svp = &PL_diehook; 991 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
972 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 992 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
973 993
974 if (svp) 994 if (svp)
975 { 995 {
976 sv_setsv (sv, *svp ? *svp : &PL_sv_undef); 996 SV *ssv;
997
998 if (!*svp)
999 ssv = &PL_sv_undef;
1000 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */
1001 ssv = sv_2mortal (newRV_inc (*svp));
1002 else
1003 ssv = *svp;
1004
1005 sv_setsv (sv, ssv);
977 return 0; 1006 return 0;
978 } 1007 }
979 } 1008 }
980 1009
981 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 1010 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
… …
1075 PL_hints = 0; 1104 PL_hints = 0;
1076 1105
1077 /* recreate the die/warn hooks */ 1106 /* recreate the die/warn hooks */
1078 PL_diehook = SvREFCNT_inc (rv_diehook); 1107 PL_diehook = SvREFCNT_inc (rv_diehook);
1079 PL_warnhook = SvREFCNT_inc (rv_warnhook); 1108 PL_warnhook = SvREFCNT_inc (rv_warnhook);
1080 1109
1081 GvSV (PL_defgv) = newSV (0); 1110 GvSV (PL_defgv) = newSV (0);
1082 GvAV (PL_defgv) = coro->args; coro->args = 0; 1111 GvAV (PL_defgv) = coro->args; coro->args = 0;
1083 GvSV (PL_errgv) = newSV (0); 1112 GvSV (PL_errgv) = newSV (0);
1084 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1113 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
1085 GvHV (PL_hintgv) = 0; 1114 GvHV (PL_hintgv) = 0;
… …
1173 /* restore swapped sv's */ 1202 /* restore swapped sv's */
1174 SWAP_SVS (coro); 1203 SWAP_SVS (coro);
1175 1204
1176 coro_destruct_stacks (aTHX); 1205 coro_destruct_stacks (aTHX);
1177 1206
1178 // now save some sv's to be free'd later 1207 /* now save some sv's to be free'd later */
1179 svf [0] = GvSV (PL_defgv); 1208 svf [0] = GvSV (PL_defgv);
1180 svf [1] = (SV *)GvAV (PL_defgv); 1209 svf [1] = (SV *)GvAV (PL_defgv);
1181 svf [2] = GvSV (PL_errgv); 1210 svf [2] = GvSV (PL_errgv);
1182 svf [3] = (SV *)PL_defoutgv; 1211 svf [3] = (SV *)PL_defoutgv;
1183 svf [4] = PL_rs; 1212 svf [4] = PL_rs;
… …
1203 SvREFCNT_dec (coro->invoke_cb); 1232 SvREFCNT_dec (coro->invoke_cb);
1204 SvREFCNT_dec (coro->invoke_av); 1233 SvREFCNT_dec (coro->invoke_av);
1205 } 1234 }
1206} 1235}
1207 1236
1208ECB_INLINE void 1237ecb_inline void
1209free_coro_mortal (pTHX) 1238free_coro_mortal (pTHX)
1210{ 1239{
1211 if (ecb_expect_true (coro_mortal)) 1240 if (ecb_expect_true (coro_mortal))
1212 { 1241 {
1213 SvREFCNT_dec ((SV *)coro_mortal); 1242 SvREFCNT_dec ((SV *)coro_mortal);
… …
1372 slf_frame.prepare = slf_prepare_set_stacklevel; 1401 slf_frame.prepare = slf_prepare_set_stacklevel;
1373 slf_frame.check = slf_check_set_stacklevel; 1402 slf_frame.check = slf_check_set_stacklevel;
1374} 1403}
1375 1404
1376/* the tail of transfer: execute stuff we can only do after a transfer */ 1405/* the tail of transfer: execute stuff we can only do after a transfer */
1377ECB_INLINE void 1406ecb_inline void
1378transfer_tail (pTHX) 1407transfer_tail (pTHX)
1379{ 1408{
1380 free_coro_mortal (aTHX); 1409 free_coro_mortal (aTHX);
1410}
1411
1412/* try to exit the same way perl's main function would do */
1413/* we do not bother resetting the environment or other things *7
1414/* that are not, uhm, essential */
1415/* this obviously also doesn't work when perl is embedded */
1416static void ecb_noinline ecb_cold
1417perlish_exit (pTHX)
1418{
1419 int exitstatus = perl_destruct (PL_curinterp);
1420 perl_free (PL_curinterp);
1421 exit (exitstatus);
1381} 1422}
1382 1423
1383/* 1424/*
1384 * this is a _very_ stripped down perl interpreter ;) 1425 * this is a _very_ stripped down perl interpreter ;)
1385 */ 1426 */
… …
1414 */ 1455 */
1415 1456
1416 /* 1457 /*
1417 * If perl-run returns we assume exit() was being called or the coro 1458 * 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) 1459 * 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 1460 * 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" 1461 * 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 */ 1462 */
1425 PL_top_env = main_top_env; 1463 perlish_exit (aTHX);
1426 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1427 } 1464 }
1428} 1465}
1429 1466
1430static coro_cctx * 1467static coro_cctx *
1431cctx_new () 1468cctx_new (void)
1432{ 1469{
1433 coro_cctx *cctx; 1470 coro_cctx *cctx;
1434 1471
1435 ++cctx_count; 1472 ++cctx_count;
1436 New (0, cctx, 1, coro_cctx); 1473 New (0, cctx, 1, coro_cctx);
… …
1442 return cctx; 1479 return cctx;
1443} 1480}
1444 1481
1445/* create a new cctx only suitable as source */ 1482/* create a new cctx only suitable as source */
1446static coro_cctx * 1483static coro_cctx *
1447cctx_new_empty () 1484cctx_new_empty (void)
1448{ 1485{
1449 coro_cctx *cctx = cctx_new (); 1486 coro_cctx *cctx = cctx_new ();
1450 1487
1451 cctx->sptr = 0; 1488 cctx->stack.sptr = 0;
1452 coro_create (&cctx->cctx, 0, 0, 0, 0); 1489 coro_create (&cctx->cctx, 0, 0, 0, 0);
1453 1490
1454 return cctx; 1491 return cctx;
1455} 1492}
1456 1493
1457/* create a new cctx suitable as destination/running a perl interpreter */ 1494/* create a new cctx suitable as destination/running a perl interpreter */
1458static coro_cctx * 1495static coro_cctx *
1459cctx_new_run () 1496cctx_new_run (void)
1460{ 1497{
1461 coro_cctx *cctx = cctx_new (); 1498 coro_cctx *cctx = cctx_new ();
1462 void *stack_start;
1463 size_t stack_size;
1464 1499
1465#if HAVE_MMAP 1500 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 } 1501 {
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."); 1502 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1488 _exit (EXIT_FAILURE); 1503 _exit (EXIT_FAILURE);
1489 }
1490
1491 stack_start = cctx->sptr;
1492 stack_size = cctx->ssize;
1493 } 1504 }
1494 1505
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); 1506 coro_create (&cctx->cctx, cctx_run, (void *)cctx, cctx->stack.sptr, cctx->stack.ssze);
1500 1507
1501 return cctx; 1508 return cctx;
1502} 1509}
1503 1510
1504static void 1511static void
… …
1510 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current)); 1517 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1511 1518
1512 --cctx_count; 1519 --cctx_count;
1513 coro_destroy (&cctx->cctx); 1520 coro_destroy (&cctx->cctx);
1514 1521
1515 /* coro_transfer creates new, empty cctx's */ 1522 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 1523
1530 Safefree (cctx); 1524 Safefree (cctx);
1531} 1525}
1532 1526
1533/* wether this cctx should be destructed */ 1527/* wether this cctx should be destructed */
… …
1552} 1546}
1553 1547
1554static void 1548static void
1555cctx_put (coro_cctx *cctx) 1549cctx_put (coro_cctx *cctx)
1556{ 1550{
1557 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1551 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->stack.sptr));
1558 1552
1559 /* free another cctx if overlimit */ 1553 /* free another cctx if overlimit */
1560 if (ecb_expect_false (cctx_idle >= cctx_max_idle)) 1554 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1561 { 1555 {
1562 coro_cctx *first = cctx_first; 1556 coro_cctx *first = cctx_first;
… …
1688 return; 1682 return;
1689 1683
1690 slf_destroy (aTHX_ coro); 1684 slf_destroy (aTHX_ coro);
1691 1685
1692 coro->flags |= CF_ZOMBIE; 1686 coro->flags |= CF_ZOMBIE;
1693 1687
1694 if (coro->flags & CF_READY) 1688 if (coro->flags & CF_READY)
1695 { 1689 {
1696 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1690 /* reduce nready, as destroying a ready coro effectively unreadies it */
1697 /* alternative: look through all ready queues and remove the coro */ 1691 /* alternative: look through all ready queues and remove the coro */
1698 --coro_nready; 1692 --coro_nready;
… …
1775 TRANSFER (ta, 1); 1769 TRANSFER (ta, 1);
1776} 1770}
1777 1771
1778/** Coro ********************************************************************/ 1772/** Coro ********************************************************************/
1779 1773
1780ECB_INLINE void 1774ecb_inline void
1781coro_enq (pTHX_ struct coro *coro) 1775coro_enq (pTHX_ struct coro *coro)
1782{ 1776{
1783 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN]; 1777 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1784 1778
1785 SvREFCNT_inc_NN (coro->hv); 1779 SvREFCNT_inc_NN (coro->hv);
… …
1787 coro->next_ready = 0; 1781 coro->next_ready = 0;
1788 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro; 1782 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1789 ready [1] = coro; 1783 ready [1] = coro;
1790} 1784}
1791 1785
1792ECB_INLINE struct coro * 1786ecb_inline struct coro *
1793coro_deq (pTHX) 1787coro_deq (pTHX)
1794{ 1788{
1795 int prio; 1789 int prio;
1796 1790
1797 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; ) 1791 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
… …
1850{ 1844{
1851 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1845 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1852} 1846}
1853 1847
1854/* expects to own a reference to next->hv */ 1848/* expects to own a reference to next->hv */
1855ECB_INLINE void 1849ecb_inline void
1856prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1850prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1857{ 1851{
1858 SV *prev_sv = SvRV (coro_current); 1852 SV *prev_sv = SvRV (coro_current);
1859 1853
1860 ta->prev = SvSTATE_hv (prev_sv); 1854 ta->prev = SvSTATE_hv (prev_sv);
… …
1919 } 1913 }
1920 } 1914 }
1921 } 1915 }
1922} 1916}
1923 1917
1924ECB_INLINE void 1918ecb_inline void
1925prepare_cede (pTHX_ struct coro_transfer_args *ta) 1919prepare_cede (pTHX_ struct coro_transfer_args *ta)
1926{ 1920{
1927 api_ready (aTHX_ coro_current); 1921 api_ready (aTHX_ coro_current);
1928 prepare_schedule (aTHX_ ta); 1922 prepare_schedule (aTHX_ ta);
1929} 1923}
1930 1924
1931ECB_INLINE void 1925ecb_inline void
1932prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 1926prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1933{ 1927{
1934 SV *prev = SvRV (coro_current); 1928 SV *prev = SvRV (coro_current);
1935 1929
1936 if (coro_nready) 1930 if (coro_nready)
… …
2131 2125
2132static void 2126static void
2133coro_set_status (pTHX_ struct coro *coro, SV **arg, int items) 2127coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
2134{ 2128{
2135 AV *av; 2129 AV *av;
2136 2130
2137 if (coro->status) 2131 if (coro->status)
2138 { 2132 {
2139 av = coro->status; 2133 av = coro->status;
2140 av_clear (av); 2134 av_clear (av);
2141 } 2135 }
… …
2188 2182
2189 coro = SvSTATE (arg [0]); 2183 coro = SvSTATE (arg [0]);
2190 coro_hv = coro->hv; 2184 coro_hv = coro->hv;
2191 2185
2192 coro_set_status (aTHX_ coro, arg + 1, items - 1); 2186 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2193 2187
2194 if (ecb_expect_false (coro->flags & CF_NOCANCEL)) 2188 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2195 { 2189 {
2196 /* coro currently busy cancelling something, so just notify it */ 2190 /* coro currently busy cancelling something, so just notify it */
2197 coro->slf_frame.data = (void *)coro; 2191 coro->slf_frame.data = (void *)coro;
2198 2192
… …
2377 2371
2378static int 2372static int
2379slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2373slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
2380{ 2374{
2381 SV *data = (SV *)frame->data; 2375 SV *data = (SV *)frame->data;
2382 2376
2383 if (CORO_THROW) 2377 if (CORO_THROW)
2384 return 0; 2378 return 0;
2385 2379
2386 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2380 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2387 return 1; 2381 return 1;
… …
2423 cb = sv_2mortal (coro->rouse_cb); 2417 cb = sv_2mortal (coro->rouse_cb);
2424 coro->rouse_cb = 0; 2418 coro->rouse_cb = 0;
2425 } 2419 }
2426 2420
2427 if (!SvROK (cb) 2421 if (!SvROK (cb)
2428 || SvTYPE (SvRV (cb)) != SVt_PVCV 2422 || SvTYPE (SvRV (cb)) != SVt_PVCV
2429 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2423 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2430 croak ("Coro::rouse_wait called with illegal callback argument,"); 2424 croak ("Coro::rouse_wait called with illegal callback argument,");
2431 2425
2432 { 2426 {
2433 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */ 2427 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
… …
2936 { 2930 {
2937 int i; 2931 int i;
2938 /* if we were woken up but can't down, we look through the whole */ 2932 /* 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 */ 2933 /* waiters list and only add us if we aren't in there already */
2940 /* this avoids some degenerate memory usage cases */ 2934 /* this avoids some degenerate memory usage cases */
2941 for (i = AvFILLp (av); i > 0; --i) // i > 0 is not an off-by-one bug 2935 for (i = AvFILLp (av); i > 0; --i) /* i > 0 is not an off-by-one bug */
2942 if (AvARRAY (av)[i] == coro_hv) 2936 if (AvARRAY (av)[i] == coro_hv)
2943 return 1; 2937 return 1;
2944 2938
2945 av_push (av, SvREFCNT_inc (coro_hv)); 2939 av_push (av, SvREFCNT_inc (coro_hv));
2946 return 1; 2940 return 1;
… …
3323 3317
3324#ifndef __cplusplus 3318#ifndef __cplusplus
3325ecb_cold XS(boot_Coro__State); 3319ecb_cold XS(boot_Coro__State);
3326#endif 3320#endif
3327 3321
3322#if CORO_JIT
3323
3324static void ecb_noinline ecb_cold
3325pushav_4uv (pTHX_ UV a, UV b, UV c, UV d)
3326{
3327 dSP;
3328 AV *av = newAV ();
3329
3330 av_store (av, 3, newSVuv (d));
3331 av_store (av, 2, newSVuv (c));
3332 av_store (av, 1, newSVuv (b));
3333 av_store (av, 0, newSVuv (a));
3334
3335 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
3336
3337 PUTBACK;
3338}
3339
3340static void ecb_noinline ecb_cold
3341jit_init (pTHX)
3342{
3343 dSP;
3344 SV *load, *save;
3345 char *map_base;
3346 char *load_ptr, *save_ptr;
3347 STRLEN load_len, save_len, map_len;
3348 int count;
3349
3350 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3351
3352 PUSHMARK (SP);
3353 #define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type));
3354 #include "state.h"
3355 count = call_pv ("Coro::State::_jit", G_ARRAY);
3356 SPAGAIN;
3357
3358 save = POPs; save_ptr = SvPVbyte (save, save_len);
3359 load = POPs; load_ptr = SvPVbyte (load, load_len);
3360
3361 map_len = load_len + save_len + 16;
3362
3363 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3364
3365 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3366
3367 load_perl_slots = (load_save_perl_slots_type)map_base;
3368 memcpy (map_base, load_ptr, load_len);
3369
3370 map_base += (load_len + 15) & ~15;
3371
3372 save_perl_slots = (load_save_perl_slots_type)map_base;
3373 memcpy (map_base, save_ptr, save_len);
3374
3375 /* we are good citizens and try to make the page read-only, so the evil evil */
3376 /* hackers might have it a bit more difficult */
3377 mprotect (map_base, map_len, PROT_READ | PROT_EXEC);
3378
3379 PUTBACK;
3380 eval_pv ("undef &Coro::State::_jit", 1);
3381}
3382
3383#endif
3384
3328MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3385MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
3329 3386
3330PROTOTYPES: DISABLE 3387PROTOTYPES: DISABLE
3331 3388
3332BOOT: 3389BOOT:
… …
3334#ifdef USE_ITHREADS 3391#ifdef USE_ITHREADS
3335# if CORO_PTHREAD 3392# if CORO_PTHREAD
3336 coro_thx = PERL_GET_CONTEXT; 3393 coro_thx = PERL_GET_CONTEXT;
3337# endif 3394# endif
3338#endif 3395#endif
3339 BOOT_PAGESIZE; 3396 /* perl defines these to check for existance first, but why it doesn't */
3397 /* just create them one at init time is not clear to me, except for */
3398 /* programs trying to delete them, but... */
3399 /* anyway, we declare this as invalid and make sure they are initialised here */
3400 DEFSV;
3401 ERRSV;
3340 3402
3341 cctx_current = cctx_new_empty (); 3403 cctx_current = cctx_new_empty ();
3342 3404
3343 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3405 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
3344 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3406 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
… …
3387 coroapi.prepare_cede_notself = prepare_cede_notself; 3449 coroapi.prepare_cede_notself = prepare_cede_notself;
3388 3450
3389 time_init (aTHX); 3451 time_init (aTHX);
3390 3452
3391 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL)); 3453 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3454#if CORO_JIT
3455 PUTBACK;
3456 jit_init (aTHX);
3457 SPAGAIN;
3458#endif
3392} 3459}
3393 3460
3394SV * 3461SV *
3395new (SV *klass, ...) 3462new (SV *klass, ...)
3396 ALIAS: 3463 ALIAS:
… …
3473void 3540void
3474list () 3541list ()
3475 PROTOTYPE: 3542 PROTOTYPE:
3476 PPCODE: 3543 PPCODE:
3477{ 3544{
3478 struct coro *coro; 3545 struct coro *coro;
3479 for (coro = coro_first; coro; coro = coro->next) 3546 for (coro = coro_first; coro; coro = coro->next)
3480 if (coro->hv) 3547 if (coro->hv)
3481 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 3548 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
3482} 3549}
3483 3550
… …
3547 RETVAL = boolSV (coro->flags & ix); 3614 RETVAL = boolSV (coro->flags & ix);
3548 OUTPUT: 3615 OUTPUT:
3549 RETVAL 3616 RETVAL
3550 3617
3551void 3618void
3552throw (Coro::State self, SV *exception = &PL_sv_undef) 3619throw (SV *self, SV *exception = &PL_sv_undef)
3553 PROTOTYPE: $;$ 3620 PROTOTYPE: $;$
3554 CODE: 3621 CODE:
3555{ 3622{
3623 struct coro *coro = SvSTATE (self);
3556 struct coro *current = SvSTATE_current; 3624 struct coro *current = SvSTATE_current;
3557 SV **exceptionp = self == current ? &CORO_THROW : &self->except; 3625 SV **exceptionp = coro == current ? &CORO_THROW : &coro->except;
3558 SvREFCNT_dec (*exceptionp); 3626 SvREFCNT_dec (*exceptionp);
3559 SvGETMAGIC (exception); 3627 SvGETMAGIC (exception);
3560 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0; 3628 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3629
3630 api_ready (aTHX_ self);
3561} 3631}
3562 3632
3563void 3633void
3564api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3634api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3565 PROTOTYPE: $;$ 3635 PROTOTYPE: $;$
… …
3642 3712
3643void 3713void
3644times (Coro::State self) 3714times (Coro::State self)
3645 PPCODE: 3715 PPCODE:
3646{ 3716{
3647 struct coro *current = SvSTATE (coro_current); 3717 struct coro *current = SvSTATE (coro_current);
3648 3718
3649 if (ecb_expect_false (current == self)) 3719 if (ecb_expect_false (current == self))
3650 { 3720 {
3651 coro_times_update (); 3721 coro_times_update ();
3652 coro_times_add (SvSTATE (coro_current)); 3722 coro_times_add (SvSTATE (coro_current));
… …
3695 3765
3696 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3766 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); 3767 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); 3768 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 */ 3769 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3700 3770
3701 coro_stash = gv_stashpv ("Coro", TRUE); 3771 coro_stash = gv_stashpv ("Coro", TRUE);
3702 3772
3703 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 3773 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3704 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 3774 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3705 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL)); 3775 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
… …
3927 on_leave = 1 3997 on_leave = 1
3928 PROTOTYPE: & 3998 PROTOTYPE: &
3929 CODE: 3999 CODE:
3930{ 4000{
3931 struct coro *coro = SvSTATE_current; 4001 struct coro *coro = SvSTATE_current;
3932 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 4002 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3933 4003
3934 block = s_get_cv_croak (block); 4004 block = s_get_cv_croak (block);
3935 4005
3936 if (!*avp) 4006 if (!*avp)
3937 *avp = newAV (); 4007 *avp = newAV ();
… …
3957 4027
3958SV * 4028SV *
3959new (SV *klass, SV *count = 0) 4029new (SV *klass, SV *count = 0)
3960 CODE: 4030 CODE:
3961{ 4031{
3962 int semcnt = 1; 4032 int semcnt = 1;
3963 4033
3964 if (count) 4034 if (count)
3965 { 4035 {
3966 SvGETMAGIC (count); 4036 SvGETMAGIC (count);
3967 4037
… …
4027 XSRETURN_NO; 4097 XSRETURN_NO;
4028} 4098}
4029 4099
4030void 4100void
4031waiters (SV *self) 4101waiters (SV *self)
4032 PPCODE: 4102 PPCODE:
4033{ 4103{
4034 AV *av = (AV *)SvRV (self); 4104 AV *av = (AV *)SvRV (self);
4035 int wcount = AvFILLp (av) + 1 - 1; 4105 int wcount = AvFILLp (av) + 1 - 1;
4036 4106
4037 if (GIMME_V == G_SCALAR) 4107 if (GIMME_V == G_SCALAR)
… …
4046} 4116}
4047 4117
4048MODULE = Coro::State PACKAGE = Coro::SemaphoreSet 4118MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
4049 4119
4050void 4120void
4051_may_delete (SV *sem, int count, int extra_refs) 4121_may_delete (SV *sem, int count, unsigned int extra_refs)
4052 PPCODE: 4122 PPCODE:
4053{ 4123{
4054 AV *av = (AV *)SvRV (sem); 4124 AV *av = (AV *)SvRV (sem);
4055 4125
4056 if (SvREFCNT ((SV *)av) == 1 + extra_refs 4126 if (SvREFCNT ((SV *)av) == 1 + extra_refs
4057 && AvFILLp (av) == 0 /* no waiters, just count */ 4127 && AvFILLp (av) == 0 /* no waiters, just count */
4058 && SvIV (AvARRAY (av)[0]) == count) 4128 && SvIV (AvARRAY (av)[0]) == count)
4059 XSRETURN_YES; 4129 XSRETURN_YES;
… …
4080 4150
4081void 4151void
4082broadcast (SV *self) 4152broadcast (SV *self)
4083 CODE: 4153 CODE:
4084{ 4154{
4085 AV *av = (AV *)SvRV (self); 4155 AV *av = (AV *)SvRV (self);
4086 coro_signal_wake (aTHX_ av, AvFILLp (av)); 4156 coro_signal_wake (aTHX_ av, AvFILLp (av));
4087} 4157}
4088 4158
4089void 4159void
4090send (SV *self) 4160send (SV *self)
… …
4098 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */ 4168 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
4099} 4169}
4100 4170
4101IV 4171IV
4102awaited (SV *self) 4172awaited (SV *self)
4103 CODE: 4173 CODE:
4104 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1; 4174 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
4105 OUTPUT: 4175 OUTPUT:
4106 RETVAL 4176 RETVAL
4107 4177
4108 4178
… …
4113 4183
4114void 4184void
4115_schedule (...) 4185_schedule (...)
4116 CODE: 4186 CODE:
4117{ 4187{
4118 static int incede; 4188 static int incede;
4119 4189
4120 api_cede_notself (aTHX); 4190 api_cede_notself (aTHX);
4121 4191
4122 ++incede; 4192 ++incede;
4123 while (coro_nready >= incede && api_cede (aTHX)) 4193 while (coro_nready >= incede && api_cede (aTHX))

Diff Legend

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