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.408 by root, Sat Jun 11 16:58:40 2011 UTC vs.
Revision 1.449 by root, Sun Jun 21 17:02:49 2015 UTC

1/* this works around a bug in mingw32 providing a non-working setjmp */ 1/* this works around a bug in mingw32 providing a non-working setjmp */
2#define USE_NO_MINGW_SETJMP_TWO_ARGS 2#define USE_NO_MINGW_SETJMP_TWO_ARGS
3 3
4#define NDEBUG 1 4#define NDEBUG 1 /* perl usually disables NDEBUG later */
5 5
6#include "libcoro/coro.c" 6#include "libcoro/coro.c"
7 7
8#define PERL_NO_GET_CONTEXT 8#define PERL_NO_GET_CONTEXT
9#define PERL_EXT 9#define PERL_EXT
… …
12#include "perl.h" 12#include "perl.h"
13#include "XSUB.h" 13#include "XSUB.h"
14#include "perliol.h" 14#include "perliol.h"
15 15
16#include "schmorp.h" 16#include "schmorp.h"
17
18#define ECB_NO_THREADS 1
19#define ECB_NO_LIBM 1
17#include "ecb.h" 20#include "ecb.h"
18 21
19#include <stddef.h> 22#include <stddef.h>
20#include <stdio.h> 23#include <stdio.h>
21#include <errno.h> 24#include <errno.h>
22#include <assert.h> 25#include <assert.h>
23 26
24#ifndef SVs_PADSTALE 27#ifndef SVs_PADSTALE
25# define SVs_PADSTALE 0 28# define SVs_PADSTALE 0
29#endif
30
31#ifdef PadARRAY
32# define NEWPADAPI 1
33# define newPADLIST(var) (Newz (0, var, 1, PADLIST), Newx (PadlistARRAY (var), 2, PAD *))
34#else
35typedef AV PADNAMELIST;
36# if !PERL_VERSION_ATLEAST(5,8,0)
37typedef AV PADLIST;
38typedef AV PAD;
39# endif
40# define PadlistARRAY(pl) ((PAD **)AvARRAY (pl))
41# define PadlistMAX(pl) AvFILLp (pl)
42# define PadlistNAMES(pl) (*PadlistARRAY (pl))
43# define PadARRAY AvARRAY
44# define PadMAX AvFILLp
45# define newPADLIST(var) ((var) = newAV (), av_extend (var, 1))
46#endif
47#ifndef PadnamelistREFCNT
48# define PadnamelistREFCNT(pnl) SvREFCNT (pnl)
49#endif
50#ifndef PadnamelistREFCNT_dec
51# define PadnamelistREFCNT_dec(pnl) SvREFCNT_dec (pnl)
52#endif
53
54/* 5.19.something has replaced SVt_BIND by SVt_INVLIST */
55/* we just alias it to SVt_IV, as that is sufficient for swap_sv for now */
56#if PERL_VERSION_ATLEAST(5,19,0)
57# define SVt_BIND SVt_IV
26#endif 58#endif
27 59
28#if defined(_WIN32) 60#if defined(_WIN32)
29# undef HAS_GETTIMEOFDAY 61# undef HAS_GETTIMEOFDAY
30# undef setjmp 62# undef setjmp
… …
33# define setjmp _setjmp /* deep magic */ 65# define setjmp _setjmp /* deep magic */
34#else 66#else
35# include <inttypes.h> /* most portable stdint.h */ 67# include <inttypes.h> /* most portable stdint.h */
36#endif 68#endif
37 69
38#ifdef HAVE_MMAP
39# include <unistd.h>
40# include <sys/mman.h>
41# ifndef MAP_ANONYMOUS
42# ifdef MAP_ANON
43# define MAP_ANONYMOUS MAP_ANON
44# else
45# undef HAVE_MMAP
46# endif
47# endif
48# include <limits.h>
49# ifndef PAGESIZE
50# define PAGESIZE pagesize
51# define BOOT_PAGESIZE pagesize = sysconf (_SC_PAGESIZE)
52static long pagesize;
53# else
54# define BOOT_PAGESIZE (void)0
55# endif
56#else
57# define PAGESIZE 0
58# define BOOT_PAGESIZE (void)0
59#endif
60
61#if CORO_USE_VALGRIND
62# include <valgrind/valgrind.h>
63#endif
64
65/* the maximum number of idle cctx that will be pooled */ 70/* the maximum number of idle cctx that will be pooled */
66static int cctx_max_idle = 4; 71static int cctx_max_idle = 4;
67 72
68#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 73#if defined(DEBUGGING) && PERL_VERSION_ATLEAST(5,12,0)
69# undef CORO_STACKGUARD 74# define HAS_SCOPESTACK_NAME 1
70#endif
71
72#ifndef CORO_STACKGUARD
73# define CORO_STACKGUARD 0
74#endif 75#endif
75 76
76/* prefer perl internal functions over our own? */ 77/* prefer perl internal functions over our own? */
77#ifndef CORO_PREFER_PERL_FUNCTIONS 78#ifndef CORO_PREFER_PERL_FUNCTIONS
78# define CORO_PREFER_PERL_FUNCTIONS 0 79# define CORO_PREFER_PERL_FUNCTIONS 0
… …
97# if CORO_PTHREAD 98# if CORO_PTHREAD
98static void *coro_thx; 99static void *coro_thx;
99# endif 100# endif
100#endif 101#endif
101 102
102/* used in state.h */
103#define VAR(name,type) VARx(name, PL_ ## name, type)
104
105#ifdef __linux 103#ifdef __linux
106# include <time.h> /* for timespec */ 104# include <time.h> /* for timespec */
107# include <syscall.h> /* for SYS_* */ 105# include <syscall.h> /* for SYS_* */
108# ifdef SYS_clock_gettime 106# ifdef SYS_clock_gettime
109# define coro_clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts)) 107# define coro_clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
… …
172typedef struct coro_cctx 170typedef struct coro_cctx
173{ 171{
174 struct coro_cctx *next; 172 struct coro_cctx *next;
175 173
176 /* the stack */ 174 /* the stack */
177 void *sptr; 175 struct coro_stack stack;
178 size_t ssize;
179 176
180 /* cpu state */ 177 /* cpu state */
181 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 178 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
179#ifndef NDEBUG
182 JMPENV *idle_te; /* same as idle_sp, but for top_env, TODO: remove once stable */ 180 JMPENV *idle_te; /* same as idle_sp, but for top_env */
181#endif
183 JMPENV *top_env; 182 JMPENV *top_env;
184 coro_context cctx; 183 coro_context cctx;
185 184
186 U32 gen; 185 U32 gen;
187#if CORO_USE_VALGRIND 186#if CORO_USE_VALGRIND
… …
207}; 206};
208 207
209/* the structure where most of the perl state is stored, overlaid on the cxstack */ 208/* the structure where most of the perl state is stored, overlaid on the cxstack */
210typedef struct 209typedef struct
211{ 210{
212#define VARx(name,expr,type) type name; 211 #define VARx(name,expr,type) type name;
213# include "state.h" 212 #include "state.h"
214#undef VARx
215} perl_slots; 213} perl_slots;
216 214
217// how many context stack entries do we need for perl_slots 215/* 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)) 216#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
219 217
220/* this is a structure representing a perl-level coroutine */ 218/* this is a structure representing a perl-level coroutine */
221struct coro 219struct coro
222{ 220{
… …
291#define coro_nready coroapi.nready 289#define coro_nready coroapi.nready
292 290
293/** JIT *********************************************************************/ 291/** JIT *********************************************************************/
294 292
295#if CORO_JIT 293#if CORO_JIT
294 /* APPLE doesn't have mmap though */
295 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__)
296 #ifndef CORO_JIT_TYPE 296 #ifndef CORO_JIT_TYPE
297 #if __x86_64 && (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris) 297 #if ECB_AMD64 && CORO_JIT_UNIXY
298 #define CORO_JIT_TYPE "amd64-unix" 298 #define CORO_JIT_TYPE "amd64-unix"
299 typedef void (*load_save_perl_slots_type)(perl_slots *); 299 #elif __i386 && CORO_JIT_UNIXY
300 #elif __i386 && (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris)
301 #define CORO_JIT_TYPE "x86-unix" 300 #define CORO_JIT_TYPE "x86-unix"
302 typedef void (*load_save_perl_slots_type)(perl_slots *);
303 #else
304 #undef CORO_JIT
305 #endif 301 #endif
306 #endif 302 #endif
307#endif 303#endif
308 304
305#if !defined(CORO_JIT_TYPE) || _POSIX_MEMORY_PROTECTION <= 0
306 #undef CORO_JIT
307#endif
308
309#if CORO_JIT 309#if CORO_JIT
310 typedef void (*load_save_perl_slots_type)(perl_slots *);
310static load_save_perl_slots_type load_perl_slots, save_perl_slots; 311 static load_save_perl_slots_type load_perl_slots, save_perl_slots;
311#endif 312#endif
312 313
313/** Coro::Select ************************************************************/ 314/** Coro::Select ************************************************************/
314 315
315static OP *(*coro_old_pp_sselect) (pTHX); 316static OP *(*coro_old_pp_sselect) (pTHX);
… …
332 333
333/** time stuff **************************************************************/ 334/** time stuff **************************************************************/
334 335
335#ifdef HAS_GETTIMEOFDAY 336#ifdef HAS_GETTIMEOFDAY
336 337
337ECB_INLINE void 338ecb_inline void
338coro_u2time (pTHX_ UV ret[2]) 339coro_u2time (pTHX_ UV ret[2])
339{ 340{
340 struct timeval tv; 341 struct timeval tv;
341 gettimeofday (&tv, 0); 342 gettimeofday (&tv, 0);
342 343
343 ret [0] = tv.tv_sec; 344 ret [0] = tv.tv_sec;
344 ret [1] = tv.tv_usec; 345 ret [1] = tv.tv_usec;
345} 346}
346 347
347ECB_INLINE double 348ecb_inline double
348coro_nvtime () 349coro_nvtime (void)
349{ 350{
350 struct timeval tv; 351 struct timeval tv;
351 gettimeofday (&tv, 0); 352 gettimeofday (&tv, 0);
352 353
353 return tv.tv_sec + tv.tv_usec * 1e-6; 354 return tv.tv_sec + tv.tv_usec * 1e-6;
354} 355}
355 356
356ECB_INLINE void 357ecb_inline void
357time_init (pTHX) 358time_init (pTHX)
358{ 359{
359 nvtime = coro_nvtime; 360 nvtime = coro_nvtime;
360 u2time = coro_u2time; 361 u2time = coro_u2time;
361} 362}
362 363
363#else 364#else
364 365
365ECB_INLINE void 366ecb_inline void
366time_init (pTHX) 367time_init (pTHX)
367{ 368{
368 SV **svp; 369 SV **svp;
369 370
370 require_pv ("Time/HiRes.pm"); 371 require_pv ("Time/HiRes.pm");
371 372
372 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0); 373 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
373 374
374 if (!svp) croak ("Time::HiRes is required, but missing. Caught"); 375 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
375 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught"); 376 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught");
376 377
… …
412 get_hv (name, create); 413 get_hv (name, create);
413#endif 414#endif
414 return get_hv (name, create); 415 return get_hv (name, create);
415} 416}
416 417
417ECB_INLINE void 418ecb_inline void
418coro_times_update () 419coro_times_update (void)
419{ 420{
420#ifdef coro_clock_gettime 421#ifdef coro_clock_gettime
421 struct timespec ts; 422 struct timespec ts;
422 423
423 ts.tv_sec = ts.tv_nsec = 0; 424 ts.tv_sec = ts.tv_nsec = 0;
… …
435 time_real [0] = tv [0]; 436 time_real [0] = tv [0];
436 time_real [1] = tv [1] * 1000; 437 time_real [1] = tv [1] * 1000;
437#endif 438#endif
438} 439}
439 440
440ECB_INLINE void 441ecb_inline void
441coro_times_add (struct coro *c) 442coro_times_add (struct coro *c)
442{ 443{
443 c->t_real [1] += time_real [1]; 444 c->t_real [1] += time_real [1];
444 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; } 445 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
445 c->t_real [0] += time_real [0]; 446 c->t_real [0] += time_real [0];
… …
447 c->t_cpu [1] += time_cpu [1]; 448 c->t_cpu [1] += time_cpu [1];
448 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; } 449 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
449 c->t_cpu [0] += time_cpu [0]; 450 c->t_cpu [0] += time_cpu [0];
450} 451}
451 452
452ECB_INLINE void 453ecb_inline void
453coro_times_sub (struct coro *c) 454coro_times_sub (struct coro *c)
454{ 455{
455 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; } 456 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; }
456 c->t_real [1] -= time_real [1]; 457 c->t_real [1] -= time_real [1];
457 c->t_real [0] -= time_real [0]; 458 c->t_real [0] -= time_real [0];
… …
478 : 0) 479 : 0)
479 480
480#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv) 481#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
481#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state) 482#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
482 483
483ECB_INLINE MAGIC * 484ecb_inline MAGIC *
484SvSTATEhv_p (pTHX_ SV *coro) 485SvSTATEhv_p (pTHX_ SV *coro)
485{ 486{
486 MAGIC *mg; 487 MAGIC *mg;
487 488
488 if (ecb_expect_true ( 489 if (ecb_expect_true (
… …
493 return mg; 494 return mg;
494 495
495 return 0; 496 return 0;
496} 497}
497 498
498ECB_INLINE struct coro * 499ecb_inline struct coro *
499SvSTATE_ (pTHX_ SV *coro) 500SvSTATE_ (pTHX_ SV *coro)
500{ 501{
501 MAGIC *mg; 502 MAGIC *mg;
502 503
503 if (SvROK (coro)) 504 if (SvROK (coro))
… …
517#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 518#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
518 519
519/*****************************************************************************/ 520/*****************************************************************************/
520/* padlist management and caching */ 521/* padlist management and caching */
521 522
522ECB_INLINE AV * 523ecb_inline PADLIST *
523coro_derive_padlist (pTHX_ CV *cv) 524coro_derive_padlist (pTHX_ CV *cv)
524{ 525{
525 AV *padlist = CvPADLIST (cv); 526 PADLIST *padlist = CvPADLIST (cv);
526 AV *newpadlist, *newpad; 527 PADLIST *newpadlist;
528 PADNAMELIST *padnames;
529 PAD *newpad;
530 PADOFFSET off = PadlistMAX (padlist) + 1;
527 531
528 newpadlist = newAV (); 532#if NEWPADAPI
533
534 /* if we had the original CvDEPTH, we might be able to steal the CvDEPTH+1 entry instead */
535 /* 20131102194744.GA6705@schmorp.de, 20131102195825.2013.qmail@lists-nntp.develooper.com */
536 while (!PadlistARRAY (padlist)[off - 1])
537 --off;
538
539 Perl_pad_push (aTHX_ padlist, off);
540
541 newpad = PadlistARRAY (padlist)[off];
542 PadlistARRAY (padlist)[off] = 0;
543
544#else
545
546#if PERL_VERSION_ATLEAST (5,10,0)
547 Perl_pad_push (aTHX_ padlist, off);
548#else
549 Perl_pad_push (aTHX_ padlist, off, 1);
550#endif
551
552 newpad = PadlistARRAY (padlist)[off];
553 PadlistMAX (padlist) = off - 1;
554
555#endif
556
557 newPADLIST (newpadlist);
558#if !PERL_VERSION_ATLEAST(5,15,3)
559 /* Padlists are AvREAL as of 5.15.3. See perl bug #98092 and perl commit 7d953ba. */
529 AvREAL_off (newpadlist); 560 AvREAL_off (newpadlist);
530#if PERL_VERSION_ATLEAST (5,10,0)
531 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1);
532#else
533 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
534#endif 561#endif
535 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
536 --AvFILLp (padlist);
537 562
538 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0])); 563 /* Already extended to 2 elements by newPADLIST. */
539 av_store (newpadlist, 1, (SV *)newpad); 564 PadlistMAX (newpadlist) = 1;
565
566 padnames = PadlistNAMES (padlist);
567 ++PadnamelistREFCNT (padnames);
568 PadlistNAMES (newpadlist) = padnames;
569
570 PadlistARRAY (newpadlist)[1] = newpad;
540 571
541 return newpadlist; 572 return newpadlist;
542} 573}
543 574
544ECB_INLINE void 575ecb_inline void
545free_padlist (pTHX_ AV *padlist) 576free_padlist (pTHX_ PADLIST *padlist)
546{ 577{
547 /* may be during global destruction */ 578 /* may be during global destruction */
548 if (!IN_DESTRUCT) 579 if (!IN_DESTRUCT)
549 { 580 {
550 I32 i = AvFILLp (padlist); 581 I32 i = PadlistMAX (padlist);
551 582
552 while (i > 0) /* special-case index 0 */ 583 while (i > 0) /* special-case index 0 */
553 { 584 {
554 /* we try to be extra-careful here */ 585 /* we try to be extra-careful here */
555 AV *av = (AV *)AvARRAY (padlist)[i--]; 586 PAD *pad = PadlistARRAY (padlist)[i--];
556 I32 j = AvFILLp (av);
557 587
588 if (pad)
589 {
590 I32 j = PadMAX (pad);
591
558 while (j >= 0) 592 while (j >= 0)
559 SvREFCNT_dec (AvARRAY (av)[j--]); 593 SvREFCNT_dec (PadARRAY (pad)[j--]);
560 594
561 AvFILLp (av) = -1; 595 PadMAX (pad) = -1;
562 SvREFCNT_dec (av); 596 SvREFCNT_dec (pad);
597 }
563 } 598 }
564 599
565 SvREFCNT_dec (AvARRAY (padlist)[0]); 600 PadnamelistREFCNT_dec (PadlistNAMES (padlist));
566 601
602#if NEWPADAPI
603 Safefree (PadlistARRAY (padlist));
604 Safefree (padlist);
605#else
567 AvFILLp (padlist) = -1; 606 AvFILLp (padlist) = -1;
607 AvREAL_off (padlist);
568 SvREFCNT_dec ((SV*)padlist); 608 SvREFCNT_dec ((SV*)padlist);
609#endif
569 } 610 }
570} 611}
571 612
572static int 613static int
573coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 614coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
574{ 615{
575 AV *padlist; 616 PADLIST *padlist;
576 AV *av = (AV *)mg->mg_obj; 617 PADLIST **padlists = (PADLIST **)(mg->mg_ptr + sizeof(size_t));
618 size_t len = *(size_t *)mg->mg_ptr;
577 619
578 /* perl manages to free our internal AV and _then_ call us */ 620 /* perl manages to free our internal AV and _then_ call us */
579 if (IN_DESTRUCT) 621 if (IN_DESTRUCT)
580 return 0; 622 return 0;
581 623
582 /* casting is fun. */ 624 while (len--)
583 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
584 free_padlist (aTHX_ padlist); 625 free_padlist (aTHX_ padlists[len]);
585
586 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
587 626
588 return 0; 627 return 0;
589} 628}
590 629
591static MGVTBL coro_cv_vtbl = { 630static MGVTBL coro_cv_vtbl = {
592 0, 0, 0, 0, 631 0, 0, 0, 0,
593 coro_cv_free 632 coro_cv_free
594}; 633};
595 634
596/* the next two functions merely cache the padlists */ 635/* the next two functions merely cache the padlists */
597ECB_INLINE void 636ecb_inline void
598get_padlist (pTHX_ CV *cv) 637get_padlist (pTHX_ CV *cv)
599{ 638{
600 MAGIC *mg = CORO_MAGIC_cv (cv); 639 MAGIC *mg = CORO_MAGIC_cv (cv);
601 AV *av; 640 size_t *lenp;
602 641
603 if (ecb_expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 642 if (ecb_expect_true (mg && *(lenp = (size_t *)mg->mg_ptr)))
604 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 643 CvPADLIST (cv) = ((PADLIST **)(mg->mg_ptr + sizeof(size_t)))[--*lenp];
605 else 644 else
606 { 645 {
607#if CORO_PREFER_PERL_FUNCTIONS 646#if CORO_PREFER_PERL_FUNCTIONS
608 /* this is probably cleaner? but also slower! */ 647 /* this is probably cleaner? but also slower! */
609 /* in practise, it seems to be less stable */ 648 /* in practise, it seems to be less stable */
… …
615 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 654 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
616#endif 655#endif
617 } 656 }
618} 657}
619 658
620ECB_INLINE void 659ecb_inline void
621put_padlist (pTHX_ CV *cv) 660put_padlist (pTHX_ CV *cv)
622{ 661{
623 MAGIC *mg = CORO_MAGIC_cv (cv); 662 MAGIC *mg = CORO_MAGIC_cv (cv);
624 AV *av;
625 663
626 if (ecb_expect_false (!mg)) 664 if (ecb_expect_false (!mg))
665 {
627 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 666 mg = sv_magicext ((SV *)cv, 0, CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
667 Newz (0, mg->mg_ptr ,sizeof (size_t) + sizeof (PADLIST *), char);
668 mg->mg_len = 1; /* so mg_free frees mg_ptr */
669 }
670 else
671 Renew (mg->mg_ptr,
672 sizeof(size_t) + (*(size_t *)mg->mg_ptr + 1) * sizeof(PADLIST *),
673 char);
628 674
629 av = (AV *)mg->mg_obj; 675 ((PADLIST **)(mg->mg_ptr + sizeof (size_t))) [(*(size_t *)mg->mg_ptr)++] = CvPADLIST (cv);
630
631 if (ecb_expect_false (AvFILLp (av) >= AvMAX (av)))
632 av_extend (av, AvFILLp (av) + 1);
633
634 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
635} 676}
636 677
637/** load & save, init *******************************************************/ 678/** load & save, init *******************************************************/
638 679
680ecb_inline void
681swap_sv (SV *a, SV *b)
682{
683 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
684 SV tmp;
685
686 /* swap sv_any */
687 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
688
689 /* swap sv_flags */
690 SvFLAGS (&tmp) = SvFLAGS (a);
691 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
692 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
693
694#if PERL_VERSION_ATLEAST (5,10,0)
695 /* perl 5.10 and later complicates this _quite_ a bit, but it also
696 * is much faster, so no quarrels here. alternatively, we could
697 * sv_upgrade to avoid this.
698 */
699 {
700 /* swap sv_u */
701 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
702
703 /* if SvANY points to the head, we need to adjust the pointers,
704 * as the pointer for a still points to b, and maybe vice versa.
705 */
706 #define svany_in_head(type) \
707 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
708
709 if (svany_in_head (SvTYPE (a)))
710 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
711
712 if (svany_in_head (SvTYPE (b)))
713 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
714 }
715#endif
716}
717
639/* swap sv heads, at least logically */ 718/* swap sv heads, at least logically */
640static void 719static void
641swap_svs (pTHX_ Coro__State c) 720swap_svs (pTHX_ Coro__State c)
642{ 721{
643 int i; 722 int i;
644 723
645 for (i = 0; i <= AvFILLp (c->swap_sv); ) 724 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
646 { 725 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
647 SV *a = AvARRAY (c->swap_sv)[i++];
648 SV *b = AvARRAY (c->swap_sv)[i++];
649
650 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
651 SV tmp;
652
653 /* swap sv_any */
654 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
655
656 /* swap sv_flags */
657 SvFLAGS (&tmp) = SvFLAGS (a);
658 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
659 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
660
661#if PERL_VERSION_ATLEAST (5,10,0)
662 /* perl 5.10 complicates this _quite_ a bit, but it also is
663 * much faster, so no quarrels here. alternatively, we could
664 * sv_upgrade to avoid this.
665 */
666 {
667 /* swap sv_u */
668 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
669
670 /* if SvANY points to the head, we need to adjust the pointers,
671 * as the pointer for a still points to b, and maybe vice versa.
672 */
673 #define svany_in_head(type) \
674 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
675
676 if (svany_in_head (SvTYPE (a)))
677 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
678
679 if (svany_in_head (SvTYPE (b)))
680 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
681 }
682#endif
683 }
684} 726}
685 727
686#define SWAP_SVS(coro) \ 728#define SWAP_SVS(coro) \
687 if (ecb_expect_false ((coro)->swap_sv)) \ 729 if (ecb_expect_false ((coro)->swap_sv)) \
688 swap_svs (aTHX_ (coro)) 730 swap_svs (aTHX_ (coro))
… …
700 742
701#if CORO_JIT 743#if CORO_JIT
702 load_perl_slots (slot); 744 load_perl_slots (slot);
703#else 745#else
704 #define VARx(name,expr,type) expr = slot->name; 746 #define VARx(name,expr,type) expr = slot->name;
705 # include "state.h" 747 #include "state.h"
706 #undef VARx
707#endif 748#endif
708 749
709 { 750 {
710 dSP; 751 dSP;
711 752
… …
714 /* now do the ugly restore mess */ 755 /* now do the ugly restore mess */
715 while (ecb_expect_true (cv = (CV *)POPs)) 756 while (ecb_expect_true (cv = (CV *)POPs))
716 { 757 {
717 put_padlist (aTHX_ cv); /* mark this padlist as available */ 758 put_padlist (aTHX_ cv); /* mark this padlist as available */
718 CvDEPTH (cv) = PTR2IV (POPs); 759 CvDEPTH (cv) = PTR2IV (POPs);
719 CvPADLIST (cv) = (AV *)POPs; 760 CvPADLIST (cv) = (PADLIST *)POPs;
720 } 761 }
721 762
722 PUTBACK; 763 PUTBACK;
723 } 764 }
724 765
… …
814 855
815 PUTBACK; 856 PUTBACK;
816 } 857 }
817 858
818 /* allocate some space on the context stack for our purposes */ 859 /* allocate some space on the context stack for our purposes */
819 if (ecb_expect_false (cxstack_ix + SLOT_COUNT >= cxstack_max)) 860 if (ecb_expect_false (cxstack_ix + (int)SLOT_COUNT >= cxstack_max))
820 { 861 {
821 unsigned int i; 862 unsigned int i;
822 863
823 for (i = 0; i < SLOT_COUNT; ++i) 864 for (i = 0; i < SLOT_COUNT; ++i)
824 CXINC; 865 CXINC;
… …
833 874
834#if CORO_JIT 875#if CORO_JIT
835 save_perl_slots (slot); 876 save_perl_slots (slot);
836#else 877#else
837 #define VARx(name,expr,type) slot->name = expr; 878 #define VARx(name,expr,type) slot->name = expr;
838 # include "state.h" 879 #include "state.h"
839 #undef VARx
840#endif 880#endif
841 } 881 }
842} 882}
843 883
844/* 884/*
… …
876#endif 916#endif
877 917
878 New(54,PL_scopestack,8,I32); 918 New(54,PL_scopestack,8,I32);
879 PL_scopestack_ix = 0; 919 PL_scopestack_ix = 0;
880 PL_scopestack_max = 8; 920 PL_scopestack_max = 8;
921#if HAS_SCOPESTACK_NAME
922 New(54,PL_scopestack_name,8,const char*);
923#endif
881 924
882 New(54,PL_savestack,24,ANY); 925 New(54,PL_savestack,24,ANY);
883 PL_savestack_ix = 0; 926 PL_savestack_ix = 0;
884 PL_savestack_max = 24; 927 PL_savestack_max = 24;
885 928
… …
913 } 956 }
914 957
915 Safefree (PL_tmps_stack); 958 Safefree (PL_tmps_stack);
916 Safefree (PL_markstack); 959 Safefree (PL_markstack);
917 Safefree (PL_scopestack); 960 Safefree (PL_scopestack);
961#if HAS_SCOPESTACK_NAME
962 Safefree (PL_scopestack_name);
963#endif
918 Safefree (PL_savestack); 964 Safefree (PL_savestack);
919#if !PERL_VERSION_ATLEAST (5,10,0) 965#if !PERL_VERSION_ATLEAST (5,10,0)
920 Safefree (PL_retstack); 966 Safefree (PL_retstack);
921#endif 967#endif
922} 968}
… …
982 { 1028 {
983 SV **svp = 0; 1029 SV **svp = 0;
984 1030
985 if (strEQ (s, "__DIE__" )) svp = &PL_diehook; 1031 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
986 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 1032 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
987 1033
988 if (svp) 1034 if (svp)
989 { 1035 {
990 sv_setsv (sv, *svp ? *svp : &PL_sv_undef); 1036 SV *ssv;
1037
1038 if (!*svp)
1039 ssv = &PL_sv_undef;
1040 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */
1041 ssv = sv_2mortal (newRV_inc (*svp));
1042 else
1043 ssv = *svp;
1044
1045 sv_setsv (sv, ssv);
991 return 0; 1046 return 0;
992 } 1047 }
993 } 1048 }
994 1049
995 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 1050 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
… …
1089 PL_hints = 0; 1144 PL_hints = 0;
1090 1145
1091 /* recreate the die/warn hooks */ 1146 /* recreate the die/warn hooks */
1092 PL_diehook = SvREFCNT_inc (rv_diehook); 1147 PL_diehook = SvREFCNT_inc (rv_diehook);
1093 PL_warnhook = SvREFCNT_inc (rv_warnhook); 1148 PL_warnhook = SvREFCNT_inc (rv_warnhook);
1094 1149
1095 GvSV (PL_defgv) = newSV (0); 1150 GvSV (PL_defgv) = newSV (0);
1096 GvAV (PL_defgv) = coro->args; coro->args = 0; 1151 GvAV (PL_defgv) = coro->args; coro->args = 0;
1097 GvSV (PL_errgv) = newSV (0); 1152 GvSV (PL_errgv) = newSV (0);
1098 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1153 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
1099 GvHV (PL_hintgv) = 0; 1154 GvHV (PL_hintgv) = newHV ();
1155#if PERL_VERSION_ATLEAST (5,10,0)
1156 hv_magic (GvHV (PL_hintgv), 0, PERL_MAGIC_hints);
1157#endif
1100 PL_rs = newSVsv (GvSV (irsgv)); 1158 PL_rs = newSVsv (GvSV (irsgv));
1101 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1159 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
1102 1160
1103 { 1161 {
1104 dSP; 1162 dSP;
… …
1187 /* restore swapped sv's */ 1245 /* restore swapped sv's */
1188 SWAP_SVS (coro); 1246 SWAP_SVS (coro);
1189 1247
1190 coro_destruct_stacks (aTHX); 1248 coro_destruct_stacks (aTHX);
1191 1249
1192 // now save some sv's to be free'd later 1250 /* now save some sv's to be free'd later */
1193 svf [0] = GvSV (PL_defgv); 1251 svf [0] = GvSV (PL_defgv);
1194 svf [1] = (SV *)GvAV (PL_defgv); 1252 svf [1] = (SV *)GvAV (PL_defgv);
1195 svf [2] = GvSV (PL_errgv); 1253 svf [2] = GvSV (PL_errgv);
1196 svf [3] = (SV *)PL_defoutgv; 1254 svf [3] = (SV *)PL_defoutgv;
1197 svf [4] = PL_rs; 1255 svf [4] = PL_rs;
… …
1217 SvREFCNT_dec (coro->invoke_cb); 1275 SvREFCNT_dec (coro->invoke_cb);
1218 SvREFCNT_dec (coro->invoke_av); 1276 SvREFCNT_dec (coro->invoke_av);
1219 } 1277 }
1220} 1278}
1221 1279
1222ECB_INLINE void 1280ecb_inline void
1223free_coro_mortal (pTHX) 1281free_coro_mortal (pTHX)
1224{ 1282{
1225 if (ecb_expect_true (coro_mortal)) 1283 if (ecb_expect_true (coro_mortal))
1226 { 1284 {
1227 SvREFCNT_dec ((SV *)coro_mortal); 1285 SvREFCNT_dec ((SV *)coro_mortal);
… …
1286 1344
1287 if (PL_curcop != &PL_compiling) 1345 if (PL_curcop != &PL_compiling)
1288 { 1346 {
1289 SV **cb; 1347 SV **cb;
1290 1348
1291 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB) 1349 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB && cxstack_ix >= 0)
1292 { 1350 {
1293 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1351 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1294 1352
1295 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1353 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1296 { 1354 {
… …
1386 slf_frame.prepare = slf_prepare_set_stacklevel; 1444 slf_frame.prepare = slf_prepare_set_stacklevel;
1387 slf_frame.check = slf_check_set_stacklevel; 1445 slf_frame.check = slf_check_set_stacklevel;
1388} 1446}
1389 1447
1390/* the tail of transfer: execute stuff we can only do after a transfer */ 1448/* the tail of transfer: execute stuff we can only do after a transfer */
1391ECB_INLINE void 1449ecb_inline void
1392transfer_tail (pTHX) 1450transfer_tail (pTHX)
1393{ 1451{
1394 free_coro_mortal (aTHX); 1452 free_coro_mortal (aTHX);
1453}
1454
1455/* try to exit the same way perl's main function would do */
1456/* we do not bother resetting the environment or other things *7
1457/* that are not, uhm, essential */
1458/* this obviously also doesn't work when perl is embedded */
1459static void ecb_noinline ecb_cold
1460perlish_exit (pTHX)
1461{
1462 int exitstatus = perl_destruct (PL_curinterp);
1463 perl_free (PL_curinterp);
1464 exit (exitstatus);
1395} 1465}
1396 1466
1397/* 1467/*
1398 * this is a _very_ stripped down perl interpreter ;) 1468 * this is a _very_ stripped down perl interpreter ;)
1399 */ 1469 */
… …
1428 */ 1498 */
1429 1499
1430 /* 1500 /*
1431 * If perl-run returns we assume exit() was being called or the coro 1501 * If perl-run returns we assume exit() was being called or the coro
1432 * fell off the end, which seems to be the only valid (non-bug) 1502 * fell off the end, which seems to be the only valid (non-bug)
1433 * reason for perl_run to return. We try to exit by jumping to the 1503 * reason for perl_run to return. We try to mimic whatever perl is normally
1434 * bootstrap-time "top" top_env, as we cannot restore the "main" 1504 * doing in that case. YMMV.
1435 * coroutine as Coro has no such concept.
1436 * This actually isn't valid with the pthread backend, but OSes requiring
1437 * that backend are too broken to do it in a standards-compliant way.
1438 */ 1505 */
1439 PL_top_env = main_top_env; 1506 perlish_exit (aTHX);
1440 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1441 } 1507 }
1442} 1508}
1443 1509
1444static coro_cctx * 1510static coro_cctx *
1445cctx_new () 1511cctx_new (void)
1446{ 1512{
1447 coro_cctx *cctx; 1513 coro_cctx *cctx;
1448 1514
1449 ++cctx_count; 1515 ++cctx_count;
1450 New (0, cctx, 1, coro_cctx); 1516 New (0, cctx, 1, coro_cctx);
… …
1456 return cctx; 1522 return cctx;
1457} 1523}
1458 1524
1459/* create a new cctx only suitable as source */ 1525/* create a new cctx only suitable as source */
1460static coro_cctx * 1526static coro_cctx *
1461cctx_new_empty () 1527cctx_new_empty (void)
1462{ 1528{
1463 coro_cctx *cctx = cctx_new (); 1529 coro_cctx *cctx = cctx_new ();
1464 1530
1465 cctx->sptr = 0; 1531 cctx->stack.sptr = 0;
1466 coro_create (&cctx->cctx, 0, 0, 0, 0); 1532 coro_create (&cctx->cctx, 0, 0, 0, 0);
1467 1533
1468 return cctx; 1534 return cctx;
1469} 1535}
1470 1536
1471/* create a new cctx suitable as destination/running a perl interpreter */ 1537/* create a new cctx suitable as destination/running a perl interpreter */
1472static coro_cctx * 1538static coro_cctx *
1473cctx_new_run () 1539cctx_new_run (void)
1474{ 1540{
1475 coro_cctx *cctx = cctx_new (); 1541 coro_cctx *cctx = cctx_new ();
1476 void *stack_start;
1477 size_t stack_size;
1478 1542
1479#if HAVE_MMAP 1543 if (!coro_stack_alloc (&cctx->stack, cctx_stacksize))
1480 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1481 /* mmap supposedly does allocate-on-write for us */
1482 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
1483
1484 if (cctx->sptr != (void *)-1)
1485 {
1486 #if CORO_STACKGUARD
1487 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
1488 #endif
1489 stack_start = (char *)cctx->sptr + CORO_STACKGUARD * PAGESIZE;
1490 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
1491 cctx->flags |= CC_MAPPED;
1492 } 1544 {
1493 else
1494#endif
1495 {
1496 cctx->ssize = cctx_stacksize * (long)sizeof (long);
1497 New (0, cctx->sptr, cctx_stacksize, long);
1498
1499 if (!cctx->sptr)
1500 {
1501 perror ("FATAL: unable to allocate stack for coroutine, exiting."); 1545 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1502 _exit (EXIT_FAILURE); 1546 _exit (EXIT_FAILURE);
1503 }
1504
1505 stack_start = cctx->sptr;
1506 stack_size = cctx->ssize;
1507 } 1547 }
1508 1548
1509 #if CORO_USE_VALGRIND
1510 cctx->valgrind_id = VALGRIND_STACK_REGISTER ((char *)stack_start, (char *)stack_start + stack_size);
1511 #endif
1512
1513 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size); 1549 coro_create (&cctx->cctx, cctx_run, (void *)cctx, cctx->stack.sptr, cctx->stack.ssze);
1514 1550
1515 return cctx; 1551 return cctx;
1516} 1552}
1517 1553
1518static void 1554static void
… …
1524 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current)); 1560 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1525 1561
1526 --cctx_count; 1562 --cctx_count;
1527 coro_destroy (&cctx->cctx); 1563 coro_destroy (&cctx->cctx);
1528 1564
1529 /* coro_transfer creates new, empty cctx's */ 1565 coro_stack_free (&cctx->stack);
1530 if (cctx->sptr)
1531 {
1532 #if CORO_USE_VALGRIND
1533 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
1534 #endif
1535
1536#if HAVE_MMAP
1537 if (cctx->flags & CC_MAPPED)
1538 munmap (cctx->sptr, cctx->ssize);
1539 else
1540#endif
1541 Safefree (cctx->sptr);
1542 }
1543 1566
1544 Safefree (cctx); 1567 Safefree (cctx);
1545} 1568}
1546 1569
1547/* wether this cctx should be destructed */ 1570/* wether this cctx should be destructed */
… …
1566} 1589}
1567 1590
1568static void 1591static void
1569cctx_put (coro_cctx *cctx) 1592cctx_put (coro_cctx *cctx)
1570{ 1593{
1571 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1594 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->stack.sptr));
1572 1595
1573 /* free another cctx if overlimit */ 1596 /* free another cctx if overlimit */
1574 if (ecb_expect_false (cctx_idle >= cctx_max_idle)) 1597 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1575 { 1598 {
1576 coro_cctx *first = cctx_first; 1599 coro_cctx *first = cctx_first;
… …
1702 return; 1725 return;
1703 1726
1704 slf_destroy (aTHX_ coro); 1727 slf_destroy (aTHX_ coro);
1705 1728
1706 coro->flags |= CF_ZOMBIE; 1729 coro->flags |= CF_ZOMBIE;
1707 1730
1708 if (coro->flags & CF_READY) 1731 if (coro->flags & CF_READY)
1709 { 1732 {
1710 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1733 /* reduce nready, as destroying a ready coro effectively unreadies it */
1711 /* alternative: look through all ready queues and remove the coro */ 1734 /* alternative: look through all ready queues and remove the coro */
1712 --coro_nready; 1735 --coro_nready;
… …
1789 TRANSFER (ta, 1); 1812 TRANSFER (ta, 1);
1790} 1813}
1791 1814
1792/** Coro ********************************************************************/ 1815/** Coro ********************************************************************/
1793 1816
1794ECB_INLINE void 1817ecb_inline void
1795coro_enq (pTHX_ struct coro *coro) 1818coro_enq (pTHX_ struct coro *coro)
1796{ 1819{
1797 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN]; 1820 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1798 1821
1799 SvREFCNT_inc_NN (coro->hv); 1822 SvREFCNT_inc_NN (coro->hv);
… …
1801 coro->next_ready = 0; 1824 coro->next_ready = 0;
1802 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro; 1825 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1803 ready [1] = coro; 1826 ready [1] = coro;
1804} 1827}
1805 1828
1806ECB_INLINE struct coro * 1829ecb_inline struct coro *
1807coro_deq (pTHX) 1830coro_deq (pTHX)
1808{ 1831{
1809 int prio; 1832 int prio;
1810 1833
1811 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; ) 1834 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
… …
1864{ 1887{
1865 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1888 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1866} 1889}
1867 1890
1868/* expects to own a reference to next->hv */ 1891/* expects to own a reference to next->hv */
1869ECB_INLINE void 1892ecb_inline void
1870prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1893prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1871{ 1894{
1872 SV *prev_sv = SvRV (coro_current); 1895 SV *prev_sv = SvRV (coro_current);
1873 1896
1874 ta->prev = SvSTATE_hv (prev_sv); 1897 ta->prev = SvSTATE_hv (prev_sv);
… …
1908 /* nothing to schedule: call the idle handler */ 1931 /* nothing to schedule: call the idle handler */
1909 if (SvROK (sv_idle) 1932 if (SvROK (sv_idle)
1910 && SvOBJECT (SvRV (sv_idle))) 1933 && SvOBJECT (SvRV (sv_idle)))
1911 { 1934 {
1912 if (SvRV (sv_idle) == SvRV (coro_current)) 1935 if (SvRV (sv_idle) == SvRV (coro_current))
1936 {
1937 require_pv ("Carp");
1938
1939 {
1940 dSP;
1941
1942 ENTER;
1943 SAVETMPS;
1944
1945 PUSHMARK (SP);
1913 croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught"); 1946 XPUSHs (sv_2mortal (newSVpv ("FATAL: $Coro::idle blocked itself - did you try to block inside an event loop callback? Caught", 0)));
1947 PUTBACK;
1948 call_pv ("Carp::confess", G_VOID | G_DISCARD);
1949
1950 FREETMPS;
1951 LEAVE;
1952 }
1953 }
1914 1954
1915 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 1955 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1916 api_ready (aTHX_ SvRV (sv_idle)); 1956 api_ready (aTHX_ SvRV (sv_idle));
1917 --coro_nready; 1957 --coro_nready;
1918 } 1958 }
… …
1933 } 1973 }
1934 } 1974 }
1935 } 1975 }
1936} 1976}
1937 1977
1938ECB_INLINE void 1978ecb_inline void
1939prepare_cede (pTHX_ struct coro_transfer_args *ta) 1979prepare_cede (pTHX_ struct coro_transfer_args *ta)
1940{ 1980{
1941 api_ready (aTHX_ coro_current); 1981 api_ready (aTHX_ coro_current);
1942 prepare_schedule (aTHX_ ta); 1982 prepare_schedule (aTHX_ ta);
1943} 1983}
1944 1984
1945ECB_INLINE void 1985ecb_inline void
1946prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 1986prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1947{ 1987{
1948 SV *prev = SvRV (coro_current); 1988 SV *prev = SvRV (coro_current);
1949 1989
1950 if (coro_nready) 1990 if (coro_nready)
… …
2115{ 2155{
2116 AV *od = coro->on_destroy; 2156 AV *od = coro->on_destroy;
2117 2157
2118 if (!od) 2158 if (!od)
2119 return; 2159 return;
2160
2161 coro->on_destroy = 0;
2162 sv_2mortal ((SV *)od);
2120 2163
2121 while (AvFILLp (od) >= 0) 2164 while (AvFILLp (od) >= 0)
2122 { 2165 {
2123 SV *cb = sv_2mortal (av_pop (od)); 2166 SV *cb = sv_2mortal (av_pop (od));
2124 2167
… …
2145 2188
2146static void 2189static void
2147coro_set_status (pTHX_ struct coro *coro, SV **arg, int items) 2190coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
2148{ 2191{
2149 AV *av; 2192 AV *av;
2150 2193
2151 if (coro->status) 2194 if (coro->status)
2152 { 2195 {
2153 av = coro->status; 2196 av = coro->status;
2154 av_clear (av); 2197 av_clear (av);
2155 } 2198 }
… …
2202 2245
2203 coro = SvSTATE (arg [0]); 2246 coro = SvSTATE (arg [0]);
2204 coro_hv = coro->hv; 2247 coro_hv = coro->hv;
2205 2248
2206 coro_set_status (aTHX_ coro, arg + 1, items - 1); 2249 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2207 2250
2208 if (ecb_expect_false (coro->flags & CF_NOCANCEL)) 2251 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2209 { 2252 {
2210 /* coro currently busy cancelling something, so just notify it */ 2253 /* coro currently busy cancelling something, so just notify it */
2211 coro->slf_frame.data = (void *)coro; 2254 coro->slf_frame.data = (void *)coro;
2212 2255
… …
2219 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv); 2262 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2220 } 2263 }
2221 else 2264 else
2222 { 2265 {
2223 struct coro *self = SvSTATE_current; 2266 struct coro *self = SvSTATE_current;
2267
2268 if (!self)
2269 croak ("Coro::cancel called outside of thread content,");
2224 2270
2225 /* otherwise we cancel directly, purely for speed reasons 2271 /* otherwise we cancel directly, purely for speed reasons
2226 * unfortunately, this requires some magic trickery, as 2272 * unfortunately, this requires some magic trickery, as
2227 * somebody else could cancel us, so we have to fight the cancellation. 2273 * somebody else could cancel us, so we have to fight the cancellation.
2228 * this is ugly, and hopefully fully worth the extra speed. 2274 * this is ugly, and hopefully fully worth the extra speed.
… …
2391 2437
2392static int 2438static int
2393slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2439slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
2394{ 2440{
2395 SV *data = (SV *)frame->data; 2441 SV *data = (SV *)frame->data;
2396 2442
2397 if (CORO_THROW) 2443 if (CORO_THROW)
2398 return 0; 2444 return 0;
2399 2445
2400 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2446 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2401 return 1; 2447 return 1;
… …
2437 cb = sv_2mortal (coro->rouse_cb); 2483 cb = sv_2mortal (coro->rouse_cb);
2438 coro->rouse_cb = 0; 2484 coro->rouse_cb = 0;
2439 } 2485 }
2440 2486
2441 if (!SvROK (cb) 2487 if (!SvROK (cb)
2442 || SvTYPE (SvRV (cb)) != SVt_PVCV 2488 || SvTYPE (SvRV (cb)) != SVt_PVCV
2443 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2489 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2444 croak ("Coro::rouse_wait called with illegal callback argument,"); 2490 croak ("Coro::rouse_wait called with illegal callback argument,");
2445 2491
2446 { 2492 {
2447 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */ 2493 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
… …
2570 2616
2571/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */ 2617/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2572static void 2618static void
2573slf_destroy (pTHX_ struct coro *coro) 2619slf_destroy (pTHX_ struct coro *coro)
2574{ 2620{
2575 /* this callback is reserved for slf functions needing to do cleanup */ 2621 struct CoroSLF frame = coro->slf_frame;
2576 if (coro->slf_frame.destroy && coro->slf_frame.prepare && !PL_dirty)
2577 coro->slf_frame.destroy (aTHX_ &coro->slf_frame);
2578 2622
2579 /* 2623 /*
2580 * The on_destroy above most likely is from an SLF call. 2624 * The on_destroy below most likely is from an SLF call.
2581 * Since by definition the SLF call will not finish when we destroy 2625 * Since by definition the SLF call will not finish when we destroy
2582 * the coro, we will have to force-finish it here, otherwise 2626 * the coro, we will have to force-finish it here, otherwise
2583 * cleanup functions cannot call SLF functions. 2627 * cleanup functions cannot call SLF functions.
2584 */ 2628 */
2585 coro->slf_frame.prepare = 0; 2629 coro->slf_frame.prepare = 0;
2630
2631 /* this callback is reserved for slf functions needing to do cleanup */
2632 if (frame.destroy && frame.prepare && !PL_dirty)
2633 frame.destroy (aTHX_ &frame);
2586} 2634}
2587 2635
2588/* 2636/*
2589 * these not obviously related functions are all rolled into one 2637 * these not obviously related functions are all rolled into one
2590 * function to increase chances that they all will call transfer with the same 2638 * function to increase chances that they all will call transfer with the same
… …
2930{ 2978{
2931 AV *av = (AV *)frame->data; 2979 AV *av = (AV *)frame->data;
2932 SV *count_sv = AvARRAY (av)[0]; 2980 SV *count_sv = AvARRAY (av)[0];
2933 SV *coro_hv = SvRV (coro_current); 2981 SV *coro_hv = SvRV (coro_current);
2934 2982
2983 frame->destroy = 0;
2984
2935 /* if we are about to throw, don't actually acquire the lock, just throw */ 2985 /* if we are about to throw, don't actually acquire the lock, just throw */
2936 if (CORO_THROW) 2986 if (ecb_expect_false (CORO_THROW))
2987 {
2988 /* we still might be responsible for the semaphore, so wake up others */
2989 coro_semaphore_adjust (aTHX_ av, 0);
2990
2937 return 0; 2991 return 0;
2992 }
2938 else if (SvIVX (count_sv) > 0) 2993 else if (SvIVX (count_sv) > 0)
2939 { 2994 {
2940 frame->destroy = 0;
2941
2942 if (acquire) 2995 if (acquire)
2943 SvIVX (count_sv) = SvIVX (count_sv) - 1; 2996 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2944 else 2997 else
2945 coro_semaphore_adjust (aTHX_ av, 0); 2998 coro_semaphore_adjust (aTHX_ av, 0);
2946 2999
… …
2950 { 3003 {
2951 int i; 3004 int i;
2952 /* if we were woken up but can't down, we look through the whole */ 3005 /* if we were woken up but can't down, we look through the whole */
2953 /* waiters list and only add us if we aren't in there already */ 3006 /* waiters list and only add us if we aren't in there already */
2954 /* this avoids some degenerate memory usage cases */ 3007 /* this avoids some degenerate memory usage cases */
2955 for (i = AvFILLp (av); i > 0; --i) // i > 0 is not an off-by-one bug 3008 for (i = AvFILLp (av); i > 0; --i) /* i > 0 is not an off-by-one bug */
2956 if (AvARRAY (av)[i] == coro_hv) 3009 if (AvARRAY (av)[i] == coro_hv)
2957 return 1; 3010 return 1;
2958 3011
2959 av_push (av, SvREFCNT_inc (coro_hv)); 3012 av_push (av, SvREFCNT_inc (coro_hv));
2960 return 1; 3013 return 1;
… …
3168 /* it quickly returns */ 3221 /* it quickly returns */
3169 if (CORO_THROW) 3222 if (CORO_THROW)
3170 return 0; 3223 return 0;
3171 3224
3172 /* one element that is an RV? repeat! */ 3225 /* one element that is an RV? repeat! */
3173 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0])) 3226 if (AvFILLp (state) == 0 && SvTYPE (AvARRAY (state)[0]) != SVt_PV)
3174 return 1; 3227 return 1;
3175 3228
3176 /* restore status */ 3229 /* restore status */
3177 { 3230 {
3178 SV *data_sv = av_pop (state); 3231 SV *data_sv = av_pop (state);
… …
3340#endif 3393#endif
3341 3394
3342#if CORO_JIT 3395#if CORO_JIT
3343 3396
3344static void ecb_noinline ecb_cold 3397static void ecb_noinline ecb_cold
3345pushav_3uv (pTHX_ UV a, UV b, UV c) 3398pushav_4uv (pTHX_ UV a, UV b, UV c, UV d)
3346{ 3399{
3347 dSP; 3400 dSP;
3348 AV *av = newAV (); 3401 AV *av = newAV ();
3349 3402
3403 av_store (av, 3, newSVuv (d));
3350 av_store (av, 2, newSVuv (c)); 3404 av_store (av, 2, newSVuv (c));
3351 av_store (av, 1, newSVuv (b)); 3405 av_store (av, 1, newSVuv (b));
3352 av_store (av, 0, newSVuv (a)); 3406 av_store (av, 0, newSVuv (a));
3353 3407
3354 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 3408 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
… …
3361{ 3415{
3362 dSP; 3416 dSP;
3363 SV *load, *save; 3417 SV *load, *save;
3364 char *map_base; 3418 char *map_base;
3365 char *load_ptr, *save_ptr; 3419 char *load_ptr, *save_ptr;
3366 STRLEN load_len, save_len; 3420 STRLEN load_len, save_len, map_len;
3367 int count; 3421 int count;
3368 3422
3423 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3424
3369 PUSHMARK (SP); 3425 PUSHMARK (SP);
3370 PUTBACK;
3371#define VARx(name,expr,type) pushav_3uv (aTHX_ (UV)&(expr), offsetof (perl_slots, name), sizeof (type)); 3426 #define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type));
3372# include "state.h" 3427 #include "state.h"
3373#undef VARx
3374 count = call_pv ("Coro::State::_jit", G_ARRAY); 3428 count = call_pv ("Coro::State::_jit", G_ARRAY);
3375 SPAGAIN; 3429 SPAGAIN;
3376 3430
3377 save = POPs; save_ptr = SvPVbyte (save, save_len); 3431 save = POPs; save_ptr = SvPVbyte (save, save_len);
3378 load = POPs; load_ptr = SvPVbyte (load, load_len); 3432 load = POPs; load_ptr = SvPVbyte (load, load_len);
3379 3433
3434 map_len = load_len + save_len + 16;
3435
3380 map_base = mmap (0, load_len + save_len + 16, PROT_EXEC | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); 3436 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3381 3437
3382 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED)); 3438 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3383 3439
3384 load_perl_slots = (load_save_perl_slots_type)map_base; 3440 load_perl_slots = (load_save_perl_slots_type)map_base;
3385 memcpy (map_base, load_ptr, load_len); 3441 memcpy (map_base, load_ptr, load_len);
3386 3442
3387 map_base += (load_len + 15) & ~15; 3443 map_base += (load_len + 15) & ~15;
3388 3444
3389 save_perl_slots = (load_save_perl_slots_type)map_base; 3445 save_perl_slots = (load_save_perl_slots_type)map_base;
3390 memcpy (map_base, save_ptr, save_len); 3446 memcpy (map_base, save_ptr, save_len);
3447
3448 /* we are good citizens and try to make the page read-only, so the evil evil */
3449 /* hackers might have it a bit more difficult */
3450 mprotect (map_base, map_len, PROT_READ | PROT_EXEC);
3451
3452 PUTBACK;
3453 eval_pv ("undef &Coro::State::_jit", 1);
3391} 3454}
3392 3455
3393#endif 3456#endif
3394 3457
3395MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3458MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
3396 3459
3397PROTOTYPES: DISABLE 3460PROTOTYPES: DISABLE
3398 3461
3399BOOT: 3462BOOT:
3400{ 3463{
3464#define VARx(name,expr,type) if (sizeof (type) < sizeof (expr)) croak ("FATAL: Coro thread context slot '" # name "' too small for this version of perl.");
3465#include "state.h"
3401#ifdef USE_ITHREADS 3466#ifdef USE_ITHREADS
3402# if CORO_PTHREAD 3467# if CORO_PTHREAD
3403 coro_thx = PERL_GET_CONTEXT; 3468 coro_thx = PERL_GET_CONTEXT;
3404# endif 3469# endif
3405#endif 3470#endif
3406 BOOT_PAGESIZE;
3407
3408 /* perl defines these to check for existance first, but why it doesn't */ 3471 /* perl defines these to check for existance first, but why it doesn't */
3409 /* just create them one at init time is not clear to me, except for */ 3472 /* just create them one at init time is not clear to me, except for */
3410 /* programs trying to delete them, but... */ 3473 /* programs trying to delete them, but... */
3411 /* anyway, we declare this as invalid and make sure they are initialised here */ 3474 /* anyway, we declare this as invalid and make sure they are initialised here */
3412 DEFSV; 3475 DEFSV;
… …
3463 time_init (aTHX); 3526 time_init (aTHX);
3464 3527
3465 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL)); 3528 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3466#if CORO_JIT 3529#if CORO_JIT
3467 PUTBACK; 3530 PUTBACK;
3468 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3469 jit_init (aTHX); 3531 jit_init (aTHX);
3470 perl_eval_pv ("undef &Coro::State::_jit", 1);
3471 SPAGAIN; 3532 SPAGAIN;
3472#endif 3533#endif
3473} 3534}
3474 3535
3475SV * 3536SV *
… …
3484void 3545void
3485transfer (...) 3546transfer (...)
3486 PROTOTYPE: $$ 3547 PROTOTYPE: $$
3487 CODE: 3548 CODE:
3488 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3549 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3489
3490void
3491_exit (int code)
3492 PROTOTYPE: $
3493 CODE:
3494 _exit (code);
3495 3550
3496SV * 3551SV *
3497clone (Coro::State coro) 3552clone (Coro::State coro)
3498 CODE: 3553 CODE:
3499{ 3554{
… …
3554void 3609void
3555list () 3610list ()
3556 PROTOTYPE: 3611 PROTOTYPE:
3557 PPCODE: 3612 PPCODE:
3558{ 3613{
3559 struct coro *coro; 3614 struct coro *coro;
3560 for (coro = coro_first; coro; coro = coro->next) 3615 for (coro = coro_first; coro; coro = coro->next)
3561 if (coro->hv) 3616 if (coro->hv)
3562 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 3617 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
3563} 3618}
3564 3619
… …
3628 RETVAL = boolSV (coro->flags & ix); 3683 RETVAL = boolSV (coro->flags & ix);
3629 OUTPUT: 3684 OUTPUT:
3630 RETVAL 3685 RETVAL
3631 3686
3632void 3687void
3633throw (Coro::State self, SV *exception = &PL_sv_undef) 3688throw (SV *self, SV *exception = &PL_sv_undef)
3634 PROTOTYPE: $;$ 3689 PROTOTYPE: $;$
3635 CODE: 3690 CODE:
3636{ 3691{
3692 struct coro *coro = SvSTATE (self);
3637 struct coro *current = SvSTATE_current; 3693 struct coro *current = SvSTATE_current;
3638 SV **exceptionp = self == current ? &CORO_THROW : &self->except; 3694 SV **exceptionp = coro == current ? &CORO_THROW : &coro->except;
3639 SvREFCNT_dec (*exceptionp); 3695 SvREFCNT_dec (*exceptionp);
3640 SvGETMAGIC (exception); 3696 SvGETMAGIC (exception);
3641 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0; 3697 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3698
3699 api_ready (aTHX_ self);
3642} 3700}
3643 3701
3644void 3702void
3645api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3703api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3646 PROTOTYPE: $;$ 3704 PROTOTYPE: $;$
… …
3723 3781
3724void 3782void
3725times (Coro::State self) 3783times (Coro::State self)
3726 PPCODE: 3784 PPCODE:
3727{ 3785{
3728 struct coro *current = SvSTATE (coro_current); 3786 struct coro *current = SvSTATE (coro_current);
3729 3787
3730 if (ecb_expect_false (current == self)) 3788 if (ecb_expect_false (current == self))
3731 { 3789 {
3732 coro_times_update (); 3790 coro_times_update ();
3733 coro_times_add (SvSTATE (coro_current)); 3791 coro_times_add (SvSTATE (coro_current));
… …
3776 3834
3777 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3835 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3778 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3836 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3779 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 3837 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3780 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */ 3838 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3781 3839
3782 coro_stash = gv_stashpv ("Coro", TRUE); 3840 coro_stash = gv_stashpv ("Coro", TRUE);
3783 3841
3784 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 3842 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3785 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 3843 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3786 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL)); 3844 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
… …
4008 on_leave = 1 4066 on_leave = 1
4009 PROTOTYPE: & 4067 PROTOTYPE: &
4010 CODE: 4068 CODE:
4011{ 4069{
4012 struct coro *coro = SvSTATE_current; 4070 struct coro *coro = SvSTATE_current;
4013 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 4071 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
4014 4072
4015 block = s_get_cv_croak (block); 4073 block = s_get_cv_croak (block);
4016 4074
4017 if (!*avp) 4075 if (!*avp)
4018 *avp = newAV (); 4076 *avp = newAV ();
… …
4038 4096
4039SV * 4097SV *
4040new (SV *klass, SV *count = 0) 4098new (SV *klass, SV *count = 0)
4041 CODE: 4099 CODE:
4042{ 4100{
4043 int semcnt = 1; 4101 int semcnt = 1;
4044 4102
4045 if (count) 4103 if (count)
4046 { 4104 {
4047 SvGETMAGIC (count); 4105 SvGETMAGIC (count);
4048 4106
… …
4108 XSRETURN_NO; 4166 XSRETURN_NO;
4109} 4167}
4110 4168
4111void 4169void
4112waiters (SV *self) 4170waiters (SV *self)
4113 PPCODE: 4171 PPCODE:
4114{ 4172{
4115 AV *av = (AV *)SvRV (self); 4173 AV *av = (AV *)SvRV (self);
4116 int wcount = AvFILLp (av) + 1 - 1; 4174 int wcount = AvFILLp (av) + 1 - 1;
4117 4175
4118 if (GIMME_V == G_SCALAR) 4176 if (GIMME_V == G_SCALAR)
… …
4127} 4185}
4128 4186
4129MODULE = Coro::State PACKAGE = Coro::SemaphoreSet 4187MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
4130 4188
4131void 4189void
4132_may_delete (SV *sem, int count, int extra_refs) 4190_may_delete (SV *sem, int count, unsigned int extra_refs)
4133 PPCODE: 4191 PPCODE:
4134{ 4192{
4135 AV *av = (AV *)SvRV (sem); 4193 AV *av = (AV *)SvRV (sem);
4136 4194
4137 if (SvREFCNT ((SV *)av) == 1 + extra_refs 4195 if (SvREFCNT ((SV *)av) == 1 + extra_refs
4138 && AvFILLp (av) == 0 /* no waiters, just count */ 4196 && AvFILLp (av) == 0 /* no waiters, just count */
4139 && SvIV (AvARRAY (av)[0]) == count) 4197 && SvIV (AvARRAY (av)[0]) == count)
4140 XSRETURN_YES; 4198 XSRETURN_YES;
… …
4161 4219
4162void 4220void
4163broadcast (SV *self) 4221broadcast (SV *self)
4164 CODE: 4222 CODE:
4165{ 4223{
4166 AV *av = (AV *)SvRV (self); 4224 AV *av = (AV *)SvRV (self);
4167 coro_signal_wake (aTHX_ av, AvFILLp (av)); 4225 coro_signal_wake (aTHX_ av, AvFILLp (av));
4168} 4226}
4169 4227
4170void 4228void
4171send (SV *self) 4229send (SV *self)
… …
4179 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */ 4237 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
4180} 4238}
4181 4239
4182IV 4240IV
4183awaited (SV *self) 4241awaited (SV *self)
4184 CODE: 4242 CODE:
4185 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1; 4243 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
4186 OUTPUT: 4244 OUTPUT:
4187 RETVAL 4245 RETVAL
4188 4246
4189 4247
… …
4194 4252
4195void 4253void
4196_schedule (...) 4254_schedule (...)
4197 CODE: 4255 CODE:
4198{ 4256{
4199 static int incede; 4257 static int incede;
4200 4258
4201 api_cede_notself (aTHX); 4259 api_cede_notself (aTHX);
4202 4260
4203 ++incede; 4261 ++incede;
4204 while (coro_nready >= incede && api_cede (aTHX)) 4262 while (coro_nready >= incede && api_cede (aTHX))
… …
4248 { 4306 {
4249 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect; 4307 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
4250 coro_old_pp_sselect = 0; 4308 coro_old_pp_sselect = 0;
4251 } 4309 }
4252 4310
4311MODULE = Coro::State PACKAGE = Coro::Util
4312
4313void
4314_exit (int code)
4315 CODE:
4316 _exit (code);
4317
4318NV
4319time ()
4320 CODE:
4321 RETVAL = nvtime (aTHX);
4322 OUTPUT:
4323 RETVAL
4324
4325NV
4326gettimeofday ()
4327 PPCODE:
4328{
4329 UV tv [2];
4330 u2time (aTHX_ tv);
4331 EXTEND (SP, 2);
4332 PUSHs (sv_2mortal (newSVuv (tv [0])));
4333 PUSHs (sv_2mortal (newSVuv (tv [1])));
4334}
4335

Diff Legend

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