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.327 by root, Mon Nov 24 06:07:16 2008 UTC vs.
Revision 1.421 by root, Sun May 27 16:36:05 2012 UTC

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

Diff Legend

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