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.434 by root, Sat Nov 2 19:48:50 2013 UTC

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

Diff Legend

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