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.337 by root, Fri Dec 5 18:26:10 2008 UTC vs.
Revision 1.425 by root, Wed Dec 5 00:14:22 2012 UTC

1/* this works around a bug in mingw32 providing a non-working setjmp */
2#define USE_NO_MINGW_SETJMP_TWO_ARGS
3
4#define NDEBUG 1
5
1#include "libcoro/coro.c" 6#include "libcoro/coro.c"
2 7
3#define PERL_NO_GET_CONTEXT 8#define PERL_NO_GET_CONTEXT
4#define PERL_EXT 9#define PERL_EXT
5 10
6#include "EXTERN.h" 11#include "EXTERN.h"
7#include "perl.h" 12#include "perl.h"
8#include "XSUB.h" 13#include "XSUB.h"
9#include "perliol.h" 14#include "perliol.h"
10 15
11#include "patchlevel.h" 16#include "schmorp.h"
12 17
18#define ECB_NO_THREADS 1
19#include "ecb.h"
20
21#include <stddef.h>
13#include <stdio.h> 22#include <stdio.h>
14#include <errno.h> 23#include <errno.h>
15#include <assert.h> 24#include <assert.h>
16 25
17#ifdef WIN32 26#ifndef SVs_PADSTALE
27# define SVs_PADSTALE 0
28#endif
29
30#ifdef PadARRAY
31# define NEWPADAPI
32# define newPADLIST(var) (Newz (0, var, 1, PADLIST), Newx (PadlistARRAY (var), 2, PAD *))
33#else
34typedef AV PADNAMELIST;
35# if !PERL_VERSION_ATLEAST(5,8,0)
36typedef AV PADLIST;
37typedef AV PAD;
38# endif
39# define PadlistARRAY(pl) ((PAD **)AvARRAY (pl))
40# define PadlistMAX(pl) AvFILLp (pl)
41# define PadlistNAMES(pl) (*PadlistARRAY (pl))
42# define PadARRAY AvARRAY
43# define PadMAX AvFILLp
44# define newPADLIST(var) ((var) = newAV (), av_extend (var, 1))
45#endif
46
47#if defined(_WIN32)
48# undef HAS_GETTIMEOFDAY
18# undef setjmp 49# undef setjmp
19# undef longjmp 50# undef longjmp
20# undef _exit 51# undef _exit
21# define setjmp _setjmp /* deep magic */ 52# define setjmp _setjmp /* deep magic */
22#else 53#else
23# include <inttypes.h> /* most portable stdint.h */ 54# include <inttypes.h> /* most portable stdint.h */
24#endif 55#endif
25 56
26#ifdef HAVE_MMAP 57#if HAVE_MMAP
27# include <unistd.h> 58# include <unistd.h>
28# include <sys/mman.h> 59# include <sys/mman.h>
29# ifndef MAP_ANONYMOUS 60# ifndef MAP_ANONYMOUS
30# ifdef MAP_ANON 61# ifdef MAP_ANON
31# define MAP_ANONYMOUS MAP_ANON 62# define MAP_ANONYMOUS MAP_ANON
… …
51#endif 82#endif
52 83
53/* the maximum number of idle cctx that will be pooled */ 84/* the maximum number of idle cctx that will be pooled */
54static int cctx_max_idle = 4; 85static int cctx_max_idle = 4;
55 86
56#define PERL_VERSION_ATLEAST(a,b,c) \ 87#if defined(DEBUGGING) && PERL_VERSION_ATLEAST(5,12,0)
57 (PERL_REVISION > (a) \ 88# define HAS_SCOPESTACK_NAME 1
58 || (PERL_REVISION == (a) \
59 && (PERL_VERSION > (b) \
60 || (PERL_VERSION == (b) && PERL_SUBVERSION >= (c)))))
61
62#if !PERL_VERSION_ATLEAST (5,6,0)
63# ifndef PL_ppaddr
64# define PL_ppaddr ppaddr
65# endif
66# ifndef call_sv
67# define call_sv perl_call_sv
68# endif
69# ifndef get_sv
70# define get_sv perl_get_sv
71# endif
72# ifndef get_cv
73# define get_cv perl_get_cv
74# endif
75# ifndef IS_PADGV
76# define IS_PADGV(v) 0
77# endif
78# ifndef IS_PADCONST
79# define IS_PADCONST(v) 0
80# endif
81#endif
82
83/* 5.11 */
84#ifndef CxHASARGS
85# define CxHASARGS(cx) (cx)->blk_sub.hasargs
86#endif
87
88/* 5.10.0 */
89#ifndef SvREFCNT_inc_NN
90# define SvREFCNT_inc_NN(sv) SvREFCNT_inc (sv)
91#endif
92
93/* 5.8.8 */
94#ifndef GV_NOTQUAL
95# define GV_NOTQUAL 0
96#endif
97#ifndef newSV
98# define newSV(l) NEWSV(0,l)
99#endif
100#ifndef CvISXSUB_on
101# define CvISXSUB_on(cv) (void)cv
102#endif
103#ifndef CvISXSUB
104# define CvISXSUB(cv) (CvXSUB (cv) ? TRUE : FALSE)
105#endif
106#ifndef Newx
107# define Newx(ptr,nitems,type) New (0,ptr,nitems,type)
108#endif
109
110/* 5.8.7 */
111#ifndef SvRV_set
112# define SvRV_set(s,v) SvRV(s) = (v)
113#endif 89#endif
114 90
115#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 91#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
116# undef CORO_STACKGUARD 92# undef CORO_STACKGUARD
117#endif 93#endif
… …
135# define STACKLEVEL ((void *)&stacklevel) 111# define STACKLEVEL ((void *)&stacklevel)
136#endif 112#endif
137 113
138#define IN_DESTRUCT PL_dirty 114#define IN_DESTRUCT PL_dirty
139 115
140#if __GNUC__ >= 3
141# define attribute(x) __attribute__(x)
142# define expect(expr,value) __builtin_expect ((expr),(value))
143# define INLINE static inline
144#else
145# define attribute(x)
146# define expect(expr,value) (expr)
147# define INLINE static
148#endif
149
150#define expect_false(expr) expect ((expr) != 0, 0)
151#define expect_true(expr) expect ((expr) != 0, 1)
152
153#define NOINLINE attribute ((noinline))
154
155#include "CoroAPI.h" 116#include "CoroAPI.h"
156#define GCoroAPI (&coroapi) /* very sneaky */ 117#define GCoroAPI (&coroapi) /* very sneaky */
157 118
158#ifdef USE_ITHREADS 119#ifdef USE_ITHREADS
159# if CORO_PTHREAD 120# if CORO_PTHREAD
160static void *coro_thx; 121static void *coro_thx;
161# endif 122# endif
162#endif 123#endif
163 124
125#ifdef __linux
126# include <time.h> /* for timespec */
127# include <syscall.h> /* for SYS_* */
128# ifdef SYS_clock_gettime
129# define coro_clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
130# define CORO_CLOCK_MONOTONIC 1
131# define CORO_CLOCK_THREAD_CPUTIME_ID 3
132# endif
133#endif
134
164static double (*nvtime)(); /* so why doesn't it take void? */ 135static double (*nvtime)(); /* so why doesn't it take void? */
136static void (*u2time)(pTHX_ UV ret[2]);
165 137
166/* we hijack an hopefully unused CV flag for our purposes */ 138/* we hijack an hopefully unused CV flag for our purposes */
167#define CVf_SLF 0x4000 139#define CVf_SLF 0x4000
168static OP *pp_slf (pTHX); 140static OP *pp_slf (pTHX);
141static void slf_destroy (pTHX_ struct coro *coro);
169 142
170static U32 cctx_gen; 143static U32 cctx_gen;
171static size_t cctx_stacksize = CORO_STACKSIZE; 144static size_t cctx_stacksize = CORO_STACKSIZE;
172static struct CoroAPI coroapi; 145static struct CoroAPI coroapi;
173static AV *main_mainstack; /* used to differentiate between $main and others */ 146static AV *main_mainstack; /* used to differentiate between $main and others */
… …
190static SV *sv_pool_size; 163static SV *sv_pool_size;
191static SV *sv_async_pool_idle; /* description string */ 164static SV *sv_async_pool_idle; /* description string */
192static AV *av_async_pool; /* idle pool */ 165static AV *av_async_pool; /* idle pool */
193static SV *sv_Coro; /* class string */ 166static SV *sv_Coro; /* class string */
194static CV *cv_pool_handler; 167static CV *cv_pool_handler;
195static CV *cv_coro_state_new;
196 168
197/* Coro::AnyEvent */ 169/* Coro::AnyEvent */
198static SV *sv_activity; 170static SV *sv_activity;
199 171
172/* enable processtime/realtime profiling */
173static char enable_times;
174typedef U32 coro_ts[2];
175static coro_ts time_real, time_cpu;
176static char times_valid;
177
200static struct coro_cctx *cctx_first; 178static struct coro_cctx *cctx_first;
201static int cctx_count, cctx_idle; 179static int cctx_count, cctx_idle;
202 180
203enum { 181enum
182{
204 CC_MAPPED = 0x01, 183 CC_MAPPED = 0x01,
205 CC_NOREUSE = 0x02, /* throw this away after tracing */ 184 CC_NOREUSE = 0x02, /* throw this away after tracing */
206 CC_TRACE = 0x04, 185 CC_TRACE = 0x04,
207 CC_TRACE_SUB = 0x08, /* trace sub calls */ 186 CC_TRACE_SUB = 0x08, /* trace sub calls */
208 CC_TRACE_LINE = 0x10, /* trace each statement */ 187 CC_TRACE_LINE = 0x10, /* trace each statement */
… …
218 void *sptr; 197 void *sptr;
219 size_t ssize; 198 size_t ssize;
220 199
221 /* cpu state */ 200 /* cpu state */
222 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 201 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
202#ifndef NDEBUG
223 JMPENV *idle_te; /* same as idle_sp, but for top_env, TODO: remove once stable */ 203 JMPENV *idle_te; /* same as idle_sp, but for top_env */
204#endif
224 JMPENV *top_env; 205 JMPENV *top_env;
225 coro_context cctx; 206 coro_context cctx;
226 207
227 U32 gen; 208 U32 gen;
228#if CORO_USE_VALGRIND 209#if CORO_USE_VALGRIND
229 int valgrind_id; 210 int valgrind_id;
230#endif 211#endif
231 unsigned char flags; 212 unsigned char flags;
232} coro_cctx; 213} coro_cctx;
233 214
234coro_cctx *cctx_current; /* the currently running cctx */ 215static coro_cctx *cctx_current; /* the currently running cctx */
235 216
236/*****************************************************************************/ 217/*****************************************************************************/
237 218
219static MGVTBL coro_state_vtbl;
220
238enum { 221enum
222{
239 CF_RUNNING = 0x0001, /* coroutine is running */ 223 CF_RUNNING = 0x0001, /* coroutine is running */
240 CF_READY = 0x0002, /* coroutine is ready */ 224 CF_READY = 0x0002, /* coroutine is ready */
241 CF_NEW = 0x0004, /* has never been switched to */ 225 CF_NEW = 0x0004, /* has never been switched to */
242 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 226 CF_ZOMBIE = 0x0008, /* coroutine data has been freed */
227 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
228 CF_NOCANCEL = 0x0020, /* cannot cancel, set slf_frame.data to 1 (hackish) */
243}; 229};
244 230
245/* 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 */
246typedef struct 232typedef struct
247{ 233{
248 SV *defsv;
249 AV *defav;
250 SV *errsv;
251 SV *irsgv;
252 HV *hinthv;
253#define VAR(name,type) type name; 234 #define VARx(name,expr,type) type name;
254# include "state.h" 235 #include "state.h"
255#undef VAR
256} perl_slots; 236} perl_slots;
257 237
238/* how many context stack entries do we need for perl_slots */
258#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))
259 240
260/* this is a structure representing a perl-level coroutine */ 241/* this is a structure representing a perl-level coroutine */
261struct coro { 242struct coro
243{
262 /* the C coroutine allocated to this perl coroutine, if any */ 244 /* the C coroutine allocated to this perl coroutine, if any */
263 coro_cctx *cctx; 245 coro_cctx *cctx;
246
247 /* ready queue */
248 struct coro *next_ready;
264 249
265 /* state data */ 250 /* state data */
266 struct CoroSLF slf_frame; /* saved slf frame */ 251 struct CoroSLF slf_frame; /* saved slf frame */
267 AV *mainstack; 252 AV *mainstack;
268 perl_slots *slot; /* basically the saved sp */ 253 perl_slots *slot; /* basically the saved sp */
269 254
270 CV *startcv; /* the CV to execute */ 255 CV *startcv; /* the CV to execute */
271 AV *args; /* data associated with this coroutine (initial args) */ 256 AV *args; /* data associated with this coroutine (initial args) */
272 int refcnt; /* coroutines are refcounted, yes */
273 int flags; /* CF_ flags */ 257 int flags; /* CF_ flags */
274 HV *hv; /* the perl hash associated with this coro, if any */ 258 HV *hv; /* the perl hash associated with this coro, if any */
275 void (*on_destroy)(pTHX_ struct coro *coro);
276 259
277 /* statistics */ 260 /* statistics */
278 int usecount; /* number of transfers to this coro */ 261 int usecount; /* number of transfers to this coro */
279 262
280 /* coro process data */ 263 /* coro process data */
281 int prio; 264 int prio;
282 SV *except; /* exception to be thrown */ 265 SV *except; /* exception to be thrown */
283 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 */
284 269
285 /* async_pool */ 270 /* async_pool */
286 SV *saved_deffh; 271 SV *saved_deffh;
287 SV *invoke_cb; 272 SV *invoke_cb;
288 AV *invoke_av; 273 AV *invoke_av;
289 274
275 /* on_enter/on_leave */
276 AV *on_enter;
277 AV *on_leave;
278
279 /* swap_sv */
280 AV *swap_sv;
281
282 /* times */
283 coro_ts t_cpu, t_real;
284
290 /* linked list */ 285 /* linked list */
291 struct coro *next, *prev; 286 struct coro *next, *prev;
292}; 287};
293 288
294typedef struct coro *Coro__State; 289typedef struct coro *Coro__State;
295typedef struct coro *Coro__State_or_hashref; 290typedef struct coro *Coro__State_or_hashref;
296 291
297/* the following variables are effectively part of the perl context */ 292/* the following variables are effectively part of the perl context */
298/* and get copied between struct coro and these variables */ 293/* and get copied between struct coro and these variables */
299/* the mainr easonw e don't support windows process emulation */ 294/* the main reason we don't support windows process emulation */
300static struct CoroSLF slf_frame; /* the current slf frame */ 295static struct CoroSLF slf_frame; /* the current slf frame */
301 296
302/** Coro ********************************************************************/ 297/** Coro ********************************************************************/
303 298
304#define PRIO_MAX 3 299#define CORO_PRIO_MAX 3
305#define PRIO_HIGH 1 300#define CORO_PRIO_HIGH 1
306#define PRIO_NORMAL 0 301#define CORO_PRIO_NORMAL 0
307#define PRIO_LOW -1 302#define CORO_PRIO_LOW -1
308#define PRIO_IDLE -3 303#define CORO_PRIO_IDLE -3
309#define PRIO_MIN -4 304#define CORO_PRIO_MIN -4
310 305
311/* for Coro.pm */ 306/* for Coro.pm */
312static SV *coro_current; 307static SV *coro_current;
313static SV *coro_readyhook; 308static SV *coro_readyhook;
314static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1]; 309static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
315static CV *cv_coro_run, *cv_coro_terminate; 310static CV *cv_coro_run;
316static struct coro *coro_first; 311static struct coro *coro_first;
317#define coro_nready coroapi.nready 312#define coro_nready coroapi.nready
318 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
319/** lowlevel stuff **********************************************************/ 409/** lowlevel stuff **********************************************************/
320 410
321static SV * 411static SV * ecb_noinline
322coro_get_sv (pTHX_ const char *name, int create) 412coro_get_sv (pTHX_ const char *name, int create)
323{ 413{
324#if PERL_VERSION_ATLEAST (5,10,0) 414#if PERL_VERSION_ATLEAST (5,10,0)
325 /* 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 */
326 get_sv (name, create); 416 get_sv (name, create);
327#endif 417#endif
328 return get_sv (name, create); 418 return get_sv (name, create);
329} 419}
330 420
331static AV * 421static AV * ecb_noinline
332coro_get_av (pTHX_ const char *name, int create) 422coro_get_av (pTHX_ const char *name, int create)
333{ 423{
334#if PERL_VERSION_ATLEAST (5,10,0) 424#if PERL_VERSION_ATLEAST (5,10,0)
335 /* 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 */
336 get_av (name, create); 426 get_av (name, create);
337#endif 427#endif
338 return get_av (name, create); 428 return get_av (name, create);
339} 429}
340 430
341static HV * 431static HV * ecb_noinline
342coro_get_hv (pTHX_ const char *name, int create) 432coro_get_hv (pTHX_ const char *name, int create)
343{ 433{
344#if PERL_VERSION_ATLEAST (5,10,0) 434#if PERL_VERSION_ATLEAST (5,10,0)
345 /* 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 */
346 get_hv (name, create); 436 get_hv (name, create);
347#endif 437#endif
348 return get_hv (name, create); 438 return get_hv (name, create);
349} 439}
350 440
351/* may croak */ 441ecb_inline void
352INLINE CV * 442coro_times_update (void)
353coro_sv_2cv (pTHX_ SV *sv)
354{ 443{
355 HV *st; 444#ifdef coro_clock_gettime
356 GV *gvp; 445 struct timespec ts;
357 return sv_2cv (sv, &st, &gvp, 0); 446
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];
358} 486}
359 487
360/*****************************************************************************/ 488/*****************************************************************************/
361/* magic glue */ 489/* magic glue */
362 490
363#define CORO_MAGIC_type_cv 26 491#define CORO_MAGIC_type_cv 26
364#define CORO_MAGIC_type_state PERL_MAGIC_ext 492#define CORO_MAGIC_type_state PERL_MAGIC_ext
365 493
366#define CORO_MAGIC_NN(sv, type) \ 494#define CORO_MAGIC_NN(sv, type) \
367 (expect_true (SvMAGIC (sv)->mg_type == type) \ 495 (ecb_expect_true (SvMAGIC (sv)->mg_type == type) \
368 ? SvMAGIC (sv) \ 496 ? SvMAGIC (sv) \
369 : mg_find (sv, type)) 497 : mg_find (sv, type))
370 498
371#define CORO_MAGIC(sv, type) \ 499#define CORO_MAGIC(sv, type) \
372 (expect_true (SvMAGIC (sv)) \ 500 (ecb_expect_true (SvMAGIC (sv)) \
373 ? CORO_MAGIC_NN (sv, type) \ 501 ? CORO_MAGIC_NN (sv, type) \
374 : 0) 502 : 0)
375 503
376#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv) 504#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
377#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state) 505#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
378 506
379INLINE struct coro * 507ecb_inline MAGIC *
508SvSTATEhv_p (pTHX_ SV *coro)
509{
510 MAGIC *mg;
511
512 if (ecb_expect_true (
513 SvTYPE (coro) == SVt_PVHV
514 && (mg = CORO_MAGIC_state (coro))
515 && mg->mg_virtual == &coro_state_vtbl
516 ))
517 return mg;
518
519 return 0;
520}
521
522ecb_inline struct coro *
380SvSTATE_ (pTHX_ SV *coro) 523SvSTATE_ (pTHX_ SV *coro)
381{ 524{
382 HV *stash;
383 MAGIC *mg; 525 MAGIC *mg;
384 526
385 if (SvROK (coro)) 527 if (SvROK (coro))
386 coro = SvRV (coro); 528 coro = SvRV (coro);
387 529
388 if (expect_false (SvTYPE (coro) != SVt_PVHV)) 530 mg = SvSTATEhv_p (aTHX_ coro);
531 if (!mg)
389 croak ("Coro::State object required"); 532 croak ("Coro::State object required");
390 533
391 stash = SvSTASH (coro);
392 if (expect_false (stash != coro_stash && stash != coro_state_stash))
393 {
394 /* very slow, but rare, check */
395 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
396 croak ("Coro::State object required");
397 }
398
399 mg = CORO_MAGIC_state (coro);
400 return (struct coro *)mg->mg_ptr; 534 return (struct coro *)mg->mg_ptr;
401} 535}
402 536
403#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 537#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
404 538
… …
407#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 541#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
408 542
409/*****************************************************************************/ 543/*****************************************************************************/
410/* padlist management and caching */ 544/* padlist management and caching */
411 545
412static AV * 546ecb_inline PADLIST *
413coro_derive_padlist (pTHX_ CV *cv) 547coro_derive_padlist (pTHX_ CV *cv)
414{ 548{
415 AV *padlist = CvPADLIST (cv); 549 PADLIST *padlist = CvPADLIST (cv);
416 AV *newpadlist, *newpad; 550 PADLIST *newpadlist;
551 PAD *newpad;
552 PADOFFSET const off = PadlistMAX (padlist) + 1;
417 553
418 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. */
419 AvREAL_off (newpadlist); 557 AvREAL_off (newpadlist);
558#endif
420#if PERL_VERSION_ATLEAST (5,10,0) 559#if PERL_VERSION_ATLEAST (5,10,0)
421 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1); 560 Perl_pad_push (aTHX_ padlist, off);
422#else 561#else
423 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 562 Perl_pad_push (aTHX_ padlist, off, 1);
424#endif 563#endif
425 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 564 newpad = PadlistARRAY (padlist)[off];
426 --AvFILLp (padlist); 565 PadlistMAX (padlist) = off - 1;
427 566
428 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0])); 567 /* Already extended to 2 elements by newPADLIST. */
429 av_store (newpadlist, 1, (SV *)newpad); 568 PadlistMAX (newpadlist) = 1;
569 PadlistNAMES (newpadlist) = (PADNAMELIST *)SvREFCNT_inc_NN (PadlistNAMES (padlist));
570 PadlistARRAY (newpadlist)[1] = newpad;
430 571
431 return newpadlist; 572 return newpadlist;
432} 573}
433 574
434static void 575ecb_inline void
435free_padlist (pTHX_ AV *padlist) 576free_padlist (pTHX_ PADLIST *padlist)
436{ 577{
437 /* may be during global destruction */ 578 /* may be during global destruction */
438 if (!IN_DESTRUCT) 579 if (!IN_DESTRUCT)
439 { 580 {
440 I32 i = AvFILLp (padlist); 581 I32 i = PadlistMAX (padlist);
441 582
442 while (i > 0) /* special-case index 0 */ 583 while (i > 0) /* special-case index 0 */
443 { 584 {
444 /* we try to be extra-careful here */ 585 /* we try to be extra-careful here */
445 AV *av = (AV *)AvARRAY (padlist)[i--]; 586 PAD *pad = PadlistARRAY (padlist)[i--];
446 I32 j = AvFILLp (av); 587 I32 j = PadMAX (pad);
447 588
448 while (j >= 0) 589 while (j >= 0)
449 SvREFCNT_dec (AvARRAY (av)[j--]); 590 SvREFCNT_dec (PadARRAY (pad)[j--]);
450 591
451 AvFILLp (av) = -1; 592 PadMAX (pad) = -1;
452 SvREFCNT_dec (av); 593 SvREFCNT_dec (pad);
453 } 594 }
454 595
455 SvREFCNT_dec (AvARRAY (padlist)[0]); 596 SvREFCNT_dec (PadlistNAMES (padlist));
456 597
598#ifdef NEWPADAPI
599 Safefree (PadlistARRAY (padlist));
600 Safefree (padlist);
601#else
457 AvFILLp (padlist) = -1; 602 AvFILLp (padlist) = -1;
603 AvREAL_off (padlist);
458 SvREFCNT_dec ((SV*)padlist); 604 SvREFCNT_dec ((SV*)padlist);
605#endif
459 } 606 }
460} 607}
461 608
462static int 609static int
463coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 610coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
464{ 611{
465 AV *padlist; 612 PADLIST *padlist;
466 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;
467 615
468 /* casting is fun. */ 616 /* perl manages to free our internal AV and _then_ call us */
469 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 617 if (IN_DESTRUCT)
618 return 0;
619
620 while (len--)
470 free_padlist (aTHX_ padlist); 621 free_padlist (aTHX_ padlists[len]);
471
472 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
473 622
474 return 0; 623 return 0;
475} 624}
476 625
477static MGVTBL coro_cv_vtbl = { 626static MGVTBL coro_cv_vtbl = {
478 0, 0, 0, 0, 627 0, 0, 0, 0,
479 coro_cv_free 628 coro_cv_free
480}; 629};
481 630
482/* the next two functions merely cache the padlists */ 631/* the next two functions merely cache the padlists */
483static void 632ecb_inline void
484get_padlist (pTHX_ CV *cv) 633get_padlist (pTHX_ CV *cv)
485{ 634{
486 MAGIC *mg = CORO_MAGIC_cv (cv); 635 MAGIC *mg = CORO_MAGIC_cv (cv);
487 AV *av; 636 size_t *lenp;
488 637
489 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 638 if (ecb_expect_true (mg && *(lenp = (size_t *)mg->mg_ptr)))
490 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 639 CvPADLIST (cv) = ((PADLIST **)(mg->mg_ptr + sizeof(size_t)))[--*lenp];
491 else 640 else
492 { 641 {
493#if CORO_PREFER_PERL_FUNCTIONS 642#if CORO_PREFER_PERL_FUNCTIONS
494 /* this is probably cleaner? but also slower! */ 643 /* this is probably cleaner? but also slower! */
495 /* in practise, it seems to be less stable */ 644 /* in practise, it seems to be less stable */
… …
501 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 650 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
502#endif 651#endif
503 } 652 }
504} 653}
505 654
506static void 655ecb_inline void
507put_padlist (pTHX_ CV *cv) 656put_padlist (pTHX_ CV *cv)
508{ 657{
509 MAGIC *mg = CORO_MAGIC_cv (cv); 658 MAGIC *mg = CORO_MAGIC_cv (cv);
510 AV *av;
511 659
512 if (expect_false (!mg)) 660 if (ecb_expect_false (!mg))
661 {
513 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);
514 670
515 av = (AV *)mg->mg_obj; 671 ((PADLIST **)(mg->mg_ptr + sizeof (size_t))) [(*(size_t *)mg->mg_ptr)++] = CvPADLIST (cv);
516
517 if (expect_false (AvFILLp (av) >= AvMAX (av)))
518 av_extend (av, AvFILLp (av) + 1);
519
520 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
521} 672}
522 673
523/** 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);
524 730
525static void 731static void
526load_perl (pTHX_ Coro__State c) 732load_perl (pTHX_ Coro__State c)
527{ 733{
528 perl_slots *slot = c->slot; 734 perl_slots *slot = c->slot;
529 c->slot = 0; 735 c->slot = 0;
530 736
531 PL_mainstack = c->mainstack; 737 PL_mainstack = c->mainstack;
532 738
533 GvSV (PL_defgv) = slot->defsv; 739#if CORO_JIT
534 GvAV (PL_defgv) = slot->defav; 740 load_perl_slots (slot);
535 GvSV (PL_errgv) = slot->errsv; 741#else
536 GvSV (irsgv) = slot->irsgv;
537 GvHV (PL_hintgv) = slot->hinthv;
538
539 #define VAR(name,type) PL_ ## name = slot->name; 742 #define VARx(name,expr,type) expr = slot->name;
540 # include "state.h" 743 #include "state.h"
541 #undef VAR 744#endif
542 745
543 { 746 {
544 dSP; 747 dSP;
545 748
546 CV *cv; 749 CV *cv;
547 750
548 /* now do the ugly restore mess */ 751 /* now do the ugly restore mess */
549 while (expect_true (cv = (CV *)POPs)) 752 while (ecb_expect_true (cv = (CV *)POPs))
550 { 753 {
551 put_padlist (aTHX_ cv); /* mark this padlist as available */ 754 put_padlist (aTHX_ cv); /* mark this padlist as available */
552 CvDEPTH (cv) = PTR2IV (POPs); 755 CvDEPTH (cv) = PTR2IV (POPs);
553 CvPADLIST (cv) = (AV *)POPs; 756 CvPADLIST (cv) = (PADLIST *)POPs;
554 } 757 }
555 758
556 PUTBACK; 759 PUTBACK;
557 } 760 }
558 761
559 slf_frame = c->slf_frame; 762 slf_frame = c->slf_frame;
560 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);
561} 782}
562 783
563static void 784static void
564save_perl (pTHX_ Coro__State c) 785save_perl (pTHX_ Coro__State c)
565{ 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
566 c->except = CORO_THROW; 805 c->except = CORO_THROW;
567 c->slf_frame = slf_frame; 806 c->slf_frame = slf_frame;
568 807
569 { 808 {
570 dSP; 809 dSP;
… …
579 818
580 XPUSHs (Nullsv); 819 XPUSHs (Nullsv);
581 /* this loop was inspired by pp_caller */ 820 /* this loop was inspired by pp_caller */
582 for (;;) 821 for (;;)
583 { 822 {
584 while (expect_true (cxix >= 0)) 823 while (ecb_expect_true (cxix >= 0))
585 { 824 {
586 PERL_CONTEXT *cx = &ccstk[cxix--]; 825 PERL_CONTEXT *cx = &ccstk[cxix--];
587 826
588 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))
589 { 828 {
590 CV *cv = cx->blk_sub.cv; 829 CV *cv = cx->blk_sub.cv;
591 830
592 if (expect_true (CvDEPTH (cv))) 831 if (ecb_expect_true (CvDEPTH (cv)))
593 { 832 {
594 EXTEND (SP, 3); 833 EXTEND (SP, 3);
595 PUSHs ((SV *)CvPADLIST (cv)); 834 PUSHs ((SV *)CvPADLIST (cv));
596 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv))); 835 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
597 PUSHs ((SV *)cv); 836 PUSHs ((SV *)cv);
… …
600 get_padlist (aTHX_ cv); 839 get_padlist (aTHX_ cv);
601 } 840 }
602 } 841 }
603 } 842 }
604 843
605 if (expect_true (top_si->si_type == PERLSI_MAIN)) 844 if (ecb_expect_true (top_si->si_type == PERLSI_MAIN))
606 break; 845 break;
607 846
608 top_si = top_si->si_prev; 847 top_si = top_si->si_prev;
609 ccstk = top_si->si_cxstack; 848 ccstk = top_si->si_cxstack;
610 cxix = top_si->si_cxix; 849 cxix = top_si->si_cxix;
… …
612 851
613 PUTBACK; 852 PUTBACK;
614 } 853 }
615 854
616 /* allocate some space on the context stack for our purposes */ 855 /* allocate some space on the context stack for our purposes */
617 /* we manually unroll here, as usually 2 slots is enough */ 856 if (ecb_expect_false (cxstack_ix + (int)SLOT_COUNT >= cxstack_max))
618 if (SLOT_COUNT >= 1) CXINC;
619 if (SLOT_COUNT >= 2) CXINC;
620 if (SLOT_COUNT >= 3) CXINC;
621 { 857 {
622 int i; 858 unsigned int i;
859
623 for (i = 3; i < SLOT_COUNT; ++i) 860 for (i = 0; i < SLOT_COUNT; ++i)
624 CXINC; 861 CXINC;
625 } 862
626 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 863 cxstack_ix -= SLOT_COUNT; /* undo allocation */
864 }
627 865
628 c->mainstack = PL_mainstack; 866 c->mainstack = PL_mainstack;
629 867
630 { 868 {
631 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 869 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
632 870
633 slot->defav = GvAV (PL_defgv); 871#if CORO_JIT
634 slot->defsv = DEFSV; 872 save_perl_slots (slot);
635 slot->errsv = ERRSV; 873#else
636 slot->irsgv = GvSV (irsgv);
637 slot->hinthv = GvHV (PL_hintgv);
638
639 #define VAR(name,type) slot->name = PL_ ## name; 874 #define VARx(name,expr,type) slot->name = expr;
640 # include "state.h" 875 #include "state.h"
641 #undef VAR 876#endif
642 } 877 }
643} 878}
644 879
645/* 880/*
646 * allocate various perl stacks. This is almost an exact copy 881 * allocate various perl stacks. This is almost an exact copy
… …
652# define coro_init_stacks(thx) init_stacks () 887# define coro_init_stacks(thx) init_stacks ()
653#else 888#else
654static void 889static void
655coro_init_stacks (pTHX) 890coro_init_stacks (pTHX)
656{ 891{
657 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() */
658 PL_curstackinfo->si_type = PERLSI_MAIN; 893 PL_curstackinfo->si_type = PERLSI_MAIN;
659 PL_curstack = PL_curstackinfo->si_stack; 894 PL_curstack = PL_curstackinfo->si_stack;
660 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 895 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
661 896
662 PL_stack_base = AvARRAY(PL_curstack); 897 PL_stack_base = AvARRAY(PL_curstack);
… …
677#endif 912#endif
678 913
679 New(54,PL_scopestack,8,I32); 914 New(54,PL_scopestack,8,I32);
680 PL_scopestack_ix = 0; 915 PL_scopestack_ix = 0;
681 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
682 920
683 New(54,PL_savestack,24,ANY); 921 New(54,PL_savestack,24,ANY);
684 PL_savestack_ix = 0; 922 PL_savestack_ix = 0;
685 PL_savestack_max = 24; 923 PL_savestack_max = 24;
686 924
… …
714 } 952 }
715 953
716 Safefree (PL_tmps_stack); 954 Safefree (PL_tmps_stack);
717 Safefree (PL_markstack); 955 Safefree (PL_markstack);
718 Safefree (PL_scopestack); 956 Safefree (PL_scopestack);
957#if HAS_SCOPESTACK_NAME
958 Safefree (PL_scopestack_name);
959#endif
719 Safefree (PL_savestack); 960 Safefree (PL_savestack);
720#if !PERL_VERSION_ATLEAST (5,10,0) 961#if !PERL_VERSION_ATLEAST (5,10,0)
721 Safefree (PL_retstack); 962 Safefree (PL_retstack);
722#endif 963#endif
723} 964}
… …
769#endif 1010#endif
770 1011
771/* 1012/*
772 * This overrides the default magic get method of %SIG elements. 1013 * This overrides the default magic get method of %SIG elements.
773 * 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
774 * 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),
775 * readback here. 1016 * we just provide our own readback here.
776 * We only do this when the hook is != 0, as they are often set to 0 temporarily,
777 * not expecting this to actually change the hook. This is a potential problem
778 * when a schedule happens then, but we ignore this.
779 */ 1017 */
780static int 1018static int ecb_cold
781coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 1019coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
782{ 1020{
783 const char *s = MgPV_nolen_const (mg); 1021 const char *s = MgPV_nolen_const (mg);
784 1022
785 if (*s == '_') 1023 if (*s == '_')
786 { 1024 {
787 SV **svp = 0; 1025 SV **svp = 0;
788 1026
789 if (strEQ (s, "__DIE__" )) svp = &PL_diehook; 1027 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
790 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 1028 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
791 1029
792 if (svp) 1030 if (svp)
793 { 1031 {
794 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);
795 return 0; 1042 return 0;
796 } 1043 }
797 } 1044 }
798 1045
799 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 1046 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
800} 1047}
801 1048
802static int 1049static int ecb_cold
803coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1050coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
804{ 1051{
805 const char *s = MgPV_nolen_const (mg); 1052 const char *s = MgPV_nolen_const (mg);
806 1053
807 if (*s == '_') 1054 if (*s == '_')
… …
821 } 1068 }
822 1069
823 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0; 1070 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
824} 1071}
825 1072
826static int 1073static int ecb_cold
827coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1074coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
828{ 1075{
829 const char *s = MgPV_nolen_const (mg); 1076 const char *s = MgPV_nolen_const (mg);
830 1077
831 if (*s == '_') 1078 if (*s == '_')
… …
836 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 1083 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
837 1084
838 if (svp) 1085 if (svp)
839 { 1086 {
840 SV *old = *svp; 1087 SV *old = *svp;
841 *svp = newSVsv (sv); 1088 *svp = SvOK (sv) ? newSVsv (sv) : 0;
842 SvREFCNT_dec (old); 1089 SvREFCNT_dec (old);
843 return 0; 1090 return 0;
844 } 1091 }
845 } 1092 }
846 1093
… …
864slf_check_repeat (pTHX_ struct CoroSLF *frame) 1111slf_check_repeat (pTHX_ struct CoroSLF *frame)
865{ 1112{
866 return 1; 1113 return 1;
867} 1114}
868 1115
869static UNOP coro_setup_op; 1116static UNOP init_perl_op;
870 1117
871static void NOINLINE /* noinline to keep it out of the transfer fast path */ 1118ecb_noinline static void /* noinline to keep it out of the transfer fast path */
872coro_setup (pTHX_ struct coro *coro) 1119init_perl (pTHX_ struct coro *coro)
873{ 1120{
874 /* 1121 /*
875 * emulate part of the perl startup here. 1122 * emulate part of the perl startup here.
876 */ 1123 */
877 coro_init_stacks (aTHX); 1124 coro_init_stacks (aTHX);
… …
884 PL_comppad_name_fill = 0; 1131 PL_comppad_name_fill = 0;
885 PL_comppad_name_floor = 0; 1132 PL_comppad_name_floor = 0;
886 PL_curpm = 0; 1133 PL_curpm = 0;
887 PL_curpad = 0; 1134 PL_curpad = 0;
888 PL_localizing = 0; 1135 PL_localizing = 0;
889 PL_dirty = 0;
890 PL_restartop = 0; 1136 PL_restartop = 0;
891#if PERL_VERSION_ATLEAST (5,10,0) 1137#if PERL_VERSION_ATLEAST (5,10,0)
892 PL_parser = 0; 1138 PL_parser = 0;
893#endif 1139#endif
894 PL_hints = 0; 1140 PL_hints = 0;
895 1141
896 /* recreate the die/warn hooks */ 1142 /* recreate the die/warn hooks */
897 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1143 PL_diehook = SvREFCNT_inc (rv_diehook);
898 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1144 PL_warnhook = SvREFCNT_inc (rv_warnhook);
899 1145
900 GvSV (PL_defgv) = newSV (0); 1146 GvSV (PL_defgv) = newSV (0);
901 GvAV (PL_defgv) = coro->args; coro->args = 0; 1147 GvAV (PL_defgv) = coro->args; coro->args = 0;
902 GvSV (PL_errgv) = newSV (0); 1148 GvSV (PL_errgv) = newSV (0);
903 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);
904 GvHV (PL_hintgv) = 0; 1150 GvHV (PL_hintgv) = 0;
… …
924 /* 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
925 * 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.
926 */ 1172 */
927 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 */
928 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;
929 1176
930 /* 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 */
931 coro_setup_op.op_next = PL_op; 1178 init_perl_op.op_next = PL_op;
932 coro_setup_op.op_type = OP_ENTERSUB; 1179 init_perl_op.op_type = OP_ENTERSUB;
933 coro_setup_op.op_ppaddr = pp_slf; 1180 init_perl_op.op_ppaddr = pp_slf;
934 /* no flags etc. required, as an init function won't be called */ 1181 /* no flags etc. required, as an init function won't be called */
935 1182
936 PL_op = (OP *)&coro_setup_op; 1183 PL_op = (OP *)&init_perl_op;
937 1184
938 /* copy throw, in case it was set before coro_setup */ 1185 /* copy throw, in case it was set before init_perl */
939 CORO_THROW = coro->except; 1186 CORO_THROW = coro->except;
1187
1188 SWAP_SVS (coro);
1189
1190 if (ecb_expect_false (enable_times))
1191 {
1192 coro_times_update ();
1193 coro_times_sub (coro);
1194 }
940} 1195}
941 1196
942static void 1197static void
943coro_unwind_stacks (pTHX) 1198coro_unwind_stacks (pTHX)
944{ 1199{
… …
959 dounwind (-1); 1214 dounwind (-1);
960 } 1215 }
961} 1216}
962 1217
963static void 1218static void
964coro_destruct_perl (pTHX_ struct coro *coro) 1219destroy_perl (pTHX_ struct coro *coro)
965{ 1220{
1221 SV *svf [9];
1222
1223 {
1224 SV *old_current = SvRV (coro_current);
1225 struct coro *current = SvSTATE (old_current);
1226
1227 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1228
1229 save_perl (aTHX_ current);
1230
1231 /* this will cause transfer_check to croak on block*/
1232 SvRV_set (coro_current, (SV *)coro->hv);
1233
1234 load_perl (aTHX_ coro);
1235
966 coro_unwind_stacks (aTHX); 1236 coro_unwind_stacks (aTHX);
967 1237
968 SvREFCNT_dec (GvSV (PL_defgv)); 1238 /* restore swapped sv's */
969 SvREFCNT_dec (GvAV (PL_defgv)); 1239 SWAP_SVS (coro);
970 SvREFCNT_dec (GvSV (PL_errgv));
971 SvREFCNT_dec (PL_defoutgv);
972 SvREFCNT_dec (PL_rs);
973 SvREFCNT_dec (GvSV (irsgv));
974 SvREFCNT_dec (GvHV (PL_hintgv));
975 1240
976 SvREFCNT_dec (PL_diehook); 1241 coro_destruct_stacks (aTHX);
977 SvREFCNT_dec (PL_warnhook); 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);
978 1258 }
1259
1260 {
1261 unsigned int i;
1262
1263 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i)
1264 SvREFCNT_dec (svf [i]);
1265
979 SvREFCNT_dec (coro->saved_deffh); 1266 SvREFCNT_dec (coro->saved_deffh);
980 SvREFCNT_dec (coro->rouse_cb); 1267 SvREFCNT_dec (coro->rouse_cb);
981 SvREFCNT_dec (coro->invoke_cb); 1268 SvREFCNT_dec (coro->invoke_cb);
982 SvREFCNT_dec (coro->invoke_av); 1269 SvREFCNT_dec (coro->invoke_av);
983 1270 }
984 coro_destruct_stacks (aTHX);
985} 1271}
986 1272
987INLINE void 1273ecb_inline void
988free_coro_mortal (pTHX) 1274free_coro_mortal (pTHX)
989{ 1275{
990 if (expect_true (coro_mortal)) 1276 if (ecb_expect_true (coro_mortal))
991 { 1277 {
992 SvREFCNT_dec (coro_mortal); 1278 SvREFCNT_dec ((SV *)coro_mortal);
993 coro_mortal = 0; 1279 coro_mortal = 0;
994 } 1280 }
995} 1281}
996 1282
997static int 1283static int
… …
1130 1416
1131 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 */
1132} 1418}
1133 1419
1134/* 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 */
1135static void NOINLINE 1421static void ecb_noinline
1136cctx_prepare (pTHX) 1422cctx_prepare (pTHX)
1137{ 1423{
1138 PL_top_env = &PL_start_env; 1424 PL_top_env = &PL_start_env;
1139 1425
1140 if (cctx_current->flags & CC_TRACE) 1426 if (cctx_current->flags & CC_TRACE)
… …
1151 slf_frame.prepare = slf_prepare_set_stacklevel; 1437 slf_frame.prepare = slf_prepare_set_stacklevel;
1152 slf_frame.check = slf_check_set_stacklevel; 1438 slf_frame.check = slf_check_set_stacklevel;
1153} 1439}
1154 1440
1155/* 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 */
1156INLINE void 1442ecb_inline void
1157transfer_tail (pTHX) 1443transfer_tail (pTHX)
1158{ 1444{
1159 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);
1160} 1458}
1161 1459
1162/* 1460/*
1163 * this is a _very_ stripped down perl interpreter ;) 1461 * this is a _very_ stripped down perl interpreter ;)
1164 */ 1462 */
… …
1186 /* 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 */
1187 PL_restartop = PL_op; 1485 PL_restartop = PL_op;
1188 perl_run (PL_curinterp); 1486 perl_run (PL_curinterp);
1189 /* 1487 /*
1190 * Unfortunately, there is no way to get at the return values of the 1488 * Unfortunately, there is no way to get at the return values of the
1191 * coro body here, as perl_run destroys these 1489 * coro body here, as perl_run destroys these. Likewise, we cannot catch
1490 * runtime errors here, as this is just a random interpreter, not a thread.
1192 */ 1491 */
1193 1492
1194 /* 1493 /*
1195 * 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
1196 * 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)
1197 * 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
1198 * bootstrap-time "top" top_env, as we cannot restore the "main" 1497 * doing in that case. YMMV.
1199 * coroutine as Coro has no such concept.
1200 * This actually isn't valid with the pthread backend, but OSes requiring
1201 * that backend are too broken to do it in a standards-compliant way.
1202 */ 1498 */
1203 PL_top_env = main_top_env; 1499 perlish_exit (aTHX);
1204 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1205 } 1500 }
1206} 1501}
1207 1502
1208static coro_cctx * 1503static coro_cctx *
1209cctx_new () 1504cctx_new (void)
1210{ 1505{
1211 coro_cctx *cctx; 1506 coro_cctx *cctx;
1212 1507
1213 ++cctx_count; 1508 ++cctx_count;
1214 New (0, cctx, 1, coro_cctx); 1509 New (0, cctx, 1, coro_cctx);
… …
1220 return cctx; 1515 return cctx;
1221} 1516}
1222 1517
1223/* create a new cctx only suitable as source */ 1518/* create a new cctx only suitable as source */
1224static coro_cctx * 1519static coro_cctx *
1225cctx_new_empty () 1520cctx_new_empty (void)
1226{ 1521{
1227 coro_cctx *cctx = cctx_new (); 1522 coro_cctx *cctx = cctx_new ();
1228 1523
1229 cctx->sptr = 0; 1524 cctx->sptr = 0;
1230 coro_create (&cctx->cctx, 0, 0, 0, 0); 1525 coro_create (&cctx->cctx, 0, 0, 0, 0);
… …
1232 return cctx; 1527 return cctx;
1233} 1528}
1234 1529
1235/* create a new cctx suitable as destination/running a perl interpreter */ 1530/* create a new cctx suitable as destination/running a perl interpreter */
1236static coro_cctx * 1531static coro_cctx *
1237cctx_new_run () 1532cctx_new_run (void)
1238{ 1533{
1239 coro_cctx *cctx = cctx_new (); 1534 coro_cctx *cctx = cctx_new ();
1240 void *stack_start; 1535 void *stack_start;
1241 size_t stack_size; 1536 size_t stack_size;
1242 1537
1243#if HAVE_MMAP 1538#if HAVE_MMAP
1244 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE; 1539 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1245 /* mmap supposedly does allocate-on-write for us */ 1540 /* mmap supposedly does allocate-on-write for us */
1246 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0); 1541 cctx->sptr = mmap (0, cctx->ssize, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_ANONYMOUS, -1, 0);
1247 1542
1248 if (cctx->sptr != (void *)-1) 1543 if (cctx->sptr != (void *)-1)
1249 { 1544 {
1250 #if CORO_STACKGUARD 1545 #if CORO_STACKGUARD
1251 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE); 1546 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
… …
1283cctx_destroy (coro_cctx *cctx) 1578cctx_destroy (coro_cctx *cctx)
1284{ 1579{
1285 if (!cctx) 1580 if (!cctx)
1286 return; 1581 return;
1287 1582
1288 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary? 1583 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1289 1584
1290 --cctx_count; 1585 --cctx_count;
1291 coro_destroy (&cctx->cctx); 1586 coro_destroy (&cctx->cctx);
1292 1587
1293 /* coro_transfer creates new, empty cctx's */ 1588 /* coro_transfer creates new, empty cctx's */
… …
1312#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE)) 1607#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE))
1313 1608
1314static coro_cctx * 1609static coro_cctx *
1315cctx_get (pTHX) 1610cctx_get (pTHX)
1316{ 1611{
1317 while (expect_true (cctx_first)) 1612 while (ecb_expect_true (cctx_first))
1318 { 1613 {
1319 coro_cctx *cctx = cctx_first; 1614 coro_cctx *cctx = cctx_first;
1320 cctx_first = cctx->next; 1615 cctx_first = cctx->next;
1321 --cctx_idle; 1616 --cctx_idle;
1322 1617
1323 if (expect_true (!CCTX_EXPIRED (cctx))) 1618 if (ecb_expect_true (!CCTX_EXPIRED (cctx)))
1324 return cctx; 1619 return cctx;
1325 1620
1326 cctx_destroy (cctx); 1621 cctx_destroy (cctx);
1327 } 1622 }
1328 1623
… …
1333cctx_put (coro_cctx *cctx) 1628cctx_put (coro_cctx *cctx)
1334{ 1629{
1335 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1630 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr));
1336 1631
1337 /* free another cctx if overlimit */ 1632 /* free another cctx if overlimit */
1338 if (expect_false (cctx_idle >= cctx_max_idle)) 1633 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1339 { 1634 {
1340 coro_cctx *first = cctx_first; 1635 coro_cctx *first = cctx_first;
1341 cctx_first = first->next; 1636 cctx_first = first->next;
1342 --cctx_idle; 1637 --cctx_idle;
1343 1638
… …
1354static void 1649static void
1355transfer_check (pTHX_ struct coro *prev, struct coro *next) 1650transfer_check (pTHX_ struct coro *prev, struct coro *next)
1356{ 1651{
1357 /* TODO: throwing up here is considered harmful */ 1652 /* TODO: throwing up here is considered harmful */
1358 1653
1359 if (expect_true (prev != next)) 1654 if (ecb_expect_true (prev != next))
1360 { 1655 {
1361 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1656 if (ecb_expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1362 croak ("Coro::State::transfer called with a suspended prev Coro::State, but can only transfer from running or new states,"); 1657 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1363 1658
1364 if (expect_false (next->flags & CF_RUNNING)) 1659 if (ecb_expect_false (next->flags & (CF_RUNNING | CF_ZOMBIE | CF_SUSPENDED)))
1365 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states,");
1366
1367 if (expect_false (next->flags & CF_DESTROYED))
1368 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states,"); 1660 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1369 1661
1370#if !PERL_VERSION_ATLEAST (5,10,0) 1662#if !PERL_VERSION_ATLEAST (5,10,0)
1371 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1663 if (ecb_expect_false (PL_lex_state != LEX_NOTPARSING))
1372 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,"); 1664 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1373#endif 1665#endif
1374 } 1666 }
1375} 1667}
1376 1668
1377/* always use the TRANSFER macro */ 1669/* always use the TRANSFER macro */
1378static void NOINLINE /* noinline so we have a fixed stackframe */ 1670static void ecb_noinline /* noinline so we have a fixed stackframe */
1379transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1671transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1380{ 1672{
1381 dSTACKLEVEL; 1673 dSTACKLEVEL;
1382 1674
1383 /* sometimes transfer is only called to set idle_sp */ 1675 /* sometimes transfer is only called to set idle_sp */
1384 if (expect_false (!prev)) 1676 if (ecb_expect_false (!prev))
1385 { 1677 {
1386 cctx_current->idle_sp = STACKLEVEL; 1678 cctx_current->idle_sp = STACKLEVEL;
1387 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1679 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1388 } 1680 }
1389 else if (expect_true (prev != next)) 1681 else if (ecb_expect_true (prev != next))
1390 { 1682 {
1391 coro_cctx *cctx_prev; 1683 coro_cctx *cctx_prev;
1392 1684
1393 if (expect_false (prev->flags & CF_NEW)) 1685 if (ecb_expect_false (prev->flags & CF_NEW))
1394 { 1686 {
1395 /* create a new empty/source context */ 1687 /* create a new empty/source context */
1396 prev->flags &= ~CF_NEW; 1688 prev->flags &= ~CF_NEW;
1397 prev->flags |= CF_RUNNING; 1689 prev->flags |= CF_RUNNING;
1398 } 1690 }
… …
1401 next->flags |= CF_RUNNING; 1693 next->flags |= CF_RUNNING;
1402 1694
1403 /* first get rid of the old state */ 1695 /* first get rid of the old state */
1404 save_perl (aTHX_ prev); 1696 save_perl (aTHX_ prev);
1405 1697
1406 if (expect_false (next->flags & CF_NEW)) 1698 if (ecb_expect_false (next->flags & CF_NEW))
1407 { 1699 {
1408 /* need to start coroutine */ 1700 /* need to start coroutine */
1409 next->flags &= ~CF_NEW; 1701 next->flags &= ~CF_NEW;
1410 /* setup coroutine call */ 1702 /* setup coroutine call */
1411 coro_setup (aTHX_ next); 1703 init_perl (aTHX_ next);
1412 } 1704 }
1413 else 1705 else
1414 load_perl (aTHX_ next); 1706 load_perl (aTHX_ next);
1415 1707
1416 /* possibly untie and reuse the cctx */ 1708 /* possibly untie and reuse the cctx */
1417 if (expect_true ( 1709 if (ecb_expect_true (
1418 cctx_current->idle_sp == STACKLEVEL 1710 cctx_current->idle_sp == STACKLEVEL
1419 && !(cctx_current->flags & CC_TRACE) 1711 && !(cctx_current->flags & CC_TRACE)
1420 && !force_cctx 1712 && !force_cctx
1421 )) 1713 ))
1422 { 1714 {
1423 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1715 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */
1424 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te)); 1716 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1425 1717
1426 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */ 1718 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */
1427 /* without this the next cctx_get might destroy the running cctx while still in use */ 1719 /* without this the next cctx_get might destroy the running cctx while still in use */
1428 if (expect_false (CCTX_EXPIRED (cctx_current))) 1720 if (ecb_expect_false (CCTX_EXPIRED (cctx_current)))
1429 if (expect_true (!next->cctx)) 1721 if (ecb_expect_true (!next->cctx))
1430 next->cctx = cctx_get (aTHX); 1722 next->cctx = cctx_get (aTHX);
1431 1723
1432 cctx_put (cctx_current); 1724 cctx_put (cctx_current);
1433 } 1725 }
1434 else 1726 else
1435 prev->cctx = cctx_current; 1727 prev->cctx = cctx_current;
1436 1728
1437 ++next->usecount; 1729 ++next->usecount;
1438 1730
1439 cctx_prev = cctx_current; 1731 cctx_prev = cctx_current;
1440 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX); 1732 cctx_current = ecb_expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1441 1733
1442 next->cctx = 0; 1734 next->cctx = 0;
1443 1735
1444 if (expect_false (cctx_prev != cctx_current)) 1736 if (ecb_expect_false (cctx_prev != cctx_current))
1445 { 1737 {
1446 cctx_prev->top_env = PL_top_env; 1738 cctx_prev->top_env = PL_top_env;
1447 PL_top_env = cctx_current->top_env; 1739 PL_top_env = cctx_current->top_env;
1448 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx); 1740 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1449 } 1741 }
… …
1455#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx)) 1747#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1456#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1748#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1457 1749
1458/** high level stuff ********************************************************/ 1750/** high level stuff ********************************************************/
1459 1751
1752/* this function is actually Coro, not Coro::State, but we call it from here */
1753/* because it is convenient - but it hasn't been declared yet for that reason */
1460static int 1754static void
1755coro_call_on_destroy (pTHX_ struct coro *coro);
1756
1757static void
1461coro_state_destroy (pTHX_ struct coro *coro) 1758coro_state_destroy (pTHX_ struct coro *coro)
1462{ 1759{
1463 if (coro->flags & CF_DESTROYED) 1760 if (coro->flags & CF_ZOMBIE)
1464 return 0; 1761 return;
1465 1762
1466 if (coro->on_destroy)
1467 coro->on_destroy (aTHX_ coro); 1763 slf_destroy (aTHX_ coro);
1468 1764
1469 coro->flags |= CF_DESTROYED; 1765 coro->flags |= CF_ZOMBIE;
1470 1766
1471 if (coro->flags & CF_READY) 1767 if (coro->flags & CF_READY)
1472 { 1768 {
1473 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1769 /* reduce nready, as destroying a ready coro effectively unreadies it */
1474 /* alternative: look through all ready queues and remove the coro */ 1770 /* alternative: look through all ready queues and remove the coro */
1475 --coro_nready; 1771 --coro_nready;
1476 } 1772 }
1477 else 1773 else
1478 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1774 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1775
1776 if (coro->next) coro->next->prev = coro->prev;
1777 if (coro->prev) coro->prev->next = coro->next;
1778 if (coro == coro_first) coro_first = coro->next;
1479 1779
1480 if (coro->mainstack 1780 if (coro->mainstack
1481 && coro->mainstack != main_mainstack 1781 && coro->mainstack != main_mainstack
1482 && coro->slot 1782 && coro->slot
1483 && !PL_dirty) 1783 && !PL_dirty)
1484 {
1485 struct coro temp;
1486
1487 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1488
1489 save_perl (aTHX_ &temp);
1490 load_perl (aTHX_ coro);
1491
1492 coro_destruct_perl (aTHX_ coro); 1784 destroy_perl (aTHX_ coro);
1493
1494 load_perl (aTHX_ &temp);
1495
1496 coro->slot = 0;
1497 }
1498 1785
1499 cctx_destroy (coro->cctx); 1786 cctx_destroy (coro->cctx);
1500 SvREFCNT_dec (coro->startcv); 1787 SvREFCNT_dec (coro->startcv);
1501 SvREFCNT_dec (coro->args); 1788 SvREFCNT_dec (coro->args);
1789 SvREFCNT_dec (coro->swap_sv);
1502 SvREFCNT_dec (CORO_THROW); 1790 SvREFCNT_dec (CORO_THROW);
1503 1791
1504 if (coro->next) coro->next->prev = coro->prev; 1792 coro_call_on_destroy (aTHX_ coro);
1505 if (coro->prev) coro->prev->next = coro->next;
1506 if (coro == coro_first) coro_first = coro->next;
1507 1793
1508 return 1; 1794 /* more destruction mayhem in coro_state_free */
1509} 1795}
1510 1796
1511static int 1797static int
1512coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1798coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1513{ 1799{
1514 struct coro *coro = (struct coro *)mg->mg_ptr; 1800 struct coro *coro = (struct coro *)mg->mg_ptr;
1515 mg->mg_ptr = 0; 1801 mg->mg_ptr = 0;
1516 1802
1517 coro->hv = 0;
1518
1519 if (--coro->refcnt < 0)
1520 {
1521 coro_state_destroy (aTHX_ coro); 1803 coro_state_destroy (aTHX_ coro);
1804 SvREFCNT_dec (coro->on_destroy);
1805 SvREFCNT_dec (coro->status);
1806
1522 Safefree (coro); 1807 Safefree (coro);
1523 }
1524 1808
1525 return 0; 1809 return 0;
1526} 1810}
1527 1811
1528static int 1812static int ecb_cold
1529coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1813coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1530{ 1814{
1531 struct coro *coro = (struct coro *)mg->mg_ptr; 1815 /* called when perl clones the current process the slow way (windows process emulation) */
1532 1816 /* WE SIMply nuke the pointers in the copy, causing perl to croak */
1533 ++coro->refcnt; 1817 mg->mg_ptr = 0;
1818 mg->mg_virtual = 0;
1534 1819
1535 return 0; 1820 return 0;
1536} 1821}
1537 1822
1538static MGVTBL coro_state_vtbl = { 1823static MGVTBL coro_state_vtbl = {
… …
1561 1846
1562 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1847 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1563 TRANSFER (ta, 1); 1848 TRANSFER (ta, 1);
1564} 1849}
1565 1850
1566/*****************************************************************************/
1567/* gensub: simple closure generation utility */
1568
1569#define GENSUB_ARG CvXSUBANY (cv).any_ptr
1570
1571/* create a closure from XS, returns a code reference */
1572/* the arg can be accessed via GENSUB_ARG from the callback */
1573/* the callback must use dXSARGS/XSRETURN */
1574static SV *
1575gensub (pTHX_ void (*xsub)(pTHX_ CV *), void *arg)
1576{
1577 CV *cv = (CV *)newSV (0);
1578
1579 sv_upgrade ((SV *)cv, SVt_PVCV);
1580
1581 CvANON_on (cv);
1582 CvISXSUB_on (cv);
1583 CvXSUB (cv) = xsub;
1584 GENSUB_ARG = arg;
1585
1586 return newRV_noinc ((SV *)cv);
1587}
1588
1589/** Coro ********************************************************************/ 1851/** Coro ********************************************************************/
1590 1852
1591INLINE void 1853ecb_inline void
1592coro_enq (pTHX_ struct coro *coro) 1854coro_enq (pTHX_ struct coro *coro)
1593{ 1855{
1594 av_push (coro_ready [coro->prio - PRIO_MIN], SvREFCNT_inc_NN (coro->hv)); 1856 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1595}
1596 1857
1597INLINE SV * 1858 SvREFCNT_inc_NN (coro->hv);
1859
1860 coro->next_ready = 0;
1861 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1862 ready [1] = coro;
1863}
1864
1865ecb_inline struct coro *
1598coro_deq (pTHX) 1866coro_deq (pTHX)
1599{ 1867{
1600 int prio; 1868 int prio;
1601 1869
1602 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; ) 1870 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
1603 if (AvFILLp (coro_ready [prio]) >= 0) 1871 {
1604 return av_shift (coro_ready [prio]); 1872 struct coro **ready = coro_ready [prio];
1873
1874 if (ready [0])
1875 {
1876 struct coro *coro = ready [0];
1877 ready [0] = coro->next_ready;
1878 return coro;
1879 }
1880 }
1605 1881
1606 return 0; 1882 return 0;
1883}
1884
1885static void
1886invoke_sv_ready_hook_helper (void)
1887{
1888 dTHX;
1889 dSP;
1890
1891 ENTER;
1892 SAVETMPS;
1893
1894 PUSHMARK (SP);
1895 PUTBACK;
1896 call_sv (coro_readyhook, G_VOID | G_DISCARD);
1897
1898 FREETMPS;
1899 LEAVE;
1607} 1900}
1608 1901
1609static int 1902static int
1610api_ready (pTHX_ SV *coro_sv) 1903api_ready (pTHX_ SV *coro_sv)
1611{ 1904{
1612 struct coro *coro;
1613 SV *sv_hook;
1614 void (*xs_hook)(void);
1615
1616 coro = SvSTATE (coro_sv); 1905 struct coro *coro = SvSTATE (coro_sv);
1617 1906
1618 if (coro->flags & CF_READY) 1907 if (coro->flags & CF_READY)
1619 return 0; 1908 return 0;
1620 1909
1621 coro->flags |= CF_READY; 1910 coro->flags |= CF_READY;
1622 1911
1623 sv_hook = coro_nready ? 0 : coro_readyhook;
1624 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1625
1626 coro_enq (aTHX_ coro); 1912 coro_enq (aTHX_ coro);
1627 ++coro_nready;
1628 1913
1629 if (sv_hook) 1914 if (!coro_nready++)
1630 { 1915 if (coroapi.readyhook)
1631 dSP; 1916 coroapi.readyhook ();
1632
1633 ENTER;
1634 SAVETMPS;
1635
1636 PUSHMARK (SP);
1637 PUTBACK;
1638 call_sv (sv_hook, G_VOID | G_DISCARD);
1639
1640 FREETMPS;
1641 LEAVE;
1642 }
1643
1644 if (xs_hook)
1645 xs_hook ();
1646 1917
1647 return 1; 1918 return 1;
1648} 1919}
1649 1920
1650static int 1921static int
… …
1652{ 1923{
1653 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1924 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1654} 1925}
1655 1926
1656/* expects to own a reference to next->hv */ 1927/* expects to own a reference to next->hv */
1657INLINE void 1928ecb_inline void
1658prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1929prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1659{ 1930{
1660 SV *prev_sv = SvRV (coro_current); 1931 SV *prev_sv = SvRV (coro_current);
1661 1932
1662 ta->prev = SvSTATE_hv (prev_sv); 1933 ta->prev = SvSTATE_hv (prev_sv);
… …
1673static void 1944static void
1674prepare_schedule (pTHX_ struct coro_transfer_args *ta) 1945prepare_schedule (pTHX_ struct coro_transfer_args *ta)
1675{ 1946{
1676 for (;;) 1947 for (;;)
1677 { 1948 {
1678 SV *next_sv = coro_deq (aTHX); 1949 struct coro *next = coro_deq (aTHX);
1679 1950
1680 if (expect_true (next_sv)) 1951 if (ecb_expect_true (next))
1681 { 1952 {
1682 struct coro *next = SvSTATE_hv (next_sv);
1683
1684 /* cannot transfer to destroyed coros, skip and look for next */ 1953 /* cannot transfer to destroyed coros, skip and look for next */
1685 if (expect_false (next->flags & CF_DESTROYED)) 1954 if (ecb_expect_false (next->flags & (CF_ZOMBIE | CF_SUSPENDED)))
1686 SvREFCNT_dec (next_sv); /* coro_nready has already been taken care of by destroy */ 1955 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1687 else 1956 else
1688 { 1957 {
1689 next->flags &= ~CF_READY; 1958 next->flags &= ~CF_READY;
1690 --coro_nready; 1959 --coro_nready;
1691 1960
… …
1697 { 1966 {
1698 /* nothing to schedule: call the idle handler */ 1967 /* nothing to schedule: call the idle handler */
1699 if (SvROK (sv_idle) 1968 if (SvROK (sv_idle)
1700 && SvOBJECT (SvRV (sv_idle))) 1969 && SvOBJECT (SvRV (sv_idle)))
1701 { 1970 {
1971 if (SvRV (sv_idle) == SvRV (coro_current))
1972 croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught");
1973
1702 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 1974 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1703 api_ready (aTHX_ SvRV (sv_idle)); 1975 api_ready (aTHX_ SvRV (sv_idle));
1704 --coro_nready; 1976 --coro_nready;
1705 } 1977 }
1706 else 1978 else
1707 { 1979 {
1980 /* TODO: deprecated, remove, cannot work reliably *//*D*/
1708 dSP; 1981 dSP;
1709 1982
1710 ENTER; 1983 ENTER;
1711 SAVETMPS; 1984 SAVETMPS;
1712 1985
… …
1719 } 1992 }
1720 } 1993 }
1721 } 1994 }
1722} 1995}
1723 1996
1724INLINE void 1997ecb_inline void
1725prepare_cede (pTHX_ struct coro_transfer_args *ta) 1998prepare_cede (pTHX_ struct coro_transfer_args *ta)
1726{ 1999{
1727 api_ready (aTHX_ coro_current); 2000 api_ready (aTHX_ coro_current);
1728 prepare_schedule (aTHX_ ta); 2001 prepare_schedule (aTHX_ ta);
1729} 2002}
1730 2003
1731INLINE void 2004ecb_inline void
1732prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 2005prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1733{ 2006{
1734 SV *prev = SvRV (coro_current); 2007 SV *prev = SvRV (coro_current);
1735 2008
1736 if (coro_nready) 2009 if (coro_nready)
… …
1766{ 2039{
1767 struct coro_transfer_args ta; 2040 struct coro_transfer_args ta;
1768 2041
1769 prepare_cede (aTHX_ &ta); 2042 prepare_cede (aTHX_ &ta);
1770 2043
1771 if (expect_true (ta.prev != ta.next)) 2044 if (ecb_expect_true (ta.prev != ta.next))
1772 { 2045 {
1773 TRANSFER (ta, 1); 2046 TRANSFER (ta, 1);
1774 return 1; 2047 return 1;
1775 } 2048 }
1776 else 2049 else
… …
1819 coro->slot->runops = RUNOPS_DEFAULT; 2092 coro->slot->runops = RUNOPS_DEFAULT;
1820 } 2093 }
1821} 2094}
1822 2095
1823static void 2096static void
2097coro_push_av (pTHX_ AV *av, I32 gimme_v)
2098{
2099 if (AvFILLp (av) >= 0 && gimme_v != G_VOID)
2100 {
2101 dSP;
2102
2103 if (gimme_v == G_SCALAR)
2104 XPUSHs (AvARRAY (av)[AvFILLp (av)]);
2105 else
2106 {
2107 int i;
2108 EXTEND (SP, AvFILLp (av) + 1);
2109
2110 for (i = 0; i <= AvFILLp (av); ++i)
2111 PUSHs (AvARRAY (av)[i]);
2112 }
2113
2114 PUTBACK;
2115 }
2116}
2117
2118static void
2119coro_push_on_destroy (pTHX_ struct coro *coro, SV *cb)
2120{
2121 if (!coro->on_destroy)
2122 coro->on_destroy = newAV ();
2123
2124 av_push (coro->on_destroy, cb);
2125}
2126
2127static void
2128slf_destroy_join (pTHX_ struct CoroSLF *frame)
2129{
2130 SvREFCNT_dec ((SV *)((struct coro *)frame->data)->hv);
2131}
2132
2133static int
2134slf_check_join (pTHX_ struct CoroSLF *frame)
2135{
2136 struct coro *coro = (struct coro *)frame->data;
2137
2138 if (!coro->status)
2139 return 1;
2140
2141 frame->destroy = 0;
2142
2143 coro_push_av (aTHX_ coro->status, GIMME_V);
2144
2145 SvREFCNT_dec ((SV *)coro->hv);
2146
2147 return 0;
2148}
2149
2150static void
2151slf_init_join (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2152{
2153 struct coro *coro = SvSTATE (items > 0 ? arg [0] : &PL_sv_undef);
2154
2155 if (items > 1)
2156 croak ("join called with too many arguments");
2157
2158 if (coro->status)
2159 frame->prepare = prepare_nop;
2160 else
2161 {
2162 coro_push_on_destroy (aTHX_ coro, SvREFCNT_inc_NN (SvRV (coro_current)));
2163 frame->prepare = prepare_schedule;
2164 }
2165
2166 frame->check = slf_check_join;
2167 frame->destroy = slf_destroy_join;
2168 frame->data = (void *)coro;
2169 SvREFCNT_inc (coro->hv);
2170}
2171
2172static void
1824coro_call_on_destroy (pTHX_ struct coro *coro) 2173coro_call_on_destroy (pTHX_ struct coro *coro)
1825{ 2174{
1826 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2175 AV *od = coro->on_destroy;
1827 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1828 2176
1829 if (on_destroyp) 2177 if (!od)
1830 { 2178 return;
1831 AV *on_destroy = (AV *)SvRV (*on_destroyp);
1832 2179
1833 while (AvFILLp (on_destroy) >= 0) 2180 while (AvFILLp (od) >= 0)
2181 {
2182 SV *cb = sv_2mortal (av_pop (od));
2183
2184 /* coro hv's (and only hv's at the moment) are supported as well */
2185 if (SvSTATEhv_p (aTHX_ cb))
2186 api_ready (aTHX_ cb);
2187 else
1834 { 2188 {
1835 dSP; /* don't disturb outer sp */ 2189 dSP; /* don't disturb outer sp */
1836 SV *cb = av_pop (on_destroy);
1837
1838 PUSHMARK (SP); 2190 PUSHMARK (SP);
1839 2191
1840 if (statusp) 2192 if (coro->status)
1841 { 2193 {
1842 int i; 2194 PUTBACK;
1843 AV *status = (AV *)SvRV (*statusp); 2195 coro_push_av (aTHX_ coro->status, G_ARRAY);
1844 EXTEND (SP, AvFILLp (status) + 1); 2196 SPAGAIN;
1845
1846 for (i = 0; i <= AvFILLp (status); ++i)
1847 PUSHs (AvARRAY (status)[i]);
1848 } 2197 }
1849 2198
1850 PUTBACK; 2199 PUTBACK;
1851 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD); 2200 call_sv (cb, G_VOID | G_DISCARD);
1852 } 2201 }
1853 } 2202 }
1854} 2203}
1855 2204
1856static void 2205static void
1857slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2206coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
1858{ 2207{
2208 AV *av;
2209
2210 if (coro->status)
2211 {
2212 av = coro->status;
2213 av_clear (av);
2214 }
2215 else
2216 av = coro->status = newAV ();
2217
2218 /* items are actually not so common, so optimise for this case */
2219 if (items)
2220 {
1859 int i; 2221 int i;
1860 HV *hv = (HV *)SvRV (coro_current);
1861 AV *av = newAV ();
1862 2222
1863 av_extend (av, items - 1); 2223 av_extend (av, items - 1);
2224
1864 for (i = 0; i < items; ++i) 2225 for (i = 0; i < items; ++i)
1865 av_push (av, SvREFCNT_inc_NN (arg [i])); 2226 av_push (av, SvREFCNT_inc_NN (arg [i]));
2227 }
2228}
1866 2229
1867 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 2230static void
1868 2231slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2232{
1869 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */ 2233 av_push (av_destroy, (SV *)newRV_inc ((SV *)coro_hv)); /* RVinc for perl */
1870 api_ready (aTHX_ sv_manager); 2234 api_ready (aTHX_ sv_manager);
1871 2235
1872 frame->prepare = prepare_schedule; 2236 frame->prepare = prepare_schedule;
1873 frame->check = slf_check_repeat; 2237 frame->check = slf_check_repeat;
1874 2238
1875 /* as a minor optimisation, we could unwind all stacks here */ 2239 /* as a minor optimisation, we could unwind all stacks here */
1876 /* but that puts extra pressure on pp_slf, and is not worth much */ 2240 /* but that puts extra pressure on pp_slf, and is not worth much */
1877 /*coro_unwind_stacks (aTHX);*/ 2241 /*coro_unwind_stacks (aTHX);*/
2242}
2243
2244static void
2245slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2246{
2247 HV *coro_hv = (HV *)SvRV (coro_current);
2248
2249 coro_set_status (aTHX_ SvSTATE ((SV *)coro_hv), arg, items);
2250 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2251}
2252
2253static void
2254slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2255{
2256 HV *coro_hv;
2257 struct coro *coro;
2258
2259 if (items <= 0)
2260 croak ("Coro::cancel called without coro object,");
2261
2262 coro = SvSTATE (arg [0]);
2263 coro_hv = coro->hv;
2264
2265 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2266
2267 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2268 {
2269 /* coro currently busy cancelling something, so just notify it */
2270 coro->slf_frame.data = (void *)coro;
2271
2272 frame->prepare = prepare_nop;
2273 frame->check = slf_check_nop;
2274 }
2275 else if (coro_hv == (HV *)SvRV (coro_current))
2276 {
2277 /* cancelling the current coro is allowed, and equals terminate */
2278 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2279 }
2280 else
2281 {
2282 struct coro *self = SvSTATE_current;
2283
2284 /* otherwise we cancel directly, purely for speed reasons
2285 * unfortunately, this requires some magic trickery, as
2286 * somebody else could cancel us, so we have to fight the cancellation.
2287 * this is ugly, and hopefully fully worth the extra speed.
2288 * besides, I can't get the slow-but-safe version working...
2289 */
2290 slf_frame.data = 0;
2291 self->flags |= CF_NOCANCEL;
2292 coro_state_destroy (aTHX_ coro);
2293 self->flags &= ~CF_NOCANCEL;
2294
2295 if (slf_frame.data)
2296 {
2297 /* while we were busy we have been cancelled, so terminate */
2298 slf_init_terminate_cancel_common (aTHX_ frame, self->hv);
2299 }
2300 else
2301 {
2302 frame->prepare = prepare_nop;
2303 frame->check = slf_check_nop;
2304 }
2305 }
2306}
2307
2308static int
2309slf_check_safe_cancel (pTHX_ struct CoroSLF *frame)
2310{
2311 frame->prepare = 0;
2312 coro_unwind_stacks (aTHX);
2313
2314 slf_init_terminate_cancel_common (aTHX_ frame, (HV *)SvRV (coro_current));
2315
2316 return 1;
2317}
2318
2319static int
2320safe_cancel (pTHX_ struct coro *coro, SV **arg, int items)
2321{
2322 if (coro->cctx)
2323 croak ("coro inside C callback, unable to cancel at this time, caught");
2324
2325 if (coro->flags & CF_NEW)
2326 {
2327 coro_set_status (aTHX_ coro, arg, items);
2328 coro_state_destroy (aTHX_ coro);
2329 }
2330 else
2331 {
2332 if (!coro->slf_frame.prepare)
2333 croak ("coro outside an SLF function, unable to cancel at this time, caught");
2334
2335 slf_destroy (aTHX_ coro);
2336
2337 coro_set_status (aTHX_ coro, arg, items);
2338 coro->slf_frame.prepare = prepare_nop;
2339 coro->slf_frame.check = slf_check_safe_cancel;
2340
2341 api_ready (aTHX_ (SV *)coro->hv);
2342 }
2343
2344 return 1;
1878} 2345}
1879 2346
1880/*****************************************************************************/ 2347/*****************************************************************************/
1881/* async pool handler */ 2348/* async pool handler */
1882 2349
… …
1913slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2380slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1914{ 2381{
1915 HV *hv = (HV *)SvRV (coro_current); 2382 HV *hv = (HV *)SvRV (coro_current);
1916 struct coro *coro = SvSTATE_hv ((SV *)hv); 2383 struct coro *coro = SvSTATE_hv ((SV *)hv);
1917 2384
1918 if (expect_true (coro->saved_deffh)) 2385 if (ecb_expect_true (coro->saved_deffh))
1919 { 2386 {
1920 /* subsequent iteration */ 2387 /* subsequent iteration */
1921 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2388 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1922 coro->saved_deffh = 0; 2389 coro->saved_deffh = 0;
1923 2390
1924 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 2391 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
1925 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2392 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1926 { 2393 {
1927 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate); 2394 slf_init_terminate_cancel_common (aTHX_ frame, hv);
1928 coro->invoke_av = newAV (); 2395 return;
1929
1930 frame->prepare = prepare_nop;
1931 } 2396 }
1932 else 2397 else
1933 { 2398 {
1934 av_clear (GvAV (PL_defgv)); 2399 av_clear (GvAV (PL_defgv));
1935 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2400 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
… …
1960 2425
1961static void 2426static void
1962coro_rouse_callback (pTHX_ CV *cv) 2427coro_rouse_callback (pTHX_ CV *cv)
1963{ 2428{
1964 dXSARGS; 2429 dXSARGS;
1965 SV *data = (SV *)GENSUB_ARG; 2430 SV *data = (SV *)S_GENSUB_ARG;
1966 2431
1967 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2432 if (SvTYPE (SvRV (data)) != SVt_PVAV)
1968 { 2433 {
1969 /* first call, set args */ 2434 /* first call, set args */
2435 SV *coro = SvRV (data);
1970 AV *av = newAV (); 2436 AV *av = newAV ();
1971 SV *coro = SvRV (data);
1972 2437
1973 SvRV_set (data, (SV *)av); 2438 SvRV_set (data, (SV *)av);
1974 api_ready (aTHX_ coro);
1975 SvREFCNT_dec (coro);
1976 2439
1977 /* better take a full copy of the arguments */ 2440 /* better take a full copy of the arguments */
1978 while (items--) 2441 while (items--)
1979 av_store (av, items, newSVsv (ST (items))); 2442 av_store (av, items, newSVsv (ST (items)));
2443
2444 api_ready (aTHX_ coro);
2445 SvREFCNT_dec (coro);
1980 } 2446 }
1981 2447
1982 XSRETURN_EMPTY; 2448 XSRETURN_EMPTY;
1983} 2449}
1984 2450
1985static int 2451static int
1986slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2452slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
1987{ 2453{
1988 SV *data = (SV *)frame->data; 2454 SV *data = (SV *)frame->data;
1989 2455
1990 if (CORO_THROW) 2456 if (CORO_THROW)
1991 return 0; 2457 return 0;
1992 2458
1993 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2459 if (SvTYPE (SvRV (data)) != SVt_PVAV)
1994 return 1; 2460 return 1;
… …
2001 2467
2002 EXTEND (SP, AvFILLp (av) + 1); 2468 EXTEND (SP, AvFILLp (av) + 1);
2003 for (i = 0; i <= AvFILLp (av); ++i) 2469 for (i = 0; i <= AvFILLp (av); ++i)
2004 PUSHs (sv_2mortal (AvARRAY (av)[i])); 2470 PUSHs (sv_2mortal (AvARRAY (av)[i]));
2005 2471
2006 /* we have stolen the elements, so ste length to zero and free */ 2472 /* we have stolen the elements, so set length to zero and free */
2007 AvFILLp (av) = -1; 2473 AvFILLp (av) = -1;
2008 av_undef (av); 2474 av_undef (av);
2009 2475
2010 PUTBACK; 2476 PUTBACK;
2011 } 2477 }
… …
2030 cb = sv_2mortal (coro->rouse_cb); 2496 cb = sv_2mortal (coro->rouse_cb);
2031 coro->rouse_cb = 0; 2497 coro->rouse_cb = 0;
2032 } 2498 }
2033 2499
2034 if (!SvROK (cb) 2500 if (!SvROK (cb)
2035 || SvTYPE (SvRV (cb)) != SVt_PVCV 2501 || SvTYPE (SvRV (cb)) != SVt_PVCV
2036 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2502 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2037 croak ("Coro::rouse_wait called with illegal callback argument,"); 2503 croak ("Coro::rouse_wait called with illegal callback argument,");
2038 2504
2039 { 2505 {
2040 CV *cv = (CV *)SvRV (cb); /* for GENSUB_ARG */ 2506 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
2041 SV *data = (SV *)GENSUB_ARG; 2507 SV *data = (SV *)S_GENSUB_ARG;
2042 2508
2043 frame->data = (void *)data; 2509 frame->data = (void *)data;
2044 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule; 2510 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
2045 frame->check = slf_check_rouse_wait; 2511 frame->check = slf_check_rouse_wait;
2046 } 2512 }
… …
2050coro_new_rouse_cb (pTHX) 2516coro_new_rouse_cb (pTHX)
2051{ 2517{
2052 HV *hv = (HV *)SvRV (coro_current); 2518 HV *hv = (HV *)SvRV (coro_current);
2053 struct coro *coro = SvSTATE_hv (hv); 2519 struct coro *coro = SvSTATE_hv (hv);
2054 SV *data = newRV_inc ((SV *)hv); 2520 SV *data = newRV_inc ((SV *)hv);
2055 SV *cb = gensub (aTHX_ coro_rouse_callback, (void *)data); 2521 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
2056 2522
2057 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0); 2523 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0);
2058 SvREFCNT_dec (data); /* magicext increases the refcount */ 2524 SvREFCNT_dec (data); /* magicext increases the refcount */
2059 2525
2060 SvREFCNT_dec (coro->rouse_cb); 2526 SvREFCNT_dec (coro->rouse_cb);
… …
2157static void 2623static void
2158slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2624slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2159{ 2625{
2160 frame->prepare = prepare_cede_notself; 2626 frame->prepare = prepare_cede_notself;
2161 frame->check = slf_check_nop; 2627 frame->check = slf_check_nop;
2628}
2629
2630/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2631static void
2632slf_destroy (pTHX_ struct coro *coro)
2633{
2634 /* this callback is reserved for slf functions needing to do cleanup */
2635 if (coro->slf_frame.destroy && coro->slf_frame.prepare && !PL_dirty)
2636 coro->slf_frame.destroy (aTHX_ &coro->slf_frame);
2637
2638 /*
2639 * The on_destroy above most likely is from an SLF call.
2640 * Since by definition the SLF call will not finish when we destroy
2641 * the coro, we will have to force-finish it here, otherwise
2642 * cleanup functions cannot call SLF functions.
2643 */
2644 coro->slf_frame.prepare = 0;
2162} 2645}
2163 2646
2164/* 2647/*
2165 * these not obviously related functions are all rolled into one 2648 * these not obviously related functions are all rolled into one
2166 * function to increase chances that they all will call transfer with the same 2649 * function to increase chances that they all will call transfer with the same
… …
2173 I32 checkmark; /* mark SP to see how many elements check has pushed */ 2656 I32 checkmark; /* mark SP to see how many elements check has pushed */
2174 2657
2175 /* set up the slf frame, unless it has already been set-up */ 2658 /* set up the slf frame, unless it has already been set-up */
2176 /* the latter happens when a new coro has been started */ 2659 /* the latter happens when a new coro has been started */
2177 /* or when a new cctx was attached to an existing coroutine */ 2660 /* or when a new cctx was attached to an existing coroutine */
2178 if (expect_true (!slf_frame.prepare)) 2661 if (ecb_expect_true (!slf_frame.prepare))
2179 { 2662 {
2180 /* first iteration */ 2663 /* first iteration */
2181 dSP; 2664 dSP;
2182 SV **arg = PL_stack_base + TOPMARK + 1; 2665 SV **arg = PL_stack_base + TOPMARK + 1;
2183 int items = SP - arg; /* args without function object */ 2666 int items = SP - arg; /* args without function object */
… …
2224 while (slf_frame.check (aTHX_ &slf_frame)); 2707 while (slf_frame.check (aTHX_ &slf_frame));
2225 2708
2226 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */ 2709 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */
2227 2710
2228 /* exception handling */ 2711 /* exception handling */
2229 if (expect_false (CORO_THROW)) 2712 if (ecb_expect_false (CORO_THROW))
2230 { 2713 {
2231 SV *exception = sv_2mortal (CORO_THROW); 2714 SV *exception = sv_2mortal (CORO_THROW);
2232 2715
2233 CORO_THROW = 0; 2716 CORO_THROW = 0;
2234 sv_setsv (ERRSV, exception); 2717 sv_setsv (ERRSV, exception);
2235 croak (0); 2718 croak (0);
2236 } 2719 }
2237 2720
2238 /* return value handling - mostly like entersub */ 2721 /* return value handling - mostly like entersub */
2239 /* make sure we put something on the stack in scalar context */ 2722 /* make sure we put something on the stack in scalar context */
2240 if (GIMME_V == G_SCALAR) 2723 if (GIMME_V == G_SCALAR
2724 && ecb_expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2241 { 2725 {
2242 dSP; 2726 dSP;
2243 SV **bot = PL_stack_base + checkmark; 2727 SV **bot = PL_stack_base + checkmark;
2244 2728
2245 if (sp == bot) /* too few, push undef */ 2729 if (sp == bot) /* too few, push undef */
2246 bot [1] = &PL_sv_undef; 2730 bot [1] = &PL_sv_undef;
2247 else if (sp != bot + 1) /* too many, take last one */ 2731 else /* too many, take last one */
2248 bot [1] = *sp; 2732 bot [1] = *sp;
2249 2733
2250 SP = bot + 1; 2734 SP = bot + 1;
2251 2735
2252 PUTBACK; 2736 PUTBACK;
… …
2285 if (PL_op->op_flags & OPf_STACKED) 2769 if (PL_op->op_flags & OPf_STACKED)
2286 { 2770 {
2287 if (items > slf_arga) 2771 if (items > slf_arga)
2288 { 2772 {
2289 slf_arga = items; 2773 slf_arga = items;
2290 free (slf_argv); 2774 Safefree (slf_argv);
2291 slf_argv = malloc (slf_arga * sizeof (SV *)); 2775 New (0, slf_argv, slf_arga, SV *);
2292 } 2776 }
2293 2777
2294 slf_argc = items; 2778 slf_argc = items;
2295 2779
2296 for (i = 0; i < items; ++i) 2780 for (i = 0; i < items; ++i)
… …
2301 2785
2302 PL_op->op_ppaddr = pp_slf; 2786 PL_op->op_ppaddr = pp_slf;
2303 /*PL_op->op_type = OP_CUSTOM; /* we do behave like entersub still */ 2787 /*PL_op->op_type = OP_CUSTOM; /* we do behave like entersub still */
2304 2788
2305 PL_op = (OP *)&slf_restore; 2789 PL_op = (OP *)&slf_restore;
2790}
2791
2792/*****************************************************************************/
2793/* dynamic wind */
2794
2795static void
2796on_enterleave_call (pTHX_ SV *cb)
2797{
2798 dSP;
2799
2800 PUSHSTACK;
2801
2802 PUSHMARK (SP);
2803 PUTBACK;
2804 call_sv (cb, G_VOID | G_DISCARD);
2805 SPAGAIN;
2806
2807 POPSTACK;
2808}
2809
2810static SV *
2811coro_avp_pop_and_free (pTHX_ AV **avp)
2812{
2813 AV *av = *avp;
2814 SV *res = av_pop (av);
2815
2816 if (AvFILLp (av) < 0)
2817 {
2818 *avp = 0;
2819 SvREFCNT_dec (av);
2820 }
2821
2822 return res;
2823}
2824
2825static void
2826coro_pop_on_enter (pTHX_ void *coro)
2827{
2828 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_enter);
2829 SvREFCNT_dec (cb);
2830}
2831
2832static void
2833coro_pop_on_leave (pTHX_ void *coro)
2834{
2835 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2836 on_enterleave_call (aTHX_ sv_2mortal (cb));
2306} 2837}
2307 2838
2308/*****************************************************************************/ 2839/*****************************************************************************/
2309/* PerlIO::cede */ 2840/* PerlIO::cede */
2310 2841
… …
2312{ 2843{
2313 PerlIOBuf base; 2844 PerlIOBuf base;
2314 NV next, every; 2845 NV next, every;
2315} PerlIOCede; 2846} PerlIOCede;
2316 2847
2317static IV 2848static IV ecb_cold
2318PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab) 2849PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab)
2319{ 2850{
2320 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2851 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2321 2852
2322 self->every = SvCUR (arg) ? SvNV (arg) : 0.01; 2853 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
2323 self->next = nvtime () + self->every; 2854 self->next = nvtime () + self->every;
2324 2855
2325 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab); 2856 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
2326} 2857}
2327 2858
2328static SV * 2859static SV * ecb_cold
2329PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags) 2860PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
2330{ 2861{
2331 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2862 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2332 2863
2333 return newSVnv (self->every); 2864 return newSVnv (self->every);
… …
2384/* Coro::Semaphore & Coro::Signal */ 2915/* Coro::Semaphore & Coro::Signal */
2385 2916
2386static SV * 2917static SV *
2387coro_waitarray_new (pTHX_ int count) 2918coro_waitarray_new (pTHX_ int count)
2388{ 2919{
2389 /* a semaphore contains a counter IV in $sem->[0] and any waiters after that */ 2920 /* a waitarray=semaphore contains a counter IV in $sem->[0] and any waiters after that */
2390 AV *av = newAV (); 2921 AV *av = newAV ();
2391 SV **ary; 2922 SV **ary;
2392 2923
2393 /* unfortunately, building manually saves memory */ 2924 /* unfortunately, building manually saves memory */
2394 Newx (ary, 2, SV *); 2925 Newx (ary, 2, SV *);
… …
2445 SvREFCNT_dec (cb); 2976 SvREFCNT_dec (cb);
2446 } 2977 }
2447} 2978}
2448 2979
2449static void 2980static void
2450coro_semaphore_on_destroy (pTHX_ struct coro *coro) 2981coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2451{ 2982{
2452 /* call $sem->adjust (0) to possibly wake up some other waiters */ 2983 /* call $sem->adjust (0) to possibly wake up some other waiters */
2453 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 2984 coro_semaphore_adjust (aTHX_ (AV *)frame->data, 0);
2454} 2985}
2455 2986
2456static int 2987static int
2457slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire) 2988slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2458{ 2989{
2459 AV *av = (AV *)frame->data; 2990 AV *av = (AV *)frame->data;
2460 SV *count_sv = AvARRAY (av)[0]; 2991 SV *count_sv = AvARRAY (av)[0];
2992 SV *coro_hv = SvRV (coro_current);
2461 2993
2462 /* if we are about to throw, don't actually acquire the lock, just throw */ 2994 /* if we are about to throw, don't actually acquire the lock, just throw */
2463 if (CORO_THROW) 2995 if (CORO_THROW)
2464 return 0; 2996 return 0;
2465 else if (SvIVX (count_sv) > 0) 2997 else if (SvIVX (count_sv) > 0)
2466 { 2998 {
2467 SvSTATE_current->on_destroy = 0; 2999 frame->destroy = 0;
2468 3000
2469 if (acquire) 3001 if (acquire)
2470 SvIVX (count_sv) = SvIVX (count_sv) - 1; 3002 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2471 else 3003 else
2472 coro_semaphore_adjust (aTHX_ av, 0); 3004 coro_semaphore_adjust (aTHX_ av, 0);
… …
2477 { 3009 {
2478 int i; 3010 int i;
2479 /* if we were woken up but can't down, we look through the whole */ 3011 /* if we were woken up but can't down, we look through the whole */
2480 /* waiters list and only add us if we aren't in there already */ 3012 /* waiters list and only add us if we aren't in there already */
2481 /* this avoids some degenerate memory usage cases */ 3013 /* this avoids some degenerate memory usage cases */
2482 3014 for (i = AvFILLp (av); i > 0; --i) /* i > 0 is not an off-by-one bug */
2483 for (i = 1; i <= AvFILLp (av); ++i)
2484 if (AvARRAY (av)[i] == SvRV (coro_current)) 3015 if (AvARRAY (av)[i] == coro_hv)
2485 return 1; 3016 return 1;
2486 3017
2487 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3018 av_push (av, SvREFCNT_inc (coro_hv));
2488 return 1; 3019 return 1;
2489 } 3020 }
2490} 3021}
2491 3022
2492static int 3023static int
… …
2515 { 3046 {
2516 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3047 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2517 3048
2518 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 3049 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2519 frame->prepare = prepare_schedule; 3050 frame->prepare = prepare_schedule;
2520
2521 /* to avoid race conditions when a woken-up coro gets terminated */ 3051 /* to avoid race conditions when a woken-up coro gets terminated */
2522 /* we arrange for a temporary on_destroy that calls adjust (0) */ 3052 /* we arrange for a temporary on_destroy that calls adjust (0) */
2523 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 3053 frame->destroy = coro_semaphore_destroy;
2524 } 3054 }
2525} 3055}
2526 3056
2527static void 3057static void
2528slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 3058slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
… …
2536{ 3066{
2537 if (items >= 2) 3067 if (items >= 2)
2538 { 3068 {
2539 /* callback form */ 3069 /* callback form */
2540 AV *av = (AV *)SvRV (arg [0]); 3070 AV *av = (AV *)SvRV (arg [0]);
2541 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 3071 SV *cb_cv = s_get_cv_croak (arg [1]);
2542 3072
2543 av_push (av, (SV *)SvREFCNT_inc_NN (cb_cv)); 3073 av_push (av, SvREFCNT_inc_NN (cb_cv));
2544 3074
2545 if (SvIVX (AvARRAY (av)[0]) > 0) 3075 if (SvIVX (AvARRAY (av)[0]) > 0)
2546 coro_semaphore_adjust (aTHX_ av, 0); 3076 coro_semaphore_adjust (aTHX_ av, 0);
2547 3077
2548 frame->prepare = prepare_nop; 3078 frame->prepare = prepare_nop;
… …
2572 AvARRAY (av)[0] = AvARRAY (av)[1]; 3102 AvARRAY (av)[0] = AvARRAY (av)[1];
2573 AvARRAY (av)[1] = cb; 3103 AvARRAY (av)[1] = cb;
2574 3104
2575 cb = av_shift (av); 3105 cb = av_shift (av);
2576 3106
3107 if (SvTYPE (cb) == SVt_PVCV)
3108 {
3109 dSP;
3110 PUSHMARK (SP);
3111 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
3112 PUTBACK;
3113 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
3114 }
3115 else
3116 {
2577 api_ready (aTHX_ cb); 3117 api_ready (aTHX_ cb);
2578 sv_setiv (cb, 0); /* signal waiter */ 3118 sv_setiv (cb, 0); /* signal waiter */
3119 }
3120
2579 SvREFCNT_dec (cb); 3121 SvREFCNT_dec (cb);
2580 3122
2581 --count; 3123 --count;
2582 } 3124 }
2583} 3125}
… …
2592static void 3134static void
2593slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 3135slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2594{ 3136{
2595 AV *av = (AV *)SvRV (arg [0]); 3137 AV *av = (AV *)SvRV (arg [0]);
2596 3138
3139 if (items >= 2)
3140 {
3141 SV *cb_cv = s_get_cv_croak (arg [1]);
3142 av_push (av, SvREFCNT_inc_NN (cb_cv));
3143
2597 if (SvIVX (AvARRAY (av)[0])) 3144 if (SvIVX (AvARRAY (av)[0]))
3145 coro_signal_wake (aTHX_ av, 1); /* must be the only waiter */
3146
3147 frame->prepare = prepare_nop;
3148 frame->check = slf_check_nop;
3149 }
3150 else if (SvIVX (AvARRAY (av)[0]))
2598 { 3151 {
2599 SvIVX (AvARRAY (av)[0]) = 0; 3152 SvIVX (AvARRAY (av)[0]) = 0;
2600 frame->prepare = prepare_nop; 3153 frame->prepare = prepare_nop;
2601 frame->check = slf_check_nop; 3154 frame->check = slf_check_nop;
2602 } 3155 }
2603 else 3156 else
2604 { 3157 {
2605 SV *waiter = newRV_inc (SvRV (coro_current)); /* owned by signal av */ 3158 SV *waiter = newSVsv (coro_current); /* owned by signal av */
2606 3159
2607 av_push (av, waiter); 3160 av_push (av, waiter);
2608 3161
2609 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */ 3162 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */
2610 frame->prepare = prepare_schedule; 3163 frame->prepare = prepare_schedule;
… …
2628 3181
2629static void 3182static void
2630coro_aio_callback (pTHX_ CV *cv) 3183coro_aio_callback (pTHX_ CV *cv)
2631{ 3184{
2632 dXSARGS; 3185 dXSARGS;
2633 AV *state = (AV *)GENSUB_ARG; 3186 AV *state = (AV *)S_GENSUB_ARG;
2634 SV *coro = av_pop (state); 3187 SV *coro = av_pop (state);
2635 SV *data_sv = newSV (sizeof (struct io_state)); 3188 SV *data_sv = newSV (sizeof (struct io_state));
2636 3189
2637 av_extend (state, items - 1); 3190 av_extend (state, items - 1);
2638 3191
… …
2723 dSP; 3276 dSP;
2724 3277
2725 static SV *prio_cv; 3278 static SV *prio_cv;
2726 static SV *prio_sv; 3279 static SV *prio_sv;
2727 3280
2728 if (expect_false (!prio_cv)) 3281 if (ecb_expect_false (!prio_cv))
2729 { 3282 {
2730 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0); 3283 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0);
2731 prio_sv = newSViv (0); 3284 prio_sv = newSViv (0);
2732 } 3285 }
2733 3286
… …
2752 3305
2753 for (i = 0; i < items; ++i) 3306 for (i = 0; i < items; ++i)
2754 PUSHs (arg [i]); 3307 PUSHs (arg [i]);
2755 3308
2756 /* now push the callback closure */ 3309 /* now push the callback closure */
2757 PUSHs (sv_2mortal (gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state)))); 3310 PUSHs (sv_2mortal (s_gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state))));
2758 3311
2759 /* now call the AIO function - we assume our request is uncancelable */ 3312 /* now call the AIO function - we assume our request is uncancelable */
2760 PUTBACK; 3313 PUTBACK;
2761 call_sv ((SV *)req, G_VOID | G_DISCARD); 3314 call_sv ((SV *)req, G_VOID | G_DISCARD);
2762 } 3315 }
2763 3316
2764 /* now that the requets is going, we loop toll we have a result */ 3317 /* now that the request is going, we loop till we have a result */
2765 frame->data = (void *)state; 3318 frame->data = (void *)state;
2766 frame->prepare = prepare_schedule; 3319 frame->prepare = prepare_schedule;
2767 frame->check = slf_check_aio_req; 3320 frame->check = slf_check_aio_req;
2768} 3321}
2769 3322
… …
2779 3332
2780/*****************************************************************************/ 3333/*****************************************************************************/
2781 3334
2782#if CORO_CLONE 3335#if CORO_CLONE
2783# include "clone.c" 3336# include "clone.c"
3337#endif
3338
3339/*****************************************************************************/
3340
3341static SV *
3342coro_new (pTHX_ HV *stash, SV **argv, int argc, int is_coro)
3343{
3344 SV *coro_sv;
3345 struct coro *coro;
3346 MAGIC *mg;
3347 HV *hv;
3348 SV *cb;
3349 int i;
3350
3351 if (argc > 0)
3352 {
3353 cb = s_get_cv_croak (argv [0]);
3354
3355 if (!is_coro)
3356 {
3357 if (CvISXSUB (cb))
3358 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
3359
3360 if (!CvROOT (cb))
3361 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
3362 }
3363 }
3364
3365 Newz (0, coro, 1, struct coro);
3366 coro->args = newAV ();
3367 coro->flags = CF_NEW;
3368
3369 if (coro_first) coro_first->prev = coro;
3370 coro->next = coro_first;
3371 coro_first = coro;
3372
3373 coro->hv = hv = newHV ();
3374 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
3375 mg->mg_flags |= MGf_DUP;
3376 coro_sv = sv_bless (newRV_noinc ((SV *)hv), stash);
3377
3378 if (argc > 0)
3379 {
3380 av_extend (coro->args, argc + is_coro - 1);
3381
3382 if (is_coro)
3383 {
3384 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
3385 cb = (SV *)cv_coro_run;
3386 }
3387
3388 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3389
3390 for (i = 1; i < argc; i++)
3391 av_push (coro->args, newSVsv (argv [i]));
3392 }
3393
3394 return coro_sv;
3395}
3396
3397#ifndef __cplusplus
3398ecb_cold XS(boot_Coro__State);
3399#endif
3400
3401#if CORO_JIT
3402
3403static void ecb_noinline ecb_cold
3404pushav_4uv (pTHX_ UV a, UV b, UV c, UV d)
3405{
3406 dSP;
3407 AV *av = newAV ();
3408
3409 av_store (av, 3, newSVuv (d));
3410 av_store (av, 2, newSVuv (c));
3411 av_store (av, 1, newSVuv (b));
3412 av_store (av, 0, newSVuv (a));
3413
3414 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
3415
3416 PUTBACK;
3417}
3418
3419static void ecb_noinline ecb_cold
3420jit_init (pTHX)
3421{
3422 dSP;
3423 SV *load, *save;
3424 char *map_base;
3425 char *load_ptr, *save_ptr;
3426 STRLEN load_len, save_len, map_len;
3427 int count;
3428
3429 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3430
3431 PUSHMARK (SP);
3432 #define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type));
3433 #include "state.h"
3434 count = call_pv ("Coro::State::_jit", G_ARRAY);
3435 SPAGAIN;
3436
3437 save = POPs; save_ptr = SvPVbyte (save, save_len);
3438 load = POPs; load_ptr = SvPVbyte (load, load_len);
3439
3440 map_len = load_len + save_len + 16;
3441
3442 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3443
3444 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3445
3446 load_perl_slots = (load_save_perl_slots_type)map_base;
3447 memcpy (map_base, load_ptr, load_len);
3448
3449 map_base += (load_len + 15) & ~15;
3450
3451 save_perl_slots = (load_save_perl_slots_type)map_base;
3452 memcpy (map_base, save_ptr, save_len);
3453
3454 /* we are good citizens and try to make the page read-only, so the evil evil */
3455 /* hackers might have it a bit more difficult */
3456 mprotect (map_base, map_len, PROT_READ | PROT_EXEC);
3457
3458 PUTBACK;
3459 eval_pv ("undef &Coro::State::_jit", 1);
3460}
3461
2784#endif 3462#endif
2785 3463
2786MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3464MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2787 3465
2788PROTOTYPES: DISABLE 3466PROTOTYPES: DISABLE
… …
2793# if CORO_PTHREAD 3471# if CORO_PTHREAD
2794 coro_thx = PERL_GET_CONTEXT; 3472 coro_thx = PERL_GET_CONTEXT;
2795# endif 3473# endif
2796#endif 3474#endif
2797 BOOT_PAGESIZE; 3475 BOOT_PAGESIZE;
3476
3477 /* perl defines these to check for existance first, but why it doesn't */
3478 /* just create them one at init time is not clear to me, except for */
3479 /* programs trying to delete them, but... */
3480 /* anyway, we declare this as invalid and make sure they are initialised here */
3481 DEFSV;
3482 ERRSV;
2798 3483
2799 cctx_current = cctx_new_empty (); 3484 cctx_current = cctx_new_empty ();
2800 3485
2801 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3486 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
2802 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3487 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
… …
2842 coroapi.prepare_nop = prepare_nop; 3527 coroapi.prepare_nop = prepare_nop;
2843 coroapi.prepare_schedule = prepare_schedule; 3528 coroapi.prepare_schedule = prepare_schedule;
2844 coroapi.prepare_cede = prepare_cede; 3529 coroapi.prepare_cede = prepare_cede;
2845 coroapi.prepare_cede_notself = prepare_cede_notself; 3530 coroapi.prepare_cede_notself = prepare_cede_notself;
2846 3531
2847 { 3532 time_init (aTHX);
2848 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
2849 3533
2850 if (!svp) croak ("Time::HiRes is required");
2851 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
2852
2853 nvtime = INT2PTR (double (*)(), SvIV (*svp));
2854 }
2855
2856 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 3534 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3535#if CORO_JIT
3536 PUTBACK;
3537 jit_init (aTHX);
3538 SPAGAIN;
3539#endif
2857} 3540}
2858 3541
2859SV * 3542SV *
2860new (char *klass, ...) 3543new (SV *klass, ...)
2861 ALIAS: 3544 ALIAS:
2862 Coro::new = 1 3545 Coro::new = 1
2863 CODE: 3546 CODE:
2864{ 3547 RETVAL = coro_new (aTHX_ ix ? coro_stash : coro_state_stash, &ST (1), items - 1, ix);
2865 struct coro *coro; 3548 OUTPUT:
2866 MAGIC *mg;
2867 HV *hv;
2868 CV *cb;
2869 int i;
2870
2871 if (items > 1)
2872 {
2873 cb = coro_sv_2cv (aTHX_ ST (1));
2874
2875 if (!ix)
2876 {
2877 if (CvISXSUB (cb))
2878 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
2879
2880 if (!CvROOT (cb))
2881 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
2882 }
2883 }
2884
2885 Newz (0, coro, 1, struct coro);
2886 coro->args = newAV ();
2887 coro->flags = CF_NEW;
2888
2889 if (coro_first) coro_first->prev = coro;
2890 coro->next = coro_first;
2891 coro_first = coro;
2892
2893 coro->hv = hv = newHV ();
2894 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
2895 mg->mg_flags |= MGf_DUP;
2896 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
2897
2898 if (items > 1)
2899 {
2900 av_extend (coro->args, items - 1 + ix - 1);
2901
2902 if (ix)
2903 {
2904 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
2905 cb = cv_coro_run;
2906 }
2907
2908 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
2909
2910 for (i = 2; i < items; i++)
2911 av_push (coro->args, newSVsv (ST (i)));
2912 }
2913}
2914 OUTPUT:
2915 RETVAL 3549 RETVAL
2916 3550
2917void 3551void
2918transfer (...) 3552transfer (...)
2919 PROTOTYPE: $$ 3553 PROTOTYPE: $$
2920 CODE: 3554 CODE:
2921 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3555 CORO_EXECUTE_SLF_XS (slf_init_transfer);
2922
2923bool
2924_destroy (SV *coro_sv)
2925 CODE:
2926 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
2927 OUTPUT:
2928 RETVAL
2929 3556
2930void 3557void
2931_exit (int code) 3558_exit (int code)
2932 PROTOTYPE: $ 3559 PROTOTYPE: $
2933 CODE: 3560 CODE:
… …
3008 eval = 1 3635 eval = 1
3009 CODE: 3636 CODE:
3010{ 3637{
3011 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3638 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
3012 { 3639 {
3013 struct coro temp; 3640 struct coro *current = SvSTATE_current;
3641 struct CoroSLF slf_save;
3014 3642
3015 if (!(coro->flags & CF_RUNNING)) 3643 if (current != coro)
3016 { 3644 {
3017 PUTBACK; 3645 PUTBACK;
3018 save_perl (aTHX_ &temp); 3646 save_perl (aTHX_ current);
3019 load_perl (aTHX_ coro); 3647 load_perl (aTHX_ coro);
3648 /* the coro is most likely in an active SLF call.
3649 * while not strictly required (the code we execute is
3650 * not allowed to call any SLF functions), it's cleaner
3651 * to reinitialise the slf_frame and restore it later.
3652 * This might one day allow us to actually do SLF calls
3653 * from code executed here.
3654 */
3655 slf_save = slf_frame;
3656 slf_frame.prepare = 0;
3657 SPAGAIN;
3020 } 3658 }
3021 3659
3022 {
3023 dSP;
3024 ENTER;
3025 SAVETMPS;
3026 PUTBACK;
3027 PUSHSTACK; 3660 PUSHSTACK;
3661
3028 PUSHMARK (SP); 3662 PUSHMARK (SP);
3663 PUTBACK;
3029 3664
3030 if (ix) 3665 if (ix)
3031 eval_sv (coderef, 0); 3666 eval_sv (coderef, 0);
3032 else 3667 else
3033 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 3668 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
3034 3669
3035 POPSTACK; 3670 POPSTACK;
3036 SPAGAIN; 3671 SPAGAIN;
3037 FREETMPS;
3038 LEAVE;
3039 PUTBACK;
3040 }
3041 3672
3042 if (!(coro->flags & CF_RUNNING)) 3673 if (current != coro)
3043 { 3674 {
3675 PUTBACK;
3676 slf_frame = slf_save;
3044 save_perl (aTHX_ coro); 3677 save_perl (aTHX_ coro);
3045 load_perl (aTHX_ &temp); 3678 load_perl (aTHX_ current);
3046 SPAGAIN; 3679 SPAGAIN;
3047 } 3680 }
3048 } 3681 }
3049} 3682}
3050 3683
… …
3053 PROTOTYPE: $ 3686 PROTOTYPE: $
3054 ALIAS: 3687 ALIAS:
3055 is_ready = CF_READY 3688 is_ready = CF_READY
3056 is_running = CF_RUNNING 3689 is_running = CF_RUNNING
3057 is_new = CF_NEW 3690 is_new = CF_NEW
3058 is_destroyed = CF_DESTROYED 3691 is_destroyed = CF_ZOMBIE
3692 is_zombie = CF_ZOMBIE
3693 is_suspended = CF_SUSPENDED
3059 CODE: 3694 CODE:
3060 RETVAL = boolSV (coro->flags & ix); 3695 RETVAL = boolSV (coro->flags & ix);
3061 OUTPUT: 3696 OUTPUT:
3062 RETVAL 3697 RETVAL
3063 3698
3064void 3699void
3065throw (Coro::State self, SV *throw = &PL_sv_undef) 3700throw (SV *self, SV *exception = &PL_sv_undef)
3066 PROTOTYPE: $;$ 3701 PROTOTYPE: $;$
3067 CODE: 3702 CODE:
3068{ 3703{
3704 struct coro *coro = SvSTATE (self);
3069 struct coro *current = SvSTATE_current; 3705 struct coro *current = SvSTATE_current;
3070 SV **throwp = self == current ? &CORO_THROW : &self->except; 3706 SV **exceptionp = coro == current ? &CORO_THROW : &coro->except;
3071 SvREFCNT_dec (*throwp); 3707 SvREFCNT_dec (*exceptionp);
3072 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3708 SvGETMAGIC (exception);
3709 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3710
3711 api_ready (aTHX_ self);
3073} 3712}
3074 3713
3075void 3714void
3076api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3715api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3077 PROTOTYPE: $;$ 3716 PROTOTYPE: $;$
… …
3128 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv; 3767 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
3129 3768
3130 SV *tmp = *src; *src = *dst; *dst = tmp; 3769 SV *tmp = *src; *src = *dst; *dst = tmp;
3131 } 3770 }
3132 3771
3772void
3773cancel (Coro::State self)
3774 CODE:
3775 coro_state_destroy (aTHX_ self);
3776
3777SV *
3778enable_times (int enabled = enable_times)
3779 CODE:
3780{
3781 RETVAL = boolSV (enable_times);
3782
3783 if (enabled != enable_times)
3784 {
3785 enable_times = enabled;
3786
3787 coro_times_update ();
3788 (enabled ? coro_times_sub : coro_times_add)(SvSTATE (coro_current));
3789 }
3790}
3791 OUTPUT:
3792 RETVAL
3793
3794void
3795times (Coro::State self)
3796 PPCODE:
3797{
3798 struct coro *current = SvSTATE (coro_current);
3799
3800 if (ecb_expect_false (current == self))
3801 {
3802 coro_times_update ();
3803 coro_times_add (SvSTATE (coro_current));
3804 }
3805
3806 EXTEND (SP, 2);
3807 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3808 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3809
3810 if (ecb_expect_false (current == self))
3811 coro_times_sub (SvSTATE (coro_current));
3812}
3813
3814void
3815swap_sv (Coro::State coro, SV *sv, SV *swapsv)
3816 CODE:
3817{
3818 struct coro *current = SvSTATE_current;
3819
3820 if (current == coro)
3821 SWAP_SVS (current);
3822
3823 if (!coro->swap_sv)
3824 coro->swap_sv = newAV ();
3825
3826 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv )));
3827 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv)));
3828
3829 if (current == coro)
3830 SWAP_SVS (current);
3831}
3832
3133 3833
3134MODULE = Coro::State PACKAGE = Coro 3834MODULE = Coro::State PACKAGE = Coro
3135 3835
3136BOOT: 3836BOOT:
3137{ 3837{
3138 int i;
3139
3140 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3838 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3141 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3839 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3142 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 3840 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3143 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3144 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 3841 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3145 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 3842 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3146 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 3843 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3147 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 3844 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3148 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 3845 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3149 3846
3150 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3847 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3151 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3848 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3152 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 3849 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3153 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new); 3850 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3154 3851
3155 coro_stash = gv_stashpv ("Coro", TRUE); 3852 coro_stash = gv_stashpv ("Coro", TRUE);
3156 3853
3157 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 3854 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3158 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 3855 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3159 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 3856 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
3160 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 3857 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (CORO_PRIO_LOW));
3161 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE)); 3858 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (CORO_PRIO_IDLE));
3162 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN)); 3859 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (CORO_PRIO_MIN));
3163
3164 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
3165 coro_ready[i] = newAV ();
3166 3860
3167 { 3861 {
3168 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 3862 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
3169 3863
3170 coroapi.schedule = api_schedule; 3864 coroapi.schedule = api_schedule;
… …
3180 sv_setiv (sv, (IV)&coroapi); 3874 sv_setiv (sv, (IV)&coroapi);
3181 SvREADONLY_on (sv); 3875 SvREADONLY_on (sv);
3182 } 3876 }
3183} 3877}
3184 3878
3879SV *
3880async (...)
3881 PROTOTYPE: &@
3882 CODE:
3883 RETVAL = coro_new (aTHX_ coro_stash, &ST (0), items, 1);
3884 api_ready (aTHX_ RETVAL);
3885 OUTPUT:
3886 RETVAL
3887
3888void
3889_destroy (Coro::State coro)
3890 CODE:
3891 /* used by the manager thread */
3892 coro_state_destroy (aTHX_ coro);
3893
3894void
3895on_destroy (Coro::State coro, SV *cb)
3896 CODE:
3897 coro_push_on_destroy (aTHX_ coro, newSVsv (cb));
3898
3899void
3900join (...)
3901 CODE:
3902 CORO_EXECUTE_SLF_XS (slf_init_join);
3903
3185void 3904void
3186terminate (...) 3905terminate (...)
3187 CODE: 3906 CODE:
3188 CORO_EXECUTE_SLF_XS (slf_init_terminate); 3907 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3189 3908
3190void 3909void
3910cancel (...)
3911 CODE:
3912 CORO_EXECUTE_SLF_XS (slf_init_cancel);
3913
3914int
3915safe_cancel (Coro::State self, ...)
3916 C_ARGS: aTHX_ self, &ST (1), items - 1
3917
3918void
3191schedule (...) 3919schedule (...)
3192 CODE: 3920 CODE:
3193 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3921 CORO_EXECUTE_SLF_XS (slf_init_schedule);
3194 3922
3195void 3923void
… …
3209 3937
3210void 3938void
3211cede_notself (...) 3939cede_notself (...)
3212 CODE: 3940 CODE:
3213 CORO_EXECUTE_SLF_XS (slf_init_cede_notself); 3941 CORO_EXECUTE_SLF_XS (slf_init_cede_notself);
3214
3215void
3216_cancel (Coro::State self)
3217 CODE:
3218 coro_state_destroy (aTHX_ self);
3219 coro_call_on_destroy (aTHX_ self);
3220 3942
3221void 3943void
3222_set_current (SV *current) 3944_set_current (SV *current)
3223 PROTOTYPE: $ 3945 PROTOTYPE: $
3224 CODE: 3946 CODE:
… …
3228void 3950void
3229_set_readyhook (SV *hook) 3951_set_readyhook (SV *hook)
3230 PROTOTYPE: $ 3952 PROTOTYPE: $
3231 CODE: 3953 CODE:
3232 SvREFCNT_dec (coro_readyhook); 3954 SvREFCNT_dec (coro_readyhook);
3955 SvGETMAGIC (hook);
3956 if (SvOK (hook))
3957 {
3233 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0; 3958 coro_readyhook = newSVsv (hook);
3959 CORO_READYHOOK = invoke_sv_ready_hook_helper;
3960 }
3961 else
3962 {
3963 coro_readyhook = 0;
3964 CORO_READYHOOK = 0;
3965 }
3234 3966
3235int 3967int
3236prio (Coro::State coro, int newprio = 0) 3968prio (Coro::State coro, int newprio = 0)
3237 PROTOTYPE: $;$ 3969 PROTOTYPE: $;$
3238 ALIAS: 3970 ALIAS:
… …
3244 if (items > 1) 3976 if (items > 1)
3245 { 3977 {
3246 if (ix) 3978 if (ix)
3247 newprio = coro->prio - newprio; 3979 newprio = coro->prio - newprio;
3248 3980
3249 if (newprio < PRIO_MIN) newprio = PRIO_MIN; 3981 if (newprio < CORO_PRIO_MIN) newprio = CORO_PRIO_MIN;
3250 if (newprio > PRIO_MAX) newprio = PRIO_MAX; 3982 if (newprio > CORO_PRIO_MAX) newprio = CORO_PRIO_MAX;
3251 3983
3252 coro->prio = newprio; 3984 coro->prio = newprio;
3253 } 3985 }
3254} 3986}
3255 OUTPUT: 3987 OUTPUT:
… …
3270 RETVAL = coro_nready; 4002 RETVAL = coro_nready;
3271 OUTPUT: 4003 OUTPUT:
3272 RETVAL 4004 RETVAL
3273 4005
3274void 4006void
4007suspend (Coro::State self)
4008 PROTOTYPE: $
4009 CODE:
4010 self->flags |= CF_SUSPENDED;
4011
4012void
4013resume (Coro::State self)
4014 PROTOTYPE: $
4015 CODE:
4016 self->flags &= ~CF_SUSPENDED;
4017
4018void
3275_pool_handler (...) 4019_pool_handler (...)
3276 CODE: 4020 CODE:
3277 CORO_EXECUTE_SLF_XS (slf_init_pool_handler); 4021 CORO_EXECUTE_SLF_XS (slf_init_pool_handler);
3278 4022
3279void 4023void
… …
3290 for (i = 1; i < items; ++i) 4034 for (i = 1; i < items; ++i)
3291 av_push (av, SvREFCNT_inc_NN (ST (i))); 4035 av_push (av, SvREFCNT_inc_NN (ST (i)));
3292 4036
3293 if ((SV *)hv == &PL_sv_undef) 4037 if ((SV *)hv == &PL_sv_undef)
3294 { 4038 {
3295 PUSHMARK (SP); 4039 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3296 EXTEND (SP, 2);
3297 PUSHs (sv_Coro);
3298 PUSHs ((SV *)cv_pool_handler);
3299 PUTBACK;
3300 call_sv ((SV *)cv_coro_state_new, G_SCALAR);
3301 SPAGAIN;
3302
3303 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs)); 4040 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
4041 SvREFCNT_dec (sv);
3304 } 4042 }
3305 4043
3306 { 4044 {
3307 struct coro *coro = SvSTATE_hv (hv); 4045 struct coro *coro = SvSTATE_hv (hv);
3308 4046
… …
3332rouse_wait (...) 4070rouse_wait (...)
3333 PROTOTYPE: ;$ 4071 PROTOTYPE: ;$
3334 PPCODE: 4072 PPCODE:
3335 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait); 4073 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait);
3336 4074
4075void
4076on_enter (SV *block)
4077 ALIAS:
4078 on_leave = 1
4079 PROTOTYPE: &
4080 CODE:
4081{
4082 struct coro *coro = SvSTATE_current;
4083 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
4084
4085 block = s_get_cv_croak (block);
4086
4087 if (!*avp)
4088 *avp = newAV ();
4089
4090 av_push (*avp, SvREFCNT_inc (block));
4091
4092 if (!ix)
4093 on_enterleave_call (aTHX_ block);
4094
4095 LEAVE; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
4096 SAVEDESTRUCTOR_X (ix ? coro_pop_on_leave : coro_pop_on_enter, (void *)coro);
4097 ENTER; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
4098}
4099
3337 4100
3338MODULE = Coro::State PACKAGE = PerlIO::cede 4101MODULE = Coro::State PACKAGE = PerlIO::cede
3339 4102
3340BOOT: 4103BOOT:
3341 PerlIO_define_layer (aTHX_ &PerlIO_cede); 4104 PerlIO_define_layer (aTHX_ &PerlIO_cede);
… …
3344MODULE = Coro::State PACKAGE = Coro::Semaphore 4107MODULE = Coro::State PACKAGE = Coro::Semaphore
3345 4108
3346SV * 4109SV *
3347new (SV *klass, SV *count = 0) 4110new (SV *klass, SV *count = 0)
3348 CODE: 4111 CODE:
4112{
4113 int semcnt = 1;
4114
4115 if (count)
4116 {
4117 SvGETMAGIC (count);
4118
4119 if (SvOK (count))
4120 semcnt = SvIV (count);
4121 }
4122
3349 RETVAL = sv_bless ( 4123 RETVAL = sv_bless (
3350 coro_waitarray_new (aTHX_ count && SvOK (count) ? SvIV (count) : 1), 4124 coro_waitarray_new (aTHX_ semcnt),
3351 GvSTASH (CvGV (cv)) 4125 GvSTASH (CvGV (cv))
3352 ); 4126 );
4127}
3353 OUTPUT: 4128 OUTPUT:
3354 RETVAL 4129 RETVAL
3355 4130
3356# helper for Coro::Channel 4131# helper for Coro::Channel and others
3357SV * 4132SV *
3358_alloc (int count) 4133_alloc (int count)
3359 CODE: 4134 CODE:
3360 RETVAL = coro_waitarray_new (aTHX_ count); 4135 RETVAL = coro_waitarray_new (aTHX_ count);
3361 OUTPUT: 4136 OUTPUT:
… …
3419 for (i = 1; i <= wcount; ++i) 4194 for (i = 1; i <= wcount; ++i)
3420 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i]))); 4195 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i])));
3421 } 4196 }
3422} 4197}
3423 4198
4199MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
4200
4201void
4202_may_delete (SV *sem, int count, unsigned int extra_refs)
4203 PPCODE:
4204{
4205 AV *av = (AV *)SvRV (sem);
4206
4207 if (SvREFCNT ((SV *)av) == 1 + extra_refs
4208 && AvFILLp (av) == 0 /* no waiters, just count */
4209 && SvIV (AvARRAY (av)[0]) == count)
4210 XSRETURN_YES;
4211
4212 XSRETURN_NO;
4213}
4214
3424MODULE = Coro::State PACKAGE = Coro::Signal 4215MODULE = Coro::State PACKAGE = Coro::Signal
3425 4216
3426SV * 4217SV *
3427new (SV *klass) 4218new (SV *klass)
3428 CODE: 4219 CODE:
… …
3499 4290
3500void 4291void
3501_register (char *target, char *proto, SV *req) 4292_register (char *target, char *proto, SV *req)
3502 CODE: 4293 CODE:
3503{ 4294{
3504 CV *req_cv = coro_sv_2cv (aTHX_ req); 4295 SV *req_cv = s_get_cv_croak (req);
3505 /* newXSproto doesn't return the CV on 5.8 */ 4296 /* newXSproto doesn't return the CV on 5.8 */
3506 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 4297 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3507 sv_setpv ((SV *)slf_cv, proto); 4298 sv_setpv ((SV *)slf_cv, proto);
3508 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0); 4299 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
3509} 4300}
3510 4301
4302MODULE = Coro::State PACKAGE = Coro::Select
4303
4304void
4305patch_pp_sselect ()
4306 CODE:
4307 if (!coro_old_pp_sselect)
4308 {
4309 coro_select_select = (SV *)get_cv ("Coro::Select::select", 0);
4310 coro_old_pp_sselect = PL_ppaddr [OP_SSELECT];
4311 PL_ppaddr [OP_SSELECT] = coro_pp_sselect;
4312 }
4313
4314void
4315unpatch_pp_sselect ()
4316 CODE:
4317 if (coro_old_pp_sselect)
4318 {
4319 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
4320 coro_old_pp_sselect = 0;
4321 }
4322

Diff Legend

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