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.407 by root, Sat Jun 11 15:30:21 2011 UTC vs.
Revision 1.434 by root, Sat Nov 2 19:48:50 2013 UTC

1/* this works around a bug in mingw32 providing a non-working setjmp */ 1/* this works around a bug in mingw32 providing a non-working setjmp */
2#define USE_NO_MINGW_SETJMP_TWO_ARGS 2#define USE_NO_MINGW_SETJMP_TWO_ARGS
3 3
4#define NDEBUG 1 4#define NDEBUG 1 /* perl usually disables NDEBUG later */
5 5
6#include "libcoro/coro.c" 6#include "libcoro/coro.c"
7 7
8#define PERL_NO_GET_CONTEXT 8#define PERL_NO_GET_CONTEXT
9#define PERL_EXT 9#define PERL_EXT
… …
12#include "perl.h" 12#include "perl.h"
13#include "XSUB.h" 13#include "XSUB.h"
14#include "perliol.h" 14#include "perliol.h"
15 15
16#include "schmorp.h" 16#include "schmorp.h"
17
18#define ECB_NO_THREADS 1
17#include "ecb.h" 19#include "ecb.h"
18 20
19#include <stddef.h> 21#include <stddef.h>
20#include <stdio.h> 22#include <stdio.h>
21#include <errno.h> 23#include <errno.h>
22#include <assert.h> 24#include <assert.h>
23 25
24#ifndef SVs_PADSTALE 26#ifndef SVs_PADSTALE
25# define SVs_PADSTALE 0 27# define SVs_PADSTALE 0
28#endif
29
30#ifdef PadARRAY
31# define NEWPADAPI 1
32# define newPADLIST(var) (Newz (0, var, 1, PADLIST), Newx (PadlistARRAY (var), 2, PAD *))
33#else
34typedef AV PADNAMELIST;
35# if !PERL_VERSION_ATLEAST(5,8,0)
36typedef AV PADLIST;
37typedef AV PAD;
38# endif
39# define PadlistARRAY(pl) ((PAD **)AvARRAY (pl))
40# define PadlistMAX(pl) AvFILLp (pl)
41# define PadlistNAMES(pl) (*PadlistARRAY (pl))
42# define PadARRAY AvARRAY
43# define PadMAX AvFILLp
44# define newPADLIST(var) ((var) = newAV (), av_extend (var, 1))
26#endif 45#endif
27 46
28#if defined(_WIN32) 47#if defined(_WIN32)
29# undef HAS_GETTIMEOFDAY 48# undef HAS_GETTIMEOFDAY
30# undef setjmp 49# undef setjmp
… …
33# define setjmp _setjmp /* deep magic */ 52# define setjmp _setjmp /* deep magic */
34#else 53#else
35# include <inttypes.h> /* most portable stdint.h */ 54# include <inttypes.h> /* most portable stdint.h */
36#endif 55#endif
37 56
38#ifdef HAVE_MMAP
39# include <unistd.h>
40# include <sys/mman.h>
41# ifndef MAP_ANONYMOUS
42# ifdef MAP_ANON
43# define MAP_ANONYMOUS MAP_ANON
44# else
45# undef HAVE_MMAP
46# endif
47# endif
48# include <limits.h>
49# ifndef PAGESIZE
50# define PAGESIZE pagesize
51# define BOOT_PAGESIZE pagesize = sysconf (_SC_PAGESIZE)
52static long pagesize;
53# else
54# define BOOT_PAGESIZE (void)0
55# endif
56#else
57# define PAGESIZE 0
58# define BOOT_PAGESIZE (void)0
59#endif
60
61#if CORO_USE_VALGRIND
62# include <valgrind/valgrind.h>
63#endif
64
65/* the maximum number of idle cctx that will be pooled */ 57/* the maximum number of idle cctx that will be pooled */
66static int cctx_max_idle = 4; 58static int cctx_max_idle = 4;
67 59
68#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 60#if defined(DEBUGGING) && PERL_VERSION_ATLEAST(5,12,0)
69# undef CORO_STACKGUARD 61# define HAS_SCOPESTACK_NAME 1
70#endif
71
72#ifndef CORO_STACKGUARD
73# define CORO_STACKGUARD 0
74#endif 62#endif
75 63
76/* prefer perl internal functions over our own? */ 64/* prefer perl internal functions over our own? */
77#ifndef CORO_PREFER_PERL_FUNCTIONS 65#ifndef CORO_PREFER_PERL_FUNCTIONS
78# define CORO_PREFER_PERL_FUNCTIONS 0 66# define CORO_PREFER_PERL_FUNCTIONS 0
… …
97# if CORO_PTHREAD 85# if CORO_PTHREAD
98static void *coro_thx; 86static void *coro_thx;
99# endif 87# endif
100#endif 88#endif
101 89
102/* used in state.h */
103#define VAR(name,type) VARx(name, PL_ ## name, type)
104
105#ifdef __linux 90#ifdef __linux
106# include <time.h> /* for timespec */ 91# include <time.h> /* for timespec */
107# include <syscall.h> /* for SYS_* */ 92# include <syscall.h> /* for SYS_* */
108# ifdef SYS_clock_gettime 93# ifdef SYS_clock_gettime
109# define coro_clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts)) 94# define coro_clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
… …
172typedef struct coro_cctx 157typedef struct coro_cctx
173{ 158{
174 struct coro_cctx *next; 159 struct coro_cctx *next;
175 160
176 /* the stack */ 161 /* the stack */
177 void *sptr; 162 struct coro_stack stack;
178 size_t ssize;
179 163
180 /* cpu state */ 164 /* cpu state */
181 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 165 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
166#ifndef NDEBUG
182 JMPENV *idle_te; /* same as idle_sp, but for top_env, TODO: remove once stable */ 167 JMPENV *idle_te; /* same as idle_sp, but for top_env */
168#endif
183 JMPENV *top_env; 169 JMPENV *top_env;
184 coro_context cctx; 170 coro_context cctx;
185 171
186 U32 gen; 172 U32 gen;
187#if CORO_USE_VALGRIND 173#if CORO_USE_VALGRIND
… …
207}; 193};
208 194
209/* the structure where most of the perl state is stored, overlaid on the cxstack */ 195/* the structure where most of the perl state is stored, overlaid on the cxstack */
210typedef struct 196typedef struct
211{ 197{
212#define VARx(name,expr,type) type name; 198 #define VARx(name,expr,type) type name;
213# include "state.h" 199 #include "state.h"
214#undef VARx
215} perl_slots; 200} perl_slots;
216 201
217// how many context stack entries do we need for perl_slots 202/* how many context stack entries do we need for perl_slots */
218#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT)) 203#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
219 204
220/* this is a structure representing a perl-level coroutine */ 205/* this is a structure representing a perl-level coroutine */
221struct coro 206struct coro
222{ 207{
… …
291#define coro_nready coroapi.nready 276#define coro_nready coroapi.nready
292 277
293/** JIT *********************************************************************/ 278/** JIT *********************************************************************/
294 279
295#if CORO_JIT 280#if CORO_JIT
281 /* APPLE doesn't have mmap though */
282 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__)
296 #ifndef CORO_JIT_TYPE 283 #ifndef CORO_JIT_TYPE
297 #if __x86_64 && (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris) 284 #if ECB_AMD64 && CORO_JIT_UNIXY
298 #define CORO_JIT_TYPE "amd64-unix" 285 #define CORO_JIT_TYPE "amd64-unix"
299 typedef void (*load_save_perl_slots_type)(perl_slots *); 286 #elif __i386 && CORO_JIT_UNIXY
300 #elif __i386 && (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris)
301 #define CORO_JIT_TYPE "x86-unix" 287 #define CORO_JIT_TYPE "x86-unix"
302 typedef void (*load_save_perl_slots_type)(perl_slots *);
303 #else
304 #undef CORO_JIT
305 #endif 288 #endif
306 #endif 289 #endif
307#endif 290#endif
308 291
292#if !defined(CORO_JIT_TYPE) || _POSIX_MEMORY_PROTECTION <= 0
293 #undef CORO_JIT
294#endif
295
309#if CORO_JIT 296#if CORO_JIT
297 typedef void (*load_save_perl_slots_type)(perl_slots *);
310static load_save_perl_slots_type load_perl_slots, save_perl_slots; 298 static load_save_perl_slots_type load_perl_slots, save_perl_slots;
311#endif 299#endif
312 300
313/** Coro::Select ************************************************************/ 301/** Coro::Select ************************************************************/
314 302
315static OP *(*coro_old_pp_sselect) (pTHX); 303static OP *(*coro_old_pp_sselect) (pTHX);
… …
332 320
333/** time stuff **************************************************************/ 321/** time stuff **************************************************************/
334 322
335#ifdef HAS_GETTIMEOFDAY 323#ifdef HAS_GETTIMEOFDAY
336 324
337ECB_INLINE void 325ecb_inline void
338coro_u2time (pTHX_ UV ret[2]) 326coro_u2time (pTHX_ UV ret[2])
339{ 327{
340 struct timeval tv; 328 struct timeval tv;
341 gettimeofday (&tv, 0); 329 gettimeofday (&tv, 0);
342 330
343 ret [0] = tv.tv_sec; 331 ret [0] = tv.tv_sec;
344 ret [1] = tv.tv_usec; 332 ret [1] = tv.tv_usec;
345} 333}
346 334
347ECB_INLINE double 335ecb_inline double
348coro_nvtime () 336coro_nvtime (void)
349{ 337{
350 struct timeval tv; 338 struct timeval tv;
351 gettimeofday (&tv, 0); 339 gettimeofday (&tv, 0);
352 340
353 return tv.tv_sec + tv.tv_usec * 1e-6; 341 return tv.tv_sec + tv.tv_usec * 1e-6;
354} 342}
355 343
356ECB_INLINE void 344ecb_inline void
357time_init (pTHX) 345time_init (pTHX)
358{ 346{
359 nvtime = coro_nvtime; 347 nvtime = coro_nvtime;
360 u2time = coro_u2time; 348 u2time = coro_u2time;
361} 349}
362 350
363#else 351#else
364 352
365ECB_INLINE void 353ecb_inline void
366time_init (pTHX) 354time_init (pTHX)
367{ 355{
368 SV **svp; 356 SV **svp;
369 357
370 require_pv ("Time/HiRes.pm"); 358 require_pv ("Time/HiRes.pm");
371 359
372 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0); 360 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
373 361
374 if (!svp) croak ("Time::HiRes is required, but missing. Caught"); 362 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
375 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught"); 363 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught");
376 364
… …
412 get_hv (name, create); 400 get_hv (name, create);
413#endif 401#endif
414 return get_hv (name, create); 402 return get_hv (name, create);
415} 403}
416 404
417ECB_INLINE void 405ecb_inline void
418coro_times_update () 406coro_times_update (void)
419{ 407{
420#ifdef coro_clock_gettime 408#ifdef coro_clock_gettime
421 struct timespec ts; 409 struct timespec ts;
422 410
423 ts.tv_sec = ts.tv_nsec = 0; 411 ts.tv_sec = ts.tv_nsec = 0;
… …
435 time_real [0] = tv [0]; 423 time_real [0] = tv [0];
436 time_real [1] = tv [1] * 1000; 424 time_real [1] = tv [1] * 1000;
437#endif 425#endif
438} 426}
439 427
440ECB_INLINE void 428ecb_inline void
441coro_times_add (struct coro *c) 429coro_times_add (struct coro *c)
442{ 430{
443 c->t_real [1] += time_real [1]; 431 c->t_real [1] += time_real [1];
444 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; } 432 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
445 c->t_real [0] += time_real [0]; 433 c->t_real [0] += time_real [0];
… …
447 c->t_cpu [1] += time_cpu [1]; 435 c->t_cpu [1] += time_cpu [1];
448 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; } 436 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
449 c->t_cpu [0] += time_cpu [0]; 437 c->t_cpu [0] += time_cpu [0];
450} 438}
451 439
452ECB_INLINE void 440ecb_inline void
453coro_times_sub (struct coro *c) 441coro_times_sub (struct coro *c)
454{ 442{
455 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; } 443 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; }
456 c->t_real [1] -= time_real [1]; 444 c->t_real [1] -= time_real [1];
457 c->t_real [0] -= time_real [0]; 445 c->t_real [0] -= time_real [0];
… …
478 : 0) 466 : 0)
479 467
480#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv) 468#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
481#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state) 469#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
482 470
483ECB_INLINE MAGIC * 471ecb_inline MAGIC *
484SvSTATEhv_p (pTHX_ SV *coro) 472SvSTATEhv_p (pTHX_ SV *coro)
485{ 473{
486 MAGIC *mg; 474 MAGIC *mg;
487 475
488 if (ecb_expect_true ( 476 if (ecb_expect_true (
… …
493 return mg; 481 return mg;
494 482
495 return 0; 483 return 0;
496} 484}
497 485
498ECB_INLINE struct coro * 486ecb_inline struct coro *
499SvSTATE_ (pTHX_ SV *coro) 487SvSTATE_ (pTHX_ SV *coro)
500{ 488{
501 MAGIC *mg; 489 MAGIC *mg;
502 490
503 if (SvROK (coro)) 491 if (SvROK (coro))
… …
517#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 505#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
518 506
519/*****************************************************************************/ 507/*****************************************************************************/
520/* padlist management and caching */ 508/* padlist management and caching */
521 509
522ECB_INLINE AV * 510ecb_inline PADLIST *
523coro_derive_padlist (pTHX_ CV *cv) 511coro_derive_padlist (pTHX_ CV *cv)
524{ 512{
525 AV *padlist = CvPADLIST (cv); 513 PADLIST *padlist = CvPADLIST (cv);
526 AV *newpadlist, *newpad; 514 PADLIST *newpadlist;
515 PAD *newpad;
516 PADOFFSET off = PadlistMAX (padlist) + 1;
527 517
528 newpadlist = newAV (); 518#if NEWPADAPI
519
520 while (!PadlistARRAY (padlist)[off - 1])
521 --off;
522
523 Perl_pad_push (aTHX_ padlist, off);
524 newpad = PadlistARRAY (padlist)[off];
525 PadlistARRAY (padlist)[off] = 0;
526
527#else
528
529#if PERL_VERSION_ATLEAST (5,10,0)
530 Perl_pad_push (aTHX_ padlist, off);
531#else
532 Perl_pad_push (aTHX_ padlist, off, 1);
533#endif
534
535 newpad = PadlistARRAY (padlist)[off];
536 PadlistMAX (padlist) = off - 1;
537
538#endif
539
540 newPADLIST (newpadlist);
541#if !PERL_VERSION_ATLEAST(5,15,3)
542 /* Padlists are AvREAL as of 5.15.3. See perl bug #98092 and perl commit 7d953ba. */
529 AvREAL_off (newpadlist); 543 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 544#endif
535 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
536 --AvFILLp (padlist);
537 545
538 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0])); 546 /* Already extended to 2 elements by newPADLIST. */
539 av_store (newpadlist, 1, (SV *)newpad); 547 PadlistMAX (newpadlist) = 1;
548 PadlistNAMES (newpadlist) = (PADNAMELIST *)SvREFCNT_inc_NN (PadlistNAMES (padlist));
549 PadlistARRAY (newpadlist)[1] = newpad;
540 550
541 return newpadlist; 551 return newpadlist;
542} 552}
543 553
544ECB_INLINE void 554ecb_inline void
545free_padlist (pTHX_ AV *padlist) 555free_padlist (pTHX_ PADLIST *padlist)
546{ 556{
547 /* may be during global destruction */ 557 /* may be during global destruction */
548 if (!IN_DESTRUCT) 558 if (!IN_DESTRUCT)
549 { 559 {
550 I32 i = AvFILLp (padlist); 560 I32 i = PadlistMAX (padlist);
551 561
552 while (i > 0) /* special-case index 0 */ 562 while (i > 0) /* special-case index 0 */
553 { 563 {
554 /* we try to be extra-careful here */ 564 /* we try to be extra-careful here */
555 AV *av = (AV *)AvARRAY (padlist)[i--]; 565 PAD *pad = PadlistARRAY (padlist)[i--];
556 I32 j = AvFILLp (av); 566 I32 j = PadMAX (pad);
557 567
558 while (j >= 0) 568 while (j >= 0)
559 SvREFCNT_dec (AvARRAY (av)[j--]); 569 SvREFCNT_dec (PadARRAY (pad)[j--]);
560 570
561 AvFILLp (av) = -1; 571 PadMAX (pad) = -1;
562 SvREFCNT_dec (av); 572 SvREFCNT_dec (pad);
563 } 573 }
564 574
565 SvREFCNT_dec (AvARRAY (padlist)[0]); 575 SvREFCNT_dec (PadlistNAMES (padlist));
566 576
577#if NEWPADAPI
578 Safefree (PadlistARRAY (padlist));
579 Safefree (padlist);
580#else
567 AvFILLp (padlist) = -1; 581 AvFILLp (padlist) = -1;
582 AvREAL_off (padlist);
568 SvREFCNT_dec ((SV*)padlist); 583 SvREFCNT_dec ((SV*)padlist);
584#endif
569 } 585 }
570} 586}
571 587
572static int 588static int
573coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 589coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
574{ 590{
575 AV *padlist; 591 PADLIST *padlist;
576 AV *av = (AV *)mg->mg_obj; 592 PADLIST **padlists = (PADLIST **)(mg->mg_ptr + sizeof(size_t));
593 size_t len = *(size_t *)mg->mg_ptr;
577 594
578 /* perl manages to free our internal AV and _then_ call us */ 595 /* perl manages to free our internal AV and _then_ call us */
579 if (IN_DESTRUCT) 596 if (IN_DESTRUCT)
580 return 0; 597 return 0;
581 598
582 /* casting is fun. */ 599 while (len--)
583 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
584 free_padlist (aTHX_ padlist); 600 free_padlist (aTHX_ padlists[len]);
585
586 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
587 601
588 return 0; 602 return 0;
589} 603}
590 604
591static MGVTBL coro_cv_vtbl = { 605static MGVTBL coro_cv_vtbl = {
592 0, 0, 0, 0, 606 0, 0, 0, 0,
593 coro_cv_free 607 coro_cv_free
594}; 608};
595 609
596/* the next two functions merely cache the padlists */ 610/* the next two functions merely cache the padlists */
597ECB_INLINE void 611ecb_inline void
598get_padlist (pTHX_ CV *cv) 612get_padlist (pTHX_ CV *cv)
599{ 613{
600 MAGIC *mg = CORO_MAGIC_cv (cv); 614 MAGIC *mg = CORO_MAGIC_cv (cv);
601 AV *av; 615 size_t *lenp;
602 616
603 if (ecb_expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 617 if (ecb_expect_true (mg && *(lenp = (size_t *)mg->mg_ptr)))
604 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 618 CvPADLIST (cv) = ((PADLIST **)(mg->mg_ptr + sizeof(size_t)))[--*lenp];
605 else 619 else
606 { 620 {
607#if CORO_PREFER_PERL_FUNCTIONS 621#if CORO_PREFER_PERL_FUNCTIONS
608 /* this is probably cleaner? but also slower! */ 622 /* this is probably cleaner? but also slower! */
609 /* in practise, it seems to be less stable */ 623 /* in practise, it seems to be less stable */
… …
615 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 629 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
616#endif 630#endif
617 } 631 }
618} 632}
619 633
620ECB_INLINE void 634ecb_inline void
621put_padlist (pTHX_ CV *cv) 635put_padlist (pTHX_ CV *cv)
622{ 636{
623 MAGIC *mg = CORO_MAGIC_cv (cv); 637 MAGIC *mg = CORO_MAGIC_cv (cv);
624 AV *av;
625 638
626 if (ecb_expect_false (!mg)) 639 if (ecb_expect_false (!mg))
640 {
627 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 641 mg = sv_magicext ((SV *)cv, 0, CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
642 Newz (0, mg->mg_ptr ,sizeof (size_t) + sizeof (PADLIST *), char);
643 mg->mg_len = 1; /* so mg_free frees mg_ptr */
644 }
645 else
646 Renew (mg->mg_ptr,
647 sizeof(size_t) + (*(size_t *)mg->mg_ptr + 1) * sizeof(PADLIST *),
648 char);
628 649
629 av = (AV *)mg->mg_obj; 650 ((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} 651}
636 652
637/** load & save, init *******************************************************/ 653/** load & save, init *******************************************************/
638 654
655ecb_inline void
656swap_sv (SV *a, SV *b)
657{
658 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
659 SV tmp;
660
661 /* swap sv_any */
662 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
663
664 /* swap sv_flags */
665 SvFLAGS (&tmp) = SvFLAGS (a);
666 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
667 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
668
669#if PERL_VERSION_ATLEAST (5,10,0)
670 /* perl 5.10 and later complicates this _quite_ a bit, but it also
671 * is much faster, so no quarrels here. alternatively, we could
672 * sv_upgrade to avoid this.
673 */
674 {
675 /* swap sv_u */
676 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
677
678 /* if SvANY points to the head, we need to adjust the pointers,
679 * as the pointer for a still points to b, and maybe vice versa.
680 */
681 #define svany_in_head(type) \
682 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
683
684 if (svany_in_head (SvTYPE (a)))
685 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
686
687 if (svany_in_head (SvTYPE (b)))
688 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
689 }
690#endif
691}
692
639/* swap sv heads, at least logically */ 693/* swap sv heads, at least logically */
640static void 694static void
641swap_svs (pTHX_ Coro__State c) 695swap_svs (pTHX_ Coro__State c)
642{ 696{
643 int i; 697 int i;
644 698
645 for (i = 0; i <= AvFILLp (c->swap_sv); ) 699 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
646 { 700 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} 701}
685 702
686#define SWAP_SVS(coro) \ 703#define SWAP_SVS(coro) \
687 if (ecb_expect_false ((coro)->swap_sv)) \ 704 if (ecb_expect_false ((coro)->swap_sv)) \
688 swap_svs (aTHX_ (coro)) 705 swap_svs (aTHX_ (coro))
… …
700 717
701#if CORO_JIT 718#if CORO_JIT
702 load_perl_slots (slot); 719 load_perl_slots (slot);
703#else 720#else
704 #define VARx(name,expr,type) expr = slot->name; 721 #define VARx(name,expr,type) expr = slot->name;
705 # include "state.h" 722 #include "state.h"
706 #undef VARx
707#endif 723#endif
708 724
709 { 725 {
710 dSP; 726 dSP;
711 727
… …
714 /* now do the ugly restore mess */ 730 /* now do the ugly restore mess */
715 while (ecb_expect_true (cv = (CV *)POPs)) 731 while (ecb_expect_true (cv = (CV *)POPs))
716 { 732 {
717 put_padlist (aTHX_ cv); /* mark this padlist as available */ 733 put_padlist (aTHX_ cv); /* mark this padlist as available */
718 CvDEPTH (cv) = PTR2IV (POPs); 734 CvDEPTH (cv) = PTR2IV (POPs);
719 CvPADLIST (cv) = (AV *)POPs; 735 CvPADLIST (cv) = (PADLIST *)POPs;
720 } 736 }
721 737
722 PUTBACK; 738 PUTBACK;
723 } 739 }
724 740
… …
814 830
815 PUTBACK; 831 PUTBACK;
816 } 832 }
817 833
818 /* allocate some space on the context stack for our purposes */ 834 /* allocate some space on the context stack for our purposes */
819 if (ecb_expect_false (cxstack_ix + SLOT_COUNT >= cxstack_max)) 835 if (ecb_expect_false (cxstack_ix + (int)SLOT_COUNT >= cxstack_max))
820 { 836 {
821 unsigned int i; 837 unsigned int i;
822 838
823 for (i = 0; i < SLOT_COUNT; ++i) 839 for (i = 0; i < SLOT_COUNT; ++i)
824 CXINC; 840 CXINC;
… …
833 849
834#if CORO_JIT 850#if CORO_JIT
835 save_perl_slots (slot); 851 save_perl_slots (slot);
836#else 852#else
837 #define VARx(name,expr,type) slot->name = expr; 853 #define VARx(name,expr,type) slot->name = expr;
838 # include "state.h" 854 #include "state.h"
839 #undef VARx
840#endif 855#endif
841 } 856 }
842} 857}
843 858
844/* 859/*
… …
876#endif 891#endif
877 892
878 New(54,PL_scopestack,8,I32); 893 New(54,PL_scopestack,8,I32);
879 PL_scopestack_ix = 0; 894 PL_scopestack_ix = 0;
880 PL_scopestack_max = 8; 895 PL_scopestack_max = 8;
896#if HAS_SCOPESTACK_NAME
897 New(54,PL_scopestack_name,8,const char*);
898#endif
881 899
882 New(54,PL_savestack,24,ANY); 900 New(54,PL_savestack,24,ANY);
883 PL_savestack_ix = 0; 901 PL_savestack_ix = 0;
884 PL_savestack_max = 24; 902 PL_savestack_max = 24;
885 903
… …
913 } 931 }
914 932
915 Safefree (PL_tmps_stack); 933 Safefree (PL_tmps_stack);
916 Safefree (PL_markstack); 934 Safefree (PL_markstack);
917 Safefree (PL_scopestack); 935 Safefree (PL_scopestack);
936#if HAS_SCOPESTACK_NAME
937 Safefree (PL_scopestack_name);
938#endif
918 Safefree (PL_savestack); 939 Safefree (PL_savestack);
919#if !PERL_VERSION_ATLEAST (5,10,0) 940#if !PERL_VERSION_ATLEAST (5,10,0)
920 Safefree (PL_retstack); 941 Safefree (PL_retstack);
921#endif 942#endif
922} 943}
… …
982 { 1003 {
983 SV **svp = 0; 1004 SV **svp = 0;
984 1005
985 if (strEQ (s, "__DIE__" )) svp = &PL_diehook; 1006 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
986 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 1007 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
987 1008
988 if (svp) 1009 if (svp)
989 { 1010 {
990 sv_setsv (sv, *svp ? *svp : &PL_sv_undef); 1011 SV *ssv;
1012
1013 if (!*svp)
1014 ssv = &PL_sv_undef;
1015 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */
1016 ssv = sv_2mortal (newRV_inc (*svp));
1017 else
1018 ssv = *svp;
1019
1020 sv_setsv (sv, ssv);
991 return 0; 1021 return 0;
992 } 1022 }
993 } 1023 }
994 1024
995 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 1025 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
… …
1089 PL_hints = 0; 1119 PL_hints = 0;
1090 1120
1091 /* recreate the die/warn hooks */ 1121 /* recreate the die/warn hooks */
1092 PL_diehook = SvREFCNT_inc (rv_diehook); 1122 PL_diehook = SvREFCNT_inc (rv_diehook);
1093 PL_warnhook = SvREFCNT_inc (rv_warnhook); 1123 PL_warnhook = SvREFCNT_inc (rv_warnhook);
1094 1124
1095 GvSV (PL_defgv) = newSV (0); 1125 GvSV (PL_defgv) = newSV (0);
1096 GvAV (PL_defgv) = coro->args; coro->args = 0; 1126 GvAV (PL_defgv) = coro->args; coro->args = 0;
1097 GvSV (PL_errgv) = newSV (0); 1127 GvSV (PL_errgv) = newSV (0);
1098 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1128 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
1099 GvHV (PL_hintgv) = 0; 1129 GvHV (PL_hintgv) = 0;
… …
1187 /* restore swapped sv's */ 1217 /* restore swapped sv's */
1188 SWAP_SVS (coro); 1218 SWAP_SVS (coro);
1189 1219
1190 coro_destruct_stacks (aTHX); 1220 coro_destruct_stacks (aTHX);
1191 1221
1192 // now save some sv's to be free'd later 1222 /* now save some sv's to be free'd later */
1193 svf [0] = GvSV (PL_defgv); 1223 svf [0] = GvSV (PL_defgv);
1194 svf [1] = (SV *)GvAV (PL_defgv); 1224 svf [1] = (SV *)GvAV (PL_defgv);
1195 svf [2] = GvSV (PL_errgv); 1225 svf [2] = GvSV (PL_errgv);
1196 svf [3] = (SV *)PL_defoutgv; 1226 svf [3] = (SV *)PL_defoutgv;
1197 svf [4] = PL_rs; 1227 svf [4] = PL_rs;
… …
1217 SvREFCNT_dec (coro->invoke_cb); 1247 SvREFCNT_dec (coro->invoke_cb);
1218 SvREFCNT_dec (coro->invoke_av); 1248 SvREFCNT_dec (coro->invoke_av);
1219 } 1249 }
1220} 1250}
1221 1251
1222ECB_INLINE void 1252ecb_inline void
1223free_coro_mortal (pTHX) 1253free_coro_mortal (pTHX)
1224{ 1254{
1225 if (ecb_expect_true (coro_mortal)) 1255 if (ecb_expect_true (coro_mortal))
1226 { 1256 {
1227 SvREFCNT_dec ((SV *)coro_mortal); 1257 SvREFCNT_dec ((SV *)coro_mortal);
… …
1386 slf_frame.prepare = slf_prepare_set_stacklevel; 1416 slf_frame.prepare = slf_prepare_set_stacklevel;
1387 slf_frame.check = slf_check_set_stacklevel; 1417 slf_frame.check = slf_check_set_stacklevel;
1388} 1418}
1389 1419
1390/* the tail of transfer: execute stuff we can only do after a transfer */ 1420/* the tail of transfer: execute stuff we can only do after a transfer */
1391ECB_INLINE void 1421ecb_inline void
1392transfer_tail (pTHX) 1422transfer_tail (pTHX)
1393{ 1423{
1394 free_coro_mortal (aTHX); 1424 free_coro_mortal (aTHX);
1425}
1426
1427/* try to exit the same way perl's main function would do */
1428/* we do not bother resetting the environment or other things *7
1429/* that are not, uhm, essential */
1430/* this obviously also doesn't work when perl is embedded */
1431static void ecb_noinline ecb_cold
1432perlish_exit (pTHX)
1433{
1434 int exitstatus = perl_destruct (PL_curinterp);
1435 perl_free (PL_curinterp);
1436 exit (exitstatus);
1395} 1437}
1396 1438
1397/* 1439/*
1398 * this is a _very_ stripped down perl interpreter ;) 1440 * this is a _very_ stripped down perl interpreter ;)
1399 */ 1441 */
… …
1428 */ 1470 */
1429 1471
1430 /* 1472 /*
1431 * If perl-run returns we assume exit() was being called or the coro 1473 * 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) 1474 * 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 1475 * 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" 1476 * 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 */ 1477 */
1439 PL_top_env = main_top_env; 1478 perlish_exit (aTHX);
1440 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1441 } 1479 }
1442} 1480}
1443 1481
1444static coro_cctx * 1482static coro_cctx *
1445cctx_new () 1483cctx_new (void)
1446{ 1484{
1447 coro_cctx *cctx; 1485 coro_cctx *cctx;
1448 1486
1449 ++cctx_count; 1487 ++cctx_count;
1450 New (0, cctx, 1, coro_cctx); 1488 New (0, cctx, 1, coro_cctx);
… …
1456 return cctx; 1494 return cctx;
1457} 1495}
1458 1496
1459/* create a new cctx only suitable as source */ 1497/* create a new cctx only suitable as source */
1460static coro_cctx * 1498static coro_cctx *
1461cctx_new_empty () 1499cctx_new_empty (void)
1462{ 1500{
1463 coro_cctx *cctx = cctx_new (); 1501 coro_cctx *cctx = cctx_new ();
1464 1502
1465 cctx->sptr = 0; 1503 cctx->stack.sptr = 0;
1466 coro_create (&cctx->cctx, 0, 0, 0, 0); 1504 coro_create (&cctx->cctx, 0, 0, 0, 0);
1467 1505
1468 return cctx; 1506 return cctx;
1469} 1507}
1470 1508
1471/* create a new cctx suitable as destination/running a perl interpreter */ 1509/* create a new cctx suitable as destination/running a perl interpreter */
1472static coro_cctx * 1510static coro_cctx *
1473cctx_new_run () 1511cctx_new_run (void)
1474{ 1512{
1475 coro_cctx *cctx = cctx_new (); 1513 coro_cctx *cctx = cctx_new ();
1476 void *stack_start;
1477 size_t stack_size;
1478 1514
1479#if HAVE_MMAP 1515 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 } 1516 {
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."); 1517 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1502 _exit (EXIT_FAILURE); 1518 _exit (EXIT_FAILURE);
1503 }
1504
1505 stack_start = cctx->sptr;
1506 stack_size = cctx->ssize;
1507 } 1519 }
1508 1520
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); 1521 coro_create (&cctx->cctx, cctx_run, (void *)cctx, cctx->stack.sptr, cctx->stack.ssze);
1514 1522
1515 return cctx; 1523 return cctx;
1516} 1524}
1517 1525
1518static void 1526static void
… …
1524 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current)); 1532 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1525 1533
1526 --cctx_count; 1534 --cctx_count;
1527 coro_destroy (&cctx->cctx); 1535 coro_destroy (&cctx->cctx);
1528 1536
1529 /* coro_transfer creates new, empty cctx's */ 1537 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 1538
1544 Safefree (cctx); 1539 Safefree (cctx);
1545} 1540}
1546 1541
1547/* wether this cctx should be destructed */ 1542/* wether this cctx should be destructed */
… …
1566} 1561}
1567 1562
1568static void 1563static void
1569cctx_put (coro_cctx *cctx) 1564cctx_put (coro_cctx *cctx)
1570{ 1565{
1571 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1566 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->stack.sptr));
1572 1567
1573 /* free another cctx if overlimit */ 1568 /* free another cctx if overlimit */
1574 if (ecb_expect_false (cctx_idle >= cctx_max_idle)) 1569 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1575 { 1570 {
1576 coro_cctx *first = cctx_first; 1571 coro_cctx *first = cctx_first;
… …
1702 return; 1697 return;
1703 1698
1704 slf_destroy (aTHX_ coro); 1699 slf_destroy (aTHX_ coro);
1705 1700
1706 coro->flags |= CF_ZOMBIE; 1701 coro->flags |= CF_ZOMBIE;
1707 1702
1708 if (coro->flags & CF_READY) 1703 if (coro->flags & CF_READY)
1709 { 1704 {
1710 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1705 /* reduce nready, as destroying a ready coro effectively unreadies it */
1711 /* alternative: look through all ready queues and remove the coro */ 1706 /* alternative: look through all ready queues and remove the coro */
1712 --coro_nready; 1707 --coro_nready;
… …
1789 TRANSFER (ta, 1); 1784 TRANSFER (ta, 1);
1790} 1785}
1791 1786
1792/** Coro ********************************************************************/ 1787/** Coro ********************************************************************/
1793 1788
1794ECB_INLINE void 1789ecb_inline void
1795coro_enq (pTHX_ struct coro *coro) 1790coro_enq (pTHX_ struct coro *coro)
1796{ 1791{
1797 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN]; 1792 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1798 1793
1799 SvREFCNT_inc_NN (coro->hv); 1794 SvREFCNT_inc_NN (coro->hv);
… …
1801 coro->next_ready = 0; 1796 coro->next_ready = 0;
1802 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro; 1797 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1803 ready [1] = coro; 1798 ready [1] = coro;
1804} 1799}
1805 1800
1806ECB_INLINE struct coro * 1801ecb_inline struct coro *
1807coro_deq (pTHX) 1802coro_deq (pTHX)
1808{ 1803{
1809 int prio; 1804 int prio;
1810 1805
1811 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; ) 1806 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
… …
1864{ 1859{
1865 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1860 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1866} 1861}
1867 1862
1868/* expects to own a reference to next->hv */ 1863/* expects to own a reference to next->hv */
1869ECB_INLINE void 1864ecb_inline void
1870prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1865prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1871{ 1866{
1872 SV *prev_sv = SvRV (coro_current); 1867 SV *prev_sv = SvRV (coro_current);
1873 1868
1874 ta->prev = SvSTATE_hv (prev_sv); 1869 ta->prev = SvSTATE_hv (prev_sv);
… …
1933 } 1928 }
1934 } 1929 }
1935 } 1930 }
1936} 1931}
1937 1932
1938ECB_INLINE void 1933ecb_inline void
1939prepare_cede (pTHX_ struct coro_transfer_args *ta) 1934prepare_cede (pTHX_ struct coro_transfer_args *ta)
1940{ 1935{
1941 api_ready (aTHX_ coro_current); 1936 api_ready (aTHX_ coro_current);
1942 prepare_schedule (aTHX_ ta); 1937 prepare_schedule (aTHX_ ta);
1943} 1938}
1944 1939
1945ECB_INLINE void 1940ecb_inline void
1946prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 1941prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1947{ 1942{
1948 SV *prev = SvRV (coro_current); 1943 SV *prev = SvRV (coro_current);
1949 1944
1950 if (coro_nready) 1945 if (coro_nready)
… …
2115{ 2110{
2116 AV *od = coro->on_destroy; 2111 AV *od = coro->on_destroy;
2117 2112
2118 if (!od) 2113 if (!od)
2119 return; 2114 return;
2115
2116 coro->on_destroy = 0;
2117 sv_2mortal ((SV *)od);
2120 2118
2121 while (AvFILLp (od) >= 0) 2119 while (AvFILLp (od) >= 0)
2122 { 2120 {
2123 SV *cb = sv_2mortal (av_pop (od)); 2121 SV *cb = sv_2mortal (av_pop (od));
2124 2122
… …
2145 2143
2146static void 2144static void
2147coro_set_status (pTHX_ struct coro *coro, SV **arg, int items) 2145coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
2148{ 2146{
2149 AV *av; 2147 AV *av;
2150 2148
2151 if (coro->status) 2149 if (coro->status)
2152 { 2150 {
2153 av = coro->status; 2151 av = coro->status;
2154 av_clear (av); 2152 av_clear (av);
2155 } 2153 }
… …
2202 2200
2203 coro = SvSTATE (arg [0]); 2201 coro = SvSTATE (arg [0]);
2204 coro_hv = coro->hv; 2202 coro_hv = coro->hv;
2205 2203
2206 coro_set_status (aTHX_ coro, arg + 1, items - 1); 2204 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2207 2205
2208 if (ecb_expect_false (coro->flags & CF_NOCANCEL)) 2206 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2209 { 2207 {
2210 /* coro currently busy cancelling something, so just notify it */ 2208 /* coro currently busy cancelling something, so just notify it */
2211 coro->slf_frame.data = (void *)coro; 2209 coro->slf_frame.data = (void *)coro;
2212 2210
… …
2391 2389
2392static int 2390static int
2393slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2391slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
2394{ 2392{
2395 SV *data = (SV *)frame->data; 2393 SV *data = (SV *)frame->data;
2396 2394
2397 if (CORO_THROW) 2395 if (CORO_THROW)
2398 return 0; 2396 return 0;
2399 2397
2400 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2398 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2401 return 1; 2399 return 1;
… …
2437 cb = sv_2mortal (coro->rouse_cb); 2435 cb = sv_2mortal (coro->rouse_cb);
2438 coro->rouse_cb = 0; 2436 coro->rouse_cb = 0;
2439 } 2437 }
2440 2438
2441 if (!SvROK (cb) 2439 if (!SvROK (cb)
2442 || SvTYPE (SvRV (cb)) != SVt_PVCV 2440 || SvTYPE (SvRV (cb)) != SVt_PVCV
2443 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2441 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2444 croak ("Coro::rouse_wait called with illegal callback argument,"); 2442 croak ("Coro::rouse_wait called with illegal callback argument,");
2445 2443
2446 { 2444 {
2447 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */ 2445 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
… …
2950 { 2948 {
2951 int i; 2949 int i;
2952 /* if we were woken up but can't down, we look through the whole */ 2950 /* 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 */ 2951 /* waiters list and only add us if we aren't in there already */
2954 /* this avoids some degenerate memory usage cases */ 2952 /* this avoids some degenerate memory usage cases */
2955 for (i = AvFILLp (av); i > 0; --i) // i > 0 is not an off-by-one bug 2953 for (i = AvFILLp (av); i > 0; --i) /* i > 0 is not an off-by-one bug */
2956 if (AvARRAY (av)[i] == coro_hv) 2954 if (AvARRAY (av)[i] == coro_hv)
2957 return 1; 2955 return 1;
2958 2956
2959 av_push (av, SvREFCNT_inc (coro_hv)); 2957 av_push (av, SvREFCNT_inc (coro_hv));
2960 return 1; 2958 return 1;
… …
3168 /* it quickly returns */ 3166 /* it quickly returns */
3169 if (CORO_THROW) 3167 if (CORO_THROW)
3170 return 0; 3168 return 0;
3171 3169
3172 /* one element that is an RV? repeat! */ 3170 /* one element that is an RV? repeat! */
3173 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0])) 3171 if (AvFILLp (state) == 0 && SvTYPE (AvARRAY (state)[0]) != SVt_PV)
3174 return 1; 3172 return 1;
3175 3173
3176 /* restore status */ 3174 /* restore status */
3177 { 3175 {
3178 SV *data_sv = av_pop (state); 3176 SV *data_sv = av_pop (state);
… …
3340#endif 3338#endif
3341 3339
3342#if CORO_JIT 3340#if CORO_JIT
3343 3341
3344static void ecb_noinline ecb_cold 3342static void ecb_noinline ecb_cold
3345pushav_3uv (pTHX_ UV a, UV b, UV c) 3343pushav_4uv (pTHX_ UV a, UV b, UV c, UV d)
3346{ 3344{
3347 dSP; 3345 dSP;
3348 AV *av = newAV (); 3346 AV *av = newAV ();
3349 3347
3348 av_store (av, 3, newSVuv (d));
3350 av_store (av, 2, newSVuv (c)); 3349 av_store (av, 2, newSVuv (c));
3351 av_store (av, 1, newSVuv (b)); 3350 av_store (av, 1, newSVuv (b));
3352 av_store (av, 0, newSVuv (a)); 3351 av_store (av, 0, newSVuv (a));
3353 3352
3354 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 3353 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
… …
3361{ 3360{
3362 dSP; 3361 dSP;
3363 SV *load, *save; 3362 SV *load, *save;
3364 char *map_base; 3363 char *map_base;
3365 char *load_ptr, *save_ptr; 3364 char *load_ptr, *save_ptr;
3366 STRLEN load_len, save_len; 3365 STRLEN load_len, save_len, map_len;
3367 int count; 3366 int count;
3368 3367
3368 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3369
3369 PUSHMARK (SP); 3370 PUSHMARK (SP);
3370 PUTBACK;
3371#define VARx(name,expr,type) pushav_3uv (aTHX_ (UV)&(expr), offsetof (perl_slots, name), sizeof (type)); 3371 #define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type));
3372# include "state.h" 3372 #include "state.h"
3373#undef VARx
3374 count = call_pv ("Coro::State::_jit", G_ARRAY); 3373 count = call_pv ("Coro::State::_jit", G_ARRAY);
3375 SPAGAIN; 3374 SPAGAIN;
3376 3375
3377 save = POPs; save_ptr = SvPVbyte (save, save_len); 3376 save = POPs; save_ptr = SvPVbyte (save, save_len);
3378 load = POPs; load_ptr = SvPVbyte (load, load_len); 3377 load = POPs; load_ptr = SvPVbyte (load, load_len);
3379 3378
3379 map_len = load_len + save_len + 16;
3380
3380 map_base = mmap (0, load_len + save_len + 16, PROT_EXEC | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); 3381 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3381 3382
3382 assert (("Coro: unable mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED)); 3383 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3383 3384
3384 load_perl_slots = (load_save_perl_slots_type)map_base; 3385 load_perl_slots = (load_save_perl_slots_type)map_base;
3385 memcpy (map_base, load_ptr, load_len); 3386 memcpy (map_base, load_ptr, load_len);
3386 3387
3387 map_base += (load_len + 15) & ~15; 3388 map_base += (load_len + 15) & ~15;
3388 3389
3389 save_perl_slots = (load_save_perl_slots_type)map_base; 3390 save_perl_slots = (load_save_perl_slots_type)map_base;
3390 memcpy (map_base, save_ptr, save_len); 3391 memcpy (map_base, save_ptr, save_len);
3392
3393 /* we are good citizens and try to make the page read-only, so the evil evil */
3394 /* hackers might have it a bit more difficult */
3395 mprotect (map_base, map_len, PROT_READ | PROT_EXEC);
3396
3397 PUTBACK;
3398 eval_pv ("undef &Coro::State::_jit", 1);
3391} 3399}
3392 3400
3393#endif 3401#endif
3394 3402
3395MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3403MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
… …
3401#ifdef USE_ITHREADS 3409#ifdef USE_ITHREADS
3402# if CORO_PTHREAD 3410# if CORO_PTHREAD
3403 coro_thx = PERL_GET_CONTEXT; 3411 coro_thx = PERL_GET_CONTEXT;
3404# endif 3412# endif
3405#endif 3413#endif
3406 BOOT_PAGESIZE;
3407
3408 /* perl defines these to check for existance first, but why it doesn't */ 3414 /* 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 */ 3415 /* just create them one at init time is not clear to me, except for */
3410 /* programs trying to delete them, but... */ 3416 /* programs trying to delete them, but... */
3411 /* anyway, we declare this as invalid and make sure they are initialised here */ 3417 /* anyway, we declare this as invalid and make sure they are initialised here */
3412 DEFSV; 3418 DEFSV;
… …
3463 time_init (aTHX); 3469 time_init (aTHX);
3464 3470
3465 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL)); 3471 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3466#if CORO_JIT 3472#if CORO_JIT
3467 PUTBACK; 3473 PUTBACK;
3468 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3469 jit_init (aTHX); 3474 jit_init (aTHX);
3470 perl_eval_pv ("undef &Coro::State::_jit", 1);
3471 SPAGAIN; 3475 SPAGAIN;
3472#endif 3476#endif
3473} 3477}
3474 3478
3475SV * 3479SV *
… …
3484void 3488void
3485transfer (...) 3489transfer (...)
3486 PROTOTYPE: $$ 3490 PROTOTYPE: $$
3487 CODE: 3491 CODE:
3488 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3492 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3489
3490void
3491_exit (int code)
3492 PROTOTYPE: $
3493 CODE:
3494 _exit (code);
3495 3493
3496SV * 3494SV *
3497clone (Coro::State coro) 3495clone (Coro::State coro)
3498 CODE: 3496 CODE:
3499{ 3497{
… …
3554void 3552void
3555list () 3553list ()
3556 PROTOTYPE: 3554 PROTOTYPE:
3557 PPCODE: 3555 PPCODE:
3558{ 3556{
3559 struct coro *coro; 3557 struct coro *coro;
3560 for (coro = coro_first; coro; coro = coro->next) 3558 for (coro = coro_first; coro; coro = coro->next)
3561 if (coro->hv) 3559 if (coro->hv)
3562 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 3560 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
3563} 3561}
3564 3562
… …
3628 RETVAL = boolSV (coro->flags & ix); 3626 RETVAL = boolSV (coro->flags & ix);
3629 OUTPUT: 3627 OUTPUT:
3630 RETVAL 3628 RETVAL
3631 3629
3632void 3630void
3633throw (Coro::State self, SV *exception = &PL_sv_undef) 3631throw (SV *self, SV *exception = &PL_sv_undef)
3634 PROTOTYPE: $;$ 3632 PROTOTYPE: $;$
3635 CODE: 3633 CODE:
3636{ 3634{
3635 struct coro *coro = SvSTATE (self);
3637 struct coro *current = SvSTATE_current; 3636 struct coro *current = SvSTATE_current;
3638 SV **exceptionp = self == current ? &CORO_THROW : &self->except; 3637 SV **exceptionp = coro == current ? &CORO_THROW : &coro->except;
3639 SvREFCNT_dec (*exceptionp); 3638 SvREFCNT_dec (*exceptionp);
3640 SvGETMAGIC (exception); 3639 SvGETMAGIC (exception);
3641 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0; 3640 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3641
3642 api_ready (aTHX_ self);
3642} 3643}
3643 3644
3644void 3645void
3645api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3646api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3646 PROTOTYPE: $;$ 3647 PROTOTYPE: $;$
… …
3723 3724
3724void 3725void
3725times (Coro::State self) 3726times (Coro::State self)
3726 PPCODE: 3727 PPCODE:
3727{ 3728{
3728 struct coro *current = SvSTATE (coro_current); 3729 struct coro *current = SvSTATE (coro_current);
3729 3730
3730 if (ecb_expect_false (current == self)) 3731 if (ecb_expect_false (current == self))
3731 { 3732 {
3732 coro_times_update (); 3733 coro_times_update ();
3733 coro_times_add (SvSTATE (coro_current)); 3734 coro_times_add (SvSTATE (coro_current));
… …
3776 3777
3777 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3778 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); 3779 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); 3780 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 */ 3781 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3781 3782
3782 coro_stash = gv_stashpv ("Coro", TRUE); 3783 coro_stash = gv_stashpv ("Coro", TRUE);
3783 3784
3784 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 3785 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3785 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 3786 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3786 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL)); 3787 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
… …
4008 on_leave = 1 4009 on_leave = 1
4009 PROTOTYPE: & 4010 PROTOTYPE: &
4010 CODE: 4011 CODE:
4011{ 4012{
4012 struct coro *coro = SvSTATE_current; 4013 struct coro *coro = SvSTATE_current;
4013 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 4014 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
4014 4015
4015 block = s_get_cv_croak (block); 4016 block = s_get_cv_croak (block);
4016 4017
4017 if (!*avp) 4018 if (!*avp)
4018 *avp = newAV (); 4019 *avp = newAV ();
… …
4038 4039
4039SV * 4040SV *
4040new (SV *klass, SV *count = 0) 4041new (SV *klass, SV *count = 0)
4041 CODE: 4042 CODE:
4042{ 4043{
4043 int semcnt = 1; 4044 int semcnt = 1;
4044 4045
4045 if (count) 4046 if (count)
4046 { 4047 {
4047 SvGETMAGIC (count); 4048 SvGETMAGIC (count);
4048 4049
… …
4108 XSRETURN_NO; 4109 XSRETURN_NO;
4109} 4110}
4110 4111
4111void 4112void
4112waiters (SV *self) 4113waiters (SV *self)
4113 PPCODE: 4114 PPCODE:
4114{ 4115{
4115 AV *av = (AV *)SvRV (self); 4116 AV *av = (AV *)SvRV (self);
4116 int wcount = AvFILLp (av) + 1 - 1; 4117 int wcount = AvFILLp (av) + 1 - 1;
4117 4118
4118 if (GIMME_V == G_SCALAR) 4119 if (GIMME_V == G_SCALAR)
… …
4127} 4128}
4128 4129
4129MODULE = Coro::State PACKAGE = Coro::SemaphoreSet 4130MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
4130 4131
4131void 4132void
4132_may_delete (SV *sem, int count, int extra_refs) 4133_may_delete (SV *sem, int count, unsigned int extra_refs)
4133 PPCODE: 4134 PPCODE:
4134{ 4135{
4135 AV *av = (AV *)SvRV (sem); 4136 AV *av = (AV *)SvRV (sem);
4136 4137
4137 if (SvREFCNT ((SV *)av) == 1 + extra_refs 4138 if (SvREFCNT ((SV *)av) == 1 + extra_refs
4138 && AvFILLp (av) == 0 /* no waiters, just count */ 4139 && AvFILLp (av) == 0 /* no waiters, just count */
4139 && SvIV (AvARRAY (av)[0]) == count) 4140 && SvIV (AvARRAY (av)[0]) == count)
4140 XSRETURN_YES; 4141 XSRETURN_YES;
… …
4161 4162
4162void 4163void
4163broadcast (SV *self) 4164broadcast (SV *self)
4164 CODE: 4165 CODE:
4165{ 4166{
4166 AV *av = (AV *)SvRV (self); 4167 AV *av = (AV *)SvRV (self);
4167 coro_signal_wake (aTHX_ av, AvFILLp (av)); 4168 coro_signal_wake (aTHX_ av, AvFILLp (av));
4168} 4169}
4169 4170
4170void 4171void
4171send (SV *self) 4172send (SV *self)
… …
4179 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */ 4180 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
4180} 4181}
4181 4182
4182IV 4183IV
4183awaited (SV *self) 4184awaited (SV *self)
4184 CODE: 4185 CODE:
4185 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1; 4186 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
4186 OUTPUT: 4187 OUTPUT:
4187 RETVAL 4188 RETVAL
4188 4189
4189 4190
… …
4194 4195
4195void 4196void
4196_schedule (...) 4197_schedule (...)
4197 CODE: 4198 CODE:
4198{ 4199{
4199 static int incede; 4200 static int incede;
4200 4201
4201 api_cede_notself (aTHX); 4202 api_cede_notself (aTHX);
4202 4203
4203 ++incede; 4204 ++incede;
4204 while (coro_nready >= incede && api_cede (aTHX)) 4205 while (coro_nready >= incede && api_cede (aTHX))
… …
4248 { 4249 {
4249 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect; 4250 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
4250 coro_old_pp_sselect = 0; 4251 coro_old_pp_sselect = 0;
4251 } 4252 }
4252 4253
4254MODULE = Coro::State PACKAGE = Coro::Util
4255
4256void
4257_exit (int code)
4258 CODE:
4259 _exit (code);
4260
4261NV
4262time ()
4263 CODE:
4264 RETVAL = nvtime (aTHX);
4265 OUTPUT:
4266 RETVAL
4267
4268NV
4269gettimeofday ()
4270 PPCODE:
4271{
4272 UV tv [2];
4273 u2time (aTHX_ tv);
4274 EXTEND (SP, 2);
4275 PUSHs (sv_2mortal (newSVuv (tv [0])));
4276 PUSHs (sv_2mortal (newSVuv (tv [1])));
4277}
4278

Diff Legend

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