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.357 by root, Sat Jun 27 14:09:28 2009 UTC vs.
Revision 1.425 by root, Wed Dec 5 00:14:22 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
160static void *coro_thx; 121static void *coro_thx;
161# endif 122# endif
162#endif 123#endif
163 124
125#ifdef __linux
126# include <time.h> /* for timespec */
127# include <syscall.h> /* for SYS_* */
128# ifdef SYS_clock_gettime
129# define coro_clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
130# define CORO_CLOCK_MONOTONIC 1
131# define CORO_CLOCK_THREAD_CPUTIME_ID 3
132# endif
133#endif
134
164static 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]);
165 137
166/* we hijack an hopefully unused CV flag for our purposes */ 138/* we hijack an hopefully unused CV flag for our purposes */
167#define CVf_SLF 0x4000 139#define CVf_SLF 0x4000
168static OP *pp_slf (pTHX); 140static OP *pp_slf (pTHX);
141static void slf_destroy (pTHX_ struct coro *coro);
169 142
170static U32 cctx_gen; 143static U32 cctx_gen;
171static size_t cctx_stacksize = CORO_STACKSIZE; 144static size_t cctx_stacksize = CORO_STACKSIZE;
172static struct CoroAPI coroapi; 145static struct CoroAPI coroapi;
173static AV *main_mainstack; /* used to differentiate between $main and others */ 146static AV *main_mainstack; /* used to differentiate between $main and others */
… …
190static SV *sv_pool_size; 163static SV *sv_pool_size;
191static SV *sv_async_pool_idle; /* description string */ 164static SV *sv_async_pool_idle; /* description string */
192static AV *av_async_pool; /* idle pool */ 165static AV *av_async_pool; /* idle pool */
193static SV *sv_Coro; /* class string */ 166static SV *sv_Coro; /* class string */
194static CV *cv_pool_handler; 167static CV *cv_pool_handler;
195static CV *cv_coro_state_new;
196 168
197/* Coro::AnyEvent */ 169/* Coro::AnyEvent */
198static SV *sv_activity; 170static SV *sv_activity;
199 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
200static struct coro_cctx *cctx_first; 178static struct coro_cctx *cctx_first;
201static int cctx_count, cctx_idle; 179static int cctx_count, cctx_idle;
202 180
203enum { 181enum
182{
204 CC_MAPPED = 0x01, 183 CC_MAPPED = 0x01,
205 CC_NOREUSE = 0x02, /* throw this away after tracing */ 184 CC_NOREUSE = 0x02, /* throw this away after tracing */
206 CC_TRACE = 0x04, 185 CC_TRACE = 0x04,
207 CC_TRACE_SUB = 0x08, /* trace sub calls */ 186 CC_TRACE_SUB = 0x08, /* trace sub calls */
208 CC_TRACE_LINE = 0x10, /* trace each statement */ 187 CC_TRACE_LINE = 0x10, /* trace each statement */
… …
218 void *sptr; 197 void *sptr;
219 size_t ssize; 198 size_t ssize;
220 199
221 /* cpu state */ 200 /* cpu state */
222 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
223 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
224 JMPENV *top_env; 205 JMPENV *top_env;
225 coro_context cctx; 206 coro_context cctx;
226 207
227 U32 gen; 208 U32 gen;
228#if CORO_USE_VALGRIND 209#if CORO_USE_VALGRIND
229 int valgrind_id; 210 int valgrind_id;
230#endif 211#endif
231 unsigned char flags; 212 unsigned char flags;
232} coro_cctx; 213} coro_cctx;
233 214
234coro_cctx *cctx_current; /* the currently running cctx */ 215static coro_cctx *cctx_current; /* the currently running cctx */
235 216
236/*****************************************************************************/ 217/*****************************************************************************/
237 218
219static MGVTBL coro_state_vtbl;
220
238enum { 221enum
222{
239 CF_RUNNING = 0x0001, /* coroutine is running */ 223 CF_RUNNING = 0x0001, /* coroutine is running */
240 CF_READY = 0x0002, /* coroutine is ready */ 224 CF_READY = 0x0002, /* coroutine is ready */
241 CF_NEW = 0x0004, /* has never been switched to */ 225 CF_NEW = 0x0004, /* has never been switched to */
242 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 226 CF_ZOMBIE = 0x0008, /* coroutine data has been freed */
243 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) */
244}; 229};
245 230
246/* 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 */
247typedef struct 232typedef struct
248{ 233{
249 SV *defsv;
250 AV *defav;
251 SV *errsv;
252 SV *irsgv;
253 HV *hinthv;
254#define VAR(name,type) type name; 234 #define VARx(name,expr,type) type name;
255# include "state.h" 235 #include "state.h"
256#undef VAR
257} perl_slots; 236} perl_slots;
258 237
238/* how many context stack entries do we need for perl_slots */
259#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))
260 240
261/* this is a structure representing a perl-level coroutine */ 241/* this is a structure representing a perl-level coroutine */
262struct coro { 242struct coro
243{
263 /* the C coroutine allocated to this perl coroutine, if any */ 244 /* the C coroutine allocated to this perl coroutine, if any */
264 coro_cctx *cctx; 245 coro_cctx *cctx;
265 246
266 /* ready queue */ 247 /* ready queue */
267 struct coro *next_ready; 248 struct coro *next_ready;
… …
269 /* state data */ 250 /* state data */
270 struct CoroSLF slf_frame; /* saved slf frame */ 251 struct CoroSLF slf_frame; /* saved slf frame */
271 AV *mainstack; 252 AV *mainstack;
272 perl_slots *slot; /* basically the saved sp */ 253 perl_slots *slot; /* basically the saved sp */
273 254
274 CV *startcv; /* the CV to execute */ 255 CV *startcv; /* the CV to execute */
275 AV *args; /* data associated with this coroutine (initial args) */ 256 AV *args; /* data associated with this coroutine (initial args) */
276 int refcnt; /* coroutines are refcounted, yes */
277 int flags; /* CF_ flags */ 257 int flags; /* CF_ flags */
278 HV *hv; /* the perl hash associated with this coro, if any */ 258 HV *hv; /* the perl hash associated with this coro, if any */
279 void (*on_destroy)(pTHX_ struct coro *coro);
280 259
281 /* statistics */ 260 /* statistics */
282 int usecount; /* number of transfers to this coro */ 261 int usecount; /* number of transfers to this coro */
283 262
284 /* coro process data */ 263 /* coro process data */
285 int prio; 264 int prio;
286 SV *except; /* exception to be thrown */ 265 SV *except; /* exception to be thrown */
287 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 */
288 269
289 /* async_pool */ 270 /* async_pool */
290 SV *saved_deffh; 271 SV *saved_deffh;
291 SV *invoke_cb; 272 SV *invoke_cb;
292 AV *invoke_av; 273 AV *invoke_av;
293 274
294 /* on_enter/on_leave */ 275 /* on_enter/on_leave */
295 AV *on_enter; 276 AV *on_enter;
296 AV *on_leave; 277 AV *on_leave;
297 278
279 /* swap_sv */
280 AV *swap_sv;
281
282 /* times */
283 coro_ts t_cpu, t_real;
284
298 /* linked list */ 285 /* linked list */
299 struct coro *next, *prev; 286 struct coro *next, *prev;
300}; 287};
301 288
302typedef struct coro *Coro__State; 289typedef struct coro *Coro__State;
303typedef struct coro *Coro__State_or_hashref; 290typedef struct coro *Coro__State_or_hashref;
304 291
305/* the following variables are effectively part of the perl context */ 292/* the following variables are effectively part of the perl context */
306/* and get copied between struct coro and these variables */ 293/* and get copied between struct coro and these variables */
307/* the mainr easonw e don't support windows process emulation */ 294/* the main reason we don't support windows process emulation */
308static struct CoroSLF slf_frame; /* the current slf frame */ 295static struct CoroSLF slf_frame; /* the current slf frame */
309 296
310/** Coro ********************************************************************/ 297/** Coro ********************************************************************/
311 298
312#define PRIO_MAX 3 299#define CORO_PRIO_MAX 3
313#define PRIO_HIGH 1 300#define CORO_PRIO_HIGH 1
314#define PRIO_NORMAL 0 301#define CORO_PRIO_NORMAL 0
315#define PRIO_LOW -1 302#define CORO_PRIO_LOW -1
316#define PRIO_IDLE -3 303#define CORO_PRIO_IDLE -3
317#define PRIO_MIN -4 304#define CORO_PRIO_MIN -4
318 305
319/* for Coro.pm */ 306/* for Coro.pm */
320static SV *coro_current; 307static SV *coro_current;
321static SV *coro_readyhook; 308static SV *coro_readyhook;
322static struct coro *coro_ready [PRIO_MAX - PRIO_MIN + 1][2]; /* head|tail */ 309static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
323static CV *cv_coro_run, *cv_coro_terminate; 310static CV *cv_coro_run;
324static struct coro *coro_first; 311static struct coro *coro_first;
325#define coro_nready coroapi.nready 312#define coro_nready coroapi.nready
326 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
327/** lowlevel stuff **********************************************************/ 409/** lowlevel stuff **********************************************************/
328 410
329static SV * 411static SV * ecb_noinline
330coro_get_sv (pTHX_ const char *name, int create) 412coro_get_sv (pTHX_ const char *name, int create)
331{ 413{
332#if PERL_VERSION_ATLEAST (5,10,0) 414#if PERL_VERSION_ATLEAST (5,10,0)
333 /* 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 */
334 get_sv (name, create); 416 get_sv (name, create);
335#endif 417#endif
336 return get_sv (name, create); 418 return get_sv (name, create);
337} 419}
338 420
339static AV * 421static AV * ecb_noinline
340coro_get_av (pTHX_ const char *name, int create) 422coro_get_av (pTHX_ const char *name, int create)
341{ 423{
342#if PERL_VERSION_ATLEAST (5,10,0) 424#if PERL_VERSION_ATLEAST (5,10,0)
343 /* 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 */
344 get_av (name, create); 426 get_av (name, create);
345#endif 427#endif
346 return get_av (name, create); 428 return get_av (name, create);
347} 429}
348 430
349static HV * 431static HV * ecb_noinline
350coro_get_hv (pTHX_ const char *name, int create) 432coro_get_hv (pTHX_ const char *name, int create)
351{ 433{
352#if PERL_VERSION_ATLEAST (5,10,0) 434#if PERL_VERSION_ATLEAST (5,10,0)
353 /* 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 */
354 get_hv (name, create); 436 get_hv (name, create);
355#endif 437#endif
356 return get_hv (name, create); 438 return get_hv (name, create);
357} 439}
358 440
359/* may croak */ 441ecb_inline void
360INLINE CV * 442coro_times_update (void)
361coro_sv_2cv (pTHX_ SV *sv)
362{ 443{
363 HV *st; 444#ifdef coro_clock_gettime
364 GV *gvp; 445 struct timespec ts;
365 CV *cv = sv_2cv (sv, &st, &gvp, 0);
366 446
367 if (!cv) 447 ts.tv_sec = ts.tv_nsec = 0;
368 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;
369 450
370 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];
371} 486}
372 487
373/*****************************************************************************/ 488/*****************************************************************************/
374/* magic glue */ 489/* magic glue */
375 490
376#define CORO_MAGIC_type_cv 26 491#define CORO_MAGIC_type_cv 26
377#define CORO_MAGIC_type_state PERL_MAGIC_ext 492#define CORO_MAGIC_type_state PERL_MAGIC_ext
378 493
379#define CORO_MAGIC_NN(sv, type) \ 494#define CORO_MAGIC_NN(sv, type) \
380 (expect_true (SvMAGIC (sv)->mg_type == type) \ 495 (ecb_expect_true (SvMAGIC (sv)->mg_type == type) \
381 ? SvMAGIC (sv) \ 496 ? SvMAGIC (sv) \
382 : mg_find (sv, type)) 497 : mg_find (sv, type))
383 498
384#define CORO_MAGIC(sv, type) \ 499#define CORO_MAGIC(sv, type) \
385 (expect_true (SvMAGIC (sv)) \ 500 (ecb_expect_true (SvMAGIC (sv)) \
386 ? CORO_MAGIC_NN (sv, type) \ 501 ? CORO_MAGIC_NN (sv, type) \
387 : 0) 502 : 0)
388 503
389#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)
390#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)
391 506
392INLINE 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 *
393SvSTATE_ (pTHX_ SV *coro) 523SvSTATE_ (pTHX_ SV *coro)
394{ 524{
395 HV *stash;
396 MAGIC *mg; 525 MAGIC *mg;
397 526
398 if (SvROK (coro)) 527 if (SvROK (coro))
399 coro = SvRV (coro); 528 coro = SvRV (coro);
400 529
401 if (expect_false (SvTYPE (coro) != SVt_PVHV)) 530 mg = SvSTATEhv_p (aTHX_ coro);
531 if (!mg)
402 croak ("Coro::State object required"); 532 croak ("Coro::State object required");
403 533
404 stash = SvSTASH (coro);
405 if (expect_false (stash != coro_stash && stash != coro_state_stash))
406 {
407 /* very slow, but rare, check */
408 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
409 croak ("Coro::State object required");
410 }
411
412 mg = CORO_MAGIC_state (coro);
413 return (struct coro *)mg->mg_ptr; 534 return (struct coro *)mg->mg_ptr;
414} 535}
415 536
416#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 537#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
417 538
… …
420#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 541#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
421 542
422/*****************************************************************************/ 543/*****************************************************************************/
423/* padlist management and caching */ 544/* padlist management and caching */
424 545
425static AV * 546ecb_inline PADLIST *
426coro_derive_padlist (pTHX_ CV *cv) 547coro_derive_padlist (pTHX_ CV *cv)
427{ 548{
428 AV *padlist = CvPADLIST (cv); 549 PADLIST *padlist = CvPADLIST (cv);
429 AV *newpadlist, *newpad; 550 PADLIST *newpadlist;
551 PAD *newpad;
552 PADOFFSET const off = PadlistMAX (padlist) + 1;
430 553
431 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. */
432 AvREAL_off (newpadlist); 557 AvREAL_off (newpadlist);
558#endif
433#if PERL_VERSION_ATLEAST (5,10,0) 559#if PERL_VERSION_ATLEAST (5,10,0)
434 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1); 560 Perl_pad_push (aTHX_ padlist, off);
435#else 561#else
436 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 562 Perl_pad_push (aTHX_ padlist, off, 1);
437#endif 563#endif
438 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 564 newpad = PadlistARRAY (padlist)[off];
439 --AvFILLp (padlist); 565 PadlistMAX (padlist) = off - 1;
440 566
441 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0])); 567 /* Already extended to 2 elements by newPADLIST. */
442 av_store (newpadlist, 1, (SV *)newpad); 568 PadlistMAX (newpadlist) = 1;
569 PadlistNAMES (newpadlist) = (PADNAMELIST *)SvREFCNT_inc_NN (PadlistNAMES (padlist));
570 PadlistARRAY (newpadlist)[1] = newpad;
443 571
444 return newpadlist; 572 return newpadlist;
445} 573}
446 574
447static void 575ecb_inline void
448free_padlist (pTHX_ AV *padlist) 576free_padlist (pTHX_ PADLIST *padlist)
449{ 577{
450 /* may be during global destruction */ 578 /* may be during global destruction */
451 if (!IN_DESTRUCT) 579 if (!IN_DESTRUCT)
452 { 580 {
453 I32 i = AvFILLp (padlist); 581 I32 i = PadlistMAX (padlist);
454 582
455 while (i > 0) /* special-case index 0 */ 583 while (i > 0) /* special-case index 0 */
456 { 584 {
457 /* we try to be extra-careful here */ 585 /* we try to be extra-careful here */
458 AV *av = (AV *)AvARRAY (padlist)[i--]; 586 PAD *pad = PadlistARRAY (padlist)[i--];
459 I32 j = AvFILLp (av); 587 I32 j = PadMAX (pad);
460 588
461 while (j >= 0) 589 while (j >= 0)
462 SvREFCNT_dec (AvARRAY (av)[j--]); 590 SvREFCNT_dec (PadARRAY (pad)[j--]);
463 591
464 AvFILLp (av) = -1; 592 PadMAX (pad) = -1;
465 SvREFCNT_dec (av); 593 SvREFCNT_dec (pad);
466 } 594 }
467 595
468 SvREFCNT_dec (AvARRAY (padlist)[0]); 596 SvREFCNT_dec (PadlistNAMES (padlist));
469 597
598#ifdef NEWPADAPI
599 Safefree (PadlistARRAY (padlist));
600 Safefree (padlist);
601#else
470 AvFILLp (padlist) = -1; 602 AvFILLp (padlist) = -1;
603 AvREAL_off (padlist);
471 SvREFCNT_dec ((SV*)padlist); 604 SvREFCNT_dec ((SV*)padlist);
605#endif
472 } 606 }
473} 607}
474 608
475static int 609static int
476coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 610coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
477{ 611{
478 AV *padlist; 612 PADLIST *padlist;
479 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;
480 615
481 /* casting is fun. */ 616 /* perl manages to free our internal AV and _then_ call us */
482 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 617 if (IN_DESTRUCT)
618 return 0;
619
620 while (len--)
483 free_padlist (aTHX_ padlist); 621 free_padlist (aTHX_ padlists[len]);
484
485 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
486 622
487 return 0; 623 return 0;
488} 624}
489 625
490static MGVTBL coro_cv_vtbl = { 626static MGVTBL coro_cv_vtbl = {
491 0, 0, 0, 0, 627 0, 0, 0, 0,
492 coro_cv_free 628 coro_cv_free
493}; 629};
494 630
495/* the next two functions merely cache the padlists */ 631/* the next two functions merely cache the padlists */
496static void 632ecb_inline void
497get_padlist (pTHX_ CV *cv) 633get_padlist (pTHX_ CV *cv)
498{ 634{
499 MAGIC *mg = CORO_MAGIC_cv (cv); 635 MAGIC *mg = CORO_MAGIC_cv (cv);
500 AV *av; 636 size_t *lenp;
501 637
502 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 638 if (ecb_expect_true (mg && *(lenp = (size_t *)mg->mg_ptr)))
503 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 639 CvPADLIST (cv) = ((PADLIST **)(mg->mg_ptr + sizeof(size_t)))[--*lenp];
504 else 640 else
505 { 641 {
506#if CORO_PREFER_PERL_FUNCTIONS 642#if CORO_PREFER_PERL_FUNCTIONS
507 /* this is probably cleaner? but also slower! */ 643 /* this is probably cleaner? but also slower! */
508 /* in practise, it seems to be less stable */ 644 /* in practise, it seems to be less stable */
… …
514 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 650 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
515#endif 651#endif
516 } 652 }
517} 653}
518 654
519static void 655ecb_inline void
520put_padlist (pTHX_ CV *cv) 656put_padlist (pTHX_ CV *cv)
521{ 657{
522 MAGIC *mg = CORO_MAGIC_cv (cv); 658 MAGIC *mg = CORO_MAGIC_cv (cv);
523 AV *av;
524 659
525 if (expect_false (!mg)) 660 if (ecb_expect_false (!mg))
661 {
526 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);
527 670
528 av = (AV *)mg->mg_obj; 671 ((PADLIST **)(mg->mg_ptr + sizeof (size_t))) [(*(size_t *)mg->mg_ptr)++] = CvPADLIST (cv);
529
530 if (expect_false (AvFILLp (av) >= AvMAX (av)))
531 av_extend (av, AvFILLp (av) + 1);
532
533 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
534} 672}
535 673
536/** 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))
537 727
538static void 728static void
539on_enterleave_call (pTHX_ SV *cb); 729on_enterleave_call (pTHX_ SV *cb);
540 730
541static void 731static void
… …
544 perl_slots *slot = c->slot; 734 perl_slots *slot = c->slot;
545 c->slot = 0; 735 c->slot = 0;
546 736
547 PL_mainstack = c->mainstack; 737 PL_mainstack = c->mainstack;
548 738
549 GvSV (PL_defgv) = slot->defsv; 739#if CORO_JIT
550 GvAV (PL_defgv) = slot->defav; 740 load_perl_slots (slot);
551 GvSV (PL_errgv) = slot->errsv; 741#else
552 GvSV (irsgv) = slot->irsgv;
553 GvHV (PL_hintgv) = slot->hinthv;
554
555 #define VAR(name,type) PL_ ## name = slot->name; 742 #define VARx(name,expr,type) expr = slot->name;
556 # include "state.h" 743 #include "state.h"
557 #undef VAR 744#endif
558 745
559 { 746 {
560 dSP; 747 dSP;
561 748
562 CV *cv; 749 CV *cv;
563 750
564 /* now do the ugly restore mess */ 751 /* now do the ugly restore mess */
565 while (expect_true (cv = (CV *)POPs)) 752 while (ecb_expect_true (cv = (CV *)POPs))
566 { 753 {
567 put_padlist (aTHX_ cv); /* mark this padlist as available */ 754 put_padlist (aTHX_ cv); /* mark this padlist as available */
568 CvDEPTH (cv) = PTR2IV (POPs); 755 CvDEPTH (cv) = PTR2IV (POPs);
569 CvPADLIST (cv) = (AV *)POPs; 756 CvPADLIST (cv) = (PADLIST *)POPs;
570 } 757 }
571 758
572 PUTBACK; 759 PUTBACK;
573 } 760 }
574 761
575 slf_frame = c->slf_frame; 762 slf_frame = c->slf_frame;
576 CORO_THROW = c->except; 763 CORO_THROW = c->except;
577 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
578 if (expect_false (c->on_enter)) 773 if (ecb_expect_false (c->on_enter))
579 { 774 {
580 int i; 775 int i;
581 776
582 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 777 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
583 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 778 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
584 } 779 }
780
781 SWAP_SVS (c);
585} 782}
586 783
587static void 784static void
588save_perl (pTHX_ Coro__State c) 785save_perl (pTHX_ Coro__State c)
589{ 786{
787 SWAP_SVS (c);
788
590 if (expect_false (c->on_leave)) 789 if (ecb_expect_false (c->on_leave))
591 { 790 {
592 int i; 791 int i;
593 792
594 for (i = AvFILLp (c->on_leave); i >= 0; --i) 793 for (i = AvFILLp (c->on_leave); i >= 0; --i)
595 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);
596 } 803 }
597 804
598 c->except = CORO_THROW; 805 c->except = CORO_THROW;
599 c->slf_frame = slf_frame; 806 c->slf_frame = slf_frame;
600 807
… …
611 818
612 XPUSHs (Nullsv); 819 XPUSHs (Nullsv);
613 /* this loop was inspired by pp_caller */ 820 /* this loop was inspired by pp_caller */
614 for (;;) 821 for (;;)
615 { 822 {
616 while (expect_true (cxix >= 0)) 823 while (ecb_expect_true (cxix >= 0))
617 { 824 {
618 PERL_CONTEXT *cx = &ccstk[cxix--]; 825 PERL_CONTEXT *cx = &ccstk[cxix--];
619 826
620 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))
621 { 828 {
622 CV *cv = cx->blk_sub.cv; 829 CV *cv = cx->blk_sub.cv;
623 830
624 if (expect_true (CvDEPTH (cv))) 831 if (ecb_expect_true (CvDEPTH (cv)))
625 { 832 {
626 EXTEND (SP, 3); 833 EXTEND (SP, 3);
627 PUSHs ((SV *)CvPADLIST (cv)); 834 PUSHs ((SV *)CvPADLIST (cv));
628 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv))); 835 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
629 PUSHs ((SV *)cv); 836 PUSHs ((SV *)cv);
… …
632 get_padlist (aTHX_ cv); 839 get_padlist (aTHX_ cv);
633 } 840 }
634 } 841 }
635 } 842 }
636 843
637 if (expect_true (top_si->si_type == PERLSI_MAIN)) 844 if (ecb_expect_true (top_si->si_type == PERLSI_MAIN))
638 break; 845 break;
639 846
640 top_si = top_si->si_prev; 847 top_si = top_si->si_prev;
641 ccstk = top_si->si_cxstack; 848 ccstk = top_si->si_cxstack;
642 cxix = top_si->si_cxix; 849 cxix = top_si->si_cxix;
… …
644 851
645 PUTBACK; 852 PUTBACK;
646 } 853 }
647 854
648 /* allocate some space on the context stack for our purposes */ 855 /* allocate some space on the context stack for our purposes */
649 /* we manually unroll here, as usually 2 slots is enough */ 856 if (ecb_expect_false (cxstack_ix + (int)SLOT_COUNT >= cxstack_max))
650 if (SLOT_COUNT >= 1) CXINC;
651 if (SLOT_COUNT >= 2) CXINC;
652 if (SLOT_COUNT >= 3) CXINC;
653 { 857 {
654 int i; 858 unsigned int i;
859
655 for (i = 3; i < SLOT_COUNT; ++i) 860 for (i = 0; i < SLOT_COUNT; ++i)
656 CXINC; 861 CXINC;
657 } 862
658 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 863 cxstack_ix -= SLOT_COUNT; /* undo allocation */
864 }
659 865
660 c->mainstack = PL_mainstack; 866 c->mainstack = PL_mainstack;
661 867
662 { 868 {
663 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 869 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
664 870
665 slot->defav = GvAV (PL_defgv); 871#if CORO_JIT
666 slot->defsv = DEFSV; 872 save_perl_slots (slot);
667 slot->errsv = ERRSV; 873#else
668 slot->irsgv = GvSV (irsgv);
669 slot->hinthv = GvHV (PL_hintgv);
670
671 #define VAR(name,type) slot->name = PL_ ## name; 874 #define VARx(name,expr,type) slot->name = expr;
672 # include "state.h" 875 #include "state.h"
673 #undef VAR 876#endif
674 } 877 }
675} 878}
676 879
677/* 880/*
678 * allocate various perl stacks. This is almost an exact copy 881 * allocate various perl stacks. This is almost an exact copy
… …
684# define coro_init_stacks(thx) init_stacks () 887# define coro_init_stacks(thx) init_stacks ()
685#else 888#else
686static void 889static void
687coro_init_stacks (pTHX) 890coro_init_stacks (pTHX)
688{ 891{
689 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() */
690 PL_curstackinfo->si_type = PERLSI_MAIN; 893 PL_curstackinfo->si_type = PERLSI_MAIN;
691 PL_curstack = PL_curstackinfo->si_stack; 894 PL_curstack = PL_curstackinfo->si_stack;
692 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 895 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
693 896
694 PL_stack_base = AvARRAY(PL_curstack); 897 PL_stack_base = AvARRAY(PL_curstack);
… …
709#endif 912#endif
710 913
711 New(54,PL_scopestack,8,I32); 914 New(54,PL_scopestack,8,I32);
712 PL_scopestack_ix = 0; 915 PL_scopestack_ix = 0;
713 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
714 920
715 New(54,PL_savestack,24,ANY); 921 New(54,PL_savestack,24,ANY);
716 PL_savestack_ix = 0; 922 PL_savestack_ix = 0;
717 PL_savestack_max = 24; 923 PL_savestack_max = 24;
718 924
… …
746 } 952 }
747 953
748 Safefree (PL_tmps_stack); 954 Safefree (PL_tmps_stack);
749 Safefree (PL_markstack); 955 Safefree (PL_markstack);
750 Safefree (PL_scopestack); 956 Safefree (PL_scopestack);
957#if HAS_SCOPESTACK_NAME
958 Safefree (PL_scopestack_name);
959#endif
751 Safefree (PL_savestack); 960 Safefree (PL_savestack);
752#if !PERL_VERSION_ATLEAST (5,10,0) 961#if !PERL_VERSION_ATLEAST (5,10,0)
753 Safefree (PL_retstack); 962 Safefree (PL_retstack);
754#endif 963#endif
755} 964}
… …
801#endif 1010#endif
802 1011
803/* 1012/*
804 * This overrides the default magic get method of %SIG elements. 1013 * This overrides the default magic get method of %SIG elements.
805 * 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
806 * 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),
807 * readback here. 1016 * we just provide our own readback here.
808 */ 1017 */
809static int 1018static int ecb_cold
810coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 1019coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
811{ 1020{
812 const char *s = MgPV_nolen_const (mg); 1021 const char *s = MgPV_nolen_const (mg);
813 1022
814 if (*s == '_') 1023 if (*s == '_')
815 { 1024 {
816 SV **svp = 0; 1025 SV **svp = 0;
817 1026
818 if (strEQ (s, "__DIE__" )) svp = &PL_diehook; 1027 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
819 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 1028 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
820 1029
821 if (svp) 1030 if (svp)
822 { 1031 {
823 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);
824 return 0; 1042 return 0;
825 } 1043 }
826 } 1044 }
827 1045
828 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 1046 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
829} 1047}
830 1048
831static int 1049static int ecb_cold
832coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1050coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
833{ 1051{
834 const char *s = MgPV_nolen_const (mg); 1052 const char *s = MgPV_nolen_const (mg);
835 1053
836 if (*s == '_') 1054 if (*s == '_')
… …
850 } 1068 }
851 1069
852 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0; 1070 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
853} 1071}
854 1072
855static int 1073static int ecb_cold
856coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1074coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
857{ 1075{
858 const char *s = MgPV_nolen_const (mg); 1076 const char *s = MgPV_nolen_const (mg);
859 1077
860 if (*s == '_') 1078 if (*s == '_')
… …
893slf_check_repeat (pTHX_ struct CoroSLF *frame) 1111slf_check_repeat (pTHX_ struct CoroSLF *frame)
894{ 1112{
895 return 1; 1113 return 1;
896} 1114}
897 1115
898static UNOP coro_setup_op; 1116static UNOP init_perl_op;
899 1117
900static 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 */
901coro_setup (pTHX_ struct coro *coro) 1119init_perl (pTHX_ struct coro *coro)
902{ 1120{
903 /* 1121 /*
904 * emulate part of the perl startup here. 1122 * emulate part of the perl startup here.
905 */ 1123 */
906 coro_init_stacks (aTHX); 1124 coro_init_stacks (aTHX);
… …
913 PL_comppad_name_fill = 0; 1131 PL_comppad_name_fill = 0;
914 PL_comppad_name_floor = 0; 1132 PL_comppad_name_floor = 0;
915 PL_curpm = 0; 1133 PL_curpm = 0;
916 PL_curpad = 0; 1134 PL_curpad = 0;
917 PL_localizing = 0; 1135 PL_localizing = 0;
918 PL_dirty = 0;
919 PL_restartop = 0; 1136 PL_restartop = 0;
920#if PERL_VERSION_ATLEAST (5,10,0) 1137#if PERL_VERSION_ATLEAST (5,10,0)
921 PL_parser = 0; 1138 PL_parser = 0;
922#endif 1139#endif
923 PL_hints = 0; 1140 PL_hints = 0;
924 1141
925 /* recreate the die/warn hooks */ 1142 /* recreate the die/warn hooks */
926 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1143 PL_diehook = SvREFCNT_inc (rv_diehook);
927 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1144 PL_warnhook = SvREFCNT_inc (rv_warnhook);
928 1145
929 GvSV (PL_defgv) = newSV (0); 1146 GvSV (PL_defgv) = newSV (0);
930 GvAV (PL_defgv) = coro->args; coro->args = 0; 1147 GvAV (PL_defgv) = coro->args; coro->args = 0;
931 GvSV (PL_errgv) = newSV (0); 1148 GvSV (PL_errgv) = newSV (0);
932 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);
933 GvHV (PL_hintgv) = 0; 1150 GvHV (PL_hintgv) = 0;
… …
953 /* 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
954 * 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.
955 */ 1172 */
956 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 */
957 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;
958 1176
959 /* 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 */
960 coro_setup_op.op_next = PL_op; 1178 init_perl_op.op_next = PL_op;
961 coro_setup_op.op_type = OP_ENTERSUB; 1179 init_perl_op.op_type = OP_ENTERSUB;
962 coro_setup_op.op_ppaddr = pp_slf; 1180 init_perl_op.op_ppaddr = pp_slf;
963 /* 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 */
964 1182
965 PL_op = (OP *)&coro_setup_op; 1183 PL_op = (OP *)&init_perl_op;
966 1184
967 /* copy throw, in case it was set before coro_setup */ 1185 /* copy throw, in case it was set before init_perl */
968 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 }
969} 1195}
970 1196
971static void 1197static void
972coro_unwind_stacks (pTHX) 1198coro_unwind_stacks (pTHX)
973{ 1199{
… …
988 dounwind (-1); 1214 dounwind (-1);
989 } 1215 }
990} 1216}
991 1217
992static void 1218static void
993coro_destruct_perl (pTHX_ struct coro *coro) 1219destroy_perl (pTHX_ struct coro *coro)
994{ 1220{
995 SV *svf [9]; 1221 SV *svf [9];
996 1222
997 { 1223 {
1224 SV *old_current = SvRV (coro_current);
998 struct coro *current = SvSTATE_current; 1225 struct coro *current = SvSTATE (old_current);
999 1226
1000 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));
1001 1228
1002 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
1003 load_perl (aTHX_ coro); 1234 load_perl (aTHX_ coro);
1004 1235
1005 coro_unwind_stacks (aTHX); 1236 coro_unwind_stacks (aTHX);
1237
1238 /* restore swapped sv's */
1239 SWAP_SVS (coro);
1240
1006 coro_destruct_stacks (aTHX); 1241 coro_destruct_stacks (aTHX);
1007 1242
1008 // now save some sv's to be free'd later 1243 /* now save some sv's to be free'd later */
1009 svf [0] = GvSV (PL_defgv); 1244 svf [0] = GvSV (PL_defgv);
1010 svf [1] = (SV *)GvAV (PL_defgv); 1245 svf [1] = (SV *)GvAV (PL_defgv);
1011 svf [2] = GvSV (PL_errgv); 1246 svf [2] = GvSV (PL_errgv);
1012 svf [3] = (SV *)PL_defoutgv; 1247 svf [3] = (SV *)PL_defoutgv;
1013 svf [4] = PL_rs; 1248 svf [4] = PL_rs;
… …
1015 svf [6] = (SV *)GvHV (PL_hintgv); 1250 svf [6] = (SV *)GvHV (PL_hintgv);
1016 svf [7] = PL_diehook; 1251 svf [7] = PL_diehook;
1017 svf [8] = PL_warnhook; 1252 svf [8] = PL_warnhook;
1018 assert (9 == sizeof (svf) / sizeof (*svf)); 1253 assert (9 == sizeof (svf) / sizeof (*svf));
1019 1254
1255 SvRV_set (coro_current, old_current);
1256
1020 load_perl (aTHX_ current); 1257 load_perl (aTHX_ current);
1021 } 1258 }
1022 1259
1023 { 1260 {
1024 int i; 1261 unsigned int i;
1025 1262
1026 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i) 1263 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i)
1027 SvREFCNT_dec (svf [i]); 1264 SvREFCNT_dec (svf [i]);
1028 1265
1029 SvREFCNT_dec (coro->saved_deffh); 1266 SvREFCNT_dec (coro->saved_deffh);
… …
1031 SvREFCNT_dec (coro->invoke_cb); 1268 SvREFCNT_dec (coro->invoke_cb);
1032 SvREFCNT_dec (coro->invoke_av); 1269 SvREFCNT_dec (coro->invoke_av);
1033 } 1270 }
1034} 1271}
1035 1272
1036INLINE void 1273ecb_inline void
1037free_coro_mortal (pTHX) 1274free_coro_mortal (pTHX)
1038{ 1275{
1039 if (expect_true (coro_mortal)) 1276 if (ecb_expect_true (coro_mortal))
1040 { 1277 {
1041 SvREFCNT_dec (coro_mortal); 1278 SvREFCNT_dec ((SV *)coro_mortal);
1042 coro_mortal = 0; 1279 coro_mortal = 0;
1043 } 1280 }
1044} 1281}
1045 1282
1046static int 1283static int
… …
1179 1416
1180 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 */
1181} 1418}
1182 1419
1183/* 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 */
1184static void NOINLINE 1421static void ecb_noinline
1185cctx_prepare (pTHX) 1422cctx_prepare (pTHX)
1186{ 1423{
1187 PL_top_env = &PL_start_env; 1424 PL_top_env = &PL_start_env;
1188 1425
1189 if (cctx_current->flags & CC_TRACE) 1426 if (cctx_current->flags & CC_TRACE)
… …
1200 slf_frame.prepare = slf_prepare_set_stacklevel; 1437 slf_frame.prepare = slf_prepare_set_stacklevel;
1201 slf_frame.check = slf_check_set_stacklevel; 1438 slf_frame.check = slf_check_set_stacklevel;
1202} 1439}
1203 1440
1204/* 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 */
1205INLINE void 1442ecb_inline void
1206transfer_tail (pTHX) 1443transfer_tail (pTHX)
1207{ 1444{
1208 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);
1209} 1458}
1210 1459
1211/* 1460/*
1212 * this is a _very_ stripped down perl interpreter ;) 1461 * this is a _very_ stripped down perl interpreter ;)
1213 */ 1462 */
… …
1235 /* 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 */
1236 PL_restartop = PL_op; 1485 PL_restartop = PL_op;
1237 perl_run (PL_curinterp); 1486 perl_run (PL_curinterp);
1238 /* 1487 /*
1239 * 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
1240 * 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.
1241 */ 1491 */
1242 1492
1243 /* 1493 /*
1244 * 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
1245 * 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)
1246 * 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
1247 * bootstrap-time "top" top_env, as we cannot restore the "main" 1497 * doing in that case. YMMV.
1248 * coroutine as Coro has no such concept.
1249 * This actually isn't valid with the pthread backend, but OSes requiring
1250 * that backend are too broken to do it in a standards-compliant way.
1251 */ 1498 */
1252 PL_top_env = main_top_env; 1499 perlish_exit (aTHX);
1253 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1254 } 1500 }
1255} 1501}
1256 1502
1257static coro_cctx * 1503static coro_cctx *
1258cctx_new () 1504cctx_new (void)
1259{ 1505{
1260 coro_cctx *cctx; 1506 coro_cctx *cctx;
1261 1507
1262 ++cctx_count; 1508 ++cctx_count;
1263 New (0, cctx, 1, coro_cctx); 1509 New (0, cctx, 1, coro_cctx);
… …
1269 return cctx; 1515 return cctx;
1270} 1516}
1271 1517
1272/* create a new cctx only suitable as source */ 1518/* create a new cctx only suitable as source */
1273static coro_cctx * 1519static coro_cctx *
1274cctx_new_empty () 1520cctx_new_empty (void)
1275{ 1521{
1276 coro_cctx *cctx = cctx_new (); 1522 coro_cctx *cctx = cctx_new ();
1277 1523
1278 cctx->sptr = 0; 1524 cctx->sptr = 0;
1279 coro_create (&cctx->cctx, 0, 0, 0, 0); 1525 coro_create (&cctx->cctx, 0, 0, 0, 0);
… …
1281 return cctx; 1527 return cctx;
1282} 1528}
1283 1529
1284/* create a new cctx suitable as destination/running a perl interpreter */ 1530/* create a new cctx suitable as destination/running a perl interpreter */
1285static coro_cctx * 1531static coro_cctx *
1286cctx_new_run () 1532cctx_new_run (void)
1287{ 1533{
1288 coro_cctx *cctx = cctx_new (); 1534 coro_cctx *cctx = cctx_new ();
1289 void *stack_start; 1535 void *stack_start;
1290 size_t stack_size; 1536 size_t stack_size;
1291 1537
1292#if HAVE_MMAP 1538#if HAVE_MMAP
1293 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE; 1539 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1294 /* mmap supposedly does allocate-on-write for us */ 1540 /* mmap supposedly does allocate-on-write for us */
1295 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0); 1541 cctx->sptr = mmap (0, cctx->ssize, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_ANONYMOUS, -1, 0);
1296 1542
1297 if (cctx->sptr != (void *)-1) 1543 if (cctx->sptr != (void *)-1)
1298 { 1544 {
1299 #if CORO_STACKGUARD 1545 #if CORO_STACKGUARD
1300 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE); 1546 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
… …
1332cctx_destroy (coro_cctx *cctx) 1578cctx_destroy (coro_cctx *cctx)
1333{ 1579{
1334 if (!cctx) 1580 if (!cctx)
1335 return; 1581 return;
1336 1582
1337 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary? 1583 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1338 1584
1339 --cctx_count; 1585 --cctx_count;
1340 coro_destroy (&cctx->cctx); 1586 coro_destroy (&cctx->cctx);
1341 1587
1342 /* coro_transfer creates new, empty cctx's */ 1588 /* coro_transfer creates new, empty cctx's */
… …
1361#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE)) 1607#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE))
1362 1608
1363static coro_cctx * 1609static coro_cctx *
1364cctx_get (pTHX) 1610cctx_get (pTHX)
1365{ 1611{
1366 while (expect_true (cctx_first)) 1612 while (ecb_expect_true (cctx_first))
1367 { 1613 {
1368 coro_cctx *cctx = cctx_first; 1614 coro_cctx *cctx = cctx_first;
1369 cctx_first = cctx->next; 1615 cctx_first = cctx->next;
1370 --cctx_idle; 1616 --cctx_idle;
1371 1617
1372 if (expect_true (!CCTX_EXPIRED (cctx))) 1618 if (ecb_expect_true (!CCTX_EXPIRED (cctx)))
1373 return cctx; 1619 return cctx;
1374 1620
1375 cctx_destroy (cctx); 1621 cctx_destroy (cctx);
1376 } 1622 }
1377 1623
… …
1382cctx_put (coro_cctx *cctx) 1628cctx_put (coro_cctx *cctx)
1383{ 1629{
1384 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1630 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr));
1385 1631
1386 /* free another cctx if overlimit */ 1632 /* free another cctx if overlimit */
1387 if (expect_false (cctx_idle >= cctx_max_idle)) 1633 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1388 { 1634 {
1389 coro_cctx *first = cctx_first; 1635 coro_cctx *first = cctx_first;
1390 cctx_first = first->next; 1636 cctx_first = first->next;
1391 --cctx_idle; 1637 --cctx_idle;
1392 1638
… …
1403static void 1649static void
1404transfer_check (pTHX_ struct coro *prev, struct coro *next) 1650transfer_check (pTHX_ struct coro *prev, struct coro *next)
1405{ 1651{
1406 /* TODO: throwing up here is considered harmful */ 1652 /* TODO: throwing up here is considered harmful */
1407 1653
1408 if (expect_true (prev != next)) 1654 if (ecb_expect_true (prev != next))
1409 { 1655 {
1410 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1656 if (ecb_expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1411 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,"); 1657 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1412 1658
1413 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED))) 1659 if (ecb_expect_false (next->flags & (CF_RUNNING | CF_ZOMBIE | CF_SUSPENDED)))
1414 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,"); 1660 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1415 1661
1416#if !PERL_VERSION_ATLEAST (5,10,0) 1662#if !PERL_VERSION_ATLEAST (5,10,0)
1417 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1663 if (ecb_expect_false (PL_lex_state != LEX_NOTPARSING))
1418 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,"); 1664 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1419#endif 1665#endif
1420 } 1666 }
1421} 1667}
1422 1668
1423/* always use the TRANSFER macro */ 1669/* always use the TRANSFER macro */
1424static void NOINLINE /* noinline so we have a fixed stackframe */ 1670static void ecb_noinline /* noinline so we have a fixed stackframe */
1425transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1671transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1426{ 1672{
1427 dSTACKLEVEL; 1673 dSTACKLEVEL;
1428 1674
1429 /* sometimes transfer is only called to set idle_sp */ 1675 /* sometimes transfer is only called to set idle_sp */
1430 if (expect_false (!prev)) 1676 if (ecb_expect_false (!prev))
1431 { 1677 {
1432 cctx_current->idle_sp = STACKLEVEL; 1678 cctx_current->idle_sp = STACKLEVEL;
1433 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1679 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1434 } 1680 }
1435 else if (expect_true (prev != next)) 1681 else if (ecb_expect_true (prev != next))
1436 { 1682 {
1437 coro_cctx *cctx_prev; 1683 coro_cctx *cctx_prev;
1438 1684
1439 if (expect_false (prev->flags & CF_NEW)) 1685 if (ecb_expect_false (prev->flags & CF_NEW))
1440 { 1686 {
1441 /* create a new empty/source context */ 1687 /* create a new empty/source context */
1442 prev->flags &= ~CF_NEW; 1688 prev->flags &= ~CF_NEW;
1443 prev->flags |= CF_RUNNING; 1689 prev->flags |= CF_RUNNING;
1444 } 1690 }
… …
1447 next->flags |= CF_RUNNING; 1693 next->flags |= CF_RUNNING;
1448 1694
1449 /* first get rid of the old state */ 1695 /* first get rid of the old state */
1450 save_perl (aTHX_ prev); 1696 save_perl (aTHX_ prev);
1451 1697
1452 if (expect_false (next->flags & CF_NEW)) 1698 if (ecb_expect_false (next->flags & CF_NEW))
1453 { 1699 {
1454 /* need to start coroutine */ 1700 /* need to start coroutine */
1455 next->flags &= ~CF_NEW; 1701 next->flags &= ~CF_NEW;
1456 /* setup coroutine call */ 1702 /* setup coroutine call */
1457 coro_setup (aTHX_ next); 1703 init_perl (aTHX_ next);
1458 } 1704 }
1459 else 1705 else
1460 load_perl (aTHX_ next); 1706 load_perl (aTHX_ next);
1461 1707
1462 /* possibly untie and reuse the cctx */ 1708 /* possibly untie and reuse the cctx */
1463 if (expect_true ( 1709 if (ecb_expect_true (
1464 cctx_current->idle_sp == STACKLEVEL 1710 cctx_current->idle_sp == STACKLEVEL
1465 && !(cctx_current->flags & CC_TRACE) 1711 && !(cctx_current->flags & CC_TRACE)
1466 && !force_cctx 1712 && !force_cctx
1467 )) 1713 ))
1468 { 1714 {
1469 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1715 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */
1470 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te)); 1716 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1471 1717
1472 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */ 1718 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */
1473 /* without this the next cctx_get might destroy the running cctx while still in use */ 1719 /* without this the next cctx_get might destroy the running cctx while still in use */
1474 if (expect_false (CCTX_EXPIRED (cctx_current))) 1720 if (ecb_expect_false (CCTX_EXPIRED (cctx_current)))
1475 if (expect_true (!next->cctx)) 1721 if (ecb_expect_true (!next->cctx))
1476 next->cctx = cctx_get (aTHX); 1722 next->cctx = cctx_get (aTHX);
1477 1723
1478 cctx_put (cctx_current); 1724 cctx_put (cctx_current);
1479 } 1725 }
1480 else 1726 else
1481 prev->cctx = cctx_current; 1727 prev->cctx = cctx_current;
1482 1728
1483 ++next->usecount; 1729 ++next->usecount;
1484 1730
1485 cctx_prev = cctx_current; 1731 cctx_prev = cctx_current;
1486 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX); 1732 cctx_current = ecb_expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1487 1733
1488 next->cctx = 0; 1734 next->cctx = 0;
1489 1735
1490 if (expect_false (cctx_prev != cctx_current)) 1736 if (ecb_expect_false (cctx_prev != cctx_current))
1491 { 1737 {
1492 cctx_prev->top_env = PL_top_env; 1738 cctx_prev->top_env = PL_top_env;
1493 PL_top_env = cctx_current->top_env; 1739 PL_top_env = cctx_current->top_env;
1494 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx); 1740 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1495 } 1741 }
… …
1501#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx)) 1747#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1502#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1748#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1503 1749
1504/** high level stuff ********************************************************/ 1750/** high level stuff ********************************************************/
1505 1751
1752/* this function is actually Coro, not Coro::State, but we call it from here */
1753/* because it is convenient - but it hasn't been declared yet for that reason */
1506static int 1754static void
1755coro_call_on_destroy (pTHX_ struct coro *coro);
1756
1757static void
1507coro_state_destroy (pTHX_ struct coro *coro) 1758coro_state_destroy (pTHX_ struct coro *coro)
1508{ 1759{
1509 if (coro->flags & CF_DESTROYED) 1760 if (coro->flags & CF_ZOMBIE)
1510 return 0; 1761 return;
1511 1762
1512 if (coro->on_destroy && !PL_dirty)
1513 coro->on_destroy (aTHX_ coro); 1763 slf_destroy (aTHX_ coro);
1514 1764
1515 coro->flags |= CF_DESTROYED; 1765 coro->flags |= CF_ZOMBIE;
1516 1766
1517 if (coro->flags & CF_READY) 1767 if (coro->flags & CF_READY)
1518 { 1768 {
1519 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1769 /* reduce nready, as destroying a ready coro effectively unreadies it */
1520 /* alternative: look through all ready queues and remove the coro */ 1770 /* alternative: look through all ready queues and remove the coro */
1521 --coro_nready; 1771 --coro_nready;
1522 } 1772 }
1523 else 1773 else
1524 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1774 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1775
1776 if (coro->next) coro->next->prev = coro->prev;
1777 if (coro->prev) coro->prev->next = coro->next;
1778 if (coro == coro_first) coro_first = coro->next;
1525 1779
1526 if (coro->mainstack 1780 if (coro->mainstack
1527 && coro->mainstack != main_mainstack 1781 && coro->mainstack != main_mainstack
1528 && coro->slot 1782 && coro->slot
1529 && !PL_dirty) 1783 && !PL_dirty)
1530 coro_destruct_perl (aTHX_ coro); 1784 destroy_perl (aTHX_ coro);
1531 1785
1532 cctx_destroy (coro->cctx); 1786 cctx_destroy (coro->cctx);
1533 SvREFCNT_dec (coro->startcv); 1787 SvREFCNT_dec (coro->startcv);
1534 SvREFCNT_dec (coro->args); 1788 SvREFCNT_dec (coro->args);
1789 SvREFCNT_dec (coro->swap_sv);
1535 SvREFCNT_dec (CORO_THROW); 1790 SvREFCNT_dec (CORO_THROW);
1536 1791
1537 if (coro->next) coro->next->prev = coro->prev; 1792 coro_call_on_destroy (aTHX_ coro);
1538 if (coro->prev) coro->prev->next = coro->next;
1539 if (coro == coro_first) coro_first = coro->next;
1540 1793
1541 return 1; 1794 /* more destruction mayhem in coro_state_free */
1542} 1795}
1543 1796
1544static int 1797static int
1545coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1798coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1546{ 1799{
1547 struct coro *coro = (struct coro *)mg->mg_ptr; 1800 struct coro *coro = (struct coro *)mg->mg_ptr;
1548 mg->mg_ptr = 0; 1801 mg->mg_ptr = 0;
1549 1802
1550 coro->hv = 0;
1551
1552 if (--coro->refcnt < 0)
1553 {
1554 coro_state_destroy (aTHX_ coro); 1803 coro_state_destroy (aTHX_ coro);
1804 SvREFCNT_dec (coro->on_destroy);
1805 SvREFCNT_dec (coro->status);
1806
1555 Safefree (coro); 1807 Safefree (coro);
1556 }
1557 1808
1558 return 0; 1809 return 0;
1559} 1810}
1560 1811
1561static int 1812static int ecb_cold
1562coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1813coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1563{ 1814{
1564 struct coro *coro = (struct coro *)mg->mg_ptr; 1815 /* called when perl clones the current process the slow way (windows process emulation) */
1565 1816 /* WE SIMply nuke the pointers in the copy, causing perl to croak */
1566 ++coro->refcnt; 1817 mg->mg_ptr = 0;
1818 mg->mg_virtual = 0;
1567 1819
1568 return 0; 1820 return 0;
1569} 1821}
1570 1822
1571static MGVTBL coro_state_vtbl = { 1823static MGVTBL coro_state_vtbl = {
… …
1594 1846
1595 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1847 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1596 TRANSFER (ta, 1); 1848 TRANSFER (ta, 1);
1597} 1849}
1598 1850
1599/*****************************************************************************/
1600/* gensub: simple closure generation utility */
1601
1602#define GENSUB_ARG CvXSUBANY (cv).any_ptr
1603
1604/* create a closure from XS, returns a code reference */
1605/* the arg can be accessed via GENSUB_ARG from the callback */
1606/* the callback must use dXSARGS/XSRETURN */
1607static SV *
1608gensub (pTHX_ void (*xsub)(pTHX_ CV *), void *arg)
1609{
1610 CV *cv = (CV *)newSV (0);
1611
1612 sv_upgrade ((SV *)cv, SVt_PVCV);
1613
1614 CvANON_on (cv);
1615 CvISXSUB_on (cv);
1616 CvXSUB (cv) = xsub;
1617 GENSUB_ARG = arg;
1618
1619 return newRV_noinc ((SV *)cv);
1620}
1621
1622/** Coro ********************************************************************/ 1851/** Coro ********************************************************************/
1623 1852
1624INLINE void 1853ecb_inline void
1625coro_enq (pTHX_ struct coro *coro) 1854coro_enq (pTHX_ struct coro *coro)
1626{ 1855{
1627 struct coro **ready = coro_ready [coro->prio - PRIO_MIN]; 1856 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1628 1857
1629 SvREFCNT_inc_NN (coro->hv); 1858 SvREFCNT_inc_NN (coro->hv);
1630 1859
1631 coro->next_ready = 0; 1860 coro->next_ready = 0;
1632 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro; 1861 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1633 ready [1] = coro; 1862 ready [1] = coro;
1634} 1863}
1635 1864
1636INLINE struct coro * 1865ecb_inline struct coro *
1637coro_deq (pTHX) 1866coro_deq (pTHX)
1638{ 1867{
1639 int prio; 1868 int prio;
1640 1869
1641 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; ) 1870 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
1642 { 1871 {
1643 struct coro **ready = coro_ready [prio]; 1872 struct coro **ready = coro_ready [prio];
1644 1873
1645 if (ready [0]) 1874 if (ready [0])
1646 { 1875 {
… …
1651 } 1880 }
1652 1881
1653 return 0; 1882 return 0;
1654} 1883}
1655 1884
1885static void
1886invoke_sv_ready_hook_helper (void)
1887{
1888 dTHX;
1889 dSP;
1890
1891 ENTER;
1892 SAVETMPS;
1893
1894 PUSHMARK (SP);
1895 PUTBACK;
1896 call_sv (coro_readyhook, G_VOID | G_DISCARD);
1897
1898 FREETMPS;
1899 LEAVE;
1900}
1901
1656static int 1902static int
1657api_ready (pTHX_ SV *coro_sv) 1903api_ready (pTHX_ SV *coro_sv)
1658{ 1904{
1659 struct coro *coro;
1660 SV *sv_hook;
1661 void (*xs_hook)(void);
1662
1663 coro = SvSTATE (coro_sv); 1905 struct coro *coro = SvSTATE (coro_sv);
1664 1906
1665 if (coro->flags & CF_READY) 1907 if (coro->flags & CF_READY)
1666 return 0; 1908 return 0;
1667 1909
1668 coro->flags |= CF_READY; 1910 coro->flags |= CF_READY;
1669 1911
1670 sv_hook = coro_nready ? 0 : coro_readyhook;
1671 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1672
1673 coro_enq (aTHX_ coro); 1912 coro_enq (aTHX_ coro);
1674 ++coro_nready;
1675 1913
1676 if (sv_hook) 1914 if (!coro_nready++)
1677 { 1915 if (coroapi.readyhook)
1678 dSP; 1916 coroapi.readyhook ();
1679
1680 ENTER;
1681 SAVETMPS;
1682
1683 PUSHMARK (SP);
1684 PUTBACK;
1685 call_sv (sv_hook, G_VOID | G_DISCARD);
1686
1687 FREETMPS;
1688 LEAVE;
1689 }
1690
1691 if (xs_hook)
1692 xs_hook ();
1693 1917
1694 return 1; 1918 return 1;
1695} 1919}
1696 1920
1697static int 1921static int
… …
1699{ 1923{
1700 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1924 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1701} 1925}
1702 1926
1703/* expects to own a reference to next->hv */ 1927/* expects to own a reference to next->hv */
1704INLINE void 1928ecb_inline void
1705prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1929prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1706{ 1930{
1707 SV *prev_sv = SvRV (coro_current); 1931 SV *prev_sv = SvRV (coro_current);
1708 1932
1709 ta->prev = SvSTATE_hv (prev_sv); 1933 ta->prev = SvSTATE_hv (prev_sv);
… …
1722{ 1946{
1723 for (;;) 1947 for (;;)
1724 { 1948 {
1725 struct coro *next = coro_deq (aTHX); 1949 struct coro *next = coro_deq (aTHX);
1726 1950
1727 if (expect_true (next)) 1951 if (ecb_expect_true (next))
1728 { 1952 {
1729 /* cannot transfer to destroyed coros, skip and look for next */ 1953 /* cannot transfer to destroyed coros, skip and look for next */
1730 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED))) 1954 if (ecb_expect_false (next->flags & (CF_ZOMBIE | CF_SUSPENDED)))
1731 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */ 1955 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1732 else 1956 else
1733 { 1957 {
1734 next->flags &= ~CF_READY; 1958 next->flags &= ~CF_READY;
1735 --coro_nready; 1959 --coro_nready;
… …
1742 { 1966 {
1743 /* nothing to schedule: call the idle handler */ 1967 /* nothing to schedule: call the idle handler */
1744 if (SvROK (sv_idle) 1968 if (SvROK (sv_idle)
1745 && SvOBJECT (SvRV (sv_idle))) 1969 && SvOBJECT (SvRV (sv_idle)))
1746 { 1970 {
1971 if (SvRV (sv_idle) == SvRV (coro_current))
1972 croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught");
1973
1747 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 1974 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1748 api_ready (aTHX_ SvRV (sv_idle)); 1975 api_ready (aTHX_ SvRV (sv_idle));
1749 --coro_nready; 1976 --coro_nready;
1750 } 1977 }
1751 else 1978 else
1752 { 1979 {
1980 /* TODO: deprecated, remove, cannot work reliably *//*D*/
1753 dSP; 1981 dSP;
1754 1982
1755 ENTER; 1983 ENTER;
1756 SAVETMPS; 1984 SAVETMPS;
1757 1985
… …
1764 } 1992 }
1765 } 1993 }
1766 } 1994 }
1767} 1995}
1768 1996
1769INLINE void 1997ecb_inline void
1770prepare_cede (pTHX_ struct coro_transfer_args *ta) 1998prepare_cede (pTHX_ struct coro_transfer_args *ta)
1771{ 1999{
1772 api_ready (aTHX_ coro_current); 2000 api_ready (aTHX_ coro_current);
1773 prepare_schedule (aTHX_ ta); 2001 prepare_schedule (aTHX_ ta);
1774} 2002}
1775 2003
1776INLINE void 2004ecb_inline void
1777prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 2005prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1778{ 2006{
1779 SV *prev = SvRV (coro_current); 2007 SV *prev = SvRV (coro_current);
1780 2008
1781 if (coro_nready) 2009 if (coro_nready)
… …
1811{ 2039{
1812 struct coro_transfer_args ta; 2040 struct coro_transfer_args ta;
1813 2041
1814 prepare_cede (aTHX_ &ta); 2042 prepare_cede (aTHX_ &ta);
1815 2043
1816 if (expect_true (ta.prev != ta.next)) 2044 if (ecb_expect_true (ta.prev != ta.next))
1817 { 2045 {
1818 TRANSFER (ta, 1); 2046 TRANSFER (ta, 1);
1819 return 1; 2047 return 1;
1820 } 2048 }
1821 else 2049 else
… …
1864 coro->slot->runops = RUNOPS_DEFAULT; 2092 coro->slot->runops = RUNOPS_DEFAULT;
1865 } 2093 }
1866} 2094}
1867 2095
1868static void 2096static void
2097coro_push_av (pTHX_ AV *av, I32 gimme_v)
2098{
2099 if (AvFILLp (av) >= 0 && gimme_v != G_VOID)
2100 {
2101 dSP;
2102
2103 if (gimme_v == G_SCALAR)
2104 XPUSHs (AvARRAY (av)[AvFILLp (av)]);
2105 else
2106 {
2107 int i;
2108 EXTEND (SP, AvFILLp (av) + 1);
2109
2110 for (i = 0; i <= AvFILLp (av); ++i)
2111 PUSHs (AvARRAY (av)[i]);
2112 }
2113
2114 PUTBACK;
2115 }
2116}
2117
2118static void
2119coro_push_on_destroy (pTHX_ struct coro *coro, SV *cb)
2120{
2121 if (!coro->on_destroy)
2122 coro->on_destroy = newAV ();
2123
2124 av_push (coro->on_destroy, cb);
2125}
2126
2127static void
2128slf_destroy_join (pTHX_ struct CoroSLF *frame)
2129{
2130 SvREFCNT_dec ((SV *)((struct coro *)frame->data)->hv);
2131}
2132
2133static int
2134slf_check_join (pTHX_ struct CoroSLF *frame)
2135{
2136 struct coro *coro = (struct coro *)frame->data;
2137
2138 if (!coro->status)
2139 return 1;
2140
2141 frame->destroy = 0;
2142
2143 coro_push_av (aTHX_ coro->status, GIMME_V);
2144
2145 SvREFCNT_dec ((SV *)coro->hv);
2146
2147 return 0;
2148}
2149
2150static void
2151slf_init_join (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2152{
2153 struct coro *coro = SvSTATE (items > 0 ? arg [0] : &PL_sv_undef);
2154
2155 if (items > 1)
2156 croak ("join called with too many arguments");
2157
2158 if (coro->status)
2159 frame->prepare = prepare_nop;
2160 else
2161 {
2162 coro_push_on_destroy (aTHX_ coro, SvREFCNT_inc_NN (SvRV (coro_current)));
2163 frame->prepare = prepare_schedule;
2164 }
2165
2166 frame->check = slf_check_join;
2167 frame->destroy = slf_destroy_join;
2168 frame->data = (void *)coro;
2169 SvREFCNT_inc (coro->hv);
2170}
2171
2172static void
1869coro_call_on_destroy (pTHX_ struct coro *coro) 2173coro_call_on_destroy (pTHX_ struct coro *coro)
1870{ 2174{
1871 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2175 AV *od = coro->on_destroy;
1872 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1873 2176
1874 if (on_destroyp) 2177 if (!od)
1875 { 2178 return;
1876 AV *on_destroy = (AV *)SvRV (*on_destroyp);
1877 2179
1878 while (AvFILLp (on_destroy) >= 0) 2180 while (AvFILLp (od) >= 0)
2181 {
2182 SV *cb = sv_2mortal (av_pop (od));
2183
2184 /* coro hv's (and only hv's at the moment) are supported as well */
2185 if (SvSTATEhv_p (aTHX_ cb))
2186 api_ready (aTHX_ cb);
2187 else
1879 { 2188 {
1880 dSP; /* don't disturb outer sp */ 2189 dSP; /* don't disturb outer sp */
1881 SV *cb = av_pop (on_destroy);
1882
1883 PUSHMARK (SP); 2190 PUSHMARK (SP);
1884 2191
1885 if (statusp) 2192 if (coro->status)
1886 { 2193 {
1887 int i; 2194 PUTBACK;
1888 AV *status = (AV *)SvRV (*statusp); 2195 coro_push_av (aTHX_ coro->status, G_ARRAY);
1889 EXTEND (SP, AvFILLp (status) + 1); 2196 SPAGAIN;
1890
1891 for (i = 0; i <= AvFILLp (status); ++i)
1892 PUSHs (AvARRAY (status)[i]);
1893 } 2197 }
1894 2198
1895 PUTBACK; 2199 PUTBACK;
1896 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD); 2200 call_sv (cb, G_VOID | G_DISCARD);
1897 } 2201 }
1898 } 2202 }
1899} 2203}
1900 2204
1901static void 2205static void
1902slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2206coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
1903{ 2207{
2208 AV *av;
2209
2210 if (coro->status)
2211 {
2212 av = coro->status;
2213 av_clear (av);
2214 }
2215 else
2216 av = coro->status = newAV ();
2217
2218 /* items are actually not so common, so optimise for this case */
2219 if (items)
2220 {
1904 int i; 2221 int i;
1905 HV *hv = (HV *)SvRV (coro_current);
1906 AV *av = newAV ();
1907 2222
1908 av_extend (av, items - 1); 2223 av_extend (av, items - 1);
2224
1909 for (i = 0; i < items; ++i) 2225 for (i = 0; i < items; ++i)
1910 av_push (av, SvREFCNT_inc_NN (arg [i])); 2226 av_push (av, SvREFCNT_inc_NN (arg [i]));
2227 }
2228}
1911 2229
1912 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 2230static void
1913 2231slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2232{
1914 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */ 2233 av_push (av_destroy, (SV *)newRV_inc ((SV *)coro_hv)); /* RVinc for perl */
1915 api_ready (aTHX_ sv_manager); 2234 api_ready (aTHX_ sv_manager);
1916 2235
1917 frame->prepare = prepare_schedule; 2236 frame->prepare = prepare_schedule;
1918 frame->check = slf_check_repeat; 2237 frame->check = slf_check_repeat;
1919 2238
1920 /* as a minor optimisation, we could unwind all stacks here */ 2239 /* as a minor optimisation, we could unwind all stacks here */
1921 /* but that puts extra pressure on pp_slf, and is not worth much */ 2240 /* but that puts extra pressure on pp_slf, and is not worth much */
1922 /*coro_unwind_stacks (aTHX);*/ 2241 /*coro_unwind_stacks (aTHX);*/
2242}
2243
2244static void
2245slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2246{
2247 HV *coro_hv = (HV *)SvRV (coro_current);
2248
2249 coro_set_status (aTHX_ SvSTATE ((SV *)coro_hv), arg, items);
2250 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2251}
2252
2253static void
2254slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2255{
2256 HV *coro_hv;
2257 struct coro *coro;
2258
2259 if (items <= 0)
2260 croak ("Coro::cancel called without coro object,");
2261
2262 coro = SvSTATE (arg [0]);
2263 coro_hv = coro->hv;
2264
2265 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2266
2267 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2268 {
2269 /* coro currently busy cancelling something, so just notify it */
2270 coro->slf_frame.data = (void *)coro;
2271
2272 frame->prepare = prepare_nop;
2273 frame->check = slf_check_nop;
2274 }
2275 else if (coro_hv == (HV *)SvRV (coro_current))
2276 {
2277 /* cancelling the current coro is allowed, and equals terminate */
2278 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2279 }
2280 else
2281 {
2282 struct coro *self = SvSTATE_current;
2283
2284 /* otherwise we cancel directly, purely for speed reasons
2285 * unfortunately, this requires some magic trickery, as
2286 * somebody else could cancel us, so we have to fight the cancellation.
2287 * this is ugly, and hopefully fully worth the extra speed.
2288 * besides, I can't get the slow-but-safe version working...
2289 */
2290 slf_frame.data = 0;
2291 self->flags |= CF_NOCANCEL;
2292 coro_state_destroy (aTHX_ coro);
2293 self->flags &= ~CF_NOCANCEL;
2294
2295 if (slf_frame.data)
2296 {
2297 /* while we were busy we have been cancelled, so terminate */
2298 slf_init_terminate_cancel_common (aTHX_ frame, self->hv);
2299 }
2300 else
2301 {
2302 frame->prepare = prepare_nop;
2303 frame->check = slf_check_nop;
2304 }
2305 }
2306}
2307
2308static int
2309slf_check_safe_cancel (pTHX_ struct CoroSLF *frame)
2310{
2311 frame->prepare = 0;
2312 coro_unwind_stacks (aTHX);
2313
2314 slf_init_terminate_cancel_common (aTHX_ frame, (HV *)SvRV (coro_current));
2315
2316 return 1;
2317}
2318
2319static int
2320safe_cancel (pTHX_ struct coro *coro, SV **arg, int items)
2321{
2322 if (coro->cctx)
2323 croak ("coro inside C callback, unable to cancel at this time, caught");
2324
2325 if (coro->flags & CF_NEW)
2326 {
2327 coro_set_status (aTHX_ coro, arg, items);
2328 coro_state_destroy (aTHX_ coro);
2329 }
2330 else
2331 {
2332 if (!coro->slf_frame.prepare)
2333 croak ("coro outside an SLF function, unable to cancel at this time, caught");
2334
2335 slf_destroy (aTHX_ coro);
2336
2337 coro_set_status (aTHX_ coro, arg, items);
2338 coro->slf_frame.prepare = prepare_nop;
2339 coro->slf_frame.check = slf_check_safe_cancel;
2340
2341 api_ready (aTHX_ (SV *)coro->hv);
2342 }
2343
2344 return 1;
1923} 2345}
1924 2346
1925/*****************************************************************************/ 2347/*****************************************************************************/
1926/* async pool handler */ 2348/* async pool handler */
1927 2349
… …
1958slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2380slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1959{ 2381{
1960 HV *hv = (HV *)SvRV (coro_current); 2382 HV *hv = (HV *)SvRV (coro_current);
1961 struct coro *coro = SvSTATE_hv ((SV *)hv); 2383 struct coro *coro = SvSTATE_hv ((SV *)hv);
1962 2384
1963 if (expect_true (coro->saved_deffh)) 2385 if (ecb_expect_true (coro->saved_deffh))
1964 { 2386 {
1965 /* subsequent iteration */ 2387 /* subsequent iteration */
1966 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2388 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1967 coro->saved_deffh = 0; 2389 coro->saved_deffh = 0;
1968 2390
1969 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 2391 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
1970 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2392 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1971 { 2393 {
1972 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate); 2394 slf_init_terminate_cancel_common (aTHX_ frame, hv);
1973 coro->invoke_av = newAV (); 2395 return;
1974
1975 frame->prepare = prepare_nop;
1976 } 2396 }
1977 else 2397 else
1978 { 2398 {
1979 av_clear (GvAV (PL_defgv)); 2399 av_clear (GvAV (PL_defgv));
1980 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2400 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
… …
2005 2425
2006static void 2426static void
2007coro_rouse_callback (pTHX_ CV *cv) 2427coro_rouse_callback (pTHX_ CV *cv)
2008{ 2428{
2009 dXSARGS; 2429 dXSARGS;
2010 SV *data = (SV *)GENSUB_ARG; 2430 SV *data = (SV *)S_GENSUB_ARG;
2011 2431
2012 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2432 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2013 { 2433 {
2014 /* first call, set args */ 2434 /* first call, set args */
2015 SV *coro = SvRV (data); 2435 SV *coro = SvRV (data);
… …
2030 2450
2031static int 2451static int
2032slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2452slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
2033{ 2453{
2034 SV *data = (SV *)frame->data; 2454 SV *data = (SV *)frame->data;
2035 2455
2036 if (CORO_THROW) 2456 if (CORO_THROW)
2037 return 0; 2457 return 0;
2038 2458
2039 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2459 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2040 return 1; 2460 return 1;
… …
2076 cb = sv_2mortal (coro->rouse_cb); 2496 cb = sv_2mortal (coro->rouse_cb);
2077 coro->rouse_cb = 0; 2497 coro->rouse_cb = 0;
2078 } 2498 }
2079 2499
2080 if (!SvROK (cb) 2500 if (!SvROK (cb)
2081 || SvTYPE (SvRV (cb)) != SVt_PVCV 2501 || SvTYPE (SvRV (cb)) != SVt_PVCV
2082 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2502 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2083 croak ("Coro::rouse_wait called with illegal callback argument,"); 2503 croak ("Coro::rouse_wait called with illegal callback argument,");
2084 2504
2085 { 2505 {
2086 CV *cv = (CV *)SvRV (cb); /* for GENSUB_ARG */ 2506 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
2087 SV *data = (SV *)GENSUB_ARG; 2507 SV *data = (SV *)S_GENSUB_ARG;
2088 2508
2089 frame->data = (void *)data; 2509 frame->data = (void *)data;
2090 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule; 2510 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
2091 frame->check = slf_check_rouse_wait; 2511 frame->check = slf_check_rouse_wait;
2092 } 2512 }
… …
2096coro_new_rouse_cb (pTHX) 2516coro_new_rouse_cb (pTHX)
2097{ 2517{
2098 HV *hv = (HV *)SvRV (coro_current); 2518 HV *hv = (HV *)SvRV (coro_current);
2099 struct coro *coro = SvSTATE_hv (hv); 2519 struct coro *coro = SvSTATE_hv (hv);
2100 SV *data = newRV_inc ((SV *)hv); 2520 SV *data = newRV_inc ((SV *)hv);
2101 SV *cb = gensub (aTHX_ coro_rouse_callback, (void *)data); 2521 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
2102 2522
2103 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0); 2523 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0);
2104 SvREFCNT_dec (data); /* magicext increases the refcount */ 2524 SvREFCNT_dec (data); /* magicext increases the refcount */
2105 2525
2106 SvREFCNT_dec (coro->rouse_cb); 2526 SvREFCNT_dec (coro->rouse_cb);
… …
2203static void 2623static void
2204slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2624slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2205{ 2625{
2206 frame->prepare = prepare_cede_notself; 2626 frame->prepare = prepare_cede_notself;
2207 frame->check = slf_check_nop; 2627 frame->check = slf_check_nop;
2628}
2629
2630/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2631static void
2632slf_destroy (pTHX_ struct coro *coro)
2633{
2634 /* this callback is reserved for slf functions needing to do cleanup */
2635 if (coro->slf_frame.destroy && coro->slf_frame.prepare && !PL_dirty)
2636 coro->slf_frame.destroy (aTHX_ &coro->slf_frame);
2637
2638 /*
2639 * The on_destroy above most likely is from an SLF call.
2640 * Since by definition the SLF call will not finish when we destroy
2641 * the coro, we will have to force-finish it here, otherwise
2642 * cleanup functions cannot call SLF functions.
2643 */
2644 coro->slf_frame.prepare = 0;
2208} 2645}
2209 2646
2210/* 2647/*
2211 * these not obviously related functions are all rolled into one 2648 * these not obviously related functions are all rolled into one
2212 * function to increase chances that they all will call transfer with the same 2649 * function to increase chances that they all will call transfer with the same
… …
2219 I32 checkmark; /* mark SP to see how many elements check has pushed */ 2656 I32 checkmark; /* mark SP to see how many elements check has pushed */
2220 2657
2221 /* set up the slf frame, unless it has already been set-up */ 2658 /* set up the slf frame, unless it has already been set-up */
2222 /* the latter happens when a new coro has been started */ 2659 /* the latter happens when a new coro has been started */
2223 /* or when a new cctx was attached to an existing coroutine */ 2660 /* or when a new cctx was attached to an existing coroutine */
2224 if (expect_true (!slf_frame.prepare)) 2661 if (ecb_expect_true (!slf_frame.prepare))
2225 { 2662 {
2226 /* first iteration */ 2663 /* first iteration */
2227 dSP; 2664 dSP;
2228 SV **arg = PL_stack_base + TOPMARK + 1; 2665 SV **arg = PL_stack_base + TOPMARK + 1;
2229 int items = SP - arg; /* args without function object */ 2666 int items = SP - arg; /* args without function object */
… …
2270 while (slf_frame.check (aTHX_ &slf_frame)); 2707 while (slf_frame.check (aTHX_ &slf_frame));
2271 2708
2272 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */ 2709 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */
2273 2710
2274 /* exception handling */ 2711 /* exception handling */
2275 if (expect_false (CORO_THROW)) 2712 if (ecb_expect_false (CORO_THROW))
2276 { 2713 {
2277 SV *exception = sv_2mortal (CORO_THROW); 2714 SV *exception = sv_2mortal (CORO_THROW);
2278 2715
2279 CORO_THROW = 0; 2716 CORO_THROW = 0;
2280 sv_setsv (ERRSV, exception); 2717 sv_setsv (ERRSV, exception);
2281 croak (0); 2718 croak (0);
2282 } 2719 }
2283 2720
2284 /* return value handling - mostly like entersub */ 2721 /* return value handling - mostly like entersub */
2285 /* make sure we put something on the stack in scalar context */ 2722 /* make sure we put something on the stack in scalar context */
2286 if (GIMME_V == G_SCALAR) 2723 if (GIMME_V == G_SCALAR
2724 && ecb_expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2287 { 2725 {
2288 dSP; 2726 dSP;
2289 SV **bot = PL_stack_base + checkmark; 2727 SV **bot = PL_stack_base + checkmark;
2290 2728
2291 if (sp == bot) /* too few, push undef */ 2729 if (sp == bot) /* too few, push undef */
2292 bot [1] = &PL_sv_undef; 2730 bot [1] = &PL_sv_undef;
2293 else if (sp != bot + 1) /* too many, take last one */ 2731 else /* too many, take last one */
2294 bot [1] = *sp; 2732 bot [1] = *sp;
2295 2733
2296 SP = bot + 1; 2734 SP = bot + 1;
2297 2735
2298 PUTBACK; 2736 PUTBACK;
… …
2331 if (PL_op->op_flags & OPf_STACKED) 2769 if (PL_op->op_flags & OPf_STACKED)
2332 { 2770 {
2333 if (items > slf_arga) 2771 if (items > slf_arga)
2334 { 2772 {
2335 slf_arga = items; 2773 slf_arga = items;
2336 free (slf_argv); 2774 Safefree (slf_argv);
2337 slf_argv = malloc (slf_arga * sizeof (SV *)); 2775 New (0, slf_argv, slf_arga, SV *);
2338 } 2776 }
2339 2777
2340 slf_argc = items; 2778 slf_argc = items;
2341 2779
2342 for (i = 0; i < items; ++i) 2780 for (i = 0; i < items; ++i)
… …
2405{ 2843{
2406 PerlIOBuf base; 2844 PerlIOBuf base;
2407 NV next, every; 2845 NV next, every;
2408} PerlIOCede; 2846} PerlIOCede;
2409 2847
2410static IV 2848static IV ecb_cold
2411PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab) 2849PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab)
2412{ 2850{
2413 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2851 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2414 2852
2415 self->every = SvCUR (arg) ? SvNV (arg) : 0.01; 2853 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
2416 self->next = nvtime () + self->every; 2854 self->next = nvtime () + self->every;
2417 2855
2418 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab); 2856 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
2419} 2857}
2420 2858
2421static SV * 2859static SV * ecb_cold
2422PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags) 2860PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
2423{ 2861{
2424 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2862 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2425 2863
2426 return newSVnv (self->every); 2864 return newSVnv (self->every);
… …
2538 SvREFCNT_dec (cb); 2976 SvREFCNT_dec (cb);
2539 } 2977 }
2540} 2978}
2541 2979
2542static void 2980static void
2543coro_semaphore_on_destroy (pTHX_ struct coro *coro) 2981coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2544{ 2982{
2545 /* call $sem->adjust (0) to possibly wake up some other waiters */ 2983 /* call $sem->adjust (0) to possibly wake up some other waiters */
2546 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 2984 coro_semaphore_adjust (aTHX_ (AV *)frame->data, 0);
2547} 2985}
2548 2986
2549static int 2987static int
2550slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire) 2988slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2551{ 2989{
2552 AV *av = (AV *)frame->data; 2990 AV *av = (AV *)frame->data;
2553 SV *count_sv = AvARRAY (av)[0]; 2991 SV *count_sv = AvARRAY (av)[0];
2992 SV *coro_hv = SvRV (coro_current);
2554 2993
2555 /* if we are about to throw, don't actually acquire the lock, just throw */ 2994 /* if we are about to throw, don't actually acquire the lock, just throw */
2556 if (CORO_THROW) 2995 if (CORO_THROW)
2557 return 0; 2996 return 0;
2558 else if (SvIVX (count_sv) > 0) 2997 else if (SvIVX (count_sv) > 0)
2559 { 2998 {
2560 SvSTATE_current->on_destroy = 0; 2999 frame->destroy = 0;
2561 3000
2562 if (acquire) 3001 if (acquire)
2563 SvIVX (count_sv) = SvIVX (count_sv) - 1; 3002 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2564 else 3003 else
2565 coro_semaphore_adjust (aTHX_ av, 0); 3004 coro_semaphore_adjust (aTHX_ av, 0);
… …
2570 { 3009 {
2571 int i; 3010 int i;
2572 /* if we were woken up but can't down, we look through the whole */ 3011 /* if we were woken up but can't down, we look through the whole */
2573 /* waiters list and only add us if we aren't in there already */ 3012 /* waiters list and only add us if we aren't in there already */
2574 /* this avoids some degenerate memory usage cases */ 3013 /* this avoids some degenerate memory usage cases */
2575 3014 for (i = AvFILLp (av); i > 0; --i) /* i > 0 is not an off-by-one bug */
2576 for (i = 1; i <= AvFILLp (av); ++i)
2577 if (AvARRAY (av)[i] == SvRV (coro_current)) 3015 if (AvARRAY (av)[i] == coro_hv)
2578 return 1; 3016 return 1;
2579 3017
2580 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3018 av_push (av, SvREFCNT_inc (coro_hv));
2581 return 1; 3019 return 1;
2582 } 3020 }
2583} 3021}
2584 3022
2585static int 3023static int
… …
2608 { 3046 {
2609 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3047 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2610 3048
2611 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 3049 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2612 frame->prepare = prepare_schedule; 3050 frame->prepare = prepare_schedule;
2613
2614 /* to avoid race conditions when a woken-up coro gets terminated */ 3051 /* to avoid race conditions when a woken-up coro gets terminated */
2615 /* we arrange for a temporary on_destroy that calls adjust (0) */ 3052 /* we arrange for a temporary on_destroy that calls adjust (0) */
2616 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 3053 frame->destroy = coro_semaphore_destroy;
2617 } 3054 }
2618} 3055}
2619 3056
2620static void 3057static void
2621slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 3058slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
… …
2629{ 3066{
2630 if (items >= 2) 3067 if (items >= 2)
2631 { 3068 {
2632 /* callback form */ 3069 /* callback form */
2633 AV *av = (AV *)SvRV (arg [0]); 3070 AV *av = (AV *)SvRV (arg [0]);
2634 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 3071 SV *cb_cv = s_get_cv_croak (arg [1]);
2635 3072
2636 av_push (av, SvREFCNT_inc_NN (cb_cv)); 3073 av_push (av, SvREFCNT_inc_NN (cb_cv));
2637 3074
2638 if (SvIVX (AvARRAY (av)[0]) > 0) 3075 if (SvIVX (AvARRAY (av)[0]) > 0)
2639 coro_semaphore_adjust (aTHX_ av, 0); 3076 coro_semaphore_adjust (aTHX_ av, 0);
… …
2699{ 3136{
2700 AV *av = (AV *)SvRV (arg [0]); 3137 AV *av = (AV *)SvRV (arg [0]);
2701 3138
2702 if (items >= 2) 3139 if (items >= 2)
2703 { 3140 {
2704 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 3141 SV *cb_cv = s_get_cv_croak (arg [1]);
2705 av_push (av, SvREFCNT_inc_NN (cb_cv)); 3142 av_push (av, SvREFCNT_inc_NN (cb_cv));
2706 3143
2707 if (SvIVX (AvARRAY (av)[0])) 3144 if (SvIVX (AvARRAY (av)[0]))
2708 coro_signal_wake (aTHX_ av, 1); /* ust be the only waiter */ 3145 coro_signal_wake (aTHX_ av, 1); /* must be the only waiter */
2709 3146
2710 frame->prepare = prepare_nop; 3147 frame->prepare = prepare_nop;
2711 frame->check = slf_check_nop; 3148 frame->check = slf_check_nop;
2712 } 3149 }
2713 else if (SvIVX (AvARRAY (av)[0])) 3150 else if (SvIVX (AvARRAY (av)[0]))
… …
2744 3181
2745static void 3182static void
2746coro_aio_callback (pTHX_ CV *cv) 3183coro_aio_callback (pTHX_ CV *cv)
2747{ 3184{
2748 dXSARGS; 3185 dXSARGS;
2749 AV *state = (AV *)GENSUB_ARG; 3186 AV *state = (AV *)S_GENSUB_ARG;
2750 SV *coro = av_pop (state); 3187 SV *coro = av_pop (state);
2751 SV *data_sv = newSV (sizeof (struct io_state)); 3188 SV *data_sv = newSV (sizeof (struct io_state));
2752 3189
2753 av_extend (state, items - 1); 3190 av_extend (state, items - 1);
2754 3191
… …
2839 dSP; 3276 dSP;
2840 3277
2841 static SV *prio_cv; 3278 static SV *prio_cv;
2842 static SV *prio_sv; 3279 static SV *prio_sv;
2843 3280
2844 if (expect_false (!prio_cv)) 3281 if (ecb_expect_false (!prio_cv))
2845 { 3282 {
2846 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0); 3283 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0);
2847 prio_sv = newSViv (0); 3284 prio_sv = newSViv (0);
2848 } 3285 }
2849 3286
… …
2868 3305
2869 for (i = 0; i < items; ++i) 3306 for (i = 0; i < items; ++i)
2870 PUSHs (arg [i]); 3307 PUSHs (arg [i]);
2871 3308
2872 /* now push the callback closure */ 3309 /* now push the callback closure */
2873 PUSHs (sv_2mortal (gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state)))); 3310 PUSHs (sv_2mortal (s_gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state))));
2874 3311
2875 /* now call the AIO function - we assume our request is uncancelable */ 3312 /* now call the AIO function - we assume our request is uncancelable */
2876 PUTBACK; 3313 PUTBACK;
2877 call_sv ((SV *)req, G_VOID | G_DISCARD); 3314 call_sv ((SV *)req, G_VOID | G_DISCARD);
2878 } 3315 }
2879 3316
2880 /* now that the requets is going, we loop toll we have a result */ 3317 /* now that the request is going, we loop till we have a result */
2881 frame->data = (void *)state; 3318 frame->data = (void *)state;
2882 frame->prepare = prepare_schedule; 3319 frame->prepare = prepare_schedule;
2883 frame->check = slf_check_aio_req; 3320 frame->check = slf_check_aio_req;
2884} 3321}
2885 3322
… …
2895 3332
2896/*****************************************************************************/ 3333/*****************************************************************************/
2897 3334
2898#if CORO_CLONE 3335#if CORO_CLONE
2899# include "clone.c" 3336# include "clone.c"
3337#endif
3338
3339/*****************************************************************************/
3340
3341static SV *
3342coro_new (pTHX_ HV *stash, SV **argv, int argc, int is_coro)
3343{
3344 SV *coro_sv;
3345 struct coro *coro;
3346 MAGIC *mg;
3347 HV *hv;
3348 SV *cb;
3349 int i;
3350
3351 if (argc > 0)
3352 {
3353 cb = s_get_cv_croak (argv [0]);
3354
3355 if (!is_coro)
3356 {
3357 if (CvISXSUB (cb))
3358 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
3359
3360 if (!CvROOT (cb))
3361 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
3362 }
3363 }
3364
3365 Newz (0, coro, 1, struct coro);
3366 coro->args = newAV ();
3367 coro->flags = CF_NEW;
3368
3369 if (coro_first) coro_first->prev = coro;
3370 coro->next = coro_first;
3371 coro_first = coro;
3372
3373 coro->hv = hv = newHV ();
3374 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
3375 mg->mg_flags |= MGf_DUP;
3376 coro_sv = sv_bless (newRV_noinc ((SV *)hv), stash);
3377
3378 if (argc > 0)
3379 {
3380 av_extend (coro->args, argc + is_coro - 1);
3381
3382 if (is_coro)
3383 {
3384 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
3385 cb = (SV *)cv_coro_run;
3386 }
3387
3388 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3389
3390 for (i = 1; i < argc; i++)
3391 av_push (coro->args, newSVsv (argv [i]));
3392 }
3393
3394 return coro_sv;
3395}
3396
3397#ifndef __cplusplus
3398ecb_cold XS(boot_Coro__State);
3399#endif
3400
3401#if CORO_JIT
3402
3403static void ecb_noinline ecb_cold
3404pushav_4uv (pTHX_ UV a, UV b, UV c, UV d)
3405{
3406 dSP;
3407 AV *av = newAV ();
3408
3409 av_store (av, 3, newSVuv (d));
3410 av_store (av, 2, newSVuv (c));
3411 av_store (av, 1, newSVuv (b));
3412 av_store (av, 0, newSVuv (a));
3413
3414 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
3415
3416 PUTBACK;
3417}
3418
3419static void ecb_noinline ecb_cold
3420jit_init (pTHX)
3421{
3422 dSP;
3423 SV *load, *save;
3424 char *map_base;
3425 char *load_ptr, *save_ptr;
3426 STRLEN load_len, save_len, map_len;
3427 int count;
3428
3429 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3430
3431 PUSHMARK (SP);
3432 #define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type));
3433 #include "state.h"
3434 count = call_pv ("Coro::State::_jit", G_ARRAY);
3435 SPAGAIN;
3436
3437 save = POPs; save_ptr = SvPVbyte (save, save_len);
3438 load = POPs; load_ptr = SvPVbyte (load, load_len);
3439
3440 map_len = load_len + save_len + 16;
3441
3442 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3443
3444 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3445
3446 load_perl_slots = (load_save_perl_slots_type)map_base;
3447 memcpy (map_base, load_ptr, load_len);
3448
3449 map_base += (load_len + 15) & ~15;
3450
3451 save_perl_slots = (load_save_perl_slots_type)map_base;
3452 memcpy (map_base, save_ptr, save_len);
3453
3454 /* we are good citizens and try to make the page read-only, so the evil evil */
3455 /* hackers might have it a bit more difficult */
3456 mprotect (map_base, map_len, PROT_READ | PROT_EXEC);
3457
3458 PUTBACK;
3459 eval_pv ("undef &Coro::State::_jit", 1);
3460}
3461
2900#endif 3462#endif
2901 3463
2902MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3464MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2903 3465
2904PROTOTYPES: DISABLE 3466PROTOTYPES: DISABLE
… …
2909# if CORO_PTHREAD 3471# if CORO_PTHREAD
2910 coro_thx = PERL_GET_CONTEXT; 3472 coro_thx = PERL_GET_CONTEXT;
2911# endif 3473# endif
2912#endif 3474#endif
2913 BOOT_PAGESIZE; 3475 BOOT_PAGESIZE;
3476
3477 /* perl defines these to check for existance first, but why it doesn't */
3478 /* just create them one at init time is not clear to me, except for */
3479 /* programs trying to delete them, but... */
3480 /* anyway, we declare this as invalid and make sure they are initialised here */
3481 DEFSV;
3482 ERRSV;
2914 3483
2915 cctx_current = cctx_new_empty (); 3484 cctx_current = cctx_new_empty ();
2916 3485
2917 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3486 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
2918 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3487 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
… …
2958 coroapi.prepare_nop = prepare_nop; 3527 coroapi.prepare_nop = prepare_nop;
2959 coroapi.prepare_schedule = prepare_schedule; 3528 coroapi.prepare_schedule = prepare_schedule;
2960 coroapi.prepare_cede = prepare_cede; 3529 coroapi.prepare_cede = prepare_cede;
2961 coroapi.prepare_cede_notself = prepare_cede_notself; 3530 coroapi.prepare_cede_notself = prepare_cede_notself;
2962 3531
2963 { 3532 time_init (aTHX);
2964 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
2965 3533
2966 if (!svp) croak ("Time::HiRes is required");
2967 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
2968
2969 nvtime = INT2PTR (double (*)(), SvIV (*svp));
2970 }
2971
2972 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 3534 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3535#if CORO_JIT
3536 PUTBACK;
3537 jit_init (aTHX);
3538 SPAGAIN;
3539#endif
2973} 3540}
2974 3541
2975SV * 3542SV *
2976new (char *klass, ...) 3543new (SV *klass, ...)
2977 ALIAS: 3544 ALIAS:
2978 Coro::new = 1 3545 Coro::new = 1
2979 CODE: 3546 CODE:
2980{ 3547 RETVAL = coro_new (aTHX_ ix ? coro_stash : coro_state_stash, &ST (1), items - 1, ix);
2981 struct coro *coro; 3548 OUTPUT:
2982 MAGIC *mg;
2983 HV *hv;
2984 CV *cb;
2985 int i;
2986
2987 if (items > 1)
2988 {
2989 cb = coro_sv_2cv (aTHX_ ST (1));
2990
2991 if (!ix)
2992 {
2993 if (CvISXSUB (cb))
2994 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
2995
2996 if (!CvROOT (cb))
2997 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
2998 }
2999 }
3000
3001 Newz (0, coro, 1, struct coro);
3002 coro->args = newAV ();
3003 coro->flags = CF_NEW;
3004
3005 if (coro_first) coro_first->prev = coro;
3006 coro->next = coro_first;
3007 coro_first = coro;
3008
3009 coro->hv = hv = newHV ();
3010 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
3011 mg->mg_flags |= MGf_DUP;
3012 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
3013
3014 if (items > 1)
3015 {
3016 av_extend (coro->args, items - 1 + ix - 1);
3017
3018 if (ix)
3019 {
3020 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
3021 cb = cv_coro_run;
3022 }
3023
3024 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3025
3026 for (i = 2; i < items; i++)
3027 av_push (coro->args, newSVsv (ST (i)));
3028 }
3029}
3030 OUTPUT:
3031 RETVAL 3549 RETVAL
3032 3550
3033void 3551void
3034transfer (...) 3552transfer (...)
3035 PROTOTYPE: $$ 3553 PROTOTYPE: $$
3036 CODE: 3554 CODE:
3037 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3555 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3038
3039bool
3040_destroy (SV *coro_sv)
3041 CODE:
3042 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
3043 OUTPUT:
3044 RETVAL
3045 3556
3046void 3557void
3047_exit (int code) 3558_exit (int code)
3048 PROTOTYPE: $ 3559 PROTOTYPE: $
3049 CODE: 3560 CODE:
… …
3125 CODE: 3636 CODE:
3126{ 3637{
3127 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3638 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
3128 { 3639 {
3129 struct coro *current = SvSTATE_current; 3640 struct coro *current = SvSTATE_current;
3641 struct CoroSLF slf_save;
3130 3642
3131 if (current != coro) 3643 if (current != coro)
3132 { 3644 {
3133 PUTBACK; 3645 PUTBACK;
3134 save_perl (aTHX_ current); 3646 save_perl (aTHX_ current);
3135 load_perl (aTHX_ coro); 3647 load_perl (aTHX_ coro);
3648 /* the coro is most likely in an active SLF call.
3649 * while not strictly required (the code we execute is
3650 * not allowed to call any SLF functions), it's cleaner
3651 * to reinitialise the slf_frame and restore it later.
3652 * This might one day allow us to actually do SLF calls
3653 * from code executed here.
3654 */
3655 slf_save = slf_frame;
3656 slf_frame.prepare = 0;
3136 SPAGAIN; 3657 SPAGAIN;
3137 } 3658 }
3138 3659
3139 PUSHSTACK; 3660 PUSHSTACK;
3140 3661
… …
3150 SPAGAIN; 3671 SPAGAIN;
3151 3672
3152 if (current != coro) 3673 if (current != coro)
3153 { 3674 {
3154 PUTBACK; 3675 PUTBACK;
3676 slf_frame = slf_save;
3155 save_perl (aTHX_ coro); 3677 save_perl (aTHX_ coro);
3156 load_perl (aTHX_ current); 3678 load_perl (aTHX_ current);
3157 SPAGAIN; 3679 SPAGAIN;
3158 } 3680 }
3159 } 3681 }
… …
3164 PROTOTYPE: $ 3686 PROTOTYPE: $
3165 ALIAS: 3687 ALIAS:
3166 is_ready = CF_READY 3688 is_ready = CF_READY
3167 is_running = CF_RUNNING 3689 is_running = CF_RUNNING
3168 is_new = CF_NEW 3690 is_new = CF_NEW
3169 is_destroyed = CF_DESTROYED 3691 is_destroyed = CF_ZOMBIE
3692 is_zombie = CF_ZOMBIE
3170 is_suspended = CF_SUSPENDED 3693 is_suspended = CF_SUSPENDED
3171 CODE: 3694 CODE:
3172 RETVAL = boolSV (coro->flags & ix); 3695 RETVAL = boolSV (coro->flags & ix);
3173 OUTPUT: 3696 OUTPUT:
3174 RETVAL 3697 RETVAL
3175 3698
3176void 3699void
3177throw (Coro::State self, SV *throw = &PL_sv_undef) 3700throw (SV *self, SV *exception = &PL_sv_undef)
3178 PROTOTYPE: $;$ 3701 PROTOTYPE: $;$
3179 CODE: 3702 CODE:
3180{ 3703{
3704 struct coro *coro = SvSTATE (self);
3181 struct coro *current = SvSTATE_current; 3705 struct coro *current = SvSTATE_current;
3182 SV **throwp = self == current ? &CORO_THROW : &self->except; 3706 SV **exceptionp = coro == current ? &CORO_THROW : &coro->except;
3183 SvREFCNT_dec (*throwp); 3707 SvREFCNT_dec (*exceptionp);
3184 SvGETMAGIC (throw); 3708 SvGETMAGIC (exception);
3185 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3709 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3710
3711 api_ready (aTHX_ self);
3186} 3712}
3187 3713
3188void 3714void
3189api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3715api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3190 PROTOTYPE: $;$ 3716 PROTOTYPE: $;$
… …
3245 3771
3246void 3772void
3247cancel (Coro::State self) 3773cancel (Coro::State self)
3248 CODE: 3774 CODE:
3249 coro_state_destroy (aTHX_ self); 3775 coro_state_destroy (aTHX_ self);
3250 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */ 3776
3777SV *
3778enable_times (int enabled = enable_times)
3779 CODE:
3780{
3781 RETVAL = boolSV (enable_times);
3782
3783 if (enabled != enable_times)
3784 {
3785 enable_times = enabled;
3786
3787 coro_times_update ();
3788 (enabled ? coro_times_sub : coro_times_add)(SvSTATE (coro_current));
3789 }
3790}
3791 OUTPUT:
3792 RETVAL
3793
3794void
3795times (Coro::State self)
3796 PPCODE:
3797{
3798 struct coro *current = SvSTATE (coro_current);
3799
3800 if (ecb_expect_false (current == self))
3801 {
3802 coro_times_update ();
3803 coro_times_add (SvSTATE (coro_current));
3804 }
3805
3806 EXTEND (SP, 2);
3807 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3808 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3809
3810 if (ecb_expect_false (current == self))
3811 coro_times_sub (SvSTATE (coro_current));
3812}
3813
3814void
3815swap_sv (Coro::State coro, SV *sv, SV *swapsv)
3816 CODE:
3817{
3818 struct coro *current = SvSTATE_current;
3819
3820 if (current == coro)
3821 SWAP_SVS (current);
3822
3823 if (!coro->swap_sv)
3824 coro->swap_sv = newAV ();
3825
3826 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv )));
3827 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv)));
3828
3829 if (current == coro)
3830 SWAP_SVS (current);
3831}
3251 3832
3252 3833
3253MODULE = Coro::State PACKAGE = Coro 3834MODULE = Coro::State PACKAGE = Coro
3254 3835
3255BOOT: 3836BOOT:
3256{ 3837{
3257 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3838 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3258 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3839 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3259 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 3840 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3260 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3261 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 3841 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3262 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 3842 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3263 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 3843 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3264 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 3844 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3265 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 3845 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3266 3846
3267 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3847 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3268 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3848 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3269 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 3849 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3270 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new); 3850 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3271 3851
3272 coro_stash = gv_stashpv ("Coro", TRUE); 3852 coro_stash = gv_stashpv ("Coro", TRUE);
3273 3853
3274 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 3854 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3275 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 3855 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3276 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 3856 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
3277 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 3857 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (CORO_PRIO_LOW));
3278 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE)); 3858 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (CORO_PRIO_IDLE));
3279 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN)); 3859 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (CORO_PRIO_MIN));
3280 3860
3281 { 3861 {
3282 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 3862 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
3283 3863
3284 coroapi.schedule = api_schedule; 3864 coroapi.schedule = api_schedule;
… …
3294 sv_setiv (sv, (IV)&coroapi); 3874 sv_setiv (sv, (IV)&coroapi);
3295 SvREADONLY_on (sv); 3875 SvREADONLY_on (sv);
3296 } 3876 }
3297} 3877}
3298 3878
3879SV *
3880async (...)
3881 PROTOTYPE: &@
3882 CODE:
3883 RETVAL = coro_new (aTHX_ coro_stash, &ST (0), items, 1);
3884 api_ready (aTHX_ RETVAL);
3885 OUTPUT:
3886 RETVAL
3887
3888void
3889_destroy (Coro::State coro)
3890 CODE:
3891 /* used by the manager thread */
3892 coro_state_destroy (aTHX_ coro);
3893
3894void
3895on_destroy (Coro::State coro, SV *cb)
3896 CODE:
3897 coro_push_on_destroy (aTHX_ coro, newSVsv (cb));
3898
3899void
3900join (...)
3901 CODE:
3902 CORO_EXECUTE_SLF_XS (slf_init_join);
3903
3299void 3904void
3300terminate (...) 3905terminate (...)
3301 CODE: 3906 CODE:
3302 CORO_EXECUTE_SLF_XS (slf_init_terminate); 3907 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3908
3909void
3910cancel (...)
3911 CODE:
3912 CORO_EXECUTE_SLF_XS (slf_init_cancel);
3913
3914int
3915safe_cancel (Coro::State self, ...)
3916 C_ARGS: aTHX_ self, &ST (1), items - 1
3303 3917
3304void 3918void
3305schedule (...) 3919schedule (...)
3306 CODE: 3920 CODE:
3307 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3921 CORO_EXECUTE_SLF_XS (slf_init_schedule);
… …
3337_set_readyhook (SV *hook) 3951_set_readyhook (SV *hook)
3338 PROTOTYPE: $ 3952 PROTOTYPE: $
3339 CODE: 3953 CODE:
3340 SvREFCNT_dec (coro_readyhook); 3954 SvREFCNT_dec (coro_readyhook);
3341 SvGETMAGIC (hook); 3955 SvGETMAGIC (hook);
3956 if (SvOK (hook))
3957 {
3342 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0; 3958 coro_readyhook = newSVsv (hook);
3959 CORO_READYHOOK = invoke_sv_ready_hook_helper;
3960 }
3961 else
3962 {
3963 coro_readyhook = 0;
3964 CORO_READYHOOK = 0;
3965 }
3343 3966
3344int 3967int
3345prio (Coro::State coro, int newprio = 0) 3968prio (Coro::State coro, int newprio = 0)
3346 PROTOTYPE: $;$ 3969 PROTOTYPE: $;$
3347 ALIAS: 3970 ALIAS:
… …
3353 if (items > 1) 3976 if (items > 1)
3354 { 3977 {
3355 if (ix) 3978 if (ix)
3356 newprio = coro->prio - newprio; 3979 newprio = coro->prio - newprio;
3357 3980
3358 if (newprio < PRIO_MIN) newprio = PRIO_MIN; 3981 if (newprio < CORO_PRIO_MIN) newprio = CORO_PRIO_MIN;
3359 if (newprio > PRIO_MAX) newprio = PRIO_MAX; 3982 if (newprio > CORO_PRIO_MAX) newprio = CORO_PRIO_MAX;
3360 3983
3361 coro->prio = newprio; 3984 coro->prio = newprio;
3362 } 3985 }
3363} 3986}
3364 OUTPUT: 3987 OUTPUT:
… …
3411 for (i = 1; i < items; ++i) 4034 for (i = 1; i < items; ++i)
3412 av_push (av, SvREFCNT_inc_NN (ST (i))); 4035 av_push (av, SvREFCNT_inc_NN (ST (i)));
3413 4036
3414 if ((SV *)hv == &PL_sv_undef) 4037 if ((SV *)hv == &PL_sv_undef)
3415 { 4038 {
3416 PUSHMARK (SP); 4039 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3417 EXTEND (SP, 2);
3418 PUSHs (sv_Coro);
3419 PUSHs ((SV *)cv_pool_handler);
3420 PUTBACK;
3421 call_sv ((SV *)cv_coro_state_new, G_SCALAR);
3422 SPAGAIN;
3423
3424 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs)); 4040 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
4041 SvREFCNT_dec (sv);
3425 } 4042 }
3426 4043
3427 { 4044 {
3428 struct coro *coro = SvSTATE_hv (hv); 4045 struct coro *coro = SvSTATE_hv (hv);
3429 4046
… …
3463 CODE: 4080 CODE:
3464{ 4081{
3465 struct coro *coro = SvSTATE_current; 4082 struct coro *coro = SvSTATE_current;
3466 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 4083 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3467 4084
3468 block = (SV *)coro_sv_2cv (aTHX_ block); 4085 block = s_get_cv_croak (block);
3469 4086
3470 if (!*avp) 4087 if (!*avp)
3471 *avp = newAV (); 4088 *avp = newAV ();
3472 4089
3473 av_push (*avp, SvREFCNT_inc (block)); 4090 av_push (*avp, SvREFCNT_inc (block));
… …
3580} 4197}
3581 4198
3582MODULE = Coro::State PACKAGE = Coro::SemaphoreSet 4199MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3583 4200
3584void 4201void
3585_may_delete (SV *sem, int count, int extra_refs) 4202_may_delete (SV *sem, int count, unsigned int extra_refs)
3586 PPCODE: 4203 PPCODE:
3587{ 4204{
3588 AV *av = (AV *)SvRV (sem); 4205 AV *av = (AV *)SvRV (sem);
3589 4206
3590 if (SvREFCNT ((SV *)av) == 1 + extra_refs 4207 if (SvREFCNT ((SV *)av) == 1 + extra_refs
… …
3673 4290
3674void 4291void
3675_register (char *target, char *proto, SV *req) 4292_register (char *target, char *proto, SV *req)
3676 CODE: 4293 CODE:
3677{ 4294{
3678 CV *req_cv = coro_sv_2cv (aTHX_ req); 4295 SV *req_cv = s_get_cv_croak (req);
3679 /* newXSproto doesn't return the CV on 5.8 */ 4296 /* newXSproto doesn't return the CV on 5.8 */
3680 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 4297 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3681 sv_setpv ((SV *)slf_cv, proto); 4298 sv_setpv ((SV *)slf_cv, proto);
3682 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0); 4299 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
3683} 4300}
3684 4301
4302MODULE = Coro::State PACKAGE = Coro::Select
4303
4304void
4305patch_pp_sselect ()
4306 CODE:
4307 if (!coro_old_pp_sselect)
4308 {
4309 coro_select_select = (SV *)get_cv ("Coro::Select::select", 0);
4310 coro_old_pp_sselect = PL_ppaddr [OP_SSELECT];
4311 PL_ppaddr [OP_SSELECT] = coro_pp_sselect;
4312 }
4313
4314void
4315unpatch_pp_sselect ()
4316 CODE:
4317 if (coro_old_pp_sselect)
4318 {
4319 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
4320 coro_old_pp_sselect = 0;
4321 }
4322

Diff Legend

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