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.409 by root, Sun Jun 12 04:29:15 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 #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 x x x x
305 #undef CORO_JIT
306 #endif 288 #endif
307 #endif 289 #endif
308#endif 290#endif
309 291
292#if !defined(CORO_JIT_TYPE) || _POSIX_MEMORY_PROTECTION <= 0
293 #undef CORO_JIT
294#endif
295
310#if CORO_JIT 296#if CORO_JIT
297 typedef void (*load_save_perl_slots_type)(perl_slots *);
311static load_save_perl_slots_type load_perl_slots, save_perl_slots; 298 static load_save_perl_slots_type load_perl_slots, save_perl_slots;
312#endif 299#endif
313 300
314/** Coro::Select ************************************************************/ 301/** Coro::Select ************************************************************/
315 302
316static OP *(*coro_old_pp_sselect) (pTHX); 303static OP *(*coro_old_pp_sselect) (pTHX);
… …
333 320
334/** time stuff **************************************************************/ 321/** time stuff **************************************************************/
335 322
336#ifdef HAS_GETTIMEOFDAY 323#ifdef HAS_GETTIMEOFDAY
337 324
338ECB_INLINE void 325ecb_inline void
339coro_u2time (pTHX_ UV ret[2]) 326coro_u2time (pTHX_ UV ret[2])
340{ 327{
341 struct timeval tv; 328 struct timeval tv;
342 gettimeofday (&tv, 0); 329 gettimeofday (&tv, 0);
343 330
344 ret [0] = tv.tv_sec; 331 ret [0] = tv.tv_sec;
345 ret [1] = tv.tv_usec; 332 ret [1] = tv.tv_usec;
346} 333}
347 334
348ECB_INLINE double 335ecb_inline double
349coro_nvtime () 336coro_nvtime (void)
350{ 337{
351 struct timeval tv; 338 struct timeval tv;
352 gettimeofday (&tv, 0); 339 gettimeofday (&tv, 0);
353 340
354 return tv.tv_sec + tv.tv_usec * 1e-6; 341 return tv.tv_sec + tv.tv_usec * 1e-6;
355} 342}
356 343
357ECB_INLINE void 344ecb_inline void
358time_init (pTHX) 345time_init (pTHX)
359{ 346{
360 nvtime = coro_nvtime; 347 nvtime = coro_nvtime;
361 u2time = coro_u2time; 348 u2time = coro_u2time;
362} 349}
363 350
364#else 351#else
365 352
366ECB_INLINE void 353ecb_inline void
367time_init (pTHX) 354time_init (pTHX)
368{ 355{
369 SV **svp; 356 SV **svp;
370 357
371 require_pv ("Time/HiRes.pm"); 358 require_pv ("Time/HiRes.pm");
372 359
373 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0); 360 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
374 361
375 if (!svp) croak ("Time::HiRes is required, but missing. Caught"); 362 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
376 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");
377 364
… …
413 get_hv (name, create); 400 get_hv (name, create);
414#endif 401#endif
415 return get_hv (name, create); 402 return get_hv (name, create);
416} 403}
417 404
418ECB_INLINE void 405ecb_inline void
419coro_times_update () 406coro_times_update (void)
420{ 407{
421#ifdef coro_clock_gettime 408#ifdef coro_clock_gettime
422 struct timespec ts; 409 struct timespec ts;
423 410
424 ts.tv_sec = ts.tv_nsec = 0; 411 ts.tv_sec = ts.tv_nsec = 0;
… …
436 time_real [0] = tv [0]; 423 time_real [0] = tv [0];
437 time_real [1] = tv [1] * 1000; 424 time_real [1] = tv [1] * 1000;
438#endif 425#endif
439} 426}
440 427
441ECB_INLINE void 428ecb_inline void
442coro_times_add (struct coro *c) 429coro_times_add (struct coro *c)
443{ 430{
444 c->t_real [1] += time_real [1]; 431 c->t_real [1] += time_real [1];
445 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]; }
446 c->t_real [0] += time_real [0]; 433 c->t_real [0] += time_real [0];
… …
448 c->t_cpu [1] += time_cpu [1]; 435 c->t_cpu [1] += time_cpu [1];
449 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]; }
450 c->t_cpu [0] += time_cpu [0]; 437 c->t_cpu [0] += time_cpu [0];
451} 438}
452 439
453ECB_INLINE void 440ecb_inline void
454coro_times_sub (struct coro *c) 441coro_times_sub (struct coro *c)
455{ 442{
456 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]; }
457 c->t_real [1] -= time_real [1]; 444 c->t_real [1] -= time_real [1];
458 c->t_real [0] -= time_real [0]; 445 c->t_real [0] -= time_real [0];
… …
479 : 0) 466 : 0)
480 467
481#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)
482#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)
483 470
484ECB_INLINE MAGIC * 471ecb_inline MAGIC *
485SvSTATEhv_p (pTHX_ SV *coro) 472SvSTATEhv_p (pTHX_ SV *coro)
486{ 473{
487 MAGIC *mg; 474 MAGIC *mg;
488 475
489 if (ecb_expect_true ( 476 if (ecb_expect_true (
… …
494 return mg; 481 return mg;
495 482
496 return 0; 483 return 0;
497} 484}
498 485
499ECB_INLINE struct coro * 486ecb_inline struct coro *
500SvSTATE_ (pTHX_ SV *coro) 487SvSTATE_ (pTHX_ SV *coro)
501{ 488{
502 MAGIC *mg; 489 MAGIC *mg;
503 490
504 if (SvROK (coro)) 491 if (SvROK (coro))
… …
518#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 505#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
519 506
520/*****************************************************************************/ 507/*****************************************************************************/
521/* padlist management and caching */ 508/* padlist management and caching */
522 509
523ECB_INLINE AV * 510ecb_inline PADLIST *
524coro_derive_padlist (pTHX_ CV *cv) 511coro_derive_padlist (pTHX_ CV *cv)
525{ 512{
526 AV *padlist = CvPADLIST (cv); 513 PADLIST *padlist = CvPADLIST (cv);
527 AV *newpadlist, *newpad; 514 PADLIST *newpadlist;
515 PAD *newpad;
516 PADOFFSET off = PadlistMAX (padlist) + 1;
528 517
529 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. */
530 AvREAL_off (newpadlist); 544 AvREAL_off (newpadlist);
531#if PERL_VERSION_ATLEAST (5,10,0)
532 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1);
533#else
534 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
535#endif 545#endif
536 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
537 --AvFILLp (padlist);
538 546
539 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0])); 547 /* Already extended to 2 elements by newPADLIST. */
540 av_store (newpadlist, 1, (SV *)newpad); 548 PadlistMAX (newpadlist) = 1;
549 PadlistNAMES (newpadlist) = (PADNAMELIST *)SvREFCNT_inc_NN (PadlistNAMES (padlist));
550 PadlistARRAY (newpadlist)[1] = newpad;
541 551
542 return newpadlist; 552 return newpadlist;
543} 553}
544 554
545ECB_INLINE void 555ecb_inline void
546free_padlist (pTHX_ AV *padlist) 556free_padlist (pTHX_ PADLIST *padlist)
547{ 557{
548 /* may be during global destruction */ 558 /* may be during global destruction */
549 if (!IN_DESTRUCT) 559 if (!IN_DESTRUCT)
550 { 560 {
551 I32 i = AvFILLp (padlist); 561 I32 i = PadlistMAX (padlist);
552 562
553 while (i > 0) /* special-case index 0 */ 563 while (i > 0) /* special-case index 0 */
554 { 564 {
555 /* we try to be extra-careful here */ 565 /* we try to be extra-careful here */
556 AV *av = (AV *)AvARRAY (padlist)[i--]; 566 PAD *pad = PadlistARRAY (padlist)[i--];
557 I32 j = AvFILLp (av); 567 I32 j = PadMAX (pad);
558 568
559 while (j >= 0) 569 while (j >= 0)
560 SvREFCNT_dec (AvARRAY (av)[j--]); 570 SvREFCNT_dec (PadARRAY (pad)[j--]);
561 571
562 AvFILLp (av) = -1; 572 PadMAX (pad) = -1;
563 SvREFCNT_dec (av); 573 SvREFCNT_dec (pad);
564 } 574 }
565 575
566 SvREFCNT_dec (AvARRAY (padlist)[0]); 576 SvREFCNT_dec (PadlistNAMES (padlist));
567 577
578#if NEWPADAPI
579 Safefree (PadlistARRAY (padlist));
580 Safefree (padlist);
581#else
568 AvFILLp (padlist) = -1; 582 AvFILLp (padlist) = -1;
583 AvREAL_off (padlist);
569 SvREFCNT_dec ((SV*)padlist); 584 SvREFCNT_dec ((SV*)padlist);
585#endif
570 } 586 }
571} 587}
572 588
573static int 589static int
574coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 590coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
575{ 591{
576 AV *padlist; 592 PADLIST *padlist;
577 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;
578 595
579 /* perl manages to free our internal AV and _then_ call us */ 596 /* perl manages to free our internal AV and _then_ call us */
580 if (IN_DESTRUCT) 597 if (IN_DESTRUCT)
581 return 0; 598 return 0;
582 599
583 /* casting is fun. */ 600 while (len--)
584 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
585 free_padlist (aTHX_ padlist); 601 free_padlist (aTHX_ padlists[len]);
586
587 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
588 602
589 return 0; 603 return 0;
590} 604}
591 605
592static MGVTBL coro_cv_vtbl = { 606static MGVTBL coro_cv_vtbl = {
593 0, 0, 0, 0, 607 0, 0, 0, 0,
594 coro_cv_free 608 coro_cv_free
595}; 609};
596 610
597/* the next two functions merely cache the padlists */ 611/* the next two functions merely cache the padlists */
598ECB_INLINE void 612ecb_inline void
599get_padlist (pTHX_ CV *cv) 613get_padlist (pTHX_ CV *cv)
600{ 614{
601 MAGIC *mg = CORO_MAGIC_cv (cv); 615 MAGIC *mg = CORO_MAGIC_cv (cv);
602 AV *av; 616 size_t *lenp;
603 617
604 if (ecb_expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 618 if (ecb_expect_true (mg && *(lenp = (size_t *)mg->mg_ptr)))
605 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 619 CvPADLIST (cv) = ((PADLIST **)(mg->mg_ptr + sizeof(size_t)))[--*lenp];
606 else 620 else
607 { 621 {
608#if CORO_PREFER_PERL_FUNCTIONS 622#if CORO_PREFER_PERL_FUNCTIONS
609 /* this is probably cleaner? but also slower! */ 623 /* this is probably cleaner? but also slower! */
610 /* in practise, it seems to be less stable */ 624 /* in practise, it seems to be less stable */
… …
616 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 630 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
617#endif 631#endif
618 } 632 }
619} 633}
620 634
621ECB_INLINE void 635ecb_inline void
622put_padlist (pTHX_ CV *cv) 636put_padlist (pTHX_ CV *cv)
623{ 637{
624 MAGIC *mg = CORO_MAGIC_cv (cv); 638 MAGIC *mg = CORO_MAGIC_cv (cv);
625 AV *av;
626 639
627 if (ecb_expect_false (!mg)) 640 if (ecb_expect_false (!mg))
641 {
628 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);
629 650
630 av = (AV *)mg->mg_obj; 651 ((PADLIST **)(mg->mg_ptr + sizeof (size_t))) [(*(size_t *)mg->mg_ptr)++] = CvPADLIST (cv);
631
632 if (ecb_expect_false (AvFILLp (av) >= AvMAX (av)))
633 av_extend (av, AvFILLp (av) + 1);
634
635 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
636} 652}
637 653
638/** load & save, init *******************************************************/ 654/** load & save, init *******************************************************/
639 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
640/* swap sv heads, at least logically */ 694/* swap sv heads, at least logically */
641static void 695static void
642swap_svs (pTHX_ Coro__State c) 696swap_svs (pTHX_ Coro__State c)
643{ 697{
644 int i; 698 int i;
645 699
646 for (i = 0; i <= AvFILLp (c->swap_sv); ) 700 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
647 { 701 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
648 SV *a = AvARRAY (c->swap_sv)[i++];
649 SV *b = AvARRAY (c->swap_sv)[i++];
650
651 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
652 SV tmp;
653
654 /* swap sv_any */
655 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
656
657 /* swap sv_flags */
658 SvFLAGS (&tmp) = SvFLAGS (a);
659 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
660 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
661
662#if PERL_VERSION_ATLEAST (5,10,0)
663 /* perl 5.10 complicates this _quite_ a bit, but it also is
664 * much faster, so no quarrels here. alternatively, we could
665 * sv_upgrade to avoid this.
666 */
667 {
668 /* swap sv_u */
669 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
670
671 /* if SvANY points to the head, we need to adjust the pointers,
672 * as the pointer for a still points to b, and maybe vice versa.
673 */
674 #define svany_in_head(type) \
675 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
676
677 if (svany_in_head (SvTYPE (a)))
678 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
679
680 if (svany_in_head (SvTYPE (b)))
681 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
682 }
683#endif
684 }
685} 702}
686 703
687#define SWAP_SVS(coro) \ 704#define SWAP_SVS(coro) \
688 if (ecb_expect_false ((coro)->swap_sv)) \ 705 if (ecb_expect_false ((coro)->swap_sv)) \
689 swap_svs (aTHX_ (coro)) 706 swap_svs (aTHX_ (coro))
… …
701 718
702#if CORO_JIT 719#if CORO_JIT
703 load_perl_slots (slot); 720 load_perl_slots (slot);
704#else 721#else
705 #define VARx(name,expr,type) expr = slot->name; 722 #define VARx(name,expr,type) expr = slot->name;
706 # include "state.h" 723 #include "state.h"
707 #undef VARx
708#endif 724#endif
709 725
710 { 726 {
711 dSP; 727 dSP;
712 728
… …
715 /* now do the ugly restore mess */ 731 /* now do the ugly restore mess */
716 while (ecb_expect_true (cv = (CV *)POPs)) 732 while (ecb_expect_true (cv = (CV *)POPs))
717 { 733 {
718 put_padlist (aTHX_ cv); /* mark this padlist as available */ 734 put_padlist (aTHX_ cv); /* mark this padlist as available */
719 CvDEPTH (cv) = PTR2IV (POPs); 735 CvDEPTH (cv) = PTR2IV (POPs);
720 CvPADLIST (cv) = (AV *)POPs; 736 CvPADLIST (cv) = (PADLIST *)POPs;
721 } 737 }
722 738
723 PUTBACK; 739 PUTBACK;
724 } 740 }
725 741
… …
815 831
816 PUTBACK; 832 PUTBACK;
817 } 833 }
818 834
819 /* allocate some space on the context stack for our purposes */ 835 /* allocate some space on the context stack for our purposes */
820 if (ecb_expect_false (cxstack_ix + SLOT_COUNT >= cxstack_max)) 836 if (ecb_expect_false (cxstack_ix + (int)SLOT_COUNT >= cxstack_max))
821 { 837 {
822 unsigned int i; 838 unsigned int i;
823 839
824 for (i = 0; i < SLOT_COUNT; ++i) 840 for (i = 0; i < SLOT_COUNT; ++i)
825 CXINC; 841 CXINC;
… …
834 850
835#if CORO_JIT 851#if CORO_JIT
836 save_perl_slots (slot); 852 save_perl_slots (slot);
837#else 853#else
838 #define VARx(name,expr,type) slot->name = expr; 854 #define VARx(name,expr,type) slot->name = expr;
839 # include "state.h" 855 #include "state.h"
840 #undef VARx
841#endif 856#endif
842 } 857 }
843} 858}
844 859
845/* 860/*
… …
877#endif 892#endif
878 893
879 New(54,PL_scopestack,8,I32); 894 New(54,PL_scopestack,8,I32);
880 PL_scopestack_ix = 0; 895 PL_scopestack_ix = 0;
881 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
882 900
883 New(54,PL_savestack,24,ANY); 901 New(54,PL_savestack,24,ANY);
884 PL_savestack_ix = 0; 902 PL_savestack_ix = 0;
885 PL_savestack_max = 24; 903 PL_savestack_max = 24;
886 904
… …
914 } 932 }
915 933
916 Safefree (PL_tmps_stack); 934 Safefree (PL_tmps_stack);
917 Safefree (PL_markstack); 935 Safefree (PL_markstack);
918 Safefree (PL_scopestack); 936 Safefree (PL_scopestack);
937#if HAS_SCOPESTACK_NAME
938 Safefree (PL_scopestack_name);
939#endif
919 Safefree (PL_savestack); 940 Safefree (PL_savestack);
920#if !PERL_VERSION_ATLEAST (5,10,0) 941#if !PERL_VERSION_ATLEAST (5,10,0)
921 Safefree (PL_retstack); 942 Safefree (PL_retstack);
922#endif 943#endif
923} 944}
… …
983 { 1004 {
984 SV **svp = 0; 1005 SV **svp = 0;
985 1006
986 if (strEQ (s, "__DIE__" )) svp = &PL_diehook; 1007 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
987 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 1008 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
988 1009
989 if (svp) 1010 if (svp)
990 { 1011 {
991 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);
992 return 0; 1022 return 0;
993 } 1023 }
994 } 1024 }
995 1025
996 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 1026 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
… …
1090 PL_hints = 0; 1120 PL_hints = 0;
1091 1121
1092 /* recreate the die/warn hooks */ 1122 /* recreate the die/warn hooks */
1093 PL_diehook = SvREFCNT_inc (rv_diehook); 1123 PL_diehook = SvREFCNT_inc (rv_diehook);
1094 PL_warnhook = SvREFCNT_inc (rv_warnhook); 1124 PL_warnhook = SvREFCNT_inc (rv_warnhook);
1095 1125
1096 GvSV (PL_defgv) = newSV (0); 1126 GvSV (PL_defgv) = newSV (0);
1097 GvAV (PL_defgv) = coro->args; coro->args = 0; 1127 GvAV (PL_defgv) = coro->args; coro->args = 0;
1098 GvSV (PL_errgv) = newSV (0); 1128 GvSV (PL_errgv) = newSV (0);
1099 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);
1100 GvHV (PL_hintgv) = 0; 1130 GvHV (PL_hintgv) = 0;
… …
1188 /* restore swapped sv's */ 1218 /* restore swapped sv's */
1189 SWAP_SVS (coro); 1219 SWAP_SVS (coro);
1190 1220
1191 coro_destruct_stacks (aTHX); 1221 coro_destruct_stacks (aTHX);
1192 1222
1193 // now save some sv's to be free'd later 1223 /* now save some sv's to be free'd later */
1194 svf [0] = GvSV (PL_defgv); 1224 svf [0] = GvSV (PL_defgv);
1195 svf [1] = (SV *)GvAV (PL_defgv); 1225 svf [1] = (SV *)GvAV (PL_defgv);
1196 svf [2] = GvSV (PL_errgv); 1226 svf [2] = GvSV (PL_errgv);
1197 svf [3] = (SV *)PL_defoutgv; 1227 svf [3] = (SV *)PL_defoutgv;
1198 svf [4] = PL_rs; 1228 svf [4] = PL_rs;
… …
1218 SvREFCNT_dec (coro->invoke_cb); 1248 SvREFCNT_dec (coro->invoke_cb);
1219 SvREFCNT_dec (coro->invoke_av); 1249 SvREFCNT_dec (coro->invoke_av);
1220 } 1250 }
1221} 1251}
1222 1252
1223ECB_INLINE void 1253ecb_inline void
1224free_coro_mortal (pTHX) 1254free_coro_mortal (pTHX)
1225{ 1255{
1226 if (ecb_expect_true (coro_mortal)) 1256 if (ecb_expect_true (coro_mortal))
1227 { 1257 {
1228 SvREFCNT_dec ((SV *)coro_mortal); 1258 SvREFCNT_dec ((SV *)coro_mortal);
… …
1387 slf_frame.prepare = slf_prepare_set_stacklevel; 1417 slf_frame.prepare = slf_prepare_set_stacklevel;
1388 slf_frame.check = slf_check_set_stacklevel; 1418 slf_frame.check = slf_check_set_stacklevel;
1389} 1419}
1390 1420
1391/* 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 */
1392ECB_INLINE void 1422ecb_inline void
1393transfer_tail (pTHX) 1423transfer_tail (pTHX)
1394{ 1424{
1395 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);
1396} 1438}
1397 1439
1398/* 1440/*
1399 * this is a _very_ stripped down perl interpreter ;) 1441 * this is a _very_ stripped down perl interpreter ;)
1400 */ 1442 */
… …
1429 */ 1471 */
1430 1472
1431 /* 1473 /*
1432 * 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
1433 * 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)
1434 * 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
1435 * bootstrap-time "top" top_env, as we cannot restore the "main" 1477 * doing in that case. YMMV.
1436 * coroutine as Coro has no such concept.
1437 * This actually isn't valid with the pthread backend, but OSes requiring
1438 * that backend are too broken to do it in a standards-compliant way.
1439 */ 1478 */
1440 PL_top_env = main_top_env; 1479 perlish_exit (aTHX);
1441 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1442 } 1480 }
1443} 1481}
1444 1482
1445static coro_cctx * 1483static coro_cctx *
1446cctx_new () 1484cctx_new (void)
1447{ 1485{
1448 coro_cctx *cctx; 1486 coro_cctx *cctx;
1449 1487
1450 ++cctx_count; 1488 ++cctx_count;
1451 New (0, cctx, 1, coro_cctx); 1489 New (0, cctx, 1, coro_cctx);
… …
1457 return cctx; 1495 return cctx;
1458} 1496}
1459 1497
1460/* create a new cctx only suitable as source */ 1498/* create a new cctx only suitable as source */
1461static coro_cctx * 1499static coro_cctx *
1462cctx_new_empty () 1500cctx_new_empty (void)
1463{ 1501{
1464 coro_cctx *cctx = cctx_new (); 1502 coro_cctx *cctx = cctx_new ();
1465 1503
1466 cctx->sptr = 0; 1504 cctx->stack.sptr = 0;
1467 coro_create (&cctx->cctx, 0, 0, 0, 0); 1505 coro_create (&cctx->cctx, 0, 0, 0, 0);
1468 1506
1469 return cctx; 1507 return cctx;
1470} 1508}
1471 1509
1472/* create a new cctx suitable as destination/running a perl interpreter */ 1510/* create a new cctx suitable as destination/running a perl interpreter */
1473static coro_cctx * 1511static coro_cctx *
1474cctx_new_run () 1512cctx_new_run (void)
1475{ 1513{
1476 coro_cctx *cctx = cctx_new (); 1514 coro_cctx *cctx = cctx_new ();
1477 void *stack_start;
1478 size_t stack_size;
1479 1515
1480#if HAVE_MMAP 1516 if (!coro_stack_alloc (&cctx->stack, cctx_stacksize))
1481 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1482 /* mmap supposedly does allocate-on-write for us */
1483 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
1484
1485 if (cctx->sptr != (void *)-1)
1486 {
1487 #if CORO_STACKGUARD
1488 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
1489 #endif
1490 stack_start = (char *)cctx->sptr + CORO_STACKGUARD * PAGESIZE;
1491 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
1492 cctx->flags |= CC_MAPPED;
1493 } 1517 {
1494 else
1495#endif
1496 {
1497 cctx->ssize = cctx_stacksize * (long)sizeof (long);
1498 New (0, cctx->sptr, cctx_stacksize, long);
1499
1500 if (!cctx->sptr)
1501 {
1502 perror ("FATAL: unable to allocate stack for coroutine, exiting."); 1518 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1503 _exit (EXIT_FAILURE); 1519 _exit (EXIT_FAILURE);
1504 }
1505
1506 stack_start = cctx->sptr;
1507 stack_size = cctx->ssize;
1508 } 1520 }
1509 1521
1510 #if CORO_USE_VALGRIND
1511 cctx->valgrind_id = VALGRIND_STACK_REGISTER ((char *)stack_start, (char *)stack_start + stack_size);
1512 #endif
1513
1514 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);
1515 1523
1516 return cctx; 1524 return cctx;
1517} 1525}
1518 1526
1519static void 1527static void
… …
1525 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current)); 1533 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1526 1534
1527 --cctx_count; 1535 --cctx_count;
1528 coro_destroy (&cctx->cctx); 1536 coro_destroy (&cctx->cctx);
1529 1537
1530 /* coro_transfer creates new, empty cctx's */ 1538 coro_stack_free (&cctx->stack);
1531 if (cctx->sptr)
1532 {
1533 #if CORO_USE_VALGRIND
1534 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
1535 #endif
1536
1537#if HAVE_MMAP
1538 if (cctx->flags & CC_MAPPED)
1539 munmap (cctx->sptr, cctx->ssize);
1540 else
1541#endif
1542 Safefree (cctx->sptr);
1543 }
1544 1539
1545 Safefree (cctx); 1540 Safefree (cctx);
1546} 1541}
1547 1542
1548/* wether this cctx should be destructed */ 1543/* wether this cctx should be destructed */
… …
1567} 1562}
1568 1563
1569static void 1564static void
1570cctx_put (coro_cctx *cctx) 1565cctx_put (coro_cctx *cctx)
1571{ 1566{
1572 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));
1573 1568
1574 /* free another cctx if overlimit */ 1569 /* free another cctx if overlimit */
1575 if (ecb_expect_false (cctx_idle >= cctx_max_idle)) 1570 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1576 { 1571 {
1577 coro_cctx *first = cctx_first; 1572 coro_cctx *first = cctx_first;
… …
1703 return; 1698 return;
1704 1699
1705 slf_destroy (aTHX_ coro); 1700 slf_destroy (aTHX_ coro);
1706 1701
1707 coro->flags |= CF_ZOMBIE; 1702 coro->flags |= CF_ZOMBIE;
1708 1703
1709 if (coro->flags & CF_READY) 1704 if (coro->flags & CF_READY)
1710 { 1705 {
1711 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1706 /* reduce nready, as destroying a ready coro effectively unreadies it */
1712 /* alternative: look through all ready queues and remove the coro */ 1707 /* alternative: look through all ready queues and remove the coro */
1713 --coro_nready; 1708 --coro_nready;
… …
1790 TRANSFER (ta, 1); 1785 TRANSFER (ta, 1);
1791} 1786}
1792 1787
1793/** Coro ********************************************************************/ 1788/** Coro ********************************************************************/
1794 1789
1795ECB_INLINE void 1790ecb_inline void
1796coro_enq (pTHX_ struct coro *coro) 1791coro_enq (pTHX_ struct coro *coro)
1797{ 1792{
1798 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN]; 1793 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1799 1794
1800 SvREFCNT_inc_NN (coro->hv); 1795 SvREFCNT_inc_NN (coro->hv);
… …
1802 coro->next_ready = 0; 1797 coro->next_ready = 0;
1803 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro; 1798 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1804 ready [1] = coro; 1799 ready [1] = coro;
1805} 1800}
1806 1801
1807ECB_INLINE struct coro * 1802ecb_inline struct coro *
1808coro_deq (pTHX) 1803coro_deq (pTHX)
1809{ 1804{
1810 int prio; 1805 int prio;
1811 1806
1812 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; ) 1807 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
… …
1865{ 1860{
1866 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1861 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1867} 1862}
1868 1863
1869/* expects to own a reference to next->hv */ 1864/* expects to own a reference to next->hv */
1870ECB_INLINE void 1865ecb_inline void
1871prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1866prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1872{ 1867{
1873 SV *prev_sv = SvRV (coro_current); 1868 SV *prev_sv = SvRV (coro_current);
1874 1869
1875 ta->prev = SvSTATE_hv (prev_sv); 1870 ta->prev = SvSTATE_hv (prev_sv);
… …
1934 } 1929 }
1935 } 1930 }
1936 } 1931 }
1937} 1932}
1938 1933
1939ECB_INLINE void 1934ecb_inline void
1940prepare_cede (pTHX_ struct coro_transfer_args *ta) 1935prepare_cede (pTHX_ struct coro_transfer_args *ta)
1941{ 1936{
1942 api_ready (aTHX_ coro_current); 1937 api_ready (aTHX_ coro_current);
1943 prepare_schedule (aTHX_ ta); 1938 prepare_schedule (aTHX_ ta);
1944} 1939}
1945 1940
1946ECB_INLINE void 1941ecb_inline void
1947prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 1942prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1948{ 1943{
1949 SV *prev = SvRV (coro_current); 1944 SV *prev = SvRV (coro_current);
1950 1945
1951 if (coro_nready) 1946 if (coro_nready)
… …
2116{ 2111{
2117 AV *od = coro->on_destroy; 2112 AV *od = coro->on_destroy;
2118 2113
2119 if (!od) 2114 if (!od)
2120 return; 2115 return;
2116
2117 coro->on_destroy = 0;
2118 sv_2mortal ((SV *)od);
2121 2119
2122 while (AvFILLp (od) >= 0) 2120 while (AvFILLp (od) >= 0)
2123 { 2121 {
2124 SV *cb = sv_2mortal (av_pop (od)); 2122 SV *cb = sv_2mortal (av_pop (od));
2125 2123
… …
2146 2144
2147static void 2145static void
2148coro_set_status (pTHX_ struct coro *coro, SV **arg, int items) 2146coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
2149{ 2147{
2150 AV *av; 2148 AV *av;
2151 2149
2152 if (coro->status) 2150 if (coro->status)
2153 { 2151 {
2154 av = coro->status; 2152 av = coro->status;
2155 av_clear (av); 2153 av_clear (av);
2156 } 2154 }
… …
2203 2201
2204 coro = SvSTATE (arg [0]); 2202 coro = SvSTATE (arg [0]);
2205 coro_hv = coro->hv; 2203 coro_hv = coro->hv;
2206 2204
2207 coro_set_status (aTHX_ coro, arg + 1, items - 1); 2205 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2208 2206
2209 if (ecb_expect_false (coro->flags & CF_NOCANCEL)) 2207 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2210 { 2208 {
2211 /* coro currently busy cancelling something, so just notify it */ 2209 /* coro currently busy cancelling something, so just notify it */
2212 coro->slf_frame.data = (void *)coro; 2210 coro->slf_frame.data = (void *)coro;
2213 2211
… …
2392 2390
2393static int 2391static int
2394slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2392slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
2395{ 2393{
2396 SV *data = (SV *)frame->data; 2394 SV *data = (SV *)frame->data;
2397 2395
2398 if (CORO_THROW) 2396 if (CORO_THROW)
2399 return 0; 2397 return 0;
2400 2398
2401 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2399 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2402 return 1; 2400 return 1;
… …
2438 cb = sv_2mortal (coro->rouse_cb); 2436 cb = sv_2mortal (coro->rouse_cb);
2439 coro->rouse_cb = 0; 2437 coro->rouse_cb = 0;
2440 } 2438 }
2441 2439
2442 if (!SvROK (cb) 2440 if (!SvROK (cb)
2443 || SvTYPE (SvRV (cb)) != SVt_PVCV 2441 || SvTYPE (SvRV (cb)) != SVt_PVCV
2444 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2442 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2445 croak ("Coro::rouse_wait called with illegal callback argument,"); 2443 croak ("Coro::rouse_wait called with illegal callback argument,");
2446 2444
2447 { 2445 {
2448 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */ 2446 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
… …
2951 { 2949 {
2952 int i; 2950 int i;
2953 /* 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 */
2954 /* 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 */
2955 /* this avoids some degenerate memory usage cases */ 2953 /* this avoids some degenerate memory usage cases */
2956 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 */
2957 if (AvARRAY (av)[i] == coro_hv) 2955 if (AvARRAY (av)[i] == coro_hv)
2958 return 1; 2956 return 1;
2959 2957
2960 av_push (av, SvREFCNT_inc (coro_hv)); 2958 av_push (av, SvREFCNT_inc (coro_hv));
2961 return 1; 2959 return 1;
… …
3169 /* it quickly returns */ 3167 /* it quickly returns */
3170 if (CORO_THROW) 3168 if (CORO_THROW)
3171 return 0; 3169 return 0;
3172 3170
3173 /* one element that is an RV? repeat! */ 3171 /* one element that is an RV? repeat! */
3174 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0])) 3172 if (AvFILLp (state) == 0 && SvTYPE (AvARRAY (state)[0]) != SVt_PV)
3175 return 1; 3173 return 1;
3176 3174
3177 /* restore status */ 3175 /* restore status */
3178 { 3176 {
3179 SV *data_sv = av_pop (state); 3177 SV *data_sv = av_pop (state);
… …
3341#endif 3339#endif
3342 3340
3343#if CORO_JIT 3341#if CORO_JIT
3344 3342
3345static void ecb_noinline ecb_cold 3343static void ecb_noinline ecb_cold
3346pushav_3uv (pTHX_ UV a, UV b, UV c) 3344pushav_4uv (pTHX_ UV a, UV b, UV c, UV d)
3347{ 3345{
3348 dSP; 3346 dSP;
3349 AV *av = newAV (); 3347 AV *av = newAV ();
3350 3348
3349 av_store (av, 3, newSVuv (d));
3351 av_store (av, 2, newSVuv (c)); 3350 av_store (av, 2, newSVuv (c));
3352 av_store (av, 1, newSVuv (b)); 3351 av_store (av, 1, newSVuv (b));
3353 av_store (av, 0, newSVuv (a)); 3352 av_store (av, 0, newSVuv (a));
3354 3353
3355 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 3354 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
… …
3362{ 3361{
3363 dSP; 3362 dSP;
3364 SV *load, *save; 3363 SV *load, *save;
3365 char *map_base; 3364 char *map_base;
3366 char *load_ptr, *save_ptr; 3365 char *load_ptr, *save_ptr;
3367 STRLEN load_len, save_len; 3366 STRLEN load_len, save_len, map_len;
3368 int count; 3367 int count;
3369 3368
3370 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1); 3369 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3371 3370
3372 PUSHMARK (SP); 3371 PUSHMARK (SP);
3373#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));
3374# include "state.h" 3373 #include "state.h"
3375#undef VARx
3376 count = call_pv ("Coro::State::_jit", G_ARRAY); 3374 count = call_pv ("Coro::State::_jit", G_ARRAY);
3377 SPAGAIN; 3375 SPAGAIN;
3378 3376
3379 save = POPs; save_ptr = SvPVbyte (save, save_len); 3377 save = POPs; save_ptr = SvPVbyte (save, save_len);
3380 load = POPs; load_ptr = SvPVbyte (load, load_len); 3378 load = POPs; load_ptr = SvPVbyte (load, load_len);
3381 3379
3380 map_len = load_len + save_len + 16;
3381
3382 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);
3383 3383
3384 assert (("Coro: unable to 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));
3385 3385
3386 load_perl_slots = (load_save_perl_slots_type)map_base; 3386 load_perl_slots = (load_save_perl_slots_type)map_base;
3387 memcpy (map_base, load_ptr, load_len); 3387 memcpy (map_base, load_ptr, load_len);
3388 3388
3389 map_base += (load_len + 15) & ~15; 3389 map_base += (load_len + 15) & ~15;
3390 3390
3391 save_perl_slots = (load_save_perl_slots_type)map_base; 3391 save_perl_slots = (load_save_perl_slots_type)map_base;
3392 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);
3393 3397
3394 PUTBACK; 3398 PUTBACK;
3395 eval_pv ("undef &Coro::State::_jit", 1); 3399 eval_pv ("undef &Coro::State::_jit", 1);
3396} 3400}
3397 3401
… …
3406#ifdef USE_ITHREADS 3410#ifdef USE_ITHREADS
3407# if CORO_PTHREAD 3411# if CORO_PTHREAD
3408 coro_thx = PERL_GET_CONTEXT; 3412 coro_thx = PERL_GET_CONTEXT;
3409# endif 3413# endif
3410#endif 3414#endif
3411 BOOT_PAGESIZE;
3412
3413 /* 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 */
3414 /* 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 */
3415 /* programs trying to delete them, but... */ 3417 /* programs trying to delete them, but... */
3416 /* 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 */
3417 DEFSV; 3419 DEFSV;
… …
3487void 3489void
3488transfer (...) 3490transfer (...)
3489 PROTOTYPE: $$ 3491 PROTOTYPE: $$
3490 CODE: 3492 CODE:
3491 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3493 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3492
3493void
3494_exit (int code)
3495 PROTOTYPE: $
3496 CODE:
3497 _exit (code);
3498 3494
3499SV * 3495SV *
3500clone (Coro::State coro) 3496clone (Coro::State coro)
3501 CODE: 3497 CODE:
3502{ 3498{
… …
3557void 3553void
3558list () 3554list ()
3559 PROTOTYPE: 3555 PROTOTYPE:
3560 PPCODE: 3556 PPCODE:
3561{ 3557{
3562 struct coro *coro; 3558 struct coro *coro;
3563 for (coro = coro_first; coro; coro = coro->next) 3559 for (coro = coro_first; coro; coro = coro->next)
3564 if (coro->hv) 3560 if (coro->hv)
3565 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 3561 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
3566} 3562}
3567 3563
… …
3631 RETVAL = boolSV (coro->flags & ix); 3627 RETVAL = boolSV (coro->flags & ix);
3632 OUTPUT: 3628 OUTPUT:
3633 RETVAL 3629 RETVAL
3634 3630
3635void 3631void
3636throw (Coro::State self, SV *exception = &PL_sv_undef) 3632throw (SV *self, SV *exception = &PL_sv_undef)
3637 PROTOTYPE: $;$ 3633 PROTOTYPE: $;$
3638 CODE: 3634 CODE:
3639{ 3635{
3636 struct coro *coro = SvSTATE (self);
3640 struct coro *current = SvSTATE_current; 3637 struct coro *current = SvSTATE_current;
3641 SV **exceptionp = self == current ? &CORO_THROW : &self->except; 3638 SV **exceptionp = coro == current ? &CORO_THROW : &coro->except;
3642 SvREFCNT_dec (*exceptionp); 3639 SvREFCNT_dec (*exceptionp);
3643 SvGETMAGIC (exception); 3640 SvGETMAGIC (exception);
3644 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0; 3641 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3642
3643 api_ready (aTHX_ self);
3645} 3644}
3646 3645
3647void 3646void
3648api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3647api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3649 PROTOTYPE: $;$ 3648 PROTOTYPE: $;$
… …
3726 3725
3727void 3726void
3728times (Coro::State self) 3727times (Coro::State self)
3729 PPCODE: 3728 PPCODE:
3730{ 3729{
3731 struct coro *current = SvSTATE (coro_current); 3730 struct coro *current = SvSTATE (coro_current);
3732 3731
3733 if (ecb_expect_false (current == self)) 3732 if (ecb_expect_false (current == self))
3734 { 3733 {
3735 coro_times_update (); 3734 coro_times_update ();
3736 coro_times_add (SvSTATE (coro_current)); 3735 coro_times_add (SvSTATE (coro_current));
… …
3779 3778
3780 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);
3781 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3780 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3782 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);
3783 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 */
3784 3783
3785 coro_stash = gv_stashpv ("Coro", TRUE); 3784 coro_stash = gv_stashpv ("Coro", TRUE);
3786 3785
3787 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 3786 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3788 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 3787 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3789 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL)); 3788 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
… …
4011 on_leave = 1 4010 on_leave = 1
4012 PROTOTYPE: & 4011 PROTOTYPE: &
4013 CODE: 4012 CODE:
4014{ 4013{
4015 struct coro *coro = SvSTATE_current; 4014 struct coro *coro = SvSTATE_current;
4016 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 4015 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
4017 4016
4018 block = s_get_cv_croak (block); 4017 block = s_get_cv_croak (block);
4019 4018
4020 if (!*avp) 4019 if (!*avp)
4021 *avp = newAV (); 4020 *avp = newAV ();
… …
4041 4040
4042SV * 4041SV *
4043new (SV *klass, SV *count = 0) 4042new (SV *klass, SV *count = 0)
4044 CODE: 4043 CODE:
4045{ 4044{
4046 int semcnt = 1; 4045 int semcnt = 1;
4047 4046
4048 if (count) 4047 if (count)
4049 { 4048 {
4050 SvGETMAGIC (count); 4049 SvGETMAGIC (count);
4051 4050
… …
4111 XSRETURN_NO; 4110 XSRETURN_NO;
4112} 4111}
4113 4112
4114void 4113void
4115waiters (SV *self) 4114waiters (SV *self)
4116 PPCODE: 4115 PPCODE:
4117{ 4116{
4118 AV *av = (AV *)SvRV (self); 4117 AV *av = (AV *)SvRV (self);
4119 int wcount = AvFILLp (av) + 1 - 1; 4118 int wcount = AvFILLp (av) + 1 - 1;
4120 4119
4121 if (GIMME_V == G_SCALAR) 4120 if (GIMME_V == G_SCALAR)
… …
4130} 4129}
4131 4130
4132MODULE = Coro::State PACKAGE = Coro::SemaphoreSet 4131MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
4133 4132
4134void 4133void
4135_may_delete (SV *sem, int count, int extra_refs) 4134_may_delete (SV *sem, int count, unsigned int extra_refs)
4136 PPCODE: 4135 PPCODE:
4137{ 4136{
4138 AV *av = (AV *)SvRV (sem); 4137 AV *av = (AV *)SvRV (sem);
4139 4138
4140 if (SvREFCNT ((SV *)av) == 1 + extra_refs 4139 if (SvREFCNT ((SV *)av) == 1 + extra_refs
4141 && AvFILLp (av) == 0 /* no waiters, just count */ 4140 && AvFILLp (av) == 0 /* no waiters, just count */
4142 && SvIV (AvARRAY (av)[0]) == count) 4141 && SvIV (AvARRAY (av)[0]) == count)
4143 XSRETURN_YES; 4142 XSRETURN_YES;
… …
4164 4163
4165void 4164void
4166broadcast (SV *self) 4165broadcast (SV *self)
4167 CODE: 4166 CODE:
4168{ 4167{
4169 AV *av = (AV *)SvRV (self); 4168 AV *av = (AV *)SvRV (self);
4170 coro_signal_wake (aTHX_ av, AvFILLp (av)); 4169 coro_signal_wake (aTHX_ av, AvFILLp (av));
4171} 4170}
4172 4171
4173void 4172void
4174send (SV *self) 4173send (SV *self)
… …
4182 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */ 4181 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
4183} 4182}
4184 4183
4185IV 4184IV
4186awaited (SV *self) 4185awaited (SV *self)
4187 CODE: 4186 CODE:
4188 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1; 4187 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
4189 OUTPUT: 4188 OUTPUT:
4190 RETVAL 4189 RETVAL
4191 4190
4192 4191
… …
4197 4196
4198void 4197void
4199_schedule (...) 4198_schedule (...)
4200 CODE: 4199 CODE:
4201{ 4200{
4202 static int incede; 4201 static int incede;
4203 4202
4204 api_cede_notself (aTHX); 4203 api_cede_notself (aTHX);
4205 4204
4206 ++incede; 4205 ++incede;
4207 while (coro_nready >= incede && api_cede (aTHX)) 4206 while (coro_nready >= incede && api_cede (aTHX))
… …
4251 { 4250 {
4252 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect; 4251 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
4253 coro_old_pp_sselect = 0; 4252 coro_old_pp_sselect = 0;
4254 } 4253 }
4255 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