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.358 by root, Mon Jun 29 04:30:25 2009 UTC vs.
Revision 1.427 by root, Wed Dec 5 14:35:34 2012 UTC

1/* this works around a bug in mingw32 providing a non-working setjmp */
2#define USE_NO_MINGW_SETJMP_TWO_ARGS
3
4#define NDEBUG 1
5
1#include "libcoro/coro.c" 6#include "libcoro/coro.c"
2 7
3#define PERL_NO_GET_CONTEXT 8#define PERL_NO_GET_CONTEXT
4#define PERL_EXT 9#define PERL_EXT
5 10
6#include "EXTERN.h" 11#include "EXTERN.h"
7#include "perl.h" 12#include "perl.h"
8#include "XSUB.h" 13#include "XSUB.h"
9#include "perliol.h" 14#include "perliol.h"
10 15
11#include "patchlevel.h" 16#include "schmorp.h"
12 17
18#define ECB_NO_THREADS 1
19#include "ecb.h"
20
21#include <stddef.h>
13#include <stdio.h> 22#include <stdio.h>
14#include <errno.h> 23#include <errno.h>
15#include <assert.h> 24#include <assert.h>
16 25
17#ifdef WIN32 26#ifndef SVs_PADSTALE
27# define SVs_PADSTALE 0
28#endif
29
30#ifdef PadARRAY
31# define NEWPADAPI
32# define newPADLIST(var) (Newz (0, var, 1, PADLIST), Newx (PadlistARRAY (var), 2, PAD *))
33#else
34typedef AV PADNAMELIST;
35# if !PERL_VERSION_ATLEAST(5,8,0)
36typedef AV PADLIST;
37typedef AV PAD;
38# endif
39# define PadlistARRAY(pl) ((PAD **)AvARRAY (pl))
40# define PadlistMAX(pl) AvFILLp (pl)
41# define PadlistNAMES(pl) (*PadlistARRAY (pl))
42# define PadARRAY AvARRAY
43# define PadMAX AvFILLp
44# define newPADLIST(var) ((var) = newAV (), av_extend (var, 1))
45#endif
46
47#if defined(_WIN32)
48# undef HAS_GETTIMEOFDAY
18# undef setjmp 49# undef setjmp
19# undef longjmp 50# undef longjmp
20# undef _exit 51# undef _exit
21# define setjmp _setjmp /* deep magic */ 52# define setjmp _setjmp /* deep magic */
22#else 53#else
23# include <inttypes.h> /* most portable stdint.h */ 54# include <inttypes.h> /* most portable stdint.h */
24#endif 55#endif
25 56
26#ifdef HAVE_MMAP 57#if HAVE_MMAP
27# include <unistd.h> 58# include <unistd.h>
28# include <sys/mman.h> 59# include <sys/mman.h>
29# ifndef MAP_ANONYMOUS 60# ifndef MAP_ANONYMOUS
30# ifdef MAP_ANON 61# ifdef MAP_ANON
31# define MAP_ANONYMOUS MAP_ANON 62# define MAP_ANONYMOUS MAP_ANON
… …
51#endif 82#endif
52 83
53/* the maximum number of idle cctx that will be pooled */ 84/* the maximum number of idle cctx that will be pooled */
54static int cctx_max_idle = 4; 85static int cctx_max_idle = 4;
55 86
56#define PERL_VERSION_ATLEAST(a,b,c) \ 87#if defined(DEBUGGING) && PERL_VERSION_ATLEAST(5,12,0)
57 (PERL_REVISION > (a) \ 88# define HAS_SCOPESTACK_NAME 1
58 || (PERL_REVISION == (a) \
59 && (PERL_VERSION > (b) \
60 || (PERL_VERSION == (b) && PERL_SUBVERSION >= (c)))))
61
62#if !PERL_VERSION_ATLEAST (5,6,0)
63# ifndef PL_ppaddr
64# define PL_ppaddr ppaddr
65# endif
66# ifndef call_sv
67# define call_sv perl_call_sv
68# endif
69# ifndef get_sv
70# define get_sv perl_get_sv
71# endif
72# ifndef get_cv
73# define get_cv perl_get_cv
74# endif
75# ifndef IS_PADGV
76# define IS_PADGV(v) 0
77# endif
78# ifndef IS_PADCONST
79# define IS_PADCONST(v) 0
80# endif
81#endif
82
83/* 5.11 */
84#ifndef CxHASARGS
85# define CxHASARGS(cx) (cx)->blk_sub.hasargs
86#endif
87
88/* 5.10.0 */
89#ifndef SvREFCNT_inc_NN
90# define SvREFCNT_inc_NN(sv) SvREFCNT_inc (sv)
91#endif
92
93/* 5.8.8 */
94#ifndef GV_NOTQUAL
95# define GV_NOTQUAL 0
96#endif
97#ifndef newSV
98# define newSV(l) NEWSV(0,l)
99#endif
100#ifndef CvISXSUB_on
101# define CvISXSUB_on(cv) (void)cv
102#endif
103#ifndef CvISXSUB
104# define CvISXSUB(cv) (CvXSUB (cv) ? TRUE : FALSE)
105#endif
106#ifndef Newx
107# define Newx(ptr,nitems,type) New (0,ptr,nitems,type)
108#endif
109
110/* 5.8.7 */
111#ifndef SvRV_set
112# define SvRV_set(s,v) SvRV(s) = (v)
113#endif 89#endif
114 90
115#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 91#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
116# undef CORO_STACKGUARD 92# undef CORO_STACKGUARD
117#endif 93#endif
… …
135# define STACKLEVEL ((void *)&stacklevel) 111# define STACKLEVEL ((void *)&stacklevel)
136#endif 112#endif
137 113
138#define IN_DESTRUCT PL_dirty 114#define IN_DESTRUCT PL_dirty
139 115
140#if __GNUC__ >= 3
141# define attribute(x) __attribute__(x)
142# define expect(expr,value) __builtin_expect ((expr), (value))
143# define INLINE static inline
144#else
145# define attribute(x)
146# define expect(expr,value) (expr)
147# define INLINE static
148#endif
149
150#define expect_false(expr) expect ((expr) != 0, 0)
151#define expect_true(expr) expect ((expr) != 0, 1)
152
153#define NOINLINE attribute ((noinline))
154
155#include "CoroAPI.h" 116#include "CoroAPI.h"
156#define GCoroAPI (&coroapi) /* very sneaky */ 117#define GCoroAPI (&coroapi) /* very sneaky */
157 118
158#ifdef USE_ITHREADS 119#ifdef USE_ITHREADS
159# if CORO_PTHREAD 120# if CORO_PTHREAD
… …
170# define CORO_CLOCK_THREAD_CPUTIME_ID 3 131# define CORO_CLOCK_THREAD_CPUTIME_ID 3
171# endif 132# endif
172#endif 133#endif
173 134
174static double (*nvtime)(); /* so why doesn't it take void? */ 135static double (*nvtime)(); /* so why doesn't it take void? */
136static void (*u2time)(pTHX_ UV ret[2]);
175 137
176/* we hijack an hopefully unused CV flag for our purposes */ 138/* we hijack an hopefully unused CV flag for our purposes */
177#define CVf_SLF 0x4000 139#define CVf_SLF 0x4000
178static OP *pp_slf (pTHX); 140static OP *pp_slf (pTHX);
141static void slf_destroy (pTHX_ struct coro *coro);
179 142
180static U32 cctx_gen; 143static U32 cctx_gen;
181static size_t cctx_stacksize = CORO_STACKSIZE; 144static size_t cctx_stacksize = CORO_STACKSIZE;
182static struct CoroAPI coroapi; 145static struct CoroAPI coroapi;
183static AV *main_mainstack; /* used to differentiate between $main and others */ 146static AV *main_mainstack; /* used to differentiate between $main and others */
… …
200static SV *sv_pool_size; 163static SV *sv_pool_size;
201static SV *sv_async_pool_idle; /* description string */ 164static SV *sv_async_pool_idle; /* description string */
202static AV *av_async_pool; /* idle pool */ 165static AV *av_async_pool; /* idle pool */
203static SV *sv_Coro; /* class string */ 166static SV *sv_Coro; /* class string */
204static CV *cv_pool_handler; 167static CV *cv_pool_handler;
205static CV *cv_coro_state_new;
206 168
207/* Coro::AnyEvent */ 169/* Coro::AnyEvent */
208static SV *sv_activity; 170static SV *sv_activity;
209 171
172/* enable processtime/realtime profiling */
173static char enable_times;
174typedef U32 coro_ts[2];
175static coro_ts time_real, time_cpu;
176static char times_valid;
177
210static struct coro_cctx *cctx_first; 178static struct coro_cctx *cctx_first;
211static int cctx_count, cctx_idle; 179static int cctx_count, cctx_idle;
212 180
213enum { 181enum
182{
214 CC_MAPPED = 0x01, 183 CC_MAPPED = 0x01,
215 CC_NOREUSE = 0x02, /* throw this away after tracing */ 184 CC_NOREUSE = 0x02, /* throw this away after tracing */
216 CC_TRACE = 0x04, 185 CC_TRACE = 0x04,
217 CC_TRACE_SUB = 0x08, /* trace sub calls */ 186 CC_TRACE_SUB = 0x08, /* trace sub calls */
218 CC_TRACE_LINE = 0x10, /* trace each statement */ 187 CC_TRACE_LINE = 0x10, /* trace each statement */
… …
228 void *sptr; 197 void *sptr;
229 size_t ssize; 198 size_t ssize;
230 199
231 /* cpu state */ 200 /* cpu state */
232 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 201 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
202#ifndef NDEBUG
233 JMPENV *idle_te; /* same as idle_sp, but for top_env, TODO: remove once stable */ 203 JMPENV *idle_te; /* same as idle_sp, but for top_env */
204#endif
234 JMPENV *top_env; 205 JMPENV *top_env;
235 coro_context cctx; 206 coro_context cctx;
236 207
237 U32 gen; 208 U32 gen;
238#if CORO_USE_VALGRIND 209#if CORO_USE_VALGRIND
239 int valgrind_id; 210 int valgrind_id;
240#endif 211#endif
241 unsigned char flags; 212 unsigned char flags;
242} coro_cctx; 213} coro_cctx;
243 214
244coro_cctx *cctx_current; /* the currently running cctx */ 215static coro_cctx *cctx_current; /* the currently running cctx */
245 216
246/*****************************************************************************/ 217/*****************************************************************************/
247 218
219static MGVTBL coro_state_vtbl;
220
248enum { 221enum
222{
249 CF_RUNNING = 0x0001, /* coroutine is running */ 223 CF_RUNNING = 0x0001, /* coroutine is running */
250 CF_READY = 0x0002, /* coroutine is ready */ 224 CF_READY = 0x0002, /* coroutine is ready */
251 CF_NEW = 0x0004, /* has never been switched to */ 225 CF_NEW = 0x0004, /* has never been switched to */
252 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 226 CF_ZOMBIE = 0x0008, /* coroutine data has been freed */
253 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */ 227 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
228 CF_NOCANCEL = 0x0020, /* cannot cancel, set slf_frame.data to 1 (hackish) */
254}; 229};
255 230
256/* the structure where most of the perl state is stored, overlaid on the cxstack */ 231/* the structure where most of the perl state is stored, overlaid on the cxstack */
257typedef struct 232typedef struct
258{ 233{
259 SV *defsv;
260 AV *defav;
261 SV *errsv;
262 SV *irsgv;
263 HV *hinthv;
264#define VAR(name,type) type name; 234 #define VARx(name,expr,type) type name;
265# include "state.h" 235 #include "state.h"
266#undef VAR
267} perl_slots; 236} perl_slots;
268 237
238/* how many context stack entries do we need for perl_slots */
269#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT)) 239#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
270 240
271/* this is a structure representing a perl-level coroutine */ 241/* this is a structure representing a perl-level coroutine */
272struct coro { 242struct coro
243{
273 /* the C coroutine allocated to this perl coroutine, if any */ 244 /* the C coroutine allocated to this perl coroutine, if any */
274 coro_cctx *cctx; 245 coro_cctx *cctx;
275 246
276 /* ready queue */ 247 /* ready queue */
277 struct coro *next_ready; 248 struct coro *next_ready;
… …
279 /* state data */ 250 /* state data */
280 struct CoroSLF slf_frame; /* saved slf frame */ 251 struct CoroSLF slf_frame; /* saved slf frame */
281 AV *mainstack; 252 AV *mainstack;
282 perl_slots *slot; /* basically the saved sp */ 253 perl_slots *slot; /* basically the saved sp */
283 254
284 CV *startcv; /* the CV to execute */ 255 CV *startcv; /* the CV to execute */
285 AV *args; /* data associated with this coroutine (initial args) */ 256 AV *args; /* data associated with this coroutine (initial args) */
286 int refcnt; /* coroutines are refcounted, yes */
287 int flags; /* CF_ flags */ 257 int flags; /* CF_ flags */
288 HV *hv; /* the perl hash associated with this coro, if any */ 258 HV *hv; /* the perl hash associated with this coro, if any */
289 void (*on_destroy)(pTHX_ struct coro *coro);
290 259
291 /* statistics */ 260 /* statistics */
292 int usecount; /* number of transfers to this coro */ 261 int usecount; /* number of transfers to this coro */
293 262
294 /* coro process data */ 263 /* coro process data */
295 int prio; 264 int prio;
296 SV *except; /* exception to be thrown */ 265 SV *except; /* exception to be thrown */
297 SV *rouse_cb; 266 SV *rouse_cb; /* last rouse callback */
267 AV *on_destroy; /* callbacks or coros to notify on destroy */
268 AV *status; /* the exit status list */
298 269
299 /* async_pool */ 270 /* async_pool */
300 SV *saved_deffh; 271 SV *saved_deffh;
301 SV *invoke_cb; 272 SV *invoke_cb;
302 AV *invoke_av; 273 AV *invoke_av;
303 274
304 /* on_enter/on_leave */ 275 /* on_enter/on_leave */
305 AV *on_enter; 276 AV *on_enter;
306 AV *on_leave; 277 AV *on_leave;
307 278
279 /* swap_sv */
280 AV *swap_sv;
281
282 /* times */
283 coro_ts t_cpu, t_real;
284
308 /* linked list */ 285 /* linked list */
309 struct coro *next, *prev; 286 struct coro *next, *prev;
310}; 287};
311 288
312typedef struct coro *Coro__State; 289typedef struct coro *Coro__State;
313typedef struct coro *Coro__State_or_hashref; 290typedef struct coro *Coro__State_or_hashref;
314 291
315/* the following variables are effectively part of the perl context */ 292/* the following variables are effectively part of the perl context */
316/* and get copied between struct coro and these variables */ 293/* and get copied between struct coro and these variables */
317/* the mainr easonw e don't support windows process emulation */ 294/* the main reason we don't support windows process emulation */
318static struct CoroSLF slf_frame; /* the current slf frame */ 295static struct CoroSLF slf_frame; /* the current slf frame */
319 296
320/** Coro ********************************************************************/ 297/** Coro ********************************************************************/
321 298
322#define CORO_PRIO_MAX 3 299#define CORO_PRIO_MAX 3
… …
328 305
329/* for Coro.pm */ 306/* for Coro.pm */
330static SV *coro_current; 307static SV *coro_current;
331static SV *coro_readyhook; 308static SV *coro_readyhook;
332static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */ 309static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
333static CV *cv_coro_run, *cv_coro_terminate; 310static CV *cv_coro_run;
334static struct coro *coro_first; 311static struct coro *coro_first;
335#define coro_nready coroapi.nready 312#define coro_nready coroapi.nready
336 313
314/** JIT *********************************************************************/
315
316#if CORO_JIT
317 /* APPLE doesn't have HAVE_MMAP though */
318 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__)
319 #ifndef CORO_JIT_TYPE
320 #if __x86_64 && CORO_JIT_UNIXY
321 #define CORO_JIT_TYPE "amd64-unix"
322 #elif __i386 && CORO_JIT_UNIXY
323 #define CORO_JIT_TYPE "x86-unix"
324 #endif
325 #endif
326#endif
327
328#if !defined(CORO_JIT_TYPE) || !HAVE_MMAP
329 #undef CORO_JIT
330#endif
331
332#if CORO_JIT
333 typedef void (*load_save_perl_slots_type)(perl_slots *);
334 static load_save_perl_slots_type load_perl_slots, save_perl_slots;
335#endif
336
337/** Coro::Select ************************************************************/
338
339static OP *(*coro_old_pp_sselect) (pTHX);
340static SV *coro_select_select;
341
342/* horrible hack, but if it works... */
343static OP *
344coro_pp_sselect (pTHX)
345{
346 dSP;
347 PUSHMARK (SP - 4); /* fake argument list */
348 XPUSHs (coro_select_select);
349 PUTBACK;
350
351 /* entersub is an UNOP, select a LISTOP... keep your fingers crossed */
352 PL_op->op_flags |= OPf_STACKED;
353 PL_op->op_private = 0;
354 return PL_ppaddr [OP_ENTERSUB](aTHX);
355}
356
357/** time stuff **************************************************************/
358
359#ifdef HAS_GETTIMEOFDAY
360
361ecb_inline void
362coro_u2time (pTHX_ UV ret[2])
363{
364 struct timeval tv;
365 gettimeofday (&tv, 0);
366
367 ret [0] = tv.tv_sec;
368 ret [1] = tv.tv_usec;
369}
370
371ecb_inline double
372coro_nvtime (void)
373{
374 struct timeval tv;
375 gettimeofday (&tv, 0);
376
377 return tv.tv_sec + tv.tv_usec * 1e-6;
378}
379
380ecb_inline void
381time_init (pTHX)
382{
383 nvtime = coro_nvtime;
384 u2time = coro_u2time;
385}
386
387#else
388
389ecb_inline void
390time_init (pTHX)
391{
392 SV **svp;
393
394 require_pv ("Time/HiRes.pm");
395
396 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
397
398 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
399 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught");
400
401 nvtime = INT2PTR (double (*)(), SvIV (*svp));
402
403 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
404 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
405}
406
407#endif
408
337/** lowlevel stuff **********************************************************/ 409/** lowlevel stuff **********************************************************/
338 410
339static SV * 411static SV * ecb_noinline
340coro_get_sv (pTHX_ const char *name, int create) 412coro_get_sv (pTHX_ const char *name, int create)
341{ 413{
342#if PERL_VERSION_ATLEAST (5,10,0) 414#if PERL_VERSION_ATLEAST (5,10,0)
343 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 415 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
344 get_sv (name, create); 416 get_sv (name, create);
345#endif 417#endif
346 return get_sv (name, create); 418 return get_sv (name, create);
347} 419}
348 420
349static AV * 421static AV * ecb_noinline
350coro_get_av (pTHX_ const char *name, int create) 422coro_get_av (pTHX_ const char *name, int create)
351{ 423{
352#if PERL_VERSION_ATLEAST (5,10,0) 424#if PERL_VERSION_ATLEAST (5,10,0)
353 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 425 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
354 get_av (name, create); 426 get_av (name, create);
355#endif 427#endif
356 return get_av (name, create); 428 return get_av (name, create);
357} 429}
358 430
359static HV * 431static HV * ecb_noinline
360coro_get_hv (pTHX_ const char *name, int create) 432coro_get_hv (pTHX_ const char *name, int create)
361{ 433{
362#if PERL_VERSION_ATLEAST (5,10,0) 434#if PERL_VERSION_ATLEAST (5,10,0)
363 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 435 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
364 get_hv (name, create); 436 get_hv (name, create);
365#endif 437#endif
366 return get_hv (name, create); 438 return get_hv (name, create);
367} 439}
368 440
369/* may croak */ 441ecb_inline void
370INLINE CV * 442coro_times_update (void)
371coro_sv_2cv (pTHX_ SV *sv)
372{ 443{
373 HV *st; 444#ifdef coro_clock_gettime
374 GV *gvp; 445 struct timespec ts;
375 CV *cv = sv_2cv (sv, &st, &gvp, 0);
376 446
377 if (!cv) 447 ts.tv_sec = ts.tv_nsec = 0;
378 croak ("code reference expected"); 448 coro_clock_gettime (CORO_CLOCK_THREAD_CPUTIME_ID, &ts);
449 time_cpu [0] = ts.tv_sec; time_cpu [1] = ts.tv_nsec;
379 450
380 return cv; 451 ts.tv_sec = ts.tv_nsec = 0;
452 coro_clock_gettime (CORO_CLOCK_MONOTONIC, &ts);
453 time_real [0] = ts.tv_sec; time_real [1] = ts.tv_nsec;
454#else
455 dTHX;
456 UV tv[2];
457
458 u2time (aTHX_ tv);
459 time_real [0] = tv [0];
460 time_real [1] = tv [1] * 1000;
461#endif
462}
463
464ecb_inline void
465coro_times_add (struct coro *c)
466{
467 c->t_real [1] += time_real [1];
468 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
469 c->t_real [0] += time_real [0];
470
471 c->t_cpu [1] += time_cpu [1];
472 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
473 c->t_cpu [0] += time_cpu [0];
474}
475
476ecb_inline void
477coro_times_sub (struct coro *c)
478{
479 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; }
480 c->t_real [1] -= time_real [1];
481 c->t_real [0] -= time_real [0];
482
483 if (c->t_cpu [1] < time_cpu [1]) { c->t_cpu [1] += 1000000000; --c->t_cpu [0]; }
484 c->t_cpu [1] -= time_cpu [1];
485 c->t_cpu [0] -= time_cpu [0];
381} 486}
382 487
383/*****************************************************************************/ 488/*****************************************************************************/
384/* magic glue */ 489/* magic glue */
385 490
386#define CORO_MAGIC_type_cv 26 491#define CORO_MAGIC_type_cv 26
387#define CORO_MAGIC_type_state PERL_MAGIC_ext 492#define CORO_MAGIC_type_state PERL_MAGIC_ext
388 493
389#define CORO_MAGIC_NN(sv, type) \ 494#define CORO_MAGIC_NN(sv, type) \
390 (expect_true (SvMAGIC (sv)->mg_type == type) \ 495 (ecb_expect_true (SvMAGIC (sv)->mg_type == type) \
391 ? SvMAGIC (sv) \ 496 ? SvMAGIC (sv) \
392 : mg_find (sv, type)) 497 : mg_find (sv, type))
393 498
394#define CORO_MAGIC(sv, type) \ 499#define CORO_MAGIC(sv, type) \
395 (expect_true (SvMAGIC (sv)) \ 500 (ecb_expect_true (SvMAGIC (sv)) \
396 ? CORO_MAGIC_NN (sv, type) \ 501 ? CORO_MAGIC_NN (sv, type) \
397 : 0) 502 : 0)
398 503
399#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv) 504#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
400#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state) 505#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
401 506
402INLINE struct coro * 507ecb_inline MAGIC *
508SvSTATEhv_p (pTHX_ SV *coro)
509{
510 MAGIC *mg;
511
512 if (ecb_expect_true (
513 SvTYPE (coro) == SVt_PVHV
514 && (mg = CORO_MAGIC_state (coro))
515 && mg->mg_virtual == &coro_state_vtbl
516 ))
517 return mg;
518
519 return 0;
520}
521
522ecb_inline struct coro *
403SvSTATE_ (pTHX_ SV *coro) 523SvSTATE_ (pTHX_ SV *coro)
404{ 524{
405 HV *stash;
406 MAGIC *mg; 525 MAGIC *mg;
407 526
408 if (SvROK (coro)) 527 if (SvROK (coro))
409 coro = SvRV (coro); 528 coro = SvRV (coro);
410 529
411 if (expect_false (SvTYPE (coro) != SVt_PVHV)) 530 mg = SvSTATEhv_p (aTHX_ coro);
531 if (!mg)
412 croak ("Coro::State object required"); 532 croak ("Coro::State object required");
413 533
414 stash = SvSTASH (coro);
415 if (expect_false (stash != coro_stash && stash != coro_state_stash))
416 {
417 /* very slow, but rare, check */
418 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
419 croak ("Coro::State object required");
420 }
421
422 mg = CORO_MAGIC_state (coro);
423 return (struct coro *)mg->mg_ptr; 534 return (struct coro *)mg->mg_ptr;
424} 535}
425 536
426#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 537#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
427 538
… …
430#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 541#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
431 542
432/*****************************************************************************/ 543/*****************************************************************************/
433/* padlist management and caching */ 544/* padlist management and caching */
434 545
435static AV * 546ecb_inline PADLIST *
436coro_derive_padlist (pTHX_ CV *cv) 547coro_derive_padlist (pTHX_ CV *cv)
437{ 548{
438 AV *padlist = CvPADLIST (cv); 549 PADLIST *padlist = CvPADLIST (cv);
439 AV *newpadlist, *newpad; 550 PADLIST *newpadlist;
551 PAD *newpad;
552 PADOFFSET const off = PadlistMAX (padlist) + 1;
440 553
441 newpadlist = newAV (); 554 newPADLIST(newpadlist);
555#if !PERL_VERSION_ATLEAST(5,15,3)
556 /* Padlists are AvREAL as of 5.15.3. See perl bug #98092 and perl commit 7d953ba. */
442 AvREAL_off (newpadlist); 557 AvREAL_off (newpadlist);
558#endif
443#if PERL_VERSION_ATLEAST (5,10,0) 559#if PERL_VERSION_ATLEAST (5,10,0)
444 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1); 560 Perl_pad_push (aTHX_ padlist, off);
445#else 561#else
446 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 562 Perl_pad_push (aTHX_ padlist, off, 1);
447#endif 563#endif
448 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 564 newpad = PadlistARRAY (padlist)[off];
449 --AvFILLp (padlist); 565 PadlistMAX (padlist) = off - 1;
450 566
451 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0])); 567 /* Already extended to 2 elements by newPADLIST. */
452 av_store (newpadlist, 1, (SV *)newpad); 568 PadlistMAX (newpadlist) = 1;
569 PadlistNAMES (newpadlist) = (PADNAMELIST *)SvREFCNT_inc_NN (PadlistNAMES (padlist));
570 PadlistARRAY (newpadlist)[1] = newpad;
453 571
454 return newpadlist; 572 return newpadlist;
455} 573}
456 574
457static void 575ecb_inline void
458free_padlist (pTHX_ AV *padlist) 576free_padlist (pTHX_ PADLIST *padlist)
459{ 577{
460 /* may be during global destruction */ 578 /* may be during global destruction */
461 if (!IN_DESTRUCT) 579 if (!IN_DESTRUCT)
462 { 580 {
463 I32 i = AvFILLp (padlist); 581 I32 i = PadlistMAX (padlist);
464 582
465 while (i > 0) /* special-case index 0 */ 583 while (i > 0) /* special-case index 0 */
466 { 584 {
467 /* we try to be extra-careful here */ 585 /* we try to be extra-careful here */
468 AV *av = (AV *)AvARRAY (padlist)[i--]; 586 PAD *pad = PadlistARRAY (padlist)[i--];
469 I32 j = AvFILLp (av); 587 I32 j = PadMAX (pad);
470 588
471 while (j >= 0) 589 while (j >= 0)
472 SvREFCNT_dec (AvARRAY (av)[j--]); 590 SvREFCNT_dec (PadARRAY (pad)[j--]);
473 591
474 AvFILLp (av) = -1; 592 PadMAX (pad) = -1;
475 SvREFCNT_dec (av); 593 SvREFCNT_dec (pad);
476 } 594 }
477 595
478 SvREFCNT_dec (AvARRAY (padlist)[0]); 596 SvREFCNT_dec (PadlistNAMES (padlist));
479 597
598#ifdef NEWPADAPI
599 Safefree (PadlistARRAY (padlist));
600 Safefree (padlist);
601#else
480 AvFILLp (padlist) = -1; 602 AvFILLp (padlist) = -1;
603 AvREAL_off (padlist);
481 SvREFCNT_dec ((SV*)padlist); 604 SvREFCNT_dec ((SV*)padlist);
605#endif
482 } 606 }
483} 607}
484 608
485static int 609static int
486coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 610coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
487{ 611{
488 AV *padlist; 612 PADLIST *padlist;
489 AV *av = (AV *)mg->mg_obj; 613 PADLIST **padlists = (PADLIST **)(mg->mg_ptr + sizeof(size_t));
614 size_t len = *(size_t *)mg->mg_ptr;
490 615
491 /* perl manages to free our internal AV and _then_ call us */ 616 /* perl manages to free our internal AV and _then_ call us */
492 if (IN_DESTRUCT) 617 if (IN_DESTRUCT)
493 return; 618 return 0;
494 619
495 /* casting is fun. */ 620 while (len--)
496 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
497 free_padlist (aTHX_ padlist); 621 free_padlist (aTHX_ padlists[len]);
498
499 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
500 622
501 return 0; 623 return 0;
502} 624}
503 625
504static MGVTBL coro_cv_vtbl = { 626static MGVTBL coro_cv_vtbl = {
505 0, 0, 0, 0, 627 0, 0, 0, 0,
506 coro_cv_free 628 coro_cv_free
507}; 629};
508 630
509/* the next two functions merely cache the padlists */ 631/* the next two functions merely cache the padlists */
510static void 632ecb_inline void
511get_padlist (pTHX_ CV *cv) 633get_padlist (pTHX_ CV *cv)
512{ 634{
513 MAGIC *mg = CORO_MAGIC_cv (cv); 635 MAGIC *mg = CORO_MAGIC_cv (cv);
514 AV *av; 636 size_t *lenp;
515 637
516 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 638 if (ecb_expect_true (mg && *(lenp = (size_t *)mg->mg_ptr)))
517 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 639 CvPADLIST (cv) = ((PADLIST **)(mg->mg_ptr + sizeof(size_t)))[--*lenp];
518 else 640 else
519 { 641 {
520#if CORO_PREFER_PERL_FUNCTIONS 642#if CORO_PREFER_PERL_FUNCTIONS
521 /* this is probably cleaner? but also slower! */ 643 /* this is probably cleaner? but also slower! */
522 /* in practise, it seems to be less stable */ 644 /* in practise, it seems to be less stable */
… …
528 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 650 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
529#endif 651#endif
530 } 652 }
531} 653}
532 654
533static void 655ecb_inline void
534put_padlist (pTHX_ CV *cv) 656put_padlist (pTHX_ CV *cv)
535{ 657{
536 MAGIC *mg = CORO_MAGIC_cv (cv); 658 MAGIC *mg = CORO_MAGIC_cv (cv);
537 AV *av;
538 659
539 if (expect_false (!mg)) 660 if (ecb_expect_false (!mg))
661 {
540 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 662 mg = sv_magicext ((SV *)cv, 0, CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
663 Newz (0, mg->mg_ptr ,sizeof (size_t) + sizeof (PADLIST *), char);
664 mg->mg_len = 1; /* so mg_free frees mg_ptr */
665 }
666 else
667 Renew (mg->mg_ptr,
668 sizeof(size_t) + (*(size_t *)mg->mg_ptr + 1) * sizeof(PADLIST *),
669 char);
541 670
542 av = (AV *)mg->mg_obj; 671 ((PADLIST **)(mg->mg_ptr + sizeof (size_t))) [(*(size_t *)mg->mg_ptr)++] = CvPADLIST (cv);
543
544 if (expect_false (AvFILLp (av) >= AvMAX (av)))
545 av_extend (av, AvFILLp (av) + 1);
546
547 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
548} 672}
549 673
550/** load & save, init *******************************************************/ 674/** load & save, init *******************************************************/
675
676ecb_inline void
677swap_sv (SV *a, SV *b)
678{
679 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
680 SV tmp;
681
682 /* swap sv_any */
683 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
684
685 /* swap sv_flags */
686 SvFLAGS (&tmp) = SvFLAGS (a);
687 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
688 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
689
690#if PERL_VERSION_ATLEAST (5,10,0)
691 /* perl 5.10 and later complicates this _quite_ a bit, but it also
692 * is much faster, so no quarrels here. alternatively, we could
693 * sv_upgrade to avoid this.
694 */
695 {
696 /* swap sv_u */
697 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
698
699 /* if SvANY points to the head, we need to adjust the pointers,
700 * as the pointer for a still points to b, and maybe vice versa.
701 */
702 #define svany_in_head(type) \
703 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
704
705 if (svany_in_head (SvTYPE (a)))
706 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
707
708 if (svany_in_head (SvTYPE (b)))
709 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
710 }
711#endif
712}
713
714/* swap sv heads, at least logically */
715static void
716swap_svs (pTHX_ Coro__State c)
717{
718 int i;
719
720 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
721 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
722}
723
724#define SWAP_SVS(coro) \
725 if (ecb_expect_false ((coro)->swap_sv)) \
726 swap_svs (aTHX_ (coro))
551 727
552static void 728static void
553on_enterleave_call (pTHX_ SV *cb); 729on_enterleave_call (pTHX_ SV *cb);
554 730
555static void 731static void
… …
558 perl_slots *slot = c->slot; 734 perl_slots *slot = c->slot;
559 c->slot = 0; 735 c->slot = 0;
560 736
561 PL_mainstack = c->mainstack; 737 PL_mainstack = c->mainstack;
562 738
563 GvSV (PL_defgv) = slot->defsv; 739#if CORO_JIT
564 GvAV (PL_defgv) = slot->defav; 740 load_perl_slots (slot);
565 GvSV (PL_errgv) = slot->errsv; 741#else
566 GvSV (irsgv) = slot->irsgv;
567 GvHV (PL_hintgv) = slot->hinthv;
568
569 #define VAR(name,type) PL_ ## name = slot->name; 742 #define VARx(name,expr,type) expr = slot->name;
570 # include "state.h" 743 #include "state.h"
571 #undef VAR 744#endif
572 745
573 { 746 {
574 dSP; 747 dSP;
575 748
576 CV *cv; 749 CV *cv;
577 750
578 /* now do the ugly restore mess */ 751 /* now do the ugly restore mess */
579 while (expect_true (cv = (CV *)POPs)) 752 while (ecb_expect_true (cv = (CV *)POPs))
580 { 753 {
581 put_padlist (aTHX_ cv); /* mark this padlist as available */ 754 put_padlist (aTHX_ cv); /* mark this padlist as available */
582 CvDEPTH (cv) = PTR2IV (POPs); 755 CvDEPTH (cv) = PTR2IV (POPs);
583 CvPADLIST (cv) = (AV *)POPs; 756 CvPADLIST (cv) = (PADLIST *)POPs;
584 } 757 }
585 758
586 PUTBACK; 759 PUTBACK;
587 } 760 }
588 761
589 slf_frame = c->slf_frame; 762 slf_frame = c->slf_frame;
590 CORO_THROW = c->except; 763 CORO_THROW = c->except;
591 764
765 if (ecb_expect_false (enable_times))
766 {
767 if (ecb_expect_false (!times_valid))
768 coro_times_update ();
769
770 coro_times_sub (c);
771 }
772
592 if (expect_false (c->on_enter)) 773 if (ecb_expect_false (c->on_enter))
593 { 774 {
594 int i; 775 int i;
595 776
596 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 777 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
597 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 778 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
598 } 779 }
780
781 SWAP_SVS (c);
599} 782}
600 783
601static void 784static void
602save_perl (pTHX_ Coro__State c) 785save_perl (pTHX_ Coro__State c)
603{ 786{
787 SWAP_SVS (c);
788
604 if (expect_false (c->on_leave)) 789 if (ecb_expect_false (c->on_leave))
605 { 790 {
606 int i; 791 int i;
607 792
608 for (i = AvFILLp (c->on_leave); i >= 0; --i) 793 for (i = AvFILLp (c->on_leave); i >= 0; --i)
609 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]); 794 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
795 }
796
797 times_valid = 0;
798
799 if (ecb_expect_false (enable_times))
800 {
801 coro_times_update (); times_valid = 1;
802 coro_times_add (c);
610 } 803 }
611 804
612 c->except = CORO_THROW; 805 c->except = CORO_THROW;
613 c->slf_frame = slf_frame; 806 c->slf_frame = slf_frame;
614 807
… …
625 818
626 XPUSHs (Nullsv); 819 XPUSHs (Nullsv);
627 /* this loop was inspired by pp_caller */ 820 /* this loop was inspired by pp_caller */
628 for (;;) 821 for (;;)
629 { 822 {
630 while (expect_true (cxix >= 0)) 823 while (ecb_expect_true (cxix >= 0))
631 { 824 {
632 PERL_CONTEXT *cx = &ccstk[cxix--]; 825 PERL_CONTEXT *cx = &ccstk[cxix--];
633 826
634 if (expect_true (CxTYPE (cx) == CXt_SUB) || expect_false (CxTYPE (cx) == CXt_FORMAT)) 827 if (ecb_expect_true (CxTYPE (cx) == CXt_SUB) || ecb_expect_false (CxTYPE (cx) == CXt_FORMAT))
635 { 828 {
636 CV *cv = cx->blk_sub.cv; 829 CV *cv = cx->blk_sub.cv;
637 830
638 if (expect_true (CvDEPTH (cv))) 831 if (ecb_expect_true (CvDEPTH (cv)))
639 { 832 {
640 EXTEND (SP, 3); 833 EXTEND (SP, 3);
641 PUSHs ((SV *)CvPADLIST (cv)); 834 PUSHs ((SV *)CvPADLIST (cv));
642 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv))); 835 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
643 PUSHs ((SV *)cv); 836 PUSHs ((SV *)cv);
… …
646 get_padlist (aTHX_ cv); 839 get_padlist (aTHX_ cv);
647 } 840 }
648 } 841 }
649 } 842 }
650 843
651 if (expect_true (top_si->si_type == PERLSI_MAIN)) 844 if (ecb_expect_true (top_si->si_type == PERLSI_MAIN))
652 break; 845 break;
653 846
654 top_si = top_si->si_prev; 847 top_si = top_si->si_prev;
655 ccstk = top_si->si_cxstack; 848 ccstk = top_si->si_cxstack;
656 cxix = top_si->si_cxix; 849 cxix = top_si->si_cxix;
… …
658 851
659 PUTBACK; 852 PUTBACK;
660 } 853 }
661 854
662 /* allocate some space on the context stack for our purposes */ 855 /* allocate some space on the context stack for our purposes */
663 /* we manually unroll here, as usually 2 slots is enough */ 856 if (ecb_expect_false (cxstack_ix + (int)SLOT_COUNT >= cxstack_max))
664 if (SLOT_COUNT >= 1) CXINC;
665 if (SLOT_COUNT >= 2) CXINC;
666 if (SLOT_COUNT >= 3) CXINC;
667 { 857 {
668 int i; 858 unsigned int i;
859
669 for (i = 3; i < SLOT_COUNT; ++i) 860 for (i = 0; i < SLOT_COUNT; ++i)
670 CXINC; 861 CXINC;
671 } 862
672 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 863 cxstack_ix -= SLOT_COUNT; /* undo allocation */
864 }
673 865
674 c->mainstack = PL_mainstack; 866 c->mainstack = PL_mainstack;
675 867
676 { 868 {
677 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 869 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
678 870
679 slot->defav = GvAV (PL_defgv); 871#if CORO_JIT
680 slot->defsv = DEFSV; 872 save_perl_slots (slot);
681 slot->errsv = ERRSV; 873#else
682 slot->irsgv = GvSV (irsgv);
683 slot->hinthv = GvHV (PL_hintgv);
684
685 #define VAR(name,type) slot->name = PL_ ## name; 874 #define VARx(name,expr,type) slot->name = expr;
686 # include "state.h" 875 #include "state.h"
687 #undef VAR 876#endif
688 } 877 }
689} 878}
690 879
691/* 880/*
692 * allocate various perl stacks. This is almost an exact copy 881 * allocate various perl stacks. This is almost an exact copy
… …
698# define coro_init_stacks(thx) init_stacks () 887# define coro_init_stacks(thx) init_stacks ()
699#else 888#else
700static void 889static void
701coro_init_stacks (pTHX) 890coro_init_stacks (pTHX)
702{ 891{
703 PL_curstackinfo = new_stackinfo(32, 8); 892 PL_curstackinfo = new_stackinfo(32, 4 + SLOT_COUNT); /* 3 is minimum due to perl rounding down in scope.c:GROW() */
704 PL_curstackinfo->si_type = PERLSI_MAIN; 893 PL_curstackinfo->si_type = PERLSI_MAIN;
705 PL_curstack = PL_curstackinfo->si_stack; 894 PL_curstack = PL_curstackinfo->si_stack;
706 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 895 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
707 896
708 PL_stack_base = AvARRAY(PL_curstack); 897 PL_stack_base = AvARRAY(PL_curstack);
… …
723#endif 912#endif
724 913
725 New(54,PL_scopestack,8,I32); 914 New(54,PL_scopestack,8,I32);
726 PL_scopestack_ix = 0; 915 PL_scopestack_ix = 0;
727 PL_scopestack_max = 8; 916 PL_scopestack_max = 8;
917#if HAS_SCOPESTACK_NAME
918 New(54,PL_scopestack_name,8,const char*);
919#endif
728 920
729 New(54,PL_savestack,24,ANY); 921 New(54,PL_savestack,24,ANY);
730 PL_savestack_ix = 0; 922 PL_savestack_ix = 0;
731 PL_savestack_max = 24; 923 PL_savestack_max = 24;
732 924
… …
760 } 952 }
761 953
762 Safefree (PL_tmps_stack); 954 Safefree (PL_tmps_stack);
763 Safefree (PL_markstack); 955 Safefree (PL_markstack);
764 Safefree (PL_scopestack); 956 Safefree (PL_scopestack);
957#if HAS_SCOPESTACK_NAME
958 Safefree (PL_scopestack_name);
959#endif
765 Safefree (PL_savestack); 960 Safefree (PL_savestack);
766#if !PERL_VERSION_ATLEAST (5,10,0) 961#if !PERL_VERSION_ATLEAST (5,10,0)
767 Safefree (PL_retstack); 962 Safefree (PL_retstack);
768#endif 963#endif
769} 964}
… …
815#endif 1010#endif
816 1011
817/* 1012/*
818 * This overrides the default magic get method of %SIG elements. 1013 * This overrides the default magic get method of %SIG elements.
819 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook 1014 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
820 * and instead of trying to save and restore the hash elements, we just provide 1015 * and instead of trying to save and restore the hash elements (extremely slow),
821 * readback here. 1016 * we just provide our own readback here.
822 */ 1017 */
823static int 1018static int ecb_cold
824coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 1019coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
825{ 1020{
826 const char *s = MgPV_nolen_const (mg); 1021 const char *s = MgPV_nolen_const (mg);
827 1022
828 if (*s == '_') 1023 if (*s == '_')
829 { 1024 {
830 SV **svp = 0; 1025 SV **svp = 0;
831 1026
832 if (strEQ (s, "__DIE__" )) svp = &PL_diehook; 1027 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
833 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 1028 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
834 1029
835 if (svp) 1030 if (svp)
836 { 1031 {
837 sv_setsv (sv, *svp ? *svp : &PL_sv_undef); 1032 SV *ssv;
1033
1034 if (!*svp)
1035 ssv = &PL_sv_undef;
1036 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */
1037 ssv = sv_2mortal (newRV_inc (*svp));
1038 else
1039 ssv = *svp;
1040
1041 sv_setsv (sv, ssv);
838 return 0; 1042 return 0;
839 } 1043 }
840 } 1044 }
841 1045
842 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 1046 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
843} 1047}
844 1048
845static int 1049static int ecb_cold
846coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1050coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
847{ 1051{
848 const char *s = MgPV_nolen_const (mg); 1052 const char *s = MgPV_nolen_const (mg);
849 1053
850 if (*s == '_') 1054 if (*s == '_')
… …
864 } 1068 }
865 1069
866 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0; 1070 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
867} 1071}
868 1072
869static int 1073static int ecb_cold
870coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1074coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
871{ 1075{
872 const char *s = MgPV_nolen_const (mg); 1076 const char *s = MgPV_nolen_const (mg);
873 1077
874 if (*s == '_') 1078 if (*s == '_')
… …
907slf_check_repeat (pTHX_ struct CoroSLF *frame) 1111slf_check_repeat (pTHX_ struct CoroSLF *frame)
908{ 1112{
909 return 1; 1113 return 1;
910} 1114}
911 1115
912static UNOP coro_setup_op; 1116static UNOP init_perl_op;
913 1117
914static void NOINLINE /* noinline to keep it out of the transfer fast path */ 1118ecb_noinline static void /* noinline to keep it out of the transfer fast path */
915coro_setup (pTHX_ struct coro *coro) 1119init_perl (pTHX_ struct coro *coro)
916{ 1120{
917 /* 1121 /*
918 * emulate part of the perl startup here. 1122 * emulate part of the perl startup here.
919 */ 1123 */
920 coro_init_stacks (aTHX); 1124 coro_init_stacks (aTHX);
… …
927 PL_comppad_name_fill = 0; 1131 PL_comppad_name_fill = 0;
928 PL_comppad_name_floor = 0; 1132 PL_comppad_name_floor = 0;
929 PL_curpm = 0; 1133 PL_curpm = 0;
930 PL_curpad = 0; 1134 PL_curpad = 0;
931 PL_localizing = 0; 1135 PL_localizing = 0;
932 PL_dirty = 0;
933 PL_restartop = 0; 1136 PL_restartop = 0;
934#if PERL_VERSION_ATLEAST (5,10,0) 1137#if PERL_VERSION_ATLEAST (5,10,0)
935 PL_parser = 0; 1138 PL_parser = 0;
936#endif 1139#endif
937 PL_hints = 0; 1140 PL_hints = 0;
938 1141
939 /* recreate the die/warn hooks */ 1142 /* recreate the die/warn hooks */
940 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1143 PL_diehook = SvREFCNT_inc (rv_diehook);
941 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1144 PL_warnhook = SvREFCNT_inc (rv_warnhook);
942 1145
943 GvSV (PL_defgv) = newSV (0); 1146 GvSV (PL_defgv) = newSV (0);
944 GvAV (PL_defgv) = coro->args; coro->args = 0; 1147 GvAV (PL_defgv) = coro->args; coro->args = 0;
945 GvSV (PL_errgv) = newSV (0); 1148 GvSV (PL_errgv) = newSV (0);
946 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1149 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
947 GvHV (PL_hintgv) = 0; 1150 GvHV (PL_hintgv) = 0;
… …
967 /* this newly created coroutine might be run on an existing cctx which most 1170 /* this newly created coroutine might be run on an existing cctx which most
968 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here. 1171 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
969 */ 1172 */
970 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1173 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
971 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */ 1174 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
1175 slf_frame.destroy = 0;
972 1176
973 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1177 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */
974 coro_setup_op.op_next = PL_op; 1178 init_perl_op.op_next = PL_op;
975 coro_setup_op.op_type = OP_ENTERSUB; 1179 init_perl_op.op_type = OP_ENTERSUB;
976 coro_setup_op.op_ppaddr = pp_slf; 1180 init_perl_op.op_ppaddr = pp_slf;
977 /* no flags etc. required, as an init function won't be called */ 1181 /* no flags etc. required, as an init function won't be called */
978 1182
979 PL_op = (OP *)&coro_setup_op; 1183 PL_op = (OP *)&init_perl_op;
980 1184
981 /* copy throw, in case it was set before coro_setup */ 1185 /* copy throw, in case it was set before init_perl */
982 CORO_THROW = coro->except; 1186 CORO_THROW = coro->except;
1187
1188 SWAP_SVS (coro);
1189
1190 if (ecb_expect_false (enable_times))
1191 {
1192 coro_times_update ();
1193 coro_times_sub (coro);
1194 }
983} 1195}
984 1196
985static void 1197static void
986coro_unwind_stacks (pTHX) 1198coro_unwind_stacks (pTHX)
987{ 1199{
… …
1002 dounwind (-1); 1214 dounwind (-1);
1003 } 1215 }
1004} 1216}
1005 1217
1006static void 1218static void
1007coro_destruct_perl (pTHX_ struct coro *coro) 1219destroy_perl (pTHX_ struct coro *coro)
1008{ 1220{
1009 SV *svf [9]; 1221 SV *svf [9];
1010 1222
1011 { 1223 {
1224 SV *old_current = SvRV (coro_current);
1012 struct coro *current = SvSTATE_current; 1225 struct coro *current = SvSTATE (old_current);
1013 1226
1014 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack)); 1227 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1015 1228
1016 save_perl (aTHX_ current); 1229 save_perl (aTHX_ current);
1230
1231 /* this will cause transfer_check to croak on block*/
1232 SvRV_set (coro_current, (SV *)coro->hv);
1233
1017 load_perl (aTHX_ coro); 1234 load_perl (aTHX_ coro);
1018 1235
1019 coro_unwind_stacks (aTHX); 1236 coro_unwind_stacks (aTHX);
1237
1238 /* restore swapped sv's */
1239 SWAP_SVS (coro);
1240
1020 coro_destruct_stacks (aTHX); 1241 coro_destruct_stacks (aTHX);
1021 1242
1022 // now save some sv's to be free'd later 1243 /* now save some sv's to be free'd later */
1023 svf [0] = GvSV (PL_defgv); 1244 svf [0] = GvSV (PL_defgv);
1024 svf [1] = (SV *)GvAV (PL_defgv); 1245 svf [1] = (SV *)GvAV (PL_defgv);
1025 svf [2] = GvSV (PL_errgv); 1246 svf [2] = GvSV (PL_errgv);
1026 svf [3] = (SV *)PL_defoutgv; 1247 svf [3] = (SV *)PL_defoutgv;
1027 svf [4] = PL_rs; 1248 svf [4] = PL_rs;
… …
1029 svf [6] = (SV *)GvHV (PL_hintgv); 1250 svf [6] = (SV *)GvHV (PL_hintgv);
1030 svf [7] = PL_diehook; 1251 svf [7] = PL_diehook;
1031 svf [8] = PL_warnhook; 1252 svf [8] = PL_warnhook;
1032 assert (9 == sizeof (svf) / sizeof (*svf)); 1253 assert (9 == sizeof (svf) / sizeof (*svf));
1033 1254
1255 SvRV_set (coro_current, old_current);
1256
1034 load_perl (aTHX_ current); 1257 load_perl (aTHX_ current);
1035 } 1258 }
1036 1259
1037 { 1260 {
1038 int i; 1261 unsigned int i;
1039 1262
1040 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i) 1263 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i)
1041 SvREFCNT_dec (svf [i]); 1264 SvREFCNT_dec (svf [i]);
1042 1265
1043 SvREFCNT_dec (coro->saved_deffh); 1266 SvREFCNT_dec (coro->saved_deffh);
… …
1045 SvREFCNT_dec (coro->invoke_cb); 1268 SvREFCNT_dec (coro->invoke_cb);
1046 SvREFCNT_dec (coro->invoke_av); 1269 SvREFCNT_dec (coro->invoke_av);
1047 } 1270 }
1048} 1271}
1049 1272
1050INLINE void 1273ecb_inline void
1051free_coro_mortal (pTHX) 1274free_coro_mortal (pTHX)
1052{ 1275{
1053 if (expect_true (coro_mortal)) 1276 if (ecb_expect_true (coro_mortal))
1054 { 1277 {
1055 SvREFCNT_dec (coro_mortal); 1278 SvREFCNT_dec ((SV *)coro_mortal);
1056 coro_mortal = 0; 1279 coro_mortal = 0;
1057 } 1280 }
1058} 1281}
1059 1282
1060static int 1283static int
… …
1193 1416
1194 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1417 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1195} 1418}
1196 1419
1197/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1420/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1198static void NOINLINE 1421static void ecb_noinline
1199cctx_prepare (pTHX) 1422cctx_prepare (pTHX)
1200{ 1423{
1201 PL_top_env = &PL_start_env; 1424 PL_top_env = &PL_start_env;
1202 1425
1203 if (cctx_current->flags & CC_TRACE) 1426 if (cctx_current->flags & CC_TRACE)
… …
1214 slf_frame.prepare = slf_prepare_set_stacklevel; 1437 slf_frame.prepare = slf_prepare_set_stacklevel;
1215 slf_frame.check = slf_check_set_stacklevel; 1438 slf_frame.check = slf_check_set_stacklevel;
1216} 1439}
1217 1440
1218/* the tail of transfer: execute stuff we can only do after a transfer */ 1441/* the tail of transfer: execute stuff we can only do after a transfer */
1219INLINE void 1442ecb_inline void
1220transfer_tail (pTHX) 1443transfer_tail (pTHX)
1221{ 1444{
1222 free_coro_mortal (aTHX); 1445 free_coro_mortal (aTHX);
1446}
1447
1448/* try to exit the same way perl's main function would do */
1449/* we do not bother resetting the environment or other things *7
1450/* that are not, uhm, essential */
1451/* this obviously also doesn't work when perl is embedded */
1452static void ecb_noinline ecb_cold
1453perlish_exit (pTHX)
1454{
1455 int exitstatus = perl_destruct (PL_curinterp);
1456 perl_free (PL_curinterp);
1457 exit (exitstatus);
1223} 1458}
1224 1459
1225/* 1460/*
1226 * this is a _very_ stripped down perl interpreter ;) 1461 * this is a _very_ stripped down perl interpreter ;)
1227 */ 1462 */
… …
1249 /* somebody or something will hit me for both perl_run and PL_restartop */ 1484 /* somebody or something will hit me for both perl_run and PL_restartop */
1250 PL_restartop = PL_op; 1485 PL_restartop = PL_op;
1251 perl_run (PL_curinterp); 1486 perl_run (PL_curinterp);
1252 /* 1487 /*
1253 * Unfortunately, there is no way to get at the return values of the 1488 * Unfortunately, there is no way to get at the return values of the
1254 * coro body here, as perl_run destroys these 1489 * coro body here, as perl_run destroys these. Likewise, we cannot catch
1490 * runtime errors here, as this is just a random interpreter, not a thread.
1255 */ 1491 */
1256 1492
1257 /* 1493 /*
1258 * If perl-run returns we assume exit() was being called or the coro 1494 * If perl-run returns we assume exit() was being called or the coro
1259 * fell off the end, which seems to be the only valid (non-bug) 1495 * fell off the end, which seems to be the only valid (non-bug)
1260 * reason for perl_run to return. We try to exit by jumping to the 1496 * reason for perl_run to return. We try to mimic whatever perl is normally
1261 * bootstrap-time "top" top_env, as we cannot restore the "main" 1497 * doing in that case. YMMV.
1262 * coroutine as Coro has no such concept.
1263 * This actually isn't valid with the pthread backend, but OSes requiring
1264 * that backend are too broken to do it in a standards-compliant way.
1265 */ 1498 */
1266 PL_top_env = main_top_env; 1499 perlish_exit (aTHX);
1267 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1268 } 1500 }
1269} 1501}
1270 1502
1271static coro_cctx * 1503static coro_cctx *
1272cctx_new () 1504cctx_new (void)
1273{ 1505{
1274 coro_cctx *cctx; 1506 coro_cctx *cctx;
1275 1507
1276 ++cctx_count; 1508 ++cctx_count;
1277 New (0, cctx, 1, coro_cctx); 1509 New (0, cctx, 1, coro_cctx);
… …
1283 return cctx; 1515 return cctx;
1284} 1516}
1285 1517
1286/* create a new cctx only suitable as source */ 1518/* create a new cctx only suitable as source */
1287static coro_cctx * 1519static coro_cctx *
1288cctx_new_empty () 1520cctx_new_empty (void)
1289{ 1521{
1290 coro_cctx *cctx = cctx_new (); 1522 coro_cctx *cctx = cctx_new ();
1291 1523
1292 cctx->sptr = 0; 1524 cctx->sptr = 0;
1293 coro_create (&cctx->cctx, 0, 0, 0, 0); 1525 coro_create (&cctx->cctx, 0, 0, 0, 0);
… …
1295 return cctx; 1527 return cctx;
1296} 1528}
1297 1529
1298/* create a new cctx suitable as destination/running a perl interpreter */ 1530/* create a new cctx suitable as destination/running a perl interpreter */
1299static coro_cctx * 1531static coro_cctx *
1300cctx_new_run () 1532cctx_new_run (void)
1301{ 1533{
1302 coro_cctx *cctx = cctx_new (); 1534 coro_cctx *cctx = cctx_new ();
1303 void *stack_start; 1535 void *stack_start;
1304 size_t stack_size; 1536 size_t stack_size;
1305 1537
1538#if CORO_FIBER
1539
1540 cctx->ssize = cctx_stacksize * sizeof (long);
1541 cctx->sptr = 0;
1542
1543#else
1544
1306#if HAVE_MMAP 1545 #if HAVE_MMAP
1307 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE; 1546 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1308 /* mmap supposedly does allocate-on-write for us */ 1547 /* mmap supposedly does allocate-on-write for us */
1309 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0); 1548 cctx->sptr = mmap (0, cctx->ssize, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_ANONYMOUS, -1, 0);
1310 1549
1311 if (cctx->sptr != (void *)-1) 1550 if (cctx->sptr != (void *)-1)
1312 { 1551 {
1313 #if CORO_STACKGUARD 1552 #if CORO_STACKGUARD
1314 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE); 1553 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
1315 #endif 1554 #endif
1316 stack_start = (char *)cctx->sptr + CORO_STACKGUARD * PAGESIZE; 1555 stack_start = (char *)cctx->sptr + CORO_STACKGUARD * PAGESIZE;
1317 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE; 1556 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
1318 cctx->flags |= CC_MAPPED; 1557 cctx->flags |= CC_MAPPED;
1319 } 1558 }
1320 else 1559 else
1321#endif 1560 #endif
1322 { 1561 {
1323 cctx->ssize = cctx_stacksize * (long)sizeof (long); 1562 cctx->ssize = cctx_stacksize * (long)sizeof (long);
1324 New (0, cctx->sptr, cctx_stacksize, long); 1563 New (0, cctx->sptr, cctx_stacksize, long);
1325 1564
1326 if (!cctx->sptr) 1565 if (!cctx->sptr)
1327 { 1566 {
1328 perror ("FATAL: unable to allocate stack for coroutine, exiting."); 1567 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1329 _exit (EXIT_FAILURE); 1568 _exit (EXIT_FAILURE);
1330 } 1569 }
1331 1570
1332 stack_start = cctx->sptr; 1571 stack_start = cctx->sptr;
1333 stack_size = cctx->ssize; 1572 stack_size = cctx->ssize;
1334 } 1573 }
1574 #endif
1335 1575
1336 #if CORO_USE_VALGRIND 1576 #if CORO_USE_VALGRIND
1337 cctx->valgrind_id = VALGRIND_STACK_REGISTER ((char *)stack_start, (char *)stack_start + stack_size); 1577 cctx->valgrind_id = VALGRIND_STACK_REGISTER ((char *)stack_start, (char *)stack_start + stack_size);
1338 #endif 1578 #endif
1339 1579
… …
1346cctx_destroy (coro_cctx *cctx) 1586cctx_destroy (coro_cctx *cctx)
1347{ 1587{
1348 if (!cctx) 1588 if (!cctx)
1349 return; 1589 return;
1350 1590
1351 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary? 1591 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1352 1592
1353 --cctx_count; 1593 --cctx_count;
1354 coro_destroy (&cctx->cctx); 1594 coro_destroy (&cctx->cctx);
1355 1595
1356 /* coro_transfer creates new, empty cctx's */ 1596 /* coro_transfer creates new, empty cctx's */
… …
1375#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE)) 1615#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE))
1376 1616
1377static coro_cctx * 1617static coro_cctx *
1378cctx_get (pTHX) 1618cctx_get (pTHX)
1379{ 1619{
1380 while (expect_true (cctx_first)) 1620 while (ecb_expect_true (cctx_first))
1381 { 1621 {
1382 coro_cctx *cctx = cctx_first; 1622 coro_cctx *cctx = cctx_first;
1383 cctx_first = cctx->next; 1623 cctx_first = cctx->next;
1384 --cctx_idle; 1624 --cctx_idle;
1385 1625
1386 if (expect_true (!CCTX_EXPIRED (cctx))) 1626 if (ecb_expect_true (!CCTX_EXPIRED (cctx)))
1387 return cctx; 1627 return cctx;
1388 1628
1389 cctx_destroy (cctx); 1629 cctx_destroy (cctx);
1390 } 1630 }
1391 1631
… …
1396cctx_put (coro_cctx *cctx) 1636cctx_put (coro_cctx *cctx)
1397{ 1637{
1398 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1638 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr));
1399 1639
1400 /* free another cctx if overlimit */ 1640 /* free another cctx if overlimit */
1401 if (expect_false (cctx_idle >= cctx_max_idle)) 1641 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1402 { 1642 {
1403 coro_cctx *first = cctx_first; 1643 coro_cctx *first = cctx_first;
1404 cctx_first = first->next; 1644 cctx_first = first->next;
1405 --cctx_idle; 1645 --cctx_idle;
1406 1646
… …
1417static void 1657static void
1418transfer_check (pTHX_ struct coro *prev, struct coro *next) 1658transfer_check (pTHX_ struct coro *prev, struct coro *next)
1419{ 1659{
1420 /* TODO: throwing up here is considered harmful */ 1660 /* TODO: throwing up here is considered harmful */
1421 1661
1422 if (expect_true (prev != next)) 1662 if (ecb_expect_true (prev != next))
1423 { 1663 {
1424 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1664 if (ecb_expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1425 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,"); 1665 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1426 1666
1427 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED))) 1667 if (ecb_expect_false (next->flags & (CF_RUNNING | CF_ZOMBIE | CF_SUSPENDED)))
1428 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,"); 1668 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1429 1669
1430#if !PERL_VERSION_ATLEAST (5,10,0) 1670#if !PERL_VERSION_ATLEAST (5,10,0)
1431 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1671 if (ecb_expect_false (PL_lex_state != LEX_NOTPARSING))
1432 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,"); 1672 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1433#endif 1673#endif
1434 } 1674 }
1435} 1675}
1436 1676
1437/* always use the TRANSFER macro */ 1677/* always use the TRANSFER macro */
1438static void NOINLINE /* noinline so we have a fixed stackframe */ 1678static void ecb_noinline /* noinline so we have a fixed stackframe */
1439transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1679transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1440{ 1680{
1441 dSTACKLEVEL; 1681 dSTACKLEVEL;
1442 1682
1443 /* sometimes transfer is only called to set idle_sp */ 1683 /* sometimes transfer is only called to set idle_sp */
1444 if (expect_false (!prev)) 1684 if (ecb_expect_false (!prev))
1445 { 1685 {
1446 cctx_current->idle_sp = STACKLEVEL; 1686 cctx_current->idle_sp = STACKLEVEL;
1447 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1687 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1448 } 1688 }
1449 else if (expect_true (prev != next)) 1689 else if (ecb_expect_true (prev != next))
1450 { 1690 {
1451 coro_cctx *cctx_prev; 1691 coro_cctx *cctx_prev;
1452 1692
1453 if (expect_false (prev->flags & CF_NEW)) 1693 if (ecb_expect_false (prev->flags & CF_NEW))
1454 { 1694 {
1455 /* create a new empty/source context */ 1695 /* create a new empty/source context */
1456 prev->flags &= ~CF_NEW; 1696 prev->flags &= ~CF_NEW;
1457 prev->flags |= CF_RUNNING; 1697 prev->flags |= CF_RUNNING;
1458 } 1698 }
… …
1461 next->flags |= CF_RUNNING; 1701 next->flags |= CF_RUNNING;
1462 1702
1463 /* first get rid of the old state */ 1703 /* first get rid of the old state */
1464 save_perl (aTHX_ prev); 1704 save_perl (aTHX_ prev);
1465 1705
1466 if (expect_false (next->flags & CF_NEW)) 1706 if (ecb_expect_false (next->flags & CF_NEW))
1467 { 1707 {
1468 /* need to start coroutine */ 1708 /* need to start coroutine */
1469 next->flags &= ~CF_NEW; 1709 next->flags &= ~CF_NEW;
1470 /* setup coroutine call */ 1710 /* setup coroutine call */
1471 coro_setup (aTHX_ next); 1711 init_perl (aTHX_ next);
1472 } 1712 }
1473 else 1713 else
1474 load_perl (aTHX_ next); 1714 load_perl (aTHX_ next);
1475 1715
1476 /* possibly untie and reuse the cctx */ 1716 /* possibly untie and reuse the cctx */
1477 if (expect_true ( 1717 if (ecb_expect_true (
1478 cctx_current->idle_sp == STACKLEVEL 1718 cctx_current->idle_sp == STACKLEVEL
1479 && !(cctx_current->flags & CC_TRACE) 1719 && !(cctx_current->flags & CC_TRACE)
1480 && !force_cctx 1720 && !force_cctx
1481 )) 1721 ))
1482 { 1722 {
1483 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1723 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */
1484 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te)); 1724 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1485 1725
1486 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */ 1726 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */
1487 /* without this the next cctx_get might destroy the running cctx while still in use */ 1727 /* without this the next cctx_get might destroy the running cctx while still in use */
1488 if (expect_false (CCTX_EXPIRED (cctx_current))) 1728 if (ecb_expect_false (CCTX_EXPIRED (cctx_current)))
1489 if (expect_true (!next->cctx)) 1729 if (ecb_expect_true (!next->cctx))
1490 next->cctx = cctx_get (aTHX); 1730 next->cctx = cctx_get (aTHX);
1491 1731
1492 cctx_put (cctx_current); 1732 cctx_put (cctx_current);
1493 } 1733 }
1494 else 1734 else
1495 prev->cctx = cctx_current; 1735 prev->cctx = cctx_current;
1496 1736
1497 ++next->usecount; 1737 ++next->usecount;
1498 1738
1499 cctx_prev = cctx_current; 1739 cctx_prev = cctx_current;
1500 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX); 1740 cctx_current = ecb_expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1501 1741
1502 next->cctx = 0; 1742 next->cctx = 0;
1503 1743
1504 if (expect_false (cctx_prev != cctx_current)) 1744 if (ecb_expect_false (cctx_prev != cctx_current))
1505 { 1745 {
1506 cctx_prev->top_env = PL_top_env; 1746 cctx_prev->top_env = PL_top_env;
1507 PL_top_env = cctx_current->top_env; 1747 PL_top_env = cctx_current->top_env;
1508 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx); 1748 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1509 } 1749 }
… …
1515#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx)) 1755#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1516#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1756#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1517 1757
1518/** high level stuff ********************************************************/ 1758/** high level stuff ********************************************************/
1519 1759
1760/* this function is actually Coro, not Coro::State, but we call it from here */
1761/* because it is convenient - but it hasn't been declared yet for that reason */
1520static int 1762static void
1763coro_call_on_destroy (pTHX_ struct coro *coro);
1764
1765static void
1521coro_state_destroy (pTHX_ struct coro *coro) 1766coro_state_destroy (pTHX_ struct coro *coro)
1522{ 1767{
1523 if (coro->flags & CF_DESTROYED) 1768 if (coro->flags & CF_ZOMBIE)
1524 return 0; 1769 return;
1525 1770
1526 if (coro->on_destroy && !PL_dirty)
1527 coro->on_destroy (aTHX_ coro); 1771 slf_destroy (aTHX_ coro);
1528 1772
1529 coro->flags |= CF_DESTROYED; 1773 coro->flags |= CF_ZOMBIE;
1530 1774
1531 if (coro->flags & CF_READY) 1775 if (coro->flags & CF_READY)
1532 { 1776 {
1533 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1777 /* reduce nready, as destroying a ready coro effectively unreadies it */
1534 /* alternative: look through all ready queues and remove the coro */ 1778 /* alternative: look through all ready queues and remove the coro */
1535 --coro_nready; 1779 --coro_nready;
1536 } 1780 }
1537 else 1781 else
1538 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1782 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1783
1784 if (coro->next) coro->next->prev = coro->prev;
1785 if (coro->prev) coro->prev->next = coro->next;
1786 if (coro == coro_first) coro_first = coro->next;
1539 1787
1540 if (coro->mainstack 1788 if (coro->mainstack
1541 && coro->mainstack != main_mainstack 1789 && coro->mainstack != main_mainstack
1542 && coro->slot 1790 && coro->slot
1543 && !PL_dirty) 1791 && !PL_dirty)
1544 coro_destruct_perl (aTHX_ coro); 1792 destroy_perl (aTHX_ coro);
1545 1793
1546 cctx_destroy (coro->cctx); 1794 cctx_destroy (coro->cctx);
1547 SvREFCNT_dec (coro->startcv); 1795 SvREFCNT_dec (coro->startcv);
1548 SvREFCNT_dec (coro->args); 1796 SvREFCNT_dec (coro->args);
1797 SvREFCNT_dec (coro->swap_sv);
1549 SvREFCNT_dec (CORO_THROW); 1798 SvREFCNT_dec (CORO_THROW);
1550 1799
1551 if (coro->next) coro->next->prev = coro->prev; 1800 coro_call_on_destroy (aTHX_ coro);
1552 if (coro->prev) coro->prev->next = coro->next;
1553 if (coro == coro_first) coro_first = coro->next;
1554 1801
1555 return 1; 1802 /* more destruction mayhem in coro_state_free */
1556} 1803}
1557 1804
1558static int 1805static int
1559coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1806coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1560{ 1807{
1561 struct coro *coro = (struct coro *)mg->mg_ptr; 1808 struct coro *coro = (struct coro *)mg->mg_ptr;
1562 mg->mg_ptr = 0; 1809 mg->mg_ptr = 0;
1563 1810
1564 coro->hv = 0;
1565
1566 if (--coro->refcnt < 0)
1567 {
1568 coro_state_destroy (aTHX_ coro); 1811 coro_state_destroy (aTHX_ coro);
1812 SvREFCNT_dec (coro->on_destroy);
1813 SvREFCNT_dec (coro->status);
1814
1569 Safefree (coro); 1815 Safefree (coro);
1570 }
1571 1816
1572 return 0; 1817 return 0;
1573} 1818}
1574 1819
1575static int 1820static int ecb_cold
1576coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1821coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1577{ 1822{
1578 struct coro *coro = (struct coro *)mg->mg_ptr; 1823 /* called when perl clones the current process the slow way (windows process emulation) */
1579 1824 /* WE SIMply nuke the pointers in the copy, causing perl to croak */
1580 ++coro->refcnt; 1825 mg->mg_ptr = 0;
1826 mg->mg_virtual = 0;
1581 1827
1582 return 0; 1828 return 0;
1583} 1829}
1584 1830
1585static MGVTBL coro_state_vtbl = { 1831static MGVTBL coro_state_vtbl = {
… …
1608 1854
1609 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1855 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1610 TRANSFER (ta, 1); 1856 TRANSFER (ta, 1);
1611} 1857}
1612 1858
1613/*****************************************************************************/
1614/* gensub: simple closure generation utility */
1615
1616#define GENSUB_ARG CvXSUBANY (cv).any_ptr
1617
1618/* create a closure from XS, returns a code reference */
1619/* the arg can be accessed via GENSUB_ARG from the callback */
1620/* the callback must use dXSARGS/XSRETURN */
1621static SV *
1622gensub (pTHX_ void (*xsub)(pTHX_ CV *), void *arg)
1623{
1624 CV *cv = (CV *)newSV (0);
1625
1626 sv_upgrade ((SV *)cv, SVt_PVCV);
1627
1628 CvANON_on (cv);
1629 CvISXSUB_on (cv);
1630 CvXSUB (cv) = xsub;
1631 GENSUB_ARG = arg;
1632
1633 return newRV_noinc ((SV *)cv);
1634}
1635
1636/** Coro ********************************************************************/ 1859/** Coro ********************************************************************/
1637 1860
1638INLINE void 1861ecb_inline void
1639coro_enq (pTHX_ struct coro *coro) 1862coro_enq (pTHX_ struct coro *coro)
1640{ 1863{
1641 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN]; 1864 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1642 1865
1643 SvREFCNT_inc_NN (coro->hv); 1866 SvREFCNT_inc_NN (coro->hv);
… …
1645 coro->next_ready = 0; 1868 coro->next_ready = 0;
1646 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro; 1869 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1647 ready [1] = coro; 1870 ready [1] = coro;
1648} 1871}
1649 1872
1650INLINE struct coro * 1873ecb_inline struct coro *
1651coro_deq (pTHX) 1874coro_deq (pTHX)
1652{ 1875{
1653 int prio; 1876 int prio;
1654 1877
1655 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; ) 1878 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
… …
1665 } 1888 }
1666 1889
1667 return 0; 1890 return 0;
1668} 1891}
1669 1892
1893static void
1894invoke_sv_ready_hook_helper (void)
1895{
1896 dTHX;
1897 dSP;
1898
1899 ENTER;
1900 SAVETMPS;
1901
1902 PUSHMARK (SP);
1903 PUTBACK;
1904 call_sv (coro_readyhook, G_VOID | G_DISCARD);
1905
1906 FREETMPS;
1907 LEAVE;
1908}
1909
1670static int 1910static int
1671api_ready (pTHX_ SV *coro_sv) 1911api_ready (pTHX_ SV *coro_sv)
1672{ 1912{
1673 struct coro *coro;
1674 SV *sv_hook;
1675 void (*xs_hook)(void);
1676
1677 coro = SvSTATE (coro_sv); 1913 struct coro *coro = SvSTATE (coro_sv);
1678 1914
1679 if (coro->flags & CF_READY) 1915 if (coro->flags & CF_READY)
1680 return 0; 1916 return 0;
1681 1917
1682 coro->flags |= CF_READY; 1918 coro->flags |= CF_READY;
1683 1919
1684 sv_hook = coro_nready ? 0 : coro_readyhook;
1685 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1686
1687 coro_enq (aTHX_ coro); 1920 coro_enq (aTHX_ coro);
1688 ++coro_nready;
1689 1921
1690 if (sv_hook) 1922 if (!coro_nready++)
1691 { 1923 if (coroapi.readyhook)
1692 dSP; 1924 coroapi.readyhook ();
1693
1694 ENTER;
1695 SAVETMPS;
1696
1697 PUSHMARK (SP);
1698 PUTBACK;
1699 call_sv (sv_hook, G_VOID | G_DISCARD);
1700
1701 FREETMPS;
1702 LEAVE;
1703 }
1704
1705 if (xs_hook)
1706 xs_hook ();
1707 1925
1708 return 1; 1926 return 1;
1709} 1927}
1710 1928
1711static int 1929static int
… …
1713{ 1931{
1714 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1932 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1715} 1933}
1716 1934
1717/* expects to own a reference to next->hv */ 1935/* expects to own a reference to next->hv */
1718INLINE void 1936ecb_inline void
1719prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1937prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1720{ 1938{
1721 SV *prev_sv = SvRV (coro_current); 1939 SV *prev_sv = SvRV (coro_current);
1722 1940
1723 ta->prev = SvSTATE_hv (prev_sv); 1941 ta->prev = SvSTATE_hv (prev_sv);
… …
1736{ 1954{
1737 for (;;) 1955 for (;;)
1738 { 1956 {
1739 struct coro *next = coro_deq (aTHX); 1957 struct coro *next = coro_deq (aTHX);
1740 1958
1741 if (expect_true (next)) 1959 if (ecb_expect_true (next))
1742 { 1960 {
1743 /* cannot transfer to destroyed coros, skip and look for next */ 1961 /* cannot transfer to destroyed coros, skip and look for next */
1744 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED))) 1962 if (ecb_expect_false (next->flags & (CF_ZOMBIE | CF_SUSPENDED)))
1745 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */ 1963 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1746 else 1964 else
1747 { 1965 {
1748 next->flags &= ~CF_READY; 1966 next->flags &= ~CF_READY;
1749 --coro_nready; 1967 --coro_nready;
… …
1756 { 1974 {
1757 /* nothing to schedule: call the idle handler */ 1975 /* nothing to schedule: call the idle handler */
1758 if (SvROK (sv_idle) 1976 if (SvROK (sv_idle)
1759 && SvOBJECT (SvRV (sv_idle))) 1977 && SvOBJECT (SvRV (sv_idle)))
1760 { 1978 {
1979 if (SvRV (sv_idle) == SvRV (coro_current))
1980 croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught");
1981
1761 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 1982 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1762 api_ready (aTHX_ SvRV (sv_idle)); 1983 api_ready (aTHX_ SvRV (sv_idle));
1763 --coro_nready; 1984 --coro_nready;
1764 } 1985 }
1765 else 1986 else
1766 { 1987 {
1988 /* TODO: deprecated, remove, cannot work reliably *//*D*/
1767 dSP; 1989 dSP;
1768 1990
1769 ENTER; 1991 ENTER;
1770 SAVETMPS; 1992 SAVETMPS;
1771 1993
… …
1778 } 2000 }
1779 } 2001 }
1780 } 2002 }
1781} 2003}
1782 2004
1783INLINE void 2005ecb_inline void
1784prepare_cede (pTHX_ struct coro_transfer_args *ta) 2006prepare_cede (pTHX_ struct coro_transfer_args *ta)
1785{ 2007{
1786 api_ready (aTHX_ coro_current); 2008 api_ready (aTHX_ coro_current);
1787 prepare_schedule (aTHX_ ta); 2009 prepare_schedule (aTHX_ ta);
1788} 2010}
1789 2011
1790INLINE void 2012ecb_inline void
1791prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 2013prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1792{ 2014{
1793 SV *prev = SvRV (coro_current); 2015 SV *prev = SvRV (coro_current);
1794 2016
1795 if (coro_nready) 2017 if (coro_nready)
… …
1825{ 2047{
1826 struct coro_transfer_args ta; 2048 struct coro_transfer_args ta;
1827 2049
1828 prepare_cede (aTHX_ &ta); 2050 prepare_cede (aTHX_ &ta);
1829 2051
1830 if (expect_true (ta.prev != ta.next)) 2052 if (ecb_expect_true (ta.prev != ta.next))
1831 { 2053 {
1832 TRANSFER (ta, 1); 2054 TRANSFER (ta, 1);
1833 return 1; 2055 return 1;
1834 } 2056 }
1835 else 2057 else
… …
1878 coro->slot->runops = RUNOPS_DEFAULT; 2100 coro->slot->runops = RUNOPS_DEFAULT;
1879 } 2101 }
1880} 2102}
1881 2103
1882static void 2104static void
2105coro_push_av (pTHX_ AV *av, I32 gimme_v)
2106{
2107 if (AvFILLp (av) >= 0 && gimme_v != G_VOID)
2108 {
2109 dSP;
2110
2111 if (gimme_v == G_SCALAR)
2112 XPUSHs (AvARRAY (av)[AvFILLp (av)]);
2113 else
2114 {
2115 int i;
2116 EXTEND (SP, AvFILLp (av) + 1);
2117
2118 for (i = 0; i <= AvFILLp (av); ++i)
2119 PUSHs (AvARRAY (av)[i]);
2120 }
2121
2122 PUTBACK;
2123 }
2124}
2125
2126static void
2127coro_push_on_destroy (pTHX_ struct coro *coro, SV *cb)
2128{
2129 if (!coro->on_destroy)
2130 coro->on_destroy = newAV ();
2131
2132 av_push (coro->on_destroy, cb);
2133}
2134
2135static void
2136slf_destroy_join (pTHX_ struct CoroSLF *frame)
2137{
2138 SvREFCNT_dec ((SV *)((struct coro *)frame->data)->hv);
2139}
2140
2141static int
2142slf_check_join (pTHX_ struct CoroSLF *frame)
2143{
2144 struct coro *coro = (struct coro *)frame->data;
2145
2146 if (!coro->status)
2147 return 1;
2148
2149 frame->destroy = 0;
2150
2151 coro_push_av (aTHX_ coro->status, GIMME_V);
2152
2153 SvREFCNT_dec ((SV *)coro->hv);
2154
2155 return 0;
2156}
2157
2158static void
2159slf_init_join (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2160{
2161 struct coro *coro = SvSTATE (items > 0 ? arg [0] : &PL_sv_undef);
2162
2163 if (items > 1)
2164 croak ("join called with too many arguments");
2165
2166 if (coro->status)
2167 frame->prepare = prepare_nop;
2168 else
2169 {
2170 coro_push_on_destroy (aTHX_ coro, SvREFCNT_inc_NN (SvRV (coro_current)));
2171 frame->prepare = prepare_schedule;
2172 }
2173
2174 frame->check = slf_check_join;
2175 frame->destroy = slf_destroy_join;
2176 frame->data = (void *)coro;
2177 SvREFCNT_inc (coro->hv);
2178}
2179
2180static void
1883coro_call_on_destroy (pTHX_ struct coro *coro) 2181coro_call_on_destroy (pTHX_ struct coro *coro)
1884{ 2182{
1885 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2183 AV *od = coro->on_destroy;
1886 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1887 2184
1888 if (on_destroyp) 2185 if (!od)
1889 { 2186 return;
1890 AV *on_destroy = (AV *)SvRV (*on_destroyp);
1891 2187
1892 while (AvFILLp (on_destroy) >= 0) 2188 while (AvFILLp (od) >= 0)
2189 {
2190 SV *cb = sv_2mortal (av_pop (od));
2191
2192 /* coro hv's (and only hv's at the moment) are supported as well */
2193 if (SvSTATEhv_p (aTHX_ cb))
2194 api_ready (aTHX_ cb);
2195 else
1893 { 2196 {
1894 dSP; /* don't disturb outer sp */ 2197 dSP; /* don't disturb outer sp */
1895 SV *cb = av_pop (on_destroy);
1896
1897 PUSHMARK (SP); 2198 PUSHMARK (SP);
1898 2199
1899 if (statusp) 2200 if (coro->status)
1900 { 2201 {
1901 int i; 2202 PUTBACK;
1902 AV *status = (AV *)SvRV (*statusp); 2203 coro_push_av (aTHX_ coro->status, G_ARRAY);
1903 EXTEND (SP, AvFILLp (status) + 1); 2204 SPAGAIN;
1904
1905 for (i = 0; i <= AvFILLp (status); ++i)
1906 PUSHs (AvARRAY (status)[i]);
1907 } 2205 }
1908 2206
1909 PUTBACK; 2207 PUTBACK;
1910 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD); 2208 call_sv (cb, G_VOID | G_DISCARD);
1911 } 2209 }
1912 } 2210 }
1913} 2211}
1914 2212
1915static void 2213static void
1916slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2214coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
1917{ 2215{
2216 AV *av;
2217
2218 if (coro->status)
2219 {
2220 av = coro->status;
2221 av_clear (av);
2222 }
2223 else
2224 av = coro->status = newAV ();
2225
2226 /* items are actually not so common, so optimise for this case */
2227 if (items)
2228 {
1918 int i; 2229 int i;
1919 HV *hv = (HV *)SvRV (coro_current);
1920 AV *av = newAV ();
1921 2230
1922 av_extend (av, items - 1); 2231 av_extend (av, items - 1);
2232
1923 for (i = 0; i < items; ++i) 2233 for (i = 0; i < items; ++i)
1924 av_push (av, SvREFCNT_inc_NN (arg [i])); 2234 av_push (av, SvREFCNT_inc_NN (arg [i]));
2235 }
2236}
1925 2237
1926 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 2238static void
1927 2239slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2240{
1928 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */ 2241 av_push (av_destroy, (SV *)newRV_inc ((SV *)coro_hv)); /* RVinc for perl */
1929 api_ready (aTHX_ sv_manager); 2242 api_ready (aTHX_ sv_manager);
1930 2243
1931 frame->prepare = prepare_schedule; 2244 frame->prepare = prepare_schedule;
1932 frame->check = slf_check_repeat; 2245 frame->check = slf_check_repeat;
1933 2246
1934 /* as a minor optimisation, we could unwind all stacks here */ 2247 /* as a minor optimisation, we could unwind all stacks here */
1935 /* but that puts extra pressure on pp_slf, and is not worth much */ 2248 /* but that puts extra pressure on pp_slf, and is not worth much */
1936 /*coro_unwind_stacks (aTHX);*/ 2249 /*coro_unwind_stacks (aTHX);*/
2250}
2251
2252static void
2253slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2254{
2255 HV *coro_hv = (HV *)SvRV (coro_current);
2256
2257 coro_set_status (aTHX_ SvSTATE ((SV *)coro_hv), arg, items);
2258 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2259}
2260
2261static void
2262slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2263{
2264 HV *coro_hv;
2265 struct coro *coro;
2266
2267 if (items <= 0)
2268 croak ("Coro::cancel called without coro object,");
2269
2270 coro = SvSTATE (arg [0]);
2271 coro_hv = coro->hv;
2272
2273 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2274
2275 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2276 {
2277 /* coro currently busy cancelling something, so just notify it */
2278 coro->slf_frame.data = (void *)coro;
2279
2280 frame->prepare = prepare_nop;
2281 frame->check = slf_check_nop;
2282 }
2283 else if (coro_hv == (HV *)SvRV (coro_current))
2284 {
2285 /* cancelling the current coro is allowed, and equals terminate */
2286 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2287 }
2288 else
2289 {
2290 struct coro *self = SvSTATE_current;
2291
2292 /* otherwise we cancel directly, purely for speed reasons
2293 * unfortunately, this requires some magic trickery, as
2294 * somebody else could cancel us, so we have to fight the cancellation.
2295 * this is ugly, and hopefully fully worth the extra speed.
2296 * besides, I can't get the slow-but-safe version working...
2297 */
2298 slf_frame.data = 0;
2299 self->flags |= CF_NOCANCEL;
2300 coro_state_destroy (aTHX_ coro);
2301 self->flags &= ~CF_NOCANCEL;
2302
2303 if (slf_frame.data)
2304 {
2305 /* while we were busy we have been cancelled, so terminate */
2306 slf_init_terminate_cancel_common (aTHX_ frame, self->hv);
2307 }
2308 else
2309 {
2310 frame->prepare = prepare_nop;
2311 frame->check = slf_check_nop;
2312 }
2313 }
2314}
2315
2316static int
2317slf_check_safe_cancel (pTHX_ struct CoroSLF *frame)
2318{
2319 frame->prepare = 0;
2320 coro_unwind_stacks (aTHX);
2321
2322 slf_init_terminate_cancel_common (aTHX_ frame, (HV *)SvRV (coro_current));
2323
2324 return 1;
2325}
2326
2327static int
2328safe_cancel (pTHX_ struct coro *coro, SV **arg, int items)
2329{
2330 if (coro->cctx)
2331 croak ("coro inside C callback, unable to cancel at this time, caught");
2332
2333 if (coro->flags & CF_NEW)
2334 {
2335 coro_set_status (aTHX_ coro, arg, items);
2336 coro_state_destroy (aTHX_ coro);
2337 }
2338 else
2339 {
2340 if (!coro->slf_frame.prepare)
2341 croak ("coro outside an SLF function, unable to cancel at this time, caught");
2342
2343 slf_destroy (aTHX_ coro);
2344
2345 coro_set_status (aTHX_ coro, arg, items);
2346 coro->slf_frame.prepare = prepare_nop;
2347 coro->slf_frame.check = slf_check_safe_cancel;
2348
2349 api_ready (aTHX_ (SV *)coro->hv);
2350 }
2351
2352 return 1;
1937} 2353}
1938 2354
1939/*****************************************************************************/ 2355/*****************************************************************************/
1940/* async pool handler */ 2356/* async pool handler */
1941 2357
… …
1972slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2388slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1973{ 2389{
1974 HV *hv = (HV *)SvRV (coro_current); 2390 HV *hv = (HV *)SvRV (coro_current);
1975 struct coro *coro = SvSTATE_hv ((SV *)hv); 2391 struct coro *coro = SvSTATE_hv ((SV *)hv);
1976 2392
1977 if (expect_true (coro->saved_deffh)) 2393 if (ecb_expect_true (coro->saved_deffh))
1978 { 2394 {
1979 /* subsequent iteration */ 2395 /* subsequent iteration */
1980 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2396 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1981 coro->saved_deffh = 0; 2397 coro->saved_deffh = 0;
1982 2398
1983 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 2399 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
1984 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2400 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1985 { 2401 {
1986 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate); 2402 slf_init_terminate_cancel_common (aTHX_ frame, hv);
1987 coro->invoke_av = newAV (); 2403 return;
1988
1989 frame->prepare = prepare_nop;
1990 } 2404 }
1991 else 2405 else
1992 { 2406 {
1993 av_clear (GvAV (PL_defgv)); 2407 av_clear (GvAV (PL_defgv));
1994 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2408 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
… …
2019 2433
2020static void 2434static void
2021coro_rouse_callback (pTHX_ CV *cv) 2435coro_rouse_callback (pTHX_ CV *cv)
2022{ 2436{
2023 dXSARGS; 2437 dXSARGS;
2024 SV *data = (SV *)GENSUB_ARG; 2438 SV *data = (SV *)S_GENSUB_ARG;
2025 2439
2026 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2440 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2027 { 2441 {
2028 /* first call, set args */ 2442 /* first call, set args */
2029 SV *coro = SvRV (data); 2443 SV *coro = SvRV (data);
… …
2044 2458
2045static int 2459static int
2046slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2460slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
2047{ 2461{
2048 SV *data = (SV *)frame->data; 2462 SV *data = (SV *)frame->data;
2049 2463
2050 if (CORO_THROW) 2464 if (CORO_THROW)
2051 return 0; 2465 return 0;
2052 2466
2053 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2467 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2054 return 1; 2468 return 1;
… …
2090 cb = sv_2mortal (coro->rouse_cb); 2504 cb = sv_2mortal (coro->rouse_cb);
2091 coro->rouse_cb = 0; 2505 coro->rouse_cb = 0;
2092 } 2506 }
2093 2507
2094 if (!SvROK (cb) 2508 if (!SvROK (cb)
2095 || SvTYPE (SvRV (cb)) != SVt_PVCV 2509 || SvTYPE (SvRV (cb)) != SVt_PVCV
2096 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2510 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2097 croak ("Coro::rouse_wait called with illegal callback argument,"); 2511 croak ("Coro::rouse_wait called with illegal callback argument,");
2098 2512
2099 { 2513 {
2100 CV *cv = (CV *)SvRV (cb); /* for GENSUB_ARG */ 2514 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
2101 SV *data = (SV *)GENSUB_ARG; 2515 SV *data = (SV *)S_GENSUB_ARG;
2102 2516
2103 frame->data = (void *)data; 2517 frame->data = (void *)data;
2104 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule; 2518 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
2105 frame->check = slf_check_rouse_wait; 2519 frame->check = slf_check_rouse_wait;
2106 } 2520 }
… …
2110coro_new_rouse_cb (pTHX) 2524coro_new_rouse_cb (pTHX)
2111{ 2525{
2112 HV *hv = (HV *)SvRV (coro_current); 2526 HV *hv = (HV *)SvRV (coro_current);
2113 struct coro *coro = SvSTATE_hv (hv); 2527 struct coro *coro = SvSTATE_hv (hv);
2114 SV *data = newRV_inc ((SV *)hv); 2528 SV *data = newRV_inc ((SV *)hv);
2115 SV *cb = gensub (aTHX_ coro_rouse_callback, (void *)data); 2529 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
2116 2530
2117 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0); 2531 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0);
2118 SvREFCNT_dec (data); /* magicext increases the refcount */ 2532 SvREFCNT_dec (data); /* magicext increases the refcount */
2119 2533
2120 SvREFCNT_dec (coro->rouse_cb); 2534 SvREFCNT_dec (coro->rouse_cb);
… …
2217static void 2631static void
2218slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2632slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2219{ 2633{
2220 frame->prepare = prepare_cede_notself; 2634 frame->prepare = prepare_cede_notself;
2221 frame->check = slf_check_nop; 2635 frame->check = slf_check_nop;
2636}
2637
2638/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2639static void
2640slf_destroy (pTHX_ struct coro *coro)
2641{
2642 /* this callback is reserved for slf functions needing to do cleanup */
2643 if (coro->slf_frame.destroy && coro->slf_frame.prepare && !PL_dirty)
2644 coro->slf_frame.destroy (aTHX_ &coro->slf_frame);
2645
2646 /*
2647 * The on_destroy above most likely is from an SLF call.
2648 * Since by definition the SLF call will not finish when we destroy
2649 * the coro, we will have to force-finish it here, otherwise
2650 * cleanup functions cannot call SLF functions.
2651 */
2652 coro->slf_frame.prepare = 0;
2222} 2653}
2223 2654
2224/* 2655/*
2225 * these not obviously related functions are all rolled into one 2656 * these not obviously related functions are all rolled into one
2226 * function to increase chances that they all will call transfer with the same 2657 * function to increase chances that they all will call transfer with the same
… …
2233 I32 checkmark; /* mark SP to see how many elements check has pushed */ 2664 I32 checkmark; /* mark SP to see how many elements check has pushed */
2234 2665
2235 /* set up the slf frame, unless it has already been set-up */ 2666 /* set up the slf frame, unless it has already been set-up */
2236 /* the latter happens when a new coro has been started */ 2667 /* the latter happens when a new coro has been started */
2237 /* or when a new cctx was attached to an existing coroutine */ 2668 /* or when a new cctx was attached to an existing coroutine */
2238 if (expect_true (!slf_frame.prepare)) 2669 if (ecb_expect_true (!slf_frame.prepare))
2239 { 2670 {
2240 /* first iteration */ 2671 /* first iteration */
2241 dSP; 2672 dSP;
2242 SV **arg = PL_stack_base + TOPMARK + 1; 2673 SV **arg = PL_stack_base + TOPMARK + 1;
2243 int items = SP - arg; /* args without function object */ 2674 int items = SP - arg; /* args without function object */
… …
2284 while (slf_frame.check (aTHX_ &slf_frame)); 2715 while (slf_frame.check (aTHX_ &slf_frame));
2285 2716
2286 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */ 2717 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */
2287 2718
2288 /* exception handling */ 2719 /* exception handling */
2289 if (expect_false (CORO_THROW)) 2720 if (ecb_expect_false (CORO_THROW))
2290 { 2721 {
2291 SV *exception = sv_2mortal (CORO_THROW); 2722 SV *exception = sv_2mortal (CORO_THROW);
2292 2723
2293 CORO_THROW = 0; 2724 CORO_THROW = 0;
2294 sv_setsv (ERRSV, exception); 2725 sv_setsv (ERRSV, exception);
2295 croak (0); 2726 croak (0);
2296 } 2727 }
2297 2728
2298 /* return value handling - mostly like entersub */ 2729 /* return value handling - mostly like entersub */
2299 /* make sure we put something on the stack in scalar context */ 2730 /* make sure we put something on the stack in scalar context */
2300 if (GIMME_V == G_SCALAR) 2731 if (GIMME_V == G_SCALAR
2732 && ecb_expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2301 { 2733 {
2302 dSP; 2734 dSP;
2303 SV **bot = PL_stack_base + checkmark; 2735 SV **bot = PL_stack_base + checkmark;
2304 2736
2305 if (sp == bot) /* too few, push undef */ 2737 if (sp == bot) /* too few, push undef */
2306 bot [1] = &PL_sv_undef; 2738 bot [1] = &PL_sv_undef;
2307 else if (sp != bot + 1) /* too many, take last one */ 2739 else /* too many, take last one */
2308 bot [1] = *sp; 2740 bot [1] = *sp;
2309 2741
2310 SP = bot + 1; 2742 SP = bot + 1;
2311 2743
2312 PUTBACK; 2744 PUTBACK;
… …
2345 if (PL_op->op_flags & OPf_STACKED) 2777 if (PL_op->op_flags & OPf_STACKED)
2346 { 2778 {
2347 if (items > slf_arga) 2779 if (items > slf_arga)
2348 { 2780 {
2349 slf_arga = items; 2781 slf_arga = items;
2350 free (slf_argv); 2782 Safefree (slf_argv);
2351 slf_argv = malloc (slf_arga * sizeof (SV *)); 2783 New (0, slf_argv, slf_arga, SV *);
2352 } 2784 }
2353 2785
2354 slf_argc = items; 2786 slf_argc = items;
2355 2787
2356 for (i = 0; i < items; ++i) 2788 for (i = 0; i < items; ++i)
… …
2419{ 2851{
2420 PerlIOBuf base; 2852 PerlIOBuf base;
2421 NV next, every; 2853 NV next, every;
2422} PerlIOCede; 2854} PerlIOCede;
2423 2855
2424static IV 2856static IV ecb_cold
2425PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab) 2857PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab)
2426{ 2858{
2427 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2859 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2428 2860
2429 self->every = SvCUR (arg) ? SvNV (arg) : 0.01; 2861 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
2430 self->next = nvtime () + self->every; 2862 self->next = nvtime () + self->every;
2431 2863
2432 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab); 2864 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
2433} 2865}
2434 2866
2435static SV * 2867static SV * ecb_cold
2436PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags) 2868PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
2437{ 2869{
2438 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2870 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2439 2871
2440 return newSVnv (self->every); 2872 return newSVnv (self->every);
… …
2552 SvREFCNT_dec (cb); 2984 SvREFCNT_dec (cb);
2553 } 2985 }
2554} 2986}
2555 2987
2556static void 2988static void
2557coro_semaphore_on_destroy (pTHX_ struct coro *coro) 2989coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2558{ 2990{
2559 /* call $sem->adjust (0) to possibly wake up some other waiters */ 2991 /* call $sem->adjust (0) to possibly wake up some other waiters */
2560 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 2992 coro_semaphore_adjust (aTHX_ (AV *)frame->data, 0);
2561} 2993}
2562 2994
2563static int 2995static int
2564slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire) 2996slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2565{ 2997{
2566 AV *av = (AV *)frame->data; 2998 AV *av = (AV *)frame->data;
2567 SV *count_sv = AvARRAY (av)[0]; 2999 SV *count_sv = AvARRAY (av)[0];
3000 SV *coro_hv = SvRV (coro_current);
2568 3001
2569 /* if we are about to throw, don't actually acquire the lock, just throw */ 3002 /* if we are about to throw, don't actually acquire the lock, just throw */
2570 if (CORO_THROW) 3003 if (CORO_THROW)
2571 return 0; 3004 return 0;
2572 else if (SvIVX (count_sv) > 0) 3005 else if (SvIVX (count_sv) > 0)
2573 { 3006 {
2574 SvSTATE_current->on_destroy = 0; 3007 frame->destroy = 0;
2575 3008
2576 if (acquire) 3009 if (acquire)
2577 SvIVX (count_sv) = SvIVX (count_sv) - 1; 3010 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2578 else 3011 else
2579 coro_semaphore_adjust (aTHX_ av, 0); 3012 coro_semaphore_adjust (aTHX_ av, 0);
… …
2584 { 3017 {
2585 int i; 3018 int i;
2586 /* if we were woken up but can't down, we look through the whole */ 3019 /* if we were woken up but can't down, we look through the whole */
2587 /* waiters list and only add us if we aren't in there already */ 3020 /* waiters list and only add us if we aren't in there already */
2588 /* this avoids some degenerate memory usage cases */ 3021 /* this avoids some degenerate memory usage cases */
2589 3022 for (i = AvFILLp (av); i > 0; --i) /* i > 0 is not an off-by-one bug */
2590 for (i = 1; i <= AvFILLp (av); ++i)
2591 if (AvARRAY (av)[i] == SvRV (coro_current)) 3023 if (AvARRAY (av)[i] == coro_hv)
2592 return 1; 3024 return 1;
2593 3025
2594 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3026 av_push (av, SvREFCNT_inc (coro_hv));
2595 return 1; 3027 return 1;
2596 } 3028 }
2597} 3029}
2598 3030
2599static int 3031static int
… …
2622 { 3054 {
2623 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3055 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2624 3056
2625 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 3057 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2626 frame->prepare = prepare_schedule; 3058 frame->prepare = prepare_schedule;
2627
2628 /* to avoid race conditions when a woken-up coro gets terminated */ 3059 /* to avoid race conditions when a woken-up coro gets terminated */
2629 /* we arrange for a temporary on_destroy that calls adjust (0) */ 3060 /* we arrange for a temporary on_destroy that calls adjust (0) */
2630 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 3061 frame->destroy = coro_semaphore_destroy;
2631 } 3062 }
2632} 3063}
2633 3064
2634static void 3065static void
2635slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 3066slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
… …
2643{ 3074{
2644 if (items >= 2) 3075 if (items >= 2)
2645 { 3076 {
2646 /* callback form */ 3077 /* callback form */
2647 AV *av = (AV *)SvRV (arg [0]); 3078 AV *av = (AV *)SvRV (arg [0]);
2648 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 3079 SV *cb_cv = s_get_cv_croak (arg [1]);
2649 3080
2650 av_push (av, SvREFCNT_inc_NN (cb_cv)); 3081 av_push (av, SvREFCNT_inc_NN (cb_cv));
2651 3082
2652 if (SvIVX (AvARRAY (av)[0]) > 0) 3083 if (SvIVX (AvARRAY (av)[0]) > 0)
2653 coro_semaphore_adjust (aTHX_ av, 0); 3084 coro_semaphore_adjust (aTHX_ av, 0);
… …
2713{ 3144{
2714 AV *av = (AV *)SvRV (arg [0]); 3145 AV *av = (AV *)SvRV (arg [0]);
2715 3146
2716 if (items >= 2) 3147 if (items >= 2)
2717 { 3148 {
2718 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 3149 SV *cb_cv = s_get_cv_croak (arg [1]);
2719 av_push (av, SvREFCNT_inc_NN (cb_cv)); 3150 av_push (av, SvREFCNT_inc_NN (cb_cv));
2720 3151
2721 if (SvIVX (AvARRAY (av)[0])) 3152 if (SvIVX (AvARRAY (av)[0]))
2722 coro_signal_wake (aTHX_ av, 1); /* ust be the only waiter */ 3153 coro_signal_wake (aTHX_ av, 1); /* must be the only waiter */
2723 3154
2724 frame->prepare = prepare_nop; 3155 frame->prepare = prepare_nop;
2725 frame->check = slf_check_nop; 3156 frame->check = slf_check_nop;
2726 } 3157 }
2727 else if (SvIVX (AvARRAY (av)[0])) 3158 else if (SvIVX (AvARRAY (av)[0]))
… …
2758 3189
2759static void 3190static void
2760coro_aio_callback (pTHX_ CV *cv) 3191coro_aio_callback (pTHX_ CV *cv)
2761{ 3192{
2762 dXSARGS; 3193 dXSARGS;
2763 AV *state = (AV *)GENSUB_ARG; 3194 AV *state = (AV *)S_GENSUB_ARG;
2764 SV *coro = av_pop (state); 3195 SV *coro = av_pop (state);
2765 SV *data_sv = newSV (sizeof (struct io_state)); 3196 SV *data_sv = newSV (sizeof (struct io_state));
2766 3197
2767 av_extend (state, items - 1); 3198 av_extend (state, items - 1);
2768 3199
… …
2853 dSP; 3284 dSP;
2854 3285
2855 static SV *prio_cv; 3286 static SV *prio_cv;
2856 static SV *prio_sv; 3287 static SV *prio_sv;
2857 3288
2858 if (expect_false (!prio_cv)) 3289 if (ecb_expect_false (!prio_cv))
2859 { 3290 {
2860 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0); 3291 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0);
2861 prio_sv = newSViv (0); 3292 prio_sv = newSViv (0);
2862 } 3293 }
2863 3294
… …
2882 3313
2883 for (i = 0; i < items; ++i) 3314 for (i = 0; i < items; ++i)
2884 PUSHs (arg [i]); 3315 PUSHs (arg [i]);
2885 3316
2886 /* now push the callback closure */ 3317 /* now push the callback closure */
2887 PUSHs (sv_2mortal (gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state)))); 3318 PUSHs (sv_2mortal (s_gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state))));
2888 3319
2889 /* now call the AIO function - we assume our request is uncancelable */ 3320 /* now call the AIO function - we assume our request is uncancelable */
2890 PUTBACK; 3321 PUTBACK;
2891 call_sv ((SV *)req, G_VOID | G_DISCARD); 3322 call_sv ((SV *)req, G_VOID | G_DISCARD);
2892 } 3323 }
2893 3324
2894 /* now that the requets is going, we loop toll we have a result */ 3325 /* now that the request is going, we loop till we have a result */
2895 frame->data = (void *)state; 3326 frame->data = (void *)state;
2896 frame->prepare = prepare_schedule; 3327 frame->prepare = prepare_schedule;
2897 frame->check = slf_check_aio_req; 3328 frame->check = slf_check_aio_req;
2898} 3329}
2899 3330
… …
2909 3340
2910/*****************************************************************************/ 3341/*****************************************************************************/
2911 3342
2912#if CORO_CLONE 3343#if CORO_CLONE
2913# include "clone.c" 3344# include "clone.c"
3345#endif
3346
3347/*****************************************************************************/
3348
3349static SV *
3350coro_new (pTHX_ HV *stash, SV **argv, int argc, int is_coro)
3351{
3352 SV *coro_sv;
3353 struct coro *coro;
3354 MAGIC *mg;
3355 HV *hv;
3356 SV *cb;
3357 int i;
3358
3359 if (argc > 0)
3360 {
3361 cb = s_get_cv_croak (argv [0]);
3362
3363 if (!is_coro)
3364 {
3365 if (CvISXSUB (cb))
3366 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
3367
3368 if (!CvROOT (cb))
3369 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
3370 }
3371 }
3372
3373 Newz (0, coro, 1, struct coro);
3374 coro->args = newAV ();
3375 coro->flags = CF_NEW;
3376
3377 if (coro_first) coro_first->prev = coro;
3378 coro->next = coro_first;
3379 coro_first = coro;
3380
3381 coro->hv = hv = newHV ();
3382 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
3383 mg->mg_flags |= MGf_DUP;
3384 coro_sv = sv_bless (newRV_noinc ((SV *)hv), stash);
3385
3386 if (argc > 0)
3387 {
3388 av_extend (coro->args, argc + is_coro - 1);
3389
3390 if (is_coro)
3391 {
3392 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
3393 cb = (SV *)cv_coro_run;
3394 }
3395
3396 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3397
3398 for (i = 1; i < argc; i++)
3399 av_push (coro->args, newSVsv (argv [i]));
3400 }
3401
3402 return coro_sv;
3403}
3404
3405#ifndef __cplusplus
3406ecb_cold XS(boot_Coro__State);
3407#endif
3408
3409#if CORO_JIT
3410
3411static void ecb_noinline ecb_cold
3412pushav_4uv (pTHX_ UV a, UV b, UV c, UV d)
3413{
3414 dSP;
3415 AV *av = newAV ();
3416
3417 av_store (av, 3, newSVuv (d));
3418 av_store (av, 2, newSVuv (c));
3419 av_store (av, 1, newSVuv (b));
3420 av_store (av, 0, newSVuv (a));
3421
3422 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
3423
3424 PUTBACK;
3425}
3426
3427static void ecb_noinline ecb_cold
3428jit_init (pTHX)
3429{
3430 dSP;
3431 SV *load, *save;
3432 char *map_base;
3433 char *load_ptr, *save_ptr;
3434 STRLEN load_len, save_len, map_len;
3435 int count;
3436
3437 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3438
3439 PUSHMARK (SP);
3440 #define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type));
3441 #include "state.h"
3442 count = call_pv ("Coro::State::_jit", G_ARRAY);
3443 SPAGAIN;
3444
3445 save = POPs; save_ptr = SvPVbyte (save, save_len);
3446 load = POPs; load_ptr = SvPVbyte (load, load_len);
3447
3448 map_len = load_len + save_len + 16;
3449
3450 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3451
3452 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3453
3454 load_perl_slots = (load_save_perl_slots_type)map_base;
3455 memcpy (map_base, load_ptr, load_len);
3456
3457 map_base += (load_len + 15) & ~15;
3458
3459 save_perl_slots = (load_save_perl_slots_type)map_base;
3460 memcpy (map_base, save_ptr, save_len);
3461
3462 /* we are good citizens and try to make the page read-only, so the evil evil */
3463 /* hackers might have it a bit more difficult */
3464 mprotect (map_base, map_len, PROT_READ | PROT_EXEC);
3465
3466 PUTBACK;
3467 eval_pv ("undef &Coro::State::_jit", 1);
3468}
3469
2914#endif 3470#endif
2915 3471
2916MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3472MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2917 3473
2918PROTOTYPES: DISABLE 3474PROTOTYPES: DISABLE
… …
2923# if CORO_PTHREAD 3479# if CORO_PTHREAD
2924 coro_thx = PERL_GET_CONTEXT; 3480 coro_thx = PERL_GET_CONTEXT;
2925# endif 3481# endif
2926#endif 3482#endif
2927 BOOT_PAGESIZE; 3483 BOOT_PAGESIZE;
3484
3485 /* perl defines these to check for existance first, but why it doesn't */
3486 /* just create them one at init time is not clear to me, except for */
3487 /* programs trying to delete them, but... */
3488 /* anyway, we declare this as invalid and make sure they are initialised here */
3489 DEFSV;
3490 ERRSV;
2928 3491
2929 cctx_current = cctx_new_empty (); 3492 cctx_current = cctx_new_empty ();
2930 3493
2931 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3494 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
2932 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3495 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
… …
2972 coroapi.prepare_nop = prepare_nop; 3535 coroapi.prepare_nop = prepare_nop;
2973 coroapi.prepare_schedule = prepare_schedule; 3536 coroapi.prepare_schedule = prepare_schedule;
2974 coroapi.prepare_cede = prepare_cede; 3537 coroapi.prepare_cede = prepare_cede;
2975 coroapi.prepare_cede_notself = prepare_cede_notself; 3538 coroapi.prepare_cede_notself = prepare_cede_notself;
2976 3539
2977 { 3540 time_init (aTHX);
2978 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
2979
2980 if (!svp) croak ("Time::HiRes is required");
2981 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
2982
2983 nvtime = INT2PTR (double (*)(), SvIV (*svp));
2984 }
2985 3541
2986 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL)); 3542 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3543#if CORO_JIT
3544 PUTBACK;
3545 jit_init (aTHX);
3546 SPAGAIN;
3547#endif
2987} 3548}
2988 3549
2989SV * 3550SV *
2990new (char *klass, ...) 3551new (SV *klass, ...)
2991 ALIAS: 3552 ALIAS:
2992 Coro::new = 1 3553 Coro::new = 1
2993 CODE: 3554 CODE:
2994{ 3555 RETVAL = coro_new (aTHX_ ix ? coro_stash : coro_state_stash, &ST (1), items - 1, ix);
2995 struct coro *coro; 3556 OUTPUT:
2996 MAGIC *mg;
2997 HV *hv;
2998 CV *cb;
2999 int i;
3000
3001 if (items > 1)
3002 {
3003 cb = coro_sv_2cv (aTHX_ ST (1));
3004
3005 if (!ix)
3006 {
3007 if (CvISXSUB (cb))
3008 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
3009
3010 if (!CvROOT (cb))
3011 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
3012 }
3013 }
3014
3015 Newz (0, coro, 1, struct coro);
3016 coro->args = newAV ();
3017 coro->flags = CF_NEW;
3018
3019 if (coro_first) coro_first->prev = coro;
3020 coro->next = coro_first;
3021 coro_first = coro;
3022
3023 coro->hv = hv = newHV ();
3024 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
3025 mg->mg_flags |= MGf_DUP;
3026 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
3027
3028 if (items > 1)
3029 {
3030 av_extend (coro->args, items - 1 + ix - 1);
3031
3032 if (ix)
3033 {
3034 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
3035 cb = cv_coro_run;
3036 }
3037
3038 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3039
3040 for (i = 2; i < items; i++)
3041 av_push (coro->args, newSVsv (ST (i)));
3042 }
3043}
3044 OUTPUT:
3045 RETVAL 3557 RETVAL
3046 3558
3047void 3559void
3048transfer (...) 3560transfer (...)
3049 PROTOTYPE: $$ 3561 PROTOTYPE: $$
3050 CODE: 3562 CODE:
3051 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3563 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3052
3053bool
3054_destroy (SV *coro_sv)
3055 CODE:
3056 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
3057 OUTPUT:
3058 RETVAL
3059 3564
3060void 3565void
3061_exit (int code) 3566_exit (int code)
3062 PROTOTYPE: $ 3567 PROTOTYPE: $
3063 CODE: 3568 CODE:
… …
3124void 3629void
3125list () 3630list ()
3126 PROTOTYPE: 3631 PROTOTYPE:
3127 PPCODE: 3632 PPCODE:
3128{ 3633{
3129 struct coro *coro; 3634 struct coro *coro;
3130 for (coro = coro_first; coro; coro = coro->next) 3635 for (coro = coro_first; coro; coro = coro->next)
3131 if (coro->hv) 3636 if (coro->hv)
3132 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 3637 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
3133} 3638}
3134 3639
… …
3139 CODE: 3644 CODE:
3140{ 3645{
3141 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3646 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
3142 { 3647 {
3143 struct coro *current = SvSTATE_current; 3648 struct coro *current = SvSTATE_current;
3649 struct CoroSLF slf_save;
3144 3650
3145 if (current != coro) 3651 if (current != coro)
3146 { 3652 {
3147 PUTBACK; 3653 PUTBACK;
3148 save_perl (aTHX_ current); 3654 save_perl (aTHX_ current);
3149 load_perl (aTHX_ coro); 3655 load_perl (aTHX_ coro);
3656 /* the coro is most likely in an active SLF call.
3657 * while not strictly required (the code we execute is
3658 * not allowed to call any SLF functions), it's cleaner
3659 * to reinitialise the slf_frame and restore it later.
3660 * This might one day allow us to actually do SLF calls
3661 * from code executed here.
3662 */
3663 slf_save = slf_frame;
3664 slf_frame.prepare = 0;
3150 SPAGAIN; 3665 SPAGAIN;
3151 } 3666 }
3152 3667
3153 PUSHSTACK; 3668 PUSHSTACK;
3154 3669
… …
3164 SPAGAIN; 3679 SPAGAIN;
3165 3680
3166 if (current != coro) 3681 if (current != coro)
3167 { 3682 {
3168 PUTBACK; 3683 PUTBACK;
3684 slf_frame = slf_save;
3169 save_perl (aTHX_ coro); 3685 save_perl (aTHX_ coro);
3170 load_perl (aTHX_ current); 3686 load_perl (aTHX_ current);
3171 SPAGAIN; 3687 SPAGAIN;
3172 } 3688 }
3173 } 3689 }
… …
3178 PROTOTYPE: $ 3694 PROTOTYPE: $
3179 ALIAS: 3695 ALIAS:
3180 is_ready = CF_READY 3696 is_ready = CF_READY
3181 is_running = CF_RUNNING 3697 is_running = CF_RUNNING
3182 is_new = CF_NEW 3698 is_new = CF_NEW
3183 is_destroyed = CF_DESTROYED 3699 is_destroyed = CF_ZOMBIE
3700 is_zombie = CF_ZOMBIE
3184 is_suspended = CF_SUSPENDED 3701 is_suspended = CF_SUSPENDED
3185 CODE: 3702 CODE:
3186 RETVAL = boolSV (coro->flags & ix); 3703 RETVAL = boolSV (coro->flags & ix);
3187 OUTPUT: 3704 OUTPUT:
3188 RETVAL 3705 RETVAL
3189 3706
3190void 3707void
3191throw (Coro::State self, SV *throw = &PL_sv_undef) 3708throw (SV *self, SV *exception = &PL_sv_undef)
3192 PROTOTYPE: $;$ 3709 PROTOTYPE: $;$
3193 CODE: 3710 CODE:
3194{ 3711{
3712 struct coro *coro = SvSTATE (self);
3195 struct coro *current = SvSTATE_current; 3713 struct coro *current = SvSTATE_current;
3196 SV **throwp = self == current ? &CORO_THROW : &self->except; 3714 SV **exceptionp = coro == current ? &CORO_THROW : &coro->except;
3197 SvREFCNT_dec (*throwp); 3715 SvREFCNT_dec (*exceptionp);
3198 SvGETMAGIC (throw); 3716 SvGETMAGIC (exception);
3199 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3717 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3718
3719 api_ready (aTHX_ self);
3200} 3720}
3201 3721
3202void 3722void
3203api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3723api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3204 PROTOTYPE: $;$ 3724 PROTOTYPE: $;$
… …
3259 3779
3260void 3780void
3261cancel (Coro::State self) 3781cancel (Coro::State self)
3262 CODE: 3782 CODE:
3263 coro_state_destroy (aTHX_ self); 3783 coro_state_destroy (aTHX_ self);
3264 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */ 3784
3785SV *
3786enable_times (int enabled = enable_times)
3787 CODE:
3788{
3789 RETVAL = boolSV (enable_times);
3790
3791 if (enabled != enable_times)
3792 {
3793 enable_times = enabled;
3794
3795 coro_times_update ();
3796 (enabled ? coro_times_sub : coro_times_add)(SvSTATE (coro_current));
3797 }
3798}
3799 OUTPUT:
3800 RETVAL
3801
3802void
3803times (Coro::State self)
3804 PPCODE:
3805{
3806 struct coro *current = SvSTATE (coro_current);
3807
3808 if (ecb_expect_false (current == self))
3809 {
3810 coro_times_update ();
3811 coro_times_add (SvSTATE (coro_current));
3812 }
3813
3814 EXTEND (SP, 2);
3815 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3816 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3817
3818 if (ecb_expect_false (current == self))
3819 coro_times_sub (SvSTATE (coro_current));
3820}
3821
3822void
3823swap_sv (Coro::State coro, SV *sv, SV *swapsv)
3824 CODE:
3825{
3826 struct coro *current = SvSTATE_current;
3827
3828 if (current == coro)
3829 SWAP_SVS (current);
3830
3831 if (!coro->swap_sv)
3832 coro->swap_sv = newAV ();
3833
3834 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv )));
3835 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv)));
3836
3837 if (current == coro)
3838 SWAP_SVS (current);
3839}
3265 3840
3266 3841
3267MODULE = Coro::State PACKAGE = Coro 3842MODULE = Coro::State PACKAGE = Coro
3268 3843
3269BOOT: 3844BOOT:
3270{ 3845{
3271 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3846 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3272 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3847 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3273 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 3848 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3274 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3275 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 3849 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3276 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 3850 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3277 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 3851 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3278 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 3852 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3279 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 3853 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3280 3854
3281 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3855 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3282 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3856 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3283 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 3857 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3284 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new); 3858 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3285 3859
3286 coro_stash = gv_stashpv ("Coro", TRUE); 3860 coro_stash = gv_stashpv ("Coro", TRUE);
3287 3861
3288 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 3862 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3289 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 3863 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
… …
3308 sv_setiv (sv, (IV)&coroapi); 3882 sv_setiv (sv, (IV)&coroapi);
3309 SvREADONLY_on (sv); 3883 SvREADONLY_on (sv);
3310 } 3884 }
3311} 3885}
3312 3886
3887SV *
3888async (...)
3889 PROTOTYPE: &@
3890 CODE:
3891 RETVAL = coro_new (aTHX_ coro_stash, &ST (0), items, 1);
3892 api_ready (aTHX_ RETVAL);
3893 OUTPUT:
3894 RETVAL
3895
3896void
3897_destroy (Coro::State coro)
3898 CODE:
3899 /* used by the manager thread */
3900 coro_state_destroy (aTHX_ coro);
3901
3902void
3903on_destroy (Coro::State coro, SV *cb)
3904 CODE:
3905 coro_push_on_destroy (aTHX_ coro, newSVsv (cb));
3906
3907void
3908join (...)
3909 CODE:
3910 CORO_EXECUTE_SLF_XS (slf_init_join);
3911
3313void 3912void
3314terminate (...) 3913terminate (...)
3315 CODE: 3914 CODE:
3316 CORO_EXECUTE_SLF_XS (slf_init_terminate); 3915 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3916
3917void
3918cancel (...)
3919 CODE:
3920 CORO_EXECUTE_SLF_XS (slf_init_cancel);
3921
3922int
3923safe_cancel (Coro::State self, ...)
3924 C_ARGS: aTHX_ self, &ST (1), items - 1
3317 3925
3318void 3926void
3319schedule (...) 3927schedule (...)
3320 CODE: 3928 CODE:
3321 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3929 CORO_EXECUTE_SLF_XS (slf_init_schedule);
… …
3351_set_readyhook (SV *hook) 3959_set_readyhook (SV *hook)
3352 PROTOTYPE: $ 3960 PROTOTYPE: $
3353 CODE: 3961 CODE:
3354 SvREFCNT_dec (coro_readyhook); 3962 SvREFCNT_dec (coro_readyhook);
3355 SvGETMAGIC (hook); 3963 SvGETMAGIC (hook);
3964 if (SvOK (hook))
3965 {
3356 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0; 3966 coro_readyhook = newSVsv (hook);
3967 CORO_READYHOOK = invoke_sv_ready_hook_helper;
3968 }
3969 else
3970 {
3971 coro_readyhook = 0;
3972 CORO_READYHOOK = 0;
3973 }
3357 3974
3358int 3975int
3359prio (Coro::State coro, int newprio = 0) 3976prio (Coro::State coro, int newprio = 0)
3360 PROTOTYPE: $;$ 3977 PROTOTYPE: $;$
3361 ALIAS: 3978 ALIAS:
… …
3367 if (items > 1) 3984 if (items > 1)
3368 { 3985 {
3369 if (ix) 3986 if (ix)
3370 newprio = coro->prio - newprio; 3987 newprio = coro->prio - newprio;
3371 3988
3372 if (newprio < PRIO_MIN) newprio = PRIO_MIN; 3989 if (newprio < CORO_PRIO_MIN) newprio = CORO_PRIO_MIN;
3373 if (newprio > PRIO_MAX) newprio = PRIO_MAX; 3990 if (newprio > CORO_PRIO_MAX) newprio = CORO_PRIO_MAX;
3374 3991
3375 coro->prio = newprio; 3992 coro->prio = newprio;
3376 } 3993 }
3377} 3994}
3378 OUTPUT: 3995 OUTPUT:
… …
3425 for (i = 1; i < items; ++i) 4042 for (i = 1; i < items; ++i)
3426 av_push (av, SvREFCNT_inc_NN (ST (i))); 4043 av_push (av, SvREFCNT_inc_NN (ST (i)));
3427 4044
3428 if ((SV *)hv == &PL_sv_undef) 4045 if ((SV *)hv == &PL_sv_undef)
3429 { 4046 {
3430 PUSHMARK (SP); 4047 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3431 EXTEND (SP, 2);
3432 PUSHs (sv_Coro);
3433 PUSHs ((SV *)cv_pool_handler);
3434 PUTBACK;
3435 call_sv ((SV *)cv_coro_state_new, G_SCALAR);
3436 SPAGAIN;
3437
3438 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs)); 4048 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
4049 SvREFCNT_dec (sv);
3439 } 4050 }
3440 4051
3441 { 4052 {
3442 struct coro *coro = SvSTATE_hv (hv); 4053 struct coro *coro = SvSTATE_hv (hv);
3443 4054
… …
3475 on_leave = 1 4086 on_leave = 1
3476 PROTOTYPE: & 4087 PROTOTYPE: &
3477 CODE: 4088 CODE:
3478{ 4089{
3479 struct coro *coro = SvSTATE_current; 4090 struct coro *coro = SvSTATE_current;
3480 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 4091 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3481 4092
3482 block = (SV *)coro_sv_2cv (aTHX_ block); 4093 block = s_get_cv_croak (block);
3483 4094
3484 if (!*avp) 4095 if (!*avp)
3485 *avp = newAV (); 4096 *avp = newAV ();
3486 4097
3487 av_push (*avp, SvREFCNT_inc (block)); 4098 av_push (*avp, SvREFCNT_inc (block));
… …
3505 4116
3506SV * 4117SV *
3507new (SV *klass, SV *count = 0) 4118new (SV *klass, SV *count = 0)
3508 CODE: 4119 CODE:
3509{ 4120{
3510 int semcnt = 1; 4121 int semcnt = 1;
3511 4122
3512 if (count) 4123 if (count)
3513 { 4124 {
3514 SvGETMAGIC (count); 4125 SvGETMAGIC (count);
3515 4126
… …
3575 XSRETURN_NO; 4186 XSRETURN_NO;
3576} 4187}
3577 4188
3578void 4189void
3579waiters (SV *self) 4190waiters (SV *self)
3580 PPCODE: 4191 PPCODE:
3581{ 4192{
3582 AV *av = (AV *)SvRV (self); 4193 AV *av = (AV *)SvRV (self);
3583 int wcount = AvFILLp (av) + 1 - 1; 4194 int wcount = AvFILLp (av) + 1 - 1;
3584 4195
3585 if (GIMME_V == G_SCALAR) 4196 if (GIMME_V == G_SCALAR)
… …
3594} 4205}
3595 4206
3596MODULE = Coro::State PACKAGE = Coro::SemaphoreSet 4207MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3597 4208
3598void 4209void
3599_may_delete (SV *sem, int count, int extra_refs) 4210_may_delete (SV *sem, int count, unsigned int extra_refs)
3600 PPCODE: 4211 PPCODE:
3601{ 4212{
3602 AV *av = (AV *)SvRV (sem); 4213 AV *av = (AV *)SvRV (sem);
3603 4214
3604 if (SvREFCNT ((SV *)av) == 1 + extra_refs 4215 if (SvREFCNT ((SV *)av) == 1 + extra_refs
3605 && AvFILLp (av) == 0 /* no waiters, just count */ 4216 && AvFILLp (av) == 0 /* no waiters, just count */
3606 && SvIV (AvARRAY (av)[0]) == count) 4217 && SvIV (AvARRAY (av)[0]) == count)
3607 XSRETURN_YES; 4218 XSRETURN_YES;
… …
3628 4239
3629void 4240void
3630broadcast (SV *self) 4241broadcast (SV *self)
3631 CODE: 4242 CODE:
3632{ 4243{
3633 AV *av = (AV *)SvRV (self); 4244 AV *av = (AV *)SvRV (self);
3634 coro_signal_wake (aTHX_ av, AvFILLp (av)); 4245 coro_signal_wake (aTHX_ av, AvFILLp (av));
3635} 4246}
3636 4247
3637void 4248void
3638send (SV *self) 4249send (SV *self)
… …
3646 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */ 4257 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
3647} 4258}
3648 4259
3649IV 4260IV
3650awaited (SV *self) 4261awaited (SV *self)
3651 CODE: 4262 CODE:
3652 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1; 4263 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
3653 OUTPUT: 4264 OUTPUT:
3654 RETVAL 4265 RETVAL
3655 4266
3656 4267
… …
3661 4272
3662void 4273void
3663_schedule (...) 4274_schedule (...)
3664 CODE: 4275 CODE:
3665{ 4276{
3666 static int incede; 4277 static int incede;
3667 4278
3668 api_cede_notself (aTHX); 4279 api_cede_notself (aTHX);
3669 4280
3670 ++incede; 4281 ++incede;
3671 while (coro_nready >= incede && api_cede (aTHX)) 4282 while (coro_nready >= incede && api_cede (aTHX))
… …
3687 4298
3688void 4299void
3689_register (char *target, char *proto, SV *req) 4300_register (char *target, char *proto, SV *req)
3690 CODE: 4301 CODE:
3691{ 4302{
3692 CV *req_cv = coro_sv_2cv (aTHX_ req); 4303 SV *req_cv = s_get_cv_croak (req);
3693 /* newXSproto doesn't return the CV on 5.8 */ 4304 /* newXSproto doesn't return the CV on 5.8 */
3694 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 4305 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3695 sv_setpv ((SV *)slf_cv, proto); 4306 sv_setpv ((SV *)slf_cv, proto);
3696 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0); 4307 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
3697} 4308}
3698 4309
4310MODULE = Coro::State PACKAGE = Coro::Select
4311
4312void
4313patch_pp_sselect ()
4314 CODE:
4315 if (!coro_old_pp_sselect)
4316 {
4317 coro_select_select = (SV *)get_cv ("Coro::Select::select", 0);
4318 coro_old_pp_sselect = PL_ppaddr [OP_SSELECT];
4319 PL_ppaddr [OP_SSELECT] = coro_pp_sselect;
4320 }
4321
4322void
4323unpatch_pp_sselect ()
4324 CODE:
4325 if (coro_old_pp_sselect)
4326 {
4327 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
4328 coro_old_pp_sselect = 0;
4329 }
4330

Diff Legend

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