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.330 by root, Wed Nov 26 09:29:06 2008 UTC vs.
Revision 1.410 by root, Sun Jun 12 08:14:12 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 {
557 /* we try to be extra-careful here */
391 SV **svp = AvARRAY (padlist)[i--]; 558 AV *av = (AV *)AvARRAY (padlist)[i--];
392 if (svp) 559 I32 j = AvFILLp (av);
393 { 560
394 AvREAL_on (*svp); 561 while (j >= 0)
395 av_undef (*svp); 562 SvREFCNT_dec (AvARRAY (av)[j--]);
563
564 AvFILLp (av) = -1;
396 SvREFCNT_dec (*svp); 565 SvREFCNT_dec (av);
397 }
398 } 566 }
399 567
568 SvREFCNT_dec (AvARRAY (padlist)[0]);
569
570 AvFILLp (padlist) = -1;
400 SvREFCNT_dec ((SV*)padlist); 571 SvREFCNT_dec ((SV*)padlist);
401 } 572 }
402} 573}
403 574
404static int 575static int
405coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 576coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
406{ 577{
407 AV *padlist; 578 AV *padlist;
408 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;
409 584
410 /* casting is fun. */ 585 /* casting is fun. */
411 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 586 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
412 free_padlist (aTHX_ padlist); 587 free_padlist (aTHX_ padlist);
413 588
414 SvREFCNT_dec (av); /* sv_magicext increased the refcount */ 589 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
415 590
416 return 0; 591 return 0;
417} 592}
418
419#define CORO_MAGIC_type_cv 26
420#define CORO_MAGIC_type_state PERL_MAGIC_ext
421 593
422static MGVTBL coro_cv_vtbl = { 594static MGVTBL coro_cv_vtbl = {
423 0, 0, 0, 0, 595 0, 0, 0, 0,
424 coro_cv_free 596 coro_cv_free
425}; 597};
426 598
427#define CORO_MAGIC_NN(sv, type) \
428 (expect_true (SvMAGIC (sv)->mg_type == type) \
429 ? SvMAGIC (sv) \
430 : mg_find (sv, type))
431
432#define CORO_MAGIC(sv, type) \
433 (expect_true (SvMAGIC (sv)) \
434 ? CORO_MAGIC_NN (sv, type) \
435 : 0)
436
437#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
438#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
439
440INLINE struct coro *
441SvSTATE_ (pTHX_ SV *coro)
442{
443 HV *stash;
444 MAGIC *mg;
445
446 if (SvROK (coro))
447 coro = SvRV (coro);
448
449 if (expect_false (SvTYPE (coro) != SVt_PVHV))
450 croak ("Coro::State object required");
451
452 stash = SvSTASH (coro);
453 if (expect_false (stash != coro_stash && stash != coro_state_stash))
454 {
455 /* very slow, but rare, check */
456 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
457 croak ("Coro::State object required");
458 }
459
460 mg = CORO_MAGIC_state (coro);
461 return (struct coro *)mg->mg_ptr;
462}
463
464#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
465
466/* faster than SvSTATE, but expects a coroutine hv */
467#define SvSTATE_hv(hv) ((struct coro *)CORO_MAGIC_NN ((SV *)hv, CORO_MAGIC_type_state)->mg_ptr)
468#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
469
470/* the next two functions merely cache the padlists */ 599/* the next two functions merely cache the padlists */
471static void 600ECB_INLINE void
472get_padlist (pTHX_ CV *cv) 601get_padlist (pTHX_ CV *cv)
473{ 602{
474 MAGIC *mg = CORO_MAGIC_cv (cv); 603 MAGIC *mg = CORO_MAGIC_cv (cv);
475 AV *av; 604 AV *av;
476 605
477 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 606 if (ecb_expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0))
478 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 607 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
479 else 608 else
480 { 609 {
481#if CORO_PREFER_PERL_FUNCTIONS 610#if CORO_PREFER_PERL_FUNCTIONS
482 /* this is probably cleaner? but also slower! */ 611 /* this is probably cleaner? but also slower! */
… …
489 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 618 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
490#endif 619#endif
491 } 620 }
492} 621}
493 622
494static void 623ECB_INLINE void
495put_padlist (pTHX_ CV *cv) 624put_padlist (pTHX_ CV *cv)
496{ 625{
497 MAGIC *mg = CORO_MAGIC_cv (cv); 626 MAGIC *mg = CORO_MAGIC_cv (cv);
498 AV *av; 627 AV *av;
499 628
500 if (expect_false (!mg)) 629 if (ecb_expect_false (!mg))
501 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);
502 631
503 av = (AV *)mg->mg_obj; 632 av = (AV *)mg->mg_obj;
504 633
505 if (expect_false (AvFILLp (av) >= AvMAX (av))) 634 if (ecb_expect_false (AvFILLp (av) >= AvMAX (av)))
506 av_extend (av, AvFILLp (av) + 1); 635 av_extend (av, AvFILLp (av) + 1);
507 636
508 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 637 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
509} 638}
510 639
511/** 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);
512 695
513static void 696static void
514load_perl (pTHX_ Coro__State c) 697load_perl (pTHX_ Coro__State c)
515{ 698{
516 perl_slots *slot = c->slot; 699 perl_slots *slot = c->slot;
517 c->slot = 0; 700 c->slot = 0;
518 701
519 PL_mainstack = c->mainstack; 702 PL_mainstack = c->mainstack;
520 703
521 GvSV (PL_defgv) = slot->defsv; 704#if CORO_JIT
522 GvAV (PL_defgv) = slot->defav; 705 load_perl_slots (slot);
523 GvSV (PL_errgv) = slot->errsv; 706#else
524 GvSV (irsgv) = slot->irsgv;
525 GvHV (PL_hintgv) = slot->hinthv;
526
527 #define VAR(name,type) PL_ ## name = slot->name; 707 #define VARx(name,expr,type) expr = slot->name;
528 # include "state.h" 708 # include "state.h"
529 #undef VAR 709 #undef VARx
710#endif
530 711
531 { 712 {
532 dSP; 713 dSP;
533 714
534 CV *cv; 715 CV *cv;
535 716
536 /* now do the ugly restore mess */ 717 /* now do the ugly restore mess */
537 while (expect_true (cv = (CV *)POPs)) 718 while (ecb_expect_true (cv = (CV *)POPs))
538 { 719 {
539 put_padlist (aTHX_ cv); /* mark this padlist as available */ 720 put_padlist (aTHX_ cv); /* mark this padlist as available */
540 CvDEPTH (cv) = PTR2IV (POPs); 721 CvDEPTH (cv) = PTR2IV (POPs);
541 CvPADLIST (cv) = (AV *)POPs; 722 CvPADLIST (cv) = (AV *)POPs;
542 } 723 }
… …
544 PUTBACK; 725 PUTBACK;
545 } 726 }
546 727
547 slf_frame = c->slf_frame; 728 slf_frame = c->slf_frame;
548 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);
549} 748}
550 749
551static void 750static void
552save_perl (pTHX_ Coro__State c) 751save_perl (pTHX_ Coro__State c)
553{ 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
554 c->except = CORO_THROW; 771 c->except = CORO_THROW;
555 c->slf_frame = slf_frame; 772 c->slf_frame = slf_frame;
556 773
557 { 774 {
558 dSP; 775 dSP;
… …
567 784
568 XPUSHs (Nullsv); 785 XPUSHs (Nullsv);
569 /* this loop was inspired by pp_caller */ 786 /* this loop was inspired by pp_caller */
570 for (;;) 787 for (;;)
571 { 788 {
572 while (expect_true (cxix >= 0)) 789 while (ecb_expect_true (cxix >= 0))
573 { 790 {
574 PERL_CONTEXT *cx = &ccstk[cxix--]; 791 PERL_CONTEXT *cx = &ccstk[cxix--];
575 792
576 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))
577 { 794 {
578 CV *cv = cx->blk_sub.cv; 795 CV *cv = cx->blk_sub.cv;
579 796
580 if (expect_true (CvDEPTH (cv))) 797 if (ecb_expect_true (CvDEPTH (cv)))
581 { 798 {
582 EXTEND (SP, 3); 799 EXTEND (SP, 3);
583 PUSHs ((SV *)CvPADLIST (cv)); 800 PUSHs ((SV *)CvPADLIST (cv));
584 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv))); 801 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
585 PUSHs ((SV *)cv); 802 PUSHs ((SV *)cv);
… …
588 get_padlist (aTHX_ cv); 805 get_padlist (aTHX_ cv);
589 } 806 }
590 } 807 }
591 } 808 }
592 809
593 if (expect_true (top_si->si_type == PERLSI_MAIN)) 810 if (ecb_expect_true (top_si->si_type == PERLSI_MAIN))
594 break; 811 break;
595 812
596 top_si = top_si->si_prev; 813 top_si = top_si->si_prev;
597 ccstk = top_si->si_cxstack; 814 ccstk = top_si->si_cxstack;
598 cxix = top_si->si_cxix; 815 cxix = top_si->si_cxix;
… …
600 817
601 PUTBACK; 818 PUTBACK;
602 } 819 }
603 820
604 /* allocate some space on the context stack for our purposes */ 821 /* allocate some space on the context stack for our purposes */
605 /* we manually unroll here, as usually 2 slots is enough */ 822 if (ecb_expect_false (cxstack_ix + SLOT_COUNT >= cxstack_max))
606 if (SLOT_COUNT >= 1) CXINC;
607 if (SLOT_COUNT >= 2) CXINC;
608 if (SLOT_COUNT >= 3) CXINC;
609 { 823 {
610 int i; 824 unsigned int i;
825
611 for (i = 3; i < SLOT_COUNT; ++i) 826 for (i = 0; i < SLOT_COUNT; ++i)
612 CXINC; 827 CXINC;
613 } 828
614 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 829 cxstack_ix -= SLOT_COUNT; /* undo allocation */
830 }
615 831
616 c->mainstack = PL_mainstack; 832 c->mainstack = PL_mainstack;
617 833
618 { 834 {
619 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 835 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
620 836
621 slot->defav = GvAV (PL_defgv); 837#if CORO_JIT
622 slot->defsv = DEFSV; 838 save_perl_slots (slot);
623 slot->errsv = ERRSV; 839#else
624 slot->irsgv = GvSV (irsgv);
625 slot->hinthv = GvHV (PL_hintgv);
626
627 #define VAR(name,type) slot->name = PL_ ## name; 840 #define VARx(name,expr,type) slot->name = expr;
628 # include "state.h" 841 # include "state.h"
629 #undef VAR 842 #undef VARx
843#endif
630 } 844 }
631} 845}
632 846
633/* 847/*
634 * allocate various perl stacks. This is almost an exact copy 848 * allocate various perl stacks. This is almost an exact copy
… …
640# define coro_init_stacks(thx) init_stacks () 854# define coro_init_stacks(thx) init_stacks ()
641#else 855#else
642static void 856static void
643coro_init_stacks (pTHX) 857coro_init_stacks (pTHX)
644{ 858{
645 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() */
646 PL_curstackinfo->si_type = PERLSI_MAIN; 860 PL_curstackinfo->si_type = PERLSI_MAIN;
647 PL_curstack = PL_curstackinfo->si_stack; 861 PL_curstack = PL_curstackinfo->si_stack;
648 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 862 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
649 863
650 PL_stack_base = AvARRAY(PL_curstack); 864 PL_stack_base = AvARRAY(PL_curstack);
… …
757#endif 971#endif
758 972
759/* 973/*
760 * This overrides the default magic get method of %SIG elements. 974 * This overrides the default magic get method of %SIG elements.
761 * 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
762 * 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),
763 * readback here. 977 * we just provide our own readback here.
764 * We only do this when the hook is != 0, as they are often set to 0 temporarily,
765 * not expecting this to actually change the hook. This is a potential problem
766 * when a schedule happens then, but we ignore this.
767 */ 978 */
768static int 979static int ecb_cold
769coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 980coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
770{ 981{
771 const char *s = MgPV_nolen_const (mg); 982 const char *s = MgPV_nolen_const (mg);
772 983
773 if (*s == '_') 984 if (*s == '_')
… …
785 } 996 }
786 997
787 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 998 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
788} 999}
789 1000
790static int 1001static int ecb_cold
791coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1002coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
792{ 1003{
793 const char *s = MgPV_nolen_const (mg); 1004 const char *s = MgPV_nolen_const (mg);
794 1005
795 if (*s == '_') 1006 if (*s == '_')
… …
809 } 1020 }
810 1021
811 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0; 1022 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
812} 1023}
813 1024
814static int 1025static int ecb_cold
815coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1026coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
816{ 1027{
817 const char *s = MgPV_nolen_const (mg); 1028 const char *s = MgPV_nolen_const (mg);
818 1029
819 if (*s == '_') 1030 if (*s == '_')
… …
824 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 1035 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
825 1036
826 if (svp) 1037 if (svp)
827 { 1038 {
828 SV *old = *svp; 1039 SV *old = *svp;
829 *svp = newSVsv (sv); 1040 *svp = SvOK (sv) ? newSVsv (sv) : 0;
830 SvREFCNT_dec (old); 1041 SvREFCNT_dec (old);
831 return 0; 1042 return 0;
832 } 1043 }
833 } 1044 }
834 1045
… …
852slf_check_repeat (pTHX_ struct CoroSLF *frame) 1063slf_check_repeat (pTHX_ struct CoroSLF *frame)
853{ 1064{
854 return 1; 1065 return 1;
855} 1066}
856 1067
857static UNOP coro_setup_op; 1068static UNOP init_perl_op;
858 1069
859static 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 */
860coro_setup (pTHX_ struct coro *coro) 1071init_perl (pTHX_ struct coro *coro)
861{ 1072{
862 /* 1073 /*
863 * emulate part of the perl startup here. 1074 * emulate part of the perl startup here.
864 */ 1075 */
865 coro_init_stacks (aTHX); 1076 coro_init_stacks (aTHX);
… …
872 PL_comppad_name_fill = 0; 1083 PL_comppad_name_fill = 0;
873 PL_comppad_name_floor = 0; 1084 PL_comppad_name_floor = 0;
874 PL_curpm = 0; 1085 PL_curpm = 0;
875 PL_curpad = 0; 1086 PL_curpad = 0;
876 PL_localizing = 0; 1087 PL_localizing = 0;
877 PL_dirty = 0;
878 PL_restartop = 0; 1088 PL_restartop = 0;
879#if PERL_VERSION_ATLEAST (5,10,0) 1089#if PERL_VERSION_ATLEAST (5,10,0)
880 PL_parser = 0; 1090 PL_parser = 0;
881#endif 1091#endif
882 PL_hints = 0; 1092 PL_hints = 0;
883 1093
884 /* recreate the die/warn hooks */ 1094 /* recreate the die/warn hooks */
885 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1095 PL_diehook = SvREFCNT_inc (rv_diehook);
886 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1096 PL_warnhook = SvREFCNT_inc (rv_warnhook);
887 1097
888 GvSV (PL_defgv) = newSV (0); 1098 GvSV (PL_defgv) = newSV (0);
889 GvAV (PL_defgv) = coro->args; coro->args = 0; 1099 GvAV (PL_defgv) = coro->args; coro->args = 0;
890 GvSV (PL_errgv) = newSV (0); 1100 GvSV (PL_errgv) = newSV (0);
891 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);
… …
912 /* 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
913 * 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.
914 */ 1124 */
915 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 */
916 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;
917 1128
918 /* 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 */
919 coro_setup_op.op_next = PL_op; 1130 init_perl_op.op_next = PL_op;
920 coro_setup_op.op_type = OP_ENTERSUB; 1131 init_perl_op.op_type = OP_ENTERSUB;
921 coro_setup_op.op_ppaddr = pp_slf; 1132 init_perl_op.op_ppaddr = pp_slf;
922 /* 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 */
923 1134
924 PL_op = (OP *)&coro_setup_op; 1135 PL_op = (OP *)&init_perl_op;
925 1136
926 /* copy throw, in case it was set before coro_setup */ 1137 /* copy throw, in case it was set before init_perl */
927 CORO_THROW = coro->except; 1138 CORO_THROW = coro->except;
928}
929 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
930static void 1149static void
931coro_destruct (pTHX_ struct coro *coro) 1150coro_unwind_stacks (pTHX)
932{ 1151{
933 if (!IN_DESTRUCT) 1152 if (!IN_DESTRUCT)
934 { 1153 {
935 /* restore all saved variables and stuff */ 1154 /* restore all saved variables and stuff */
936 LEAVE_SCOPE (0); 1155 LEAVE_SCOPE (0);
… …
944 POPSTACK_TO (PL_mainstack); 1163 POPSTACK_TO (PL_mainstack);
945 1164
946 /* unwind main stack */ 1165 /* unwind main stack */
947 dounwind (-1); 1166 dounwind (-1);
948 } 1167 }
1168}
949 1169
950 SvREFCNT_dec (GvSV (PL_defgv)); 1170static void
951 SvREFCNT_dec (GvAV (PL_defgv)); 1171destroy_perl (pTHX_ struct coro *coro)
952 SvREFCNT_dec (GvSV (PL_errgv)); 1172{
953 SvREFCNT_dec (PL_defoutgv); 1173 SV *svf [9];
954 SvREFCNT_dec (PL_rs);
955 SvREFCNT_dec (GvSV (irsgv));
956 SvREFCNT_dec (GvHV (PL_hintgv));
957 1174
958 SvREFCNT_dec (PL_diehook);
959 SvREFCNT_dec (PL_warnhook);
960 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
961 SvREFCNT_dec (coro->saved_deffh); 1218 SvREFCNT_dec (coro->saved_deffh);
962 SvREFCNT_dec (coro->rouse_cb); 1219 SvREFCNT_dec (coro->rouse_cb);
963 SvREFCNT_dec (coro->invoke_cb); 1220 SvREFCNT_dec (coro->invoke_cb);
964 SvREFCNT_dec (coro->invoke_av); 1221 SvREFCNT_dec (coro->invoke_av);
965 1222 }
966 coro_destruct_stacks (aTHX);
967} 1223}
968 1224
969INLINE void 1225ECB_INLINE void
970free_coro_mortal (pTHX) 1226free_coro_mortal (pTHX)
971{ 1227{
972 if (expect_true (coro_mortal)) 1228 if (ecb_expect_true (coro_mortal))
973 { 1229 {
974 SvREFCNT_dec (coro_mortal); 1230 SvREFCNT_dec ((SV *)coro_mortal);
975 coro_mortal = 0; 1231 coro_mortal = 0;
976 } 1232 }
977} 1233}
978 1234
979static int 1235static int
… …
1112 1368
1113 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 */
1114} 1370}
1115 1371
1116/* 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 */
1117static void NOINLINE 1373static void ecb_noinline
1118cctx_prepare (pTHX) 1374cctx_prepare (pTHX)
1119{ 1375{
1120 PL_top_env = &PL_start_env; 1376 PL_top_env = &PL_start_env;
1121 1377
1122 if (cctx_current->flags & CC_TRACE) 1378 if (cctx_current->flags & CC_TRACE)
… …
1133 slf_frame.prepare = slf_prepare_set_stacklevel; 1389 slf_frame.prepare = slf_prepare_set_stacklevel;
1134 slf_frame.check = slf_check_set_stacklevel; 1390 slf_frame.check = slf_check_set_stacklevel;
1135} 1391}
1136 1392
1137/* 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 */
1138INLINE void 1394ECB_INLINE void
1139transfer_tail (pTHX) 1395transfer_tail (pTHX)
1140{ 1396{
1141 free_coro_mortal (aTHX); 1397 free_coro_mortal (aTHX);
1142} 1398}
1143 1399
… …
1168 /* 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 */
1169 PL_restartop = PL_op; 1425 PL_restartop = PL_op;
1170 perl_run (PL_curinterp); 1426 perl_run (PL_curinterp);
1171 /* 1427 /*
1172 * 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
1173 * 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.
1174 */ 1431 */
1175 1432
1176 /* 1433 /*
1177 * 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
1178 * 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)
… …
1186 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 */
1187 } 1444 }
1188} 1445}
1189 1446
1190static coro_cctx * 1447static coro_cctx *
1191cctx_new () 1448cctx_new (void)
1192{ 1449{
1193 coro_cctx *cctx; 1450 coro_cctx *cctx;
1194 1451
1195 ++cctx_count; 1452 ++cctx_count;
1196 New (0, cctx, 1, coro_cctx); 1453 New (0, cctx, 1, coro_cctx);
… …
1202 return cctx; 1459 return cctx;
1203} 1460}
1204 1461
1205/* create a new cctx only suitable as source */ 1462/* create a new cctx only suitable as source */
1206static coro_cctx * 1463static coro_cctx *
1207cctx_new_empty () 1464cctx_new_empty (void)
1208{ 1465{
1209 coro_cctx *cctx = cctx_new (); 1466 coro_cctx *cctx = cctx_new ();
1210 1467
1211 cctx->sptr = 0; 1468 cctx->sptr = 0;
1212 coro_create (&cctx->cctx, 0, 0, 0, 0); 1469 coro_create (&cctx->cctx, 0, 0, 0, 0);
… …
1214 return cctx; 1471 return cctx;
1215} 1472}
1216 1473
1217/* create a new cctx suitable as destination/running a perl interpreter */ 1474/* create a new cctx suitable as destination/running a perl interpreter */
1218static coro_cctx * 1475static coro_cctx *
1219cctx_new_run () 1476cctx_new_run (void)
1220{ 1477{
1221 coro_cctx *cctx = cctx_new (); 1478 coro_cctx *cctx = cctx_new ();
1222 void *stack_start; 1479 void *stack_start;
1223 size_t stack_size; 1480 size_t stack_size;
1224 1481
1225#if HAVE_MMAP 1482#if HAVE_MMAP
1226 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;
1227 /* mmap supposedly does allocate-on-write for us */ 1484 /* mmap supposedly does allocate-on-write for us */
1228 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0); 1485 cctx->sptr = mmap (0, cctx->ssize, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_ANONYMOUS, 0, 0);
1229 1486
1230 if (cctx->sptr != (void *)-1) 1487 if (cctx->sptr != (void *)-1)
1231 { 1488 {
1232 #if CORO_STACKGUARD 1489 #if CORO_STACKGUARD
1233 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE); 1490 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
… …
1265cctx_destroy (coro_cctx *cctx) 1522cctx_destroy (coro_cctx *cctx)
1266{ 1523{
1267 if (!cctx) 1524 if (!cctx)
1268 return; 1525 return;
1269 1526
1270 assert (cctx != cctx_current);//D temporary 1527 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1271 1528
1272 --cctx_count; 1529 --cctx_count;
1273 coro_destroy (&cctx->cctx); 1530 coro_destroy (&cctx->cctx);
1274 1531
1275 /* coro_transfer creates new, empty cctx's */ 1532 /* coro_transfer creates new, empty cctx's */
… …
1294#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))
1295 1552
1296static coro_cctx * 1553static coro_cctx *
1297cctx_get (pTHX) 1554cctx_get (pTHX)
1298{ 1555{
1299 while (expect_true (cctx_first)) 1556 while (ecb_expect_true (cctx_first))
1300 { 1557 {
1301 coro_cctx *cctx = cctx_first; 1558 coro_cctx *cctx = cctx_first;
1302 cctx_first = cctx->next; 1559 cctx_first = cctx->next;
1303 --cctx_idle; 1560 --cctx_idle;
1304 1561
1305 if (expect_true (!CCTX_EXPIRED (cctx))) 1562 if (ecb_expect_true (!CCTX_EXPIRED (cctx)))
1306 return cctx; 1563 return cctx;
1307 1564
1308 cctx_destroy (cctx); 1565 cctx_destroy (cctx);
1309 } 1566 }
1310 1567
… …
1315cctx_put (coro_cctx *cctx) 1572cctx_put (coro_cctx *cctx)
1316{ 1573{
1317 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));
1318 1575
1319 /* free another cctx if overlimit */ 1576 /* free another cctx if overlimit */
1320 if (expect_false (cctx_idle >= cctx_max_idle)) 1577 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1321 { 1578 {
1322 coro_cctx *first = cctx_first; 1579 coro_cctx *first = cctx_first;
1323 cctx_first = first->next; 1580 cctx_first = first->next;
1324 --cctx_idle; 1581 --cctx_idle;
1325 1582
… …
1336static void 1593static void
1337transfer_check (pTHX_ struct coro *prev, struct coro *next) 1594transfer_check (pTHX_ struct coro *prev, struct coro *next)
1338{ 1595{
1339 /* TODO: throwing up here is considered harmful */ 1596 /* TODO: throwing up here is considered harmful */
1340 1597
1341 if (expect_true (prev != next)) 1598 if (ecb_expect_true (prev != next))
1342 { 1599 {
1343 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1600 if (ecb_expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1344 croak ("Coro::State::transfer called with a suspended prev Coro::State, but can only transfer from running or new states,"); 1601 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1345 1602
1346 if (expect_false (next->flags & CF_RUNNING)) 1603 if (ecb_expect_false (next->flags & (CF_RUNNING | CF_ZOMBIE | CF_SUSPENDED)))
1347 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states,");
1348
1349 if (expect_false (next->flags & CF_DESTROYED))
1350 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states,"); 1604 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1351 1605
1352#if !PERL_VERSION_ATLEAST (5,10,0) 1606#if !PERL_VERSION_ATLEAST (5,10,0)
1353 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1607 if (ecb_expect_false (PL_lex_state != LEX_NOTPARSING))
1354 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,"); 1608 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1355#endif 1609#endif
1356 } 1610 }
1357} 1611}
1358 1612
1359/* always use the TRANSFER macro */ 1613/* always use the TRANSFER macro */
1360static void NOINLINE /* noinline so we have a fixed stackframe */ 1614static void ecb_noinline /* noinline so we have a fixed stackframe */
1361transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1615transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1362{ 1616{
1363 dSTACKLEVEL; 1617 dSTACKLEVEL;
1364 1618
1365 /* sometimes transfer is only called to set idle_sp */ 1619 /* sometimes transfer is only called to set idle_sp */
1366 if (expect_false (!prev)) 1620 if (ecb_expect_false (!prev))
1367 { 1621 {
1368 cctx_current->idle_sp = STACKLEVEL; 1622 cctx_current->idle_sp = STACKLEVEL;
1369 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 */
1370 } 1624 }
1371 else if (expect_true (prev != next)) 1625 else if (ecb_expect_true (prev != next))
1372 { 1626 {
1373 coro_cctx *cctx_prev; 1627 coro_cctx *cctx_prev;
1374 1628
1375 if (expect_false (prev->flags & CF_NEW)) 1629 if (ecb_expect_false (prev->flags & CF_NEW))
1376 { 1630 {
1377 /* create a new empty/source context */ 1631 /* create a new empty/source context */
1378 prev->flags &= ~CF_NEW; 1632 prev->flags &= ~CF_NEW;
1379 prev->flags |= CF_RUNNING; 1633 prev->flags |= CF_RUNNING;
1380 } 1634 }
… …
1383 next->flags |= CF_RUNNING; 1637 next->flags |= CF_RUNNING;
1384 1638
1385 /* first get rid of the old state */ 1639 /* first get rid of the old state */
1386 save_perl (aTHX_ prev); 1640 save_perl (aTHX_ prev);
1387 1641
1388 if (expect_false (next->flags & CF_NEW)) 1642 if (ecb_expect_false (next->flags & CF_NEW))
1389 { 1643 {
1390 /* need to start coroutine */ 1644 /* need to start coroutine */
1391 next->flags &= ~CF_NEW; 1645 next->flags &= ~CF_NEW;
1392 /* setup coroutine call */ 1646 /* setup coroutine call */
1393 coro_setup (aTHX_ next); 1647 init_perl (aTHX_ next);
1394 } 1648 }
1395 else 1649 else
1396 load_perl (aTHX_ next); 1650 load_perl (aTHX_ next);
1397 1651
1398 assert (!prev->cctx);//D temporary
1399
1400 /* possibly untie and reuse the cctx */ 1652 /* possibly untie and reuse the cctx */
1401 if (expect_true ( 1653 if (ecb_expect_true (
1402 cctx_current->idle_sp == STACKLEVEL 1654 cctx_current->idle_sp == STACKLEVEL
1403 && !(cctx_current->flags & CC_TRACE) 1655 && !(cctx_current->flags & CC_TRACE)
1404 && !force_cctx 1656 && !force_cctx
1405 )) 1657 ))
1406 { 1658 {
1407 /* 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 */
1408 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));
1409 1661
1410 /* 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. */
1411 /* 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 */
1412 if (expect_false (CCTX_EXPIRED (cctx_current))) 1664 if (ecb_expect_false (CCTX_EXPIRED (cctx_current)))
1413 if (expect_true (!next->cctx)) 1665 if (ecb_expect_true (!next->cctx))
1414 next->cctx = cctx_get (aTHX); 1666 next->cctx = cctx_get (aTHX);
1415 1667
1416 cctx_put (cctx_current); 1668 cctx_put (cctx_current);
1417 } 1669 }
1418 else 1670 else
1419 prev->cctx = cctx_current; 1671 prev->cctx = cctx_current;
1420 1672
1421 ++next->usecount; 1673 ++next->usecount;
1422 1674
1423 cctx_prev = cctx_current; 1675 cctx_prev = cctx_current;
1424 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX); 1676 cctx_current = ecb_expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1425 1677
1426 next->cctx = 0; 1678 next->cctx = 0;
1427 1679
1428 if (expect_false (cctx_prev != cctx_current)) 1680 if (ecb_expect_false (cctx_prev != cctx_current))
1429 { 1681 {
1430 cctx_prev->top_env = PL_top_env; 1682 cctx_prev->top_env = PL_top_env;
1431 PL_top_env = cctx_current->top_env; 1683 PL_top_env = cctx_current->top_env;
1432 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx); 1684 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1433 } 1685 }
… …
1439#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))
1440#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1692#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1441 1693
1442/** high level stuff ********************************************************/ 1694/** high level stuff ********************************************************/
1443 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 */
1444static int 1698static void
1699coro_call_on_destroy (pTHX_ struct coro *coro);
1700
1701static void
1445coro_state_destroy (pTHX_ struct coro *coro) 1702coro_state_destroy (pTHX_ struct coro *coro)
1446{ 1703{
1447 if (coro->flags & CF_DESTROYED) 1704 if (coro->flags & CF_ZOMBIE)
1448 return 0; 1705 return;
1449 1706
1450 if (coro->on_destroy)
1451 coro->on_destroy (aTHX_ coro); 1707 slf_destroy (aTHX_ coro);
1452 1708
1453 coro->flags |= CF_DESTROYED; 1709 coro->flags |= CF_ZOMBIE;
1454 1710
1455 if (coro->flags & CF_READY) 1711 if (coro->flags & CF_READY)
1456 { 1712 {
1457 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1713 /* reduce nready, as destroying a ready coro effectively unreadies it */
1458 /* alternative: look through all ready queues and remove the coro */ 1714 /* alternative: look through all ready queues and remove the coro */
1459 --coro_nready; 1715 --coro_nready;
1460 } 1716 }
1461 else 1717 else
1462 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 */
1463 1719
1464 if (coro->mainstack && coro->mainstack != main_mainstack) 1720 if (coro->next) coro->next->prev = coro->prev;
1465 { 1721 if (coro->prev) coro->prev->next = coro->next;
1466 struct coro temp; 1722 if (coro == coro_first) coro_first = coro->next;
1467 1723
1468 assert (("FATAL: tried to destroy currently running coroutine (please report)", !(coro->flags & CF_RUNNING))); 1724 if (coro->mainstack
1469 1725 && coro->mainstack != main_mainstack
1470 save_perl (aTHX_ &temp); 1726 && coro->slot
1727 && !PL_dirty)
1471 load_perl (aTHX_ coro); 1728 destroy_perl (aTHX_ coro);
1472
1473 coro_destruct (aTHX_ coro);
1474
1475 load_perl (aTHX_ &temp);
1476
1477 coro->slot = 0;
1478 }
1479 1729
1480 cctx_destroy (coro->cctx); 1730 cctx_destroy (coro->cctx);
1481 SvREFCNT_dec (coro->startcv); 1731 SvREFCNT_dec (coro->startcv);
1482 SvREFCNT_dec (coro->args); 1732 SvREFCNT_dec (coro->args);
1733 SvREFCNT_dec (coro->swap_sv);
1483 SvREFCNT_dec (CORO_THROW); 1734 SvREFCNT_dec (CORO_THROW);
1484 1735
1485 if (coro->next) coro->next->prev = coro->prev; 1736 coro_call_on_destroy (aTHX_ coro);
1486 if (coro->prev) coro->prev->next = coro->next;
1487 if (coro == coro_first) coro_first = coro->next;
1488 1737
1489 return 1; 1738 /* more destruction mayhem in coro_state_free */
1490} 1739}
1491 1740
1492static int 1741static int
1493coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1742coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1494{ 1743{
1495 struct coro *coro = (struct coro *)mg->mg_ptr; 1744 struct coro *coro = (struct coro *)mg->mg_ptr;
1496 mg->mg_ptr = 0; 1745 mg->mg_ptr = 0;
1497 1746
1498 coro->hv = 0;
1499
1500 if (--coro->refcnt < 0)
1501 {
1502 coro_state_destroy (aTHX_ coro); 1747 coro_state_destroy (aTHX_ coro);
1748 SvREFCNT_dec (coro->on_destroy);
1749 SvREFCNT_dec (coro->status);
1750
1503 Safefree (coro); 1751 Safefree (coro);
1504 }
1505 1752
1506 return 0; 1753 return 0;
1507} 1754}
1508 1755
1509static int 1756static int ecb_cold
1510coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1757coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1511{ 1758{
1512 struct coro *coro = (struct coro *)mg->mg_ptr; 1759 /* called when perl clones the current process the slow way (windows process emulation) */
1513 1760 /* WE SIMply nuke the pointers in the copy, causing perl to croak */
1514 ++coro->refcnt; 1761 mg->mg_ptr = 0;
1762 mg->mg_virtual = 0;
1515 1763
1516 return 0; 1764 return 0;
1517} 1765}
1518 1766
1519static MGVTBL coro_state_vtbl = { 1767static MGVTBL coro_state_vtbl = {
… …
1542 1790
1543 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1791 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1544 TRANSFER (ta, 1); 1792 TRANSFER (ta, 1);
1545} 1793}
1546 1794
1547/*****************************************************************************/
1548/* gensub: simple closure generation utility */
1549
1550#define GENSUB_ARG CvXSUBANY (cv).any_ptr
1551
1552/* create a closure from XS, returns a code reference */
1553/* the arg can be accessed via GENSUB_ARG from the callback */
1554/* the callback must use dXSARGS/XSRETURN */
1555static SV *
1556gensub (pTHX_ void (*xsub)(pTHX_ CV *), void *arg)
1557{
1558 CV *cv = (CV *)newSV (0);
1559
1560 sv_upgrade ((SV *)cv, SVt_PVCV);
1561
1562 CvANON_on (cv);
1563 CvISXSUB_on (cv);
1564 CvXSUB (cv) = xsub;
1565 GENSUB_ARG = arg;
1566
1567 return newRV_noinc ((SV *)cv);
1568}
1569
1570/** Coro ********************************************************************/ 1795/** Coro ********************************************************************/
1571 1796
1572INLINE void 1797ECB_INLINE void
1573coro_enq (pTHX_ struct coro *coro) 1798coro_enq (pTHX_ struct coro *coro)
1574{ 1799{
1575 av_push (coro_ready [coro->prio - PRIO_MIN], SvREFCNT_inc_NN (coro->hv)); 1800 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1576}
1577 1801
1578INLINE 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 *
1579coro_deq (pTHX) 1810coro_deq (pTHX)
1580{ 1811{
1581 int prio; 1812 int prio;
1582 1813
1583 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; ) 1814 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
1584 if (AvFILLp (coro_ready [prio]) >= 0) 1815 {
1585 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 }
1586 1825
1587 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;
1588} 1844}
1589 1845
1590static int 1846static int
1591api_ready (pTHX_ SV *coro_sv) 1847api_ready (pTHX_ SV *coro_sv)
1592{ 1848{
1593 struct coro *coro;
1594 SV *sv_hook;
1595 void (*xs_hook)(void);
1596
1597 coro = SvSTATE (coro_sv); 1849 struct coro *coro = SvSTATE (coro_sv);
1598 1850
1599 if (coro->flags & CF_READY) 1851 if (coro->flags & CF_READY)
1600 return 0; 1852 return 0;
1601 1853
1602 coro->flags |= CF_READY; 1854 coro->flags |= CF_READY;
1603 1855
1604 sv_hook = coro_nready ? 0 : coro_readyhook;
1605 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1606
1607 coro_enq (aTHX_ coro); 1856 coro_enq (aTHX_ coro);
1608 ++coro_nready;
1609 1857
1610 if (sv_hook) 1858 if (!coro_nready++)
1611 { 1859 if (coroapi.readyhook)
1612 dSP; 1860 coroapi.readyhook ();
1613
1614 ENTER;
1615 SAVETMPS;
1616
1617 PUSHMARK (SP);
1618 PUTBACK;
1619 call_sv (sv_hook, G_VOID | G_DISCARD);
1620
1621 FREETMPS;
1622 LEAVE;
1623 }
1624
1625 if (xs_hook)
1626 xs_hook ();
1627 1861
1628 return 1; 1862 return 1;
1629} 1863}
1630 1864
1631static int 1865static int
… …
1633{ 1867{
1634 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1868 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1635} 1869}
1636 1870
1637/* expects to own a reference to next->hv */ 1871/* expects to own a reference to next->hv */
1638INLINE void 1872ECB_INLINE void
1639prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1873prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1640{ 1874{
1641 SV *prev_sv = SvRV (coro_current); 1875 SV *prev_sv = SvRV (coro_current);
1642 1876
1643 ta->prev = SvSTATE_hv (prev_sv); 1877 ta->prev = SvSTATE_hv (prev_sv);
… …
1654static void 1888static void
1655prepare_schedule (pTHX_ struct coro_transfer_args *ta) 1889prepare_schedule (pTHX_ struct coro_transfer_args *ta)
1656{ 1890{
1657 for (;;) 1891 for (;;)
1658 { 1892 {
1659 SV *next_sv = coro_deq (aTHX); 1893 struct coro *next = coro_deq (aTHX);
1660 1894
1661 if (expect_true (next_sv)) 1895 if (ecb_expect_true (next))
1662 { 1896 {
1663 struct coro *next = SvSTATE_hv (next_sv);
1664
1665 /* cannot transfer to destroyed coros, skip and look for next */ 1897 /* cannot transfer to destroyed coros, skip and look for next */
1666 if (expect_false (next->flags & CF_DESTROYED)) 1898 if (ecb_expect_false (next->flags & (CF_ZOMBIE | CF_SUSPENDED)))
1667 SvREFCNT_dec (next_sv); /* coro_nready has already been taken care of by destroy */ 1899 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1668 else 1900 else
1669 { 1901 {
1670 next->flags &= ~CF_READY; 1902 next->flags &= ~CF_READY;
1671 --coro_nready; 1903 --coro_nready;
1672 1904
… …
1678 { 1910 {
1679 /* nothing to schedule: call the idle handler */ 1911 /* nothing to schedule: call the idle handler */
1680 if (SvROK (sv_idle) 1912 if (SvROK (sv_idle)
1681 && SvOBJECT (SvRV (sv_idle))) 1913 && SvOBJECT (SvRV (sv_idle)))
1682 { 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
1683 ++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 */
1684 api_ready (aTHX_ SvRV (sv_idle)); 1919 api_ready (aTHX_ SvRV (sv_idle));
1685 --coro_nready; 1920 --coro_nready;
1686 } 1921 }
1687 else 1922 else
1688 { 1923 {
1924 /* TODO: deprecated, remove, cannot work reliably *//*D*/
1689 dSP; 1925 dSP;
1690 1926
1691 ENTER; 1927 ENTER;
1692 SAVETMPS; 1928 SAVETMPS;
1693 1929
… …
1700 } 1936 }
1701 } 1937 }
1702 } 1938 }
1703} 1939}
1704 1940
1705INLINE void 1941ECB_INLINE void
1706prepare_cede (pTHX_ struct coro_transfer_args *ta) 1942prepare_cede (pTHX_ struct coro_transfer_args *ta)
1707{ 1943{
1708 api_ready (aTHX_ coro_current); 1944 api_ready (aTHX_ coro_current);
1709 prepare_schedule (aTHX_ ta); 1945 prepare_schedule (aTHX_ ta);
1710} 1946}
1711 1947
1712INLINE void 1948ECB_INLINE void
1713prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 1949prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1714{ 1950{
1715 SV *prev = SvRV (coro_current); 1951 SV *prev = SvRV (coro_current);
1716 1952
1717 if (coro_nready) 1953 if (coro_nready)
… …
1747{ 1983{
1748 struct coro_transfer_args ta; 1984 struct coro_transfer_args ta;
1749 1985
1750 prepare_cede (aTHX_ &ta); 1986 prepare_cede (aTHX_ &ta);
1751 1987
1752 if (expect_true (ta.prev != ta.next)) 1988 if (ecb_expect_true (ta.prev != ta.next))
1753 { 1989 {
1754 TRANSFER (ta, 1); 1990 TRANSFER (ta, 1);
1755 return 1; 1991 return 1;
1756 } 1992 }
1757 else 1993 else
… …
1800 coro->slot->runops = RUNOPS_DEFAULT; 2036 coro->slot->runops = RUNOPS_DEFAULT;
1801 } 2037 }
1802} 2038}
1803 2039
1804static 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
1805coro_call_on_destroy (pTHX_ struct coro *coro) 2117coro_call_on_destroy (pTHX_ struct coro *coro)
1806{ 2118{
1807 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2119 AV *od = coro->on_destroy;
1808 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1809 2120
1810 if (on_destroyp) 2121 if (!od)
1811 { 2122 return;
1812 AV *on_destroy = (AV *)SvRV (*on_destroyp);
1813 2123
1814 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
1815 { 2132 {
1816 dSP; /* don't disturb outer sp */ 2133 dSP; /* don't disturb outer sp */
1817 SV *cb = av_pop (on_destroy);
1818
1819 PUSHMARK (SP); 2134 PUSHMARK (SP);
1820 2135
1821 if (statusp) 2136 if (coro->status)
1822 { 2137 {
1823 int i; 2138 PUTBACK;
1824 AV *status = (AV *)SvRV (*statusp); 2139 coro_push_av (aTHX_ coro->status, G_ARRAY);
1825 EXTEND (SP, AvFILLp (status) + 1); 2140 SPAGAIN;
1826
1827 for (i = 0; i <= AvFILLp (status); ++i)
1828 PUSHs (AvARRAY (status)[i]);
1829 } 2141 }
1830 2142
1831 PUTBACK; 2143 PUTBACK;
1832 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD); 2144 call_sv (cb, G_VOID | G_DISCARD);
1833 } 2145 }
1834 } 2146 }
1835} 2147}
1836 2148
1837static void 2149static void
1838slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2150coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
1839{ 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 {
1840 int i; 2165 int i;
1841 HV *hv = (HV *)SvRV (coro_current);
1842 AV *av = newAV ();
1843 2166
1844 av_extend (av, items - 1); 2167 av_extend (av, items - 1);
2168
1845 for (i = 0; i < items; ++i) 2169 for (i = 0; i < items; ++i)
1846 av_push (av, SvREFCNT_inc_NN (arg [i])); 2170 av_push (av, SvREFCNT_inc_NN (arg [i]));
2171 }
2172}
1847 2173
1848 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 2174static void
1849 2175slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2176{
1850 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 */
1851 api_ready (aTHX_ sv_manager); 2178 api_ready (aTHX_ sv_manager);
1852 2179
1853 frame->prepare = prepare_schedule; 2180 frame->prepare = prepare_schedule;
1854 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;
1855} 2289}
1856 2290
1857/*****************************************************************************/ 2291/*****************************************************************************/
1858/* async pool handler */ 2292/* async pool handler */
1859 2293
… …
1890slf_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)
1891{ 2325{
1892 HV *hv = (HV *)SvRV (coro_current); 2326 HV *hv = (HV *)SvRV (coro_current);
1893 struct coro *coro = SvSTATE_hv ((SV *)hv); 2327 struct coro *coro = SvSTATE_hv ((SV *)hv);
1894 2328
1895 if (expect_true (coro->saved_deffh)) 2329 if (ecb_expect_true (coro->saved_deffh))
1896 { 2330 {
1897 /* subsequent iteration */ 2331 /* subsequent iteration */
1898 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2332 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1899 coro->saved_deffh = 0; 2333 coro->saved_deffh = 0;
1900 2334
1901 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 2335 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
1902 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2336 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1903 { 2337 {
1904 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate); 2338 slf_init_terminate_cancel_common (aTHX_ frame, hv);
1905 coro->invoke_av = newAV (); 2339 return;
1906
1907 frame->prepare = prepare_nop;
1908 } 2340 }
1909 else 2341 else
1910 { 2342 {
1911 av_clear (GvAV (PL_defgv)); 2343 av_clear (GvAV (PL_defgv));
1912 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);
… …
1937 2369
1938static void 2370static void
1939coro_rouse_callback (pTHX_ CV *cv) 2371coro_rouse_callback (pTHX_ CV *cv)
1940{ 2372{
1941 dXSARGS; 2373 dXSARGS;
1942 SV *data = (SV *)GENSUB_ARG; 2374 SV *data = (SV *)S_GENSUB_ARG;
1943 2375
1944 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2376 if (SvTYPE (SvRV (data)) != SVt_PVAV)
1945 { 2377 {
1946 /* first call, set args */ 2378 /* first call, set args */
2379 SV *coro = SvRV (data);
1947 AV *av = newAV (); 2380 AV *av = newAV ();
1948 SV *coro = SvRV (data);
1949 2381
1950 SvRV_set (data, (SV *)av); 2382 SvRV_set (data, (SV *)av);
1951 api_ready (aTHX_ coro);
1952 SvREFCNT_dec (coro);
1953 2383
1954 /* better take a full copy of the arguments */ 2384 /* better take a full copy of the arguments */
1955 while (items--) 2385 while (items--)
1956 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);
1957 } 2390 }
1958 2391
1959 XSRETURN_EMPTY; 2392 XSRETURN_EMPTY;
1960} 2393}
1961 2394
… …
1978 2411
1979 EXTEND (SP, AvFILLp (av) + 1); 2412 EXTEND (SP, AvFILLp (av) + 1);
1980 for (i = 0; i <= AvFILLp (av); ++i) 2413 for (i = 0; i <= AvFILLp (av); ++i)
1981 PUSHs (sv_2mortal (AvARRAY (av)[i])); 2414 PUSHs (sv_2mortal (AvARRAY (av)[i]));
1982 2415
1983 /* 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 */
1984 AvFILLp (av) = -1; 2417 AvFILLp (av) = -1;
1985 av_undef (av); 2418 av_undef (av);
1986 2419
1987 PUTBACK; 2420 PUTBACK;
1988 } 2421 }
… …
2012 || SvTYPE (SvRV (cb)) != SVt_PVCV 2445 || SvTYPE (SvRV (cb)) != SVt_PVCV
2013 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2446 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2014 croak ("Coro::rouse_wait called with illegal callback argument,"); 2447 croak ("Coro::rouse_wait called with illegal callback argument,");
2015 2448
2016 { 2449 {
2017 CV *cv = (CV *)SvRV (cb); /* for GENSUB_ARG */ 2450 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
2018 SV *data = (SV *)GENSUB_ARG; 2451 SV *data = (SV *)S_GENSUB_ARG;
2019 2452
2020 frame->data = (void *)data; 2453 frame->data = (void *)data;
2021 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule; 2454 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
2022 frame->check = slf_check_rouse_wait; 2455 frame->check = slf_check_rouse_wait;
2023 } 2456 }
… …
2027coro_new_rouse_cb (pTHX) 2460coro_new_rouse_cb (pTHX)
2028{ 2461{
2029 HV *hv = (HV *)SvRV (coro_current); 2462 HV *hv = (HV *)SvRV (coro_current);
2030 struct coro *coro = SvSTATE_hv (hv); 2463 struct coro *coro = SvSTATE_hv (hv);
2031 SV *data = newRV_inc ((SV *)hv); 2464 SV *data = newRV_inc ((SV *)hv);
2032 SV *cb = gensub (aTHX_ coro_rouse_callback, (void *)data); 2465 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
2033 2466
2034 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);
2035 SvREFCNT_dec (data); /* magicext increases the refcount */ 2468 SvREFCNT_dec (data); /* magicext increases the refcount */
2036 2469
2037 SvREFCNT_dec (coro->rouse_cb); 2470 SvREFCNT_dec (coro->rouse_cb);
… …
2134static void 2567static void
2135slf_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)
2136{ 2569{
2137 frame->prepare = prepare_cede_notself; 2570 frame->prepare = prepare_cede_notself;
2138 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;
2139} 2589}
2140 2590
2141/* 2591/*
2142 * these not obviously related functions are all rolled into one 2592 * these not obviously related functions are all rolled into one
2143 * 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
… …
2150 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 */
2151 2601
2152 /* 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 */
2153 /* the latter happens when a new coro has been started */ 2603 /* the latter happens when a new coro has been started */
2154 /* or when a new cctx was attached to an existing coroutine */ 2604 /* or when a new cctx was attached to an existing coroutine */
2155 if (expect_true (!slf_frame.prepare)) 2605 if (ecb_expect_true (!slf_frame.prepare))
2156 { 2606 {
2157 /* first iteration */ 2607 /* first iteration */
2158 dSP; 2608 dSP;
2159 SV **arg = PL_stack_base + TOPMARK + 1; 2609 SV **arg = PL_stack_base + TOPMARK + 1;
2160 int items = SP - arg; /* args without function object */ 2610 int items = SP - arg; /* args without function object */
… …
2201 while (slf_frame.check (aTHX_ &slf_frame)); 2651 while (slf_frame.check (aTHX_ &slf_frame));
2202 2652
2203 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 */
2204 2654
2205 /* exception handling */ 2655 /* exception handling */
2206 if (expect_false (CORO_THROW)) 2656 if (ecb_expect_false (CORO_THROW))
2207 { 2657 {
2208 SV *exception = sv_2mortal (CORO_THROW); 2658 SV *exception = sv_2mortal (CORO_THROW);
2209 2659
2210 CORO_THROW = 0; 2660 CORO_THROW = 0;
2211 sv_setsv (ERRSV, exception); 2661 sv_setsv (ERRSV, exception);
2212 croak (0); 2662 croak (0);
2213 } 2663 }
2214 2664
2215 /* return value handling - mostly like entersub */ 2665 /* return value handling - mostly like entersub */
2216 /* make sure we put something on the stack in scalar context */ 2666 /* make sure we put something on the stack in scalar context */
2217 if (GIMME_V == G_SCALAR) 2667 if (GIMME_V == G_SCALAR
2668 && ecb_expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2218 { 2669 {
2219 dSP; 2670 dSP;
2220 SV **bot = PL_stack_base + checkmark; 2671 SV **bot = PL_stack_base + checkmark;
2221 2672
2222 if (sp == bot) /* too few, push undef */ 2673 if (sp == bot) /* too few, push undef */
2223 bot [1] = &PL_sv_undef; 2674 bot [1] = &PL_sv_undef;
2224 else if (sp != bot + 1) /* too many, take last one */ 2675 else /* too many, take last one */
2225 bot [1] = *sp; 2676 bot [1] = *sp;
2226 2677
2227 SP = bot + 1; 2678 SP = bot + 1;
2228 2679
2229 PUTBACK; 2680 PUTBACK;
… …
2262 if (PL_op->op_flags & OPf_STACKED) 2713 if (PL_op->op_flags & OPf_STACKED)
2263 { 2714 {
2264 if (items > slf_arga) 2715 if (items > slf_arga)
2265 { 2716 {
2266 slf_arga = items; 2717 slf_arga = items;
2267 free (slf_argv); 2718 Safefree (slf_argv);
2268 slf_argv = malloc (slf_arga * sizeof (SV *)); 2719 New (0, slf_argv, slf_arga, SV *);
2269 } 2720 }
2270 2721
2271 slf_argc = items; 2722 slf_argc = items;
2272 2723
2273 for (i = 0; i < items; ++i) 2724 for (i = 0; i < items; ++i)
… …
2278 2729
2279 PL_op->op_ppaddr = pp_slf; 2730 PL_op->op_ppaddr = pp_slf;
2280 /*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 */
2281 2732
2282 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));
2283} 2781}
2284 2782
2285/*****************************************************************************/ 2783/*****************************************************************************/
2286/* PerlIO::cede */ 2784/* PerlIO::cede */
2287 2785
… …
2289{ 2787{
2290 PerlIOBuf base; 2788 PerlIOBuf base;
2291 NV next, every; 2789 NV next, every;
2292} PerlIOCede; 2790} PerlIOCede;
2293 2791
2294static IV 2792static IV ecb_cold
2295PerlIOCede_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)
2296{ 2794{
2297 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2795 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2298 2796
2299 self->every = SvCUR (arg) ? SvNV (arg) : 0.01; 2797 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
2300 self->next = nvtime () + self->every; 2798 self->next = nvtime () + self->every;
2301 2799
2302 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab); 2800 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
2303} 2801}
2304 2802
2305static SV * 2803static SV * ecb_cold
2306PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags) 2804PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
2307{ 2805{
2308 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2806 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2309 2807
2310 return newSVnv (self->every); 2808 return newSVnv (self->every);
… …
2361/* Coro::Semaphore & Coro::Signal */ 2859/* Coro::Semaphore & Coro::Signal */
2362 2860
2363static SV * 2861static SV *
2364coro_waitarray_new (pTHX_ int count) 2862coro_waitarray_new (pTHX_ int count)
2365{ 2863{
2366 /* 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 */
2367 AV *av = newAV (); 2865 AV *av = newAV ();
2368 SV **ary; 2866 SV **ary;
2369 2867
2370 /* unfortunately, building manually saves memory */ 2868 /* unfortunately, building manually saves memory */
2371 Newx (ary, 2, SV *); 2869 Newx (ary, 2, SV *);
… …
2422 SvREFCNT_dec (cb); 2920 SvREFCNT_dec (cb);
2423 } 2921 }
2424} 2922}
2425 2923
2426static void 2924static void
2427coro_semaphore_on_destroy (pTHX_ struct coro *coro) 2925coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2428{ 2926{
2429 /* call $sem->adjust (0) to possibly wake up some other waiters */ 2927 /* call $sem->adjust (0) to possibly wake up some other waiters */
2430 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 2928 coro_semaphore_adjust (aTHX_ (AV *)frame->data, 0);
2431} 2929}
2432 2930
2433static int 2931static int
2434slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire) 2932slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2435{ 2933{
2436 AV *av = (AV *)frame->data; 2934 AV *av = (AV *)frame->data;
2437 SV *count_sv = AvARRAY (av)[0]; 2935 SV *count_sv = AvARRAY (av)[0];
2936 SV *coro_hv = SvRV (coro_current);
2438 2937
2439 /* 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 */
2440 if (CORO_THROW) 2939 if (CORO_THROW)
2441 return 0; 2940 return 0;
2442 else if (SvIVX (count_sv) > 0) 2941 else if (SvIVX (count_sv) > 0)
2443 { 2942 {
2444 SvSTATE_current->on_destroy = 0; 2943 frame->destroy = 0;
2445 2944
2446 if (acquire) 2945 if (acquire)
2447 SvIVX (count_sv) = SvIVX (count_sv) - 1; 2946 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2448 else 2947 else
2449 coro_semaphore_adjust (aTHX_ av, 0); 2948 coro_semaphore_adjust (aTHX_ av, 0);
… …
2454 { 2953 {
2455 int i; 2954 int i;
2456 /* 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 */
2457 /* 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 */
2458 /* this avoids some degenerate memory usage cases */ 2957 /* this avoids some degenerate memory usage cases */
2459 2958 for (i = AvFILLp (av); i > 0; --i) /* i > 0 is not an off-by-one bug */
2460 for (i = 1; i <= AvFILLp (av); ++i)
2461 if (AvARRAY (av)[i] == SvRV (coro_current)) 2959 if (AvARRAY (av)[i] == coro_hv)
2462 return 1; 2960 return 1;
2463 2961
2464 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2962 av_push (av, SvREFCNT_inc (coro_hv));
2465 return 1; 2963 return 1;
2466 } 2964 }
2467} 2965}
2468 2966
2469static int 2967static int
… …
2492 { 2990 {
2493 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2991 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2494 2992
2495 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 2993 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2496 frame->prepare = prepare_schedule; 2994 frame->prepare = prepare_schedule;
2497
2498 /* to avoid race conditions when a woken-up coro gets terminated */ 2995 /* to avoid race conditions when a woken-up coro gets terminated */
2499 /* we arrange for a temporary on_destroy that calls adjust (0) */ 2996 /* we arrange for a temporary on_destroy that calls adjust (0) */
2500 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 2997 frame->destroy = coro_semaphore_destroy;
2501 } 2998 }
2502} 2999}
2503 3000
2504static void 3001static void
2505slf_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)
… …
2513{ 3010{
2514 if (items >= 2) 3011 if (items >= 2)
2515 { 3012 {
2516 /* callback form */ 3013 /* callback form */
2517 AV *av = (AV *)SvRV (arg [0]); 3014 AV *av = (AV *)SvRV (arg [0]);
2518 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 3015 SV *cb_cv = s_get_cv_croak (arg [1]);
2519 3016
2520 av_push (av, (SV *)SvREFCNT_inc_NN (cb_cv)); 3017 av_push (av, SvREFCNT_inc_NN (cb_cv));
2521 3018
2522 if (SvIVX (AvARRAY (av)[0]) > 0) 3019 if (SvIVX (AvARRAY (av)[0]) > 0)
2523 coro_semaphore_adjust (aTHX_ av, 0); 3020 coro_semaphore_adjust (aTHX_ av, 0);
2524 3021
2525 frame->prepare = prepare_nop; 3022 frame->prepare = prepare_nop;
… …
2549 AvARRAY (av)[0] = AvARRAY (av)[1]; 3046 AvARRAY (av)[0] = AvARRAY (av)[1];
2550 AvARRAY (av)[1] = cb; 3047 AvARRAY (av)[1] = cb;
2551 3048
2552 cb = av_shift (av); 3049 cb = av_shift (av);
2553 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 {
2554 api_ready (aTHX_ cb); 3061 api_ready (aTHX_ cb);
2555 sv_setiv (cb, 0); /* signal waiter */ 3062 sv_setiv (cb, 0); /* signal waiter */
3063 }
3064
2556 SvREFCNT_dec (cb); 3065 SvREFCNT_dec (cb);
2557 3066
2558 --count; 3067 --count;
2559 } 3068 }
2560} 3069}
… …
2569static void 3078static void
2570slf_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)
2571{ 3080{
2572 AV *av = (AV *)SvRV (arg [0]); 3081 AV *av = (AV *)SvRV (arg [0]);
2573 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
2574 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]))
2575 { 3095 {
2576 SvIVX (AvARRAY (av)[0]) = 0; 3096 SvIVX (AvARRAY (av)[0]) = 0;
2577 frame->prepare = prepare_nop; 3097 frame->prepare = prepare_nop;
2578 frame->check = slf_check_nop; 3098 frame->check = slf_check_nop;
2579 } 3099 }
2580 else 3100 else
2581 { 3101 {
2582 SV *waiter = newRV_inc (SvRV (coro_current)); /* owned by signal av */ 3102 SV *waiter = newSVsv (coro_current); /* owned by signal av */
2583 3103
2584 av_push (av, waiter); 3104 av_push (av, waiter);
2585 3105
2586 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 */
2587 frame->prepare = prepare_schedule; 3107 frame->prepare = prepare_schedule;
… …
2605 3125
2606static void 3126static void
2607coro_aio_callback (pTHX_ CV *cv) 3127coro_aio_callback (pTHX_ CV *cv)
2608{ 3128{
2609 dXSARGS; 3129 dXSARGS;
2610 AV *state = (AV *)GENSUB_ARG; 3130 AV *state = (AV *)S_GENSUB_ARG;
2611 SV *coro = av_pop (state); 3131 SV *coro = av_pop (state);
2612 SV *data_sv = newSV (sizeof (struct io_state)); 3132 SV *data_sv = newSV (sizeof (struct io_state));
2613 3133
2614 av_extend (state, items - 1); 3134 av_extend (state, items - 1);
2615 3135
… …
2700 dSP; 3220 dSP;
2701 3221
2702 static SV *prio_cv; 3222 static SV *prio_cv;
2703 static SV *prio_sv; 3223 static SV *prio_sv;
2704 3224
2705 if (expect_false (!prio_cv)) 3225 if (ecb_expect_false (!prio_cv))
2706 { 3226 {
2707 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0); 3227 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0);
2708 prio_sv = newSViv (0); 3228 prio_sv = newSViv (0);
2709 } 3229 }
2710 3230
… …
2729 3249
2730 for (i = 0; i < items; ++i) 3250 for (i = 0; i < items; ++i)
2731 PUSHs (arg [i]); 3251 PUSHs (arg [i]);
2732 3252
2733 /* now push the callback closure */ 3253 /* now push the callback closure */
2734 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))));
2735 3255
2736 /* now call the AIO function - we assume our request is uncancelable */ 3256 /* now call the AIO function - we assume our request is uncancelable */
2737 PUTBACK; 3257 PUTBACK;
2738 call_sv ((SV *)req, G_VOID | G_DISCARD); 3258 call_sv ((SV *)req, G_VOID | G_DISCARD);
2739 } 3259 }
2740 3260
2741 /* 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 */
2742 frame->data = (void *)state; 3262 frame->data = (void *)state;
2743 frame->prepare = prepare_schedule; 3263 frame->prepare = prepare_schedule;
2744 frame->check = slf_check_aio_req; 3264 frame->check = slf_check_aio_req;
2745} 3265}
2746 3266
… …
2756 3276
2757/*****************************************************************************/ 3277/*****************************************************************************/
2758 3278
2759#if CORO_CLONE 3279#if CORO_CLONE
2760# 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_3uv (pTHX_ UV a, UV b, UV c)
3349{
3350 dSP;
3351 AV *av = newAV ();
3352
3353 av_store (av, 2, newSVuv (c));
3354 av_store (av, 1, newSVuv (b));
3355 av_store (av, 0, newSVuv (a));
3356
3357 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
3358
3359 PUTBACK;
3360}
3361
3362static void ecb_noinline ecb_cold
3363jit_init (pTHX)
3364{
3365 dSP;
3366 SV *load, *save;
3367 char *map_base;
3368 char *load_ptr, *save_ptr;
3369 STRLEN load_len, save_len, map_len;
3370 int count;
3371
3372 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3373
3374 PUSHMARK (SP);
3375#define VARx(name,expr,type) pushav_3uv (aTHX_ (UV)&(expr), offsetof (perl_slots, name), sizeof (type));
3376# include "state.h"
3377#undef VARx
3378 count = call_pv ("Coro::State::_jit", G_ARRAY);
3379 SPAGAIN;
3380
3381 save = POPs; save_ptr = SvPVbyte (save, save_len);
3382 load = POPs; load_ptr = SvPVbyte (load, load_len);
3383
3384 map_len = load_len + save_len + 16;
3385
3386 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3387
3388 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3389
3390 load_perl_slots = (load_save_perl_slots_type)map_base;
3391 memcpy (map_base, load_ptr, load_len);
3392
3393 map_base += (load_len + 15) & ~15;
3394
3395 save_perl_slots = (load_save_perl_slots_type)map_base;
3396 memcpy (map_base, save_ptr, save_len);
3397
3398 /* we are good citizens and try to make the page read-only, so the evil evil */
3399 /* hackers might have it a bit more difficult */
3400 mprotect (map_base, map_len, PROT_READ | PROT_EXEC);
3401
3402 PUTBACK;
3403 eval_pv ("undef &Coro::State::_jit", 1);
3404}
3405
2761#endif 3406#endif
2762 3407
2763MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3408MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2764 3409
2765PROTOTYPES: DISABLE 3410PROTOTYPES: DISABLE
… …
2771 coro_thx = PERL_GET_CONTEXT; 3416 coro_thx = PERL_GET_CONTEXT;
2772# endif 3417# endif
2773#endif 3418#endif
2774 BOOT_PAGESIZE; 3419 BOOT_PAGESIZE;
2775 3420
3421 /* perl defines these to check for existance first, but why it doesn't */
3422 /* just create them one at init time is not clear to me, except for */
3423 /* programs trying to delete them, but... */
3424 /* anyway, we declare this as invalid and make sure they are initialised here */
3425 DEFSV;
3426 ERRSV;
3427
2776 cctx_current = cctx_new_empty (); 3428 cctx_current = cctx_new_empty ();
2777 3429
2778 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3430 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
2779 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3431 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
2780 3432
… …
2819 coroapi.prepare_nop = prepare_nop; 3471 coroapi.prepare_nop = prepare_nop;
2820 coroapi.prepare_schedule = prepare_schedule; 3472 coroapi.prepare_schedule = prepare_schedule;
2821 coroapi.prepare_cede = prepare_cede; 3473 coroapi.prepare_cede = prepare_cede;
2822 coroapi.prepare_cede_notself = prepare_cede_notself; 3474 coroapi.prepare_cede_notself = prepare_cede_notself;
2823 3475
2824 { 3476 time_init (aTHX);
2825 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
2826 3477
2827 if (!svp) croak ("Time::HiRes is required");
2828 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
2829
2830 nvtime = INT2PTR (double (*)(), SvIV (*svp));
2831 }
2832
2833 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 3478 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3479#if CORO_JIT
3480 PUTBACK;
3481 jit_init (aTHX);
3482 SPAGAIN;
3483#endif
2834} 3484}
2835 3485
2836SV * 3486SV *
2837new (char *klass, ...) 3487new (SV *klass, ...)
2838 ALIAS: 3488 ALIAS:
2839 Coro::new = 1 3489 Coro::new = 1
2840 CODE: 3490 CODE:
2841{ 3491 RETVAL = coro_new (aTHX_ ix ? coro_stash : coro_state_stash, &ST (1), items - 1, ix);
2842 struct coro *coro; 3492 OUTPUT:
2843 MAGIC *mg;
2844 HV *hv;
2845 CV *cb;
2846 int i;
2847
2848 if (items > 1)
2849 {
2850 cb = coro_sv_2cv (aTHX_ ST (1));
2851
2852 if (!ix)
2853 {
2854 if (CvISXSUB (cb))
2855 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
2856
2857 if (!CvROOT (cb))
2858 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
2859 }
2860 }
2861
2862 Newz (0, coro, 1, struct coro);
2863 coro->args = newAV ();
2864 coro->flags = CF_NEW;
2865
2866 if (coro_first) coro_first->prev = coro;
2867 coro->next = coro_first;
2868 coro_first = coro;
2869
2870 coro->hv = hv = newHV ();
2871 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
2872 mg->mg_flags |= MGf_DUP;
2873 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
2874
2875 if (items > 1)
2876 {
2877 av_extend (coro->args, items - 1 + ix - 1);
2878
2879 if (ix)
2880 {
2881 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
2882 cb = cv_coro_run;
2883 }
2884
2885 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
2886
2887 for (i = 2; i < items; i++)
2888 av_push (coro->args, newSVsv (ST (i)));
2889 }
2890}
2891 OUTPUT:
2892 RETVAL 3493 RETVAL
2893 3494
2894void 3495void
2895transfer (...) 3496transfer (...)
2896 PROTOTYPE: $$ 3497 PROTOTYPE: $$
2897 CODE: 3498 CODE:
2898 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3499 CORO_EXECUTE_SLF_XS (slf_init_transfer);
2899 3500
2900bool
2901_destroy (SV *coro_sv)
2902 CODE:
2903 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
2904 OUTPUT:
2905 RETVAL
2906
2907void 3501void
2908_exit (int code) 3502_exit (int code)
2909 PROTOTYPE: $ 3503 PROTOTYPE: $
2910 CODE: 3504 CODE:
2911 _exit (code); 3505 _exit (code);
… …
2913SV * 3507SV *
2914clone (Coro::State coro) 3508clone (Coro::State coro)
2915 CODE: 3509 CODE:
2916{ 3510{
2917#if CORO_CLONE 3511#if CORO_CLONE
2918 struct coro *ncoro = coro_clone (coro); 3512 struct coro *ncoro = coro_clone (aTHX_ coro);
2919 MAGIC *mg; 3513 MAGIC *mg;
2920 /* TODO: too much duplication */ 3514 /* TODO: too much duplication */
2921 ncoro->hv = newHV (); 3515 ncoro->hv = newHV ();
2922 mg = sv_magicext ((SV *)ncoro->hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)ncoro, 0); 3516 mg = sv_magicext ((SV *)ncoro->hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)ncoro, 0);
2923 mg->mg_flags |= MGf_DUP; 3517 mg->mg_flags |= MGf_DUP;
… …
2985 eval = 1 3579 eval = 1
2986 CODE: 3580 CODE:
2987{ 3581{
2988 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3582 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
2989 { 3583 {
2990 struct coro temp; 3584 struct coro *current = SvSTATE_current;
3585 struct CoroSLF slf_save;
2991 3586
2992 if (!(coro->flags & CF_RUNNING)) 3587 if (current != coro)
2993 { 3588 {
2994 PUTBACK; 3589 PUTBACK;
2995 save_perl (aTHX_ &temp); 3590 save_perl (aTHX_ current);
2996 load_perl (aTHX_ coro); 3591 load_perl (aTHX_ coro);
3592 /* the coro is most likely in an active SLF call.
3593 * while not strictly required (the code we execute is
3594 * not allowed to call any SLF functions), it's cleaner
3595 * to reinitialise the slf_frame and restore it later.
3596 * This might one day allow us to actually do SLF calls
3597 * from code executed here.
3598 */
3599 slf_save = slf_frame;
3600 slf_frame.prepare = 0;
3601 SPAGAIN;
2997 } 3602 }
2998 3603
2999 {
3000 dSP;
3001 ENTER;
3002 SAVETMPS;
3003 PUTBACK;
3004 PUSHSTACK; 3604 PUSHSTACK;
3605
3005 PUSHMARK (SP); 3606 PUSHMARK (SP);
3607 PUTBACK;
3006 3608
3007 if (ix) 3609 if (ix)
3008 eval_sv (coderef, 0); 3610 eval_sv (coderef, 0);
3009 else 3611 else
3010 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 3612 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
3011 3613
3012 POPSTACK; 3614 POPSTACK;
3013 SPAGAIN; 3615 SPAGAIN;
3014 FREETMPS;
3015 LEAVE;
3016 PUTBACK;
3017 }
3018 3616
3019 if (!(coro->flags & CF_RUNNING)) 3617 if (current != coro)
3020 { 3618 {
3619 PUTBACK;
3620 slf_frame = slf_save;
3021 save_perl (aTHX_ coro); 3621 save_perl (aTHX_ coro);
3022 load_perl (aTHX_ &temp); 3622 load_perl (aTHX_ current);
3023 SPAGAIN; 3623 SPAGAIN;
3024 } 3624 }
3025 } 3625 }
3026} 3626}
3027 3627
… …
3030 PROTOTYPE: $ 3630 PROTOTYPE: $
3031 ALIAS: 3631 ALIAS:
3032 is_ready = CF_READY 3632 is_ready = CF_READY
3033 is_running = CF_RUNNING 3633 is_running = CF_RUNNING
3034 is_new = CF_NEW 3634 is_new = CF_NEW
3035 is_destroyed = CF_DESTROYED 3635 is_destroyed = CF_ZOMBIE
3636 is_zombie = CF_ZOMBIE
3637 is_suspended = CF_SUSPENDED
3036 CODE: 3638 CODE:
3037 RETVAL = boolSV (coro->flags & ix); 3639 RETVAL = boolSV (coro->flags & ix);
3038 OUTPUT: 3640 OUTPUT:
3039 RETVAL 3641 RETVAL
3040 3642
3041void 3643void
3042throw (Coro::State self, SV *throw = &PL_sv_undef) 3644throw (Coro::State self, SV *exception = &PL_sv_undef)
3043 PROTOTYPE: $;$ 3645 PROTOTYPE: $;$
3044 CODE: 3646 CODE:
3045{ 3647{
3046 struct coro *current = SvSTATE_current; 3648 struct coro *current = SvSTATE_current;
3047 SV **throwp = self == current ? &CORO_THROW : &self->except; 3649 SV **exceptionp = self == current ? &CORO_THROW : &self->except;
3048 SvREFCNT_dec (*throwp); 3650 SvREFCNT_dec (*exceptionp);
3049 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3651 SvGETMAGIC (exception);
3652 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3050} 3653}
3051 3654
3052void 3655void
3053api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3656api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3054 PROTOTYPE: $;$ 3657 PROTOTYPE: $;$
… …
3105 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv; 3708 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
3106 3709
3107 SV *tmp = *src; *src = *dst; *dst = tmp; 3710 SV *tmp = *src; *src = *dst; *dst = tmp;
3108 } 3711 }
3109 3712
3713void
3714cancel (Coro::State self)
3715 CODE:
3716 coro_state_destroy (aTHX_ self);
3717
3718SV *
3719enable_times (int enabled = enable_times)
3720 CODE:
3721{
3722 RETVAL = boolSV (enable_times);
3723
3724 if (enabled != enable_times)
3725 {
3726 enable_times = enabled;
3727
3728 coro_times_update ();
3729 (enabled ? coro_times_sub : coro_times_add)(SvSTATE (coro_current));
3730 }
3731}
3732 OUTPUT:
3733 RETVAL
3734
3735void
3736times (Coro::State self)
3737 PPCODE:
3738{
3739 struct coro *current = SvSTATE (coro_current);
3740
3741 if (ecb_expect_false (current == self))
3742 {
3743 coro_times_update ();
3744 coro_times_add (SvSTATE (coro_current));
3745 }
3746
3747 EXTEND (SP, 2);
3748 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3749 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3750
3751 if (ecb_expect_false (current == self))
3752 coro_times_sub (SvSTATE (coro_current));
3753}
3754
3755void
3756swap_sv (Coro::State coro, SV *sv, SV *swapsv)
3757 CODE:
3758{
3759 struct coro *current = SvSTATE_current;
3760
3761 if (current == coro)
3762 SWAP_SVS (current);
3763
3764 if (!coro->swap_sv)
3765 coro->swap_sv = newAV ();
3766
3767 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv )));
3768 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv)));
3769
3770 if (current == coro)
3771 SWAP_SVS (current);
3772}
3773
3110 3774
3111MODULE = Coro::State PACKAGE = Coro 3775MODULE = Coro::State PACKAGE = Coro
3112 3776
3113BOOT: 3777BOOT:
3114{ 3778{
3115 int i;
3116
3117 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3779 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3118 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3780 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3119 cv_coro_run = get_cv ( "Coro::_terminate", GV_ADD); 3781 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3120 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3121 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 3782 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3122 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 3783 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3123 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 3784 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3124 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 3785 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3125 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 3786 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3126 3787
3127 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3788 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3128 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3789 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3129 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 3790 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3130 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new); 3791 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3131 3792
3132 coro_stash = gv_stashpv ("Coro", TRUE); 3793 coro_stash = gv_stashpv ("Coro", TRUE);
3133 3794
3134 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 3795 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3135 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 3796 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3136 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 3797 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
3137 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 3798 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (CORO_PRIO_LOW));
3138 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE)); 3799 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (CORO_PRIO_IDLE));
3139 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN)); 3800 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (CORO_PRIO_MIN));
3140
3141 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
3142 coro_ready[i] = newAV ();
3143 3801
3144 { 3802 {
3145 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 3803 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
3146 3804
3147 coroapi.schedule = api_schedule; 3805 coroapi.schedule = api_schedule;
… …
3157 sv_setiv (sv, (IV)&coroapi); 3815 sv_setiv (sv, (IV)&coroapi);
3158 SvREADONLY_on (sv); 3816 SvREADONLY_on (sv);
3159 } 3817 }
3160} 3818}
3161 3819
3820SV *
3821async (...)
3822 PROTOTYPE: &@
3823 CODE:
3824 RETVAL = coro_new (aTHX_ coro_stash, &ST (0), items, 1);
3825 api_ready (aTHX_ RETVAL);
3826 OUTPUT:
3827 RETVAL
3828
3829void
3830_destroy (Coro::State coro)
3831 CODE:
3832 /* used by the manager thread */
3833 coro_state_destroy (aTHX_ coro);
3834
3835void
3836on_destroy (Coro::State coro, SV *cb)
3837 CODE:
3838 coro_push_on_destroy (aTHX_ coro, newSVsv (cb));
3839
3840void
3841join (...)
3842 CODE:
3843 CORO_EXECUTE_SLF_XS (slf_init_join);
3844
3162void 3845void
3163terminate (...) 3846terminate (...)
3164 CODE: 3847 CODE:
3165 CORO_EXECUTE_SLF_XS (slf_init_terminate); 3848 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3166 3849
3167void 3850void
3851cancel (...)
3852 CODE:
3853 CORO_EXECUTE_SLF_XS (slf_init_cancel);
3854
3855int
3856safe_cancel (Coro::State self, ...)
3857 C_ARGS: aTHX_ self, &ST (1), items - 1
3858
3859void
3168schedule (...) 3860schedule (...)
3169 CODE: 3861 CODE:
3170 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3862 CORO_EXECUTE_SLF_XS (slf_init_schedule);
3171 3863
3172void 3864void
… …
3186 3878
3187void 3879void
3188cede_notself (...) 3880cede_notself (...)
3189 CODE: 3881 CODE:
3190 CORO_EXECUTE_SLF_XS (slf_init_cede_notself); 3882 CORO_EXECUTE_SLF_XS (slf_init_cede_notself);
3191
3192void
3193_cancel (Coro::State self)
3194 CODE:
3195 coro_state_destroy (aTHX_ self);
3196 coro_call_on_destroy (aTHX_ self);
3197 3883
3198void 3884void
3199_set_current (SV *current) 3885_set_current (SV *current)
3200 PROTOTYPE: $ 3886 PROTOTYPE: $
3201 CODE: 3887 CODE:
… …
3205void 3891void
3206_set_readyhook (SV *hook) 3892_set_readyhook (SV *hook)
3207 PROTOTYPE: $ 3893 PROTOTYPE: $
3208 CODE: 3894 CODE:
3209 SvREFCNT_dec (coro_readyhook); 3895 SvREFCNT_dec (coro_readyhook);
3896 SvGETMAGIC (hook);
3897 if (SvOK (hook))
3898 {
3210 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0; 3899 coro_readyhook = newSVsv (hook);
3900 CORO_READYHOOK = invoke_sv_ready_hook_helper;
3901 }
3902 else
3903 {
3904 coro_readyhook = 0;
3905 CORO_READYHOOK = 0;
3906 }
3211 3907
3212int 3908int
3213prio (Coro::State coro, int newprio = 0) 3909prio (Coro::State coro, int newprio = 0)
3214 PROTOTYPE: $;$ 3910 PROTOTYPE: $;$
3215 ALIAS: 3911 ALIAS:
… …
3221 if (items > 1) 3917 if (items > 1)
3222 { 3918 {
3223 if (ix) 3919 if (ix)
3224 newprio = coro->prio - newprio; 3920 newprio = coro->prio - newprio;
3225 3921
3226 if (newprio < PRIO_MIN) newprio = PRIO_MIN; 3922 if (newprio < CORO_PRIO_MIN) newprio = CORO_PRIO_MIN;
3227 if (newprio > PRIO_MAX) newprio = PRIO_MAX; 3923 if (newprio > CORO_PRIO_MAX) newprio = CORO_PRIO_MAX;
3228 3924
3229 coro->prio = newprio; 3925 coro->prio = newprio;
3230 } 3926 }
3231} 3927}
3232 OUTPUT: 3928 OUTPUT:
… …
3247 RETVAL = coro_nready; 3943 RETVAL = coro_nready;
3248 OUTPUT: 3944 OUTPUT:
3249 RETVAL 3945 RETVAL
3250 3946
3251void 3947void
3948suspend (Coro::State self)
3949 PROTOTYPE: $
3950 CODE:
3951 self->flags |= CF_SUSPENDED;
3952
3953void
3954resume (Coro::State self)
3955 PROTOTYPE: $
3956 CODE:
3957 self->flags &= ~CF_SUSPENDED;
3958
3959void
3252_pool_handler (...) 3960_pool_handler (...)
3253 CODE: 3961 CODE:
3254 CORO_EXECUTE_SLF_XS (slf_init_pool_handler); 3962 CORO_EXECUTE_SLF_XS (slf_init_pool_handler);
3255 3963
3256void 3964void
… …
3267 for (i = 1; i < items; ++i) 3975 for (i = 1; i < items; ++i)
3268 av_push (av, SvREFCNT_inc_NN (ST (i))); 3976 av_push (av, SvREFCNT_inc_NN (ST (i)));
3269 3977
3270 if ((SV *)hv == &PL_sv_undef) 3978 if ((SV *)hv == &PL_sv_undef)
3271 { 3979 {
3272 PUSHMARK (SP); 3980 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3273 EXTEND (SP, 2);
3274 PUSHs (sv_Coro);
3275 PUSHs ((SV *)cv_pool_handler);
3276 PUTBACK;
3277 call_sv ((SV *)cv_coro_state_new, G_SCALAR);
3278 SPAGAIN;
3279
3280 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs)); 3981 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
3982 SvREFCNT_dec (sv);
3281 } 3983 }
3282 3984
3283 { 3985 {
3284 struct coro *coro = SvSTATE_hv (hv); 3986 struct coro *coro = SvSTATE_hv (hv);
3285 3987
… …
3309rouse_wait (...) 4011rouse_wait (...)
3310 PROTOTYPE: ;$ 4012 PROTOTYPE: ;$
3311 PPCODE: 4013 PPCODE:
3312 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait); 4014 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait);
3313 4015
4016void
4017on_enter (SV *block)
4018 ALIAS:
4019 on_leave = 1
4020 PROTOTYPE: &
4021 CODE:
4022{
4023 struct coro *coro = SvSTATE_current;
4024 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
4025
4026 block = s_get_cv_croak (block);
4027
4028 if (!*avp)
4029 *avp = newAV ();
4030
4031 av_push (*avp, SvREFCNT_inc (block));
4032
4033 if (!ix)
4034 on_enterleave_call (aTHX_ block);
4035
4036 LEAVE; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
4037 SAVEDESTRUCTOR_X (ix ? coro_pop_on_leave : coro_pop_on_enter, (void *)coro);
4038 ENTER; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
4039}
4040
3314 4041
3315MODULE = Coro::State PACKAGE = PerlIO::cede 4042MODULE = Coro::State PACKAGE = PerlIO::cede
3316 4043
3317BOOT: 4044BOOT:
3318 PerlIO_define_layer (aTHX_ &PerlIO_cede); 4045 PerlIO_define_layer (aTHX_ &PerlIO_cede);
… …
3321MODULE = Coro::State PACKAGE = Coro::Semaphore 4048MODULE = Coro::State PACKAGE = Coro::Semaphore
3322 4049
3323SV * 4050SV *
3324new (SV *klass, SV *count = 0) 4051new (SV *klass, SV *count = 0)
3325 CODE: 4052 CODE:
4053{
4054 int semcnt = 1;
4055
4056 if (count)
4057 {
4058 SvGETMAGIC (count);
4059
4060 if (SvOK (count))
4061 semcnt = SvIV (count);
4062 }
4063
3326 RETVAL = sv_bless ( 4064 RETVAL = sv_bless (
3327 coro_waitarray_new (aTHX_ count && SvOK (count) ? SvIV (count) : 1), 4065 coro_waitarray_new (aTHX_ semcnt),
3328 GvSTASH (CvGV (cv)) 4066 GvSTASH (CvGV (cv))
3329 ); 4067 );
4068}
3330 OUTPUT: 4069 OUTPUT:
3331 RETVAL 4070 RETVAL
3332 4071
3333# helper for Coro::Channel 4072# helper for Coro::Channel and others
3334SV * 4073SV *
3335_alloc (int count) 4074_alloc (int count)
3336 CODE: 4075 CODE:
3337 RETVAL = coro_waitarray_new (aTHX_ count); 4076 RETVAL = coro_waitarray_new (aTHX_ count);
3338 OUTPUT: 4077 OUTPUT:
… …
3396 for (i = 1; i <= wcount; ++i) 4135 for (i = 1; i <= wcount; ++i)
3397 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i]))); 4136 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i])));
3398 } 4137 }
3399} 4138}
3400 4139
4140MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
4141
4142void
4143_may_delete (SV *sem, int count, int extra_refs)
4144 PPCODE:
4145{
4146 AV *av = (AV *)SvRV (sem);
4147
4148 if (SvREFCNT ((SV *)av) == 1 + extra_refs
4149 && AvFILLp (av) == 0 /* no waiters, just count */
4150 && SvIV (AvARRAY (av)[0]) == count)
4151 XSRETURN_YES;
4152
4153 XSRETURN_NO;
4154}
4155
3401MODULE = Coro::State PACKAGE = Coro::Signal 4156MODULE = Coro::State PACKAGE = Coro::Signal
3402 4157
3403SV * 4158SV *
3404new (SV *klass) 4159new (SV *klass)
3405 CODE: 4160 CODE:
… …
3476 4231
3477void 4232void
3478_register (char *target, char *proto, SV *req) 4233_register (char *target, char *proto, SV *req)
3479 CODE: 4234 CODE:
3480{ 4235{
3481 CV *req_cv = coro_sv_2cv (aTHX_ req); 4236 SV *req_cv = s_get_cv_croak (req);
3482 /* newXSproto doesn't return the CV on 5.8 */ 4237 /* newXSproto doesn't return the CV on 5.8 */
3483 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 4238 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3484 sv_setpv ((SV *)slf_cv, proto); 4239 sv_setpv ((SV *)slf_cv, proto);
3485 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0); 4240 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
3486} 4241}
3487 4242
4243MODULE = Coro::State PACKAGE = Coro::Select
4244
4245void
4246patch_pp_sselect ()
4247 CODE:
4248 if (!coro_old_pp_sselect)
4249 {
4250 coro_select_select = (SV *)get_cv ("Coro::Select::select", 0);
4251 coro_old_pp_sselect = PL_ppaddr [OP_SSELECT];
4252 PL_ppaddr [OP_SSELECT] = coro_pp_sselect;
4253 }
4254
4255void
4256unpatch_pp_sselect ()
4257 CODE:
4258 if (coro_old_pp_sselect)
4259 {
4260 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
4261 coro_old_pp_sselect = 0;
4262 }
4263

Diff Legend

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