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.317 by root, Thu Nov 20 06:28:52 2008 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
107/* 5.8.7 */
108#ifndef SvRV_set
109# define SvRV_set(s,v) SvRV(s) = (v)
110#endif 89#endif
111 90
112#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 91#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
113# undef CORO_STACKGUARD 92# undef CORO_STACKGUARD
114#endif 93#endif
… …
130#else 109#else
131# define dSTACKLEVEL volatile void *stacklevel 110# define dSTACKLEVEL volatile void *stacklevel
132# define STACKLEVEL ((void *)&stacklevel) 111# define STACKLEVEL ((void *)&stacklevel)
133#endif 112#endif
134 113
135#define IN_DESTRUCT (PL_main_cv == Nullcv) 114#define IN_DESTRUCT PL_dirty
136
137#if __GNUC__ >= 3
138# define attribute(x) __attribute__(x)
139# define expect(expr,value) __builtin_expect ((expr),(value))
140# define INLINE static inline
141#else
142# define attribute(x)
143# define expect(expr,value) (expr)
144# define INLINE static
145#endif
146
147#define expect_false(expr) expect ((expr) != 0, 0)
148#define expect_true(expr) expect ((expr) != 0, 1)
149
150#define NOINLINE attribute ((noinline))
151 115
152#include "CoroAPI.h" 116#include "CoroAPI.h"
153#define GCoroAPI (&coroapi) /* very sneaky */ 117#define GCoroAPI (&coroapi) /* very sneaky */
154 118
155#ifdef USE_ITHREADS 119#ifdef USE_ITHREADS
156# if CORO_PTHREAD 120# if CORO_PTHREAD
157static void *coro_thx; 121static void *coro_thx;
158# endif 122# endif
159#endif 123#endif
160 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
161static 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]);
162 137
163/* we hijack an hopefully unused CV flag for our purposes */ 138/* we hijack an hopefully unused CV flag for our purposes */
164#define CVf_SLF 0x4000 139#define CVf_SLF 0x4000
165static OP *pp_slf (pTHX); 140static OP *pp_slf (pTHX);
141static void slf_destroy (pTHX_ struct coro *coro);
166 142
167static U32 cctx_gen; 143static U32 cctx_gen;
168static size_t cctx_stacksize = CORO_STACKSIZE; 144static size_t cctx_stacksize = CORO_STACKSIZE;
169static struct CoroAPI coroapi; 145static struct CoroAPI coroapi;
170static AV *main_mainstack; /* used to differentiate between $main and others */ 146static AV *main_mainstack; /* used to differentiate between $main and others */
171static JMPENV *main_top_env; 147static JMPENV *main_top_env;
172static HV *coro_state_stash, *coro_stash; 148static HV *coro_state_stash, *coro_stash;
173static volatile SV *coro_mortal; /* will be freed/thrown after next transfer */ 149static volatile SV *coro_mortal; /* will be freed/thrown after next transfer */
174 150
151static AV *av_destroy; /* destruction queue */
152static SV *sv_manager; /* the manager coro */
153static SV *sv_idle; /* $Coro::idle */
154
175static GV *irsgv; /* $/ */ 155static GV *irsgv; /* $/ */
176static GV *stdoutgv; /* *STDOUT */ 156static GV *stdoutgv; /* *STDOUT */
177static SV *rv_diehook; 157static SV *rv_diehook;
178static SV *rv_warnhook; 158static SV *rv_warnhook;
179static HV *hv_sig; /* %SIG */ 159static HV *hv_sig; /* %SIG */
180 160
181/* async_pool helper stuff */ 161/* async_pool helper stuff */
182static SV *sv_pool_rss; 162static SV *sv_pool_rss;
183static SV *sv_pool_size; 163static SV *sv_pool_size;
184static SV *sv_async_pool_idle; 164static SV *sv_async_pool_idle; /* description string */
185static AV *av_async_pool; 165static AV *av_async_pool; /* idle pool */
186static SV *sv_Coro; 166static SV *sv_Coro; /* class string */
187static CV *cv_pool_handler; 167static CV *cv_pool_handler;
188static CV *cv_coro_state_new;
189 168
190/* Coro::AnyEvent */ 169/* Coro::AnyEvent */
191static SV *sv_activity; 170static SV *sv_activity;
192 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
193static struct coro_cctx *cctx_first; 178static struct coro_cctx *cctx_first;
194static int cctx_count, cctx_idle; 179static int cctx_count, cctx_idle;
195 180
196enum { 181enum
182{
197 CC_MAPPED = 0x01, 183 CC_MAPPED = 0x01,
198 CC_NOREUSE = 0x02, /* throw this away after tracing */ 184 CC_NOREUSE = 0x02, /* throw this away after tracing */
199 CC_TRACE = 0x04, 185 CC_TRACE = 0x04,
200 CC_TRACE_SUB = 0x08, /* trace sub calls */ 186 CC_TRACE_SUB = 0x08, /* trace sub calls */
201 CC_TRACE_LINE = 0x10, /* trace each statement */ 187 CC_TRACE_LINE = 0x10, /* trace each statement */
… …
211 void *sptr; 197 void *sptr;
212 size_t ssize; 198 size_t ssize;
213 199
214 /* cpu state */ 200 /* cpu state */
215 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
216 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
217 JMPENV *top_env; 205 JMPENV *top_env;
218 coro_context cctx; 206 coro_context cctx;
219 207
220 U32 gen; 208 U32 gen;
221#if CORO_USE_VALGRIND 209#if CORO_USE_VALGRIND
222 int valgrind_id; 210 int valgrind_id;
223#endif 211#endif
224 unsigned char flags; 212 unsigned char flags;
225} coro_cctx; 213} coro_cctx;
226 214
215static coro_cctx *cctx_current; /* the currently running cctx */
216
217/*****************************************************************************/
218
219static MGVTBL coro_state_vtbl;
220
227enum { 221enum
222{
228 CF_RUNNING = 0x0001, /* coroutine is running */ 223 CF_RUNNING = 0x0001, /* coroutine is running */
229 CF_READY = 0x0002, /* coroutine is ready */ 224 CF_READY = 0x0002, /* coroutine is ready */
230 CF_NEW = 0x0004, /* has never been switched to */ 225 CF_NEW = 0x0004, /* has never been switched to */
231 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 226 CF_ZOMBIE = 0x0008, /* coroutine data has been freed */
227 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
228 CF_NOCANCEL = 0x0020, /* cannot cancel, set slf_frame.data to 1 (hackish) */
232}; 229};
233 230
234/* 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 */
235typedef struct 232typedef struct
236{ 233{
237 SV *defsv;
238 AV *defav;
239 SV *errsv;
240 SV *irsgv;
241#define VAR(name,type) type name; 234 #define VARx(name,expr,type) type name;
242# include "state.h" 235 #include "state.h"
243#undef VAR
244} perl_slots; 236} perl_slots;
245 237
238/* how many context stack entries do we need for perl_slots */
246#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))
247 240
248/* this is a structure representing a perl-level coroutine */ 241/* this is a structure representing a perl-level coroutine */
249struct coro { 242struct coro
243{
250 /* the C coroutine allocated to this perl coroutine, if any */ 244 /* the C coroutine allocated to this perl coroutine, if any */
251 coro_cctx *cctx; 245 coro_cctx *cctx;
246
247 /* ready queue */
248 struct coro *next_ready;
252 249
253 /* state data */ 250 /* state data */
254 struct CoroSLF slf_frame; /* saved slf frame */ 251 struct CoroSLF slf_frame; /* saved slf frame */
255 AV *mainstack; 252 AV *mainstack;
256 perl_slots *slot; /* basically the saved sp */ 253 perl_slots *slot; /* basically the saved sp */
257 254
258 CV *startcv; /* the CV to execute */ 255 CV *startcv; /* the CV to execute */
259 AV *args; /* data associated with this coroutine (initial args) */ 256 AV *args; /* data associated with this coroutine (initial args) */
260 int refcnt; /* coroutines are refcounted, yes */
261 int flags; /* CF_ flags */ 257 int flags; /* CF_ flags */
262 HV *hv; /* the perl hash associated with this coro, if any */ 258 HV *hv; /* the perl hash associated with this coro, if any */
263 void (*on_destroy)(pTHX_ struct coro *coro);
264 259
265 /* statistics */ 260 /* statistics */
266 int usecount; /* number of transfers to this coro */ 261 int usecount; /* number of transfers to this coro */
267 262
268 /* coro process data */ 263 /* coro process data */
269 int prio; 264 int prio;
270 SV *except; /* exception to be thrown */ 265 SV *except; /* exception to be thrown */
271 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 */
272 269
273 /* async_pool */ 270 /* async_pool */
274 SV *saved_deffh; 271 SV *saved_deffh;
275 SV *invoke_cb; 272 SV *invoke_cb;
276 AV *invoke_av; 273 AV *invoke_av;
277 274
275 /* on_enter/on_leave */
276 AV *on_enter;
277 AV *on_leave;
278
279 /* swap_sv */
280 AV *swap_sv;
281
282 /* times */
283 coro_ts t_cpu, t_real;
284
278 /* linked list */ 285 /* linked list */
279 struct coro *next, *prev; 286 struct coro *next, *prev;
280}; 287};
281 288
282typedef struct coro *Coro__State; 289typedef struct coro *Coro__State;
283typedef struct coro *Coro__State_or_hashref; 290typedef struct coro *Coro__State_or_hashref;
284 291
285/* the following variables are effectively part of the perl context */ 292/* the following variables are effectively part of the perl context */
286/* and get copied between struct coro and these variables */ 293/* and get copied between struct coro and these variables */
287/* the mainr easonw e don't support windows process emulation */ 294/* the main reason we don't support windows process emulation */
288static struct CoroSLF slf_frame; /* the current slf frame */ 295static struct CoroSLF slf_frame; /* the current slf frame */
289 296
290/** Coro ********************************************************************/ 297/** Coro ********************************************************************/
291 298
292#define PRIO_MAX 3 299#define CORO_PRIO_MAX 3
293#define PRIO_HIGH 1 300#define CORO_PRIO_HIGH 1
294#define PRIO_NORMAL 0 301#define CORO_PRIO_NORMAL 0
295#define PRIO_LOW -1 302#define CORO_PRIO_LOW -1
296#define PRIO_IDLE -3 303#define CORO_PRIO_IDLE -3
297#define PRIO_MIN -4 304#define CORO_PRIO_MIN -4
298 305
299/* for Coro.pm */ 306/* for Coro.pm */
300static SV *coro_current; 307static SV *coro_current;
301static SV *coro_readyhook; 308static SV *coro_readyhook;
302static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1]; 309static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
303static CV *cv_coro_run, *cv_coro_terminate; 310static CV *cv_coro_run;
304static struct coro *coro_first; 311static struct coro *coro_first;
305#define coro_nready coroapi.nready 312#define coro_nready coroapi.nready
306 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
307/** lowlevel stuff **********************************************************/ 409/** lowlevel stuff **********************************************************/
308 410
309static SV * 411static SV * ecb_noinline
310coro_get_sv (pTHX_ const char *name, int create) 412coro_get_sv (pTHX_ const char *name, int create)
311{ 413{
312#if PERL_VERSION_ATLEAST (5,10,0) 414#if PERL_VERSION_ATLEAST (5,10,0)
313 /* 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 */
314 get_sv (name, create); 416 get_sv (name, create);
315#endif 417#endif
316 return get_sv (name, create); 418 return get_sv (name, create);
317} 419}
318 420
319static AV * 421static AV * ecb_noinline
320coro_get_av (pTHX_ const char *name, int create) 422coro_get_av (pTHX_ const char *name, int create)
321{ 423{
322#if PERL_VERSION_ATLEAST (5,10,0) 424#if PERL_VERSION_ATLEAST (5,10,0)
323 /* 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 */
324 get_av (name, create); 426 get_av (name, create);
325#endif 427#endif
326 return get_av (name, create); 428 return get_av (name, create);
327} 429}
328 430
329static HV * 431static HV * ecb_noinline
330coro_get_hv (pTHX_ const char *name, int create) 432coro_get_hv (pTHX_ const char *name, int create)
331{ 433{
332#if PERL_VERSION_ATLEAST (5,10,0) 434#if PERL_VERSION_ATLEAST (5,10,0)
333 /* 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 */
334 get_hv (name, create); 436 get_hv (name, create);
335#endif 437#endif
336 return get_hv (name, create); 438 return get_hv (name, create);
337} 439}
338 440
339/* may croak */ 441ecb_inline void
340INLINE CV * 442coro_times_update (void)
341coro_sv_2cv (pTHX_ SV *sv)
342{ 443{
343 HV *st; 444#ifdef coro_clock_gettime
344 GV *gvp; 445 struct timespec ts;
345 return sv_2cv (sv, &st, &gvp, 0);
346}
347 446
348static AV * 447 ts.tv_sec = ts.tv_nsec = 0;
448 coro_clock_gettime (CORO_CLOCK_THREAD_CPUTIME_ID, &ts);
449 time_cpu [0] = ts.tv_sec; time_cpu [1] = ts.tv_nsec;
450
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];
486}
487
488/*****************************************************************************/
489/* magic glue */
490
491#define CORO_MAGIC_type_cv 26
492#define CORO_MAGIC_type_state PERL_MAGIC_ext
493
494#define CORO_MAGIC_NN(sv, type) \
495 (ecb_expect_true (SvMAGIC (sv)->mg_type == type) \
496 ? SvMAGIC (sv) \
497 : mg_find (sv, type))
498
499#define CORO_MAGIC(sv, type) \
500 (ecb_expect_true (SvMAGIC (sv)) \
501 ? CORO_MAGIC_NN (sv, type) \
502 : 0)
503
504#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
505#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
506
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 *
523SvSTATE_ (pTHX_ SV *coro)
524{
525 MAGIC *mg;
526
527 if (SvROK (coro))
528 coro = SvRV (coro);
529
530 mg = SvSTATEhv_p (aTHX_ coro);
531 if (!mg)
532 croak ("Coro::State object required");
533
534 return (struct coro *)mg->mg_ptr;
535}
536
537#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
538
539/* faster than SvSTATE, but expects a coroutine hv */
540#define SvSTATE_hv(hv) ((struct coro *)CORO_MAGIC_NN ((SV *)hv, CORO_MAGIC_type_state)->mg_ptr)
541#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
542
543/*****************************************************************************/
544/* padlist management and caching */
545
546ecb_inline PADLIST *
349coro_clone_padlist (pTHX_ CV *cv) 547coro_derive_padlist (pTHX_ CV *cv)
350{ 548{
351 AV *padlist = CvPADLIST (cv); 549 PADLIST *padlist = CvPADLIST (cv);
352 AV *newpadlist, *newpad; 550 PADLIST *newpadlist;
551 PAD *newpad;
552 PADOFFSET const off = PadlistMAX (padlist) + 1;
353 553
354 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. */
355 AvREAL_off (newpadlist); 557 AvREAL_off (newpadlist);
558#endif
356#if PERL_VERSION_ATLEAST (5,10,0) 559#if PERL_VERSION_ATLEAST (5,10,0)
357 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1); 560 Perl_pad_push (aTHX_ padlist, off);
358#else 561#else
359 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 562 Perl_pad_push (aTHX_ padlist, off, 1);
360#endif 563#endif
361 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 564 newpad = PadlistARRAY (padlist)[off];
362 --AvFILLp (padlist); 565 PadlistMAX (padlist) = off - 1;
363 566
364 av_store (newpadlist, 0, SvREFCNT_inc_NN (*av_fetch (padlist, 0, FALSE))); 567 /* Already extended to 2 elements by newPADLIST. */
365 av_store (newpadlist, 1, (SV *)newpad); 568 PadlistMAX (newpadlist) = 1;
569 PadlistNAMES (newpadlist) = (PADNAMELIST *)SvREFCNT_inc_NN (PadlistNAMES (padlist));
570 PadlistARRAY (newpadlist)[1] = newpad;
366 571
367 return newpadlist; 572 return newpadlist;
368} 573}
369 574
370static void 575ecb_inline void
371free_padlist (pTHX_ AV *padlist) 576free_padlist (pTHX_ PADLIST *padlist)
372{ 577{
373 /* may be during global destruction */ 578 /* may be during global destruction */
374 if (SvREFCNT (padlist)) 579 if (!IN_DESTRUCT)
375 { 580 {
376 I32 i = AvFILLp (padlist); 581 I32 i = PadlistMAX (padlist);
377 while (i >= 0) 582
583 while (i > 0) /* special-case index 0 */
378 { 584 {
379 SV **svp = av_fetch (padlist, i--, FALSE); 585 /* we try to be extra-careful here */
380 if (svp) 586 PAD *pad = PadlistARRAY (padlist)[i--];
381 { 587 I32 j = PadMAX (pad);
382 SV *sv;
383 while (&PL_sv_undef != (sv = av_pop ((AV *)*svp)))
384 SvREFCNT_dec (sv);
385 588
589 while (j >= 0)
590 SvREFCNT_dec (PadARRAY (pad)[j--]);
591
592 PadMAX (pad) = -1;
386 SvREFCNT_dec (*svp); 593 SvREFCNT_dec (pad);
387 }
388 } 594 }
389 595
596 SvREFCNT_dec (PadlistNAMES (padlist));
597
598#ifdef NEWPADAPI
599 Safefree (PadlistARRAY (padlist));
600 Safefree (padlist);
601#else
602 AvFILLp (padlist) = -1;
603 AvREAL_off (padlist);
390 SvREFCNT_dec ((SV*)padlist); 604 SvREFCNT_dec ((SV*)padlist);
605#endif
391 } 606 }
392} 607}
393 608
394static int 609static int
395coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 610coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
396{ 611{
397 AV *padlist; 612 PADLIST *padlist;
398 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;
399 615
400 /* casting is fun. */ 616 /* perl manages to free our internal AV and _then_ call us */
401 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 617 if (IN_DESTRUCT)
618 return 0;
619
620 while (len--)
402 free_padlist (aTHX_ padlist); 621 free_padlist (aTHX_ padlists[len]);
403
404 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
405 622
406 return 0; 623 return 0;
407} 624}
408
409#define CORO_MAGIC_type_cv 26
410#define CORO_MAGIC_type_state PERL_MAGIC_ext
411 625
412static MGVTBL coro_cv_vtbl = { 626static MGVTBL coro_cv_vtbl = {
413 0, 0, 0, 0, 627 0, 0, 0, 0,
414 coro_cv_free 628 coro_cv_free
415}; 629};
416 630
417#define CORO_MAGIC_NN(sv, type) \
418 (expect_true (SvMAGIC (sv)->mg_type == type) \
419 ? SvMAGIC (sv) \
420 : mg_find (sv, type))
421
422#define CORO_MAGIC(sv, type) \
423 (expect_true (SvMAGIC (sv)) \
424 ? CORO_MAGIC_NN (sv, type) \
425 : 0)
426
427#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
428#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
429
430INLINE struct coro *
431SvSTATE_ (pTHX_ SV *coro)
432{
433 HV *stash;
434 MAGIC *mg;
435
436 if (SvROK (coro))
437 coro = SvRV (coro);
438
439 if (expect_false (SvTYPE (coro) != SVt_PVHV))
440 croak ("Coro::State object required");
441
442 stash = SvSTASH (coro);
443 if (expect_false (stash != coro_stash && stash != coro_state_stash))
444 {
445 /* very slow, but rare, check */
446 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
447 croak ("Coro::State object required");
448 }
449
450 mg = CORO_MAGIC_state (coro);
451 return (struct coro *)mg->mg_ptr;
452}
453
454#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
455
456/* faster than SvSTATE, but expects a coroutine hv */
457#define SvSTATE_hv(hv) ((struct coro *)CORO_MAGIC_NN ((SV *)hv, CORO_MAGIC_type_state)->mg_ptr)
458#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
459
460/* the next two functions merely cache the padlists */ 631/* the next two functions merely cache the padlists */
461static void 632ecb_inline void
462get_padlist (pTHX_ CV *cv) 633get_padlist (pTHX_ CV *cv)
463{ 634{
464 MAGIC *mg = CORO_MAGIC_cv (cv); 635 MAGIC *mg = CORO_MAGIC_cv (cv);
465 AV *av; 636 size_t *lenp;
466 637
467 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 638 if (ecb_expect_true (mg && *(lenp = (size_t *)mg->mg_ptr)))
468 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 639 CvPADLIST (cv) = ((PADLIST **)(mg->mg_ptr + sizeof(size_t)))[--*lenp];
469 else 640 else
470 { 641 {
471#if CORO_PREFER_PERL_FUNCTIONS 642#if CORO_PREFER_PERL_FUNCTIONS
472 /* this is probably cleaner? but also slower! */ 643 /* this is probably cleaner? but also slower! */
473 /* in practise, it seems to be less stable */ 644 /* in practise, it seems to be less stable */
474 CV *cp = Perl_cv_clone (aTHX_ cv); 645 CV *cp = Perl_cv_clone (aTHX_ cv);
475 CvPADLIST (cv) = CvPADLIST (cp); 646 CvPADLIST (cv) = CvPADLIST (cp);
476 CvPADLIST (cp) = 0; 647 CvPADLIST (cp) = 0;
477 SvREFCNT_dec (cp); 648 SvREFCNT_dec (cp);
478#else 649#else
479 CvPADLIST (cv) = coro_clone_padlist (aTHX_ cv); 650 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
480#endif 651#endif
481 } 652 }
482} 653}
483 654
484static void 655ecb_inline void
485put_padlist (pTHX_ CV *cv) 656put_padlist (pTHX_ CV *cv)
486{ 657{
487 MAGIC *mg = CORO_MAGIC_cv (cv); 658 MAGIC *mg = CORO_MAGIC_cv (cv);
488 AV *av;
489 659
490 if (expect_false (!mg)) 660 if (ecb_expect_false (!mg))
661 {
491 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);
492 670
493 av = (AV *)mg->mg_obj; 671 ((PADLIST **)(mg->mg_ptr + sizeof (size_t))) [(*(size_t *)mg->mg_ptr)++] = CvPADLIST (cv);
494
495 if (expect_false (AvFILLp (av) >= AvMAX (av)))
496 av_extend (av, AvMAX (av) + 1);
497
498 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
499} 672}
500 673
501/** 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))
727
728static void
729on_enterleave_call (pTHX_ SV *cb);
502 730
503static void 731static void
504load_perl (pTHX_ Coro__State c) 732load_perl (pTHX_ Coro__State c)
505{ 733{
506 perl_slots *slot = c->slot; 734 perl_slots *slot = c->slot;
507 c->slot = 0; 735 c->slot = 0;
508 736
509 PL_mainstack = c->mainstack; 737 PL_mainstack = c->mainstack;
510 738
511 GvSV (PL_defgv) = slot->defsv; 739#if CORO_JIT
512 GvAV (PL_defgv) = slot->defav; 740 load_perl_slots (slot);
513 GvSV (PL_errgv) = slot->errsv; 741#else
514 GvSV (irsgv) = slot->irsgv;
515
516 #define VAR(name,type) PL_ ## name = slot->name; 742 #define VARx(name,expr,type) expr = slot->name;
517 # include "state.h" 743 #include "state.h"
518 #undef VAR 744#endif
519 745
520 { 746 {
521 dSP; 747 dSP;
522 748
523 CV *cv; 749 CV *cv;
524 750
525 /* now do the ugly restore mess */ 751 /* now do the ugly restore mess */
526 while (expect_true (cv = (CV *)POPs)) 752 while (ecb_expect_true (cv = (CV *)POPs))
527 { 753 {
528 put_padlist (aTHX_ cv); /* mark this padlist as available */ 754 put_padlist (aTHX_ cv); /* mark this padlist as available */
529 CvDEPTH (cv) = PTR2IV (POPs); 755 CvDEPTH (cv) = PTR2IV (POPs);
530 CvPADLIST (cv) = (AV *)POPs; 756 CvPADLIST (cv) = (PADLIST *)POPs;
531 } 757 }
532 758
533 PUTBACK; 759 PUTBACK;
534 } 760 }
535 761
536 slf_frame = c->slf_frame; 762 slf_frame = c->slf_frame;
537 CORO_THROW = c->except; 763 CORO_THROW = c->except;
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
773 if (ecb_expect_false (c->on_enter))
774 {
775 int i;
776
777 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
778 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
779 }
780
781 SWAP_SVS (c);
538} 782}
539 783
540static void 784static void
541save_perl (pTHX_ Coro__State c) 785save_perl (pTHX_ Coro__State c)
542{ 786{
787 SWAP_SVS (c);
788
789 if (ecb_expect_false (c->on_leave))
790 {
791 int i;
792
793 for (i = AvFILLp (c->on_leave); i >= 0; --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);
803 }
804
543 c->except = CORO_THROW; 805 c->except = CORO_THROW;
544 c->slf_frame = slf_frame; 806 c->slf_frame = slf_frame;
545 807
546 { 808 {
547 dSP; 809 dSP;
… …
556 818
557 XPUSHs (Nullsv); 819 XPUSHs (Nullsv);
558 /* this loop was inspired by pp_caller */ 820 /* this loop was inspired by pp_caller */
559 for (;;) 821 for (;;)
560 { 822 {
561 while (expect_true (cxix >= 0)) 823 while (ecb_expect_true (cxix >= 0))
562 { 824 {
563 PERL_CONTEXT *cx = &ccstk[cxix--]; 825 PERL_CONTEXT *cx = &ccstk[cxix--];
564 826
565 if (expect_true (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT)) 827 if (ecb_expect_true (CxTYPE (cx) == CXt_SUB) || ecb_expect_false (CxTYPE (cx) == CXt_FORMAT))
566 { 828 {
567 CV *cv = cx->blk_sub.cv; 829 CV *cv = cx->blk_sub.cv;
568 830
569 if (expect_true (CvDEPTH (cv))) 831 if (ecb_expect_true (CvDEPTH (cv)))
570 { 832 {
571 EXTEND (SP, 3); 833 EXTEND (SP, 3);
572 PUSHs ((SV *)CvPADLIST (cv)); 834 PUSHs ((SV *)CvPADLIST (cv));
573 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv))); 835 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
574 PUSHs ((SV *)cv); 836 PUSHs ((SV *)cv);
… …
577 get_padlist (aTHX_ cv); 839 get_padlist (aTHX_ cv);
578 } 840 }
579 } 841 }
580 } 842 }
581 843
582 if (expect_true (top_si->si_type == PERLSI_MAIN)) 844 if (ecb_expect_true (top_si->si_type == PERLSI_MAIN))
583 break; 845 break;
584 846
585 top_si = top_si->si_prev; 847 top_si = top_si->si_prev;
586 ccstk = top_si->si_cxstack; 848 ccstk = top_si->si_cxstack;
587 cxix = top_si->si_cxix; 849 cxix = top_si->si_cxix;
… …
589 851
590 PUTBACK; 852 PUTBACK;
591 } 853 }
592 854
593 /* allocate some space on the context stack for our purposes */ 855 /* allocate some space on the context stack for our purposes */
594 /* we manually unroll here, as usually 2 slots is enough */ 856 if (ecb_expect_false (cxstack_ix + (int)SLOT_COUNT >= cxstack_max))
595 if (SLOT_COUNT >= 1) CXINC;
596 if (SLOT_COUNT >= 2) CXINC;
597 if (SLOT_COUNT >= 3) CXINC;
598 { 857 {
599 int i; 858 unsigned int i;
859
600 for (i = 3; i < SLOT_COUNT; ++i) 860 for (i = 0; i < SLOT_COUNT; ++i)
601 CXINC; 861 CXINC;
602 } 862
603 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 863 cxstack_ix -= SLOT_COUNT; /* undo allocation */
864 }
604 865
605 c->mainstack = PL_mainstack; 866 c->mainstack = PL_mainstack;
606 867
607 { 868 {
608 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 869 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
609 870
610 slot->defav = GvAV (PL_defgv); 871#if CORO_JIT
611 slot->defsv = DEFSV; 872 save_perl_slots (slot);
612 slot->errsv = ERRSV; 873#else
613 slot->irsgv = GvSV (irsgv);
614
615 #define VAR(name,type) slot->name = PL_ ## name; 874 #define VARx(name,expr,type) slot->name = expr;
616 # include "state.h" 875 #include "state.h"
617 #undef VAR 876#endif
618 } 877 }
619} 878}
620 879
621/* 880/*
622 * allocate various perl stacks. This is almost an exact copy 881 * allocate various perl stacks. This is almost an exact copy
… …
628# define coro_init_stacks(thx) init_stacks () 887# define coro_init_stacks(thx) init_stacks ()
629#else 888#else
630static void 889static void
631coro_init_stacks (pTHX) 890coro_init_stacks (pTHX)
632{ 891{
633 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() */
634 PL_curstackinfo->si_type = PERLSI_MAIN; 893 PL_curstackinfo->si_type = PERLSI_MAIN;
635 PL_curstack = PL_curstackinfo->si_stack; 894 PL_curstack = PL_curstackinfo->si_stack;
636 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 895 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
637 896
638 PL_stack_base = AvARRAY(PL_curstack); 897 PL_stack_base = AvARRAY(PL_curstack);
… …
653#endif 912#endif
654 913
655 New(54,PL_scopestack,8,I32); 914 New(54,PL_scopestack,8,I32);
656 PL_scopestack_ix = 0; 915 PL_scopestack_ix = 0;
657 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
658 920
659 New(54,PL_savestack,24,ANY); 921 New(54,PL_savestack,24,ANY);
660 PL_savestack_ix = 0; 922 PL_savestack_ix = 0;
661 PL_savestack_max = 24; 923 PL_savestack_max = 24;
662 924
… …
690 } 952 }
691 953
692 Safefree (PL_tmps_stack); 954 Safefree (PL_tmps_stack);
693 Safefree (PL_markstack); 955 Safefree (PL_markstack);
694 Safefree (PL_scopestack); 956 Safefree (PL_scopestack);
957#if HAS_SCOPESTACK_NAME
958 Safefree (PL_scopestack_name);
959#endif
695 Safefree (PL_savestack); 960 Safefree (PL_savestack);
696#if !PERL_VERSION_ATLEAST (5,10,0) 961#if !PERL_VERSION_ATLEAST (5,10,0)
697 Safefree (PL_retstack); 962 Safefree (PL_retstack);
698#endif 963#endif
699} 964}
… …
745#endif 1010#endif
746 1011
747/* 1012/*
748 * This overrides the default magic get method of %SIG elements. 1013 * This overrides the default magic get method of %SIG elements.
749 * 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
750 * and instead of tryign to save and restore the hash elements, we just provide 1015 * and instead of trying to save and restore the hash elements (extremely slow),
751 * readback here. 1016 * we just provide our own readback here.
752 * We only do this when the hook is != 0, as they are often set to 0 temporarily,
753 * not expecting this to actually change the hook. This is a potential problem
754 * when a schedule happens then, but we ignore this.
755 */ 1017 */
756static int 1018static int ecb_cold
757coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 1019coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
758{ 1020{
759 const char *s = MgPV_nolen_const (mg); 1021 const char *s = MgPV_nolen_const (mg);
760 1022
761 if (*s == '_') 1023 if (*s == '_')
762 { 1024 {
763 SV **svp = 0; 1025 SV **svp = 0;
764 1026
765 if (strEQ (s, "__DIE__" )) svp = &PL_diehook; 1027 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
766 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 1028 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
767 1029
768 if (svp) 1030 if (svp)
769 { 1031 {
770 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);
771 return 0; 1042 return 0;
772 } 1043 }
773 } 1044 }
774 1045
775 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 1046 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
776} 1047}
777 1048
778static int 1049static int ecb_cold
779coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1050coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
780{ 1051{
781 const char *s = MgPV_nolen_const (mg); 1052 const char *s = MgPV_nolen_const (mg);
782 1053
783 if (*s == '_') 1054 if (*s == '_')
… …
797 } 1068 }
798 1069
799 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0; 1070 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
800} 1071}
801 1072
802static int 1073static int ecb_cold
803coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1074coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
804{ 1075{
805 const char *s = MgPV_nolen_const (mg); 1076 const char *s = MgPV_nolen_const (mg);
806 1077
807 if (*s == '_') 1078 if (*s == '_')
… …
812 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 1083 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
813 1084
814 if (svp) 1085 if (svp)
815 { 1086 {
816 SV *old = *svp; 1087 SV *old = *svp;
817 *svp = newSVsv (sv); 1088 *svp = SvOK (sv) ? newSVsv (sv) : 0;
818 SvREFCNT_dec (old); 1089 SvREFCNT_dec (old);
819 return 0; 1090 return 0;
820 } 1091 }
821 } 1092 }
822 1093
… …
834slf_check_nop (pTHX_ struct CoroSLF *frame) 1105slf_check_nop (pTHX_ struct CoroSLF *frame)
835{ 1106{
836 return 0; 1107 return 0;
837} 1108}
838 1109
839static UNOP coro_setup_op; 1110static int
1111slf_check_repeat (pTHX_ struct CoroSLF *frame)
1112{
1113 return 1;
1114}
840 1115
841static void NOINLINE /* noinline to keep it out of the transfer fast path */ 1116static UNOP init_perl_op;
1117
1118ecb_noinline static void /* noinline to keep it out of the transfer fast path */
842coro_setup (pTHX_ struct coro *coro) 1119init_perl (pTHX_ struct coro *coro)
843{ 1120{
844 /* 1121 /*
845 * emulate part of the perl startup here. 1122 * emulate part of the perl startup here.
846 */ 1123 */
847 coro_init_stacks (aTHX); 1124 coro_init_stacks (aTHX);
848 1125
849 PL_runops = RUNOPS_DEFAULT; 1126 PL_runops = RUNOPS_DEFAULT;
850 PL_curcop = &PL_compiling; 1127 PL_curcop = &PL_compiling;
851 PL_in_eval = EVAL_NULL; 1128 PL_in_eval = EVAL_NULL;
852 PL_comppad = 0; 1129 PL_comppad = 0;
1130 PL_comppad_name = 0;
1131 PL_comppad_name_fill = 0;
1132 PL_comppad_name_floor = 0;
853 PL_curpm = 0; 1133 PL_curpm = 0;
854 PL_curpad = 0; 1134 PL_curpad = 0;
855 PL_localizing = 0; 1135 PL_localizing = 0;
856 PL_dirty = 0;
857 PL_restartop = 0; 1136 PL_restartop = 0;
858#if PERL_VERSION_ATLEAST (5,10,0) 1137#if PERL_VERSION_ATLEAST (5,10,0)
859 PL_parser = 0; 1138 PL_parser = 0;
860#endif 1139#endif
1140 PL_hints = 0;
861 1141
862 /* recreate the die/warn hooks */ 1142 /* recreate the die/warn hooks */
863 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1143 PL_diehook = SvREFCNT_inc (rv_diehook);
864 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1144 PL_warnhook = SvREFCNT_inc (rv_warnhook);
865 1145
866 GvSV (PL_defgv) = newSV (0); 1146 GvSV (PL_defgv) = newSV (0);
867 GvAV (PL_defgv) = coro->args; coro->args = 0; 1147 GvAV (PL_defgv) = coro->args; coro->args = 0;
868 GvSV (PL_errgv) = newSV (0); 1148 GvSV (PL_errgv) = newSV (0);
869 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);
1150 GvHV (PL_hintgv) = 0;
870 PL_rs = newSVsv (GvSV (irsgv)); 1151 PL_rs = newSVsv (GvSV (irsgv));
871 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1152 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
872 1153
873 { 1154 {
874 dSP; 1155 dSP;
… …
889 /* 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
890 * 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.
891 */ 1172 */
892 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 */
893 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;
894 1176
895 /* 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 */
896 coro_setup_op.op_next = PL_op; 1178 init_perl_op.op_next = PL_op;
897 coro_setup_op.op_type = OP_CUSTOM; 1179 init_perl_op.op_type = OP_ENTERSUB;
898 coro_setup_op.op_ppaddr = pp_slf; 1180 init_perl_op.op_ppaddr = pp_slf;
899 /* 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 */
900 1182
901 PL_op = (OP *)&coro_setup_op; 1183 PL_op = (OP *)&init_perl_op;
902 1184
903 /* copy throw, in case it was set before coro_setup */ 1185 /* copy throw, in case it was set before init_perl */
904 CORO_THROW = coro->except; 1186 CORO_THROW = coro->except;
905}
906 1187
1188 SWAP_SVS (coro);
1189
1190 if (ecb_expect_false (enable_times))
1191 {
1192 coro_times_update ();
1193 coro_times_sub (coro);
1194 }
1195}
1196
907static void 1197static void
908coro_destruct (pTHX_ struct coro *coro) 1198coro_unwind_stacks (pTHX)
909{ 1199{
910 if (!IN_DESTRUCT) 1200 if (!IN_DESTRUCT)
911 { 1201 {
912 /* restore all saved variables and stuff */ 1202 /* restore all saved variables and stuff */
913 LEAVE_SCOPE (0); 1203 LEAVE_SCOPE (0);
… …
921 POPSTACK_TO (PL_mainstack); 1211 POPSTACK_TO (PL_mainstack);
922 1212
923 /* unwind main stack */ 1213 /* unwind main stack */
924 dounwind (-1); 1214 dounwind (-1);
925 } 1215 }
1216}
926 1217
927 SvREFCNT_dec (GvSV (PL_defgv)); 1218static void
928 SvREFCNT_dec (GvAV (PL_defgv)); 1219destroy_perl (pTHX_ struct coro *coro)
929 SvREFCNT_dec (GvSV (PL_errgv)); 1220{
930 SvREFCNT_dec (PL_defoutgv); 1221 SV *svf [9];
931 SvREFCNT_dec (PL_rs);
932 SvREFCNT_dec (GvSV (irsgv));
933 1222
934 SvREFCNT_dec (PL_diehook);
935 SvREFCNT_dec (PL_warnhook);
936 1223 {
1224 SV *old_current = SvRV (coro_current);
1225 struct coro *current = SvSTATE (old_current);
1226
1227 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1228
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
1234 load_perl (aTHX_ coro);
1235
1236 coro_unwind_stacks (aTHX);
1237
1238 /* restore swapped sv's */
1239 SWAP_SVS (coro);
1240
1241 coro_destruct_stacks (aTHX);
1242
1243 /* now save some sv's to be free'd later */
1244 svf [0] = GvSV (PL_defgv);
1245 svf [1] = (SV *)GvAV (PL_defgv);
1246 svf [2] = GvSV (PL_errgv);
1247 svf [3] = (SV *)PL_defoutgv;
1248 svf [4] = PL_rs;
1249 svf [5] = GvSV (irsgv);
1250 svf [6] = (SV *)GvHV (PL_hintgv);
1251 svf [7] = PL_diehook;
1252 svf [8] = PL_warnhook;
1253 assert (9 == sizeof (svf) / sizeof (*svf));
1254
1255 SvRV_set (coro_current, old_current);
1256
1257 load_perl (aTHX_ current);
1258 }
1259
1260 {
1261 unsigned int i;
1262
1263 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i)
1264 SvREFCNT_dec (svf [i]);
1265
937 SvREFCNT_dec (coro->saved_deffh); 1266 SvREFCNT_dec (coro->saved_deffh);
938 SvREFCNT_dec (coro->rouse_cb); 1267 SvREFCNT_dec (coro->rouse_cb);
939 SvREFCNT_dec (coro->invoke_cb); 1268 SvREFCNT_dec (coro->invoke_cb);
940 SvREFCNT_dec (coro->invoke_av); 1269 SvREFCNT_dec (coro->invoke_av);
941 1270 }
942 coro_destruct_stacks (aTHX);
943} 1271}
944 1272
945INLINE void 1273ecb_inline void
946free_coro_mortal (pTHX) 1274free_coro_mortal (pTHX)
947{ 1275{
948 if (expect_true (coro_mortal)) 1276 if (ecb_expect_true (coro_mortal))
949 { 1277 {
950 SvREFCNT_dec (coro_mortal); 1278 SvREFCNT_dec ((SV *)coro_mortal);
951 coro_mortal = 0; 1279 coro_mortal = 0;
952 } 1280 }
953} 1281}
954 1282
955static int 1283static int
956runops_trace (pTHX) 1284runops_trace (pTHX)
957{ 1285{
958 COP *oldcop = 0; 1286 COP *oldcop = 0;
959 int oldcxix = -2; 1287 int oldcxix = -2;
960 struct coro *coro = SvSTATE_current; /* trace cctx is tied to specific coro */
961 coro_cctx *cctx = coro->cctx;
962 1288
963 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX))) 1289 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX)))
964 { 1290 {
965 PERL_ASYNC_CHECK (); 1291 PERL_ASYNC_CHECK ();
966 1292
967 if (cctx->flags & CC_TRACE_ALL) 1293 if (cctx_current->flags & CC_TRACE_ALL)
968 { 1294 {
969 if (PL_op->op_type == OP_LEAVESUB && cctx->flags & CC_TRACE_SUB) 1295 if (PL_op->op_type == OP_LEAVESUB && cctx_current->flags & CC_TRACE_SUB)
970 { 1296 {
971 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1297 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
972 SV **bot, **top; 1298 SV **bot, **top;
973 AV *av = newAV (); /* return values */ 1299 AV *av = newAV (); /* return values */
974 SV **cb; 1300 SV **cb;
… …
1011 1337
1012 if (PL_curcop != &PL_compiling) 1338 if (PL_curcop != &PL_compiling)
1013 { 1339 {
1014 SV **cb; 1340 SV **cb;
1015 1341
1016 if (oldcxix != cxstack_ix && cctx->flags & CC_TRACE_SUB) 1342 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB)
1017 { 1343 {
1018 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1344 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1019 1345
1020 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1346 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1021 { 1347 {
1022 runops_proc_t old_runops = PL_runops;
1023 dSP; 1348 dSP;
1024 GV *gv = CvGV (cx->blk_sub.cv); 1349 GV *gv = CvGV (cx->blk_sub.cv);
1025 SV *fullname = sv_2mortal (newSV (0)); 1350 SV *fullname = sv_2mortal (newSV (0));
1026 1351
1027 if (isGV (gv)) 1352 if (isGV (gv))
… …
1045 } 1370 }
1046 1371
1047 oldcxix = cxstack_ix; 1372 oldcxix = cxstack_ix;
1048 } 1373 }
1049 1374
1050 if (cctx->flags & CC_TRACE_LINE) 1375 if (cctx_current->flags & CC_TRACE_LINE)
1051 { 1376 {
1052 dSP; 1377 dSP;
1053 1378
1054 PL_runops = RUNOPS_DEFAULT; 1379 PL_runops = RUNOPS_DEFAULT;
1055 ENTER; 1380 ENTER;
… …
1074 1399
1075 TAINT_NOT; 1400 TAINT_NOT;
1076 return 0; 1401 return 0;
1077} 1402}
1078 1403
1079static struct coro_cctx *cctx_ssl_cctx;
1080static struct CoroSLF cctx_ssl_frame; 1404static struct CoroSLF cctx_ssl_frame;
1081 1405
1082static void 1406static void
1083slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta) 1407slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta)
1084{ 1408{
1085 ta->prev = (struct coro *)cctx_ssl_cctx;
1086 ta->next = 0; 1409 ta->prev = 0;
1087} 1410}
1088 1411
1089static int 1412static int
1090slf_check_set_stacklevel (pTHX_ struct CoroSLF *frame) 1413slf_check_set_stacklevel (pTHX_ struct CoroSLF *frame)
1091{ 1414{
… …
1093 1416
1094 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 */
1095} 1418}
1096 1419
1097/* 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 */
1098static void NOINLINE 1421static void ecb_noinline
1099cctx_prepare (pTHX_ coro_cctx *cctx) 1422cctx_prepare (pTHX)
1100{ 1423{
1101 PL_top_env = &PL_start_env; 1424 PL_top_env = &PL_start_env;
1102 1425
1103 if (cctx->flags & CC_TRACE) 1426 if (cctx_current->flags & CC_TRACE)
1104 PL_runops = runops_trace; 1427 PL_runops = runops_trace;
1105 1428
1106 /* we already must be executing an SLF op, there is no other valid way 1429 /* we already must be executing an SLF op, there is no other valid way
1107 * that can lead to creation of a new cctx */ 1430 * that can lead to creation of a new cctx */
1108 assert (("FATAL: can't prepare slf-less cctx in Coro module (please report)", 1431 assert (("FATAL: can't prepare slf-less cctx in Coro module (please report)",
1109 slf_frame.prepare && PL_op->op_ppaddr == pp_slf)); 1432 slf_frame.prepare && PL_op->op_ppaddr == pp_slf));
1110 1433
1111 /* we must emulate leaving pp_slf, which is done inside slf_check_set_stacklevel */ 1434 /* we must emulate leaving pp_slf, which is done inside slf_check_set_stacklevel */
1112 cctx_ssl_cctx = cctx;
1113 cctx_ssl_frame = slf_frame; 1435 cctx_ssl_frame = slf_frame;
1114 1436
1115 slf_frame.prepare = slf_prepare_set_stacklevel; 1437 slf_frame.prepare = slf_prepare_set_stacklevel;
1116 slf_frame.check = slf_check_set_stacklevel; 1438 slf_frame.check = slf_check_set_stacklevel;
1117} 1439}
1118 1440
1119/* 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 */
1120INLINE void 1442ecb_inline void
1121transfer_tail (pTHX) 1443transfer_tail (pTHX)
1122{ 1444{
1123 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);
1124} 1458}
1125 1459
1126/* 1460/*
1127 * this is a _very_ stripped down perl interpreter ;) 1461 * this is a _very_ stripped down perl interpreter ;)
1128 */ 1462 */
… …
1140 /* normally we would need to skip the entersub here */ 1474 /* normally we would need to skip the entersub here */
1141 /* not doing so will re-execute it, which is exactly what we want */ 1475 /* not doing so will re-execute it, which is exactly what we want */
1142 /* PL_nop = PL_nop->op_next */ 1476 /* PL_nop = PL_nop->op_next */
1143 1477
1144 /* inject a fake subroutine call to cctx_init */ 1478 /* inject a fake subroutine call to cctx_init */
1145 cctx_prepare (aTHX_ (coro_cctx *)arg); 1479 cctx_prepare (aTHX);
1146 1480
1147 /* cctx_run is the alternative tail of transfer() */ 1481 /* cctx_run is the alternative tail of transfer() */
1148 transfer_tail (aTHX); 1482 transfer_tail (aTHX);
1149 1483
1150 /* 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 */
1151 PL_restartop = PL_op; 1485 PL_restartop = PL_op;
1152 perl_run (PL_curinterp); 1486 perl_run (PL_curinterp);
1153 /* 1487 /*
1154 * 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
1155 * 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.
1156 */ 1491 */
1157 1492
1158 /* 1493 /*
1159 * 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
1160 * 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)
1161 * 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
1162 * bootstrap-time "top" top_env, as we cannot restore the "main" 1497 * doing in that case. YMMV.
1163 * coroutine as Coro has no such concept
1164 */ 1498 */
1165 PL_top_env = main_top_env; 1499 perlish_exit (aTHX);
1166 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1167 } 1500 }
1168} 1501}
1169 1502
1170static coro_cctx * 1503static coro_cctx *
1171cctx_new () 1504cctx_new (void)
1172{ 1505{
1173 coro_cctx *cctx; 1506 coro_cctx *cctx;
1174 1507
1175 ++cctx_count; 1508 ++cctx_count;
1176 New (0, cctx, 1, coro_cctx); 1509 New (0, cctx, 1, coro_cctx);
… …
1182 return cctx; 1515 return cctx;
1183} 1516}
1184 1517
1185/* create a new cctx only suitable as source */ 1518/* create a new cctx only suitable as source */
1186static coro_cctx * 1519static coro_cctx *
1187cctx_new_empty () 1520cctx_new_empty (void)
1188{ 1521{
1189 coro_cctx *cctx = cctx_new (); 1522 coro_cctx *cctx = cctx_new ();
1190 1523
1191 cctx->sptr = 0; 1524 cctx->sptr = 0;
1192 coro_create (&cctx->cctx, 0, 0, 0, 0); 1525 coro_create (&cctx->cctx, 0, 0, 0, 0);
… …
1194 return cctx; 1527 return cctx;
1195} 1528}
1196 1529
1197/* create a new cctx suitable as destination/running a perl interpreter */ 1530/* create a new cctx suitable as destination/running a perl interpreter */
1198static coro_cctx * 1531static coro_cctx *
1199cctx_new_run () 1532cctx_new_run (void)
1200{ 1533{
1201 coro_cctx *cctx = cctx_new (); 1534 coro_cctx *cctx = cctx_new ();
1202 void *stack_start; 1535 void *stack_start;
1203 size_t stack_size; 1536 size_t stack_size;
1204 1537
1205#if HAVE_MMAP 1538#if HAVE_MMAP
1206 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;
1207 /* mmap supposedly does allocate-on-write for us */ 1540 /* mmap supposedly does allocate-on-write for us */
1208 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);
1209 1542
1210 if (cctx->sptr != (void *)-1) 1543 if (cctx->sptr != (void *)-1)
1211 { 1544 {
1212 #if CORO_STACKGUARD 1545 #if CORO_STACKGUARD
1213 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE); 1546 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
… …
1245cctx_destroy (coro_cctx *cctx) 1578cctx_destroy (coro_cctx *cctx)
1246{ 1579{
1247 if (!cctx) 1580 if (!cctx)
1248 return; 1581 return;
1249 1582
1583 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1584
1250 --cctx_count; 1585 --cctx_count;
1251 coro_destroy (&cctx->cctx); 1586 coro_destroy (&cctx->cctx);
1252 1587
1253 /* coro_transfer creates new, empty cctx's */ 1588 /* coro_transfer creates new, empty cctx's */
1254 if (cctx->sptr) 1589 if (cctx->sptr)
… …
1272#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))
1273 1608
1274static coro_cctx * 1609static coro_cctx *
1275cctx_get (pTHX) 1610cctx_get (pTHX)
1276{ 1611{
1277 while (expect_true (cctx_first)) 1612 while (ecb_expect_true (cctx_first))
1278 { 1613 {
1279 coro_cctx *cctx = cctx_first; 1614 coro_cctx *cctx = cctx_first;
1280 cctx_first = cctx->next; 1615 cctx_first = cctx->next;
1281 --cctx_idle; 1616 --cctx_idle;
1282 1617
1283 if (expect_true (!CCTX_EXPIRED (cctx))) 1618 if (ecb_expect_true (!CCTX_EXPIRED (cctx)))
1284 return cctx; 1619 return cctx;
1285 1620
1286 cctx_destroy (cctx); 1621 cctx_destroy (cctx);
1287 } 1622 }
1288 1623
… …
1293cctx_put (coro_cctx *cctx) 1628cctx_put (coro_cctx *cctx)
1294{ 1629{
1295 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));
1296 1631
1297 /* free another cctx if overlimit */ 1632 /* free another cctx if overlimit */
1298 if (expect_false (cctx_idle >= cctx_max_idle)) 1633 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1299 { 1634 {
1300 coro_cctx *first = cctx_first; 1635 coro_cctx *first = cctx_first;
1301 cctx_first = first->next; 1636 cctx_first = first->next;
1302 --cctx_idle; 1637 --cctx_idle;
1303 1638
… …
1314static void 1649static void
1315transfer_check (pTHX_ struct coro *prev, struct coro *next) 1650transfer_check (pTHX_ struct coro *prev, struct coro *next)
1316{ 1651{
1317 /* TODO: throwing up here is considered harmful */ 1652 /* TODO: throwing up here is considered harmful */
1318 1653
1319 if (expect_true (prev != next)) 1654 if (ecb_expect_true (prev != next))
1320 { 1655 {
1321 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1656 if (ecb_expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1322 croak ("Coro::State::transfer called with non-running/new 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,");
1323 1658
1324 if (expect_false (next->flags & CF_RUNNING)) 1659 if (ecb_expect_false (next->flags & (CF_RUNNING | CF_ZOMBIE | CF_SUSPENDED)))
1325 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states,");
1326
1327 if (expect_false (next->flags & CF_DESTROYED))
1328 croak ("Coro::State::transfer called with destroyed 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,");
1329 1661
1330#if !PERL_VERSION_ATLEAST (5,10,0) 1662#if !PERL_VERSION_ATLEAST (5,10,0)
1331 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1663 if (ecb_expect_false (PL_lex_state != LEX_NOTPARSING))
1332 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,");
1333#endif 1665#endif
1334 } 1666 }
1335} 1667}
1336 1668
1337/* always use the TRANSFER macro */ 1669/* always use the TRANSFER macro */
1338static void NOINLINE /* noinline so we have a fixed stackframe */ 1670static void ecb_noinline /* noinline so we have a fixed stackframe */
1339transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1671transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1340{ 1672{
1341 dSTACKLEVEL; 1673 dSTACKLEVEL;
1342 1674
1343 /* sometimes transfer is only called to set idle_sp */ 1675 /* sometimes transfer is only called to set idle_sp */
1344 if (expect_false (!next)) 1676 if (ecb_expect_false (!prev))
1345 { 1677 {
1346 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1678 cctx_current->idle_sp = STACKLEVEL;
1347 assert (((coro_cctx *)prev)->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 */
1348 } 1680 }
1349 else if (expect_true (prev != next)) 1681 else if (ecb_expect_true (prev != next))
1350 { 1682 {
1351 coro_cctx *prev__cctx; 1683 coro_cctx *cctx_prev;
1352 1684
1353 if (expect_false (prev->flags & CF_NEW)) 1685 if (ecb_expect_false (prev->flags & CF_NEW))
1354 { 1686 {
1355 /* create a new empty/source context */ 1687 /* create a new empty/source context */
1356 prev->cctx = cctx_new_empty ();
1357 prev->flags &= ~CF_NEW; 1688 prev->flags &= ~CF_NEW;
1358 prev->flags |= CF_RUNNING; 1689 prev->flags |= CF_RUNNING;
1359 } 1690 }
1360 1691
1361 prev->flags &= ~CF_RUNNING; 1692 prev->flags &= ~CF_RUNNING;
1362 next->flags |= CF_RUNNING; 1693 next->flags |= CF_RUNNING;
1363 1694
1364 /* first get rid of the old state */ 1695 /* first get rid of the old state */
1365 save_perl (aTHX_ prev); 1696 save_perl (aTHX_ prev);
1366 1697
1367 if (expect_false (next->flags & CF_NEW)) 1698 if (ecb_expect_false (next->flags & CF_NEW))
1368 { 1699 {
1369 /* need to start coroutine */ 1700 /* need to start coroutine */
1370 next->flags &= ~CF_NEW; 1701 next->flags &= ~CF_NEW;
1371 /* setup coroutine call */ 1702 /* setup coroutine call */
1372 coro_setup (aTHX_ next); 1703 init_perl (aTHX_ next);
1373 } 1704 }
1374 else 1705 else
1375 load_perl (aTHX_ next); 1706 load_perl (aTHX_ next);
1376 1707
1377 prev__cctx = prev->cctx;
1378
1379 /* possibly untie and reuse the cctx */ 1708 /* possibly untie and reuse the cctx */
1380 if (expect_true ( 1709 if (ecb_expect_true (
1381 prev__cctx->idle_sp == STACKLEVEL 1710 cctx_current->idle_sp == STACKLEVEL
1382 && !(prev__cctx->flags & CC_TRACE) 1711 && !(cctx_current->flags & CC_TRACE)
1383 && !force_cctx 1712 && !force_cctx
1384 )) 1713 ))
1385 { 1714 {
1386 /* 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 */
1387 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == prev__cctx->idle_te)); 1716 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1388 1717
1389 prev->cctx = 0;
1390
1391 /* 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. */
1392 /* without this the next cctx_get might destroy the prev__cctx while still in use */ 1719 /* without this the next cctx_get might destroy the running cctx while still in use */
1393 if (expect_false (CCTX_EXPIRED (prev__cctx))) 1720 if (ecb_expect_false (CCTX_EXPIRED (cctx_current)))
1394 if (!next->cctx) 1721 if (ecb_expect_true (!next->cctx))
1395 next->cctx = cctx_get (aTHX); 1722 next->cctx = cctx_get (aTHX);
1396 1723
1397 cctx_put (prev__cctx); 1724 cctx_put (cctx_current);
1398 } 1725 }
1726 else
1727 prev->cctx = cctx_current;
1399 1728
1400 ++next->usecount; 1729 ++next->usecount;
1401 1730
1402 if (expect_true (!next->cctx)) 1731 cctx_prev = cctx_current;
1403 next->cctx = cctx_get (aTHX); 1732 cctx_current = ecb_expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1404 1733
1405 if (expect_false (prev__cctx != next->cctx)) 1734 next->cctx = 0;
1735
1736 if (ecb_expect_false (cctx_prev != cctx_current))
1406 { 1737 {
1407 prev__cctx->top_env = PL_top_env; 1738 cctx_prev->top_env = PL_top_env;
1408 PL_top_env = next->cctx->top_env; 1739 PL_top_env = cctx_current->top_env;
1409 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1740 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1410 } 1741 }
1411 1742
1412 transfer_tail (aTHX); 1743 transfer_tail (aTHX);
1413 } 1744 }
1414} 1745}
… …
1416#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))
1417#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1748#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1418 1749
1419/** high level stuff ********************************************************/ 1750/** high level stuff ********************************************************/
1420 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 */
1421static int 1754static void
1755coro_call_on_destroy (pTHX_ struct coro *coro);
1756
1757static void
1422coro_state_destroy (pTHX_ struct coro *coro) 1758coro_state_destroy (pTHX_ struct coro *coro)
1423{ 1759{
1424 if (coro->flags & CF_DESTROYED) 1760 if (coro->flags & CF_ZOMBIE)
1425 return 0; 1761 return;
1426 1762
1427 if (coro->on_destroy)
1428 coro->on_destroy (aTHX_ coro); 1763 slf_destroy (aTHX_ coro);
1429 1764
1430 coro->flags |= CF_DESTROYED; 1765 coro->flags |= CF_ZOMBIE;
1431 1766
1432 if (coro->flags & CF_READY) 1767 if (coro->flags & CF_READY)
1433 { 1768 {
1434 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1769 /* reduce nready, as destroying a ready coro effectively unreadies it */
1435 /* alternative: look through all ready queues and remove the coro */ 1770 /* alternative: look through all ready queues and remove the coro */
1436 --coro_nready; 1771 --coro_nready;
1437 } 1772 }
1438 else 1773 else
1439 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 */
1440 1775
1441 if (coro->mainstack && coro->mainstack != main_mainstack) 1776 if (coro->next) coro->next->prev = coro->prev;
1442 { 1777 if (coro->prev) coro->prev->next = coro->next;
1443 struct coro temp; 1778 if (coro == coro_first) coro_first = coro->next;
1444 1779
1445 assert (("FATAL: tried to destroy currently running coroutine (please report)", !(coro->flags & CF_RUNNING))); 1780 if (coro->mainstack
1446 1781 && coro->mainstack != main_mainstack
1447 save_perl (aTHX_ &temp); 1782 && coro->slot
1783 && !PL_dirty)
1448 load_perl (aTHX_ coro); 1784 destroy_perl (aTHX_ coro);
1449
1450 coro_destruct (aTHX_ coro);
1451
1452 load_perl (aTHX_ &temp);
1453
1454 coro->slot = 0;
1455 }
1456 1785
1457 cctx_destroy (coro->cctx); 1786 cctx_destroy (coro->cctx);
1458 SvREFCNT_dec (coro->startcv); 1787 SvREFCNT_dec (coro->startcv);
1459 SvREFCNT_dec (coro->args); 1788 SvREFCNT_dec (coro->args);
1789 SvREFCNT_dec (coro->swap_sv);
1460 SvREFCNT_dec (CORO_THROW); 1790 SvREFCNT_dec (CORO_THROW);
1461 1791
1462 if (coro->next) coro->next->prev = coro->prev; 1792 coro_call_on_destroy (aTHX_ coro);
1463 if (coro->prev) coro->prev->next = coro->next;
1464 if (coro == coro_first) coro_first = coro->next;
1465 1793
1466 return 1; 1794 /* more destruction mayhem in coro_state_free */
1467} 1795}
1468 1796
1469static int 1797static int
1470coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1798coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1471{ 1799{
1472 struct coro *coro = (struct coro *)mg->mg_ptr; 1800 struct coro *coro = (struct coro *)mg->mg_ptr;
1473 mg->mg_ptr = 0; 1801 mg->mg_ptr = 0;
1474 1802
1475 coro->hv = 0;
1476
1477 if (--coro->refcnt < 0)
1478 {
1479 coro_state_destroy (aTHX_ coro); 1803 coro_state_destroy (aTHX_ coro);
1804 SvREFCNT_dec (coro->on_destroy);
1805 SvREFCNT_dec (coro->status);
1806
1480 Safefree (coro); 1807 Safefree (coro);
1481 }
1482 1808
1483 return 0; 1809 return 0;
1484} 1810}
1485 1811
1486static int 1812static int ecb_cold
1487coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1813coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1488{ 1814{
1489 struct coro *coro = (struct coro *)mg->mg_ptr; 1815 /* called when perl clones the current process the slow way (windows process emulation) */
1490 1816 /* WE SIMply nuke the pointers in the copy, causing perl to croak */
1491 ++coro->refcnt; 1817 mg->mg_ptr = 0;
1818 mg->mg_virtual = 0;
1492 1819
1493 return 0; 1820 return 0;
1494} 1821}
1495 1822
1496static MGVTBL coro_state_vtbl = { 1823static MGVTBL coro_state_vtbl = {
… …
1519 1846
1520 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1847 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1521 TRANSFER (ta, 1); 1848 TRANSFER (ta, 1);
1522} 1849}
1523 1850
1524/*****************************************************************************/
1525/* gensub: simple closure generation utility */
1526
1527#define GENSUB_ARG CvXSUBANY (cv).any_ptr
1528
1529/* create a closure from XS, returns a code reference */
1530/* the arg can be accessed via GENSUB_ARG from the callback */
1531/* the callback must use dXSARGS/XSRETURN */
1532static SV *
1533gensub (pTHX_ void (*xsub)(pTHX_ CV *), void *arg)
1534{
1535 CV *cv = (CV *)newSV (0);
1536
1537 sv_upgrade ((SV *)cv, SVt_PVCV);
1538
1539 CvANON_on (cv);
1540 CvISXSUB_on (cv);
1541 CvXSUB (cv) = xsub;
1542 GENSUB_ARG = arg;
1543
1544 return newRV_noinc ((SV *)cv);
1545}
1546
1547/** Coro ********************************************************************/ 1851/** Coro ********************************************************************/
1548 1852
1549INLINE void 1853ecb_inline void
1550coro_enq (pTHX_ struct coro *coro) 1854coro_enq (pTHX_ struct coro *coro)
1551{ 1855{
1552 av_push (coro_ready [coro->prio - PRIO_MIN], SvREFCNT_inc_NN (coro->hv)); 1856 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1553}
1554 1857
1555INLINE SV * 1858 SvREFCNT_inc_NN (coro->hv);
1859
1860 coro->next_ready = 0;
1861 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1862 ready [1] = coro;
1863}
1864
1865ecb_inline struct coro *
1556coro_deq (pTHX) 1866coro_deq (pTHX)
1557{ 1867{
1558 int prio; 1868 int prio;
1559 1869
1560 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; ) 1870 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
1561 if (AvFILLp (coro_ready [prio]) >= 0) 1871 {
1562 return av_shift (coro_ready [prio]); 1872 struct coro **ready = coro_ready [prio];
1873
1874 if (ready [0])
1875 {
1876 struct coro *coro = ready [0];
1877 ready [0] = coro->next_ready;
1878 return coro;
1879 }
1880 }
1563 1881
1564 return 0; 1882 return 0;
1883}
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;
1565} 1900}
1566 1901
1567static int 1902static int
1568api_ready (pTHX_ SV *coro_sv) 1903api_ready (pTHX_ SV *coro_sv)
1569{ 1904{
1570 struct coro *coro;
1571 SV *sv_hook;
1572 void (*xs_hook)(void);
1573
1574 if (SvROK (coro_sv))
1575 coro_sv = SvRV (coro_sv);
1576
1577 coro = SvSTATE (coro_sv); 1905 struct coro *coro = SvSTATE (coro_sv);
1578 1906
1579 if (coro->flags & CF_READY) 1907 if (coro->flags & CF_READY)
1580 return 0; 1908 return 0;
1581 1909
1582 coro->flags |= CF_READY; 1910 coro->flags |= CF_READY;
1583 1911
1584 sv_hook = coro_nready ? 0 : coro_readyhook;
1585 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1586
1587 coro_enq (aTHX_ coro); 1912 coro_enq (aTHX_ coro);
1588 ++coro_nready;
1589 1913
1590 if (sv_hook) 1914 if (!coro_nready++)
1591 { 1915 if (coroapi.readyhook)
1592 dSP; 1916 coroapi.readyhook ();
1593
1594 ENTER;
1595 SAVETMPS;
1596
1597 PUSHMARK (SP);
1598 PUTBACK;
1599 call_sv (sv_hook, G_VOID | G_DISCARD);
1600
1601 FREETMPS;
1602 LEAVE;
1603 }
1604
1605 if (xs_hook)
1606 xs_hook ();
1607 1917
1608 return 1; 1918 return 1;
1609} 1919}
1610 1920
1611static int 1921static int
… …
1613{ 1923{
1614 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1924 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1615} 1925}
1616 1926
1617/* expects to own a reference to next->hv */ 1927/* expects to own a reference to next->hv */
1618INLINE void 1928ecb_inline void
1619prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1929prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1620{ 1930{
1621 SV *prev_sv = SvRV (coro_current); 1931 SV *prev_sv = SvRV (coro_current);
1622 1932
1623 ta->prev = SvSTATE_hv (prev_sv); 1933 ta->prev = SvSTATE_hv (prev_sv);
… …
1634static void 1944static void
1635prepare_schedule (pTHX_ struct coro_transfer_args *ta) 1945prepare_schedule (pTHX_ struct coro_transfer_args *ta)
1636{ 1946{
1637 for (;;) 1947 for (;;)
1638 { 1948 {
1639 SV *next_sv = coro_deq (aTHX); 1949 struct coro *next = coro_deq (aTHX);
1640 1950
1641 if (expect_true (next_sv)) 1951 if (ecb_expect_true (next))
1642 { 1952 {
1643 struct coro *next = SvSTATE_hv (next_sv);
1644
1645 /* cannot transfer to destroyed coros, skip and look for next */ 1953 /* cannot transfer to destroyed coros, skip and look for next */
1646 if (expect_false (next->flags & CF_DESTROYED)) 1954 if (ecb_expect_false (next->flags & (CF_ZOMBIE | CF_SUSPENDED)))
1647 SvREFCNT_dec (next_sv); /* 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 */
1648 else 1956 else
1649 { 1957 {
1650 next->flags &= ~CF_READY; 1958 next->flags &= ~CF_READY;
1651 --coro_nready; 1959 --coro_nready;
1652 1960
1653 return prepare_schedule_to (aTHX_ ta, next); 1961 prepare_schedule_to (aTHX_ ta, next);
1962 break;
1654 } 1963 }
1655 } 1964 }
1656 else 1965 else
1657 { 1966 {
1658 /* nothing to schedule: call the idle handler */ 1967 /* nothing to schedule: call the idle handler */
1968 if (SvROK (sv_idle)
1969 && SvOBJECT (SvRV (sv_idle)))
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
1974 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1975 api_ready (aTHX_ SvRV (sv_idle));
1976 --coro_nready;
1977 }
1978 else
1979 {
1980 /* TODO: deprecated, remove, cannot work reliably *//*D*/
1659 dSP; 1981 dSP;
1660 1982
1661 ENTER; 1983 ENTER;
1662 SAVETMPS; 1984 SAVETMPS;
1663 1985
1664 PUSHMARK (SP); 1986 PUSHMARK (SP);
1665 PUTBACK; 1987 PUTBACK;
1666 call_sv (get_sv ("Coro::idle", FALSE), G_VOID | G_DISCARD); 1988 call_sv (sv_idle, G_VOID | G_DISCARD);
1667 1989
1668 FREETMPS; 1990 FREETMPS;
1669 LEAVE; 1991 LEAVE;
1992 }
1670 } 1993 }
1671 } 1994 }
1672} 1995}
1673 1996
1674INLINE void 1997ecb_inline void
1675prepare_cede (pTHX_ struct coro_transfer_args *ta) 1998prepare_cede (pTHX_ struct coro_transfer_args *ta)
1676{ 1999{
1677 api_ready (aTHX_ coro_current); 2000 api_ready (aTHX_ coro_current);
1678 prepare_schedule (aTHX_ ta); 2001 prepare_schedule (aTHX_ ta);
1679} 2002}
1680 2003
1681INLINE void 2004ecb_inline void
1682prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 2005prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1683{ 2006{
1684 SV *prev = SvRV (coro_current); 2007 SV *prev = SvRV (coro_current);
1685 2008
1686 if (coro_nready) 2009 if (coro_nready)
… …
1716{ 2039{
1717 struct coro_transfer_args ta; 2040 struct coro_transfer_args ta;
1718 2041
1719 prepare_cede (aTHX_ &ta); 2042 prepare_cede (aTHX_ &ta);
1720 2043
1721 if (expect_true (ta.prev != ta.next)) 2044 if (ecb_expect_true (ta.prev != ta.next))
1722 { 2045 {
1723 TRANSFER (ta, 1); 2046 TRANSFER (ta, 1);
1724 return 1; 2047 return 1;
1725 } 2048 }
1726 else 2049 else
… …
1745static void 2068static void
1746api_trace (pTHX_ SV *coro_sv, int flags) 2069api_trace (pTHX_ SV *coro_sv, int flags)
1747{ 2070{
1748 struct coro *coro = SvSTATE (coro_sv); 2071 struct coro *coro = SvSTATE (coro_sv);
1749 2072
2073 if (coro->flags & CF_RUNNING)
2074 croak ("cannot enable tracing on a running coroutine, caught");
2075
1750 if (flags & CC_TRACE) 2076 if (flags & CC_TRACE)
1751 { 2077 {
1752 if (!coro->cctx) 2078 if (!coro->cctx)
1753 coro->cctx = cctx_new_run (); 2079 coro->cctx = cctx_new_run ();
1754 else if (!(coro->cctx->flags & CC_TRACE)) 2080 else if (!(coro->cctx->flags & CC_TRACE))
1755 croak ("cannot enable tracing on coroutine with custom stack,"); 2081 croak ("cannot enable tracing on coroutine with custom stack, caught");
1756 2082
1757 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL)); 2083 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL));
1758 } 2084 }
1759 else if (coro->cctx && coro->cctx->flags & CC_TRACE) 2085 else if (coro->cctx && coro->cctx->flags & CC_TRACE)
1760 { 2086 {
… …
1763 if (coro->flags & CF_RUNNING) 2089 if (coro->flags & CF_RUNNING)
1764 PL_runops = RUNOPS_DEFAULT; 2090 PL_runops = RUNOPS_DEFAULT;
1765 else 2091 else
1766 coro->slot->runops = RUNOPS_DEFAULT; 2092 coro->slot->runops = RUNOPS_DEFAULT;
1767 } 2093 }
2094}
2095
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
2173coro_call_on_destroy (pTHX_ struct coro *coro)
2174{
2175 AV *od = coro->on_destroy;
2176
2177 if (!od)
2178 return;
2179
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
2188 {
2189 dSP; /* don't disturb outer sp */
2190 PUSHMARK (SP);
2191
2192 if (coro->status)
2193 {
2194 PUTBACK;
2195 coro_push_av (aTHX_ coro->status, G_ARRAY);
2196 SPAGAIN;
2197 }
2198
2199 PUTBACK;
2200 call_sv (cb, G_VOID | G_DISCARD);
2201 }
2202 }
2203}
2204
2205static void
2206coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
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 {
2221 int i;
2222
2223 av_extend (av, items - 1);
2224
2225 for (i = 0; i < items; ++i)
2226 av_push (av, SvREFCNT_inc_NN (arg [i]));
2227 }
2228}
2229
2230static void
2231slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2232{
2233 av_push (av_destroy, (SV *)newRV_inc ((SV *)coro_hv)); /* RVinc for perl */
2234 api_ready (aTHX_ sv_manager);
2235
2236 frame->prepare = prepare_schedule;
2237 frame->check = slf_check_repeat;
2238
2239 /* as a minor optimisation, we could unwind all stacks here */
2240 /* but that puts extra pressure on pp_slf, and is not worth much */
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;
1768} 2345}
1769 2346
1770/*****************************************************************************/ 2347/*****************************************************************************/
1771/* async pool handler */ 2348/* async pool handler */
1772 2349
… …
1803slf_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)
1804{ 2381{
1805 HV *hv = (HV *)SvRV (coro_current); 2382 HV *hv = (HV *)SvRV (coro_current);
1806 struct coro *coro = SvSTATE_hv ((SV *)hv); 2383 struct coro *coro = SvSTATE_hv ((SV *)hv);
1807 2384
1808 if (expect_true (coro->saved_deffh)) 2385 if (ecb_expect_true (coro->saved_deffh))
1809 { 2386 {
1810 /* subsequent iteration */ 2387 /* subsequent iteration */
1811 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2388 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1812 coro->saved_deffh = 0; 2389 coro->saved_deffh = 0;
1813 2390
1814 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 2391 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
1815 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2392 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1816 { 2393 {
1817 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate); 2394 slf_init_terminate_cancel_common (aTHX_ frame, hv);
1818 coro->invoke_av = newAV (); 2395 return;
1819
1820 frame->prepare = prepare_nop;
1821 } 2396 }
1822 else 2397 else
1823 { 2398 {
1824 av_clear (GvAV (PL_defgv)); 2399 av_clear (GvAV (PL_defgv));
1825 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);
… …
1850 2425
1851static void 2426static void
1852coro_rouse_callback (pTHX_ CV *cv) 2427coro_rouse_callback (pTHX_ CV *cv)
1853{ 2428{
1854 dXSARGS; 2429 dXSARGS;
1855 SV *data = (SV *)GENSUB_ARG; 2430 SV *data = (SV *)S_GENSUB_ARG;
1856 2431
1857 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2432 if (SvTYPE (SvRV (data)) != SVt_PVAV)
1858 { 2433 {
1859 /* first call, set args */ 2434 /* first call, set args */
2435 SV *coro = SvRV (data);
1860 AV *av = newAV (); 2436 AV *av = newAV ();
1861 SV *coro = SvRV (data);
1862 2437
1863 SvRV_set (data, (SV *)av); 2438 SvRV_set (data, (SV *)av);
1864 api_ready (aTHX_ coro);
1865 SvREFCNT_dec (coro);
1866 2439
1867 /* better take a full copy of the arguments */ 2440 /* better take a full copy of the arguments */
1868 while (items--) 2441 while (items--)
1869 av_store (av, items, newSVsv (ST (items))); 2442 av_store (av, items, newSVsv (ST (items)));
2443
2444 api_ready (aTHX_ coro);
2445 SvREFCNT_dec (coro);
1870 } 2446 }
1871 2447
1872 XSRETURN_EMPTY; 2448 XSRETURN_EMPTY;
1873} 2449}
1874 2450
1875static int 2451static int
1876slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2452slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
1877{ 2453{
1878 SV *data = (SV *)frame->data; 2454 SV *data = (SV *)frame->data;
1879 2455
1880 if (CORO_THROW) 2456 if (CORO_THROW)
1881 return 0; 2457 return 0;
1882 2458
1883 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2459 if (SvTYPE (SvRV (data)) != SVt_PVAV)
1884 return 1; 2460 return 1;
… …
1891 2467
1892 EXTEND (SP, AvFILLp (av) + 1); 2468 EXTEND (SP, AvFILLp (av) + 1);
1893 for (i = 0; i <= AvFILLp (av); ++i) 2469 for (i = 0; i <= AvFILLp (av); ++i)
1894 PUSHs (sv_2mortal (AvARRAY (av)[i])); 2470 PUSHs (sv_2mortal (AvARRAY (av)[i]));
1895 2471
1896 /* we have stolen the elements, so ste length to zero and free */ 2472 /* we have stolen the elements, so set length to zero and free */
1897 AvFILLp (av) = -1; 2473 AvFILLp (av) = -1;
1898 av_undef (av); 2474 av_undef (av);
1899 2475
1900 PUTBACK; 2476 PUTBACK;
1901 } 2477 }
… …
1920 cb = sv_2mortal (coro->rouse_cb); 2496 cb = sv_2mortal (coro->rouse_cb);
1921 coro->rouse_cb = 0; 2497 coro->rouse_cb = 0;
1922 } 2498 }
1923 2499
1924 if (!SvROK (cb) 2500 if (!SvROK (cb)
1925 || SvTYPE (SvRV (cb)) != SVt_PVCV 2501 || SvTYPE (SvRV (cb)) != SVt_PVCV
1926 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2502 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
1927 croak ("Coro::rouse_wait called with illegal callback argument,"); 2503 croak ("Coro::rouse_wait called with illegal callback argument,");
1928 2504
1929 { 2505 {
1930 CV *cv = (CV *)SvRV (cb); /* for GENSUB_ARG */ 2506 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
1931 SV *data = (SV *)GENSUB_ARG; 2507 SV *data = (SV *)S_GENSUB_ARG;
1932 2508
1933 frame->data = (void *)data; 2509 frame->data = (void *)data;
1934 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule; 2510 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
1935 frame->check = slf_check_rouse_wait; 2511 frame->check = slf_check_rouse_wait;
1936 } 2512 }
… …
1940coro_new_rouse_cb (pTHX) 2516coro_new_rouse_cb (pTHX)
1941{ 2517{
1942 HV *hv = (HV *)SvRV (coro_current); 2518 HV *hv = (HV *)SvRV (coro_current);
1943 struct coro *coro = SvSTATE_hv (hv); 2519 struct coro *coro = SvSTATE_hv (hv);
1944 SV *data = newRV_inc ((SV *)hv); 2520 SV *data = newRV_inc ((SV *)hv);
1945 SV *cb = gensub (aTHX_ coro_rouse_callback, (void *)data); 2521 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
1946 2522
1947 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);
1948 SvREFCNT_dec (data); /* magicext increases the refcount */ 2524 SvREFCNT_dec (data); /* magicext increases the refcount */
1949 2525
1950 SvREFCNT_dec (coro->rouse_cb); 2526 SvREFCNT_dec (coro->rouse_cb);
… …
2047static void 2623static void
2048slf_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)
2049{ 2625{
2050 frame->prepare = prepare_cede_notself; 2626 frame->prepare = prepare_cede_notself;
2051 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;
2052} 2645}
2053 2646
2054/* 2647/*
2055 * these not obviously related functions are all rolled into one 2648 * these not obviously related functions are all rolled into one
2056 * 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
… …
2063 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 */
2064 2657
2065 /* 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 */
2066 /* the latter happens when a new coro has been started */ 2659 /* the latter happens when a new coro has been started */
2067 /* or when a new cctx was attached to an existing coroutine */ 2660 /* or when a new cctx was attached to an existing coroutine */
2068 if (expect_true (!slf_frame.prepare)) 2661 if (ecb_expect_true (!slf_frame.prepare))
2069 { 2662 {
2070 /* first iteration */ 2663 /* first iteration */
2071 dSP; 2664 dSP;
2072 SV **arg = PL_stack_base + TOPMARK + 1; 2665 SV **arg = PL_stack_base + TOPMARK + 1;
2073 int items = SP - arg; /* args without function object */ 2666 int items = SP - arg; /* args without function object */
… …
2114 while (slf_frame.check (aTHX_ &slf_frame)); 2707 while (slf_frame.check (aTHX_ &slf_frame));
2115 2708
2116 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 */
2117 2710
2118 /* exception handling */ 2711 /* exception handling */
2119 if (expect_false (CORO_THROW)) 2712 if (ecb_expect_false (CORO_THROW))
2120 { 2713 {
2121 SV *exception = sv_2mortal (CORO_THROW); 2714 SV *exception = sv_2mortal (CORO_THROW);
2122 2715
2123 CORO_THROW = 0; 2716 CORO_THROW = 0;
2124 sv_setsv (ERRSV, exception); 2717 sv_setsv (ERRSV, exception);
2125 croak (0); 2718 croak (0);
2126 } 2719 }
2127 2720
2128 /* return value handling - mostly like entersub */ 2721 /* return value handling - mostly like entersub */
2129 /* make sure we put something on the stack in scalar context */ 2722 /* make sure we put something on the stack in scalar context */
2130 if (GIMME_V == G_SCALAR) 2723 if (GIMME_V == G_SCALAR
2724 && ecb_expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2131 { 2725 {
2132 dSP; 2726 dSP;
2133 SV **bot = PL_stack_base + checkmark; 2727 SV **bot = PL_stack_base + checkmark;
2134 2728
2135 if (sp == bot) /* too few, push undef */ 2729 if (sp == bot) /* too few, push undef */
2136 bot [1] = &PL_sv_undef; 2730 bot [1] = &PL_sv_undef;
2137 else if (sp != bot + 1) /* too many, take last one */ 2731 else /* too many, take last one */
2138 bot [1] = *sp; 2732 bot [1] = *sp;
2139 2733
2140 SP = bot + 1; 2734 SP = bot + 1;
2141 2735
2142 PUTBACK; 2736 PUTBACK;
… …
2175 if (PL_op->op_flags & OPf_STACKED) 2769 if (PL_op->op_flags & OPf_STACKED)
2176 { 2770 {
2177 if (items > slf_arga) 2771 if (items > slf_arga)
2178 { 2772 {
2179 slf_arga = items; 2773 slf_arga = items;
2180 free (slf_argv); 2774 Safefree (slf_argv);
2181 slf_argv = malloc (slf_arga * sizeof (SV *)); 2775 New (0, slf_argv, slf_arga, SV *);
2182 } 2776 }
2183 2777
2184 slf_argc = items; 2778 slf_argc = items;
2185 2779
2186 for (i = 0; i < items; ++i) 2780 for (i = 0; i < items; ++i)
… …
2188 } 2782 }
2189 else 2783 else
2190 slf_argc = 0; 2784 slf_argc = 0;
2191 2785
2192 PL_op->op_ppaddr = pp_slf; 2786 PL_op->op_ppaddr = pp_slf;
2193 PL_op->op_type = OP_CUSTOM; /* maybe we should leave it at entersub? */ 2787 /*PL_op->op_type = OP_CUSTOM; /* we do behave like entersub still */
2194 2788
2195 PL_op = (OP *)&slf_restore; 2789 PL_op = (OP *)&slf_restore;
2790}
2791
2792/*****************************************************************************/
2793/* dynamic wind */
2794
2795static void
2796on_enterleave_call (pTHX_ SV *cb)
2797{
2798 dSP;
2799
2800 PUSHSTACK;
2801
2802 PUSHMARK (SP);
2803 PUTBACK;
2804 call_sv (cb, G_VOID | G_DISCARD);
2805 SPAGAIN;
2806
2807 POPSTACK;
2808}
2809
2810static SV *
2811coro_avp_pop_and_free (pTHX_ AV **avp)
2812{
2813 AV *av = *avp;
2814 SV *res = av_pop (av);
2815
2816 if (AvFILLp (av) < 0)
2817 {
2818 *avp = 0;
2819 SvREFCNT_dec (av);
2820 }
2821
2822 return res;
2823}
2824
2825static void
2826coro_pop_on_enter (pTHX_ void *coro)
2827{
2828 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_enter);
2829 SvREFCNT_dec (cb);
2830}
2831
2832static void
2833coro_pop_on_leave (pTHX_ void *coro)
2834{
2835 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2836 on_enterleave_call (aTHX_ sv_2mortal (cb));
2196} 2837}
2197 2838
2198/*****************************************************************************/ 2839/*****************************************************************************/
2199/* PerlIO::cede */ 2840/* PerlIO::cede */
2200 2841
… …
2202{ 2843{
2203 PerlIOBuf base; 2844 PerlIOBuf base;
2204 NV next, every; 2845 NV next, every;
2205} PerlIOCede; 2846} PerlIOCede;
2206 2847
2207static IV 2848static IV ecb_cold
2208PerlIOCede_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)
2209{ 2850{
2210 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2851 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2211 2852
2212 self->every = SvCUR (arg) ? SvNV (arg) : 0.01; 2853 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
2213 self->next = nvtime () + self->every; 2854 self->next = nvtime () + self->every;
2214 2855
2215 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab); 2856 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
2216} 2857}
2217 2858
2218static SV * 2859static SV * ecb_cold
2219PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags) 2860PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
2220{ 2861{
2221 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2862 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2222 2863
2223 return newSVnv (self->every); 2864 return newSVnv (self->every);
… …
2274/* Coro::Semaphore & Coro::Signal */ 2915/* Coro::Semaphore & Coro::Signal */
2275 2916
2276static SV * 2917static SV *
2277coro_waitarray_new (pTHX_ int count) 2918coro_waitarray_new (pTHX_ int count)
2278{ 2919{
2279 /* a semaphore contains a counter IV in $sem->[0] and any waiters after that */ 2920 /* a waitarray=semaphore contains a counter IV in $sem->[0] and any waiters after that */
2280 AV *av = newAV (); 2921 AV *av = newAV ();
2281 SV **ary; 2922 SV **ary;
2282 2923
2283 /* unfortunately, building manually saves memory */ 2924 /* unfortunately, building manually saves memory */
2284 Newx (ary, 2, SV *); 2925 Newx (ary, 2, SV *);
2285 AvALLOC (av) = ary; 2926 AvALLOC (av) = ary;
2927#if PERL_VERSION_ATLEAST (5,10,0)
2286 /*AvARRAY (av) = ary;*/ 2928 AvARRAY (av) = ary;
2929#else
2287 SvPVX ((SV *)av) = (char *)ary; /* 5.8.8 needs this syntax instead of AvARRAY = ary */ 2930 /* 5.8.8 needs this syntax instead of AvARRAY = ary, yet */
2931 /* -DDEBUGGING flags this as a bug, despite it perfectly working */
2932 SvPVX ((SV *)av) = (char *)ary;
2933#endif
2288 AvMAX (av) = 1; 2934 AvMAX (av) = 1;
2289 AvFILLp (av) = 0; 2935 AvFILLp (av) = 0;
2290 ary [0] = newSViv (count); 2936 ary [0] = newSViv (count);
2291 2937
2292 return newRV_noinc ((SV *)av); 2938 return newRV_noinc ((SV *)av);
… …
2330 SvREFCNT_dec (cb); 2976 SvREFCNT_dec (cb);
2331 } 2977 }
2332} 2978}
2333 2979
2334static void 2980static void
2335coro_semaphore_on_destroy (pTHX_ struct coro *coro) 2981coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2336{ 2982{
2337 /* call $sem->adjust (0) to possibly wake up some other waiters */ 2983 /* call $sem->adjust (0) to possibly wake up some other waiters */
2338 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 2984 coro_semaphore_adjust (aTHX_ (AV *)frame->data, 0);
2339} 2985}
2340 2986
2341static int 2987static int
2342slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire) 2988slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2343{ 2989{
2344 AV *av = (AV *)frame->data; 2990 AV *av = (AV *)frame->data;
2345 SV *count_sv = AvARRAY (av)[0]; 2991 SV *count_sv = AvARRAY (av)[0];
2992 SV *coro_hv = SvRV (coro_current);
2346 2993
2347 /* 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 */
2348 if (CORO_THROW) 2995 if (CORO_THROW)
2349 return 0; 2996 return 0;
2350 else if (SvIVX (count_sv) > 0) 2997 else if (SvIVX (count_sv) > 0)
2351 { 2998 {
2352 SvSTATE_current->on_destroy = 0; 2999 frame->destroy = 0;
2353 3000
2354 if (acquire) 3001 if (acquire)
2355 SvIVX (count_sv) = SvIVX (count_sv) - 1; 3002 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2356 else 3003 else
2357 coro_semaphore_adjust (aTHX_ av, 0); 3004 coro_semaphore_adjust (aTHX_ av, 0);
… …
2362 { 3009 {
2363 int i; 3010 int i;
2364 /* 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 */
2365 /* 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 */
2366 /* this avoids some degenerate memory usage cases */ 3013 /* this avoids some degenerate memory usage cases */
2367 3014 for (i = AvFILLp (av); i > 0; --i) /* i > 0 is not an off-by-one bug */
2368 for (i = 1; i <= AvFILLp (av); ++i)
2369 if (AvARRAY (av)[i] == SvRV (coro_current)) 3015 if (AvARRAY (av)[i] == coro_hv)
2370 return 1; 3016 return 1;
2371 3017
2372 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3018 av_push (av, SvREFCNT_inc (coro_hv));
2373 return 1; 3019 return 1;
2374 } 3020 }
2375} 3021}
2376 3022
2377static int 3023static int
… …
2400 { 3046 {
2401 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3047 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2402 3048
2403 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 3049 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2404 frame->prepare = prepare_schedule; 3050 frame->prepare = prepare_schedule;
2405
2406 /* to avoid race conditions when a woken-up coro gets terminated */ 3051 /* to avoid race conditions when a woken-up coro gets terminated */
2407 /* we arrange for a temporary on_destroy that calls adjust (0) */ 3052 /* we arrange for a temporary on_destroy that calls adjust (0) */
2408 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 3053 frame->destroy = coro_semaphore_destroy;
2409 } 3054 }
2410} 3055}
2411 3056
2412static void 3057static void
2413slf_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)
… …
2421{ 3066{
2422 if (items >= 2) 3067 if (items >= 2)
2423 { 3068 {
2424 /* callback form */ 3069 /* callback form */
2425 AV *av = (AV *)SvRV (arg [0]); 3070 AV *av = (AV *)SvRV (arg [0]);
2426 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 3071 SV *cb_cv = s_get_cv_croak (arg [1]);
2427 3072
2428 av_push (av, (SV *)SvREFCNT_inc_NN (cb_cv)); 3073 av_push (av, SvREFCNT_inc_NN (cb_cv));
2429 3074
2430 if (SvIVX (AvARRAY (av)[0]) > 0) 3075 if (SvIVX (AvARRAY (av)[0]) > 0)
2431 coro_semaphore_adjust (aTHX_ av, 0); 3076 coro_semaphore_adjust (aTHX_ av, 0);
2432 3077
2433 frame->prepare = prepare_nop; 3078 frame->prepare = prepare_nop;
… …
2457 AvARRAY (av)[0] = AvARRAY (av)[1]; 3102 AvARRAY (av)[0] = AvARRAY (av)[1];
2458 AvARRAY (av)[1] = cb; 3103 AvARRAY (av)[1] = cb;
2459 3104
2460 cb = av_shift (av); 3105 cb = av_shift (av);
2461 3106
3107 if (SvTYPE (cb) == SVt_PVCV)
3108 {
3109 dSP;
3110 PUSHMARK (SP);
3111 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
3112 PUTBACK;
3113 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
3114 }
3115 else
3116 {
2462 api_ready (aTHX_ cb); 3117 api_ready (aTHX_ cb);
2463 sv_setiv (cb, 0); /* signal waiter */ 3118 sv_setiv (cb, 0); /* signal waiter */
3119 }
3120
2464 SvREFCNT_dec (cb); 3121 SvREFCNT_dec (cb);
2465 3122
2466 --count; 3123 --count;
2467 } 3124 }
2468} 3125}
… …
2477static void 3134static void
2478slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 3135slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2479{ 3136{
2480 AV *av = (AV *)SvRV (arg [0]); 3137 AV *av = (AV *)SvRV (arg [0]);
2481 3138
3139 if (items >= 2)
3140 {
3141 SV *cb_cv = s_get_cv_croak (arg [1]);
3142 av_push (av, SvREFCNT_inc_NN (cb_cv));
3143
2482 if (SvIVX (AvARRAY (av)[0])) 3144 if (SvIVX (AvARRAY (av)[0]))
3145 coro_signal_wake (aTHX_ av, 1); /* must be the only waiter */
3146
3147 frame->prepare = prepare_nop;
3148 frame->check = slf_check_nop;
3149 }
3150 else if (SvIVX (AvARRAY (av)[0]))
2483 { 3151 {
2484 SvIVX (AvARRAY (av)[0]) = 0; 3152 SvIVX (AvARRAY (av)[0]) = 0;
2485 frame->prepare = prepare_nop; 3153 frame->prepare = prepare_nop;
2486 frame->check = slf_check_nop; 3154 frame->check = slf_check_nop;
2487 } 3155 }
2488 else 3156 else
2489 { 3157 {
2490 SV *waiter = newRV_inc (SvRV (coro_current)); /* owned by signal av */ 3158 SV *waiter = newSVsv (coro_current); /* owned by signal av */
2491 3159
2492 av_push (av, waiter); 3160 av_push (av, waiter);
2493 3161
2494 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */ 3162 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */
2495 frame->prepare = prepare_schedule; 3163 frame->prepare = prepare_schedule;
… …
2513 3181
2514static void 3182static void
2515coro_aio_callback (pTHX_ CV *cv) 3183coro_aio_callback (pTHX_ CV *cv)
2516{ 3184{
2517 dXSARGS; 3185 dXSARGS;
2518 AV *state = (AV *)GENSUB_ARG; 3186 AV *state = (AV *)S_GENSUB_ARG;
2519 SV *coro = av_pop (state); 3187 SV *coro = av_pop (state);
2520 SV *data_sv = newSV (sizeof (struct io_state)); 3188 SV *data_sv = newSV (sizeof (struct io_state));
2521 3189
2522 av_extend (state, items - 1); 3190 av_extend (state, items - 1);
2523 3191
… …
2608 dSP; 3276 dSP;
2609 3277
2610 static SV *prio_cv; 3278 static SV *prio_cv;
2611 static SV *prio_sv; 3279 static SV *prio_sv;
2612 3280
2613 if (expect_false (!prio_cv)) 3281 if (ecb_expect_false (!prio_cv))
2614 { 3282 {
2615 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0); 3283 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0);
2616 prio_sv = newSViv (0); 3284 prio_sv = newSViv (0);
2617 } 3285 }
2618 3286
… …
2637 3305
2638 for (i = 0; i < items; ++i) 3306 for (i = 0; i < items; ++i)
2639 PUSHs (arg [i]); 3307 PUSHs (arg [i]);
2640 3308
2641 /* now push the callback closure */ 3309 /* now push the callback closure */
2642 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))));
2643 3311
2644 /* now call the AIO function - we assume our request is uncancelable */ 3312 /* now call the AIO function - we assume our request is uncancelable */
2645 PUTBACK; 3313 PUTBACK;
2646 call_sv ((SV *)req, G_VOID | G_DISCARD); 3314 call_sv ((SV *)req, G_VOID | G_DISCARD);
2647 } 3315 }
2648 3316
2649 /* 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 */
2650 frame->data = (void *)state; 3318 frame->data = (void *)state;
2651 frame->prepare = prepare_schedule; 3319 frame->prepare = prepare_schedule;
2652 frame->check = slf_check_aio_req; 3320 frame->check = slf_check_aio_req;
2653} 3321}
2654 3322
… …
2661 3329
2662 XSRETURN_EMPTY; 3330 XSRETURN_EMPTY;
2663} 3331}
2664 3332
2665/*****************************************************************************/ 3333/*****************************************************************************/
3334
3335#if CORO_CLONE
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
3462#endif
2666 3463
2667MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3464MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2668 3465
2669PROTOTYPES: DISABLE 3466PROTOTYPES: DISABLE
2670 3467
… …
2675 coro_thx = PERL_GET_CONTEXT; 3472 coro_thx = PERL_GET_CONTEXT;
2676# endif 3473# endif
2677#endif 3474#endif
2678 BOOT_PAGESIZE; 3475 BOOT_PAGESIZE;
2679 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;
3483
3484 cctx_current = cctx_new_empty ();
3485
2680 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3486 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
2681 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3487 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
2682 3488
2683 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 3489 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get;
2684 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set; 3490 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set;
… …
2703 3509
2704 { 3510 {
2705 SV *slf = sv_2mortal (newSViv (PTR2IV (pp_slf))); 3511 SV *slf = sv_2mortal (newSViv (PTR2IV (pp_slf)));
2706 3512
2707 if (!PL_custom_op_names) PL_custom_op_names = newHV (); 3513 if (!PL_custom_op_names) PL_custom_op_names = newHV ();
2708 hv_store_ent (PL_custom_op_names, slf, 3514 hv_store_ent (PL_custom_op_names, slf, newSVpv ("coro_slf", 0), 0);
2709 newSVpv ("coro_slf", 0), 0);
2710 3515
2711 if (!PL_custom_op_descs) PL_custom_op_descs = newHV (); 3516 if (!PL_custom_op_descs) PL_custom_op_descs = newHV ();
2712 hv_store_ent (PL_custom_op_descs, slf, 3517 hv_store_ent (PL_custom_op_descs, slf, newSVpv ("coro schedule like function", 0), 0);
2713 newSVpv ("coro schedule like function", 0), 0);
2714 } 3518 }
2715 3519
2716 coroapi.ver = CORO_API_VERSION; 3520 coroapi.ver = CORO_API_VERSION;
2717 coroapi.rev = CORO_API_REVISION; 3521 coroapi.rev = CORO_API_REVISION;
2718 3522
… …
2723 coroapi.prepare_nop = prepare_nop; 3527 coroapi.prepare_nop = prepare_nop;
2724 coroapi.prepare_schedule = prepare_schedule; 3528 coroapi.prepare_schedule = prepare_schedule;
2725 coroapi.prepare_cede = prepare_cede; 3529 coroapi.prepare_cede = prepare_cede;
2726 coroapi.prepare_cede_notself = prepare_cede_notself; 3530 coroapi.prepare_cede_notself = prepare_cede_notself;
2727 3531
2728 { 3532 time_init (aTHX);
2729 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
2730 3533
2731 if (!svp) croak ("Time::HiRes is required");
2732 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
2733
2734 nvtime = INT2PTR (double (*)(), SvIV (*svp));
2735 }
2736
2737 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
2738} 3540}
2739 3541
2740SV * 3542SV *
2741new (char *klass, ...) 3543new (SV *klass, ...)
2742 ALIAS: 3544 ALIAS:
2743 Coro::new = 1 3545 Coro::new = 1
2744 CODE: 3546 CODE:
2745{ 3547 RETVAL = coro_new (aTHX_ ix ? coro_stash : coro_state_stash, &ST (1), items - 1, ix);
2746 struct coro *coro; 3548 OUTPUT:
2747 MAGIC *mg;
2748 HV *hv;
2749 CV *cb;
2750 int i;
2751
2752 if (items > 1)
2753 {
2754 cb = coro_sv_2cv (aTHX_ ST (1));
2755
2756 if (!ix)
2757 {
2758 if (CvISXSUB (cb))
2759 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
2760
2761 if (!CvROOT (cb))
2762 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
2763 }
2764 }
2765
2766 Newz (0, coro, 1, struct coro);
2767 coro->args = newAV ();
2768 coro->flags = CF_NEW;
2769
2770 if (coro_first) coro_first->prev = coro;
2771 coro->next = coro_first;
2772 coro_first = coro;
2773
2774 coro->hv = hv = newHV ();
2775 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
2776 mg->mg_flags |= MGf_DUP;
2777 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
2778
2779 if (items > 1)
2780 {
2781 av_extend (coro->args, items - 1 + ix - 1);
2782
2783 if (ix)
2784 {
2785 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
2786 cb = cv_coro_run;
2787 }
2788
2789 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
2790
2791 for (i = 2; i < items; i++)
2792 av_push (coro->args, newSVsv (ST (i)));
2793 }
2794}
2795 OUTPUT:
2796 RETVAL 3549 RETVAL
2797 3550
2798void 3551void
2799transfer (...) 3552transfer (...)
2800 PROTOTYPE: $$ 3553 PROTOTYPE: $$
2801 CODE: 3554 CODE:
2802 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3555 CORO_EXECUTE_SLF_XS (slf_init_transfer);
2803 3556
2804bool
2805_destroy (SV *coro_sv)
2806 CODE:
2807 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
2808 OUTPUT:
2809 RETVAL
2810
2811void 3557void
2812_exit (int code) 3558_exit (int code)
2813 PROTOTYPE: $ 3559 PROTOTYPE: $
2814 CODE: 3560 CODE:
2815 _exit (code); 3561 _exit (code);
3562
3563SV *
3564clone (Coro::State coro)
3565 CODE:
3566{
3567#if CORO_CLONE
3568 struct coro *ncoro = coro_clone (aTHX_ coro);
3569 MAGIC *mg;
3570 /* TODO: too much duplication */
3571 ncoro->hv = newHV ();
3572 mg = sv_magicext ((SV *)ncoro->hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)ncoro, 0);
3573 mg->mg_flags |= MGf_DUP;
3574 RETVAL = sv_bless (newRV_noinc ((SV *)ncoro->hv), SvSTASH (coro->hv));
3575#else
3576 croak ("Coro::State->clone has not been configured into this installation of Coro, realised");
3577#endif
3578}
3579 OUTPUT:
3580 RETVAL
2816 3581
2817int 3582int
2818cctx_stacksize (int new_stacksize = 0) 3583cctx_stacksize (int new_stacksize = 0)
2819 PROTOTYPE: ;$ 3584 PROTOTYPE: ;$
2820 CODE: 3585 CODE:
… …
2870 eval = 1 3635 eval = 1
2871 CODE: 3636 CODE:
2872{ 3637{
2873 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3638 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
2874 { 3639 {
2875 struct coro temp; 3640 struct coro *current = SvSTATE_current;
3641 struct CoroSLF slf_save;
2876 3642
2877 if (!(coro->flags & CF_RUNNING)) 3643 if (current != coro)
2878 { 3644 {
2879 PUTBACK; 3645 PUTBACK;
2880 save_perl (aTHX_ &temp); 3646 save_perl (aTHX_ current);
2881 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;
3657 SPAGAIN;
2882 } 3658 }
2883 3659
2884 {
2885 dSP;
2886 ENTER;
2887 SAVETMPS;
2888 PUTBACK;
2889 PUSHSTACK; 3660 PUSHSTACK;
3661
2890 PUSHMARK (SP); 3662 PUSHMARK (SP);
3663 PUTBACK;
2891 3664
2892 if (ix) 3665 if (ix)
2893 eval_sv (coderef, 0); 3666 eval_sv (coderef, 0);
2894 else 3667 else
2895 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 3668 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
2896 3669
2897 POPSTACK; 3670 POPSTACK;
2898 SPAGAIN; 3671 SPAGAIN;
2899 FREETMPS;
2900 LEAVE;
2901 PUTBACK;
2902 }
2903 3672
2904 if (!(coro->flags & CF_RUNNING)) 3673 if (current != coro)
2905 { 3674 {
3675 PUTBACK;
3676 slf_frame = slf_save;
2906 save_perl (aTHX_ coro); 3677 save_perl (aTHX_ coro);
2907 load_perl (aTHX_ &temp); 3678 load_perl (aTHX_ current);
2908 SPAGAIN; 3679 SPAGAIN;
2909 } 3680 }
2910 } 3681 }
2911} 3682}
2912 3683
… …
2915 PROTOTYPE: $ 3686 PROTOTYPE: $
2916 ALIAS: 3687 ALIAS:
2917 is_ready = CF_READY 3688 is_ready = CF_READY
2918 is_running = CF_RUNNING 3689 is_running = CF_RUNNING
2919 is_new = CF_NEW 3690 is_new = CF_NEW
2920 is_destroyed = CF_DESTROYED 3691 is_destroyed = CF_ZOMBIE
3692 is_zombie = CF_ZOMBIE
3693 is_suspended = CF_SUSPENDED
2921 CODE: 3694 CODE:
2922 RETVAL = boolSV (coro->flags & ix); 3695 RETVAL = boolSV (coro->flags & ix);
2923 OUTPUT: 3696 OUTPUT:
2924 RETVAL 3697 RETVAL
2925 3698
2926void 3699void
2927throw (Coro::State self, SV *throw = &PL_sv_undef) 3700throw (SV *self, SV *exception = &PL_sv_undef)
2928 PROTOTYPE: $;$ 3701 PROTOTYPE: $;$
2929 CODE: 3702 CODE:
2930{ 3703{
3704 struct coro *coro = SvSTATE (self);
2931 struct coro *current = SvSTATE_current; 3705 struct coro *current = SvSTATE_current;
2932 SV **throwp = self == current ? &CORO_THROW : &self->except; 3706 SV **exceptionp = coro == current ? &CORO_THROW : &coro->except;
2933 SvREFCNT_dec (*throwp); 3707 SvREFCNT_dec (*exceptionp);
2934 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3708 SvGETMAGIC (exception);
3709 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3710
3711 api_ready (aTHX_ self);
2935} 3712}
2936 3713
2937void 3714void
2938api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3715api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
2939 PROTOTYPE: $;$ 3716 PROTOTYPE: $;$
… …
2941 3718
2942SV * 3719SV *
2943has_cctx (Coro::State coro) 3720has_cctx (Coro::State coro)
2944 PROTOTYPE: $ 3721 PROTOTYPE: $
2945 CODE: 3722 CODE:
2946 RETVAL = boolSV (!!coro->cctx); 3723 /* maybe manage the running flag differently */
3724 RETVAL = boolSV (!!coro->cctx || (coro->flags & CF_RUNNING));
2947 OUTPUT: 3725 OUTPUT:
2948 RETVAL 3726 RETVAL
2949 3727
2950int 3728int
2951is_traced (Coro::State coro) 3729is_traced (Coro::State coro)
… …
2971 3749
2972void 3750void
2973force_cctx () 3751force_cctx ()
2974 PROTOTYPE: 3752 PROTOTYPE:
2975 CODE: 3753 CODE:
2976 SvSTATE_current->cctx->idle_sp = 0; 3754 cctx_current->idle_sp = 0;
2977 3755
2978void 3756void
2979swap_defsv (Coro::State self) 3757swap_defsv (Coro::State self)
2980 PROTOTYPE: $ 3758 PROTOTYPE: $
2981 ALIAS: 3759 ALIAS:
… …
2989 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv; 3767 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
2990 3768
2991 SV *tmp = *src; *src = *dst; *dst = tmp; 3769 SV *tmp = *src; *src = *dst; *dst = tmp;
2992 } 3770 }
2993 3771
3772void
3773cancel (Coro::State self)
3774 CODE:
3775 coro_state_destroy (aTHX_ self);
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}
3832
2994 3833
2995MODULE = Coro::State PACKAGE = Coro 3834MODULE = Coro::State PACKAGE = Coro
2996 3835
2997BOOT: 3836BOOT:
2998{ 3837{
2999 int i;
3000
3001 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3002 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3838 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3003 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3839 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3004 cv_coro_run = get_cv ( "Coro::_terminate", GV_ADD); 3840 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3005 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3006 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);
3842 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3843 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3844 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3845 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3007 3846
3008 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);
3009 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3848 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3010 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);
3011 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 */
3012 3851
3013 coro_stash = gv_stashpv ("Coro", TRUE); 3852 coro_stash = gv_stashpv ("Coro", TRUE);
3014 3853
3015 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 3854 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3016 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 3855 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3017 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 3856 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
3018 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 3857 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (CORO_PRIO_LOW));
3019 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE)); 3858 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (CORO_PRIO_IDLE));
3020 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN)); 3859 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (CORO_PRIO_MIN));
3021
3022 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
3023 coro_ready[i] = newAV ();
3024 3860
3025 { 3861 {
3026 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 3862 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
3027 3863
3028 coroapi.schedule = api_schedule; 3864 coroapi.schedule = api_schedule;
… …
3038 sv_setiv (sv, (IV)&coroapi); 3874 sv_setiv (sv, (IV)&coroapi);
3039 SvREADONLY_on (sv); 3875 SvREADONLY_on (sv);
3040 } 3876 }
3041} 3877}
3042 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
3904void
3905terminate (...)
3906 CODE:
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
3917
3043void 3918void
3044schedule (...) 3919schedule (...)
3045 CODE: 3920 CODE:
3046 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3921 CORO_EXECUTE_SLF_XS (slf_init_schedule);
3047 3922
… …
3075void 3950void
3076_set_readyhook (SV *hook) 3951_set_readyhook (SV *hook)
3077 PROTOTYPE: $ 3952 PROTOTYPE: $
3078 CODE: 3953 CODE:
3079 SvREFCNT_dec (coro_readyhook); 3954 SvREFCNT_dec (coro_readyhook);
3955 SvGETMAGIC (hook);
3956 if (SvOK (hook))
3957 {
3080 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 }
3081 3966
3082int 3967int
3083prio (Coro::State coro, int newprio = 0) 3968prio (Coro::State coro, int newprio = 0)
3084 PROTOTYPE: $;$ 3969 PROTOTYPE: $;$
3085 ALIAS: 3970 ALIAS:
… …
3091 if (items > 1) 3976 if (items > 1)
3092 { 3977 {
3093 if (ix) 3978 if (ix)
3094 newprio = coro->prio - newprio; 3979 newprio = coro->prio - newprio;
3095 3980
3096 if (newprio < PRIO_MIN) newprio = PRIO_MIN; 3981 if (newprio < CORO_PRIO_MIN) newprio = CORO_PRIO_MIN;
3097 if (newprio > PRIO_MAX) newprio = PRIO_MAX; 3982 if (newprio > CORO_PRIO_MAX) newprio = CORO_PRIO_MAX;
3098 3983
3099 coro->prio = newprio; 3984 coro->prio = newprio;
3100 } 3985 }
3101} 3986}
3102 OUTPUT: 3987 OUTPUT:
… …
3117 RETVAL = coro_nready; 4002 RETVAL = coro_nready;
3118 OUTPUT: 4003 OUTPUT:
3119 RETVAL 4004 RETVAL
3120 4005
3121void 4006void
4007suspend (Coro::State self)
4008 PROTOTYPE: $
4009 CODE:
4010 self->flags |= CF_SUSPENDED;
4011
4012void
4013resume (Coro::State self)
4014 PROTOTYPE: $
4015 CODE:
4016 self->flags &= ~CF_SUSPENDED;
4017
4018void
3122_pool_handler (...) 4019_pool_handler (...)
3123 CODE: 4020 CODE:
3124 CORO_EXECUTE_SLF_XS (slf_init_pool_handler); 4021 CORO_EXECUTE_SLF_XS (slf_init_pool_handler);
3125 4022
3126void 4023void
… …
3137 for (i = 1; i < items; ++i) 4034 for (i = 1; i < items; ++i)
3138 av_push (av, SvREFCNT_inc_NN (ST (i))); 4035 av_push (av, SvREFCNT_inc_NN (ST (i)));
3139 4036
3140 if ((SV *)hv == &PL_sv_undef) 4037 if ((SV *)hv == &PL_sv_undef)
3141 { 4038 {
3142 PUSHMARK (SP); 4039 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3143 EXTEND (SP, 2);
3144 PUSHs (sv_Coro);
3145 PUSHs ((SV *)cv_pool_handler);
3146 PUTBACK;
3147 call_sv ((SV *)cv_coro_state_new, G_SCALAR);
3148 SPAGAIN;
3149
3150 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs)); 4040 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
4041 SvREFCNT_dec (sv);
3151 } 4042 }
3152 4043
3153 { 4044 {
3154 struct coro *coro = SvSTATE_hv (hv); 4045 struct coro *coro = SvSTATE_hv (hv);
3155 4046
… …
3179rouse_wait (...) 4070rouse_wait (...)
3180 PROTOTYPE: ;$ 4071 PROTOTYPE: ;$
3181 PPCODE: 4072 PPCODE:
3182 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait); 4073 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait);
3183 4074
4075void
4076on_enter (SV *block)
4077 ALIAS:
4078 on_leave = 1
4079 PROTOTYPE: &
4080 CODE:
4081{
4082 struct coro *coro = SvSTATE_current;
4083 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
4084
4085 block = s_get_cv_croak (block);
4086
4087 if (!*avp)
4088 *avp = newAV ();
4089
4090 av_push (*avp, SvREFCNT_inc (block));
4091
4092 if (!ix)
4093 on_enterleave_call (aTHX_ block);
4094
4095 LEAVE; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
4096 SAVEDESTRUCTOR_X (ix ? coro_pop_on_leave : coro_pop_on_enter, (void *)coro);
4097 ENTER; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
4098}
4099
3184 4100
3185MODULE = Coro::State PACKAGE = PerlIO::cede 4101MODULE = Coro::State PACKAGE = PerlIO::cede
3186 4102
3187BOOT: 4103BOOT:
3188 PerlIO_define_layer (aTHX_ &PerlIO_cede); 4104 PerlIO_define_layer (aTHX_ &PerlIO_cede);
… …
3191MODULE = Coro::State PACKAGE = Coro::Semaphore 4107MODULE = Coro::State PACKAGE = Coro::Semaphore
3192 4108
3193SV * 4109SV *
3194new (SV *klass, SV *count = 0) 4110new (SV *klass, SV *count = 0)
3195 CODE: 4111 CODE:
4112{
4113 int semcnt = 1;
4114
4115 if (count)
4116 {
4117 SvGETMAGIC (count);
4118
4119 if (SvOK (count))
4120 semcnt = SvIV (count);
4121 }
4122
3196 RETVAL = sv_bless ( 4123 RETVAL = sv_bless (
3197 coro_waitarray_new (aTHX_ count && SvOK (count) ? SvIV (count) : 1), 4124 coro_waitarray_new (aTHX_ semcnt),
3198 GvSTASH (CvGV (cv)) 4125 GvSTASH (CvGV (cv))
3199 ); 4126 );
4127}
3200 OUTPUT: 4128 OUTPUT:
3201 RETVAL 4129 RETVAL
3202 4130
3203# helper for Coro::Channel 4131# helper for Coro::Channel and others
3204SV * 4132SV *
3205_alloc (int count) 4133_alloc (int count)
3206 CODE: 4134 CODE:
3207 RETVAL = coro_waitarray_new (aTHX_ count); 4135 RETVAL = coro_waitarray_new (aTHX_ count);
3208 OUTPUT: 4136 OUTPUT:
… …
3266 for (i = 1; i <= wcount; ++i) 4194 for (i = 1; i <= wcount; ++i)
3267 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i]))); 4195 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i])));
3268 } 4196 }
3269} 4197}
3270 4198
4199MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
4200
4201void
4202_may_delete (SV *sem, int count, unsigned int extra_refs)
4203 PPCODE:
4204{
4205 AV *av = (AV *)SvRV (sem);
4206
4207 if (SvREFCNT ((SV *)av) == 1 + extra_refs
4208 && AvFILLp (av) == 0 /* no waiters, just count */
4209 && SvIV (AvARRAY (av)[0]) == count)
4210 XSRETURN_YES;
4211
4212 XSRETURN_NO;
4213}
4214
3271MODULE = Coro::State PACKAGE = Coro::Signal 4215MODULE = Coro::State PACKAGE = Coro::Signal
3272 4216
3273SV * 4217SV *
3274new (SV *klass) 4218new (SV *klass)
3275 CODE: 4219 CODE:
… …
3346 4290
3347void 4291void
3348_register (char *target, char *proto, SV *req) 4292_register (char *target, char *proto, SV *req)
3349 CODE: 4293 CODE:
3350{ 4294{
3351 CV *req_cv = coro_sv_2cv (aTHX_ req); 4295 SV *req_cv = s_get_cv_croak (req);
3352 /* newXSproto doesn't return the CV on 5.8 */ 4296 /* newXSproto doesn't return the CV on 5.8 */
3353 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 4297 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3354 sv_setpv ((SV *)slf_cv, proto); 4298 sv_setpv ((SV *)slf_cv, proto);
3355 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);
3356} 4300}
3357 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