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.438 by root, Mon Nov 18 10:27:53 2013 UTC

1/* this works around a bug in mingw32 providing a non-working setjmp */ 1/* this works around a bug in mingw32 providing a non-working setjmp */
2#define USE_NO_MINGW_SETJMP_TWO_ARGS 2#define USE_NO_MINGW_SETJMP_TWO_ARGS
3 3
4#define NDEBUG 1 4#define NDEBUG 1 /* perl usually disables NDEBUG later */
5 5
6#include "libcoro/coro.c" 6#include "libcoro/coro.c"
7 7
8#define PERL_NO_GET_CONTEXT 8#define PERL_NO_GET_CONTEXT
9#define PERL_EXT 9#define PERL_EXT
… …
12#include "perl.h" 12#include "perl.h"
13#include "XSUB.h" 13#include "XSUB.h"
14#include "perliol.h" 14#include "perliol.h"
15 15
16#include "schmorp.h" 16#include "schmorp.h"
17
18#define ECB_NO_THREADS 1
17#include "ecb.h" 19#include "ecb.h"
18 20
19#include <stddef.h> 21#include <stddef.h>
20#include <stdio.h> 22#include <stdio.h>
21#include <errno.h> 23#include <errno.h>
22#include <assert.h> 24#include <assert.h>
23 25
24#ifndef SVs_PADSTALE 26#ifndef SVs_PADSTALE
25# define SVs_PADSTALE 0 27# define SVs_PADSTALE 0
28#endif
29
30#ifdef PadARRAY
31# define NEWPADAPI 1
32# define newPADLIST(var) (Newz (0, var, 1, PADLIST), Newx (PadlistARRAY (var), 2, PAD *))
33#else
34typedef AV PADNAMELIST;
35# if !PERL_VERSION_ATLEAST(5,8,0)
36typedef AV PADLIST;
37typedef AV PAD;
38# endif
39# define PadlistARRAY(pl) ((PAD **)AvARRAY (pl))
40# define PadlistMAX(pl) AvFILLp (pl)
41# define PadlistNAMES(pl) (*PadlistARRAY (pl))
42# define PadARRAY AvARRAY
43# define PadMAX AvFILLp
44# define newPADLIST(var) ((var) = newAV (), av_extend (var, 1))
45#endif
46
47/* 5.19.something has replaced SVt_BIND by SVt_INVLIST */
48/* we just alias it to SVt_IV, as that is sufficient for swap_sv for now */
49#if PERL_VERSION_ATLEAST(5,19,0)
50# define SVt_BIND SVt_IV
26#endif 51#endif
27 52
28#if defined(_WIN32) 53#if defined(_WIN32)
29# undef HAS_GETTIMEOFDAY 54# undef HAS_GETTIMEOFDAY
30# undef setjmp 55# undef setjmp
… …
33# define setjmp _setjmp /* deep magic */ 58# define setjmp _setjmp /* deep magic */
34#else 59#else
35# include <inttypes.h> /* most portable stdint.h */ 60# include <inttypes.h> /* most portable stdint.h */
36#endif 61#endif
37 62
38#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 */ 63/* the maximum number of idle cctx that will be pooled */
66static int cctx_max_idle = 4; 64static int cctx_max_idle = 4;
67 65
68#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 66#if defined(DEBUGGING) && PERL_VERSION_ATLEAST(5,12,0)
69# undef CORO_STACKGUARD 67# define HAS_SCOPESTACK_NAME 1
70#endif
71
72#ifndef CORO_STACKGUARD
73# define CORO_STACKGUARD 0
74#endif 68#endif
75 69
76/* prefer perl internal functions over our own? */ 70/* prefer perl internal functions over our own? */
77#ifndef CORO_PREFER_PERL_FUNCTIONS 71#ifndef CORO_PREFER_PERL_FUNCTIONS
78# define CORO_PREFER_PERL_FUNCTIONS 0 72# define CORO_PREFER_PERL_FUNCTIONS 0
… …
97# if CORO_PTHREAD 91# if CORO_PTHREAD
98static void *coro_thx; 92static void *coro_thx;
99# endif 93# endif
100#endif 94#endif
101 95
102/* used in state.h */
103#define VAR(name,type) VARx(name, PL_ ## name, type)
104
105#ifdef __linux 96#ifdef __linux
106# include <time.h> /* for timespec */ 97# include <time.h> /* for timespec */
107# include <syscall.h> /* for SYS_* */ 98# include <syscall.h> /* for SYS_* */
108# ifdef SYS_clock_gettime 99# ifdef SYS_clock_gettime
109# define coro_clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts)) 100# define coro_clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
… …
172typedef struct coro_cctx 163typedef struct coro_cctx
173{ 164{
174 struct coro_cctx *next; 165 struct coro_cctx *next;
175 166
176 /* the stack */ 167 /* the stack */
177 void *sptr; 168 struct coro_stack stack;
178 size_t ssize;
179 169
180 /* cpu state */ 170 /* cpu state */
181 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 171 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
172#ifndef NDEBUG
182 JMPENV *idle_te; /* same as idle_sp, but for top_env, TODO: remove once stable */ 173 JMPENV *idle_te; /* same as idle_sp, but for top_env */
174#endif
183 JMPENV *top_env; 175 JMPENV *top_env;
184 coro_context cctx; 176 coro_context cctx;
185 177
186 U32 gen; 178 U32 gen;
187#if CORO_USE_VALGRIND 179#if CORO_USE_VALGRIND
… …
207}; 199};
208 200
209/* the structure where most of the perl state is stored, overlaid on the cxstack */ 201/* the structure where most of the perl state is stored, overlaid on the cxstack */
210typedef struct 202typedef struct
211{ 203{
212#define VARx(name,expr,type) type name; 204 #define VARx(name,expr,type) type name;
213# include "state.h" 205 #include "state.h"
214#undef VARx
215} perl_slots; 206} perl_slots;
216 207
217/* how many context stack entries do we need for perl_slots */ 208/* 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)) 209#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
219 210
… …
291#define coro_nready coroapi.nready 282#define coro_nready coroapi.nready
292 283
293/** JIT *********************************************************************/ 284/** JIT *********************************************************************/
294 285
295#if CORO_JIT 286#if CORO_JIT
296 /* APPLE doesn't have HAVE_MMAP though */ 287 /* APPLE doesn't have mmap though */
297 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__) 288 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__)
298 #ifndef CORO_JIT_TYPE 289 #ifndef CORO_JIT_TYPE
299 #if __x86_64 && CORO_JIT_UNIXY 290 #if ECB_AMD64 && CORO_JIT_UNIXY
300 #define CORO_JIT_TYPE "amd64-unix" 291 #define CORO_JIT_TYPE "amd64-unix"
301 #elif __i386 && CORO_JIT_UNIXY 292 #elif __i386 && CORO_JIT_UNIXY
302 #define CORO_JIT_TYPE "x86-unix" 293 #define CORO_JIT_TYPE "x86-unix"
303 #endif 294 #endif
304 #endif 295 #endif
305#endif 296#endif
306 297
307#if !defined(CORO_JIT_TYPE) || !HAVE_MMAP 298#if !defined(CORO_JIT_TYPE) || _POSIX_MEMORY_PROTECTION <= 0
308 #undef CORO_JIT 299 #undef CORO_JIT
309#endif 300#endif
310 301
311#if CORO_JIT 302#if CORO_JIT
312 typedef void (*load_save_perl_slots_type)(perl_slots *); 303 typedef void (*load_save_perl_slots_type)(perl_slots *);
… …
335 326
336/** time stuff **************************************************************/ 327/** time stuff **************************************************************/
337 328
338#ifdef HAS_GETTIMEOFDAY 329#ifdef HAS_GETTIMEOFDAY
339 330
340ECB_INLINE void 331ecb_inline void
341coro_u2time (pTHX_ UV ret[2]) 332coro_u2time (pTHX_ UV ret[2])
342{ 333{
343 struct timeval tv; 334 struct timeval tv;
344 gettimeofday (&tv, 0); 335 gettimeofday (&tv, 0);
345 336
346 ret [0] = tv.tv_sec; 337 ret [0] = tv.tv_sec;
347 ret [1] = tv.tv_usec; 338 ret [1] = tv.tv_usec;
348} 339}
349 340
350ECB_INLINE double 341ecb_inline double
351coro_nvtime (void) 342coro_nvtime (void)
352{ 343{
353 struct timeval tv; 344 struct timeval tv;
354 gettimeofday (&tv, 0); 345 gettimeofday (&tv, 0);
355 346
356 return tv.tv_sec + tv.tv_usec * 1e-6; 347 return tv.tv_sec + tv.tv_usec * 1e-6;
357} 348}
358 349
359ECB_INLINE void 350ecb_inline void
360time_init (pTHX) 351time_init (pTHX)
361{ 352{
362 nvtime = coro_nvtime; 353 nvtime = coro_nvtime;
363 u2time = coro_u2time; 354 u2time = coro_u2time;
364} 355}
365 356
366#else 357#else
367 358
368ECB_INLINE void 359ecb_inline void
369time_init (pTHX) 360time_init (pTHX)
370{ 361{
371 SV **svp; 362 SV **svp;
372 363
373 require_pv ("Time/HiRes.pm"); 364 require_pv ("Time/HiRes.pm");
374 365
375 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0); 366 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
376 367
377 if (!svp) croak ("Time::HiRes is required, but missing. Caught"); 368 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
378 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught"); 369 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught");
379 370
… …
415 get_hv (name, create); 406 get_hv (name, create);
416#endif 407#endif
417 return get_hv (name, create); 408 return get_hv (name, create);
418} 409}
419 410
420ECB_INLINE void 411ecb_inline void
421coro_times_update (void) 412coro_times_update (void)
422{ 413{
423#ifdef coro_clock_gettime 414#ifdef coro_clock_gettime
424 struct timespec ts; 415 struct timespec ts;
425 416
… …
438 time_real [0] = tv [0]; 429 time_real [0] = tv [0];
439 time_real [1] = tv [1] * 1000; 430 time_real [1] = tv [1] * 1000;
440#endif 431#endif
441} 432}
442 433
443ECB_INLINE void 434ecb_inline void
444coro_times_add (struct coro *c) 435coro_times_add (struct coro *c)
445{ 436{
446 c->t_real [1] += time_real [1]; 437 c->t_real [1] += time_real [1];
447 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; } 438 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
448 c->t_real [0] += time_real [0]; 439 c->t_real [0] += time_real [0];
… …
450 c->t_cpu [1] += time_cpu [1]; 441 c->t_cpu [1] += time_cpu [1];
451 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; } 442 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
452 c->t_cpu [0] += time_cpu [0]; 443 c->t_cpu [0] += time_cpu [0];
453} 444}
454 445
455ECB_INLINE void 446ecb_inline void
456coro_times_sub (struct coro *c) 447coro_times_sub (struct coro *c)
457{ 448{
458 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; } 449 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; }
459 c->t_real [1] -= time_real [1]; 450 c->t_real [1] -= time_real [1];
460 c->t_real [0] -= time_real [0]; 451 c->t_real [0] -= time_real [0];
… …
481 : 0) 472 : 0)
482 473
483#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv) 474#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
484#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state) 475#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
485 476
486ECB_INLINE MAGIC * 477ecb_inline MAGIC *
487SvSTATEhv_p (pTHX_ SV *coro) 478SvSTATEhv_p (pTHX_ SV *coro)
488{ 479{
489 MAGIC *mg; 480 MAGIC *mg;
490 481
491 if (ecb_expect_true ( 482 if (ecb_expect_true (
… …
496 return mg; 487 return mg;
497 488
498 return 0; 489 return 0;
499} 490}
500 491
501ECB_INLINE struct coro * 492ecb_inline struct coro *
502SvSTATE_ (pTHX_ SV *coro) 493SvSTATE_ (pTHX_ SV *coro)
503{ 494{
504 MAGIC *mg; 495 MAGIC *mg;
505 496
506 if (SvROK (coro)) 497 if (SvROK (coro))
… …
520#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 511#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
521 512
522/*****************************************************************************/ 513/*****************************************************************************/
523/* padlist management and caching */ 514/* padlist management and caching */
524 515
525ECB_INLINE AV * 516ecb_inline PADLIST *
526coro_derive_padlist (pTHX_ CV *cv) 517coro_derive_padlist (pTHX_ CV *cv)
527{ 518{
528 AV *padlist = CvPADLIST (cv); 519 PADLIST *padlist = CvPADLIST (cv);
529 AV *newpadlist, *newpad; 520 PADLIST *newpadlist;
521 PAD *newpad;
522 PADOFFSET off = PadlistMAX (padlist) + 1;
530 523
531 newpadlist = newAV (); 524#if NEWPADAPI
525
526 /* if we had the original CvDEPTH, we might be able to steal the CvDEPTH+1 entry instead */
527 /* 20131102194744.GA6705@schmorp.de, 20131102195825.2013.qmail@lists-nntp.develooper.com */
528 while (!PadlistARRAY (padlist)[off - 1])
529 --off;
530
531 Perl_pad_push (aTHX_ padlist, off);
532
533 newpad = PadlistARRAY (padlist)[off];
534 PadlistARRAY (padlist)[off] = 0;
535
536#else
537
538#if PERL_VERSION_ATLEAST (5,10,0)
539 Perl_pad_push (aTHX_ padlist, off);
540#else
541 Perl_pad_push (aTHX_ padlist, off, 1);
542#endif
543
544 newpad = PadlistARRAY (padlist)[off];
545 PadlistMAX (padlist) = off - 1;
546
547#endif
548
549 newPADLIST (newpadlist);
550#if !PERL_VERSION_ATLEAST(5,15,3)
551 /* Padlists are AvREAL as of 5.15.3. See perl bug #98092 and perl commit 7d953ba. */
532 AvREAL_off (newpadlist); 552 AvREAL_off (newpadlist);
533#if PERL_VERSION_ATLEAST (5,10,0)
534 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1);
535#else
536 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
537#endif 553#endif
538 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
539 --AvFILLp (padlist);
540 554
541 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0])); 555 /* Already extended to 2 elements by newPADLIST. */
542 av_store (newpadlist, 1, (SV *)newpad); 556 PadlistMAX (newpadlist) = 1;
557 PadlistNAMES (newpadlist) = (PADNAMELIST *)SvREFCNT_inc_NN (PadlistNAMES (padlist));
558 PadlistARRAY (newpadlist)[1] = newpad;
543 559
544 return newpadlist; 560 return newpadlist;
545} 561}
546 562
547ECB_INLINE void 563ecb_inline void
548free_padlist (pTHX_ AV *padlist) 564free_padlist (pTHX_ PADLIST *padlist)
549{ 565{
550 /* may be during global destruction */ 566 /* may be during global destruction */
551 if (!IN_DESTRUCT) 567 if (!IN_DESTRUCT)
552 { 568 {
553 I32 i = AvFILLp (padlist); 569 I32 i = PadlistMAX (padlist);
554 570
555 while (i > 0) /* special-case index 0 */ 571 while (i > 0) /* special-case index 0 */
556 { 572 {
557 /* we try to be extra-careful here */ 573 /* we try to be extra-careful here */
558 AV *av = (AV *)AvARRAY (padlist)[i--]; 574 PAD *pad = PadlistARRAY (padlist)[i--];
559 I32 j = AvFILLp (av);
560 575
576 if (pad)
577 {
578 I32 j = PadMAX (pad);
579
561 while (j >= 0) 580 while (j >= 0)
562 SvREFCNT_dec (AvARRAY (av)[j--]); 581 SvREFCNT_dec (PadARRAY (pad)[j--]);
563 582
564 AvFILLp (av) = -1; 583 PadMAX (pad) = -1;
565 SvREFCNT_dec (av); 584 SvREFCNT_dec (pad);
585 }
566 } 586 }
567 587
568 SvREFCNT_dec (AvARRAY (padlist)[0]); 588 SvREFCNT_dec (PadlistNAMES (padlist));
569 589
590#if NEWPADAPI
591 Safefree (PadlistARRAY (padlist));
592 Safefree (padlist);
593#else
570 AvFILLp (padlist) = -1; 594 AvFILLp (padlist) = -1;
595 AvREAL_off (padlist);
571 SvREFCNT_dec ((SV*)padlist); 596 SvREFCNT_dec ((SV*)padlist);
597#endif
572 } 598 }
573} 599}
574 600
575static int 601static int
576coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 602coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
577{ 603{
578 AV *padlist; 604 PADLIST *padlist;
579 AV *av = (AV *)mg->mg_obj; 605 PADLIST **padlists = (PADLIST **)(mg->mg_ptr + sizeof(size_t));
606 size_t len = *(size_t *)mg->mg_ptr;
580 607
581 /* perl manages to free our internal AV and _then_ call us */ 608 /* perl manages to free our internal AV and _then_ call us */
582 if (IN_DESTRUCT) 609 if (IN_DESTRUCT)
583 return 0; 610 return 0;
584 611
585 /* casting is fun. */ 612 while (len--)
586 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
587 free_padlist (aTHX_ padlist); 613 free_padlist (aTHX_ padlists[len]);
588
589 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
590 614
591 return 0; 615 return 0;
592} 616}
593 617
594static MGVTBL coro_cv_vtbl = { 618static MGVTBL coro_cv_vtbl = {
595 0, 0, 0, 0, 619 0, 0, 0, 0,
596 coro_cv_free 620 coro_cv_free
597}; 621};
598 622
599/* the next two functions merely cache the padlists */ 623/* the next two functions merely cache the padlists */
600ECB_INLINE void 624ecb_inline void
601get_padlist (pTHX_ CV *cv) 625get_padlist (pTHX_ CV *cv)
602{ 626{
603 MAGIC *mg = CORO_MAGIC_cv (cv); 627 MAGIC *mg = CORO_MAGIC_cv (cv);
604 AV *av; 628 size_t *lenp;
605 629
606 if (ecb_expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 630 if (ecb_expect_true (mg && *(lenp = (size_t *)mg->mg_ptr)))
607 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 631 CvPADLIST (cv) = ((PADLIST **)(mg->mg_ptr + sizeof(size_t)))[--*lenp];
608 else 632 else
609 { 633 {
610#if CORO_PREFER_PERL_FUNCTIONS 634#if CORO_PREFER_PERL_FUNCTIONS
611 /* this is probably cleaner? but also slower! */ 635 /* this is probably cleaner? but also slower! */
612 /* in practise, it seems to be less stable */ 636 /* in practise, it seems to be less stable */
… …
618 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 642 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
619#endif 643#endif
620 } 644 }
621} 645}
622 646
623ECB_INLINE void 647ecb_inline void
624put_padlist (pTHX_ CV *cv) 648put_padlist (pTHX_ CV *cv)
625{ 649{
626 MAGIC *mg = CORO_MAGIC_cv (cv); 650 MAGIC *mg = CORO_MAGIC_cv (cv);
627 AV *av;
628 651
629 if (ecb_expect_false (!mg)) 652 if (ecb_expect_false (!mg))
653 {
630 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 654 mg = sv_magicext ((SV *)cv, 0, CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
655 Newz (0, mg->mg_ptr ,sizeof (size_t) + sizeof (PADLIST *), char);
656 mg->mg_len = 1; /* so mg_free frees mg_ptr */
657 }
658 else
659 Renew (mg->mg_ptr,
660 sizeof(size_t) + (*(size_t *)mg->mg_ptr + 1) * sizeof(PADLIST *),
661 char);
631 662
632 av = (AV *)mg->mg_obj; 663 ((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} 664}
639 665
640/** load & save, init *******************************************************/ 666/** load & save, init *******************************************************/
641 667
668ecb_inline void
669swap_sv (SV *a, SV *b)
670{
671 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
672 SV tmp;
673
674 /* swap sv_any */
675 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
676
677 /* swap sv_flags */
678 SvFLAGS (&tmp) = SvFLAGS (a);
679 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
680 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
681
682#if PERL_VERSION_ATLEAST (5,10,0)
683 /* perl 5.10 and later complicates this _quite_ a bit, but it also
684 * is much faster, so no quarrels here. alternatively, we could
685 * sv_upgrade to avoid this.
686 */
687 {
688 /* swap sv_u */
689 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
690
691 /* if SvANY points to the head, we need to adjust the pointers,
692 * as the pointer for a still points to b, and maybe vice versa.
693 */
694 #define svany_in_head(type) \
695 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
696
697 if (svany_in_head (SvTYPE (a)))
698 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
699
700 if (svany_in_head (SvTYPE (b)))
701 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
702 }
703#endif
704}
705
642/* swap sv heads, at least logically */ 706/* swap sv heads, at least logically */
643static void 707static void
644swap_svs (pTHX_ Coro__State c) 708swap_svs (pTHX_ Coro__State c)
645{ 709{
646 int i; 710 int i;
647 711
648 for (i = 0; i <= AvFILLp (c->swap_sv); ) 712 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
649 { 713 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} 714}
688 715
689#define SWAP_SVS(coro) \ 716#define SWAP_SVS(coro) \
690 if (ecb_expect_false ((coro)->swap_sv)) \ 717 if (ecb_expect_false ((coro)->swap_sv)) \
691 swap_svs (aTHX_ (coro)) 718 swap_svs (aTHX_ (coro))
… …
703 730
704#if CORO_JIT 731#if CORO_JIT
705 load_perl_slots (slot); 732 load_perl_slots (slot);
706#else 733#else
707 #define VARx(name,expr,type) expr = slot->name; 734 #define VARx(name,expr,type) expr = slot->name;
708 # include "state.h" 735 #include "state.h"
709 #undef VARx
710#endif 736#endif
711 737
712 { 738 {
713 dSP; 739 dSP;
714 740
… …
717 /* now do the ugly restore mess */ 743 /* now do the ugly restore mess */
718 while (ecb_expect_true (cv = (CV *)POPs)) 744 while (ecb_expect_true (cv = (CV *)POPs))
719 { 745 {
720 put_padlist (aTHX_ cv); /* mark this padlist as available */ 746 put_padlist (aTHX_ cv); /* mark this padlist as available */
721 CvDEPTH (cv) = PTR2IV (POPs); 747 CvDEPTH (cv) = PTR2IV (POPs);
722 CvPADLIST (cv) = (AV *)POPs; 748 CvPADLIST (cv) = (PADLIST *)POPs;
723 } 749 }
724 750
725 PUTBACK; 751 PUTBACK;
726 } 752 }
727 753
… …
817 843
818 PUTBACK; 844 PUTBACK;
819 } 845 }
820 846
821 /* allocate some space on the context stack for our purposes */ 847 /* allocate some space on the context stack for our purposes */
822 if (ecb_expect_false (cxstack_ix + SLOT_COUNT >= cxstack_max)) 848 if (ecb_expect_false (cxstack_ix + (int)SLOT_COUNT >= cxstack_max))
823 { 849 {
824 unsigned int i; 850 unsigned int i;
825 851
826 for (i = 0; i < SLOT_COUNT; ++i) 852 for (i = 0; i < SLOT_COUNT; ++i)
827 CXINC; 853 CXINC;
… …
836 862
837#if CORO_JIT 863#if CORO_JIT
838 save_perl_slots (slot); 864 save_perl_slots (slot);
839#else 865#else
840 #define VARx(name,expr,type) slot->name = expr; 866 #define VARx(name,expr,type) slot->name = expr;
841 # include "state.h" 867 #include "state.h"
842 #undef VARx
843#endif 868#endif
844 } 869 }
845} 870}
846 871
847/* 872/*
… …
879#endif 904#endif
880 905
881 New(54,PL_scopestack,8,I32); 906 New(54,PL_scopestack,8,I32);
882 PL_scopestack_ix = 0; 907 PL_scopestack_ix = 0;
883 PL_scopestack_max = 8; 908 PL_scopestack_max = 8;
909#if HAS_SCOPESTACK_NAME
910 New(54,PL_scopestack_name,8,const char*);
911#endif
884 912
885 New(54,PL_savestack,24,ANY); 913 New(54,PL_savestack,24,ANY);
886 PL_savestack_ix = 0; 914 PL_savestack_ix = 0;
887 PL_savestack_max = 24; 915 PL_savestack_max = 24;
888 916
… …
916 } 944 }
917 945
918 Safefree (PL_tmps_stack); 946 Safefree (PL_tmps_stack);
919 Safefree (PL_markstack); 947 Safefree (PL_markstack);
920 Safefree (PL_scopestack); 948 Safefree (PL_scopestack);
949#if HAS_SCOPESTACK_NAME
950 Safefree (PL_scopestack_name);
951#endif
921 Safefree (PL_savestack); 952 Safefree (PL_savestack);
922#if !PERL_VERSION_ATLEAST (5,10,0) 953#if !PERL_VERSION_ATLEAST (5,10,0)
923 Safefree (PL_retstack); 954 Safefree (PL_retstack);
924#endif 955#endif
925} 956}
… …
985 { 1016 {
986 SV **svp = 0; 1017 SV **svp = 0;
987 1018
988 if (strEQ (s, "__DIE__" )) svp = &PL_diehook; 1019 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
989 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 1020 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
990 1021
991 if (svp) 1022 if (svp)
992 { 1023 {
993 sv_setsv (sv, *svp ? *svp : &PL_sv_undef); 1024 SV *ssv;
1025
1026 if (!*svp)
1027 ssv = &PL_sv_undef;
1028 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */
1029 ssv = sv_2mortal (newRV_inc (*svp));
1030 else
1031 ssv = *svp;
1032
1033 sv_setsv (sv, ssv);
994 return 0; 1034 return 0;
995 } 1035 }
996 } 1036 }
997 1037
998 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 1038 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
… …
1092 PL_hints = 0; 1132 PL_hints = 0;
1093 1133
1094 /* recreate the die/warn hooks */ 1134 /* recreate the die/warn hooks */
1095 PL_diehook = SvREFCNT_inc (rv_diehook); 1135 PL_diehook = SvREFCNT_inc (rv_diehook);
1096 PL_warnhook = SvREFCNT_inc (rv_warnhook); 1136 PL_warnhook = SvREFCNT_inc (rv_warnhook);
1097 1137
1098 GvSV (PL_defgv) = newSV (0); 1138 GvSV (PL_defgv) = newSV (0);
1099 GvAV (PL_defgv) = coro->args; coro->args = 0; 1139 GvAV (PL_defgv) = coro->args; coro->args = 0;
1100 GvSV (PL_errgv) = newSV (0); 1140 GvSV (PL_errgv) = newSV (0);
1101 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1141 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
1102 GvHV (PL_hintgv) = 0; 1142 GvHV (PL_hintgv) = 0;
… …
1220 SvREFCNT_dec (coro->invoke_cb); 1260 SvREFCNT_dec (coro->invoke_cb);
1221 SvREFCNT_dec (coro->invoke_av); 1261 SvREFCNT_dec (coro->invoke_av);
1222 } 1262 }
1223} 1263}
1224 1264
1225ECB_INLINE void 1265ecb_inline void
1226free_coro_mortal (pTHX) 1266free_coro_mortal (pTHX)
1227{ 1267{
1228 if (ecb_expect_true (coro_mortal)) 1268 if (ecb_expect_true (coro_mortal))
1229 { 1269 {
1230 SvREFCNT_dec ((SV *)coro_mortal); 1270 SvREFCNT_dec ((SV *)coro_mortal);
… …
1389 slf_frame.prepare = slf_prepare_set_stacklevel; 1429 slf_frame.prepare = slf_prepare_set_stacklevel;
1390 slf_frame.check = slf_check_set_stacklevel; 1430 slf_frame.check = slf_check_set_stacklevel;
1391} 1431}
1392 1432
1393/* the tail of transfer: execute stuff we can only do after a transfer */ 1433/* the tail of transfer: execute stuff we can only do after a transfer */
1394ECB_INLINE void 1434ecb_inline void
1395transfer_tail (pTHX) 1435transfer_tail (pTHX)
1396{ 1436{
1397 free_coro_mortal (aTHX); 1437 free_coro_mortal (aTHX);
1438}
1439
1440/* try to exit the same way perl's main function would do */
1441/* we do not bother resetting the environment or other things *7
1442/* that are not, uhm, essential */
1443/* this obviously also doesn't work when perl is embedded */
1444static void ecb_noinline ecb_cold
1445perlish_exit (pTHX)
1446{
1447 int exitstatus = perl_destruct (PL_curinterp);
1448 perl_free (PL_curinterp);
1449 exit (exitstatus);
1398} 1450}
1399 1451
1400/* 1452/*
1401 * this is a _very_ stripped down perl interpreter ;) 1453 * this is a _very_ stripped down perl interpreter ;)
1402 */ 1454 */
… …
1431 */ 1483 */
1432 1484
1433 /* 1485 /*
1434 * If perl-run returns we assume exit() was being called or the coro 1486 * If perl-run returns we assume exit() was being called or the coro
1435 * fell off the end, which seems to be the only valid (non-bug) 1487 * fell off the end, which seems to be the only valid (non-bug)
1436 * reason for perl_run to return. We try to exit by jumping to the 1488 * reason for perl_run to return. We try to mimic whatever perl is normally
1437 * bootstrap-time "top" top_env, as we cannot restore the "main" 1489 * 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 */ 1490 */
1442 PL_top_env = main_top_env; 1491 perlish_exit (aTHX);
1443 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1444 } 1492 }
1445} 1493}
1446 1494
1447static coro_cctx * 1495static coro_cctx *
1448cctx_new (void) 1496cctx_new (void)
… …
1463static coro_cctx * 1511static coro_cctx *
1464cctx_new_empty (void) 1512cctx_new_empty (void)
1465{ 1513{
1466 coro_cctx *cctx = cctx_new (); 1514 coro_cctx *cctx = cctx_new ();
1467 1515
1468 cctx->sptr = 0; 1516 cctx->stack.sptr = 0;
1469 coro_create (&cctx->cctx, 0, 0, 0, 0); 1517 coro_create (&cctx->cctx, 0, 0, 0, 0);
1470 1518
1471 return cctx; 1519 return cctx;
1472} 1520}
1473 1521
1474/* create a new cctx suitable as destination/running a perl interpreter */ 1522/* create a new cctx suitable as destination/running a perl interpreter */
1475static coro_cctx * 1523static coro_cctx *
1476cctx_new_run (void) 1524cctx_new_run (void)
1477{ 1525{
1478 coro_cctx *cctx = cctx_new (); 1526 coro_cctx *cctx = cctx_new ();
1479 void *stack_start;
1480 size_t stack_size;
1481 1527
1482#if HAVE_MMAP 1528 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 } 1529 {
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."); 1530 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1505 _exit (EXIT_FAILURE); 1531 _exit (EXIT_FAILURE);
1506 }
1507
1508 stack_start = cctx->sptr;
1509 stack_size = cctx->ssize;
1510 } 1532 }
1511 1533
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); 1534 coro_create (&cctx->cctx, cctx_run, (void *)cctx, cctx->stack.sptr, cctx->stack.ssze);
1517 1535
1518 return cctx; 1536 return cctx;
1519} 1537}
1520 1538
1521static void 1539static void
… …
1527 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current)); 1545 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1528 1546
1529 --cctx_count; 1547 --cctx_count;
1530 coro_destroy (&cctx->cctx); 1548 coro_destroy (&cctx->cctx);
1531 1549
1532 /* coro_transfer creates new, empty cctx's */ 1550 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 1551
1547 Safefree (cctx); 1552 Safefree (cctx);
1548} 1553}
1549 1554
1550/* wether this cctx should be destructed */ 1555/* wether this cctx should be destructed */
… …
1569} 1574}
1570 1575
1571static void 1576static void
1572cctx_put (coro_cctx *cctx) 1577cctx_put (coro_cctx *cctx)
1573{ 1578{
1574 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1579 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->stack.sptr));
1575 1580
1576 /* free another cctx if overlimit */ 1581 /* free another cctx if overlimit */
1577 if (ecb_expect_false (cctx_idle >= cctx_max_idle)) 1582 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1578 { 1583 {
1579 coro_cctx *first = cctx_first; 1584 coro_cctx *first = cctx_first;
… …
1705 return; 1710 return;
1706 1711
1707 slf_destroy (aTHX_ coro); 1712 slf_destroy (aTHX_ coro);
1708 1713
1709 coro->flags |= CF_ZOMBIE; 1714 coro->flags |= CF_ZOMBIE;
1710 1715
1711 if (coro->flags & CF_READY) 1716 if (coro->flags & CF_READY)
1712 { 1717 {
1713 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1718 /* reduce nready, as destroying a ready coro effectively unreadies it */
1714 /* alternative: look through all ready queues and remove the coro */ 1719 /* alternative: look through all ready queues and remove the coro */
1715 --coro_nready; 1720 --coro_nready;
… …
1792 TRANSFER (ta, 1); 1797 TRANSFER (ta, 1);
1793} 1798}
1794 1799
1795/** Coro ********************************************************************/ 1800/** Coro ********************************************************************/
1796 1801
1797ECB_INLINE void 1802ecb_inline void
1798coro_enq (pTHX_ struct coro *coro) 1803coro_enq (pTHX_ struct coro *coro)
1799{ 1804{
1800 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN]; 1805 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1801 1806
1802 SvREFCNT_inc_NN (coro->hv); 1807 SvREFCNT_inc_NN (coro->hv);
… …
1804 coro->next_ready = 0; 1809 coro->next_ready = 0;
1805 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro; 1810 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1806 ready [1] = coro; 1811 ready [1] = coro;
1807} 1812}
1808 1813
1809ECB_INLINE struct coro * 1814ecb_inline struct coro *
1810coro_deq (pTHX) 1815coro_deq (pTHX)
1811{ 1816{
1812 int prio; 1817 int prio;
1813 1818
1814 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; ) 1819 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
… …
1867{ 1872{
1868 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1873 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1869} 1874}
1870 1875
1871/* expects to own a reference to next->hv */ 1876/* expects to own a reference to next->hv */
1872ECB_INLINE void 1877ecb_inline void
1873prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1878prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1874{ 1879{
1875 SV *prev_sv = SvRV (coro_current); 1880 SV *prev_sv = SvRV (coro_current);
1876 1881
1877 ta->prev = SvSTATE_hv (prev_sv); 1882 ta->prev = SvSTATE_hv (prev_sv);
… …
1936 } 1941 }
1937 } 1942 }
1938 } 1943 }
1939} 1944}
1940 1945
1941ECB_INLINE void 1946ecb_inline void
1942prepare_cede (pTHX_ struct coro_transfer_args *ta) 1947prepare_cede (pTHX_ struct coro_transfer_args *ta)
1943{ 1948{
1944 api_ready (aTHX_ coro_current); 1949 api_ready (aTHX_ coro_current);
1945 prepare_schedule (aTHX_ ta); 1950 prepare_schedule (aTHX_ ta);
1946} 1951}
1947 1952
1948ECB_INLINE void 1953ecb_inline void
1949prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 1954prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1950{ 1955{
1951 SV *prev = SvRV (coro_current); 1956 SV *prev = SvRV (coro_current);
1952 1957
1953 if (coro_nready) 1958 if (coro_nready)
… …
2118{ 2123{
2119 AV *od = coro->on_destroy; 2124 AV *od = coro->on_destroy;
2120 2125
2121 if (!od) 2126 if (!od)
2122 return; 2127 return;
2128
2129 coro->on_destroy = 0;
2130 sv_2mortal ((SV *)od);
2123 2131
2124 while (AvFILLp (od) >= 0) 2132 while (AvFILLp (od) >= 0)
2125 { 2133 {
2126 SV *cb = sv_2mortal (av_pop (od)); 2134 SV *cb = sv_2mortal (av_pop (od));
2127 2135
… …
2148 2156
2149static void 2157static void
2150coro_set_status (pTHX_ struct coro *coro, SV **arg, int items) 2158coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
2151{ 2159{
2152 AV *av; 2160 AV *av;
2153 2161
2154 if (coro->status) 2162 if (coro->status)
2155 { 2163 {
2156 av = coro->status; 2164 av = coro->status;
2157 av_clear (av); 2165 av_clear (av);
2158 } 2166 }
… …
2205 2213
2206 coro = SvSTATE (arg [0]); 2214 coro = SvSTATE (arg [0]);
2207 coro_hv = coro->hv; 2215 coro_hv = coro->hv;
2208 2216
2209 coro_set_status (aTHX_ coro, arg + 1, items - 1); 2217 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2210 2218
2211 if (ecb_expect_false (coro->flags & CF_NOCANCEL)) 2219 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2212 { 2220 {
2213 /* coro currently busy cancelling something, so just notify it */ 2221 /* coro currently busy cancelling something, so just notify it */
2214 coro->slf_frame.data = (void *)coro; 2222 coro->slf_frame.data = (void *)coro;
2215 2223
… …
2394 2402
2395static int 2403static int
2396slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2404slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
2397{ 2405{
2398 SV *data = (SV *)frame->data; 2406 SV *data = (SV *)frame->data;
2399 2407
2400 if (CORO_THROW) 2408 if (CORO_THROW)
2401 return 0; 2409 return 0;
2402 2410
2403 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2411 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2404 return 1; 2412 return 1;
… …
2440 cb = sv_2mortal (coro->rouse_cb); 2448 cb = sv_2mortal (coro->rouse_cb);
2441 coro->rouse_cb = 0; 2449 coro->rouse_cb = 0;
2442 } 2450 }
2443 2451
2444 if (!SvROK (cb) 2452 if (!SvROK (cb)
2445 || SvTYPE (SvRV (cb)) != SVt_PVCV 2453 || SvTYPE (SvRV (cb)) != SVt_PVCV
2446 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2454 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2447 croak ("Coro::rouse_wait called with illegal callback argument,"); 2455 croak ("Coro::rouse_wait called with illegal callback argument,");
2448 2456
2449 { 2457 {
2450 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */ 2458 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
… …
3171 /* it quickly returns */ 3179 /* it quickly returns */
3172 if (CORO_THROW) 3180 if (CORO_THROW)
3173 return 0; 3181 return 0;
3174 3182
3175 /* one element that is an RV? repeat! */ 3183 /* one element that is an RV? repeat! */
3176 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0])) 3184 if (AvFILLp (state) == 0 && SvTYPE (AvARRAY (state)[0]) != SVt_PV)
3177 return 1; 3185 return 1;
3178 3186
3179 /* restore status */ 3187 /* restore status */
3180 { 3188 {
3181 SV *data_sv = av_pop (state); 3189 SV *data_sv = av_pop (state);
… …
3343#endif 3351#endif
3344 3352
3345#if CORO_JIT 3353#if CORO_JIT
3346 3354
3347static void ecb_noinline ecb_cold 3355static void ecb_noinline ecb_cold
3348pushav_3uv (pTHX_ UV a, UV b, UV c) 3356pushav_4uv (pTHX_ UV a, UV b, UV c, UV d)
3349{ 3357{
3350 dSP; 3358 dSP;
3351 AV *av = newAV (); 3359 AV *av = newAV ();
3352 3360
3361 av_store (av, 3, newSVuv (d));
3353 av_store (av, 2, newSVuv (c)); 3362 av_store (av, 2, newSVuv (c));
3354 av_store (av, 1, newSVuv (b)); 3363 av_store (av, 1, newSVuv (b));
3355 av_store (av, 0, newSVuv (a)); 3364 av_store (av, 0, newSVuv (a));
3356 3365
3357 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 3366 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
… …
3370 int count; 3379 int count;
3371 3380
3372 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1); 3381 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3373 3382
3374 PUSHMARK (SP); 3383 PUSHMARK (SP);
3375#define VARx(name,expr,type) pushav_3uv (aTHX_ (UV)&(expr), offsetof (perl_slots, name), sizeof (type)); 3384 #define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type));
3376# include "state.h" 3385 #include "state.h"
3377#undef VARx
3378 count = call_pv ("Coro::State::_jit", G_ARRAY); 3386 count = call_pv ("Coro::State::_jit", G_ARRAY);
3379 SPAGAIN; 3387 SPAGAIN;
3380 3388
3381 save = POPs; save_ptr = SvPVbyte (save, save_len); 3389 save = POPs; save_ptr = SvPVbyte (save, save_len);
3382 load = POPs; load_ptr = SvPVbyte (load, load_len); 3390 load = POPs; load_ptr = SvPVbyte (load, load_len);
… …
3414#ifdef USE_ITHREADS 3422#ifdef USE_ITHREADS
3415# if CORO_PTHREAD 3423# if CORO_PTHREAD
3416 coro_thx = PERL_GET_CONTEXT; 3424 coro_thx = PERL_GET_CONTEXT;
3417# endif 3425# endif
3418#endif 3426#endif
3419 BOOT_PAGESIZE;
3420
3421 /* perl defines these to check for existance first, but why it doesn't */ 3427 /* 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 */ 3428 /* just create them one at init time is not clear to me, except for */
3423 /* programs trying to delete them, but... */ 3429 /* programs trying to delete them, but... */
3424 /* anyway, we declare this as invalid and make sure they are initialised here */ 3430 /* anyway, we declare this as invalid and make sure they are initialised here */
3425 DEFSV; 3431 DEFSV;
… …
3495void 3501void
3496transfer (...) 3502transfer (...)
3497 PROTOTYPE: $$ 3503 PROTOTYPE: $$
3498 CODE: 3504 CODE:
3499 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3505 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3500
3501void
3502_exit (int code)
3503 PROTOTYPE: $
3504 CODE:
3505 _exit (code);
3506 3506
3507SV * 3507SV *
3508clone (Coro::State coro) 3508clone (Coro::State coro)
3509 CODE: 3509 CODE:
3510{ 3510{
… …
3565void 3565void
3566list () 3566list ()
3567 PROTOTYPE: 3567 PROTOTYPE:
3568 PPCODE: 3568 PPCODE:
3569{ 3569{
3570 struct coro *coro; 3570 struct coro *coro;
3571 for (coro = coro_first; coro; coro = coro->next) 3571 for (coro = coro_first; coro; coro = coro->next)
3572 if (coro->hv) 3572 if (coro->hv)
3573 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 3573 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
3574} 3574}
3575 3575
… …
3639 RETVAL = boolSV (coro->flags & ix); 3639 RETVAL = boolSV (coro->flags & ix);
3640 OUTPUT: 3640 OUTPUT:
3641 RETVAL 3641 RETVAL
3642 3642
3643void 3643void
3644throw (Coro::State self, SV *exception = &PL_sv_undef) 3644throw (SV *self, SV *exception = &PL_sv_undef)
3645 PROTOTYPE: $;$ 3645 PROTOTYPE: $;$
3646 CODE: 3646 CODE:
3647{ 3647{
3648 struct coro *coro = SvSTATE (self);
3648 struct coro *current = SvSTATE_current; 3649 struct coro *current = SvSTATE_current;
3649 SV **exceptionp = self == current ? &CORO_THROW : &self->except; 3650 SV **exceptionp = coro == current ? &CORO_THROW : &coro->except;
3650 SvREFCNT_dec (*exceptionp); 3651 SvREFCNT_dec (*exceptionp);
3651 SvGETMAGIC (exception); 3652 SvGETMAGIC (exception);
3652 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0; 3653 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3654
3655 api_ready (aTHX_ self);
3653} 3656}
3654 3657
3655void 3658void
3656api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3659api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3657 PROTOTYPE: $;$ 3660 PROTOTYPE: $;$
… …
3734 3737
3735void 3738void
3736times (Coro::State self) 3739times (Coro::State self)
3737 PPCODE: 3740 PPCODE:
3738{ 3741{
3739 struct coro *current = SvSTATE (coro_current); 3742 struct coro *current = SvSTATE (coro_current);
3740 3743
3741 if (ecb_expect_false (current == self)) 3744 if (ecb_expect_false (current == self))
3742 { 3745 {
3743 coro_times_update (); 3746 coro_times_update ();
3744 coro_times_add (SvSTATE (coro_current)); 3747 coro_times_add (SvSTATE (coro_current));
… …
3787 3790
3788 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3791 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); 3792 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); 3793 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 */ 3794 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3792 3795
3793 coro_stash = gv_stashpv ("Coro", TRUE); 3796 coro_stash = gv_stashpv ("Coro", TRUE);
3794 3797
3795 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 3798 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3796 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 3799 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3797 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL)); 3800 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
… …
4019 on_leave = 1 4022 on_leave = 1
4020 PROTOTYPE: & 4023 PROTOTYPE: &
4021 CODE: 4024 CODE:
4022{ 4025{
4023 struct coro *coro = SvSTATE_current; 4026 struct coro *coro = SvSTATE_current;
4024 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 4027 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
4025 4028
4026 block = s_get_cv_croak (block); 4029 block = s_get_cv_croak (block);
4027 4030
4028 if (!*avp) 4031 if (!*avp)
4029 *avp = newAV (); 4032 *avp = newAV ();
… …
4049 4052
4050SV * 4053SV *
4051new (SV *klass, SV *count = 0) 4054new (SV *klass, SV *count = 0)
4052 CODE: 4055 CODE:
4053{ 4056{
4054 int semcnt = 1; 4057 int semcnt = 1;
4055 4058
4056 if (count) 4059 if (count)
4057 { 4060 {
4058 SvGETMAGIC (count); 4061 SvGETMAGIC (count);
4059 4062
… …
4119 XSRETURN_NO; 4122 XSRETURN_NO;
4120} 4123}
4121 4124
4122void 4125void
4123waiters (SV *self) 4126waiters (SV *self)
4124 PPCODE: 4127 PPCODE:
4125{ 4128{
4126 AV *av = (AV *)SvRV (self); 4129 AV *av = (AV *)SvRV (self);
4127 int wcount = AvFILLp (av) + 1 - 1; 4130 int wcount = AvFILLp (av) + 1 - 1;
4128 4131
4129 if (GIMME_V == G_SCALAR) 4132 if (GIMME_V == G_SCALAR)
… …
4138} 4141}
4139 4142
4140MODULE = Coro::State PACKAGE = Coro::SemaphoreSet 4143MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
4141 4144
4142void 4145void
4143_may_delete (SV *sem, int count, int extra_refs) 4146_may_delete (SV *sem, int count, unsigned int extra_refs)
4144 PPCODE: 4147 PPCODE:
4145{ 4148{
4146 AV *av = (AV *)SvRV (sem); 4149 AV *av = (AV *)SvRV (sem);
4147 4150
4148 if (SvREFCNT ((SV *)av) == 1 + extra_refs 4151 if (SvREFCNT ((SV *)av) == 1 + extra_refs
4149 && AvFILLp (av) == 0 /* no waiters, just count */ 4152 && AvFILLp (av) == 0 /* no waiters, just count */
4150 && SvIV (AvARRAY (av)[0]) == count) 4153 && SvIV (AvARRAY (av)[0]) == count)
4151 XSRETURN_YES; 4154 XSRETURN_YES;
… …
4172 4175
4173void 4176void
4174broadcast (SV *self) 4177broadcast (SV *self)
4175 CODE: 4178 CODE:
4176{ 4179{
4177 AV *av = (AV *)SvRV (self); 4180 AV *av = (AV *)SvRV (self);
4178 coro_signal_wake (aTHX_ av, AvFILLp (av)); 4181 coro_signal_wake (aTHX_ av, AvFILLp (av));
4179} 4182}
4180 4183
4181void 4184void
4182send (SV *self) 4185send (SV *self)
… …
4190 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */ 4193 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
4191} 4194}
4192 4195
4193IV 4196IV
4194awaited (SV *self) 4197awaited (SV *self)
4195 CODE: 4198 CODE:
4196 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1; 4199 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
4197 OUTPUT: 4200 OUTPUT:
4198 RETVAL 4201 RETVAL
4199 4202
4200 4203
… …
4205 4208
4206void 4209void
4207_schedule (...) 4210_schedule (...)
4208 CODE: 4211 CODE:
4209{ 4212{
4210 static int incede; 4213 static int incede;
4211 4214
4212 api_cede_notself (aTHX); 4215 api_cede_notself (aTHX);
4213 4216
4214 ++incede; 4217 ++incede;
4215 while (coro_nready >= incede && api_cede (aTHX)) 4218 while (coro_nready >= incede && api_cede (aTHX))
… …
4259 { 4262 {
4260 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect; 4263 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
4261 coro_old_pp_sselect = 0; 4264 coro_old_pp_sselect = 0;
4262 } 4265 }
4263 4266
4267MODULE = Coro::State PACKAGE = Coro::Util
4268
4269void
4270_exit (int code)
4271 CODE:
4272 _exit (code);
4273
4274NV
4275time ()
4276 CODE:
4277 RETVAL = nvtime (aTHX);
4278 OUTPUT:
4279 RETVAL
4280
4281NV
4282gettimeofday ()
4283 PPCODE:
4284{
4285 UV tv [2];
4286 u2time (aTHX_ tv);
4287 EXTEND (SP, 2);
4288 PUSHs (sv_2mortal (newSVuv (tv [0])));
4289 PUSHs (sv_2mortal (newSVuv (tv [1])));
4290}
4291

Diff Legend

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