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.405 by root, Sat Jun 11 13:01:26 2011 UTC vs.
Revision 1.463 by root, Wed Jun 22 20:37:27 2016 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
27#ifndef SvREFCNT_dec_NN
28 #define SvREFCNT_dec_NN(sv) SvREFCNT_dec (sv)
29#endif
30
31#ifndef SvREFCNT_inc_NN
32 #define SvREFCNT_inc_NN(sv) SvREFCNT_inc (sv)
33#endif
34
24#ifndef SVs_PADSTALE 35#ifndef SVs_PADSTALE
25# define SVs_PADSTALE 0 36# define SVs_PADSTALE 0
37#endif
38
39#ifdef PadARRAY
40# define NEWPADAPI 1
41# define newPADLIST(var) (Newz (0, var, 1, PADLIST), Newx (PadlistARRAY (var), 2, PAD *))
42#else
43typedef AV PADNAMELIST;
44# if !PERL_VERSION_ATLEAST(5,8,0)
45typedef AV PADLIST;
46typedef AV PAD;
47# endif
48# define PadlistARRAY(pl) ((PAD **)AvARRAY (pl))
49# define PadlistMAX(pl) AvFILLp (pl)
50# define PadlistNAMES(pl) (*PadlistARRAY (pl))
51# define PadARRAY AvARRAY
52# define PadMAX AvFILLp
53# define newPADLIST(var) ((var) = newAV (), av_extend (var, 1))
54#endif
55#ifndef PadnamelistREFCNT
56# define PadnamelistREFCNT(pnl) SvREFCNT (pnl)
57#endif
58#ifndef PadnamelistREFCNT_dec
59# define PadnamelistREFCNT_dec(pnl) SvREFCNT_dec (pnl)
60#endif
61
62/* 5.19.something has replaced SVt_BIND by SVt_INVLIST */
63/* we just alias it to SVt_IV, as that is sufficient for swap_sv for now */
64#if PERL_VERSION_ATLEAST(5,19,0)
65# define SVt_BIND SVt_IV
26#endif 66#endif
27 67
28#if defined(_WIN32) 68#if defined(_WIN32)
29# undef HAS_GETTIMEOFDAY 69# undef HAS_GETTIMEOFDAY
30# undef setjmp 70# undef setjmp
33# define setjmp _setjmp /* deep magic */ 73# define setjmp _setjmp /* deep magic */
34#else 74#else
35# include <inttypes.h> /* most portable stdint.h */ 75# include <inttypes.h> /* most portable stdint.h */
36#endif 76#endif
37 77
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 */ 78/* the maximum number of idle cctx that will be pooled */
66static int cctx_max_idle = 4; 79static int cctx_max_idle = 4;
67 80
68#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 81#if defined(DEBUGGING) && PERL_VERSION_ATLEAST(5,12,0)
69# undef CORO_STACKGUARD 82# define HAS_SCOPESTACK_NAME 1
70#endif
71
72#ifndef CORO_STACKGUARD
73# define CORO_STACKGUARD 0
74#endif 83#endif
75 84
76/* prefer perl internal functions over our own? */ 85/* prefer perl internal functions over our own? */
77#ifndef CORO_PREFER_PERL_FUNCTIONS 86#ifndef CORO_PREFER_PERL_FUNCTIONS
78# define CORO_PREFER_PERL_FUNCTIONS 0 87# define CORO_PREFER_PERL_FUNCTIONS 0
97# if CORO_PTHREAD 106# if CORO_PTHREAD
98static void *coro_thx; 107static void *coro_thx;
99# endif 108# endif
100#endif 109#endif
101 110
102/* used in state.h */
103#define VAR(name,type) VARx(name, PL_ ## name, type)
104
105#ifdef __linux 111#ifdef __linux
106# include <time.h> /* for timespec */ 112# include <time.h> /* for timespec */
107# include <syscall.h> /* for SYS_* */ 113# include <syscall.h> /* for SYS_* */
108# ifdef SYS_clock_gettime 114# ifdef SYS_clock_gettime
109# define coro_clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts)) 115# define coro_clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
134 140
135static GV *irsgv; /* $/ */ 141static GV *irsgv; /* $/ */
136static GV *stdoutgv; /* *STDOUT */ 142static GV *stdoutgv; /* *STDOUT */
137static SV *rv_diehook; 143static SV *rv_diehook;
138static SV *rv_warnhook; 144static SV *rv_warnhook;
139static HV *hv_sig; /* %SIG */
140 145
141/* async_pool helper stuff */ 146/* async_pool helper stuff */
142static SV *sv_pool_rss; 147static SV *sv_pool_rss;
143static SV *sv_pool_size; 148static SV *sv_pool_size;
144static SV *sv_async_pool_idle; /* description string */ 149static SV *sv_async_pool_idle; /* description string */
172typedef struct coro_cctx 177typedef struct coro_cctx
173{ 178{
174 struct coro_cctx *next; 179 struct coro_cctx *next;
175 180
176 /* the stack */ 181 /* the stack */
177 void *sptr; 182 struct coro_stack stack;
178 size_t ssize;
179 183
180 /* cpu state */ 184 /* cpu state */
181 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 185 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
186#ifndef NDEBUG
182 JMPENV *idle_te; /* same as idle_sp, but for top_env, TODO: remove once stable */ 187 JMPENV *idle_te; /* same as idle_sp, but for top_env */
188#endif
183 JMPENV *top_env; 189 JMPENV *top_env;
184 coro_context cctx; 190 coro_context cctx;
185 191
186 U32 gen; 192 U32 gen;
187#if CORO_USE_VALGRIND 193#if CORO_USE_VALGRIND
207}; 213};
208 214
209/* the structure where most of the perl state is stored, overlaid on the cxstack */ 215/* the structure where most of the perl state is stored, overlaid on the cxstack */
210typedef struct 216typedef struct
211{ 217{
212#define VARx(name,expr,type) type name; 218 #define VARx(name,expr,type) type name;
213# include "state.h" 219 #include "state.h"
214#undef VARx
215} perl_slots; 220} perl_slots;
216 221
217// how many context stack entries do we need for perl_slots 222/* 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)) 223#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
219 224
220/* this is a structure representing a perl-level coroutine */ 225/* this is a structure representing a perl-level coroutine */
221struct coro 226struct coro
222{ 227{
250 SV *saved_deffh; 255 SV *saved_deffh;
251 SV *invoke_cb; 256 SV *invoke_cb;
252 AV *invoke_av; 257 AV *invoke_av;
253 258
254 /* on_enter/on_leave */ 259 /* on_enter/on_leave */
255 AV *on_enter; 260 AV *on_enter; AV *on_enter_xs;
256 AV *on_leave; 261 AV *on_leave; AV *on_leave_xs;
257 262
258 /* swap_sv */ 263 /* swap_sv */
259 AV *swap_sv; 264 AV *swap_sv;
260 265
261 /* times */ 266 /* times */
291#define coro_nready coroapi.nready 296#define coro_nready coroapi.nready
292 297
293/** JIT *********************************************************************/ 298/** JIT *********************************************************************/
294 299
295#if CORO_JIT 300#if CORO_JIT
301 /* APPLE doesn't have mmap though */
302 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__)
296 #ifndef CORO_JIT_TYPE 303 #ifndef CORO_JIT_TYPE
297 #if __linux && __amd64 304 #if ECB_AMD64 && CORO_JIT_UNIXY
298 #define CORO_JIT_TYPE "amd64-unix" 305 #define CORO_JIT_TYPE "amd64-unix"
299 typedef void (*load_save_perl_slots_type)(perl_slots *); 306 #elif __i386 && CORO_JIT_UNIXY
300 #else 307 #define CORO_JIT_TYPE "x86-unix"
301 #undef CORO_JIT
302 #endif 308 #endif
303 #endif 309 #endif
304#endif 310#endif
305 311
312#if !defined(CORO_JIT_TYPE) || _POSIX_MEMORY_PROTECTION <= 0
313 #undef CORO_JIT
314#endif
315
306#if CORO_JIT 316#if CORO_JIT
307 317 typedef void (*load_save_perl_slots_type)(perl_slots *);
308static load_save_perl_slots_type load_perl_slots, save_perl_slots; 318 static load_save_perl_slots_type load_perl_slots, save_perl_slots;
309
310#endif 319#endif
311 320
312/** Coro::Select ************************************************************/ 321/** Coro::Select ************************************************************/
313 322
314static OP *(*coro_old_pp_sselect) (pTHX); 323static OP *(*coro_old_pp_sselect) (pTHX);
331 340
332/** time stuff **************************************************************/ 341/** time stuff **************************************************************/
333 342
334#ifdef HAS_GETTIMEOFDAY 343#ifdef HAS_GETTIMEOFDAY
335 344
336ECB_INLINE void 345ecb_inline void
337coro_u2time (pTHX_ UV ret[2]) 346coro_u2time (pTHX_ UV ret[2])
338{ 347{
339 struct timeval tv; 348 struct timeval tv;
340 gettimeofday (&tv, 0); 349 gettimeofday (&tv, 0);
341 350
342 ret [0] = tv.tv_sec; 351 ret [0] = tv.tv_sec;
343 ret [1] = tv.tv_usec; 352 ret [1] = tv.tv_usec;
344} 353}
345 354
346ECB_INLINE double 355ecb_inline double
347coro_nvtime () 356coro_nvtime (void)
348{ 357{
349 struct timeval tv; 358 struct timeval tv;
350 gettimeofday (&tv, 0); 359 gettimeofday (&tv, 0);
351 360
352 return tv.tv_sec + tv.tv_usec * 1e-6; 361 return tv.tv_sec + tv.tv_usec * 1e-6;
353} 362}
354 363
355ECB_INLINE void 364ecb_inline void
356time_init (pTHX) 365time_init (pTHX)
357{ 366{
358 nvtime = coro_nvtime; 367 nvtime = coro_nvtime;
359 u2time = coro_u2time; 368 u2time = coro_u2time;
360} 369}
361 370
362#else 371#else
363 372
364ECB_INLINE void 373ecb_inline void
365time_init (pTHX) 374time_init (pTHX)
366{ 375{
367 SV **svp; 376 SV **svp;
368 377
369 require_pv ("Time/HiRes.pm"); 378 require_pv ("Time/HiRes.pm");
370 379
371 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0); 380 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
372 381
373 if (!svp) croak ("Time::HiRes is required, but missing. Caught"); 382 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
374 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught"); 383 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught");
375 384
411 get_hv (name, create); 420 get_hv (name, create);
412#endif 421#endif
413 return get_hv (name, create); 422 return get_hv (name, create);
414} 423}
415 424
416ECB_INLINE void 425ecb_inline void
417coro_times_update () 426coro_times_update (void)
418{ 427{
419#ifdef coro_clock_gettime 428#ifdef coro_clock_gettime
420 struct timespec ts; 429 struct timespec ts;
421 430
422 ts.tv_sec = ts.tv_nsec = 0; 431 ts.tv_sec = ts.tv_nsec = 0;
434 time_real [0] = tv [0]; 443 time_real [0] = tv [0];
435 time_real [1] = tv [1] * 1000; 444 time_real [1] = tv [1] * 1000;
436#endif 445#endif
437} 446}
438 447
439ECB_INLINE void 448ecb_inline void
440coro_times_add (struct coro *c) 449coro_times_add (struct coro *c)
441{ 450{
442 c->t_real [1] += time_real [1]; 451 c->t_real [1] += time_real [1];
443 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; } 452 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
444 c->t_real [0] += time_real [0]; 453 c->t_real [0] += time_real [0];
446 c->t_cpu [1] += time_cpu [1]; 455 c->t_cpu [1] += time_cpu [1];
447 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; } 456 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
448 c->t_cpu [0] += time_cpu [0]; 457 c->t_cpu [0] += time_cpu [0];
449} 458}
450 459
451ECB_INLINE void 460ecb_inline void
452coro_times_sub (struct coro *c) 461coro_times_sub (struct coro *c)
453{ 462{
454 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; } 463 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; }
455 c->t_real [1] -= time_real [1]; 464 c->t_real [1] -= time_real [1];
456 c->t_real [0] -= time_real [0]; 465 c->t_real [0] -= time_real [0];
477 : 0) 486 : 0)
478 487
479#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv) 488#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
480#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state) 489#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
481 490
482ECB_INLINE MAGIC * 491ecb_inline MAGIC *
483SvSTATEhv_p (pTHX_ SV *coro) 492SvSTATEhv_p (pTHX_ SV *coro)
484{ 493{
485 MAGIC *mg; 494 MAGIC *mg;
486 495
487 if (ecb_expect_true ( 496 if (ecb_expect_true (
492 return mg; 501 return mg;
493 502
494 return 0; 503 return 0;
495} 504}
496 505
497ECB_INLINE struct coro * 506ecb_inline struct coro *
498SvSTATE_ (pTHX_ SV *coro) 507SvSTATE_ (pTHX_ SV *coro_sv)
499{ 508{
500 MAGIC *mg; 509 MAGIC *mg;
501 510
502 if (SvROK (coro)) 511 if (SvROK (coro_sv))
503 coro = SvRV (coro); 512 coro_sv = SvRV (coro_sv);
504 513
505 mg = SvSTATEhv_p (aTHX_ coro); 514 mg = SvSTATEhv_p (aTHX_ coro_sv);
506 if (!mg) 515 if (!mg)
507 croak ("Coro::State object required"); 516 croak ("Coro::State object required");
508 517
509 return (struct coro *)mg->mg_ptr; 518 return (struct coro *)mg->mg_ptr;
510} 519}
516#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 525#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
517 526
518/*****************************************************************************/ 527/*****************************************************************************/
519/* padlist management and caching */ 528/* padlist management and caching */
520 529
521ECB_INLINE AV * 530ecb_inline PADLIST *
522coro_derive_padlist (pTHX_ CV *cv) 531coro_derive_padlist (pTHX_ CV *cv)
523{ 532{
524 AV *padlist = CvPADLIST (cv); 533 PADLIST *padlist = CvPADLIST (cv);
525 AV *newpadlist, *newpad; 534 PADLIST *newpadlist;
535 PADNAMELIST *padnames;
536 PAD *newpad;
537 PADOFFSET off = PadlistMAX (padlist) + 1;
526 538
527 newpadlist = newAV (); 539#if NEWPADAPI
540
541 /* if we had the original CvDEPTH, we might be able to steal the CvDEPTH+1 entry instead */
542 /* 20131102194744.GA6705@schmorp.de, 20131102195825.2013.qmail@lists-nntp.develooper.com */
543 while (!PadlistARRAY (padlist)[off - 1])
544 --off;
545
546 Perl_pad_push (aTHX_ padlist, off);
547
548 newpad = PadlistARRAY (padlist)[off];
549 PadlistARRAY (padlist)[off] = 0;
550
551#else
552
553#if PERL_VERSION_ATLEAST (5,10,0)
554 Perl_pad_push (aTHX_ padlist, off);
555#else
556 Perl_pad_push (aTHX_ padlist, off, 1);
557#endif
558
559 newpad = PadlistARRAY (padlist)[off];
560 PadlistMAX (padlist) = off - 1;
561
562#endif
563
564 newPADLIST (newpadlist);
565#if !PERL_VERSION_ATLEAST(5,15,3)
566 /* Padlists are AvREAL as of 5.15.3. See perl bug #98092 and perl commit 7d953ba. */
528 AvREAL_off (newpadlist); 567 AvREAL_off (newpadlist);
529#if PERL_VERSION_ATLEAST (5,10,0)
530 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1);
531#else
532 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
533#endif 568#endif
534 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
535 --AvFILLp (padlist);
536 569
537 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0])); 570 /* Already extended to 2 elements by newPADLIST. */
538 av_store (newpadlist, 1, (SV *)newpad); 571 PadlistMAX (newpadlist) = 1;
572
573 padnames = PadlistNAMES (padlist);
574 ++PadnamelistREFCNT (padnames);
575 PadlistNAMES (newpadlist) = padnames;
576
577 PadlistARRAY (newpadlist)[1] = newpad;
539 578
540 return newpadlist; 579 return newpadlist;
541} 580}
542 581
543ECB_INLINE void 582ecb_inline void
544free_padlist (pTHX_ AV *padlist) 583free_padlist (pTHX_ PADLIST *padlist)
545{ 584{
546 /* may be during global destruction */ 585 /* may be during global destruction */
547 if (!IN_DESTRUCT) 586 if (!IN_DESTRUCT)
548 { 587 {
549 I32 i = AvFILLp (padlist); 588 I32 i = PadlistMAX (padlist);
550 589
551 while (i > 0) /* special-case index 0 */ 590 while (i > 0) /* special-case index 0 */
552 { 591 {
553 /* we try to be extra-careful here */ 592 /* we try to be extra-careful here */
554 AV *av = (AV *)AvARRAY (padlist)[i--]; 593 PAD *pad = PadlistARRAY (padlist)[i--];
555 I32 j = AvFILLp (av);
556 594
595 if (pad)
596 {
597 I32 j = PadMAX (pad);
598
557 while (j >= 0) 599 while (j >= 0)
558 SvREFCNT_dec (AvARRAY (av)[j--]); 600 SvREFCNT_dec (PadARRAY (pad)[j--]);
559 601
560 AvFILLp (av) = -1; 602 PadMAX (pad) = -1;
561 SvREFCNT_dec (av); 603 SvREFCNT_dec (pad);
604 }
562 } 605 }
563 606
564 SvREFCNT_dec (AvARRAY (padlist)[0]); 607 PadnamelistREFCNT_dec (PadlistNAMES (padlist));
565 608
609#if NEWPADAPI
610 Safefree (PadlistARRAY (padlist));
611 Safefree (padlist);
612#else
566 AvFILLp (padlist) = -1; 613 AvFILLp (padlist) = -1;
614 AvREAL_off (padlist);
567 SvREFCNT_dec ((SV*)padlist); 615 SvREFCNT_dec ((SV*)padlist);
616#endif
568 } 617 }
569} 618}
570 619
571static int 620static int
572coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 621coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
573{ 622{
574 AV *padlist; 623 PADLIST *padlist;
575 AV *av = (AV *)mg->mg_obj; 624 PADLIST **padlists = (PADLIST **)(mg->mg_ptr + sizeof(size_t));
625 size_t len = *(size_t *)mg->mg_ptr;
576 626
577 /* perl manages to free our internal AV and _then_ call us */ 627 /* perl manages to free our internal AV and _then_ call us */
578 if (IN_DESTRUCT) 628 if (IN_DESTRUCT)
579 return 0; 629 return 0;
580 630
581 /* casting is fun. */ 631 while (len--)
582 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
583 free_padlist (aTHX_ padlist); 632 free_padlist (aTHX_ padlists[len]);
584
585 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
586 633
587 return 0; 634 return 0;
588} 635}
589 636
590static MGVTBL coro_cv_vtbl = { 637static MGVTBL coro_cv_vtbl = {
591 0, 0, 0, 0, 638 0, 0, 0, 0,
592 coro_cv_free 639 coro_cv_free
593}; 640};
594 641
595/* the next two functions merely cache the padlists */ 642/* the next two functions merely cache the padlists */
596ECB_INLINE void 643ecb_inline void
597get_padlist (pTHX_ CV *cv) 644get_padlist (pTHX_ CV *cv)
598{ 645{
599 MAGIC *mg = CORO_MAGIC_cv (cv); 646 MAGIC *mg = CORO_MAGIC_cv (cv);
600 AV *av; 647 size_t *lenp;
601 648
602 if (ecb_expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 649 if (ecb_expect_true (mg && *(lenp = (size_t *)mg->mg_ptr)))
603 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 650 CvPADLIST (cv) = ((PADLIST **)(mg->mg_ptr + sizeof(size_t)))[--*lenp];
604 else 651 else
605 { 652 {
606#if CORO_PREFER_PERL_FUNCTIONS 653#if CORO_PREFER_PERL_FUNCTIONS
607 /* this is probably cleaner? but also slower! */ 654 /* this is probably cleaner? but also slower! */
608 /* in practise, it seems to be less stable */ 655 /* in practise, it seems to be less stable */
614 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 661 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
615#endif 662#endif
616 } 663 }
617} 664}
618 665
619ECB_INLINE void 666ecb_inline void
620put_padlist (pTHX_ CV *cv) 667put_padlist (pTHX_ CV *cv)
621{ 668{
622 MAGIC *mg = CORO_MAGIC_cv (cv); 669 MAGIC *mg = CORO_MAGIC_cv (cv);
623 AV *av;
624 670
625 if (ecb_expect_false (!mg)) 671 if (ecb_expect_false (!mg))
672 {
626 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 673 mg = sv_magicext ((SV *)cv, 0, CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
674 Newz (0, mg->mg_ptr ,sizeof (size_t) + sizeof (PADLIST *), char);
675 mg->mg_len = 1; /* so mg_free frees mg_ptr */
676 }
677 else
678 Renew (mg->mg_ptr,
679 sizeof(size_t) + (*(size_t *)mg->mg_ptr + 1) * sizeof(PADLIST *),
680 char);
627 681
628 av = (AV *)mg->mg_obj; 682 ((PADLIST **)(mg->mg_ptr + sizeof (size_t))) [(*(size_t *)mg->mg_ptr)++] = CvPADLIST (cv);
629
630 if (ecb_expect_false (AvFILLp (av) >= AvMAX (av)))
631 av_extend (av, AvFILLp (av) + 1);
632
633 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
634} 683}
635 684
636/** load & save, init *******************************************************/ 685/** load & save, init *******************************************************/
637 686
687ecb_inline void
688swap_sv (SV *a, SV *b)
689{
690 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
691 SV tmp;
692
693 /* swap sv_any */
694 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
695
696 /* swap sv_flags */
697 SvFLAGS (&tmp) = SvFLAGS (a);
698 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
699 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
700
701#if PERL_VERSION_ATLEAST (5,10,0)
702 /* perl 5.10 and later complicates this _quite_ a bit, but it also
703 * is much faster, so no quarrels here. alternatively, we could
704 * sv_upgrade to avoid this.
705 */
706 {
707 /* swap sv_u */
708 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
709
710 /* if SvANY points to the head, we need to adjust the pointers,
711 * as the pointer for a still points to b, and maybe vice versa.
712 */
713 U32 svany_in_head_set = (1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV);
714 #if NVSIZE <= IVSIZE && PERL_VERSION_ATLEAST(5,22,0)
715 svany_in_head_set |= 1 << SVt_NV;
716 #endif
717
718 #define svany_in_head(type) (svany_in_head_set & (1 << (type)))
719
720 if (svany_in_head (SvTYPE (a)))
721 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
722
723 if (svany_in_head (SvTYPE (b)))
724 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
725 }
726#endif
727}
728
638/* swap sv heads, at least logically */ 729/* swap sv heads, at least logically */
639static void 730static void
640swap_svs (pTHX_ Coro__State c) 731swap_svs_enter (pTHX_ Coro__State c)
641{ 732{
642 int i; 733 int i;
643 734
644 for (i = 0; i <= AvFILLp (c->swap_sv); ) 735 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
645 { 736 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
646 SV *a = AvARRAY (c->swap_sv)[i++];
647 SV *b = AvARRAY (c->swap_sv)[i++];
648
649 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
650 SV tmp;
651
652 /* swap sv_any */
653 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
654
655 /* swap sv_flags */
656 SvFLAGS (&tmp) = SvFLAGS (a);
657 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
658 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
659
660#if PERL_VERSION_ATLEAST (5,10,0)
661 /* perl 5.10 complicates this _quite_ a bit, but it also is
662 * much faster, so no quarrels here. alternatively, we could
663 * sv_upgrade to avoid this.
664 */
665 {
666 /* swap sv_u */
667 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
668
669 /* if SvANY points to the head, we need to adjust the pointers,
670 * as the pointer for a still points to b, and maybe vice versa.
671 */
672 #define svany_in_head(type) \
673 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
674
675 if (svany_in_head (SvTYPE (a)))
676 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
677
678 if (svany_in_head (SvTYPE (b)))
679 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
680 }
681#endif
682 }
683} 737}
684 738
739static void
740swap_svs_leave (pTHX_ Coro__State c)
741{
742 int i;
743
744 for (i = AvFILLp (c->swap_sv) - 1; i >= 0; i -= 2)
745 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
746}
747
685#define SWAP_SVS(coro) \ 748#define SWAP_SVS_ENTER(coro) \
686 if (ecb_expect_false ((coro)->swap_sv)) \ 749 if (ecb_expect_false ((coro)->swap_sv)) \
687 swap_svs (aTHX_ (coro)) 750 swap_svs_enter (aTHX_ (coro))
751
752#define SWAP_SVS_LEAVE(coro) \
753 if (ecb_expect_false ((coro)->swap_sv)) \
754 swap_svs_leave (aTHX_ (coro))
688 755
689static void 756static void
690on_enterleave_call (pTHX_ SV *cb); 757on_enterleave_call (pTHX_ SV *cb);
691 758
692static void 759static void
699 766
700#if CORO_JIT 767#if CORO_JIT
701 load_perl_slots (slot); 768 load_perl_slots (slot);
702#else 769#else
703 #define VARx(name,expr,type) expr = slot->name; 770 #define VARx(name,expr,type) expr = slot->name;
704 # include "state.h" 771 #include "state.h"
705 #undef VARx
706#endif 772#endif
707 773
708 { 774 {
709 dSP; 775 dSP;
710 776
713 /* now do the ugly restore mess */ 779 /* now do the ugly restore mess */
714 while (ecb_expect_true (cv = (CV *)POPs)) 780 while (ecb_expect_true (cv = (CV *)POPs))
715 { 781 {
716 put_padlist (aTHX_ cv); /* mark this padlist as available */ 782 put_padlist (aTHX_ cv); /* mark this padlist as available */
717 CvDEPTH (cv) = PTR2IV (POPs); 783 CvDEPTH (cv) = PTR2IV (POPs);
718 CvPADLIST (cv) = (AV *)POPs; 784 CvPADLIST (cv) = (PADLIST *)POPs;
719 } 785 }
720 786
721 PUTBACK; 787 PUTBACK;
722 } 788 }
723 789
738 804
739 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 805 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
740 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 806 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
741 } 807 }
742 808
809 if (ecb_expect_false (c->on_enter_xs))
810 {
811 int i;
812
813 for (i = 0; i <= AvFILLp (c->on_enter_xs); i += 2)
814 ((coro_enterleave_hook)AvARRAY (c->on_enter_xs)[i]) (aTHX_ AvARRAY (c->on_enter_xs)[i + 1]);
815 }
816
743 SWAP_SVS (c); 817 SWAP_SVS_ENTER (c);
744} 818}
745 819
746static void 820static void
747save_perl (pTHX_ Coro__State c) 821save_perl (pTHX_ Coro__State c)
748{ 822{
749 SWAP_SVS (c); 823 SWAP_SVS_LEAVE (c);
824
825 if (ecb_expect_false (c->on_leave_xs))
826 {
827 int i;
828
829 for (i = AvFILLp (c->on_leave_xs) - 1; i >= 0; i -= 2)
830 ((coro_enterleave_hook)AvARRAY (c->on_leave_xs)[i]) (aTHX_ AvARRAY (c->on_leave_xs)[i + 1]);
831 }
750 832
751 if (ecb_expect_false (c->on_leave)) 833 if (ecb_expect_false (c->on_leave))
752 { 834 {
753 int i; 835 int i;
754 836
813 895
814 PUTBACK; 896 PUTBACK;
815 } 897 }
816 898
817 /* allocate some space on the context stack for our purposes */ 899 /* allocate some space on the context stack for our purposes */
818 if (ecb_expect_false (cxstack_ix + SLOT_COUNT >= cxstack_max)) 900 if (ecb_expect_false (cxstack_ix + (int)SLOT_COUNT >= cxstack_max))
819 { 901 {
820 unsigned int i; 902 unsigned int i;
821 903
822 for (i = 0; i < SLOT_COUNT; ++i) 904 for (i = 0; i < SLOT_COUNT; ++i)
823 CXINC; 905 CXINC;
832 914
833#if CORO_JIT 915#if CORO_JIT
834 save_perl_slots (slot); 916 save_perl_slots (slot);
835#else 917#else
836 #define VARx(name,expr,type) slot->name = expr; 918 #define VARx(name,expr,type) slot->name = expr;
837 # include "state.h" 919 #include "state.h"
838 #undef VARx
839#endif 920#endif
840 } 921 }
841} 922}
842 923
843/* 924/*
875#endif 956#endif
876 957
877 New(54,PL_scopestack,8,I32); 958 New(54,PL_scopestack,8,I32);
878 PL_scopestack_ix = 0; 959 PL_scopestack_ix = 0;
879 PL_scopestack_max = 8; 960 PL_scopestack_max = 8;
961#if HAS_SCOPESTACK_NAME
962 New(54,PL_scopestack_name,8,const char*);
963#endif
880 964
881 New(54,PL_savestack,24,ANY); 965 New(54,PL_savestack,24,ANY);
882 PL_savestack_ix = 0; 966 PL_savestack_ix = 0;
883 PL_savestack_max = 24; 967 PL_savestack_max = 24;
968#if !PERL_VERSION_ATLEAST (5,24,0)
969 /* perl 5.24 moves SS_MAXPUSH optimisation from */
970 /* the header macros to PL_savestack_max */
971 PL_savestack_max -= SS_MAXPUSH;
972#endif
884 973
885#if !PERL_VERSION_ATLEAST (5,10,0) 974#if !PERL_VERSION_ATLEAST (5,10,0)
886 New(54,PL_retstack,4,OP*); 975 New(54,PL_retstack,4,OP*);
887 PL_retstack_ix = 0; 976 PL_retstack_ix = 0;
888 PL_retstack_max = 4; 977 PL_retstack_max = 4;
912 } 1001 }
913 1002
914 Safefree (PL_tmps_stack); 1003 Safefree (PL_tmps_stack);
915 Safefree (PL_markstack); 1004 Safefree (PL_markstack);
916 Safefree (PL_scopestack); 1005 Safefree (PL_scopestack);
1006#if HAS_SCOPESTACK_NAME
1007 Safefree (PL_scopestack_name);
1008#endif
917 Safefree (PL_savestack); 1009 Safefree (PL_savestack);
918#if !PERL_VERSION_ATLEAST (5,10,0) 1010#if !PERL_VERSION_ATLEAST (5,10,0)
919 Safefree (PL_retstack); 1011 Safefree (PL_retstack);
920#endif 1012#endif
921} 1013}
981 { 1073 {
982 SV **svp = 0; 1074 SV **svp = 0;
983 1075
984 if (strEQ (s, "__DIE__" )) svp = &PL_diehook; 1076 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
985 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 1077 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
986 1078
987 if (svp) 1079 if (svp)
988 { 1080 {
989 sv_setsv (sv, *svp ? *svp : &PL_sv_undef); 1081 SV *ssv;
1082
1083 if (!*svp)
1084 ssv = &PL_sv_undef;
1085 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */
1086 ssv = sv_2mortal (newRV_inc (*svp));
1087 else
1088 ssv = *svp;
1089
1090 sv_setsv (sv, ssv);
990 return 0; 1091 return 0;
991 } 1092 }
992 } 1093 }
993 1094
994 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 1095 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
1088 PL_hints = 0; 1189 PL_hints = 0;
1089 1190
1090 /* recreate the die/warn hooks */ 1191 /* recreate the die/warn hooks */
1091 PL_diehook = SvREFCNT_inc (rv_diehook); 1192 PL_diehook = SvREFCNT_inc (rv_diehook);
1092 PL_warnhook = SvREFCNT_inc (rv_warnhook); 1193 PL_warnhook = SvREFCNT_inc (rv_warnhook);
1093 1194
1094 GvSV (PL_defgv) = newSV (0); 1195 GvSV (PL_defgv) = newSV (0);
1095 GvAV (PL_defgv) = coro->args; coro->args = 0; 1196 GvAV (PL_defgv) = coro->args; coro->args = 0;
1096 GvSV (PL_errgv) = newSV (0); 1197 GvSV (PL_errgv) = newSV (0);
1097 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1198 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
1098 GvHV (PL_hintgv) = 0; 1199 GvHV (PL_hintgv) = newHV ();
1200#if PERL_VERSION_ATLEAST (5,10,0)
1201 hv_magic (GvHV (PL_hintgv), 0, PERL_MAGIC_hints);
1202#endif
1099 PL_rs = newSVsv (GvSV (irsgv)); 1203 PL_rs = newSVsv (GvSV (irsgv));
1100 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1204 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
1101 1205
1102 { 1206 {
1103 dSP; 1207 dSP;
1131 PL_op = (OP *)&init_perl_op; 1235 PL_op = (OP *)&init_perl_op;
1132 1236
1133 /* copy throw, in case it was set before init_perl */ 1237 /* copy throw, in case it was set before init_perl */
1134 CORO_THROW = coro->except; 1238 CORO_THROW = coro->except;
1135 1239
1136 SWAP_SVS (coro); 1240 SWAP_SVS_ENTER (coro);
1137 1241
1138 if (ecb_expect_false (enable_times)) 1242 if (ecb_expect_false (enable_times))
1139 { 1243 {
1140 coro_times_update (); 1244 coro_times_update ();
1141 coro_times_sub (coro); 1245 coro_times_sub (coro);
1179 /* this will cause transfer_check to croak on block*/ 1283 /* this will cause transfer_check to croak on block*/
1180 SvRV_set (coro_current, (SV *)coro->hv); 1284 SvRV_set (coro_current, (SV *)coro->hv);
1181 1285
1182 load_perl (aTHX_ coro); 1286 load_perl (aTHX_ coro);
1183 1287
1288 /* restore swapped sv's */
1289 SWAP_SVS_LEAVE (coro);
1290
1184 coro_unwind_stacks (aTHX); 1291 coro_unwind_stacks (aTHX);
1185 1292
1186 /* restore swapped sv's */
1187 SWAP_SVS (coro);
1188
1189 coro_destruct_stacks (aTHX); 1293 coro_destruct_stacks (aTHX);
1190 1294
1191 // now save some sv's to be free'd later 1295 /* now save some sv's to be free'd later */
1192 svf [0] = GvSV (PL_defgv); 1296 svf [0] = GvSV (PL_defgv);
1193 svf [1] = (SV *)GvAV (PL_defgv); 1297 svf [1] = (SV *)GvAV (PL_defgv);
1194 svf [2] = GvSV (PL_errgv); 1298 svf [2] = GvSV (PL_errgv);
1195 svf [3] = (SV *)PL_defoutgv; 1299 svf [3] = (SV *)PL_defoutgv;
1196 svf [4] = PL_rs; 1300 svf [4] = PL_rs;
1213 1317
1214 SvREFCNT_dec (coro->saved_deffh); 1318 SvREFCNT_dec (coro->saved_deffh);
1215 SvREFCNT_dec (coro->rouse_cb); 1319 SvREFCNT_dec (coro->rouse_cb);
1216 SvREFCNT_dec (coro->invoke_cb); 1320 SvREFCNT_dec (coro->invoke_cb);
1217 SvREFCNT_dec (coro->invoke_av); 1321 SvREFCNT_dec (coro->invoke_av);
1322 SvREFCNT_dec (coro->on_enter_xs);
1323 SvREFCNT_dec (coro->on_leave_xs);
1218 } 1324 }
1219} 1325}
1220 1326
1221ECB_INLINE void 1327ecb_inline void
1222free_coro_mortal (pTHX) 1328free_coro_mortal (pTHX)
1223{ 1329{
1224 if (ecb_expect_true (coro_mortal)) 1330 if (ecb_expect_true (coro_mortal))
1225 { 1331 {
1226 SvREFCNT_dec ((SV *)coro_mortal); 1332 SvREFCNT_dec ((SV *)coro_mortal);
1285 1391
1286 if (PL_curcop != &PL_compiling) 1392 if (PL_curcop != &PL_compiling)
1287 { 1393 {
1288 SV **cb; 1394 SV **cb;
1289 1395
1290 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB) 1396 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB && cxstack_ix >= 0)
1291 { 1397 {
1292 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1398 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1293 1399
1294 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1400 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1295 { 1401 {
1385 slf_frame.prepare = slf_prepare_set_stacklevel; 1491 slf_frame.prepare = slf_prepare_set_stacklevel;
1386 slf_frame.check = slf_check_set_stacklevel; 1492 slf_frame.check = slf_check_set_stacklevel;
1387} 1493}
1388 1494
1389/* the tail of transfer: execute stuff we can only do after a transfer */ 1495/* the tail of transfer: execute stuff we can only do after a transfer */
1390ECB_INLINE void 1496ecb_inline void
1391transfer_tail (pTHX) 1497transfer_tail (pTHX)
1392{ 1498{
1393 free_coro_mortal (aTHX); 1499 free_coro_mortal (aTHX);
1500}
1501
1502/* try to exit the same way perl's main function would do */
1503/* we do not bother resetting the environment or other things *7
1504/* that are not, uhm, essential */
1505/* this obviously also doesn't work when perl is embedded */
1506static void ecb_noinline ecb_cold
1507perlish_exit (pTHX)
1508{
1509 int exitstatus = perl_destruct (PL_curinterp);
1510 perl_free (PL_curinterp);
1511 exit (exitstatus);
1394} 1512}
1395 1513
1396/* 1514/*
1397 * this is a _very_ stripped down perl interpreter ;) 1515 * this is a _very_ stripped down perl interpreter ;)
1398 */ 1516 */
1425 * coro body here, as perl_run destroys these. Likewise, we cannot catch 1543 * coro body here, as perl_run destroys these. Likewise, we cannot catch
1426 * runtime errors here, as this is just a random interpreter, not a thread. 1544 * runtime errors here, as this is just a random interpreter, not a thread.
1427 */ 1545 */
1428 1546
1429 /* 1547 /*
1548 * pp_entersub in 5.24 no longer ENTERs, but perl_destruct
1549 * requires PL_scopestack_ix, so do it here if required.
1550 */
1551 if (!PL_scopestack_ix)
1552 ENTER;
1553
1554 /*
1430 * If perl-run returns we assume exit() was being called or the coro 1555 * If perl-run returns we assume exit() was being called or the coro
1431 * fell off the end, which seems to be the only valid (non-bug) 1556 * fell off the end, which seems to be the only valid (non-bug)
1432 * reason for perl_run to return. We try to exit by jumping to the 1557 * reason for perl_run to return. We try to mimic whatever perl is normally
1433 * bootstrap-time "top" top_env, as we cannot restore the "main" 1558 * doing in that case. YMMV.
1434 * coroutine as Coro has no such concept.
1435 * This actually isn't valid with the pthread backend, but OSes requiring
1436 * that backend are too broken to do it in a standards-compliant way.
1437 */ 1559 */
1438 PL_top_env = main_top_env; 1560 perlish_exit (aTHX);
1439 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1440 } 1561 }
1441} 1562}
1442 1563
1443static coro_cctx * 1564static coro_cctx *
1444cctx_new () 1565cctx_new (void)
1445{ 1566{
1446 coro_cctx *cctx; 1567 coro_cctx *cctx;
1447 1568
1448 ++cctx_count; 1569 ++cctx_count;
1449 New (0, cctx, 1, coro_cctx); 1570 New (0, cctx, 1, coro_cctx);
1455 return cctx; 1576 return cctx;
1456} 1577}
1457 1578
1458/* create a new cctx only suitable as source */ 1579/* create a new cctx only suitable as source */
1459static coro_cctx * 1580static coro_cctx *
1460cctx_new_empty () 1581cctx_new_empty (void)
1461{ 1582{
1462 coro_cctx *cctx = cctx_new (); 1583 coro_cctx *cctx = cctx_new ();
1463 1584
1464 cctx->sptr = 0; 1585 cctx->stack.sptr = 0;
1465 coro_create (&cctx->cctx, 0, 0, 0, 0); 1586 coro_create (&cctx->cctx, 0, 0, 0, 0);
1466 1587
1467 return cctx; 1588 return cctx;
1468} 1589}
1469 1590
1470/* create a new cctx suitable as destination/running a perl interpreter */ 1591/* create a new cctx suitable as destination/running a perl interpreter */
1471static coro_cctx * 1592static coro_cctx *
1472cctx_new_run () 1593cctx_new_run (void)
1473{ 1594{
1474 coro_cctx *cctx = cctx_new (); 1595 coro_cctx *cctx = cctx_new ();
1475 void *stack_start;
1476 size_t stack_size;
1477 1596
1478#if HAVE_MMAP 1597 if (!coro_stack_alloc (&cctx->stack, cctx_stacksize))
1479 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1480 /* mmap supposedly does allocate-on-write for us */
1481 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
1482
1483 if (cctx->sptr != (void *)-1)
1484 {
1485 #if CORO_STACKGUARD
1486 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
1487 #endif
1488 stack_start = (char *)cctx->sptr + CORO_STACKGUARD * PAGESIZE;
1489 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
1490 cctx->flags |= CC_MAPPED;
1491 } 1598 {
1492 else
1493#endif
1494 {
1495 cctx->ssize = cctx_stacksize * (long)sizeof (long);
1496 New (0, cctx->sptr, cctx_stacksize, long);
1497
1498 if (!cctx->sptr)
1499 {
1500 perror ("FATAL: unable to allocate stack for coroutine, exiting."); 1599 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1501 _exit (EXIT_FAILURE); 1600 _exit (EXIT_FAILURE);
1502 }
1503
1504 stack_start = cctx->sptr;
1505 stack_size = cctx->ssize;
1506 } 1601 }
1507 1602
1508 #if CORO_USE_VALGRIND
1509 cctx->valgrind_id = VALGRIND_STACK_REGISTER ((char *)stack_start, (char *)stack_start + stack_size);
1510 #endif
1511
1512 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size); 1603 coro_create (&cctx->cctx, cctx_run, (void *)cctx, cctx->stack.sptr, cctx->stack.ssze);
1513 1604
1514 return cctx; 1605 return cctx;
1515} 1606}
1516 1607
1517static void 1608static void
1523 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current)); 1614 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1524 1615
1525 --cctx_count; 1616 --cctx_count;
1526 coro_destroy (&cctx->cctx); 1617 coro_destroy (&cctx->cctx);
1527 1618
1528 /* coro_transfer creates new, empty cctx's */ 1619 coro_stack_free (&cctx->stack);
1529 if (cctx->sptr)
1530 {
1531 #if CORO_USE_VALGRIND
1532 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
1533 #endif
1534
1535#if HAVE_MMAP
1536 if (cctx->flags & CC_MAPPED)
1537 munmap (cctx->sptr, cctx->ssize);
1538 else
1539#endif
1540 Safefree (cctx->sptr);
1541 }
1542 1620
1543 Safefree (cctx); 1621 Safefree (cctx);
1544} 1622}
1545 1623
1546/* wether this cctx should be destructed */ 1624/* wether this cctx should be destructed */
1565} 1643}
1566 1644
1567static void 1645static void
1568cctx_put (coro_cctx *cctx) 1646cctx_put (coro_cctx *cctx)
1569{ 1647{
1570 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1648 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->stack.sptr));
1571 1649
1572 /* free another cctx if overlimit */ 1650 /* free another cctx if overlimit */
1573 if (ecb_expect_false (cctx_idle >= cctx_max_idle)) 1651 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1574 { 1652 {
1575 coro_cctx *first = cctx_first; 1653 coro_cctx *first = cctx_first;
1701 return; 1779 return;
1702 1780
1703 slf_destroy (aTHX_ coro); 1781 slf_destroy (aTHX_ coro);
1704 1782
1705 coro->flags |= CF_ZOMBIE; 1783 coro->flags |= CF_ZOMBIE;
1706 1784
1707 if (coro->flags & CF_READY) 1785 if (coro->flags & CF_READY)
1708 { 1786 {
1709 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1787 /* reduce nready, as destroying a ready coro effectively unreadies it */
1710 /* alternative: look through all ready queues and remove the coro */ 1788 /* alternative: look through all ready queues and remove the coro */
1711 --coro_nready; 1789 --coro_nready;
1788 TRANSFER (ta, 1); 1866 TRANSFER (ta, 1);
1789} 1867}
1790 1868
1791/** Coro ********************************************************************/ 1869/** Coro ********************************************************************/
1792 1870
1793ECB_INLINE void 1871ecb_inline void
1794coro_enq (pTHX_ struct coro *coro) 1872coro_enq (pTHX_ struct coro *coro)
1795{ 1873{
1796 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN]; 1874 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1797 1875
1798 SvREFCNT_inc_NN (coro->hv); 1876 SvREFCNT_inc_NN (coro->hv);
1800 coro->next_ready = 0; 1878 coro->next_ready = 0;
1801 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro; 1879 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1802 ready [1] = coro; 1880 ready [1] = coro;
1803} 1881}
1804 1882
1805ECB_INLINE struct coro * 1883ecb_inline struct coro *
1806coro_deq (pTHX) 1884coro_deq (pTHX)
1807{ 1885{
1808 int prio; 1886 int prio;
1809 1887
1810 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; ) 1888 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
1863{ 1941{
1864 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1942 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1865} 1943}
1866 1944
1867/* expects to own a reference to next->hv */ 1945/* expects to own a reference to next->hv */
1868ECB_INLINE void 1946ecb_inline void
1869prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1947prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1870{ 1948{
1871 SV *prev_sv = SvRV (coro_current); 1949 SV *prev_sv = SvRV (coro_current);
1872 1950
1873 ta->prev = SvSTATE_hv (prev_sv); 1951 ta->prev = SvSTATE_hv (prev_sv);
1907 /* nothing to schedule: call the idle handler */ 1985 /* nothing to schedule: call the idle handler */
1908 if (SvROK (sv_idle) 1986 if (SvROK (sv_idle)
1909 && SvOBJECT (SvRV (sv_idle))) 1987 && SvOBJECT (SvRV (sv_idle)))
1910 { 1988 {
1911 if (SvRV (sv_idle) == SvRV (coro_current)) 1989 if (SvRV (sv_idle) == SvRV (coro_current))
1990 {
1991 require_pv ("Carp");
1992
1993 {
1994 dSP;
1995
1996 ENTER;
1997 SAVETMPS;
1998
1999 PUSHMARK (SP);
1912 croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught"); 2000 XPUSHs (sv_2mortal (newSVpv ("FATAL: $Coro::idle blocked itself - did you try to block inside an event loop callback? Caught", 0)));
2001 PUTBACK;
2002 call_pv ("Carp::confess", G_VOID | G_DISCARD);
2003
2004 FREETMPS;
2005 LEAVE;
2006 }
2007 }
1913 2008
1914 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 2009 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1915 api_ready (aTHX_ SvRV (sv_idle)); 2010 api_ready (aTHX_ SvRV (sv_idle));
1916 --coro_nready; 2011 --coro_nready;
1917 } 2012 }
1932 } 2027 }
1933 } 2028 }
1934 } 2029 }
1935} 2030}
1936 2031
1937ECB_INLINE void 2032ecb_inline void
1938prepare_cede (pTHX_ struct coro_transfer_args *ta) 2033prepare_cede (pTHX_ struct coro_transfer_args *ta)
1939{ 2034{
1940 api_ready (aTHX_ coro_current); 2035 api_ready (aTHX_ coro_current);
1941 prepare_schedule (aTHX_ ta); 2036 prepare_schedule (aTHX_ ta);
1942} 2037}
1943 2038
1944ECB_INLINE void 2039ecb_inline void
1945prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 2040prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1946{ 2041{
1947 SV *prev = SvRV (coro_current); 2042 SV *prev = SvRV (coro_current);
1948 2043
1949 if (coro_nready) 2044 if (coro_nready)
2114{ 2209{
2115 AV *od = coro->on_destroy; 2210 AV *od = coro->on_destroy;
2116 2211
2117 if (!od) 2212 if (!od)
2118 return; 2213 return;
2214
2215 coro->on_destroy = 0;
2216 sv_2mortal ((SV *)od);
2119 2217
2120 while (AvFILLp (od) >= 0) 2218 while (AvFILLp (od) >= 0)
2121 { 2219 {
2122 SV *cb = sv_2mortal (av_pop (od)); 2220 SV *cb = sv_2mortal (av_pop (od));
2123 2221
2144 2242
2145static void 2243static void
2146coro_set_status (pTHX_ struct coro *coro, SV **arg, int items) 2244coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
2147{ 2245{
2148 AV *av; 2246 AV *av;
2149 2247
2150 if (coro->status) 2248 if (coro->status)
2151 { 2249 {
2152 av = coro->status; 2250 av = coro->status;
2153 av_clear (av); 2251 av_clear (av);
2154 } 2252 }
2201 2299
2202 coro = SvSTATE (arg [0]); 2300 coro = SvSTATE (arg [0]);
2203 coro_hv = coro->hv; 2301 coro_hv = coro->hv;
2204 2302
2205 coro_set_status (aTHX_ coro, arg + 1, items - 1); 2303 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2206 2304
2207 if (ecb_expect_false (coro->flags & CF_NOCANCEL)) 2305 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2208 { 2306 {
2209 /* coro currently busy cancelling something, so just notify it */ 2307 /* coro currently busy cancelling something, so just notify it */
2210 coro->slf_frame.data = (void *)coro; 2308 coro->slf_frame.data = (void *)coro;
2211 2309
2218 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv); 2316 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2219 } 2317 }
2220 else 2318 else
2221 { 2319 {
2222 struct coro *self = SvSTATE_current; 2320 struct coro *self = SvSTATE_current;
2321
2322 if (!self)
2323 croak ("Coro::cancel called outside of thread content,");
2223 2324
2224 /* otherwise we cancel directly, purely for speed reasons 2325 /* otherwise we cancel directly, purely for speed reasons
2225 * unfortunately, this requires some magic trickery, as 2326 * unfortunately, this requires some magic trickery, as
2226 * somebody else could cancel us, so we have to fight the cancellation. 2327 * somebody else could cancel us, so we have to fight the cancellation.
2227 * this is ugly, and hopefully fully worth the extra speed. 2328 * this is ugly, and hopefully fully worth the extra speed.
2337 else 2438 else
2338 { 2439 {
2339 av_clear (GvAV (PL_defgv)); 2440 av_clear (GvAV (PL_defgv));
2340 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2441 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
2341 2442
2443 if (ecb_expect_false (coro->swap_sv))
2444 {
2445 swap_svs_leave (coro);
2446 SvREFCNT_dec_NN (coro->swap_sv);
2447 coro->swap_sv = 0;
2448 }
2449
2342 coro->prio = 0; 2450 coro->prio = 0;
2343 2451
2344 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 2452 if (ecb_expect_false (coro->cctx) && ecb_expect_false (coro->cctx->flags & CC_TRACE))
2345 api_trace (aTHX_ coro_current, 0); 2453 api_trace (aTHX_ coro_current, 0);
2346 2454
2347 frame->prepare = prepare_schedule; 2455 frame->prepare = prepare_schedule;
2348 av_push (av_async_pool, SvREFCNT_inc (hv)); 2456 av_push (av_async_pool, SvREFCNT_inc (hv));
2349 } 2457 }
2390 2498
2391static int 2499static int
2392slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2500slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
2393{ 2501{
2394 SV *data = (SV *)frame->data; 2502 SV *data = (SV *)frame->data;
2395 2503
2396 if (CORO_THROW) 2504 if (CORO_THROW)
2397 return 0; 2505 return 0;
2398 2506
2399 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2507 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2400 return 1; 2508 return 1;
2436 cb = sv_2mortal (coro->rouse_cb); 2544 cb = sv_2mortal (coro->rouse_cb);
2437 coro->rouse_cb = 0; 2545 coro->rouse_cb = 0;
2438 } 2546 }
2439 2547
2440 if (!SvROK (cb) 2548 if (!SvROK (cb)
2441 || SvTYPE (SvRV (cb)) != SVt_PVCV 2549 || SvTYPE (SvRV (cb)) != SVt_PVCV
2442 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2550 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2443 croak ("Coro::rouse_wait called with illegal callback argument,"); 2551 croak ("Coro::rouse_wait called with illegal callback argument,");
2444 2552
2445 { 2553 {
2446 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */ 2554 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
2569 2677
2570/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */ 2678/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2571static void 2679static void
2572slf_destroy (pTHX_ struct coro *coro) 2680slf_destroy (pTHX_ struct coro *coro)
2573{ 2681{
2574 /* this callback is reserved for slf functions needing to do cleanup */ 2682 struct CoroSLF frame = coro->slf_frame;
2575 if (coro->slf_frame.destroy && coro->slf_frame.prepare && !PL_dirty)
2576 coro->slf_frame.destroy (aTHX_ &coro->slf_frame);
2577 2683
2578 /* 2684 /*
2579 * The on_destroy above most likely is from an SLF call. 2685 * The on_destroy below most likely is from an SLF call.
2580 * Since by definition the SLF call will not finish when we destroy 2686 * Since by definition the SLF call will not finish when we destroy
2581 * the coro, we will have to force-finish it here, otherwise 2687 * the coro, we will have to force-finish it here, otherwise
2582 * cleanup functions cannot call SLF functions. 2688 * cleanup functions cannot call SLF functions.
2583 */ 2689 */
2584 coro->slf_frame.prepare = 0; 2690 coro->slf_frame.prepare = 0;
2691
2692 /* this callback is reserved for slf functions needing to do cleanup */
2693 if (frame.destroy && frame.prepare && !PL_dirty)
2694 frame.destroy (aTHX_ &frame);
2585} 2695}
2586 2696
2587/* 2697/*
2588 * these not obviously related functions are all rolled into one 2698 * these not obviously related functions are all rolled into one
2589 * function to increase chances that they all will call transfer with the same 2699 * function to increase chances that they all will call transfer with the same
2772static void 2882static void
2773coro_pop_on_leave (pTHX_ void *coro) 2883coro_pop_on_leave (pTHX_ void *coro)
2774{ 2884{
2775 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave); 2885 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2776 on_enterleave_call (aTHX_ sv_2mortal (cb)); 2886 on_enterleave_call (aTHX_ sv_2mortal (cb));
2887}
2888
2889static void
2890enterleave_hook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, void *arg)
2891{
2892 if (!hook)
2893 return;
2894
2895 if (!*avp)
2896 {
2897 *avp = newAV ();
2898 AvREAL_off (*avp);
2899 }
2900
2901 av_push (*avp, (SV *)hook);
2902 av_push (*avp, (SV *)arg);
2903}
2904
2905static void
2906enterleave_unhook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, int execute)
2907{
2908 AV *av = *avp;
2909 int i;
2910
2911 if (!av)
2912 return;
2913
2914 for (i = AvFILLp (av) - 1; i >= 0; i -= 2)
2915 if (AvARRAY (av)[i] == (SV *)hook)
2916 {
2917 if (execute)
2918 hook (aTHX_ (void *)AvARRAY (av)[i + 1]);
2919
2920 memmove (AvARRAY (av) + i, AvARRAY (av) + i + 2, AvFILLp (av) - i - 1);
2921 av_pop (av);
2922 av_pop (av);
2923 break;
2924 }
2925
2926 if (AvFILLp (av) >= 0)
2927 {
2928 *avp = 0;
2929 SvREFCNT_dec_NN (av);
2930 }
2931}
2932
2933static void
2934api_enterleave_hook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2935{
2936 struct coro *coro = SvSTATE (coro_sv);
2937
2938 if (SvSTATE_current == coro)
2939 if (enter)
2940 enter (aTHX_ enter_arg);
2941
2942 enterleave_hook_xs (aTHX_ coro, &coro->on_enter_xs, enter, enter_arg);
2943 enterleave_hook_xs (aTHX_ coro, &coro->on_leave_xs, leave, leave_arg);
2944}
2945
2946static void
2947api_enterleave_unhook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, coro_enterleave_hook leave)
2948{
2949 struct coro *coro = SvSTATE (coro_sv);
2950
2951 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2952 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, SvSTATE_current == coro);
2953}
2954
2955static void
2956savedestructor_unhook_enter (pTHX_ coro_enterleave_hook enter)
2957{
2958 struct coro *coro = SvSTATE_current;
2959
2960 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2961}
2962
2963static void
2964savedestructor_unhook_leave (pTHX_ coro_enterleave_hook leave)
2965{
2966 struct coro *coro = SvSTATE_current;
2967
2968 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, 1);
2969}
2970
2971static void
2972api_enterleave_scope_hook (pTHX_ coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2973{
2974 api_enterleave_hook (aTHX_ coro_current, enter, enter_arg, leave, leave_arg);
2975
2976 /* this ought to be much cheaper than malloc + a single destructor call */
2977 if (enter) SAVEDESTRUCTOR_X (savedestructor_unhook_enter, enter);
2978 if (leave) SAVEDESTRUCTOR_X (savedestructor_unhook_leave, leave);
2777} 2979}
2778 2980
2779/*****************************************************************************/ 2981/*****************************************************************************/
2780/* PerlIO::cede */ 2982/* PerlIO::cede */
2781 2983
2911 XPUSHs (sv_2mortal (newRV_inc ((SV *)av))); 3113 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2912 PUTBACK; 3114 PUTBACK;
2913 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR); 3115 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2914 } 3116 }
2915 3117
2916 SvREFCNT_dec (cb); 3118 SvREFCNT_dec_NN (cb);
2917 } 3119 }
2918} 3120}
2919 3121
2920static void 3122static void
2921coro_semaphore_destroy (pTHX_ struct CoroSLF *frame) 3123coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2929{ 3131{
2930 AV *av = (AV *)frame->data; 3132 AV *av = (AV *)frame->data;
2931 SV *count_sv = AvARRAY (av)[0]; 3133 SV *count_sv = AvARRAY (av)[0];
2932 SV *coro_hv = SvRV (coro_current); 3134 SV *coro_hv = SvRV (coro_current);
2933 3135
3136 frame->destroy = 0;
3137
2934 /* if we are about to throw, don't actually acquire the lock, just throw */ 3138 /* if we are about to throw, don't actually acquire the lock, just throw */
2935 if (CORO_THROW) 3139 if (ecb_expect_false (CORO_THROW))
3140 {
3141 /* we still might be responsible for the semaphore, so wake up others */
3142 coro_semaphore_adjust (aTHX_ av, 0);
3143
2936 return 0; 3144 return 0;
3145 }
2937 else if (SvIVX (count_sv) > 0) 3146 else if (SvIVX (count_sv) > 0)
2938 { 3147 {
2939 frame->destroy = 0;
2940
2941 if (acquire) 3148 if (acquire)
2942 SvIVX (count_sv) = SvIVX (count_sv) - 1; 3149 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2943 else 3150 else
2944 coro_semaphore_adjust (aTHX_ av, 0); 3151 coro_semaphore_adjust (aTHX_ av, 0);
2945 3152
2949 { 3156 {
2950 int i; 3157 int i;
2951 /* if we were woken up but can't down, we look through the whole */ 3158 /* if we were woken up but can't down, we look through the whole */
2952 /* waiters list and only add us if we aren't in there already */ 3159 /* waiters list and only add us if we aren't in there already */
2953 /* this avoids some degenerate memory usage cases */ 3160 /* this avoids some degenerate memory usage cases */
2954 for (i = AvFILLp (av); i > 0; --i) // i > 0 is not an off-by-one bug 3161 for (i = AvFILLp (av); i > 0; --i) /* i > 0 is not an off-by-one bug */
2955 if (AvARRAY (av)[i] == coro_hv) 3162 if (AvARRAY (av)[i] == coro_hv)
2956 return 1; 3163 return 1;
2957 3164
2958 av_push (av, SvREFCNT_inc (coro_hv)); 3165 av_push (av, SvREFCNT_inc (coro_hv));
2959 return 1; 3166 return 1;
3056 { 3263 {
3057 api_ready (aTHX_ cb); 3264 api_ready (aTHX_ cb);
3058 sv_setiv (cb, 0); /* signal waiter */ 3265 sv_setiv (cb, 0); /* signal waiter */
3059 } 3266 }
3060 3267
3061 SvREFCNT_dec (cb); 3268 SvREFCNT_dec_NN (cb);
3062 3269
3063 --count; 3270 --count;
3064 } 3271 }
3065} 3272}
3066 3273
3151 } 3358 }
3152 3359
3153 av_push (state, data_sv); 3360 av_push (state, data_sv);
3154 3361
3155 api_ready (aTHX_ coro); 3362 api_ready (aTHX_ coro);
3156 SvREFCNT_dec (coro); 3363 SvREFCNT_dec_NN (coro);
3157 SvREFCNT_dec ((AV *)state); 3364 SvREFCNT_dec_NN ((AV *)state);
3158} 3365}
3159 3366
3160static int 3367static int
3161slf_check_aio_req (pTHX_ struct CoroSLF *frame) 3368slf_check_aio_req (pTHX_ struct CoroSLF *frame)
3162{ 3369{
3167 /* it quickly returns */ 3374 /* it quickly returns */
3168 if (CORO_THROW) 3375 if (CORO_THROW)
3169 return 0; 3376 return 0;
3170 3377
3171 /* one element that is an RV? repeat! */ 3378 /* one element that is an RV? repeat! */
3172 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0])) 3379 if (AvFILLp (state) == 0 && SvTYPE (AvARRAY (state)[0]) != SVt_PV)
3173 return 1; 3380 return 1;
3174 3381
3175 /* restore status */ 3382 /* restore status */
3176 { 3383 {
3177 SV *data_sv = av_pop (state); 3384 SV *data_sv = av_pop (state);
3180 errno = data->errorno; 3387 errno = data->errorno;
3181 PL_laststype = data->laststype; 3388 PL_laststype = data->laststype;
3182 PL_laststatval = data->laststatval; 3389 PL_laststatval = data->laststatval;
3183 PL_statcache = data->statcache; 3390 PL_statcache = data->statcache;
3184 3391
3185 SvREFCNT_dec (data_sv); 3392 SvREFCNT_dec_NN (data_sv);
3186 } 3393 }
3187 3394
3188 /* push result values */ 3395 /* push result values */
3189 { 3396 {
3190 dSP; 3397 dSP;
3339#endif 3546#endif
3340 3547
3341#if CORO_JIT 3548#if CORO_JIT
3342 3549
3343static void ecb_noinline ecb_cold 3550static void ecb_noinline ecb_cold
3344pushav_3uv (pTHX_ UV a, UV b, UV c) 3551pushav_4uv (pTHX_ UV a, UV b, UV c, UV d)
3345{ 3552{
3346 dSP; 3553 dSP;
3347 AV *av = newAV (); 3554 AV *av = newAV ();
3348 3555
3556 av_store (av, 3, newSVuv (d));
3349 av_store (av, 2, newSVuv (c)); 3557 av_store (av, 2, newSVuv (c));
3350 av_store (av, 1, newSVuv (b)); 3558 av_store (av, 1, newSVuv (b));
3351 av_store (av, 0, newSVuv (a)); 3559 av_store (av, 0, newSVuv (a));
3352 3560
3353 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 3561 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
3360{ 3568{
3361 dSP; 3569 dSP;
3362 SV *load, *save; 3570 SV *load, *save;
3363 char *map_base; 3571 char *map_base;
3364 char *load_ptr, *save_ptr; 3572 char *load_ptr, *save_ptr;
3365 STRLEN load_len, save_len; 3573 STRLEN load_len, save_len, map_len;
3366 int count; 3574 int count;
3367 3575
3576 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3577
3368 PUSHMARK (SP); 3578 PUSHMARK (SP);
3369 PUTBACK;
3370#define VARx(name,expr,type) pushav_3uv (aTHX_ (UV)&(expr), offsetof (perl_slots, name), sizeof (type)); 3579 #define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type));
3371# include "state.h" 3580 #include "state.h"
3372#undef VARx
3373 count = call_pv ("Coro::State::_jit", G_ARRAY); 3581 count = call_pv ("Coro::State::_jit", G_ARRAY);
3374 SPAGAIN; 3582 SPAGAIN;
3375 3583
3376 save = POPs; save_ptr = SvPVbyte (save, save_len); 3584 save = POPs; save_ptr = SvPVbyte (save, save_len);
3377 load = POPs; load_ptr = SvPVbyte (load, load_len); 3585 load = POPs; load_ptr = SvPVbyte (load, load_len);
3378 3586
3587 map_len = load_len + save_len + 16;
3588
3379 map_base = mmap (0, load_len + save_len + 16, PROT_EXEC | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); 3589 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3380 3590
3381 assert (("Coro: unable mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED)); 3591 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3382 3592
3383 load_perl_slots = (load_save_perl_slots_type)map_base; 3593 load_perl_slots = (load_save_perl_slots_type)map_base;
3384 memcpy (map_base, load_ptr, load_len); 3594 memcpy (map_base, load_ptr, load_len);
3385 3595
3386 map_base += (load_len + 15) & ~15; 3596 map_base += (load_len + 15) & ~15;
3387 3597
3388 save_perl_slots = (load_save_perl_slots_type)map_base; 3598 save_perl_slots = (load_save_perl_slots_type)map_base;
3389 memcpy (map_base, save_ptr, save_len); 3599 memcpy (map_base, save_ptr, save_len);
3600
3601 /* we are good citizens and try to make the page read-only, so the evil evil */
3602 /* hackers might have it a bit more difficult */
3603 mprotect (map_base, map_len, PROT_READ | PROT_EXEC);
3604
3605 PUTBACK;
3606 eval_pv ("undef &Coro::State::_jit", 1);
3390} 3607}
3391 3608
3392#endif 3609#endif
3393 3610
3394MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3611MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
3395 3612
3396PROTOTYPES: DISABLE 3613PROTOTYPES: DISABLE
3397 3614
3398BOOT: 3615BOOT:
3399{ 3616{
3617#define VARx(name,expr,type) if (sizeof (type) < sizeof (expr)) croak ("FATAL: Coro thread context slot '" # name "' too small for this version of perl.");
3618#include "state.h"
3400#ifdef USE_ITHREADS 3619#ifdef USE_ITHREADS
3401# if CORO_PTHREAD 3620# if CORO_PTHREAD
3402 coro_thx = PERL_GET_CONTEXT; 3621 coro_thx = PERL_GET_CONTEXT;
3403# endif 3622# endif
3404#endif 3623#endif
3405 BOOT_PAGESIZE;
3406
3407 /* perl defines these to check for existance first, but why it doesn't */ 3624 /* perl defines these to check for existance first, but why it doesn't */
3408 /* just create them one at init time is not clear to me, except for */ 3625 /* just create them one at init time is not clear to me, except for */
3409 /* programs trying to delete them, but... */ 3626 /* programs trying to delete them, but... */
3410 /* anyway, we declare this as invalid and make sure they are initialised here */ 3627 /* anyway, we declare this as invalid and make sure they are initialised here */
3411 DEFSV; 3628 DEFSV;
3418 3635
3419 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 3636 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get;
3420 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set; 3637 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set;
3421 orig_sigelem_clr = PL_vtbl_sigelem.svt_clear; PL_vtbl_sigelem.svt_clear = coro_sigelem_clr; 3638 orig_sigelem_clr = PL_vtbl_sigelem.svt_clear; PL_vtbl_sigelem.svt_clear = coro_sigelem_clr;
3422 3639
3423 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
3424 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV)); 3640 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
3425 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV)); 3641 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
3426 3642
3427 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 3643 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
3428 3644
3462 time_init (aTHX); 3678 time_init (aTHX);
3463 3679
3464 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL)); 3680 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3465#if CORO_JIT 3681#if CORO_JIT
3466 PUTBACK; 3682 PUTBACK;
3467 require_pv ("Coro/jit-" CORO_JIT_TYPE ".pl");
3468 jit_init (aTHX); 3683 jit_init (aTHX);
3469 perl_eval_pv ("undef &Coro::State::_jit", 1);
3470 SPAGAIN; 3684 SPAGAIN;
3471#endif 3685#endif
3472} 3686}
3473 3687
3474SV * 3688SV *
3483void 3697void
3484transfer (...) 3698transfer (...)
3485 PROTOTYPE: $$ 3699 PROTOTYPE: $$
3486 CODE: 3700 CODE:
3487 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3701 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3488
3489void
3490_exit (int code)
3491 PROTOTYPE: $
3492 CODE:
3493 _exit (code);
3494 3702
3495SV * 3703SV *
3496clone (Coro::State coro) 3704clone (Coro::State coro)
3497 CODE: 3705 CODE:
3498{ 3706{
3553void 3761void
3554list () 3762list ()
3555 PROTOTYPE: 3763 PROTOTYPE:
3556 PPCODE: 3764 PPCODE:
3557{ 3765{
3558 struct coro *coro; 3766 struct coro *coro;
3559 for (coro = coro_first; coro; coro = coro->next) 3767 for (coro = coro_first; coro; coro = coro->next)
3560 if (coro->hv) 3768 if (coro->hv)
3561 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 3769 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
3562} 3770}
3563 3771
3627 RETVAL = boolSV (coro->flags & ix); 3835 RETVAL = boolSV (coro->flags & ix);
3628 OUTPUT: 3836 OUTPUT:
3629 RETVAL 3837 RETVAL
3630 3838
3631void 3839void
3632throw (Coro::State self, SV *exception = &PL_sv_undef) 3840throw (SV *self, SV *exception = &PL_sv_undef)
3633 PROTOTYPE: $;$ 3841 PROTOTYPE: $;$
3634 CODE: 3842 CODE:
3635{ 3843{
3844 struct coro *coro = SvSTATE (self);
3636 struct coro *current = SvSTATE_current; 3845 struct coro *current = SvSTATE_current;
3637 SV **exceptionp = self == current ? &CORO_THROW : &self->except; 3846 SV **exceptionp = coro == current ? &CORO_THROW : &coro->except;
3638 SvREFCNT_dec (*exceptionp); 3847 SvREFCNT_dec (*exceptionp);
3639 SvGETMAGIC (exception); 3848 SvGETMAGIC (exception);
3640 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0; 3849 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3850
3851 api_ready (aTHX_ self);
3641} 3852}
3642 3853
3643void 3854void
3644api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3855api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3645 PROTOTYPE: $;$ 3856 PROTOTYPE: $;$
3722 3933
3723void 3934void
3724times (Coro::State self) 3935times (Coro::State self)
3725 PPCODE: 3936 PPCODE:
3726{ 3937{
3727 struct coro *current = SvSTATE (coro_current); 3938 struct coro *current = SvSTATE (coro_current);
3728 3939
3729 if (ecb_expect_false (current == self)) 3940 if (ecb_expect_false (current == self))
3730 { 3941 {
3731 coro_times_update (); 3942 coro_times_update ();
3732 coro_times_add (SvSTATE (coro_current)); 3943 coro_times_add (SvSTATE (coro_current));
3739 if (ecb_expect_false (current == self)) 3950 if (ecb_expect_false (current == self))
3740 coro_times_sub (SvSTATE (coro_current)); 3951 coro_times_sub (SvSTATE (coro_current));
3741} 3952}
3742 3953
3743void 3954void
3744swap_sv (Coro::State coro, SV *sv, SV *swapsv) 3955swap_sv (Coro::State coro, SV *sva, SV *svb)
3745 CODE: 3956 CODE:
3746{ 3957{
3747 struct coro *current = SvSTATE_current; 3958 struct coro *current = SvSTATE_current;
3959 AV *swap_sv;
3960 int i;
3961
3962 sva = SvRV (sva);
3963 svb = SvRV (svb);
3748 3964
3749 if (current == coro) 3965 if (current == coro)
3750 SWAP_SVS (current); 3966 SWAP_SVS_LEAVE (current);
3751 3967
3752 if (!coro->swap_sv) 3968 if (!coro->swap_sv)
3753 coro->swap_sv = newAV (); 3969 coro->swap_sv = newAV ();
3754 3970
3971 swap_sv = coro->swap_sv;
3972
3973 for (i = AvFILLp (swap_sv) - 1; i >= 0; i -= 2)
3974 {
3975 SV *a = AvARRAY (swap_sv)[i ];
3976 SV *b = AvARRAY (swap_sv)[i + 1];
3977
3978 if (a == sva && b == svb)
3979 {
3980 SvREFCNT_dec_NN (a);
3981 SvREFCNT_dec_NN (b);
3982
3983 for (; i <= AvFILLp (swap_sv) - 2; i++)
3984 AvARRAY (swap_sv)[i] = AvARRAY (swap_sv)[i + 2];
3985
3986 AvFILLp (swap_sv) -= 2;
3987
3988 goto removed;
3989 }
3990 }
3991
3755 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv ))); 3992 av_push (swap_sv, SvREFCNT_inc_NN (sva));
3756 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv))); 3993 av_push (swap_sv, SvREFCNT_inc_NN (svb));
3994
3995 removed:
3757 3996
3758 if (current == coro) 3997 if (current == coro)
3759 SWAP_SVS (current); 3998 SWAP_SVS_ENTER (current);
3760} 3999}
3761 4000
3762 4001
3763MODULE = Coro::State PACKAGE = Coro 4002MODULE = Coro::State PACKAGE = Coro
3764 4003
3765BOOT: 4004BOOT:
3766{ 4005{
4006 if (SVt_LAST > 32)
4007 croak ("Coro internal error: SVt_LAST > 32, swap_sv might need adjustment");
4008
3767 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 4009 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3768 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 4010 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3769 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 4011 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3770 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 4012 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3771 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 4013 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3775 4017
3776 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 4018 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3777 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 4019 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3778 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 4020 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3779 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */ 4021 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3780 4022
3781 coro_stash = gv_stashpv ("Coro", TRUE); 4023 coro_stash = gv_stashpv ("Coro", TRUE);
3782 4024
3783 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 4025 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3784 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 4026 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3785 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL)); 4027 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
3797 coroapi.ready = api_ready; 4039 coroapi.ready = api_ready;
3798 coroapi.is_ready = api_is_ready; 4040 coroapi.is_ready = api_is_ready;
3799 coroapi.nready = coro_nready; 4041 coroapi.nready = coro_nready;
3800 coroapi.current = coro_current; 4042 coroapi.current = coro_current;
3801 4043
4044 coroapi.enterleave_hook = api_enterleave_hook;
4045 coroapi.enterleave_unhook = api_enterleave_unhook;
4046 coroapi.enterleave_scope_hook = api_enterleave_scope_hook;
4047
3802 /*GCoroAPI = &coroapi;*/ 4048 /*GCoroAPI = &coroapi;*/
3803 sv_setiv (sv, (IV)&coroapi); 4049 sv_setiv (sv, (IV)&coroapi);
3804 SvREADONLY_on (sv); 4050 SvREADONLY_on (sv);
3805 } 4051 }
3806} 4052}
3871 4117
3872void 4118void
3873_set_current (SV *current) 4119_set_current (SV *current)
3874 PROTOTYPE: $ 4120 PROTOTYPE: $
3875 CODE: 4121 CODE:
3876 SvREFCNT_dec (SvRV (coro_current)); 4122 SvREFCNT_dec_NN (SvRV (coro_current));
3877 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current))); 4123 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
3878 4124
3879void 4125void
3880_set_readyhook (SV *hook) 4126_set_readyhook (SV *hook)
3881 PROTOTYPE: $ 4127 PROTOTYPE: $
3965 4211
3966 if ((SV *)hv == &PL_sv_undef) 4212 if ((SV *)hv == &PL_sv_undef)
3967 { 4213 {
3968 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1); 4214 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3969 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv)); 4215 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
3970 SvREFCNT_dec (sv); 4216 SvREFCNT_dec_NN (sv);
3971 } 4217 }
3972 4218
3973 { 4219 {
3974 struct coro *coro = SvSTATE_hv (hv); 4220 struct coro *coro = SvSTATE_hv (hv);
3975 4221
3982 api_ready (aTHX_ (SV *)hv); 4228 api_ready (aTHX_ (SV *)hv);
3983 4229
3984 if (GIMME_V != G_VOID) 4230 if (GIMME_V != G_VOID)
3985 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 4231 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
3986 else 4232 else
3987 SvREFCNT_dec (hv); 4233 SvREFCNT_dec_NN (hv);
3988} 4234}
3989 4235
3990SV * 4236SV *
3991rouse_cb () 4237rouse_cb ()
3992 PROTOTYPE: 4238 PROTOTYPE:
4007 on_leave = 1 4253 on_leave = 1
4008 PROTOTYPE: & 4254 PROTOTYPE: &
4009 CODE: 4255 CODE:
4010{ 4256{
4011 struct coro *coro = SvSTATE_current; 4257 struct coro *coro = SvSTATE_current;
4012 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 4258 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
4013 4259
4014 block = s_get_cv_croak (block); 4260 block = s_get_cv_croak (block);
4015 4261
4016 if (!*avp) 4262 if (!*avp)
4017 *avp = newAV (); 4263 *avp = newAV ();
4037 4283
4038SV * 4284SV *
4039new (SV *klass, SV *count = 0) 4285new (SV *klass, SV *count = 0)
4040 CODE: 4286 CODE:
4041{ 4287{
4042 int semcnt = 1; 4288 int semcnt = 1;
4043 4289
4044 if (count) 4290 if (count)
4045 { 4291 {
4046 SvGETMAGIC (count); 4292 SvGETMAGIC (count);
4047 4293
4071 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]); 4317 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]);
4072 OUTPUT: 4318 OUTPUT:
4073 RETVAL 4319 RETVAL
4074 4320
4075void 4321void
4076up (SV *self, int adjust = 1) 4322up (SV *self)
4077 ALIAS:
4078 adjust = 1
4079 CODE: 4323 CODE:
4324 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), 1);
4325
4326void
4327adjust (SV *self, int adjust)
4328 CODE:
4080 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1); 4329 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), adjust);
4081 4330
4082void 4331void
4083down (...) 4332down (...)
4084 CODE: 4333 CODE:
4085 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down); 4334 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down);
4107 XSRETURN_NO; 4356 XSRETURN_NO;
4108} 4357}
4109 4358
4110void 4359void
4111waiters (SV *self) 4360waiters (SV *self)
4112 PPCODE: 4361 PPCODE:
4113{ 4362{
4114 AV *av = (AV *)SvRV (self); 4363 AV *av = (AV *)SvRV (self);
4115 int wcount = AvFILLp (av) + 1 - 1; 4364 int wcount = AvFILLp (av) + 1 - 1;
4116 4365
4117 if (GIMME_V == G_SCALAR) 4366 if (GIMME_V == G_SCALAR)
4126} 4375}
4127 4376
4128MODULE = Coro::State PACKAGE = Coro::SemaphoreSet 4377MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
4129 4378
4130void 4379void
4131_may_delete (SV *sem, int count, int extra_refs) 4380_may_delete (SV *sem, int count, unsigned int extra_refs)
4132 PPCODE: 4381 PPCODE:
4133{ 4382{
4134 AV *av = (AV *)SvRV (sem); 4383 AV *av = (AV *)SvRV (sem);
4135 4384
4136 if (SvREFCNT ((SV *)av) == 1 + extra_refs 4385 if (SvREFCNT ((SV *)av) == 1 + extra_refs
4137 && AvFILLp (av) == 0 /* no waiters, just count */ 4386 && AvFILLp (av) == 0 /* no waiters, just count */
4138 && SvIV (AvARRAY (av)[0]) == count) 4387 && SvIV (AvARRAY (av)[0]) == count)
4139 XSRETURN_YES; 4388 XSRETURN_YES;
4160 4409
4161void 4410void
4162broadcast (SV *self) 4411broadcast (SV *self)
4163 CODE: 4412 CODE:
4164{ 4413{
4165 AV *av = (AV *)SvRV (self); 4414 AV *av = (AV *)SvRV (self);
4166 coro_signal_wake (aTHX_ av, AvFILLp (av)); 4415 coro_signal_wake (aTHX_ av, AvFILLp (av));
4167} 4416}
4168 4417
4169void 4418void
4170send (SV *self) 4419send (SV *self)
4178 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */ 4427 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
4179} 4428}
4180 4429
4181IV 4430IV
4182awaited (SV *self) 4431awaited (SV *self)
4183 CODE: 4432 CODE:
4184 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1; 4433 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
4185 OUTPUT: 4434 OUTPUT:
4186 RETVAL 4435 RETVAL
4187 4436
4188 4437
4193 4442
4194void 4443void
4195_schedule (...) 4444_schedule (...)
4196 CODE: 4445 CODE:
4197{ 4446{
4198 static int incede; 4447 static int incede;
4199 4448
4200 api_cede_notself (aTHX); 4449 api_cede_notself (aTHX);
4201 4450
4202 ++incede; 4451 ++incede;
4203 while (coro_nready >= incede && api_cede (aTHX)) 4452 while (coro_nready >= incede && api_cede (aTHX))
4247 { 4496 {
4248 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect; 4497 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
4249 coro_old_pp_sselect = 0; 4498 coro_old_pp_sselect = 0;
4250 } 4499 }
4251 4500
4501MODULE = Coro::State PACKAGE = Coro::Util
4502
4503void
4504_exit (int code)
4505 CODE:
4506 _exit (code);
4507
4508NV
4509time ()
4510 CODE:
4511 RETVAL = nvtime (aTHX);
4512 OUTPUT:
4513 RETVAL
4514
4515NV
4516gettimeofday ()
4517 PPCODE:
4518{
4519 UV tv [2];
4520 u2time (aTHX_ tv);
4521 EXTEND (SP, 2);
4522 PUSHs (sv_2mortal (newSVuv (tv [0])));
4523 PUSHs (sv_2mortal (newSVuv (tv [1])));
4524}
4525

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines