ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/Coro/Coro/State.xs
(Generate patch)

Comparing Coro/Coro/State.xs (file contents):
Revision 1.405 by root, Sat Jun 11 13:01:26 2011 UTC vs.
Revision 1.433 by root, Thu May 9 05:40:14 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
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 __linux && __amd64 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
307 297 typedef void (*load_save_perl_slots_type)(perl_slots *);
308static load_save_perl_slots_type load_perl_slots, save_perl_slots; 298 static load_save_perl_slots_type load_perl_slots, save_perl_slots;
309
310#endif 299#endif
311 300
312/** Coro::Select ************************************************************/ 301/** Coro::Select ************************************************************/
313 302
314static OP *(*coro_old_pp_sselect) (pTHX); 303static OP *(*coro_old_pp_sselect) (pTHX);
… …
331 320
332/** time stuff **************************************************************/ 321/** time stuff **************************************************************/
333 322
334#ifdef HAS_GETTIMEOFDAY 323#ifdef HAS_GETTIMEOFDAY
335 324
336ECB_INLINE void 325ecb_inline void
337coro_u2time (pTHX_ UV ret[2]) 326coro_u2time (pTHX_ UV ret[2])
338{ 327{
339 struct timeval tv; 328 struct timeval tv;
340 gettimeofday (&tv, 0); 329 gettimeofday (&tv, 0);
341 330
342 ret [0] = tv.tv_sec; 331 ret [0] = tv.tv_sec;
343 ret [1] = tv.tv_usec; 332 ret [1] = tv.tv_usec;
344} 333}
345 334
346ECB_INLINE double 335ecb_inline double
347coro_nvtime () 336coro_nvtime (void)
348{ 337{
349 struct timeval tv; 338 struct timeval tv;
350 gettimeofday (&tv, 0); 339 gettimeofday (&tv, 0);
351 340
352 return tv.tv_sec + tv.tv_usec * 1e-6; 341 return tv.tv_sec + tv.tv_usec * 1e-6;
353} 342}
354 343
355ECB_INLINE void 344ecb_inline void
356time_init (pTHX) 345time_init (pTHX)
357{ 346{
358 nvtime = coro_nvtime; 347 nvtime = coro_nvtime;
359 u2time = coro_u2time; 348 u2time = coro_u2time;
360} 349}
361 350
362#else 351#else
363 352
364ECB_INLINE void 353ecb_inline void
365time_init (pTHX) 354time_init (pTHX)
366{ 355{
367 SV **svp; 356 SV **svp;
368 357
369 require_pv ("Time/HiRes.pm"); 358 require_pv ("Time/HiRes.pm");
370 359
371 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0); 360 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
372 361
373 if (!svp) croak ("Time::HiRes is required, but missing. Caught"); 362 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
374 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");
375 364
… …
411 get_hv (name, create); 400 get_hv (name, create);
412#endif 401#endif
413 return get_hv (name, create); 402 return get_hv (name, create);
414} 403}
415 404
416ECB_INLINE void 405ecb_inline void
417coro_times_update () 406coro_times_update (void)
418{ 407{
419#ifdef coro_clock_gettime 408#ifdef coro_clock_gettime
420 struct timespec ts; 409 struct timespec ts;
421 410
422 ts.tv_sec = ts.tv_nsec = 0; 411 ts.tv_sec = ts.tv_nsec = 0;
… …
434 time_real [0] = tv [0]; 423 time_real [0] = tv [0];
435 time_real [1] = tv [1] * 1000; 424 time_real [1] = tv [1] * 1000;
436#endif 425#endif
437} 426}
438 427
439ECB_INLINE void 428ecb_inline void
440coro_times_add (struct coro *c) 429coro_times_add (struct coro *c)
441{ 430{
442 c->t_real [1] += time_real [1]; 431 c->t_real [1] += time_real [1];
443 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]; }
444 c->t_real [0] += time_real [0]; 433 c->t_real [0] += time_real [0];
… …
446 c->t_cpu [1] += time_cpu [1]; 435 c->t_cpu [1] += time_cpu [1];
447 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]; }
448 c->t_cpu [0] += time_cpu [0]; 437 c->t_cpu [0] += time_cpu [0];
449} 438}
450 439
451ECB_INLINE void 440ecb_inline void
452coro_times_sub (struct coro *c) 441coro_times_sub (struct coro *c)
453{ 442{
454 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]; }
455 c->t_real [1] -= time_real [1]; 444 c->t_real [1] -= time_real [1];
456 c->t_real [0] -= time_real [0]; 445 c->t_real [0] -= time_real [0];
… …
477 : 0) 466 : 0)
478 467
479#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)
480#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)
481 470
482ECB_INLINE MAGIC * 471ecb_inline MAGIC *
483SvSTATEhv_p (pTHX_ SV *coro) 472SvSTATEhv_p (pTHX_ SV *coro)
484{ 473{
485 MAGIC *mg; 474 MAGIC *mg;
486 475
487 if (ecb_expect_true ( 476 if (ecb_expect_true (
… …
492 return mg; 481 return mg;
493 482
494 return 0; 483 return 0;
495} 484}
496 485
497ECB_INLINE struct coro * 486ecb_inline struct coro *
498SvSTATE_ (pTHX_ SV *coro) 487SvSTATE_ (pTHX_ SV *coro)
499{ 488{
500 MAGIC *mg; 489 MAGIC *mg;
501 490
502 if (SvROK (coro)) 491 if (SvROK (coro))
… …
516#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 505#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
517 506
518/*****************************************************************************/ 507/*****************************************************************************/
519/* padlist management and caching */ 508/* padlist management and caching */
520 509
521ECB_INLINE AV * 510ecb_inline PADLIST *
522coro_derive_padlist (pTHX_ CV *cv) 511coro_derive_padlist (pTHX_ CV *cv)
523{ 512{
524 AV *padlist = CvPADLIST (cv); 513 PADLIST *padlist = CvPADLIST (cv);
525 AV *newpadlist, *newpad; 514 PADLIST *newpadlist;
515 PAD *newpad;
516 PADOFFSET const off = PadlistMAX (padlist) + 1;
526 517
527 newpadlist = newAV (); 518 newPADLIST(newpadlist);
519#if !PERL_VERSION_ATLEAST(5,15,3)
520 /* Padlists are AvREAL as of 5.15.3. See perl bug #98092 and perl commit 7d953ba. */
528 AvREAL_off (newpadlist); 521 AvREAL_off (newpadlist);
522#endif
529#if PERL_VERSION_ATLEAST (5,10,0) 523#if PERL_VERSION_ATLEAST (5,10,0)
530 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1); 524 Perl_pad_push (aTHX_ padlist, off);
531#else 525#else
532 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 526 Perl_pad_push (aTHX_ padlist, off, 1);
533#endif 527#endif
534 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 528 newpad = PadlistARRAY (padlist)[off];
535 --AvFILLp (padlist); 529 PadlistMAX (padlist) = off - 1;
536 530
537 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0])); 531 /* Already extended to 2 elements by newPADLIST. */
538 av_store (newpadlist, 1, (SV *)newpad); 532 PadlistMAX (newpadlist) = 1;
533 PadlistNAMES (newpadlist) = (PADNAMELIST *)SvREFCNT_inc_NN (PadlistNAMES (padlist));
534 PadlistARRAY (newpadlist)[1] = newpad;
539 535
540 return newpadlist; 536 return newpadlist;
541} 537}
542 538
543ECB_INLINE void 539ecb_inline void
544free_padlist (pTHX_ AV *padlist) 540free_padlist (pTHX_ PADLIST *padlist)
545{ 541{
546 /* may be during global destruction */ 542 /* may be during global destruction */
547 if (!IN_DESTRUCT) 543 if (!IN_DESTRUCT)
548 { 544 {
549 I32 i = AvFILLp (padlist); 545 I32 i = PadlistMAX (padlist);
550 546
551 while (i > 0) /* special-case index 0 */ 547 while (i > 0) /* special-case index 0 */
552 { 548 {
553 /* we try to be extra-careful here */ 549 /* we try to be extra-careful here */
554 AV *av = (AV *)AvARRAY (padlist)[i--]; 550 PAD *pad = PadlistARRAY (padlist)[i--];
555 I32 j = AvFILLp (av); 551 I32 j = PadMAX (pad);
556 552
557 while (j >= 0) 553 while (j >= 0)
558 SvREFCNT_dec (AvARRAY (av)[j--]); 554 SvREFCNT_dec (PadARRAY (pad)[j--]);
559 555
560 AvFILLp (av) = -1; 556 PadMAX (pad) = -1;
561 SvREFCNT_dec (av); 557 SvREFCNT_dec (pad);
562 } 558 }
563 559
564 SvREFCNT_dec (AvARRAY (padlist)[0]); 560 SvREFCNT_dec (PadlistNAMES (padlist));
565 561
562#ifdef NEWPADAPI
563 Safefree (PadlistARRAY (padlist));
564 Safefree (padlist);
565#else
566 AvFILLp (padlist) = -1; 566 AvFILLp (padlist) = -1;
567 AvREAL_off (padlist);
567 SvREFCNT_dec ((SV*)padlist); 568 SvREFCNT_dec ((SV*)padlist);
569#endif
568 } 570 }
569} 571}
570 572
571static int 573static int
572coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 574coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
573{ 575{
574 AV *padlist; 576 PADLIST *padlist;
575 AV *av = (AV *)mg->mg_obj; 577 PADLIST **padlists = (PADLIST **)(mg->mg_ptr + sizeof(size_t));
578 size_t len = *(size_t *)mg->mg_ptr;
576 579
577 /* perl manages to free our internal AV and _then_ call us */ 580 /* perl manages to free our internal AV and _then_ call us */
578 if (IN_DESTRUCT) 581 if (IN_DESTRUCT)
579 return 0; 582 return 0;
580 583
581 /* casting is fun. */ 584 while (len--)
582 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
583 free_padlist (aTHX_ padlist); 585 free_padlist (aTHX_ padlists[len]);
584
585 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
586 586
587 return 0; 587 return 0;
588} 588}
589 589
590static MGVTBL coro_cv_vtbl = { 590static MGVTBL coro_cv_vtbl = {
591 0, 0, 0, 0, 591 0, 0, 0, 0,
592 coro_cv_free 592 coro_cv_free
593}; 593};
594 594
595/* the next two functions merely cache the padlists */ 595/* the next two functions merely cache the padlists */
596ECB_INLINE void 596ecb_inline void
597get_padlist (pTHX_ CV *cv) 597get_padlist (pTHX_ CV *cv)
598{ 598{
599 MAGIC *mg = CORO_MAGIC_cv (cv); 599 MAGIC *mg = CORO_MAGIC_cv (cv);
600 AV *av; 600 size_t *lenp;
601 601
602 if (ecb_expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 602 if (ecb_expect_true (mg && *(lenp = (size_t *)mg->mg_ptr)))
603 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 603 CvPADLIST (cv) = ((PADLIST **)(mg->mg_ptr + sizeof(size_t)))[--*lenp];
604 else 604 else
605 { 605 {
606#if CORO_PREFER_PERL_FUNCTIONS 606#if CORO_PREFER_PERL_FUNCTIONS
607 /* this is probably cleaner? but also slower! */ 607 /* this is probably cleaner? but also slower! */
608 /* in practise, it seems to be less stable */ 608 /* in practise, it seems to be less stable */
… …
614 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 614 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
615#endif 615#endif
616 } 616 }
617} 617}
618 618
619ECB_INLINE void 619ecb_inline void
620put_padlist (pTHX_ CV *cv) 620put_padlist (pTHX_ CV *cv)
621{ 621{
622 MAGIC *mg = CORO_MAGIC_cv (cv); 622 MAGIC *mg = CORO_MAGIC_cv (cv);
623 AV *av;
624 623
625 if (ecb_expect_false (!mg)) 624 if (ecb_expect_false (!mg))
625 {
626 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 626 mg = sv_magicext ((SV *)cv, 0, CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
627 Newz (0, mg->mg_ptr ,sizeof (size_t) + sizeof (PADLIST *), char);
628 mg->mg_len = 1; /* so mg_free frees mg_ptr */
629 }
630 else
631 Renew (mg->mg_ptr,
632 sizeof(size_t) + (*(size_t *)mg->mg_ptr + 1) * sizeof(PADLIST *),
633 char);
627 634
628 av = (AV *)mg->mg_obj; 635 ((PADLIST **)(mg->mg_ptr + sizeof (size_t))) [(*(size_t *)mg->mg_ptr)++] = CvPADLIST (cv);
629
630 if (ecb_expect_false (AvFILLp (av) >= AvMAX (av)))
631 av_extend (av, AvFILLp (av) + 1);
632
633 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
634} 636}
635 637
636/** load & save, init *******************************************************/ 638/** load & save, init *******************************************************/
637 639
640ecb_inline void
641swap_sv (SV *a, SV *b)
642{
643 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
644 SV tmp;
645
646 /* swap sv_any */
647 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
648
649 /* swap sv_flags */
650 SvFLAGS (&tmp) = SvFLAGS (a);
651 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
652 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
653
654#if PERL_VERSION_ATLEAST (5,10,0)
655 /* perl 5.10 and later complicates this _quite_ a bit, but it also
656 * is much faster, so no quarrels here. alternatively, we could
657 * sv_upgrade to avoid this.
658 */
659 {
660 /* swap sv_u */
661 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
662
663 /* if SvANY points to the head, we need to adjust the pointers,
664 * as the pointer for a still points to b, and maybe vice versa.
665 */
666 #define svany_in_head(type) \
667 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
668
669 if (svany_in_head (SvTYPE (a)))
670 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
671
672 if (svany_in_head (SvTYPE (b)))
673 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
674 }
675#endif
676}
677
638/* swap sv heads, at least logically */ 678/* swap sv heads, at least logically */
639static void 679static void
640swap_svs (pTHX_ Coro__State c) 680swap_svs (pTHX_ Coro__State c)
641{ 681{
642 int i; 682 int i;
643 683
644 for (i = 0; i <= AvFILLp (c->swap_sv); ) 684 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
645 { 685 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
646 SV *a = AvARRAY (c->swap_sv)[i++];
647 SV *b = AvARRAY (c->swap_sv)[i++];
648
649 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
650 SV tmp;
651
652 /* swap sv_any */
653 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
654
655 /* swap sv_flags */
656 SvFLAGS (&tmp) = SvFLAGS (a);
657 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
658 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
659
660#if PERL_VERSION_ATLEAST (5,10,0)
661 /* perl 5.10 complicates this _quite_ a bit, but it also is
662 * much faster, so no quarrels here. alternatively, we could
663 * sv_upgrade to avoid this.
664 */
665 {
666 /* swap sv_u */
667 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
668
669 /* if SvANY points to the head, we need to adjust the pointers,
670 * as the pointer for a still points to b, and maybe vice versa.
671 */
672 #define svany_in_head(type) \
673 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
674
675 if (svany_in_head (SvTYPE (a)))
676 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
677
678 if (svany_in_head (SvTYPE (b)))
679 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
680 }
681#endif
682 }
683} 686}
684 687
685#define SWAP_SVS(coro) \ 688#define SWAP_SVS(coro) \
686 if (ecb_expect_false ((coro)->swap_sv)) \ 689 if (ecb_expect_false ((coro)->swap_sv)) \
687 swap_svs (aTHX_ (coro)) 690 swap_svs (aTHX_ (coro))
… …
699 702
700#if CORO_JIT 703#if CORO_JIT
701 load_perl_slots (slot); 704 load_perl_slots (slot);
702#else 705#else
703 #define VARx(name,expr,type) expr = slot->name; 706 #define VARx(name,expr,type) expr = slot->name;
704 # include "state.h" 707 #include "state.h"
705 #undef VARx
706#endif 708#endif
707 709
708 { 710 {
709 dSP; 711 dSP;
710 712
… …
713 /* now do the ugly restore mess */ 715 /* now do the ugly restore mess */
714 while (ecb_expect_true (cv = (CV *)POPs)) 716 while (ecb_expect_true (cv = (CV *)POPs))
715 { 717 {
716 put_padlist (aTHX_ cv); /* mark this padlist as available */ 718 put_padlist (aTHX_ cv); /* mark this padlist as available */
717 CvDEPTH (cv) = PTR2IV (POPs); 719 CvDEPTH (cv) = PTR2IV (POPs);
718 CvPADLIST (cv) = (AV *)POPs; 720 CvPADLIST (cv) = (PADLIST *)POPs;
719 } 721 }
720 722
721 PUTBACK; 723 PUTBACK;
722 } 724 }
723 725
… …
813 815
814 PUTBACK; 816 PUTBACK;
815 } 817 }
816 818
817 /* allocate some space on the context stack for our purposes */ 819 /* allocate some space on the context stack for our purposes */
818 if (ecb_expect_false (cxstack_ix + SLOT_COUNT >= cxstack_max)) 820 if (ecb_expect_false (cxstack_ix + (int)SLOT_COUNT >= cxstack_max))
819 { 821 {
820 unsigned int i; 822 unsigned int i;
821 823
822 for (i = 0; i < SLOT_COUNT; ++i) 824 for (i = 0; i < SLOT_COUNT; ++i)
823 CXINC; 825 CXINC;
… …
832 834
833#if CORO_JIT 835#if CORO_JIT
834 save_perl_slots (slot); 836 save_perl_slots (slot);
835#else 837#else
836 #define VARx(name,expr,type) slot->name = expr; 838 #define VARx(name,expr,type) slot->name = expr;
837 # include "state.h" 839 #include "state.h"
838 #undef VARx
839#endif 840#endif
840 } 841 }
841} 842}
842 843
843/* 844/*
… …
875#endif 876#endif
876 877
877 New(54,PL_scopestack,8,I32); 878 New(54,PL_scopestack,8,I32);
878 PL_scopestack_ix = 0; 879 PL_scopestack_ix = 0;
879 PL_scopestack_max = 8; 880 PL_scopestack_max = 8;
881#if HAS_SCOPESTACK_NAME
882 New(54,PL_scopestack_name,8,const char*);
883#endif
880 884
881 New(54,PL_savestack,24,ANY); 885 New(54,PL_savestack,24,ANY);
882 PL_savestack_ix = 0; 886 PL_savestack_ix = 0;
883 PL_savestack_max = 24; 887 PL_savestack_max = 24;
884 888
… …
912 } 916 }
913 917
914 Safefree (PL_tmps_stack); 918 Safefree (PL_tmps_stack);
915 Safefree (PL_markstack); 919 Safefree (PL_markstack);
916 Safefree (PL_scopestack); 920 Safefree (PL_scopestack);
921#if HAS_SCOPESTACK_NAME
922 Safefree (PL_scopestack_name);
923#endif
917 Safefree (PL_savestack); 924 Safefree (PL_savestack);
918#if !PERL_VERSION_ATLEAST (5,10,0) 925#if !PERL_VERSION_ATLEAST (5,10,0)
919 Safefree (PL_retstack); 926 Safefree (PL_retstack);
920#endif 927#endif
921} 928}
… …
981 { 988 {
982 SV **svp = 0; 989 SV **svp = 0;
983 990
984 if (strEQ (s, "__DIE__" )) svp = &PL_diehook; 991 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
985 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 992 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
986 993
987 if (svp) 994 if (svp)
988 { 995 {
989 sv_setsv (sv, *svp ? *svp : &PL_sv_undef); 996 SV *ssv;
997
998 if (!*svp)
999 ssv = &PL_sv_undef;
1000 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */
1001 ssv = sv_2mortal (newRV_inc (*svp));
1002 else
1003 ssv = *svp;
1004
1005 sv_setsv (sv, ssv);
990 return 0; 1006 return 0;
991 } 1007 }
992 } 1008 }
993 1009
994 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 1010 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
… …
1088 PL_hints = 0; 1104 PL_hints = 0;
1089 1105
1090 /* recreate the die/warn hooks */ 1106 /* recreate the die/warn hooks */
1091 PL_diehook = SvREFCNT_inc (rv_diehook); 1107 PL_diehook = SvREFCNT_inc (rv_diehook);
1092 PL_warnhook = SvREFCNT_inc (rv_warnhook); 1108 PL_warnhook = SvREFCNT_inc (rv_warnhook);
1093 1109
1094 GvSV (PL_defgv) = newSV (0); 1110 GvSV (PL_defgv) = newSV (0);
1095 GvAV (PL_defgv) = coro->args; coro->args = 0; 1111 GvAV (PL_defgv) = coro->args; coro->args = 0;
1096 GvSV (PL_errgv) = newSV (0); 1112 GvSV (PL_errgv) = newSV (0);
1097 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1113 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
1098 GvHV (PL_hintgv) = 0; 1114 GvHV (PL_hintgv) = 0;
… …
1186 /* restore swapped sv's */ 1202 /* restore swapped sv's */
1187 SWAP_SVS (coro); 1203 SWAP_SVS (coro);
1188 1204
1189 coro_destruct_stacks (aTHX); 1205 coro_destruct_stacks (aTHX);
1190 1206
1191 // now save some sv's to be free'd later 1207 /* now save some sv's to be free'd later */
1192 svf [0] = GvSV (PL_defgv); 1208 svf [0] = GvSV (PL_defgv);
1193 svf [1] = (SV *)GvAV (PL_defgv); 1209 svf [1] = (SV *)GvAV (PL_defgv);
1194 svf [2] = GvSV (PL_errgv); 1210 svf [2] = GvSV (PL_errgv);
1195 svf [3] = (SV *)PL_defoutgv; 1211 svf [3] = (SV *)PL_defoutgv;
1196 svf [4] = PL_rs; 1212 svf [4] = PL_rs;
… …
1216 SvREFCNT_dec (coro->invoke_cb); 1232 SvREFCNT_dec (coro->invoke_cb);
1217 SvREFCNT_dec (coro->invoke_av); 1233 SvREFCNT_dec (coro->invoke_av);
1218 } 1234 }
1219} 1235}
1220 1236
1221ECB_INLINE void 1237ecb_inline void
1222free_coro_mortal (pTHX) 1238free_coro_mortal (pTHX)
1223{ 1239{
1224 if (ecb_expect_true (coro_mortal)) 1240 if (ecb_expect_true (coro_mortal))
1225 { 1241 {
1226 SvREFCNT_dec ((SV *)coro_mortal); 1242 SvREFCNT_dec ((SV *)coro_mortal);
… …
1385 slf_frame.prepare = slf_prepare_set_stacklevel; 1401 slf_frame.prepare = slf_prepare_set_stacklevel;
1386 slf_frame.check = slf_check_set_stacklevel; 1402 slf_frame.check = slf_check_set_stacklevel;
1387} 1403}
1388 1404
1389/* the tail of transfer: execute stuff we can only do after a transfer */ 1405/* the tail of transfer: execute stuff we can only do after a transfer */
1390ECB_INLINE void 1406ecb_inline void
1391transfer_tail (pTHX) 1407transfer_tail (pTHX)
1392{ 1408{
1393 free_coro_mortal (aTHX); 1409 free_coro_mortal (aTHX);
1410}
1411
1412/* try to exit the same way perl's main function would do */
1413/* we do not bother resetting the environment or other things *7
1414/* that are not, uhm, essential */
1415/* this obviously also doesn't work when perl is embedded */
1416static void ecb_noinline ecb_cold
1417perlish_exit (pTHX)
1418{
1419 int exitstatus = perl_destruct (PL_curinterp);
1420 perl_free (PL_curinterp);
1421 exit (exitstatus);
1394} 1422}
1395 1423
1396/* 1424/*
1397 * this is a _very_ stripped down perl interpreter ;) 1425 * this is a _very_ stripped down perl interpreter ;)
1398 */ 1426 */
… …
1427 */ 1455 */
1428 1456
1429 /* 1457 /*
1430 * If perl-run returns we assume exit() was being called or the coro 1458 * If perl-run returns we assume exit() was being called or the coro
1431 * fell off the end, which seems to be the only valid (non-bug) 1459 * fell off the end, which seems to be the only valid (non-bug)
1432 * reason for perl_run to return. We try to exit by jumping to the 1460 * reason for perl_run to return. We try to mimic whatever perl is normally
1433 * bootstrap-time "top" top_env, as we cannot restore the "main" 1461 * doing in that case. YMMV.
1434 * coroutine as Coro has no such concept.
1435 * This actually isn't valid with the pthread backend, but OSes requiring
1436 * that backend are too broken to do it in a standards-compliant way.
1437 */ 1462 */
1438 PL_top_env = main_top_env; 1463 perlish_exit (aTHX);
1439 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1440 } 1464 }
1441} 1465}
1442 1466
1443static coro_cctx * 1467static coro_cctx *
1444cctx_new () 1468cctx_new (void)
1445{ 1469{
1446 coro_cctx *cctx; 1470 coro_cctx *cctx;
1447 1471
1448 ++cctx_count; 1472 ++cctx_count;
1449 New (0, cctx, 1, coro_cctx); 1473 New (0, cctx, 1, coro_cctx);
… …
1455 return cctx; 1479 return cctx;
1456} 1480}
1457 1481
1458/* create a new cctx only suitable as source */ 1482/* create a new cctx only suitable as source */
1459static coro_cctx * 1483static coro_cctx *
1460cctx_new_empty () 1484cctx_new_empty (void)
1461{ 1485{
1462 coro_cctx *cctx = cctx_new (); 1486 coro_cctx *cctx = cctx_new ();
1463 1487
1464 cctx->sptr = 0; 1488 cctx->stack.sptr = 0;
1465 coro_create (&cctx->cctx, 0, 0, 0, 0); 1489 coro_create (&cctx->cctx, 0, 0, 0, 0);
1466 1490
1467 return cctx; 1491 return cctx;
1468} 1492}
1469 1493
1470/* create a new cctx suitable as destination/running a perl interpreter */ 1494/* create a new cctx suitable as destination/running a perl interpreter */
1471static coro_cctx * 1495static coro_cctx *
1472cctx_new_run () 1496cctx_new_run (void)
1473{ 1497{
1474 coro_cctx *cctx = cctx_new (); 1498 coro_cctx *cctx = cctx_new ();
1475 void *stack_start;
1476 size_t stack_size;
1477 1499
1478#if HAVE_MMAP 1500 if (!coro_stack_alloc (&cctx->stack, cctx_stacksize))
1479 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1480 /* mmap supposedly does allocate-on-write for us */
1481 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
1482
1483 if (cctx->sptr != (void *)-1)
1484 {
1485 #if CORO_STACKGUARD
1486 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
1487 #endif
1488 stack_start = (char *)cctx->sptr + CORO_STACKGUARD * PAGESIZE;
1489 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
1490 cctx->flags |= CC_MAPPED;
1491 } 1501 {
1492 else
1493#endif
1494 {
1495 cctx->ssize = cctx_stacksize * (long)sizeof (long);
1496 New (0, cctx->sptr, cctx_stacksize, long);
1497
1498 if (!cctx->sptr)
1499 {
1500 perror ("FATAL: unable to allocate stack for coroutine, exiting."); 1502 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1501 _exit (EXIT_FAILURE); 1503 _exit (EXIT_FAILURE);
1502 }
1503
1504 stack_start = cctx->sptr;
1505 stack_size = cctx->ssize;
1506 } 1504 }
1507 1505
1508 #if CORO_USE_VALGRIND
1509 cctx->valgrind_id = VALGRIND_STACK_REGISTER ((char *)stack_start, (char *)stack_start + stack_size);
1510 #endif
1511
1512 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size); 1506 coro_create (&cctx->cctx, cctx_run, (void *)cctx, cctx->stack.sptr, cctx->stack.ssze);
1513 1507
1514 return cctx; 1508 return cctx;
1515} 1509}
1516 1510
1517static void 1511static void
… …
1523 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current)); 1517 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1524 1518
1525 --cctx_count; 1519 --cctx_count;
1526 coro_destroy (&cctx->cctx); 1520 coro_destroy (&cctx->cctx);
1527 1521
1528 /* coro_transfer creates new, empty cctx's */ 1522 coro_stack_free (&cctx->stack);
1529 if (cctx->sptr)
1530 {
1531 #if CORO_USE_VALGRIND
1532 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
1533 #endif
1534
1535#if HAVE_MMAP
1536 if (cctx->flags & CC_MAPPED)
1537 munmap (cctx->sptr, cctx->ssize);
1538 else
1539#endif
1540 Safefree (cctx->sptr);
1541 }
1542 1523
1543 Safefree (cctx); 1524 Safefree (cctx);
1544} 1525}
1545 1526
1546/* wether this cctx should be destructed */ 1527/* wether this cctx should be destructed */
… …
1565} 1546}
1566 1547
1567static void 1548static void
1568cctx_put (coro_cctx *cctx) 1549cctx_put (coro_cctx *cctx)
1569{ 1550{
1570 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1551 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->stack.sptr));
1571 1552
1572 /* free another cctx if overlimit */ 1553 /* free another cctx if overlimit */
1573 if (ecb_expect_false (cctx_idle >= cctx_max_idle)) 1554 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1574 { 1555 {
1575 coro_cctx *first = cctx_first; 1556 coro_cctx *first = cctx_first;
… …
1701 return; 1682 return;
1702 1683
1703 slf_destroy (aTHX_ coro); 1684 slf_destroy (aTHX_ coro);
1704 1685
1705 coro->flags |= CF_ZOMBIE; 1686 coro->flags |= CF_ZOMBIE;
1706 1687
1707 if (coro->flags & CF_READY) 1688 if (coro->flags & CF_READY)
1708 { 1689 {
1709 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1690 /* reduce nready, as destroying a ready coro effectively unreadies it */
1710 /* alternative: look through all ready queues and remove the coro */ 1691 /* alternative: look through all ready queues and remove the coro */
1711 --coro_nready; 1692 --coro_nready;
… …
1788 TRANSFER (ta, 1); 1769 TRANSFER (ta, 1);
1789} 1770}
1790 1771
1791/** Coro ********************************************************************/ 1772/** Coro ********************************************************************/
1792 1773
1793ECB_INLINE void 1774ecb_inline void
1794coro_enq (pTHX_ struct coro *coro) 1775coro_enq (pTHX_ struct coro *coro)
1795{ 1776{
1796 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN]; 1777 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1797 1778
1798 SvREFCNT_inc_NN (coro->hv); 1779 SvREFCNT_inc_NN (coro->hv);
… …
1800 coro->next_ready = 0; 1781 coro->next_ready = 0;
1801 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro; 1782 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1802 ready [1] = coro; 1783 ready [1] = coro;
1803} 1784}
1804 1785
1805ECB_INLINE struct coro * 1786ecb_inline struct coro *
1806coro_deq (pTHX) 1787coro_deq (pTHX)
1807{ 1788{
1808 int prio; 1789 int prio;
1809 1790
1810 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; ) 1791 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
… …
1863{ 1844{
1864 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1845 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1865} 1846}
1866 1847
1867/* expects to own a reference to next->hv */ 1848/* expects to own a reference to next->hv */
1868ECB_INLINE void 1849ecb_inline void
1869prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1850prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1870{ 1851{
1871 SV *prev_sv = SvRV (coro_current); 1852 SV *prev_sv = SvRV (coro_current);
1872 1853
1873 ta->prev = SvSTATE_hv (prev_sv); 1854 ta->prev = SvSTATE_hv (prev_sv);
… …
1932 } 1913 }
1933 } 1914 }
1934 } 1915 }
1935} 1916}
1936 1917
1937ECB_INLINE void 1918ecb_inline void
1938prepare_cede (pTHX_ struct coro_transfer_args *ta) 1919prepare_cede (pTHX_ struct coro_transfer_args *ta)
1939{ 1920{
1940 api_ready (aTHX_ coro_current); 1921 api_ready (aTHX_ coro_current);
1941 prepare_schedule (aTHX_ ta); 1922 prepare_schedule (aTHX_ ta);
1942} 1923}
1943 1924
1944ECB_INLINE void 1925ecb_inline void
1945prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 1926prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1946{ 1927{
1947 SV *prev = SvRV (coro_current); 1928 SV *prev = SvRV (coro_current);
1948 1929
1949 if (coro_nready) 1930 if (coro_nready)
… …
2114{ 2095{
2115 AV *od = coro->on_destroy; 2096 AV *od = coro->on_destroy;
2116 2097
2117 if (!od) 2098 if (!od)
2118 return; 2099 return;
2100
2101 coro->on_destroy = 0;
2102 sv_2mortal ((SV *)od);
2119 2103
2120 while (AvFILLp (od) >= 0) 2104 while (AvFILLp (od) >= 0)
2121 { 2105 {
2122 SV *cb = sv_2mortal (av_pop (od)); 2106 SV *cb = sv_2mortal (av_pop (od));
2123 2107
… …
2144 2128
2145static void 2129static void
2146coro_set_status (pTHX_ struct coro *coro, SV **arg, int items) 2130coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
2147{ 2131{
2148 AV *av; 2132 AV *av;
2149 2133
2150 if (coro->status) 2134 if (coro->status)
2151 { 2135 {
2152 av = coro->status; 2136 av = coro->status;
2153 av_clear (av); 2137 av_clear (av);
2154 } 2138 }
… …
2201 2185
2202 coro = SvSTATE (arg [0]); 2186 coro = SvSTATE (arg [0]);
2203 coro_hv = coro->hv; 2187 coro_hv = coro->hv;
2204 2188
2205 coro_set_status (aTHX_ coro, arg + 1, items - 1); 2189 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2206 2190
2207 if (ecb_expect_false (coro->flags & CF_NOCANCEL)) 2191 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2208 { 2192 {
2209 /* coro currently busy cancelling something, so just notify it */ 2193 /* coro currently busy cancelling something, so just notify it */
2210 coro->slf_frame.data = (void *)coro; 2194 coro->slf_frame.data = (void *)coro;
2211 2195
… …
2390 2374
2391static int 2375static int
2392slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2376slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
2393{ 2377{
2394 SV *data = (SV *)frame->data; 2378 SV *data = (SV *)frame->data;
2395 2379
2396 if (CORO_THROW) 2380 if (CORO_THROW)
2397 return 0; 2381 return 0;
2398 2382
2399 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2383 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2400 return 1; 2384 return 1;
… …
2436 cb = sv_2mortal (coro->rouse_cb); 2420 cb = sv_2mortal (coro->rouse_cb);
2437 coro->rouse_cb = 0; 2421 coro->rouse_cb = 0;
2438 } 2422 }
2439 2423
2440 if (!SvROK (cb) 2424 if (!SvROK (cb)
2441 || SvTYPE (SvRV (cb)) != SVt_PVCV 2425 || SvTYPE (SvRV (cb)) != SVt_PVCV
2442 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2426 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2443 croak ("Coro::rouse_wait called with illegal callback argument,"); 2427 croak ("Coro::rouse_wait called with illegal callback argument,");
2444 2428
2445 { 2429 {
2446 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */ 2430 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
… …
2949 { 2933 {
2950 int i; 2934 int i;
2951 /* if we were woken up but can't down, we look through the whole */ 2935 /* if we were woken up but can't down, we look through the whole */
2952 /* waiters list and only add us if we aren't in there already */ 2936 /* waiters list and only add us if we aren't in there already */
2953 /* this avoids some degenerate memory usage cases */ 2937 /* this avoids some degenerate memory usage cases */
2954 for (i = AvFILLp (av); i > 0; --i) // i > 0 is not an off-by-one bug 2938 for (i = AvFILLp (av); i > 0; --i) /* i > 0 is not an off-by-one bug */
2955 if (AvARRAY (av)[i] == coro_hv) 2939 if (AvARRAY (av)[i] == coro_hv)
2956 return 1; 2940 return 1;
2957 2941
2958 av_push (av, SvREFCNT_inc (coro_hv)); 2942 av_push (av, SvREFCNT_inc (coro_hv));
2959 return 1; 2943 return 1;
… …
3167 /* it quickly returns */ 3151 /* it quickly returns */
3168 if (CORO_THROW) 3152 if (CORO_THROW)
3169 return 0; 3153 return 0;
3170 3154
3171 /* one element that is an RV? repeat! */ 3155 /* one element that is an RV? repeat! */
3172 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0])) 3156 if (AvFILLp (state) == 0 && SvTYPE (AvARRAY (state)[0]) != SVt_PV)
3173 return 1; 3157 return 1;
3174 3158
3175 /* restore status */ 3159 /* restore status */
3176 { 3160 {
3177 SV *data_sv = av_pop (state); 3161 SV *data_sv = av_pop (state);
… …
3339#endif 3323#endif
3340 3324
3341#if CORO_JIT 3325#if CORO_JIT
3342 3326
3343static void ecb_noinline ecb_cold 3327static void ecb_noinline ecb_cold
3344pushav_3uv (pTHX_ UV a, UV b, UV c) 3328pushav_4uv (pTHX_ UV a, UV b, UV c, UV d)
3345{ 3329{
3346 dSP; 3330 dSP;
3347 AV *av = newAV (); 3331 AV *av = newAV ();
3348 3332
3333 av_store (av, 3, newSVuv (d));
3349 av_store (av, 2, newSVuv (c)); 3334 av_store (av, 2, newSVuv (c));
3350 av_store (av, 1, newSVuv (b)); 3335 av_store (av, 1, newSVuv (b));
3351 av_store (av, 0, newSVuv (a)); 3336 av_store (av, 0, newSVuv (a));
3352 3337
3353 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 3338 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
… …
3360{ 3345{
3361 dSP; 3346 dSP;
3362 SV *load, *save; 3347 SV *load, *save;
3363 char *map_base; 3348 char *map_base;
3364 char *load_ptr, *save_ptr; 3349 char *load_ptr, *save_ptr;
3365 STRLEN load_len, save_len; 3350 STRLEN load_len, save_len, map_len;
3366 int count; 3351 int count;
3367 3352
3353 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3354
3368 PUSHMARK (SP); 3355 PUSHMARK (SP);
3369 PUTBACK;
3370#define VARx(name,expr,type) pushav_3uv (aTHX_ (UV)&(expr), offsetof (perl_slots, name), sizeof (type)); 3356 #define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type));
3371# include "state.h" 3357 #include "state.h"
3372#undef VARx
3373 count = call_pv ("Coro::State::_jit", G_ARRAY); 3358 count = call_pv ("Coro::State::_jit", G_ARRAY);
3374 SPAGAIN; 3359 SPAGAIN;
3375 3360
3376 save = POPs; save_ptr = SvPVbyte (save, save_len); 3361 save = POPs; save_ptr = SvPVbyte (save, save_len);
3377 load = POPs; load_ptr = SvPVbyte (load, load_len); 3362 load = POPs; load_ptr = SvPVbyte (load, load_len);
3378 3363
3364 map_len = load_len + save_len + 16;
3365
3379 map_base = mmap (0, load_len + save_len + 16, PROT_EXEC | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); 3366 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3380 3367
3381 assert (("Coro: unable mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED)); 3368 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3382 3369
3383 load_perl_slots = (load_save_perl_slots_type)map_base; 3370 load_perl_slots = (load_save_perl_slots_type)map_base;
3384 memcpy (map_base, load_ptr, load_len); 3371 memcpy (map_base, load_ptr, load_len);
3385 3372
3386 map_base += (load_len + 15) & ~15; 3373 map_base += (load_len + 15) & ~15;
3387 3374
3388 save_perl_slots = (load_save_perl_slots_type)map_base; 3375 save_perl_slots = (load_save_perl_slots_type)map_base;
3389 memcpy (map_base, save_ptr, save_len); 3376 memcpy (map_base, save_ptr, save_len);
3377
3378 /* we are good citizens and try to make the page read-only, so the evil evil */
3379 /* hackers might have it a bit more difficult */
3380 mprotect (map_base, map_len, PROT_READ | PROT_EXEC);
3381
3382 PUTBACK;
3383 eval_pv ("undef &Coro::State::_jit", 1);
3390} 3384}
3391 3385
3392#endif 3386#endif
3393 3387
3394MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3388MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
… …
3400#ifdef USE_ITHREADS 3394#ifdef USE_ITHREADS
3401# if CORO_PTHREAD 3395# if CORO_PTHREAD
3402 coro_thx = PERL_GET_CONTEXT; 3396 coro_thx = PERL_GET_CONTEXT;
3403# endif 3397# endif
3404#endif 3398#endif
3405 BOOT_PAGESIZE;
3406
3407 /* perl defines these to check for existance first, but why it doesn't */ 3399 /* perl defines these to check for existance first, but why it doesn't */
3408 /* just create them one at init time is not clear to me, except for */ 3400 /* just create them one at init time is not clear to me, except for */
3409 /* programs trying to delete them, but... */ 3401 /* programs trying to delete them, but... */
3410 /* anyway, we declare this as invalid and make sure they are initialised here */ 3402 /* anyway, we declare this as invalid and make sure they are initialised here */
3411 DEFSV; 3403 DEFSV;
… …
3462 time_init (aTHX); 3454 time_init (aTHX);
3463 3455
3464 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL)); 3456 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3465#if CORO_JIT 3457#if CORO_JIT
3466 PUTBACK; 3458 PUTBACK;
3467 require_pv ("Coro/jit-" CORO_JIT_TYPE ".pl");
3468 jit_init (aTHX); 3459 jit_init (aTHX);
3469 perl_eval_pv ("undef &Coro::State::_jit", 1);
3470 SPAGAIN; 3460 SPAGAIN;
3471#endif 3461#endif
3472} 3462}
3473 3463
3474SV * 3464SV *
… …
3483void 3473void
3484transfer (...) 3474transfer (...)
3485 PROTOTYPE: $$ 3475 PROTOTYPE: $$
3486 CODE: 3476 CODE:
3487 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3477 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3488
3489void
3490_exit (int code)
3491 PROTOTYPE: $
3492 CODE:
3493 _exit (code);
3494 3478
3495SV * 3479SV *
3496clone (Coro::State coro) 3480clone (Coro::State coro)
3497 CODE: 3481 CODE:
3498{ 3482{
… …
3553void 3537void
3554list () 3538list ()
3555 PROTOTYPE: 3539 PROTOTYPE:
3556 PPCODE: 3540 PPCODE:
3557{ 3541{
3558 struct coro *coro; 3542 struct coro *coro;
3559 for (coro = coro_first; coro; coro = coro->next) 3543 for (coro = coro_first; coro; coro = coro->next)
3560 if (coro->hv) 3544 if (coro->hv)
3561 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 3545 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
3562} 3546}
3563 3547
… …
3627 RETVAL = boolSV (coro->flags & ix); 3611 RETVAL = boolSV (coro->flags & ix);
3628 OUTPUT: 3612 OUTPUT:
3629 RETVAL 3613 RETVAL
3630 3614
3631void 3615void
3632throw (Coro::State self, SV *exception = &PL_sv_undef) 3616throw (SV *self, SV *exception = &PL_sv_undef)
3633 PROTOTYPE: $;$ 3617 PROTOTYPE: $;$
3634 CODE: 3618 CODE:
3635{ 3619{
3620 struct coro *coro = SvSTATE (self);
3636 struct coro *current = SvSTATE_current; 3621 struct coro *current = SvSTATE_current;
3637 SV **exceptionp = self == current ? &CORO_THROW : &self->except; 3622 SV **exceptionp = coro == current ? &CORO_THROW : &coro->except;
3638 SvREFCNT_dec (*exceptionp); 3623 SvREFCNT_dec (*exceptionp);
3639 SvGETMAGIC (exception); 3624 SvGETMAGIC (exception);
3640 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0; 3625 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3626
3627 api_ready (aTHX_ self);
3641} 3628}
3642 3629
3643void 3630void
3644api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3631api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3645 PROTOTYPE: $;$ 3632 PROTOTYPE: $;$
… …
3722 3709
3723void 3710void
3724times (Coro::State self) 3711times (Coro::State self)
3725 PPCODE: 3712 PPCODE:
3726{ 3713{
3727 struct coro *current = SvSTATE (coro_current); 3714 struct coro *current = SvSTATE (coro_current);
3728 3715
3729 if (ecb_expect_false (current == self)) 3716 if (ecb_expect_false (current == self))
3730 { 3717 {
3731 coro_times_update (); 3718 coro_times_update ();
3732 coro_times_add (SvSTATE (coro_current)); 3719 coro_times_add (SvSTATE (coro_current));
… …
3775 3762
3776 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3763 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3777 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3764 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3778 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 3765 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3779 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */ 3766 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3780 3767
3781 coro_stash = gv_stashpv ("Coro", TRUE); 3768 coro_stash = gv_stashpv ("Coro", TRUE);
3782 3769
3783 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 3770 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3784 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 3771 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3785 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL)); 3772 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
… …
4007 on_leave = 1 3994 on_leave = 1
4008 PROTOTYPE: & 3995 PROTOTYPE: &
4009 CODE: 3996 CODE:
4010{ 3997{
4011 struct coro *coro = SvSTATE_current; 3998 struct coro *coro = SvSTATE_current;
4012 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 3999 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
4013 4000
4014 block = s_get_cv_croak (block); 4001 block = s_get_cv_croak (block);
4015 4002
4016 if (!*avp) 4003 if (!*avp)
4017 *avp = newAV (); 4004 *avp = newAV ();
… …
4037 4024
4038SV * 4025SV *
4039new (SV *klass, SV *count = 0) 4026new (SV *klass, SV *count = 0)
4040 CODE: 4027 CODE:
4041{ 4028{
4042 int semcnt = 1; 4029 int semcnt = 1;
4043 4030
4044 if (count) 4031 if (count)
4045 { 4032 {
4046 SvGETMAGIC (count); 4033 SvGETMAGIC (count);
4047 4034
… …
4107 XSRETURN_NO; 4094 XSRETURN_NO;
4108} 4095}
4109 4096
4110void 4097void
4111waiters (SV *self) 4098waiters (SV *self)
4112 PPCODE: 4099 PPCODE:
4113{ 4100{
4114 AV *av = (AV *)SvRV (self); 4101 AV *av = (AV *)SvRV (self);
4115 int wcount = AvFILLp (av) + 1 - 1; 4102 int wcount = AvFILLp (av) + 1 - 1;
4116 4103
4117 if (GIMME_V == G_SCALAR) 4104 if (GIMME_V == G_SCALAR)
… …
4126} 4113}
4127 4114
4128MODULE = Coro::State PACKAGE = Coro::SemaphoreSet 4115MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
4129 4116
4130void 4117void
4131_may_delete (SV *sem, int count, int extra_refs) 4118_may_delete (SV *sem, int count, unsigned int extra_refs)
4132 PPCODE: 4119 PPCODE:
4133{ 4120{
4134 AV *av = (AV *)SvRV (sem); 4121 AV *av = (AV *)SvRV (sem);
4135 4122
4136 if (SvREFCNT ((SV *)av) == 1 + extra_refs 4123 if (SvREFCNT ((SV *)av) == 1 + extra_refs
4137 && AvFILLp (av) == 0 /* no waiters, just count */ 4124 && AvFILLp (av) == 0 /* no waiters, just count */
4138 && SvIV (AvARRAY (av)[0]) == count) 4125 && SvIV (AvARRAY (av)[0]) == count)
4139 XSRETURN_YES; 4126 XSRETURN_YES;
… …
4160 4147
4161void 4148void
4162broadcast (SV *self) 4149broadcast (SV *self)
4163 CODE: 4150 CODE:
4164{ 4151{
4165 AV *av = (AV *)SvRV (self); 4152 AV *av = (AV *)SvRV (self);
4166 coro_signal_wake (aTHX_ av, AvFILLp (av)); 4153 coro_signal_wake (aTHX_ av, AvFILLp (av));
4167} 4154}
4168 4155
4169void 4156void
4170send (SV *self) 4157send (SV *self)
… …
4178 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */ 4165 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
4179} 4166}
4180 4167
4181IV 4168IV
4182awaited (SV *self) 4169awaited (SV *self)
4183 CODE: 4170 CODE:
4184 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1; 4171 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
4185 OUTPUT: 4172 OUTPUT:
4186 RETVAL 4173 RETVAL
4187 4174
4188 4175
… …
4193 4180
4194void 4181void
4195_schedule (...) 4182_schedule (...)
4196 CODE: 4183 CODE:
4197{ 4184{
4198 static int incede; 4185 static int incede;
4199 4186
4200 api_cede_notself (aTHX); 4187 api_cede_notself (aTHX);
4201 4188
4202 ++incede; 4189 ++incede;
4203 while (coro_nready >= incede && api_cede (aTHX)) 4190 while (coro_nready >= incede && api_cede (aTHX))
… …
4247 { 4234 {
4248 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect; 4235 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
4249 coro_old_pp_sselect = 0; 4236 coro_old_pp_sselect = 0;
4250 } 4237 }
4251 4238
4239MODULE = Coro::State PACKAGE = Coro::Util
4240
4241void
4242_exit (int code)
4243 CODE:
4244 _exit (code);
4245
4246NV
4247time ()
4248 CODE:
4249 RETVAL = nvtime (aTHX);
4250 OUTPUT:
4251 RETVAL
4252
4253NV
4254gettimeofday ()
4255 PPCODE:
4256{
4257 UV tv [2];
4258 u2time (aTHX_ tv);
4259 EXTEND (SP, 2);
4260 PUSHs (sv_2mortal (newSVuv (tv [0])));
4261 PUSHs (sv_2mortal (newSVuv (tv [1])));
4262}
4263

Diff Legend

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