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.410 by root, Sun Jun 12 08:14:12 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#if 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
… …
97# if CORO_PTHREAD 85# if CORO_PTHREAD
98static void *coro_thx; 86static void *coro_thx;
99# endif 87# endif
100#endif 88#endif
101 89
102/* used in state.h */
103#define VAR(name,type) VARx(name, PL_ ## name, type)
104
105#ifdef __linux 90#ifdef __linux
106# include <time.h> /* for timespec */ 91# include <time.h> /* for timespec */
107# include <syscall.h> /* for SYS_* */ 92# include <syscall.h> /* for SYS_* */
108# ifdef SYS_clock_gettime 93# ifdef SYS_clock_gettime
109# define coro_clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts)) 94# define coro_clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
… …
172typedef struct coro_cctx 157typedef struct coro_cctx
173{ 158{
174 struct coro_cctx *next; 159 struct coro_cctx *next;
175 160
176 /* the stack */ 161 /* the stack */
177 void *sptr; 162 struct coro_stack stack;
178 size_t ssize;
179 163
180 /* cpu state */ 164 /* cpu state */
181 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
182 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
183 JMPENV *top_env; 169 JMPENV *top_env;
184 coro_context cctx; 170 coro_context cctx;
185 171
186 U32 gen; 172 U32 gen;
187#if CORO_USE_VALGRIND 173#if CORO_USE_VALGRIND
… …
207}; 193};
208 194
209/* 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 */
210typedef struct 196typedef struct
211{ 197{
212#define VARx(name,expr,type) type name; 198 #define VARx(name,expr,type) type name;
213# include "state.h" 199 #include "state.h"
214#undef VARx
215} perl_slots; 200} perl_slots;
216 201
217/* how many context stack entries do we need for perl_slots */ 202/* how many context stack entries do we need for perl_slots */
218#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))
219 204
… …
291#define coro_nready coroapi.nready 276#define coro_nready coroapi.nready
292 277
293/** JIT *********************************************************************/ 278/** JIT *********************************************************************/
294 279
295#if CORO_JIT 280#if CORO_JIT
296 /* APPLE doesn't have HAVE_MMAP though */ 281 /* APPLE doesn't have mmap though */
297 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__) 282 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__)
298 #ifndef CORO_JIT_TYPE 283 #ifndef CORO_JIT_TYPE
299 #if __x86_64 && CORO_JIT_UNIXY 284 #if __x86_64 && CORO_JIT_UNIXY
300 #define CORO_JIT_TYPE "amd64-unix" 285 #define CORO_JIT_TYPE "amd64-unix"
301 #elif __i386 && CORO_JIT_UNIXY 286 #elif __i386 && CORO_JIT_UNIXY
302 #define CORO_JIT_TYPE "x86-unix" 287 #define CORO_JIT_TYPE "x86-unix"
303 #endif 288 #endif
304 #endif 289 #endif
305#endif 290#endif
306 291
307#if !defined(CORO_JIT_TYPE) || !HAVE_MMAP 292#if !defined(CORO_JIT_TYPE) || _POSIX_MEMORY_PROTECTION <= 0
308 #undef CORO_JIT 293 #undef CORO_JIT
309#endif 294#endif
310 295
311#if CORO_JIT 296#if CORO_JIT
312 typedef void (*load_save_perl_slots_type)(perl_slots *); 297 typedef void (*load_save_perl_slots_type)(perl_slots *);
… …
335 320
336/** time stuff **************************************************************/ 321/** time stuff **************************************************************/
337 322
338#ifdef HAS_GETTIMEOFDAY 323#ifdef HAS_GETTIMEOFDAY
339 324
340ECB_INLINE void 325ecb_inline void
341coro_u2time (pTHX_ UV ret[2]) 326coro_u2time (pTHX_ UV ret[2])
342{ 327{
343 struct timeval tv; 328 struct timeval tv;
344 gettimeofday (&tv, 0); 329 gettimeofday (&tv, 0);
345 330
346 ret [0] = tv.tv_sec; 331 ret [0] = tv.tv_sec;
347 ret [1] = tv.tv_usec; 332 ret [1] = tv.tv_usec;
348} 333}
349 334
350ECB_INLINE double 335ecb_inline double
351coro_nvtime (void) 336coro_nvtime (void)
352{ 337{
353 struct timeval tv; 338 struct timeval tv;
354 gettimeofday (&tv, 0); 339 gettimeofday (&tv, 0);
355 340
356 return tv.tv_sec + tv.tv_usec * 1e-6; 341 return tv.tv_sec + tv.tv_usec * 1e-6;
357} 342}
358 343
359ECB_INLINE void 344ecb_inline void
360time_init (pTHX) 345time_init (pTHX)
361{ 346{
362 nvtime = coro_nvtime; 347 nvtime = coro_nvtime;
363 u2time = coro_u2time; 348 u2time = coro_u2time;
364} 349}
365 350
366#else 351#else
367 352
368ECB_INLINE void 353ecb_inline void
369time_init (pTHX) 354time_init (pTHX)
370{ 355{
371 SV **svp; 356 SV **svp;
372 357
373 require_pv ("Time/HiRes.pm"); 358 require_pv ("Time/HiRes.pm");
374 359
375 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0); 360 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
376 361
377 if (!svp) croak ("Time::HiRes is required, but missing. Caught"); 362 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
378 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");
379 364
… …
415 get_hv (name, create); 400 get_hv (name, create);
416#endif 401#endif
417 return get_hv (name, create); 402 return get_hv (name, create);
418} 403}
419 404
420ECB_INLINE void 405ecb_inline void
421coro_times_update (void) 406coro_times_update (void)
422{ 407{
423#ifdef coro_clock_gettime 408#ifdef coro_clock_gettime
424 struct timespec ts; 409 struct timespec ts;
425 410
… …
438 time_real [0] = tv [0]; 423 time_real [0] = tv [0];
439 time_real [1] = tv [1] * 1000; 424 time_real [1] = tv [1] * 1000;
440#endif 425#endif
441} 426}
442 427
443ECB_INLINE void 428ecb_inline void
444coro_times_add (struct coro *c) 429coro_times_add (struct coro *c)
445{ 430{
446 c->t_real [1] += time_real [1]; 431 c->t_real [1] += time_real [1];
447 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]; }
448 c->t_real [0] += time_real [0]; 433 c->t_real [0] += time_real [0];
… …
450 c->t_cpu [1] += time_cpu [1]; 435 c->t_cpu [1] += time_cpu [1];
451 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]; }
452 c->t_cpu [0] += time_cpu [0]; 437 c->t_cpu [0] += time_cpu [0];
453} 438}
454 439
455ECB_INLINE void 440ecb_inline void
456coro_times_sub (struct coro *c) 441coro_times_sub (struct coro *c)
457{ 442{
458 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]; }
459 c->t_real [1] -= time_real [1]; 444 c->t_real [1] -= time_real [1];
460 c->t_real [0] -= time_real [0]; 445 c->t_real [0] -= time_real [0];
… …
481 : 0) 466 : 0)
482 467
483#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)
484#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)
485 470
486ECB_INLINE MAGIC * 471ecb_inline MAGIC *
487SvSTATEhv_p (pTHX_ SV *coro) 472SvSTATEhv_p (pTHX_ SV *coro)
488{ 473{
489 MAGIC *mg; 474 MAGIC *mg;
490 475
491 if (ecb_expect_true ( 476 if (ecb_expect_true (
… …
496 return mg; 481 return mg;
497 482
498 return 0; 483 return 0;
499} 484}
500 485
501ECB_INLINE struct coro * 486ecb_inline struct coro *
502SvSTATE_ (pTHX_ SV *coro) 487SvSTATE_ (pTHX_ SV *coro)
503{ 488{
504 MAGIC *mg; 489 MAGIC *mg;
505 490
506 if (SvROK (coro)) 491 if (SvROK (coro))
… …
520#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 505#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
521 506
522/*****************************************************************************/ 507/*****************************************************************************/
523/* padlist management and caching */ 508/* padlist management and caching */
524 509
525ECB_INLINE AV * 510ecb_inline PADLIST *
526coro_derive_padlist (pTHX_ CV *cv) 511coro_derive_padlist (pTHX_ CV *cv)
527{ 512{
528 AV *padlist = CvPADLIST (cv); 513 PADLIST *padlist = CvPADLIST (cv);
529 AV *newpadlist, *newpad; 514 PADLIST *newpadlist;
515 PAD *newpad;
516 PADOFFSET const off = PadlistMAX (padlist) + 1;
530 517
531 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. */
532 AvREAL_off (newpadlist); 521 AvREAL_off (newpadlist);
522#endif
533#if PERL_VERSION_ATLEAST (5,10,0) 523#if PERL_VERSION_ATLEAST (5,10,0)
534 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1); 524 Perl_pad_push (aTHX_ padlist, off);
535#else 525#else
536 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 526 Perl_pad_push (aTHX_ padlist, off, 1);
537#endif 527#endif
538 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 528 newpad = PadlistARRAY (padlist)[off];
539 --AvFILLp (padlist); 529 PadlistMAX (padlist) = off - 1;
540 530
541 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0])); 531 /* Already extended to 2 elements by newPADLIST. */
542 av_store (newpadlist, 1, (SV *)newpad); 532 PadlistMAX (newpadlist) = 1;
533 PadlistNAMES (newpadlist) = (PADNAMELIST *)SvREFCNT_inc_NN (PadlistNAMES (padlist));
534 PadlistARRAY (newpadlist)[1] = newpad;
543 535
544 return newpadlist; 536 return newpadlist;
545} 537}
546 538
547ECB_INLINE void 539ecb_inline void
548free_padlist (pTHX_ AV *padlist) 540free_padlist (pTHX_ PADLIST *padlist)
549{ 541{
550 /* may be during global destruction */ 542 /* may be during global destruction */
551 if (!IN_DESTRUCT) 543 if (!IN_DESTRUCT)
552 { 544 {
553 I32 i = AvFILLp (padlist); 545 I32 i = PadlistMAX (padlist);
554 546
555 while (i > 0) /* special-case index 0 */ 547 while (i > 0) /* special-case index 0 */
556 { 548 {
557 /* we try to be extra-careful here */ 549 /* we try to be extra-careful here */
558 AV *av = (AV *)AvARRAY (padlist)[i--]; 550 PAD *pad = PadlistARRAY (padlist)[i--];
559 I32 j = AvFILLp (av); 551 I32 j = PadMAX (pad);
560 552
561 while (j >= 0) 553 while (j >= 0)
562 SvREFCNT_dec (AvARRAY (av)[j--]); 554 SvREFCNT_dec (PadARRAY (pad)[j--]);
563 555
564 AvFILLp (av) = -1; 556 PadMAX (pad) = -1;
565 SvREFCNT_dec (av); 557 SvREFCNT_dec (pad);
566 } 558 }
567 559
568 SvREFCNT_dec (AvARRAY (padlist)[0]); 560 SvREFCNT_dec (PadlistNAMES (padlist));
569 561
562#ifdef NEWPADAPI
563 Safefree (PadlistARRAY (padlist));
564 Safefree (padlist);
565#else
570 AvFILLp (padlist) = -1; 566 AvFILLp (padlist) = -1;
567 AvREAL_off (padlist);
571 SvREFCNT_dec ((SV*)padlist); 568 SvREFCNT_dec ((SV*)padlist);
569#endif
572 } 570 }
573} 571}
574 572
575static int 573static int
576coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 574coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
577{ 575{
578 AV *padlist; 576 PADLIST *padlist;
579 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;
580 579
581 /* perl manages to free our internal AV and _then_ call us */ 580 /* perl manages to free our internal AV and _then_ call us */
582 if (IN_DESTRUCT) 581 if (IN_DESTRUCT)
583 return 0; 582 return 0;
584 583
585 /* casting is fun. */ 584 while (len--)
586 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
587 free_padlist (aTHX_ padlist); 585 free_padlist (aTHX_ padlists[len]);
588
589 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
590 586
591 return 0; 587 return 0;
592} 588}
593 589
594static MGVTBL coro_cv_vtbl = { 590static MGVTBL coro_cv_vtbl = {
595 0, 0, 0, 0, 591 0, 0, 0, 0,
596 coro_cv_free 592 coro_cv_free
597}; 593};
598 594
599/* the next two functions merely cache the padlists */ 595/* the next two functions merely cache the padlists */
600ECB_INLINE void 596ecb_inline void
601get_padlist (pTHX_ CV *cv) 597get_padlist (pTHX_ CV *cv)
602{ 598{
603 MAGIC *mg = CORO_MAGIC_cv (cv); 599 MAGIC *mg = CORO_MAGIC_cv (cv);
604 AV *av; 600 size_t *lenp;
605 601
606 if (ecb_expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 602 if (ecb_expect_true (mg && *(lenp = (size_t *)mg->mg_ptr)))
607 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 603 CvPADLIST (cv) = ((PADLIST **)(mg->mg_ptr + sizeof(size_t)))[--*lenp];
608 else 604 else
609 { 605 {
610#if CORO_PREFER_PERL_FUNCTIONS 606#if CORO_PREFER_PERL_FUNCTIONS
611 /* this is probably cleaner? but also slower! */ 607 /* this is probably cleaner? but also slower! */
612 /* in practise, it seems to be less stable */ 608 /* in practise, it seems to be less stable */
… …
618 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 614 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
619#endif 615#endif
620 } 616 }
621} 617}
622 618
623ECB_INLINE void 619ecb_inline void
624put_padlist (pTHX_ CV *cv) 620put_padlist (pTHX_ CV *cv)
625{ 621{
626 MAGIC *mg = CORO_MAGIC_cv (cv); 622 MAGIC *mg = CORO_MAGIC_cv (cv);
627 AV *av;
628 623
629 if (ecb_expect_false (!mg)) 624 if (ecb_expect_false (!mg))
625 {
630 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);
631 634
632 av = (AV *)mg->mg_obj; 635 ((PADLIST **)(mg->mg_ptr + sizeof (size_t))) [(*(size_t *)mg->mg_ptr)++] = CvPADLIST (cv);
633
634 if (ecb_expect_false (AvFILLp (av) >= AvMAX (av)))
635 av_extend (av, AvFILLp (av) + 1);
636
637 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
638} 636}
639 637
640/** load & save, init *******************************************************/ 638/** load & save, init *******************************************************/
641 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
642/* swap sv heads, at least logically */ 678/* swap sv heads, at least logically */
643static void 679static void
644swap_svs (pTHX_ Coro__State c) 680swap_svs (pTHX_ Coro__State c)
645{ 681{
646 int i; 682 int i;
647 683
648 for (i = 0; i <= AvFILLp (c->swap_sv); ) 684 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
649 { 685 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
650 SV *a = AvARRAY (c->swap_sv)[i++];
651 SV *b = AvARRAY (c->swap_sv)[i++];
652
653 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
654 SV tmp;
655
656 /* swap sv_any */
657 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
658
659 /* swap sv_flags */
660 SvFLAGS (&tmp) = SvFLAGS (a);
661 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
662 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
663
664#if PERL_VERSION_ATLEAST (5,10,0)
665 /* perl 5.10 complicates this _quite_ a bit, but it also is
666 * much faster, so no quarrels here. alternatively, we could
667 * sv_upgrade to avoid this.
668 */
669 {
670 /* swap sv_u */
671 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
672
673 /* if SvANY points to the head, we need to adjust the pointers,
674 * as the pointer for a still points to b, and maybe vice versa.
675 */
676 #define svany_in_head(type) \
677 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
678
679 if (svany_in_head (SvTYPE (a)))
680 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
681
682 if (svany_in_head (SvTYPE (b)))
683 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
684 }
685#endif
686 }
687} 686}
688 687
689#define SWAP_SVS(coro) \ 688#define SWAP_SVS(coro) \
690 if (ecb_expect_false ((coro)->swap_sv)) \ 689 if (ecb_expect_false ((coro)->swap_sv)) \
691 swap_svs (aTHX_ (coro)) 690 swap_svs (aTHX_ (coro))
… …
703 702
704#if CORO_JIT 703#if CORO_JIT
705 load_perl_slots (slot); 704 load_perl_slots (slot);
706#else 705#else
707 #define VARx(name,expr,type) expr = slot->name; 706 #define VARx(name,expr,type) expr = slot->name;
708 # include "state.h" 707 #include "state.h"
709 #undef VARx
710#endif 708#endif
711 709
712 { 710 {
713 dSP; 711 dSP;
714 712
… …
717 /* now do the ugly restore mess */ 715 /* now do the ugly restore mess */
718 while (ecb_expect_true (cv = (CV *)POPs)) 716 while (ecb_expect_true (cv = (CV *)POPs))
719 { 717 {
720 put_padlist (aTHX_ cv); /* mark this padlist as available */ 718 put_padlist (aTHX_ cv); /* mark this padlist as available */
721 CvDEPTH (cv) = PTR2IV (POPs); 719 CvDEPTH (cv) = PTR2IV (POPs);
722 CvPADLIST (cv) = (AV *)POPs; 720 CvPADLIST (cv) = (PADLIST *)POPs;
723 } 721 }
724 722
725 PUTBACK; 723 PUTBACK;
726 } 724 }
727 725
… …
817 815
818 PUTBACK; 816 PUTBACK;
819 } 817 }
820 818
821 /* allocate some space on the context stack for our purposes */ 819 /* allocate some space on the context stack for our purposes */
822 if (ecb_expect_false (cxstack_ix + SLOT_COUNT >= cxstack_max)) 820 if (ecb_expect_false (cxstack_ix + (int)SLOT_COUNT >= cxstack_max))
823 { 821 {
824 unsigned int i; 822 unsigned int i;
825 823
826 for (i = 0; i < SLOT_COUNT; ++i) 824 for (i = 0; i < SLOT_COUNT; ++i)
827 CXINC; 825 CXINC;
… …
836 834
837#if CORO_JIT 835#if CORO_JIT
838 save_perl_slots (slot); 836 save_perl_slots (slot);
839#else 837#else
840 #define VARx(name,expr,type) slot->name = expr; 838 #define VARx(name,expr,type) slot->name = expr;
841 # include "state.h" 839 #include "state.h"
842 #undef VARx
843#endif 840#endif
844 } 841 }
845} 842}
846 843
847/* 844/*
… …
879#endif 876#endif
880 877
881 New(54,PL_scopestack,8,I32); 878 New(54,PL_scopestack,8,I32);
882 PL_scopestack_ix = 0; 879 PL_scopestack_ix = 0;
883 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
884 884
885 New(54,PL_savestack,24,ANY); 885 New(54,PL_savestack,24,ANY);
886 PL_savestack_ix = 0; 886 PL_savestack_ix = 0;
887 PL_savestack_max = 24; 887 PL_savestack_max = 24;
888 888
… …
916 } 916 }
917 917
918 Safefree (PL_tmps_stack); 918 Safefree (PL_tmps_stack);
919 Safefree (PL_markstack); 919 Safefree (PL_markstack);
920 Safefree (PL_scopestack); 920 Safefree (PL_scopestack);
921#if HAS_SCOPESTACK_NAME
922 Safefree (PL_scopestack_name);
923#endif
921 Safefree (PL_savestack); 924 Safefree (PL_savestack);
922#if !PERL_VERSION_ATLEAST (5,10,0) 925#if !PERL_VERSION_ATLEAST (5,10,0)
923 Safefree (PL_retstack); 926 Safefree (PL_retstack);
924#endif 927#endif
925} 928}
… …
985 { 988 {
986 SV **svp = 0; 989 SV **svp = 0;
987 990
988 if (strEQ (s, "__DIE__" )) svp = &PL_diehook; 991 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
989 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 992 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
990 993
991 if (svp) 994 if (svp)
992 { 995 {
993 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);
994 return 0; 1006 return 0;
995 } 1007 }
996 } 1008 }
997 1009
998 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 1010 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
… …
1092 PL_hints = 0; 1104 PL_hints = 0;
1093 1105
1094 /* recreate the die/warn hooks */ 1106 /* recreate the die/warn hooks */
1095 PL_diehook = SvREFCNT_inc (rv_diehook); 1107 PL_diehook = SvREFCNT_inc (rv_diehook);
1096 PL_warnhook = SvREFCNT_inc (rv_warnhook); 1108 PL_warnhook = SvREFCNT_inc (rv_warnhook);
1097 1109
1098 GvSV (PL_defgv) = newSV (0); 1110 GvSV (PL_defgv) = newSV (0);
1099 GvAV (PL_defgv) = coro->args; coro->args = 0; 1111 GvAV (PL_defgv) = coro->args; coro->args = 0;
1100 GvSV (PL_errgv) = newSV (0); 1112 GvSV (PL_errgv) = newSV (0);
1101 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);
1102 GvHV (PL_hintgv) = 0; 1114 GvHV (PL_hintgv) = 0;
… …
1220 SvREFCNT_dec (coro->invoke_cb); 1232 SvREFCNT_dec (coro->invoke_cb);
1221 SvREFCNT_dec (coro->invoke_av); 1233 SvREFCNT_dec (coro->invoke_av);
1222 } 1234 }
1223} 1235}
1224 1236
1225ECB_INLINE void 1237ecb_inline void
1226free_coro_mortal (pTHX) 1238free_coro_mortal (pTHX)
1227{ 1239{
1228 if (ecb_expect_true (coro_mortal)) 1240 if (ecb_expect_true (coro_mortal))
1229 { 1241 {
1230 SvREFCNT_dec ((SV *)coro_mortal); 1242 SvREFCNT_dec ((SV *)coro_mortal);
… …
1389 slf_frame.prepare = slf_prepare_set_stacklevel; 1401 slf_frame.prepare = slf_prepare_set_stacklevel;
1390 slf_frame.check = slf_check_set_stacklevel; 1402 slf_frame.check = slf_check_set_stacklevel;
1391} 1403}
1392 1404
1393/* 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 */
1394ECB_INLINE void 1406ecb_inline void
1395transfer_tail (pTHX) 1407transfer_tail (pTHX)
1396{ 1408{
1397 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);
1398} 1422}
1399 1423
1400/* 1424/*
1401 * this is a _very_ stripped down perl interpreter ;) 1425 * this is a _very_ stripped down perl interpreter ;)
1402 */ 1426 */
… …
1431 */ 1455 */
1432 1456
1433 /* 1457 /*
1434 * 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
1435 * 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)
1436 * 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
1437 * bootstrap-time "top" top_env, as we cannot restore the "main" 1461 * doing in that case. YMMV.
1438 * coroutine as Coro has no such concept.
1439 * This actually isn't valid with the pthread backend, but OSes requiring
1440 * that backend are too broken to do it in a standards-compliant way.
1441 */ 1462 */
1442 PL_top_env = main_top_env; 1463 perlish_exit (aTHX);
1443 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1444 } 1464 }
1445} 1465}
1446 1466
1447static coro_cctx * 1467static coro_cctx *
1448cctx_new (void) 1468cctx_new (void)
… …
1463static coro_cctx * 1483static coro_cctx *
1464cctx_new_empty (void) 1484cctx_new_empty (void)
1465{ 1485{
1466 coro_cctx *cctx = cctx_new (); 1486 coro_cctx *cctx = cctx_new ();
1467 1487
1468 cctx->sptr = 0; 1488 cctx->stack.sptr = 0;
1469 coro_create (&cctx->cctx, 0, 0, 0, 0); 1489 coro_create (&cctx->cctx, 0, 0, 0, 0);
1470 1490
1471 return cctx; 1491 return cctx;
1472} 1492}
1473 1493
1474/* create a new cctx suitable as destination/running a perl interpreter */ 1494/* create a new cctx suitable as destination/running a perl interpreter */
1475static coro_cctx * 1495static coro_cctx *
1476cctx_new_run (void) 1496cctx_new_run (void)
1477{ 1497{
1478 coro_cctx *cctx = cctx_new (); 1498 coro_cctx *cctx = cctx_new ();
1479 void *stack_start;
1480 size_t stack_size;
1481 1499
1482#if HAVE_MMAP 1500 if (!coro_stack_alloc (&cctx->stack, cctx_stacksize))
1483 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1484 /* mmap supposedly does allocate-on-write for us */
1485 cctx->sptr = mmap (0, cctx->ssize, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_ANONYMOUS, 0, 0);
1486
1487 if (cctx->sptr != (void *)-1)
1488 {
1489 #if CORO_STACKGUARD
1490 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
1491 #endif
1492 stack_start = (char *)cctx->sptr + CORO_STACKGUARD * PAGESIZE;
1493 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
1494 cctx->flags |= CC_MAPPED;
1495 } 1501 {
1496 else
1497#endif
1498 {
1499 cctx->ssize = cctx_stacksize * (long)sizeof (long);
1500 New (0, cctx->sptr, cctx_stacksize, long);
1501
1502 if (!cctx->sptr)
1503 {
1504 perror ("FATAL: unable to allocate stack for coroutine, exiting."); 1502 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1505 _exit (EXIT_FAILURE); 1503 _exit (EXIT_FAILURE);
1506 }
1507
1508 stack_start = cctx->sptr;
1509 stack_size = cctx->ssize;
1510 } 1504 }
1511 1505
1512 #if CORO_USE_VALGRIND
1513 cctx->valgrind_id = VALGRIND_STACK_REGISTER ((char *)stack_start, (char *)stack_start + stack_size);
1514 #endif
1515
1516 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);
1517 1507
1518 return cctx; 1508 return cctx;
1519} 1509}
1520 1510
1521static void 1511static void
… …
1527 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current)); 1517 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1528 1518
1529 --cctx_count; 1519 --cctx_count;
1530 coro_destroy (&cctx->cctx); 1520 coro_destroy (&cctx->cctx);
1531 1521
1532 /* coro_transfer creates new, empty cctx's */ 1522 coro_stack_free (&cctx->stack);
1533 if (cctx->sptr)
1534 {
1535 #if CORO_USE_VALGRIND
1536 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
1537 #endif
1538
1539#if HAVE_MMAP
1540 if (cctx->flags & CC_MAPPED)
1541 munmap (cctx->sptr, cctx->ssize);
1542 else
1543#endif
1544 Safefree (cctx->sptr);
1545 }
1546 1523
1547 Safefree (cctx); 1524 Safefree (cctx);
1548} 1525}
1549 1526
1550/* wether this cctx should be destructed */ 1527/* wether this cctx should be destructed */
… …
1569} 1546}
1570 1547
1571static void 1548static void
1572cctx_put (coro_cctx *cctx) 1549cctx_put (coro_cctx *cctx)
1573{ 1550{
1574 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));
1575 1552
1576 /* free another cctx if overlimit */ 1553 /* free another cctx if overlimit */
1577 if (ecb_expect_false (cctx_idle >= cctx_max_idle)) 1554 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1578 { 1555 {
1579 coro_cctx *first = cctx_first; 1556 coro_cctx *first = cctx_first;
… …
1705 return; 1682 return;
1706 1683
1707 slf_destroy (aTHX_ coro); 1684 slf_destroy (aTHX_ coro);
1708 1685
1709 coro->flags |= CF_ZOMBIE; 1686 coro->flags |= CF_ZOMBIE;
1710 1687
1711 if (coro->flags & CF_READY) 1688 if (coro->flags & CF_READY)
1712 { 1689 {
1713 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1690 /* reduce nready, as destroying a ready coro effectively unreadies it */
1714 /* alternative: look through all ready queues and remove the coro */ 1691 /* alternative: look through all ready queues and remove the coro */
1715 --coro_nready; 1692 --coro_nready;
… …
1792 TRANSFER (ta, 1); 1769 TRANSFER (ta, 1);
1793} 1770}
1794 1771
1795/** Coro ********************************************************************/ 1772/** Coro ********************************************************************/
1796 1773
1797ECB_INLINE void 1774ecb_inline void
1798coro_enq (pTHX_ struct coro *coro) 1775coro_enq (pTHX_ struct coro *coro)
1799{ 1776{
1800 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN]; 1777 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1801 1778
1802 SvREFCNT_inc_NN (coro->hv); 1779 SvREFCNT_inc_NN (coro->hv);
… …
1804 coro->next_ready = 0; 1781 coro->next_ready = 0;
1805 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro; 1782 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1806 ready [1] = coro; 1783 ready [1] = coro;
1807} 1784}
1808 1785
1809ECB_INLINE struct coro * 1786ecb_inline struct coro *
1810coro_deq (pTHX) 1787coro_deq (pTHX)
1811{ 1788{
1812 int prio; 1789 int prio;
1813 1790
1814 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; ) 1791 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
… …
1867{ 1844{
1868 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1845 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1869} 1846}
1870 1847
1871/* expects to own a reference to next->hv */ 1848/* expects to own a reference to next->hv */
1872ECB_INLINE void 1849ecb_inline void
1873prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1850prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1874{ 1851{
1875 SV *prev_sv = SvRV (coro_current); 1852 SV *prev_sv = SvRV (coro_current);
1876 1853
1877 ta->prev = SvSTATE_hv (prev_sv); 1854 ta->prev = SvSTATE_hv (prev_sv);
… …
1936 } 1913 }
1937 } 1914 }
1938 } 1915 }
1939} 1916}
1940 1917
1941ECB_INLINE void 1918ecb_inline void
1942prepare_cede (pTHX_ struct coro_transfer_args *ta) 1919prepare_cede (pTHX_ struct coro_transfer_args *ta)
1943{ 1920{
1944 api_ready (aTHX_ coro_current); 1921 api_ready (aTHX_ coro_current);
1945 prepare_schedule (aTHX_ ta); 1922 prepare_schedule (aTHX_ ta);
1946} 1923}
1947 1924
1948ECB_INLINE void 1925ecb_inline void
1949prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 1926prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1950{ 1927{
1951 SV *prev = SvRV (coro_current); 1928 SV *prev = SvRV (coro_current);
1952 1929
1953 if (coro_nready) 1930 if (coro_nready)
… …
2148 2125
2149static void 2126static void
2150coro_set_status (pTHX_ struct coro *coro, SV **arg, int items) 2127coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
2151{ 2128{
2152 AV *av; 2129 AV *av;
2153 2130
2154 if (coro->status) 2131 if (coro->status)
2155 { 2132 {
2156 av = coro->status; 2133 av = coro->status;
2157 av_clear (av); 2134 av_clear (av);
2158 } 2135 }
… …
2205 2182
2206 coro = SvSTATE (arg [0]); 2183 coro = SvSTATE (arg [0]);
2207 coro_hv = coro->hv; 2184 coro_hv = coro->hv;
2208 2185
2209 coro_set_status (aTHX_ coro, arg + 1, items - 1); 2186 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2210 2187
2211 if (ecb_expect_false (coro->flags & CF_NOCANCEL)) 2188 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2212 { 2189 {
2213 /* coro currently busy cancelling something, so just notify it */ 2190 /* coro currently busy cancelling something, so just notify it */
2214 coro->slf_frame.data = (void *)coro; 2191 coro->slf_frame.data = (void *)coro;
2215 2192
… …
2394 2371
2395static int 2372static int
2396slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2373slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
2397{ 2374{
2398 SV *data = (SV *)frame->data; 2375 SV *data = (SV *)frame->data;
2399 2376
2400 if (CORO_THROW) 2377 if (CORO_THROW)
2401 return 0; 2378 return 0;
2402 2379
2403 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2380 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2404 return 1; 2381 return 1;
… …
2440 cb = sv_2mortal (coro->rouse_cb); 2417 cb = sv_2mortal (coro->rouse_cb);
2441 coro->rouse_cb = 0; 2418 coro->rouse_cb = 0;
2442 } 2419 }
2443 2420
2444 if (!SvROK (cb) 2421 if (!SvROK (cb)
2445 || SvTYPE (SvRV (cb)) != SVt_PVCV 2422 || SvTYPE (SvRV (cb)) != SVt_PVCV
2446 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2423 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2447 croak ("Coro::rouse_wait called with illegal callback argument,"); 2424 croak ("Coro::rouse_wait called with illegal callback argument,");
2448 2425
2449 { 2426 {
2450 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */ 2427 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
… …
3343#endif 3320#endif
3344 3321
3345#if CORO_JIT 3322#if CORO_JIT
3346 3323
3347static void ecb_noinline ecb_cold 3324static void ecb_noinline ecb_cold
3348pushav_3uv (pTHX_ UV a, UV b, UV c) 3325pushav_4uv (pTHX_ UV a, UV b, UV c, UV d)
3349{ 3326{
3350 dSP; 3327 dSP;
3351 AV *av = newAV (); 3328 AV *av = newAV ();
3352 3329
3330 av_store (av, 3, newSVuv (d));
3353 av_store (av, 2, newSVuv (c)); 3331 av_store (av, 2, newSVuv (c));
3354 av_store (av, 1, newSVuv (b)); 3332 av_store (av, 1, newSVuv (b));
3355 av_store (av, 0, newSVuv (a)); 3333 av_store (av, 0, newSVuv (a));
3356 3334
3357 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 3335 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
… …
3370 int count; 3348 int count;
3371 3349
3372 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1); 3350 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3373 3351
3374 PUSHMARK (SP); 3352 PUSHMARK (SP);
3375#define VARx(name,expr,type) pushav_3uv (aTHX_ (UV)&(expr), offsetof (perl_slots, name), sizeof (type)); 3353 #define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type));
3376# include "state.h" 3354 #include "state.h"
3377#undef VARx
3378 count = call_pv ("Coro::State::_jit", G_ARRAY); 3355 count = call_pv ("Coro::State::_jit", G_ARRAY);
3379 SPAGAIN; 3356 SPAGAIN;
3380 3357
3381 save = POPs; save_ptr = SvPVbyte (save, save_len); 3358 save = POPs; save_ptr = SvPVbyte (save, save_len);
3382 load = POPs; load_ptr = SvPVbyte (load, load_len); 3359 load = POPs; load_ptr = SvPVbyte (load, load_len);
… …
3414#ifdef USE_ITHREADS 3391#ifdef USE_ITHREADS
3415# if CORO_PTHREAD 3392# if CORO_PTHREAD
3416 coro_thx = PERL_GET_CONTEXT; 3393 coro_thx = PERL_GET_CONTEXT;
3417# endif 3394# endif
3418#endif 3395#endif
3419 BOOT_PAGESIZE;
3420
3421 /* perl defines these to check for existance first, but why it doesn't */ 3396 /* perl defines these to check for existance first, but why it doesn't */
3422 /* just create them one at init time is not clear to me, except for */ 3397 /* just create them one at init time is not clear to me, except for */
3423 /* programs trying to delete them, but... */ 3398 /* programs trying to delete them, but... */
3424 /* anyway, we declare this as invalid and make sure they are initialised here */ 3399 /* anyway, we declare this as invalid and make sure they are initialised here */
3425 DEFSV; 3400 DEFSV;
… …
3565void 3540void
3566list () 3541list ()
3567 PROTOTYPE: 3542 PROTOTYPE:
3568 PPCODE: 3543 PPCODE:
3569{ 3544{
3570 struct coro *coro; 3545 struct coro *coro;
3571 for (coro = coro_first; coro; coro = coro->next) 3546 for (coro = coro_first; coro; coro = coro->next)
3572 if (coro->hv) 3547 if (coro->hv)
3573 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 3548 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
3574} 3549}
3575 3550
… …
3639 RETVAL = boolSV (coro->flags & ix); 3614 RETVAL = boolSV (coro->flags & ix);
3640 OUTPUT: 3615 OUTPUT:
3641 RETVAL 3616 RETVAL
3642 3617
3643void 3618void
3644throw (Coro::State self, SV *exception = &PL_sv_undef) 3619throw (SV *self, SV *exception = &PL_sv_undef)
3645 PROTOTYPE: $;$ 3620 PROTOTYPE: $;$
3646 CODE: 3621 CODE:
3647{ 3622{
3623 struct coro *coro = SvSTATE (self);
3648 struct coro *current = SvSTATE_current; 3624 struct coro *current = SvSTATE_current;
3649 SV **exceptionp = self == current ? &CORO_THROW : &self->except; 3625 SV **exceptionp = coro == current ? &CORO_THROW : &coro->except;
3650 SvREFCNT_dec (*exceptionp); 3626 SvREFCNT_dec (*exceptionp);
3651 SvGETMAGIC (exception); 3627 SvGETMAGIC (exception);
3652 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0; 3628 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3629
3630 api_ready (aTHX_ self);
3653} 3631}
3654 3632
3655void 3633void
3656api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3634api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3657 PROTOTYPE: $;$ 3635 PROTOTYPE: $;$
… …
3734 3712
3735void 3713void
3736times (Coro::State self) 3714times (Coro::State self)
3737 PPCODE: 3715 PPCODE:
3738{ 3716{
3739 struct coro *current = SvSTATE (coro_current); 3717 struct coro *current = SvSTATE (coro_current);
3740 3718
3741 if (ecb_expect_false (current == self)) 3719 if (ecb_expect_false (current == self))
3742 { 3720 {
3743 coro_times_update (); 3721 coro_times_update ();
3744 coro_times_add (SvSTATE (coro_current)); 3722 coro_times_add (SvSTATE (coro_current));
… …
3787 3765
3788 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);
3789 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3767 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3790 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);
3791 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 */
3792 3770
3793 coro_stash = gv_stashpv ("Coro", TRUE); 3771 coro_stash = gv_stashpv ("Coro", TRUE);
3794 3772
3795 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 3773 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3796 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 3774 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3797 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL)); 3775 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
… …
4019 on_leave = 1 3997 on_leave = 1
4020 PROTOTYPE: & 3998 PROTOTYPE: &
4021 CODE: 3999 CODE:
4022{ 4000{
4023 struct coro *coro = SvSTATE_current; 4001 struct coro *coro = SvSTATE_current;
4024 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 4002 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
4025 4003
4026 block = s_get_cv_croak (block); 4004 block = s_get_cv_croak (block);
4027 4005
4028 if (!*avp) 4006 if (!*avp)
4029 *avp = newAV (); 4007 *avp = newAV ();
… …
4049 4027
4050SV * 4028SV *
4051new (SV *klass, SV *count = 0) 4029new (SV *klass, SV *count = 0)
4052 CODE: 4030 CODE:
4053{ 4031{
4054 int semcnt = 1; 4032 int semcnt = 1;
4055 4033
4056 if (count) 4034 if (count)
4057 { 4035 {
4058 SvGETMAGIC (count); 4036 SvGETMAGIC (count);
4059 4037
… …
4119 XSRETURN_NO; 4097 XSRETURN_NO;
4120} 4098}
4121 4099
4122void 4100void
4123waiters (SV *self) 4101waiters (SV *self)
4124 PPCODE: 4102 PPCODE:
4125{ 4103{
4126 AV *av = (AV *)SvRV (self); 4104 AV *av = (AV *)SvRV (self);
4127 int wcount = AvFILLp (av) + 1 - 1; 4105 int wcount = AvFILLp (av) + 1 - 1;
4128 4106
4129 if (GIMME_V == G_SCALAR) 4107 if (GIMME_V == G_SCALAR)
… …
4138} 4116}
4139 4117
4140MODULE = Coro::State PACKAGE = Coro::SemaphoreSet 4118MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
4141 4119
4142void 4120void
4143_may_delete (SV *sem, int count, int extra_refs) 4121_may_delete (SV *sem, int count, unsigned int extra_refs)
4144 PPCODE: 4122 PPCODE:
4145{ 4123{
4146 AV *av = (AV *)SvRV (sem); 4124 AV *av = (AV *)SvRV (sem);
4147 4125
4148 if (SvREFCNT ((SV *)av) == 1 + extra_refs 4126 if (SvREFCNT ((SV *)av) == 1 + extra_refs
4149 && AvFILLp (av) == 0 /* no waiters, just count */ 4127 && AvFILLp (av) == 0 /* no waiters, just count */
4150 && SvIV (AvARRAY (av)[0]) == count) 4128 && SvIV (AvARRAY (av)[0]) == count)
4151 XSRETURN_YES; 4129 XSRETURN_YES;
… …
4172 4150
4173void 4151void
4174broadcast (SV *self) 4152broadcast (SV *self)
4175 CODE: 4153 CODE:
4176{ 4154{
4177 AV *av = (AV *)SvRV (self); 4155 AV *av = (AV *)SvRV (self);
4178 coro_signal_wake (aTHX_ av, AvFILLp (av)); 4156 coro_signal_wake (aTHX_ av, AvFILLp (av));
4179} 4157}
4180 4158
4181void 4159void
4182send (SV *self) 4160send (SV *self)
… …
4190 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */ 4168 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
4191} 4169}
4192 4170
4193IV 4171IV
4194awaited (SV *self) 4172awaited (SV *self)
4195 CODE: 4173 CODE:
4196 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1; 4174 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
4197 OUTPUT: 4175 OUTPUT:
4198 RETVAL 4176 RETVAL
4199 4177
4200 4178
… …
4205 4183
4206void 4184void
4207_schedule (...) 4185_schedule (...)
4208 CODE: 4186 CODE:
4209{ 4187{
4210 static int incede; 4188 static int incede;
4211 4189
4212 api_cede_notself (aTHX); 4190 api_cede_notself (aTHX);
4213 4191
4214 ++incede; 4192 ++incede;
4215 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