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.328 by root, Tue Nov 25 09:49:43 2008 UTC vs.
Revision 1.414 by root, Wed Jun 29 16:08:31 2011 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"
17#include "ecb.h"
12 18
19#include <stddef.h>
13#include <stdio.h> 20#include <stdio.h>
14#include <errno.h> 21#include <errno.h>
15#include <assert.h> 22#include <assert.h>
16 23
17#ifdef WIN32 24#ifndef SVs_PADSTALE
25# define SVs_PADSTALE 0
26#endif
27
28#if defined(_WIN32)
29# undef HAS_GETTIMEOFDAY
18# undef setjmp 30# undef setjmp
19# undef longjmp 31# undef longjmp
20# undef _exit 32# undef _exit
21# define setjmp _setjmp /* deep magic */ 33# define setjmp _setjmp /* deep magic */
22#else 34#else
23# include <inttypes.h> /* most portable stdint.h */ 35# include <inttypes.h> /* most portable stdint.h */
24#endif 36#endif
25 37
26#ifdef HAVE_MMAP 38#if HAVE_MMAP
27# include <unistd.h> 39# include <unistd.h>
28# include <sys/mman.h> 40# include <sys/mman.h>
29# ifndef MAP_ANONYMOUS 41# ifndef MAP_ANONYMOUS
30# ifdef MAP_ANON 42# ifdef MAP_ANON
31# define MAP_ANONYMOUS MAP_ANON 43# define MAP_ANONYMOUS MAP_ANON
… …
51#endif 63#endif
52 64
53/* the maximum number of idle cctx that will be pooled */ 65/* the maximum number of idle cctx that will be pooled */
54static int cctx_max_idle = 4; 66static int cctx_max_idle = 4;
55 67
56#define PERL_VERSION_ATLEAST(a,b,c) \ 68#if defined(DEBUGGING) && PERL_VERSION_ATLEAST(5,12,0)
57 (PERL_REVISION > (a) \ 69# 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 70#endif
114 71
115#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 72#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
116# undef CORO_STACKGUARD 73# undef CORO_STACKGUARD
117#endif 74#endif
… …
133#else 90#else
134# define dSTACKLEVEL volatile void *stacklevel 91# define dSTACKLEVEL volatile void *stacklevel
135# define STACKLEVEL ((void *)&stacklevel) 92# define STACKLEVEL ((void *)&stacklevel)
136#endif 93#endif
137 94
138#define IN_DESTRUCT (PL_main_cv == Nullcv) 95#define IN_DESTRUCT PL_dirty
139
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 96
155#include "CoroAPI.h" 97#include "CoroAPI.h"
156#define GCoroAPI (&coroapi) /* very sneaky */ 98#define GCoroAPI (&coroapi) /* very sneaky */
157 99
158#ifdef USE_ITHREADS 100#ifdef USE_ITHREADS
159# if CORO_PTHREAD 101# if CORO_PTHREAD
160static void *coro_thx; 102static void *coro_thx;
161# endif 103# endif
162#endif 104#endif
163 105
106/* used in state.h */
107#define VAR(name,type) VARx(name, PL_ ## name, type)
108
109#ifdef __linux
110# include <time.h> /* for timespec */
111# include <syscall.h> /* for SYS_* */
112# ifdef SYS_clock_gettime
113# define coro_clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
114# define CORO_CLOCK_MONOTONIC 1
115# define CORO_CLOCK_THREAD_CPUTIME_ID 3
116# endif
117#endif
118
164static double (*nvtime)(); /* so why doesn't it take void? */ 119static double (*nvtime)(); /* so why doesn't it take void? */
120static void (*u2time)(pTHX_ UV ret[2]);
165 121
166/* we hijack an hopefully unused CV flag for our purposes */ 122/* we hijack an hopefully unused CV flag for our purposes */
167#define CVf_SLF 0x4000 123#define CVf_SLF 0x4000
168static OP *pp_slf (pTHX); 124static OP *pp_slf (pTHX);
125static void slf_destroy (pTHX_ struct coro *coro);
169 126
170static U32 cctx_gen; 127static U32 cctx_gen;
171static size_t cctx_stacksize = CORO_STACKSIZE; 128static size_t cctx_stacksize = CORO_STACKSIZE;
172static struct CoroAPI coroapi; 129static struct CoroAPI coroapi;
173static AV *main_mainstack; /* used to differentiate between $main and others */ 130static AV *main_mainstack; /* used to differentiate between $main and others */
… …
190static SV *sv_pool_size; 147static SV *sv_pool_size;
191static SV *sv_async_pool_idle; /* description string */ 148static SV *sv_async_pool_idle; /* description string */
192static AV *av_async_pool; /* idle pool */ 149static AV *av_async_pool; /* idle pool */
193static SV *sv_Coro; /* class string */ 150static SV *sv_Coro; /* class string */
194static CV *cv_pool_handler; 151static CV *cv_pool_handler;
195static CV *cv_coro_state_new;
196 152
197/* Coro::AnyEvent */ 153/* Coro::AnyEvent */
198static SV *sv_activity; 154static SV *sv_activity;
199 155
156/* enable processtime/realtime profiling */
157static char enable_times;
158typedef U32 coro_ts[2];
159static coro_ts time_real, time_cpu;
160static char times_valid;
161
200static struct coro_cctx *cctx_first; 162static struct coro_cctx *cctx_first;
201static int cctx_count, cctx_idle; 163static int cctx_count, cctx_idle;
202 164
203enum { 165enum
166{
204 CC_MAPPED = 0x01, 167 CC_MAPPED = 0x01,
205 CC_NOREUSE = 0x02, /* throw this away after tracing */ 168 CC_NOREUSE = 0x02, /* throw this away after tracing */
206 CC_TRACE = 0x04, 169 CC_TRACE = 0x04,
207 CC_TRACE_SUB = 0x08, /* trace sub calls */ 170 CC_TRACE_SUB = 0x08, /* trace sub calls */
208 CC_TRACE_LINE = 0x10, /* trace each statement */ 171 CC_TRACE_LINE = 0x10, /* trace each statement */
… …
229 int valgrind_id; 192 int valgrind_id;
230#endif 193#endif
231 unsigned char flags; 194 unsigned char flags;
232} coro_cctx; 195} coro_cctx;
233 196
234coro_cctx *cctx_current; /* the currently running cctx */ 197static coro_cctx *cctx_current; /* the currently running cctx */
235 198
236/*****************************************************************************/ 199/*****************************************************************************/
237 200
201static MGVTBL coro_state_vtbl;
202
238enum { 203enum
204{
239 CF_RUNNING = 0x0001, /* coroutine is running */ 205 CF_RUNNING = 0x0001, /* coroutine is running */
240 CF_READY = 0x0002, /* coroutine is ready */ 206 CF_READY = 0x0002, /* coroutine is ready */
241 CF_NEW = 0x0004, /* has never been switched to */ 207 CF_NEW = 0x0004, /* has never been switched to */
242 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 208 CF_ZOMBIE = 0x0008, /* coroutine data has been freed */
209 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
210 CF_NOCANCEL = 0x0020, /* cannot cancel, set slf_frame.data to 1 (hackish) */
243}; 211};
244 212
245/* the structure where most of the perl state is stored, overlaid on the cxstack */ 213/* the structure where most of the perl state is stored, overlaid on the cxstack */
246typedef struct 214typedef struct
247{ 215{
248 SV *defsv;
249 AV *defav;
250 SV *errsv;
251 SV *irsgv;
252 HV *hinthv;
253#define VAR(name,type) type name; 216#define VARx(name,expr,type) type name;
254# include "state.h" 217# include "state.h"
255#undef VAR 218#undef VARx
256} perl_slots; 219} perl_slots;
257 220
221/* 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)) 222#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
259 223
260/* this is a structure representing a perl-level coroutine */ 224/* this is a structure representing a perl-level coroutine */
261struct coro { 225struct coro
226{
262 /* the C coroutine allocated to this perl coroutine, if any */ 227 /* the C coroutine allocated to this perl coroutine, if any */
263 coro_cctx *cctx; 228 coro_cctx *cctx;
229
230 /* ready queue */
231 struct coro *next_ready;
264 232
265 /* state data */ 233 /* state data */
266 struct CoroSLF slf_frame; /* saved slf frame */ 234 struct CoroSLF slf_frame; /* saved slf frame */
267 AV *mainstack; 235 AV *mainstack;
268 perl_slots *slot; /* basically the saved sp */ 236 perl_slots *slot; /* basically the saved sp */
269 237
270 CV *startcv; /* the CV to execute */ 238 CV *startcv; /* the CV to execute */
271 AV *args; /* data associated with this coroutine (initial args) */ 239 AV *args; /* data associated with this coroutine (initial args) */
272 int refcnt; /* coroutines are refcounted, yes */
273 int flags; /* CF_ flags */ 240 int flags; /* CF_ flags */
274 HV *hv; /* the perl hash associated with this coro, if any */ 241 HV *hv; /* the perl hash associated with this coro, if any */
275 void (*on_destroy)(pTHX_ struct coro *coro);
276 242
277 /* statistics */ 243 /* statistics */
278 int usecount; /* number of transfers to this coro */ 244 int usecount; /* number of transfers to this coro */
279 245
280 /* coro process data */ 246 /* coro process data */
281 int prio; 247 int prio;
282 SV *except; /* exception to be thrown */ 248 SV *except; /* exception to be thrown */
283 SV *rouse_cb; 249 SV *rouse_cb; /* last rouse callback */
250 AV *on_destroy; /* callbacks or coros to notify on destroy */
251 AV *status; /* the exit status list */
284 252
285 /* async_pool */ 253 /* async_pool */
286 SV *saved_deffh; 254 SV *saved_deffh;
287 SV *invoke_cb; 255 SV *invoke_cb;
288 AV *invoke_av; 256 AV *invoke_av;
289 257
258 /* on_enter/on_leave */
259 AV *on_enter;
260 AV *on_leave;
261
262 /* swap_sv */
263 AV *swap_sv;
264
265 /* times */
266 coro_ts t_cpu, t_real;
267
290 /* linked list */ 268 /* linked list */
291 struct coro *next, *prev; 269 struct coro *next, *prev;
292}; 270};
293 271
294typedef struct coro *Coro__State; 272typedef struct coro *Coro__State;
295typedef struct coro *Coro__State_or_hashref; 273typedef struct coro *Coro__State_or_hashref;
296 274
297/* the following variables are effectively part of the perl context */ 275/* the following variables are effectively part of the perl context */
298/* and get copied between struct coro and these variables */ 276/* and get copied between struct coro and these variables */
299/* the mainr easonw e don't support windows process emulation */ 277/* the main reason we don't support windows process emulation */
300static struct CoroSLF slf_frame; /* the current slf frame */ 278static struct CoroSLF slf_frame; /* the current slf frame */
301 279
302/** Coro ********************************************************************/ 280/** Coro ********************************************************************/
303 281
304#define PRIO_MAX 3 282#define CORO_PRIO_MAX 3
305#define PRIO_HIGH 1 283#define CORO_PRIO_HIGH 1
306#define PRIO_NORMAL 0 284#define CORO_PRIO_NORMAL 0
307#define PRIO_LOW -1 285#define CORO_PRIO_LOW -1
308#define PRIO_IDLE -3 286#define CORO_PRIO_IDLE -3
309#define PRIO_MIN -4 287#define CORO_PRIO_MIN -4
310 288
311/* for Coro.pm */ 289/* for Coro.pm */
312static SV *coro_current; 290static SV *coro_current;
313static SV *coro_readyhook; 291static SV *coro_readyhook;
314static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1]; 292static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
315static CV *cv_coro_run, *cv_coro_terminate; 293static CV *cv_coro_run;
316static struct coro *coro_first; 294static struct coro *coro_first;
317#define coro_nready coroapi.nready 295#define coro_nready coroapi.nready
318 296
297/** JIT *********************************************************************/
298
299#if CORO_JIT
300 /* APPLE doesn't have HAVE_MMAP though */
301 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__)
302 #ifndef CORO_JIT_TYPE
303 #if __x86_64 && CORO_JIT_UNIXY
304 #define CORO_JIT_TYPE "amd64-unix"
305 #elif __i386 && CORO_JIT_UNIXY
306 #define CORO_JIT_TYPE "x86-unix"
307 #endif
308 #endif
309#endif
310
311#if !defined(CORO_JIT_TYPE) || !HAVE_MMAP
312 #undef CORO_JIT
313#endif
314
315#if CORO_JIT
316 typedef void (*load_save_perl_slots_type)(perl_slots *);
317 static load_save_perl_slots_type load_perl_slots, save_perl_slots;
318#endif
319
320/** Coro::Select ************************************************************/
321
322static OP *(*coro_old_pp_sselect) (pTHX);
323static SV *coro_select_select;
324
325/* horrible hack, but if it works... */
326static OP *
327coro_pp_sselect (pTHX)
328{
329 dSP;
330 PUSHMARK (SP - 4); /* fake argument list */
331 XPUSHs (coro_select_select);
332 PUTBACK;
333
334 /* entersub is an UNOP, select a LISTOP... keep your fingers crossed */
335 PL_op->op_flags |= OPf_STACKED;
336 PL_op->op_private = 0;
337 return PL_ppaddr [OP_ENTERSUB](aTHX);
338}
339
340/** time stuff **************************************************************/
341
342#ifdef HAS_GETTIMEOFDAY
343
344ecb_inline void
345coro_u2time (pTHX_ UV ret[2])
346{
347 struct timeval tv;
348 gettimeofday (&tv, 0);
349
350 ret [0] = tv.tv_sec;
351 ret [1] = tv.tv_usec;
352}
353
354ecb_inline double
355coro_nvtime (void)
356{
357 struct timeval tv;
358 gettimeofday (&tv, 0);
359
360 return tv.tv_sec + tv.tv_usec * 1e-6;
361}
362
363ecb_inline void
364time_init (pTHX)
365{
366 nvtime = coro_nvtime;
367 u2time = coro_u2time;
368}
369
370#else
371
372ecb_inline void
373time_init (pTHX)
374{
375 SV **svp;
376
377 require_pv ("Time/HiRes.pm");
378
379 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
380
381 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
382 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught");
383
384 nvtime = INT2PTR (double (*)(), SvIV (*svp));
385
386 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
387 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
388}
389
390#endif
391
319/** lowlevel stuff **********************************************************/ 392/** lowlevel stuff **********************************************************/
320 393
321static SV * 394static SV * ecb_noinline
322coro_get_sv (pTHX_ const char *name, int create) 395coro_get_sv (pTHX_ const char *name, int create)
323{ 396{
324#if PERL_VERSION_ATLEAST (5,10,0) 397#if PERL_VERSION_ATLEAST (5,10,0)
325 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 398 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
326 get_sv (name, create); 399 get_sv (name, create);
327#endif 400#endif
328 return get_sv (name, create); 401 return get_sv (name, create);
329} 402}
330 403
331static AV * 404static AV * ecb_noinline
332coro_get_av (pTHX_ const char *name, int create) 405coro_get_av (pTHX_ const char *name, int create)
333{ 406{
334#if PERL_VERSION_ATLEAST (5,10,0) 407#if PERL_VERSION_ATLEAST (5,10,0)
335 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 408 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
336 get_av (name, create); 409 get_av (name, create);
337#endif 410#endif
338 return get_av (name, create); 411 return get_av (name, create);
339} 412}
340 413
341static HV * 414static HV * ecb_noinline
342coro_get_hv (pTHX_ const char *name, int create) 415coro_get_hv (pTHX_ const char *name, int create)
343{ 416{
344#if PERL_VERSION_ATLEAST (5,10,0) 417#if PERL_VERSION_ATLEAST (5,10,0)
345 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 418 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
346 get_hv (name, create); 419 get_hv (name, create);
347#endif 420#endif
348 return get_hv (name, create); 421 return get_hv (name, create);
349} 422}
350 423
351/* may croak */ 424ecb_inline void
352INLINE CV * 425coro_times_update (void)
353coro_sv_2cv (pTHX_ SV *sv)
354{ 426{
355 HV *st; 427#ifdef coro_clock_gettime
356 GV *gvp; 428 struct timespec ts;
357 return sv_2cv (sv, &st, &gvp, 0);
358}
359 429
360static AV * 430 ts.tv_sec = ts.tv_nsec = 0;
431 coro_clock_gettime (CORO_CLOCK_THREAD_CPUTIME_ID, &ts);
432 time_cpu [0] = ts.tv_sec; time_cpu [1] = ts.tv_nsec;
433
434 ts.tv_sec = ts.tv_nsec = 0;
435 coro_clock_gettime (CORO_CLOCK_MONOTONIC, &ts);
436 time_real [0] = ts.tv_sec; time_real [1] = ts.tv_nsec;
437#else
438 dTHX;
439 UV tv[2];
440
441 u2time (aTHX_ tv);
442 time_real [0] = tv [0];
443 time_real [1] = tv [1] * 1000;
444#endif
445}
446
447ecb_inline void
448coro_times_add (struct coro *c)
449{
450 c->t_real [1] += time_real [1];
451 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
452 c->t_real [0] += time_real [0];
453
454 c->t_cpu [1] += time_cpu [1];
455 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
456 c->t_cpu [0] += time_cpu [0];
457}
458
459ecb_inline void
460coro_times_sub (struct coro *c)
461{
462 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; }
463 c->t_real [1] -= time_real [1];
464 c->t_real [0] -= time_real [0];
465
466 if (c->t_cpu [1] < time_cpu [1]) { c->t_cpu [1] += 1000000000; --c->t_cpu [0]; }
467 c->t_cpu [1] -= time_cpu [1];
468 c->t_cpu [0] -= time_cpu [0];
469}
470
471/*****************************************************************************/
472/* magic glue */
473
474#define CORO_MAGIC_type_cv 26
475#define CORO_MAGIC_type_state PERL_MAGIC_ext
476
477#define CORO_MAGIC_NN(sv, type) \
478 (ecb_expect_true (SvMAGIC (sv)->mg_type == type) \
479 ? SvMAGIC (sv) \
480 : mg_find (sv, type))
481
482#define CORO_MAGIC(sv, type) \
483 (ecb_expect_true (SvMAGIC (sv)) \
484 ? CORO_MAGIC_NN (sv, type) \
485 : 0)
486
487#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
488#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
489
490ecb_inline MAGIC *
491SvSTATEhv_p (pTHX_ SV *coro)
492{
493 MAGIC *mg;
494
495 if (ecb_expect_true (
496 SvTYPE (coro) == SVt_PVHV
497 && (mg = CORO_MAGIC_state (coro))
498 && mg->mg_virtual == &coro_state_vtbl
499 ))
500 return mg;
501
502 return 0;
503}
504
505ecb_inline struct coro *
506SvSTATE_ (pTHX_ SV *coro)
507{
508 MAGIC *mg;
509
510 if (SvROK (coro))
511 coro = SvRV (coro);
512
513 mg = SvSTATEhv_p (aTHX_ coro);
514 if (!mg)
515 croak ("Coro::State object required");
516
517 return (struct coro *)mg->mg_ptr;
518}
519
520#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
521
522/* faster than SvSTATE, but expects a coroutine hv */
523#define SvSTATE_hv(hv) ((struct coro *)CORO_MAGIC_NN ((SV *)hv, CORO_MAGIC_type_state)->mg_ptr)
524#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
525
526/*****************************************************************************/
527/* padlist management and caching */
528
529ecb_inline AV *
361coro_derive_padlist (pTHX_ CV *cv) 530coro_derive_padlist (pTHX_ CV *cv)
362{ 531{
363 AV *padlist = CvPADLIST (cv); 532 AV *padlist = CvPADLIST (cv);
364 AV *newpadlist, *newpad; 533 AV *newpadlist, *newpad;
365 534
… …
371 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 540 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
372#endif 541#endif
373 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 542 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
374 --AvFILLp (padlist); 543 --AvFILLp (padlist);
375 544
376 av_store (newpadlist, 0, SvREFCNT_inc_NN (*av_fetch (padlist, 0, FALSE))); 545 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0]));
377 av_store (newpadlist, 1, (SV *)newpad); 546 av_store (newpadlist, 1, (SV *)newpad);
378 547
379 return newpadlist; 548 return newpadlist;
380} 549}
381 550
382static void 551ecb_inline void
383free_padlist (pTHX_ AV *padlist) 552free_padlist (pTHX_ AV *padlist)
384{ 553{
385 /* may be during global destruction */ 554 /* may be during global destruction */
386 if (SvREFCNT (padlist)) 555 if (!IN_DESTRUCT)
387 { 556 {
388 I32 i = AvFILLp (padlist); 557 I32 i = AvFILLp (padlist);
389 while (i >= 0) 558
559 while (i > 0) /* special-case index 0 */
390 { 560 {
391 SV **svp = av_fetch (padlist, i--, FALSE); 561 /* we try to be extra-careful here */
392 if (svp) 562 AV *av = (AV *)AvARRAY (padlist)[i--];
393 { 563 I32 j = AvFILLp (av);
394 SV *sv; 564
395 while (&PL_sv_undef != (sv = av_pop ((AV *)*svp))) 565 while (j >= 0)
566 SvREFCNT_dec (AvARRAY (av)[j--]);
567
568 AvFILLp (av) = -1;
396 SvREFCNT_dec (sv); 569 SvREFCNT_dec (av);
397
398 SvREFCNT_dec (*svp);
399 }
400 } 570 }
401 571
572 SvREFCNT_dec (AvARRAY (padlist)[0]);
573
574 AvFILLp (padlist) = -1;
402 SvREFCNT_dec ((SV*)padlist); 575 SvREFCNT_dec ((SV*)padlist);
403 } 576 }
404} 577}
405 578
406static int 579static int
407coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 580coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
408{ 581{
409 AV *padlist; 582 AV *padlist;
410 AV *av = (AV *)mg->mg_obj; 583 AV *av = (AV *)mg->mg_obj;
584
585 /* perl manages to free our internal AV and _then_ call us */
586 if (IN_DESTRUCT)
587 return 0;
411 588
412 /* casting is fun. */ 589 /* casting is fun. */
413 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 590 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
414 free_padlist (aTHX_ padlist); 591 free_padlist (aTHX_ padlist);
415 592
416 SvREFCNT_dec (av); /* sv_magicext increased the refcount */ 593 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
417 594
418 return 0; 595 return 0;
419} 596}
420
421#define CORO_MAGIC_type_cv 26
422#define CORO_MAGIC_type_state PERL_MAGIC_ext
423 597
424static MGVTBL coro_cv_vtbl = { 598static MGVTBL coro_cv_vtbl = {
425 0, 0, 0, 0, 599 0, 0, 0, 0,
426 coro_cv_free 600 coro_cv_free
427}; 601};
428 602
429#define CORO_MAGIC_NN(sv, type) \
430 (expect_true (SvMAGIC (sv)->mg_type == type) \
431 ? SvMAGIC (sv) \
432 : mg_find (sv, type))
433
434#define CORO_MAGIC(sv, type) \
435 (expect_true (SvMAGIC (sv)) \
436 ? CORO_MAGIC_NN (sv, type) \
437 : 0)
438
439#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
440#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
441
442INLINE struct coro *
443SvSTATE_ (pTHX_ SV *coro)
444{
445 HV *stash;
446 MAGIC *mg;
447
448 if (SvROK (coro))
449 coro = SvRV (coro);
450
451 if (expect_false (SvTYPE (coro) != SVt_PVHV))
452 croak ("Coro::State object required");
453
454 stash = SvSTASH (coro);
455 if (expect_false (stash != coro_stash && stash != coro_state_stash))
456 {
457 /* very slow, but rare, check */
458 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
459 croak ("Coro::State object required");
460 }
461
462 mg = CORO_MAGIC_state (coro);
463 return (struct coro *)mg->mg_ptr;
464}
465
466#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
467
468/* faster than SvSTATE, but expects a coroutine hv */
469#define SvSTATE_hv(hv) ((struct coro *)CORO_MAGIC_NN ((SV *)hv, CORO_MAGIC_type_state)->mg_ptr)
470#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
471
472/* the next two functions merely cache the padlists */ 603/* the next two functions merely cache the padlists */
473static void 604ecb_inline void
474get_padlist (pTHX_ CV *cv) 605get_padlist (pTHX_ CV *cv)
475{ 606{
476 MAGIC *mg = CORO_MAGIC_cv (cv); 607 MAGIC *mg = CORO_MAGIC_cv (cv);
477 AV *av; 608 AV *av;
478 609
479 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 610 if (ecb_expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0))
480 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 611 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
481 else 612 else
482 { 613 {
483#if CORO_PREFER_PERL_FUNCTIONS 614#if CORO_PREFER_PERL_FUNCTIONS
484 /* this is probably cleaner? but also slower! */ 615 /* this is probably cleaner? but also slower! */
… …
491 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 622 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
492#endif 623#endif
493 } 624 }
494} 625}
495 626
496static void 627ecb_inline void
497put_padlist (pTHX_ CV *cv) 628put_padlist (pTHX_ CV *cv)
498{ 629{
499 MAGIC *mg = CORO_MAGIC_cv (cv); 630 MAGIC *mg = CORO_MAGIC_cv (cv);
500 AV *av; 631 AV *av;
501 632
502 if (expect_false (!mg)) 633 if (ecb_expect_false (!mg))
503 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 634 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
504 635
505 av = (AV *)mg->mg_obj; 636 av = (AV *)mg->mg_obj;
506 637
507 if (expect_false (AvFILLp (av) >= AvMAX (av))) 638 if (ecb_expect_false (AvFILLp (av) >= AvMAX (av)))
508 av_extend (av, AvMAX (av) + 1); 639 av_extend (av, AvFILLp (av) + 1);
509 640
510 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 641 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
511} 642}
512 643
513/** load & save, init *******************************************************/ 644/** load & save, init *******************************************************/
645
646/* swap sv heads, at least logically */
647static void
648swap_svs (pTHX_ Coro__State c)
649{
650 int i;
651
652 for (i = 0; i <= AvFILLp (c->swap_sv); )
653 {
654 SV *a = AvARRAY (c->swap_sv)[i++];
655 SV *b = AvARRAY (c->swap_sv)[i++];
656
657 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
658 SV tmp;
659
660 /* swap sv_any */
661 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
662
663 /* swap sv_flags */
664 SvFLAGS (&tmp) = SvFLAGS (a);
665 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
666 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
667
668#if PERL_VERSION_ATLEAST (5,10,0)
669 /* perl 5.10 complicates this _quite_ a bit, but it also is
670 * much faster, so no quarrels here. alternatively, we could
671 * sv_upgrade to avoid this.
672 */
673 {
674 /* swap sv_u */
675 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
676
677 /* if SvANY points to the head, we need to adjust the pointers,
678 * as the pointer for a still points to b, and maybe vice versa.
679 */
680 #define svany_in_head(type) \
681 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
682
683 if (svany_in_head (SvTYPE (a)))
684 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
685
686 if (svany_in_head (SvTYPE (b)))
687 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
688 }
689#endif
690 }
691}
692
693#define SWAP_SVS(coro) \
694 if (ecb_expect_false ((coro)->swap_sv)) \
695 swap_svs (aTHX_ (coro))
696
697static void
698on_enterleave_call (pTHX_ SV *cb);
514 699
515static void 700static void
516load_perl (pTHX_ Coro__State c) 701load_perl (pTHX_ Coro__State c)
517{ 702{
518 perl_slots *slot = c->slot; 703 perl_slots *slot = c->slot;
519 c->slot = 0; 704 c->slot = 0;
520 705
521 PL_mainstack = c->mainstack; 706 PL_mainstack = c->mainstack;
522 707
523 GvSV (PL_defgv) = slot->defsv; 708#if CORO_JIT
524 GvAV (PL_defgv) = slot->defav; 709 load_perl_slots (slot);
525 GvSV (PL_errgv) = slot->errsv; 710#else
526 GvSV (irsgv) = slot->irsgv;
527 GvHV (PL_hintgv) = slot->hinthv;
528
529 #define VAR(name,type) PL_ ## name = slot->name; 711 #define VARx(name,expr,type) expr = slot->name;
530 # include "state.h" 712 # include "state.h"
531 #undef VAR 713 #undef VARx
714#endif
532 715
533 { 716 {
534 dSP; 717 dSP;
535 718
536 CV *cv; 719 CV *cv;
537 720
538 /* now do the ugly restore mess */ 721 /* now do the ugly restore mess */
539 while (expect_true (cv = (CV *)POPs)) 722 while (ecb_expect_true (cv = (CV *)POPs))
540 { 723 {
541 put_padlist (aTHX_ cv); /* mark this padlist as available */ 724 put_padlist (aTHX_ cv); /* mark this padlist as available */
542 CvDEPTH (cv) = PTR2IV (POPs); 725 CvDEPTH (cv) = PTR2IV (POPs);
543 CvPADLIST (cv) = (AV *)POPs; 726 CvPADLIST (cv) = (AV *)POPs;
544 } 727 }
… …
546 PUTBACK; 729 PUTBACK;
547 } 730 }
548 731
549 slf_frame = c->slf_frame; 732 slf_frame = c->slf_frame;
550 CORO_THROW = c->except; 733 CORO_THROW = c->except;
734
735 if (ecb_expect_false (enable_times))
736 {
737 if (ecb_expect_false (!times_valid))
738 coro_times_update ();
739
740 coro_times_sub (c);
741 }
742
743 if (ecb_expect_false (c->on_enter))
744 {
745 int i;
746
747 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
748 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
749 }
750
751 SWAP_SVS (c);
551} 752}
552 753
553static void 754static void
554save_perl (pTHX_ Coro__State c) 755save_perl (pTHX_ Coro__State c)
555{ 756{
757 SWAP_SVS (c);
758
759 if (ecb_expect_false (c->on_leave))
760 {
761 int i;
762
763 for (i = AvFILLp (c->on_leave); i >= 0; --i)
764 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
765 }
766
767 times_valid = 0;
768
769 if (ecb_expect_false (enable_times))
770 {
771 coro_times_update (); times_valid = 1;
772 coro_times_add (c);
773 }
774
556 c->except = CORO_THROW; 775 c->except = CORO_THROW;
557 c->slf_frame = slf_frame; 776 c->slf_frame = slf_frame;
558 777
559 { 778 {
560 dSP; 779 dSP;
… …
569 788
570 XPUSHs (Nullsv); 789 XPUSHs (Nullsv);
571 /* this loop was inspired by pp_caller */ 790 /* this loop was inspired by pp_caller */
572 for (;;) 791 for (;;)
573 { 792 {
574 while (expect_true (cxix >= 0)) 793 while (ecb_expect_true (cxix >= 0))
575 { 794 {
576 PERL_CONTEXT *cx = &ccstk[cxix--]; 795 PERL_CONTEXT *cx = &ccstk[cxix--];
577 796
578 if (expect_true (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT)) 797 if (ecb_expect_true (CxTYPE (cx) == CXt_SUB) || ecb_expect_false (CxTYPE (cx) == CXt_FORMAT))
579 { 798 {
580 CV *cv = cx->blk_sub.cv; 799 CV *cv = cx->blk_sub.cv;
581 800
582 if (expect_true (CvDEPTH (cv))) 801 if (ecb_expect_true (CvDEPTH (cv)))
583 { 802 {
584 EXTEND (SP, 3); 803 EXTEND (SP, 3);
585 PUSHs ((SV *)CvPADLIST (cv)); 804 PUSHs ((SV *)CvPADLIST (cv));
586 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv))); 805 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
587 PUSHs ((SV *)cv); 806 PUSHs ((SV *)cv);
… …
590 get_padlist (aTHX_ cv); 809 get_padlist (aTHX_ cv);
591 } 810 }
592 } 811 }
593 } 812 }
594 813
595 if (expect_true (top_si->si_type == PERLSI_MAIN)) 814 if (ecb_expect_true (top_si->si_type == PERLSI_MAIN))
596 break; 815 break;
597 816
598 top_si = top_si->si_prev; 817 top_si = top_si->si_prev;
599 ccstk = top_si->si_cxstack; 818 ccstk = top_si->si_cxstack;
600 cxix = top_si->si_cxix; 819 cxix = top_si->si_cxix;
… …
602 821
603 PUTBACK; 822 PUTBACK;
604 } 823 }
605 824
606 /* allocate some space on the context stack for our purposes */ 825 /* allocate some space on the context stack for our purposes */
607 /* we manually unroll here, as usually 2 slots is enough */ 826 if (ecb_expect_false (cxstack_ix + (int)SLOT_COUNT >= cxstack_max))
608 if (SLOT_COUNT >= 1) CXINC;
609 if (SLOT_COUNT >= 2) CXINC;
610 if (SLOT_COUNT >= 3) CXINC;
611 { 827 {
612 int i; 828 unsigned int i;
829
613 for (i = 3; i < SLOT_COUNT; ++i) 830 for (i = 0; i < SLOT_COUNT; ++i)
614 CXINC; 831 CXINC;
615 } 832
616 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 833 cxstack_ix -= SLOT_COUNT; /* undo allocation */
834 }
617 835
618 c->mainstack = PL_mainstack; 836 c->mainstack = PL_mainstack;
619 837
620 { 838 {
621 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 839 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
622 840
623 slot->defav = GvAV (PL_defgv); 841#if CORO_JIT
624 slot->defsv = DEFSV; 842 save_perl_slots (slot);
625 slot->errsv = ERRSV; 843#else
626 slot->irsgv = GvSV (irsgv);
627 slot->hinthv = GvHV (PL_hintgv);
628
629 #define VAR(name,type) slot->name = PL_ ## name; 844 #define VARx(name,expr,type) slot->name = expr;
630 # include "state.h" 845 # include "state.h"
631 #undef VAR 846 #undef VARx
847#endif
632 } 848 }
633} 849}
634 850
635/* 851/*
636 * allocate various perl stacks. This is almost an exact copy 852 * allocate various perl stacks. This is almost an exact copy
… …
642# define coro_init_stacks(thx) init_stacks () 858# define coro_init_stacks(thx) init_stacks ()
643#else 859#else
644static void 860static void
645coro_init_stacks (pTHX) 861coro_init_stacks (pTHX)
646{ 862{
647 PL_curstackinfo = new_stackinfo(32, 8); 863 PL_curstackinfo = new_stackinfo(32, 4 + SLOT_COUNT); /* 3 is minimum due to perl rounding down in scope.c:GROW() */
648 PL_curstackinfo->si_type = PERLSI_MAIN; 864 PL_curstackinfo->si_type = PERLSI_MAIN;
649 PL_curstack = PL_curstackinfo->si_stack; 865 PL_curstack = PL_curstackinfo->si_stack;
650 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 866 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
651 867
652 PL_stack_base = AvARRAY(PL_curstack); 868 PL_stack_base = AvARRAY(PL_curstack);
… …
667#endif 883#endif
668 884
669 New(54,PL_scopestack,8,I32); 885 New(54,PL_scopestack,8,I32);
670 PL_scopestack_ix = 0; 886 PL_scopestack_ix = 0;
671 PL_scopestack_max = 8; 887 PL_scopestack_max = 8;
888#if HAS_SCOPESTACK_NAME
889 New(54,PL_scopestack_name,8,const char*);
890#endif
672 891
673 New(54,PL_savestack,24,ANY); 892 New(54,PL_savestack,24,ANY);
674 PL_savestack_ix = 0; 893 PL_savestack_ix = 0;
675 PL_savestack_max = 24; 894 PL_savestack_max = 24;
676 895
… …
704 } 923 }
705 924
706 Safefree (PL_tmps_stack); 925 Safefree (PL_tmps_stack);
707 Safefree (PL_markstack); 926 Safefree (PL_markstack);
708 Safefree (PL_scopestack); 927 Safefree (PL_scopestack);
928#if HAS_SCOPESTACK_NAME
929 Safefree (PL_scopestack_name);
930#endif
709 Safefree (PL_savestack); 931 Safefree (PL_savestack);
710#if !PERL_VERSION_ATLEAST (5,10,0) 932#if !PERL_VERSION_ATLEAST (5,10,0)
711 Safefree (PL_retstack); 933 Safefree (PL_retstack);
712#endif 934#endif
713} 935}
… …
759#endif 981#endif
760 982
761/* 983/*
762 * This overrides the default magic get method of %SIG elements. 984 * This overrides the default magic get method of %SIG elements.
763 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook 985 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
764 * and instead of tryign to save and restore the hash elements, we just provide 986 * and instead of trying to save and restore the hash elements (extremely slow),
765 * readback here. 987 * we just provide our own readback here.
766 * We only do this when the hook is != 0, as they are often set to 0 temporarily,
767 * not expecting this to actually change the hook. This is a potential problem
768 * when a schedule happens then, but we ignore this.
769 */ 988 */
770static int 989static int ecb_cold
771coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 990coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
772{ 991{
773 const char *s = MgPV_nolen_const (mg); 992 const char *s = MgPV_nolen_const (mg);
774 993
775 if (*s == '_') 994 if (*s == '_')
… …
787 } 1006 }
788 1007
789 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 1008 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
790} 1009}
791 1010
792static int 1011static int ecb_cold
793coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1012coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
794{ 1013{
795 const char *s = MgPV_nolen_const (mg); 1014 const char *s = MgPV_nolen_const (mg);
796 1015
797 if (*s == '_') 1016 if (*s == '_')
… …
811 } 1030 }
812 1031
813 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0; 1032 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
814} 1033}
815 1034
816static int 1035static int ecb_cold
817coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1036coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
818{ 1037{
819 const char *s = MgPV_nolen_const (mg); 1038 const char *s = MgPV_nolen_const (mg);
820 1039
821 if (*s == '_') 1040 if (*s == '_')
… …
826 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 1045 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
827 1046
828 if (svp) 1047 if (svp)
829 { 1048 {
830 SV *old = *svp; 1049 SV *old = *svp;
831 *svp = newSVsv (sv); 1050 *svp = SvOK (sv) ? newSVsv (sv) : 0;
832 SvREFCNT_dec (old); 1051 SvREFCNT_dec (old);
833 return 0; 1052 return 0;
834 } 1053 }
835 } 1054 }
836 1055
… …
854slf_check_repeat (pTHX_ struct CoroSLF *frame) 1073slf_check_repeat (pTHX_ struct CoroSLF *frame)
855{ 1074{
856 return 1; 1075 return 1;
857} 1076}
858 1077
859static UNOP coro_setup_op; 1078static UNOP init_perl_op;
860 1079
861static void NOINLINE /* noinline to keep it out of the transfer fast path */ 1080ecb_noinline static void /* noinline to keep it out of the transfer fast path */
862coro_setup (pTHX_ struct coro *coro) 1081init_perl (pTHX_ struct coro *coro)
863{ 1082{
864 /* 1083 /*
865 * emulate part of the perl startup here. 1084 * emulate part of the perl startup here.
866 */ 1085 */
867 coro_init_stacks (aTHX); 1086 coro_init_stacks (aTHX);
… …
874 PL_comppad_name_fill = 0; 1093 PL_comppad_name_fill = 0;
875 PL_comppad_name_floor = 0; 1094 PL_comppad_name_floor = 0;
876 PL_curpm = 0; 1095 PL_curpm = 0;
877 PL_curpad = 0; 1096 PL_curpad = 0;
878 PL_localizing = 0; 1097 PL_localizing = 0;
879 PL_dirty = 0;
880 PL_restartop = 0; 1098 PL_restartop = 0;
881#if PERL_VERSION_ATLEAST (5,10,0) 1099#if PERL_VERSION_ATLEAST (5,10,0)
882 PL_parser = 0; 1100 PL_parser = 0;
883#endif 1101#endif
884 PL_hints = 0; 1102 PL_hints = 0;
885 1103
886 /* recreate the die/warn hooks */ 1104 /* recreate the die/warn hooks */
887 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1105 PL_diehook = SvREFCNT_inc (rv_diehook);
888 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1106 PL_warnhook = SvREFCNT_inc (rv_warnhook);
889 1107
890 GvSV (PL_defgv) = newSV (0); 1108 GvSV (PL_defgv) = newSV (0);
891 GvAV (PL_defgv) = coro->args; coro->args = 0; 1109 GvAV (PL_defgv) = coro->args; coro->args = 0;
892 GvSV (PL_errgv) = newSV (0); 1110 GvSV (PL_errgv) = newSV (0);
893 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1111 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
… …
914 /* this newly created coroutine might be run on an existing cctx which most 1132 /* this newly created coroutine might be run on an existing cctx which most
915 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here. 1133 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
916 */ 1134 */
917 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1135 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
918 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */ 1136 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
1137 slf_frame.destroy = 0;
919 1138
920 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1139 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */
921 coro_setup_op.op_next = PL_op; 1140 init_perl_op.op_next = PL_op;
922 coro_setup_op.op_type = OP_ENTERSUB; 1141 init_perl_op.op_type = OP_ENTERSUB;
923 coro_setup_op.op_ppaddr = pp_slf; 1142 init_perl_op.op_ppaddr = pp_slf;
924 /* no flags etc. required, as an init function won't be called */ 1143 /* no flags etc. required, as an init function won't be called */
925 1144
926 PL_op = (OP *)&coro_setup_op; 1145 PL_op = (OP *)&init_perl_op;
927 1146
928 /* copy throw, in case it was set before coro_setup */ 1147 /* copy throw, in case it was set before init_perl */
929 CORO_THROW = coro->except; 1148 CORO_THROW = coro->except;
930}
931 1149
1150 SWAP_SVS (coro);
1151
1152 if (ecb_expect_false (enable_times))
1153 {
1154 coro_times_update ();
1155 coro_times_sub (coro);
1156 }
1157}
1158
932static void 1159static void
933coro_destruct (pTHX_ struct coro *coro) 1160coro_unwind_stacks (pTHX)
934{ 1161{
935 if (!IN_DESTRUCT) 1162 if (!IN_DESTRUCT)
936 { 1163 {
937 /* restore all saved variables and stuff */ 1164 /* restore all saved variables and stuff */
938 LEAVE_SCOPE (0); 1165 LEAVE_SCOPE (0);
… …
946 POPSTACK_TO (PL_mainstack); 1173 POPSTACK_TO (PL_mainstack);
947 1174
948 /* unwind main stack */ 1175 /* unwind main stack */
949 dounwind (-1); 1176 dounwind (-1);
950 } 1177 }
1178}
951 1179
952 SvREFCNT_dec (GvSV (PL_defgv)); 1180static void
953 SvREFCNT_dec (GvAV (PL_defgv)); 1181destroy_perl (pTHX_ struct coro *coro)
954 SvREFCNT_dec (GvSV (PL_errgv)); 1182{
955 SvREFCNT_dec (PL_defoutgv); 1183 SV *svf [9];
956 SvREFCNT_dec (PL_rs);
957 SvREFCNT_dec (GvSV (irsgv));
958 SvREFCNT_dec (GvHV (PL_hintgv));
959 1184
960 SvREFCNT_dec (PL_diehook);
961 SvREFCNT_dec (PL_warnhook);
962 1185 {
1186 SV *old_current = SvRV (coro_current);
1187 struct coro *current = SvSTATE (old_current);
1188
1189 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1190
1191 save_perl (aTHX_ current);
1192
1193 /* this will cause transfer_check to croak on block*/
1194 SvRV_set (coro_current, (SV *)coro->hv);
1195
1196 load_perl (aTHX_ coro);
1197
1198 coro_unwind_stacks (aTHX);
1199
1200 /* restore swapped sv's */
1201 SWAP_SVS (coro);
1202
1203 coro_destruct_stacks (aTHX);
1204
1205 /* now save some sv's to be free'd later */
1206 svf [0] = GvSV (PL_defgv);
1207 svf [1] = (SV *)GvAV (PL_defgv);
1208 svf [2] = GvSV (PL_errgv);
1209 svf [3] = (SV *)PL_defoutgv;
1210 svf [4] = PL_rs;
1211 svf [5] = GvSV (irsgv);
1212 svf [6] = (SV *)GvHV (PL_hintgv);
1213 svf [7] = PL_diehook;
1214 svf [8] = PL_warnhook;
1215 assert (9 == sizeof (svf) / sizeof (*svf));
1216
1217 SvRV_set (coro_current, old_current);
1218
1219 load_perl (aTHX_ current);
1220 }
1221
1222 {
1223 unsigned int i;
1224
1225 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i)
1226 SvREFCNT_dec (svf [i]);
1227
963 SvREFCNT_dec (coro->saved_deffh); 1228 SvREFCNT_dec (coro->saved_deffh);
964 SvREFCNT_dec (coro->rouse_cb); 1229 SvREFCNT_dec (coro->rouse_cb);
965 SvREFCNT_dec (coro->invoke_cb); 1230 SvREFCNT_dec (coro->invoke_cb);
966 SvREFCNT_dec (coro->invoke_av); 1231 SvREFCNT_dec (coro->invoke_av);
967 1232 }
968 coro_destruct_stacks (aTHX);
969} 1233}
970 1234
971INLINE void 1235ecb_inline void
972free_coro_mortal (pTHX) 1236free_coro_mortal (pTHX)
973{ 1237{
974 if (expect_true (coro_mortal)) 1238 if (ecb_expect_true (coro_mortal))
975 { 1239 {
976 SvREFCNT_dec (coro_mortal); 1240 SvREFCNT_dec ((SV *)coro_mortal);
977 coro_mortal = 0; 1241 coro_mortal = 0;
978 } 1242 }
979} 1243}
980 1244
981static int 1245static int
… …
1114 1378
1115 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1379 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1116} 1380}
1117 1381
1118/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1382/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1119static void NOINLINE 1383static void ecb_noinline
1120cctx_prepare (pTHX) 1384cctx_prepare (pTHX)
1121{ 1385{
1122 PL_top_env = &PL_start_env; 1386 PL_top_env = &PL_start_env;
1123 1387
1124 if (cctx_current->flags & CC_TRACE) 1388 if (cctx_current->flags & CC_TRACE)
… …
1135 slf_frame.prepare = slf_prepare_set_stacklevel; 1399 slf_frame.prepare = slf_prepare_set_stacklevel;
1136 slf_frame.check = slf_check_set_stacklevel; 1400 slf_frame.check = slf_check_set_stacklevel;
1137} 1401}
1138 1402
1139/* the tail of transfer: execute stuff we can only do after a transfer */ 1403/* the tail of transfer: execute stuff we can only do after a transfer */
1140INLINE void 1404ecb_inline void
1141transfer_tail (pTHX) 1405transfer_tail (pTHX)
1142{ 1406{
1143 free_coro_mortal (aTHX); 1407 free_coro_mortal (aTHX);
1144} 1408}
1145 1409
… …
1170 /* somebody or something will hit me for both perl_run and PL_restartop */ 1434 /* somebody or something will hit me for both perl_run and PL_restartop */
1171 PL_restartop = PL_op; 1435 PL_restartop = PL_op;
1172 perl_run (PL_curinterp); 1436 perl_run (PL_curinterp);
1173 /* 1437 /*
1174 * Unfortunately, there is no way to get at the return values of the 1438 * Unfortunately, there is no way to get at the return values of the
1175 * coro body here, as perl_run destroys these 1439 * coro body here, as perl_run destroys these. Likewise, we cannot catch
1440 * runtime errors here, as this is just a random interpreter, not a thread.
1176 */ 1441 */
1177 1442
1178 /* 1443 /*
1179 * If perl-run returns we assume exit() was being called or the coro 1444 * If perl-run returns we assume exit() was being called or the coro
1180 * fell off the end, which seems to be the only valid (non-bug) 1445 * fell off the end, which seems to be the only valid (non-bug)
… …
1188 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */ 1453 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1189 } 1454 }
1190} 1455}
1191 1456
1192static coro_cctx * 1457static coro_cctx *
1193cctx_new () 1458cctx_new (void)
1194{ 1459{
1195 coro_cctx *cctx; 1460 coro_cctx *cctx;
1196 1461
1197 ++cctx_count; 1462 ++cctx_count;
1198 New (0, cctx, 1, coro_cctx); 1463 New (0, cctx, 1, coro_cctx);
… …
1204 return cctx; 1469 return cctx;
1205} 1470}
1206 1471
1207/* create a new cctx only suitable as source */ 1472/* create a new cctx only suitable as source */
1208static coro_cctx * 1473static coro_cctx *
1209cctx_new_empty () 1474cctx_new_empty (void)
1210{ 1475{
1211 coro_cctx *cctx = cctx_new (); 1476 coro_cctx *cctx = cctx_new ();
1212 1477
1213 cctx->sptr = 0; 1478 cctx->sptr = 0;
1214 coro_create (&cctx->cctx, 0, 0, 0, 0); 1479 coro_create (&cctx->cctx, 0, 0, 0, 0);
… …
1216 return cctx; 1481 return cctx;
1217} 1482}
1218 1483
1219/* create a new cctx suitable as destination/running a perl interpreter */ 1484/* create a new cctx suitable as destination/running a perl interpreter */
1220static coro_cctx * 1485static coro_cctx *
1221cctx_new_run () 1486cctx_new_run (void)
1222{ 1487{
1223 coro_cctx *cctx = cctx_new (); 1488 coro_cctx *cctx = cctx_new ();
1224 void *stack_start; 1489 void *stack_start;
1225 size_t stack_size; 1490 size_t stack_size;
1226 1491
1227#if HAVE_MMAP 1492#if HAVE_MMAP
1228 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE; 1493 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1229 /* mmap supposedly does allocate-on-write for us */ 1494 /* mmap supposedly does allocate-on-write for us */
1230 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0); 1495 cctx->sptr = mmap (0, cctx->ssize, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_ANONYMOUS, 0, 0);
1231 1496
1232 if (cctx->sptr != (void *)-1) 1497 if (cctx->sptr != (void *)-1)
1233 { 1498 {
1234 #if CORO_STACKGUARD 1499 #if CORO_STACKGUARD
1235 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE); 1500 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
… …
1267cctx_destroy (coro_cctx *cctx) 1532cctx_destroy (coro_cctx *cctx)
1268{ 1533{
1269 if (!cctx) 1534 if (!cctx)
1270 return; 1535 return;
1271 1536
1272 assert (cctx != cctx_current);//D temporary 1537 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1273 1538
1274 --cctx_count; 1539 --cctx_count;
1275 coro_destroy (&cctx->cctx); 1540 coro_destroy (&cctx->cctx);
1276 1541
1277 /* coro_transfer creates new, empty cctx's */ 1542 /* coro_transfer creates new, empty cctx's */
… …
1296#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE)) 1561#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE))
1297 1562
1298static coro_cctx * 1563static coro_cctx *
1299cctx_get (pTHX) 1564cctx_get (pTHX)
1300{ 1565{
1301 while (expect_true (cctx_first)) 1566 while (ecb_expect_true (cctx_first))
1302 { 1567 {
1303 coro_cctx *cctx = cctx_first; 1568 coro_cctx *cctx = cctx_first;
1304 cctx_first = cctx->next; 1569 cctx_first = cctx->next;
1305 --cctx_idle; 1570 --cctx_idle;
1306 1571
1307 if (expect_true (!CCTX_EXPIRED (cctx))) 1572 if (ecb_expect_true (!CCTX_EXPIRED (cctx)))
1308 return cctx; 1573 return cctx;
1309 1574
1310 cctx_destroy (cctx); 1575 cctx_destroy (cctx);
1311 } 1576 }
1312 1577
… …
1317cctx_put (coro_cctx *cctx) 1582cctx_put (coro_cctx *cctx)
1318{ 1583{
1319 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1584 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr));
1320 1585
1321 /* free another cctx if overlimit */ 1586 /* free another cctx if overlimit */
1322 if (expect_false (cctx_idle >= cctx_max_idle)) 1587 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1323 { 1588 {
1324 coro_cctx *first = cctx_first; 1589 coro_cctx *first = cctx_first;
1325 cctx_first = first->next; 1590 cctx_first = first->next;
1326 --cctx_idle; 1591 --cctx_idle;
1327 1592
… …
1338static void 1603static void
1339transfer_check (pTHX_ struct coro *prev, struct coro *next) 1604transfer_check (pTHX_ struct coro *prev, struct coro *next)
1340{ 1605{
1341 /* TODO: throwing up here is considered harmful */ 1606 /* TODO: throwing up here is considered harmful */
1342 1607
1343 if (expect_true (prev != next)) 1608 if (ecb_expect_true (prev != next))
1344 { 1609 {
1345 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1610 if (ecb_expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1346 croak ("Coro::State::transfer called with a suspended prev Coro::State, but can only transfer from running or new states,"); 1611 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1347 1612
1348 if (expect_false (next->flags & CF_RUNNING)) 1613 if (ecb_expect_false (next->flags & (CF_RUNNING | CF_ZOMBIE | CF_SUSPENDED)))
1349 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states,");
1350
1351 if (expect_false (next->flags & CF_DESTROYED))
1352 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states,"); 1614 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1353 1615
1354#if !PERL_VERSION_ATLEAST (5,10,0) 1616#if !PERL_VERSION_ATLEAST (5,10,0)
1355 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1617 if (ecb_expect_false (PL_lex_state != LEX_NOTPARSING))
1356 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,"); 1618 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1357#endif 1619#endif
1358 } 1620 }
1359} 1621}
1360 1622
1361/* always use the TRANSFER macro */ 1623/* always use the TRANSFER macro */
1362static void NOINLINE /* noinline so we have a fixed stackframe */ 1624static void ecb_noinline /* noinline so we have a fixed stackframe */
1363transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1625transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1364{ 1626{
1365 dSTACKLEVEL; 1627 dSTACKLEVEL;
1366 1628
1367 /* sometimes transfer is only called to set idle_sp */ 1629 /* sometimes transfer is only called to set idle_sp */
1368 if (expect_false (!prev)) 1630 if (ecb_expect_false (!prev))
1369 { 1631 {
1370 cctx_current->idle_sp = STACKLEVEL; 1632 cctx_current->idle_sp = STACKLEVEL;
1371 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1633 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1372 } 1634 }
1373 else if (expect_true (prev != next)) 1635 else if (ecb_expect_true (prev != next))
1374 { 1636 {
1375 coro_cctx *cctx_prev; 1637 coro_cctx *cctx_prev;
1376 1638
1377 if (expect_false (prev->flags & CF_NEW)) 1639 if (ecb_expect_false (prev->flags & CF_NEW))
1378 { 1640 {
1379 /* create a new empty/source context */ 1641 /* create a new empty/source context */
1380 prev->flags &= ~CF_NEW; 1642 prev->flags &= ~CF_NEW;
1381 prev->flags |= CF_RUNNING; 1643 prev->flags |= CF_RUNNING;
1382 } 1644 }
… …
1385 next->flags |= CF_RUNNING; 1647 next->flags |= CF_RUNNING;
1386 1648
1387 /* first get rid of the old state */ 1649 /* first get rid of the old state */
1388 save_perl (aTHX_ prev); 1650 save_perl (aTHX_ prev);
1389 1651
1390 if (expect_false (next->flags & CF_NEW)) 1652 if (ecb_expect_false (next->flags & CF_NEW))
1391 { 1653 {
1392 /* need to start coroutine */ 1654 /* need to start coroutine */
1393 next->flags &= ~CF_NEW; 1655 next->flags &= ~CF_NEW;
1394 /* setup coroutine call */ 1656 /* setup coroutine call */
1395 coro_setup (aTHX_ next); 1657 init_perl (aTHX_ next);
1396 } 1658 }
1397 else 1659 else
1398 load_perl (aTHX_ next); 1660 load_perl (aTHX_ next);
1399 1661
1400 assert (!prev->cctx);//D temporary
1401
1402 /* possibly untie and reuse the cctx */ 1662 /* possibly untie and reuse the cctx */
1403 if (expect_true ( 1663 if (ecb_expect_true (
1404 cctx_current->idle_sp == STACKLEVEL 1664 cctx_current->idle_sp == STACKLEVEL
1405 && !(cctx_current->flags & CC_TRACE) 1665 && !(cctx_current->flags & CC_TRACE)
1406 && !force_cctx 1666 && !force_cctx
1407 )) 1667 ))
1408 { 1668 {
1409 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1669 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */
1410 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te)); 1670 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1411 1671
1412 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */ 1672 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */
1413 /* without this the next cctx_get might destroy the running cctx while still in use */ 1673 /* without this the next cctx_get might destroy the running cctx while still in use */
1414 if (expect_false (CCTX_EXPIRED (cctx_current))) 1674 if (ecb_expect_false (CCTX_EXPIRED (cctx_current)))
1415 if (expect_true (!next->cctx)) 1675 if (ecb_expect_true (!next->cctx))
1416 next->cctx = cctx_get (aTHX); 1676 next->cctx = cctx_get (aTHX);
1417 1677
1418 cctx_put (cctx_current); 1678 cctx_put (cctx_current);
1419 } 1679 }
1420 else 1680 else
1421 prev->cctx = cctx_current; 1681 prev->cctx = cctx_current;
1422 1682
1423 ++next->usecount; 1683 ++next->usecount;
1424 1684
1425 cctx_prev = cctx_current; 1685 cctx_prev = cctx_current;
1426 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX); 1686 cctx_current = ecb_expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1427 1687
1428 next->cctx = 0; 1688 next->cctx = 0;
1429 1689
1430 if (expect_false (cctx_prev != cctx_current)) 1690 if (ecb_expect_false (cctx_prev != cctx_current))
1431 { 1691 {
1432 cctx_prev->top_env = PL_top_env; 1692 cctx_prev->top_env = PL_top_env;
1433 PL_top_env = cctx_current->top_env; 1693 PL_top_env = cctx_current->top_env;
1434 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx); 1694 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1435 } 1695 }
… …
1441#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx)) 1701#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1442#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1702#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1443 1703
1444/** high level stuff ********************************************************/ 1704/** high level stuff ********************************************************/
1445 1705
1706/* this function is actually Coro, not Coro::State, but we call it from here */
1707/* because it is convenient - but it hasn't been declared yet for that reason */
1446static int 1708static void
1709coro_call_on_destroy (pTHX_ struct coro *coro);
1710
1711static void
1447coro_state_destroy (pTHX_ struct coro *coro) 1712coro_state_destroy (pTHX_ struct coro *coro)
1448{ 1713{
1449 if (coro->flags & CF_DESTROYED) 1714 if (coro->flags & CF_ZOMBIE)
1450 return 0; 1715 return;
1451 1716
1452 if (coro->on_destroy)
1453 coro->on_destroy (aTHX_ coro); 1717 slf_destroy (aTHX_ coro);
1454 1718
1455 coro->flags |= CF_DESTROYED; 1719 coro->flags |= CF_ZOMBIE;
1456 1720
1457 if (coro->flags & CF_READY) 1721 if (coro->flags & CF_READY)
1458 { 1722 {
1459 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1723 /* reduce nready, as destroying a ready coro effectively unreadies it */
1460 /* alternative: look through all ready queues and remove the coro */ 1724 /* alternative: look through all ready queues and remove the coro */
1461 --coro_nready; 1725 --coro_nready;
1462 } 1726 }
1463 else 1727 else
1464 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1728 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1465 1729
1466 if (coro->mainstack && coro->mainstack != main_mainstack) 1730 if (coro->next) coro->next->prev = coro->prev;
1467 { 1731 if (coro->prev) coro->prev->next = coro->next;
1468 struct coro temp; 1732 if (coro == coro_first) coro_first = coro->next;
1469 1733
1470 assert (("FATAL: tried to destroy currently running coroutine (please report)", !(coro->flags & CF_RUNNING))); 1734 if (coro->mainstack
1471 1735 && coro->mainstack != main_mainstack
1472 save_perl (aTHX_ &temp); 1736 && coro->slot
1737 && !PL_dirty)
1473 load_perl (aTHX_ coro); 1738 destroy_perl (aTHX_ coro);
1474
1475 coro_destruct (aTHX_ coro);
1476
1477 load_perl (aTHX_ &temp);
1478
1479 coro->slot = 0;
1480 }
1481 1739
1482 cctx_destroy (coro->cctx); 1740 cctx_destroy (coro->cctx);
1483 SvREFCNT_dec (coro->startcv); 1741 SvREFCNT_dec (coro->startcv);
1484 SvREFCNT_dec (coro->args); 1742 SvREFCNT_dec (coro->args);
1743 SvREFCNT_dec (coro->swap_sv);
1485 SvREFCNT_dec (CORO_THROW); 1744 SvREFCNT_dec (CORO_THROW);
1486 1745
1487 if (coro->next) coro->next->prev = coro->prev; 1746 coro_call_on_destroy (aTHX_ coro);
1488 if (coro->prev) coro->prev->next = coro->next;
1489 if (coro == coro_first) coro_first = coro->next;
1490 1747
1491 return 1; 1748 /* more destruction mayhem in coro_state_free */
1492} 1749}
1493 1750
1494static int 1751static int
1495coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1752coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1496{ 1753{
1497 struct coro *coro = (struct coro *)mg->mg_ptr; 1754 struct coro *coro = (struct coro *)mg->mg_ptr;
1498 mg->mg_ptr = 0; 1755 mg->mg_ptr = 0;
1499 1756
1500 coro->hv = 0;
1501
1502 if (--coro->refcnt < 0)
1503 {
1504 coro_state_destroy (aTHX_ coro); 1757 coro_state_destroy (aTHX_ coro);
1758 SvREFCNT_dec (coro->on_destroy);
1759 SvREFCNT_dec (coro->status);
1760
1505 Safefree (coro); 1761 Safefree (coro);
1506 }
1507 1762
1508 return 0; 1763 return 0;
1509} 1764}
1510 1765
1511static int 1766static int ecb_cold
1512coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1767coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1513{ 1768{
1514 struct coro *coro = (struct coro *)mg->mg_ptr; 1769 /* called when perl clones the current process the slow way (windows process emulation) */
1515 1770 /* WE SIMply nuke the pointers in the copy, causing perl to croak */
1516 ++coro->refcnt; 1771 mg->mg_ptr = 0;
1772 mg->mg_virtual = 0;
1517 1773
1518 return 0; 1774 return 0;
1519} 1775}
1520 1776
1521static MGVTBL coro_state_vtbl = { 1777static MGVTBL coro_state_vtbl = {
… …
1544 1800
1545 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1801 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1546 TRANSFER (ta, 1); 1802 TRANSFER (ta, 1);
1547} 1803}
1548 1804
1549/*****************************************************************************/
1550/* gensub: simple closure generation utility */
1551
1552#define GENSUB_ARG CvXSUBANY (cv).any_ptr
1553
1554/* create a closure from XS, returns a code reference */
1555/* the arg can be accessed via GENSUB_ARG from the callback */
1556/* the callback must use dXSARGS/XSRETURN */
1557static SV *
1558gensub (pTHX_ void (*xsub)(pTHX_ CV *), void *arg)
1559{
1560 CV *cv = (CV *)newSV (0);
1561
1562 sv_upgrade ((SV *)cv, SVt_PVCV);
1563
1564 CvANON_on (cv);
1565 CvISXSUB_on (cv);
1566 CvXSUB (cv) = xsub;
1567 GENSUB_ARG = arg;
1568
1569 return newRV_noinc ((SV *)cv);
1570}
1571
1572/** Coro ********************************************************************/ 1805/** Coro ********************************************************************/
1573 1806
1574INLINE void 1807ecb_inline void
1575coro_enq (pTHX_ struct coro *coro) 1808coro_enq (pTHX_ struct coro *coro)
1576{ 1809{
1577 av_push (coro_ready [coro->prio - PRIO_MIN], SvREFCNT_inc_NN (coro->hv)); 1810 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1578}
1579 1811
1580INLINE SV * 1812 SvREFCNT_inc_NN (coro->hv);
1813
1814 coro->next_ready = 0;
1815 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1816 ready [1] = coro;
1817}
1818
1819ecb_inline struct coro *
1581coro_deq (pTHX) 1820coro_deq (pTHX)
1582{ 1821{
1583 int prio; 1822 int prio;
1584 1823
1585 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; ) 1824 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
1586 if (AvFILLp (coro_ready [prio]) >= 0) 1825 {
1587 return av_shift (coro_ready [prio]); 1826 struct coro **ready = coro_ready [prio];
1827
1828 if (ready [0])
1829 {
1830 struct coro *coro = ready [0];
1831 ready [0] = coro->next_ready;
1832 return coro;
1833 }
1834 }
1588 1835
1589 return 0; 1836 return 0;
1837}
1838
1839static void
1840invoke_sv_ready_hook_helper (void)
1841{
1842 dTHX;
1843 dSP;
1844
1845 ENTER;
1846 SAVETMPS;
1847
1848 PUSHMARK (SP);
1849 PUTBACK;
1850 call_sv (coro_readyhook, G_VOID | G_DISCARD);
1851
1852 FREETMPS;
1853 LEAVE;
1590} 1854}
1591 1855
1592static int 1856static int
1593api_ready (pTHX_ SV *coro_sv) 1857api_ready (pTHX_ SV *coro_sv)
1594{ 1858{
1595 struct coro *coro;
1596 SV *sv_hook;
1597 void (*xs_hook)(void);
1598
1599 coro = SvSTATE (coro_sv); 1859 struct coro *coro = SvSTATE (coro_sv);
1600 1860
1601 if (coro->flags & CF_READY) 1861 if (coro->flags & CF_READY)
1602 return 0; 1862 return 0;
1603 1863
1604 coro->flags |= CF_READY; 1864 coro->flags |= CF_READY;
1605 1865
1606 sv_hook = coro_nready ? 0 : coro_readyhook;
1607 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1608
1609 coro_enq (aTHX_ coro); 1866 coro_enq (aTHX_ coro);
1610 ++coro_nready;
1611 1867
1612 if (sv_hook) 1868 if (!coro_nready++)
1613 { 1869 if (coroapi.readyhook)
1614 dSP; 1870 coroapi.readyhook ();
1615
1616 ENTER;
1617 SAVETMPS;
1618
1619 PUSHMARK (SP);
1620 PUTBACK;
1621 call_sv (sv_hook, G_VOID | G_DISCARD);
1622
1623 FREETMPS;
1624 LEAVE;
1625 }
1626
1627 if (xs_hook)
1628 xs_hook ();
1629 1871
1630 return 1; 1872 return 1;
1631} 1873}
1632 1874
1633static int 1875static int
… …
1635{ 1877{
1636 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1878 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1637} 1879}
1638 1880
1639/* expects to own a reference to next->hv */ 1881/* expects to own a reference to next->hv */
1640INLINE void 1882ecb_inline void
1641prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1883prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1642{ 1884{
1643 SV *prev_sv = SvRV (coro_current); 1885 SV *prev_sv = SvRV (coro_current);
1644 1886
1645 ta->prev = SvSTATE_hv (prev_sv); 1887 ta->prev = SvSTATE_hv (prev_sv);
… …
1656static void 1898static void
1657prepare_schedule (pTHX_ struct coro_transfer_args *ta) 1899prepare_schedule (pTHX_ struct coro_transfer_args *ta)
1658{ 1900{
1659 for (;;) 1901 for (;;)
1660 { 1902 {
1661 SV *next_sv = coro_deq (aTHX); 1903 struct coro *next = coro_deq (aTHX);
1662 1904
1663 if (expect_true (next_sv)) 1905 if (ecb_expect_true (next))
1664 { 1906 {
1665 struct coro *next = SvSTATE_hv (next_sv);
1666
1667 /* cannot transfer to destroyed coros, skip and look for next */ 1907 /* cannot transfer to destroyed coros, skip and look for next */
1668 if (expect_false (next->flags & CF_DESTROYED)) 1908 if (ecb_expect_false (next->flags & (CF_ZOMBIE | CF_SUSPENDED)))
1669 SvREFCNT_dec (next_sv); /* coro_nready has already been taken care of by destroy */ 1909 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1670 else 1910 else
1671 { 1911 {
1672 next->flags &= ~CF_READY; 1912 next->flags &= ~CF_READY;
1673 --coro_nready; 1913 --coro_nready;
1674 1914
… …
1680 { 1920 {
1681 /* nothing to schedule: call the idle handler */ 1921 /* nothing to schedule: call the idle handler */
1682 if (SvROK (sv_idle) 1922 if (SvROK (sv_idle)
1683 && SvOBJECT (SvRV (sv_idle))) 1923 && SvOBJECT (SvRV (sv_idle)))
1684 { 1924 {
1925 if (SvRV (sv_idle) == SvRV (coro_current))
1926 croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught");
1927
1685 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 1928 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1686 api_ready (aTHX_ SvRV (sv_idle)); 1929 api_ready (aTHX_ SvRV (sv_idle));
1687 --coro_nready; 1930 --coro_nready;
1688 } 1931 }
1689 else 1932 else
1690 { 1933 {
1934 /* TODO: deprecated, remove, cannot work reliably *//*D*/
1691 dSP; 1935 dSP;
1692 1936
1693 ENTER; 1937 ENTER;
1694 SAVETMPS; 1938 SAVETMPS;
1695 1939
… …
1702 } 1946 }
1703 } 1947 }
1704 } 1948 }
1705} 1949}
1706 1950
1707INLINE void 1951ecb_inline void
1708prepare_cede (pTHX_ struct coro_transfer_args *ta) 1952prepare_cede (pTHX_ struct coro_transfer_args *ta)
1709{ 1953{
1710 api_ready (aTHX_ coro_current); 1954 api_ready (aTHX_ coro_current);
1711 prepare_schedule (aTHX_ ta); 1955 prepare_schedule (aTHX_ ta);
1712} 1956}
1713 1957
1714INLINE void 1958ecb_inline void
1715prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 1959prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1716{ 1960{
1717 SV *prev = SvRV (coro_current); 1961 SV *prev = SvRV (coro_current);
1718 1962
1719 if (coro_nready) 1963 if (coro_nready)
… …
1749{ 1993{
1750 struct coro_transfer_args ta; 1994 struct coro_transfer_args ta;
1751 1995
1752 prepare_cede (aTHX_ &ta); 1996 prepare_cede (aTHX_ &ta);
1753 1997
1754 if (expect_true (ta.prev != ta.next)) 1998 if (ecb_expect_true (ta.prev != ta.next))
1755 { 1999 {
1756 TRANSFER (ta, 1); 2000 TRANSFER (ta, 1);
1757 return 1; 2001 return 1;
1758 } 2002 }
1759 else 2003 else
… …
1802 coro->slot->runops = RUNOPS_DEFAULT; 2046 coro->slot->runops = RUNOPS_DEFAULT;
1803 } 2047 }
1804} 2048}
1805 2049
1806static void 2050static void
2051coro_push_av (pTHX_ AV *av, I32 gimme_v)
2052{
2053 if (AvFILLp (av) >= 0 && gimme_v != G_VOID)
2054 {
2055 dSP;
2056
2057 if (gimme_v == G_SCALAR)
2058 XPUSHs (AvARRAY (av)[AvFILLp (av)]);
2059 else
2060 {
2061 int i;
2062 EXTEND (SP, AvFILLp (av) + 1);
2063
2064 for (i = 0; i <= AvFILLp (av); ++i)
2065 PUSHs (AvARRAY (av)[i]);
2066 }
2067
2068 PUTBACK;
2069 }
2070}
2071
2072static void
2073coro_push_on_destroy (pTHX_ struct coro *coro, SV *cb)
2074{
2075 if (!coro->on_destroy)
2076 coro->on_destroy = newAV ();
2077
2078 av_push (coro->on_destroy, cb);
2079}
2080
2081static void
2082slf_destroy_join (pTHX_ struct CoroSLF *frame)
2083{
2084 SvREFCNT_dec ((SV *)((struct coro *)frame->data)->hv);
2085}
2086
2087static int
2088slf_check_join (pTHX_ struct CoroSLF *frame)
2089{
2090 struct coro *coro = (struct coro *)frame->data;
2091
2092 if (!coro->status)
2093 return 1;
2094
2095 frame->destroy = 0;
2096
2097 coro_push_av (aTHX_ coro->status, GIMME_V);
2098
2099 SvREFCNT_dec ((SV *)coro->hv);
2100
2101 return 0;
2102}
2103
2104static void
2105slf_init_join (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2106{
2107 struct coro *coro = SvSTATE (items > 0 ? arg [0] : &PL_sv_undef);
2108
2109 if (items > 1)
2110 croak ("join called with too many arguments");
2111
2112 if (coro->status)
2113 frame->prepare = prepare_nop;
2114 else
2115 {
2116 coro_push_on_destroy (aTHX_ coro, SvREFCNT_inc_NN (SvRV (coro_current)));
2117 frame->prepare = prepare_schedule;
2118 }
2119
2120 frame->check = slf_check_join;
2121 frame->destroy = slf_destroy_join;
2122 frame->data = (void *)coro;
2123 SvREFCNT_inc (coro->hv);
2124}
2125
2126static void
1807coro_call_on_destroy (pTHX_ struct coro *coro) 2127coro_call_on_destroy (pTHX_ struct coro *coro)
1808{ 2128{
1809 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2129 AV *od = coro->on_destroy;
1810 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1811 2130
1812 if (on_destroyp) 2131 if (!od)
1813 { 2132 return;
1814 AV *on_destroy = (AV *)SvRV (*on_destroyp);
1815 2133
1816 while (AvFILLp (on_destroy) >= 0) 2134 while (AvFILLp (od) >= 0)
2135 {
2136 SV *cb = sv_2mortal (av_pop (od));
2137
2138 /* coro hv's (and only hv's at the moment) are supported as well */
2139 if (SvSTATEhv_p (aTHX_ cb))
2140 api_ready (aTHX_ cb);
2141 else
1817 { 2142 {
1818 dSP; /* don't disturb outer sp */ 2143 dSP; /* don't disturb outer sp */
1819 SV *cb = av_pop (on_destroy);
1820
1821 PUSHMARK (SP); 2144 PUSHMARK (SP);
1822 2145
1823 if (statusp) 2146 if (coro->status)
1824 { 2147 {
1825 int i; 2148 PUTBACK;
1826 AV *status = (AV *)SvRV (*statusp); 2149 coro_push_av (aTHX_ coro->status, G_ARRAY);
1827 EXTEND (SP, AvFILLp (status) + 1); 2150 SPAGAIN;
1828
1829 for (i = 0; i <= AvFILLp (status); ++i)
1830 PUSHs (AvARRAY (status)[i]);
1831 } 2151 }
1832 2152
1833 PUTBACK; 2153 PUTBACK;
1834 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD); 2154 call_sv (cb, G_VOID | G_DISCARD);
1835 } 2155 }
1836 } 2156 }
1837} 2157}
1838 2158
1839static void 2159static void
1840slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2160coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
1841{ 2161{
2162 AV *av;
2163
2164 if (coro->status)
2165 {
2166 av = coro->status;
2167 av_clear (av);
2168 }
2169 else
2170 av = coro->status = newAV ();
2171
2172 /* items are actually not so common, so optimise for this case */
2173 if (items)
2174 {
1842 int i; 2175 int i;
1843 HV *hv = (HV *)SvRV (coro_current);
1844 AV *av = newAV ();
1845 2176
1846 av_extend (av, items - 1); 2177 av_extend (av, items - 1);
2178
1847 for (i = 0; i < items; ++i) 2179 for (i = 0; i < items; ++i)
1848 av_push (av, SvREFCNT_inc_NN (arg [i])); 2180 av_push (av, SvREFCNT_inc_NN (arg [i]));
2181 }
2182}
1849 2183
1850 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 2184static void
1851 2185slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2186{
1852 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */ 2187 av_push (av_destroy, (SV *)newRV_inc ((SV *)coro_hv)); /* RVinc for perl */
1853 api_ready (aTHX_ sv_manager); 2188 api_ready (aTHX_ sv_manager);
1854 2189
1855 frame->prepare = prepare_schedule; 2190 frame->prepare = prepare_schedule;
1856 frame->check = slf_check_repeat; 2191 frame->check = slf_check_repeat;
2192
2193 /* as a minor optimisation, we could unwind all stacks here */
2194 /* but that puts extra pressure on pp_slf, and is not worth much */
2195 /*coro_unwind_stacks (aTHX);*/
2196}
2197
2198static void
2199slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2200{
2201 HV *coro_hv = (HV *)SvRV (coro_current);
2202
2203 coro_set_status (aTHX_ SvSTATE ((SV *)coro_hv), arg, items);
2204 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2205}
2206
2207static void
2208slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2209{
2210 HV *coro_hv;
2211 struct coro *coro;
2212
2213 if (items <= 0)
2214 croak ("Coro::cancel called without coro object,");
2215
2216 coro = SvSTATE (arg [0]);
2217 coro_hv = coro->hv;
2218
2219 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2220
2221 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2222 {
2223 /* coro currently busy cancelling something, so just notify it */
2224 coro->slf_frame.data = (void *)coro;
2225
2226 frame->prepare = prepare_nop;
2227 frame->check = slf_check_nop;
2228 }
2229 else if (coro_hv == (HV *)SvRV (coro_current))
2230 {
2231 /* cancelling the current coro is allowed, and equals terminate */
2232 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2233 }
2234 else
2235 {
2236 struct coro *self = SvSTATE_current;
2237
2238 /* otherwise we cancel directly, purely for speed reasons
2239 * unfortunately, this requires some magic trickery, as
2240 * somebody else could cancel us, so we have to fight the cancellation.
2241 * this is ugly, and hopefully fully worth the extra speed.
2242 * besides, I can't get the slow-but-safe version working...
2243 */
2244 slf_frame.data = 0;
2245 self->flags |= CF_NOCANCEL;
2246 coro_state_destroy (aTHX_ coro);
2247 self->flags &= ~CF_NOCANCEL;
2248
2249 if (slf_frame.data)
2250 {
2251 /* while we were busy we have been cancelled, so terminate */
2252 slf_init_terminate_cancel_common (aTHX_ frame, self->hv);
2253 }
2254 else
2255 {
2256 frame->prepare = prepare_nop;
2257 frame->check = slf_check_nop;
2258 }
2259 }
2260}
2261
2262static int
2263slf_check_safe_cancel (pTHX_ struct CoroSLF *frame)
2264{
2265 frame->prepare = 0;
2266 coro_unwind_stacks (aTHX);
2267
2268 slf_init_terminate_cancel_common (aTHX_ frame, (HV *)SvRV (coro_current));
2269
2270 return 1;
2271}
2272
2273static int
2274safe_cancel (pTHX_ struct coro *coro, SV **arg, int items)
2275{
2276 if (coro->cctx)
2277 croak ("coro inside C callback, unable to cancel at this time, caught");
2278
2279 if (coro->flags & CF_NEW)
2280 {
2281 coro_set_status (aTHX_ coro, arg, items);
2282 coro_state_destroy (aTHX_ coro);
2283 }
2284 else
2285 {
2286 if (!coro->slf_frame.prepare)
2287 croak ("coro outside an SLF function, unable to cancel at this time, caught");
2288
2289 slf_destroy (aTHX_ coro);
2290
2291 coro_set_status (aTHX_ coro, arg, items);
2292 coro->slf_frame.prepare = prepare_nop;
2293 coro->slf_frame.check = slf_check_safe_cancel;
2294
2295 api_ready (aTHX_ (SV *)coro->hv);
2296 }
2297
2298 return 1;
1857} 2299}
1858 2300
1859/*****************************************************************************/ 2301/*****************************************************************************/
1860/* async pool handler */ 2302/* async pool handler */
1861 2303
… …
1892slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2334slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1893{ 2335{
1894 HV *hv = (HV *)SvRV (coro_current); 2336 HV *hv = (HV *)SvRV (coro_current);
1895 struct coro *coro = SvSTATE_hv ((SV *)hv); 2337 struct coro *coro = SvSTATE_hv ((SV *)hv);
1896 2338
1897 if (expect_true (coro->saved_deffh)) 2339 if (ecb_expect_true (coro->saved_deffh))
1898 { 2340 {
1899 /* subsequent iteration */ 2341 /* subsequent iteration */
1900 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2342 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1901 coro->saved_deffh = 0; 2343 coro->saved_deffh = 0;
1902 2344
1903 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 2345 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
1904 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2346 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1905 { 2347 {
1906 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate); 2348 slf_init_terminate_cancel_common (aTHX_ frame, hv);
1907 coro->invoke_av = newAV (); 2349 return;
1908
1909 frame->prepare = prepare_nop;
1910 } 2350 }
1911 else 2351 else
1912 { 2352 {
1913 av_clear (GvAV (PL_defgv)); 2353 av_clear (GvAV (PL_defgv));
1914 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2354 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
… …
1939 2379
1940static void 2380static void
1941coro_rouse_callback (pTHX_ CV *cv) 2381coro_rouse_callback (pTHX_ CV *cv)
1942{ 2382{
1943 dXSARGS; 2383 dXSARGS;
1944 SV *data = (SV *)GENSUB_ARG; 2384 SV *data = (SV *)S_GENSUB_ARG;
1945 2385
1946 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2386 if (SvTYPE (SvRV (data)) != SVt_PVAV)
1947 { 2387 {
1948 /* first call, set args */ 2388 /* first call, set args */
2389 SV *coro = SvRV (data);
1949 AV *av = newAV (); 2390 AV *av = newAV ();
1950 SV *coro = SvRV (data);
1951 2391
1952 SvRV_set (data, (SV *)av); 2392 SvRV_set (data, (SV *)av);
1953 api_ready (aTHX_ coro);
1954 SvREFCNT_dec (coro);
1955 2393
1956 /* better take a full copy of the arguments */ 2394 /* better take a full copy of the arguments */
1957 while (items--) 2395 while (items--)
1958 av_store (av, items, newSVsv (ST (items))); 2396 av_store (av, items, newSVsv (ST (items)));
2397
2398 api_ready (aTHX_ coro);
2399 SvREFCNT_dec (coro);
1959 } 2400 }
1960 2401
1961 XSRETURN_EMPTY; 2402 XSRETURN_EMPTY;
1962} 2403}
1963 2404
… …
1980 2421
1981 EXTEND (SP, AvFILLp (av) + 1); 2422 EXTEND (SP, AvFILLp (av) + 1);
1982 for (i = 0; i <= AvFILLp (av); ++i) 2423 for (i = 0; i <= AvFILLp (av); ++i)
1983 PUSHs (sv_2mortal (AvARRAY (av)[i])); 2424 PUSHs (sv_2mortal (AvARRAY (av)[i]));
1984 2425
1985 /* we have stolen the elements, so ste length to zero and free */ 2426 /* we have stolen the elements, so set length to zero and free */
1986 AvFILLp (av) = -1; 2427 AvFILLp (av) = -1;
1987 av_undef (av); 2428 av_undef (av);
1988 2429
1989 PUTBACK; 2430 PUTBACK;
1990 } 2431 }
… …
2014 || SvTYPE (SvRV (cb)) != SVt_PVCV 2455 || SvTYPE (SvRV (cb)) != SVt_PVCV
2015 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2456 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2016 croak ("Coro::rouse_wait called with illegal callback argument,"); 2457 croak ("Coro::rouse_wait called with illegal callback argument,");
2017 2458
2018 { 2459 {
2019 CV *cv = (CV *)SvRV (cb); /* for GENSUB_ARG */ 2460 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
2020 SV *data = (SV *)GENSUB_ARG; 2461 SV *data = (SV *)S_GENSUB_ARG;
2021 2462
2022 frame->data = (void *)data; 2463 frame->data = (void *)data;
2023 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule; 2464 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
2024 frame->check = slf_check_rouse_wait; 2465 frame->check = slf_check_rouse_wait;
2025 } 2466 }
… …
2029coro_new_rouse_cb (pTHX) 2470coro_new_rouse_cb (pTHX)
2030{ 2471{
2031 HV *hv = (HV *)SvRV (coro_current); 2472 HV *hv = (HV *)SvRV (coro_current);
2032 struct coro *coro = SvSTATE_hv (hv); 2473 struct coro *coro = SvSTATE_hv (hv);
2033 SV *data = newRV_inc ((SV *)hv); 2474 SV *data = newRV_inc ((SV *)hv);
2034 SV *cb = gensub (aTHX_ coro_rouse_callback, (void *)data); 2475 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
2035 2476
2036 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0); 2477 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0);
2037 SvREFCNT_dec (data); /* magicext increases the refcount */ 2478 SvREFCNT_dec (data); /* magicext increases the refcount */
2038 2479
2039 SvREFCNT_dec (coro->rouse_cb); 2480 SvREFCNT_dec (coro->rouse_cb);
… …
2136static void 2577static void
2137slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2578slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2138{ 2579{
2139 frame->prepare = prepare_cede_notself; 2580 frame->prepare = prepare_cede_notself;
2140 frame->check = slf_check_nop; 2581 frame->check = slf_check_nop;
2582}
2583
2584/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2585static void
2586slf_destroy (pTHX_ struct coro *coro)
2587{
2588 /* this callback is reserved for slf functions needing to do cleanup */
2589 if (coro->slf_frame.destroy && coro->slf_frame.prepare && !PL_dirty)
2590 coro->slf_frame.destroy (aTHX_ &coro->slf_frame);
2591
2592 /*
2593 * The on_destroy above most likely is from an SLF call.
2594 * Since by definition the SLF call will not finish when we destroy
2595 * the coro, we will have to force-finish it here, otherwise
2596 * cleanup functions cannot call SLF functions.
2597 */
2598 coro->slf_frame.prepare = 0;
2141} 2599}
2142 2600
2143/* 2601/*
2144 * these not obviously related functions are all rolled into one 2602 * these not obviously related functions are all rolled into one
2145 * function to increase chances that they all will call transfer with the same 2603 * function to increase chances that they all will call transfer with the same
… …
2152 I32 checkmark; /* mark SP to see how many elements check has pushed */ 2610 I32 checkmark; /* mark SP to see how many elements check has pushed */
2153 2611
2154 /* set up the slf frame, unless it has already been set-up */ 2612 /* set up the slf frame, unless it has already been set-up */
2155 /* the latter happens when a new coro has been started */ 2613 /* the latter happens when a new coro has been started */
2156 /* or when a new cctx was attached to an existing coroutine */ 2614 /* or when a new cctx was attached to an existing coroutine */
2157 if (expect_true (!slf_frame.prepare)) 2615 if (ecb_expect_true (!slf_frame.prepare))
2158 { 2616 {
2159 /* first iteration */ 2617 /* first iteration */
2160 dSP; 2618 dSP;
2161 SV **arg = PL_stack_base + TOPMARK + 1; 2619 SV **arg = PL_stack_base + TOPMARK + 1;
2162 int items = SP - arg; /* args without function object */ 2620 int items = SP - arg; /* args without function object */
… …
2203 while (slf_frame.check (aTHX_ &slf_frame)); 2661 while (slf_frame.check (aTHX_ &slf_frame));
2204 2662
2205 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */ 2663 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */
2206 2664
2207 /* exception handling */ 2665 /* exception handling */
2208 if (expect_false (CORO_THROW)) 2666 if (ecb_expect_false (CORO_THROW))
2209 { 2667 {
2210 SV *exception = sv_2mortal (CORO_THROW); 2668 SV *exception = sv_2mortal (CORO_THROW);
2211 2669
2212 CORO_THROW = 0; 2670 CORO_THROW = 0;
2213 sv_setsv (ERRSV, exception); 2671 sv_setsv (ERRSV, exception);
2214 croak (0); 2672 croak (0);
2215 } 2673 }
2216 2674
2217 /* return value handling - mostly like entersub */ 2675 /* return value handling - mostly like entersub */
2218 /* make sure we put something on the stack in scalar context */ 2676 /* make sure we put something on the stack in scalar context */
2219 if (GIMME_V == G_SCALAR) 2677 if (GIMME_V == G_SCALAR
2678 && ecb_expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2220 { 2679 {
2221 dSP; 2680 dSP;
2222 SV **bot = PL_stack_base + checkmark; 2681 SV **bot = PL_stack_base + checkmark;
2223 2682
2224 if (sp == bot) /* too few, push undef */ 2683 if (sp == bot) /* too few, push undef */
2225 bot [1] = &PL_sv_undef; 2684 bot [1] = &PL_sv_undef;
2226 else if (sp != bot + 1) /* too many, take last one */ 2685 else /* too many, take last one */
2227 bot [1] = *sp; 2686 bot [1] = *sp;
2228 2687
2229 SP = bot + 1; 2688 SP = bot + 1;
2230 2689
2231 PUTBACK; 2690 PUTBACK;
… …
2264 if (PL_op->op_flags & OPf_STACKED) 2723 if (PL_op->op_flags & OPf_STACKED)
2265 { 2724 {
2266 if (items > slf_arga) 2725 if (items > slf_arga)
2267 { 2726 {
2268 slf_arga = items; 2727 slf_arga = items;
2269 free (slf_argv); 2728 Safefree (slf_argv);
2270 slf_argv = malloc (slf_arga * sizeof (SV *)); 2729 New (0, slf_argv, slf_arga, SV *);
2271 } 2730 }
2272 2731
2273 slf_argc = items; 2732 slf_argc = items;
2274 2733
2275 for (i = 0; i < items; ++i) 2734 for (i = 0; i < items; ++i)
… …
2280 2739
2281 PL_op->op_ppaddr = pp_slf; 2740 PL_op->op_ppaddr = pp_slf;
2282 /*PL_op->op_type = OP_CUSTOM; /* we do behave like entersub still */ 2741 /*PL_op->op_type = OP_CUSTOM; /* we do behave like entersub still */
2283 2742
2284 PL_op = (OP *)&slf_restore; 2743 PL_op = (OP *)&slf_restore;
2744}
2745
2746/*****************************************************************************/
2747/* dynamic wind */
2748
2749static void
2750on_enterleave_call (pTHX_ SV *cb)
2751{
2752 dSP;
2753
2754 PUSHSTACK;
2755
2756 PUSHMARK (SP);
2757 PUTBACK;
2758 call_sv (cb, G_VOID | G_DISCARD);
2759 SPAGAIN;
2760
2761 POPSTACK;
2762}
2763
2764static SV *
2765coro_avp_pop_and_free (pTHX_ AV **avp)
2766{
2767 AV *av = *avp;
2768 SV *res = av_pop (av);
2769
2770 if (AvFILLp (av) < 0)
2771 {
2772 *avp = 0;
2773 SvREFCNT_dec (av);
2774 }
2775
2776 return res;
2777}
2778
2779static void
2780coro_pop_on_enter (pTHX_ void *coro)
2781{
2782 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_enter);
2783 SvREFCNT_dec (cb);
2784}
2785
2786static void
2787coro_pop_on_leave (pTHX_ void *coro)
2788{
2789 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2790 on_enterleave_call (aTHX_ sv_2mortal (cb));
2285} 2791}
2286 2792
2287/*****************************************************************************/ 2793/*****************************************************************************/
2288/* PerlIO::cede */ 2794/* PerlIO::cede */
2289 2795
… …
2291{ 2797{
2292 PerlIOBuf base; 2798 PerlIOBuf base;
2293 NV next, every; 2799 NV next, every;
2294} PerlIOCede; 2800} PerlIOCede;
2295 2801
2296static IV 2802static IV ecb_cold
2297PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab) 2803PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab)
2298{ 2804{
2299 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2805 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2300 2806
2301 self->every = SvCUR (arg) ? SvNV (arg) : 0.01; 2807 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
2302 self->next = nvtime () + self->every; 2808 self->next = nvtime () + self->every;
2303 2809
2304 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab); 2810 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
2305} 2811}
2306 2812
2307static SV * 2813static SV * ecb_cold
2308PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags) 2814PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
2309{ 2815{
2310 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2816 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2311 2817
2312 return newSVnv (self->every); 2818 return newSVnv (self->every);
… …
2363/* Coro::Semaphore & Coro::Signal */ 2869/* Coro::Semaphore & Coro::Signal */
2364 2870
2365static SV * 2871static SV *
2366coro_waitarray_new (pTHX_ int count) 2872coro_waitarray_new (pTHX_ int count)
2367{ 2873{
2368 /* a semaphore contains a counter IV in $sem->[0] and any waiters after that */ 2874 /* a waitarray=semaphore contains a counter IV in $sem->[0] and any waiters after that */
2369 AV *av = newAV (); 2875 AV *av = newAV ();
2370 SV **ary; 2876 SV **ary;
2371 2877
2372 /* unfortunately, building manually saves memory */ 2878 /* unfortunately, building manually saves memory */
2373 Newx (ary, 2, SV *); 2879 Newx (ary, 2, SV *);
2374 AvALLOC (av) = ary; 2880 AvALLOC (av) = ary;
2881#if PERL_VERSION_ATLEAST (5,10,0)
2375 /*AvARRAY (av) = ary;*/ 2882 AvARRAY (av) = ary;
2883#else
2376 SvPVX ((SV *)av) = (char *)ary; /* 5.8.8 needs this syntax instead of AvARRAY = ary */ 2884 /* 5.8.8 needs this syntax instead of AvARRAY = ary, yet */
2885 /* -DDEBUGGING flags this as a bug, despite it perfectly working */
2886 SvPVX ((SV *)av) = (char *)ary;
2887#endif
2377 AvMAX (av) = 1; 2888 AvMAX (av) = 1;
2378 AvFILLp (av) = 0; 2889 AvFILLp (av) = 0;
2379 ary [0] = newSViv (count); 2890 ary [0] = newSViv (count);
2380 2891
2381 return newRV_noinc ((SV *)av); 2892 return newRV_noinc ((SV *)av);
… …
2419 SvREFCNT_dec (cb); 2930 SvREFCNT_dec (cb);
2420 } 2931 }
2421} 2932}
2422 2933
2423static void 2934static void
2424coro_semaphore_on_destroy (pTHX_ struct coro *coro) 2935coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2425{ 2936{
2426 /* call $sem->adjust (0) to possibly wake up some other waiters */ 2937 /* call $sem->adjust (0) to possibly wake up some other waiters */
2427 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 2938 coro_semaphore_adjust (aTHX_ (AV *)frame->data, 0);
2428} 2939}
2429 2940
2430static int 2941static int
2431slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire) 2942slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2432{ 2943{
2433 AV *av = (AV *)frame->data; 2944 AV *av = (AV *)frame->data;
2434 SV *count_sv = AvARRAY (av)[0]; 2945 SV *count_sv = AvARRAY (av)[0];
2946 SV *coro_hv = SvRV (coro_current);
2435 2947
2436 /* if we are about to throw, don't actually acquire the lock, just throw */ 2948 /* if we are about to throw, don't actually acquire the lock, just throw */
2437 if (CORO_THROW) 2949 if (CORO_THROW)
2438 return 0; 2950 return 0;
2439 else if (SvIVX (count_sv) > 0) 2951 else if (SvIVX (count_sv) > 0)
2440 { 2952 {
2441 SvSTATE_current->on_destroy = 0; 2953 frame->destroy = 0;
2442 2954
2443 if (acquire) 2955 if (acquire)
2444 SvIVX (count_sv) = SvIVX (count_sv) - 1; 2956 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2445 else 2957 else
2446 coro_semaphore_adjust (aTHX_ av, 0); 2958 coro_semaphore_adjust (aTHX_ av, 0);
… …
2451 { 2963 {
2452 int i; 2964 int i;
2453 /* if we were woken up but can't down, we look through the whole */ 2965 /* if we were woken up but can't down, we look through the whole */
2454 /* waiters list and only add us if we aren't in there already */ 2966 /* waiters list and only add us if we aren't in there already */
2455 /* this avoids some degenerate memory usage cases */ 2967 /* this avoids some degenerate memory usage cases */
2456 2968 for (i = AvFILLp (av); i > 0; --i) /* i > 0 is not an off-by-one bug */
2457 for (i = 1; i <= AvFILLp (av); ++i)
2458 if (AvARRAY (av)[i] == SvRV (coro_current)) 2969 if (AvARRAY (av)[i] == coro_hv)
2459 return 1; 2970 return 1;
2460 2971
2461 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2972 av_push (av, SvREFCNT_inc (coro_hv));
2462 return 1; 2973 return 1;
2463 } 2974 }
2464} 2975}
2465 2976
2466static int 2977static int
… …
2489 { 3000 {
2490 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3001 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2491 3002
2492 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 3003 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2493 frame->prepare = prepare_schedule; 3004 frame->prepare = prepare_schedule;
2494
2495 /* to avoid race conditions when a woken-up coro gets terminated */ 3005 /* to avoid race conditions when a woken-up coro gets terminated */
2496 /* we arrange for a temporary on_destroy that calls adjust (0) */ 3006 /* we arrange for a temporary on_destroy that calls adjust (0) */
2497 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 3007 frame->destroy = coro_semaphore_destroy;
2498 } 3008 }
2499} 3009}
2500 3010
2501static void 3011static void
2502slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 3012slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
… …
2510{ 3020{
2511 if (items >= 2) 3021 if (items >= 2)
2512 { 3022 {
2513 /* callback form */ 3023 /* callback form */
2514 AV *av = (AV *)SvRV (arg [0]); 3024 AV *av = (AV *)SvRV (arg [0]);
2515 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 3025 SV *cb_cv = s_get_cv_croak (arg [1]);
2516 3026
2517 av_push (av, (SV *)SvREFCNT_inc_NN (cb_cv)); 3027 av_push (av, SvREFCNT_inc_NN (cb_cv));
2518 3028
2519 if (SvIVX (AvARRAY (av)[0]) > 0) 3029 if (SvIVX (AvARRAY (av)[0]) > 0)
2520 coro_semaphore_adjust (aTHX_ av, 0); 3030 coro_semaphore_adjust (aTHX_ av, 0);
2521 3031
2522 frame->prepare = prepare_nop; 3032 frame->prepare = prepare_nop;
… …
2546 AvARRAY (av)[0] = AvARRAY (av)[1]; 3056 AvARRAY (av)[0] = AvARRAY (av)[1];
2547 AvARRAY (av)[1] = cb; 3057 AvARRAY (av)[1] = cb;
2548 3058
2549 cb = av_shift (av); 3059 cb = av_shift (av);
2550 3060
3061 if (SvTYPE (cb) == SVt_PVCV)
3062 {
3063 dSP;
3064 PUSHMARK (SP);
3065 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
3066 PUTBACK;
3067 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
3068 }
3069 else
3070 {
2551 api_ready (aTHX_ cb); 3071 api_ready (aTHX_ cb);
2552 sv_setiv (cb, 0); /* signal waiter */ 3072 sv_setiv (cb, 0); /* signal waiter */
3073 }
3074
2553 SvREFCNT_dec (cb); 3075 SvREFCNT_dec (cb);
2554 3076
2555 --count; 3077 --count;
2556 } 3078 }
2557} 3079}
… …
2566static void 3088static void
2567slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 3089slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2568{ 3090{
2569 AV *av = (AV *)SvRV (arg [0]); 3091 AV *av = (AV *)SvRV (arg [0]);
2570 3092
3093 if (items >= 2)
3094 {
3095 SV *cb_cv = s_get_cv_croak (arg [1]);
3096 av_push (av, SvREFCNT_inc_NN (cb_cv));
3097
2571 if (SvIVX (AvARRAY (av)[0])) 3098 if (SvIVX (AvARRAY (av)[0]))
3099 coro_signal_wake (aTHX_ av, 1); /* must be the only waiter */
3100
3101 frame->prepare = prepare_nop;
3102 frame->check = slf_check_nop;
3103 }
3104 else if (SvIVX (AvARRAY (av)[0]))
2572 { 3105 {
2573 SvIVX (AvARRAY (av)[0]) = 0; 3106 SvIVX (AvARRAY (av)[0]) = 0;
2574 frame->prepare = prepare_nop; 3107 frame->prepare = prepare_nop;
2575 frame->check = slf_check_nop; 3108 frame->check = slf_check_nop;
2576 } 3109 }
2577 else 3110 else
2578 { 3111 {
2579 SV *waiter = newRV_inc (SvRV (coro_current)); /* owned by signal av */ 3112 SV *waiter = newSVsv (coro_current); /* owned by signal av */
2580 3113
2581 av_push (av, waiter); 3114 av_push (av, waiter);
2582 3115
2583 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */ 3116 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */
2584 frame->prepare = prepare_schedule; 3117 frame->prepare = prepare_schedule;
… …
2602 3135
2603static void 3136static void
2604coro_aio_callback (pTHX_ CV *cv) 3137coro_aio_callback (pTHX_ CV *cv)
2605{ 3138{
2606 dXSARGS; 3139 dXSARGS;
2607 AV *state = (AV *)GENSUB_ARG; 3140 AV *state = (AV *)S_GENSUB_ARG;
2608 SV *coro = av_pop (state); 3141 SV *coro = av_pop (state);
2609 SV *data_sv = newSV (sizeof (struct io_state)); 3142 SV *data_sv = newSV (sizeof (struct io_state));
2610 3143
2611 av_extend (state, items - 1); 3144 av_extend (state, items - 1);
2612 3145
… …
2697 dSP; 3230 dSP;
2698 3231
2699 static SV *prio_cv; 3232 static SV *prio_cv;
2700 static SV *prio_sv; 3233 static SV *prio_sv;
2701 3234
2702 if (expect_false (!prio_cv)) 3235 if (ecb_expect_false (!prio_cv))
2703 { 3236 {
2704 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0); 3237 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0);
2705 prio_sv = newSViv (0); 3238 prio_sv = newSViv (0);
2706 } 3239 }
2707 3240
… …
2726 3259
2727 for (i = 0; i < items; ++i) 3260 for (i = 0; i < items; ++i)
2728 PUSHs (arg [i]); 3261 PUSHs (arg [i]);
2729 3262
2730 /* now push the callback closure */ 3263 /* now push the callback closure */
2731 PUSHs (sv_2mortal (gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state)))); 3264 PUSHs (sv_2mortal (s_gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state))));
2732 3265
2733 /* now call the AIO function - we assume our request is uncancelable */ 3266 /* now call the AIO function - we assume our request is uncancelable */
2734 PUTBACK; 3267 PUTBACK;
2735 call_sv ((SV *)req, G_VOID | G_DISCARD); 3268 call_sv ((SV *)req, G_VOID | G_DISCARD);
2736 } 3269 }
2737 3270
2738 /* now that the requets is going, we loop toll we have a result */ 3271 /* now that the request is going, we loop till we have a result */
2739 frame->data = (void *)state; 3272 frame->data = (void *)state;
2740 frame->prepare = prepare_schedule; 3273 frame->prepare = prepare_schedule;
2741 frame->check = slf_check_aio_req; 3274 frame->check = slf_check_aio_req;
2742} 3275}
2743 3276
… …
2753 3286
2754/*****************************************************************************/ 3287/*****************************************************************************/
2755 3288
2756#if CORO_CLONE 3289#if CORO_CLONE
2757# include "clone.c" 3290# include "clone.c"
3291#endif
3292
3293/*****************************************************************************/
3294
3295static SV *
3296coro_new (pTHX_ HV *stash, SV **argv, int argc, int is_coro)
3297{
3298 SV *coro_sv;
3299 struct coro *coro;
3300 MAGIC *mg;
3301 HV *hv;
3302 SV *cb;
3303 int i;
3304
3305 if (argc > 0)
3306 {
3307 cb = s_get_cv_croak (argv [0]);
3308
3309 if (!is_coro)
3310 {
3311 if (CvISXSUB (cb))
3312 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
3313
3314 if (!CvROOT (cb))
3315 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
3316 }
3317 }
3318
3319 Newz (0, coro, 1, struct coro);
3320 coro->args = newAV ();
3321 coro->flags = CF_NEW;
3322
3323 if (coro_first) coro_first->prev = coro;
3324 coro->next = coro_first;
3325 coro_first = coro;
3326
3327 coro->hv = hv = newHV ();
3328 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
3329 mg->mg_flags |= MGf_DUP;
3330 coro_sv = sv_bless (newRV_noinc ((SV *)hv), stash);
3331
3332 if (argc > 0)
3333 {
3334 av_extend (coro->args, argc + is_coro - 1);
3335
3336 if (is_coro)
3337 {
3338 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
3339 cb = (SV *)cv_coro_run;
3340 }
3341
3342 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3343
3344 for (i = 1; i < argc; i++)
3345 av_push (coro->args, newSVsv (argv [i]));
3346 }
3347
3348 return coro_sv;
3349}
3350
3351#ifndef __cplusplus
3352ecb_cold XS(boot_Coro__State);
3353#endif
3354
3355#if CORO_JIT
3356
3357static void ecb_noinline ecb_cold
3358pushav_4uv (pTHX_ UV a, UV b, UV c, UV d)
3359{
3360 dSP;
3361 AV *av = newAV ();
3362
3363 av_store (av, 3, newSVuv (d));
3364 av_store (av, 2, newSVuv (c));
3365 av_store (av, 1, newSVuv (b));
3366 av_store (av, 0, newSVuv (a));
3367
3368 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
3369
3370 PUTBACK;
3371}
3372
3373static void ecb_noinline ecb_cold
3374jit_init (pTHX)
3375{
3376 dSP;
3377 SV *load, *save;
3378 char *map_base;
3379 char *load_ptr, *save_ptr;
3380 STRLEN load_len, save_len, map_len;
3381 int count;
3382
3383 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3384
3385 PUSHMARK (SP);
3386#define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type));
3387# include "state.h"
3388#undef VARx
3389 count = call_pv ("Coro::State::_jit", G_ARRAY);
3390 SPAGAIN;
3391
3392 save = POPs; save_ptr = SvPVbyte (save, save_len);
3393 load = POPs; load_ptr = SvPVbyte (load, load_len);
3394
3395 map_len = load_len + save_len + 16;
3396
3397 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3398
3399 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3400
3401 load_perl_slots = (load_save_perl_slots_type)map_base;
3402 memcpy (map_base, load_ptr, load_len);
3403
3404 map_base += (load_len + 15) & ~15;
3405
3406 save_perl_slots = (load_save_perl_slots_type)map_base;
3407 memcpy (map_base, save_ptr, save_len);
3408
3409 /* we are good citizens and try to make the page read-only, so the evil evil */
3410 /* hackers might have it a bit more difficult */
3411 mprotect (map_base, map_len, PROT_READ | PROT_EXEC);
3412
3413 PUTBACK;
3414 eval_pv ("undef &Coro::State::_jit", 1);
3415}
3416
2758#endif 3417#endif
2759 3418
2760MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3419MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2761 3420
2762PROTOTYPES: DISABLE 3421PROTOTYPES: DISABLE
… …
2767# if CORO_PTHREAD 3426# if CORO_PTHREAD
2768 coro_thx = PERL_GET_CONTEXT; 3427 coro_thx = PERL_GET_CONTEXT;
2769# endif 3428# endif
2770#endif 3429#endif
2771 BOOT_PAGESIZE; 3430 BOOT_PAGESIZE;
3431
3432 /* perl defines these to check for existance first, but why it doesn't */
3433 /* just create them one at init time is not clear to me, except for */
3434 /* programs trying to delete them, but... */
3435 /* anyway, we declare this as invalid and make sure they are initialised here */
3436 DEFSV;
3437 ERRSV;
2772 3438
2773 cctx_current = cctx_new_empty (); 3439 cctx_current = cctx_new_empty ();
2774 3440
2775 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3441 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
2776 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3442 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
… …
2816 coroapi.prepare_nop = prepare_nop; 3482 coroapi.prepare_nop = prepare_nop;
2817 coroapi.prepare_schedule = prepare_schedule; 3483 coroapi.prepare_schedule = prepare_schedule;
2818 coroapi.prepare_cede = prepare_cede; 3484 coroapi.prepare_cede = prepare_cede;
2819 coroapi.prepare_cede_notself = prepare_cede_notself; 3485 coroapi.prepare_cede_notself = prepare_cede_notself;
2820 3486
2821 { 3487 time_init (aTHX);
2822 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
2823 3488
2824 if (!svp) croak ("Time::HiRes is required");
2825 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
2826
2827 nvtime = INT2PTR (double (*)(), SvIV (*svp));
2828 }
2829
2830 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 3489 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3490#if CORO_JIT
3491 PUTBACK;
3492 jit_init (aTHX);
3493 SPAGAIN;
3494#endif
2831} 3495}
2832 3496
2833SV * 3497SV *
2834new (char *klass, ...) 3498new (SV *klass, ...)
2835 ALIAS: 3499 ALIAS:
2836 Coro::new = 1 3500 Coro::new = 1
2837 CODE: 3501 CODE:
2838{ 3502 RETVAL = coro_new (aTHX_ ix ? coro_stash : coro_state_stash, &ST (1), items - 1, ix);
2839 struct coro *coro; 3503 OUTPUT:
2840 MAGIC *mg;
2841 HV *hv;
2842 CV *cb;
2843 int i;
2844
2845 if (items > 1)
2846 {
2847 cb = coro_sv_2cv (aTHX_ ST (1));
2848
2849 if (!ix)
2850 {
2851 if (CvISXSUB (cb))
2852 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
2853
2854 if (!CvROOT (cb))
2855 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
2856 }
2857 }
2858
2859 Newz (0, coro, 1, struct coro);
2860 coro->args = newAV ();
2861 coro->flags = CF_NEW;
2862
2863 if (coro_first) coro_first->prev = coro;
2864 coro->next = coro_first;
2865 coro_first = coro;
2866
2867 coro->hv = hv = newHV ();
2868 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
2869 mg->mg_flags |= MGf_DUP;
2870 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
2871
2872 if (items > 1)
2873 {
2874 av_extend (coro->args, items - 1 + ix - 1);
2875
2876 if (ix)
2877 {
2878 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
2879 cb = cv_coro_run;
2880 }
2881
2882 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
2883
2884 for (i = 2; i < items; i++)
2885 av_push (coro->args, newSVsv (ST (i)));
2886 }
2887}
2888 OUTPUT:
2889 RETVAL 3504 RETVAL
2890 3505
2891void 3506void
2892transfer (...) 3507transfer (...)
2893 PROTOTYPE: $$ 3508 PROTOTYPE: $$
2894 CODE: 3509 CODE:
2895 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3510 CORO_EXECUTE_SLF_XS (slf_init_transfer);
2896 3511
2897bool
2898_destroy (SV *coro_sv)
2899 CODE:
2900 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
2901 OUTPUT:
2902 RETVAL
2903
2904void 3512void
2905_exit (int code) 3513_exit (int code)
2906 PROTOTYPE: $ 3514 PROTOTYPE: $
2907 CODE: 3515 CODE:
2908 _exit (code); 3516 _exit (code);
… …
2910SV * 3518SV *
2911clone (Coro::State coro) 3519clone (Coro::State coro)
2912 CODE: 3520 CODE:
2913{ 3521{
2914#if CORO_CLONE 3522#if CORO_CLONE
2915 struct coro *ncoro = coro_clone (coro); 3523 struct coro *ncoro = coro_clone (aTHX_ coro);
2916 MAGIC *mg; 3524 MAGIC *mg;
2917 /* TODO: too much duplication */ 3525 /* TODO: too much duplication */
2918 ncoro->hv = newHV (); 3526 ncoro->hv = newHV ();
2919 mg = sv_magicext ((SV *)ncoro->hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)ncoro, 0); 3527 mg = sv_magicext ((SV *)ncoro->hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)ncoro, 0);
2920 mg->mg_flags |= MGf_DUP; 3528 mg->mg_flags |= MGf_DUP;
… …
2982 eval = 1 3590 eval = 1
2983 CODE: 3591 CODE:
2984{ 3592{
2985 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3593 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
2986 { 3594 {
2987 struct coro temp; 3595 struct coro *current = SvSTATE_current;
3596 struct CoroSLF slf_save;
2988 3597
2989 if (!(coro->flags & CF_RUNNING)) 3598 if (current != coro)
2990 { 3599 {
2991 PUTBACK; 3600 PUTBACK;
2992 save_perl (aTHX_ &temp); 3601 save_perl (aTHX_ current);
2993 load_perl (aTHX_ coro); 3602 load_perl (aTHX_ coro);
3603 /* the coro is most likely in an active SLF call.
3604 * while not strictly required (the code we execute is
3605 * not allowed to call any SLF functions), it's cleaner
3606 * to reinitialise the slf_frame and restore it later.
3607 * This might one day allow us to actually do SLF calls
3608 * from code executed here.
3609 */
3610 slf_save = slf_frame;
3611 slf_frame.prepare = 0;
3612 SPAGAIN;
2994 } 3613 }
2995 3614
2996 {
2997 dSP;
2998 ENTER;
2999 SAVETMPS;
3000 PUTBACK;
3001 PUSHSTACK; 3615 PUSHSTACK;
3616
3002 PUSHMARK (SP); 3617 PUSHMARK (SP);
3618 PUTBACK;
3003 3619
3004 if (ix) 3620 if (ix)
3005 eval_sv (coderef, 0); 3621 eval_sv (coderef, 0);
3006 else 3622 else
3007 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 3623 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
3008 3624
3009 POPSTACK; 3625 POPSTACK;
3010 SPAGAIN; 3626 SPAGAIN;
3011 FREETMPS;
3012 LEAVE;
3013 PUTBACK;
3014 }
3015 3627
3016 if (!(coro->flags & CF_RUNNING)) 3628 if (current != coro)
3017 { 3629 {
3630 PUTBACK;
3631 slf_frame = slf_save;
3018 save_perl (aTHX_ coro); 3632 save_perl (aTHX_ coro);
3019 load_perl (aTHX_ &temp); 3633 load_perl (aTHX_ current);
3020 SPAGAIN; 3634 SPAGAIN;
3021 } 3635 }
3022 } 3636 }
3023} 3637}
3024 3638
… …
3027 PROTOTYPE: $ 3641 PROTOTYPE: $
3028 ALIAS: 3642 ALIAS:
3029 is_ready = CF_READY 3643 is_ready = CF_READY
3030 is_running = CF_RUNNING 3644 is_running = CF_RUNNING
3031 is_new = CF_NEW 3645 is_new = CF_NEW
3032 is_destroyed = CF_DESTROYED 3646 is_destroyed = CF_ZOMBIE
3647 is_zombie = CF_ZOMBIE
3648 is_suspended = CF_SUSPENDED
3033 CODE: 3649 CODE:
3034 RETVAL = boolSV (coro->flags & ix); 3650 RETVAL = boolSV (coro->flags & ix);
3035 OUTPUT: 3651 OUTPUT:
3036 RETVAL 3652 RETVAL
3037 3653
3038void 3654void
3039throw (Coro::State self, SV *throw = &PL_sv_undef) 3655throw (Coro::State self, SV *exception = &PL_sv_undef)
3040 PROTOTYPE: $;$ 3656 PROTOTYPE: $;$
3041 CODE: 3657 CODE:
3042{ 3658{
3043 struct coro *current = SvSTATE_current; 3659 struct coro *current = SvSTATE_current;
3044 SV **throwp = self == current ? &CORO_THROW : &self->except; 3660 SV **exceptionp = self == current ? &CORO_THROW : &self->except;
3045 SvREFCNT_dec (*throwp); 3661 SvREFCNT_dec (*exceptionp);
3046 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3662 SvGETMAGIC (exception);
3663 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3047} 3664}
3048 3665
3049void 3666void
3050api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3667api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3051 PROTOTYPE: $;$ 3668 PROTOTYPE: $;$
… …
3102 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv; 3719 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
3103 3720
3104 SV *tmp = *src; *src = *dst; *dst = tmp; 3721 SV *tmp = *src; *src = *dst; *dst = tmp;
3105 } 3722 }
3106 3723
3724void
3725cancel (Coro::State self)
3726 CODE:
3727 coro_state_destroy (aTHX_ self);
3728
3729SV *
3730enable_times (int enabled = enable_times)
3731 CODE:
3732{
3733 RETVAL = boolSV (enable_times);
3734
3735 if (enabled != enable_times)
3736 {
3737 enable_times = enabled;
3738
3739 coro_times_update ();
3740 (enabled ? coro_times_sub : coro_times_add)(SvSTATE (coro_current));
3741 }
3742}
3743 OUTPUT:
3744 RETVAL
3745
3746void
3747times (Coro::State self)
3748 PPCODE:
3749{
3750 struct coro *current = SvSTATE (coro_current);
3751
3752 if (ecb_expect_false (current == self))
3753 {
3754 coro_times_update ();
3755 coro_times_add (SvSTATE (coro_current));
3756 }
3757
3758 EXTEND (SP, 2);
3759 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3760 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3761
3762 if (ecb_expect_false (current == self))
3763 coro_times_sub (SvSTATE (coro_current));
3764}
3765
3766void
3767swap_sv (Coro::State coro, SV *sv, SV *swapsv)
3768 CODE:
3769{
3770 struct coro *current = SvSTATE_current;
3771
3772 if (current == coro)
3773 SWAP_SVS (current);
3774
3775 if (!coro->swap_sv)
3776 coro->swap_sv = newAV ();
3777
3778 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv )));
3779 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv)));
3780
3781 if (current == coro)
3782 SWAP_SVS (current);
3783}
3784
3107 3785
3108MODULE = Coro::State PACKAGE = Coro 3786MODULE = Coro::State PACKAGE = Coro
3109 3787
3110BOOT: 3788BOOT:
3111{ 3789{
3112 int i;
3113
3114 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3790 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3115 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3791 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3116 cv_coro_run = get_cv ( "Coro::_terminate", GV_ADD); 3792 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3117 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3118 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 3793 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3119 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 3794 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3120 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 3795 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3121 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 3796 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3122 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 3797 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3123 3798
3124 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3799 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3125 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3800 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3126 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 3801 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3127 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new); 3802 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3128 3803
3129 coro_stash = gv_stashpv ("Coro", TRUE); 3804 coro_stash = gv_stashpv ("Coro", TRUE);
3130 3805
3131 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 3806 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3132 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 3807 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3133 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 3808 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
3134 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 3809 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (CORO_PRIO_LOW));
3135 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE)); 3810 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (CORO_PRIO_IDLE));
3136 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN)); 3811 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (CORO_PRIO_MIN));
3137
3138 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
3139 coro_ready[i] = newAV ();
3140 3812
3141 { 3813 {
3142 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 3814 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
3143 3815
3144 coroapi.schedule = api_schedule; 3816 coroapi.schedule = api_schedule;
… …
3154 sv_setiv (sv, (IV)&coroapi); 3826 sv_setiv (sv, (IV)&coroapi);
3155 SvREADONLY_on (sv); 3827 SvREADONLY_on (sv);
3156 } 3828 }
3157} 3829}
3158 3830
3831SV *
3832async (...)
3833 PROTOTYPE: &@
3834 CODE:
3835 RETVAL = coro_new (aTHX_ coro_stash, &ST (0), items, 1);
3836 api_ready (aTHX_ RETVAL);
3837 OUTPUT:
3838 RETVAL
3839
3840void
3841_destroy (Coro::State coro)
3842 CODE:
3843 /* used by the manager thread */
3844 coro_state_destroy (aTHX_ coro);
3845
3846void
3847on_destroy (Coro::State coro, SV *cb)
3848 CODE:
3849 coro_push_on_destroy (aTHX_ coro, newSVsv (cb));
3850
3851void
3852join (...)
3853 CODE:
3854 CORO_EXECUTE_SLF_XS (slf_init_join);
3855
3159void 3856void
3160terminate (...) 3857terminate (...)
3161 CODE: 3858 CODE:
3162 CORO_EXECUTE_SLF_XS (slf_init_terminate); 3859 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3163 3860
3164void 3861void
3862cancel (...)
3863 CODE:
3864 CORO_EXECUTE_SLF_XS (slf_init_cancel);
3865
3866int
3867safe_cancel (Coro::State self, ...)
3868 C_ARGS: aTHX_ self, &ST (1), items - 1
3869
3870void
3165schedule (...) 3871schedule (...)
3166 CODE: 3872 CODE:
3167 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3873 CORO_EXECUTE_SLF_XS (slf_init_schedule);
3168 3874
3169void 3875void
… …
3183 3889
3184void 3890void
3185cede_notself (...) 3891cede_notself (...)
3186 CODE: 3892 CODE:
3187 CORO_EXECUTE_SLF_XS (slf_init_cede_notself); 3893 CORO_EXECUTE_SLF_XS (slf_init_cede_notself);
3188
3189void
3190_cancel (Coro::State self)
3191 CODE:
3192 coro_state_destroy (aTHX_ self);
3193 coro_call_on_destroy (aTHX_ self);
3194 3894
3195void 3895void
3196_set_current (SV *current) 3896_set_current (SV *current)
3197 PROTOTYPE: $ 3897 PROTOTYPE: $
3198 CODE: 3898 CODE:
… …
3202void 3902void
3203_set_readyhook (SV *hook) 3903_set_readyhook (SV *hook)
3204 PROTOTYPE: $ 3904 PROTOTYPE: $
3205 CODE: 3905 CODE:
3206 SvREFCNT_dec (coro_readyhook); 3906 SvREFCNT_dec (coro_readyhook);
3907 SvGETMAGIC (hook);
3908 if (SvOK (hook))
3909 {
3207 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0; 3910 coro_readyhook = newSVsv (hook);
3911 CORO_READYHOOK = invoke_sv_ready_hook_helper;
3912 }
3913 else
3914 {
3915 coro_readyhook = 0;
3916 CORO_READYHOOK = 0;
3917 }
3208 3918
3209int 3919int
3210prio (Coro::State coro, int newprio = 0) 3920prio (Coro::State coro, int newprio = 0)
3211 PROTOTYPE: $;$ 3921 PROTOTYPE: $;$
3212 ALIAS: 3922 ALIAS:
… …
3218 if (items > 1) 3928 if (items > 1)
3219 { 3929 {
3220 if (ix) 3930 if (ix)
3221 newprio = coro->prio - newprio; 3931 newprio = coro->prio - newprio;
3222 3932
3223 if (newprio < PRIO_MIN) newprio = PRIO_MIN; 3933 if (newprio < CORO_PRIO_MIN) newprio = CORO_PRIO_MIN;
3224 if (newprio > PRIO_MAX) newprio = PRIO_MAX; 3934 if (newprio > CORO_PRIO_MAX) newprio = CORO_PRIO_MAX;
3225 3935
3226 coro->prio = newprio; 3936 coro->prio = newprio;
3227 } 3937 }
3228} 3938}
3229 OUTPUT: 3939 OUTPUT:
… …
3244 RETVAL = coro_nready; 3954 RETVAL = coro_nready;
3245 OUTPUT: 3955 OUTPUT:
3246 RETVAL 3956 RETVAL
3247 3957
3248void 3958void
3959suspend (Coro::State self)
3960 PROTOTYPE: $
3961 CODE:
3962 self->flags |= CF_SUSPENDED;
3963
3964void
3965resume (Coro::State self)
3966 PROTOTYPE: $
3967 CODE:
3968 self->flags &= ~CF_SUSPENDED;
3969
3970void
3249_pool_handler (...) 3971_pool_handler (...)
3250 CODE: 3972 CODE:
3251 CORO_EXECUTE_SLF_XS (slf_init_pool_handler); 3973 CORO_EXECUTE_SLF_XS (slf_init_pool_handler);
3252 3974
3253void 3975void
… …
3264 for (i = 1; i < items; ++i) 3986 for (i = 1; i < items; ++i)
3265 av_push (av, SvREFCNT_inc_NN (ST (i))); 3987 av_push (av, SvREFCNT_inc_NN (ST (i)));
3266 3988
3267 if ((SV *)hv == &PL_sv_undef) 3989 if ((SV *)hv == &PL_sv_undef)
3268 { 3990 {
3269 PUSHMARK (SP); 3991 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3270 EXTEND (SP, 2);
3271 PUSHs (sv_Coro);
3272 PUSHs ((SV *)cv_pool_handler);
3273 PUTBACK;
3274 call_sv ((SV *)cv_coro_state_new, G_SCALAR);
3275 SPAGAIN;
3276
3277 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs)); 3992 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
3993 SvREFCNT_dec (sv);
3278 } 3994 }
3279 3995
3280 { 3996 {
3281 struct coro *coro = SvSTATE_hv (hv); 3997 struct coro *coro = SvSTATE_hv (hv);
3282 3998
… …
3306rouse_wait (...) 4022rouse_wait (...)
3307 PROTOTYPE: ;$ 4023 PROTOTYPE: ;$
3308 PPCODE: 4024 PPCODE:
3309 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait); 4025 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait);
3310 4026
4027void
4028on_enter (SV *block)
4029 ALIAS:
4030 on_leave = 1
4031 PROTOTYPE: &
4032 CODE:
4033{
4034 struct coro *coro = SvSTATE_current;
4035 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
4036
4037 block = s_get_cv_croak (block);
4038
4039 if (!*avp)
4040 *avp = newAV ();
4041
4042 av_push (*avp, SvREFCNT_inc (block));
4043
4044 if (!ix)
4045 on_enterleave_call (aTHX_ block);
4046
4047 LEAVE; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
4048 SAVEDESTRUCTOR_X (ix ? coro_pop_on_leave : coro_pop_on_enter, (void *)coro);
4049 ENTER; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
4050}
4051
3311 4052
3312MODULE = Coro::State PACKAGE = PerlIO::cede 4053MODULE = Coro::State PACKAGE = PerlIO::cede
3313 4054
3314BOOT: 4055BOOT:
3315 PerlIO_define_layer (aTHX_ &PerlIO_cede); 4056 PerlIO_define_layer (aTHX_ &PerlIO_cede);
… …
3318MODULE = Coro::State PACKAGE = Coro::Semaphore 4059MODULE = Coro::State PACKAGE = Coro::Semaphore
3319 4060
3320SV * 4061SV *
3321new (SV *klass, SV *count = 0) 4062new (SV *klass, SV *count = 0)
3322 CODE: 4063 CODE:
4064{
4065 int semcnt = 1;
4066
4067 if (count)
4068 {
4069 SvGETMAGIC (count);
4070
4071 if (SvOK (count))
4072 semcnt = SvIV (count);
4073 }
4074
3323 RETVAL = sv_bless ( 4075 RETVAL = sv_bless (
3324 coro_waitarray_new (aTHX_ count && SvOK (count) ? SvIV (count) : 1), 4076 coro_waitarray_new (aTHX_ semcnt),
3325 GvSTASH (CvGV (cv)) 4077 GvSTASH (CvGV (cv))
3326 ); 4078 );
4079}
3327 OUTPUT: 4080 OUTPUT:
3328 RETVAL 4081 RETVAL
3329 4082
3330# helper for Coro::Channel 4083# helper for Coro::Channel and others
3331SV * 4084SV *
3332_alloc (int count) 4085_alloc (int count)
3333 CODE: 4086 CODE:
3334 RETVAL = coro_waitarray_new (aTHX_ count); 4087 RETVAL = coro_waitarray_new (aTHX_ count);
3335 OUTPUT: 4088 OUTPUT:
… …
3393 for (i = 1; i <= wcount; ++i) 4146 for (i = 1; i <= wcount; ++i)
3394 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i]))); 4147 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i])));
3395 } 4148 }
3396} 4149}
3397 4150
4151MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
4152
4153void
4154_may_delete (SV *sem, int count, unsigned int extra_refs)
4155 PPCODE:
4156{
4157 AV *av = (AV *)SvRV (sem);
4158
4159 if (SvREFCNT ((SV *)av) == 1 + extra_refs
4160 && AvFILLp (av) == 0 /* no waiters, just count */
4161 && SvIV (AvARRAY (av)[0]) == count)
4162 XSRETURN_YES;
4163
4164 XSRETURN_NO;
4165}
4166
3398MODULE = Coro::State PACKAGE = Coro::Signal 4167MODULE = Coro::State PACKAGE = Coro::Signal
3399 4168
3400SV * 4169SV *
3401new (SV *klass) 4170new (SV *klass)
3402 CODE: 4171 CODE:
… …
3473 4242
3474void 4243void
3475_register (char *target, char *proto, SV *req) 4244_register (char *target, char *proto, SV *req)
3476 CODE: 4245 CODE:
3477{ 4246{
3478 CV *req_cv = coro_sv_2cv (aTHX_ req); 4247 SV *req_cv = s_get_cv_croak (req);
3479 /* newXSproto doesn't return the CV on 5.8 */ 4248 /* newXSproto doesn't return the CV on 5.8 */
3480 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 4249 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3481 sv_setpv ((SV *)slf_cv, proto); 4250 sv_setpv ((SV *)slf_cv, proto);
3482 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0); 4251 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
3483} 4252}
3484 4253
4254MODULE = Coro::State PACKAGE = Coro::Select
4255
4256void
4257patch_pp_sselect ()
4258 CODE:
4259 if (!coro_old_pp_sselect)
4260 {
4261 coro_select_select = (SV *)get_cv ("Coro::Select::select", 0);
4262 coro_old_pp_sselect = PL_ppaddr [OP_SSELECT];
4263 PL_ppaddr [OP_SSELECT] = coro_pp_sselect;
4264 }
4265
4266void
4267unpatch_pp_sselect ()
4268 CODE:
4269 if (coro_old_pp_sselect)
4270 {
4271 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
4272 coro_old_pp_sselect = 0;
4273 }
4274

Diff Legend

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