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.406 by root, Sat Jun 11 13:49:00 2011 UTC vs.
Revision 1.435 by root, Sat Nov 2 19:49:33 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 #else 287 #define CORO_JIT_TYPE "x86-unix"
301 #undef CORO_JIT
302 #endif 288 #endif
303 #endif 289 #endif
304#endif 290#endif
305 291
292#if !defined(CORO_JIT_TYPE) || _POSIX_MEMORY_PROTECTION <= 0
293 #undef CORO_JIT
294#endif
295
306#if CORO_JIT 296#if CORO_JIT
297 typedef void (*load_save_perl_slots_type)(perl_slots *);
307static load_save_perl_slots_type load_perl_slots, save_perl_slots; 298 static load_save_perl_slots_type load_perl_slots, save_perl_slots;
308#endif 299#endif
309 300
310/** Coro::Select ************************************************************/ 301/** Coro::Select ************************************************************/
311 302
312static OP *(*coro_old_pp_sselect) (pTHX); 303static OP *(*coro_old_pp_sselect) (pTHX);
… …
329 320
330/** time stuff **************************************************************/ 321/** time stuff **************************************************************/
331 322
332#ifdef HAS_GETTIMEOFDAY 323#ifdef HAS_GETTIMEOFDAY
333 324
334ECB_INLINE void 325ecb_inline void
335coro_u2time (pTHX_ UV ret[2]) 326coro_u2time (pTHX_ UV ret[2])
336{ 327{
337 struct timeval tv; 328 struct timeval tv;
338 gettimeofday (&tv, 0); 329 gettimeofday (&tv, 0);
339 330
340 ret [0] = tv.tv_sec; 331 ret [0] = tv.tv_sec;
341 ret [1] = tv.tv_usec; 332 ret [1] = tv.tv_usec;
342} 333}
343 334
344ECB_INLINE double 335ecb_inline double
345coro_nvtime () 336coro_nvtime (void)
346{ 337{
347 struct timeval tv; 338 struct timeval tv;
348 gettimeofday (&tv, 0); 339 gettimeofday (&tv, 0);
349 340
350 return tv.tv_sec + tv.tv_usec * 1e-6; 341 return tv.tv_sec + tv.tv_usec * 1e-6;
351} 342}
352 343
353ECB_INLINE void 344ecb_inline void
354time_init (pTHX) 345time_init (pTHX)
355{ 346{
356 nvtime = coro_nvtime; 347 nvtime = coro_nvtime;
357 u2time = coro_u2time; 348 u2time = coro_u2time;
358} 349}
359 350
360#else 351#else
361 352
362ECB_INLINE void 353ecb_inline void
363time_init (pTHX) 354time_init (pTHX)
364{ 355{
365 SV **svp; 356 SV **svp;
366 357
367 require_pv ("Time/HiRes.pm"); 358 require_pv ("Time/HiRes.pm");
368 359
369 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0); 360 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
370 361
371 if (!svp) croak ("Time::HiRes is required, but missing. Caught"); 362 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
372 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");
373 364
… …
409 get_hv (name, create); 400 get_hv (name, create);
410#endif 401#endif
411 return get_hv (name, create); 402 return get_hv (name, create);
412} 403}
413 404
414ECB_INLINE void 405ecb_inline void
415coro_times_update () 406coro_times_update (void)
416{ 407{
417#ifdef coro_clock_gettime 408#ifdef coro_clock_gettime
418 struct timespec ts; 409 struct timespec ts;
419 410
420 ts.tv_sec = ts.tv_nsec = 0; 411 ts.tv_sec = ts.tv_nsec = 0;
… …
432 time_real [0] = tv [0]; 423 time_real [0] = tv [0];
433 time_real [1] = tv [1] * 1000; 424 time_real [1] = tv [1] * 1000;
434#endif 425#endif
435} 426}
436 427
437ECB_INLINE void 428ecb_inline void
438coro_times_add (struct coro *c) 429coro_times_add (struct coro *c)
439{ 430{
440 c->t_real [1] += time_real [1]; 431 c->t_real [1] += time_real [1];
441 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]; }
442 c->t_real [0] += time_real [0]; 433 c->t_real [0] += time_real [0];
… …
444 c->t_cpu [1] += time_cpu [1]; 435 c->t_cpu [1] += time_cpu [1];
445 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]; }
446 c->t_cpu [0] += time_cpu [0]; 437 c->t_cpu [0] += time_cpu [0];
447} 438}
448 439
449ECB_INLINE void 440ecb_inline void
450coro_times_sub (struct coro *c) 441coro_times_sub (struct coro *c)
451{ 442{
452 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]; }
453 c->t_real [1] -= time_real [1]; 444 c->t_real [1] -= time_real [1];
454 c->t_real [0] -= time_real [0]; 445 c->t_real [0] -= time_real [0];
… …
475 : 0) 466 : 0)
476 467
477#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)
478#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)
479 470
480ECB_INLINE MAGIC * 471ecb_inline MAGIC *
481SvSTATEhv_p (pTHX_ SV *coro) 472SvSTATEhv_p (pTHX_ SV *coro)
482{ 473{
483 MAGIC *mg; 474 MAGIC *mg;
484 475
485 if (ecb_expect_true ( 476 if (ecb_expect_true (
… …
490 return mg; 481 return mg;
491 482
492 return 0; 483 return 0;
493} 484}
494 485
495ECB_INLINE struct coro * 486ecb_inline struct coro *
496SvSTATE_ (pTHX_ SV *coro) 487SvSTATE_ (pTHX_ SV *coro)
497{ 488{
498 MAGIC *mg; 489 MAGIC *mg;
499 490
500 if (SvROK (coro)) 491 if (SvROK (coro))
… …
514#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 505#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
515 506
516/*****************************************************************************/ 507/*****************************************************************************/
517/* padlist management and caching */ 508/* padlist management and caching */
518 509
519ECB_INLINE AV * 510ecb_inline PADLIST *
520coro_derive_padlist (pTHX_ CV *cv) 511coro_derive_padlist (pTHX_ CV *cv)
521{ 512{
522 AV *padlist = CvPADLIST (cv); 513 PADLIST *padlist = CvPADLIST (cv);
523 AV *newpadlist, *newpad; 514 PADLIST *newpadlist;
515 PAD *newpad;
516 PADOFFSET off = PadlistMAX (padlist) + 1;
524 517
525 newpadlist = newAV (); 518#if NEWPADAPI
519
520 while (!PadlistARRAY (padlist)[off - 1])
521 --off;
522
523 Perl_pad_push (aTHX_ padlist, off);
524
525 newpad = PadlistARRAY (padlist)[off];
526 PadlistARRAY (padlist)[off] = 0;
527
528#else
529
530#if PERL_VERSION_ATLEAST (5,10,0)
531 Perl_pad_push (aTHX_ padlist, off);
532#else
533 Perl_pad_push (aTHX_ padlist, off, 1);
534#endif
535
536 newpad = PadlistARRAY (padlist)[off];
537 PadlistMAX (padlist) = off - 1;
538
539#endif
540
541 newPADLIST (newpadlist);
542#if !PERL_VERSION_ATLEAST(5,15,3)
543 /* Padlists are AvREAL as of 5.15.3. See perl bug #98092 and perl commit 7d953ba. */
526 AvREAL_off (newpadlist); 544 AvREAL_off (newpadlist);
527#if PERL_VERSION_ATLEAST (5,10,0)
528 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1);
529#else
530 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
531#endif 545#endif
532 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
533 --AvFILLp (padlist);
534 546
535 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0])); 547 /* Already extended to 2 elements by newPADLIST. */
536 av_store (newpadlist, 1, (SV *)newpad); 548 PadlistMAX (newpadlist) = 1;
549 PadlistNAMES (newpadlist) = (PADNAMELIST *)SvREFCNT_inc_NN (PadlistNAMES (padlist));
550 PadlistARRAY (newpadlist)[1] = newpad;
537 551
538 return newpadlist; 552 return newpadlist;
539} 553}
540 554
541ECB_INLINE void 555ecb_inline void
542free_padlist (pTHX_ AV *padlist) 556free_padlist (pTHX_ PADLIST *padlist)
543{ 557{
544 /* may be during global destruction */ 558 /* may be during global destruction */
545 if (!IN_DESTRUCT) 559 if (!IN_DESTRUCT)
546 { 560 {
547 I32 i = AvFILLp (padlist); 561 I32 i = PadlistMAX (padlist);
548 562
549 while (i > 0) /* special-case index 0 */ 563 while (i > 0) /* special-case index 0 */
550 { 564 {
551 /* we try to be extra-careful here */ 565 /* we try to be extra-careful here */
552 AV *av = (AV *)AvARRAY (padlist)[i--]; 566 PAD *pad = PadlistARRAY (padlist)[i--];
553 I32 j = AvFILLp (av); 567 I32 j = PadMAX (pad);
554 568
555 while (j >= 0) 569 while (j >= 0)
556 SvREFCNT_dec (AvARRAY (av)[j--]); 570 SvREFCNT_dec (PadARRAY (pad)[j--]);
557 571
558 AvFILLp (av) = -1; 572 PadMAX (pad) = -1;
559 SvREFCNT_dec (av); 573 SvREFCNT_dec (pad);
560 } 574 }
561 575
562 SvREFCNT_dec (AvARRAY (padlist)[0]); 576 SvREFCNT_dec (PadlistNAMES (padlist));
563 577
578#if NEWPADAPI
579 Safefree (PadlistARRAY (padlist));
580 Safefree (padlist);
581#else
564 AvFILLp (padlist) = -1; 582 AvFILLp (padlist) = -1;
583 AvREAL_off (padlist);
565 SvREFCNT_dec ((SV*)padlist); 584 SvREFCNT_dec ((SV*)padlist);
585#endif
566 } 586 }
567} 587}
568 588
569static int 589static int
570coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 590coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
571{ 591{
572 AV *padlist; 592 PADLIST *padlist;
573 AV *av = (AV *)mg->mg_obj; 593 PADLIST **padlists = (PADLIST **)(mg->mg_ptr + sizeof(size_t));
594 size_t len = *(size_t *)mg->mg_ptr;
574 595
575 /* perl manages to free our internal AV and _then_ call us */ 596 /* perl manages to free our internal AV and _then_ call us */
576 if (IN_DESTRUCT) 597 if (IN_DESTRUCT)
577 return 0; 598 return 0;
578 599
579 /* casting is fun. */ 600 while (len--)
580 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
581 free_padlist (aTHX_ padlist); 601 free_padlist (aTHX_ padlists[len]);
582
583 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
584 602
585 return 0; 603 return 0;
586} 604}
587 605
588static MGVTBL coro_cv_vtbl = { 606static MGVTBL coro_cv_vtbl = {
589 0, 0, 0, 0, 607 0, 0, 0, 0,
590 coro_cv_free 608 coro_cv_free
591}; 609};
592 610
593/* the next two functions merely cache the padlists */ 611/* the next two functions merely cache the padlists */
594ECB_INLINE void 612ecb_inline void
595get_padlist (pTHX_ CV *cv) 613get_padlist (pTHX_ CV *cv)
596{ 614{
597 MAGIC *mg = CORO_MAGIC_cv (cv); 615 MAGIC *mg = CORO_MAGIC_cv (cv);
598 AV *av; 616 size_t *lenp;
599 617
600 if (ecb_expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 618 if (ecb_expect_true (mg && *(lenp = (size_t *)mg->mg_ptr)))
601 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 619 CvPADLIST (cv) = ((PADLIST **)(mg->mg_ptr + sizeof(size_t)))[--*lenp];
602 else 620 else
603 { 621 {
604#if CORO_PREFER_PERL_FUNCTIONS 622#if CORO_PREFER_PERL_FUNCTIONS
605 /* this is probably cleaner? but also slower! */ 623 /* this is probably cleaner? but also slower! */
606 /* in practise, it seems to be less stable */ 624 /* in practise, it seems to be less stable */
… …
612 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 630 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
613#endif 631#endif
614 } 632 }
615} 633}
616 634
617ECB_INLINE void 635ecb_inline void
618put_padlist (pTHX_ CV *cv) 636put_padlist (pTHX_ CV *cv)
619{ 637{
620 MAGIC *mg = CORO_MAGIC_cv (cv); 638 MAGIC *mg = CORO_MAGIC_cv (cv);
621 AV *av;
622 639
623 if (ecb_expect_false (!mg)) 640 if (ecb_expect_false (!mg))
641 {
624 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 642 mg = sv_magicext ((SV *)cv, 0, CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
643 Newz (0, mg->mg_ptr ,sizeof (size_t) + sizeof (PADLIST *), char);
644 mg->mg_len = 1; /* so mg_free frees mg_ptr */
645 }
646 else
647 Renew (mg->mg_ptr,
648 sizeof(size_t) + (*(size_t *)mg->mg_ptr + 1) * sizeof(PADLIST *),
649 char);
625 650
626 av = (AV *)mg->mg_obj; 651 ((PADLIST **)(mg->mg_ptr + sizeof (size_t))) [(*(size_t *)mg->mg_ptr)++] = CvPADLIST (cv);
627
628 if (ecb_expect_false (AvFILLp (av) >= AvMAX (av)))
629 av_extend (av, AvFILLp (av) + 1);
630
631 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
632} 652}
633 653
634/** load & save, init *******************************************************/ 654/** load & save, init *******************************************************/
635 655
656ecb_inline void
657swap_sv (SV *a, SV *b)
658{
659 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
660 SV tmp;
661
662 /* swap sv_any */
663 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
664
665 /* swap sv_flags */
666 SvFLAGS (&tmp) = SvFLAGS (a);
667 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
668 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
669
670#if PERL_VERSION_ATLEAST (5,10,0)
671 /* perl 5.10 and later complicates this _quite_ a bit, but it also
672 * is much faster, so no quarrels here. alternatively, we could
673 * sv_upgrade to avoid this.
674 */
675 {
676 /* swap sv_u */
677 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
678
679 /* if SvANY points to the head, we need to adjust the pointers,
680 * as the pointer for a still points to b, and maybe vice versa.
681 */
682 #define svany_in_head(type) \
683 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
684
685 if (svany_in_head (SvTYPE (a)))
686 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
687
688 if (svany_in_head (SvTYPE (b)))
689 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
690 }
691#endif
692}
693
636/* swap sv heads, at least logically */ 694/* swap sv heads, at least logically */
637static void 695static void
638swap_svs (pTHX_ Coro__State c) 696swap_svs (pTHX_ Coro__State c)
639{ 697{
640 int i; 698 int i;
641 699
642 for (i = 0; i <= AvFILLp (c->swap_sv); ) 700 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
643 { 701 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
644 SV *a = AvARRAY (c->swap_sv)[i++];
645 SV *b = AvARRAY (c->swap_sv)[i++];
646
647 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
648 SV tmp;
649
650 /* swap sv_any */
651 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
652
653 /* swap sv_flags */
654 SvFLAGS (&tmp) = SvFLAGS (a);
655 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
656 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
657
658#if PERL_VERSION_ATLEAST (5,10,0)
659 /* perl 5.10 complicates this _quite_ a bit, but it also is
660 * much faster, so no quarrels here. alternatively, we could
661 * sv_upgrade to avoid this.
662 */
663 {
664 /* swap sv_u */
665 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
666
667 /* if SvANY points to the head, we need to adjust the pointers,
668 * as the pointer for a still points to b, and maybe vice versa.
669 */
670 #define svany_in_head(type) \
671 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
672
673 if (svany_in_head (SvTYPE (a)))
674 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
675
676 if (svany_in_head (SvTYPE (b)))
677 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
678 }
679#endif
680 }
681} 702}
682 703
683#define SWAP_SVS(coro) \ 704#define SWAP_SVS(coro) \
684 if (ecb_expect_false ((coro)->swap_sv)) \ 705 if (ecb_expect_false ((coro)->swap_sv)) \
685 swap_svs (aTHX_ (coro)) 706 swap_svs (aTHX_ (coro))
… …
697 718
698#if CORO_JIT 719#if CORO_JIT
699 load_perl_slots (slot); 720 load_perl_slots (slot);
700#else 721#else
701 #define VARx(name,expr,type) expr = slot->name; 722 #define VARx(name,expr,type) expr = slot->name;
702 # include "state.h" 723 #include "state.h"
703 #undef VARx
704#endif 724#endif
705 725
706 { 726 {
707 dSP; 727 dSP;
708 728
… …
711 /* now do the ugly restore mess */ 731 /* now do the ugly restore mess */
712 while (ecb_expect_true (cv = (CV *)POPs)) 732 while (ecb_expect_true (cv = (CV *)POPs))
713 { 733 {
714 put_padlist (aTHX_ cv); /* mark this padlist as available */ 734 put_padlist (aTHX_ cv); /* mark this padlist as available */
715 CvDEPTH (cv) = PTR2IV (POPs); 735 CvDEPTH (cv) = PTR2IV (POPs);
716 CvPADLIST (cv) = (AV *)POPs; 736 CvPADLIST (cv) = (PADLIST *)POPs;
717 } 737 }
718 738
719 PUTBACK; 739 PUTBACK;
720 } 740 }
721 741
… …
811 831
812 PUTBACK; 832 PUTBACK;
813 } 833 }
814 834
815 /* allocate some space on the context stack for our purposes */ 835 /* allocate some space on the context stack for our purposes */
816 if (ecb_expect_false (cxstack_ix + SLOT_COUNT >= cxstack_max)) 836 if (ecb_expect_false (cxstack_ix + (int)SLOT_COUNT >= cxstack_max))
817 { 837 {
818 unsigned int i; 838 unsigned int i;
819 839
820 for (i = 0; i < SLOT_COUNT; ++i) 840 for (i = 0; i < SLOT_COUNT; ++i)
821 CXINC; 841 CXINC;
… …
830 850
831#if CORO_JIT 851#if CORO_JIT
832 save_perl_slots (slot); 852 save_perl_slots (slot);
833#else 853#else
834 #define VARx(name,expr,type) slot->name = expr; 854 #define VARx(name,expr,type) slot->name = expr;
835 # include "state.h" 855 #include "state.h"
836 #undef VARx
837#endif 856#endif
838 } 857 }
839} 858}
840 859
841/* 860/*
… …
873#endif 892#endif
874 893
875 New(54,PL_scopestack,8,I32); 894 New(54,PL_scopestack,8,I32);
876 PL_scopestack_ix = 0; 895 PL_scopestack_ix = 0;
877 PL_scopestack_max = 8; 896 PL_scopestack_max = 8;
897#if HAS_SCOPESTACK_NAME
898 New(54,PL_scopestack_name,8,const char*);
899#endif
878 900
879 New(54,PL_savestack,24,ANY); 901 New(54,PL_savestack,24,ANY);
880 PL_savestack_ix = 0; 902 PL_savestack_ix = 0;
881 PL_savestack_max = 24; 903 PL_savestack_max = 24;
882 904
… …
910 } 932 }
911 933
912 Safefree (PL_tmps_stack); 934 Safefree (PL_tmps_stack);
913 Safefree (PL_markstack); 935 Safefree (PL_markstack);
914 Safefree (PL_scopestack); 936 Safefree (PL_scopestack);
937#if HAS_SCOPESTACK_NAME
938 Safefree (PL_scopestack_name);
939#endif
915 Safefree (PL_savestack); 940 Safefree (PL_savestack);
916#if !PERL_VERSION_ATLEAST (5,10,0) 941#if !PERL_VERSION_ATLEAST (5,10,0)
917 Safefree (PL_retstack); 942 Safefree (PL_retstack);
918#endif 943#endif
919} 944}
… …
979 { 1004 {
980 SV **svp = 0; 1005 SV **svp = 0;
981 1006
982 if (strEQ (s, "__DIE__" )) svp = &PL_diehook; 1007 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
983 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 1008 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
984 1009
985 if (svp) 1010 if (svp)
986 { 1011 {
987 sv_setsv (sv, *svp ? *svp : &PL_sv_undef); 1012 SV *ssv;
1013
1014 if (!*svp)
1015 ssv = &PL_sv_undef;
1016 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */
1017 ssv = sv_2mortal (newRV_inc (*svp));
1018 else
1019 ssv = *svp;
1020
1021 sv_setsv (sv, ssv);
988 return 0; 1022 return 0;
989 } 1023 }
990 } 1024 }
991 1025
992 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 1026 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
… …
1086 PL_hints = 0; 1120 PL_hints = 0;
1087 1121
1088 /* recreate the die/warn hooks */ 1122 /* recreate the die/warn hooks */
1089 PL_diehook = SvREFCNT_inc (rv_diehook); 1123 PL_diehook = SvREFCNT_inc (rv_diehook);
1090 PL_warnhook = SvREFCNT_inc (rv_warnhook); 1124 PL_warnhook = SvREFCNT_inc (rv_warnhook);
1091 1125
1092 GvSV (PL_defgv) = newSV (0); 1126 GvSV (PL_defgv) = newSV (0);
1093 GvAV (PL_defgv) = coro->args; coro->args = 0; 1127 GvAV (PL_defgv) = coro->args; coro->args = 0;
1094 GvSV (PL_errgv) = newSV (0); 1128 GvSV (PL_errgv) = newSV (0);
1095 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1129 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
1096 GvHV (PL_hintgv) = 0; 1130 GvHV (PL_hintgv) = 0;
… …
1184 /* restore swapped sv's */ 1218 /* restore swapped sv's */
1185 SWAP_SVS (coro); 1219 SWAP_SVS (coro);
1186 1220
1187 coro_destruct_stacks (aTHX); 1221 coro_destruct_stacks (aTHX);
1188 1222
1189 // now save some sv's to be free'd later 1223 /* now save some sv's to be free'd later */
1190 svf [0] = GvSV (PL_defgv); 1224 svf [0] = GvSV (PL_defgv);
1191 svf [1] = (SV *)GvAV (PL_defgv); 1225 svf [1] = (SV *)GvAV (PL_defgv);
1192 svf [2] = GvSV (PL_errgv); 1226 svf [2] = GvSV (PL_errgv);
1193 svf [3] = (SV *)PL_defoutgv; 1227 svf [3] = (SV *)PL_defoutgv;
1194 svf [4] = PL_rs; 1228 svf [4] = PL_rs;
… …
1214 SvREFCNT_dec (coro->invoke_cb); 1248 SvREFCNT_dec (coro->invoke_cb);
1215 SvREFCNT_dec (coro->invoke_av); 1249 SvREFCNT_dec (coro->invoke_av);
1216 } 1250 }
1217} 1251}
1218 1252
1219ECB_INLINE void 1253ecb_inline void
1220free_coro_mortal (pTHX) 1254free_coro_mortal (pTHX)
1221{ 1255{
1222 if (ecb_expect_true (coro_mortal)) 1256 if (ecb_expect_true (coro_mortal))
1223 { 1257 {
1224 SvREFCNT_dec ((SV *)coro_mortal); 1258 SvREFCNT_dec ((SV *)coro_mortal);
… …
1383 slf_frame.prepare = slf_prepare_set_stacklevel; 1417 slf_frame.prepare = slf_prepare_set_stacklevel;
1384 slf_frame.check = slf_check_set_stacklevel; 1418 slf_frame.check = slf_check_set_stacklevel;
1385} 1419}
1386 1420
1387/* the tail of transfer: execute stuff we can only do after a transfer */ 1421/* the tail of transfer: execute stuff we can only do after a transfer */
1388ECB_INLINE void 1422ecb_inline void
1389transfer_tail (pTHX) 1423transfer_tail (pTHX)
1390{ 1424{
1391 free_coro_mortal (aTHX); 1425 free_coro_mortal (aTHX);
1426}
1427
1428/* try to exit the same way perl's main function would do */
1429/* we do not bother resetting the environment or other things *7
1430/* that are not, uhm, essential */
1431/* this obviously also doesn't work when perl is embedded */
1432static void ecb_noinline ecb_cold
1433perlish_exit (pTHX)
1434{
1435 int exitstatus = perl_destruct (PL_curinterp);
1436 perl_free (PL_curinterp);
1437 exit (exitstatus);
1392} 1438}
1393 1439
1394/* 1440/*
1395 * this is a _very_ stripped down perl interpreter ;) 1441 * this is a _very_ stripped down perl interpreter ;)
1396 */ 1442 */
… …
1425 */ 1471 */
1426 1472
1427 /* 1473 /*
1428 * If perl-run returns we assume exit() was being called or the coro 1474 * If perl-run returns we assume exit() was being called or the coro
1429 * fell off the end, which seems to be the only valid (non-bug) 1475 * fell off the end, which seems to be the only valid (non-bug)
1430 * reason for perl_run to return. We try to exit by jumping to the 1476 * reason for perl_run to return. We try to mimic whatever perl is normally
1431 * bootstrap-time "top" top_env, as we cannot restore the "main" 1477 * doing in that case. YMMV.
1432 * coroutine as Coro has no such concept.
1433 * This actually isn't valid with the pthread backend, but OSes requiring
1434 * that backend are too broken to do it in a standards-compliant way.
1435 */ 1478 */
1436 PL_top_env = main_top_env; 1479 perlish_exit (aTHX);
1437 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1438 } 1480 }
1439} 1481}
1440 1482
1441static coro_cctx * 1483static coro_cctx *
1442cctx_new () 1484cctx_new (void)
1443{ 1485{
1444 coro_cctx *cctx; 1486 coro_cctx *cctx;
1445 1487
1446 ++cctx_count; 1488 ++cctx_count;
1447 New (0, cctx, 1, coro_cctx); 1489 New (0, cctx, 1, coro_cctx);
… …
1453 return cctx; 1495 return cctx;
1454} 1496}
1455 1497
1456/* create a new cctx only suitable as source */ 1498/* create a new cctx only suitable as source */
1457static coro_cctx * 1499static coro_cctx *
1458cctx_new_empty () 1500cctx_new_empty (void)
1459{ 1501{
1460 coro_cctx *cctx = cctx_new (); 1502 coro_cctx *cctx = cctx_new ();
1461 1503
1462 cctx->sptr = 0; 1504 cctx->stack.sptr = 0;
1463 coro_create (&cctx->cctx, 0, 0, 0, 0); 1505 coro_create (&cctx->cctx, 0, 0, 0, 0);
1464 1506
1465 return cctx; 1507 return cctx;
1466} 1508}
1467 1509
1468/* create a new cctx suitable as destination/running a perl interpreter */ 1510/* create a new cctx suitable as destination/running a perl interpreter */
1469static coro_cctx * 1511static coro_cctx *
1470cctx_new_run () 1512cctx_new_run (void)
1471{ 1513{
1472 coro_cctx *cctx = cctx_new (); 1514 coro_cctx *cctx = cctx_new ();
1473 void *stack_start;
1474 size_t stack_size;
1475 1515
1476#if HAVE_MMAP 1516 if (!coro_stack_alloc (&cctx->stack, cctx_stacksize))
1477 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1478 /* mmap supposedly does allocate-on-write for us */
1479 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
1480
1481 if (cctx->sptr != (void *)-1)
1482 {
1483 #if CORO_STACKGUARD
1484 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
1485 #endif
1486 stack_start = (char *)cctx->sptr + CORO_STACKGUARD * PAGESIZE;
1487 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
1488 cctx->flags |= CC_MAPPED;
1489 } 1517 {
1490 else
1491#endif
1492 {
1493 cctx->ssize = cctx_stacksize * (long)sizeof (long);
1494 New (0, cctx->sptr, cctx_stacksize, long);
1495
1496 if (!cctx->sptr)
1497 {
1498 perror ("FATAL: unable to allocate stack for coroutine, exiting."); 1518 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1499 _exit (EXIT_FAILURE); 1519 _exit (EXIT_FAILURE);
1500 }
1501
1502 stack_start = cctx->sptr;
1503 stack_size = cctx->ssize;
1504 } 1520 }
1505 1521
1506 #if CORO_USE_VALGRIND
1507 cctx->valgrind_id = VALGRIND_STACK_REGISTER ((char *)stack_start, (char *)stack_start + stack_size);
1508 #endif
1509
1510 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size); 1522 coro_create (&cctx->cctx, cctx_run, (void *)cctx, cctx->stack.sptr, cctx->stack.ssze);
1511 1523
1512 return cctx; 1524 return cctx;
1513} 1525}
1514 1526
1515static void 1527static void
… …
1521 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current)); 1533 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1522 1534
1523 --cctx_count; 1535 --cctx_count;
1524 coro_destroy (&cctx->cctx); 1536 coro_destroy (&cctx->cctx);
1525 1537
1526 /* coro_transfer creates new, empty cctx's */ 1538 coro_stack_free (&cctx->stack);
1527 if (cctx->sptr)
1528 {
1529 #if CORO_USE_VALGRIND
1530 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
1531 #endif
1532
1533#if HAVE_MMAP
1534 if (cctx->flags & CC_MAPPED)
1535 munmap (cctx->sptr, cctx->ssize);
1536 else
1537#endif
1538 Safefree (cctx->sptr);
1539 }
1540 1539
1541 Safefree (cctx); 1540 Safefree (cctx);
1542} 1541}
1543 1542
1544/* wether this cctx should be destructed */ 1543/* wether this cctx should be destructed */
… …
1563} 1562}
1564 1563
1565static void 1564static void
1566cctx_put (coro_cctx *cctx) 1565cctx_put (coro_cctx *cctx)
1567{ 1566{
1568 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1567 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->stack.sptr));
1569 1568
1570 /* free another cctx if overlimit */ 1569 /* free another cctx if overlimit */
1571 if (ecb_expect_false (cctx_idle >= cctx_max_idle)) 1570 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1572 { 1571 {
1573 coro_cctx *first = cctx_first; 1572 coro_cctx *first = cctx_first;
… …
1699 return; 1698 return;
1700 1699
1701 slf_destroy (aTHX_ coro); 1700 slf_destroy (aTHX_ coro);
1702 1701
1703 coro->flags |= CF_ZOMBIE; 1702 coro->flags |= CF_ZOMBIE;
1704 1703
1705 if (coro->flags & CF_READY) 1704 if (coro->flags & CF_READY)
1706 { 1705 {
1707 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1706 /* reduce nready, as destroying a ready coro effectively unreadies it */
1708 /* alternative: look through all ready queues and remove the coro */ 1707 /* alternative: look through all ready queues and remove the coro */
1709 --coro_nready; 1708 --coro_nready;
… …
1786 TRANSFER (ta, 1); 1785 TRANSFER (ta, 1);
1787} 1786}
1788 1787
1789/** Coro ********************************************************************/ 1788/** Coro ********************************************************************/
1790 1789
1791ECB_INLINE void 1790ecb_inline void
1792coro_enq (pTHX_ struct coro *coro) 1791coro_enq (pTHX_ struct coro *coro)
1793{ 1792{
1794 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN]; 1793 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1795 1794
1796 SvREFCNT_inc_NN (coro->hv); 1795 SvREFCNT_inc_NN (coro->hv);
… …
1798 coro->next_ready = 0; 1797 coro->next_ready = 0;
1799 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro; 1798 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1800 ready [1] = coro; 1799 ready [1] = coro;
1801} 1800}
1802 1801
1803ECB_INLINE struct coro * 1802ecb_inline struct coro *
1804coro_deq (pTHX) 1803coro_deq (pTHX)
1805{ 1804{
1806 int prio; 1805 int prio;
1807 1806
1808 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; ) 1807 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
… …
1861{ 1860{
1862 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1861 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1863} 1862}
1864 1863
1865/* expects to own a reference to next->hv */ 1864/* expects to own a reference to next->hv */
1866ECB_INLINE void 1865ecb_inline void
1867prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1866prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1868{ 1867{
1869 SV *prev_sv = SvRV (coro_current); 1868 SV *prev_sv = SvRV (coro_current);
1870 1869
1871 ta->prev = SvSTATE_hv (prev_sv); 1870 ta->prev = SvSTATE_hv (prev_sv);
… …
1930 } 1929 }
1931 } 1930 }
1932 } 1931 }
1933} 1932}
1934 1933
1935ECB_INLINE void 1934ecb_inline void
1936prepare_cede (pTHX_ struct coro_transfer_args *ta) 1935prepare_cede (pTHX_ struct coro_transfer_args *ta)
1937{ 1936{
1938 api_ready (aTHX_ coro_current); 1937 api_ready (aTHX_ coro_current);
1939 prepare_schedule (aTHX_ ta); 1938 prepare_schedule (aTHX_ ta);
1940} 1939}
1941 1940
1942ECB_INLINE void 1941ecb_inline void
1943prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 1942prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1944{ 1943{
1945 SV *prev = SvRV (coro_current); 1944 SV *prev = SvRV (coro_current);
1946 1945
1947 if (coro_nready) 1946 if (coro_nready)
… …
2112{ 2111{
2113 AV *od = coro->on_destroy; 2112 AV *od = coro->on_destroy;
2114 2113
2115 if (!od) 2114 if (!od)
2116 return; 2115 return;
2116
2117 coro->on_destroy = 0;
2118 sv_2mortal ((SV *)od);
2117 2119
2118 while (AvFILLp (od) >= 0) 2120 while (AvFILLp (od) >= 0)
2119 { 2121 {
2120 SV *cb = sv_2mortal (av_pop (od)); 2122 SV *cb = sv_2mortal (av_pop (od));
2121 2123
… …
2142 2144
2143static void 2145static void
2144coro_set_status (pTHX_ struct coro *coro, SV **arg, int items) 2146coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
2145{ 2147{
2146 AV *av; 2148 AV *av;
2147 2149
2148 if (coro->status) 2150 if (coro->status)
2149 { 2151 {
2150 av = coro->status; 2152 av = coro->status;
2151 av_clear (av); 2153 av_clear (av);
2152 } 2154 }
… …
2199 2201
2200 coro = SvSTATE (arg [0]); 2202 coro = SvSTATE (arg [0]);
2201 coro_hv = coro->hv; 2203 coro_hv = coro->hv;
2202 2204
2203 coro_set_status (aTHX_ coro, arg + 1, items - 1); 2205 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2204 2206
2205 if (ecb_expect_false (coro->flags & CF_NOCANCEL)) 2207 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2206 { 2208 {
2207 /* coro currently busy cancelling something, so just notify it */ 2209 /* coro currently busy cancelling something, so just notify it */
2208 coro->slf_frame.data = (void *)coro; 2210 coro->slf_frame.data = (void *)coro;
2209 2211
… …
2388 2390
2389static int 2391static int
2390slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2392slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
2391{ 2393{
2392 SV *data = (SV *)frame->data; 2394 SV *data = (SV *)frame->data;
2393 2395
2394 if (CORO_THROW) 2396 if (CORO_THROW)
2395 return 0; 2397 return 0;
2396 2398
2397 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2399 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2398 return 1; 2400 return 1;
… …
2434 cb = sv_2mortal (coro->rouse_cb); 2436 cb = sv_2mortal (coro->rouse_cb);
2435 coro->rouse_cb = 0; 2437 coro->rouse_cb = 0;
2436 } 2438 }
2437 2439
2438 if (!SvROK (cb) 2440 if (!SvROK (cb)
2439 || SvTYPE (SvRV (cb)) != SVt_PVCV 2441 || SvTYPE (SvRV (cb)) != SVt_PVCV
2440 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2442 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2441 croak ("Coro::rouse_wait called with illegal callback argument,"); 2443 croak ("Coro::rouse_wait called with illegal callback argument,");
2442 2444
2443 { 2445 {
2444 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */ 2446 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
… …
2947 { 2949 {
2948 int i; 2950 int i;
2949 /* if we were woken up but can't down, we look through the whole */ 2951 /* if we were woken up but can't down, we look through the whole */
2950 /* waiters list and only add us if we aren't in there already */ 2952 /* waiters list and only add us if we aren't in there already */
2951 /* this avoids some degenerate memory usage cases */ 2953 /* this avoids some degenerate memory usage cases */
2952 for (i = AvFILLp (av); i > 0; --i) // i > 0 is not an off-by-one bug 2954 for (i = AvFILLp (av); i > 0; --i) /* i > 0 is not an off-by-one bug */
2953 if (AvARRAY (av)[i] == coro_hv) 2955 if (AvARRAY (av)[i] == coro_hv)
2954 return 1; 2956 return 1;
2955 2957
2956 av_push (av, SvREFCNT_inc (coro_hv)); 2958 av_push (av, SvREFCNT_inc (coro_hv));
2957 return 1; 2959 return 1;
… …
3165 /* it quickly returns */ 3167 /* it quickly returns */
3166 if (CORO_THROW) 3168 if (CORO_THROW)
3167 return 0; 3169 return 0;
3168 3170
3169 /* one element that is an RV? repeat! */ 3171 /* one element that is an RV? repeat! */
3170 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0])) 3172 if (AvFILLp (state) == 0 && SvTYPE (AvARRAY (state)[0]) != SVt_PV)
3171 return 1; 3173 return 1;
3172 3174
3173 /* restore status */ 3175 /* restore status */
3174 { 3176 {
3175 SV *data_sv = av_pop (state); 3177 SV *data_sv = av_pop (state);
… …
3337#endif 3339#endif
3338 3340
3339#if CORO_JIT 3341#if CORO_JIT
3340 3342
3341static void ecb_noinline ecb_cold 3343static void ecb_noinline ecb_cold
3342pushav_3uv (pTHX_ UV a, UV b, UV c) 3344pushav_4uv (pTHX_ UV a, UV b, UV c, UV d)
3343{ 3345{
3344 dSP; 3346 dSP;
3345 AV *av = newAV (); 3347 AV *av = newAV ();
3346 3348
3349 av_store (av, 3, newSVuv (d));
3347 av_store (av, 2, newSVuv (c)); 3350 av_store (av, 2, newSVuv (c));
3348 av_store (av, 1, newSVuv (b)); 3351 av_store (av, 1, newSVuv (b));
3349 av_store (av, 0, newSVuv (a)); 3352 av_store (av, 0, newSVuv (a));
3350 3353
3351 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 3354 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
… …
3358{ 3361{
3359 dSP; 3362 dSP;
3360 SV *load, *save; 3363 SV *load, *save;
3361 char *map_base; 3364 char *map_base;
3362 char *load_ptr, *save_ptr; 3365 char *load_ptr, *save_ptr;
3363 STRLEN load_len, save_len; 3366 STRLEN load_len, save_len, map_len;
3364 int count; 3367 int count;
3365 3368
3369 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3370
3366 PUSHMARK (SP); 3371 PUSHMARK (SP);
3367 PUTBACK;
3368#define VARx(name,expr,type) pushav_3uv (aTHX_ (UV)&(expr), offsetof (perl_slots, name), sizeof (type)); 3372 #define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type));
3369# include "state.h" 3373 #include "state.h"
3370#undef VARx
3371 count = call_pv ("Coro::State::_jit", G_ARRAY); 3374 count = call_pv ("Coro::State::_jit", G_ARRAY);
3372 SPAGAIN; 3375 SPAGAIN;
3373 3376
3374 save = POPs; save_ptr = SvPVbyte (save, save_len); 3377 save = POPs; save_ptr = SvPVbyte (save, save_len);
3375 load = POPs; load_ptr = SvPVbyte (load, load_len); 3378 load = POPs; load_ptr = SvPVbyte (load, load_len);
3376 3379
3380 map_len = load_len + save_len + 16;
3381
3377 map_base = mmap (0, load_len + save_len + 16, PROT_EXEC | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); 3382 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3378 3383
3379 assert (("Coro: unable mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED)); 3384 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3380 3385
3381 load_perl_slots = (load_save_perl_slots_type)map_base; 3386 load_perl_slots = (load_save_perl_slots_type)map_base;
3382 memcpy (map_base, load_ptr, load_len); 3387 memcpy (map_base, load_ptr, load_len);
3383 3388
3384 map_base += (load_len + 15) & ~15; 3389 map_base += (load_len + 15) & ~15;
3385 3390
3386 save_perl_slots = (load_save_perl_slots_type)map_base; 3391 save_perl_slots = (load_save_perl_slots_type)map_base;
3387 memcpy (map_base, save_ptr, save_len); 3392 memcpy (map_base, save_ptr, save_len);
3393
3394 /* we are good citizens and try to make the page read-only, so the evil evil */
3395 /* hackers might have it a bit more difficult */
3396 mprotect (map_base, map_len, PROT_READ | PROT_EXEC);
3397
3398 PUTBACK;
3399 eval_pv ("undef &Coro::State::_jit", 1);
3388} 3400}
3389 3401
3390#endif 3402#endif
3391 3403
3392MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3404MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
… …
3398#ifdef USE_ITHREADS 3410#ifdef USE_ITHREADS
3399# if CORO_PTHREAD 3411# if CORO_PTHREAD
3400 coro_thx = PERL_GET_CONTEXT; 3412 coro_thx = PERL_GET_CONTEXT;
3401# endif 3413# endif
3402#endif 3414#endif
3403 BOOT_PAGESIZE;
3404
3405 /* perl defines these to check for existance first, but why it doesn't */ 3415 /* perl defines these to check for existance first, but why it doesn't */
3406 /* just create them one at init time is not clear to me, except for */ 3416 /* just create them one at init time is not clear to me, except for */
3407 /* programs trying to delete them, but... */ 3417 /* programs trying to delete them, but... */
3408 /* anyway, we declare this as invalid and make sure they are initialised here */ 3418 /* anyway, we declare this as invalid and make sure they are initialised here */
3409 DEFSV; 3419 DEFSV;
… …
3460 time_init (aTHX); 3470 time_init (aTHX);
3461 3471
3462 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL)); 3472 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3463#if CORO_JIT 3473#if CORO_JIT
3464 PUTBACK; 3474 PUTBACK;
3465 require_pv ("Coro/jit-" CORO_JIT_TYPE ".pl");
3466 jit_init (aTHX); 3475 jit_init (aTHX);
3467 perl_eval_pv ("undef &Coro::State::_jit", 1);
3468 SPAGAIN; 3476 SPAGAIN;
3469#endif 3477#endif
3470} 3478}
3471 3479
3472SV * 3480SV *
… …
3481void 3489void
3482transfer (...) 3490transfer (...)
3483 PROTOTYPE: $$ 3491 PROTOTYPE: $$
3484 CODE: 3492 CODE:
3485 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3493 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3486
3487void
3488_exit (int code)
3489 PROTOTYPE: $
3490 CODE:
3491 _exit (code);
3492 3494
3493SV * 3495SV *
3494clone (Coro::State coro) 3496clone (Coro::State coro)
3495 CODE: 3497 CODE:
3496{ 3498{
… …
3551void 3553void
3552list () 3554list ()
3553 PROTOTYPE: 3555 PROTOTYPE:
3554 PPCODE: 3556 PPCODE:
3555{ 3557{
3556 struct coro *coro; 3558 struct coro *coro;
3557 for (coro = coro_first; coro; coro = coro->next) 3559 for (coro = coro_first; coro; coro = coro->next)
3558 if (coro->hv) 3560 if (coro->hv)
3559 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 3561 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
3560} 3562}
3561 3563
… …
3625 RETVAL = boolSV (coro->flags & ix); 3627 RETVAL = boolSV (coro->flags & ix);
3626 OUTPUT: 3628 OUTPUT:
3627 RETVAL 3629 RETVAL
3628 3630
3629void 3631void
3630throw (Coro::State self, SV *exception = &PL_sv_undef) 3632throw (SV *self, SV *exception = &PL_sv_undef)
3631 PROTOTYPE: $;$ 3633 PROTOTYPE: $;$
3632 CODE: 3634 CODE:
3633{ 3635{
3636 struct coro *coro = SvSTATE (self);
3634 struct coro *current = SvSTATE_current; 3637 struct coro *current = SvSTATE_current;
3635 SV **exceptionp = self == current ? &CORO_THROW : &self->except; 3638 SV **exceptionp = coro == current ? &CORO_THROW : &coro->except;
3636 SvREFCNT_dec (*exceptionp); 3639 SvREFCNT_dec (*exceptionp);
3637 SvGETMAGIC (exception); 3640 SvGETMAGIC (exception);
3638 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0; 3641 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3642
3643 api_ready (aTHX_ self);
3639} 3644}
3640 3645
3641void 3646void
3642api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3647api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3643 PROTOTYPE: $;$ 3648 PROTOTYPE: $;$
… …
3720 3725
3721void 3726void
3722times (Coro::State self) 3727times (Coro::State self)
3723 PPCODE: 3728 PPCODE:
3724{ 3729{
3725 struct coro *current = SvSTATE (coro_current); 3730 struct coro *current = SvSTATE (coro_current);
3726 3731
3727 if (ecb_expect_false (current == self)) 3732 if (ecb_expect_false (current == self))
3728 { 3733 {
3729 coro_times_update (); 3734 coro_times_update ();
3730 coro_times_add (SvSTATE (coro_current)); 3735 coro_times_add (SvSTATE (coro_current));
… …
3773 3778
3774 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3779 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3775 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3780 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3776 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 3781 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3777 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */ 3782 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3778 3783
3779 coro_stash = gv_stashpv ("Coro", TRUE); 3784 coro_stash = gv_stashpv ("Coro", TRUE);
3780 3785
3781 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 3786 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3782 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 3787 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3783 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL)); 3788 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
… …
4005 on_leave = 1 4010 on_leave = 1
4006 PROTOTYPE: & 4011 PROTOTYPE: &
4007 CODE: 4012 CODE:
4008{ 4013{
4009 struct coro *coro = SvSTATE_current; 4014 struct coro *coro = SvSTATE_current;
4010 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 4015 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
4011 4016
4012 block = s_get_cv_croak (block); 4017 block = s_get_cv_croak (block);
4013 4018
4014 if (!*avp) 4019 if (!*avp)
4015 *avp = newAV (); 4020 *avp = newAV ();
… …
4035 4040
4036SV * 4041SV *
4037new (SV *klass, SV *count = 0) 4042new (SV *klass, SV *count = 0)
4038 CODE: 4043 CODE:
4039{ 4044{
4040 int semcnt = 1; 4045 int semcnt = 1;
4041 4046
4042 if (count) 4047 if (count)
4043 { 4048 {
4044 SvGETMAGIC (count); 4049 SvGETMAGIC (count);
4045 4050
… …
4105 XSRETURN_NO; 4110 XSRETURN_NO;
4106} 4111}
4107 4112
4108void 4113void
4109waiters (SV *self) 4114waiters (SV *self)
4110 PPCODE: 4115 PPCODE:
4111{ 4116{
4112 AV *av = (AV *)SvRV (self); 4117 AV *av = (AV *)SvRV (self);
4113 int wcount = AvFILLp (av) + 1 - 1; 4118 int wcount = AvFILLp (av) + 1 - 1;
4114 4119
4115 if (GIMME_V == G_SCALAR) 4120 if (GIMME_V == G_SCALAR)
… …
4124} 4129}
4125 4130
4126MODULE = Coro::State PACKAGE = Coro::SemaphoreSet 4131MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
4127 4132
4128void 4133void
4129_may_delete (SV *sem, int count, int extra_refs) 4134_may_delete (SV *sem, int count, unsigned int extra_refs)
4130 PPCODE: 4135 PPCODE:
4131{ 4136{
4132 AV *av = (AV *)SvRV (sem); 4137 AV *av = (AV *)SvRV (sem);
4133 4138
4134 if (SvREFCNT ((SV *)av) == 1 + extra_refs 4139 if (SvREFCNT ((SV *)av) == 1 + extra_refs
4135 && AvFILLp (av) == 0 /* no waiters, just count */ 4140 && AvFILLp (av) == 0 /* no waiters, just count */
4136 && SvIV (AvARRAY (av)[0]) == count) 4141 && SvIV (AvARRAY (av)[0]) == count)
4137 XSRETURN_YES; 4142 XSRETURN_YES;
… …
4158 4163
4159void 4164void
4160broadcast (SV *self) 4165broadcast (SV *self)
4161 CODE: 4166 CODE:
4162{ 4167{
4163 AV *av = (AV *)SvRV (self); 4168 AV *av = (AV *)SvRV (self);
4164 coro_signal_wake (aTHX_ av, AvFILLp (av)); 4169 coro_signal_wake (aTHX_ av, AvFILLp (av));
4165} 4170}
4166 4171
4167void 4172void
4168send (SV *self) 4173send (SV *self)
… …
4176 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */ 4181 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
4177} 4182}
4178 4183
4179IV 4184IV
4180awaited (SV *self) 4185awaited (SV *self)
4181 CODE: 4186 CODE:
4182 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1; 4187 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
4183 OUTPUT: 4188 OUTPUT:
4184 RETVAL 4189 RETVAL
4185 4190
4186 4191
… …
4191 4196
4192void 4197void
4193_schedule (...) 4198_schedule (...)
4194 CODE: 4199 CODE:
4195{ 4200{
4196 static int incede; 4201 static int incede;
4197 4202
4198 api_cede_notself (aTHX); 4203 api_cede_notself (aTHX);
4199 4204
4200 ++incede; 4205 ++incede;
4201 while (coro_nready >= incede && api_cede (aTHX)) 4206 while (coro_nready >= incede && api_cede (aTHX))
… …
4245 { 4250 {
4246 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect; 4251 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
4247 coro_old_pp_sselect = 0; 4252 coro_old_pp_sselect = 0;
4248 } 4253 }
4249 4254
4255MODULE = Coro::State PACKAGE = Coro::Util
4256
4257void
4258_exit (int code)
4259 CODE:
4260 _exit (code);
4261
4262NV
4263time ()
4264 CODE:
4265 RETVAL = nvtime (aTHX);
4266 OUTPUT:
4267 RETVAL
4268
4269NV
4270gettimeofday ()
4271 PPCODE:
4272{
4273 UV tv [2];
4274 u2time (aTHX_ tv);
4275 EXTEND (SP, 2);
4276 PUSHs (sv_2mortal (newSVuv (tv [0])));
4277 PUSHs (sv_2mortal (newSVuv (tv [1])));
4278}
4279

Diff Legend

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