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.398 by root, Sat May 7 14:11:10 2011 UTC vs.
Revision 1.426 by root, Wed Dec 5 00:19:57 2012 UTC

… …
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 17
18#define ECB_NO_THREADS 1
19#include "ecb.h"
20
21#include <stddef.h>
18#include <stdio.h> 22#include <stdio.h>
19#include <errno.h> 23#include <errno.h>
20#include <assert.h> 24#include <assert.h>
21 25
22#ifndef SVs_PADSTALE 26#ifndef SVs_PADSTALE
23# 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))
24#endif 45#endif
25 46
26#if defined(_WIN32) 47#if defined(_WIN32)
27# undef HAS_GETTIMEOFDAY 48# undef HAS_GETTIMEOFDAY
28# undef setjmp 49# undef setjmp
… …
31# define setjmp _setjmp /* deep magic */ 52# define setjmp _setjmp /* deep magic */
32#else 53#else
33# include <inttypes.h> /* most portable stdint.h */ 54# include <inttypes.h> /* most portable stdint.h */
34#endif 55#endif
35 56
36#ifdef HAVE_MMAP 57#if HAVE_MMAP
37# include <unistd.h> 58# include <unistd.h>
38# include <sys/mman.h> 59# include <sys/mman.h>
39# ifndef MAP_ANONYMOUS 60# ifndef MAP_ANONYMOUS
40# ifdef MAP_ANON 61# ifdef MAP_ANON
41# define MAP_ANONYMOUS MAP_ANON 62# define MAP_ANONYMOUS MAP_ANON
… …
61#endif 82#endif
62 83
63/* the maximum number of idle cctx that will be pooled */ 84/* the maximum number of idle cctx that will be pooled */
64static int cctx_max_idle = 4; 85static int cctx_max_idle = 4;
65 86
87#if defined(DEBUGGING) && PERL_VERSION_ATLEAST(5,12,0)
88# define HAS_SCOPESTACK_NAME 1
89#endif
90
66#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 91#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
67# undef CORO_STACKGUARD 92# undef CORO_STACKGUARD
68#endif 93#endif
69 94
70#ifndef CORO_STACKGUARD 95#ifndef CORO_STACKGUARD
… …
86# define STACKLEVEL ((void *)&stacklevel) 111# define STACKLEVEL ((void *)&stacklevel)
87#endif 112#endif
88 113
89#define IN_DESTRUCT PL_dirty 114#define IN_DESTRUCT PL_dirty
90 115
91#if __GNUC__ >= 3
92# define attribute(x) __attribute__(x)
93# define expect(expr,value) __builtin_expect ((expr), (value))
94# define INLINE static inline
95#else
96# define attribute(x)
97# define expect(expr,value) (expr)
98# define INLINE static
99#endif
100
101#define expect_false(expr) expect ((expr) != 0, 0)
102#define expect_true(expr) expect ((expr) != 0, 1)
103
104#define NOINLINE attribute ((noinline))
105
106#include "CoroAPI.h" 116#include "CoroAPI.h"
107#define GCoroAPI (&coroapi) /* very sneaky */ 117#define GCoroAPI (&coroapi) /* very sneaky */
108 118
109#ifdef USE_ITHREADS 119#ifdef USE_ITHREADS
110# if CORO_PTHREAD 120# if CORO_PTHREAD
… …
166static char times_valid; 176static char times_valid;
167 177
168static struct coro_cctx *cctx_first; 178static struct coro_cctx *cctx_first;
169static int cctx_count, cctx_idle; 179static int cctx_count, cctx_idle;
170 180
171enum { 181enum
182{
172 CC_MAPPED = 0x01, 183 CC_MAPPED = 0x01,
173 CC_NOREUSE = 0x02, /* throw this away after tracing */ 184 CC_NOREUSE = 0x02, /* throw this away after tracing */
174 CC_TRACE = 0x04, 185 CC_TRACE = 0x04,
175 CC_TRACE_SUB = 0x08, /* trace sub calls */ 186 CC_TRACE_SUB = 0x08, /* trace sub calls */
176 CC_TRACE_LINE = 0x10, /* trace each statement */ 187 CC_TRACE_LINE = 0x10, /* trace each statement */
… …
186 void *sptr; 197 void *sptr;
187 size_t ssize; 198 size_t ssize;
188 199
189 /* cpu state */ 200 /* cpu state */
190 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 201 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
202#ifndef NDEBUG
191 JMPENV *idle_te; /* same as idle_sp, but for top_env, TODO: remove once stable */ 203 JMPENV *idle_te; /* same as idle_sp, but for top_env */
204#endif
192 JMPENV *top_env; 205 JMPENV *top_env;
193 coro_context cctx; 206 coro_context cctx;
194 207
195 U32 gen; 208 U32 gen;
196#if CORO_USE_VALGRIND 209#if CORO_USE_VALGRIND
… …
201 214
202static coro_cctx *cctx_current; /* the currently running cctx */ 215static coro_cctx *cctx_current; /* the currently running cctx */
203 216
204/*****************************************************************************/ 217/*****************************************************************************/
205 218
219static MGVTBL coro_state_vtbl;
220
206enum { 221enum
222{
207 CF_RUNNING = 0x0001, /* coroutine is running */ 223 CF_RUNNING = 0x0001, /* coroutine is running */
208 CF_READY = 0x0002, /* coroutine is ready */ 224 CF_READY = 0x0002, /* coroutine is ready */
209 CF_NEW = 0x0004, /* has never been switched to */ 225 CF_NEW = 0x0004, /* has never been switched to */
210 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 226 CF_ZOMBIE = 0x0008, /* coroutine data has been freed */
211 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */ 227 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
212 CF_NOCANCEL = 0x0020, /* cannot cancel, set slf_frame.data to 1 (hackish) */ 228 CF_NOCANCEL = 0x0020, /* cannot cancel, set slf_frame.data to 1 (hackish) */
213}; 229};
214 230
215/* the structure where most of the perl state is stored, overlaid on the cxstack */ 231/* the structure where most of the perl state is stored, overlaid on the cxstack */
216typedef struct 232typedef struct
217{ 233{
218 SV *defsv;
219 AV *defav;
220 SV *errsv;
221 SV *irsgv;
222 HV *hinthv;
223#define VAR(name,type) type name; 234 #define VARx(name,expr,type) type name;
224# include "state.h" 235 #include "state.h"
225#undef VAR
226} perl_slots; 236} perl_slots;
227 237
228// how many context stack entries do we need for perl_slots 238/* how many context stack entries do we need for perl_slots */
229#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT)) 239#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
230 240
231/* this is a structure representing a perl-level coroutine */ 241/* this is a structure representing a perl-level coroutine */
232struct coro { 242struct coro
243{
233 /* the C coroutine allocated to this perl coroutine, if any */ 244 /* the C coroutine allocated to this perl coroutine, if any */
234 coro_cctx *cctx; 245 coro_cctx *cctx;
235 246
236 /* ready queue */ 247 /* ready queue */
237 struct coro *next_ready; 248 struct coro *next_ready;
… …
239 /* state data */ 250 /* state data */
240 struct CoroSLF slf_frame; /* saved slf frame */ 251 struct CoroSLF slf_frame; /* saved slf frame */
241 AV *mainstack; 252 AV *mainstack;
242 perl_slots *slot; /* basically the saved sp */ 253 perl_slots *slot; /* basically the saved sp */
243 254
244 CV *startcv; /* the CV to execute */ 255 CV *startcv; /* the CV to execute */
245 AV *args; /* data associated with this coroutine (initial args) */ 256 AV *args; /* data associated with this coroutine (initial args) */
246 int refcnt; /* coroutines are refcounted, yes */
247 int flags; /* CF_ flags */ 257 int flags; /* CF_ flags */
248 HV *hv; /* the perl hash associated with this coro, if any */ 258 HV *hv; /* the perl hash associated with this coro, if any */
249 259
250 /* statistics */ 260 /* statistics */
251 int usecount; /* number of transfers to this coro */ 261 int usecount; /* number of transfers to this coro */
252 262
253 /* coro process data */ 263 /* coro process data */
254 int prio; 264 int prio;
255 SV *except; /* exception to be thrown */ 265 SV *except; /* exception to be thrown */
256 SV *rouse_cb; 266 SV *rouse_cb; /* last rouse callback */
267 AV *on_destroy; /* callbacks or coros to notify on destroy */
268 AV *status; /* the exit status list */
257 269
258 /* async_pool */ 270 /* async_pool */
259 SV *saved_deffh; 271 SV *saved_deffh;
260 SV *invoke_cb; 272 SV *invoke_cb;
261 AV *invoke_av; 273 AV *invoke_av;
… …
297static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */ 309static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
298static CV *cv_coro_run; 310static CV *cv_coro_run;
299static struct coro *coro_first; 311static struct coro *coro_first;
300#define coro_nready coroapi.nready 312#define coro_nready coroapi.nready
301 313
314/** JIT *********************************************************************/
315
316#if CORO_JIT
317 /* APPLE doesn't have HAVE_MMAP though */
318 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__)
319 #ifndef CORO_JIT_TYPE
320 #if __x86_64 && CORO_JIT_UNIXY
321 #define CORO_JIT_TYPE "amd64-unix"
322 #elif __i386 && CORO_JIT_UNIXY
323 #define CORO_JIT_TYPE "x86-unix"
324 #endif
325 #endif
326#endif
327
328#if !defined(CORO_JIT_TYPE) || !HAVE_MMAP
329 #undef CORO_JIT
330#endif
331
332#if CORO_JIT
333 typedef void (*load_save_perl_slots_type)(perl_slots *);
334 static load_save_perl_slots_type load_perl_slots, save_perl_slots;
335#endif
336
302/** Coro::Select ************************************************************/ 337/** Coro::Select ************************************************************/
303 338
304static OP *(*coro_old_pp_sselect) (pTHX); 339static OP *(*coro_old_pp_sselect) (pTHX);
305static SV *coro_select_select; 340static SV *coro_select_select;
306 341
… …
321 356
322/** time stuff **************************************************************/ 357/** time stuff **************************************************************/
323 358
324#ifdef HAS_GETTIMEOFDAY 359#ifdef HAS_GETTIMEOFDAY
325 360
326static void 361ecb_inline void
327coro_u2time (pTHX_ UV ret[2]) 362coro_u2time (pTHX_ UV ret[2])
328{ 363{
329 struct timeval tv; 364 struct timeval tv;
330 gettimeofday (&tv, 0); 365 gettimeofday (&tv, 0);
331 366
332 ret [0] = tv.tv_sec; 367 ret [0] = tv.tv_sec;
333 ret [1] = tv.tv_usec; 368 ret [1] = tv.tv_usec;
334} 369}
335 370
336static double 371ecb_inline double
337coro_nvtime () 372coro_nvtime (void)
338{ 373{
339 struct timeval tv; 374 struct timeval tv;
340 gettimeofday (&tv, 0); 375 gettimeofday (&tv, 0);
341 376
342 return tv.tv_sec + tv.tv_usec * 1e-6; 377 return tv.tv_sec + tv.tv_usec * 1e-6;
343} 378}
344 379
345static void 380ecb_inline void
346time_init (pTHX) 381time_init (pTHX)
347{ 382{
348 nvtime = coro_nvtime; 383 nvtime = coro_nvtime;
349 u2time = coro_u2time; 384 u2time = coro_u2time;
350} 385}
351 386
352#else 387#else
353 388
354static void 389ecb_inline void
355time_init (pTHX) 390time_init (pTHX)
356{ 391{
357 SV **svp; 392 SV **svp;
358 393
359 require_pv ("Time/HiRes.pm"); 394 require_pv ("Time/HiRes.pm");
360 395
361 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0); 396 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
362 397
363 if (!svp) croak ("Time::HiRes is required, but missing. Caught"); 398 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
364 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught"); 399 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught");
365 400
… …
371 406
372#endif 407#endif
373 408
374/** lowlevel stuff **********************************************************/ 409/** lowlevel stuff **********************************************************/
375 410
376static SV * 411static SV * ecb_noinline
377coro_get_sv (pTHX_ const char *name, int create) 412coro_get_sv (pTHX_ const char *name, int create)
378{ 413{
379#if PERL_VERSION_ATLEAST (5,10,0) 414#if PERL_VERSION_ATLEAST (5,10,0)
380 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 415 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
381 get_sv (name, create); 416 get_sv (name, create);
382#endif 417#endif
383 return get_sv (name, create); 418 return get_sv (name, create);
384} 419}
385 420
386static AV * 421static AV * ecb_noinline
387coro_get_av (pTHX_ const char *name, int create) 422coro_get_av (pTHX_ const char *name, int create)
388{ 423{
389#if PERL_VERSION_ATLEAST (5,10,0) 424#if PERL_VERSION_ATLEAST (5,10,0)
390 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 425 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
391 get_av (name, create); 426 get_av (name, create);
392#endif 427#endif
393 return get_av (name, create); 428 return get_av (name, create);
394} 429}
395 430
396static HV * 431static HV * ecb_noinline
397coro_get_hv (pTHX_ const char *name, int create) 432coro_get_hv (pTHX_ const char *name, int create)
398{ 433{
399#if PERL_VERSION_ATLEAST (5,10,0) 434#if PERL_VERSION_ATLEAST (5,10,0)
400 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 435 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
401 get_hv (name, create); 436 get_hv (name, create);
402#endif 437#endif
403 return get_hv (name, create); 438 return get_hv (name, create);
404} 439}
405 440
406INLINE void 441ecb_inline void
407coro_times_update () 442coro_times_update (void)
408{ 443{
409#ifdef coro_clock_gettime 444#ifdef coro_clock_gettime
410 struct timespec ts; 445 struct timespec ts;
411 446
412 ts.tv_sec = ts.tv_nsec = 0; 447 ts.tv_sec = ts.tv_nsec = 0;
… …
424 time_real [0] = tv [0]; 459 time_real [0] = tv [0];
425 time_real [1] = tv [1] * 1000; 460 time_real [1] = tv [1] * 1000;
426#endif 461#endif
427} 462}
428 463
429INLINE void 464ecb_inline void
430coro_times_add (struct coro *c) 465coro_times_add (struct coro *c)
431{ 466{
432 c->t_real [1] += time_real [1]; 467 c->t_real [1] += time_real [1];
433 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; } 468 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
434 c->t_real [0] += time_real [0]; 469 c->t_real [0] += time_real [0];
… …
436 c->t_cpu [1] += time_cpu [1]; 471 c->t_cpu [1] += time_cpu [1];
437 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; } 472 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
438 c->t_cpu [0] += time_cpu [0]; 473 c->t_cpu [0] += time_cpu [0];
439} 474}
440 475
441INLINE void 476ecb_inline void
442coro_times_sub (struct coro *c) 477coro_times_sub (struct coro *c)
443{ 478{
444 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; } 479 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; }
445 c->t_real [1] -= time_real [1]; 480 c->t_real [1] -= time_real [1];
446 c->t_real [0] -= time_real [0]; 481 c->t_real [0] -= time_real [0];
… …
454/* magic glue */ 489/* magic glue */
455 490
456#define CORO_MAGIC_type_cv 26 491#define CORO_MAGIC_type_cv 26
457#define CORO_MAGIC_type_state PERL_MAGIC_ext 492#define CORO_MAGIC_type_state PERL_MAGIC_ext
458 493
459#define CORO_MAGIC_NN(sv, type) \ 494#define CORO_MAGIC_NN(sv, type) \
460 (expect_true (SvMAGIC (sv)->mg_type == type) \ 495 (ecb_expect_true (SvMAGIC (sv)->mg_type == type) \
461 ? SvMAGIC (sv) \ 496 ? SvMAGIC (sv) \
462 : mg_find (sv, type)) 497 : mg_find (sv, type))
463 498
464#define CORO_MAGIC(sv, type) \ 499#define CORO_MAGIC(sv, type) \
465 (expect_true (SvMAGIC (sv)) \ 500 (ecb_expect_true (SvMAGIC (sv)) \
466 ? CORO_MAGIC_NN (sv, type) \ 501 ? CORO_MAGIC_NN (sv, type) \
467 : 0) 502 : 0)
468 503
469#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv) 504#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
470#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state) 505#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
471 506
472INLINE struct coro * 507ecb_inline MAGIC *
508SvSTATEhv_p (pTHX_ SV *coro)
509{
510 MAGIC *mg;
511
512 if (ecb_expect_true (
513 SvTYPE (coro) == SVt_PVHV
514 && (mg = CORO_MAGIC_state (coro))
515 && mg->mg_virtual == &coro_state_vtbl
516 ))
517 return mg;
518
519 return 0;
520}
521
522ecb_inline struct coro *
473SvSTATE_ (pTHX_ SV *coro) 523SvSTATE_ (pTHX_ SV *coro)
474{ 524{
475 HV *stash;
476 MAGIC *mg; 525 MAGIC *mg;
477 526
478 if (SvROK (coro)) 527 if (SvROK (coro))
479 coro = SvRV (coro); 528 coro = SvRV (coro);
480 529
481 if (expect_false (SvTYPE (coro) != SVt_PVHV)) 530 mg = SvSTATEhv_p (aTHX_ coro);
531 if (!mg)
482 croak ("Coro::State object required"); 532 croak ("Coro::State object required");
483 533
484 stash = SvSTASH (coro);
485 if (expect_false (stash != coro_stash && stash != coro_state_stash))
486 {
487 /* very slow, but rare, check */
488 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
489 croak ("Coro::State object required");
490 }
491
492 mg = CORO_MAGIC_state (coro);
493 return (struct coro *)mg->mg_ptr; 534 return (struct coro *)mg->mg_ptr;
494} 535}
495 536
496#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 537#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
497 538
… …
500#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 541#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
501 542
502/*****************************************************************************/ 543/*****************************************************************************/
503/* padlist management and caching */ 544/* padlist management and caching */
504 545
505static AV * 546ecb_inline PADLIST *
506coro_derive_padlist (pTHX_ CV *cv) 547coro_derive_padlist (pTHX_ CV *cv)
507{ 548{
508 AV *padlist = CvPADLIST (cv); 549 PADLIST *padlist = CvPADLIST (cv);
509 AV *newpadlist, *newpad; 550 PADLIST *newpadlist;
551 PAD *newpad;
552 PADOFFSET const off = PadlistMAX (padlist) + 1;
510 553
511 newpadlist = newAV (); 554 newPADLIST(newpadlist);
555#if !PERL_VERSION_ATLEAST(5,15,3)
556 /* Padlists are AvREAL as of 5.15.3. See perl bug #98092 and perl commit 7d953ba. */
512 AvREAL_off (newpadlist); 557 AvREAL_off (newpadlist);
558#endif
513#if PERL_VERSION_ATLEAST (5,10,0) 559#if PERL_VERSION_ATLEAST (5,10,0)
514 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1); 560 Perl_pad_push (aTHX_ padlist, off);
515#else 561#else
516 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 562 Perl_pad_push (aTHX_ padlist, off, 1);
517#endif 563#endif
518 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 564 newpad = PadlistARRAY (padlist)[off];
519 --AvFILLp (padlist); 565 PadlistMAX (padlist) = off - 1;
520 566
521 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0])); 567 /* Already extended to 2 elements by newPADLIST. */
522 av_store (newpadlist, 1, (SV *)newpad); 568 PadlistMAX (newpadlist) = 1;
569 PadlistNAMES (newpadlist) = (PADNAMELIST *)SvREFCNT_inc_NN (PadlistNAMES (padlist));
570 PadlistARRAY (newpadlist)[1] = newpad;
523 571
524 return newpadlist; 572 return newpadlist;
525} 573}
526 574
527static void 575ecb_inline void
528free_padlist (pTHX_ AV *padlist) 576free_padlist (pTHX_ PADLIST *padlist)
529{ 577{
530 /* may be during global destruction */ 578 /* may be during global destruction */
531 if (!IN_DESTRUCT) 579 if (!IN_DESTRUCT)
532 { 580 {
533 I32 i = AvFILLp (padlist); 581 I32 i = PadlistMAX (padlist);
534 582
535 while (i > 0) /* special-case index 0 */ 583 while (i > 0) /* special-case index 0 */
536 { 584 {
537 /* we try to be extra-careful here */ 585 /* we try to be extra-careful here */
538 AV *av = (AV *)AvARRAY (padlist)[i--]; 586 PAD *pad = PadlistARRAY (padlist)[i--];
539 I32 j = AvFILLp (av); 587 I32 j = PadMAX (pad);
540 588
541 while (j >= 0) 589 while (j >= 0)
542 SvREFCNT_dec (AvARRAY (av)[j--]); 590 SvREFCNT_dec (PadARRAY (pad)[j--]);
543 591
544 AvFILLp (av) = -1; 592 PadMAX (pad) = -1;
545 SvREFCNT_dec (av); 593 SvREFCNT_dec (pad);
546 } 594 }
547 595
548 SvREFCNT_dec (AvARRAY (padlist)[0]); 596 SvREFCNT_dec (PadlistNAMES (padlist));
549 597
598#ifdef NEWPADAPI
599 Safefree (PadlistARRAY (padlist));
600 Safefree (padlist);
601#else
550 AvFILLp (padlist) = -1; 602 AvFILLp (padlist) = -1;
603 AvREAL_off (padlist);
551 SvREFCNT_dec ((SV*)padlist); 604 SvREFCNT_dec ((SV*)padlist);
605#endif
552 } 606 }
553} 607}
554 608
555static int 609static int
556coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 610coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
557{ 611{
558 AV *padlist; 612 PADLIST *padlist;
559 AV *av = (AV *)mg->mg_obj; 613 PADLIST **padlists = (PADLIST **)(mg->mg_ptr + sizeof(size_t));
614 size_t len = *(size_t *)mg->mg_ptr;
560 615
561 /* perl manages to free our internal AV and _then_ call us */ 616 /* perl manages to free our internal AV and _then_ call us */
562 if (IN_DESTRUCT) 617 if (IN_DESTRUCT)
563 return 0; 618 return 0;
564 619
565 /* casting is fun. */ 620 while (len--)
566 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
567 free_padlist (aTHX_ padlist); 621 free_padlist (aTHX_ padlists[len]);
568
569 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
570 622
571 return 0; 623 return 0;
572} 624}
573 625
574static MGVTBL coro_cv_vtbl = { 626static MGVTBL coro_cv_vtbl = {
575 0, 0, 0, 0, 627 0, 0, 0, 0,
576 coro_cv_free 628 coro_cv_free
577}; 629};
578 630
579/* the next two functions merely cache the padlists */ 631/* the next two functions merely cache the padlists */
580static void 632ecb_inline void
581get_padlist (pTHX_ CV *cv) 633get_padlist (pTHX_ CV *cv)
582{ 634{
583 MAGIC *mg = CORO_MAGIC_cv (cv); 635 MAGIC *mg = CORO_MAGIC_cv (cv);
584 AV *av; 636 size_t *lenp;
585 637
586 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 638 if (ecb_expect_true (mg && *(lenp = (size_t *)mg->mg_ptr)))
587 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 639 CvPADLIST (cv) = ((PADLIST **)(mg->mg_ptr + sizeof(size_t)))[--*lenp];
588 else 640 else
589 { 641 {
590#if CORO_PREFER_PERL_FUNCTIONS 642#if CORO_PREFER_PERL_FUNCTIONS
591 /* this is probably cleaner? but also slower! */ 643 /* this is probably cleaner? but also slower! */
592 /* in practise, it seems to be less stable */ 644 /* in practise, it seems to be less stable */
… …
598 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 650 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
599#endif 651#endif
600 } 652 }
601} 653}
602 654
603static void 655ecb_inline void
604put_padlist (pTHX_ CV *cv) 656put_padlist (pTHX_ CV *cv)
605{ 657{
606 MAGIC *mg = CORO_MAGIC_cv (cv); 658 MAGIC *mg = CORO_MAGIC_cv (cv);
607 AV *av;
608 659
609 if (expect_false (!mg)) 660 if (ecb_expect_false (!mg))
661 {
610 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 662 mg = sv_magicext ((SV *)cv, 0, CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
663 Newz (0, mg->mg_ptr ,sizeof (size_t) + sizeof (PADLIST *), char);
664 mg->mg_len = 1; /* so mg_free frees mg_ptr */
665 }
666 else
667 Renew (mg->mg_ptr,
668 sizeof(size_t) + (*(size_t *)mg->mg_ptr + 1) * sizeof(PADLIST *),
669 char);
611 670
612 av = (AV *)mg->mg_obj; 671 ((PADLIST **)(mg->mg_ptr + sizeof (size_t))) [(*(size_t *)mg->mg_ptr)++] = CvPADLIST (cv);
613
614 if (expect_false (AvFILLp (av) >= AvMAX (av)))
615 av_extend (av, AvFILLp (av) + 1);
616
617 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
618} 672}
619 673
620/** load & save, init *******************************************************/ 674/** load & save, init *******************************************************/
621 675
676ecb_inline void
677swap_sv (SV *a, SV *b)
678{
679 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
680 SV tmp;
681
682 /* swap sv_any */
683 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
684
685 /* swap sv_flags */
686 SvFLAGS (&tmp) = SvFLAGS (a);
687 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
688 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
689
690#if PERL_VERSION_ATLEAST (5,10,0)
691 /* perl 5.10 and later complicates this _quite_ a bit, but it also
692 * is much faster, so no quarrels here. alternatively, we could
693 * sv_upgrade to avoid this.
694 */
695 {
696 /* swap sv_u */
697 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
698
699 /* if SvANY points to the head, we need to adjust the pointers,
700 * as the pointer for a still points to b, and maybe vice versa.
701 */
702 #define svany_in_head(type) \
703 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
704
705 if (svany_in_head (SvTYPE (a)))
706 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
707
708 if (svany_in_head (SvTYPE (b)))
709 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
710 }
711#endif
712}
713
622/* swap sv heads, at least logically */ 714/* swap sv heads, at least logically */
623static void 715static void
624swap_svs (pTHX_ Coro__State c) 716swap_svs (pTHX_ Coro__State c)
625{ 717{
626 int i; 718 int i;
627 719
628 for (i = 0; i <= AvFILLp (c->swap_sv); ) 720 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
629 { 721 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
630 SV *a = AvARRAY (c->swap_sv)[i++];
631 SV *b = AvARRAY (c->swap_sv)[i++];
632
633 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
634 SV tmp;
635
636 /* swap sv_any */
637 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
638
639 /* swap sv_flags */
640 SvFLAGS (&tmp) = SvFLAGS (a);
641 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
642 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
643
644#if PERL_VERSION_ATLEAST (5,10,0)
645 /* perl 5.10 complicates this _quite_ a bit, but it also is
646 * much faster, so no quarrels here. alternatively, we could
647 * sv_upgrade to avoid this.
648 */
649 {
650 /* swap sv_u */
651 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
652
653 /* if SvANY points to the head, we need to adjust the pointers,
654 * as the pointer for a still points to b, and maybe vice versa.
655 */
656 #define svany_in_head(type) \
657 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
658
659 if (svany_in_head (SvTYPE (a)))
660 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
661
662 if (svany_in_head (SvTYPE (b)))
663 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
664 }
665#endif
666 }
667} 722}
668 723
669#define SWAP_SVS(coro) \ 724#define SWAP_SVS(coro) \
670 if (expect_false ((coro)->swap_sv)) \ 725 if (ecb_expect_false ((coro)->swap_sv)) \
671 swap_svs (aTHX_ (coro)) 726 swap_svs (aTHX_ (coro))
672 727
673static void 728static void
674on_enterleave_call (pTHX_ SV *cb); 729on_enterleave_call (pTHX_ SV *cb);
675 730
… …
679 perl_slots *slot = c->slot; 734 perl_slots *slot = c->slot;
680 c->slot = 0; 735 c->slot = 0;
681 736
682 PL_mainstack = c->mainstack; 737 PL_mainstack = c->mainstack;
683 738
684 GvSV (PL_defgv) = slot->defsv; 739#if CORO_JIT
685 GvAV (PL_defgv) = slot->defav; 740 load_perl_slots (slot);
686 GvSV (PL_errgv) = slot->errsv; 741#else
687 GvSV (irsgv) = slot->irsgv;
688 GvHV (PL_hintgv) = slot->hinthv;
689
690 #define VAR(name,type) PL_ ## name = slot->name; 742 #define VARx(name,expr,type) expr = slot->name;
691 # include "state.h" 743 #include "state.h"
692 #undef VAR 744#endif
693 745
694 { 746 {
695 dSP; 747 dSP;
696 748
697 CV *cv; 749 CV *cv;
698 750
699 /* now do the ugly restore mess */ 751 /* now do the ugly restore mess */
700 while (expect_true (cv = (CV *)POPs)) 752 while (ecb_expect_true (cv = (CV *)POPs))
701 { 753 {
702 put_padlist (aTHX_ cv); /* mark this padlist as available */ 754 put_padlist (aTHX_ cv); /* mark this padlist as available */
703 CvDEPTH (cv) = PTR2IV (POPs); 755 CvDEPTH (cv) = PTR2IV (POPs);
704 CvPADLIST (cv) = (AV *)POPs; 756 CvPADLIST (cv) = (PADLIST *)POPs;
705 } 757 }
706 758
707 PUTBACK; 759 PUTBACK;
708 } 760 }
709 761
710 slf_frame = c->slf_frame; 762 slf_frame = c->slf_frame;
711 CORO_THROW = c->except; 763 CORO_THROW = c->except;
712 764
713 if (expect_false (enable_times)) 765 if (ecb_expect_false (enable_times))
714 { 766 {
715 if (expect_false (!times_valid)) 767 if (ecb_expect_false (!times_valid))
716 coro_times_update (); 768 coro_times_update ();
717 769
718 coro_times_sub (c); 770 coro_times_sub (c);
719 } 771 }
720 772
721 if (expect_false (c->on_enter)) 773 if (ecb_expect_false (c->on_enter))
722 { 774 {
723 int i; 775 int i;
724 776
725 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 777 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
726 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 778 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
… …
732static void 784static void
733save_perl (pTHX_ Coro__State c) 785save_perl (pTHX_ Coro__State c)
734{ 786{
735 SWAP_SVS (c); 787 SWAP_SVS (c);
736 788
737 if (expect_false (c->on_leave)) 789 if (ecb_expect_false (c->on_leave))
738 { 790 {
739 int i; 791 int i;
740 792
741 for (i = AvFILLp (c->on_leave); i >= 0; --i) 793 for (i = AvFILLp (c->on_leave); i >= 0; --i)
742 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]); 794 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
743 } 795 }
744 796
745 times_valid = 0; 797 times_valid = 0;
746 798
747 if (expect_false (enable_times)) 799 if (ecb_expect_false (enable_times))
748 { 800 {
749 coro_times_update (); times_valid = 1; 801 coro_times_update (); times_valid = 1;
750 coro_times_add (c); 802 coro_times_add (c);
751 } 803 }
752 804
… …
766 818
767 XPUSHs (Nullsv); 819 XPUSHs (Nullsv);
768 /* this loop was inspired by pp_caller */ 820 /* this loop was inspired by pp_caller */
769 for (;;) 821 for (;;)
770 { 822 {
771 while (expect_true (cxix >= 0)) 823 while (ecb_expect_true (cxix >= 0))
772 { 824 {
773 PERL_CONTEXT *cx = &ccstk[cxix--]; 825 PERL_CONTEXT *cx = &ccstk[cxix--];
774 826
775 if (expect_true (CxTYPE (cx) == CXt_SUB) || expect_false (CxTYPE (cx) == CXt_FORMAT)) 827 if (ecb_expect_true (CxTYPE (cx) == CXt_SUB) || ecb_expect_false (CxTYPE (cx) == CXt_FORMAT))
776 { 828 {
777 CV *cv = cx->blk_sub.cv; 829 CV *cv = cx->blk_sub.cv;
778 830
779 if (expect_true (CvDEPTH (cv))) 831 if (ecb_expect_true (CvDEPTH (cv)))
780 { 832 {
781 EXTEND (SP, 3); 833 EXTEND (SP, 3);
782 PUSHs ((SV *)CvPADLIST (cv)); 834 PUSHs ((SV *)CvPADLIST (cv));
783 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv))); 835 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
784 PUSHs ((SV *)cv); 836 PUSHs ((SV *)cv);
… …
787 get_padlist (aTHX_ cv); 839 get_padlist (aTHX_ cv);
788 } 840 }
789 } 841 }
790 } 842 }
791 843
792 if (expect_true (top_si->si_type == PERLSI_MAIN)) 844 if (ecb_expect_true (top_si->si_type == PERLSI_MAIN))
793 break; 845 break;
794 846
795 top_si = top_si->si_prev; 847 top_si = top_si->si_prev;
796 ccstk = top_si->si_cxstack; 848 ccstk = top_si->si_cxstack;
797 cxix = top_si->si_cxix; 849 cxix = top_si->si_cxix;
… …
799 851
800 PUTBACK; 852 PUTBACK;
801 } 853 }
802 854
803 /* allocate some space on the context stack for our purposes */ 855 /* allocate some space on the context stack for our purposes */
804 if (expect_false (cxstack_ix + SLOT_COUNT >= cxstack_max)) 856 if (ecb_expect_false (cxstack_ix + (int)SLOT_COUNT >= cxstack_max))
805 { 857 {
806 unsigned int i; 858 unsigned int i;
807 859
808 for (i = 0; i < SLOT_COUNT; ++i) 860 for (i = 0; i < SLOT_COUNT; ++i)
809 CXINC; 861 CXINC;
… …
814 c->mainstack = PL_mainstack; 866 c->mainstack = PL_mainstack;
815 867
816 { 868 {
817 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 869 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
818 870
819 slot->defav = GvAV (PL_defgv); 871#if CORO_JIT
820 slot->defsv = DEFSV; 872 save_perl_slots (slot);
821 slot->errsv = ERRSV; 873#else
822 slot->irsgv = GvSV (irsgv);
823 slot->hinthv = GvHV (PL_hintgv);
824
825 #define VAR(name,type) slot->name = PL_ ## name; 874 #define VARx(name,expr,type) slot->name = expr;
826 # include "state.h" 875 #include "state.h"
827 #undef VAR 876#endif
828 } 877 }
829} 878}
830 879
831/* 880/*
832 * allocate various perl stacks. This is almost an exact copy 881 * allocate various perl stacks. This is almost an exact copy
… …
863#endif 912#endif
864 913
865 New(54,PL_scopestack,8,I32); 914 New(54,PL_scopestack,8,I32);
866 PL_scopestack_ix = 0; 915 PL_scopestack_ix = 0;
867 PL_scopestack_max = 8; 916 PL_scopestack_max = 8;
917#if HAS_SCOPESTACK_NAME
918 New(54,PL_scopestack_name,8,const char*);
919#endif
868 920
869 New(54,PL_savestack,24,ANY); 921 New(54,PL_savestack,24,ANY);
870 PL_savestack_ix = 0; 922 PL_savestack_ix = 0;
871 PL_savestack_max = 24; 923 PL_savestack_max = 24;
872 924
… …
900 } 952 }
901 953
902 Safefree (PL_tmps_stack); 954 Safefree (PL_tmps_stack);
903 Safefree (PL_markstack); 955 Safefree (PL_markstack);
904 Safefree (PL_scopestack); 956 Safefree (PL_scopestack);
957#if HAS_SCOPESTACK_NAME
958 Safefree (PL_scopestack_name);
959#endif
905 Safefree (PL_savestack); 960 Safefree (PL_savestack);
906#if !PERL_VERSION_ATLEAST (5,10,0) 961#if !PERL_VERSION_ATLEAST (5,10,0)
907 Safefree (PL_retstack); 962 Safefree (PL_retstack);
908#endif 963#endif
909} 964}
… …
955#endif 1010#endif
956 1011
957/* 1012/*
958 * This overrides the default magic get method of %SIG elements. 1013 * This overrides the default magic get method of %SIG elements.
959 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook 1014 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
960 * and instead of trying to save and restore the hash elements, we just provide 1015 * and instead of trying to save and restore the hash elements (extremely slow),
961 * readback here. 1016 * we just provide our own readback here.
962 */ 1017 */
963static int 1018static int ecb_cold
964coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 1019coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
965{ 1020{
966 const char *s = MgPV_nolen_const (mg); 1021 const char *s = MgPV_nolen_const (mg);
967 1022
968 if (*s == '_') 1023 if (*s == '_')
969 { 1024 {
970 SV **svp = 0; 1025 SV **svp = 0;
971 1026
972 if (strEQ (s, "__DIE__" )) svp = &PL_diehook; 1027 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
973 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 1028 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
974 1029
975 if (svp) 1030 if (svp)
976 { 1031 {
977 sv_setsv (sv, *svp ? *svp : &PL_sv_undef); 1032 SV *ssv;
1033
1034 if (!*svp)
1035 ssv = &PL_sv_undef;
1036 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */
1037 ssv = sv_2mortal (newRV_inc (*svp));
1038 else
1039 ssv = *svp;
1040
1041 sv_setsv (sv, ssv);
978 return 0; 1042 return 0;
979 } 1043 }
980 } 1044 }
981 1045
982 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 1046 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
983} 1047}
984 1048
985static int 1049static int ecb_cold
986coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1050coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
987{ 1051{
988 const char *s = MgPV_nolen_const (mg); 1052 const char *s = MgPV_nolen_const (mg);
989 1053
990 if (*s == '_') 1054 if (*s == '_')
… …
1004 } 1068 }
1005 1069
1006 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0; 1070 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
1007} 1071}
1008 1072
1009static int 1073static int ecb_cold
1010coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1074coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
1011{ 1075{
1012 const char *s = MgPV_nolen_const (mg); 1076 const char *s = MgPV_nolen_const (mg);
1013 1077
1014 if (*s == '_') 1078 if (*s == '_')
… …
1049 return 1; 1113 return 1;
1050} 1114}
1051 1115
1052static UNOP init_perl_op; 1116static UNOP init_perl_op;
1053 1117
1054static void NOINLINE /* noinline to keep it out of the transfer fast path */ 1118ecb_noinline static void /* noinline to keep it out of the transfer fast path */
1055init_perl (pTHX_ struct coro *coro) 1119init_perl (pTHX_ struct coro *coro)
1056{ 1120{
1057 /* 1121 /*
1058 * emulate part of the perl startup here. 1122 * emulate part of the perl startup here.
1059 */ 1123 */
… …
1074 PL_parser = 0; 1138 PL_parser = 0;
1075#endif 1139#endif
1076 PL_hints = 0; 1140 PL_hints = 0;
1077 1141
1078 /* recreate the die/warn hooks */ 1142 /* recreate the die/warn hooks */
1079 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1143 PL_diehook = SvREFCNT_inc (rv_diehook);
1080 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1144 PL_warnhook = SvREFCNT_inc (rv_warnhook);
1081 1145
1082 GvSV (PL_defgv) = newSV (0); 1146 GvSV (PL_defgv) = newSV (0);
1083 GvAV (PL_defgv) = coro->args; coro->args = 0; 1147 GvAV (PL_defgv) = coro->args; coro->args = 0;
1084 GvSV (PL_errgv) = newSV (0); 1148 GvSV (PL_errgv) = newSV (0);
1085 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1149 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
1086 GvHV (PL_hintgv) = 0; 1150 GvHV (PL_hintgv) = 0;
… …
1106 /* this newly created coroutine might be run on an existing cctx which most 1170 /* this newly created coroutine might be run on an existing cctx which most
1107 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here. 1171 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
1108 */ 1172 */
1109 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1173 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
1110 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */ 1174 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
1175 slf_frame.destroy = 0;
1111 1176
1112 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1177 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */
1113 init_perl_op.op_next = PL_op; 1178 init_perl_op.op_next = PL_op;
1114 init_perl_op.op_type = OP_ENTERSUB; 1179 init_perl_op.op_type = OP_ENTERSUB;
1115 init_perl_op.op_ppaddr = pp_slf; 1180 init_perl_op.op_ppaddr = pp_slf;
… …
1120 /* copy throw, in case it was set before init_perl */ 1185 /* copy throw, in case it was set before init_perl */
1121 CORO_THROW = coro->except; 1186 CORO_THROW = coro->except;
1122 1187
1123 SWAP_SVS (coro); 1188 SWAP_SVS (coro);
1124 1189
1125 if (expect_false (enable_times)) 1190 if (ecb_expect_false (enable_times))
1126 { 1191 {
1127 coro_times_update (); 1192 coro_times_update ();
1128 coro_times_sub (coro); 1193 coro_times_sub (coro);
1129 } 1194 }
1130} 1195}
… …
1167 SvRV_set (coro_current, (SV *)coro->hv); 1232 SvRV_set (coro_current, (SV *)coro->hv);
1168 1233
1169 load_perl (aTHX_ coro); 1234 load_perl (aTHX_ coro);
1170 1235
1171 coro_unwind_stacks (aTHX); 1236 coro_unwind_stacks (aTHX);
1172 coro_destruct_stacks (aTHX);
1173 1237
1174 /* restore swapped sv's */ 1238 /* restore swapped sv's */
1175 SWAP_SVS (coro); 1239 SWAP_SVS (coro);
1176 1240
1241 coro_destruct_stacks (aTHX);
1242
1177 // now save some sv's to be free'd later 1243 /* now save some sv's to be free'd later */
1178 svf [0] = GvSV (PL_defgv); 1244 svf [0] = GvSV (PL_defgv);
1179 svf [1] = (SV *)GvAV (PL_defgv); 1245 svf [1] = (SV *)GvAV (PL_defgv);
1180 svf [2] = GvSV (PL_errgv); 1246 svf [2] = GvSV (PL_errgv);
1181 svf [3] = (SV *)PL_defoutgv; 1247 svf [3] = (SV *)PL_defoutgv;
1182 svf [4] = PL_rs; 1248 svf [4] = PL_rs;
… …
1202 SvREFCNT_dec (coro->invoke_cb); 1268 SvREFCNT_dec (coro->invoke_cb);
1203 SvREFCNT_dec (coro->invoke_av); 1269 SvREFCNT_dec (coro->invoke_av);
1204 } 1270 }
1205} 1271}
1206 1272
1207INLINE void 1273ecb_inline void
1208free_coro_mortal (pTHX) 1274free_coro_mortal (pTHX)
1209{ 1275{
1210 if (expect_true (coro_mortal)) 1276 if (ecb_expect_true (coro_mortal))
1211 { 1277 {
1212 SvREFCNT_dec (coro_mortal); 1278 SvREFCNT_dec ((SV *)coro_mortal);
1213 coro_mortal = 0; 1279 coro_mortal = 0;
1214 } 1280 }
1215} 1281}
1216 1282
1217static int 1283static int
… …
1350 1416
1351 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1417 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1352} 1418}
1353 1419
1354/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1420/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1355static void NOINLINE 1421static void ecb_noinline
1356cctx_prepare (pTHX) 1422cctx_prepare (pTHX)
1357{ 1423{
1358 PL_top_env = &PL_start_env; 1424 PL_top_env = &PL_start_env;
1359 1425
1360 if (cctx_current->flags & CC_TRACE) 1426 if (cctx_current->flags & CC_TRACE)
… …
1371 slf_frame.prepare = slf_prepare_set_stacklevel; 1437 slf_frame.prepare = slf_prepare_set_stacklevel;
1372 slf_frame.check = slf_check_set_stacklevel; 1438 slf_frame.check = slf_check_set_stacklevel;
1373} 1439}
1374 1440
1375/* the tail of transfer: execute stuff we can only do after a transfer */ 1441/* the tail of transfer: execute stuff we can only do after a transfer */
1376INLINE void 1442ecb_inline void
1377transfer_tail (pTHX) 1443transfer_tail (pTHX)
1378{ 1444{
1379 free_coro_mortal (aTHX); 1445 free_coro_mortal (aTHX);
1446}
1447
1448/* try to exit the same way perl's main function would do */
1449/* we do not bother resetting the environment or other things *7
1450/* that are not, uhm, essential */
1451/* this obviously also doesn't work when perl is embedded */
1452static void ecb_noinline ecb_cold
1453perlish_exit (pTHX)
1454{
1455 int exitstatus = perl_destruct (PL_curinterp);
1456 perl_free (PL_curinterp);
1457 exit (exitstatus);
1380} 1458}
1381 1459
1382/* 1460/*
1383 * this is a _very_ stripped down perl interpreter ;) 1461 * this is a _very_ stripped down perl interpreter ;)
1384 */ 1462 */
… …
1413 */ 1491 */
1414 1492
1415 /* 1493 /*
1416 * If perl-run returns we assume exit() was being called or the coro 1494 * If perl-run returns we assume exit() was being called or the coro
1417 * fell off the end, which seems to be the only valid (non-bug) 1495 * fell off the end, which seems to be the only valid (non-bug)
1418 * reason for perl_run to return. We try to exit by jumping to the 1496 * reason for perl_run to return. We try to mimic whatever perl is normally
1419 * bootstrap-time "top" top_env, as we cannot restore the "main" 1497 * doing in that case. YMMV.
1420 * coroutine as Coro has no such concept.
1421 * This actually isn't valid with the pthread backend, but OSes requiring
1422 * that backend are too broken to do it in a standards-compliant way.
1423 */ 1498 */
1424 PL_top_env = main_top_env; 1499 perlish_exit (aTHX);
1425 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1426 } 1500 }
1427} 1501}
1428 1502
1429static coro_cctx * 1503static coro_cctx *
1430cctx_new () 1504cctx_new (void)
1431{ 1505{
1432 coro_cctx *cctx; 1506 coro_cctx *cctx;
1433 1507
1434 ++cctx_count; 1508 ++cctx_count;
1435 New (0, cctx, 1, coro_cctx); 1509 New (0, cctx, 1, coro_cctx);
… …
1441 return cctx; 1515 return cctx;
1442} 1516}
1443 1517
1444/* create a new cctx only suitable as source */ 1518/* create a new cctx only suitable as source */
1445static coro_cctx * 1519static coro_cctx *
1446cctx_new_empty () 1520cctx_new_empty (void)
1447{ 1521{
1448 coro_cctx *cctx = cctx_new (); 1522 coro_cctx *cctx = cctx_new ();
1449 1523
1450 cctx->sptr = 0; 1524 cctx->sptr = 0;
1451 coro_create (&cctx->cctx, 0, 0, 0, 0); 1525 coro_create (&cctx->cctx, 0, 0, 0, 0);
… …
1453 return cctx; 1527 return cctx;
1454} 1528}
1455 1529
1456/* create a new cctx suitable as destination/running a perl interpreter */ 1530/* create a new cctx suitable as destination/running a perl interpreter */
1457static coro_cctx * 1531static coro_cctx *
1458cctx_new_run () 1532cctx_new_run (void)
1459{ 1533{
1460 coro_cctx *cctx = cctx_new (); 1534 coro_cctx *cctx = cctx_new ();
1461 void *stack_start; 1535 void *stack_start;
1462 size_t stack_size; 1536 size_t stack_size;
1463 1537
1464#if HAVE_MMAP 1538#if HAVE_MMAP
1465 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE; 1539 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1466 /* mmap supposedly does allocate-on-write for us */ 1540 /* mmap supposedly does allocate-on-write for us */
1467 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0); 1541 cctx->sptr = mmap (0, cctx->ssize, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_ANONYMOUS, -1, 0);
1468 1542
1469 if (cctx->sptr != (void *)-1) 1543 if (cctx->sptr != (void *)-1)
1470 { 1544 {
1471 #if CORO_STACKGUARD 1545 #if CORO_STACKGUARD
1472 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE); 1546 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
… …
1533#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE)) 1607#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE))
1534 1608
1535static coro_cctx * 1609static coro_cctx *
1536cctx_get (pTHX) 1610cctx_get (pTHX)
1537{ 1611{
1538 while (expect_true (cctx_first)) 1612 while (ecb_expect_true (cctx_first))
1539 { 1613 {
1540 coro_cctx *cctx = cctx_first; 1614 coro_cctx *cctx = cctx_first;
1541 cctx_first = cctx->next; 1615 cctx_first = cctx->next;
1542 --cctx_idle; 1616 --cctx_idle;
1543 1617
1544 if (expect_true (!CCTX_EXPIRED (cctx))) 1618 if (ecb_expect_true (!CCTX_EXPIRED (cctx)))
1545 return cctx; 1619 return cctx;
1546 1620
1547 cctx_destroy (cctx); 1621 cctx_destroy (cctx);
1548 } 1622 }
1549 1623
… …
1554cctx_put (coro_cctx *cctx) 1628cctx_put (coro_cctx *cctx)
1555{ 1629{
1556 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1630 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr));
1557 1631
1558 /* free another cctx if overlimit */ 1632 /* free another cctx if overlimit */
1559 if (expect_false (cctx_idle >= cctx_max_idle)) 1633 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1560 { 1634 {
1561 coro_cctx *first = cctx_first; 1635 coro_cctx *first = cctx_first;
1562 cctx_first = first->next; 1636 cctx_first = first->next;
1563 --cctx_idle; 1637 --cctx_idle;
1564 1638
… …
1575static void 1649static void
1576transfer_check (pTHX_ struct coro *prev, struct coro *next) 1650transfer_check (pTHX_ struct coro *prev, struct coro *next)
1577{ 1651{
1578 /* TODO: throwing up here is considered harmful */ 1652 /* TODO: throwing up here is considered harmful */
1579 1653
1580 if (expect_true (prev != next)) 1654 if (ecb_expect_true (prev != next))
1581 { 1655 {
1582 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1656 if (ecb_expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1583 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,"); 1657 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1584 1658
1585 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED))) 1659 if (ecb_expect_false (next->flags & (CF_RUNNING | CF_ZOMBIE | CF_SUSPENDED)))
1586 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,"); 1660 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1587 1661
1588#if !PERL_VERSION_ATLEAST (5,10,0) 1662#if !PERL_VERSION_ATLEAST (5,10,0)
1589 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1663 if (ecb_expect_false (PL_lex_state != LEX_NOTPARSING))
1590 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,"); 1664 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1591#endif 1665#endif
1592 } 1666 }
1593} 1667}
1594 1668
1595/* always use the TRANSFER macro */ 1669/* always use the TRANSFER macro */
1596static void NOINLINE /* noinline so we have a fixed stackframe */ 1670static void ecb_noinline /* noinline so we have a fixed stackframe */
1597transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1671transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1598{ 1672{
1599 dSTACKLEVEL; 1673 dSTACKLEVEL;
1600 1674
1601 /* sometimes transfer is only called to set idle_sp */ 1675 /* sometimes transfer is only called to set idle_sp */
1602 if (expect_false (!prev)) 1676 if (ecb_expect_false (!prev))
1603 { 1677 {
1604 cctx_current->idle_sp = STACKLEVEL; 1678 cctx_current->idle_sp = STACKLEVEL;
1605 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1679 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1606 } 1680 }
1607 else if (expect_true (prev != next)) 1681 else if (ecb_expect_true (prev != next))
1608 { 1682 {
1609 coro_cctx *cctx_prev; 1683 coro_cctx *cctx_prev;
1610 1684
1611 if (expect_false (prev->flags & CF_NEW)) 1685 if (ecb_expect_false (prev->flags & CF_NEW))
1612 { 1686 {
1613 /* create a new empty/source context */ 1687 /* create a new empty/source context */
1614 prev->flags &= ~CF_NEW; 1688 prev->flags &= ~CF_NEW;
1615 prev->flags |= CF_RUNNING; 1689 prev->flags |= CF_RUNNING;
1616 } 1690 }
… …
1619 next->flags |= CF_RUNNING; 1693 next->flags |= CF_RUNNING;
1620 1694
1621 /* first get rid of the old state */ 1695 /* first get rid of the old state */
1622 save_perl (aTHX_ prev); 1696 save_perl (aTHX_ prev);
1623 1697
1624 if (expect_false (next->flags & CF_NEW)) 1698 if (ecb_expect_false (next->flags & CF_NEW))
1625 { 1699 {
1626 /* need to start coroutine */ 1700 /* need to start coroutine */
1627 next->flags &= ~CF_NEW; 1701 next->flags &= ~CF_NEW;
1628 /* setup coroutine call */ 1702 /* setup coroutine call */
1629 init_perl (aTHX_ next); 1703 init_perl (aTHX_ next);
1630 } 1704 }
1631 else 1705 else
1632 load_perl (aTHX_ next); 1706 load_perl (aTHX_ next);
1633 1707
1634 /* possibly untie and reuse the cctx */ 1708 /* possibly untie and reuse the cctx */
1635 if (expect_true ( 1709 if (ecb_expect_true (
1636 cctx_current->idle_sp == STACKLEVEL 1710 cctx_current->idle_sp == STACKLEVEL
1637 && !(cctx_current->flags & CC_TRACE) 1711 && !(cctx_current->flags & CC_TRACE)
1638 && !force_cctx 1712 && !force_cctx
1639 )) 1713 ))
1640 { 1714 {
1641 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1715 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */
1642 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te)); 1716 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1643 1717
1644 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */ 1718 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */
1645 /* without this the next cctx_get might destroy the running cctx while still in use */ 1719 /* without this the next cctx_get might destroy the running cctx while still in use */
1646 if (expect_false (CCTX_EXPIRED (cctx_current))) 1720 if (ecb_expect_false (CCTX_EXPIRED (cctx_current)))
1647 if (expect_true (!next->cctx)) 1721 if (ecb_expect_true (!next->cctx))
1648 next->cctx = cctx_get (aTHX); 1722 next->cctx = cctx_get (aTHX);
1649 1723
1650 cctx_put (cctx_current); 1724 cctx_put (cctx_current);
1651 } 1725 }
1652 else 1726 else
1653 prev->cctx = cctx_current; 1727 prev->cctx = cctx_current;
1654 1728
1655 ++next->usecount; 1729 ++next->usecount;
1656 1730
1657 cctx_prev = cctx_current; 1731 cctx_prev = cctx_current;
1658 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX); 1732 cctx_current = ecb_expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1659 1733
1660 next->cctx = 0; 1734 next->cctx = 0;
1661 1735
1662 if (expect_false (cctx_prev != cctx_current)) 1736 if (ecb_expect_false (cctx_prev != cctx_current))
1663 { 1737 {
1664 cctx_prev->top_env = PL_top_env; 1738 cctx_prev->top_env = PL_top_env;
1665 PL_top_env = cctx_current->top_env; 1739 PL_top_env = cctx_current->top_env;
1666 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx); 1740 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1667 } 1741 }
… …
1673#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx)) 1747#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1674#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1748#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1675 1749
1676/** high level stuff ********************************************************/ 1750/** high level stuff ********************************************************/
1677 1751
1752/* this function is actually Coro, not Coro::State, but we call it from here */
1753/* because it is convenient - but it hasn't been declared yet for that reason */
1754static void
1755coro_call_on_destroy (pTHX_ struct coro *coro);
1756
1678static void 1757static void
1679coro_state_destroy (pTHX_ struct coro *coro) 1758coro_state_destroy (pTHX_ struct coro *coro)
1680{ 1759{
1681 if (coro->flags & CF_DESTROYED) 1760 if (coro->flags & CF_ZOMBIE)
1682 return; 1761 return;
1683 1762
1684 slf_destroy (aTHX_ coro); 1763 slf_destroy (aTHX_ coro);
1685 1764
1686 coro->flags |= CF_DESTROYED; 1765 coro->flags |= CF_ZOMBIE;
1687 1766
1688 if (coro->flags & CF_READY) 1767 if (coro->flags & CF_READY)
1689 { 1768 {
1690 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1769 /* reduce nready, as destroying a ready coro effectively unreadies it */
1691 /* alternative: look through all ready queues and remove the coro */ 1770 /* alternative: look through all ready queues and remove the coro */
1692 --coro_nready; 1771 --coro_nready;
1693 } 1772 }
1694 else 1773 else
1695 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1774 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1775
1776 if (coro->next) coro->next->prev = coro->prev;
1777 if (coro->prev) coro->prev->next = coro->next;
1778 if (coro == coro_first) coro_first = coro->next;
1696 1779
1697 if (coro->mainstack 1780 if (coro->mainstack
1698 && coro->mainstack != main_mainstack 1781 && coro->mainstack != main_mainstack
1699 && coro->slot 1782 && coro->slot
1700 && !PL_dirty) 1783 && !PL_dirty)
1701 destroy_perl (aTHX_ coro); 1784 destroy_perl (aTHX_ coro);
1702 1785
1703 if (coro->next) coro->next->prev = coro->prev;
1704 if (coro->prev) coro->prev->next = coro->next;
1705 if (coro == coro_first) coro_first = coro->next;
1706
1707 cctx_destroy (coro->cctx); 1786 cctx_destroy (coro->cctx);
1708 SvREFCNT_dec (coro->startcv); 1787 SvREFCNT_dec (coro->startcv);
1709 SvREFCNT_dec (coro->args); 1788 SvREFCNT_dec (coro->args);
1710 SvREFCNT_dec (coro->swap_sv); 1789 SvREFCNT_dec (coro->swap_sv);
1711 SvREFCNT_dec (CORO_THROW); 1790 SvREFCNT_dec (CORO_THROW);
1791
1792 coro_call_on_destroy (aTHX_ coro);
1793
1794 /* more destruction mayhem in coro_state_free */
1712} 1795}
1713 1796
1714static int 1797static int
1715coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1798coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1716{ 1799{
1717 struct coro *coro = (struct coro *)mg->mg_ptr; 1800 struct coro *coro = (struct coro *)mg->mg_ptr;
1718 mg->mg_ptr = 0; 1801 mg->mg_ptr = 0;
1719 1802
1720 coro->hv = 0;
1721
1722 if (--coro->refcnt < 0)
1723 {
1724 coro_state_destroy (aTHX_ coro); 1803 coro_state_destroy (aTHX_ coro);
1804 SvREFCNT_dec (coro->on_destroy);
1805 SvREFCNT_dec (coro->status);
1806
1725 Safefree (coro); 1807 Safefree (coro);
1726 }
1727 1808
1728 return 0; 1809 return 0;
1729} 1810}
1730 1811
1731static int 1812static int ecb_cold
1732coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1813coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1733{ 1814{
1734 struct coro *coro = (struct coro *)mg->mg_ptr; 1815 /* called when perl clones the current process the slow way (windows process emulation) */
1735 1816 /* WE SIMply nuke the pointers in the copy, causing perl to croak */
1736 ++coro->refcnt; 1817 mg->mg_ptr = 0;
1818 mg->mg_virtual = 0;
1737 1819
1738 return 0; 1820 return 0;
1739} 1821}
1740 1822
1741static MGVTBL coro_state_vtbl = { 1823static MGVTBL coro_state_vtbl = {
… …
1766 TRANSFER (ta, 1); 1848 TRANSFER (ta, 1);
1767} 1849}
1768 1850
1769/** Coro ********************************************************************/ 1851/** Coro ********************************************************************/
1770 1852
1771INLINE void 1853ecb_inline void
1772coro_enq (pTHX_ struct coro *coro) 1854coro_enq (pTHX_ struct coro *coro)
1773{ 1855{
1774 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN]; 1856 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1775 1857
1776 SvREFCNT_inc_NN (coro->hv); 1858 SvREFCNT_inc_NN (coro->hv);
… …
1778 coro->next_ready = 0; 1860 coro->next_ready = 0;
1779 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro; 1861 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1780 ready [1] = coro; 1862 ready [1] = coro;
1781} 1863}
1782 1864
1783INLINE struct coro * 1865ecb_inline struct coro *
1784coro_deq (pTHX) 1866coro_deq (pTHX)
1785{ 1867{
1786 int prio; 1868 int prio;
1787 1869
1788 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; ) 1870 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
… …
1841{ 1923{
1842 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1924 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1843} 1925}
1844 1926
1845/* expects to own a reference to next->hv */ 1927/* expects to own a reference to next->hv */
1846INLINE void 1928ecb_inline void
1847prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1929prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1848{ 1930{
1849 SV *prev_sv = SvRV (coro_current); 1931 SV *prev_sv = SvRV (coro_current);
1850 1932
1851 ta->prev = SvSTATE_hv (prev_sv); 1933 ta->prev = SvSTATE_hv (prev_sv);
… …
1864{ 1946{
1865 for (;;) 1947 for (;;)
1866 { 1948 {
1867 struct coro *next = coro_deq (aTHX); 1949 struct coro *next = coro_deq (aTHX);
1868 1950
1869 if (expect_true (next)) 1951 if (ecb_expect_true (next))
1870 { 1952 {
1871 /* cannot transfer to destroyed coros, skip and look for next */ 1953 /* cannot transfer to destroyed coros, skip and look for next */
1872 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED))) 1954 if (ecb_expect_false (next->flags & (CF_ZOMBIE | CF_SUSPENDED)))
1873 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */ 1955 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1874 else 1956 else
1875 { 1957 {
1876 next->flags &= ~CF_READY; 1958 next->flags &= ~CF_READY;
1877 --coro_nready; 1959 --coro_nready;
… …
1910 } 1992 }
1911 } 1993 }
1912 } 1994 }
1913} 1995}
1914 1996
1915INLINE void 1997ecb_inline void
1916prepare_cede (pTHX_ struct coro_transfer_args *ta) 1998prepare_cede (pTHX_ struct coro_transfer_args *ta)
1917{ 1999{
1918 api_ready (aTHX_ coro_current); 2000 api_ready (aTHX_ coro_current);
1919 prepare_schedule (aTHX_ ta); 2001 prepare_schedule (aTHX_ ta);
1920} 2002}
1921 2003
1922INLINE void 2004ecb_inline void
1923prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 2005prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1924{ 2006{
1925 SV *prev = SvRV (coro_current); 2007 SV *prev = SvRV (coro_current);
1926 2008
1927 if (coro_nready) 2009 if (coro_nready)
… …
1957{ 2039{
1958 struct coro_transfer_args ta; 2040 struct coro_transfer_args ta;
1959 2041
1960 prepare_cede (aTHX_ &ta); 2042 prepare_cede (aTHX_ &ta);
1961 2043
1962 if (expect_true (ta.prev != ta.next)) 2044 if (ecb_expect_true (ta.prev != ta.next))
1963 { 2045 {
1964 TRANSFER (ta, 1); 2046 TRANSFER (ta, 1);
1965 return 1; 2047 return 1;
1966 } 2048 }
1967 else 2049 else
… …
2010 coro->slot->runops = RUNOPS_DEFAULT; 2092 coro->slot->runops = RUNOPS_DEFAULT;
2011 } 2093 }
2012} 2094}
2013 2095
2014static void 2096static void
2097coro_push_av (pTHX_ AV *av, I32 gimme_v)
2098{
2099 if (AvFILLp (av) >= 0 && gimme_v != G_VOID)
2100 {
2101 dSP;
2102
2103 if (gimme_v == G_SCALAR)
2104 XPUSHs (AvARRAY (av)[AvFILLp (av)]);
2105 else
2106 {
2107 int i;
2108 EXTEND (SP, AvFILLp (av) + 1);
2109
2110 for (i = 0; i <= AvFILLp (av); ++i)
2111 PUSHs (AvARRAY (av)[i]);
2112 }
2113
2114 PUTBACK;
2115 }
2116}
2117
2118static void
2119coro_push_on_destroy (pTHX_ struct coro *coro, SV *cb)
2120{
2121 if (!coro->on_destroy)
2122 coro->on_destroy = newAV ();
2123
2124 av_push (coro->on_destroy, cb);
2125}
2126
2127static void
2128slf_destroy_join (pTHX_ struct CoroSLF *frame)
2129{
2130 SvREFCNT_dec ((SV *)((struct coro *)frame->data)->hv);
2131}
2132
2133static int
2134slf_check_join (pTHX_ struct CoroSLF *frame)
2135{
2136 struct coro *coro = (struct coro *)frame->data;
2137
2138 if (!coro->status)
2139 return 1;
2140
2141 frame->destroy = 0;
2142
2143 coro_push_av (aTHX_ coro->status, GIMME_V);
2144
2145 SvREFCNT_dec ((SV *)coro->hv);
2146
2147 return 0;
2148}
2149
2150static void
2151slf_init_join (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2152{
2153 struct coro *coro = SvSTATE (items > 0 ? arg [0] : &PL_sv_undef);
2154
2155 if (items > 1)
2156 croak ("join called with too many arguments");
2157
2158 if (coro->status)
2159 frame->prepare = prepare_nop;
2160 else
2161 {
2162 coro_push_on_destroy (aTHX_ coro, SvREFCNT_inc_NN (SvRV (coro_current)));
2163 frame->prepare = prepare_schedule;
2164 }
2165
2166 frame->check = slf_check_join;
2167 frame->destroy = slf_destroy_join;
2168 frame->data = (void *)coro;
2169 SvREFCNT_inc (coro->hv);
2170}
2171
2172static void
2015coro_call_on_destroy (pTHX_ struct coro *coro) 2173coro_call_on_destroy (pTHX_ struct coro *coro)
2016{ 2174{
2017 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2175 AV *od = coro->on_destroy;
2018 2176
2019 if (on_destroyp) 2177 if (!od)
2020 { 2178 return;
2021 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
2022 AV *on_destroy = sv_2mortal (SvREFCNT_inc ((AV *)SvRV (*on_destroyp)));
2023 AV *status = statusp ? sv_2mortal (SvREFCNT_inc ((AV *)SvRV (*statusp))) : 0;
2024 2179
2025 while (AvFILLp (on_destroy) >= 0) 2180 while (AvFILLp (od) >= 0)
2181 {
2182 SV *cb = sv_2mortal (av_pop (od));
2183
2184 /* coro hv's (and only hv's at the moment) are supported as well */
2185 if (SvSTATEhv_p (aTHX_ cb))
2186 api_ready (aTHX_ cb);
2187 else
2026 { 2188 {
2027 dSP; /* don't disturb outer sp */ 2189 dSP; /* don't disturb outer sp */
2028 SV *cb = av_pop (on_destroy);
2029
2030 PUSHMARK (SP); 2190 PUSHMARK (SP);
2031 2191
2032 if (statusp) 2192 if (coro->status)
2033 { 2193 {
2034 int i; 2194 PUTBACK;
2035 EXTEND (SP, AvFILLp (status) + 1); 2195 coro_push_av (aTHX_ coro->status, G_ARRAY);
2036 2196 SPAGAIN;
2037 for (i = 0; i <= AvFILLp (status); ++i)
2038 PUSHs (AvARRAY (status)[i]);
2039 } 2197 }
2040 2198
2041 PUTBACK; 2199 PUTBACK;
2042 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD); 2200 call_sv (cb, G_VOID | G_DISCARD);
2043 } 2201 }
2044 } 2202 }
2045} 2203}
2046 2204
2047static void 2205static void
2048coro_set_status (pTHX_ HV *coro_hv, SV **arg, int items) 2206coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
2049{ 2207{
2050 AV *av = newAV (); 2208 AV *av;
2209
2210 if (coro->status)
2211 {
2212 av = coro->status;
2213 av_clear (av);
2214 }
2215 else
2216 av = coro->status = newAV ();
2051 2217
2052 /* items are actually not so common, so optimise for this case */ 2218 /* items are actually not so common, so optimise for this case */
2053 if (items) 2219 if (items)
2054 { 2220 {
2055 int i; 2221 int i;
… …
2057 av_extend (av, items - 1); 2223 av_extend (av, items - 1);
2058 2224
2059 for (i = 0; i < items; ++i) 2225 for (i = 0; i < items; ++i)
2060 av_push (av, SvREFCNT_inc_NN (arg [i])); 2226 av_push (av, SvREFCNT_inc_NN (arg [i]));
2061 } 2227 }
2062
2063 hv_store (coro_hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0);
2064} 2228}
2065 2229
2066static void 2230static void
2067slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv) 2231slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2068{ 2232{
… …
2080static void 2244static void
2081slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2245slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2082{ 2246{
2083 HV *coro_hv = (HV *)SvRV (coro_current); 2247 HV *coro_hv = (HV *)SvRV (coro_current);
2084 2248
2085 coro_set_status (aTHX_ coro_hv, arg, items); 2249 coro_set_status (aTHX_ SvSTATE ((SV *)coro_hv), arg, items);
2086 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv); 2250 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2087} 2251}
2088 2252
2089static void 2253static void
2090slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2254slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
… …
2096 croak ("Coro::cancel called without coro object,"); 2260 croak ("Coro::cancel called without coro object,");
2097 2261
2098 coro = SvSTATE (arg [0]); 2262 coro = SvSTATE (arg [0]);
2099 coro_hv = coro->hv; 2263 coro_hv = coro->hv;
2100 2264
2101 coro_set_status (aTHX_ coro_hv, arg + 1, items - 1); 2265 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2102 2266
2103 if (expect_false (coro->flags & CF_NOCANCEL)) 2267 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2104 { 2268 {
2105 /* coro currently busy cancelling something, so just notify it */ 2269 /* coro currently busy cancelling something, so just notify it */
2106 coro->slf_frame.data = (void *)coro; 2270 coro->slf_frame.data = (void *)coro;
2107 2271
2108 frame->prepare = prepare_nop; 2272 frame->prepare = prepare_nop;
… …
2123 * this is ugly, and hopefully fully worth the extra speed. 2287 * this is ugly, and hopefully fully worth the extra speed.
2124 * besides, I can't get the slow-but-safe version working... 2288 * besides, I can't get the slow-but-safe version working...
2125 */ 2289 */
2126 slf_frame.data = 0; 2290 slf_frame.data = 0;
2127 self->flags |= CF_NOCANCEL; 2291 self->flags |= CF_NOCANCEL;
2128
2129 coro_state_destroy (aTHX_ coro); 2292 coro_state_destroy (aTHX_ coro);
2130 coro_call_on_destroy (aTHX_ coro);
2131
2132 self->flags &= ~CF_NOCANCEL; 2293 self->flags &= ~CF_NOCANCEL;
2133 2294
2134 if (slf_frame.data) 2295 if (slf_frame.data)
2135 { 2296 {
2136 /* while we were busy we have been cancelled, so terminate */ 2297 /* while we were busy we have been cancelled, so terminate */
… …
2161 if (coro->cctx) 2322 if (coro->cctx)
2162 croak ("coro inside C callback, unable to cancel at this time, caught"); 2323 croak ("coro inside C callback, unable to cancel at this time, caught");
2163 2324
2164 if (coro->flags & CF_NEW) 2325 if (coro->flags & CF_NEW)
2165 { 2326 {
2166 coro_set_status (aTHX_ coro->hv, arg, items); 2327 coro_set_status (aTHX_ coro, arg, items);
2167 coro_state_destroy (aTHX_ coro); 2328 coro_state_destroy (aTHX_ coro);
2168 coro_call_on_destroy (aTHX_ coro);
2169 } 2329 }
2170 else 2330 else
2171 { 2331 {
2172 if (!coro->slf_frame.prepare) 2332 if (!coro->slf_frame.prepare)
2173 croak ("coro outside an SLF function, unable to cancel at this time, caught"); 2333 croak ("coro outside an SLF function, unable to cancel at this time, caught");
2174 2334
2175 slf_destroy (aTHX_ coro); 2335 slf_destroy (aTHX_ coro);
2176 2336
2177 coro_set_status (aTHX_ coro->hv, arg, items); 2337 coro_set_status (aTHX_ coro, arg, items);
2178 coro->slf_frame.prepare = prepare_nop; 2338 coro->slf_frame.prepare = prepare_nop;
2179 coro->slf_frame.check = slf_check_safe_cancel; 2339 coro->slf_frame.check = slf_check_safe_cancel;
2180 2340
2181 api_ready (aTHX_ coro->hv); 2341 api_ready (aTHX_ (SV *)coro->hv);
2182 } 2342 }
2183 2343
2184 return 1; 2344 return 1;
2185} 2345}
2186 2346
… …
2220slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2380slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2221{ 2381{
2222 HV *hv = (HV *)SvRV (coro_current); 2382 HV *hv = (HV *)SvRV (coro_current);
2223 struct coro *coro = SvSTATE_hv ((SV *)hv); 2383 struct coro *coro = SvSTATE_hv ((SV *)hv);
2224 2384
2225 if (expect_true (coro->saved_deffh)) 2385 if (ecb_expect_true (coro->saved_deffh))
2226 { 2386 {
2227 /* subsequent iteration */ 2387 /* subsequent iteration */
2228 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2388 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
2229 coro->saved_deffh = 0; 2389 coro->saved_deffh = 0;
2230 2390
… …
2290 2450
2291static int 2451static int
2292slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2452slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
2293{ 2453{
2294 SV *data = (SV *)frame->data; 2454 SV *data = (SV *)frame->data;
2295 2455
2296 if (CORO_THROW) 2456 if (CORO_THROW)
2297 return 0; 2457 return 0;
2298 2458
2299 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2459 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2300 return 1; 2460 return 1;
… …
2336 cb = sv_2mortal (coro->rouse_cb); 2496 cb = sv_2mortal (coro->rouse_cb);
2337 coro->rouse_cb = 0; 2497 coro->rouse_cb = 0;
2338 } 2498 }
2339 2499
2340 if (!SvROK (cb) 2500 if (!SvROK (cb)
2341 || SvTYPE (SvRV (cb)) != SVt_PVCV 2501 || SvTYPE (SvRV (cb)) != SVt_PVCV
2342 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2502 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2343 croak ("Coro::rouse_wait called with illegal callback argument,"); 2503 croak ("Coro::rouse_wait called with illegal callback argument,");
2344 2504
2345 { 2505 {
2346 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */ 2506 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
… …
2471static void 2631static void
2472slf_destroy (pTHX_ struct coro *coro) 2632slf_destroy (pTHX_ struct coro *coro)
2473{ 2633{
2474 /* this callback is reserved for slf functions needing to do cleanup */ 2634 /* this callback is reserved for slf functions needing to do cleanup */
2475 if (coro->slf_frame.destroy && coro->slf_frame.prepare && !PL_dirty) 2635 if (coro->slf_frame.destroy && coro->slf_frame.prepare && !PL_dirty)
2476 coro->slf_frame.destroy (aTHX_ coro); 2636 coro->slf_frame.destroy (aTHX_ &coro->slf_frame);
2477 2637
2478 /* 2638 /*
2479 * The on_destroy above most likely is from an SLF call. 2639 * The on_destroy above most likely is from an SLF call.
2480 * Since by definition the SLF call will not finish when we destroy 2640 * Since by definition the SLF call will not finish when we destroy
2481 * the coro, we will have to force-finish it here, otherwise 2641 * the coro, we will have to force-finish it here, otherwise
… …
2496 I32 checkmark; /* mark SP to see how many elements check has pushed */ 2656 I32 checkmark; /* mark SP to see how many elements check has pushed */
2497 2657
2498 /* set up the slf frame, unless it has already been set-up */ 2658 /* set up the slf frame, unless it has already been set-up */
2499 /* the latter happens when a new coro has been started */ 2659 /* the latter happens when a new coro has been started */
2500 /* or when a new cctx was attached to an existing coroutine */ 2660 /* or when a new cctx was attached to an existing coroutine */
2501 if (expect_true (!slf_frame.prepare)) 2661 if (ecb_expect_true (!slf_frame.prepare))
2502 { 2662 {
2503 /* first iteration */ 2663 /* first iteration */
2504 dSP; 2664 dSP;
2505 SV **arg = PL_stack_base + TOPMARK + 1; 2665 SV **arg = PL_stack_base + TOPMARK + 1;
2506 int items = SP - arg; /* args without function object */ 2666 int items = SP - arg; /* args without function object */
… …
2547 while (slf_frame.check (aTHX_ &slf_frame)); 2707 while (slf_frame.check (aTHX_ &slf_frame));
2548 2708
2549 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */ 2709 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */
2550 2710
2551 /* exception handling */ 2711 /* exception handling */
2552 if (expect_false (CORO_THROW)) 2712 if (ecb_expect_false (CORO_THROW))
2553 { 2713 {
2554 SV *exception = sv_2mortal (CORO_THROW); 2714 SV *exception = sv_2mortal (CORO_THROW);
2555 2715
2556 CORO_THROW = 0; 2716 CORO_THROW = 0;
2557 sv_setsv (ERRSV, exception); 2717 sv_setsv (ERRSV, exception);
2558 croak (0); 2718 croak (0);
2559 } 2719 }
2560 2720
2561 /* return value handling - mostly like entersub */ 2721 /* return value handling - mostly like entersub */
2562 /* make sure we put something on the stack in scalar context */ 2722 /* make sure we put something on the stack in scalar context */
2563 if (GIMME_V == G_SCALAR) 2723 if (GIMME_V == G_SCALAR
2724 && ecb_expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2564 { 2725 {
2565 dSP; 2726 dSP;
2566 SV **bot = PL_stack_base + checkmark; 2727 SV **bot = PL_stack_base + checkmark;
2567 2728
2568 if (sp == bot) /* too few, push undef */ 2729 if (sp == bot) /* too few, push undef */
2569 bot [1] = &PL_sv_undef; 2730 bot [1] = &PL_sv_undef;
2570 else if (sp != bot + 1) /* too many, take last one */ 2731 else /* too many, take last one */
2571 bot [1] = *sp; 2732 bot [1] = *sp;
2572 2733
2573 SP = bot + 1; 2734 SP = bot + 1;
2574 2735
2575 PUTBACK; 2736 PUTBACK;
… …
2682{ 2843{
2683 PerlIOBuf base; 2844 PerlIOBuf base;
2684 NV next, every; 2845 NV next, every;
2685} PerlIOCede; 2846} PerlIOCede;
2686 2847
2687static IV 2848static IV ecb_cold
2688PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab) 2849PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab)
2689{ 2850{
2690 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2851 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2691 2852
2692 self->every = SvCUR (arg) ? SvNV (arg) : 0.01; 2853 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
2693 self->next = nvtime () + self->every; 2854 self->next = nvtime () + self->every;
2694 2855
2695 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab); 2856 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
2696} 2857}
2697 2858
2698static SV * 2859static SV * ecb_cold
2699PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags) 2860PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
2700{ 2861{
2701 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2862 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2702 2863
2703 return newSVnv (self->every); 2864 return newSVnv (self->every);
… …
2815 SvREFCNT_dec (cb); 2976 SvREFCNT_dec (cb);
2816 } 2977 }
2817} 2978}
2818 2979
2819static void 2980static void
2820coro_semaphore_destroy (pTHX_ struct coro *coro) 2981coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2821{ 2982{
2822 /* call $sem->adjust (0) to possibly wake up some other waiters */ 2983 /* call $sem->adjust (0) to possibly wake up some other waiters */
2823 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 2984 coro_semaphore_adjust (aTHX_ (AV *)frame->data, 0);
2824} 2985}
2825 2986
2826static int 2987static int
2827slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire) 2988slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2828{ 2989{
2829 AV *av = (AV *)frame->data; 2990 AV *av = (AV *)frame->data;
2830 SV *count_sv = AvARRAY (av)[0]; 2991 SV *count_sv = AvARRAY (av)[0];
2992 SV *coro_hv = SvRV (coro_current);
2831 2993
2832 /* if we are about to throw, don't actually acquire the lock, just throw */ 2994 /* if we are about to throw, don't actually acquire the lock, just throw */
2833 if (CORO_THROW) 2995 if (CORO_THROW)
2834 return 0; 2996 return 0;
2835 else if (SvIVX (count_sv) > 0) 2997 else if (SvIVX (count_sv) > 0)
… …
2847 { 3009 {
2848 int i; 3010 int i;
2849 /* if we were woken up but can't down, we look through the whole */ 3011 /* if we were woken up but can't down, we look through the whole */
2850 /* waiters list and only add us if we aren't in there already */ 3012 /* waiters list and only add us if we aren't in there already */
2851 /* this avoids some degenerate memory usage cases */ 3013 /* this avoids some degenerate memory usage cases */
2852 3014 for (i = AvFILLp (av); i > 0; --i) /* i > 0 is not an off-by-one bug */
2853 for (i = 1; i <= AvFILLp (av); ++i)
2854 if (AvARRAY (av)[i] == SvRV (coro_current)) 3015 if (AvARRAY (av)[i] == coro_hv)
2855 return 1; 3016 return 1;
2856 3017
2857 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3018 av_push (av, SvREFCNT_inc (coro_hv));
2858 return 1; 3019 return 1;
2859 } 3020 }
2860} 3021}
2861 3022
2862static int 3023static int
… …
3115 dSP; 3276 dSP;
3116 3277
3117 static SV *prio_cv; 3278 static SV *prio_cv;
3118 static SV *prio_sv; 3279 static SV *prio_sv;
3119 3280
3120 if (expect_false (!prio_cv)) 3281 if (ecb_expect_false (!prio_cv))
3121 { 3282 {
3122 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0); 3283 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0);
3123 prio_sv = newSViv (0); 3284 prio_sv = newSViv (0);
3124 } 3285 }
3125 3286
… …
3231 } 3392 }
3232 3393
3233 return coro_sv; 3394 return coro_sv;
3234} 3395}
3235 3396
3397#ifndef __cplusplus
3398ecb_cold XS(boot_Coro__State);
3399#endif
3400
3401#if CORO_JIT
3402
3403static void ecb_noinline ecb_cold
3404pushav_4uv (pTHX_ UV a, UV b, UV c, UV d)
3405{
3406 dSP;
3407 AV *av = newAV ();
3408
3409 av_store (av, 3, newSVuv (d));
3410 av_store (av, 2, newSVuv (c));
3411 av_store (av, 1, newSVuv (b));
3412 av_store (av, 0, newSVuv (a));
3413
3414 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
3415
3416 PUTBACK;
3417}
3418
3419static void ecb_noinline ecb_cold
3420jit_init (pTHX)
3421{
3422 dSP;
3423 SV *load, *save;
3424 char *map_base;
3425 char *load_ptr, *save_ptr;
3426 STRLEN load_len, save_len, map_len;
3427 int count;
3428
3429 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3430
3431 PUSHMARK (SP);
3432 #define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type));
3433 #include "state.h"
3434 count = call_pv ("Coro::State::_jit", G_ARRAY);
3435 SPAGAIN;
3436
3437 save = POPs; save_ptr = SvPVbyte (save, save_len);
3438 load = POPs; load_ptr = SvPVbyte (load, load_len);
3439
3440 map_len = load_len + save_len + 16;
3441
3442 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3443
3444 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3445
3446 load_perl_slots = (load_save_perl_slots_type)map_base;
3447 memcpy (map_base, load_ptr, load_len);
3448
3449 map_base += (load_len + 15) & ~15;
3450
3451 save_perl_slots = (load_save_perl_slots_type)map_base;
3452 memcpy (map_base, save_ptr, save_len);
3453
3454 /* we are good citizens and try to make the page read-only, so the evil evil */
3455 /* hackers might have it a bit more difficult */
3456 mprotect (map_base, map_len, PROT_READ | PROT_EXEC);
3457
3458 PUTBACK;
3459 eval_pv ("undef &Coro::State::_jit", 1);
3460}
3461
3462#endif
3463
3236MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3464MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
3237 3465
3238PROTOTYPES: DISABLE 3466PROTOTYPES: DISABLE
3239 3467
3240BOOT: 3468BOOT:
… …
3243# if CORO_PTHREAD 3471# if CORO_PTHREAD
3244 coro_thx = PERL_GET_CONTEXT; 3472 coro_thx = PERL_GET_CONTEXT;
3245# endif 3473# endif
3246#endif 3474#endif
3247 BOOT_PAGESIZE; 3475 BOOT_PAGESIZE;
3476
3477 /* perl defines these to check for existance first, but why it doesn't */
3478 /* just create them one at init time is not clear to me, except for */
3479 /* programs trying to delete them, but... */
3480 /* anyway, we declare this as invalid and make sure they are initialised here */
3481 DEFSV;
3482 ERRSV;
3248 3483
3249 cctx_current = cctx_new_empty (); 3484 cctx_current = cctx_new_empty ();
3250 3485
3251 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3486 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
3252 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3487 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
… …
3295 coroapi.prepare_cede_notself = prepare_cede_notself; 3530 coroapi.prepare_cede_notself = prepare_cede_notself;
3296 3531
3297 time_init (aTHX); 3532 time_init (aTHX);
3298 3533
3299 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL)); 3534 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3535#if CORO_JIT
3536 PUTBACK;
3537 jit_init (aTHX);
3538 SPAGAIN;
3539#endif
3300} 3540}
3301 3541
3302SV * 3542SV *
3303new (SV *klass, ...) 3543new (SV *klass, ...)
3304 ALIAS: 3544 ALIAS:
… …
3381void 3621void
3382list () 3622list ()
3383 PROTOTYPE: 3623 PROTOTYPE:
3384 PPCODE: 3624 PPCODE:
3385{ 3625{
3386 struct coro *coro; 3626 struct coro *coro;
3387 for (coro = coro_first; coro; coro = coro->next) 3627 for (coro = coro_first; coro; coro = coro->next)
3388 if (coro->hv) 3628 if (coro->hv)
3389 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 3629 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
3390} 3630}
3391 3631
… …
3446 PROTOTYPE: $ 3686 PROTOTYPE: $
3447 ALIAS: 3687 ALIAS:
3448 is_ready = CF_READY 3688 is_ready = CF_READY
3449 is_running = CF_RUNNING 3689 is_running = CF_RUNNING
3450 is_new = CF_NEW 3690 is_new = CF_NEW
3451 is_destroyed = CF_DESTROYED 3691 is_destroyed = CF_ZOMBIE
3692 is_zombie = CF_ZOMBIE
3452 is_suspended = CF_SUSPENDED 3693 is_suspended = CF_SUSPENDED
3453 CODE: 3694 CODE:
3454 RETVAL = boolSV (coro->flags & ix); 3695 RETVAL = boolSV (coro->flags & ix);
3455 OUTPUT: 3696 OUTPUT:
3456 RETVAL 3697 RETVAL
3457 3698
3458void 3699void
3459throw (Coro::State self, SV *exception = &PL_sv_undef) 3700throw (SV *self, SV *exception = &PL_sv_undef)
3460 PROTOTYPE: $;$ 3701 PROTOTYPE: $;$
3461 CODE: 3702 CODE:
3462{ 3703{
3704 struct coro *coro = SvSTATE (self);
3463 struct coro *current = SvSTATE_current; 3705 struct coro *current = SvSTATE_current;
3464 SV **exceptionp = self == current ? &CORO_THROW : &self->except; 3706 SV **exceptionp = coro == current ? &CORO_THROW : &coro->except;
3465 SvREFCNT_dec (*exceptionp); 3707 SvREFCNT_dec (*exceptionp);
3466 SvGETMAGIC (exception); 3708 SvGETMAGIC (exception);
3467 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0; 3709 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3710
3711 api_ready (aTHX_ self);
3468} 3712}
3469 3713
3470void 3714void
3471api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3715api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3472 PROTOTYPE: $;$ 3716 PROTOTYPE: $;$
… …
3549 3793
3550void 3794void
3551times (Coro::State self) 3795times (Coro::State self)
3552 PPCODE: 3796 PPCODE:
3553{ 3797{
3554 struct coro *current = SvSTATE (coro_current); 3798 struct coro *current = SvSTATE (coro_current);
3555 3799
3556 if (expect_false (current == self)) 3800 if (ecb_expect_false (current == self))
3557 { 3801 {
3558 coro_times_update (); 3802 coro_times_update ();
3559 coro_times_add (SvSTATE (coro_current)); 3803 coro_times_add (SvSTATE (coro_current));
3560 } 3804 }
3561 3805
3562 EXTEND (SP, 2); 3806 EXTEND (SP, 2);
3563 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9))); 3807 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3564 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9))); 3808 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3565 3809
3566 if (expect_false (current == self)) 3810 if (ecb_expect_false (current == self))
3567 coro_times_sub (SvSTATE (coro_current)); 3811 coro_times_sub (SvSTATE (coro_current));
3568} 3812}
3569 3813
3570void 3814void
3571swap_sv (Coro::State coro, SV *sv, SV *swapsv) 3815swap_sv (Coro::State coro, SV *sv, SV *swapsv)
… …
3602 3846
3603 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3847 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3604 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3848 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3605 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 3849 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3606 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */ 3850 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3607 3851
3608 coro_stash = gv_stashpv ("Coro", TRUE); 3852 coro_stash = gv_stashpv ("Coro", TRUE);
3609 3853
3610 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 3854 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3611 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 3855 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3612 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL)); 3856 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
… …
3644void 3888void
3645_destroy (Coro::State coro) 3889_destroy (Coro::State coro)
3646 CODE: 3890 CODE:
3647 /* used by the manager thread */ 3891 /* used by the manager thread */
3648 coro_state_destroy (aTHX_ coro); 3892 coro_state_destroy (aTHX_ coro);
3893
3894void
3895on_destroy (Coro::State coro, SV *cb)
3896 CODE:
3649 coro_call_on_destroy (aTHX_ coro); 3897 coro_push_on_destroy (aTHX_ coro, newSVsv (cb));
3898
3899void
3900join (...)
3901 CODE:
3902 CORO_EXECUTE_SLF_XS (slf_init_join);
3650 3903
3651void 3904void
3652terminate (...) 3905terminate (...)
3653 CODE: 3906 CODE:
3654 CORO_EXECUTE_SLF_XS (slf_init_terminate); 3907 CORO_EXECUTE_SLF_XS (slf_init_terminate);
… …
3825 on_leave = 1 4078 on_leave = 1
3826 PROTOTYPE: & 4079 PROTOTYPE: &
3827 CODE: 4080 CODE:
3828{ 4081{
3829 struct coro *coro = SvSTATE_current; 4082 struct coro *coro = SvSTATE_current;
3830 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 4083 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3831 4084
3832 block = s_get_cv_croak (block); 4085 block = s_get_cv_croak (block);
3833 4086
3834 if (!*avp) 4087 if (!*avp)
3835 *avp = newAV (); 4088 *avp = newAV ();
… …
3855 4108
3856SV * 4109SV *
3857new (SV *klass, SV *count = 0) 4110new (SV *klass, SV *count = 0)
3858 CODE: 4111 CODE:
3859{ 4112{
3860 int semcnt = 1; 4113 int semcnt = 1;
3861 4114
3862 if (count) 4115 if (count)
3863 { 4116 {
3864 SvGETMAGIC (count); 4117 SvGETMAGIC (count);
3865 4118
… …
3925 XSRETURN_NO; 4178 XSRETURN_NO;
3926} 4179}
3927 4180
3928void 4181void
3929waiters (SV *self) 4182waiters (SV *self)
3930 PPCODE: 4183 PPCODE:
3931{ 4184{
3932 AV *av = (AV *)SvRV (self); 4185 AV *av = (AV *)SvRV (self);
3933 int wcount = AvFILLp (av) + 1 - 1; 4186 int wcount = AvFILLp (av) + 1 - 1;
3934 4187
3935 if (GIMME_V == G_SCALAR) 4188 if (GIMME_V == G_SCALAR)
… …
3944} 4197}
3945 4198
3946MODULE = Coro::State PACKAGE = Coro::SemaphoreSet 4199MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3947 4200
3948void 4201void
3949_may_delete (SV *sem, int count, int extra_refs) 4202_may_delete (SV *sem, int count, unsigned int extra_refs)
3950 PPCODE: 4203 PPCODE:
3951{ 4204{
3952 AV *av = (AV *)SvRV (sem); 4205 AV *av = (AV *)SvRV (sem);
3953 4206
3954 if (SvREFCNT ((SV *)av) == 1 + extra_refs 4207 if (SvREFCNT ((SV *)av) == 1 + extra_refs
3955 && AvFILLp (av) == 0 /* no waiters, just count */ 4208 && AvFILLp (av) == 0 /* no waiters, just count */
3956 && SvIV (AvARRAY (av)[0]) == count) 4209 && SvIV (AvARRAY (av)[0]) == count)
3957 XSRETURN_YES; 4210 XSRETURN_YES;
… …
3978 4231
3979void 4232void
3980broadcast (SV *self) 4233broadcast (SV *self)
3981 CODE: 4234 CODE:
3982{ 4235{
3983 AV *av = (AV *)SvRV (self); 4236 AV *av = (AV *)SvRV (self);
3984 coro_signal_wake (aTHX_ av, AvFILLp (av)); 4237 coro_signal_wake (aTHX_ av, AvFILLp (av));
3985} 4238}
3986 4239
3987void 4240void
3988send (SV *self) 4241send (SV *self)
… …
3996 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */ 4249 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
3997} 4250}
3998 4251
3999IV 4252IV
4000awaited (SV *self) 4253awaited (SV *self)
4001 CODE: 4254 CODE:
4002 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1; 4255 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
4003 OUTPUT: 4256 OUTPUT:
4004 RETVAL 4257 RETVAL
4005 4258
4006 4259
… …
4011 4264
4012void 4265void
4013_schedule (...) 4266_schedule (...)
4014 CODE: 4267 CODE:
4015{ 4268{
4016 static int incede; 4269 static int incede;
4017 4270
4018 api_cede_notself (aTHX); 4271 api_cede_notself (aTHX);
4019 4272
4020 ++incede; 4273 ++incede;
4021 while (coro_nready >= incede && api_cede (aTHX)) 4274 while (coro_nready >= incede && api_cede (aTHX))

Diff Legend

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