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

Comparing Coro/Coro/State.xs (file contents):
Revision 1.398 by root, Sat May 7 14:11:10 2011 UTC vs.
Revision 1.430 by root, Wed Dec 19 23:36:16 2012 UTC

1/* this works around a bug in mingw32 providing a non-working setjmp */ 1/* this works around a bug in mingw32 providing a non-working setjmp */
2#define USE_NO_MINGW_SETJMP_TWO_ARGS 2#define USE_NO_MINGW_SETJMP_TWO_ARGS
3 3
4#define NDEBUG 1 4#define NDEBUG 1 /* perl usually disables NDEBUG later */
5 5
6#include "libcoro/coro.c" 6#include "libcoro/coro.c"
7 7
8#define PERL_NO_GET_CONTEXT 8#define PERL_NO_GET_CONTEXT
9#define PERL_EXT 9#define PERL_EXT
… …
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
37# include <unistd.h>
38# include <sys/mman.h>
39# ifndef MAP_ANONYMOUS
40# ifdef MAP_ANON
41# define MAP_ANONYMOUS MAP_ANON
42# else
43# undef HAVE_MMAP
44# endif
45# endif
46# include <limits.h>
47# ifndef PAGESIZE
48# define PAGESIZE pagesize
49# define BOOT_PAGESIZE pagesize = sysconf (_SC_PAGESIZE)
50static long pagesize;
51# else
52# define BOOT_PAGESIZE (void)0
53# endif
54#else
55# define PAGESIZE 0
56# define BOOT_PAGESIZE (void)0
57#endif
58
59#if CORO_USE_VALGRIND
60# include <valgrind/valgrind.h>
61#endif
62
63/* the maximum number of idle cctx that will be pooled */ 57/* the maximum number of idle cctx that will be pooled */
64static int cctx_max_idle = 4; 58static int cctx_max_idle = 4;
65 59
66#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 60#if defined(DEBUGGING) && PERL_VERSION_ATLEAST(5,12,0)
67# undef CORO_STACKGUARD 61# define HAS_SCOPESTACK_NAME 1
68#endif
69
70#ifndef CORO_STACKGUARD
71# define CORO_STACKGUARD 0
72#endif 62#endif
73 63
74/* prefer perl internal functions over our own? */ 64/* prefer perl internal functions over our own? */
75#ifndef CORO_PREFER_PERL_FUNCTIONS 65#ifndef CORO_PREFER_PERL_FUNCTIONS
76# define CORO_PREFER_PERL_FUNCTIONS 0 66# define CORO_PREFER_PERL_FUNCTIONS 0
… …
86# define STACKLEVEL ((void *)&stacklevel) 76# define STACKLEVEL ((void *)&stacklevel)
87#endif 77#endif
88 78
89#define IN_DESTRUCT PL_dirty 79#define IN_DESTRUCT PL_dirty
90 80
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" 81#include "CoroAPI.h"
107#define GCoroAPI (&coroapi) /* very sneaky */ 82#define GCoroAPI (&coroapi) /* very sneaky */
108 83
109#ifdef USE_ITHREADS 84#ifdef USE_ITHREADS
110# if CORO_PTHREAD 85# if CORO_PTHREAD
… …
166static char times_valid; 141static char times_valid;
167 142
168static struct coro_cctx *cctx_first; 143static struct coro_cctx *cctx_first;
169static int cctx_count, cctx_idle; 144static int cctx_count, cctx_idle;
170 145
171enum { 146enum
147{
172 CC_MAPPED = 0x01, 148 CC_MAPPED = 0x01,
173 CC_NOREUSE = 0x02, /* throw this away after tracing */ 149 CC_NOREUSE = 0x02, /* throw this away after tracing */
174 CC_TRACE = 0x04, 150 CC_TRACE = 0x04,
175 CC_TRACE_SUB = 0x08, /* trace sub calls */ 151 CC_TRACE_SUB = 0x08, /* trace sub calls */
176 CC_TRACE_LINE = 0x10, /* trace each statement */ 152 CC_TRACE_LINE = 0x10, /* trace each statement */
… …
181typedef struct coro_cctx 157typedef struct coro_cctx
182{ 158{
183 struct coro_cctx *next; 159 struct coro_cctx *next;
184 160
185 /* the stack */ 161 /* the stack */
186 void *sptr; 162 struct coro_stack stack;
187 size_t ssize;
188 163
189 /* cpu state */ 164 /* cpu state */
190 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 165 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
166#ifndef NDEBUG
191 JMPENV *idle_te; /* same as idle_sp, but for top_env, TODO: remove once stable */ 167 JMPENV *idle_te; /* same as idle_sp, but for top_env */
168#endif
192 JMPENV *top_env; 169 JMPENV *top_env;
193 coro_context cctx; 170 coro_context cctx;
194 171
195 U32 gen; 172 U32 gen;
196#if CORO_USE_VALGRIND 173#if CORO_USE_VALGRIND
… …
201 178
202static coro_cctx *cctx_current; /* the currently running cctx */ 179static coro_cctx *cctx_current; /* the currently running cctx */
203 180
204/*****************************************************************************/ 181/*****************************************************************************/
205 182
183static MGVTBL coro_state_vtbl;
184
206enum { 185enum
186{
207 CF_RUNNING = 0x0001, /* coroutine is running */ 187 CF_RUNNING = 0x0001, /* coroutine is running */
208 CF_READY = 0x0002, /* coroutine is ready */ 188 CF_READY = 0x0002, /* coroutine is ready */
209 CF_NEW = 0x0004, /* has never been switched to */ 189 CF_NEW = 0x0004, /* has never been switched to */
210 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 190 CF_ZOMBIE = 0x0008, /* coroutine data has been freed */
211 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */ 191 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
212 CF_NOCANCEL = 0x0020, /* cannot cancel, set slf_frame.data to 1 (hackish) */ 192 CF_NOCANCEL = 0x0020, /* cannot cancel, set slf_frame.data to 1 (hackish) */
213}; 193};
214 194
215/* the structure where most of the perl state is stored, overlaid on the cxstack */ 195/* the structure where most of the perl state is stored, overlaid on the cxstack */
216typedef struct 196typedef struct
217{ 197{
218 SV *defsv;
219 AV *defav;
220 SV *errsv;
221 SV *irsgv;
222 HV *hinthv;
223#define VAR(name,type) type name; 198 #define VARx(name,expr,type) type name;
224# include "state.h" 199 #include "state.h"
225#undef VAR
226} perl_slots; 200} perl_slots;
227 201
228// how many context stack entries do we need for perl_slots 202/* how many context stack entries do we need for perl_slots */
229#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT)) 203#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
230 204
231/* this is a structure representing a perl-level coroutine */ 205/* this is a structure representing a perl-level coroutine */
232struct coro { 206struct coro
207{
233 /* the C coroutine allocated to this perl coroutine, if any */ 208 /* the C coroutine allocated to this perl coroutine, if any */
234 coro_cctx *cctx; 209 coro_cctx *cctx;
235 210
236 /* ready queue */ 211 /* ready queue */
237 struct coro *next_ready; 212 struct coro *next_ready;
… …
239 /* state data */ 214 /* state data */
240 struct CoroSLF slf_frame; /* saved slf frame */ 215 struct CoroSLF slf_frame; /* saved slf frame */
241 AV *mainstack; 216 AV *mainstack;
242 perl_slots *slot; /* basically the saved sp */ 217 perl_slots *slot; /* basically the saved sp */
243 218
244 CV *startcv; /* the CV to execute */ 219 CV *startcv; /* the CV to execute */
245 AV *args; /* data associated with this coroutine (initial args) */ 220 AV *args; /* data associated with this coroutine (initial args) */
246 int refcnt; /* coroutines are refcounted, yes */
247 int flags; /* CF_ flags */ 221 int flags; /* CF_ flags */
248 HV *hv; /* the perl hash associated with this coro, if any */ 222 HV *hv; /* the perl hash associated with this coro, if any */
249 223
250 /* statistics */ 224 /* statistics */
251 int usecount; /* number of transfers to this coro */ 225 int usecount; /* number of transfers to this coro */
252 226
253 /* coro process data */ 227 /* coro process data */
254 int prio; 228 int prio;
255 SV *except; /* exception to be thrown */ 229 SV *except; /* exception to be thrown */
256 SV *rouse_cb; 230 SV *rouse_cb; /* last rouse callback */
231 AV *on_destroy; /* callbacks or coros to notify on destroy */
232 AV *status; /* the exit status list */
257 233
258 /* async_pool */ 234 /* async_pool */
259 SV *saved_deffh; 235 SV *saved_deffh;
260 SV *invoke_cb; 236 SV *invoke_cb;
261 AV *invoke_av; 237 AV *invoke_av;
… …
297static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */ 273static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
298static CV *cv_coro_run; 274static CV *cv_coro_run;
299static struct coro *coro_first; 275static struct coro *coro_first;
300#define coro_nready coroapi.nready 276#define coro_nready coroapi.nready
301 277
278/** JIT *********************************************************************/
279
280#if CORO_JIT
281 /* APPLE doesn't have mmap though */
282 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__)
283 #ifndef CORO_JIT_TYPE
284 #if ECB_AMD64 && CORO_JIT_UNIXY
285 #define CORO_JIT_TYPE "amd64-unix"
286 #elif __i386 && CORO_JIT_UNIXY
287 #define CORO_JIT_TYPE "x86-unix"
288 #endif
289 #endif
290#endif
291
292#if !defined(CORO_JIT_TYPE) || _POSIX_MEMORY_PROTECTION <= 0
293 #undef CORO_JIT
294#endif
295
296#if CORO_JIT
297 typedef void (*load_save_perl_slots_type)(perl_slots *);
298 static load_save_perl_slots_type load_perl_slots, save_perl_slots;
299#endif
300
302/** Coro::Select ************************************************************/ 301/** Coro::Select ************************************************************/
303 302
304static OP *(*coro_old_pp_sselect) (pTHX); 303static OP *(*coro_old_pp_sselect) (pTHX);
305static SV *coro_select_select; 304static SV *coro_select_select;
306 305
… …
321 320
322/** time stuff **************************************************************/ 321/** time stuff **************************************************************/
323 322
324#ifdef HAS_GETTIMEOFDAY 323#ifdef HAS_GETTIMEOFDAY
325 324
326static void 325ecb_inline void
327coro_u2time (pTHX_ UV ret[2]) 326coro_u2time (pTHX_ UV ret[2])
328{ 327{
329 struct timeval tv; 328 struct timeval tv;
330 gettimeofday (&tv, 0); 329 gettimeofday (&tv, 0);
331 330
332 ret [0] = tv.tv_sec; 331 ret [0] = tv.tv_sec;
333 ret [1] = tv.tv_usec; 332 ret [1] = tv.tv_usec;
334} 333}
335 334
336static double 335ecb_inline double
337coro_nvtime () 336coro_nvtime (void)
338{ 337{
339 struct timeval tv; 338 struct timeval tv;
340 gettimeofday (&tv, 0); 339 gettimeofday (&tv, 0);
341 340
342 return tv.tv_sec + tv.tv_usec * 1e-6; 341 return tv.tv_sec + tv.tv_usec * 1e-6;
343} 342}
344 343
345static void 344ecb_inline void
346time_init (pTHX) 345time_init (pTHX)
347{ 346{
348 nvtime = coro_nvtime; 347 nvtime = coro_nvtime;
349 u2time = coro_u2time; 348 u2time = coro_u2time;
350} 349}
351 350
352#else 351#else
353 352
354static void 353ecb_inline void
355time_init (pTHX) 354time_init (pTHX)
356{ 355{
357 SV **svp; 356 SV **svp;
358 357
359 require_pv ("Time/HiRes.pm"); 358 require_pv ("Time/HiRes.pm");
360 359
361 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0); 360 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
362 361
363 if (!svp) croak ("Time::HiRes is required, but missing. Caught"); 362 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
364 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught"); 363 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught");
365 364
… …
371 370
372#endif 371#endif
373 372
374/** lowlevel stuff **********************************************************/ 373/** lowlevel stuff **********************************************************/
375 374
376static SV * 375static SV * ecb_noinline
377coro_get_sv (pTHX_ const char *name, int create) 376coro_get_sv (pTHX_ const char *name, int create)
378{ 377{
379#if PERL_VERSION_ATLEAST (5,10,0) 378#if PERL_VERSION_ATLEAST (5,10,0)
380 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 379 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
381 get_sv (name, create); 380 get_sv (name, create);
382#endif 381#endif
383 return get_sv (name, create); 382 return get_sv (name, create);
384} 383}
385 384
386static AV * 385static AV * ecb_noinline
387coro_get_av (pTHX_ const char *name, int create) 386coro_get_av (pTHX_ const char *name, int create)
388{ 387{
389#if PERL_VERSION_ATLEAST (5,10,0) 388#if PERL_VERSION_ATLEAST (5,10,0)
390 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 389 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
391 get_av (name, create); 390 get_av (name, create);
392#endif 391#endif
393 return get_av (name, create); 392 return get_av (name, create);
394} 393}
395 394
396static HV * 395static HV * ecb_noinline
397coro_get_hv (pTHX_ const char *name, int create) 396coro_get_hv (pTHX_ const char *name, int create)
398{ 397{
399#if PERL_VERSION_ATLEAST (5,10,0) 398#if PERL_VERSION_ATLEAST (5,10,0)
400 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 399 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
401 get_hv (name, create); 400 get_hv (name, create);
402#endif 401#endif
403 return get_hv (name, create); 402 return get_hv (name, create);
404} 403}
405 404
406INLINE void 405ecb_inline void
407coro_times_update () 406coro_times_update (void)
408{ 407{
409#ifdef coro_clock_gettime 408#ifdef coro_clock_gettime
410 struct timespec ts; 409 struct timespec ts;
411 410
412 ts.tv_sec = ts.tv_nsec = 0; 411 ts.tv_sec = ts.tv_nsec = 0;
… …
424 time_real [0] = tv [0]; 423 time_real [0] = tv [0];
425 time_real [1] = tv [1] * 1000; 424 time_real [1] = tv [1] * 1000;
426#endif 425#endif
427} 426}
428 427
429INLINE void 428ecb_inline void
430coro_times_add (struct coro *c) 429coro_times_add (struct coro *c)
431{ 430{
432 c->t_real [1] += time_real [1]; 431 c->t_real [1] += time_real [1];
433 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; } 432 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
434 c->t_real [0] += time_real [0]; 433 c->t_real [0] += time_real [0];
… …
436 c->t_cpu [1] += time_cpu [1]; 435 c->t_cpu [1] += time_cpu [1];
437 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; } 436 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
438 c->t_cpu [0] += time_cpu [0]; 437 c->t_cpu [0] += time_cpu [0];
439} 438}
440 439
441INLINE void 440ecb_inline void
442coro_times_sub (struct coro *c) 441coro_times_sub (struct coro *c)
443{ 442{
444 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; } 443 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; }
445 c->t_real [1] -= time_real [1]; 444 c->t_real [1] -= time_real [1];
446 c->t_real [0] -= time_real [0]; 445 c->t_real [0] -= time_real [0];
… …
454/* magic glue */ 453/* magic glue */
455 454
456#define CORO_MAGIC_type_cv 26 455#define CORO_MAGIC_type_cv 26
457#define CORO_MAGIC_type_state PERL_MAGIC_ext 456#define CORO_MAGIC_type_state PERL_MAGIC_ext
458 457
459#define CORO_MAGIC_NN(sv, type) \ 458#define CORO_MAGIC_NN(sv, type) \
460 (expect_true (SvMAGIC (sv)->mg_type == type) \ 459 (ecb_expect_true (SvMAGIC (sv)->mg_type == type) \
461 ? SvMAGIC (sv) \ 460 ? SvMAGIC (sv) \
462 : mg_find (sv, type)) 461 : mg_find (sv, type))
463 462
464#define CORO_MAGIC(sv, type) \ 463#define CORO_MAGIC(sv, type) \
465 (expect_true (SvMAGIC (sv)) \ 464 (ecb_expect_true (SvMAGIC (sv)) \
466 ? CORO_MAGIC_NN (sv, type) \ 465 ? CORO_MAGIC_NN (sv, type) \
467 : 0) 466 : 0)
468 467
469#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv) 468#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
470#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state) 469#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
471 470
472INLINE struct coro * 471ecb_inline MAGIC *
472SvSTATEhv_p (pTHX_ SV *coro)
473{
474 MAGIC *mg;
475
476 if (ecb_expect_true (
477 SvTYPE (coro) == SVt_PVHV
478 && (mg = CORO_MAGIC_state (coro))
479 && mg->mg_virtual == &coro_state_vtbl
480 ))
481 return mg;
482
483 return 0;
484}
485
486ecb_inline struct coro *
473SvSTATE_ (pTHX_ SV *coro) 487SvSTATE_ (pTHX_ SV *coro)
474{ 488{
475 HV *stash;
476 MAGIC *mg; 489 MAGIC *mg;
477 490
478 if (SvROK (coro)) 491 if (SvROK (coro))
479 coro = SvRV (coro); 492 coro = SvRV (coro);
480 493
481 if (expect_false (SvTYPE (coro) != SVt_PVHV)) 494 mg = SvSTATEhv_p (aTHX_ coro);
495 if (!mg)
482 croak ("Coro::State object required"); 496 croak ("Coro::State object required");
483 497
484 stash = SvSTASH (coro);
485 if (expect_false (stash != coro_stash && stash != coro_state_stash))
486 {
487 /* very slow, but rare, check */
488 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
489 croak ("Coro::State object required");
490 }
491
492 mg = CORO_MAGIC_state (coro);
493 return (struct coro *)mg->mg_ptr; 498 return (struct coro *)mg->mg_ptr;
494} 499}
495 500
496#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 501#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
497 502
… …
500#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 505#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
501 506
502/*****************************************************************************/ 507/*****************************************************************************/
503/* padlist management and caching */ 508/* padlist management and caching */
504 509
505static AV * 510ecb_inline PADLIST *
506coro_derive_padlist (pTHX_ CV *cv) 511coro_derive_padlist (pTHX_ CV *cv)
507{ 512{
508 AV *padlist = CvPADLIST (cv); 513 PADLIST *padlist = CvPADLIST (cv);
509 AV *newpadlist, *newpad; 514 PADLIST *newpadlist;
515 PAD *newpad;
516 PADOFFSET const off = PadlistMAX (padlist) + 1;
510 517
511 newpadlist = newAV (); 518 newPADLIST(newpadlist);
519#if !PERL_VERSION_ATLEAST(5,15,3)
520 /* Padlists are AvREAL as of 5.15.3. See perl bug #98092 and perl commit 7d953ba. */
512 AvREAL_off (newpadlist); 521 AvREAL_off (newpadlist);
522#endif
513#if PERL_VERSION_ATLEAST (5,10,0) 523#if PERL_VERSION_ATLEAST (5,10,0)
514 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1); 524 Perl_pad_push (aTHX_ padlist, off);
515#else 525#else
516 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 526 Perl_pad_push (aTHX_ padlist, off, 1);
517#endif 527#endif
518 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 528 newpad = PadlistARRAY (padlist)[off];
519 --AvFILLp (padlist); 529 PadlistMAX (padlist) = off - 1;
520 530
521 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0])); 531 /* Already extended to 2 elements by newPADLIST. */
522 av_store (newpadlist, 1, (SV *)newpad); 532 PadlistMAX (newpadlist) = 1;
533 PadlistNAMES (newpadlist) = (PADNAMELIST *)SvREFCNT_inc_NN (PadlistNAMES (padlist));
534 PadlistARRAY (newpadlist)[1] = newpad;
523 535
524 return newpadlist; 536 return newpadlist;
525} 537}
526 538
527static void 539ecb_inline void
528free_padlist (pTHX_ AV *padlist) 540free_padlist (pTHX_ PADLIST *padlist)
529{ 541{
530 /* may be during global destruction */ 542 /* may be during global destruction */
531 if (!IN_DESTRUCT) 543 if (!IN_DESTRUCT)
532 { 544 {
533 I32 i = AvFILLp (padlist); 545 I32 i = PadlistMAX (padlist);
534 546
535 while (i > 0) /* special-case index 0 */ 547 while (i > 0) /* special-case index 0 */
536 { 548 {
537 /* we try to be extra-careful here */ 549 /* we try to be extra-careful here */
538 AV *av = (AV *)AvARRAY (padlist)[i--]; 550 PAD *pad = PadlistARRAY (padlist)[i--];
539 I32 j = AvFILLp (av); 551 I32 j = PadMAX (pad);
540 552
541 while (j >= 0) 553 while (j >= 0)
542 SvREFCNT_dec (AvARRAY (av)[j--]); 554 SvREFCNT_dec (PadARRAY (pad)[j--]);
543 555
544 AvFILLp (av) = -1; 556 PadMAX (pad) = -1;
545 SvREFCNT_dec (av); 557 SvREFCNT_dec (pad);
546 } 558 }
547 559
548 SvREFCNT_dec (AvARRAY (padlist)[0]); 560 SvREFCNT_dec (PadlistNAMES (padlist));
549 561
562#ifdef NEWPADAPI
563 Safefree (PadlistARRAY (padlist));
564 Safefree (padlist);
565#else
550 AvFILLp (padlist) = -1; 566 AvFILLp (padlist) = -1;
567 AvREAL_off (padlist);
551 SvREFCNT_dec ((SV*)padlist); 568 SvREFCNT_dec ((SV*)padlist);
569#endif
552 } 570 }
553} 571}
554 572
555static int 573static int
556coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 574coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
557{ 575{
558 AV *padlist; 576 PADLIST *padlist;
559 AV *av = (AV *)mg->mg_obj; 577 PADLIST **padlists = (PADLIST **)(mg->mg_ptr + sizeof(size_t));
578 size_t len = *(size_t *)mg->mg_ptr;
560 579
561 /* perl manages to free our internal AV and _then_ call us */ 580 /* perl manages to free our internal AV and _then_ call us */
562 if (IN_DESTRUCT) 581 if (IN_DESTRUCT)
563 return 0; 582 return 0;
564 583
565 /* casting is fun. */ 584 while (len--)
566 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
567 free_padlist (aTHX_ padlist); 585 free_padlist (aTHX_ padlists[len]);
568
569 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
570 586
571 return 0; 587 return 0;
572} 588}
573 589
574static MGVTBL coro_cv_vtbl = { 590static MGVTBL coro_cv_vtbl = {
575 0, 0, 0, 0, 591 0, 0, 0, 0,
576 coro_cv_free 592 coro_cv_free
577}; 593};
578 594
579/* the next two functions merely cache the padlists */ 595/* the next two functions merely cache the padlists */
580static void 596ecb_inline void
581get_padlist (pTHX_ CV *cv) 597get_padlist (pTHX_ CV *cv)
582{ 598{
583 MAGIC *mg = CORO_MAGIC_cv (cv); 599 MAGIC *mg = CORO_MAGIC_cv (cv);
584 AV *av; 600 size_t *lenp;
585 601
586 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 602 if (ecb_expect_true (mg && *(lenp = (size_t *)mg->mg_ptr)))
587 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 603 CvPADLIST (cv) = ((PADLIST **)(mg->mg_ptr + sizeof(size_t)))[--*lenp];
588 else 604 else
589 { 605 {
590#if CORO_PREFER_PERL_FUNCTIONS 606#if CORO_PREFER_PERL_FUNCTIONS
591 /* this is probably cleaner? but also slower! */ 607 /* this is probably cleaner? but also slower! */
592 /* in practise, it seems to be less stable */ 608 /* in practise, it seems to be less stable */
… …
598 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 614 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
599#endif 615#endif
600 } 616 }
601} 617}
602 618
603static void 619ecb_inline void
604put_padlist (pTHX_ CV *cv) 620put_padlist (pTHX_ CV *cv)
605{ 621{
606 MAGIC *mg = CORO_MAGIC_cv (cv); 622 MAGIC *mg = CORO_MAGIC_cv (cv);
607 AV *av;
608 623
609 if (expect_false (!mg)) 624 if (ecb_expect_false (!mg))
625 {
610 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 626 mg = sv_magicext ((SV *)cv, 0, CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
627 Newz (0, mg->mg_ptr ,sizeof (size_t) + sizeof (PADLIST *), char);
628 mg->mg_len = 1; /* so mg_free frees mg_ptr */
629 }
630 else
631 Renew (mg->mg_ptr,
632 sizeof(size_t) + (*(size_t *)mg->mg_ptr + 1) * sizeof(PADLIST *),
633 char);
611 634
612 av = (AV *)mg->mg_obj; 635 ((PADLIST **)(mg->mg_ptr + sizeof (size_t))) [(*(size_t *)mg->mg_ptr)++] = CvPADLIST (cv);
613
614 if (expect_false (AvFILLp (av) >= AvMAX (av)))
615 av_extend (av, AvFILLp (av) + 1);
616
617 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
618} 636}
619 637
620/** load & save, init *******************************************************/ 638/** load & save, init *******************************************************/
621 639
640ecb_inline void
641swap_sv (SV *a, SV *b)
642{
643 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
644 SV tmp;
645
646 /* swap sv_any */
647 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
648
649 /* swap sv_flags */
650 SvFLAGS (&tmp) = SvFLAGS (a);
651 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
652 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
653
654#if PERL_VERSION_ATLEAST (5,10,0)
655 /* perl 5.10 and later complicates this _quite_ a bit, but it also
656 * is much faster, so no quarrels here. alternatively, we could
657 * sv_upgrade to avoid this.
658 */
659 {
660 /* swap sv_u */
661 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
662
663 /* if SvANY points to the head, we need to adjust the pointers,
664 * as the pointer for a still points to b, and maybe vice versa.
665 */
666 #define svany_in_head(type) \
667 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
668
669 if (svany_in_head (SvTYPE (a)))
670 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
671
672 if (svany_in_head (SvTYPE (b)))
673 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
674 }
675#endif
676}
677
622/* swap sv heads, at least logically */ 678/* swap sv heads, at least logically */
623static void 679static void
624swap_svs (pTHX_ Coro__State c) 680swap_svs (pTHX_ Coro__State c)
625{ 681{
626 int i; 682 int i;
627 683
628 for (i = 0; i <= AvFILLp (c->swap_sv); ) 684 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
629 { 685 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
630 SV *a = AvARRAY (c->swap_sv)[i++];
631 SV *b = AvARRAY (c->swap_sv)[i++];
632
633 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
634 SV tmp;
635
636 /* swap sv_any */
637 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
638
639 /* swap sv_flags */
640 SvFLAGS (&tmp) = SvFLAGS (a);
641 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
642 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
643
644#if PERL_VERSION_ATLEAST (5,10,0)
645 /* perl 5.10 complicates this _quite_ a bit, but it also is
646 * much faster, so no quarrels here. alternatively, we could
647 * sv_upgrade to avoid this.
648 */
649 {
650 /* swap sv_u */
651 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
652
653 /* if SvANY points to the head, we need to adjust the pointers,
654 * as the pointer for a still points to b, and maybe vice versa.
655 */
656 #define svany_in_head(type) \
657 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
658
659 if (svany_in_head (SvTYPE (a)))
660 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
661
662 if (svany_in_head (SvTYPE (b)))
663 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
664 }
665#endif
666 }
667} 686}
668 687
669#define SWAP_SVS(coro) \ 688#define SWAP_SVS(coro) \
670 if (expect_false ((coro)->swap_sv)) \ 689 if (ecb_expect_false ((coro)->swap_sv)) \
671 swap_svs (aTHX_ (coro)) 690 swap_svs (aTHX_ (coro))
672 691
673static void 692static void
674on_enterleave_call (pTHX_ SV *cb); 693on_enterleave_call (pTHX_ SV *cb);
675 694
… …
679 perl_slots *slot = c->slot; 698 perl_slots *slot = c->slot;
680 c->slot = 0; 699 c->slot = 0;
681 700
682 PL_mainstack = c->mainstack; 701 PL_mainstack = c->mainstack;
683 702
684 GvSV (PL_defgv) = slot->defsv; 703#if CORO_JIT
685 GvAV (PL_defgv) = slot->defav; 704 load_perl_slots (slot);
686 GvSV (PL_errgv) = slot->errsv; 705#else
687 GvSV (irsgv) = slot->irsgv;
688 GvHV (PL_hintgv) = slot->hinthv;
689
690 #define VAR(name,type) PL_ ## name = slot->name; 706 #define VARx(name,expr,type) expr = slot->name;
691 # include "state.h" 707 #include "state.h"
692 #undef VAR 708#endif
693 709
694 { 710 {
695 dSP; 711 dSP;
696 712
697 CV *cv; 713 CV *cv;
698 714
699 /* now do the ugly restore mess */ 715 /* now do the ugly restore mess */
700 while (expect_true (cv = (CV *)POPs)) 716 while (ecb_expect_true (cv = (CV *)POPs))
701 { 717 {
702 put_padlist (aTHX_ cv); /* mark this padlist as available */ 718 put_padlist (aTHX_ cv); /* mark this padlist as available */
703 CvDEPTH (cv) = PTR2IV (POPs); 719 CvDEPTH (cv) = PTR2IV (POPs);
704 CvPADLIST (cv) = (AV *)POPs; 720 CvPADLIST (cv) = (PADLIST *)POPs;
705 } 721 }
706 722
707 PUTBACK; 723 PUTBACK;
708 } 724 }
709 725
710 slf_frame = c->slf_frame; 726 slf_frame = c->slf_frame;
711 CORO_THROW = c->except; 727 CORO_THROW = c->except;
712 728
713 if (expect_false (enable_times)) 729 if (ecb_expect_false (enable_times))
714 { 730 {
715 if (expect_false (!times_valid)) 731 if (ecb_expect_false (!times_valid))
716 coro_times_update (); 732 coro_times_update ();
717 733
718 coro_times_sub (c); 734 coro_times_sub (c);
719 } 735 }
720 736
721 if (expect_false (c->on_enter)) 737 if (ecb_expect_false (c->on_enter))
722 { 738 {
723 int i; 739 int i;
724 740
725 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 741 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
726 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 742 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
… …
732static void 748static void
733save_perl (pTHX_ Coro__State c) 749save_perl (pTHX_ Coro__State c)
734{ 750{
735 SWAP_SVS (c); 751 SWAP_SVS (c);
736 752
737 if (expect_false (c->on_leave)) 753 if (ecb_expect_false (c->on_leave))
738 { 754 {
739 int i; 755 int i;
740 756
741 for (i = AvFILLp (c->on_leave); i >= 0; --i) 757 for (i = AvFILLp (c->on_leave); i >= 0; --i)
742 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]); 758 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
743 } 759 }
744 760
745 times_valid = 0; 761 times_valid = 0;
746 762
747 if (expect_false (enable_times)) 763 if (ecb_expect_false (enable_times))
748 { 764 {
749 coro_times_update (); times_valid = 1; 765 coro_times_update (); times_valid = 1;
750 coro_times_add (c); 766 coro_times_add (c);
751 } 767 }
752 768
… …
766 782
767 XPUSHs (Nullsv); 783 XPUSHs (Nullsv);
768 /* this loop was inspired by pp_caller */ 784 /* this loop was inspired by pp_caller */
769 for (;;) 785 for (;;)
770 { 786 {
771 while (expect_true (cxix >= 0)) 787 while (ecb_expect_true (cxix >= 0))
772 { 788 {
773 PERL_CONTEXT *cx = &ccstk[cxix--]; 789 PERL_CONTEXT *cx = &ccstk[cxix--];
774 790
775 if (expect_true (CxTYPE (cx) == CXt_SUB) || expect_false (CxTYPE (cx) == CXt_FORMAT)) 791 if (ecb_expect_true (CxTYPE (cx) == CXt_SUB) || ecb_expect_false (CxTYPE (cx) == CXt_FORMAT))
776 { 792 {
777 CV *cv = cx->blk_sub.cv; 793 CV *cv = cx->blk_sub.cv;
778 794
779 if (expect_true (CvDEPTH (cv))) 795 if (ecb_expect_true (CvDEPTH (cv)))
780 { 796 {
781 EXTEND (SP, 3); 797 EXTEND (SP, 3);
782 PUSHs ((SV *)CvPADLIST (cv)); 798 PUSHs ((SV *)CvPADLIST (cv));
783 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv))); 799 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
784 PUSHs ((SV *)cv); 800 PUSHs ((SV *)cv);
… …
787 get_padlist (aTHX_ cv); 803 get_padlist (aTHX_ cv);
788 } 804 }
789 } 805 }
790 } 806 }
791 807
792 if (expect_true (top_si->si_type == PERLSI_MAIN)) 808 if (ecb_expect_true (top_si->si_type == PERLSI_MAIN))
793 break; 809 break;
794 810
795 top_si = top_si->si_prev; 811 top_si = top_si->si_prev;
796 ccstk = top_si->si_cxstack; 812 ccstk = top_si->si_cxstack;
797 cxix = top_si->si_cxix; 813 cxix = top_si->si_cxix;
… …
799 815
800 PUTBACK; 816 PUTBACK;
801 } 817 }
802 818
803 /* allocate some space on the context stack for our purposes */ 819 /* allocate some space on the context stack for our purposes */
804 if (expect_false (cxstack_ix + SLOT_COUNT >= cxstack_max)) 820 if (ecb_expect_false (cxstack_ix + (int)SLOT_COUNT >= cxstack_max))
805 { 821 {
806 unsigned int i; 822 unsigned int i;
807 823
808 for (i = 0; i < SLOT_COUNT; ++i) 824 for (i = 0; i < SLOT_COUNT; ++i)
809 CXINC; 825 CXINC;
… …
814 c->mainstack = PL_mainstack; 830 c->mainstack = PL_mainstack;
815 831
816 { 832 {
817 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 833 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
818 834
819 slot->defav = GvAV (PL_defgv); 835#if CORO_JIT
820 slot->defsv = DEFSV; 836 save_perl_slots (slot);
821 slot->errsv = ERRSV; 837#else
822 slot->irsgv = GvSV (irsgv);
823 slot->hinthv = GvHV (PL_hintgv);
824
825 #define VAR(name,type) slot->name = PL_ ## name; 838 #define VARx(name,expr,type) slot->name = expr;
826 # include "state.h" 839 #include "state.h"
827 #undef VAR 840#endif
828 } 841 }
829} 842}
830 843
831/* 844/*
832 * allocate various perl stacks. This is almost an exact copy 845 * allocate various perl stacks. This is almost an exact copy
… …
863#endif 876#endif
864 877
865 New(54,PL_scopestack,8,I32); 878 New(54,PL_scopestack,8,I32);
866 PL_scopestack_ix = 0; 879 PL_scopestack_ix = 0;
867 PL_scopestack_max = 8; 880 PL_scopestack_max = 8;
881#if HAS_SCOPESTACK_NAME
882 New(54,PL_scopestack_name,8,const char*);
883#endif
868 884
869 New(54,PL_savestack,24,ANY); 885 New(54,PL_savestack,24,ANY);
870 PL_savestack_ix = 0; 886 PL_savestack_ix = 0;
871 PL_savestack_max = 24; 887 PL_savestack_max = 24;
872 888
… …
900 } 916 }
901 917
902 Safefree (PL_tmps_stack); 918 Safefree (PL_tmps_stack);
903 Safefree (PL_markstack); 919 Safefree (PL_markstack);
904 Safefree (PL_scopestack); 920 Safefree (PL_scopestack);
921#if HAS_SCOPESTACK_NAME
922 Safefree (PL_scopestack_name);
923#endif
905 Safefree (PL_savestack); 924 Safefree (PL_savestack);
906#if !PERL_VERSION_ATLEAST (5,10,0) 925#if !PERL_VERSION_ATLEAST (5,10,0)
907 Safefree (PL_retstack); 926 Safefree (PL_retstack);
908#endif 927#endif
909} 928}
… …
955#endif 974#endif
956 975
957/* 976/*
958 * This overrides the default magic get method of %SIG elements. 977 * 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 978 * 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 979 * and instead of trying to save and restore the hash elements (extremely slow),
961 * readback here. 980 * we just provide our own readback here.
962 */ 981 */
963static int 982static int ecb_cold
964coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 983coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
965{ 984{
966 const char *s = MgPV_nolen_const (mg); 985 const char *s = MgPV_nolen_const (mg);
967 986
968 if (*s == '_') 987 if (*s == '_')
969 { 988 {
970 SV **svp = 0; 989 SV **svp = 0;
971 990
972 if (strEQ (s, "__DIE__" )) svp = &PL_diehook; 991 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
973 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 992 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
974 993
975 if (svp) 994 if (svp)
976 { 995 {
977 sv_setsv (sv, *svp ? *svp : &PL_sv_undef); 996 SV *ssv;
997
998 if (!*svp)
999 ssv = &PL_sv_undef;
1000 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */
1001 ssv = sv_2mortal (newRV_inc (*svp));
1002 else
1003 ssv = *svp;
1004
1005 sv_setsv (sv, ssv);
978 return 0; 1006 return 0;
979 } 1007 }
980 } 1008 }
981 1009
982 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 1010 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
983} 1011}
984 1012
985static int 1013static int ecb_cold
986coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1014coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
987{ 1015{
988 const char *s = MgPV_nolen_const (mg); 1016 const char *s = MgPV_nolen_const (mg);
989 1017
990 if (*s == '_') 1018 if (*s == '_')
… …
1004 } 1032 }
1005 1033
1006 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0; 1034 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
1007} 1035}
1008 1036
1009static int 1037static int ecb_cold
1010coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1038coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
1011{ 1039{
1012 const char *s = MgPV_nolen_const (mg); 1040 const char *s = MgPV_nolen_const (mg);
1013 1041
1014 if (*s == '_') 1042 if (*s == '_')
… …
1049 return 1; 1077 return 1;
1050} 1078}
1051 1079
1052static UNOP init_perl_op; 1080static UNOP init_perl_op;
1053 1081
1054static void NOINLINE /* noinline to keep it out of the transfer fast path */ 1082ecb_noinline static void /* noinline to keep it out of the transfer fast path */
1055init_perl (pTHX_ struct coro *coro) 1083init_perl (pTHX_ struct coro *coro)
1056{ 1084{
1057 /* 1085 /*
1058 * emulate part of the perl startup here. 1086 * emulate part of the perl startup here.
1059 */ 1087 */
… …
1074 PL_parser = 0; 1102 PL_parser = 0;
1075#endif 1103#endif
1076 PL_hints = 0; 1104 PL_hints = 0;
1077 1105
1078 /* recreate the die/warn hooks */ 1106 /* recreate the die/warn hooks */
1079 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1107 PL_diehook = SvREFCNT_inc (rv_diehook);
1080 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1108 PL_warnhook = SvREFCNT_inc (rv_warnhook);
1081 1109
1082 GvSV (PL_defgv) = newSV (0); 1110 GvSV (PL_defgv) = newSV (0);
1083 GvAV (PL_defgv) = coro->args; coro->args = 0; 1111 GvAV (PL_defgv) = coro->args; coro->args = 0;
1084 GvSV (PL_errgv) = newSV (0); 1112 GvSV (PL_errgv) = newSV (0);
1085 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1113 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
1086 GvHV (PL_hintgv) = 0; 1114 GvHV (PL_hintgv) = 0;
… …
1106 /* this newly created coroutine might be run on an existing cctx which most 1134 /* 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. 1135 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
1108 */ 1136 */
1109 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1137 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 */ 1138 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
1139 slf_frame.destroy = 0;
1111 1140
1112 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1141 /* 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; 1142 init_perl_op.op_next = PL_op;
1114 init_perl_op.op_type = OP_ENTERSUB; 1143 init_perl_op.op_type = OP_ENTERSUB;
1115 init_perl_op.op_ppaddr = pp_slf; 1144 init_perl_op.op_ppaddr = pp_slf;
… …
1120 /* copy throw, in case it was set before init_perl */ 1149 /* copy throw, in case it was set before init_perl */
1121 CORO_THROW = coro->except; 1150 CORO_THROW = coro->except;
1122 1151
1123 SWAP_SVS (coro); 1152 SWAP_SVS (coro);
1124 1153
1125 if (expect_false (enable_times)) 1154 if (ecb_expect_false (enable_times))
1126 { 1155 {
1127 coro_times_update (); 1156 coro_times_update ();
1128 coro_times_sub (coro); 1157 coro_times_sub (coro);
1129 } 1158 }
1130} 1159}
… …
1167 SvRV_set (coro_current, (SV *)coro->hv); 1196 SvRV_set (coro_current, (SV *)coro->hv);
1168 1197
1169 load_perl (aTHX_ coro); 1198 load_perl (aTHX_ coro);
1170 1199
1171 coro_unwind_stacks (aTHX); 1200 coro_unwind_stacks (aTHX);
1172 coro_destruct_stacks (aTHX);
1173 1201
1174 /* restore swapped sv's */ 1202 /* restore swapped sv's */
1175 SWAP_SVS (coro); 1203 SWAP_SVS (coro);
1176 1204
1205 coro_destruct_stacks (aTHX);
1206
1177 // now save some sv's to be free'd later 1207 /* now save some sv's to be free'd later */
1178 svf [0] = GvSV (PL_defgv); 1208 svf [0] = GvSV (PL_defgv);
1179 svf [1] = (SV *)GvAV (PL_defgv); 1209 svf [1] = (SV *)GvAV (PL_defgv);
1180 svf [2] = GvSV (PL_errgv); 1210 svf [2] = GvSV (PL_errgv);
1181 svf [3] = (SV *)PL_defoutgv; 1211 svf [3] = (SV *)PL_defoutgv;
1182 svf [4] = PL_rs; 1212 svf [4] = PL_rs;
… …
1202 SvREFCNT_dec (coro->invoke_cb); 1232 SvREFCNT_dec (coro->invoke_cb);
1203 SvREFCNT_dec (coro->invoke_av); 1233 SvREFCNT_dec (coro->invoke_av);
1204 } 1234 }
1205} 1235}
1206 1236
1207INLINE void 1237ecb_inline void
1208free_coro_mortal (pTHX) 1238free_coro_mortal (pTHX)
1209{ 1239{
1210 if (expect_true (coro_mortal)) 1240 if (ecb_expect_true (coro_mortal))
1211 { 1241 {
1212 SvREFCNT_dec (coro_mortal); 1242 SvREFCNT_dec ((SV *)coro_mortal);
1213 coro_mortal = 0; 1243 coro_mortal = 0;
1214 } 1244 }
1215} 1245}
1216 1246
1217static int 1247static int
… …
1350 1380
1351 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1381 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1352} 1382}
1353 1383
1354/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1384/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1355static void NOINLINE 1385static void ecb_noinline
1356cctx_prepare (pTHX) 1386cctx_prepare (pTHX)
1357{ 1387{
1358 PL_top_env = &PL_start_env; 1388 PL_top_env = &PL_start_env;
1359 1389
1360 if (cctx_current->flags & CC_TRACE) 1390 if (cctx_current->flags & CC_TRACE)
… …
1371 slf_frame.prepare = slf_prepare_set_stacklevel; 1401 slf_frame.prepare = slf_prepare_set_stacklevel;
1372 slf_frame.check = slf_check_set_stacklevel; 1402 slf_frame.check = slf_check_set_stacklevel;
1373} 1403}
1374 1404
1375/* the tail of transfer: execute stuff we can only do after a transfer */ 1405/* the tail of transfer: execute stuff we can only do after a transfer */
1376INLINE void 1406ecb_inline void
1377transfer_tail (pTHX) 1407transfer_tail (pTHX)
1378{ 1408{
1379 free_coro_mortal (aTHX); 1409 free_coro_mortal (aTHX);
1410}
1411
1412/* try to exit the same way perl's main function would do */
1413/* we do not bother resetting the environment or other things *7
1414/* that are not, uhm, essential */
1415/* this obviously also doesn't work when perl is embedded */
1416static void ecb_noinline ecb_cold
1417perlish_exit (pTHX)
1418{
1419 int exitstatus = perl_destruct (PL_curinterp);
1420 perl_free (PL_curinterp);
1421 exit (exitstatus);
1380} 1422}
1381 1423
1382/* 1424/*
1383 * this is a _very_ stripped down perl interpreter ;) 1425 * this is a _very_ stripped down perl interpreter ;)
1384 */ 1426 */
… …
1413 */ 1455 */
1414 1456
1415 /* 1457 /*
1416 * If perl-run returns we assume exit() was being called or the coro 1458 * If perl-run returns we assume exit() was being called or the coro
1417 * fell off the end, which seems to be the only valid (non-bug) 1459 * fell off the end, which seems to be the only valid (non-bug)
1418 * reason for perl_run to return. We try to exit by jumping to the 1460 * reason for perl_run to return. We try to mimic whatever perl is normally
1419 * bootstrap-time "top" top_env, as we cannot restore the "main" 1461 * doing in that case. YMMV.
1420 * coroutine as Coro has no such concept.
1421 * This actually isn't valid with the pthread backend, but OSes requiring
1422 * that backend are too broken to do it in a standards-compliant way.
1423 */ 1462 */
1424 PL_top_env = main_top_env; 1463 perlish_exit (aTHX);
1425 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1426 } 1464 }
1427} 1465}
1428 1466
1429static coro_cctx * 1467static coro_cctx *
1430cctx_new () 1468cctx_new (void)
1431{ 1469{
1432 coro_cctx *cctx; 1470 coro_cctx *cctx;
1433 1471
1434 ++cctx_count; 1472 ++cctx_count;
1435 New (0, cctx, 1, coro_cctx); 1473 New (0, cctx, 1, coro_cctx);
… …
1441 return cctx; 1479 return cctx;
1442} 1480}
1443 1481
1444/* create a new cctx only suitable as source */ 1482/* create a new cctx only suitable as source */
1445static coro_cctx * 1483static coro_cctx *
1446cctx_new_empty () 1484cctx_new_empty (void)
1447{ 1485{
1448 coro_cctx *cctx = cctx_new (); 1486 coro_cctx *cctx = cctx_new ();
1449 1487
1450 cctx->sptr = 0; 1488 cctx->stack.sptr = 0;
1451 coro_create (&cctx->cctx, 0, 0, 0, 0); 1489 coro_create (&cctx->cctx, 0, 0, 0, 0);
1452 1490
1453 return cctx; 1491 return cctx;
1454} 1492}
1455 1493
1456/* create a new cctx suitable as destination/running a perl interpreter */ 1494/* create a new cctx suitable as destination/running a perl interpreter */
1457static coro_cctx * 1495static coro_cctx *
1458cctx_new_run () 1496cctx_new_run (void)
1459{ 1497{
1460 coro_cctx *cctx = cctx_new (); 1498 coro_cctx *cctx = cctx_new ();
1461 void *stack_start;
1462 size_t stack_size;
1463 1499
1464#if HAVE_MMAP 1500 if (!coro_stack_alloc (&cctx->stack, cctx_stacksize))
1465 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1466 /* mmap supposedly does allocate-on-write for us */
1467 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
1468
1469 if (cctx->sptr != (void *)-1)
1470 {
1471 #if CORO_STACKGUARD
1472 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
1473 #endif
1474 stack_start = (char *)cctx->sptr + CORO_STACKGUARD * PAGESIZE;
1475 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
1476 cctx->flags |= CC_MAPPED;
1477 } 1501 {
1478 else
1479#endif
1480 {
1481 cctx->ssize = cctx_stacksize * (long)sizeof (long);
1482 New (0, cctx->sptr, cctx_stacksize, long);
1483
1484 if (!cctx->sptr)
1485 {
1486 perror ("FATAL: unable to allocate stack for coroutine, exiting."); 1502 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1487 _exit (EXIT_FAILURE); 1503 _exit (EXIT_FAILURE);
1488 }
1489
1490 stack_start = cctx->sptr;
1491 stack_size = cctx->ssize;
1492 } 1504 }
1493 1505
1494 #if CORO_USE_VALGRIND
1495 cctx->valgrind_id = VALGRIND_STACK_REGISTER ((char *)stack_start, (char *)stack_start + stack_size);
1496 #endif
1497
1498 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size); 1506 coro_create (&cctx->cctx, cctx_run, (void *)cctx, cctx->stack.sptr, cctx->stack.ssze);
1499 1507
1500 return cctx; 1508 return cctx;
1501} 1509}
1502 1510
1503static void 1511static void
… …
1509 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current)); 1517 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1510 1518
1511 --cctx_count; 1519 --cctx_count;
1512 coro_destroy (&cctx->cctx); 1520 coro_destroy (&cctx->cctx);
1513 1521
1514 /* coro_transfer creates new, empty cctx's */ 1522 coro_stack_free (&cctx->stack);
1515 if (cctx->sptr)
1516 {
1517 #if CORO_USE_VALGRIND
1518 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
1519 #endif
1520
1521#if HAVE_MMAP
1522 if (cctx->flags & CC_MAPPED)
1523 munmap (cctx->sptr, cctx->ssize);
1524 else
1525#endif
1526 Safefree (cctx->sptr);
1527 }
1528 1523
1529 Safefree (cctx); 1524 Safefree (cctx);
1530} 1525}
1531 1526
1532/* wether this cctx should be destructed */ 1527/* wether this cctx should be destructed */
1533#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE)) 1528#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE))
1534 1529
1535static coro_cctx * 1530static coro_cctx *
1536cctx_get (pTHX) 1531cctx_get (pTHX)
1537{ 1532{
1538 while (expect_true (cctx_first)) 1533 while (ecb_expect_true (cctx_first))
1539 { 1534 {
1540 coro_cctx *cctx = cctx_first; 1535 coro_cctx *cctx = cctx_first;
1541 cctx_first = cctx->next; 1536 cctx_first = cctx->next;
1542 --cctx_idle; 1537 --cctx_idle;
1543 1538
1544 if (expect_true (!CCTX_EXPIRED (cctx))) 1539 if (ecb_expect_true (!CCTX_EXPIRED (cctx)))
1545 return cctx; 1540 return cctx;
1546 1541
1547 cctx_destroy (cctx); 1542 cctx_destroy (cctx);
1548 } 1543 }
1549 1544
… …
1551} 1546}
1552 1547
1553static void 1548static void
1554cctx_put (coro_cctx *cctx) 1549cctx_put (coro_cctx *cctx)
1555{ 1550{
1556 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1551 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->stack.sptr));
1557 1552
1558 /* free another cctx if overlimit */ 1553 /* free another cctx if overlimit */
1559 if (expect_false (cctx_idle >= cctx_max_idle)) 1554 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1560 { 1555 {
1561 coro_cctx *first = cctx_first; 1556 coro_cctx *first = cctx_first;
1562 cctx_first = first->next; 1557 cctx_first = first->next;
1563 --cctx_idle; 1558 --cctx_idle;
1564 1559
… …
1575static void 1570static void
1576transfer_check (pTHX_ struct coro *prev, struct coro *next) 1571transfer_check (pTHX_ struct coro *prev, struct coro *next)
1577{ 1572{
1578 /* TODO: throwing up here is considered harmful */ 1573 /* TODO: throwing up here is considered harmful */
1579 1574
1580 if (expect_true (prev != next)) 1575 if (ecb_expect_true (prev != next))
1581 { 1576 {
1582 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1577 if (ecb_expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1583 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,"); 1578 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1584 1579
1585 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED))) 1580 if (ecb_expect_false (next->flags & (CF_RUNNING | CF_ZOMBIE | CF_SUSPENDED)))
1586 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,"); 1581 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1587 1582
1588#if !PERL_VERSION_ATLEAST (5,10,0) 1583#if !PERL_VERSION_ATLEAST (5,10,0)
1589 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1584 if (ecb_expect_false (PL_lex_state != LEX_NOTPARSING))
1590 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,"); 1585 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1591#endif 1586#endif
1592 } 1587 }
1593} 1588}
1594 1589
1595/* always use the TRANSFER macro */ 1590/* always use the TRANSFER macro */
1596static void NOINLINE /* noinline so we have a fixed stackframe */ 1591static void ecb_noinline /* noinline so we have a fixed stackframe */
1597transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1592transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1598{ 1593{
1599 dSTACKLEVEL; 1594 dSTACKLEVEL;
1600 1595
1601 /* sometimes transfer is only called to set idle_sp */ 1596 /* sometimes transfer is only called to set idle_sp */
1602 if (expect_false (!prev)) 1597 if (ecb_expect_false (!prev))
1603 { 1598 {
1604 cctx_current->idle_sp = STACKLEVEL; 1599 cctx_current->idle_sp = STACKLEVEL;
1605 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1600 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1606 } 1601 }
1607 else if (expect_true (prev != next)) 1602 else if (ecb_expect_true (prev != next))
1608 { 1603 {
1609 coro_cctx *cctx_prev; 1604 coro_cctx *cctx_prev;
1610 1605
1611 if (expect_false (prev->flags & CF_NEW)) 1606 if (ecb_expect_false (prev->flags & CF_NEW))
1612 { 1607 {
1613 /* create a new empty/source context */ 1608 /* create a new empty/source context */
1614 prev->flags &= ~CF_NEW; 1609 prev->flags &= ~CF_NEW;
1615 prev->flags |= CF_RUNNING; 1610 prev->flags |= CF_RUNNING;
1616 } 1611 }
… …
1619 next->flags |= CF_RUNNING; 1614 next->flags |= CF_RUNNING;
1620 1615
1621 /* first get rid of the old state */ 1616 /* first get rid of the old state */
1622 save_perl (aTHX_ prev); 1617 save_perl (aTHX_ prev);
1623 1618
1624 if (expect_false (next->flags & CF_NEW)) 1619 if (ecb_expect_false (next->flags & CF_NEW))
1625 { 1620 {
1626 /* need to start coroutine */ 1621 /* need to start coroutine */
1627 next->flags &= ~CF_NEW; 1622 next->flags &= ~CF_NEW;
1628 /* setup coroutine call */ 1623 /* setup coroutine call */
1629 init_perl (aTHX_ next); 1624 init_perl (aTHX_ next);
1630 } 1625 }
1631 else 1626 else
1632 load_perl (aTHX_ next); 1627 load_perl (aTHX_ next);
1633 1628
1634 /* possibly untie and reuse the cctx */ 1629 /* possibly untie and reuse the cctx */
1635 if (expect_true ( 1630 if (ecb_expect_true (
1636 cctx_current->idle_sp == STACKLEVEL 1631 cctx_current->idle_sp == STACKLEVEL
1637 && !(cctx_current->flags & CC_TRACE) 1632 && !(cctx_current->flags & CC_TRACE)
1638 && !force_cctx 1633 && !force_cctx
1639 )) 1634 ))
1640 { 1635 {
1641 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1636 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */
1642 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te)); 1637 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1643 1638
1644 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */ 1639 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */
1645 /* without this the next cctx_get might destroy the running cctx while still in use */ 1640 /* without this the next cctx_get might destroy the running cctx while still in use */
1646 if (expect_false (CCTX_EXPIRED (cctx_current))) 1641 if (ecb_expect_false (CCTX_EXPIRED (cctx_current)))
1647 if (expect_true (!next->cctx)) 1642 if (ecb_expect_true (!next->cctx))
1648 next->cctx = cctx_get (aTHX); 1643 next->cctx = cctx_get (aTHX);
1649 1644
1650 cctx_put (cctx_current); 1645 cctx_put (cctx_current);
1651 } 1646 }
1652 else 1647 else
1653 prev->cctx = cctx_current; 1648 prev->cctx = cctx_current;
1654 1649
1655 ++next->usecount; 1650 ++next->usecount;
1656 1651
1657 cctx_prev = cctx_current; 1652 cctx_prev = cctx_current;
1658 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX); 1653 cctx_current = ecb_expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1659 1654
1660 next->cctx = 0; 1655 next->cctx = 0;
1661 1656
1662 if (expect_false (cctx_prev != cctx_current)) 1657 if (ecb_expect_false (cctx_prev != cctx_current))
1663 { 1658 {
1664 cctx_prev->top_env = PL_top_env; 1659 cctx_prev->top_env = PL_top_env;
1665 PL_top_env = cctx_current->top_env; 1660 PL_top_env = cctx_current->top_env;
1666 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx); 1661 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1667 } 1662 }
… …
1673#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx)) 1668#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1674#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1669#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1675 1670
1676/** high level stuff ********************************************************/ 1671/** high level stuff ********************************************************/
1677 1672
1673/* this function is actually Coro, not Coro::State, but we call it from here */
1674/* because it is convenient - but it hasn't been declared yet for that reason */
1675static void
1676coro_call_on_destroy (pTHX_ struct coro *coro);
1677
1678static void 1678static void
1679coro_state_destroy (pTHX_ struct coro *coro) 1679coro_state_destroy (pTHX_ struct coro *coro)
1680{ 1680{
1681 if (coro->flags & CF_DESTROYED) 1681 if (coro->flags & CF_ZOMBIE)
1682 return; 1682 return;
1683 1683
1684 slf_destroy (aTHX_ coro); 1684 slf_destroy (aTHX_ coro);
1685 1685
1686 coro->flags |= CF_DESTROYED; 1686 coro->flags |= CF_ZOMBIE;
1687 1687
1688 if (coro->flags & CF_READY) 1688 if (coro->flags & CF_READY)
1689 { 1689 {
1690 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1690 /* reduce nready, as destroying a ready coro effectively unreadies it */
1691 /* alternative: look through all ready queues and remove the coro */ 1691 /* alternative: look through all ready queues and remove the coro */
1692 --coro_nready; 1692 --coro_nready;
1693 } 1693 }
1694 else 1694 else
1695 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1695 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1696
1697 if (coro->next) coro->next->prev = coro->prev;
1698 if (coro->prev) coro->prev->next = coro->next;
1699 if (coro == coro_first) coro_first = coro->next;
1696 1700
1697 if (coro->mainstack 1701 if (coro->mainstack
1698 && coro->mainstack != main_mainstack 1702 && coro->mainstack != main_mainstack
1699 && coro->slot 1703 && coro->slot
1700 && !PL_dirty) 1704 && !PL_dirty)
1701 destroy_perl (aTHX_ coro); 1705 destroy_perl (aTHX_ coro);
1702 1706
1703 if (coro->next) coro->next->prev = coro->prev;
1704 if (coro->prev) coro->prev->next = coro->next;
1705 if (coro == coro_first) coro_first = coro->next;
1706
1707 cctx_destroy (coro->cctx); 1707 cctx_destroy (coro->cctx);
1708 SvREFCNT_dec (coro->startcv); 1708 SvREFCNT_dec (coro->startcv);
1709 SvREFCNT_dec (coro->args); 1709 SvREFCNT_dec (coro->args);
1710 SvREFCNT_dec (coro->swap_sv); 1710 SvREFCNT_dec (coro->swap_sv);
1711 SvREFCNT_dec (CORO_THROW); 1711 SvREFCNT_dec (CORO_THROW);
1712
1713 coro_call_on_destroy (aTHX_ coro);
1714
1715 /* more destruction mayhem in coro_state_free */
1712} 1716}
1713 1717
1714static int 1718static int
1715coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1719coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1716{ 1720{
1717 struct coro *coro = (struct coro *)mg->mg_ptr; 1721 struct coro *coro = (struct coro *)mg->mg_ptr;
1718 mg->mg_ptr = 0; 1722 mg->mg_ptr = 0;
1719 1723
1720 coro->hv = 0;
1721
1722 if (--coro->refcnt < 0)
1723 {
1724 coro_state_destroy (aTHX_ coro); 1724 coro_state_destroy (aTHX_ coro);
1725 SvREFCNT_dec (coro->on_destroy);
1726 SvREFCNT_dec (coro->status);
1727
1725 Safefree (coro); 1728 Safefree (coro);
1726 }
1727 1729
1728 return 0; 1730 return 0;
1729} 1731}
1730 1732
1731static int 1733static int ecb_cold
1732coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1734coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1733{ 1735{
1734 struct coro *coro = (struct coro *)mg->mg_ptr; 1736 /* called when perl clones the current process the slow way (windows process emulation) */
1735 1737 /* WE SIMply nuke the pointers in the copy, causing perl to croak */
1736 ++coro->refcnt; 1738 mg->mg_ptr = 0;
1739 mg->mg_virtual = 0;
1737 1740
1738 return 0; 1741 return 0;
1739} 1742}
1740 1743
1741static MGVTBL coro_state_vtbl = { 1744static MGVTBL coro_state_vtbl = {
… …
1766 TRANSFER (ta, 1); 1769 TRANSFER (ta, 1);
1767} 1770}
1768 1771
1769/** Coro ********************************************************************/ 1772/** Coro ********************************************************************/
1770 1773
1771INLINE void 1774ecb_inline void
1772coro_enq (pTHX_ struct coro *coro) 1775coro_enq (pTHX_ struct coro *coro)
1773{ 1776{
1774 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN]; 1777 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1775 1778
1776 SvREFCNT_inc_NN (coro->hv); 1779 SvREFCNT_inc_NN (coro->hv);
… …
1778 coro->next_ready = 0; 1781 coro->next_ready = 0;
1779 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro; 1782 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1780 ready [1] = coro; 1783 ready [1] = coro;
1781} 1784}
1782 1785
1783INLINE struct coro * 1786ecb_inline struct coro *
1784coro_deq (pTHX) 1787coro_deq (pTHX)
1785{ 1788{
1786 int prio; 1789 int prio;
1787 1790
1788 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; ) 1791 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
… …
1841{ 1844{
1842 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1845 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1843} 1846}
1844 1847
1845/* expects to own a reference to next->hv */ 1848/* expects to own a reference to next->hv */
1846INLINE void 1849ecb_inline void
1847prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1850prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1848{ 1851{
1849 SV *prev_sv = SvRV (coro_current); 1852 SV *prev_sv = SvRV (coro_current);
1850 1853
1851 ta->prev = SvSTATE_hv (prev_sv); 1854 ta->prev = SvSTATE_hv (prev_sv);
… …
1864{ 1867{
1865 for (;;) 1868 for (;;)
1866 { 1869 {
1867 struct coro *next = coro_deq (aTHX); 1870 struct coro *next = coro_deq (aTHX);
1868 1871
1869 if (expect_true (next)) 1872 if (ecb_expect_true (next))
1870 { 1873 {
1871 /* cannot transfer to destroyed coros, skip and look for next */ 1874 /* cannot transfer to destroyed coros, skip and look for next */
1872 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED))) 1875 if (ecb_expect_false (next->flags & (CF_ZOMBIE | CF_SUSPENDED)))
1873 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */ 1876 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1874 else 1877 else
1875 { 1878 {
1876 next->flags &= ~CF_READY; 1879 next->flags &= ~CF_READY;
1877 --coro_nready; 1880 --coro_nready;
… …
1910 } 1913 }
1911 } 1914 }
1912 } 1915 }
1913} 1916}
1914 1917
1915INLINE void 1918ecb_inline void
1916prepare_cede (pTHX_ struct coro_transfer_args *ta) 1919prepare_cede (pTHX_ struct coro_transfer_args *ta)
1917{ 1920{
1918 api_ready (aTHX_ coro_current); 1921 api_ready (aTHX_ coro_current);
1919 prepare_schedule (aTHX_ ta); 1922 prepare_schedule (aTHX_ ta);
1920} 1923}
1921 1924
1922INLINE void 1925ecb_inline void
1923prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 1926prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1924{ 1927{
1925 SV *prev = SvRV (coro_current); 1928 SV *prev = SvRV (coro_current);
1926 1929
1927 if (coro_nready) 1930 if (coro_nready)
… …
1957{ 1960{
1958 struct coro_transfer_args ta; 1961 struct coro_transfer_args ta;
1959 1962
1960 prepare_cede (aTHX_ &ta); 1963 prepare_cede (aTHX_ &ta);
1961 1964
1962 if (expect_true (ta.prev != ta.next)) 1965 if (ecb_expect_true (ta.prev != ta.next))
1963 { 1966 {
1964 TRANSFER (ta, 1); 1967 TRANSFER (ta, 1);
1965 return 1; 1968 return 1;
1966 } 1969 }
1967 else 1970 else
… …
2010 coro->slot->runops = RUNOPS_DEFAULT; 2013 coro->slot->runops = RUNOPS_DEFAULT;
2011 } 2014 }
2012} 2015}
2013 2016
2014static void 2017static void
2018coro_push_av (pTHX_ AV *av, I32 gimme_v)
2019{
2020 if (AvFILLp (av) >= 0 && gimme_v != G_VOID)
2021 {
2022 dSP;
2023
2024 if (gimme_v == G_SCALAR)
2025 XPUSHs (AvARRAY (av)[AvFILLp (av)]);
2026 else
2027 {
2028 int i;
2029 EXTEND (SP, AvFILLp (av) + 1);
2030
2031 for (i = 0; i <= AvFILLp (av); ++i)
2032 PUSHs (AvARRAY (av)[i]);
2033 }
2034
2035 PUTBACK;
2036 }
2037}
2038
2039static void
2040coro_push_on_destroy (pTHX_ struct coro *coro, SV *cb)
2041{
2042 if (!coro->on_destroy)
2043 coro->on_destroy = newAV ();
2044
2045 av_push (coro->on_destroy, cb);
2046}
2047
2048static void
2049slf_destroy_join (pTHX_ struct CoroSLF *frame)
2050{
2051 SvREFCNT_dec ((SV *)((struct coro *)frame->data)->hv);
2052}
2053
2054static int
2055slf_check_join (pTHX_ struct CoroSLF *frame)
2056{
2057 struct coro *coro = (struct coro *)frame->data;
2058
2059 if (!coro->status)
2060 return 1;
2061
2062 frame->destroy = 0;
2063
2064 coro_push_av (aTHX_ coro->status, GIMME_V);
2065
2066 SvREFCNT_dec ((SV *)coro->hv);
2067
2068 return 0;
2069}
2070
2071static void
2072slf_init_join (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2073{
2074 struct coro *coro = SvSTATE (items > 0 ? arg [0] : &PL_sv_undef);
2075
2076 if (items > 1)
2077 croak ("join called with too many arguments");
2078
2079 if (coro->status)
2080 frame->prepare = prepare_nop;
2081 else
2082 {
2083 coro_push_on_destroy (aTHX_ coro, SvREFCNT_inc_NN (SvRV (coro_current)));
2084 frame->prepare = prepare_schedule;
2085 }
2086
2087 frame->check = slf_check_join;
2088 frame->destroy = slf_destroy_join;
2089 frame->data = (void *)coro;
2090 SvREFCNT_inc (coro->hv);
2091}
2092
2093static void
2015coro_call_on_destroy (pTHX_ struct coro *coro) 2094coro_call_on_destroy (pTHX_ struct coro *coro)
2016{ 2095{
2017 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2096 AV *od = coro->on_destroy;
2018 2097
2019 if (on_destroyp) 2098 if (!od)
2020 { 2099 return;
2021 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
2022 AV *on_destroy = sv_2mortal (SvREFCNT_inc ((AV *)SvRV (*on_destroyp)));
2023 AV *status = statusp ? sv_2mortal (SvREFCNT_inc ((AV *)SvRV (*statusp))) : 0;
2024 2100
2025 while (AvFILLp (on_destroy) >= 0) 2101 while (AvFILLp (od) >= 0)
2102 {
2103 SV *cb = sv_2mortal (av_pop (od));
2104
2105 /* coro hv's (and only hv's at the moment) are supported as well */
2106 if (SvSTATEhv_p (aTHX_ cb))
2107 api_ready (aTHX_ cb);
2108 else
2026 { 2109 {
2027 dSP; /* don't disturb outer sp */ 2110 dSP; /* don't disturb outer sp */
2028 SV *cb = av_pop (on_destroy);
2029
2030 PUSHMARK (SP); 2111 PUSHMARK (SP);
2031 2112
2032 if (statusp) 2113 if (coro->status)
2033 { 2114 {
2034 int i; 2115 PUTBACK;
2035 EXTEND (SP, AvFILLp (status) + 1); 2116 coro_push_av (aTHX_ coro->status, G_ARRAY);
2036 2117 SPAGAIN;
2037 for (i = 0; i <= AvFILLp (status); ++i)
2038 PUSHs (AvARRAY (status)[i]);
2039 } 2118 }
2040 2119
2041 PUTBACK; 2120 PUTBACK;
2042 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD); 2121 call_sv (cb, G_VOID | G_DISCARD);
2043 } 2122 }
2044 } 2123 }
2045} 2124}
2046 2125
2047static void 2126static void
2048coro_set_status (pTHX_ HV *coro_hv, SV **arg, int items) 2127coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
2049{ 2128{
2050 AV *av = newAV (); 2129 AV *av;
2130
2131 if (coro->status)
2132 {
2133 av = coro->status;
2134 av_clear (av);
2135 }
2136 else
2137 av = coro->status = newAV ();
2051 2138
2052 /* items are actually not so common, so optimise for this case */ 2139 /* items are actually not so common, so optimise for this case */
2053 if (items) 2140 if (items)
2054 { 2141 {
2055 int i; 2142 int i;
… …
2057 av_extend (av, items - 1); 2144 av_extend (av, items - 1);
2058 2145
2059 for (i = 0; i < items; ++i) 2146 for (i = 0; i < items; ++i)
2060 av_push (av, SvREFCNT_inc_NN (arg [i])); 2147 av_push (av, SvREFCNT_inc_NN (arg [i]));
2061 } 2148 }
2062
2063 hv_store (coro_hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0);
2064} 2149}
2065 2150
2066static void 2151static void
2067slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv) 2152slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2068{ 2153{
… …
2080static void 2165static void
2081slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2166slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2082{ 2167{
2083 HV *coro_hv = (HV *)SvRV (coro_current); 2168 HV *coro_hv = (HV *)SvRV (coro_current);
2084 2169
2085 coro_set_status (aTHX_ coro_hv, arg, items); 2170 coro_set_status (aTHX_ SvSTATE ((SV *)coro_hv), arg, items);
2086 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv); 2171 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2087} 2172}
2088 2173
2089static void 2174static void
2090slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2175slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
… …
2096 croak ("Coro::cancel called without coro object,"); 2181 croak ("Coro::cancel called without coro object,");
2097 2182
2098 coro = SvSTATE (arg [0]); 2183 coro = SvSTATE (arg [0]);
2099 coro_hv = coro->hv; 2184 coro_hv = coro->hv;
2100 2185
2101 coro_set_status (aTHX_ coro_hv, arg + 1, items - 1); 2186 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2102 2187
2103 if (expect_false (coro->flags & CF_NOCANCEL)) 2188 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2104 { 2189 {
2105 /* coro currently busy cancelling something, so just notify it */ 2190 /* coro currently busy cancelling something, so just notify it */
2106 coro->slf_frame.data = (void *)coro; 2191 coro->slf_frame.data = (void *)coro;
2107 2192
2108 frame->prepare = prepare_nop; 2193 frame->prepare = prepare_nop;
… …
2123 * this is ugly, and hopefully fully worth the extra speed. 2208 * this is ugly, and hopefully fully worth the extra speed.
2124 * besides, I can't get the slow-but-safe version working... 2209 * besides, I can't get the slow-but-safe version working...
2125 */ 2210 */
2126 slf_frame.data = 0; 2211 slf_frame.data = 0;
2127 self->flags |= CF_NOCANCEL; 2212 self->flags |= CF_NOCANCEL;
2128
2129 coro_state_destroy (aTHX_ coro); 2213 coro_state_destroy (aTHX_ coro);
2130 coro_call_on_destroy (aTHX_ coro);
2131
2132 self->flags &= ~CF_NOCANCEL; 2214 self->flags &= ~CF_NOCANCEL;
2133 2215
2134 if (slf_frame.data) 2216 if (slf_frame.data)
2135 { 2217 {
2136 /* while we were busy we have been cancelled, so terminate */ 2218 /* while we were busy we have been cancelled, so terminate */
… …
2161 if (coro->cctx) 2243 if (coro->cctx)
2162 croak ("coro inside C callback, unable to cancel at this time, caught"); 2244 croak ("coro inside C callback, unable to cancel at this time, caught");
2163 2245
2164 if (coro->flags & CF_NEW) 2246 if (coro->flags & CF_NEW)
2165 { 2247 {
2166 coro_set_status (aTHX_ coro->hv, arg, items); 2248 coro_set_status (aTHX_ coro, arg, items);
2167 coro_state_destroy (aTHX_ coro); 2249 coro_state_destroy (aTHX_ coro);
2168 coro_call_on_destroy (aTHX_ coro);
2169 } 2250 }
2170 else 2251 else
2171 { 2252 {
2172 if (!coro->slf_frame.prepare) 2253 if (!coro->slf_frame.prepare)
2173 croak ("coro outside an SLF function, unable to cancel at this time, caught"); 2254 croak ("coro outside an SLF function, unable to cancel at this time, caught");
2174 2255
2175 slf_destroy (aTHX_ coro); 2256 slf_destroy (aTHX_ coro);
2176 2257
2177 coro_set_status (aTHX_ coro->hv, arg, items); 2258 coro_set_status (aTHX_ coro, arg, items);
2178 coro->slf_frame.prepare = prepare_nop; 2259 coro->slf_frame.prepare = prepare_nop;
2179 coro->slf_frame.check = slf_check_safe_cancel; 2260 coro->slf_frame.check = slf_check_safe_cancel;
2180 2261
2181 api_ready (aTHX_ coro->hv); 2262 api_ready (aTHX_ (SV *)coro->hv);
2182 } 2263 }
2183 2264
2184 return 1; 2265 return 1;
2185} 2266}
2186 2267
… …
2220slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2301slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2221{ 2302{
2222 HV *hv = (HV *)SvRV (coro_current); 2303 HV *hv = (HV *)SvRV (coro_current);
2223 struct coro *coro = SvSTATE_hv ((SV *)hv); 2304 struct coro *coro = SvSTATE_hv ((SV *)hv);
2224 2305
2225 if (expect_true (coro->saved_deffh)) 2306 if (ecb_expect_true (coro->saved_deffh))
2226 { 2307 {
2227 /* subsequent iteration */ 2308 /* subsequent iteration */
2228 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2309 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
2229 coro->saved_deffh = 0; 2310 coro->saved_deffh = 0;
2230 2311
… …
2290 2371
2291static int 2372static int
2292slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2373slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
2293{ 2374{
2294 SV *data = (SV *)frame->data; 2375 SV *data = (SV *)frame->data;
2295 2376
2296 if (CORO_THROW) 2377 if (CORO_THROW)
2297 return 0; 2378 return 0;
2298 2379
2299 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2380 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2300 return 1; 2381 return 1;
… …
2336 cb = sv_2mortal (coro->rouse_cb); 2417 cb = sv_2mortal (coro->rouse_cb);
2337 coro->rouse_cb = 0; 2418 coro->rouse_cb = 0;
2338 } 2419 }
2339 2420
2340 if (!SvROK (cb) 2421 if (!SvROK (cb)
2341 || SvTYPE (SvRV (cb)) != SVt_PVCV 2422 || SvTYPE (SvRV (cb)) != SVt_PVCV
2342 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2423 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2343 croak ("Coro::rouse_wait called with illegal callback argument,"); 2424 croak ("Coro::rouse_wait called with illegal callback argument,");
2344 2425
2345 { 2426 {
2346 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */ 2427 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
… …
2471static void 2552static void
2472slf_destroy (pTHX_ struct coro *coro) 2553slf_destroy (pTHX_ struct coro *coro)
2473{ 2554{
2474 /* this callback is reserved for slf functions needing to do cleanup */ 2555 /* this callback is reserved for slf functions needing to do cleanup */
2475 if (coro->slf_frame.destroy && coro->slf_frame.prepare && !PL_dirty) 2556 if (coro->slf_frame.destroy && coro->slf_frame.prepare && !PL_dirty)
2476 coro->slf_frame.destroy (aTHX_ coro); 2557 coro->slf_frame.destroy (aTHX_ &coro->slf_frame);
2477 2558
2478 /* 2559 /*
2479 * The on_destroy above most likely is from an SLF call. 2560 * The on_destroy above most likely is from an SLF call.
2480 * Since by definition the SLF call will not finish when we destroy 2561 * Since by definition the SLF call will not finish when we destroy
2481 * the coro, we will have to force-finish it here, otherwise 2562 * the coro, we will have to force-finish it here, otherwise
… …
2496 I32 checkmark; /* mark SP to see how many elements check has pushed */ 2577 I32 checkmark; /* mark SP to see how many elements check has pushed */
2497 2578
2498 /* set up the slf frame, unless it has already been set-up */ 2579 /* set up the slf frame, unless it has already been set-up */
2499 /* the latter happens when a new coro has been started */ 2580 /* the latter happens when a new coro has been started */
2500 /* or when a new cctx was attached to an existing coroutine */ 2581 /* or when a new cctx was attached to an existing coroutine */
2501 if (expect_true (!slf_frame.prepare)) 2582 if (ecb_expect_true (!slf_frame.prepare))
2502 { 2583 {
2503 /* first iteration */ 2584 /* first iteration */
2504 dSP; 2585 dSP;
2505 SV **arg = PL_stack_base + TOPMARK + 1; 2586 SV **arg = PL_stack_base + TOPMARK + 1;
2506 int items = SP - arg; /* args without function object */ 2587 int items = SP - arg; /* args without function object */
… …
2547 while (slf_frame.check (aTHX_ &slf_frame)); 2628 while (slf_frame.check (aTHX_ &slf_frame));
2548 2629
2549 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */ 2630 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */
2550 2631
2551 /* exception handling */ 2632 /* exception handling */
2552 if (expect_false (CORO_THROW)) 2633 if (ecb_expect_false (CORO_THROW))
2553 { 2634 {
2554 SV *exception = sv_2mortal (CORO_THROW); 2635 SV *exception = sv_2mortal (CORO_THROW);
2555 2636
2556 CORO_THROW = 0; 2637 CORO_THROW = 0;
2557 sv_setsv (ERRSV, exception); 2638 sv_setsv (ERRSV, exception);
2558 croak (0); 2639 croak (0);
2559 } 2640 }
2560 2641
2561 /* return value handling - mostly like entersub */ 2642 /* return value handling - mostly like entersub */
2562 /* make sure we put something on the stack in scalar context */ 2643 /* make sure we put something on the stack in scalar context */
2563 if (GIMME_V == G_SCALAR) 2644 if (GIMME_V == G_SCALAR
2645 && ecb_expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2564 { 2646 {
2565 dSP; 2647 dSP;
2566 SV **bot = PL_stack_base + checkmark; 2648 SV **bot = PL_stack_base + checkmark;
2567 2649
2568 if (sp == bot) /* too few, push undef */ 2650 if (sp == bot) /* too few, push undef */
2569 bot [1] = &PL_sv_undef; 2651 bot [1] = &PL_sv_undef;
2570 else if (sp != bot + 1) /* too many, take last one */ 2652 else /* too many, take last one */
2571 bot [1] = *sp; 2653 bot [1] = *sp;
2572 2654
2573 SP = bot + 1; 2655 SP = bot + 1;
2574 2656
2575 PUTBACK; 2657 PUTBACK;
… …
2682{ 2764{
2683 PerlIOBuf base; 2765 PerlIOBuf base;
2684 NV next, every; 2766 NV next, every;
2685} PerlIOCede; 2767} PerlIOCede;
2686 2768
2687static IV 2769static IV ecb_cold
2688PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab) 2770PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab)
2689{ 2771{
2690 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2772 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2691 2773
2692 self->every = SvCUR (arg) ? SvNV (arg) : 0.01; 2774 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
2693 self->next = nvtime () + self->every; 2775 self->next = nvtime () + self->every;
2694 2776
2695 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab); 2777 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
2696} 2778}
2697 2779
2698static SV * 2780static SV * ecb_cold
2699PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags) 2781PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
2700{ 2782{
2701 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2783 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2702 2784
2703 return newSVnv (self->every); 2785 return newSVnv (self->every);
… …
2815 SvREFCNT_dec (cb); 2897 SvREFCNT_dec (cb);
2816 } 2898 }
2817} 2899}
2818 2900
2819static void 2901static void
2820coro_semaphore_destroy (pTHX_ struct coro *coro) 2902coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2821{ 2903{
2822 /* call $sem->adjust (0) to possibly wake up some other waiters */ 2904 /* call $sem->adjust (0) to possibly wake up some other waiters */
2823 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 2905 coro_semaphore_adjust (aTHX_ (AV *)frame->data, 0);
2824} 2906}
2825 2907
2826static int 2908static int
2827slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire) 2909slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2828{ 2910{
2829 AV *av = (AV *)frame->data; 2911 AV *av = (AV *)frame->data;
2830 SV *count_sv = AvARRAY (av)[0]; 2912 SV *count_sv = AvARRAY (av)[0];
2913 SV *coro_hv = SvRV (coro_current);
2831 2914
2832 /* if we are about to throw, don't actually acquire the lock, just throw */ 2915 /* if we are about to throw, don't actually acquire the lock, just throw */
2833 if (CORO_THROW) 2916 if (CORO_THROW)
2834 return 0; 2917 return 0;
2835 else if (SvIVX (count_sv) > 0) 2918 else if (SvIVX (count_sv) > 0)
… …
2847 { 2930 {
2848 int i; 2931 int i;
2849 /* if we were woken up but can't down, we look through the whole */ 2932 /* if we were woken up but can't down, we look through the whole */
2850 /* waiters list and only add us if we aren't in there already */ 2933 /* waiters list and only add us if we aren't in there already */
2851 /* this avoids some degenerate memory usage cases */ 2934 /* this avoids some degenerate memory usage cases */
2852 2935 for (i = AvFILLp (av); i > 0; --i) /* i > 0 is not an off-by-one bug */
2853 for (i = 1; i <= AvFILLp (av); ++i)
2854 if (AvARRAY (av)[i] == SvRV (coro_current)) 2936 if (AvARRAY (av)[i] == coro_hv)
2855 return 1; 2937 return 1;
2856 2938
2857 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2939 av_push (av, SvREFCNT_inc (coro_hv));
2858 return 1; 2940 return 1;
2859 } 2941 }
2860} 2942}
2861 2943
2862static int 2944static int
… …
3115 dSP; 3197 dSP;
3116 3198
3117 static SV *prio_cv; 3199 static SV *prio_cv;
3118 static SV *prio_sv; 3200 static SV *prio_sv;
3119 3201
3120 if (expect_false (!prio_cv)) 3202 if (ecb_expect_false (!prio_cv))
3121 { 3203 {
3122 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0); 3204 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0);
3123 prio_sv = newSViv (0); 3205 prio_sv = newSViv (0);
3124 } 3206 }
3125 3207
… …
3231 } 3313 }
3232 3314
3233 return coro_sv; 3315 return coro_sv;
3234} 3316}
3235 3317
3318#ifndef __cplusplus
3319ecb_cold XS(boot_Coro__State);
3320#endif
3321
3322#if CORO_JIT
3323
3324static void ecb_noinline ecb_cold
3325pushav_4uv (pTHX_ UV a, UV b, UV c, UV d)
3326{
3327 dSP;
3328 AV *av = newAV ();
3329
3330 av_store (av, 3, newSVuv (d));
3331 av_store (av, 2, newSVuv (c));
3332 av_store (av, 1, newSVuv (b));
3333 av_store (av, 0, newSVuv (a));
3334
3335 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
3336
3337 PUTBACK;
3338}
3339
3340static void ecb_noinline ecb_cold
3341jit_init (pTHX)
3342{
3343 dSP;
3344 SV *load, *save;
3345 char *map_base;
3346 char *load_ptr, *save_ptr;
3347 STRLEN load_len, save_len, map_len;
3348 int count;
3349
3350 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3351
3352 PUSHMARK (SP);
3353 #define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type));
3354 #include "state.h"
3355 count = call_pv ("Coro::State::_jit", G_ARRAY);
3356 SPAGAIN;
3357
3358 save = POPs; save_ptr = SvPVbyte (save, save_len);
3359 load = POPs; load_ptr = SvPVbyte (load, load_len);
3360
3361 map_len = load_len + save_len + 16;
3362
3363 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3364
3365 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3366
3367 load_perl_slots = (load_save_perl_slots_type)map_base;
3368 memcpy (map_base, load_ptr, load_len);
3369
3370 map_base += (load_len + 15) & ~15;
3371
3372 save_perl_slots = (load_save_perl_slots_type)map_base;
3373 memcpy (map_base, save_ptr, save_len);
3374
3375 /* we are good citizens and try to make the page read-only, so the evil evil */
3376 /* hackers might have it a bit more difficult */
3377 mprotect (map_base, map_len, PROT_READ | PROT_EXEC);
3378
3379 PUTBACK;
3380 eval_pv ("undef &Coro::State::_jit", 1);
3381}
3382
3383#endif
3384
3236MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3385MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
3237 3386
3238PROTOTYPES: DISABLE 3387PROTOTYPES: DISABLE
3239 3388
3240BOOT: 3389BOOT:
… …
3242#ifdef USE_ITHREADS 3391#ifdef USE_ITHREADS
3243# if CORO_PTHREAD 3392# if CORO_PTHREAD
3244 coro_thx = PERL_GET_CONTEXT; 3393 coro_thx = PERL_GET_CONTEXT;
3245# endif 3394# endif
3246#endif 3395#endif
3247 BOOT_PAGESIZE; 3396 /* perl defines these to check for existance first, but why it doesn't */
3397 /* just create them one at init time is not clear to me, except for */
3398 /* programs trying to delete them, but... */
3399 /* anyway, we declare this as invalid and make sure they are initialised here */
3400 DEFSV;
3401 ERRSV;
3248 3402
3249 cctx_current = cctx_new_empty (); 3403 cctx_current = cctx_new_empty ();
3250 3404
3251 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3405 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
3252 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3406 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
… …
3295 coroapi.prepare_cede_notself = prepare_cede_notself; 3449 coroapi.prepare_cede_notself = prepare_cede_notself;
3296 3450
3297 time_init (aTHX); 3451 time_init (aTHX);
3298 3452
3299 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL)); 3453 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3454#if CORO_JIT
3455 PUTBACK;
3456 jit_init (aTHX);
3457 SPAGAIN;
3458#endif
3300} 3459}
3301 3460
3302SV * 3461SV *
3303new (SV *klass, ...) 3462new (SV *klass, ...)
3304 ALIAS: 3463 ALIAS:
… …
3381void 3540void
3382list () 3541list ()
3383 PROTOTYPE: 3542 PROTOTYPE:
3384 PPCODE: 3543 PPCODE:
3385{ 3544{
3386 struct coro *coro; 3545 struct coro *coro;
3387 for (coro = coro_first; coro; coro = coro->next) 3546 for (coro = coro_first; coro; coro = coro->next)
3388 if (coro->hv) 3547 if (coro->hv)
3389 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 3548 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
3390} 3549}
3391 3550
… …
3446 PROTOTYPE: $ 3605 PROTOTYPE: $
3447 ALIAS: 3606 ALIAS:
3448 is_ready = CF_READY 3607 is_ready = CF_READY
3449 is_running = CF_RUNNING 3608 is_running = CF_RUNNING
3450 is_new = CF_NEW 3609 is_new = CF_NEW
3451 is_destroyed = CF_DESTROYED 3610 is_destroyed = CF_ZOMBIE
3611 is_zombie = CF_ZOMBIE
3452 is_suspended = CF_SUSPENDED 3612 is_suspended = CF_SUSPENDED
3453 CODE: 3613 CODE:
3454 RETVAL = boolSV (coro->flags & ix); 3614 RETVAL = boolSV (coro->flags & ix);
3455 OUTPUT: 3615 OUTPUT:
3456 RETVAL 3616 RETVAL
3457 3617
3458void 3618void
3459throw (Coro::State self, SV *exception = &PL_sv_undef) 3619throw (SV *self, SV *exception = &PL_sv_undef)
3460 PROTOTYPE: $;$ 3620 PROTOTYPE: $;$
3461 CODE: 3621 CODE:
3462{ 3622{
3623 struct coro *coro = SvSTATE (self);
3463 struct coro *current = SvSTATE_current; 3624 struct coro *current = SvSTATE_current;
3464 SV **exceptionp = self == current ? &CORO_THROW : &self->except; 3625 SV **exceptionp = coro == current ? &CORO_THROW : &coro->except;
3465 SvREFCNT_dec (*exceptionp); 3626 SvREFCNT_dec (*exceptionp);
3466 SvGETMAGIC (exception); 3627 SvGETMAGIC (exception);
3467 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0; 3628 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3629
3630 api_ready (aTHX_ self);
3468} 3631}
3469 3632
3470void 3633void
3471api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3634api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3472 PROTOTYPE: $;$ 3635 PROTOTYPE: $;$
… …
3549 3712
3550void 3713void
3551times (Coro::State self) 3714times (Coro::State self)
3552 PPCODE: 3715 PPCODE:
3553{ 3716{
3554 struct coro *current = SvSTATE (coro_current); 3717 struct coro *current = SvSTATE (coro_current);
3555 3718
3556 if (expect_false (current == self)) 3719 if (ecb_expect_false (current == self))
3557 { 3720 {
3558 coro_times_update (); 3721 coro_times_update ();
3559 coro_times_add (SvSTATE (coro_current)); 3722 coro_times_add (SvSTATE (coro_current));
3560 } 3723 }
3561 3724
3562 EXTEND (SP, 2); 3725 EXTEND (SP, 2);
3563 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9))); 3726 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3564 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9))); 3727 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3565 3728
3566 if (expect_false (current == self)) 3729 if (ecb_expect_false (current == self))
3567 coro_times_sub (SvSTATE (coro_current)); 3730 coro_times_sub (SvSTATE (coro_current));
3568} 3731}
3569 3732
3570void 3733void
3571swap_sv (Coro::State coro, SV *sv, SV *swapsv) 3734swap_sv (Coro::State coro, SV *sv, SV *swapsv)
… …
3602 3765
3603 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3766 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3604 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3767 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3605 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 3768 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3606 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */ 3769 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3607 3770
3608 coro_stash = gv_stashpv ("Coro", TRUE); 3771 coro_stash = gv_stashpv ("Coro", TRUE);
3609 3772
3610 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 3773 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3611 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 3774 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3612 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL)); 3775 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
… …
3644void 3807void
3645_destroy (Coro::State coro) 3808_destroy (Coro::State coro)
3646 CODE: 3809 CODE:
3647 /* used by the manager thread */ 3810 /* used by the manager thread */
3648 coro_state_destroy (aTHX_ coro); 3811 coro_state_destroy (aTHX_ coro);
3812
3813void
3814on_destroy (Coro::State coro, SV *cb)
3815 CODE:
3649 coro_call_on_destroy (aTHX_ coro); 3816 coro_push_on_destroy (aTHX_ coro, newSVsv (cb));
3817
3818void
3819join (...)
3820 CODE:
3821 CORO_EXECUTE_SLF_XS (slf_init_join);
3650 3822
3651void 3823void
3652terminate (...) 3824terminate (...)
3653 CODE: 3825 CODE:
3654 CORO_EXECUTE_SLF_XS (slf_init_terminate); 3826 CORO_EXECUTE_SLF_XS (slf_init_terminate);
… …
3825 on_leave = 1 3997 on_leave = 1
3826 PROTOTYPE: & 3998 PROTOTYPE: &
3827 CODE: 3999 CODE:
3828{ 4000{
3829 struct coro *coro = SvSTATE_current; 4001 struct coro *coro = SvSTATE_current;
3830 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 4002 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3831 4003
3832 block = s_get_cv_croak (block); 4004 block = s_get_cv_croak (block);
3833 4005
3834 if (!*avp) 4006 if (!*avp)
3835 *avp = newAV (); 4007 *avp = newAV ();
… …
3855 4027
3856SV * 4028SV *
3857new (SV *klass, SV *count = 0) 4029new (SV *klass, SV *count = 0)
3858 CODE: 4030 CODE:
3859{ 4031{
3860 int semcnt = 1; 4032 int semcnt = 1;
3861 4033
3862 if (count) 4034 if (count)
3863 { 4035 {
3864 SvGETMAGIC (count); 4036 SvGETMAGIC (count);
3865 4037
… …
3925 XSRETURN_NO; 4097 XSRETURN_NO;
3926} 4098}
3927 4099
3928void 4100void
3929waiters (SV *self) 4101waiters (SV *self)
3930 PPCODE: 4102 PPCODE:
3931{ 4103{
3932 AV *av = (AV *)SvRV (self); 4104 AV *av = (AV *)SvRV (self);
3933 int wcount = AvFILLp (av) + 1 - 1; 4105 int wcount = AvFILLp (av) + 1 - 1;
3934 4106
3935 if (GIMME_V == G_SCALAR) 4107 if (GIMME_V == G_SCALAR)
… …
3944} 4116}
3945 4117
3946MODULE = Coro::State PACKAGE = Coro::SemaphoreSet 4118MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3947 4119
3948void 4120void
3949_may_delete (SV *sem, int count, int extra_refs) 4121_may_delete (SV *sem, int count, unsigned int extra_refs)
3950 PPCODE: 4122 PPCODE:
3951{ 4123{
3952 AV *av = (AV *)SvRV (sem); 4124 AV *av = (AV *)SvRV (sem);
3953 4125
3954 if (SvREFCNT ((SV *)av) == 1 + extra_refs 4126 if (SvREFCNT ((SV *)av) == 1 + extra_refs
3955 && AvFILLp (av) == 0 /* no waiters, just count */ 4127 && AvFILLp (av) == 0 /* no waiters, just count */
3956 && SvIV (AvARRAY (av)[0]) == count) 4128 && SvIV (AvARRAY (av)[0]) == count)
3957 XSRETURN_YES; 4129 XSRETURN_YES;
… …
3978 4150
3979void 4151void
3980broadcast (SV *self) 4152broadcast (SV *self)
3981 CODE: 4153 CODE:
3982{ 4154{
3983 AV *av = (AV *)SvRV (self); 4155 AV *av = (AV *)SvRV (self);
3984 coro_signal_wake (aTHX_ av, AvFILLp (av)); 4156 coro_signal_wake (aTHX_ av, AvFILLp (av));
3985} 4157}
3986 4158
3987void 4159void
3988send (SV *self) 4160send (SV *self)
… …
3996 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */ 4168 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
3997} 4169}
3998 4170
3999IV 4171IV
4000awaited (SV *self) 4172awaited (SV *self)
4001 CODE: 4173 CODE:
4002 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1; 4174 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
4003 OUTPUT: 4175 OUTPUT:
4004 RETVAL 4176 RETVAL
4005 4177
4006 4178
… …
4011 4183
4012void 4184void
4013_schedule (...) 4185_schedule (...)
4014 CODE: 4186 CODE:
4015{ 4187{
4016 static int incede; 4188 static int incede;
4017 4189
4018 api_cede_notself (aTHX); 4190 api_cede_notself (aTHX);
4019 4191
4020 ++incede; 4192 ++incede;
4021 while (coro_nready >= incede && api_cede (aTHX)) 4193 while (coro_nready >= incede && api_cede (aTHX))

Diff Legend

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