ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/Coro/Coro/State.xs
(Generate patch)

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

Diff Legend

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