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.395 by root, Fri May 6 07:22:14 2011 UTC vs.
Revision 1.428 by root, Wed Dec 5 16:34:12 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
… …
126static void (*u2time)(pTHX_ UV ret[2]); 136static void (*u2time)(pTHX_ UV ret[2]);
127 137
128/* we hijack an hopefully unused CV flag for our purposes */ 138/* we hijack an hopefully unused CV flag for our purposes */
129#define CVf_SLF 0x4000 139#define CVf_SLF 0x4000
130static OP *pp_slf (pTHX); 140static OP *pp_slf (pTHX);
141static void slf_destroy (pTHX_ struct coro *coro);
131 142
132static U32 cctx_gen; 143static U32 cctx_gen;
133static size_t cctx_stacksize = CORO_STACKSIZE; 144static size_t cctx_stacksize = CORO_STACKSIZE;
134static struct CoroAPI coroapi; 145static struct CoroAPI coroapi;
135static AV *main_mainstack; /* used to differentiate between $main and others */ 146static AV *main_mainstack; /* used to differentiate between $main and others */
… …
165static char times_valid; 176static char times_valid;
166 177
167static struct coro_cctx *cctx_first; 178static struct coro_cctx *cctx_first;
168static int cctx_count, cctx_idle; 179static int cctx_count, cctx_idle;
169 180
170enum { 181enum
182{
171 CC_MAPPED = 0x01, 183 CC_MAPPED = 0x01,
172 CC_NOREUSE = 0x02, /* throw this away after tracing */ 184 CC_NOREUSE = 0x02, /* throw this away after tracing */
173 CC_TRACE = 0x04, 185 CC_TRACE = 0x04,
174 CC_TRACE_SUB = 0x08, /* trace sub calls */ 186 CC_TRACE_SUB = 0x08, /* trace sub calls */
175 CC_TRACE_LINE = 0x10, /* trace each statement */ 187 CC_TRACE_LINE = 0x10, /* trace each statement */
… …
185 void *sptr; 197 void *sptr;
186 size_t ssize; 198 size_t ssize;
187 199
188 /* cpu state */ 200 /* cpu state */
189 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
190 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
191 JMPENV *top_env; 205 JMPENV *top_env;
192 coro_context cctx; 206 coro_context cctx;
193 207
194 U32 gen; 208 U32 gen;
195#if CORO_USE_VALGRIND 209#if CORO_USE_VALGRIND
… …
200 214
201static coro_cctx *cctx_current; /* the currently running cctx */ 215static coro_cctx *cctx_current; /* the currently running cctx */
202 216
203/*****************************************************************************/ 217/*****************************************************************************/
204 218
219static MGVTBL coro_state_vtbl;
220
205enum { 221enum
222{
206 CF_RUNNING = 0x0001, /* coroutine is running */ 223 CF_RUNNING = 0x0001, /* coroutine is running */
207 CF_READY = 0x0002, /* coroutine is ready */ 224 CF_READY = 0x0002, /* coroutine is ready */
208 CF_NEW = 0x0004, /* has never been switched to */ 225 CF_NEW = 0x0004, /* has never been switched to */
209 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 226 CF_ZOMBIE = 0x0008, /* coroutine data has been freed */
210 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */ 227 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
211 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) */
212}; 229};
213 230
214/* 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 */
215typedef struct 232typedef struct
216{ 233{
217 SV *defsv;
218 AV *defav;
219 SV *errsv;
220 SV *irsgv;
221 HV *hinthv;
222#define VAR(name,type) type name; 234 #define VARx(name,expr,type) type name;
223# include "state.h" 235 #include "state.h"
224#undef VAR
225} perl_slots; 236} perl_slots;
226 237
238/* how many context stack entries do we need for perl_slots */
227#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))
228 240
229/* this is a structure representing a perl-level coroutine */ 241/* this is a structure representing a perl-level coroutine */
230struct coro { 242struct coro
243{
231 /* the C coroutine allocated to this perl coroutine, if any */ 244 /* the C coroutine allocated to this perl coroutine, if any */
232 coro_cctx *cctx; 245 coro_cctx *cctx;
233 246
234 /* ready queue */ 247 /* ready queue */
235 struct coro *next_ready; 248 struct coro *next_ready;
… …
237 /* state data */ 250 /* state data */
238 struct CoroSLF slf_frame; /* saved slf frame */ 251 struct CoroSLF slf_frame; /* saved slf frame */
239 AV *mainstack; 252 AV *mainstack;
240 perl_slots *slot; /* basically the saved sp */ 253 perl_slots *slot; /* basically the saved sp */
241 254
242 CV *startcv; /* the CV to execute */ 255 CV *startcv; /* the CV to execute */
243 AV *args; /* data associated with this coroutine (initial args) */ 256 AV *args; /* data associated with this coroutine (initial args) */
244 int refcnt; /* coroutines are refcounted, yes */
245 int flags; /* CF_ flags */ 257 int flags; /* CF_ flags */
246 HV *hv; /* the perl hash associated with this coro, if any */ 258 HV *hv; /* the perl hash associated with this coro, if any */
247 void (*on_destroy)(pTHX_ struct coro *coro); /* for temporary use by xs in critical sections */
248 259
249 /* statistics */ 260 /* statistics */
250 int usecount; /* number of transfers to this coro */ 261 int usecount; /* number of transfers to this coro */
251 262
252 /* coro process data */ 263 /* coro process data */
253 int prio; 264 int prio;
254 SV *except; /* exception to be thrown */ 265 SV *except; /* exception to be thrown */
255 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 */
256 269
257 /* async_pool */ 270 /* async_pool */
258 SV *saved_deffh; 271 SV *saved_deffh;
259 SV *invoke_cb; 272 SV *invoke_cb;
260 AV *invoke_av; 273 AV *invoke_av;
… …
292 305
293/* for Coro.pm */ 306/* for Coro.pm */
294static SV *coro_current; 307static SV *coro_current;
295static SV *coro_readyhook; 308static SV *coro_readyhook;
296static 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 */
297static CV *cv_coro_run, *cv_coro_terminate; 310static CV *cv_coro_run;
298static struct coro *coro_first; 311static struct coro *coro_first;
299#define coro_nready coroapi.nready 312#define coro_nready coroapi.nready
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
300 336
301/** Coro::Select ************************************************************/ 337/** Coro::Select ************************************************************/
302 338
303static OP *(*coro_old_pp_sselect) (pTHX); 339static OP *(*coro_old_pp_sselect) (pTHX);
304static SV *coro_select_select; 340static SV *coro_select_select;
… …
320 356
321/** time stuff **************************************************************/ 357/** time stuff **************************************************************/
322 358
323#ifdef HAS_GETTIMEOFDAY 359#ifdef HAS_GETTIMEOFDAY
324 360
325static void 361ecb_inline void
326coro_u2time (pTHX_ UV ret[2]) 362coro_u2time (pTHX_ UV ret[2])
327{ 363{
328 struct timeval tv; 364 struct timeval tv;
329 gettimeofday (&tv, 0); 365 gettimeofday (&tv, 0);
330 366
331 ret [0] = tv.tv_sec; 367 ret [0] = tv.tv_sec;
332 ret [1] = tv.tv_usec; 368 ret [1] = tv.tv_usec;
333} 369}
334 370
335static double 371ecb_inline double
336coro_nvtime () 372coro_nvtime (void)
337{ 373{
338 struct timeval tv; 374 struct timeval tv;
339 gettimeofday (&tv, 0); 375 gettimeofday (&tv, 0);
340 376
341 return tv.tv_sec + tv.tv_usec * 1e-6; 377 return tv.tv_sec + tv.tv_usec * 1e-6;
342} 378}
343 379
344static void 380ecb_inline void
345time_init (pTHX) 381time_init (pTHX)
346{ 382{
347 nvtime = coro_nvtime; 383 nvtime = coro_nvtime;
348 u2time = coro_u2time; 384 u2time = coro_u2time;
349} 385}
350 386
351#else 387#else
352 388
353static void 389ecb_inline void
354time_init (pTHX) 390time_init (pTHX)
355{ 391{
356 SV **svp; 392 SV **svp;
357 393
358 require_pv ("Time/HiRes.pm"); 394 require_pv ("Time/HiRes.pm");
359 395
360 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0); 396 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
361 397
362 if (!svp) croak ("Time::HiRes is required, but missing. Caught"); 398 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
363 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");
364 400
… …
370 406
371#endif 407#endif
372 408
373/** lowlevel stuff **********************************************************/ 409/** lowlevel stuff **********************************************************/
374 410
375static SV * 411static SV * ecb_noinline
376coro_get_sv (pTHX_ const char *name, int create) 412coro_get_sv (pTHX_ const char *name, int create)
377{ 413{
378#if PERL_VERSION_ATLEAST (5,10,0) 414#if PERL_VERSION_ATLEAST (5,10,0)
379 /* 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 */
380 get_sv (name, create); 416 get_sv (name, create);
381#endif 417#endif
382 return get_sv (name, create); 418 return get_sv (name, create);
383} 419}
384 420
385static AV * 421static AV * ecb_noinline
386coro_get_av (pTHX_ const char *name, int create) 422coro_get_av (pTHX_ const char *name, int create)
387{ 423{
388#if PERL_VERSION_ATLEAST (5,10,0) 424#if PERL_VERSION_ATLEAST (5,10,0)
389 /* 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 */
390 get_av (name, create); 426 get_av (name, create);
391#endif 427#endif
392 return get_av (name, create); 428 return get_av (name, create);
393} 429}
394 430
395static HV * 431static HV * ecb_noinline
396coro_get_hv (pTHX_ const char *name, int create) 432coro_get_hv (pTHX_ const char *name, int create)
397{ 433{
398#if PERL_VERSION_ATLEAST (5,10,0) 434#if PERL_VERSION_ATLEAST (5,10,0)
399 /* 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 */
400 get_hv (name, create); 436 get_hv (name, create);
401#endif 437#endif
402 return get_hv (name, create); 438 return get_hv (name, create);
403} 439}
404 440
405INLINE void 441ecb_inline void
406coro_times_update () 442coro_times_update (void)
407{ 443{
408#ifdef coro_clock_gettime 444#ifdef coro_clock_gettime
409 struct timespec ts; 445 struct timespec ts;
410 446
411 ts.tv_sec = ts.tv_nsec = 0; 447 ts.tv_sec = ts.tv_nsec = 0;
… …
423 time_real [0] = tv [0]; 459 time_real [0] = tv [0];
424 time_real [1] = tv [1] * 1000; 460 time_real [1] = tv [1] * 1000;
425#endif 461#endif
426} 462}
427 463
428INLINE void 464ecb_inline void
429coro_times_add (struct coro *c) 465coro_times_add (struct coro *c)
430{ 466{
431 c->t_real [1] += time_real [1]; 467 c->t_real [1] += time_real [1];
432 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]; }
433 c->t_real [0] += time_real [0]; 469 c->t_real [0] += time_real [0];
… …
435 c->t_cpu [1] += time_cpu [1]; 471 c->t_cpu [1] += time_cpu [1];
436 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]; }
437 c->t_cpu [0] += time_cpu [0]; 473 c->t_cpu [0] += time_cpu [0];
438} 474}
439 475
440INLINE void 476ecb_inline void
441coro_times_sub (struct coro *c) 477coro_times_sub (struct coro *c)
442{ 478{
443 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]; }
444 c->t_real [1] -= time_real [1]; 480 c->t_real [1] -= time_real [1];
445 c->t_real [0] -= time_real [0]; 481 c->t_real [0] -= time_real [0];
… …
453/* magic glue */ 489/* magic glue */
454 490
455#define CORO_MAGIC_type_cv 26 491#define CORO_MAGIC_type_cv 26
456#define CORO_MAGIC_type_state PERL_MAGIC_ext 492#define CORO_MAGIC_type_state PERL_MAGIC_ext
457 493
458#define CORO_MAGIC_NN(sv, type) \ 494#define CORO_MAGIC_NN(sv, type) \
459 (expect_true (SvMAGIC (sv)->mg_type == type) \ 495 (ecb_expect_true (SvMAGIC (sv)->mg_type == type) \
460 ? SvMAGIC (sv) \ 496 ? SvMAGIC (sv) \
461 : mg_find (sv, type)) 497 : mg_find (sv, type))
462 498
463#define CORO_MAGIC(sv, type) \ 499#define CORO_MAGIC(sv, type) \
464 (expect_true (SvMAGIC (sv)) \ 500 (ecb_expect_true (SvMAGIC (sv)) \
465 ? CORO_MAGIC_NN (sv, type) \ 501 ? CORO_MAGIC_NN (sv, type) \
466 : 0) 502 : 0)
467 503
468#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)
469#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)
470 506
471INLINE 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 *
472SvSTATE_ (pTHX_ SV *coro) 523SvSTATE_ (pTHX_ SV *coro)
473{ 524{
474 HV *stash;
475 MAGIC *mg; 525 MAGIC *mg;
476 526
477 if (SvROK (coro)) 527 if (SvROK (coro))
478 coro = SvRV (coro); 528 coro = SvRV (coro);
479 529
480 if (expect_false (SvTYPE (coro) != SVt_PVHV)) 530 mg = SvSTATEhv_p (aTHX_ coro);
531 if (!mg)
481 croak ("Coro::State object required"); 532 croak ("Coro::State object required");
482 533
483 stash = SvSTASH (coro);
484 if (expect_false (stash != coro_stash && stash != coro_state_stash))
485 {
486 /* very slow, but rare, check */
487 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
488 croak ("Coro::State object required");
489 }
490
491 mg = CORO_MAGIC_state (coro);
492 return (struct coro *)mg->mg_ptr; 534 return (struct coro *)mg->mg_ptr;
493} 535}
494 536
495#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 537#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
496 538
… …
499#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 541#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
500 542
501/*****************************************************************************/ 543/*****************************************************************************/
502/* padlist management and caching */ 544/* padlist management and caching */
503 545
504static AV * 546ecb_inline PADLIST *
505coro_derive_padlist (pTHX_ CV *cv) 547coro_derive_padlist (pTHX_ CV *cv)
506{ 548{
507 AV *padlist = CvPADLIST (cv); 549 PADLIST *padlist = CvPADLIST (cv);
508 AV *newpadlist, *newpad; 550 PADLIST *newpadlist;
551 PAD *newpad;
552 PADOFFSET const off = PadlistMAX (padlist) + 1;
509 553
510 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. */
511 AvREAL_off (newpadlist); 557 AvREAL_off (newpadlist);
558#endif
512#if PERL_VERSION_ATLEAST (5,10,0) 559#if PERL_VERSION_ATLEAST (5,10,0)
513 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1); 560 Perl_pad_push (aTHX_ padlist, off);
514#else 561#else
515 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 562 Perl_pad_push (aTHX_ padlist, off, 1);
516#endif 563#endif
517 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 564 newpad = PadlistARRAY (padlist)[off];
518 --AvFILLp (padlist); 565 PadlistMAX (padlist) = off - 1;
519 566
520 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0])); 567 /* Already extended to 2 elements by newPADLIST. */
521 av_store (newpadlist, 1, (SV *)newpad); 568 PadlistMAX (newpadlist) = 1;
569 PadlistNAMES (newpadlist) = (PADNAMELIST *)SvREFCNT_inc_NN (PadlistNAMES (padlist));
570 PadlistARRAY (newpadlist)[1] = newpad;
522 571
523 return newpadlist; 572 return newpadlist;
524} 573}
525 574
526static void 575ecb_inline void
527free_padlist (pTHX_ AV *padlist) 576free_padlist (pTHX_ PADLIST *padlist)
528{ 577{
529 /* may be during global destruction */ 578 /* may be during global destruction */
530 if (!IN_DESTRUCT) 579 if (!IN_DESTRUCT)
531 { 580 {
532 I32 i = AvFILLp (padlist); 581 I32 i = PadlistMAX (padlist);
533 582
534 while (i > 0) /* special-case index 0 */ 583 while (i > 0) /* special-case index 0 */
535 { 584 {
536 /* we try to be extra-careful here */ 585 /* we try to be extra-careful here */
537 AV *av = (AV *)AvARRAY (padlist)[i--]; 586 PAD *pad = PadlistARRAY (padlist)[i--];
538 I32 j = AvFILLp (av); 587 I32 j = PadMAX (pad);
539 588
540 while (j >= 0) 589 while (j >= 0)
541 SvREFCNT_dec (AvARRAY (av)[j--]); 590 SvREFCNT_dec (PadARRAY (pad)[j--]);
542 591
543 AvFILLp (av) = -1; 592 PadMAX (pad) = -1;
544 SvREFCNT_dec (av); 593 SvREFCNT_dec (pad);
545 } 594 }
546 595
547 SvREFCNT_dec (AvARRAY (padlist)[0]); 596 SvREFCNT_dec (PadlistNAMES (padlist));
548 597
598#ifdef NEWPADAPI
599 Safefree (PadlistARRAY (padlist));
600 Safefree (padlist);
601#else
549 AvFILLp (padlist) = -1; 602 AvFILLp (padlist) = -1;
603 AvREAL_off (padlist);
550 SvREFCNT_dec ((SV*)padlist); 604 SvREFCNT_dec ((SV*)padlist);
605#endif
551 } 606 }
552} 607}
553 608
554static int 609static int
555coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 610coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
556{ 611{
557 AV *padlist; 612 PADLIST *padlist;
558 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;
559 615
560 /* perl manages to free our internal AV and _then_ call us */ 616 /* perl manages to free our internal AV and _then_ call us */
561 if (IN_DESTRUCT) 617 if (IN_DESTRUCT)
562 return 0; 618 return 0;
563 619
564 /* casting is fun. */ 620 while (len--)
565 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
566 free_padlist (aTHX_ padlist); 621 free_padlist (aTHX_ padlists[len]);
567
568 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
569 622
570 return 0; 623 return 0;
571} 624}
572 625
573static MGVTBL coro_cv_vtbl = { 626static MGVTBL coro_cv_vtbl = {
574 0, 0, 0, 0, 627 0, 0, 0, 0,
575 coro_cv_free 628 coro_cv_free
576}; 629};
577 630
578/* the next two functions merely cache the padlists */ 631/* the next two functions merely cache the padlists */
579static void 632ecb_inline void
580get_padlist (pTHX_ CV *cv) 633get_padlist (pTHX_ CV *cv)
581{ 634{
582 MAGIC *mg = CORO_MAGIC_cv (cv); 635 MAGIC *mg = CORO_MAGIC_cv (cv);
583 AV *av; 636 size_t *lenp;
584 637
585 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 638 if (ecb_expect_true (mg && *(lenp = (size_t *)mg->mg_ptr)))
586 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 639 CvPADLIST (cv) = ((PADLIST **)(mg->mg_ptr + sizeof(size_t)))[--*lenp];
587 else 640 else
588 { 641 {
589#if CORO_PREFER_PERL_FUNCTIONS 642#if CORO_PREFER_PERL_FUNCTIONS
590 /* this is probably cleaner? but also slower! */ 643 /* this is probably cleaner? but also slower! */
591 /* in practise, it seems to be less stable */ 644 /* in practise, it seems to be less stable */
… …
597 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 650 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
598#endif 651#endif
599 } 652 }
600} 653}
601 654
602static void 655ecb_inline void
603put_padlist (pTHX_ CV *cv) 656put_padlist (pTHX_ CV *cv)
604{ 657{
605 MAGIC *mg = CORO_MAGIC_cv (cv); 658 MAGIC *mg = CORO_MAGIC_cv (cv);
606 AV *av;
607 659
608 if (expect_false (!mg)) 660 if (ecb_expect_false (!mg))
661 {
609 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);
610 670
611 av = (AV *)mg->mg_obj; 671 ((PADLIST **)(mg->mg_ptr + sizeof (size_t))) [(*(size_t *)mg->mg_ptr)++] = CvPADLIST (cv);
612
613 if (expect_false (AvFILLp (av) >= AvMAX (av)))
614 av_extend (av, AvFILLp (av) + 1);
615
616 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
617} 672}
618 673
619/** load & save, init *******************************************************/ 674/** load & save, init *******************************************************/
620 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
621/* swap sv heads, at least logically */ 714/* swap sv heads, at least logically */
622static void 715static void
623swap_svs (pTHX_ Coro__State c) 716swap_svs (pTHX_ Coro__State c)
624{ 717{
625 int i; 718 int i;
626 719
627 for (i = 0; i <= AvFILLp (c->swap_sv); ) 720 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
628 { 721 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
629 SV *a = AvARRAY (c->swap_sv)[i++];
630 SV *b = AvARRAY (c->swap_sv)[i++];
631
632 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
633 SV tmp;
634
635 /* swap sv_any */
636 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
637
638 /* swap sv_flags */
639 SvFLAGS (&tmp) = SvFLAGS (a);
640 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
641 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
642
643#if PERL_VERSION_ATLEAST (5,10,0)
644 /* perl 5.10 complicates this _quite_ a bit, but it also is
645 * much faster, so no quarrels here. alternatively, we could
646 * sv_upgrade to avoid this.
647 */
648 {
649 /* swap sv_u */
650 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
651
652 /* if SvANY points to the head, we need to adjust the pointers,
653 * as the pointer for a still points to b, and maybe vice versa.
654 */
655 #define svany_in_head(type) \
656 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
657
658 if (svany_in_head (SvTYPE (a)))
659 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
660
661 if (svany_in_head (SvTYPE (b)))
662 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
663 }
664#endif
665 }
666} 722}
667 723
668#define SWAP_SVS(coro) \ 724#define SWAP_SVS(coro) \
669 if (expect_false ((coro)->swap_sv)) \ 725 if (ecb_expect_false ((coro)->swap_sv)) \
670 swap_svs (aTHX_ (coro)) 726 swap_svs (aTHX_ (coro))
671 727
672static void 728static void
673on_enterleave_call (pTHX_ SV *cb); 729on_enterleave_call (pTHX_ SV *cb);
674 730
… …
678 perl_slots *slot = c->slot; 734 perl_slots *slot = c->slot;
679 c->slot = 0; 735 c->slot = 0;
680 736
681 PL_mainstack = c->mainstack; 737 PL_mainstack = c->mainstack;
682 738
683 GvSV (PL_defgv) = slot->defsv; 739#if CORO_JIT
684 GvAV (PL_defgv) = slot->defav; 740 load_perl_slots (slot);
685 GvSV (PL_errgv) = slot->errsv; 741#else
686 GvSV (irsgv) = slot->irsgv;
687 GvHV (PL_hintgv) = slot->hinthv;
688
689 #define VAR(name,type) PL_ ## name = slot->name; 742 #define VARx(name,expr,type) expr = slot->name;
690 # include "state.h" 743 #include "state.h"
691 #undef VAR 744#endif
692 745
693 { 746 {
694 dSP; 747 dSP;
695 748
696 CV *cv; 749 CV *cv;
697 750
698 /* now do the ugly restore mess */ 751 /* now do the ugly restore mess */
699 while (expect_true (cv = (CV *)POPs)) 752 while (ecb_expect_true (cv = (CV *)POPs))
700 { 753 {
701 put_padlist (aTHX_ cv); /* mark this padlist as available */ 754 put_padlist (aTHX_ cv); /* mark this padlist as available */
702 CvDEPTH (cv) = PTR2IV (POPs); 755 CvDEPTH (cv) = PTR2IV (POPs);
703 CvPADLIST (cv) = (AV *)POPs; 756 CvPADLIST (cv) = (PADLIST *)POPs;
704 } 757 }
705 758
706 PUTBACK; 759 PUTBACK;
707 } 760 }
708 761
709 slf_frame = c->slf_frame; 762 slf_frame = c->slf_frame;
710 CORO_THROW = c->except; 763 CORO_THROW = c->except;
711 764
712 if (expect_false (enable_times)) 765 if (ecb_expect_false (enable_times))
713 { 766 {
714 if (expect_false (!times_valid)) 767 if (ecb_expect_false (!times_valid))
715 coro_times_update (); 768 coro_times_update ();
716 769
717 coro_times_sub (c); 770 coro_times_sub (c);
718 } 771 }
719 772
720 if (expect_false (c->on_enter)) 773 if (ecb_expect_false (c->on_enter))
721 { 774 {
722 int i; 775 int i;
723 776
724 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 777 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
725 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 778 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
… …
731static void 784static void
732save_perl (pTHX_ Coro__State c) 785save_perl (pTHX_ Coro__State c)
733{ 786{
734 SWAP_SVS (c); 787 SWAP_SVS (c);
735 788
736 if (expect_false (c->on_leave)) 789 if (ecb_expect_false (c->on_leave))
737 { 790 {
738 int i; 791 int i;
739 792
740 for (i = AvFILLp (c->on_leave); i >= 0; --i) 793 for (i = AvFILLp (c->on_leave); i >= 0; --i)
741 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]); 794 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
742 } 795 }
743 796
744 times_valid = 0; 797 times_valid = 0;
745 798
746 if (expect_false (enable_times)) 799 if (ecb_expect_false (enable_times))
747 { 800 {
748 coro_times_update (); times_valid = 1; 801 coro_times_update (); times_valid = 1;
749 coro_times_add (c); 802 coro_times_add (c);
750 } 803 }
751 804
… …
765 818
766 XPUSHs (Nullsv); 819 XPUSHs (Nullsv);
767 /* this loop was inspired by pp_caller */ 820 /* this loop was inspired by pp_caller */
768 for (;;) 821 for (;;)
769 { 822 {
770 while (expect_true (cxix >= 0)) 823 while (ecb_expect_true (cxix >= 0))
771 { 824 {
772 PERL_CONTEXT *cx = &ccstk[cxix--]; 825 PERL_CONTEXT *cx = &ccstk[cxix--];
773 826
774 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))
775 { 828 {
776 CV *cv = cx->blk_sub.cv; 829 CV *cv = cx->blk_sub.cv;
777 830
778 if (expect_true (CvDEPTH (cv))) 831 if (ecb_expect_true (CvDEPTH (cv)))
779 { 832 {
780 EXTEND (SP, 3); 833 EXTEND (SP, 3);
781 PUSHs ((SV *)CvPADLIST (cv)); 834 PUSHs ((SV *)CvPADLIST (cv));
782 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv))); 835 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
783 PUSHs ((SV *)cv); 836 PUSHs ((SV *)cv);
… …
786 get_padlist (aTHX_ cv); 839 get_padlist (aTHX_ cv);
787 } 840 }
788 } 841 }
789 } 842 }
790 843
791 if (expect_true (top_si->si_type == PERLSI_MAIN)) 844 if (ecb_expect_true (top_si->si_type == PERLSI_MAIN))
792 break; 845 break;
793 846
794 top_si = top_si->si_prev; 847 top_si = top_si->si_prev;
795 ccstk = top_si->si_cxstack; 848 ccstk = top_si->si_cxstack;
796 cxix = top_si->si_cxix; 849 cxix = top_si->si_cxix;
… …
798 851
799 PUTBACK; 852 PUTBACK;
800 } 853 }
801 854
802 /* allocate some space on the context stack for our purposes */ 855 /* allocate some space on the context stack for our purposes */
803 /* we manually unroll here, as usually 2 slots is enough */ 856 if (ecb_expect_false (cxstack_ix + (int)SLOT_COUNT >= cxstack_max))
804 if (SLOT_COUNT >= 1) CXINC;
805 if (SLOT_COUNT >= 2) CXINC;
806 if (SLOT_COUNT >= 3) CXINC;
807 { 857 {
808 unsigned int i; 858 unsigned int i;
859
809 for (i = 3; i < SLOT_COUNT; ++i) 860 for (i = 0; i < SLOT_COUNT; ++i)
810 CXINC; 861 CXINC;
811 } 862
812 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 863 cxstack_ix -= SLOT_COUNT; /* undo allocation */
864 }
813 865
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
… …
838# define coro_init_stacks(thx) init_stacks () 887# define coro_init_stacks(thx) init_stacks ()
839#else 888#else
840static void 889static void
841coro_init_stacks (pTHX) 890coro_init_stacks (pTHX)
842{ 891{
843 PL_curstackinfo = new_stackinfo(32, 8); 892 PL_curstackinfo = new_stackinfo(32, 4 + SLOT_COUNT); /* 3 is minimum due to perl rounding down in scope.c:GROW() */
844 PL_curstackinfo->si_type = PERLSI_MAIN; 893 PL_curstackinfo->si_type = PERLSI_MAIN;
845 PL_curstack = PL_curstackinfo->si_stack; 894 PL_curstack = PL_curstackinfo->si_stack;
846 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 895 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
847 896
848 PL_stack_base = AvARRAY(PL_curstack); 897 PL_stack_base = AvARRAY(PL_curstack);
… …
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}
… …
1154destroy_perl (pTHX_ struct coro *coro) 1219destroy_perl (pTHX_ struct coro *coro)
1155{ 1220{
1156 SV *svf [9]; 1221 SV *svf [9];
1157 1222
1158 { 1223 {
1224 SV *old_current = SvRV (coro_current);
1159 struct coro *current = SvSTATE_current; 1225 struct coro *current = SvSTATE (old_current);
1160 1226
1161 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack)); 1227 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1162 1228
1163 save_perl (aTHX_ current); 1229 save_perl (aTHX_ current);
1230
1231 /* this will cause transfer_check to croak on block*/
1164 /*SvRV_set (coro_current, (SV *)coro->hv);*/ 1232 SvRV_set (coro_current, (SV *)coro->hv);
1233
1165 load_perl (aTHX_ coro); 1234 load_perl (aTHX_ coro);
1166 1235
1167 coro_unwind_stacks (aTHX); 1236 coro_unwind_stacks (aTHX);
1168 coro_destruct_stacks (aTHX);
1169 1237
1170 /* restore swapped sv's */ 1238 /* restore swapped sv's */
1171 SWAP_SVS (coro); 1239 SWAP_SVS (coro);
1172 1240
1241 coro_destruct_stacks (aTHX);
1242
1173 // now save some sv's to be free'd later 1243 /* now save some sv's to be free'd later */
1174 svf [0] = GvSV (PL_defgv); 1244 svf [0] = GvSV (PL_defgv);
1175 svf [1] = (SV *)GvAV (PL_defgv); 1245 svf [1] = (SV *)GvAV (PL_defgv);
1176 svf [2] = GvSV (PL_errgv); 1246 svf [2] = GvSV (PL_errgv);
1177 svf [3] = (SV *)PL_defoutgv; 1247 svf [3] = (SV *)PL_defoutgv;
1178 svf [4] = PL_rs; 1248 svf [4] = PL_rs;
… …
1180 svf [6] = (SV *)GvHV (PL_hintgv); 1250 svf [6] = (SV *)GvHV (PL_hintgv);
1181 svf [7] = PL_diehook; 1251 svf [7] = PL_diehook;
1182 svf [8] = PL_warnhook; 1252 svf [8] = PL_warnhook;
1183 assert (9 == sizeof (svf) / sizeof (*svf)); 1253 assert (9 == sizeof (svf) / sizeof (*svf));
1184 1254
1185 /*SvRV_set (coro_current, (SV *)current->hv);*/ 1255 SvRV_set (coro_current, old_current);
1256
1186 load_perl (aTHX_ current); 1257 load_perl (aTHX_ current);
1187 } 1258 }
1188 1259
1189 { 1260 {
1190 unsigned int i; 1261 unsigned int i;
… …
1197 SvREFCNT_dec (coro->invoke_cb); 1268 SvREFCNT_dec (coro->invoke_cb);
1198 SvREFCNT_dec (coro->invoke_av); 1269 SvREFCNT_dec (coro->invoke_av);
1199 } 1270 }
1200} 1271}
1201 1272
1202INLINE void 1273ecb_inline void
1203free_coro_mortal (pTHX) 1274free_coro_mortal (pTHX)
1204{ 1275{
1205 if (expect_true (coro_mortal)) 1276 if (ecb_expect_true (coro_mortal))
1206 { 1277 {
1207 SvREFCNT_dec (coro_mortal); 1278 SvREFCNT_dec ((SV *)coro_mortal);
1208 coro_mortal = 0; 1279 coro_mortal = 0;
1209 } 1280 }
1210} 1281}
1211 1282
1212static int 1283static int
… …
1345 1416
1346 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 */
1347} 1418}
1348 1419
1349/* 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 */
1350static void NOINLINE 1421static void ecb_noinline
1351cctx_prepare (pTHX) 1422cctx_prepare (pTHX)
1352{ 1423{
1353 PL_top_env = &PL_start_env; 1424 PL_top_env = &PL_start_env;
1354 1425
1355 if (cctx_current->flags & CC_TRACE) 1426 if (cctx_current->flags & CC_TRACE)
… …
1366 slf_frame.prepare = slf_prepare_set_stacklevel; 1437 slf_frame.prepare = slf_prepare_set_stacklevel;
1367 slf_frame.check = slf_check_set_stacklevel; 1438 slf_frame.check = slf_check_set_stacklevel;
1368} 1439}
1369 1440
1370/* 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 */
1371INLINE void 1442ecb_inline void
1372transfer_tail (pTHX) 1443transfer_tail (pTHX)
1373{ 1444{
1374 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);
1375} 1458}
1376 1459
1377/* 1460/*
1378 * this is a _very_ stripped down perl interpreter ;) 1461 * this is a _very_ stripped down perl interpreter ;)
1379 */ 1462 */
… …
1408 */ 1491 */
1409 1492
1410 /* 1493 /*
1411 * 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
1412 * 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)
1413 * 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
1414 * bootstrap-time "top" top_env, as we cannot restore the "main" 1497 * doing in that case. YMMV.
1415 * coroutine as Coro has no such concept.
1416 * This actually isn't valid with the pthread backend, but OSes requiring
1417 * that backend are too broken to do it in a standards-compliant way.
1418 */ 1498 */
1419 PL_top_env = main_top_env; 1499 perlish_exit (aTHX);
1420 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1421 } 1500 }
1422} 1501}
1423 1502
1424static coro_cctx * 1503static coro_cctx *
1425cctx_new () 1504cctx_new (void)
1426{ 1505{
1427 coro_cctx *cctx; 1506 coro_cctx *cctx;
1428 1507
1429 ++cctx_count; 1508 ++cctx_count;
1430 New (0, cctx, 1, coro_cctx); 1509 New (0, cctx, 1, coro_cctx);
… …
1436 return cctx; 1515 return cctx;
1437} 1516}
1438 1517
1439/* create a new cctx only suitable as source */ 1518/* create a new cctx only suitable as source */
1440static coro_cctx * 1519static coro_cctx *
1441cctx_new_empty () 1520cctx_new_empty (void)
1442{ 1521{
1443 coro_cctx *cctx = cctx_new (); 1522 coro_cctx *cctx = cctx_new ();
1444 1523
1445 cctx->sptr = 0; 1524 cctx->sptr = 0;
1446 coro_create (&cctx->cctx, 0, 0, 0, 0); 1525 coro_create (&cctx->cctx, 0, 0, 0, 0);
… …
1448 return cctx; 1527 return cctx;
1449} 1528}
1450 1529
1451/* create a new cctx suitable as destination/running a perl interpreter */ 1530/* create a new cctx suitable as destination/running a perl interpreter */
1452static coro_cctx * 1531static coro_cctx *
1453cctx_new_run () 1532cctx_new_run (void)
1454{ 1533{
1455 coro_cctx *cctx = cctx_new (); 1534 coro_cctx *cctx = cctx_new ();
1456 void *stack_start; 1535 void *stack_start;
1457 size_t stack_size; 1536 size_t stack_size;
1458 1537
1538#if CORO_FIBER
1539
1540 cctx->ssize = cctx_stacksize * sizeof (long);
1541 cctx->sptr = 0;
1542
1543#else
1544
1459#if HAVE_MMAP 1545 #if HAVE_MMAP
1460 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE; 1546 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1461 /* mmap supposedly does allocate-on-write for us */ 1547 /* mmap supposedly does allocate-on-write for us */
1462 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0); 1548 cctx->sptr = mmap (0, cctx->ssize, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_ANONYMOUS, -1, 0);
1463 1549
1464 if (cctx->sptr != (void *)-1) 1550 if (cctx->sptr != (void *)-1)
1465 { 1551 {
1466 #if CORO_STACKGUARD 1552 #if CORO_STACKGUARD
1467 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE); 1553 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
1468 #endif 1554 #endif
1469 stack_start = (char *)cctx->sptr + CORO_STACKGUARD * PAGESIZE; 1555 stack_start = (char *)cctx->sptr + CORO_STACKGUARD * PAGESIZE;
1470 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE; 1556 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
1471 cctx->flags |= CC_MAPPED; 1557 cctx->flags |= CC_MAPPED;
1472 } 1558 }
1473 else 1559 else
1474#endif 1560 #endif
1475 { 1561 {
1476 cctx->ssize = cctx_stacksize * (long)sizeof (long); 1562 cctx->ssize = cctx_stacksize * (long)sizeof (long);
1477 New (0, cctx->sptr, cctx_stacksize, long); 1563 New (0, cctx->sptr, cctx_stacksize, long);
1478 1564
1479 if (!cctx->sptr) 1565 if (!cctx->sptr)
1480 { 1566 {
1481 perror ("FATAL: unable to allocate stack for coroutine, exiting."); 1567 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1482 _exit (EXIT_FAILURE); 1568 _exit (EXIT_FAILURE);
1483 } 1569 }
1484 1570
1485 stack_start = cctx->sptr; 1571 stack_start = cctx->sptr;
1486 stack_size = cctx->ssize; 1572 stack_size = cctx->ssize;
1487 } 1573 }
1574 #endif
1488 1575
1489 #if CORO_USE_VALGRIND 1576 #if CORO_USE_VALGRIND
1490 cctx->valgrind_id = VALGRIND_STACK_REGISTER ((char *)stack_start, (char *)stack_start + stack_size); 1577 cctx->valgrind_id = VALGRIND_STACK_REGISTER ((char *)stack_start, (char *)stack_start + stack_size);
1491 #endif 1578 #endif
1492 1579
… …
1511 { 1598 {
1512 #if CORO_USE_VALGRIND 1599 #if CORO_USE_VALGRIND
1513 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id); 1600 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
1514 #endif 1601 #endif
1515 1602
1516#if HAVE_MMAP 1603 #if HAVE_MMAP
1517 if (cctx->flags & CC_MAPPED) 1604 if (cctx->flags & CC_MAPPED)
1518 munmap (cctx->sptr, cctx->ssize); 1605 munmap (cctx->sptr, cctx->ssize);
1519 else 1606 else
1520#endif 1607 #endif
1521 Safefree (cctx->sptr); 1608 Safefree (cctx->sptr);
1522 } 1609 }
1523 1610
1524 Safefree (cctx); 1611 Safefree (cctx);
1525} 1612}
1526 1613
… …
1528#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE)) 1615#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE))
1529 1616
1530static coro_cctx * 1617static coro_cctx *
1531cctx_get (pTHX) 1618cctx_get (pTHX)
1532{ 1619{
1533 while (expect_true (cctx_first)) 1620 while (ecb_expect_true (cctx_first))
1534 { 1621 {
1535 coro_cctx *cctx = cctx_first; 1622 coro_cctx *cctx = cctx_first;
1536 cctx_first = cctx->next; 1623 cctx_first = cctx->next;
1537 --cctx_idle; 1624 --cctx_idle;
1538 1625
1539 if (expect_true (!CCTX_EXPIRED (cctx))) 1626 if (ecb_expect_true (!CCTX_EXPIRED (cctx)))
1540 return cctx; 1627 return cctx;
1541 1628
1542 cctx_destroy (cctx); 1629 cctx_destroy (cctx);
1543 } 1630 }
1544 1631
… …
1549cctx_put (coro_cctx *cctx) 1636cctx_put (coro_cctx *cctx)
1550{ 1637{
1551 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1638 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr));
1552 1639
1553 /* free another cctx if overlimit */ 1640 /* free another cctx if overlimit */
1554 if (expect_false (cctx_idle >= cctx_max_idle)) 1641 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1555 { 1642 {
1556 coro_cctx *first = cctx_first; 1643 coro_cctx *first = cctx_first;
1557 cctx_first = first->next; 1644 cctx_first = first->next;
1558 --cctx_idle; 1645 --cctx_idle;
1559 1646
… …
1570static void 1657static void
1571transfer_check (pTHX_ struct coro *prev, struct coro *next) 1658transfer_check (pTHX_ struct coro *prev, struct coro *next)
1572{ 1659{
1573 /* TODO: throwing up here is considered harmful */ 1660 /* TODO: throwing up here is considered harmful */
1574 1661
1575 if (expect_true (prev != next)) 1662 if (ecb_expect_true (prev != next))
1576 { 1663 {
1577 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1664 if (ecb_expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1578 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,"); 1665 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1579 1666
1580 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED))) 1667 if (ecb_expect_false (next->flags & (CF_RUNNING | CF_ZOMBIE | CF_SUSPENDED)))
1581 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,"); 1668 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1582 1669
1583#if !PERL_VERSION_ATLEAST (5,10,0) 1670#if !PERL_VERSION_ATLEAST (5,10,0)
1584 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1671 if (ecb_expect_false (PL_lex_state != LEX_NOTPARSING))
1585 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,"); 1672 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1586#endif 1673#endif
1587 } 1674 }
1588} 1675}
1589 1676
1590/* always use the TRANSFER macro */ 1677/* always use the TRANSFER macro */
1591static void NOINLINE /* noinline so we have a fixed stackframe */ 1678static void ecb_noinline /* noinline so we have a fixed stackframe */
1592transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1679transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1593{ 1680{
1594 dSTACKLEVEL; 1681 dSTACKLEVEL;
1595 1682
1596 /* sometimes transfer is only called to set idle_sp */ 1683 /* sometimes transfer is only called to set idle_sp */
1597 if (expect_false (!prev)) 1684 if (ecb_expect_false (!prev))
1598 { 1685 {
1599 cctx_current->idle_sp = STACKLEVEL; 1686 cctx_current->idle_sp = STACKLEVEL;
1600 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1687 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1601 } 1688 }
1602 else if (expect_true (prev != next)) 1689 else if (ecb_expect_true (prev != next))
1603 { 1690 {
1604 coro_cctx *cctx_prev; 1691 coro_cctx *cctx_prev;
1605 1692
1606 if (expect_false (prev->flags & CF_NEW)) 1693 if (ecb_expect_false (prev->flags & CF_NEW))
1607 { 1694 {
1608 /* create a new empty/source context */ 1695 /* create a new empty/source context */
1609 prev->flags &= ~CF_NEW; 1696 prev->flags &= ~CF_NEW;
1610 prev->flags |= CF_RUNNING; 1697 prev->flags |= CF_RUNNING;
1611 } 1698 }
… …
1614 next->flags |= CF_RUNNING; 1701 next->flags |= CF_RUNNING;
1615 1702
1616 /* first get rid of the old state */ 1703 /* first get rid of the old state */
1617 save_perl (aTHX_ prev); 1704 save_perl (aTHX_ prev);
1618 1705
1619 if (expect_false (next->flags & CF_NEW)) 1706 if (ecb_expect_false (next->flags & CF_NEW))
1620 { 1707 {
1621 /* need to start coroutine */ 1708 /* need to start coroutine */
1622 next->flags &= ~CF_NEW; 1709 next->flags &= ~CF_NEW;
1623 /* setup coroutine call */ 1710 /* setup coroutine call */
1624 init_perl (aTHX_ next); 1711 init_perl (aTHX_ next);
1625 } 1712 }
1626 else 1713 else
1627 load_perl (aTHX_ next); 1714 load_perl (aTHX_ next);
1628 1715
1629 /* possibly untie and reuse the cctx */ 1716 /* possibly untie and reuse the cctx */
1630 if (expect_true ( 1717 if (ecb_expect_true (
1631 cctx_current->idle_sp == STACKLEVEL 1718 cctx_current->idle_sp == STACKLEVEL
1632 && !(cctx_current->flags & CC_TRACE) 1719 && !(cctx_current->flags & CC_TRACE)
1633 && !force_cctx 1720 && !force_cctx
1634 )) 1721 ))
1635 { 1722 {
1636 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1723 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */
1637 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te)); 1724 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1638 1725
1639 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */ 1726 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */
1640 /* without this the next cctx_get might destroy the running cctx while still in use */ 1727 /* without this the next cctx_get might destroy the running cctx while still in use */
1641 if (expect_false (CCTX_EXPIRED (cctx_current))) 1728 if (ecb_expect_false (CCTX_EXPIRED (cctx_current)))
1642 if (expect_true (!next->cctx)) 1729 if (ecb_expect_true (!next->cctx))
1643 next->cctx = cctx_get (aTHX); 1730 next->cctx = cctx_get (aTHX);
1644 1731
1645 cctx_put (cctx_current); 1732 cctx_put (cctx_current);
1646 } 1733 }
1647 else 1734 else
1648 prev->cctx = cctx_current; 1735 prev->cctx = cctx_current;
1649 1736
1650 ++next->usecount; 1737 ++next->usecount;
1651 1738
1652 cctx_prev = cctx_current; 1739 cctx_prev = cctx_current;
1653 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX); 1740 cctx_current = ecb_expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1654 1741
1655 next->cctx = 0; 1742 next->cctx = 0;
1656 1743
1657 if (expect_false (cctx_prev != cctx_current)) 1744 if (ecb_expect_false (cctx_prev != cctx_current))
1658 { 1745 {
1659 cctx_prev->top_env = PL_top_env; 1746 cctx_prev->top_env = PL_top_env;
1660 PL_top_env = cctx_current->top_env; 1747 PL_top_env = cctx_current->top_env;
1661 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx); 1748 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1662 } 1749 }
… …
1668#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx)) 1755#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1669#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1756#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1670 1757
1671/** high level stuff ********************************************************/ 1758/** high level stuff ********************************************************/
1672 1759
1760/* this function is actually Coro, not Coro::State, but we call it from here */
1761/* because it is convenient - but it hasn't been declared yet for that reason */
1762static void
1763coro_call_on_destroy (pTHX_ struct coro *coro);
1764
1673static void 1765static void
1674coro_state_destroy (pTHX_ struct coro *coro) 1766coro_state_destroy (pTHX_ struct coro *coro)
1675{ 1767{
1676 if (coro->flags & CF_DESTROYED) 1768 if (coro->flags & CF_ZOMBIE)
1677 return; 1769 return;
1678 1770
1679 /* this callback is reserved for slf functions needing to do cleanup */
1680 if (coro->on_destroy && !PL_dirty)
1681 coro->on_destroy (aTHX_ coro); 1771 slf_destroy (aTHX_ coro);
1682 1772
1683 /*
1684 * The on_destroy above most likely is from an SLF call.
1685 * Since by definition the SLF call will not finish when we destroy
1686 * the coro, we will have to force-finish it here, otherwise
1687 * cleanup functions cannot call SLF functions.
1688 */
1689 coro->slf_frame.prepare = 0;
1690
1691 coro->flags |= CF_DESTROYED; 1773 coro->flags |= CF_ZOMBIE;
1692 1774
1693 if (coro->flags & CF_READY) 1775 if (coro->flags & CF_READY)
1694 { 1776 {
1695 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1777 /* reduce nready, as destroying a ready coro effectively unreadies it */
1696 /* alternative: look through all ready queues and remove the coro */ 1778 /* alternative: look through all ready queues and remove the coro */
1697 --coro_nready; 1779 --coro_nready;
1698 } 1780 }
1699 else 1781 else
1700 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1782 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1783
1784 if (coro->next) coro->next->prev = coro->prev;
1785 if (coro->prev) coro->prev->next = coro->next;
1786 if (coro == coro_first) coro_first = coro->next;
1701 1787
1702 if (coro->mainstack 1788 if (coro->mainstack
1703 && coro->mainstack != main_mainstack 1789 && coro->mainstack != main_mainstack
1704 && coro->slot 1790 && coro->slot
1705 && !PL_dirty) 1791 && !PL_dirty)
1706 destroy_perl (aTHX_ coro); 1792 destroy_perl (aTHX_ coro);
1707 1793
1708 if (coro->next) coro->next->prev = coro->prev;
1709 if (coro->prev) coro->prev->next = coro->next;
1710 if (coro == coro_first) coro_first = coro->next;
1711
1712 cctx_destroy (coro->cctx); 1794 cctx_destroy (coro->cctx);
1713 SvREFCNT_dec (coro->startcv); 1795 SvREFCNT_dec (coro->startcv);
1714 SvREFCNT_dec (coro->args); 1796 SvREFCNT_dec (coro->args);
1715 SvREFCNT_dec (coro->swap_sv); 1797 SvREFCNT_dec (coro->swap_sv);
1716 SvREFCNT_dec (CORO_THROW); 1798 SvREFCNT_dec (CORO_THROW);
1799
1800 coro_call_on_destroy (aTHX_ coro);
1801
1802 /* more destruction mayhem in coro_state_free */
1717} 1803}
1718 1804
1719static int 1805static int
1720coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1806coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1721{ 1807{
1722 struct coro *coro = (struct coro *)mg->mg_ptr; 1808 struct coro *coro = (struct coro *)mg->mg_ptr;
1723 mg->mg_ptr = 0; 1809 mg->mg_ptr = 0;
1724 1810
1725 coro->hv = 0;
1726
1727 if (--coro->refcnt < 0)
1728 {
1729 coro_state_destroy (aTHX_ coro); 1811 coro_state_destroy (aTHX_ coro);
1812 SvREFCNT_dec (coro->on_destroy);
1813 SvREFCNT_dec (coro->status);
1814
1730 Safefree (coro); 1815 Safefree (coro);
1731 }
1732 1816
1733 return 0; 1817 return 0;
1734} 1818}
1735 1819
1736static int 1820static int ecb_cold
1737coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1821coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1738{ 1822{
1739 struct coro *coro = (struct coro *)mg->mg_ptr; 1823 /* called when perl clones the current process the slow way (windows process emulation) */
1740 1824 /* WE SIMply nuke the pointers in the copy, causing perl to croak */
1741 ++coro->refcnt; 1825 mg->mg_ptr = 0;
1826 mg->mg_virtual = 0;
1742 1827
1743 return 0; 1828 return 0;
1744} 1829}
1745 1830
1746static MGVTBL coro_state_vtbl = { 1831static MGVTBL coro_state_vtbl = {
… …
1771 TRANSFER (ta, 1); 1856 TRANSFER (ta, 1);
1772} 1857}
1773 1858
1774/** Coro ********************************************************************/ 1859/** Coro ********************************************************************/
1775 1860
1776INLINE void 1861ecb_inline void
1777coro_enq (pTHX_ struct coro *coro) 1862coro_enq (pTHX_ struct coro *coro)
1778{ 1863{
1779 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN]; 1864 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1780 1865
1781 SvREFCNT_inc_NN (coro->hv); 1866 SvREFCNT_inc_NN (coro->hv);
… …
1783 coro->next_ready = 0; 1868 coro->next_ready = 0;
1784 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro; 1869 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1785 ready [1] = coro; 1870 ready [1] = coro;
1786} 1871}
1787 1872
1788INLINE struct coro * 1873ecb_inline struct coro *
1789coro_deq (pTHX) 1874coro_deq (pTHX)
1790{ 1875{
1791 int prio; 1876 int prio;
1792 1877
1793 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; ) 1878 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
… …
1846{ 1931{
1847 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1932 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1848} 1933}
1849 1934
1850/* expects to own a reference to next->hv */ 1935/* expects to own a reference to next->hv */
1851INLINE void 1936ecb_inline void
1852prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1937prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1853{ 1938{
1854 SV *prev_sv = SvRV (coro_current); 1939 SV *prev_sv = SvRV (coro_current);
1855 1940
1856 ta->prev = SvSTATE_hv (prev_sv); 1941 ta->prev = SvSTATE_hv (prev_sv);
… …
1869{ 1954{
1870 for (;;) 1955 for (;;)
1871 { 1956 {
1872 struct coro *next = coro_deq (aTHX); 1957 struct coro *next = coro_deq (aTHX);
1873 1958
1874 if (expect_true (next)) 1959 if (ecb_expect_true (next))
1875 { 1960 {
1876 /* cannot transfer to destroyed coros, skip and look for next */ 1961 /* cannot transfer to destroyed coros, skip and look for next */
1877 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED))) 1962 if (ecb_expect_false (next->flags & (CF_ZOMBIE | CF_SUSPENDED)))
1878 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */ 1963 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1879 else 1964 else
1880 { 1965 {
1881 next->flags &= ~CF_READY; 1966 next->flags &= ~CF_READY;
1882 --coro_nready; 1967 --coro_nready;
… …
1915 } 2000 }
1916 } 2001 }
1917 } 2002 }
1918} 2003}
1919 2004
1920INLINE void 2005ecb_inline void
1921prepare_cede (pTHX_ struct coro_transfer_args *ta) 2006prepare_cede (pTHX_ struct coro_transfer_args *ta)
1922{ 2007{
1923 api_ready (aTHX_ coro_current); 2008 api_ready (aTHX_ coro_current);
1924 prepare_schedule (aTHX_ ta); 2009 prepare_schedule (aTHX_ ta);
1925} 2010}
1926 2011
1927INLINE void 2012ecb_inline void
1928prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 2013prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1929{ 2014{
1930 SV *prev = SvRV (coro_current); 2015 SV *prev = SvRV (coro_current);
1931 2016
1932 if (coro_nready) 2017 if (coro_nready)
… …
1962{ 2047{
1963 struct coro_transfer_args ta; 2048 struct coro_transfer_args ta;
1964 2049
1965 prepare_cede (aTHX_ &ta); 2050 prepare_cede (aTHX_ &ta);
1966 2051
1967 if (expect_true (ta.prev != ta.next)) 2052 if (ecb_expect_true (ta.prev != ta.next))
1968 { 2053 {
1969 TRANSFER (ta, 1); 2054 TRANSFER (ta, 1);
1970 return 1; 2055 return 1;
1971 } 2056 }
1972 else 2057 else
… …
2015 coro->slot->runops = RUNOPS_DEFAULT; 2100 coro->slot->runops = RUNOPS_DEFAULT;
2016 } 2101 }
2017} 2102}
2018 2103
2019static void 2104static void
2105coro_push_av (pTHX_ AV *av, I32 gimme_v)
2106{
2107 if (AvFILLp (av) >= 0 && gimme_v != G_VOID)
2108 {
2109 dSP;
2110
2111 if (gimme_v == G_SCALAR)
2112 XPUSHs (AvARRAY (av)[AvFILLp (av)]);
2113 else
2114 {
2115 int i;
2116 EXTEND (SP, AvFILLp (av) + 1);
2117
2118 for (i = 0; i <= AvFILLp (av); ++i)
2119 PUSHs (AvARRAY (av)[i]);
2120 }
2121
2122 PUTBACK;
2123 }
2124}
2125
2126static void
2127coro_push_on_destroy (pTHX_ struct coro *coro, SV *cb)
2128{
2129 if (!coro->on_destroy)
2130 coro->on_destroy = newAV ();
2131
2132 av_push (coro->on_destroy, cb);
2133}
2134
2135static void
2136slf_destroy_join (pTHX_ struct CoroSLF *frame)
2137{
2138 SvREFCNT_dec ((SV *)((struct coro *)frame->data)->hv);
2139}
2140
2141static int
2142slf_check_join (pTHX_ struct CoroSLF *frame)
2143{
2144 struct coro *coro = (struct coro *)frame->data;
2145
2146 if (!coro->status)
2147 return 1;
2148
2149 frame->destroy = 0;
2150
2151 coro_push_av (aTHX_ coro->status, GIMME_V);
2152
2153 SvREFCNT_dec ((SV *)coro->hv);
2154
2155 return 0;
2156}
2157
2158static void
2159slf_init_join (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2160{
2161 struct coro *coro = SvSTATE (items > 0 ? arg [0] : &PL_sv_undef);
2162
2163 if (items > 1)
2164 croak ("join called with too many arguments");
2165
2166 if (coro->status)
2167 frame->prepare = prepare_nop;
2168 else
2169 {
2170 coro_push_on_destroy (aTHX_ coro, SvREFCNT_inc_NN (SvRV (coro_current)));
2171 frame->prepare = prepare_schedule;
2172 }
2173
2174 frame->check = slf_check_join;
2175 frame->destroy = slf_destroy_join;
2176 frame->data = (void *)coro;
2177 SvREFCNT_inc (coro->hv);
2178}
2179
2180static void
2020coro_call_on_destroy (pTHX_ struct coro *coro) 2181coro_call_on_destroy (pTHX_ struct coro *coro)
2021{ 2182{
2022 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2183 AV *od = coro->on_destroy;
2023 2184
2024 if (on_destroyp) 2185 if (!od)
2025 { 2186 return;
2026 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
2027 AV *on_destroy = sv_2mortal (SvREFCNT_inc ((AV *)SvRV (*on_destroyp)));
2028 AV *status = statusp ? sv_2mortal (SvREFCNT_inc ((AV *)SvRV (*statusp))) : 0;
2029 2187
2030 while (AvFILLp (on_destroy) >= 0) 2188 while (AvFILLp (od) >= 0)
2189 {
2190 SV *cb = sv_2mortal (av_pop (od));
2191
2192 /* coro hv's (and only hv's at the moment) are supported as well */
2193 if (SvSTATEhv_p (aTHX_ cb))
2194 api_ready (aTHX_ cb);
2195 else
2031 { 2196 {
2032 dSP; /* don't disturb outer sp */ 2197 dSP; /* don't disturb outer sp */
2033 SV *cb = av_pop (on_destroy);
2034
2035 PUSHMARK (SP); 2198 PUSHMARK (SP);
2036 2199
2037 if (statusp) 2200 if (coro->status)
2038 { 2201 {
2039 int i; 2202 PUTBACK;
2040 EXTEND (SP, AvFILLp (status) + 1); 2203 coro_push_av (aTHX_ coro->status, G_ARRAY);
2041 2204 SPAGAIN;
2042 for (i = 0; i <= AvFILLp (status); ++i)
2043 PUSHs (AvARRAY (status)[i]);
2044 } 2205 }
2045 2206
2046 PUTBACK; 2207 PUTBACK;
2047 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD); 2208 call_sv (cb, G_VOID | G_DISCARD);
2048 } 2209 }
2049 } 2210 }
2050} 2211}
2051 2212
2052static void 2213static void
2053coro_set_status (HV *coro_hv, SV **arg, int items) 2214coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
2054{ 2215{
2055 AV *av = newAV (); 2216 AV *av;
2217
2218 if (coro->status)
2219 {
2220 av = coro->status;
2221 av_clear (av);
2222 }
2223 else
2224 av = coro->status = newAV ();
2056 2225
2057 /* items are actually not so common, so optimise for this case */ 2226 /* items are actually not so common, so optimise for this case */
2058 if (items) 2227 if (items)
2059 { 2228 {
2060 int i; 2229 int i;
… …
2062 av_extend (av, items - 1); 2231 av_extend (av, items - 1);
2063 2232
2064 for (i = 0; i < items; ++i) 2233 for (i = 0; i < items; ++i)
2065 av_push (av, SvREFCNT_inc_NN (arg [i])); 2234 av_push (av, SvREFCNT_inc_NN (arg [i]));
2066 } 2235 }
2067
2068 hv_store (coro_hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0);
2069} 2236}
2070 2237
2071static void 2238static void
2072slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv) 2239slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2073{ 2240{
… …
2085static void 2252static void
2086slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2253slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2087{ 2254{
2088 HV *coro_hv = (HV *)SvRV (coro_current); 2255 HV *coro_hv = (HV *)SvRV (coro_current);
2089 2256
2090 coro_set_status (coro_hv, arg, items); 2257 coro_set_status (aTHX_ SvSTATE ((SV *)coro_hv), arg, items);
2091 slf_init_terminate_cancel_common (frame, coro_hv); 2258 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2092} 2259}
2093 2260
2094static void 2261static void
2095slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2262slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2096{ 2263{
… …
2101 croak ("Coro::cancel called without coro object,"); 2268 croak ("Coro::cancel called without coro object,");
2102 2269
2103 coro = SvSTATE (arg [0]); 2270 coro = SvSTATE (arg [0]);
2104 coro_hv = coro->hv; 2271 coro_hv = coro->hv;
2105 2272
2106 coro_set_status (coro_hv, arg + 1, items - 1); 2273 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2107 2274
2108 if (expect_false (coro->flags & CF_NOCANCEL)) 2275 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2109 { 2276 {
2110 /* coro currently busy cancelling something, so just notify it */ 2277 /* coro currently busy cancelling something, so just notify it */
2111 coro->slf_frame.data = (void *)coro; 2278 coro->slf_frame.data = (void *)coro;
2112 2279
2113 frame->prepare = prepare_nop; 2280 frame->prepare = prepare_nop;
2114 frame->check = slf_check_nop; 2281 frame->check = slf_check_nop;
2115 } 2282 }
2116 else if (coro_hv == (HV *)SvRV (coro_current)) 2283 else if (coro_hv == (HV *)SvRV (coro_current))
2117 { 2284 {
2118 /* cancelling the current coro is allowed, and equals terminate */ 2285 /* cancelling the current coro is allowed, and equals terminate */
2119 slf_init_terminate_cancel_common (frame, coro_hv); 2286 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2120 } 2287 }
2121 else 2288 else
2122 { 2289 {
2123 struct coro *self = SvSTATE_current; 2290 struct coro *self = SvSTATE_current;
2124 2291
… …
2128 * this is ugly, and hopefully fully worth the extra speed. 2295 * this is ugly, and hopefully fully worth the extra speed.
2129 * besides, I can't get the slow-but-safe version working... 2296 * besides, I can't get the slow-but-safe version working...
2130 */ 2297 */
2131 slf_frame.data = 0; 2298 slf_frame.data = 0;
2132 self->flags |= CF_NOCANCEL; 2299 self->flags |= CF_NOCANCEL;
2133
2134 coro_state_destroy (aTHX_ coro); 2300 coro_state_destroy (aTHX_ coro);
2135 coro_call_on_destroy (aTHX_ coro);
2136
2137 self->flags &= ~CF_NOCANCEL; 2301 self->flags &= ~CF_NOCANCEL;
2138 2302
2139 if (slf_frame.data) 2303 if (slf_frame.data)
2140 { 2304 {
2141 /* while we were busy we have been cancelled, so terminate */ 2305 /* while we were busy we have been cancelled, so terminate */
2142 slf_init_terminate_cancel_common (frame, self->hv); 2306 slf_init_terminate_cancel_common (aTHX_ frame, self->hv);
2143 } 2307 }
2144 else 2308 else
2145 { 2309 {
2146 frame->prepare = prepare_nop; 2310 frame->prepare = prepare_nop;
2147 frame->check = slf_check_nop; 2311 frame->check = slf_check_nop;
2148 } 2312 }
2149 } 2313 }
2150} 2314}
2151 2315
2316static int
2317slf_check_safe_cancel (pTHX_ struct CoroSLF *frame)
2318{
2319 frame->prepare = 0;
2320 coro_unwind_stacks (aTHX);
2321
2322 slf_init_terminate_cancel_common (aTHX_ frame, (HV *)SvRV (coro_current));
2323
2324 return 1;
2325}
2326
2327static int
2328safe_cancel (pTHX_ struct coro *coro, SV **arg, int items)
2329{
2330 if (coro->cctx)
2331 croak ("coro inside C callback, unable to cancel at this time, caught");
2332
2333 if (coro->flags & CF_NEW)
2334 {
2335 coro_set_status (aTHX_ coro, arg, items);
2336 coro_state_destroy (aTHX_ coro);
2337 }
2338 else
2339 {
2340 if (!coro->slf_frame.prepare)
2341 croak ("coro outside an SLF function, unable to cancel at this time, caught");
2342
2343 slf_destroy (aTHX_ coro);
2344
2345 coro_set_status (aTHX_ coro, arg, items);
2346 coro->slf_frame.prepare = prepare_nop;
2347 coro->slf_frame.check = slf_check_safe_cancel;
2348
2349 api_ready (aTHX_ (SV *)coro->hv);
2350 }
2351
2352 return 1;
2353}
2354
2152/*****************************************************************************/ 2355/*****************************************************************************/
2153/* async pool handler */ 2356/* async pool handler */
2154 2357
2155static int 2358static int
2156slf_check_pool_handler (pTHX_ struct CoroSLF *frame) 2359slf_check_pool_handler (pTHX_ struct CoroSLF *frame)
… …
2185slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2388slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2186{ 2389{
2187 HV *hv = (HV *)SvRV (coro_current); 2390 HV *hv = (HV *)SvRV (coro_current);
2188 struct coro *coro = SvSTATE_hv ((SV *)hv); 2391 struct coro *coro = SvSTATE_hv ((SV *)hv);
2189 2392
2190 if (expect_true (coro->saved_deffh)) 2393 if (ecb_expect_true (coro->saved_deffh))
2191 { 2394 {
2192 /* subsequent iteration */ 2395 /* subsequent iteration */
2193 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2396 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
2194 coro->saved_deffh = 0; 2397 coro->saved_deffh = 0;
2195 2398
2196 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 2399 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
2197 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2400 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
2198 { 2401 {
2199 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate); 2402 slf_init_terminate_cancel_common (aTHX_ frame, hv);
2200 coro->invoke_av = newAV (); 2403 return;
2201
2202 frame->prepare = prepare_nop;
2203 } 2404 }
2204 else 2405 else
2205 { 2406 {
2206 av_clear (GvAV (PL_defgv)); 2407 av_clear (GvAV (PL_defgv));
2207 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2408 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
… …
2257 2458
2258static int 2459static int
2259slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2460slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
2260{ 2461{
2261 SV *data = (SV *)frame->data; 2462 SV *data = (SV *)frame->data;
2262 2463
2263 if (CORO_THROW) 2464 if (CORO_THROW)
2264 return 0; 2465 return 0;
2265 2466
2266 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2467 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2267 return 1; 2468 return 1;
… …
2303 cb = sv_2mortal (coro->rouse_cb); 2504 cb = sv_2mortal (coro->rouse_cb);
2304 coro->rouse_cb = 0; 2505 coro->rouse_cb = 0;
2305 } 2506 }
2306 2507
2307 if (!SvROK (cb) 2508 if (!SvROK (cb)
2308 || SvTYPE (SvRV (cb)) != SVt_PVCV 2509 || SvTYPE (SvRV (cb)) != SVt_PVCV
2309 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2510 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2310 croak ("Coro::rouse_wait called with illegal callback argument,"); 2511 croak ("Coro::rouse_wait called with illegal callback argument,");
2311 2512
2312 { 2513 {
2313 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */ 2514 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
… …
2430static void 2631static void
2431slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2632slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2432{ 2633{
2433 frame->prepare = prepare_cede_notself; 2634 frame->prepare = prepare_cede_notself;
2434 frame->check = slf_check_nop; 2635 frame->check = slf_check_nop;
2636}
2637
2638/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2639static void
2640slf_destroy (pTHX_ struct coro *coro)
2641{
2642 /* this callback is reserved for slf functions needing to do cleanup */
2643 if (coro->slf_frame.destroy && coro->slf_frame.prepare && !PL_dirty)
2644 coro->slf_frame.destroy (aTHX_ &coro->slf_frame);
2645
2646 /*
2647 * The on_destroy above most likely is from an SLF call.
2648 * Since by definition the SLF call will not finish when we destroy
2649 * the coro, we will have to force-finish it here, otherwise
2650 * cleanup functions cannot call SLF functions.
2651 */
2652 coro->slf_frame.prepare = 0;
2435} 2653}
2436 2654
2437/* 2655/*
2438 * these not obviously related functions are all rolled into one 2656 * these not obviously related functions are all rolled into one
2439 * function to increase chances that they all will call transfer with the same 2657 * function to increase chances that they all will call transfer with the same
… …
2446 I32 checkmark; /* mark SP to see how many elements check has pushed */ 2664 I32 checkmark; /* mark SP to see how many elements check has pushed */
2447 2665
2448 /* set up the slf frame, unless it has already been set-up */ 2666 /* set up the slf frame, unless it has already been set-up */
2449 /* the latter happens when a new coro has been started */ 2667 /* the latter happens when a new coro has been started */
2450 /* or when a new cctx was attached to an existing coroutine */ 2668 /* or when a new cctx was attached to an existing coroutine */
2451 if (expect_true (!slf_frame.prepare)) 2669 if (ecb_expect_true (!slf_frame.prepare))
2452 { 2670 {
2453 /* first iteration */ 2671 /* first iteration */
2454 dSP; 2672 dSP;
2455 SV **arg = PL_stack_base + TOPMARK + 1; 2673 SV **arg = PL_stack_base + TOPMARK + 1;
2456 int items = SP - arg; /* args without function object */ 2674 int items = SP - arg; /* args without function object */
… …
2497 while (slf_frame.check (aTHX_ &slf_frame)); 2715 while (slf_frame.check (aTHX_ &slf_frame));
2498 2716
2499 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */ 2717 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */
2500 2718
2501 /* exception handling */ 2719 /* exception handling */
2502 if (expect_false (CORO_THROW)) 2720 if (ecb_expect_false (CORO_THROW))
2503 { 2721 {
2504 SV *exception = sv_2mortal (CORO_THROW); 2722 SV *exception = sv_2mortal (CORO_THROW);
2505 2723
2506 CORO_THROW = 0; 2724 CORO_THROW = 0;
2507 sv_setsv (ERRSV, exception); 2725 sv_setsv (ERRSV, exception);
2508 croak (0); 2726 croak (0);
2509 } 2727 }
2510 2728
2511 /* return value handling - mostly like entersub */ 2729 /* return value handling - mostly like entersub */
2512 /* make sure we put something on the stack in scalar context */ 2730 /* make sure we put something on the stack in scalar context */
2513 if (GIMME_V == G_SCALAR) 2731 if (GIMME_V == G_SCALAR
2732 && ecb_expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2514 { 2733 {
2515 dSP; 2734 dSP;
2516 SV **bot = PL_stack_base + checkmark; 2735 SV **bot = PL_stack_base + checkmark;
2517 2736
2518 if (sp == bot) /* too few, push undef */ 2737 if (sp == bot) /* too few, push undef */
2519 bot [1] = &PL_sv_undef; 2738 bot [1] = &PL_sv_undef;
2520 else if (sp != bot + 1) /* too many, take last one */ 2739 else /* too many, take last one */
2521 bot [1] = *sp; 2740 bot [1] = *sp;
2522 2741
2523 SP = bot + 1; 2742 SP = bot + 1;
2524 2743
2525 PUTBACK; 2744 PUTBACK;
… …
2632{ 2851{
2633 PerlIOBuf base; 2852 PerlIOBuf base;
2634 NV next, every; 2853 NV next, every;
2635} PerlIOCede; 2854} PerlIOCede;
2636 2855
2637static IV 2856static IV ecb_cold
2638PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab) 2857PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab)
2639{ 2858{
2640 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2859 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2641 2860
2642 self->every = SvCUR (arg) ? SvNV (arg) : 0.01; 2861 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
2643 self->next = nvtime () + self->every; 2862 self->next = nvtime () + self->every;
2644 2863
2645 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab); 2864 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
2646} 2865}
2647 2866
2648static SV * 2867static SV * ecb_cold
2649PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags) 2868PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
2650{ 2869{
2651 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2870 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2652 2871
2653 return newSVnv (self->every); 2872 return newSVnv (self->every);
… …
2765 SvREFCNT_dec (cb); 2984 SvREFCNT_dec (cb);
2766 } 2985 }
2767} 2986}
2768 2987
2769static void 2988static void
2770coro_semaphore_on_destroy (pTHX_ struct coro *coro) 2989coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2771{ 2990{
2772 /* call $sem->adjust (0) to possibly wake up some other waiters */ 2991 /* call $sem->adjust (0) to possibly wake up some other waiters */
2773 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 2992 coro_semaphore_adjust (aTHX_ (AV *)frame->data, 0);
2774} 2993}
2775 2994
2776static int 2995static int
2777slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire) 2996slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2778{ 2997{
2779 AV *av = (AV *)frame->data; 2998 AV *av = (AV *)frame->data;
2780 SV *count_sv = AvARRAY (av)[0]; 2999 SV *count_sv = AvARRAY (av)[0];
3000 SV *coro_hv = SvRV (coro_current);
2781 3001
2782 /* if we are about to throw, don't actually acquire the lock, just throw */ 3002 /* if we are about to throw, don't actually acquire the lock, just throw */
2783 if (CORO_THROW) 3003 if (CORO_THROW)
2784 return 0; 3004 return 0;
2785 else if (SvIVX (count_sv) > 0) 3005 else if (SvIVX (count_sv) > 0)
2786 { 3006 {
2787 SvSTATE_current->on_destroy = 0; 3007 frame->destroy = 0;
2788 3008
2789 if (acquire) 3009 if (acquire)
2790 SvIVX (count_sv) = SvIVX (count_sv) - 1; 3010 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2791 else 3011 else
2792 coro_semaphore_adjust (aTHX_ av, 0); 3012 coro_semaphore_adjust (aTHX_ av, 0);
… …
2797 { 3017 {
2798 int i; 3018 int i;
2799 /* if we were woken up but can't down, we look through the whole */ 3019 /* if we were woken up but can't down, we look through the whole */
2800 /* waiters list and only add us if we aren't in there already */ 3020 /* waiters list and only add us if we aren't in there already */
2801 /* this avoids some degenerate memory usage cases */ 3021 /* this avoids some degenerate memory usage cases */
2802 3022 for (i = AvFILLp (av); i > 0; --i) /* i > 0 is not an off-by-one bug */
2803 for (i = 1; i <= AvFILLp (av); ++i)
2804 if (AvARRAY (av)[i] == SvRV (coro_current)) 3023 if (AvARRAY (av)[i] == coro_hv)
2805 return 1; 3024 return 1;
2806 3025
2807 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3026 av_push (av, SvREFCNT_inc (coro_hv));
2808 return 1; 3027 return 1;
2809 } 3028 }
2810} 3029}
2811 3030
2812static int 3031static int
… …
2835 { 3054 {
2836 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3055 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2837 3056
2838 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 3057 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2839 frame->prepare = prepare_schedule; 3058 frame->prepare = prepare_schedule;
2840
2841 /* to avoid race conditions when a woken-up coro gets terminated */ 3059 /* to avoid race conditions when a woken-up coro gets terminated */
2842 /* we arrange for a temporary on_destroy that calls adjust (0) */ 3060 /* we arrange for a temporary on_destroy that calls adjust (0) */
2843 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 3061 frame->destroy = coro_semaphore_destroy;
2844 } 3062 }
2845} 3063}
2846 3064
2847static void 3065static void
2848slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 3066slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
… …
3066 dSP; 3284 dSP;
3067 3285
3068 static SV *prio_cv; 3286 static SV *prio_cv;
3069 static SV *prio_sv; 3287 static SV *prio_sv;
3070 3288
3071 if (expect_false (!prio_cv)) 3289 if (ecb_expect_false (!prio_cv))
3072 { 3290 {
3073 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0); 3291 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0);
3074 prio_sv = newSViv (0); 3292 prio_sv = newSViv (0);
3075 } 3293 }
3076 3294
… …
3182 } 3400 }
3183 3401
3184 return coro_sv; 3402 return coro_sv;
3185} 3403}
3186 3404
3405#ifndef __cplusplus
3406ecb_cold XS(boot_Coro__State);
3407#endif
3408
3409#if CORO_JIT
3410
3411static void ecb_noinline ecb_cold
3412pushav_4uv (pTHX_ UV a, UV b, UV c, UV d)
3413{
3414 dSP;
3415 AV *av = newAV ();
3416
3417 av_store (av, 3, newSVuv (d));
3418 av_store (av, 2, newSVuv (c));
3419 av_store (av, 1, newSVuv (b));
3420 av_store (av, 0, newSVuv (a));
3421
3422 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
3423
3424 PUTBACK;
3425}
3426
3427static void ecb_noinline ecb_cold
3428jit_init (pTHX)
3429{
3430 dSP;
3431 SV *load, *save;
3432 char *map_base;
3433 char *load_ptr, *save_ptr;
3434 STRLEN load_len, save_len, map_len;
3435 int count;
3436
3437 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3438
3439 PUSHMARK (SP);
3440 #define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type));
3441 #include "state.h"
3442 count = call_pv ("Coro::State::_jit", G_ARRAY);
3443 SPAGAIN;
3444
3445 save = POPs; save_ptr = SvPVbyte (save, save_len);
3446 load = POPs; load_ptr = SvPVbyte (load, load_len);
3447
3448 map_len = load_len + save_len + 16;
3449
3450 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3451
3452 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3453
3454 load_perl_slots = (load_save_perl_slots_type)map_base;
3455 memcpy (map_base, load_ptr, load_len);
3456
3457 map_base += (load_len + 15) & ~15;
3458
3459 save_perl_slots = (load_save_perl_slots_type)map_base;
3460 memcpy (map_base, save_ptr, save_len);
3461
3462 /* we are good citizens and try to make the page read-only, so the evil evil */
3463 /* hackers might have it a bit more difficult */
3464 mprotect (map_base, map_len, PROT_READ | PROT_EXEC);
3465
3466 PUTBACK;
3467 eval_pv ("undef &Coro::State::_jit", 1);
3468}
3469
3470#endif
3471
3187MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3472MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
3188 3473
3189PROTOTYPES: DISABLE 3474PROTOTYPES: DISABLE
3190 3475
3191BOOT: 3476BOOT:
… …
3194# if CORO_PTHREAD 3479# if CORO_PTHREAD
3195 coro_thx = PERL_GET_CONTEXT; 3480 coro_thx = PERL_GET_CONTEXT;
3196# endif 3481# endif
3197#endif 3482#endif
3198 BOOT_PAGESIZE; 3483 BOOT_PAGESIZE;
3484
3485 /* perl defines these to check for existance first, but why it doesn't */
3486 /* just create them one at init time is not clear to me, except for */
3487 /* programs trying to delete them, but... */
3488 /* anyway, we declare this as invalid and make sure they are initialised here */
3489 DEFSV;
3490 ERRSV;
3199 3491
3200 cctx_current = cctx_new_empty (); 3492 cctx_current = cctx_new_empty ();
3201 3493
3202 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3494 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
3203 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3495 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
… …
3246 coroapi.prepare_cede_notself = prepare_cede_notself; 3538 coroapi.prepare_cede_notself = prepare_cede_notself;
3247 3539
3248 time_init (aTHX); 3540 time_init (aTHX);
3249 3541
3250 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL)); 3542 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3543#if CORO_JIT
3544 PUTBACK;
3545 jit_init (aTHX);
3546 SPAGAIN;
3547#endif
3251} 3548}
3252 3549
3253SV * 3550SV *
3254new (SV *klass, ...) 3551new (SV *klass, ...)
3255 ALIAS: 3552 ALIAS:
… …
3332void 3629void
3333list () 3630list ()
3334 PROTOTYPE: 3631 PROTOTYPE:
3335 PPCODE: 3632 PPCODE:
3336{ 3633{
3337 struct coro *coro; 3634 struct coro *coro;
3338 for (coro = coro_first; coro; coro = coro->next) 3635 for (coro = coro_first; coro; coro = coro->next)
3339 if (coro->hv) 3636 if (coro->hv)
3340 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 3637 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
3341} 3638}
3342 3639
… …
3397 PROTOTYPE: $ 3694 PROTOTYPE: $
3398 ALIAS: 3695 ALIAS:
3399 is_ready = CF_READY 3696 is_ready = CF_READY
3400 is_running = CF_RUNNING 3697 is_running = CF_RUNNING
3401 is_new = CF_NEW 3698 is_new = CF_NEW
3402 is_destroyed = CF_DESTROYED 3699 is_destroyed = CF_ZOMBIE
3700 is_zombie = CF_ZOMBIE
3403 is_suspended = CF_SUSPENDED 3701 is_suspended = CF_SUSPENDED
3404 CODE: 3702 CODE:
3405 RETVAL = boolSV (coro->flags & ix); 3703 RETVAL = boolSV (coro->flags & ix);
3406 OUTPUT: 3704 OUTPUT:
3407 RETVAL 3705 RETVAL
3408 3706
3409void 3707void
3410throw (Coro::State self, SV *exception = &PL_sv_undef) 3708throw (SV *self, SV *exception = &PL_sv_undef)
3411 PROTOTYPE: $;$ 3709 PROTOTYPE: $;$
3412 CODE: 3710 CODE:
3413{ 3711{
3712 struct coro *coro = SvSTATE (self);
3414 struct coro *current = SvSTATE_current; 3713 struct coro *current = SvSTATE_current;
3415 SV **exceptionp = self == current ? &CORO_THROW : &self->except; 3714 SV **exceptionp = coro == current ? &CORO_THROW : &coro->except;
3416 SvREFCNT_dec (*exceptionp); 3715 SvREFCNT_dec (*exceptionp);
3417 SvGETMAGIC (exception); 3716 SvGETMAGIC (exception);
3418 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0; 3717 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3718
3719 api_ready (aTHX_ self);
3419} 3720}
3420 3721
3421void 3722void
3422api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3723api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3423 PROTOTYPE: $;$ 3724 PROTOTYPE: $;$
… …
3500 3801
3501void 3802void
3502times (Coro::State self) 3803times (Coro::State self)
3503 PPCODE: 3804 PPCODE:
3504{ 3805{
3505 struct coro *current = SvSTATE (coro_current); 3806 struct coro *current = SvSTATE (coro_current);
3506 3807
3507 if (expect_false (current == self)) 3808 if (ecb_expect_false (current == self))
3508 { 3809 {
3509 coro_times_update (); 3810 coro_times_update ();
3510 coro_times_add (SvSTATE (coro_current)); 3811 coro_times_add (SvSTATE (coro_current));
3511 } 3812 }
3512 3813
3513 EXTEND (SP, 2); 3814 EXTEND (SP, 2);
3514 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9))); 3815 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3515 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9))); 3816 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3516 3817
3517 if (expect_false (current == self)) 3818 if (ecb_expect_false (current == self))
3518 coro_times_sub (SvSTATE (coro_current)); 3819 coro_times_sub (SvSTATE (coro_current));
3519} 3820}
3520 3821
3521void 3822void
3522swap_sv (Coro::State coro, SV *sv, SV *swapsv) 3823swap_sv (Coro::State coro, SV *sv, SV *swapsv)
… …
3543BOOT: 3844BOOT:
3544{ 3845{
3545 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3846 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3546 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3847 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3547 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 3848 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3548 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3549 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 3849 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3550 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 3850 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3551 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 3851 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3552 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 3852 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3553 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 3853 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3554 3854
3555 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3855 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3556 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3856 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3557 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 3857 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3558 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */ 3858 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3559 3859
3560 coro_stash = gv_stashpv ("Coro", TRUE); 3860 coro_stash = gv_stashpv ("Coro", TRUE);
3561 3861
3562 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 3862 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3563 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 3863 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3564 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL)); 3864 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
… …
3596void 3896void
3597_destroy (Coro::State coro) 3897_destroy (Coro::State coro)
3598 CODE: 3898 CODE:
3599 /* used by the manager thread */ 3899 /* used by the manager thread */
3600 coro_state_destroy (aTHX_ coro); 3900 coro_state_destroy (aTHX_ coro);
3901
3902void
3903on_destroy (Coro::State coro, SV *cb)
3904 CODE:
3601 coro_call_on_destroy (aTHX_ coro); 3905 coro_push_on_destroy (aTHX_ coro, newSVsv (cb));
3906
3907void
3908join (...)
3909 CODE:
3910 CORO_EXECUTE_SLF_XS (slf_init_join);
3602 3911
3603void 3912void
3604terminate (...) 3913terminate (...)
3605 CODE: 3914 CODE:
3606 CORO_EXECUTE_SLF_XS (slf_init_terminate); 3915 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3607 3916
3608void 3917void
3609cancel (...) 3918cancel (...)
3610 CODE: 3919 CODE:
3611 CORO_EXECUTE_SLF_XS (slf_init_cancel); 3920 CORO_EXECUTE_SLF_XS (slf_init_cancel);
3921
3922int
3923safe_cancel (Coro::State self, ...)
3924 C_ARGS: aTHX_ self, &ST (1), items - 1
3612 3925
3613void 3926void
3614schedule (...) 3927schedule (...)
3615 CODE: 3928 CODE:
3616 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3929 CORO_EXECUTE_SLF_XS (slf_init_schedule);
… …
3773 on_leave = 1 4086 on_leave = 1
3774 PROTOTYPE: & 4087 PROTOTYPE: &
3775 CODE: 4088 CODE:
3776{ 4089{
3777 struct coro *coro = SvSTATE_current; 4090 struct coro *coro = SvSTATE_current;
3778 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 4091 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3779 4092
3780 block = s_get_cv_croak (block); 4093 block = s_get_cv_croak (block);
3781 4094
3782 if (!*avp) 4095 if (!*avp)
3783 *avp = newAV (); 4096 *avp = newAV ();
… …
3803 4116
3804SV * 4117SV *
3805new (SV *klass, SV *count = 0) 4118new (SV *klass, SV *count = 0)
3806 CODE: 4119 CODE:
3807{ 4120{
3808 int semcnt = 1; 4121 int semcnt = 1;
3809 4122
3810 if (count) 4123 if (count)
3811 { 4124 {
3812 SvGETMAGIC (count); 4125 SvGETMAGIC (count);
3813 4126
… …
3873 XSRETURN_NO; 4186 XSRETURN_NO;
3874} 4187}
3875 4188
3876void 4189void
3877waiters (SV *self) 4190waiters (SV *self)
3878 PPCODE: 4191 PPCODE:
3879{ 4192{
3880 AV *av = (AV *)SvRV (self); 4193 AV *av = (AV *)SvRV (self);
3881 int wcount = AvFILLp (av) + 1 - 1; 4194 int wcount = AvFILLp (av) + 1 - 1;
3882 4195
3883 if (GIMME_V == G_SCALAR) 4196 if (GIMME_V == G_SCALAR)
… …
3892} 4205}
3893 4206
3894MODULE = Coro::State PACKAGE = Coro::SemaphoreSet 4207MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3895 4208
3896void 4209void
3897_may_delete (SV *sem, int count, int extra_refs) 4210_may_delete (SV *sem, int count, unsigned int extra_refs)
3898 PPCODE: 4211 PPCODE:
3899{ 4212{
3900 AV *av = (AV *)SvRV (sem); 4213 AV *av = (AV *)SvRV (sem);
3901 4214
3902 if (SvREFCNT ((SV *)av) == 1 + extra_refs 4215 if (SvREFCNT ((SV *)av) == 1 + extra_refs
3903 && AvFILLp (av) == 0 /* no waiters, just count */ 4216 && AvFILLp (av) == 0 /* no waiters, just count */
3904 && SvIV (AvARRAY (av)[0]) == count) 4217 && SvIV (AvARRAY (av)[0]) == count)
3905 XSRETURN_YES; 4218 XSRETURN_YES;
… …
3926 4239
3927void 4240void
3928broadcast (SV *self) 4241broadcast (SV *self)
3929 CODE: 4242 CODE:
3930{ 4243{
3931 AV *av = (AV *)SvRV (self); 4244 AV *av = (AV *)SvRV (self);
3932 coro_signal_wake (aTHX_ av, AvFILLp (av)); 4245 coro_signal_wake (aTHX_ av, AvFILLp (av));
3933} 4246}
3934 4247
3935void 4248void
3936send (SV *self) 4249send (SV *self)
… …
3944 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */ 4257 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
3945} 4258}
3946 4259
3947IV 4260IV
3948awaited (SV *self) 4261awaited (SV *self)
3949 CODE: 4262 CODE:
3950 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1; 4263 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
3951 OUTPUT: 4264 OUTPUT:
3952 RETVAL 4265 RETVAL
3953 4266
3954 4267
… …
3959 4272
3960void 4273void
3961_schedule (...) 4274_schedule (...)
3962 CODE: 4275 CODE:
3963{ 4276{
3964 static int incede; 4277 static int incede;
3965 4278
3966 api_cede_notself (aTHX); 4279 api_cede_notself (aTHX);
3967 4280
3968 ++incede; 4281 ++incede;
3969 while (coro_nready >= incede && api_cede (aTHX)) 4282 while (coro_nready >= incede && api_cede (aTHX))

Diff Legend

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