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.307 by root, Wed Nov 19 14:34:46 2008 UTC vs.
Revision 1.427 by root, Wed Dec 5 14:35:34 2012 UTC

1/* this works around a bug in mingw32 providing a non-working setjmp */
2#define USE_NO_MINGW_SETJMP_TWO_ARGS
3
4#define NDEBUG 1
5
1#include "libcoro/coro.c" 6#include "libcoro/coro.c"
2 7
3#define PERL_NO_GET_CONTEXT 8#define PERL_NO_GET_CONTEXT
4#define PERL_EXT 9#define PERL_EXT
5 10
6#include "EXTERN.h" 11#include "EXTERN.h"
7#include "perl.h" 12#include "perl.h"
8#include "XSUB.h" 13#include "XSUB.h"
9#include "perliol.h" 14#include "perliol.h"
10 15
11#include "patchlevel.h" 16#include "schmorp.h"
12 17
18#define ECB_NO_THREADS 1
19#include "ecb.h"
20
21#include <stddef.h>
13#include <stdio.h> 22#include <stdio.h>
14#include <errno.h> 23#include <errno.h>
15#include <assert.h> 24#include <assert.h>
16 25
17#ifdef WIN32 26#ifndef SVs_PADSTALE
27# define SVs_PADSTALE 0
28#endif
29
30#ifdef PadARRAY
31# define NEWPADAPI
32# define newPADLIST(var) (Newz (0, var, 1, PADLIST), Newx (PadlistARRAY (var), 2, PAD *))
33#else
34typedef AV PADNAMELIST;
35# if !PERL_VERSION_ATLEAST(5,8,0)
36typedef AV PADLIST;
37typedef AV PAD;
38# endif
39# define PadlistARRAY(pl) ((PAD **)AvARRAY (pl))
40# define PadlistMAX(pl) AvFILLp (pl)
41# define PadlistNAMES(pl) (*PadlistARRAY (pl))
42# define PadARRAY AvARRAY
43# define PadMAX AvFILLp
44# define newPADLIST(var) ((var) = newAV (), av_extend (var, 1))
45#endif
46
47#if defined(_WIN32)
48# undef HAS_GETTIMEOFDAY
18# undef setjmp 49# undef setjmp
19# undef longjmp 50# undef longjmp
20# undef _exit 51# undef _exit
21# define setjmp _setjmp /* deep magic */ 52# define setjmp _setjmp /* deep magic */
22#else 53#else
23# include <inttypes.h> /* most portable stdint.h */ 54# include <inttypes.h> /* most portable stdint.h */
24#endif 55#endif
25 56
26#ifdef HAVE_MMAP 57#if HAVE_MMAP
27# include <unistd.h> 58# include <unistd.h>
28# include <sys/mman.h> 59# include <sys/mman.h>
29# ifndef MAP_ANONYMOUS 60# ifndef MAP_ANONYMOUS
30# ifdef MAP_ANON 61# ifdef MAP_ANON
31# define MAP_ANONYMOUS MAP_ANON 62# define MAP_ANONYMOUS MAP_ANON
… …
51#endif 82#endif
52 83
53/* the maximum number of idle cctx that will be pooled */ 84/* the maximum number of idle cctx that will be pooled */
54static int cctx_max_idle = 4; 85static int cctx_max_idle = 4;
55 86
56#define PERL_VERSION_ATLEAST(a,b,c) \ 87#if defined(DEBUGGING) && PERL_VERSION_ATLEAST(5,12,0)
57 (PERL_REVISION > (a) \ 88# define HAS_SCOPESTACK_NAME 1
58 || (PERL_REVISION == (a) \
59 && (PERL_VERSION > (b) \
60 || (PERL_VERSION == (b) && PERLSUBVERSION >= (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
104/* 5.8.7 */
105#ifndef SvRV_set
106# define SvRV_set(s,v) SvRV(s) = (v)
107#endif 89#endif
108 90
109#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 91#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
110# undef CORO_STACKGUARD 92# undef CORO_STACKGUARD
111#endif 93#endif
… …
127#else 109#else
128# define dSTACKLEVEL volatile void *stacklevel 110# define dSTACKLEVEL volatile void *stacklevel
129# define STACKLEVEL ((void *)&stacklevel) 111# define STACKLEVEL ((void *)&stacklevel)
130#endif 112#endif
131 113
132#define IN_DESTRUCT (PL_main_cv == Nullcv) 114#define IN_DESTRUCT PL_dirty
133
134#if __GNUC__ >= 3
135# define attribute(x) __attribute__(x)
136# define expect(expr,value) __builtin_expect ((expr),(value))
137# define INLINE static inline
138#else
139# define attribute(x)
140# define expect(expr,value) (expr)
141# define INLINE static
142#endif
143
144#define expect_false(expr) expect ((expr) != 0, 0)
145#define expect_true(expr) expect ((expr) != 0, 1)
146
147#define NOINLINE attribute ((noinline))
148 115
149#include "CoroAPI.h" 116#include "CoroAPI.h"
150#define GCoroAPI (&coroapi) /* very sneaky */ 117#define GCoroAPI (&coroapi) /* very sneaky */
151 118
152#ifdef USE_ITHREADS 119#ifdef USE_ITHREADS
153# if CORO_PTHREAD 120# if CORO_PTHREAD
154static void *coro_thx; 121static void *coro_thx;
155# endif 122# endif
156#endif 123#endif
157 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
158static 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]);
159 137
160/* we hijack an hopefully unused CV flag for our purposes */ 138/* we hijack an hopefully unused CV flag for our purposes */
161#define CVf_SLF 0x4000 139#define CVf_SLF 0x4000
162static OP *pp_slf (pTHX); 140static OP *pp_slf (pTHX);
141static void slf_destroy (pTHX_ struct coro *coro);
163 142
164static U32 cctx_gen; 143static U32 cctx_gen;
165static size_t cctx_stacksize = CORO_STACKSIZE; 144static size_t cctx_stacksize = CORO_STACKSIZE;
166static struct CoroAPI coroapi; 145static struct CoroAPI coroapi;
167static AV *main_mainstack; /* used to differentiate between $main and others */ 146static AV *main_mainstack; /* used to differentiate between $main and others */
168static JMPENV *main_top_env; 147static JMPENV *main_top_env;
169static HV *coro_state_stash, *coro_stash; 148static HV *coro_state_stash, *coro_stash;
170static volatile SV *coro_mortal; /* will be freed/thrown after next transfer */ 149static volatile SV *coro_mortal; /* will be freed/thrown after next transfer */
171 150
151static AV *av_destroy; /* destruction queue */
152static SV *sv_manager; /* the manager coro */
153static SV *sv_idle; /* $Coro::idle */
154
172static GV *irsgv; /* $/ */ 155static GV *irsgv; /* $/ */
173static GV *stdoutgv; /* *STDOUT */ 156static GV *stdoutgv; /* *STDOUT */
174static SV *rv_diehook; 157static SV *rv_diehook;
175static SV *rv_warnhook; 158static SV *rv_warnhook;
176static HV *hv_sig; /* %SIG */ 159static HV *hv_sig; /* %SIG */
177 160
178/* async_pool helper stuff */ 161/* async_pool helper stuff */
179static SV *sv_pool_rss; 162static SV *sv_pool_rss;
180static SV *sv_pool_size; 163static SV *sv_pool_size;
164static SV *sv_async_pool_idle; /* description string */
181static AV *av_async_pool; 165static AV *av_async_pool; /* idle pool */
166static SV *sv_Coro; /* class string */
167static CV *cv_pool_handler;
182 168
183/* Coro::AnyEvent */ 169/* Coro::AnyEvent */
184static SV *sv_activity; 170static SV *sv_activity;
185 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
186static struct coro_cctx *cctx_first; 178static struct coro_cctx *cctx_first;
187static int cctx_count, cctx_idle; 179static int cctx_count, cctx_idle;
188 180
189enum { 181enum
182{
190 CC_MAPPED = 0x01, 183 CC_MAPPED = 0x01,
191 CC_NOREUSE = 0x02, /* throw this away after tracing */ 184 CC_NOREUSE = 0x02, /* throw this away after tracing */
192 CC_TRACE = 0x04, 185 CC_TRACE = 0x04,
193 CC_TRACE_SUB = 0x08, /* trace sub calls */ 186 CC_TRACE_SUB = 0x08, /* trace sub calls */
194 CC_TRACE_LINE = 0x10, /* trace each statement */ 187 CC_TRACE_LINE = 0x10, /* trace each statement */
… …
204 void *sptr; 197 void *sptr;
205 size_t ssize; 198 size_t ssize;
206 199
207 /* cpu state */ 200 /* cpu state */
208 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
209 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
210 JMPENV *top_env; 205 JMPENV *top_env;
211 coro_context cctx; 206 coro_context cctx;
212 207
213 U32 gen; 208 U32 gen;
214#if CORO_USE_VALGRIND 209#if CORO_USE_VALGRIND
215 int valgrind_id; 210 int valgrind_id;
216#endif 211#endif
217 unsigned char flags; 212 unsigned char flags;
218} coro_cctx; 213} coro_cctx;
219 214
215static coro_cctx *cctx_current; /* the currently running cctx */
216
217/*****************************************************************************/
218
219static MGVTBL coro_state_vtbl;
220
220enum { 221enum
222{
221 CF_RUNNING = 0x0001, /* coroutine is running */ 223 CF_RUNNING = 0x0001, /* coroutine is running */
222 CF_READY = 0x0002, /* coroutine is ready */ 224 CF_READY = 0x0002, /* coroutine is ready */
223 CF_NEW = 0x0004, /* has never been switched to */ 225 CF_NEW = 0x0004, /* has never been switched to */
224 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) */
225}; 229};
226 230
227/* 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 */
228typedef struct 232typedef struct
229{ 233{
230 SV *defsv;
231 AV *defav;
232 SV *errsv;
233 SV *irsgv;
234#define VAR(name,type) type name; 234 #define VARx(name,expr,type) type name;
235# include "state.h" 235 #include "state.h"
236#undef VAR
237} perl_slots; 236} perl_slots;
238 237
238/* how many context stack entries do we need for perl_slots */
239#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))
240 240
241/* this is a structure representing a perl-level coroutine */ 241/* this is a structure representing a perl-level coroutine */
242struct coro { 242struct coro
243{
243 /* the C coroutine allocated to this perl coroutine, if any */ 244 /* the C coroutine allocated to this perl coroutine, if any */
244 coro_cctx *cctx; 245 coro_cctx *cctx;
246
247 /* ready queue */
248 struct coro *next_ready;
245 249
246 /* state data */ 250 /* state data */
247 struct CoroSLF slf_frame; /* saved slf frame */ 251 struct CoroSLF slf_frame; /* saved slf frame */
248 AV *mainstack; 252 AV *mainstack;
249 perl_slots *slot; /* basically the saved sp */ 253 perl_slots *slot; /* basically the saved sp */
250 254
251 CV *startcv; /* the CV to execute */ 255 CV *startcv; /* the CV to execute */
252 AV *args; /* data associated with this coroutine (initial args) */ 256 AV *args; /* data associated with this coroutine (initial args) */
253 int refcnt; /* coroutines are refcounted, yes */
254 int flags; /* CF_ flags */ 257 int flags; /* CF_ flags */
255 HV *hv; /* the perl hash associated with this coro, if any */ 258 HV *hv; /* the perl hash associated with this coro, if any */
256 void (*on_destroy)(pTHX_ struct coro *coro);
257 259
258 /* statistics */ 260 /* statistics */
259 int usecount; /* number of transfers to this coro */ 261 int usecount; /* number of transfers to this coro */
260 262
261 /* coro process data */ 263 /* coro process data */
262 int prio; 264 int prio;
263 SV *except; /* exception to be thrown */ 265 SV *except; /* exception to be thrown */
264 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 */
265 269
266 /* async_pool */ 270 /* async_pool */
267 SV *saved_deffh; 271 SV *saved_deffh;
272 SV *invoke_cb;
273 AV *invoke_av;
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;
268 284
269 /* linked list */ 285 /* linked list */
270 struct coro *next, *prev; 286 struct coro *next, *prev;
271}; 287};
272 288
273typedef struct coro *Coro__State; 289typedef struct coro *Coro__State;
274typedef struct coro *Coro__State_or_hashref; 290typedef struct coro *Coro__State_or_hashref;
275 291
276/* the following variables are effectively part of the perl context */ 292/* the following variables are effectively part of the perl context */
277/* and get copied between struct coro and these variables */ 293/* and get copied between struct coro and these variables */
278/* the mainr easonw e don't support windows process emulation */ 294/* the main reason we don't support windows process emulation */
279static struct CoroSLF slf_frame; /* the current slf frame */ 295static struct CoroSLF slf_frame; /* the current slf frame */
280 296
281/** Coro ********************************************************************/ 297/** Coro ********************************************************************/
282 298
283#define PRIO_MAX 3 299#define CORO_PRIO_MAX 3
284#define PRIO_HIGH 1 300#define CORO_PRIO_HIGH 1
285#define PRIO_NORMAL 0 301#define CORO_PRIO_NORMAL 0
286#define PRIO_LOW -1 302#define CORO_PRIO_LOW -1
287#define PRIO_IDLE -3 303#define CORO_PRIO_IDLE -3
288#define PRIO_MIN -4 304#define CORO_PRIO_MIN -4
289 305
290/* for Coro.pm */ 306/* for Coro.pm */
291static SV *coro_current; 307static SV *coro_current;
292static SV *coro_readyhook; 308static SV *coro_readyhook;
293static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1]; 309static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
310static CV *cv_coro_run;
294static struct coro *coro_first; 311static struct coro *coro_first;
295#define coro_nready coroapi.nready 312#define coro_nready coroapi.nready
296 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
297/** lowlevel stuff **********************************************************/ 409/** lowlevel stuff **********************************************************/
298 410
299static SV * 411static SV * ecb_noinline
300coro_get_sv (pTHX_ const char *name, int create) 412coro_get_sv (pTHX_ const char *name, int create)
301{ 413{
302#if PERL_VERSION_ATLEAST (5,10,0) 414#if PERL_VERSION_ATLEAST (5,10,0)
303 /* 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 */
304 get_sv (name, create); 416 get_sv (name, create);
305#endif 417#endif
306 return get_sv (name, create); 418 return get_sv (name, create);
307} 419}
308 420
309static AV * 421static AV * ecb_noinline
310coro_get_av (pTHX_ const char *name, int create) 422coro_get_av (pTHX_ const char *name, int create)
311{ 423{
312#if PERL_VERSION_ATLEAST (5,10,0) 424#if PERL_VERSION_ATLEAST (5,10,0)
313 /* 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 */
314 get_av (name, create); 426 get_av (name, create);
315#endif 427#endif
316 return get_av (name, create); 428 return get_av (name, create);
317} 429}
318 430
319static HV * 431static HV * ecb_noinline
320coro_get_hv (pTHX_ const char *name, int create) 432coro_get_hv (pTHX_ const char *name, int create)
321{ 433{
322#if PERL_VERSION_ATLEAST (5,10,0) 434#if PERL_VERSION_ATLEAST (5,10,0)
323 /* 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 */
324 get_hv (name, create); 436 get_hv (name, create);
325#endif 437#endif
326 return get_hv (name, create); 438 return get_hv (name, create);
327} 439}
328 440
329/* may croak */ 441ecb_inline void
330INLINE CV * 442coro_times_update (void)
331coro_sv_2cv (SV *sv)
332{ 443{
333 HV *st; 444#ifdef coro_clock_gettime
334 GV *gvp; 445 struct timespec ts;
335 return sv_2cv (sv, &st, &gvp, 0);
336}
337 446
338static 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 *
339coro_clone_padlist (pTHX_ CV *cv) 547coro_derive_padlist (pTHX_ CV *cv)
340{ 548{
341 AV *padlist = CvPADLIST (cv); 549 PADLIST *padlist = CvPADLIST (cv);
342 AV *newpadlist, *newpad; 550 PADLIST *newpadlist;
551 PAD *newpad;
552 PADOFFSET const off = PadlistMAX (padlist) + 1;
343 553
344 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. */
345 AvREAL_off (newpadlist); 557 AvREAL_off (newpadlist);
558#endif
346#if PERL_VERSION_ATLEAST (5,10,0) 559#if PERL_VERSION_ATLEAST (5,10,0)
347 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1); 560 Perl_pad_push (aTHX_ padlist, off);
348#else 561#else
349 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 562 Perl_pad_push (aTHX_ padlist, off, 1);
350#endif 563#endif
351 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 564 newpad = PadlistARRAY (padlist)[off];
352 --AvFILLp (padlist); 565 PadlistMAX (padlist) = off - 1;
353 566
354 av_store (newpadlist, 0, SvREFCNT_inc_NN (*av_fetch (padlist, 0, FALSE))); 567 /* Already extended to 2 elements by newPADLIST. */
355 av_store (newpadlist, 1, (SV *)newpad); 568 PadlistMAX (newpadlist) = 1;
569 PadlistNAMES (newpadlist) = (PADNAMELIST *)SvREFCNT_inc_NN (PadlistNAMES (padlist));
570 PadlistARRAY (newpadlist)[1] = newpad;
356 571
357 return newpadlist; 572 return newpadlist;
358} 573}
359 574
360static void 575ecb_inline void
361free_padlist (pTHX_ AV *padlist) 576free_padlist (pTHX_ PADLIST *padlist)
362{ 577{
363 /* may be during global destruction */ 578 /* may be during global destruction */
364 if (SvREFCNT (padlist)) 579 if (!IN_DESTRUCT)
365 { 580 {
366 I32 i = AvFILLp (padlist); 581 I32 i = PadlistMAX (padlist);
367 while (i >= 0) 582
583 while (i > 0) /* special-case index 0 */
368 { 584 {
369 SV **svp = av_fetch (padlist, i--, FALSE); 585 /* we try to be extra-careful here */
370 if (svp) 586 PAD *pad = PadlistARRAY (padlist)[i--];
371 { 587 I32 j = PadMAX (pad);
372 SV *sv;
373 while (&PL_sv_undef != (sv = av_pop ((AV *)*svp)))
374 SvREFCNT_dec (sv);
375 588
589 while (j >= 0)
590 SvREFCNT_dec (PadARRAY (pad)[j--]);
591
592 PadMAX (pad) = -1;
376 SvREFCNT_dec (*svp); 593 SvREFCNT_dec (pad);
377 }
378 } 594 }
379 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);
380 SvREFCNT_dec ((SV*)padlist); 604 SvREFCNT_dec ((SV*)padlist);
605#endif
381 } 606 }
382} 607}
383 608
384static int 609static int
385coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 610coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
386{ 611{
387 AV *padlist; 612 PADLIST *padlist;
388 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;
389 615
390 /* casting is fun. */ 616 /* perl manages to free our internal AV and _then_ call us */
391 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 617 if (IN_DESTRUCT)
618 return 0;
619
620 while (len--)
392 free_padlist (aTHX_ padlist); 621 free_padlist (aTHX_ padlists[len]);
393
394 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
395 622
396 return 0; 623 return 0;
397} 624}
398
399#define CORO_MAGIC_type_cv 26
400#define CORO_MAGIC_type_state PERL_MAGIC_ext
401 625
402static MGVTBL coro_cv_vtbl = { 626static MGVTBL coro_cv_vtbl = {
403 0, 0, 0, 0, 627 0, 0, 0, 0,
404 coro_cv_free 628 coro_cv_free
405}; 629};
406 630
407#define CORO_MAGIC_NN(sv, type) \
408 (expect_true (SvMAGIC (sv)->mg_type == type) \
409 ? SvMAGIC (sv) \
410 : mg_find (sv, type))
411
412#define CORO_MAGIC(sv, type) \
413 (expect_true (SvMAGIC (sv)) \
414 ? CORO_MAGIC_NN (sv, type) \
415 : 0)
416
417#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
418#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
419
420INLINE struct coro *
421SvSTATE_ (pTHX_ SV *coro)
422{
423 HV *stash;
424 MAGIC *mg;
425
426 if (SvROK (coro))
427 coro = SvRV (coro);
428
429 if (expect_false (SvTYPE (coro) != SVt_PVHV))
430 croak ("Coro::State object required");
431
432 stash = SvSTASH (coro);
433 if (expect_false (stash != coro_stash && stash != coro_state_stash))
434 {
435 /* very slow, but rare, check */
436 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
437 croak ("Coro::State object required");
438 }
439
440 mg = CORO_MAGIC_state (coro);
441 return (struct coro *)mg->mg_ptr;
442}
443
444#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
445
446/* faster than SvSTATE, but expects a coroutine hv */
447#define SvSTATE_hv(hv) ((struct coro *)CORO_MAGIC_NN ((SV *)hv, CORO_MAGIC_type_state)->mg_ptr)
448#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
449
450/* the next two functions merely cache the padlists */ 631/* the next two functions merely cache the padlists */
451static void 632ecb_inline void
452get_padlist (pTHX_ CV *cv) 633get_padlist (pTHX_ CV *cv)
453{ 634{
454 MAGIC *mg = CORO_MAGIC_cv (cv); 635 MAGIC *mg = CORO_MAGIC_cv (cv);
455 AV *av; 636 size_t *lenp;
456 637
457 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 638 if (ecb_expect_true (mg && *(lenp = (size_t *)mg->mg_ptr)))
458 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 639 CvPADLIST (cv) = ((PADLIST **)(mg->mg_ptr + sizeof(size_t)))[--*lenp];
459 else 640 else
460 { 641 {
461#if CORO_PREFER_PERL_FUNCTIONS 642#if CORO_PREFER_PERL_FUNCTIONS
462 /* this is probably cleaner? but also slower! */ 643 /* this is probably cleaner? but also slower! */
463 /* in practise, it seems to be less stable */ 644 /* in practise, it seems to be less stable */
464 CV *cp = Perl_cv_clone (aTHX_ cv); 645 CV *cp = Perl_cv_clone (aTHX_ cv);
465 CvPADLIST (cv) = CvPADLIST (cp); 646 CvPADLIST (cv) = CvPADLIST (cp);
466 CvPADLIST (cp) = 0; 647 CvPADLIST (cp) = 0;
467 SvREFCNT_dec (cp); 648 SvREFCNT_dec (cp);
468#else 649#else
469 CvPADLIST (cv) = coro_clone_padlist (aTHX_ cv); 650 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
470#endif 651#endif
471 } 652 }
472} 653}
473 654
474static void 655ecb_inline void
475put_padlist (pTHX_ CV *cv) 656put_padlist (pTHX_ CV *cv)
476{ 657{
477 MAGIC *mg = CORO_MAGIC_cv (cv); 658 MAGIC *mg = CORO_MAGIC_cv (cv);
478 AV *av;
479 659
480 if (expect_false (!mg)) 660 if (ecb_expect_false (!mg))
661 {
481 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);
482 670
483 av = (AV *)mg->mg_obj; 671 ((PADLIST **)(mg->mg_ptr + sizeof (size_t))) [(*(size_t *)mg->mg_ptr)++] = CvPADLIST (cv);
484
485 if (expect_false (AvFILLp (av) >= AvMAX (av)))
486 av_extend (av, AvMAX (av) + 1);
487
488 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
489} 672}
490 673
491/** 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);
492 730
493static void 731static void
494load_perl (pTHX_ Coro__State c) 732load_perl (pTHX_ Coro__State c)
495{ 733{
496 perl_slots *slot = c->slot; 734 perl_slots *slot = c->slot;
497 c->slot = 0; 735 c->slot = 0;
498 736
499 PL_mainstack = c->mainstack; 737 PL_mainstack = c->mainstack;
500 738
501 GvSV (PL_defgv) = slot->defsv; 739#if CORO_JIT
502 GvAV (PL_defgv) = slot->defav; 740 load_perl_slots (slot);
503 GvSV (PL_errgv) = slot->errsv; 741#else
504 GvSV (irsgv) = slot->irsgv;
505
506 #define VAR(name,type) PL_ ## name = slot->name; 742 #define VARx(name,expr,type) expr = slot->name;
507 # include "state.h" 743 #include "state.h"
508 #undef VAR 744#endif
509 745
510 { 746 {
511 dSP; 747 dSP;
512 748
513 CV *cv; 749 CV *cv;
514 750
515 /* now do the ugly restore mess */ 751 /* now do the ugly restore mess */
516 while (expect_true (cv = (CV *)POPs)) 752 while (ecb_expect_true (cv = (CV *)POPs))
517 { 753 {
518 put_padlist (aTHX_ cv); /* mark this padlist as available */ 754 put_padlist (aTHX_ cv); /* mark this padlist as available */
519 CvDEPTH (cv) = PTR2IV (POPs); 755 CvDEPTH (cv) = PTR2IV (POPs);
520 CvPADLIST (cv) = (AV *)POPs; 756 CvPADLIST (cv) = (PADLIST *)POPs;
521 } 757 }
522 758
523 PUTBACK; 759 PUTBACK;
524 } 760 }
525 761
526 slf_frame = c->slf_frame; 762 slf_frame = c->slf_frame;
527 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);
528} 782}
529 783
530static void 784static void
531save_perl (pTHX_ Coro__State c) 785save_perl (pTHX_ Coro__State c)
532{ 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
533 c->except = CORO_THROW; 805 c->except = CORO_THROW;
534 c->slf_frame = slf_frame; 806 c->slf_frame = slf_frame;
535 807
536 { 808 {
537 dSP; 809 dSP;
… …
546 818
547 XPUSHs (Nullsv); 819 XPUSHs (Nullsv);
548 /* this loop was inspired by pp_caller */ 820 /* this loop was inspired by pp_caller */
549 for (;;) 821 for (;;)
550 { 822 {
551 while (expect_true (cxix >= 0)) 823 while (ecb_expect_true (cxix >= 0))
552 { 824 {
553 PERL_CONTEXT *cx = &ccstk[cxix--]; 825 PERL_CONTEXT *cx = &ccstk[cxix--];
554 826
555 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))
556 { 828 {
557 CV *cv = cx->blk_sub.cv; 829 CV *cv = cx->blk_sub.cv;
558 830
559 if (expect_true (CvDEPTH (cv))) 831 if (ecb_expect_true (CvDEPTH (cv)))
560 { 832 {
561 EXTEND (SP, 3); 833 EXTEND (SP, 3);
562 PUSHs ((SV *)CvPADLIST (cv)); 834 PUSHs ((SV *)CvPADLIST (cv));
563 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv))); 835 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
564 PUSHs ((SV *)cv); 836 PUSHs ((SV *)cv);
… …
567 get_padlist (aTHX_ cv); 839 get_padlist (aTHX_ cv);
568 } 840 }
569 } 841 }
570 } 842 }
571 843
572 if (expect_true (top_si->si_type == PERLSI_MAIN)) 844 if (ecb_expect_true (top_si->si_type == PERLSI_MAIN))
573 break; 845 break;
574 846
575 top_si = top_si->si_prev; 847 top_si = top_si->si_prev;
576 ccstk = top_si->si_cxstack; 848 ccstk = top_si->si_cxstack;
577 cxix = top_si->si_cxix; 849 cxix = top_si->si_cxix;
… …
579 851
580 PUTBACK; 852 PUTBACK;
581 } 853 }
582 854
583 /* allocate some space on the context stack for our purposes */ 855 /* allocate some space on the context stack for our purposes */
584 /* we manually unroll here, as usually 2 slots is enough */ 856 if (ecb_expect_false (cxstack_ix + (int)SLOT_COUNT >= cxstack_max))
585 if (SLOT_COUNT >= 1) CXINC;
586 if (SLOT_COUNT >= 2) CXINC;
587 if (SLOT_COUNT >= 3) CXINC;
588 { 857 {
589 int i; 858 unsigned int i;
859
590 for (i = 3; i < SLOT_COUNT; ++i) 860 for (i = 0; i < SLOT_COUNT; ++i)
591 CXINC; 861 CXINC;
592 } 862
593 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 863 cxstack_ix -= SLOT_COUNT; /* undo allocation */
864 }
594 865
595 c->mainstack = PL_mainstack; 866 c->mainstack = PL_mainstack;
596 867
597 { 868 {
598 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 869 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
599 870
600 slot->defav = GvAV (PL_defgv); 871#if CORO_JIT
601 slot->defsv = DEFSV; 872 save_perl_slots (slot);
602 slot->errsv = ERRSV; 873#else
603 slot->irsgv = GvSV (irsgv);
604
605 #define VAR(name,type) slot->name = PL_ ## name; 874 #define VARx(name,expr,type) slot->name = expr;
606 # include "state.h" 875 #include "state.h"
607 #undef VAR 876#endif
608 } 877 }
609} 878}
610 879
611/* 880/*
612 * allocate various perl stacks. This is almost an exact copy 881 * allocate various perl stacks. This is almost an exact copy
… …
618# define coro_init_stacks(thx) init_stacks () 887# define coro_init_stacks(thx) init_stacks ()
619#else 888#else
620static void 889static void
621coro_init_stacks (pTHX) 890coro_init_stacks (pTHX)
622{ 891{
623 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() */
624 PL_curstackinfo->si_type = PERLSI_MAIN; 893 PL_curstackinfo->si_type = PERLSI_MAIN;
625 PL_curstack = PL_curstackinfo->si_stack; 894 PL_curstack = PL_curstackinfo->si_stack;
626 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 895 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
627 896
628 PL_stack_base = AvARRAY(PL_curstack); 897 PL_stack_base = AvARRAY(PL_curstack);
… …
643#endif 912#endif
644 913
645 New(54,PL_scopestack,8,I32); 914 New(54,PL_scopestack,8,I32);
646 PL_scopestack_ix = 0; 915 PL_scopestack_ix = 0;
647 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
648 920
649 New(54,PL_savestack,24,ANY); 921 New(54,PL_savestack,24,ANY);
650 PL_savestack_ix = 0; 922 PL_savestack_ix = 0;
651 PL_savestack_max = 24; 923 PL_savestack_max = 24;
652 924
… …
680 } 952 }
681 953
682 Safefree (PL_tmps_stack); 954 Safefree (PL_tmps_stack);
683 Safefree (PL_markstack); 955 Safefree (PL_markstack);
684 Safefree (PL_scopestack); 956 Safefree (PL_scopestack);
957#if HAS_SCOPESTACK_NAME
958 Safefree (PL_scopestack_name);
959#endif
685 Safefree (PL_savestack); 960 Safefree (PL_savestack);
686#if !PERL_VERSION_ATLEAST (5,10,0) 961#if !PERL_VERSION_ATLEAST (5,10,0)
687 Safefree (PL_retstack); 962 Safefree (PL_retstack);
688#endif 963#endif
689} 964}
690 965
966#define CORO_RSS \
967 rss += sizeof (SYM (curstackinfo)); \
968 rss += (SYM (curstackinfo->si_cxmax) + 1) * sizeof (PERL_CONTEXT); \
969 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (SYM (curstack))) * sizeof (SV *); \
970 rss += SYM (tmps_max) * sizeof (SV *); \
971 rss += (SYM (markstack_max) - SYM (markstack_ptr)) * sizeof (I32); \
972 rss += SYM (scopestack_max) * sizeof (I32); \
973 rss += SYM (savestack_max) * sizeof (ANY);
974
691static size_t 975static size_t
692coro_rss (pTHX_ struct coro *coro) 976coro_rss (pTHX_ struct coro *coro)
693{ 977{
694 size_t rss = sizeof (*coro); 978 size_t rss = sizeof (*coro);
695 979
696 if (coro->mainstack) 980 if (coro->mainstack)
697 { 981 {
698 perl_slots tmp_slot;
699 perl_slots *slot;
700
701 if (coro->flags & CF_RUNNING) 982 if (coro->flags & CF_RUNNING)
702 { 983 {
703 slot = &tmp_slot; 984 #define SYM(sym) PL_ ## sym
704 985 CORO_RSS;
705 #define VAR(name,type) slot->name = PL_ ## name;
706 # include "state.h"
707 #undef VAR 986 #undef SYM
708 } 987 }
709 else 988 else
710 slot = coro->slot;
711
712 if (slot)
713 { 989 {
714 rss += sizeof (slot->curstackinfo); 990 #define SYM(sym) coro->slot->sym
715 rss += (slot->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT); 991 CORO_RSS;
716 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (slot->curstack)) * sizeof (SV *); 992 #undef SYM
717 rss += slot->tmps_max * sizeof (SV *);
718 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32);
719 rss += slot->scopestack_max * sizeof (I32);
720 rss += slot->savestack_max * sizeof (ANY);
721
722#if !PERL_VERSION_ATLEAST (5,10,0)
723 rss += slot->retstack_max * sizeof (OP *);
724#endif
725 } 993 }
726 } 994 }
727 995
728 return rss; 996 return rss;
729} 997}
… …
742#endif 1010#endif
743 1011
744/* 1012/*
745 * This overrides the default magic get method of %SIG elements. 1013 * This overrides the default magic get method of %SIG elements.
746 * 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
747 * 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),
748 * readback here. 1016 * we just provide our own readback here.
749 * We only do this when the hook is != 0, as they are often set to 0 temporarily,
750 * not expecting this to actually change the hook. This is a potential problem
751 * when a schedule happens then, but we ignore this.
752 */ 1017 */
753static int 1018static int ecb_cold
754coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 1019coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
755{ 1020{
756 const char *s = MgPV_nolen_const (mg); 1021 const char *s = MgPV_nolen_const (mg);
757 1022
758 if (*s == '_') 1023 if (*s == '_')
759 { 1024 {
760 SV **svp = 0; 1025 SV **svp = 0;
761 1026
762 if (strEQ (s, "__DIE__" )) svp = &PL_diehook; 1027 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
763 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 1028 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
764 1029
765 if (svp) 1030 if (svp)
766 { 1031 {
767 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);
768 return 0; 1042 return 0;
769 } 1043 }
770 } 1044 }
771 1045
772 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 1046 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
773} 1047}
774 1048
775static int 1049static int ecb_cold
776coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1050coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
777{ 1051{
778 const char *s = MgPV_nolen_const (mg); 1052 const char *s = MgPV_nolen_const (mg);
779 1053
780 if (*s == '_') 1054 if (*s == '_')
… …
794 } 1068 }
795 1069
796 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0; 1070 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
797} 1071}
798 1072
799static int 1073static int ecb_cold
800coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1074coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
801{ 1075{
802 const char *s = MgPV_nolen_const (mg); 1076 const char *s = MgPV_nolen_const (mg);
803 1077
804 if (*s == '_') 1078 if (*s == '_')
… …
809 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 1083 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
810 1084
811 if (svp) 1085 if (svp)
812 { 1086 {
813 SV *old = *svp; 1087 SV *old = *svp;
814 *svp = newSVsv (sv); 1088 *svp = SvOK (sv) ? newSVsv (sv) : 0;
815 SvREFCNT_dec (old); 1089 SvREFCNT_dec (old);
816 return 0; 1090 return 0;
817 } 1091 }
818 } 1092 }
819 1093
… …
831slf_check_nop (pTHX_ struct CoroSLF *frame) 1105slf_check_nop (pTHX_ struct CoroSLF *frame)
832{ 1106{
833 return 0; 1107 return 0;
834} 1108}
835 1109
836static UNOP coro_setup_op; 1110static int
1111slf_check_repeat (pTHX_ struct CoroSLF *frame)
1112{
1113 return 1;
1114}
837 1115
838static 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 */
839coro_setup (pTHX_ struct coro *coro) 1119init_perl (pTHX_ struct coro *coro)
840{ 1120{
841 /* 1121 /*
842 * emulate part of the perl startup here. 1122 * emulate part of the perl startup here.
843 */ 1123 */
844 coro_init_stacks (aTHX); 1124 coro_init_stacks (aTHX);
845 1125
846 PL_runops = RUNOPS_DEFAULT; 1126 PL_runops = RUNOPS_DEFAULT;
847 PL_curcop = &PL_compiling; 1127 PL_curcop = &PL_compiling;
848 PL_in_eval = EVAL_NULL; 1128 PL_in_eval = EVAL_NULL;
849 PL_comppad = 0; 1129 PL_comppad = 0;
1130 PL_comppad_name = 0;
1131 PL_comppad_name_fill = 0;
1132 PL_comppad_name_floor = 0;
850 PL_curpm = 0; 1133 PL_curpm = 0;
851 PL_curpad = 0; 1134 PL_curpad = 0;
852 PL_localizing = 0; 1135 PL_localizing = 0;
853 PL_dirty = 0;
854 PL_restartop = 0; 1136 PL_restartop = 0;
855#if PERL_VERSION_ATLEAST (5,10,0) 1137#if PERL_VERSION_ATLEAST (5,10,0)
856 PL_parser = 0; 1138 PL_parser = 0;
857#endif 1139#endif
1140 PL_hints = 0;
858 1141
859 /* recreate the die/warn hooks */ 1142 /* recreate the die/warn hooks */
860 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1143 PL_diehook = SvREFCNT_inc (rv_diehook);
861 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1144 PL_warnhook = SvREFCNT_inc (rv_warnhook);
862 1145
863 GvSV (PL_defgv) = newSV (0); 1146 GvSV (PL_defgv) = newSV (0);
864 GvAV (PL_defgv) = coro->args; coro->args = 0; 1147 GvAV (PL_defgv) = coro->args; coro->args = 0;
865 GvSV (PL_errgv) = newSV (0); 1148 GvSV (PL_errgv) = newSV (0);
866 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;
867 PL_rs = newSVsv (GvSV (irsgv)); 1151 PL_rs = newSVsv (GvSV (irsgv));
868 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1152 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
869 1153
870 { 1154 {
871 dSP; 1155 dSP;
872 UNOP myop; 1156 UNOP myop;
873 1157
874 Zero (&myop, 1, UNOP); 1158 Zero (&myop, 1, UNOP);
875 myop.op_next = Nullop; 1159 myop.op_next = Nullop;
1160 myop.op_type = OP_ENTERSUB;
876 myop.op_flags = OPf_WANT_VOID; 1161 myop.op_flags = OPf_WANT_VOID;
877 1162
878 PUSHMARK (SP); 1163 PUSHMARK (SP);
879 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv)))); 1164 PUSHs ((SV *)coro->startcv);
880 PUTBACK; 1165 PUTBACK;
881 PL_op = (OP *)&myop; 1166 PL_op = (OP *)&myop;
882 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 1167 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
883 SPAGAIN;
884 } 1168 }
885 1169
886 /* 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
887 * 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.
888 */ 1172 */
889 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 */
890 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;
891 1176
892 /* 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 */
893 coro_setup_op.op_next = PL_op; 1178 init_perl_op.op_next = PL_op;
894 coro_setup_op.op_type = OP_CUSTOM; 1179 init_perl_op.op_type = OP_ENTERSUB;
895 coro_setup_op.op_ppaddr = pp_slf; 1180 init_perl_op.op_ppaddr = pp_slf;
896 /* no flags required, as an init function won't be called */ 1181 /* no flags etc. required, as an init function won't be called */
897 1182
898 PL_op = (OP *)&coro_setup_op; 1183 PL_op = (OP *)&init_perl_op;
899 1184
900 /* copy throw, in case it was set before coro_setup */ 1185 /* copy throw, in case it was set before init_perl */
901 CORO_THROW = coro->except; 1186 CORO_THROW = coro->except;
902}
903 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
904static void 1197static void
905coro_destruct (pTHX_ struct coro *coro) 1198coro_unwind_stacks (pTHX)
906{ 1199{
907 if (!IN_DESTRUCT) 1200 if (!IN_DESTRUCT)
908 { 1201 {
909 /* restore all saved variables and stuff */ 1202 /* restore all saved variables and stuff */
910 LEAVE_SCOPE (0); 1203 LEAVE_SCOPE (0);
… …
918 POPSTACK_TO (PL_mainstack); 1211 POPSTACK_TO (PL_mainstack);
919 1212
920 /* unwind main stack */ 1213 /* unwind main stack */
921 dounwind (-1); 1214 dounwind (-1);
922 } 1215 }
1216}
923 1217
924 SvREFCNT_dec (GvSV (PL_defgv)); 1218static void
925 SvREFCNT_dec (GvAV (PL_defgv)); 1219destroy_perl (pTHX_ struct coro *coro)
926 SvREFCNT_dec (GvSV (PL_errgv)); 1220{
927 SvREFCNT_dec (PL_defoutgv); 1221 SV *svf [9];
928 SvREFCNT_dec (PL_rs);
929 SvREFCNT_dec (GvSV (irsgv));
930 1222
931 SvREFCNT_dec (PL_diehook);
932 SvREFCNT_dec (PL_warnhook);
933 1223 {
934 SvREFCNT_dec (CORO_THROW); 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
935 SvREFCNT_dec (coro->saved_deffh); 1266 SvREFCNT_dec (coro->saved_deffh);
936 SvREFCNT_dec (coro->rouse_cb); 1267 SvREFCNT_dec (coro->rouse_cb);
937 1268 SvREFCNT_dec (coro->invoke_cb);
938 coro_destruct_stacks (aTHX); 1269 SvREFCNT_dec (coro->invoke_av);
1270 }
939} 1271}
940 1272
941INLINE void 1273ecb_inline void
942free_coro_mortal (pTHX) 1274free_coro_mortal (pTHX)
943{ 1275{
944 if (expect_true (coro_mortal)) 1276 if (ecb_expect_true (coro_mortal))
945 { 1277 {
946 SvREFCNT_dec (coro_mortal); 1278 SvREFCNT_dec ((SV *)coro_mortal);
947 coro_mortal = 0; 1279 coro_mortal = 0;
948 } 1280 }
949} 1281}
950 1282
951static int 1283static int
952runops_trace (pTHX) 1284runops_trace (pTHX)
953{ 1285{
954 COP *oldcop = 0; 1286 COP *oldcop = 0;
955 int oldcxix = -2; 1287 int oldcxix = -2;
956 struct coro *coro = SvSTATE_current; /* trace cctx is tied to specific coro */
957 coro_cctx *cctx = coro->cctx;
958 1288
959 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX))) 1289 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX)))
960 { 1290 {
961 PERL_ASYNC_CHECK (); 1291 PERL_ASYNC_CHECK ();
962 1292
963 if (cctx->flags & CC_TRACE_ALL) 1293 if (cctx_current->flags & CC_TRACE_ALL)
964 { 1294 {
965 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)
966 { 1296 {
967 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1297 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
968 SV **bot, **top; 1298 SV **bot, **top;
969 AV *av = newAV (); /* return values */ 1299 AV *av = newAV (); /* return values */
970 SV **cb; 1300 SV **cb;
… …
1007 1337
1008 if (PL_curcop != &PL_compiling) 1338 if (PL_curcop != &PL_compiling)
1009 { 1339 {
1010 SV **cb; 1340 SV **cb;
1011 1341
1012 if (oldcxix != cxstack_ix && cctx->flags & CC_TRACE_SUB) 1342 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB)
1013 { 1343 {
1014 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1344 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1015 1345
1016 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1346 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1017 { 1347 {
1018 runops_proc_t old_runops = PL_runops;
1019 dSP; 1348 dSP;
1020 GV *gv = CvGV (cx->blk_sub.cv); 1349 GV *gv = CvGV (cx->blk_sub.cv);
1021 SV *fullname = sv_2mortal (newSV (0)); 1350 SV *fullname = sv_2mortal (newSV (0));
1022 1351
1023 if (isGV (gv)) 1352 if (isGV (gv))
… …
1041 } 1370 }
1042 1371
1043 oldcxix = cxstack_ix; 1372 oldcxix = cxstack_ix;
1044 } 1373 }
1045 1374
1046 if (cctx->flags & CC_TRACE_LINE) 1375 if (cctx_current->flags & CC_TRACE_LINE)
1047 { 1376 {
1048 dSP; 1377 dSP;
1049 1378
1050 PL_runops = RUNOPS_DEFAULT; 1379 PL_runops = RUNOPS_DEFAULT;
1051 ENTER; 1380 ENTER;
… …
1070 1399
1071 TAINT_NOT; 1400 TAINT_NOT;
1072 return 0; 1401 return 0;
1073} 1402}
1074 1403
1075static struct coro_cctx *cctx_ssl_cctx;
1076static struct CoroSLF cctx_ssl_frame; 1404static struct CoroSLF cctx_ssl_frame;
1077 1405
1078static void 1406static void
1079slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta) 1407slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta)
1080{ 1408{
1081 ta->prev = (struct coro *)cctx_ssl_cctx;
1082 ta->next = 0; 1409 ta->prev = 0;
1083} 1410}
1084 1411
1085static int 1412static int
1086slf_check_set_stacklevel (pTHX_ struct CoroSLF *frame) 1413slf_check_set_stacklevel (pTHX_ struct CoroSLF *frame)
1087{ 1414{
… …
1089 1416
1090 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 */
1091} 1418}
1092 1419
1093/* 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 */
1094static void NOINLINE 1421static void ecb_noinline
1095cctx_prepare (pTHX_ coro_cctx *cctx) 1422cctx_prepare (pTHX)
1096{ 1423{
1097 PL_top_env = &PL_start_env; 1424 PL_top_env = &PL_start_env;
1098 1425
1099 if (cctx->flags & CC_TRACE) 1426 if (cctx_current->flags & CC_TRACE)
1100 PL_runops = runops_trace; 1427 PL_runops = runops_trace;
1101 1428
1102 /* 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
1103 * that can lead to creation of a new cctx */ 1430 * that can lead to creation of a new cctx */
1104 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)",
1105 slf_frame.prepare && PL_op->op_ppaddr == pp_slf)); 1432 slf_frame.prepare && PL_op->op_ppaddr == pp_slf));
1106 1433
1107 /* 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 */
1108 cctx_ssl_cctx = cctx;
1109 cctx_ssl_frame = slf_frame; 1435 cctx_ssl_frame = slf_frame;
1110 1436
1111 slf_frame.prepare = slf_prepare_set_stacklevel; 1437 slf_frame.prepare = slf_prepare_set_stacklevel;
1112 slf_frame.check = slf_check_set_stacklevel; 1438 slf_frame.check = slf_check_set_stacklevel;
1113} 1439}
1114 1440
1115/* 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 */
1116INLINE void 1442ecb_inline void
1117transfer_tail (pTHX) 1443transfer_tail (pTHX)
1118{ 1444{
1119 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);
1120} 1458}
1121 1459
1122/* 1460/*
1123 * this is a _very_ stripped down perl interpreter ;) 1461 * this is a _very_ stripped down perl interpreter ;)
1124 */ 1462 */
… …
1136 /* normally we would need to skip the entersub here */ 1474 /* normally we would need to skip the entersub here */
1137 /* 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 */
1138 /* PL_nop = PL_nop->op_next */ 1476 /* PL_nop = PL_nop->op_next */
1139 1477
1140 /* inject a fake subroutine call to cctx_init */ 1478 /* inject a fake subroutine call to cctx_init */
1141 cctx_prepare (aTHX_ (coro_cctx *)arg); 1479 cctx_prepare (aTHX);
1142 1480
1143 /* cctx_run is the alternative tail of transfer() */ 1481 /* cctx_run is the alternative tail of transfer() */
1144 transfer_tail (aTHX); 1482 transfer_tail (aTHX);
1145 1483
1146 /* 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 */
1147 PL_restartop = PL_op; 1485 PL_restartop = PL_op;
1148 perl_run (PL_curinterp); 1486 perl_run (PL_curinterp);
1487 /*
1488 * Unfortunately, there is no way to get at the return values of the
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.
1491 */
1149 1492
1150 /* 1493 /*
1151 * 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
1152 * 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)
1153 * 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
1154 * bootstrap-time "top" top_env, as we cannot restore the "main" 1497 * doing in that case. YMMV.
1155 * coroutine as Coro has no such concept
1156 */ 1498 */
1157 PL_top_env = main_top_env; 1499 perlish_exit (aTHX);
1158 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1159 } 1500 }
1160} 1501}
1161 1502
1162static coro_cctx * 1503static coro_cctx *
1163cctx_new () 1504cctx_new (void)
1164{ 1505{
1165 coro_cctx *cctx; 1506 coro_cctx *cctx;
1166 1507
1167 ++cctx_count; 1508 ++cctx_count;
1168 New (0, cctx, 1, coro_cctx); 1509 New (0, cctx, 1, coro_cctx);
… …
1174 return cctx; 1515 return cctx;
1175} 1516}
1176 1517
1177/* create a new cctx only suitable as source */ 1518/* create a new cctx only suitable as source */
1178static coro_cctx * 1519static coro_cctx *
1179cctx_new_empty () 1520cctx_new_empty (void)
1180{ 1521{
1181 coro_cctx *cctx = cctx_new (); 1522 coro_cctx *cctx = cctx_new ();
1182 1523
1183 cctx->sptr = 0; 1524 cctx->sptr = 0;
1184 coro_create (&cctx->cctx, 0, 0, 0, 0); 1525 coro_create (&cctx->cctx, 0, 0, 0, 0);
… …
1186 return cctx; 1527 return cctx;
1187} 1528}
1188 1529
1189/* create a new cctx suitable as destination/running a perl interpreter */ 1530/* create a new cctx suitable as destination/running a perl interpreter */
1190static coro_cctx * 1531static coro_cctx *
1191cctx_new_run () 1532cctx_new_run (void)
1192{ 1533{
1193 coro_cctx *cctx = cctx_new (); 1534 coro_cctx *cctx = cctx_new ();
1194 void *stack_start; 1535 void *stack_start;
1195 size_t stack_size; 1536 size_t stack_size;
1196 1537
1538#if CORO_FIBER
1539
1540 cctx->ssize = cctx_stacksize * sizeof (long);
1541 cctx->sptr = 0;
1542
1543#else
1544
1197#if HAVE_MMAP 1545 #if HAVE_MMAP
1198 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE; 1546 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1199 /* mmap supposedly does allocate-on-write for us */ 1547 /* mmap supposedly does allocate-on-write for us */
1200 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0); 1548 cctx->sptr = mmap (0, cctx->ssize, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_ANONYMOUS, -1, 0);
1201 1549
1202 if (cctx->sptr != (void *)-1) 1550 if (cctx->sptr != (void *)-1)
1203 { 1551 {
1204 #if CORO_STACKGUARD 1552 #if CORO_STACKGUARD
1205 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE); 1553 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
1206 #endif 1554 #endif
1207 stack_start = (char *)cctx->sptr + CORO_STACKGUARD * PAGESIZE; 1555 stack_start = (char *)cctx->sptr + CORO_STACKGUARD * PAGESIZE;
1208 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE; 1556 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
1209 cctx->flags |= CC_MAPPED; 1557 cctx->flags |= CC_MAPPED;
1210 } 1558 }
1211 else 1559 else
1212#endif 1560 #endif
1213 { 1561 {
1214 cctx->ssize = cctx_stacksize * (long)sizeof (long); 1562 cctx->ssize = cctx_stacksize * (long)sizeof (long);
1215 New (0, cctx->sptr, cctx_stacksize, long); 1563 New (0, cctx->sptr, cctx_stacksize, long);
1216 1564
1217 if (!cctx->sptr) 1565 if (!cctx->sptr)
1218 { 1566 {
1219 perror ("FATAL: unable to allocate stack for coroutine, exiting."); 1567 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1220 _exit (EXIT_FAILURE); 1568 _exit (EXIT_FAILURE);
1221 } 1569 }
1222 1570
1223 stack_start = cctx->sptr; 1571 stack_start = cctx->sptr;
1224 stack_size = cctx->ssize; 1572 stack_size = cctx->ssize;
1225 } 1573 }
1574 #endif
1226 1575
1227 #if CORO_USE_VALGRIND 1576 #if CORO_USE_VALGRIND
1228 cctx->valgrind_id = VALGRIND_STACK_REGISTER ((char *)stack_start, (char *)stack_start + stack_size); 1577 cctx->valgrind_id = VALGRIND_STACK_REGISTER ((char *)stack_start, (char *)stack_start + stack_size);
1229 #endif 1578 #endif
1230 1579
… …
1236static void 1585static void
1237cctx_destroy (coro_cctx *cctx) 1586cctx_destroy (coro_cctx *cctx)
1238{ 1587{
1239 if (!cctx) 1588 if (!cctx)
1240 return; 1589 return;
1590
1591 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1241 1592
1242 --cctx_count; 1593 --cctx_count;
1243 coro_destroy (&cctx->cctx); 1594 coro_destroy (&cctx->cctx);
1244 1595
1245 /* coro_transfer creates new, empty cctx's */ 1596 /* coro_transfer creates new, empty cctx's */
… …
1264#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE)) 1615#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE))
1265 1616
1266static coro_cctx * 1617static coro_cctx *
1267cctx_get (pTHX) 1618cctx_get (pTHX)
1268{ 1619{
1269 while (expect_true (cctx_first)) 1620 while (ecb_expect_true (cctx_first))
1270 { 1621 {
1271 coro_cctx *cctx = cctx_first; 1622 coro_cctx *cctx = cctx_first;
1272 cctx_first = cctx->next; 1623 cctx_first = cctx->next;
1273 --cctx_idle; 1624 --cctx_idle;
1274 1625
1275 if (expect_true (!CCTX_EXPIRED (cctx))) 1626 if (ecb_expect_true (!CCTX_EXPIRED (cctx)))
1276 return cctx; 1627 return cctx;
1277 1628
1278 cctx_destroy (cctx); 1629 cctx_destroy (cctx);
1279 } 1630 }
1280 1631
… …
1285cctx_put (coro_cctx *cctx) 1636cctx_put (coro_cctx *cctx)
1286{ 1637{
1287 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1638 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr));
1288 1639
1289 /* free another cctx if overlimit */ 1640 /* free another cctx if overlimit */
1290 if (expect_false (cctx_idle >= cctx_max_idle)) 1641 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1291 { 1642 {
1292 coro_cctx *first = cctx_first; 1643 coro_cctx *first = cctx_first;
1293 cctx_first = first->next; 1644 cctx_first = first->next;
1294 --cctx_idle; 1645 --cctx_idle;
1295 1646
… …
1306static void 1657static void
1307transfer_check (pTHX_ struct coro *prev, struct coro *next) 1658transfer_check (pTHX_ struct coro *prev, struct coro *next)
1308{ 1659{
1309 /* TODO: throwing up here is considered harmful */ 1660 /* TODO: throwing up here is considered harmful */
1310 1661
1311 if (expect_true (prev != next)) 1662 if (ecb_expect_true (prev != next))
1312 { 1663 {
1313 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1664 if (ecb_expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1314 croak ("Coro::State::transfer called with non-running/new prev Coro::State, but can only transfer from running or new states,"); 1665 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1315 1666
1316 if (expect_false (next->flags & CF_RUNNING)) 1667 if (ecb_expect_false (next->flags & (CF_RUNNING | CF_ZOMBIE | CF_SUSPENDED)))
1317 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states,");
1318
1319 if (expect_false (next->flags & CF_DESTROYED))
1320 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states,"); 1668 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1321 1669
1322#if !PERL_VERSION_ATLEAST (5,10,0) 1670#if !PERL_VERSION_ATLEAST (5,10,0)
1323 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1671 if (ecb_expect_false (PL_lex_state != LEX_NOTPARSING))
1324 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,"); 1672 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1325#endif 1673#endif
1326 } 1674 }
1327} 1675}
1328 1676
1329/* always use the TRANSFER macro */ 1677/* always use the TRANSFER macro */
1330static void NOINLINE /* noinline so we have a fixed stackframe */ 1678static void ecb_noinline /* noinline so we have a fixed stackframe */
1331transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1679transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1332{ 1680{
1333 dSTACKLEVEL; 1681 dSTACKLEVEL;
1334 1682
1335 /* sometimes transfer is only called to set idle_sp */ 1683 /* sometimes transfer is only called to set idle_sp */
1336 if (expect_false (!next)) 1684 if (ecb_expect_false (!prev))
1337 { 1685 {
1338 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1686 cctx_current->idle_sp = STACKLEVEL;
1339 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1687 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1340 } 1688 }
1341 else if (expect_true (prev != next)) 1689 else if (ecb_expect_true (prev != next))
1342 { 1690 {
1343 coro_cctx *prev__cctx; 1691 coro_cctx *cctx_prev;
1344 1692
1345 if (expect_false (prev->flags & CF_NEW)) 1693 if (ecb_expect_false (prev->flags & CF_NEW))
1346 { 1694 {
1347 /* create a new empty/source context */ 1695 /* create a new empty/source context */
1348 prev->cctx = cctx_new_empty ();
1349 prev->flags &= ~CF_NEW; 1696 prev->flags &= ~CF_NEW;
1350 prev->flags |= CF_RUNNING; 1697 prev->flags |= CF_RUNNING;
1351 } 1698 }
1352 1699
1353 prev->flags &= ~CF_RUNNING; 1700 prev->flags &= ~CF_RUNNING;
1354 next->flags |= CF_RUNNING; 1701 next->flags |= CF_RUNNING;
1355 1702
1356 /* first get rid of the old state */ 1703 /* first get rid of the old state */
1357 save_perl (aTHX_ prev); 1704 save_perl (aTHX_ prev);
1358 1705
1359 if (expect_false (next->flags & CF_NEW)) 1706 if (ecb_expect_false (next->flags & CF_NEW))
1360 { 1707 {
1361 /* need to start coroutine */ 1708 /* need to start coroutine */
1362 next->flags &= ~CF_NEW; 1709 next->flags &= ~CF_NEW;
1363 /* setup coroutine call */ 1710 /* setup coroutine call */
1364 coro_setup (aTHX_ next); 1711 init_perl (aTHX_ next);
1365 } 1712 }
1366 else 1713 else
1367 load_perl (aTHX_ next); 1714 load_perl (aTHX_ next);
1368 1715
1369 prev__cctx = prev->cctx;
1370
1371 /* possibly untie and reuse the cctx */ 1716 /* possibly untie and reuse the cctx */
1372 if (expect_true ( 1717 if (ecb_expect_true (
1373 prev__cctx->idle_sp == STACKLEVEL 1718 cctx_current->idle_sp == STACKLEVEL
1374 && !(prev__cctx->flags & CC_TRACE) 1719 && !(cctx_current->flags & CC_TRACE)
1375 && !force_cctx 1720 && !force_cctx
1376 )) 1721 ))
1377 { 1722 {
1378 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1723 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */
1379 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == prev__cctx->idle_te)); 1724 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1380 1725
1381 prev->cctx = 0;
1382
1383 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */ 1726 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */
1384 /* without this the next cctx_get might destroy the prev__cctx while still in use */ 1727 /* without this the next cctx_get might destroy the running cctx while still in use */
1385 if (expect_false (CCTX_EXPIRED (prev__cctx))) 1728 if (ecb_expect_false (CCTX_EXPIRED (cctx_current)))
1386 if (!next->cctx) 1729 if (ecb_expect_true (!next->cctx))
1387 next->cctx = cctx_get (aTHX); 1730 next->cctx = cctx_get (aTHX);
1388 1731
1389 cctx_put (prev__cctx); 1732 cctx_put (cctx_current);
1390 } 1733 }
1734 else
1735 prev->cctx = cctx_current;
1391 1736
1392 ++next->usecount; 1737 ++next->usecount;
1393 1738
1394 if (expect_true (!next->cctx)) 1739 cctx_prev = cctx_current;
1395 next->cctx = cctx_get (aTHX); 1740 cctx_current = ecb_expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1396 1741
1397 if (expect_false (prev__cctx != next->cctx)) 1742 next->cctx = 0;
1743
1744 if (ecb_expect_false (cctx_prev != cctx_current))
1398 { 1745 {
1399 prev__cctx->top_env = PL_top_env; 1746 cctx_prev->top_env = PL_top_env;
1400 PL_top_env = next->cctx->top_env; 1747 PL_top_env = cctx_current->top_env;
1401 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1748 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1402 } 1749 }
1403 1750
1404 transfer_tail (aTHX); 1751 transfer_tail (aTHX);
1405 } 1752 }
1406} 1753}
… …
1408#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx)) 1755#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1409#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1756#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1410 1757
1411/** high level stuff ********************************************************/ 1758/** high level stuff ********************************************************/
1412 1759
1760/* this function is actually Coro, not Coro::State, but we call it from here */
1761/* because it is convenient - but it hasn't been declared yet for that reason */
1413static int 1762static void
1763coro_call_on_destroy (pTHX_ struct coro *coro);
1764
1765static void
1414coro_state_destroy (pTHX_ struct coro *coro) 1766coro_state_destroy (pTHX_ struct coro *coro)
1415{ 1767{
1416 if (coro->flags & CF_DESTROYED) 1768 if (coro->flags & CF_ZOMBIE)
1417 return 0; 1769 return;
1418 1770
1419 if (coro->on_destroy)
1420 coro->on_destroy (aTHX_ coro); 1771 slf_destroy (aTHX_ coro);
1421 1772
1422 coro->flags |= CF_DESTROYED; 1773 coro->flags |= CF_ZOMBIE;
1423 1774
1424 if (coro->flags & CF_READY) 1775 if (coro->flags & CF_READY)
1425 { 1776 {
1426 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1777 /* reduce nready, as destroying a ready coro effectively unreadies it */
1427 /* alternative: look through all ready queues and remove the coro */ 1778 /* alternative: look through all ready queues and remove the coro */
1428 --coro_nready; 1779 --coro_nready;
1429 } 1780 }
1430 else 1781 else
1431 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1782 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1432 1783
1433 if (coro->mainstack && coro->mainstack != main_mainstack) 1784 if (coro->next) coro->next->prev = coro->prev;
1434 { 1785 if (coro->prev) coro->prev->next = coro->next;
1435 struct coro temp; 1786 if (coro == coro_first) coro_first = coro->next;
1436 1787
1437 assert (("FATAL: tried to destroy currently running coroutine (please report)", !(coro->flags & CF_RUNNING))); 1788 if (coro->mainstack
1438 1789 && coro->mainstack != main_mainstack
1439 save_perl (aTHX_ &temp); 1790 && coro->slot
1791 && !PL_dirty)
1440 load_perl (aTHX_ coro); 1792 destroy_perl (aTHX_ coro);
1441
1442 coro_destruct (aTHX_ coro);
1443
1444 load_perl (aTHX_ &temp);
1445
1446 coro->slot = 0;
1447 }
1448 1793
1449 cctx_destroy (coro->cctx); 1794 cctx_destroy (coro->cctx);
1450 SvREFCNT_dec (coro->startcv); 1795 SvREFCNT_dec (coro->startcv);
1451 SvREFCNT_dec (coro->args); 1796 SvREFCNT_dec (coro->args);
1797 SvREFCNT_dec (coro->swap_sv);
1798 SvREFCNT_dec (CORO_THROW);
1452 1799
1453 if (coro->next) coro->next->prev = coro->prev; 1800 coro_call_on_destroy (aTHX_ coro);
1454 if (coro->prev) coro->prev->next = coro->next;
1455 if (coro == coro_first) coro_first = coro->next;
1456 1801
1457 return 1; 1802 /* more destruction mayhem in coro_state_free */
1458} 1803}
1459 1804
1460static int 1805static int
1461coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1806coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1462{ 1807{
1463 struct coro *coro = (struct coro *)mg->mg_ptr; 1808 struct coro *coro = (struct coro *)mg->mg_ptr;
1464 mg->mg_ptr = 0; 1809 mg->mg_ptr = 0;
1465 1810
1466 coro->hv = 0;
1467
1468 if (--coro->refcnt < 0)
1469 {
1470 coro_state_destroy (aTHX_ coro); 1811 coro_state_destroy (aTHX_ coro);
1812 SvREFCNT_dec (coro->on_destroy);
1813 SvREFCNT_dec (coro->status);
1814
1471 Safefree (coro); 1815 Safefree (coro);
1472 }
1473 1816
1474 return 0; 1817 return 0;
1475} 1818}
1476 1819
1477static int 1820static int ecb_cold
1478coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1821coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1479{ 1822{
1480 struct coro *coro = (struct coro *)mg->mg_ptr; 1823 /* called when perl clones the current process the slow way (windows process emulation) */
1481 1824 /* WE SIMply nuke the pointers in the copy, causing perl to croak */
1482 ++coro->refcnt; 1825 mg->mg_ptr = 0;
1826 mg->mg_virtual = 0;
1483 1827
1484 return 0; 1828 return 0;
1485} 1829}
1486 1830
1487static MGVTBL coro_state_vtbl = { 1831static MGVTBL coro_state_vtbl = {
… …
1510 1854
1511 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1855 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1512 TRANSFER (ta, 1); 1856 TRANSFER (ta, 1);
1513} 1857}
1514 1858
1515/*****************************************************************************/
1516/* gensub: simple closure generation utility */
1517
1518#define GENSUB_ARG CvXSUBANY (cv).any_ptr
1519
1520/* create a closure from XS, returns a code reference */
1521/* the arg can be accessed via GENSUB_ARG from the callback */
1522/* the callback must use dXSARGS/XSRETURN */
1523static SV *
1524gensub (pTHX_ void (*xsub)(pTHX_ CV *), void *arg)
1525{
1526 CV *cv = (CV *)newSV (0);
1527
1528 sv_upgrade ((SV *)cv, SVt_PVCV);
1529
1530 CvANON_on (cv);
1531 CvISXSUB_on (cv);
1532 CvXSUB (cv) = xsub;
1533 GENSUB_ARG = arg;
1534
1535 return newRV_noinc ((SV *)cv);
1536}
1537
1538/** Coro ********************************************************************/ 1859/** Coro ********************************************************************/
1539 1860
1540INLINE void 1861ecb_inline void
1541coro_enq (pTHX_ struct coro *coro) 1862coro_enq (pTHX_ struct coro *coro)
1542{ 1863{
1543 av_push (coro_ready [coro->prio - PRIO_MIN], SvREFCNT_inc_NN (coro->hv)); 1864 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1544}
1545 1865
1546INLINE SV * 1866 SvREFCNT_inc_NN (coro->hv);
1867
1868 coro->next_ready = 0;
1869 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1870 ready [1] = coro;
1871}
1872
1873ecb_inline struct coro *
1547coro_deq (pTHX) 1874coro_deq (pTHX)
1548{ 1875{
1549 int prio; 1876 int prio;
1550 1877
1551 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; ) 1878 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
1552 if (AvFILLp (coro_ready [prio]) >= 0) 1879 {
1553 return av_shift (coro_ready [prio]); 1880 struct coro **ready = coro_ready [prio];
1881
1882 if (ready [0])
1883 {
1884 struct coro *coro = ready [0];
1885 ready [0] = coro->next_ready;
1886 return coro;
1887 }
1888 }
1554 1889
1555 return 0; 1890 return 0;
1891}
1892
1893static void
1894invoke_sv_ready_hook_helper (void)
1895{
1896 dTHX;
1897 dSP;
1898
1899 ENTER;
1900 SAVETMPS;
1901
1902 PUSHMARK (SP);
1903 PUTBACK;
1904 call_sv (coro_readyhook, G_VOID | G_DISCARD);
1905
1906 FREETMPS;
1907 LEAVE;
1556} 1908}
1557 1909
1558static int 1910static int
1559api_ready (pTHX_ SV *coro_sv) 1911api_ready (pTHX_ SV *coro_sv)
1560{ 1912{
1561 struct coro *coro;
1562 SV *sv_hook;
1563 void (*xs_hook)(void);
1564
1565 if (SvROK (coro_sv))
1566 coro_sv = SvRV (coro_sv);
1567
1568 coro = SvSTATE (coro_sv); 1913 struct coro *coro = SvSTATE (coro_sv);
1569 1914
1570 if (coro->flags & CF_READY) 1915 if (coro->flags & CF_READY)
1571 return 0; 1916 return 0;
1572 1917
1573 coro->flags |= CF_READY; 1918 coro->flags |= CF_READY;
1574 1919
1575 sv_hook = coro_nready ? 0 : coro_readyhook;
1576 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1577
1578 coro_enq (aTHX_ coro); 1920 coro_enq (aTHX_ coro);
1579 ++coro_nready;
1580 1921
1581 if (sv_hook) 1922 if (!coro_nready++)
1582 { 1923 if (coroapi.readyhook)
1583 dSP; 1924 coroapi.readyhook ();
1584
1585 ENTER;
1586 SAVETMPS;
1587
1588 PUSHMARK (SP);
1589 PUTBACK;
1590 call_sv (sv_hook, G_VOID | G_DISCARD);
1591
1592 FREETMPS;
1593 LEAVE;
1594 }
1595
1596 if (xs_hook)
1597 xs_hook ();
1598 1925
1599 return 1; 1926 return 1;
1600} 1927}
1601 1928
1602static int 1929static int
1603api_is_ready (pTHX_ SV *coro_sv) 1930api_is_ready (pTHX_ SV *coro_sv)
1604{ 1931{
1605 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1932 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1606} 1933}
1607 1934
1608INLINE void 1935/* expects to own a reference to next->hv */
1936ecb_inline void
1609prepare_schedule (pTHX_ struct coro_transfer_args *ta) 1937prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1610{ 1938{
1611 SV *prev_sv, *next_sv;
1612
1613 for (;;)
1614 {
1615 next_sv = coro_deq (aTHX);
1616
1617 /* nothing to schedule: call the idle handler */
1618 if (expect_false (!next_sv))
1619 {
1620 dSP;
1621
1622 ENTER;
1623 SAVETMPS;
1624
1625 PUSHMARK (SP);
1626 PUTBACK;
1627 call_sv (get_sv ("Coro::idle", FALSE), G_VOID | G_DISCARD);
1628
1629 FREETMPS;
1630 LEAVE;
1631 continue;
1632 }
1633
1634 ta->next = SvSTATE_hv (next_sv);
1635
1636 /* cannot transfer to destroyed coros, skip and look for next */
1637 if (expect_false (ta->next->flags & CF_DESTROYED))
1638 {
1639 SvREFCNT_dec (next_sv);
1640 /* coro_nready has already been taken care of by destroy */
1641 continue;
1642 }
1643
1644 --coro_nready;
1645 break;
1646 }
1647
1648 /* free this only after the transfer */
1649 prev_sv = SvRV (coro_current); 1939 SV *prev_sv = SvRV (coro_current);
1940
1650 ta->prev = SvSTATE_hv (prev_sv); 1941 ta->prev = SvSTATE_hv (prev_sv);
1942 ta->next = next;
1943
1651 TRANSFER_CHECK (*ta); 1944 TRANSFER_CHECK (*ta);
1652 assert (("FATAL: next coroutine isn't marked as ready in Coro (please report)", ta->next->flags & CF_READY)); 1945
1653 ta->next->flags &= ~CF_READY;
1654 SvRV_set (coro_current, next_sv); 1946 SvRV_set (coro_current, (SV *)next->hv);
1655 1947
1656 free_coro_mortal (aTHX); 1948 free_coro_mortal (aTHX);
1657 coro_mortal = prev_sv; 1949 coro_mortal = prev_sv;
1658} 1950}
1659 1951
1660INLINE void 1952static void
1953prepare_schedule (pTHX_ struct coro_transfer_args *ta)
1954{
1955 for (;;)
1956 {
1957 struct coro *next = coro_deq (aTHX);
1958
1959 if (ecb_expect_true (next))
1960 {
1961 /* cannot transfer to destroyed coros, skip and look for next */
1962 if (ecb_expect_false (next->flags & (CF_ZOMBIE | CF_SUSPENDED)))
1963 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1964 else
1965 {
1966 next->flags &= ~CF_READY;
1967 --coro_nready;
1968
1969 prepare_schedule_to (aTHX_ ta, next);
1970 break;
1971 }
1972 }
1973 else
1974 {
1975 /* nothing to schedule: call the idle handler */
1976 if (SvROK (sv_idle)
1977 && SvOBJECT (SvRV (sv_idle)))
1978 {
1979 if (SvRV (sv_idle) == SvRV (coro_current))
1980 croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught");
1981
1982 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1983 api_ready (aTHX_ SvRV (sv_idle));
1984 --coro_nready;
1985 }
1986 else
1987 {
1988 /* TODO: deprecated, remove, cannot work reliably *//*D*/
1989 dSP;
1990
1991 ENTER;
1992 SAVETMPS;
1993
1994 PUSHMARK (SP);
1995 PUTBACK;
1996 call_sv (sv_idle, G_VOID | G_DISCARD);
1997
1998 FREETMPS;
1999 LEAVE;
2000 }
2001 }
2002 }
2003}
2004
2005ecb_inline void
1661prepare_cede (pTHX_ struct coro_transfer_args *ta) 2006prepare_cede (pTHX_ struct coro_transfer_args *ta)
1662{ 2007{
1663 api_ready (aTHX_ coro_current); 2008 api_ready (aTHX_ coro_current);
1664 prepare_schedule (aTHX_ ta); 2009 prepare_schedule (aTHX_ ta);
1665} 2010}
1666 2011
1667INLINE void 2012ecb_inline void
1668prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 2013prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1669{ 2014{
1670 SV *prev = SvRV (coro_current); 2015 SV *prev = SvRV (coro_current);
1671 2016
1672 if (coro_nready) 2017 if (coro_nready)
… …
1685 2030
1686 prepare_schedule (aTHX_ &ta); 2031 prepare_schedule (aTHX_ &ta);
1687 TRANSFER (ta, 1); 2032 TRANSFER (ta, 1);
1688} 2033}
1689 2034
2035static void
2036api_schedule_to (pTHX_ SV *coro_sv)
2037{
2038 struct coro_transfer_args ta;
2039 struct coro *next = SvSTATE (coro_sv);
2040
2041 SvREFCNT_inc_NN (coro_sv);
2042 prepare_schedule_to (aTHX_ &ta, next);
2043}
2044
1690static int 2045static int
1691api_cede (pTHX) 2046api_cede (pTHX)
1692{ 2047{
1693 struct coro_transfer_args ta; 2048 struct coro_transfer_args ta;
1694 2049
1695 prepare_cede (aTHX_ &ta); 2050 prepare_cede (aTHX_ &ta);
1696 2051
1697 if (expect_true (ta.prev != ta.next)) 2052 if (ecb_expect_true (ta.prev != ta.next))
1698 { 2053 {
1699 TRANSFER (ta, 1); 2054 TRANSFER (ta, 1);
1700 return 1; 2055 return 1;
1701 } 2056 }
1702 else 2057 else
… …
1721static void 2076static void
1722api_trace (pTHX_ SV *coro_sv, int flags) 2077api_trace (pTHX_ SV *coro_sv, int flags)
1723{ 2078{
1724 struct coro *coro = SvSTATE (coro_sv); 2079 struct coro *coro = SvSTATE (coro_sv);
1725 2080
2081 if (coro->flags & CF_RUNNING)
2082 croak ("cannot enable tracing on a running coroutine, caught");
2083
1726 if (flags & CC_TRACE) 2084 if (flags & CC_TRACE)
1727 { 2085 {
1728 if (!coro->cctx) 2086 if (!coro->cctx)
1729 coro->cctx = cctx_new_run (); 2087 coro->cctx = cctx_new_run ();
1730 else if (!(coro->cctx->flags & CC_TRACE)) 2088 else if (!(coro->cctx->flags & CC_TRACE))
1731 croak ("cannot enable tracing on coroutine with custom stack,"); 2089 croak ("cannot enable tracing on coroutine with custom stack, caught");
1732 2090
1733 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL)); 2091 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL));
1734 } 2092 }
1735 else if (coro->cctx && coro->cctx->flags & CC_TRACE) 2093 else if (coro->cctx && coro->cctx->flags & CC_TRACE)
1736 { 2094 {
… …
1741 else 2099 else
1742 coro->slot->runops = RUNOPS_DEFAULT; 2100 coro->slot->runops = RUNOPS_DEFAULT;
1743 } 2101 }
1744} 2102}
1745 2103
2104static void
2105coro_push_av (pTHX_ AV *av, I32 gimme_v)
2106{
2107 if (AvFILLp (av) >= 0 && gimme_v != G_VOID)
2108 {
2109 dSP;
2110
2111 if (gimme_v == G_SCALAR)
2112 XPUSHs (AvARRAY (av)[AvFILLp (av)]);
2113 else
2114 {
2115 int i;
2116 EXTEND (SP, AvFILLp (av) + 1);
2117
2118 for (i = 0; i <= AvFILLp (av); ++i)
2119 PUSHs (AvARRAY (av)[i]);
2120 }
2121
2122 PUTBACK;
2123 }
2124}
2125
2126static void
2127coro_push_on_destroy (pTHX_ struct coro *coro, SV *cb)
2128{
2129 if (!coro->on_destroy)
2130 coro->on_destroy = newAV ();
2131
2132 av_push (coro->on_destroy, cb);
2133}
2134
2135static void
2136slf_destroy_join (pTHX_ struct CoroSLF *frame)
2137{
2138 SvREFCNT_dec ((SV *)((struct coro *)frame->data)->hv);
2139}
2140
2141static int
2142slf_check_join (pTHX_ struct CoroSLF *frame)
2143{
2144 struct coro *coro = (struct coro *)frame->data;
2145
2146 if (!coro->status)
2147 return 1;
2148
2149 frame->destroy = 0;
2150
2151 coro_push_av (aTHX_ coro->status, GIMME_V);
2152
2153 SvREFCNT_dec ((SV *)coro->hv);
2154
2155 return 0;
2156}
2157
2158static void
2159slf_init_join (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2160{
2161 struct coro *coro = SvSTATE (items > 0 ? arg [0] : &PL_sv_undef);
2162
2163 if (items > 1)
2164 croak ("join called with too many arguments");
2165
2166 if (coro->status)
2167 frame->prepare = prepare_nop;
2168 else
2169 {
2170 coro_push_on_destroy (aTHX_ coro, SvREFCNT_inc_NN (SvRV (coro_current)));
2171 frame->prepare = prepare_schedule;
2172 }
2173
2174 frame->check = slf_check_join;
2175 frame->destroy = slf_destroy_join;
2176 frame->data = (void *)coro;
2177 SvREFCNT_inc (coro->hv);
2178}
2179
2180static void
2181coro_call_on_destroy (pTHX_ struct coro *coro)
2182{
2183 AV *od = coro->on_destroy;
2184
2185 if (!od)
2186 return;
2187
2188 while (AvFILLp (od) >= 0)
2189 {
2190 SV *cb = sv_2mortal (av_pop (od));
2191
2192 /* coro hv's (and only hv's at the moment) are supported as well */
2193 if (SvSTATEhv_p (aTHX_ cb))
2194 api_ready (aTHX_ cb);
2195 else
2196 {
2197 dSP; /* don't disturb outer sp */
2198 PUSHMARK (SP);
2199
2200 if (coro->status)
2201 {
2202 PUTBACK;
2203 coro_push_av (aTHX_ coro->status, G_ARRAY);
2204 SPAGAIN;
2205 }
2206
2207 PUTBACK;
2208 call_sv (cb, G_VOID | G_DISCARD);
2209 }
2210 }
2211}
2212
2213static void
2214coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
2215{
2216 AV *av;
2217
2218 if (coro->status)
2219 {
2220 av = coro->status;
2221 av_clear (av);
2222 }
2223 else
2224 av = coro->status = newAV ();
2225
2226 /* items are actually not so common, so optimise for this case */
2227 if (items)
2228 {
2229 int i;
2230
2231 av_extend (av, items - 1);
2232
2233 for (i = 0; i < items; ++i)
2234 av_push (av, SvREFCNT_inc_NN (arg [i]));
2235 }
2236}
2237
2238static void
2239slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2240{
2241 av_push (av_destroy, (SV *)newRV_inc ((SV *)coro_hv)); /* RVinc for perl */
2242 api_ready (aTHX_ sv_manager);
2243
2244 frame->prepare = prepare_schedule;
2245 frame->check = slf_check_repeat;
2246
2247 /* as a minor optimisation, we could unwind all stacks here */
2248 /* but that puts extra pressure on pp_slf, and is not worth much */
2249 /*coro_unwind_stacks (aTHX);*/
2250}
2251
2252static void
2253slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2254{
2255 HV *coro_hv = (HV *)SvRV (coro_current);
2256
2257 coro_set_status (aTHX_ SvSTATE ((SV *)coro_hv), arg, items);
2258 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2259}
2260
2261static void
2262slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2263{
2264 HV *coro_hv;
2265 struct coro *coro;
2266
2267 if (items <= 0)
2268 croak ("Coro::cancel called without coro object,");
2269
2270 coro = SvSTATE (arg [0]);
2271 coro_hv = coro->hv;
2272
2273 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2274
2275 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2276 {
2277 /* coro currently busy cancelling something, so just notify it */
2278 coro->slf_frame.data = (void *)coro;
2279
2280 frame->prepare = prepare_nop;
2281 frame->check = slf_check_nop;
2282 }
2283 else if (coro_hv == (HV *)SvRV (coro_current))
2284 {
2285 /* cancelling the current coro is allowed, and equals terminate */
2286 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2287 }
2288 else
2289 {
2290 struct coro *self = SvSTATE_current;
2291
2292 /* otherwise we cancel directly, purely for speed reasons
2293 * unfortunately, this requires some magic trickery, as
2294 * somebody else could cancel us, so we have to fight the cancellation.
2295 * this is ugly, and hopefully fully worth the extra speed.
2296 * besides, I can't get the slow-but-safe version working...
2297 */
2298 slf_frame.data = 0;
2299 self->flags |= CF_NOCANCEL;
2300 coro_state_destroy (aTHX_ coro);
2301 self->flags &= ~CF_NOCANCEL;
2302
2303 if (slf_frame.data)
2304 {
2305 /* while we were busy we have been cancelled, so terminate */
2306 slf_init_terminate_cancel_common (aTHX_ frame, self->hv);
2307 }
2308 else
2309 {
2310 frame->prepare = prepare_nop;
2311 frame->check = slf_check_nop;
2312 }
2313 }
2314}
2315
2316static int
2317slf_check_safe_cancel (pTHX_ struct CoroSLF *frame)
2318{
2319 frame->prepare = 0;
2320 coro_unwind_stacks (aTHX);
2321
2322 slf_init_terminate_cancel_common (aTHX_ frame, (HV *)SvRV (coro_current));
2323
2324 return 1;
2325}
2326
2327static int
2328safe_cancel (pTHX_ struct coro *coro, SV **arg, int items)
2329{
2330 if (coro->cctx)
2331 croak ("coro inside C callback, unable to cancel at this time, caught");
2332
2333 if (coro->flags & CF_NEW)
2334 {
2335 coro_set_status (aTHX_ coro, arg, items);
2336 coro_state_destroy (aTHX_ coro);
2337 }
2338 else
2339 {
2340 if (!coro->slf_frame.prepare)
2341 croak ("coro outside an SLF function, unable to cancel at this time, caught");
2342
2343 slf_destroy (aTHX_ coro);
2344
2345 coro_set_status (aTHX_ coro, arg, items);
2346 coro->slf_frame.prepare = prepare_nop;
2347 coro->slf_frame.check = slf_check_safe_cancel;
2348
2349 api_ready (aTHX_ (SV *)coro->hv);
2350 }
2351
2352 return 1;
2353}
2354
2355/*****************************************************************************/
2356/* async pool handler */
2357
2358static int
2359slf_check_pool_handler (pTHX_ struct CoroSLF *frame)
2360{
2361 HV *hv = (HV *)SvRV (coro_current);
2362 struct coro *coro = (struct coro *)frame->data;
2363
2364 if (!coro->invoke_cb)
2365 return 1; /* loop till we have invoke */
2366 else
2367 {
2368 hv_store (hv, "desc", sizeof ("desc") - 1,
2369 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
2370
2371 coro->saved_deffh = SvREFCNT_inc_NN ((SV *)PL_defoutgv);
2372
2373 {
2374 dSP;
2375 XPUSHs (sv_2mortal (coro->invoke_cb)); coro->invoke_cb = 0;
2376 PUTBACK;
2377 }
2378
2379 SvREFCNT_dec (GvAV (PL_defgv));
2380 GvAV (PL_defgv) = coro->invoke_av;
2381 coro->invoke_av = 0;
2382
2383 return 0;
2384 }
2385}
2386
2387static void
2388slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2389{
2390 HV *hv = (HV *)SvRV (coro_current);
2391 struct coro *coro = SvSTATE_hv ((SV *)hv);
2392
2393 if (ecb_expect_true (coro->saved_deffh))
2394 {
2395 /* subsequent iteration */
2396 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
2397 coro->saved_deffh = 0;
2398
2399 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
2400 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
2401 {
2402 slf_init_terminate_cancel_common (aTHX_ frame, hv);
2403 return;
2404 }
2405 else
2406 {
2407 av_clear (GvAV (PL_defgv));
2408 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
2409
2410 coro->prio = 0;
2411
2412 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
2413 api_trace (aTHX_ coro_current, 0);
2414
2415 frame->prepare = prepare_schedule;
2416 av_push (av_async_pool, SvREFCNT_inc (hv));
2417 }
2418 }
2419 else
2420 {
2421 /* first iteration, simply fall through */
2422 frame->prepare = prepare_nop;
2423 }
2424
2425 frame->check = slf_check_pool_handler;
2426 frame->data = (void *)coro;
2427}
2428
1746/*****************************************************************************/ 2429/*****************************************************************************/
1747/* rouse callback */ 2430/* rouse callback */
1748 2431
1749#define CORO_MAGIC_type_rouse PERL_MAGIC_ext 2432#define CORO_MAGIC_type_rouse PERL_MAGIC_ext
1750 2433
1751static void 2434static void
1752coro_rouse_callback (pTHX_ CV *cv) 2435coro_rouse_callback (pTHX_ CV *cv)
1753{ 2436{
1754 dXSARGS; 2437 dXSARGS;
1755 SV *data = (SV *)GENSUB_ARG; 2438 SV *data = (SV *)S_GENSUB_ARG;
1756 2439
1757 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2440 if (SvTYPE (SvRV (data)) != SVt_PVAV)
1758 { 2441 {
1759 /* first call, set args */ 2442 /* first call, set args */
1760 int i; 2443 SV *coro = SvRV (data);
1761 AV *av = newAV (); 2444 AV *av = newAV ();
1762 SV *coro = SvRV (data);
1763 2445
1764 SvRV_set (data, (SV *)av); 2446 SvRV_set (data, (SV *)av);
1765 api_ready (aTHX_ coro);
1766 SvREFCNT_dec (coro);
1767 2447
1768 /* better take a full copy of the arguments */ 2448 /* better take a full copy of the arguments */
1769 while (items--) 2449 while (items--)
1770 av_store (av, items, newSVsv (ST (items))); 2450 av_store (av, items, newSVsv (ST (items)));
2451
2452 api_ready (aTHX_ coro);
2453 SvREFCNT_dec (coro);
1771 } 2454 }
1772 2455
1773 XSRETURN_EMPTY; 2456 XSRETURN_EMPTY;
1774} 2457}
1775 2458
1776static int 2459static int
1777slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2460slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
1778{ 2461{
1779 SV *data = (SV *)frame->data; 2462 SV *data = (SV *)frame->data;
1780 2463
1781 if (CORO_THROW) 2464 if (CORO_THROW)
1782 return 0; 2465 return 0;
1783 2466
1784 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2467 if (SvTYPE (SvRV (data)) != SVt_PVAV)
1785 return 1; 2468 return 1;
… …
1792 2475
1793 EXTEND (SP, AvFILLp (av) + 1); 2476 EXTEND (SP, AvFILLp (av) + 1);
1794 for (i = 0; i <= AvFILLp (av); ++i) 2477 for (i = 0; i <= AvFILLp (av); ++i)
1795 PUSHs (sv_2mortal (AvARRAY (av)[i])); 2478 PUSHs (sv_2mortal (AvARRAY (av)[i]));
1796 2479
1797 /* we have stolen the elements, so ste length to zero and free */ 2480 /* we have stolen the elements, so set length to zero and free */
1798 AvFILLp (av) = -1; 2481 AvFILLp (av) = -1;
1799 av_undef (av); 2482 av_undef (av);
1800 2483
1801 PUTBACK; 2484 PUTBACK;
1802 } 2485 }
… …
1821 cb = sv_2mortal (coro->rouse_cb); 2504 cb = sv_2mortal (coro->rouse_cb);
1822 coro->rouse_cb = 0; 2505 coro->rouse_cb = 0;
1823 } 2506 }
1824 2507
1825 if (!SvROK (cb) 2508 if (!SvROK (cb)
1826 || SvTYPE (SvRV (cb)) != SVt_PVCV 2509 || SvTYPE (SvRV (cb)) != SVt_PVCV
1827 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2510 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
1828 croak ("Coro::rouse_wait called with illegal callback argument,"); 2511 croak ("Coro::rouse_wait called with illegal callback argument,");
1829 2512
1830 { 2513 {
1831 CV *cv = (CV *)SvRV (cb); /* for GENSUB_ARG */ 2514 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
1832 SV *data = (SV *)GENSUB_ARG; 2515 SV *data = (SV *)S_GENSUB_ARG;
1833 2516
1834 frame->data = (void *)data; 2517 frame->data = (void *)data;
1835 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule; 2518 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
1836 frame->check = slf_check_rouse_wait; 2519 frame->check = slf_check_rouse_wait;
1837 } 2520 }
… …
1841coro_new_rouse_cb (pTHX) 2524coro_new_rouse_cb (pTHX)
1842{ 2525{
1843 HV *hv = (HV *)SvRV (coro_current); 2526 HV *hv = (HV *)SvRV (coro_current);
1844 struct coro *coro = SvSTATE_hv (hv); 2527 struct coro *coro = SvSTATE_hv (hv);
1845 SV *data = newRV_inc ((SV *)hv); 2528 SV *data = newRV_inc ((SV *)hv);
1846 SV *cb = gensub (aTHX_ coro_rouse_callback, (void *)data); 2529 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
1847 2530
1848 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0); 2531 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0);
1849 SvREFCNT_dec (data); /* magicext increases the refcount */ 2532 SvREFCNT_dec (data); /* magicext increases the refcount */
1850 2533
1851 SvREFCNT_dec (coro->rouse_cb); 2534 SvREFCNT_dec (coro->rouse_cb);
… …
1909 frame->prepare = prepare_schedule; 2592 frame->prepare = prepare_schedule;
1910 frame->check = slf_check_nop; 2593 frame->check = slf_check_nop;
1911} 2594}
1912 2595
1913static void 2596static void
2597slf_prepare_schedule_to (pTHX_ struct coro_transfer_args *ta)
2598{
2599 struct coro *next = (struct coro *)slf_frame.data;
2600
2601 SvREFCNT_inc_NN (next->hv);
2602 prepare_schedule_to (aTHX_ ta, next);
2603}
2604
2605static void
2606slf_init_schedule_to (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2607{
2608 if (!items)
2609 croak ("Coro::schedule_to expects a coroutine argument, caught");
2610
2611 frame->data = (void *)SvSTATE (arg [0]);
2612 frame->prepare = slf_prepare_schedule_to;
2613 frame->check = slf_check_nop;
2614}
2615
2616static void
2617slf_init_cede_to (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2618{
2619 api_ready (aTHX_ SvRV (coro_current));
2620
2621 slf_init_schedule_to (aTHX_ frame, cv, arg, items);
2622}
2623
2624static void
1914slf_init_cede (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2625slf_init_cede (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1915{ 2626{
1916 frame->prepare = prepare_cede; 2627 frame->prepare = prepare_cede;
1917 frame->check = slf_check_nop; 2628 frame->check = slf_check_nop;
1918} 2629}
… …
1920static void 2631static void
1921slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2632slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1922{ 2633{
1923 frame->prepare = prepare_cede_notself; 2634 frame->prepare = prepare_cede_notself;
1924 frame->check = slf_check_nop; 2635 frame->check = slf_check_nop;
2636}
2637
2638/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2639static void
2640slf_destroy (pTHX_ struct coro *coro)
2641{
2642 /* this callback is reserved for slf functions needing to do cleanup */
2643 if (coro->slf_frame.destroy && coro->slf_frame.prepare && !PL_dirty)
2644 coro->slf_frame.destroy (aTHX_ &coro->slf_frame);
2645
2646 /*
2647 * The on_destroy above most likely is from an SLF call.
2648 * Since by definition the SLF call will not finish when we destroy
2649 * the coro, we will have to force-finish it here, otherwise
2650 * cleanup functions cannot call SLF functions.
2651 */
2652 coro->slf_frame.prepare = 0;
1925} 2653}
1926 2654
1927/* 2655/*
1928 * these not obviously related functions are all rolled into one 2656 * these not obviously related functions are all rolled into one
1929 * function to increase chances that they all will call transfer with the same 2657 * function to increase chances that they all will call transfer with the same
… …
1936 I32 checkmark; /* mark SP to see how many elements check has pushed */ 2664 I32 checkmark; /* mark SP to see how many elements check has pushed */
1937 2665
1938 /* set up the slf frame, unless it has already been set-up */ 2666 /* set up the slf frame, unless it has already been set-up */
1939 /* the latter happens when a new coro has been started */ 2667 /* the latter happens when a new coro has been started */
1940 /* or when a new cctx was attached to an existing coroutine */ 2668 /* or when a new cctx was attached to an existing coroutine */
1941 if (expect_true (!slf_frame.prepare)) 2669 if (ecb_expect_true (!slf_frame.prepare))
1942 { 2670 {
1943 /* first iteration */ 2671 /* first iteration */
1944 dSP; 2672 dSP;
1945 SV **arg = PL_stack_base + TOPMARK + 1; 2673 SV **arg = PL_stack_base + TOPMARK + 1;
1946 int items = SP - arg; /* args without function object */ 2674 int items = SP - arg; /* args without function object */
… …
1987 while (slf_frame.check (aTHX_ &slf_frame)); 2715 while (slf_frame.check (aTHX_ &slf_frame));
1988 2716
1989 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */ 2717 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */
1990 2718
1991 /* exception handling */ 2719 /* exception handling */
1992 if (expect_false (CORO_THROW)) 2720 if (ecb_expect_false (CORO_THROW))
1993 { 2721 {
1994 SV *exception = sv_2mortal (CORO_THROW); 2722 SV *exception = sv_2mortal (CORO_THROW);
1995 2723
1996 CORO_THROW = 0; 2724 CORO_THROW = 0;
1997 sv_setsv (ERRSV, exception); 2725 sv_setsv (ERRSV, exception);
1998 croak (0); 2726 croak (0);
1999 } 2727 }
2000 2728
2001 /* return value handling - mostly like entersub */ 2729 /* return value handling - mostly like entersub */
2002 /* make sure we put something on the stack in scalar context */ 2730 /* make sure we put something on the stack in scalar context */
2003 if (GIMME_V == G_SCALAR) 2731 if (GIMME_V == G_SCALAR
2732 && ecb_expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2004 { 2733 {
2005 dSP; 2734 dSP;
2006 SV **bot = PL_stack_base + checkmark; 2735 SV **bot = PL_stack_base + checkmark;
2007 2736
2008 if (sp == bot) /* too few, push undef */ 2737 if (sp == bot) /* too few, push undef */
2009 bot [1] = &PL_sv_undef; 2738 bot [1] = &PL_sv_undef;
2010 else if (sp != bot + 1) /* too many, take last one */ 2739 else /* too many, take last one */
2011 bot [1] = *sp; 2740 bot [1] = *sp;
2012 2741
2013 SP = bot + 1; 2742 SP = bot + 1;
2014 2743
2015 PUTBACK; 2744 PUTBACK;
… …
2048 if (PL_op->op_flags & OPf_STACKED) 2777 if (PL_op->op_flags & OPf_STACKED)
2049 { 2778 {
2050 if (items > slf_arga) 2779 if (items > slf_arga)
2051 { 2780 {
2052 slf_arga = items; 2781 slf_arga = items;
2053 free (slf_argv); 2782 Safefree (slf_argv);
2054 slf_argv = malloc (slf_arga * sizeof (SV *)); 2783 New (0, slf_argv, slf_arga, SV *);
2055 } 2784 }
2056 2785
2057 slf_argc = items; 2786 slf_argc = items;
2058 2787
2059 for (i = 0; i < items; ++i) 2788 for (i = 0; i < items; ++i)
… …
2061 } 2790 }
2062 else 2791 else
2063 slf_argc = 0; 2792 slf_argc = 0;
2064 2793
2065 PL_op->op_ppaddr = pp_slf; 2794 PL_op->op_ppaddr = pp_slf;
2066 PL_op->op_type = OP_CUSTOM; /* maybe we should leave it at entersub? */ 2795 /*PL_op->op_type = OP_CUSTOM; /* we do behave like entersub still */
2067 2796
2068 PL_op = (OP *)&slf_restore; 2797 PL_op = (OP *)&slf_restore;
2798}
2799
2800/*****************************************************************************/
2801/* dynamic wind */
2802
2803static void
2804on_enterleave_call (pTHX_ SV *cb)
2805{
2806 dSP;
2807
2808 PUSHSTACK;
2809
2810 PUSHMARK (SP);
2811 PUTBACK;
2812 call_sv (cb, G_VOID | G_DISCARD);
2813 SPAGAIN;
2814
2815 POPSTACK;
2816}
2817
2818static SV *
2819coro_avp_pop_and_free (pTHX_ AV **avp)
2820{
2821 AV *av = *avp;
2822 SV *res = av_pop (av);
2823
2824 if (AvFILLp (av) < 0)
2825 {
2826 *avp = 0;
2827 SvREFCNT_dec (av);
2828 }
2829
2830 return res;
2831}
2832
2833static void
2834coro_pop_on_enter (pTHX_ void *coro)
2835{
2836 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_enter);
2837 SvREFCNT_dec (cb);
2838}
2839
2840static void
2841coro_pop_on_leave (pTHX_ void *coro)
2842{
2843 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2844 on_enterleave_call (aTHX_ sv_2mortal (cb));
2069} 2845}
2070 2846
2071/*****************************************************************************/ 2847/*****************************************************************************/
2072/* PerlIO::cede */ 2848/* PerlIO::cede */
2073 2849
… …
2075{ 2851{
2076 PerlIOBuf base; 2852 PerlIOBuf base;
2077 NV next, every; 2853 NV next, every;
2078} PerlIOCede; 2854} PerlIOCede;
2079 2855
2080static IV 2856static IV ecb_cold
2081PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab) 2857PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab)
2082{ 2858{
2083 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2859 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2084 2860
2085 self->every = SvCUR (arg) ? SvNV (arg) : 0.01; 2861 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
2086 self->next = nvtime () + self->every; 2862 self->next = nvtime () + self->every;
2087 2863
2088 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab); 2864 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
2089} 2865}
2090 2866
2091static SV * 2867static SV * ecb_cold
2092PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags) 2868PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
2093{ 2869{
2094 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2870 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2095 2871
2096 return newSVnv (self->every); 2872 return newSVnv (self->every);
… …
2147/* Coro::Semaphore & Coro::Signal */ 2923/* Coro::Semaphore & Coro::Signal */
2148 2924
2149static SV * 2925static SV *
2150coro_waitarray_new (pTHX_ int count) 2926coro_waitarray_new (pTHX_ int count)
2151{ 2927{
2152 /* a semaphore contains a counter IV in $sem->[0] and any waiters after that */ 2928 /* a waitarray=semaphore contains a counter IV in $sem->[0] and any waiters after that */
2153 AV *av = newAV (); 2929 AV *av = newAV ();
2154 SV **ary; 2930 SV **ary;
2155 2931
2156 /* unfortunately, building manually saves memory */ 2932 /* unfortunately, building manually saves memory */
2157 Newx (ary, 2, SV *); 2933 Newx (ary, 2, SV *);
2158 AvALLOC (av) = ary; 2934 AvALLOC (av) = ary;
2935#if PERL_VERSION_ATLEAST (5,10,0)
2159 /*AvARRAY (av) = ary;*/ 2936 AvARRAY (av) = ary;
2937#else
2160 SvPVX ((SV *)av) = (char *)ary; /* 5.8.8 needs this syntax instead of AvARRAY = ary */ 2938 /* 5.8.8 needs this syntax instead of AvARRAY = ary, yet */
2939 /* -DDEBUGGING flags this as a bug, despite it perfectly working */
2940 SvPVX ((SV *)av) = (char *)ary;
2941#endif
2161 AvMAX (av) = 1; 2942 AvMAX (av) = 1;
2162 AvFILLp (av) = 0; 2943 AvFILLp (av) = 0;
2163 ary [0] = newSViv (count); 2944 ary [0] = newSViv (count);
2164 2945
2165 return newRV_noinc ((SV *)av); 2946 return newRV_noinc ((SV *)av);
… …
2203 SvREFCNT_dec (cb); 2984 SvREFCNT_dec (cb);
2204 } 2985 }
2205} 2986}
2206 2987
2207static void 2988static void
2208coro_semaphore_on_destroy (pTHX_ struct coro *coro) 2989coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2209{ 2990{
2210 /* call $sem->adjust (0) to possibly wake up some other waiters */ 2991 /* call $sem->adjust (0) to possibly wake up some other waiters */
2211 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 2992 coro_semaphore_adjust (aTHX_ (AV *)frame->data, 0);
2212} 2993}
2213 2994
2214static int 2995static int
2215slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire) 2996slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2216{ 2997{
2217 AV *av = (AV *)frame->data; 2998 AV *av = (AV *)frame->data;
2218 SV *count_sv = AvARRAY (av)[0]; 2999 SV *count_sv = AvARRAY (av)[0];
3000 SV *coro_hv = SvRV (coro_current);
2219 3001
2220 /* if we are about to throw, don't actually acquire the lock, just throw */ 3002 /* if we are about to throw, don't actually acquire the lock, just throw */
2221 if (CORO_THROW) 3003 if (CORO_THROW)
2222 return 0; 3004 return 0;
2223 else if (SvIVX (count_sv) > 0) 3005 else if (SvIVX (count_sv) > 0)
2224 { 3006 {
2225 SvSTATE_current->on_destroy = 0; 3007 frame->destroy = 0;
2226 3008
2227 if (acquire) 3009 if (acquire)
2228 SvIVX (count_sv) = SvIVX (count_sv) - 1; 3010 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2229 else 3011 else
2230 coro_semaphore_adjust (aTHX_ av, 0); 3012 coro_semaphore_adjust (aTHX_ av, 0);
… …
2235 { 3017 {
2236 int i; 3018 int i;
2237 /* if we were woken up but can't down, we look through the whole */ 3019 /* if we were woken up but can't down, we look through the whole */
2238 /* waiters list and only add us if we aren't in there already */ 3020 /* waiters list and only add us if we aren't in there already */
2239 /* this avoids some degenerate memory usage cases */ 3021 /* this avoids some degenerate memory usage cases */
2240 3022 for (i = AvFILLp (av); i > 0; --i) /* i > 0 is not an off-by-one bug */
2241 for (i = 1; i <= AvFILLp (av); ++i)
2242 if (AvARRAY (av)[i] == SvRV (coro_current)) 3023 if (AvARRAY (av)[i] == coro_hv)
2243 return 1; 3024 return 1;
2244 3025
2245 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3026 av_push (av, SvREFCNT_inc (coro_hv));
2246 return 1; 3027 return 1;
2247 } 3028 }
2248} 3029}
2249 3030
2250static int 3031static int
… …
2273 { 3054 {
2274 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3055 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2275 3056
2276 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 3057 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2277 frame->prepare = prepare_schedule; 3058 frame->prepare = prepare_schedule;
2278
2279 /* to avoid race conditions when a woken-up coro gets terminated */ 3059 /* to avoid race conditions when a woken-up coro gets terminated */
2280 /* we arrange for a temporary on_destroy that calls adjust (0) */ 3060 /* we arrange for a temporary on_destroy that calls adjust (0) */
2281 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 3061 frame->destroy = coro_semaphore_destroy;
2282 } 3062 }
2283} 3063}
2284 3064
2285static void 3065static void
2286slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 3066slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
… …
2294{ 3074{
2295 if (items >= 2) 3075 if (items >= 2)
2296 { 3076 {
2297 /* callback form */ 3077 /* callback form */
2298 AV *av = (AV *)SvRV (arg [0]); 3078 AV *av = (AV *)SvRV (arg [0]);
2299 CV *cb_cv = coro_sv_2cv (arg [1]); 3079 SV *cb_cv = s_get_cv_croak (arg [1]);
2300 3080
2301 av_push (av, (SV *)SvREFCNT_inc_NN (cb_cv)); 3081 av_push (av, SvREFCNT_inc_NN (cb_cv));
2302 3082
2303 if (SvIVX (AvARRAY (av)[0]) > 0) 3083 if (SvIVX (AvARRAY (av)[0]) > 0)
2304 coro_semaphore_adjust (aTHX_ av, 0); 3084 coro_semaphore_adjust (aTHX_ av, 0);
2305 3085
2306 frame->prepare = prepare_nop; 3086 frame->prepare = prepare_nop;
… …
2330 AvARRAY (av)[0] = AvARRAY (av)[1]; 3110 AvARRAY (av)[0] = AvARRAY (av)[1];
2331 AvARRAY (av)[1] = cb; 3111 AvARRAY (av)[1] = cb;
2332 3112
2333 cb = av_shift (av); 3113 cb = av_shift (av);
2334 3114
3115 if (SvTYPE (cb) == SVt_PVCV)
3116 {
3117 dSP;
3118 PUSHMARK (SP);
3119 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
3120 PUTBACK;
3121 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
3122 }
3123 else
3124 {
2335 api_ready (aTHX_ cb); 3125 api_ready (aTHX_ cb);
2336 sv_setiv (cb, 0); /* signal waiter */ 3126 sv_setiv (cb, 0); /* signal waiter */
3127 }
3128
2337 SvREFCNT_dec (cb); 3129 SvREFCNT_dec (cb);
2338 3130
2339 --count; 3131 --count;
2340 } 3132 }
2341} 3133}
… …
2350static void 3142static void
2351slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 3143slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2352{ 3144{
2353 AV *av = (AV *)SvRV (arg [0]); 3145 AV *av = (AV *)SvRV (arg [0]);
2354 3146
3147 if (items >= 2)
3148 {
3149 SV *cb_cv = s_get_cv_croak (arg [1]);
3150 av_push (av, SvREFCNT_inc_NN (cb_cv));
3151
2355 if (SvIVX (AvARRAY (av)[0])) 3152 if (SvIVX (AvARRAY (av)[0]))
3153 coro_signal_wake (aTHX_ av, 1); /* must be the only waiter */
3154
3155 frame->prepare = prepare_nop;
3156 frame->check = slf_check_nop;
3157 }
3158 else if (SvIVX (AvARRAY (av)[0]))
2356 { 3159 {
2357 SvIVX (AvARRAY (av)[0]) = 0; 3160 SvIVX (AvARRAY (av)[0]) = 0;
2358 frame->prepare = prepare_nop; 3161 frame->prepare = prepare_nop;
2359 frame->check = slf_check_nop; 3162 frame->check = slf_check_nop;
2360 } 3163 }
2361 else 3164 else
2362 { 3165 {
2363 SV *waiter = newRV_inc (SvRV (coro_current)); /* owned by signal av */ 3166 SV *waiter = newSVsv (coro_current); /* owned by signal av */
2364 3167
2365 av_push (av, waiter); 3168 av_push (av, waiter);
2366 3169
2367 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */ 3170 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */
2368 frame->prepare = prepare_schedule; 3171 frame->prepare = prepare_schedule;
… …
2386 3189
2387static void 3190static void
2388coro_aio_callback (pTHX_ CV *cv) 3191coro_aio_callback (pTHX_ CV *cv)
2389{ 3192{
2390 dXSARGS; 3193 dXSARGS;
2391 AV *state = (AV *)GENSUB_ARG; 3194 AV *state = (AV *)S_GENSUB_ARG;
2392 SV *coro = av_pop (state); 3195 SV *coro = av_pop (state);
2393 SV *data_sv = newSV (sizeof (struct io_state)); 3196 SV *data_sv = newSV (sizeof (struct io_state));
2394 3197
2395 av_extend (state, items); 3198 av_extend (state, items - 1);
2396 3199
2397 sv_upgrade (data_sv, SVt_PV); 3200 sv_upgrade (data_sv, SVt_PV);
2398 SvCUR_set (data_sv, sizeof (struct io_state)); 3201 SvCUR_set (data_sv, sizeof (struct io_state));
2399 SvPOK_only (data_sv); 3202 SvPOK_only (data_sv);
2400 3203
… …
2481 dSP; 3284 dSP;
2482 3285
2483 static SV *prio_cv; 3286 static SV *prio_cv;
2484 static SV *prio_sv; 3287 static SV *prio_sv;
2485 3288
2486 if (expect_false (!prio_cv)) 3289 if (ecb_expect_false (!prio_cv))
2487 { 3290 {
2488 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0); 3291 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0);
2489 prio_sv = newSViv (0); 3292 prio_sv = newSViv (0);
2490 } 3293 }
2491 3294
… …
2510 3313
2511 for (i = 0; i < items; ++i) 3314 for (i = 0; i < items; ++i)
2512 PUSHs (arg [i]); 3315 PUSHs (arg [i]);
2513 3316
2514 /* now push the callback closure */ 3317 /* now push the callback closure */
2515 PUSHs (sv_2mortal (gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state)))); 3318 PUSHs (sv_2mortal (s_gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state))));
2516 3319
2517 /* now call the AIO function - we assume our request is uncancelable */ 3320 /* now call the AIO function - we assume our request is uncancelable */
2518 PUTBACK; 3321 PUTBACK;
2519 call_sv ((SV *)req, G_VOID | G_DISCARD); 3322 call_sv ((SV *)req, G_VOID | G_DISCARD);
2520 } 3323 }
2521 3324
2522 /* now that the requets is going, we loop toll we have a result */ 3325 /* now that the request is going, we loop till we have a result */
2523 frame->data = (void *)state; 3326 frame->data = (void *)state;
2524 frame->prepare = prepare_schedule; 3327 frame->prepare = prepare_schedule;
2525 frame->check = slf_check_aio_req; 3328 frame->check = slf_check_aio_req;
2526} 3329}
2527 3330
… …
2534 3337
2535 XSRETURN_EMPTY; 3338 XSRETURN_EMPTY;
2536} 3339}
2537 3340
2538/*****************************************************************************/ 3341/*****************************************************************************/
3342
3343#if CORO_CLONE
3344# include "clone.c"
3345#endif
3346
3347/*****************************************************************************/
3348
3349static SV *
3350coro_new (pTHX_ HV *stash, SV **argv, int argc, int is_coro)
3351{
3352 SV *coro_sv;
3353 struct coro *coro;
3354 MAGIC *mg;
3355 HV *hv;
3356 SV *cb;
3357 int i;
3358
3359 if (argc > 0)
3360 {
3361 cb = s_get_cv_croak (argv [0]);
3362
3363 if (!is_coro)
3364 {
3365 if (CvISXSUB (cb))
3366 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
3367
3368 if (!CvROOT (cb))
3369 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
3370 }
3371 }
3372
3373 Newz (0, coro, 1, struct coro);
3374 coro->args = newAV ();
3375 coro->flags = CF_NEW;
3376
3377 if (coro_first) coro_first->prev = coro;
3378 coro->next = coro_first;
3379 coro_first = coro;
3380
3381 coro->hv = hv = newHV ();
3382 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
3383 mg->mg_flags |= MGf_DUP;
3384 coro_sv = sv_bless (newRV_noinc ((SV *)hv), stash);
3385
3386 if (argc > 0)
3387 {
3388 av_extend (coro->args, argc + is_coro - 1);
3389
3390 if (is_coro)
3391 {
3392 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
3393 cb = (SV *)cv_coro_run;
3394 }
3395
3396 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3397
3398 for (i = 1; i < argc; i++)
3399 av_push (coro->args, newSVsv (argv [i]));
3400 }
3401
3402 return coro_sv;
3403}
3404
3405#ifndef __cplusplus
3406ecb_cold XS(boot_Coro__State);
3407#endif
3408
3409#if CORO_JIT
3410
3411static void ecb_noinline ecb_cold
3412pushav_4uv (pTHX_ UV a, UV b, UV c, UV d)
3413{
3414 dSP;
3415 AV *av = newAV ();
3416
3417 av_store (av, 3, newSVuv (d));
3418 av_store (av, 2, newSVuv (c));
3419 av_store (av, 1, newSVuv (b));
3420 av_store (av, 0, newSVuv (a));
3421
3422 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
3423
3424 PUTBACK;
3425}
3426
3427static void ecb_noinline ecb_cold
3428jit_init (pTHX)
3429{
3430 dSP;
3431 SV *load, *save;
3432 char *map_base;
3433 char *load_ptr, *save_ptr;
3434 STRLEN load_len, save_len, map_len;
3435 int count;
3436
3437 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3438
3439 PUSHMARK (SP);
3440 #define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type));
3441 #include "state.h"
3442 count = call_pv ("Coro::State::_jit", G_ARRAY);
3443 SPAGAIN;
3444
3445 save = POPs; save_ptr = SvPVbyte (save, save_len);
3446 load = POPs; load_ptr = SvPVbyte (load, load_len);
3447
3448 map_len = load_len + save_len + 16;
3449
3450 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3451
3452 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3453
3454 load_perl_slots = (load_save_perl_slots_type)map_base;
3455 memcpy (map_base, load_ptr, load_len);
3456
3457 map_base += (load_len + 15) & ~15;
3458
3459 save_perl_slots = (load_save_perl_slots_type)map_base;
3460 memcpy (map_base, save_ptr, save_len);
3461
3462 /* we are good citizens and try to make the page read-only, so the evil evil */
3463 /* hackers might have it a bit more difficult */
3464 mprotect (map_base, map_len, PROT_READ | PROT_EXEC);
3465
3466 PUTBACK;
3467 eval_pv ("undef &Coro::State::_jit", 1);
3468}
3469
3470#endif
2539 3471
2540MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3472MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2541 3473
2542PROTOTYPES: DISABLE 3474PROTOTYPES: DISABLE
2543 3475
… …
2548 coro_thx = PERL_GET_CONTEXT; 3480 coro_thx = PERL_GET_CONTEXT;
2549# endif 3481# endif
2550#endif 3482#endif
2551 BOOT_PAGESIZE; 3483 BOOT_PAGESIZE;
2552 3484
3485 /* perl defines these to check for existance first, but why it doesn't */
3486 /* just create them one at init time is not clear to me, except for */
3487 /* programs trying to delete them, but... */
3488 /* anyway, we declare this as invalid and make sure they are initialised here */
3489 DEFSV;
3490 ERRSV;
3491
3492 cctx_current = cctx_new_empty ();
3493
2553 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3494 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
2554 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3495 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
2555 3496
2556 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 3497 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get;
2557 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set; 3498 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set;
… …
2576 3517
2577 { 3518 {
2578 SV *slf = sv_2mortal (newSViv (PTR2IV (pp_slf))); 3519 SV *slf = sv_2mortal (newSViv (PTR2IV (pp_slf)));
2579 3520
2580 if (!PL_custom_op_names) PL_custom_op_names = newHV (); 3521 if (!PL_custom_op_names) PL_custom_op_names = newHV ();
2581 hv_store_ent (PL_custom_op_names, slf, 3522 hv_store_ent (PL_custom_op_names, slf, newSVpv ("coro_slf", 0), 0);
2582 newSVpv ("coro_slf", 0), 0);
2583 3523
2584 if (!PL_custom_op_descs) PL_custom_op_descs = newHV (); 3524 if (!PL_custom_op_descs) PL_custom_op_descs = newHV ();
2585 hv_store_ent (PL_custom_op_descs, slf, 3525 hv_store_ent (PL_custom_op_descs, slf, newSVpv ("coro schedule like function", 0), 0);
2586 newSVpv ("coro schedule like function", 0), 0);
2587 } 3526 }
2588 3527
2589 coroapi.ver = CORO_API_VERSION; 3528 coroapi.ver = CORO_API_VERSION;
2590 coroapi.rev = CORO_API_REVISION; 3529 coroapi.rev = CORO_API_REVISION;
2591 3530
… …
2596 coroapi.prepare_nop = prepare_nop; 3535 coroapi.prepare_nop = prepare_nop;
2597 coroapi.prepare_schedule = prepare_schedule; 3536 coroapi.prepare_schedule = prepare_schedule;
2598 coroapi.prepare_cede = prepare_cede; 3537 coroapi.prepare_cede = prepare_cede;
2599 coroapi.prepare_cede_notself = prepare_cede_notself; 3538 coroapi.prepare_cede_notself = prepare_cede_notself;
2600 3539
2601 { 3540 time_init (aTHX);
2602 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
2603 3541
2604 if (!svp) croak ("Time::HiRes is required");
2605 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
2606
2607 nvtime = INT2PTR (double (*)(), SvIV (*svp));
2608 }
2609
2610 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 3542 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3543#if CORO_JIT
3544 PUTBACK;
3545 jit_init (aTHX);
3546 SPAGAIN;
3547#endif
2611} 3548}
2612 3549
2613SV * 3550SV *
2614new (char *klass, ...) 3551new (SV *klass, ...)
3552 ALIAS:
3553 Coro::new = 1
2615 CODE: 3554 CODE:
2616{ 3555 RETVAL = coro_new (aTHX_ ix ? coro_stash : coro_state_stash, &ST (1), items - 1, ix);
2617 struct coro *coro; 3556 OUTPUT:
2618 MAGIC *mg;
2619 HV *hv;
2620 CV *cb;
2621 int i;
2622
2623 if (items > 1)
2624 {
2625 cb = coro_sv_2cv (ST (1));
2626
2627 if (CvISXSUB (cb))
2628 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
2629
2630 if (!CvROOT (cb))
2631 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
2632 }
2633
2634 Newz (0, coro, 1, struct coro);
2635 coro->args = newAV ();
2636 coro->flags = CF_NEW;
2637
2638 if (coro_first) coro_first->prev = coro;
2639 coro->next = coro_first;
2640 coro_first = coro;
2641
2642 coro->hv = hv = newHV ();
2643 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
2644 mg->mg_flags |= MGf_DUP;
2645 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
2646
2647 if (items > 1)
2648 {
2649 coro->startcv = SvREFCNT_inc_NN (cb);
2650
2651 av_extend (coro->args, items - 1);
2652 av_push (coro->args, SvREFCNT_inc (cb));
2653 for (i = 2; i < items; i++)
2654 av_push (coro->args, newSVsv (ST (i)));
2655 }
2656}
2657 OUTPUT:
2658 RETVAL 3557 RETVAL
2659 3558
2660void 3559void
2661transfer (...) 3560transfer (...)
2662 PROTOTYPE: $$ 3561 PROTOTYPE: $$
2663 CODE: 3562 CODE:
2664 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3563 CORO_EXECUTE_SLF_XS (slf_init_transfer);
2665 3564
2666bool
2667_destroy (SV *coro_sv)
2668 CODE:
2669 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
2670 OUTPUT:
2671 RETVAL
2672
2673void 3565void
2674_exit (int code) 3566_exit (int code)
2675 PROTOTYPE: $ 3567 PROTOTYPE: $
2676 CODE: 3568 CODE:
2677 _exit (code); 3569 _exit (code);
3570
3571SV *
3572clone (Coro::State coro)
3573 CODE:
3574{
3575#if CORO_CLONE
3576 struct coro *ncoro = coro_clone (aTHX_ coro);
3577 MAGIC *mg;
3578 /* TODO: too much duplication */
3579 ncoro->hv = newHV ();
3580 mg = sv_magicext ((SV *)ncoro->hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)ncoro, 0);
3581 mg->mg_flags |= MGf_DUP;
3582 RETVAL = sv_bless (newRV_noinc ((SV *)ncoro->hv), SvSTASH (coro->hv));
3583#else
3584 croak ("Coro::State->clone has not been configured into this installation of Coro, realised");
3585#endif
3586}
3587 OUTPUT:
3588 RETVAL
2678 3589
2679int 3590int
2680cctx_stacksize (int new_stacksize = 0) 3591cctx_stacksize (int new_stacksize = 0)
2681 PROTOTYPE: ;$ 3592 PROTOTYPE: ;$
2682 CODE: 3593 CODE:
… …
2718void 3629void
2719list () 3630list ()
2720 PROTOTYPE: 3631 PROTOTYPE:
2721 PPCODE: 3632 PPCODE:
2722{ 3633{
2723 struct coro *coro; 3634 struct coro *coro;
2724 for (coro = coro_first; coro; coro = coro->next) 3635 for (coro = coro_first; coro; coro = coro->next)
2725 if (coro->hv) 3636 if (coro->hv)
2726 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 3637 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
2727} 3638}
2728 3639
… …
2732 eval = 1 3643 eval = 1
2733 CODE: 3644 CODE:
2734{ 3645{
2735 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3646 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
2736 { 3647 {
2737 struct coro temp; 3648 struct coro *current = SvSTATE_current;
3649 struct CoroSLF slf_save;
2738 3650
2739 if (!(coro->flags & CF_RUNNING)) 3651 if (current != coro)
2740 { 3652 {
2741 PUTBACK; 3653 PUTBACK;
2742 save_perl (aTHX_ &temp); 3654 save_perl (aTHX_ current);
2743 load_perl (aTHX_ coro); 3655 load_perl (aTHX_ coro);
3656 /* the coro is most likely in an active SLF call.
3657 * while not strictly required (the code we execute is
3658 * not allowed to call any SLF functions), it's cleaner
3659 * to reinitialise the slf_frame and restore it later.
3660 * This might one day allow us to actually do SLF calls
3661 * from code executed here.
3662 */
3663 slf_save = slf_frame;
3664 slf_frame.prepare = 0;
3665 SPAGAIN;
2744 } 3666 }
2745 3667
2746 {
2747 dSP;
2748 ENTER;
2749 SAVETMPS;
2750 PUTBACK;
2751 PUSHSTACK; 3668 PUSHSTACK;
3669
2752 PUSHMARK (SP); 3670 PUSHMARK (SP);
3671 PUTBACK;
2753 3672
2754 if (ix) 3673 if (ix)
2755 eval_sv (coderef, 0); 3674 eval_sv (coderef, 0);
2756 else 3675 else
2757 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 3676 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
2758 3677
2759 POPSTACK; 3678 POPSTACK;
2760 SPAGAIN; 3679 SPAGAIN;
2761 FREETMPS;
2762 LEAVE;
2763 PUTBACK;
2764 }
2765 3680
2766 if (!(coro->flags & CF_RUNNING)) 3681 if (current != coro)
2767 { 3682 {
3683 PUTBACK;
3684 slf_frame = slf_save;
2768 save_perl (aTHX_ coro); 3685 save_perl (aTHX_ coro);
2769 load_perl (aTHX_ &temp); 3686 load_perl (aTHX_ current);
2770 SPAGAIN; 3687 SPAGAIN;
2771 } 3688 }
2772 } 3689 }
2773} 3690}
2774 3691
… …
2777 PROTOTYPE: $ 3694 PROTOTYPE: $
2778 ALIAS: 3695 ALIAS:
2779 is_ready = CF_READY 3696 is_ready = CF_READY
2780 is_running = CF_RUNNING 3697 is_running = CF_RUNNING
2781 is_new = CF_NEW 3698 is_new = CF_NEW
2782 is_destroyed = CF_DESTROYED 3699 is_destroyed = CF_ZOMBIE
3700 is_zombie = CF_ZOMBIE
3701 is_suspended = CF_SUSPENDED
2783 CODE: 3702 CODE:
2784 RETVAL = boolSV (coro->flags & ix); 3703 RETVAL = boolSV (coro->flags & ix);
2785 OUTPUT: 3704 OUTPUT:
2786 RETVAL 3705 RETVAL
2787 3706
2788void 3707void
2789throw (Coro::State self, SV *throw = &PL_sv_undef) 3708throw (SV *self, SV *exception = &PL_sv_undef)
2790 PROTOTYPE: $;$ 3709 PROTOTYPE: $;$
2791 CODE: 3710 CODE:
2792{ 3711{
3712 struct coro *coro = SvSTATE (self);
2793 struct coro *current = SvSTATE_current; 3713 struct coro *current = SvSTATE_current;
2794 SV **throwp = self == current ? &CORO_THROW : &self->except; 3714 SV **exceptionp = coro == current ? &CORO_THROW : &coro->except;
2795 SvREFCNT_dec (*throwp); 3715 SvREFCNT_dec (*exceptionp);
2796 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3716 SvGETMAGIC (exception);
3717 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3718
3719 api_ready (aTHX_ self);
2797} 3720}
2798 3721
2799void 3722void
2800api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3723api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
2801 PROTOTYPE: $;$ 3724 PROTOTYPE: $;$
… …
2803 3726
2804SV * 3727SV *
2805has_cctx (Coro::State coro) 3728has_cctx (Coro::State coro)
2806 PROTOTYPE: $ 3729 PROTOTYPE: $
2807 CODE: 3730 CODE:
2808 RETVAL = boolSV (!!coro->cctx); 3731 /* maybe manage the running flag differently */
3732 RETVAL = boolSV (!!coro->cctx || (coro->flags & CF_RUNNING));
2809 OUTPUT: 3733 OUTPUT:
2810 RETVAL 3734 RETVAL
2811 3735
2812int 3736int
2813is_traced (Coro::State coro) 3737is_traced (Coro::State coro)
… …
2833 3757
2834void 3758void
2835force_cctx () 3759force_cctx ()
2836 PROTOTYPE: 3760 PROTOTYPE:
2837 CODE: 3761 CODE:
2838 SvSTATE_current->cctx->idle_sp = 0; 3762 cctx_current->idle_sp = 0;
2839 3763
2840void 3764void
2841swap_defsv (Coro::State self) 3765swap_defsv (Coro::State self)
2842 PROTOTYPE: $ 3766 PROTOTYPE: $
2843 ALIAS: 3767 ALIAS:
… …
2851 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv; 3775 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
2852 3776
2853 SV *tmp = *src; *src = *dst; *dst = tmp; 3777 SV *tmp = *src; *src = *dst; *dst = tmp;
2854 } 3778 }
2855 3779
3780void
3781cancel (Coro::State self)
3782 CODE:
3783 coro_state_destroy (aTHX_ self);
3784
3785SV *
3786enable_times (int enabled = enable_times)
3787 CODE:
3788{
3789 RETVAL = boolSV (enable_times);
3790
3791 if (enabled != enable_times)
3792 {
3793 enable_times = enabled;
3794
3795 coro_times_update ();
3796 (enabled ? coro_times_sub : coro_times_add)(SvSTATE (coro_current));
3797 }
3798}
3799 OUTPUT:
3800 RETVAL
3801
3802void
3803times (Coro::State self)
3804 PPCODE:
3805{
3806 struct coro *current = SvSTATE (coro_current);
3807
3808 if (ecb_expect_false (current == self))
3809 {
3810 coro_times_update ();
3811 coro_times_add (SvSTATE (coro_current));
3812 }
3813
3814 EXTEND (SP, 2);
3815 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3816 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3817
3818 if (ecb_expect_false (current == self))
3819 coro_times_sub (SvSTATE (coro_current));
3820}
3821
3822void
3823swap_sv (Coro::State coro, SV *sv, SV *swapsv)
3824 CODE:
3825{
3826 struct coro *current = SvSTATE_current;
3827
3828 if (current == coro)
3829 SWAP_SVS (current);
3830
3831 if (!coro->swap_sv)
3832 coro->swap_sv = newAV ();
3833
3834 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv )));
3835 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv)));
3836
3837 if (current == coro)
3838 SWAP_SVS (current);
3839}
3840
2856 3841
2857MODULE = Coro::State PACKAGE = Coro 3842MODULE = Coro::State PACKAGE = Coro
2858 3843
2859BOOT: 3844BOOT:
2860{ 3845{
2861 int i;
2862
2863 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
2864 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3846 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
2865 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3847 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
2866 3848 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
2867 coro_current = coro_get_sv (aTHX_ "Coro::current", FALSE); 3849 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
2868 SvREADONLY_on (coro_current); 3850 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3851 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3852 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3853 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3854
3855 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3856 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3857 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3858 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
2869 3859
2870 coro_stash = gv_stashpv ("Coro", TRUE); 3860 coro_stash = gv_stashpv ("Coro", TRUE);
2871 3861
2872 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 3862 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
2873 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 3863 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
2874 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 3864 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
2875 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 3865 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (CORO_PRIO_LOW));
2876 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE)); 3866 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (CORO_PRIO_IDLE));
2877 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN)); 3867 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (CORO_PRIO_MIN));
2878
2879 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
2880 coro_ready[i] = newAV ();
2881 3868
2882 { 3869 {
2883 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 3870 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
2884 3871
2885 coroapi.schedule = api_schedule; 3872 coroapi.schedule = api_schedule;
3873 coroapi.schedule_to = api_schedule_to;
2886 coroapi.cede = api_cede; 3874 coroapi.cede = api_cede;
2887 coroapi.cede_notself = api_cede_notself; 3875 coroapi.cede_notself = api_cede_notself;
2888 coroapi.ready = api_ready; 3876 coroapi.ready = api_ready;
2889 coroapi.is_ready = api_is_ready; 3877 coroapi.is_ready = api_is_ready;
2890 coroapi.nready = coro_nready; 3878 coroapi.nready = coro_nready;
… …
2894 sv_setiv (sv, (IV)&coroapi); 3882 sv_setiv (sv, (IV)&coroapi);
2895 SvREADONLY_on (sv); 3883 SvREADONLY_on (sv);
2896 } 3884 }
2897} 3885}
2898 3886
3887SV *
3888async (...)
3889 PROTOTYPE: &@
3890 CODE:
3891 RETVAL = coro_new (aTHX_ coro_stash, &ST (0), items, 1);
3892 api_ready (aTHX_ RETVAL);
3893 OUTPUT:
3894 RETVAL
3895
3896void
3897_destroy (Coro::State coro)
3898 CODE:
3899 /* used by the manager thread */
3900 coro_state_destroy (aTHX_ coro);
3901
3902void
3903on_destroy (Coro::State coro, SV *cb)
3904 CODE:
3905 coro_push_on_destroy (aTHX_ coro, newSVsv (cb));
3906
3907void
3908join (...)
3909 CODE:
3910 CORO_EXECUTE_SLF_XS (slf_init_join);
3911
3912void
3913terminate (...)
3914 CODE:
3915 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3916
3917void
3918cancel (...)
3919 CODE:
3920 CORO_EXECUTE_SLF_XS (slf_init_cancel);
3921
3922int
3923safe_cancel (Coro::State self, ...)
3924 C_ARGS: aTHX_ self, &ST (1), items - 1
3925
2899void 3926void
2900schedule (...) 3927schedule (...)
2901 CODE: 3928 CODE:
2902 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3929 CORO_EXECUTE_SLF_XS (slf_init_schedule);
3930
3931void
3932schedule_to (...)
3933 CODE:
3934 CORO_EXECUTE_SLF_XS (slf_init_schedule_to);
3935
3936void
3937cede_to (...)
3938 CODE:
3939 CORO_EXECUTE_SLF_XS (slf_init_cede_to);
2903 3940
2904void 3941void
2905cede (...) 3942cede (...)
2906 CODE: 3943 CODE:
2907 CORO_EXECUTE_SLF_XS (slf_init_cede); 3944 CORO_EXECUTE_SLF_XS (slf_init_cede);
… …
2921void 3958void
2922_set_readyhook (SV *hook) 3959_set_readyhook (SV *hook)
2923 PROTOTYPE: $ 3960 PROTOTYPE: $
2924 CODE: 3961 CODE:
2925 SvREFCNT_dec (coro_readyhook); 3962 SvREFCNT_dec (coro_readyhook);
3963 SvGETMAGIC (hook);
3964 if (SvOK (hook))
3965 {
2926 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0; 3966 coro_readyhook = newSVsv (hook);
3967 CORO_READYHOOK = invoke_sv_ready_hook_helper;
3968 }
3969 else
3970 {
3971 coro_readyhook = 0;
3972 CORO_READYHOOK = 0;
3973 }
2927 3974
2928int 3975int
2929prio (Coro::State coro, int newprio = 0) 3976prio (Coro::State coro, int newprio = 0)
2930 PROTOTYPE: $;$ 3977 PROTOTYPE: $;$
2931 ALIAS: 3978 ALIAS:
… …
2937 if (items > 1) 3984 if (items > 1)
2938 { 3985 {
2939 if (ix) 3986 if (ix)
2940 newprio = coro->prio - newprio; 3987 newprio = coro->prio - newprio;
2941 3988
2942 if (newprio < PRIO_MIN) newprio = PRIO_MIN; 3989 if (newprio < CORO_PRIO_MIN) newprio = CORO_PRIO_MIN;
2943 if (newprio > PRIO_MAX) newprio = PRIO_MAX; 3990 if (newprio > CORO_PRIO_MAX) newprio = CORO_PRIO_MAX;
2944 3991
2945 coro->prio = newprio; 3992 coro->prio = newprio;
2946 } 3993 }
2947} 3994}
2948 OUTPUT: 3995 OUTPUT:
… …
2962 CODE: 4009 CODE:
2963 RETVAL = coro_nready; 4010 RETVAL = coro_nready;
2964 OUTPUT: 4011 OUTPUT:
2965 RETVAL 4012 RETVAL
2966 4013
2967# for async_pool speedup
2968void 4014void
2969_pool_1 (SV *cb) 4015suspend (Coro::State self)
4016 PROTOTYPE: $
2970 CODE: 4017 CODE:
2971{ 4018 self->flags |= CF_SUSPENDED;
2972 HV *hv = (HV *)SvRV (coro_current);
2973 struct coro *coro = SvSTATE_hv ((SV *)hv);
2974 AV *defav = GvAV (PL_defgv);
2975 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
2976 AV *invoke_av;
2977 int i, len;
2978 4019
2979 if (!invoke) 4020void
4021resume (Coro::State self)
4022 PROTOTYPE: $
4023 CODE:
4024 self->flags &= ~CF_SUSPENDED;
4025
4026void
4027_pool_handler (...)
4028 CODE:
4029 CORO_EXECUTE_SLF_XS (slf_init_pool_handler);
4030
4031void
4032async_pool (SV *cv, ...)
4033 PROTOTYPE: &@
4034 PPCODE:
4035{
4036 HV *hv = (HV *)av_pop (av_async_pool);
4037 AV *av = newAV ();
4038 SV *cb = ST (0);
4039 int i;
4040
4041 av_extend (av, items - 2);
4042 for (i = 1; i < items; ++i)
4043 av_push (av, SvREFCNT_inc_NN (ST (i)));
4044
4045 if ((SV *)hv == &PL_sv_undef)
2980 { 4046 {
2981 SV *old = PL_diehook; 4047 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
2982 PL_diehook = 0; 4048 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
2983 SvREFCNT_dec (old); 4049 SvREFCNT_dec (sv);
2984 croak ("\3async_pool terminate\2\n");
2985 } 4050 }
2986 4051
2987 SvREFCNT_dec (coro->saved_deffh);
2988 coro->saved_deffh = SvREFCNT_inc_NN ((SV *)PL_defoutgv);
2989
2990 hv_store (hv, "desc", sizeof ("desc") - 1,
2991 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
2992
2993 invoke_av = (AV *)SvRV (invoke);
2994 len = av_len (invoke_av);
2995
2996 sv_setsv (cb, AvARRAY (invoke_av)[0]);
2997
2998 if (len > 0)
2999 { 4052 {
3000 av_fill (defav, len - 1); 4053 struct coro *coro = SvSTATE_hv (hv);
3001 for (i = 0; i < len; ++i) 4054
3002 av_store (defav, i, SvREFCNT_inc_NN (AvARRAY (invoke_av)[i + 1])); 4055 assert (!coro->invoke_cb);
4056 assert (!coro->invoke_av);
4057 coro->invoke_cb = SvREFCNT_inc (cb);
4058 coro->invoke_av = av;
3003 } 4059 }
3004}
3005 4060
3006void 4061 api_ready (aTHX_ (SV *)hv);
3007_pool_2 (SV *cb)
3008 CODE:
3009{
3010 HV *hv = (HV *)SvRV (coro_current);
3011 struct coro *coro = SvSTATE_hv ((SV *)hv);
3012 4062
3013 sv_setsv (cb, &PL_sv_undef); 4063 if (GIMME_V != G_VOID)
3014 4064 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
3015 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 4065 else
3016 coro->saved_deffh = 0;
3017
3018 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
3019 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
3020 {
3021 SV *old = PL_diehook;
3022 PL_diehook = 0;
3023 SvREFCNT_dec (old); 4066 SvREFCNT_dec (hv);
3024 croak ("\3async_pool terminate\2\n");
3025 }
3026
3027 av_clear (GvAV (PL_defgv));
3028 hv_store (hv, "desc", sizeof ("desc") - 1,
3029 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
3030
3031 coro->prio = 0;
3032
3033 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
3034 api_trace (aTHX_ coro_current, 0);
3035
3036 av_push (av_async_pool, newSVsv (coro_current));
3037} 4067}
3038 4068
3039SV * 4069SV *
3040rouse_cb () 4070rouse_cb ()
3041 PROTOTYPE: 4071 PROTOTYPE:
… …
3048rouse_wait (...) 4078rouse_wait (...)
3049 PROTOTYPE: ;$ 4079 PROTOTYPE: ;$
3050 PPCODE: 4080 PPCODE:
3051 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait); 4081 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait);
3052 4082
4083void
4084on_enter (SV *block)
4085 ALIAS:
4086 on_leave = 1
4087 PROTOTYPE: &
4088 CODE:
4089{
4090 struct coro *coro = SvSTATE_current;
4091 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
4092
4093 block = s_get_cv_croak (block);
4094
4095 if (!*avp)
4096 *avp = newAV ();
4097
4098 av_push (*avp, SvREFCNT_inc (block));
4099
4100 if (!ix)
4101 on_enterleave_call (aTHX_ block);
4102
4103 LEAVE; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
4104 SAVEDESTRUCTOR_X (ix ? coro_pop_on_leave : coro_pop_on_enter, (void *)coro);
4105 ENTER; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
4106}
4107
3053 4108
3054MODULE = Coro::State PACKAGE = PerlIO::cede 4109MODULE = Coro::State PACKAGE = PerlIO::cede
3055 4110
3056BOOT: 4111BOOT:
3057 PerlIO_define_layer (aTHX_ &PerlIO_cede); 4112 PerlIO_define_layer (aTHX_ &PerlIO_cede);
… …
3060MODULE = Coro::State PACKAGE = Coro::Semaphore 4115MODULE = Coro::State PACKAGE = Coro::Semaphore
3061 4116
3062SV * 4117SV *
3063new (SV *klass, SV *count = 0) 4118new (SV *klass, SV *count = 0)
3064 CODE: 4119 CODE:
4120{
4121 int semcnt = 1;
4122
4123 if (count)
4124 {
4125 SvGETMAGIC (count);
4126
4127 if (SvOK (count))
4128 semcnt = SvIV (count);
4129 }
4130
3065 RETVAL = sv_bless ( 4131 RETVAL = sv_bless (
3066 coro_waitarray_new (aTHX_ count && SvOK (count) ? SvIV (count) : 1), 4132 coro_waitarray_new (aTHX_ semcnt),
3067 GvSTASH (CvGV (cv)) 4133 GvSTASH (CvGV (cv))
3068 ); 4134 );
4135}
3069 OUTPUT: 4136 OUTPUT:
3070 RETVAL 4137 RETVAL
3071 4138
3072# helper for Coro::Channel 4139# helper for Coro::Channel and others
3073SV * 4140SV *
3074_alloc (int count) 4141_alloc (int count)
3075 CODE: 4142 CODE:
3076 RETVAL = coro_waitarray_new (aTHX_ count); 4143 RETVAL = coro_waitarray_new (aTHX_ count);
3077 OUTPUT: 4144 OUTPUT:
… …
3119 XSRETURN_NO; 4186 XSRETURN_NO;
3120} 4187}
3121 4188
3122void 4189void
3123waiters (SV *self) 4190waiters (SV *self)
3124 PPCODE: 4191 PPCODE:
3125{ 4192{
3126 AV *av = (AV *)SvRV (self); 4193 AV *av = (AV *)SvRV (self);
3127 int wcount = AvFILLp (av) + 1 - 1; 4194 int wcount = AvFILLp (av) + 1 - 1;
3128 4195
3129 if (GIMME_V == G_SCALAR) 4196 if (GIMME_V == G_SCALAR)
… …
3135 for (i = 1; i <= wcount; ++i) 4202 for (i = 1; i <= wcount; ++i)
3136 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i]))); 4203 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i])));
3137 } 4204 }
3138} 4205}
3139 4206
4207MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
4208
4209void
4210_may_delete (SV *sem, int count, unsigned int extra_refs)
4211 PPCODE:
4212{
4213 AV *av = (AV *)SvRV (sem);
4214
4215 if (SvREFCNT ((SV *)av) == 1 + extra_refs
4216 && AvFILLp (av) == 0 /* no waiters, just count */
4217 && SvIV (AvARRAY (av)[0]) == count)
4218 XSRETURN_YES;
4219
4220 XSRETURN_NO;
4221}
4222
3140MODULE = Coro::State PACKAGE = Coro::Signal 4223MODULE = Coro::State PACKAGE = Coro::Signal
3141 4224
3142SV * 4225SV *
3143new (SV *klass) 4226new (SV *klass)
3144 CODE: 4227 CODE:
… …
3156 4239
3157void 4240void
3158broadcast (SV *self) 4241broadcast (SV *self)
3159 CODE: 4242 CODE:
3160{ 4243{
3161 AV *av = (AV *)SvRV (self); 4244 AV *av = (AV *)SvRV (self);
3162 coro_signal_wake (aTHX_ av, AvFILLp (av)); 4245 coro_signal_wake (aTHX_ av, AvFILLp (av));
3163} 4246}
3164 4247
3165void 4248void
3166send (SV *self) 4249send (SV *self)
… …
3174 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */ 4257 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
3175} 4258}
3176 4259
3177IV 4260IV
3178awaited (SV *self) 4261awaited (SV *self)
3179 CODE: 4262 CODE:
3180 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1; 4263 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
3181 OUTPUT: 4264 OUTPUT:
3182 RETVAL 4265 RETVAL
3183 4266
3184 4267
… …
3189 4272
3190void 4273void
3191_schedule (...) 4274_schedule (...)
3192 CODE: 4275 CODE:
3193{ 4276{
3194 static int incede; 4277 static int incede;
3195 4278
3196 api_cede_notself (aTHX); 4279 api_cede_notself (aTHX);
3197 4280
3198 ++incede; 4281 ++incede;
3199 while (coro_nready >= incede && api_cede (aTHX)) 4282 while (coro_nready >= incede && api_cede (aTHX))
… …
3215 4298
3216void 4299void
3217_register (char *target, char *proto, SV *req) 4300_register (char *target, char *proto, SV *req)
3218 CODE: 4301 CODE:
3219{ 4302{
3220 CV *req_cv = coro_sv_2cv (req); 4303 SV *req_cv = s_get_cv_croak (req);
3221 /* newXSproto doesn't return the CV on 5.8 */ 4304 /* newXSproto doesn't return the CV on 5.8 */
3222 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 4305 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3223 sv_setpv ((SV *)slf_cv, proto); 4306 sv_setpv ((SV *)slf_cv, proto);
3224 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0); 4307 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
3225} 4308}
3226 4309
4310MODULE = Coro::State PACKAGE = Coro::Select
4311
4312void
4313patch_pp_sselect ()
4314 CODE:
4315 if (!coro_old_pp_sselect)
4316 {
4317 coro_select_select = (SV *)get_cv ("Coro::Select::select", 0);
4318 coro_old_pp_sselect = PL_ppaddr [OP_SSELECT];
4319 PL_ppaddr [OP_SSELECT] = coro_pp_sselect;
4320 }
4321
4322void
4323unpatch_pp_sselect ()
4324 CODE:
4325 if (coro_old_pp_sselect)
4326 {
4327 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
4328 coro_old_pp_sselect = 0;
4329 }
4330

Diff Legend

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