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.451 by root, Mon Jun 29 23:49:34 2015 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#define ECB_NO_LIBM 1
20#include "ecb.h"
21
22#include <stddef.h>
18#include <stdio.h> 23#include <stdio.h>
19#include <errno.h> 24#include <errno.h>
20#include <assert.h> 25#include <assert.h>
21 26
27#ifndef SvREFCNT_dec_NN
28 #define SvREFCNT_dec_NN(sv) SvREFCNT_dec (sv)
29#endif
30
31#ifndef SvREFCNT_inc_NN
32 #define SvREFCNT_inc_NN(sv) SvREFCNT_inc (sv)
33#endif
34
22#ifndef SVs_PADSTALE 35#ifndef SVs_PADSTALE
23# define SVs_PADSTALE 0 36# define SVs_PADSTALE 0
37#endif
38
39#ifdef PadARRAY
40# define NEWPADAPI 1
41# define newPADLIST(var) (Newz (0, var, 1, PADLIST), Newx (PadlistARRAY (var), 2, PAD *))
42#else
43typedef AV PADNAMELIST;
44# if !PERL_VERSION_ATLEAST(5,8,0)
45typedef AV PADLIST;
46typedef AV PAD;
47# endif
48# define PadlistARRAY(pl) ((PAD **)AvARRAY (pl))
49# define PadlistMAX(pl) AvFILLp (pl)
50# define PadlistNAMES(pl) (*PadlistARRAY (pl))
51# define PadARRAY AvARRAY
52# define PadMAX AvFILLp
53# define newPADLIST(var) ((var) = newAV (), av_extend (var, 1))
54#endif
55#ifndef PadnamelistREFCNT
56# define PadnamelistREFCNT(pnl) SvREFCNT (pnl)
57#endif
58#ifndef PadnamelistREFCNT_dec
59# define PadnamelistREFCNT_dec(pnl) SvREFCNT_dec (pnl)
60#endif
61
62/* 5.19.something has replaced SVt_BIND by SVt_INVLIST */
63/* we just alias it to SVt_IV, as that is sufficient for swap_sv for now */
64#if PERL_VERSION_ATLEAST(5,19,0)
65# define SVt_BIND SVt_IV
24#endif 66#endif
25 67
26#if defined(_WIN32) 68#if defined(_WIN32)
27# undef HAS_GETTIMEOFDAY 69# undef HAS_GETTIMEOFDAY
28# undef setjmp 70# undef setjmp
… …
31# define setjmp _setjmp /* deep magic */ 73# define setjmp _setjmp /* deep magic */
32#else 74#else
33# include <inttypes.h> /* most portable stdint.h */ 75# include <inttypes.h> /* most portable stdint.h */
34#endif 76#endif
35 77
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 */ 78/* the maximum number of idle cctx that will be pooled */
64static int cctx_max_idle = 4; 79static int cctx_max_idle = 4;
65 80
66#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 81#if defined(DEBUGGING) && PERL_VERSION_ATLEAST(5,12,0)
67# undef CORO_STACKGUARD 82# define HAS_SCOPESTACK_NAME 1
68#endif
69
70#ifndef CORO_STACKGUARD
71# define CORO_STACKGUARD 0
72#endif 83#endif
73 84
74/* prefer perl internal functions over our own? */ 85/* prefer perl internal functions over our own? */
75#ifndef CORO_PREFER_PERL_FUNCTIONS 86#ifndef CORO_PREFER_PERL_FUNCTIONS
76# define CORO_PREFER_PERL_FUNCTIONS 0 87# define CORO_PREFER_PERL_FUNCTIONS 0
… …
86# define STACKLEVEL ((void *)&stacklevel) 97# define STACKLEVEL ((void *)&stacklevel)
87#endif 98#endif
88 99
89#define IN_DESTRUCT PL_dirty 100#define IN_DESTRUCT PL_dirty
90 101
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" 102#include "CoroAPI.h"
107#define GCoroAPI (&coroapi) /* very sneaky */ 103#define GCoroAPI (&coroapi) /* very sneaky */
108 104
109#ifdef USE_ITHREADS 105#ifdef USE_ITHREADS
110# if CORO_PTHREAD 106# if CORO_PTHREAD
… …
166static char times_valid; 162static char times_valid;
167 163
168static struct coro_cctx *cctx_first; 164static struct coro_cctx *cctx_first;
169static int cctx_count, cctx_idle; 165static int cctx_count, cctx_idle;
170 166
171enum { 167enum
168{
172 CC_MAPPED = 0x01, 169 CC_MAPPED = 0x01,
173 CC_NOREUSE = 0x02, /* throw this away after tracing */ 170 CC_NOREUSE = 0x02, /* throw this away after tracing */
174 CC_TRACE = 0x04, 171 CC_TRACE = 0x04,
175 CC_TRACE_SUB = 0x08, /* trace sub calls */ 172 CC_TRACE_SUB = 0x08, /* trace sub calls */
176 CC_TRACE_LINE = 0x10, /* trace each statement */ 173 CC_TRACE_LINE = 0x10, /* trace each statement */
… …
181typedef struct coro_cctx 178typedef struct coro_cctx
182{ 179{
183 struct coro_cctx *next; 180 struct coro_cctx *next;
184 181
185 /* the stack */ 182 /* the stack */
186 void *sptr; 183 struct coro_stack stack;
187 size_t ssize;
188 184
189 /* cpu state */ 185 /* cpu state */
190 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 186 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
187#ifndef NDEBUG
191 JMPENV *idle_te; /* same as idle_sp, but for top_env, TODO: remove once stable */ 188 JMPENV *idle_te; /* same as idle_sp, but for top_env */
189#endif
192 JMPENV *top_env; 190 JMPENV *top_env;
193 coro_context cctx; 191 coro_context cctx;
194 192
195 U32 gen; 193 U32 gen;
196#if CORO_USE_VALGRIND 194#if CORO_USE_VALGRIND
… …
201 199
202static coro_cctx *cctx_current; /* the currently running cctx */ 200static coro_cctx *cctx_current; /* the currently running cctx */
203 201
204/*****************************************************************************/ 202/*****************************************************************************/
205 203
204static MGVTBL coro_state_vtbl;
205
206enum { 206enum
207{
207 CF_RUNNING = 0x0001, /* coroutine is running */ 208 CF_RUNNING = 0x0001, /* coroutine is running */
208 CF_READY = 0x0002, /* coroutine is ready */ 209 CF_READY = 0x0002, /* coroutine is ready */
209 CF_NEW = 0x0004, /* has never been switched to */ 210 CF_NEW = 0x0004, /* has never been switched to */
210 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 211 CF_ZOMBIE = 0x0008, /* coroutine data has been freed */
211 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */ 212 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
212 CF_NOCANCEL = 0x0020, /* cannot cancel, set slf_frame.data to 1 (hackish) */ 213 CF_NOCANCEL = 0x0020, /* cannot cancel, set slf_frame.data to 1 (hackish) */
213}; 214};
214 215
215/* the structure where most of the perl state is stored, overlaid on the cxstack */ 216/* the structure where most of the perl state is stored, overlaid on the cxstack */
216typedef struct 217typedef struct
217{ 218{
218 SV *defsv;
219 AV *defav;
220 SV *errsv;
221 SV *irsgv;
222 HV *hinthv;
223#define VAR(name,type) type name; 219 #define VARx(name,expr,type) type name;
224# include "state.h" 220 #include "state.h"
225#undef VAR
226} perl_slots; 221} perl_slots;
227 222
228// how many context stack entries do we need for perl_slots 223/* 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)) 224#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
230 225
231/* this is a structure representing a perl-level coroutine */ 226/* this is a structure representing a perl-level coroutine */
232struct coro { 227struct coro
228{
233 /* the C coroutine allocated to this perl coroutine, if any */ 229 /* the C coroutine allocated to this perl coroutine, if any */
234 coro_cctx *cctx; 230 coro_cctx *cctx;
235 231
236 /* ready queue */ 232 /* ready queue */
237 struct coro *next_ready; 233 struct coro *next_ready;
… …
239 /* state data */ 235 /* state data */
240 struct CoroSLF slf_frame; /* saved slf frame */ 236 struct CoroSLF slf_frame; /* saved slf frame */
241 AV *mainstack; 237 AV *mainstack;
242 perl_slots *slot; /* basically the saved sp */ 238 perl_slots *slot; /* basically the saved sp */
243 239
244 CV *startcv; /* the CV to execute */ 240 CV *startcv; /* the CV to execute */
245 AV *args; /* data associated with this coroutine (initial args) */ 241 AV *args; /* data associated with this coroutine (initial args) */
246 int refcnt; /* coroutines are refcounted, yes */
247 int flags; /* CF_ flags */ 242 int flags; /* CF_ flags */
248 HV *hv; /* the perl hash associated with this coro, if any */ 243 HV *hv; /* the perl hash associated with this coro, if any */
249 244
250 /* statistics */ 245 /* statistics */
251 int usecount; /* number of transfers to this coro */ 246 int usecount; /* number of transfers to this coro */
252 247
253 /* coro process data */ 248 /* coro process data */
254 int prio; 249 int prio;
255 SV *except; /* exception to be thrown */ 250 SV *except; /* exception to be thrown */
256 SV *rouse_cb; 251 SV *rouse_cb; /* last rouse callback */
252 AV *on_destroy; /* callbacks or coros to notify on destroy */
253 AV *status; /* the exit status list */
257 254
258 /* async_pool */ 255 /* async_pool */
259 SV *saved_deffh; 256 SV *saved_deffh;
260 SV *invoke_cb; 257 SV *invoke_cb;
261 AV *invoke_av; 258 AV *invoke_av;
262 259
263 /* on_enter/on_leave */ 260 /* on_enter/on_leave */
264 AV *on_enter; 261 AV *on_enter; AV *on_enter_xs;
265 AV *on_leave; 262 AV *on_leave; AV *on_leave_xs;
266 263
267 /* swap_sv */ 264 /* swap_sv */
268 AV *swap_sv; 265 AV *swap_sv;
269 266
270 /* times */ 267 /* times */
… …
297static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */ 294static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
298static CV *cv_coro_run; 295static CV *cv_coro_run;
299static struct coro *coro_first; 296static struct coro *coro_first;
300#define coro_nready coroapi.nready 297#define coro_nready coroapi.nready
301 298
299/** JIT *********************************************************************/
300
301#if CORO_JIT
302 /* APPLE doesn't have mmap though */
303 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__)
304 #ifndef CORO_JIT_TYPE
305 #if ECB_AMD64 && CORO_JIT_UNIXY
306 #define CORO_JIT_TYPE "amd64-unix"
307 #elif __i386 && CORO_JIT_UNIXY
308 #define CORO_JIT_TYPE "x86-unix"
309 #endif
310 #endif
311#endif
312
313#if !defined(CORO_JIT_TYPE) || _POSIX_MEMORY_PROTECTION <= 0
314 #undef CORO_JIT
315#endif
316
317#if CORO_JIT
318 typedef void (*load_save_perl_slots_type)(perl_slots *);
319 static load_save_perl_slots_type load_perl_slots, save_perl_slots;
320#endif
321
302/** Coro::Select ************************************************************/ 322/** Coro::Select ************************************************************/
303 323
304static OP *(*coro_old_pp_sselect) (pTHX); 324static OP *(*coro_old_pp_sselect) (pTHX);
305static SV *coro_select_select; 325static SV *coro_select_select;
306 326
… …
321 341
322/** time stuff **************************************************************/ 342/** time stuff **************************************************************/
323 343
324#ifdef HAS_GETTIMEOFDAY 344#ifdef HAS_GETTIMEOFDAY
325 345
326static void 346ecb_inline void
327coro_u2time (pTHX_ UV ret[2]) 347coro_u2time (pTHX_ UV ret[2])
328{ 348{
329 struct timeval tv; 349 struct timeval tv;
330 gettimeofday (&tv, 0); 350 gettimeofday (&tv, 0);
331 351
332 ret [0] = tv.tv_sec; 352 ret [0] = tv.tv_sec;
333 ret [1] = tv.tv_usec; 353 ret [1] = tv.tv_usec;
334} 354}
335 355
336static double 356ecb_inline double
337coro_nvtime () 357coro_nvtime (void)
338{ 358{
339 struct timeval tv; 359 struct timeval tv;
340 gettimeofday (&tv, 0); 360 gettimeofday (&tv, 0);
341 361
342 return tv.tv_sec + tv.tv_usec * 1e-6; 362 return tv.tv_sec + tv.tv_usec * 1e-6;
343} 363}
344 364
345static void 365ecb_inline void
346time_init (pTHX) 366time_init (pTHX)
347{ 367{
348 nvtime = coro_nvtime; 368 nvtime = coro_nvtime;
349 u2time = coro_u2time; 369 u2time = coro_u2time;
350} 370}
351 371
352#else 372#else
353 373
354static void 374ecb_inline void
355time_init (pTHX) 375time_init (pTHX)
356{ 376{
357 SV **svp; 377 SV **svp;
358 378
359 require_pv ("Time/HiRes.pm"); 379 require_pv ("Time/HiRes.pm");
360 380
361 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0); 381 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
362 382
363 if (!svp) croak ("Time::HiRes is required, but missing. Caught"); 383 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
364 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught"); 384 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught");
365 385
… …
371 391
372#endif 392#endif
373 393
374/** lowlevel stuff **********************************************************/ 394/** lowlevel stuff **********************************************************/
375 395
376static SV * 396static SV * ecb_noinline
377coro_get_sv (pTHX_ const char *name, int create) 397coro_get_sv (pTHX_ const char *name, int create)
378{ 398{
379#if PERL_VERSION_ATLEAST (5,10,0) 399#if PERL_VERSION_ATLEAST (5,10,0)
380 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 400 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
381 get_sv (name, create); 401 get_sv (name, create);
382#endif 402#endif
383 return get_sv (name, create); 403 return get_sv (name, create);
384} 404}
385 405
386static AV * 406static AV * ecb_noinline
387coro_get_av (pTHX_ const char *name, int create) 407coro_get_av (pTHX_ const char *name, int create)
388{ 408{
389#if PERL_VERSION_ATLEAST (5,10,0) 409#if PERL_VERSION_ATLEAST (5,10,0)
390 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 410 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
391 get_av (name, create); 411 get_av (name, create);
392#endif 412#endif
393 return get_av (name, create); 413 return get_av (name, create);
394} 414}
395 415
396static HV * 416static HV * ecb_noinline
397coro_get_hv (pTHX_ const char *name, int create) 417coro_get_hv (pTHX_ const char *name, int create)
398{ 418{
399#if PERL_VERSION_ATLEAST (5,10,0) 419#if PERL_VERSION_ATLEAST (5,10,0)
400 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 420 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
401 get_hv (name, create); 421 get_hv (name, create);
402#endif 422#endif
403 return get_hv (name, create); 423 return get_hv (name, create);
404} 424}
405 425
406INLINE void 426ecb_inline void
407coro_times_update () 427coro_times_update (void)
408{ 428{
409#ifdef coro_clock_gettime 429#ifdef coro_clock_gettime
410 struct timespec ts; 430 struct timespec ts;
411 431
412 ts.tv_sec = ts.tv_nsec = 0; 432 ts.tv_sec = ts.tv_nsec = 0;
… …
424 time_real [0] = tv [0]; 444 time_real [0] = tv [0];
425 time_real [1] = tv [1] * 1000; 445 time_real [1] = tv [1] * 1000;
426#endif 446#endif
427} 447}
428 448
429INLINE void 449ecb_inline void
430coro_times_add (struct coro *c) 450coro_times_add (struct coro *c)
431{ 451{
432 c->t_real [1] += time_real [1]; 452 c->t_real [1] += time_real [1];
433 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; } 453 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
434 c->t_real [0] += time_real [0]; 454 c->t_real [0] += time_real [0];
… …
436 c->t_cpu [1] += time_cpu [1]; 456 c->t_cpu [1] += time_cpu [1];
437 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; } 457 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
438 c->t_cpu [0] += time_cpu [0]; 458 c->t_cpu [0] += time_cpu [0];
439} 459}
440 460
441INLINE void 461ecb_inline void
442coro_times_sub (struct coro *c) 462coro_times_sub (struct coro *c)
443{ 463{
444 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; } 464 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]; 465 c->t_real [1] -= time_real [1];
446 c->t_real [0] -= time_real [0]; 466 c->t_real [0] -= time_real [0];
… …
454/* magic glue */ 474/* magic glue */
455 475
456#define CORO_MAGIC_type_cv 26 476#define CORO_MAGIC_type_cv 26
457#define CORO_MAGIC_type_state PERL_MAGIC_ext 477#define CORO_MAGIC_type_state PERL_MAGIC_ext
458 478
459#define CORO_MAGIC_NN(sv, type) \ 479#define CORO_MAGIC_NN(sv, type) \
460 (expect_true (SvMAGIC (sv)->mg_type == type) \ 480 (ecb_expect_true (SvMAGIC (sv)->mg_type == type) \
461 ? SvMAGIC (sv) \ 481 ? SvMAGIC (sv) \
462 : mg_find (sv, type)) 482 : mg_find (sv, type))
463 483
464#define CORO_MAGIC(sv, type) \ 484#define CORO_MAGIC(sv, type) \
465 (expect_true (SvMAGIC (sv)) \ 485 (ecb_expect_true (SvMAGIC (sv)) \
466 ? CORO_MAGIC_NN (sv, type) \ 486 ? CORO_MAGIC_NN (sv, type) \
467 : 0) 487 : 0)
468 488
469#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv) 489#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) 490#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
471 491
472INLINE struct coro * 492ecb_inline MAGIC *
473SvSTATE_ (pTHX_ SV *coro) 493SvSTATEhv_p (pTHX_ SV *coro)
474{ 494{
475 HV *stash;
476 MAGIC *mg; 495 MAGIC *mg;
477 496
497 if (ecb_expect_true (
498 SvTYPE (coro) == SVt_PVHV
499 && (mg = CORO_MAGIC_state (coro))
500 && mg->mg_virtual == &coro_state_vtbl
501 ))
502 return mg;
503
504 return 0;
505}
506
507ecb_inline struct coro *
508SvSTATE_ (pTHX_ SV *coro_sv)
509{
510 MAGIC *mg;
511
478 if (SvROK (coro)) 512 if (SvROK (coro_sv))
479 coro = SvRV (coro); 513 coro_sv = SvRV (coro_sv);
480 514
481 if (expect_false (SvTYPE (coro) != SVt_PVHV)) 515 mg = SvSTATEhv_p (aTHX_ coro_sv);
516 if (!mg)
482 croak ("Coro::State object required"); 517 croak ("Coro::State object required");
483 518
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; 519 return (struct coro *)mg->mg_ptr;
494} 520}
495 521
496#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 522#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
497 523
… …
500#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 526#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
501 527
502/*****************************************************************************/ 528/*****************************************************************************/
503/* padlist management and caching */ 529/* padlist management and caching */
504 530
505static AV * 531ecb_inline PADLIST *
506coro_derive_padlist (pTHX_ CV *cv) 532coro_derive_padlist (pTHX_ CV *cv)
507{ 533{
508 AV *padlist = CvPADLIST (cv); 534 PADLIST *padlist = CvPADLIST (cv);
509 AV *newpadlist, *newpad; 535 PADLIST *newpadlist;
536 PADNAMELIST *padnames;
537 PAD *newpad;
538 PADOFFSET off = PadlistMAX (padlist) + 1;
510 539
511 newpadlist = newAV (); 540#if NEWPADAPI
541
542 /* if we had the original CvDEPTH, we might be able to steal the CvDEPTH+1 entry instead */
543 /* 20131102194744.GA6705@schmorp.de, 20131102195825.2013.qmail@lists-nntp.develooper.com */
544 while (!PadlistARRAY (padlist)[off - 1])
545 --off;
546
547 Perl_pad_push (aTHX_ padlist, off);
548
549 newpad = PadlistARRAY (padlist)[off];
550 PadlistARRAY (padlist)[off] = 0;
551
552#else
553
554#if PERL_VERSION_ATLEAST (5,10,0)
555 Perl_pad_push (aTHX_ padlist, off);
556#else
557 Perl_pad_push (aTHX_ padlist, off, 1);
558#endif
559
560 newpad = PadlistARRAY (padlist)[off];
561 PadlistMAX (padlist) = off - 1;
562
563#endif
564
565 newPADLIST (newpadlist);
566#if !PERL_VERSION_ATLEAST(5,15,3)
567 /* Padlists are AvREAL as of 5.15.3. See perl bug #98092 and perl commit 7d953ba. */
512 AvREAL_off (newpadlist); 568 AvREAL_off (newpadlist);
513#if PERL_VERSION_ATLEAST (5,10,0)
514 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1);
515#else
516 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
517#endif 569#endif
518 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
519 --AvFILLp (padlist);
520 570
521 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0])); 571 /* Already extended to 2 elements by newPADLIST. */
522 av_store (newpadlist, 1, (SV *)newpad); 572 PadlistMAX (newpadlist) = 1;
573
574 padnames = PadlistNAMES (padlist);
575 ++PadnamelistREFCNT (padnames);
576 PadlistNAMES (newpadlist) = padnames;
577
578 PadlistARRAY (newpadlist)[1] = newpad;
523 579
524 return newpadlist; 580 return newpadlist;
525} 581}
526 582
527static void 583ecb_inline void
528free_padlist (pTHX_ AV *padlist) 584free_padlist (pTHX_ PADLIST *padlist)
529{ 585{
530 /* may be during global destruction */ 586 /* may be during global destruction */
531 if (!IN_DESTRUCT) 587 if (!IN_DESTRUCT)
532 { 588 {
533 I32 i = AvFILLp (padlist); 589 I32 i = PadlistMAX (padlist);
534 590
535 while (i > 0) /* special-case index 0 */ 591 while (i > 0) /* special-case index 0 */
536 { 592 {
537 /* we try to be extra-careful here */ 593 /* we try to be extra-careful here */
538 AV *av = (AV *)AvARRAY (padlist)[i--]; 594 PAD *pad = PadlistARRAY (padlist)[i--];
539 I32 j = AvFILLp (av);
540 595
596 if (pad)
597 {
598 I32 j = PadMAX (pad);
599
541 while (j >= 0) 600 while (j >= 0)
542 SvREFCNT_dec (AvARRAY (av)[j--]); 601 SvREFCNT_dec (PadARRAY (pad)[j--]);
543 602
544 AvFILLp (av) = -1; 603 PadMAX (pad) = -1;
545 SvREFCNT_dec (av); 604 SvREFCNT_dec (pad);
605 }
546 } 606 }
547 607
548 SvREFCNT_dec (AvARRAY (padlist)[0]); 608 PadnamelistREFCNT_dec (PadlistNAMES (padlist));
549 609
610#if NEWPADAPI
611 Safefree (PadlistARRAY (padlist));
612 Safefree (padlist);
613#else
550 AvFILLp (padlist) = -1; 614 AvFILLp (padlist) = -1;
615 AvREAL_off (padlist);
551 SvREFCNT_dec ((SV*)padlist); 616 SvREFCNT_dec ((SV*)padlist);
617#endif
552 } 618 }
553} 619}
554 620
555static int 621static int
556coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 622coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
557{ 623{
558 AV *padlist; 624 PADLIST *padlist;
559 AV *av = (AV *)mg->mg_obj; 625 PADLIST **padlists = (PADLIST **)(mg->mg_ptr + sizeof(size_t));
626 size_t len = *(size_t *)mg->mg_ptr;
560 627
561 /* perl manages to free our internal AV and _then_ call us */ 628 /* perl manages to free our internal AV and _then_ call us */
562 if (IN_DESTRUCT) 629 if (IN_DESTRUCT)
563 return 0; 630 return 0;
564 631
565 /* casting is fun. */ 632 while (len--)
566 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
567 free_padlist (aTHX_ padlist); 633 free_padlist (aTHX_ padlists[len]);
568
569 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
570 634
571 return 0; 635 return 0;
572} 636}
573 637
574static MGVTBL coro_cv_vtbl = { 638static MGVTBL coro_cv_vtbl = {
575 0, 0, 0, 0, 639 0, 0, 0, 0,
576 coro_cv_free 640 coro_cv_free
577}; 641};
578 642
579/* the next two functions merely cache the padlists */ 643/* the next two functions merely cache the padlists */
580static void 644ecb_inline void
581get_padlist (pTHX_ CV *cv) 645get_padlist (pTHX_ CV *cv)
582{ 646{
583 MAGIC *mg = CORO_MAGIC_cv (cv); 647 MAGIC *mg = CORO_MAGIC_cv (cv);
584 AV *av; 648 size_t *lenp;
585 649
586 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 650 if (ecb_expect_true (mg && *(lenp = (size_t *)mg->mg_ptr)))
587 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 651 CvPADLIST (cv) = ((PADLIST **)(mg->mg_ptr + sizeof(size_t)))[--*lenp];
588 else 652 else
589 { 653 {
590#if CORO_PREFER_PERL_FUNCTIONS 654#if CORO_PREFER_PERL_FUNCTIONS
591 /* this is probably cleaner? but also slower! */ 655 /* this is probably cleaner? but also slower! */
592 /* in practise, it seems to be less stable */ 656 /* in practise, it seems to be less stable */
… …
598 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 662 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
599#endif 663#endif
600 } 664 }
601} 665}
602 666
603static void 667ecb_inline void
604put_padlist (pTHX_ CV *cv) 668put_padlist (pTHX_ CV *cv)
605{ 669{
606 MAGIC *mg = CORO_MAGIC_cv (cv); 670 MAGIC *mg = CORO_MAGIC_cv (cv);
607 AV *av;
608 671
609 if (expect_false (!mg)) 672 if (ecb_expect_false (!mg))
673 {
610 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 674 mg = sv_magicext ((SV *)cv, 0, CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
675 Newz (0, mg->mg_ptr ,sizeof (size_t) + sizeof (PADLIST *), char);
676 mg->mg_len = 1; /* so mg_free frees mg_ptr */
677 }
678 else
679 Renew (mg->mg_ptr,
680 sizeof(size_t) + (*(size_t *)mg->mg_ptr + 1) * sizeof(PADLIST *),
681 char);
611 682
612 av = (AV *)mg->mg_obj; 683 ((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} 684}
619 685
620/** load & save, init *******************************************************/ 686/** load & save, init *******************************************************/
621 687
688ecb_inline void
689swap_sv (SV *a, SV *b)
690{
691 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
692 SV tmp;
693
694 /* swap sv_any */
695 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
696
697 /* swap sv_flags */
698 SvFLAGS (&tmp) = SvFLAGS (a);
699 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
700 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
701
702#if PERL_VERSION_ATLEAST (5,10,0)
703 /* perl 5.10 and later complicates this _quite_ a bit, but it also
704 * is much faster, so no quarrels here. alternatively, we could
705 * sv_upgrade to avoid this.
706 */
707 {
708 /* swap sv_u */
709 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
710
711 /* if SvANY points to the head, we need to adjust the pointers,
712 * as the pointer for a still points to b, and maybe vice versa.
713 */
714 #define svany_in_head(type) \
715 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
716
717 if (svany_in_head (SvTYPE (a)))
718 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
719
720 if (svany_in_head (SvTYPE (b)))
721 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
722 }
723#endif
724}
725
622/* swap sv heads, at least logically */ 726/* swap sv heads, at least logically */
623static void 727static void
624swap_svs (pTHX_ Coro__State c) 728swap_svs (pTHX_ Coro__State c)
625{ 729{
626 int i; 730 int i;
627 731
628 for (i = 0; i <= AvFILLp (c->swap_sv); ) 732 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
629 { 733 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} 734}
668 735
669#define SWAP_SVS(coro) \ 736#define SWAP_SVS(coro) \
670 if (expect_false ((coro)->swap_sv)) \ 737 if (ecb_expect_false ((coro)->swap_sv)) \
671 swap_svs (aTHX_ (coro)) 738 swap_svs (aTHX_ (coro))
672 739
673static void 740static void
674on_enterleave_call (pTHX_ SV *cb); 741on_enterleave_call (pTHX_ SV *cb);
675 742
… …
679 perl_slots *slot = c->slot; 746 perl_slots *slot = c->slot;
680 c->slot = 0; 747 c->slot = 0;
681 748
682 PL_mainstack = c->mainstack; 749 PL_mainstack = c->mainstack;
683 750
684 GvSV (PL_defgv) = slot->defsv; 751#if CORO_JIT
685 GvAV (PL_defgv) = slot->defav; 752 load_perl_slots (slot);
686 GvSV (PL_errgv) = slot->errsv; 753#else
687 GvSV (irsgv) = slot->irsgv;
688 GvHV (PL_hintgv) = slot->hinthv;
689
690 #define VAR(name,type) PL_ ## name = slot->name; 754 #define VARx(name,expr,type) expr = slot->name;
691 # include "state.h" 755 #include "state.h"
692 #undef VAR 756#endif
693 757
694 { 758 {
695 dSP; 759 dSP;
696 760
697 CV *cv; 761 CV *cv;
698 762
699 /* now do the ugly restore mess */ 763 /* now do the ugly restore mess */
700 while (expect_true (cv = (CV *)POPs)) 764 while (ecb_expect_true (cv = (CV *)POPs))
701 { 765 {
702 put_padlist (aTHX_ cv); /* mark this padlist as available */ 766 put_padlist (aTHX_ cv); /* mark this padlist as available */
703 CvDEPTH (cv) = PTR2IV (POPs); 767 CvDEPTH (cv) = PTR2IV (POPs);
704 CvPADLIST (cv) = (AV *)POPs; 768 CvPADLIST (cv) = (PADLIST *)POPs;
705 } 769 }
706 770
707 PUTBACK; 771 PUTBACK;
708 } 772 }
709 773
710 slf_frame = c->slf_frame; 774 slf_frame = c->slf_frame;
711 CORO_THROW = c->except; 775 CORO_THROW = c->except;
712 776
713 if (expect_false (enable_times)) 777 if (ecb_expect_false (enable_times))
714 { 778 {
715 if (expect_false (!times_valid)) 779 if (ecb_expect_false (!times_valid))
716 coro_times_update (); 780 coro_times_update ();
717 781
718 coro_times_sub (c); 782 coro_times_sub (c);
719 } 783 }
720 784
721 if (expect_false (c->on_enter)) 785 if (ecb_expect_false (c->on_enter))
722 { 786 {
723 int i; 787 int i;
724 788
725 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 789 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
726 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 790 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
727 } 791 }
728 792
793 if (ecb_expect_false (c->on_enter_xs))
794 {
795 int i;
796
797 for (i = 0; i <= AvFILLp (c->on_enter_xs); i += 2)
798 ((coro_enterleave_hook)AvARRAY (c->on_enter_xs)[i]) (aTHX_ AvARRAY (c->on_enter_xs)[i + 1]);
799 }
800
729 SWAP_SVS (c); 801 SWAP_SVS (c);
730} 802}
731 803
732static void 804static void
733save_perl (pTHX_ Coro__State c) 805save_perl (pTHX_ Coro__State c)
734{ 806{
735 SWAP_SVS (c); 807 SWAP_SVS (c);
736 808
809 if (ecb_expect_false (c->on_leave_xs))
810 {
811 int i;
812
813 for (i = AvFILLp (c->on_leave_xs) - 1; i >= 0; i -= 2)
814 ((coro_enterleave_hook)AvARRAY (c->on_leave_xs)[i]) (aTHX_ AvARRAY (c->on_leave_xs)[i + 1]);
815 }
816
737 if (expect_false (c->on_leave)) 817 if (ecb_expect_false (c->on_leave))
738 { 818 {
739 int i; 819 int i;
740 820
741 for (i = AvFILLp (c->on_leave); i >= 0; --i) 821 for (i = AvFILLp (c->on_leave); i >= 0; --i)
742 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]); 822 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
743 } 823 }
744 824
745 times_valid = 0; 825 times_valid = 0;
746 826
747 if (expect_false (enable_times)) 827 if (ecb_expect_false (enable_times))
748 { 828 {
749 coro_times_update (); times_valid = 1; 829 coro_times_update (); times_valid = 1;
750 coro_times_add (c); 830 coro_times_add (c);
751 } 831 }
752 832
… …
766 846
767 XPUSHs (Nullsv); 847 XPUSHs (Nullsv);
768 /* this loop was inspired by pp_caller */ 848 /* this loop was inspired by pp_caller */
769 for (;;) 849 for (;;)
770 { 850 {
771 while (expect_true (cxix >= 0)) 851 while (ecb_expect_true (cxix >= 0))
772 { 852 {
773 PERL_CONTEXT *cx = &ccstk[cxix--]; 853 PERL_CONTEXT *cx = &ccstk[cxix--];
774 854
775 if (expect_true (CxTYPE (cx) == CXt_SUB) || expect_false (CxTYPE (cx) == CXt_FORMAT)) 855 if (ecb_expect_true (CxTYPE (cx) == CXt_SUB) || ecb_expect_false (CxTYPE (cx) == CXt_FORMAT))
776 { 856 {
777 CV *cv = cx->blk_sub.cv; 857 CV *cv = cx->blk_sub.cv;
778 858
779 if (expect_true (CvDEPTH (cv))) 859 if (ecb_expect_true (CvDEPTH (cv)))
780 { 860 {
781 EXTEND (SP, 3); 861 EXTEND (SP, 3);
782 PUSHs ((SV *)CvPADLIST (cv)); 862 PUSHs ((SV *)CvPADLIST (cv));
783 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv))); 863 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
784 PUSHs ((SV *)cv); 864 PUSHs ((SV *)cv);
… …
787 get_padlist (aTHX_ cv); 867 get_padlist (aTHX_ cv);
788 } 868 }
789 } 869 }
790 } 870 }
791 871
792 if (expect_true (top_si->si_type == PERLSI_MAIN)) 872 if (ecb_expect_true (top_si->si_type == PERLSI_MAIN))
793 break; 873 break;
794 874
795 top_si = top_si->si_prev; 875 top_si = top_si->si_prev;
796 ccstk = top_si->si_cxstack; 876 ccstk = top_si->si_cxstack;
797 cxix = top_si->si_cxix; 877 cxix = top_si->si_cxix;
… …
799 879
800 PUTBACK; 880 PUTBACK;
801 } 881 }
802 882
803 /* allocate some space on the context stack for our purposes */ 883 /* allocate some space on the context stack for our purposes */
804 if (expect_false (cxstack_ix + SLOT_COUNT >= cxstack_max)) 884 if (ecb_expect_false (cxstack_ix + (int)SLOT_COUNT >= cxstack_max))
805 { 885 {
806 unsigned int i; 886 unsigned int i;
807 887
808 for (i = 0; i < SLOT_COUNT; ++i) 888 for (i = 0; i < SLOT_COUNT; ++i)
809 CXINC; 889 CXINC;
… …
814 c->mainstack = PL_mainstack; 894 c->mainstack = PL_mainstack;
815 895
816 { 896 {
817 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 897 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
818 898
819 slot->defav = GvAV (PL_defgv); 899#if CORO_JIT
820 slot->defsv = DEFSV; 900 save_perl_slots (slot);
821 slot->errsv = ERRSV; 901#else
822 slot->irsgv = GvSV (irsgv);
823 slot->hinthv = GvHV (PL_hintgv);
824
825 #define VAR(name,type) slot->name = PL_ ## name; 902 #define VARx(name,expr,type) slot->name = expr;
826 # include "state.h" 903 #include "state.h"
827 #undef VAR 904#endif
828 } 905 }
829} 906}
830 907
831/* 908/*
832 * allocate various perl stacks. This is almost an exact copy 909 * allocate various perl stacks. This is almost an exact copy
… …
863#endif 940#endif
864 941
865 New(54,PL_scopestack,8,I32); 942 New(54,PL_scopestack,8,I32);
866 PL_scopestack_ix = 0; 943 PL_scopestack_ix = 0;
867 PL_scopestack_max = 8; 944 PL_scopestack_max = 8;
945#if HAS_SCOPESTACK_NAME
946 New(54,PL_scopestack_name,8,const char*);
947#endif
868 948
869 New(54,PL_savestack,24,ANY); 949 New(54,PL_savestack,24,ANY);
870 PL_savestack_ix = 0; 950 PL_savestack_ix = 0;
871 PL_savestack_max = 24; 951 PL_savestack_max = 24;
872 952
… …
900 } 980 }
901 981
902 Safefree (PL_tmps_stack); 982 Safefree (PL_tmps_stack);
903 Safefree (PL_markstack); 983 Safefree (PL_markstack);
904 Safefree (PL_scopestack); 984 Safefree (PL_scopestack);
985#if HAS_SCOPESTACK_NAME
986 Safefree (PL_scopestack_name);
987#endif
905 Safefree (PL_savestack); 988 Safefree (PL_savestack);
906#if !PERL_VERSION_ATLEAST (5,10,0) 989#if !PERL_VERSION_ATLEAST (5,10,0)
907 Safefree (PL_retstack); 990 Safefree (PL_retstack);
908#endif 991#endif
909} 992}
… …
955#endif 1038#endif
956 1039
957/* 1040/*
958 * This overrides the default magic get method of %SIG elements. 1041 * 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 1042 * 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 1043 * and instead of trying to save and restore the hash elements (extremely slow),
961 * readback here. 1044 * we just provide our own readback here.
962 */ 1045 */
963static int 1046static int ecb_cold
964coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 1047coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
965{ 1048{
966 const char *s = MgPV_nolen_const (mg); 1049 const char *s = MgPV_nolen_const (mg);
967 1050
968 if (*s == '_') 1051 if (*s == '_')
969 { 1052 {
970 SV **svp = 0; 1053 SV **svp = 0;
971 1054
972 if (strEQ (s, "__DIE__" )) svp = &PL_diehook; 1055 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
973 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 1056 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
974 1057
975 if (svp) 1058 if (svp)
976 { 1059 {
977 sv_setsv (sv, *svp ? *svp : &PL_sv_undef); 1060 SV *ssv;
1061
1062 if (!*svp)
1063 ssv = &PL_sv_undef;
1064 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */
1065 ssv = sv_2mortal (newRV_inc (*svp));
1066 else
1067 ssv = *svp;
1068
1069 sv_setsv (sv, ssv);
978 return 0; 1070 return 0;
979 } 1071 }
980 } 1072 }
981 1073
982 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 1074 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
983} 1075}
984 1076
985static int 1077static int ecb_cold
986coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1078coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
987{ 1079{
988 const char *s = MgPV_nolen_const (mg); 1080 const char *s = MgPV_nolen_const (mg);
989 1081
990 if (*s == '_') 1082 if (*s == '_')
… …
1004 } 1096 }
1005 1097
1006 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0; 1098 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
1007} 1099}
1008 1100
1009static int 1101static int ecb_cold
1010coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1102coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
1011{ 1103{
1012 const char *s = MgPV_nolen_const (mg); 1104 const char *s = MgPV_nolen_const (mg);
1013 1105
1014 if (*s == '_') 1106 if (*s == '_')
… …
1049 return 1; 1141 return 1;
1050} 1142}
1051 1143
1052static UNOP init_perl_op; 1144static UNOP init_perl_op;
1053 1145
1054static void NOINLINE /* noinline to keep it out of the transfer fast path */ 1146ecb_noinline static void /* noinline to keep it out of the transfer fast path */
1055init_perl (pTHX_ struct coro *coro) 1147init_perl (pTHX_ struct coro *coro)
1056{ 1148{
1057 /* 1149 /*
1058 * emulate part of the perl startup here. 1150 * emulate part of the perl startup here.
1059 */ 1151 */
… …
1074 PL_parser = 0; 1166 PL_parser = 0;
1075#endif 1167#endif
1076 PL_hints = 0; 1168 PL_hints = 0;
1077 1169
1078 /* recreate the die/warn hooks */ 1170 /* recreate the die/warn hooks */
1079 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1171 PL_diehook = SvREFCNT_inc (rv_diehook);
1080 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1172 PL_warnhook = SvREFCNT_inc (rv_warnhook);
1081 1173
1082 GvSV (PL_defgv) = newSV (0); 1174 GvSV (PL_defgv) = newSV (0);
1083 GvAV (PL_defgv) = coro->args; coro->args = 0; 1175 GvAV (PL_defgv) = coro->args; coro->args = 0;
1084 GvSV (PL_errgv) = newSV (0); 1176 GvSV (PL_errgv) = newSV (0);
1085 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1177 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
1086 GvHV (PL_hintgv) = 0; 1178 GvHV (PL_hintgv) = newHV ();
1179#if PERL_VERSION_ATLEAST (5,10,0)
1180 hv_magic (GvHV (PL_hintgv), 0, PERL_MAGIC_hints);
1181#endif
1087 PL_rs = newSVsv (GvSV (irsgv)); 1182 PL_rs = newSVsv (GvSV (irsgv));
1088 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1183 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
1089 1184
1090 { 1185 {
1091 dSP; 1186 dSP;
… …
1106 /* this newly created coroutine might be run on an existing cctx which most 1201 /* 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. 1202 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
1108 */ 1203 */
1109 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1204 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 */ 1205 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
1206 slf_frame.destroy = 0;
1111 1207
1112 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1208 /* 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; 1209 init_perl_op.op_next = PL_op;
1114 init_perl_op.op_type = OP_ENTERSUB; 1210 init_perl_op.op_type = OP_ENTERSUB;
1115 init_perl_op.op_ppaddr = pp_slf; 1211 init_perl_op.op_ppaddr = pp_slf;
… …
1120 /* copy throw, in case it was set before init_perl */ 1216 /* copy throw, in case it was set before init_perl */
1121 CORO_THROW = coro->except; 1217 CORO_THROW = coro->except;
1122 1218
1123 SWAP_SVS (coro); 1219 SWAP_SVS (coro);
1124 1220
1125 if (expect_false (enable_times)) 1221 if (ecb_expect_false (enable_times))
1126 { 1222 {
1127 coro_times_update (); 1223 coro_times_update ();
1128 coro_times_sub (coro); 1224 coro_times_sub (coro);
1129 } 1225 }
1130} 1226}
… …
1167 SvRV_set (coro_current, (SV *)coro->hv); 1263 SvRV_set (coro_current, (SV *)coro->hv);
1168 1264
1169 load_perl (aTHX_ coro); 1265 load_perl (aTHX_ coro);
1170 1266
1171 coro_unwind_stacks (aTHX); 1267 coro_unwind_stacks (aTHX);
1172 coro_destruct_stacks (aTHX);
1173 1268
1174 /* restore swapped sv's */ 1269 /* restore swapped sv's */
1175 SWAP_SVS (coro); 1270 SWAP_SVS (coro);
1176 1271
1272 coro_destruct_stacks (aTHX);
1273
1177 // now save some sv's to be free'd later 1274 /* now save some sv's to be free'd later */
1178 svf [0] = GvSV (PL_defgv); 1275 svf [0] = GvSV (PL_defgv);
1179 svf [1] = (SV *)GvAV (PL_defgv); 1276 svf [1] = (SV *)GvAV (PL_defgv);
1180 svf [2] = GvSV (PL_errgv); 1277 svf [2] = GvSV (PL_errgv);
1181 svf [3] = (SV *)PL_defoutgv; 1278 svf [3] = (SV *)PL_defoutgv;
1182 svf [4] = PL_rs; 1279 svf [4] = PL_rs;
… …
1199 1296
1200 SvREFCNT_dec (coro->saved_deffh); 1297 SvREFCNT_dec (coro->saved_deffh);
1201 SvREFCNT_dec (coro->rouse_cb); 1298 SvREFCNT_dec (coro->rouse_cb);
1202 SvREFCNT_dec (coro->invoke_cb); 1299 SvREFCNT_dec (coro->invoke_cb);
1203 SvREFCNT_dec (coro->invoke_av); 1300 SvREFCNT_dec (coro->invoke_av);
1301 SvREFCNT_dec (coro->on_enter_xs);
1302 SvREFCNT_dec (coro->on_leave_xs);
1204 } 1303 }
1205} 1304}
1206 1305
1207INLINE void 1306ecb_inline void
1208free_coro_mortal (pTHX) 1307free_coro_mortal (pTHX)
1209{ 1308{
1210 if (expect_true (coro_mortal)) 1309 if (ecb_expect_true (coro_mortal))
1211 { 1310 {
1212 SvREFCNT_dec (coro_mortal); 1311 SvREFCNT_dec ((SV *)coro_mortal);
1213 coro_mortal = 0; 1312 coro_mortal = 0;
1214 } 1313 }
1215} 1314}
1216 1315
1217static int 1316static int
… …
1271 1370
1272 if (PL_curcop != &PL_compiling) 1371 if (PL_curcop != &PL_compiling)
1273 { 1372 {
1274 SV **cb; 1373 SV **cb;
1275 1374
1276 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB) 1375 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB && cxstack_ix >= 0)
1277 { 1376 {
1278 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1377 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1279 1378
1280 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1379 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1281 { 1380 {
… …
1350 1449
1351 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1450 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1352} 1451}
1353 1452
1354/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1453/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1355static void NOINLINE 1454static void ecb_noinline
1356cctx_prepare (pTHX) 1455cctx_prepare (pTHX)
1357{ 1456{
1358 PL_top_env = &PL_start_env; 1457 PL_top_env = &PL_start_env;
1359 1458
1360 if (cctx_current->flags & CC_TRACE) 1459 if (cctx_current->flags & CC_TRACE)
… …
1371 slf_frame.prepare = slf_prepare_set_stacklevel; 1470 slf_frame.prepare = slf_prepare_set_stacklevel;
1372 slf_frame.check = slf_check_set_stacklevel; 1471 slf_frame.check = slf_check_set_stacklevel;
1373} 1472}
1374 1473
1375/* the tail of transfer: execute stuff we can only do after a transfer */ 1474/* the tail of transfer: execute stuff we can only do after a transfer */
1376INLINE void 1475ecb_inline void
1377transfer_tail (pTHX) 1476transfer_tail (pTHX)
1378{ 1477{
1379 free_coro_mortal (aTHX); 1478 free_coro_mortal (aTHX);
1479}
1480
1481/* try to exit the same way perl's main function would do */
1482/* we do not bother resetting the environment or other things *7
1483/* that are not, uhm, essential */
1484/* this obviously also doesn't work when perl is embedded */
1485static void ecb_noinline ecb_cold
1486perlish_exit (pTHX)
1487{
1488 int exitstatus = perl_destruct (PL_curinterp);
1489 perl_free (PL_curinterp);
1490 exit (exitstatus);
1380} 1491}
1381 1492
1382/* 1493/*
1383 * this is a _very_ stripped down perl interpreter ;) 1494 * this is a _very_ stripped down perl interpreter ;)
1384 */ 1495 */
… …
1413 */ 1524 */
1414 1525
1415 /* 1526 /*
1416 * If perl-run returns we assume exit() was being called or the coro 1527 * 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) 1528 * 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 1529 * 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" 1530 * 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 */ 1531 */
1424 PL_top_env = main_top_env; 1532 perlish_exit (aTHX);
1425 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1426 } 1533 }
1427} 1534}
1428 1535
1429static coro_cctx * 1536static coro_cctx *
1430cctx_new () 1537cctx_new (void)
1431{ 1538{
1432 coro_cctx *cctx; 1539 coro_cctx *cctx;
1433 1540
1434 ++cctx_count; 1541 ++cctx_count;
1435 New (0, cctx, 1, coro_cctx); 1542 New (0, cctx, 1, coro_cctx);
… …
1441 return cctx; 1548 return cctx;
1442} 1549}
1443 1550
1444/* create a new cctx only suitable as source */ 1551/* create a new cctx only suitable as source */
1445static coro_cctx * 1552static coro_cctx *
1446cctx_new_empty () 1553cctx_new_empty (void)
1447{ 1554{
1448 coro_cctx *cctx = cctx_new (); 1555 coro_cctx *cctx = cctx_new ();
1449 1556
1450 cctx->sptr = 0; 1557 cctx->stack.sptr = 0;
1451 coro_create (&cctx->cctx, 0, 0, 0, 0); 1558 coro_create (&cctx->cctx, 0, 0, 0, 0);
1452 1559
1453 return cctx; 1560 return cctx;
1454} 1561}
1455 1562
1456/* create a new cctx suitable as destination/running a perl interpreter */ 1563/* create a new cctx suitable as destination/running a perl interpreter */
1457static coro_cctx * 1564static coro_cctx *
1458cctx_new_run () 1565cctx_new_run (void)
1459{ 1566{
1460 coro_cctx *cctx = cctx_new (); 1567 coro_cctx *cctx = cctx_new ();
1461 void *stack_start;
1462 size_t stack_size;
1463 1568
1464#if HAVE_MMAP 1569 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 } 1570 {
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."); 1571 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1487 _exit (EXIT_FAILURE); 1572 _exit (EXIT_FAILURE);
1488 }
1489
1490 stack_start = cctx->sptr;
1491 stack_size = cctx->ssize;
1492 } 1573 }
1493 1574
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); 1575 coro_create (&cctx->cctx, cctx_run, (void *)cctx, cctx->stack.sptr, cctx->stack.ssze);
1499 1576
1500 return cctx; 1577 return cctx;
1501} 1578}
1502 1579
1503static void 1580static void
… …
1509 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current)); 1586 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1510 1587
1511 --cctx_count; 1588 --cctx_count;
1512 coro_destroy (&cctx->cctx); 1589 coro_destroy (&cctx->cctx);
1513 1590
1514 /* coro_transfer creates new, empty cctx's */ 1591 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 1592
1529 Safefree (cctx); 1593 Safefree (cctx);
1530} 1594}
1531 1595
1532/* wether this cctx should be destructed */ 1596/* wether this cctx should be destructed */
1533#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE)) 1597#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE))
1534 1598
1535static coro_cctx * 1599static coro_cctx *
1536cctx_get (pTHX) 1600cctx_get (pTHX)
1537{ 1601{
1538 while (expect_true (cctx_first)) 1602 while (ecb_expect_true (cctx_first))
1539 { 1603 {
1540 coro_cctx *cctx = cctx_first; 1604 coro_cctx *cctx = cctx_first;
1541 cctx_first = cctx->next; 1605 cctx_first = cctx->next;
1542 --cctx_idle; 1606 --cctx_idle;
1543 1607
1544 if (expect_true (!CCTX_EXPIRED (cctx))) 1608 if (ecb_expect_true (!CCTX_EXPIRED (cctx)))
1545 return cctx; 1609 return cctx;
1546 1610
1547 cctx_destroy (cctx); 1611 cctx_destroy (cctx);
1548 } 1612 }
1549 1613
… …
1551} 1615}
1552 1616
1553static void 1617static void
1554cctx_put (coro_cctx *cctx) 1618cctx_put (coro_cctx *cctx)
1555{ 1619{
1556 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1620 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->stack.sptr));
1557 1621
1558 /* free another cctx if overlimit */ 1622 /* free another cctx if overlimit */
1559 if (expect_false (cctx_idle >= cctx_max_idle)) 1623 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1560 { 1624 {
1561 coro_cctx *first = cctx_first; 1625 coro_cctx *first = cctx_first;
1562 cctx_first = first->next; 1626 cctx_first = first->next;
1563 --cctx_idle; 1627 --cctx_idle;
1564 1628
… …
1575static void 1639static void
1576transfer_check (pTHX_ struct coro *prev, struct coro *next) 1640transfer_check (pTHX_ struct coro *prev, struct coro *next)
1577{ 1641{
1578 /* TODO: throwing up here is considered harmful */ 1642 /* TODO: throwing up here is considered harmful */
1579 1643
1580 if (expect_true (prev != next)) 1644 if (ecb_expect_true (prev != next))
1581 { 1645 {
1582 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1646 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,"); 1647 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1584 1648
1585 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED))) 1649 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,"); 1650 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1587 1651
1588#if !PERL_VERSION_ATLEAST (5,10,0) 1652#if !PERL_VERSION_ATLEAST (5,10,0)
1589 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1653 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,"); 1654 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1591#endif 1655#endif
1592 } 1656 }
1593} 1657}
1594 1658
1595/* always use the TRANSFER macro */ 1659/* always use the TRANSFER macro */
1596static void NOINLINE /* noinline so we have a fixed stackframe */ 1660static void ecb_noinline /* noinline so we have a fixed stackframe */
1597transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1661transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1598{ 1662{
1599 dSTACKLEVEL; 1663 dSTACKLEVEL;
1600 1664
1601 /* sometimes transfer is only called to set idle_sp */ 1665 /* sometimes transfer is only called to set idle_sp */
1602 if (expect_false (!prev)) 1666 if (ecb_expect_false (!prev))
1603 { 1667 {
1604 cctx_current->idle_sp = STACKLEVEL; 1668 cctx_current->idle_sp = STACKLEVEL;
1605 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1669 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1606 } 1670 }
1607 else if (expect_true (prev != next)) 1671 else if (ecb_expect_true (prev != next))
1608 { 1672 {
1609 coro_cctx *cctx_prev; 1673 coro_cctx *cctx_prev;
1610 1674
1611 if (expect_false (prev->flags & CF_NEW)) 1675 if (ecb_expect_false (prev->flags & CF_NEW))
1612 { 1676 {
1613 /* create a new empty/source context */ 1677 /* create a new empty/source context */
1614 prev->flags &= ~CF_NEW; 1678 prev->flags &= ~CF_NEW;
1615 prev->flags |= CF_RUNNING; 1679 prev->flags |= CF_RUNNING;
1616 } 1680 }
… …
1619 next->flags |= CF_RUNNING; 1683 next->flags |= CF_RUNNING;
1620 1684
1621 /* first get rid of the old state */ 1685 /* first get rid of the old state */
1622 save_perl (aTHX_ prev); 1686 save_perl (aTHX_ prev);
1623 1687
1624 if (expect_false (next->flags & CF_NEW)) 1688 if (ecb_expect_false (next->flags & CF_NEW))
1625 { 1689 {
1626 /* need to start coroutine */ 1690 /* need to start coroutine */
1627 next->flags &= ~CF_NEW; 1691 next->flags &= ~CF_NEW;
1628 /* setup coroutine call */ 1692 /* setup coroutine call */
1629 init_perl (aTHX_ next); 1693 init_perl (aTHX_ next);
1630 } 1694 }
1631 else 1695 else
1632 load_perl (aTHX_ next); 1696 load_perl (aTHX_ next);
1633 1697
1634 /* possibly untie and reuse the cctx */ 1698 /* possibly untie and reuse the cctx */
1635 if (expect_true ( 1699 if (ecb_expect_true (
1636 cctx_current->idle_sp == STACKLEVEL 1700 cctx_current->idle_sp == STACKLEVEL
1637 && !(cctx_current->flags & CC_TRACE) 1701 && !(cctx_current->flags & CC_TRACE)
1638 && !force_cctx 1702 && !force_cctx
1639 )) 1703 ))
1640 { 1704 {
1641 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1705 /* 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)); 1706 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1643 1707
1644 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */ 1708 /* 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 */ 1709 /* without this the next cctx_get might destroy the running cctx while still in use */
1646 if (expect_false (CCTX_EXPIRED (cctx_current))) 1710 if (ecb_expect_false (CCTX_EXPIRED (cctx_current)))
1647 if (expect_true (!next->cctx)) 1711 if (ecb_expect_true (!next->cctx))
1648 next->cctx = cctx_get (aTHX); 1712 next->cctx = cctx_get (aTHX);
1649 1713
1650 cctx_put (cctx_current); 1714 cctx_put (cctx_current);
1651 } 1715 }
1652 else 1716 else
1653 prev->cctx = cctx_current; 1717 prev->cctx = cctx_current;
1654 1718
1655 ++next->usecount; 1719 ++next->usecount;
1656 1720
1657 cctx_prev = cctx_current; 1721 cctx_prev = cctx_current;
1658 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX); 1722 cctx_current = ecb_expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1659 1723
1660 next->cctx = 0; 1724 next->cctx = 0;
1661 1725
1662 if (expect_false (cctx_prev != cctx_current)) 1726 if (ecb_expect_false (cctx_prev != cctx_current))
1663 { 1727 {
1664 cctx_prev->top_env = PL_top_env; 1728 cctx_prev->top_env = PL_top_env;
1665 PL_top_env = cctx_current->top_env; 1729 PL_top_env = cctx_current->top_env;
1666 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx); 1730 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1667 } 1731 }
… …
1673#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx)) 1737#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) 1738#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1675 1739
1676/** high level stuff ********************************************************/ 1740/** high level stuff ********************************************************/
1677 1741
1742/* this function is actually Coro, not Coro::State, but we call it from here */
1743/* because it is convenient - but it hasn't been declared yet for that reason */
1744static void
1745coro_call_on_destroy (pTHX_ struct coro *coro);
1746
1678static void 1747static void
1679coro_state_destroy (pTHX_ struct coro *coro) 1748coro_state_destroy (pTHX_ struct coro *coro)
1680{ 1749{
1681 if (coro->flags & CF_DESTROYED) 1750 if (coro->flags & CF_ZOMBIE)
1682 return; 1751 return;
1683 1752
1684 slf_destroy (aTHX_ coro); 1753 slf_destroy (aTHX_ coro);
1685 1754
1686 coro->flags |= CF_DESTROYED; 1755 coro->flags |= CF_ZOMBIE;
1687 1756
1688 if (coro->flags & CF_READY) 1757 if (coro->flags & CF_READY)
1689 { 1758 {
1690 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1759 /* reduce nready, as destroying a ready coro effectively unreadies it */
1691 /* alternative: look through all ready queues and remove the coro */ 1760 /* alternative: look through all ready queues and remove the coro */
1692 --coro_nready; 1761 --coro_nready;
1693 } 1762 }
1694 else 1763 else
1695 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1764 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1765
1766 if (coro->next) coro->next->prev = coro->prev;
1767 if (coro->prev) coro->prev->next = coro->next;
1768 if (coro == coro_first) coro_first = coro->next;
1696 1769
1697 if (coro->mainstack 1770 if (coro->mainstack
1698 && coro->mainstack != main_mainstack 1771 && coro->mainstack != main_mainstack
1699 && coro->slot 1772 && coro->slot
1700 && !PL_dirty) 1773 && !PL_dirty)
1701 destroy_perl (aTHX_ coro); 1774 destroy_perl (aTHX_ coro);
1702 1775
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); 1776 cctx_destroy (coro->cctx);
1708 SvREFCNT_dec (coro->startcv); 1777 SvREFCNT_dec (coro->startcv);
1709 SvREFCNT_dec (coro->args); 1778 SvREFCNT_dec (coro->args);
1710 SvREFCNT_dec (coro->swap_sv); 1779 SvREFCNT_dec (coro->swap_sv);
1711 SvREFCNT_dec (CORO_THROW); 1780 SvREFCNT_dec (CORO_THROW);
1781
1782 coro_call_on_destroy (aTHX_ coro);
1783
1784 /* more destruction mayhem in coro_state_free */
1712} 1785}
1713 1786
1714static int 1787static int
1715coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1788coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1716{ 1789{
1717 struct coro *coro = (struct coro *)mg->mg_ptr; 1790 struct coro *coro = (struct coro *)mg->mg_ptr;
1718 mg->mg_ptr = 0; 1791 mg->mg_ptr = 0;
1719 1792
1720 coro->hv = 0;
1721
1722 if (--coro->refcnt < 0)
1723 {
1724 coro_state_destroy (aTHX_ coro); 1793 coro_state_destroy (aTHX_ coro);
1794 SvREFCNT_dec (coro->on_destroy);
1795 SvREFCNT_dec (coro->status);
1796
1725 Safefree (coro); 1797 Safefree (coro);
1726 }
1727 1798
1728 return 0; 1799 return 0;
1729} 1800}
1730 1801
1731static int 1802static int ecb_cold
1732coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1803coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1733{ 1804{
1734 struct coro *coro = (struct coro *)mg->mg_ptr; 1805 /* called when perl clones the current process the slow way (windows process emulation) */
1735 1806 /* WE SIMply nuke the pointers in the copy, causing perl to croak */
1736 ++coro->refcnt; 1807 mg->mg_ptr = 0;
1808 mg->mg_virtual = 0;
1737 1809
1738 return 0; 1810 return 0;
1739} 1811}
1740 1812
1741static MGVTBL coro_state_vtbl = { 1813static MGVTBL coro_state_vtbl = {
… …
1766 TRANSFER (ta, 1); 1838 TRANSFER (ta, 1);
1767} 1839}
1768 1840
1769/** Coro ********************************************************************/ 1841/** Coro ********************************************************************/
1770 1842
1771INLINE void 1843ecb_inline void
1772coro_enq (pTHX_ struct coro *coro) 1844coro_enq (pTHX_ struct coro *coro)
1773{ 1845{
1774 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN]; 1846 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1775 1847
1776 SvREFCNT_inc_NN (coro->hv); 1848 SvREFCNT_inc_NN (coro->hv);
… …
1778 coro->next_ready = 0; 1850 coro->next_ready = 0;
1779 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro; 1851 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1780 ready [1] = coro; 1852 ready [1] = coro;
1781} 1853}
1782 1854
1783INLINE struct coro * 1855ecb_inline struct coro *
1784coro_deq (pTHX) 1856coro_deq (pTHX)
1785{ 1857{
1786 int prio; 1858 int prio;
1787 1859
1788 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; ) 1860 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
… …
1841{ 1913{
1842 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1914 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1843} 1915}
1844 1916
1845/* expects to own a reference to next->hv */ 1917/* expects to own a reference to next->hv */
1846INLINE void 1918ecb_inline void
1847prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1919prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1848{ 1920{
1849 SV *prev_sv = SvRV (coro_current); 1921 SV *prev_sv = SvRV (coro_current);
1850 1922
1851 ta->prev = SvSTATE_hv (prev_sv); 1923 ta->prev = SvSTATE_hv (prev_sv);
… …
1864{ 1936{
1865 for (;;) 1937 for (;;)
1866 { 1938 {
1867 struct coro *next = coro_deq (aTHX); 1939 struct coro *next = coro_deq (aTHX);
1868 1940
1869 if (expect_true (next)) 1941 if (ecb_expect_true (next))
1870 { 1942 {
1871 /* cannot transfer to destroyed coros, skip and look for next */ 1943 /* cannot transfer to destroyed coros, skip and look for next */
1872 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED))) 1944 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 */ 1945 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1874 else 1946 else
1875 { 1947 {
1876 next->flags &= ~CF_READY; 1948 next->flags &= ~CF_READY;
1877 --coro_nready; 1949 --coro_nready;
… …
1885 /* nothing to schedule: call the idle handler */ 1957 /* nothing to schedule: call the idle handler */
1886 if (SvROK (sv_idle) 1958 if (SvROK (sv_idle)
1887 && SvOBJECT (SvRV (sv_idle))) 1959 && SvOBJECT (SvRV (sv_idle)))
1888 { 1960 {
1889 if (SvRV (sv_idle) == SvRV (coro_current)) 1961 if (SvRV (sv_idle) == SvRV (coro_current))
1962 {
1963 require_pv ("Carp");
1964
1965 {
1966 dSP;
1967
1968 ENTER;
1969 SAVETMPS;
1970
1971 PUSHMARK (SP);
1890 croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught"); 1972 XPUSHs (sv_2mortal (newSVpv ("FATAL: $Coro::idle blocked itself - did you try to block inside an event loop callback? Caught", 0)));
1973 PUTBACK;
1974 call_pv ("Carp::confess", G_VOID | G_DISCARD);
1975
1976 FREETMPS;
1977 LEAVE;
1978 }
1979 }
1891 1980
1892 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 1981 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1893 api_ready (aTHX_ SvRV (sv_idle)); 1982 api_ready (aTHX_ SvRV (sv_idle));
1894 --coro_nready; 1983 --coro_nready;
1895 } 1984 }
… …
1910 } 1999 }
1911 } 2000 }
1912 } 2001 }
1913} 2002}
1914 2003
1915INLINE void 2004ecb_inline void
1916prepare_cede (pTHX_ struct coro_transfer_args *ta) 2005prepare_cede (pTHX_ struct coro_transfer_args *ta)
1917{ 2006{
1918 api_ready (aTHX_ coro_current); 2007 api_ready (aTHX_ coro_current);
1919 prepare_schedule (aTHX_ ta); 2008 prepare_schedule (aTHX_ ta);
1920} 2009}
1921 2010
1922INLINE void 2011ecb_inline void
1923prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 2012prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1924{ 2013{
1925 SV *prev = SvRV (coro_current); 2014 SV *prev = SvRV (coro_current);
1926 2015
1927 if (coro_nready) 2016 if (coro_nready)
… …
1957{ 2046{
1958 struct coro_transfer_args ta; 2047 struct coro_transfer_args ta;
1959 2048
1960 prepare_cede (aTHX_ &ta); 2049 prepare_cede (aTHX_ &ta);
1961 2050
1962 if (expect_true (ta.prev != ta.next)) 2051 if (ecb_expect_true (ta.prev != ta.next))
1963 { 2052 {
1964 TRANSFER (ta, 1); 2053 TRANSFER (ta, 1);
1965 return 1; 2054 return 1;
1966 } 2055 }
1967 else 2056 else
… …
2010 coro->slot->runops = RUNOPS_DEFAULT; 2099 coro->slot->runops = RUNOPS_DEFAULT;
2011 } 2100 }
2012} 2101}
2013 2102
2014static void 2103static void
2104coro_push_av (pTHX_ AV *av, I32 gimme_v)
2105{
2106 if (AvFILLp (av) >= 0 && gimme_v != G_VOID)
2107 {
2108 dSP;
2109
2110 if (gimme_v == G_SCALAR)
2111 XPUSHs (AvARRAY (av)[AvFILLp (av)]);
2112 else
2113 {
2114 int i;
2115 EXTEND (SP, AvFILLp (av) + 1);
2116
2117 for (i = 0; i <= AvFILLp (av); ++i)
2118 PUSHs (AvARRAY (av)[i]);
2119 }
2120
2121 PUTBACK;
2122 }
2123}
2124
2125static void
2126coro_push_on_destroy (pTHX_ struct coro *coro, SV *cb)
2127{
2128 if (!coro->on_destroy)
2129 coro->on_destroy = newAV ();
2130
2131 av_push (coro->on_destroy, cb);
2132}
2133
2134static void
2135slf_destroy_join (pTHX_ struct CoroSLF *frame)
2136{
2137 SvREFCNT_dec ((SV *)((struct coro *)frame->data)->hv);
2138}
2139
2140static int
2141slf_check_join (pTHX_ struct CoroSLF *frame)
2142{
2143 struct coro *coro = (struct coro *)frame->data;
2144
2145 if (!coro->status)
2146 return 1;
2147
2148 frame->destroy = 0;
2149
2150 coro_push_av (aTHX_ coro->status, GIMME_V);
2151
2152 SvREFCNT_dec ((SV *)coro->hv);
2153
2154 return 0;
2155}
2156
2157static void
2158slf_init_join (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2159{
2160 struct coro *coro = SvSTATE (items > 0 ? arg [0] : &PL_sv_undef);
2161
2162 if (items > 1)
2163 croak ("join called with too many arguments");
2164
2165 if (coro->status)
2166 frame->prepare = prepare_nop;
2167 else
2168 {
2169 coro_push_on_destroy (aTHX_ coro, SvREFCNT_inc_NN (SvRV (coro_current)));
2170 frame->prepare = prepare_schedule;
2171 }
2172
2173 frame->check = slf_check_join;
2174 frame->destroy = slf_destroy_join;
2175 frame->data = (void *)coro;
2176 SvREFCNT_inc (coro->hv);
2177}
2178
2179static void
2015coro_call_on_destroy (pTHX_ struct coro *coro) 2180coro_call_on_destroy (pTHX_ struct coro *coro)
2016{ 2181{
2017 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2182 AV *od = coro->on_destroy;
2018 2183
2019 if (on_destroyp) 2184 if (!od)
2020 { 2185 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 2186
2187 coro->on_destroy = 0;
2188 sv_2mortal ((SV *)od);
2189
2025 while (AvFILLp (on_destroy) >= 0) 2190 while (AvFILLp (od) >= 0)
2191 {
2192 SV *cb = sv_2mortal (av_pop (od));
2193
2194 /* coro hv's (and only hv's at the moment) are supported as well */
2195 if (SvSTATEhv_p (aTHX_ cb))
2196 api_ready (aTHX_ cb);
2197 else
2026 { 2198 {
2027 dSP; /* don't disturb outer sp */ 2199 dSP; /* don't disturb outer sp */
2028 SV *cb = av_pop (on_destroy);
2029
2030 PUSHMARK (SP); 2200 PUSHMARK (SP);
2031 2201
2032 if (statusp) 2202 if (coro->status)
2033 { 2203 {
2034 int i; 2204 PUTBACK;
2035 EXTEND (SP, AvFILLp (status) + 1); 2205 coro_push_av (aTHX_ coro->status, G_ARRAY);
2036 2206 SPAGAIN;
2037 for (i = 0; i <= AvFILLp (status); ++i)
2038 PUSHs (AvARRAY (status)[i]);
2039 } 2207 }
2040 2208
2041 PUTBACK; 2209 PUTBACK;
2042 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD); 2210 call_sv (cb, G_VOID | G_DISCARD);
2043 } 2211 }
2044 } 2212 }
2045} 2213}
2046 2214
2047static void 2215static void
2048coro_set_status (pTHX_ HV *coro_hv, SV **arg, int items) 2216coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
2049{ 2217{
2050 AV *av = newAV (); 2218 AV *av;
2219
2220 if (coro->status)
2221 {
2222 av = coro->status;
2223 av_clear (av);
2224 }
2225 else
2226 av = coro->status = newAV ();
2051 2227
2052 /* items are actually not so common, so optimise for this case */ 2228 /* items are actually not so common, so optimise for this case */
2053 if (items) 2229 if (items)
2054 { 2230 {
2055 int i; 2231 int i;
… …
2057 av_extend (av, items - 1); 2233 av_extend (av, items - 1);
2058 2234
2059 for (i = 0; i < items; ++i) 2235 for (i = 0; i < items; ++i)
2060 av_push (av, SvREFCNT_inc_NN (arg [i])); 2236 av_push (av, SvREFCNT_inc_NN (arg [i]));
2061 } 2237 }
2062
2063 hv_store (coro_hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0);
2064} 2238}
2065 2239
2066static void 2240static void
2067slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv) 2241slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2068{ 2242{
… …
2080static void 2254static void
2081slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2255slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2082{ 2256{
2083 HV *coro_hv = (HV *)SvRV (coro_current); 2257 HV *coro_hv = (HV *)SvRV (coro_current);
2084 2258
2085 coro_set_status (aTHX_ coro_hv, arg, items); 2259 coro_set_status (aTHX_ SvSTATE ((SV *)coro_hv), arg, items);
2086 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv); 2260 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2087} 2261}
2088 2262
2089static void 2263static void
2090slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2264slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
… …
2096 croak ("Coro::cancel called without coro object,"); 2270 croak ("Coro::cancel called without coro object,");
2097 2271
2098 coro = SvSTATE (arg [0]); 2272 coro = SvSTATE (arg [0]);
2099 coro_hv = coro->hv; 2273 coro_hv = coro->hv;
2100 2274
2101 coro_set_status (aTHX_ coro_hv, arg + 1, items - 1); 2275 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2102 2276
2103 if (expect_false (coro->flags & CF_NOCANCEL)) 2277 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2104 { 2278 {
2105 /* coro currently busy cancelling something, so just notify it */ 2279 /* coro currently busy cancelling something, so just notify it */
2106 coro->slf_frame.data = (void *)coro; 2280 coro->slf_frame.data = (void *)coro;
2107 2281
2108 frame->prepare = prepare_nop; 2282 frame->prepare = prepare_nop;
… …
2114 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv); 2288 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2115 } 2289 }
2116 else 2290 else
2117 { 2291 {
2118 struct coro *self = SvSTATE_current; 2292 struct coro *self = SvSTATE_current;
2293
2294 if (!self)
2295 croak ("Coro::cancel called outside of thread content,");
2119 2296
2120 /* otherwise we cancel directly, purely for speed reasons 2297 /* otherwise we cancel directly, purely for speed reasons
2121 * unfortunately, this requires some magic trickery, as 2298 * unfortunately, this requires some magic trickery, as
2122 * somebody else could cancel us, so we have to fight the cancellation. 2299 * somebody else could cancel us, so we have to fight the cancellation.
2123 * this is ugly, and hopefully fully worth the extra speed. 2300 * this is ugly, and hopefully fully worth the extra speed.
2124 * besides, I can't get the slow-but-safe version working... 2301 * besides, I can't get the slow-but-safe version working...
2125 */ 2302 */
2126 slf_frame.data = 0; 2303 slf_frame.data = 0;
2127 self->flags |= CF_NOCANCEL; 2304 self->flags |= CF_NOCANCEL;
2128
2129 coro_state_destroy (aTHX_ coro); 2305 coro_state_destroy (aTHX_ coro);
2130 coro_call_on_destroy (aTHX_ coro);
2131
2132 self->flags &= ~CF_NOCANCEL; 2306 self->flags &= ~CF_NOCANCEL;
2133 2307
2134 if (slf_frame.data) 2308 if (slf_frame.data)
2135 { 2309 {
2136 /* while we were busy we have been cancelled, so terminate */ 2310 /* while we were busy we have been cancelled, so terminate */
… …
2161 if (coro->cctx) 2335 if (coro->cctx)
2162 croak ("coro inside C callback, unable to cancel at this time, caught"); 2336 croak ("coro inside C callback, unable to cancel at this time, caught");
2163 2337
2164 if (coro->flags & CF_NEW) 2338 if (coro->flags & CF_NEW)
2165 { 2339 {
2166 coro_set_status (aTHX_ coro->hv, arg, items); 2340 coro_set_status (aTHX_ coro, arg, items);
2167 coro_state_destroy (aTHX_ coro); 2341 coro_state_destroy (aTHX_ coro);
2168 coro_call_on_destroy (aTHX_ coro);
2169 } 2342 }
2170 else 2343 else
2171 { 2344 {
2172 if (!coro->slf_frame.prepare) 2345 if (!coro->slf_frame.prepare)
2173 croak ("coro outside an SLF function, unable to cancel at this time, caught"); 2346 croak ("coro outside an SLF function, unable to cancel at this time, caught");
2174 2347
2175 slf_destroy (aTHX_ coro); 2348 slf_destroy (aTHX_ coro);
2176 2349
2177 coro_set_status (aTHX_ coro->hv, arg, items); 2350 coro_set_status (aTHX_ coro, arg, items);
2178 coro->slf_frame.prepare = prepare_nop; 2351 coro->slf_frame.prepare = prepare_nop;
2179 coro->slf_frame.check = slf_check_safe_cancel; 2352 coro->slf_frame.check = slf_check_safe_cancel;
2180 2353
2181 api_ready (aTHX_ coro->hv); 2354 api_ready (aTHX_ (SV *)coro->hv);
2182 } 2355 }
2183 2356
2184 return 1; 2357 return 1;
2185} 2358}
2186 2359
… …
2220slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2393slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2221{ 2394{
2222 HV *hv = (HV *)SvRV (coro_current); 2395 HV *hv = (HV *)SvRV (coro_current);
2223 struct coro *coro = SvSTATE_hv ((SV *)hv); 2396 struct coro *coro = SvSTATE_hv ((SV *)hv);
2224 2397
2225 if (expect_true (coro->saved_deffh)) 2398 if (ecb_expect_true (coro->saved_deffh))
2226 { 2399 {
2227 /* subsequent iteration */ 2400 /* subsequent iteration */
2228 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2401 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
2229 coro->saved_deffh = 0; 2402 coro->saved_deffh = 0;
2230 2403
… …
2290 2463
2291static int 2464static int
2292slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2465slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
2293{ 2466{
2294 SV *data = (SV *)frame->data; 2467 SV *data = (SV *)frame->data;
2295 2468
2296 if (CORO_THROW) 2469 if (CORO_THROW)
2297 return 0; 2470 return 0;
2298 2471
2299 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2472 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2300 return 1; 2473 return 1;
… …
2336 cb = sv_2mortal (coro->rouse_cb); 2509 cb = sv_2mortal (coro->rouse_cb);
2337 coro->rouse_cb = 0; 2510 coro->rouse_cb = 0;
2338 } 2511 }
2339 2512
2340 if (!SvROK (cb) 2513 if (!SvROK (cb)
2341 || SvTYPE (SvRV (cb)) != SVt_PVCV 2514 || SvTYPE (SvRV (cb)) != SVt_PVCV
2342 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2515 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2343 croak ("Coro::rouse_wait called with illegal callback argument,"); 2516 croak ("Coro::rouse_wait called with illegal callback argument,");
2344 2517
2345 { 2518 {
2346 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */ 2519 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
… …
2469 2642
2470/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */ 2643/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2471static void 2644static void
2472slf_destroy (pTHX_ struct coro *coro) 2645slf_destroy (pTHX_ struct coro *coro)
2473{ 2646{
2474 /* this callback is reserved for slf functions needing to do cleanup */ 2647 struct CoroSLF frame = coro->slf_frame;
2475 if (coro->slf_frame.destroy && coro->slf_frame.prepare && !PL_dirty)
2476 coro->slf_frame.destroy (aTHX_ coro);
2477 2648
2478 /* 2649 /*
2479 * The on_destroy above most likely is from an SLF call. 2650 * The on_destroy below most likely is from an SLF call.
2480 * Since by definition the SLF call will not finish when we destroy 2651 * Since by definition the SLF call will not finish when we destroy
2481 * the coro, we will have to force-finish it here, otherwise 2652 * the coro, we will have to force-finish it here, otherwise
2482 * cleanup functions cannot call SLF functions. 2653 * cleanup functions cannot call SLF functions.
2483 */ 2654 */
2484 coro->slf_frame.prepare = 0; 2655 coro->slf_frame.prepare = 0;
2656
2657 /* this callback is reserved for slf functions needing to do cleanup */
2658 if (frame.destroy && frame.prepare && !PL_dirty)
2659 frame.destroy (aTHX_ &frame);
2485} 2660}
2486 2661
2487/* 2662/*
2488 * these not obviously related functions are all rolled into one 2663 * these not obviously related functions are all rolled into one
2489 * function to increase chances that they all will call transfer with the same 2664 * function to increase chances that they all will call transfer with the same
… …
2496 I32 checkmark; /* mark SP to see how many elements check has pushed */ 2671 I32 checkmark; /* mark SP to see how many elements check has pushed */
2497 2672
2498 /* set up the slf frame, unless it has already been set-up */ 2673 /* set up the slf frame, unless it has already been set-up */
2499 /* the latter happens when a new coro has been started */ 2674 /* the latter happens when a new coro has been started */
2500 /* or when a new cctx was attached to an existing coroutine */ 2675 /* or when a new cctx was attached to an existing coroutine */
2501 if (expect_true (!slf_frame.prepare)) 2676 if (ecb_expect_true (!slf_frame.prepare))
2502 { 2677 {
2503 /* first iteration */ 2678 /* first iteration */
2504 dSP; 2679 dSP;
2505 SV **arg = PL_stack_base + TOPMARK + 1; 2680 SV **arg = PL_stack_base + TOPMARK + 1;
2506 int items = SP - arg; /* args without function object */ 2681 int items = SP - arg; /* args without function object */
… …
2547 while (slf_frame.check (aTHX_ &slf_frame)); 2722 while (slf_frame.check (aTHX_ &slf_frame));
2548 2723
2549 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */ 2724 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */
2550 2725
2551 /* exception handling */ 2726 /* exception handling */
2552 if (expect_false (CORO_THROW)) 2727 if (ecb_expect_false (CORO_THROW))
2553 { 2728 {
2554 SV *exception = sv_2mortal (CORO_THROW); 2729 SV *exception = sv_2mortal (CORO_THROW);
2555 2730
2556 CORO_THROW = 0; 2731 CORO_THROW = 0;
2557 sv_setsv (ERRSV, exception); 2732 sv_setsv (ERRSV, exception);
2558 croak (0); 2733 croak (0);
2559 } 2734 }
2560 2735
2561 /* return value handling - mostly like entersub */ 2736 /* return value handling - mostly like entersub */
2562 /* make sure we put something on the stack in scalar context */ 2737 /* make sure we put something on the stack in scalar context */
2563 if (GIMME_V == G_SCALAR) 2738 if (GIMME_V == G_SCALAR
2739 && ecb_expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2564 { 2740 {
2565 dSP; 2741 dSP;
2566 SV **bot = PL_stack_base + checkmark; 2742 SV **bot = PL_stack_base + checkmark;
2567 2743
2568 if (sp == bot) /* too few, push undef */ 2744 if (sp == bot) /* too few, push undef */
2569 bot [1] = &PL_sv_undef; 2745 bot [1] = &PL_sv_undef;
2570 else if (sp != bot + 1) /* too many, take last one */ 2746 else /* too many, take last one */
2571 bot [1] = *sp; 2747 bot [1] = *sp;
2572 2748
2573 SP = bot + 1; 2749 SP = bot + 1;
2574 2750
2575 PUTBACK; 2751 PUTBACK;
… …
2673{ 2849{
2674 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave); 2850 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2675 on_enterleave_call (aTHX_ sv_2mortal (cb)); 2851 on_enterleave_call (aTHX_ sv_2mortal (cb));
2676} 2852}
2677 2853
2854static void
2855enterleave_hook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, void *arg)
2856{
2857 if (!hook)
2858 return;
2859
2860 if (!*avp)
2861 {
2862 *avp = newAV ();
2863 AvREAL_off (*avp);
2864 }
2865
2866 av_push (*avp, (SV *)hook);
2867 av_push (*avp, (SV *)arg);
2868}
2869
2870static void
2871enterleave_unhook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, int execute)
2872{
2873 AV *av = *avp;
2874 int i;
2875
2876 if (!av)
2877 return;
2878
2879 for (i = AvFILLp (av) - 1; i >= 0; i -= 2)
2880 if (AvARRAY (av)[i] == (SV *)hook)
2881 {
2882 if (execute)
2883 hook ((void *)AvARRAY (av)[i + 1]);
2884
2885 memmove (AvARRAY (av) + i, AvARRAY (av) + i + 2, AvFILLp (av) - i - 1);
2886 av_pop (av);
2887 av_pop (av);
2888 break;
2889 }
2890
2891 if (AvFILLp (av) >= 0)
2892 {
2893 *avp = 0;
2894 SvREFCNT_dec_NN (av);
2895 }
2896}
2897
2898static void
2899api_enterleave_hook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2900{
2901 struct coro *coro = SvSTATE (coro_sv);
2902
2903 if (SvSTATE_current == coro)
2904 if (enter)
2905 enter (aTHX enter_arg);
2906
2907 enterleave_hook_xs (aTHX_ coro, &coro->on_enter_xs, enter, enter_arg);
2908 enterleave_hook_xs (aTHX_ coro, &coro->on_leave_xs, leave, leave_arg);
2909}
2910
2911static void
2912api_enterleave_unhook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, coro_enterleave_hook leave)
2913{
2914 struct coro *coro = SvSTATE (coro_sv);
2915
2916 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2917 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, SvSTATE_current == coro);
2918}
2919
2920static void
2921savedestructor_unhook_enter (pTHX_ coro_enterleave_hook enter)
2922{
2923 struct coro *coro = SvSTATE_current;
2924
2925 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2926}
2927
2928static void
2929savedestructor_unhook_leave (pTHX_ coro_enterleave_hook leave)
2930{
2931 struct coro *coro = SvSTATE_current;
2932
2933 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, 1);
2934}
2935
2936static void
2937api_enterleave_scope_hook (pTHX_ coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2938{
2939 api_enterleave_hook (aTHX_ coro_current, enter, enter_arg, leave, leave_arg);
2940
2941 /* this ought to be much cheaper than malloc + a single destructor call */
2942 if (enter) SAVEDESTRUCTOR_X (savedestructor_unhook_enter, enter);
2943 if (leave) SAVEDESTRUCTOR_X (savedestructor_unhook_leave, leave);
2944}
2945
2678/*****************************************************************************/ 2946/*****************************************************************************/
2679/* PerlIO::cede */ 2947/* PerlIO::cede */
2680 2948
2681typedef struct 2949typedef struct
2682{ 2950{
2683 PerlIOBuf base; 2951 PerlIOBuf base;
2684 NV next, every; 2952 NV next, every;
2685} PerlIOCede; 2953} PerlIOCede;
2686 2954
2687static IV 2955static IV ecb_cold
2688PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab) 2956PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab)
2689{ 2957{
2690 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2958 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2691 2959
2692 self->every = SvCUR (arg) ? SvNV (arg) : 0.01; 2960 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
2693 self->next = nvtime () + self->every; 2961 self->next = nvtime () + self->every;
2694 2962
2695 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab); 2963 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
2696} 2964}
2697 2965
2698static SV * 2966static SV * ecb_cold
2699PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags) 2967PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
2700{ 2968{
2701 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2969 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2702 2970
2703 return newSVnv (self->every); 2971 return newSVnv (self->every);
… …
2810 XPUSHs (sv_2mortal (newRV_inc ((SV *)av))); 3078 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2811 PUTBACK; 3079 PUTBACK;
2812 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR); 3080 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2813 } 3081 }
2814 3082
2815 SvREFCNT_dec (cb); 3083 SvREFCNT_dec_NN (cb);
2816 } 3084 }
2817} 3085}
2818 3086
2819static void 3087static void
2820coro_semaphore_destroy (pTHX_ struct coro *coro) 3088coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2821{ 3089{
2822 /* call $sem->adjust (0) to possibly wake up some other waiters */ 3090 /* call $sem->adjust (0) to possibly wake up some other waiters */
2823 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 3091 coro_semaphore_adjust (aTHX_ (AV *)frame->data, 0);
2824} 3092}
2825 3093
2826static int 3094static int
2827slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire) 3095slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2828{ 3096{
2829 AV *av = (AV *)frame->data; 3097 AV *av = (AV *)frame->data;
2830 SV *count_sv = AvARRAY (av)[0]; 3098 SV *count_sv = AvARRAY (av)[0];
3099 SV *coro_hv = SvRV (coro_current);
3100
3101 frame->destroy = 0;
2831 3102
2832 /* if we are about to throw, don't actually acquire the lock, just throw */ 3103 /* if we are about to throw, don't actually acquire the lock, just throw */
2833 if (CORO_THROW) 3104 if (ecb_expect_false (CORO_THROW))
3105 {
3106 /* we still might be responsible for the semaphore, so wake up others */
3107 coro_semaphore_adjust (aTHX_ av, 0);
3108
2834 return 0; 3109 return 0;
3110 }
2835 else if (SvIVX (count_sv) > 0) 3111 else if (SvIVX (count_sv) > 0)
2836 { 3112 {
2837 frame->destroy = 0;
2838
2839 if (acquire) 3113 if (acquire)
2840 SvIVX (count_sv) = SvIVX (count_sv) - 1; 3114 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2841 else 3115 else
2842 coro_semaphore_adjust (aTHX_ av, 0); 3116 coro_semaphore_adjust (aTHX_ av, 0);
2843 3117
… …
2847 { 3121 {
2848 int i; 3122 int i;
2849 /* if we were woken up but can't down, we look through the whole */ 3123 /* 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 */ 3124 /* waiters list and only add us if we aren't in there already */
2851 /* this avoids some degenerate memory usage cases */ 3125 /* this avoids some degenerate memory usage cases */
2852 3126 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)) 3127 if (AvARRAY (av)[i] == coro_hv)
2855 return 1; 3128 return 1;
2856 3129
2857 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3130 av_push (av, SvREFCNT_inc (coro_hv));
2858 return 1; 3131 return 1;
2859 } 3132 }
2860} 3133}
2861 3134
2862static int 3135static int
… …
2955 { 3228 {
2956 api_ready (aTHX_ cb); 3229 api_ready (aTHX_ cb);
2957 sv_setiv (cb, 0); /* signal waiter */ 3230 sv_setiv (cb, 0); /* signal waiter */
2958 } 3231 }
2959 3232
2960 SvREFCNT_dec (cb); 3233 SvREFCNT_dec_NN (cb);
2961 3234
2962 --count; 3235 --count;
2963 } 3236 }
2964} 3237}
2965 3238
… …
3050 } 3323 }
3051 3324
3052 av_push (state, data_sv); 3325 av_push (state, data_sv);
3053 3326
3054 api_ready (aTHX_ coro); 3327 api_ready (aTHX_ coro);
3055 SvREFCNT_dec (coro); 3328 SvREFCNT_dec_NN (coro);
3056 SvREFCNT_dec ((AV *)state); 3329 SvREFCNT_dec_NN ((AV *)state);
3057} 3330}
3058 3331
3059static int 3332static int
3060slf_check_aio_req (pTHX_ struct CoroSLF *frame) 3333slf_check_aio_req (pTHX_ struct CoroSLF *frame)
3061{ 3334{
… …
3066 /* it quickly returns */ 3339 /* it quickly returns */
3067 if (CORO_THROW) 3340 if (CORO_THROW)
3068 return 0; 3341 return 0;
3069 3342
3070 /* one element that is an RV? repeat! */ 3343 /* one element that is an RV? repeat! */
3071 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0])) 3344 if (AvFILLp (state) == 0 && SvTYPE (AvARRAY (state)[0]) != SVt_PV)
3072 return 1; 3345 return 1;
3073 3346
3074 /* restore status */ 3347 /* restore status */
3075 { 3348 {
3076 SV *data_sv = av_pop (state); 3349 SV *data_sv = av_pop (state);
… …
3079 errno = data->errorno; 3352 errno = data->errorno;
3080 PL_laststype = data->laststype; 3353 PL_laststype = data->laststype;
3081 PL_laststatval = data->laststatval; 3354 PL_laststatval = data->laststatval;
3082 PL_statcache = data->statcache; 3355 PL_statcache = data->statcache;
3083 3356
3084 SvREFCNT_dec (data_sv); 3357 SvREFCNT_dec_NN (data_sv);
3085 } 3358 }
3086 3359
3087 /* push result values */ 3360 /* push result values */
3088 { 3361 {
3089 dSP; 3362 dSP;
… …
3115 dSP; 3388 dSP;
3116 3389
3117 static SV *prio_cv; 3390 static SV *prio_cv;
3118 static SV *prio_sv; 3391 static SV *prio_sv;
3119 3392
3120 if (expect_false (!prio_cv)) 3393 if (ecb_expect_false (!prio_cv))
3121 { 3394 {
3122 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0); 3395 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0);
3123 prio_sv = newSViv (0); 3396 prio_sv = newSViv (0);
3124 } 3397 }
3125 3398
… …
3231 } 3504 }
3232 3505
3233 return coro_sv; 3506 return coro_sv;
3234} 3507}
3235 3508
3509#ifndef __cplusplus
3510ecb_cold XS(boot_Coro__State);
3511#endif
3512
3513#if CORO_JIT
3514
3515static void ecb_noinline ecb_cold
3516pushav_4uv (pTHX_ UV a, UV b, UV c, UV d)
3517{
3518 dSP;
3519 AV *av = newAV ();
3520
3521 av_store (av, 3, newSVuv (d));
3522 av_store (av, 2, newSVuv (c));
3523 av_store (av, 1, newSVuv (b));
3524 av_store (av, 0, newSVuv (a));
3525
3526 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
3527
3528 PUTBACK;
3529}
3530
3531static void ecb_noinline ecb_cold
3532jit_init (pTHX)
3533{
3534 dSP;
3535 SV *load, *save;
3536 char *map_base;
3537 char *load_ptr, *save_ptr;
3538 STRLEN load_len, save_len, map_len;
3539 int count;
3540
3541 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3542
3543 PUSHMARK (SP);
3544 #define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type));
3545 #include "state.h"
3546 count = call_pv ("Coro::State::_jit", G_ARRAY);
3547 SPAGAIN;
3548
3549 save = POPs; save_ptr = SvPVbyte (save, save_len);
3550 load = POPs; load_ptr = SvPVbyte (load, load_len);
3551
3552 map_len = load_len + save_len + 16;
3553
3554 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3555
3556 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3557
3558 load_perl_slots = (load_save_perl_slots_type)map_base;
3559 memcpy (map_base, load_ptr, load_len);
3560
3561 map_base += (load_len + 15) & ~15;
3562
3563 save_perl_slots = (load_save_perl_slots_type)map_base;
3564 memcpy (map_base, save_ptr, save_len);
3565
3566 /* we are good citizens and try to make the page read-only, so the evil evil */
3567 /* hackers might have it a bit more difficult */
3568 mprotect (map_base, map_len, PROT_READ | PROT_EXEC);
3569
3570 PUTBACK;
3571 eval_pv ("undef &Coro::State::_jit", 1);
3572}
3573
3574#endif
3575
3236MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3576MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
3237 3577
3238PROTOTYPES: DISABLE 3578PROTOTYPES: DISABLE
3239 3579
3240BOOT: 3580BOOT:
3241{ 3581{
3582#define VARx(name,expr,type) if (sizeof (type) < sizeof (expr)) croak ("FATAL: Coro thread context slot '" # name "' too small for this version of perl.");
3583#include "state.h"
3242#ifdef USE_ITHREADS 3584#ifdef USE_ITHREADS
3243# if CORO_PTHREAD 3585# if CORO_PTHREAD
3244 coro_thx = PERL_GET_CONTEXT; 3586 coro_thx = PERL_GET_CONTEXT;
3245# endif 3587# endif
3246#endif 3588#endif
3247 BOOT_PAGESIZE; 3589 /* perl defines these to check for existance first, but why it doesn't */
3590 /* just create them one at init time is not clear to me, except for */
3591 /* programs trying to delete them, but... */
3592 /* anyway, we declare this as invalid and make sure they are initialised here */
3593 DEFSV;
3594 ERRSV;
3248 3595
3249 cctx_current = cctx_new_empty (); 3596 cctx_current = cctx_new_empty ();
3250 3597
3251 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3598 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
3252 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3599 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
… …
3295 coroapi.prepare_cede_notself = prepare_cede_notself; 3642 coroapi.prepare_cede_notself = prepare_cede_notself;
3296 3643
3297 time_init (aTHX); 3644 time_init (aTHX);
3298 3645
3299 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL)); 3646 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3647#if CORO_JIT
3648 PUTBACK;
3649 jit_init (aTHX);
3650 SPAGAIN;
3651#endif
3300} 3652}
3301 3653
3302SV * 3654SV *
3303new (SV *klass, ...) 3655new (SV *klass, ...)
3304 ALIAS: 3656 ALIAS:
… …
3311void 3663void
3312transfer (...) 3664transfer (...)
3313 PROTOTYPE: $$ 3665 PROTOTYPE: $$
3314 CODE: 3666 CODE:
3315 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3667 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3316
3317void
3318_exit (int code)
3319 PROTOTYPE: $
3320 CODE:
3321 _exit (code);
3322 3668
3323SV * 3669SV *
3324clone (Coro::State coro) 3670clone (Coro::State coro)
3325 CODE: 3671 CODE:
3326{ 3672{
… …
3381void 3727void
3382list () 3728list ()
3383 PROTOTYPE: 3729 PROTOTYPE:
3384 PPCODE: 3730 PPCODE:
3385{ 3731{
3386 struct coro *coro; 3732 struct coro *coro;
3387 for (coro = coro_first; coro; coro = coro->next) 3733 for (coro = coro_first; coro; coro = coro->next)
3388 if (coro->hv) 3734 if (coro->hv)
3389 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 3735 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
3390} 3736}
3391 3737
… …
3446 PROTOTYPE: $ 3792 PROTOTYPE: $
3447 ALIAS: 3793 ALIAS:
3448 is_ready = CF_READY 3794 is_ready = CF_READY
3449 is_running = CF_RUNNING 3795 is_running = CF_RUNNING
3450 is_new = CF_NEW 3796 is_new = CF_NEW
3451 is_destroyed = CF_DESTROYED 3797 is_destroyed = CF_ZOMBIE
3798 is_zombie = CF_ZOMBIE
3452 is_suspended = CF_SUSPENDED 3799 is_suspended = CF_SUSPENDED
3453 CODE: 3800 CODE:
3454 RETVAL = boolSV (coro->flags & ix); 3801 RETVAL = boolSV (coro->flags & ix);
3455 OUTPUT: 3802 OUTPUT:
3456 RETVAL 3803 RETVAL
3457 3804
3458void 3805void
3459throw (Coro::State self, SV *exception = &PL_sv_undef) 3806throw (SV *self, SV *exception = &PL_sv_undef)
3460 PROTOTYPE: $;$ 3807 PROTOTYPE: $;$
3461 CODE: 3808 CODE:
3462{ 3809{
3810 struct coro *coro = SvSTATE (self);
3463 struct coro *current = SvSTATE_current; 3811 struct coro *current = SvSTATE_current;
3464 SV **exceptionp = self == current ? &CORO_THROW : &self->except; 3812 SV **exceptionp = coro == current ? &CORO_THROW : &coro->except;
3465 SvREFCNT_dec (*exceptionp); 3813 SvREFCNT_dec (*exceptionp);
3466 SvGETMAGIC (exception); 3814 SvGETMAGIC (exception);
3467 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0; 3815 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3816
3817 api_ready (aTHX_ self);
3468} 3818}
3469 3819
3470void 3820void
3471api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3821api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3472 PROTOTYPE: $;$ 3822 PROTOTYPE: $;$
… …
3549 3899
3550void 3900void
3551times (Coro::State self) 3901times (Coro::State self)
3552 PPCODE: 3902 PPCODE:
3553{ 3903{
3554 struct coro *current = SvSTATE (coro_current); 3904 struct coro *current = SvSTATE (coro_current);
3555 3905
3556 if (expect_false (current == self)) 3906 if (ecb_expect_false (current == self))
3557 { 3907 {
3558 coro_times_update (); 3908 coro_times_update ();
3559 coro_times_add (SvSTATE (coro_current)); 3909 coro_times_add (SvSTATE (coro_current));
3560 } 3910 }
3561 3911
3562 EXTEND (SP, 2); 3912 EXTEND (SP, 2);
3563 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9))); 3913 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))); 3914 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3565 3915
3566 if (expect_false (current == self)) 3916 if (ecb_expect_false (current == self))
3567 coro_times_sub (SvSTATE (coro_current)); 3917 coro_times_sub (SvSTATE (coro_current));
3568} 3918}
3569 3919
3570void 3920void
3571swap_sv (Coro::State coro, SV *sv, SV *swapsv) 3921swap_sv (Coro::State coro, SV *sv, SV *swapsv)
… …
3602 3952
3603 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3953 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); 3954 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); 3955 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 */ 3956 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3607 3957
3608 coro_stash = gv_stashpv ("Coro", TRUE); 3958 coro_stash = gv_stashpv ("Coro", TRUE);
3609 3959
3610 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 3960 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3611 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 3961 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3612 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL)); 3962 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
… …
3624 coroapi.ready = api_ready; 3974 coroapi.ready = api_ready;
3625 coroapi.is_ready = api_is_ready; 3975 coroapi.is_ready = api_is_ready;
3626 coroapi.nready = coro_nready; 3976 coroapi.nready = coro_nready;
3627 coroapi.current = coro_current; 3977 coroapi.current = coro_current;
3628 3978
3979 coroapi.enterleave_hook = api_enterleave_hook;
3980 coroapi.enterleave_unhook = api_enterleave_unhook;
3981 coroapi.enterleave_scope_hook = api_enterleave_scope_hook;
3982
3629 /*GCoroAPI = &coroapi;*/ 3983 /*GCoroAPI = &coroapi;*/
3630 sv_setiv (sv, (IV)&coroapi); 3984 sv_setiv (sv, (IV)&coroapi);
3631 SvREADONLY_on (sv); 3985 SvREADONLY_on (sv);
3632 } 3986 }
3633} 3987}
… …
3644void 3998void
3645_destroy (Coro::State coro) 3999_destroy (Coro::State coro)
3646 CODE: 4000 CODE:
3647 /* used by the manager thread */ 4001 /* used by the manager thread */
3648 coro_state_destroy (aTHX_ coro); 4002 coro_state_destroy (aTHX_ coro);
4003
4004void
4005on_destroy (Coro::State coro, SV *cb)
4006 CODE:
3649 coro_call_on_destroy (aTHX_ coro); 4007 coro_push_on_destroy (aTHX_ coro, newSVsv (cb));
4008
4009void
4010join (...)
4011 CODE:
4012 CORO_EXECUTE_SLF_XS (slf_init_join);
3650 4013
3651void 4014void
3652terminate (...) 4015terminate (...)
3653 CODE: 4016 CODE:
3654 CORO_EXECUTE_SLF_XS (slf_init_terminate); 4017 CORO_EXECUTE_SLF_XS (slf_init_terminate);
… …
3689 4052
3690void 4053void
3691_set_current (SV *current) 4054_set_current (SV *current)
3692 PROTOTYPE: $ 4055 PROTOTYPE: $
3693 CODE: 4056 CODE:
3694 SvREFCNT_dec (SvRV (coro_current)); 4057 SvREFCNT_dec_NN (SvRV (coro_current));
3695 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current))); 4058 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
3696 4059
3697void 4060void
3698_set_readyhook (SV *hook) 4061_set_readyhook (SV *hook)
3699 PROTOTYPE: $ 4062 PROTOTYPE: $
… …
3783 4146
3784 if ((SV *)hv == &PL_sv_undef) 4147 if ((SV *)hv == &PL_sv_undef)
3785 { 4148 {
3786 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1); 4149 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3787 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv)); 4150 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
3788 SvREFCNT_dec (sv); 4151 SvREFCNT_dec_NN (sv);
3789 } 4152 }
3790 4153
3791 { 4154 {
3792 struct coro *coro = SvSTATE_hv (hv); 4155 struct coro *coro = SvSTATE_hv (hv);
3793 4156
… …
3800 api_ready (aTHX_ (SV *)hv); 4163 api_ready (aTHX_ (SV *)hv);
3801 4164
3802 if (GIMME_V != G_VOID) 4165 if (GIMME_V != G_VOID)
3803 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 4166 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
3804 else 4167 else
3805 SvREFCNT_dec (hv); 4168 SvREFCNT_dec_NN (hv);
3806} 4169}
3807 4170
3808SV * 4171SV *
3809rouse_cb () 4172rouse_cb ()
3810 PROTOTYPE: 4173 PROTOTYPE:
… …
3825 on_leave = 1 4188 on_leave = 1
3826 PROTOTYPE: & 4189 PROTOTYPE: &
3827 CODE: 4190 CODE:
3828{ 4191{
3829 struct coro *coro = SvSTATE_current; 4192 struct coro *coro = SvSTATE_current;
3830 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 4193 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3831 4194
3832 block = s_get_cv_croak (block); 4195 block = s_get_cv_croak (block);
3833 4196
3834 if (!*avp) 4197 if (!*avp)
3835 *avp = newAV (); 4198 *avp = newAV ();
… …
3855 4218
3856SV * 4219SV *
3857new (SV *klass, SV *count = 0) 4220new (SV *klass, SV *count = 0)
3858 CODE: 4221 CODE:
3859{ 4222{
3860 int semcnt = 1; 4223 int semcnt = 1;
3861 4224
3862 if (count) 4225 if (count)
3863 { 4226 {
3864 SvGETMAGIC (count); 4227 SvGETMAGIC (count);
3865 4228
… …
3925 XSRETURN_NO; 4288 XSRETURN_NO;
3926} 4289}
3927 4290
3928void 4291void
3929waiters (SV *self) 4292waiters (SV *self)
3930 PPCODE: 4293 PPCODE:
3931{ 4294{
3932 AV *av = (AV *)SvRV (self); 4295 AV *av = (AV *)SvRV (self);
3933 int wcount = AvFILLp (av) + 1 - 1; 4296 int wcount = AvFILLp (av) + 1 - 1;
3934 4297
3935 if (GIMME_V == G_SCALAR) 4298 if (GIMME_V == G_SCALAR)
… …
3944} 4307}
3945 4308
3946MODULE = Coro::State PACKAGE = Coro::SemaphoreSet 4309MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3947 4310
3948void 4311void
3949_may_delete (SV *sem, int count, int extra_refs) 4312_may_delete (SV *sem, int count, unsigned int extra_refs)
3950 PPCODE: 4313 PPCODE:
3951{ 4314{
3952 AV *av = (AV *)SvRV (sem); 4315 AV *av = (AV *)SvRV (sem);
3953 4316
3954 if (SvREFCNT ((SV *)av) == 1 + extra_refs 4317 if (SvREFCNT ((SV *)av) == 1 + extra_refs
3955 && AvFILLp (av) == 0 /* no waiters, just count */ 4318 && AvFILLp (av) == 0 /* no waiters, just count */
3956 && SvIV (AvARRAY (av)[0]) == count) 4319 && SvIV (AvARRAY (av)[0]) == count)
3957 XSRETURN_YES; 4320 XSRETURN_YES;
… …
3978 4341
3979void 4342void
3980broadcast (SV *self) 4343broadcast (SV *self)
3981 CODE: 4344 CODE:
3982{ 4345{
3983 AV *av = (AV *)SvRV (self); 4346 AV *av = (AV *)SvRV (self);
3984 coro_signal_wake (aTHX_ av, AvFILLp (av)); 4347 coro_signal_wake (aTHX_ av, AvFILLp (av));
3985} 4348}
3986 4349
3987void 4350void
3988send (SV *self) 4351send (SV *self)
… …
3996 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */ 4359 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
3997} 4360}
3998 4361
3999IV 4362IV
4000awaited (SV *self) 4363awaited (SV *self)
4001 CODE: 4364 CODE:
4002 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1; 4365 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
4003 OUTPUT: 4366 OUTPUT:
4004 RETVAL 4367 RETVAL
4005 4368
4006 4369
… …
4011 4374
4012void 4375void
4013_schedule (...) 4376_schedule (...)
4014 CODE: 4377 CODE:
4015{ 4378{
4016 static int incede; 4379 static int incede;
4017 4380
4018 api_cede_notself (aTHX); 4381 api_cede_notself (aTHX);
4019 4382
4020 ++incede; 4383 ++incede;
4021 while (coro_nready >= incede && api_cede (aTHX)) 4384 while (coro_nready >= incede && api_cede (aTHX))
… …
4065 { 4428 {
4066 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect; 4429 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
4067 coro_old_pp_sselect = 0; 4430 coro_old_pp_sselect = 0;
4068 } 4431 }
4069 4432
4433MODULE = Coro::State PACKAGE = Coro::Util
4434
4435void
4436_exit (int code)
4437 CODE:
4438 _exit (code);
4439
4440NV
4441time ()
4442 CODE:
4443 RETVAL = nvtime (aTHX);
4444 OUTPUT:
4445 RETVAL
4446
4447NV
4448gettimeofday ()
4449 PPCODE:
4450{
4451 UV tv [2];
4452 u2time (aTHX_ tv);
4453 EXTEND (SP, 2);
4454 PUSHs (sv_2mortal (newSVuv (tv [0])));
4455 PUSHs (sv_2mortal (newSVuv (tv [1])));
4456}
4457

Diff Legend

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