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.357 by root, Sat Jun 27 14:09:28 2009 UTC vs.
Revision 1.414 by root, Wed Jun 29 16:08:31 2011 UTC

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

Diff Legend

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