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.322 by root, Sat Nov 22 05:13:34 2008 UTC vs.
Revision 1.406 by root, Sat Jun 11 13:49:00 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
… …
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 */
… …
175static HV *coro_state_stash, *coro_stash; 128static HV *coro_state_stash, *coro_stash;
176static volatile SV *coro_mortal; /* will be freed/thrown after next transfer */ 129static volatile SV *coro_mortal; /* will be freed/thrown after next transfer */
177 130
178static AV *av_destroy; /* destruction queue */ 131static AV *av_destroy; /* destruction queue */
179static SV *sv_manager; /* the manager coro */ 132static SV *sv_manager; /* the manager coro */
133static SV *sv_idle; /* $Coro::idle */
180 134
181static GV *irsgv; /* $/ */ 135static GV *irsgv; /* $/ */
182static GV *stdoutgv; /* *STDOUT */ 136static GV *stdoutgv; /* *STDOUT */
183static SV *rv_diehook; 137static SV *rv_diehook;
184static SV *rv_warnhook; 138static SV *rv_warnhook;
… …
189static SV *sv_pool_size; 143static SV *sv_pool_size;
190static SV *sv_async_pool_idle; /* description string */ 144static SV *sv_async_pool_idle; /* description string */
191static AV *av_async_pool; /* idle pool */ 145static AV *av_async_pool; /* idle pool */
192static SV *sv_Coro; /* class string */ 146static SV *sv_Coro; /* class string */
193static CV *cv_pool_handler; 147static CV *cv_pool_handler;
194static CV *cv_coro_state_new;
195 148
196/* Coro::AnyEvent */ 149/* Coro::AnyEvent */
197static SV *sv_activity; 150static SV *sv_activity;
198 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
199static struct coro_cctx *cctx_first; 158static struct coro_cctx *cctx_first;
200static int cctx_count, cctx_idle; 159static int cctx_count, cctx_idle;
201 160
202enum { 161enum
162{
203 CC_MAPPED = 0x01, 163 CC_MAPPED = 0x01,
204 CC_NOREUSE = 0x02, /* throw this away after tracing */ 164 CC_NOREUSE = 0x02, /* throw this away after tracing */
205 CC_TRACE = 0x04, 165 CC_TRACE = 0x04,
206 CC_TRACE_SUB = 0x08, /* trace sub calls */ 166 CC_TRACE_SUB = 0x08, /* trace sub calls */
207 CC_TRACE_LINE = 0x10, /* trace each statement */ 167 CC_TRACE_LINE = 0x10, /* trace each statement */
… …
228 int valgrind_id; 188 int valgrind_id;
229#endif 189#endif
230 unsigned char flags; 190 unsigned char flags;
231} coro_cctx; 191} coro_cctx;
232 192
233coro_cctx *cctx_current; /* the currently running cctx */ 193static coro_cctx *cctx_current; /* the currently running cctx */
234 194
235/*****************************************************************************/ 195/*****************************************************************************/
236 196
197static MGVTBL coro_state_vtbl;
198
237enum { 199enum
200{
238 CF_RUNNING = 0x0001, /* coroutine is running */ 201 CF_RUNNING = 0x0001, /* coroutine is running */
239 CF_READY = 0x0002, /* coroutine is ready */ 202 CF_READY = 0x0002, /* coroutine is ready */
240 CF_NEW = 0x0004, /* has never been switched to */ 203 CF_NEW = 0x0004, /* has never been switched to */
241 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) */
242}; 207};
243 208
244/* 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 */
245typedef struct 210typedef struct
246{ 211{
247 SV *defsv;
248 AV *defav;
249 SV *errsv;
250 SV *irsgv;
251#define VAR(name,type) type name; 212#define VARx(name,expr,type) type name;
252# include "state.h" 213# include "state.h"
253#undef VAR 214#undef VARx
254} perl_slots; 215} perl_slots;
255 216
217// how many context stack entries do we need for perl_slots
256#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))
257 219
258/* this is a structure representing a perl-level coroutine */ 220/* this is a structure representing a perl-level coroutine */
259struct coro { 221struct coro
222{
260 /* the C coroutine allocated to this perl coroutine, if any */ 223 /* the C coroutine allocated to this perl coroutine, if any */
261 coro_cctx *cctx; 224 coro_cctx *cctx;
225
226 /* ready queue */
227 struct coro *next_ready;
262 228
263 /* state data */ 229 /* state data */
264 struct CoroSLF slf_frame; /* saved slf frame */ 230 struct CoroSLF slf_frame; /* saved slf frame */
265 AV *mainstack; 231 AV *mainstack;
266 perl_slots *slot; /* basically the saved sp */ 232 perl_slots *slot; /* basically the saved sp */
267 233
268 CV *startcv; /* the CV to execute */ 234 CV *startcv; /* the CV to execute */
269 AV *args; /* data associated with this coroutine (initial args) */ 235 AV *args; /* data associated with this coroutine (initial args) */
270 int refcnt; /* coroutines are refcounted, yes */
271 int flags; /* CF_ flags */ 236 int flags; /* CF_ flags */
272 HV *hv; /* the perl hash associated with this coro, if any */ 237 HV *hv; /* the perl hash associated with this coro, if any */
273 void (*on_destroy)(pTHX_ struct coro *coro);
274 238
275 /* statistics */ 239 /* statistics */
276 int usecount; /* number of transfers to this coro */ 240 int usecount; /* number of transfers to this coro */
277 241
278 /* coro process data */ 242 /* coro process data */
279 int prio; 243 int prio;
280 SV *except; /* exception to be thrown */ 244 SV *except; /* exception to be thrown */
281 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 */
282 248
283 /* async_pool */ 249 /* async_pool */
284 SV *saved_deffh; 250 SV *saved_deffh;
285 SV *invoke_cb; 251 SV *invoke_cb;
286 AV *invoke_av; 252 AV *invoke_av;
287 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
288 /* linked list */ 264 /* linked list */
289 struct coro *next, *prev; 265 struct coro *next, *prev;
290}; 266};
291 267
292typedef struct coro *Coro__State; 268typedef struct coro *Coro__State;
293typedef struct coro *Coro__State_or_hashref; 269typedef struct coro *Coro__State_or_hashref;
294 270
295/* the following variables are effectively part of the perl context */ 271/* the following variables are effectively part of the perl context */
296/* and get copied between struct coro and these variables */ 272/* and get copied between struct coro and these variables */
297/* the mainr easonw e don't support windows process emulation */ 273/* the main reason we don't support windows process emulation */
298static struct CoroSLF slf_frame; /* the current slf frame */ 274static struct CoroSLF slf_frame; /* the current slf frame */
299 275
300/** Coro ********************************************************************/ 276/** Coro ********************************************************************/
301 277
302#define PRIO_MAX 3 278#define CORO_PRIO_MAX 3
303#define PRIO_HIGH 1 279#define CORO_PRIO_HIGH 1
304#define PRIO_NORMAL 0 280#define CORO_PRIO_NORMAL 0
305#define PRIO_LOW -1 281#define CORO_PRIO_LOW -1
306#define PRIO_IDLE -3 282#define CORO_PRIO_IDLE -3
307#define PRIO_MIN -4 283#define CORO_PRIO_MIN -4
308 284
309/* for Coro.pm */ 285/* for Coro.pm */
310static SV *coro_current; 286static SV *coro_current;
311static SV *coro_readyhook; 287static SV *coro_readyhook;
312static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1]; 288static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
313static CV *cv_coro_run, *cv_coro_terminate; 289static CV *cv_coro_run;
314static struct coro *coro_first; 290static struct coro *coro_first;
315#define coro_nready coroapi.nready 291#define coro_nready coroapi.nready
316 292
293/** JIT *********************************************************************/
294
295#if CORO_JIT
296 #ifndef CORO_JIT_TYPE
297 #if __x86_64 && (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris)
298 #define CORO_JIT_TYPE "amd64-unix"
299 typedef void (*load_save_perl_slots_type)(perl_slots *);
300 #else
301 #undef CORO_JIT
302 #endif
303 #endif
304#endif
305
306#if CORO_JIT
307static load_save_perl_slots_type load_perl_slots, save_perl_slots;
308#endif
309
310/** Coro::Select ************************************************************/
311
312static OP *(*coro_old_pp_sselect) (pTHX);
313static SV *coro_select_select;
314
315/* horrible hack, but if it works... */
316static OP *
317coro_pp_sselect (pTHX)
318{
319 dSP;
320 PUSHMARK (SP - 4); /* fake argument list */
321 XPUSHs (coro_select_select);
322 PUTBACK;
323
324 /* entersub is an UNOP, select a LISTOP... keep your fingers crossed */
325 PL_op->op_flags |= OPf_STACKED;
326 PL_op->op_private = 0;
327 return PL_ppaddr [OP_ENTERSUB](aTHX);
328}
329
330/** time stuff **************************************************************/
331
332#ifdef HAS_GETTIMEOFDAY
333
334ECB_INLINE void
335coro_u2time (pTHX_ UV ret[2])
336{
337 struct timeval tv;
338 gettimeofday (&tv, 0);
339
340 ret [0] = tv.tv_sec;
341 ret [1] = tv.tv_usec;
342}
343
344ECB_INLINE double
345coro_nvtime ()
346{
347 struct timeval tv;
348 gettimeofday (&tv, 0);
349
350 return tv.tv_sec + tv.tv_usec * 1e-6;
351}
352
353ECB_INLINE void
354time_init (pTHX)
355{
356 nvtime = coro_nvtime;
357 u2time = coro_u2time;
358}
359
360#else
361
362ECB_INLINE void
363time_init (pTHX)
364{
365 SV **svp;
366
367 require_pv ("Time/HiRes.pm");
368
369 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
370
371 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
372 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught");
373
374 nvtime = INT2PTR (double (*)(), SvIV (*svp));
375
376 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
377 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
378}
379
380#endif
381
317/** lowlevel stuff **********************************************************/ 382/** lowlevel stuff **********************************************************/
318 383
319static SV * 384static SV * ecb_noinline
320coro_get_sv (pTHX_ const char *name, int create) 385coro_get_sv (pTHX_ const char *name, int create)
321{ 386{
322#if PERL_VERSION_ATLEAST (5,10,0) 387#if PERL_VERSION_ATLEAST (5,10,0)
323 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 388 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
324 get_sv (name, create); 389 get_sv (name, create);
325#endif 390#endif
326 return get_sv (name, create); 391 return get_sv (name, create);
327} 392}
328 393
329static AV * 394static AV * ecb_noinline
330coro_get_av (pTHX_ const char *name, int create) 395coro_get_av (pTHX_ const char *name, int create)
331{ 396{
332#if PERL_VERSION_ATLEAST (5,10,0) 397#if PERL_VERSION_ATLEAST (5,10,0)
333 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 398 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
334 get_av (name, create); 399 get_av (name, create);
335#endif 400#endif
336 return get_av (name, create); 401 return get_av (name, create);
337} 402}
338 403
339static HV * 404static HV * ecb_noinline
340coro_get_hv (pTHX_ const char *name, int create) 405coro_get_hv (pTHX_ const char *name, int create)
341{ 406{
342#if PERL_VERSION_ATLEAST (5,10,0) 407#if PERL_VERSION_ATLEAST (5,10,0)
343 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 408 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
344 get_hv (name, create); 409 get_hv (name, create);
345#endif 410#endif
346 return get_hv (name, create); 411 return get_hv (name, create);
347} 412}
348 413
349/* may croak */ 414ECB_INLINE void
415coro_times_update ()
416{
417#ifdef coro_clock_gettime
418 struct timespec ts;
419
420 ts.tv_sec = ts.tv_nsec = 0;
421 coro_clock_gettime (CORO_CLOCK_THREAD_CPUTIME_ID, &ts);
422 time_cpu [0] = ts.tv_sec; time_cpu [1] = ts.tv_nsec;
423
424 ts.tv_sec = ts.tv_nsec = 0;
425 coro_clock_gettime (CORO_CLOCK_MONOTONIC, &ts);
426 time_real [0] = ts.tv_sec; time_real [1] = ts.tv_nsec;
427#else
428 dTHX;
429 UV tv[2];
430
431 u2time (aTHX_ tv);
432 time_real [0] = tv [0];
433 time_real [1] = tv [1] * 1000;
434#endif
435}
436
437ECB_INLINE void
438coro_times_add (struct coro *c)
439{
440 c->t_real [1] += time_real [1];
441 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
442 c->t_real [0] += time_real [0];
443
444 c->t_cpu [1] += time_cpu [1];
445 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
446 c->t_cpu [0] += time_cpu [0];
447}
448
449ECB_INLINE void
450coro_times_sub (struct coro *c)
451{
452 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; }
453 c->t_real [1] -= time_real [1];
454 c->t_real [0] -= time_real [0];
455
456 if (c->t_cpu [1] < time_cpu [1]) { c->t_cpu [1] += 1000000000; --c->t_cpu [0]; }
457 c->t_cpu [1] -= time_cpu [1];
458 c->t_cpu [0] -= time_cpu [0];
459}
460
461/*****************************************************************************/
462/* magic glue */
463
464#define CORO_MAGIC_type_cv 26
465#define CORO_MAGIC_type_state PERL_MAGIC_ext
466
467#define CORO_MAGIC_NN(sv, type) \
468 (ecb_expect_true (SvMAGIC (sv)->mg_type == type) \
469 ? SvMAGIC (sv) \
470 : mg_find (sv, type))
471
472#define CORO_MAGIC(sv, type) \
473 (ecb_expect_true (SvMAGIC (sv)) \
474 ? CORO_MAGIC_NN (sv, type) \
475 : 0)
476
477#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
478#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
479
480ECB_INLINE MAGIC *
481SvSTATEhv_p (pTHX_ SV *coro)
482{
483 MAGIC *mg;
484
485 if (ecb_expect_true (
486 SvTYPE (coro) == SVt_PVHV
487 && (mg = CORO_MAGIC_state (coro))
488 && mg->mg_virtual == &coro_state_vtbl
489 ))
490 return mg;
491
492 return 0;
493}
494
495ECB_INLINE struct coro *
496SvSTATE_ (pTHX_ SV *coro)
497{
498 MAGIC *mg;
499
500 if (SvROK (coro))
501 coro = SvRV (coro);
502
503 mg = SvSTATEhv_p (aTHX_ coro);
504 if (!mg)
505 croak ("Coro::State object required");
506
507 return (struct coro *)mg->mg_ptr;
508}
509
510#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
511
512/* faster than SvSTATE, but expects a coroutine hv */
513#define SvSTATE_hv(hv) ((struct coro *)CORO_MAGIC_NN ((SV *)hv, CORO_MAGIC_type_state)->mg_ptr)
514#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
515
516/*****************************************************************************/
517/* padlist management and caching */
518
350INLINE CV * 519ECB_INLINE AV *
351coro_sv_2cv (pTHX_ SV *sv)
352{
353 HV *st;
354 GV *gvp;
355 return sv_2cv (sv, &st, &gvp, 0);
356}
357
358static AV *
359coro_derive_padlist (pTHX_ CV *cv) 520coro_derive_padlist (pTHX_ CV *cv)
360{ 521{
361 AV *padlist = CvPADLIST (cv); 522 AV *padlist = CvPADLIST (cv);
362 AV *newpadlist, *newpad; 523 AV *newpadlist, *newpad;
363 524
… …
369 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 530 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
370#endif 531#endif
371 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 532 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
372 --AvFILLp (padlist); 533 --AvFILLp (padlist);
373 534
374 av_store (newpadlist, 0, SvREFCNT_inc_NN (*av_fetch (padlist, 0, FALSE))); 535 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0]));
375 av_store (newpadlist, 1, (SV *)newpad); 536 av_store (newpadlist, 1, (SV *)newpad);
376 537
377 return newpadlist; 538 return newpadlist;
378} 539}
379 540
380static void 541ECB_INLINE void
381free_padlist (pTHX_ AV *padlist) 542free_padlist (pTHX_ AV *padlist)
382{ 543{
383 /* may be during global destruction */ 544 /* may be during global destruction */
384 if (SvREFCNT (padlist)) 545 if (!IN_DESTRUCT)
385 { 546 {
386 I32 i = AvFILLp (padlist); 547 I32 i = AvFILLp (padlist);
387 while (i >= 0) 548
549 while (i > 0) /* special-case index 0 */
388 { 550 {
389 SV **svp = av_fetch (padlist, i--, FALSE); 551 /* we try to be extra-careful here */
390 if (svp) 552 AV *av = (AV *)AvARRAY (padlist)[i--];
391 { 553 I32 j = AvFILLp (av);
392 SV *sv; 554
393 while (&PL_sv_undef != (sv = av_pop ((AV *)*svp))) 555 while (j >= 0)
556 SvREFCNT_dec (AvARRAY (av)[j--]);
557
558 AvFILLp (av) = -1;
394 SvREFCNT_dec (sv); 559 SvREFCNT_dec (av);
395
396 SvREFCNT_dec (*svp);
397 }
398 } 560 }
399 561
562 SvREFCNT_dec (AvARRAY (padlist)[0]);
563
564 AvFILLp (padlist) = -1;
400 SvREFCNT_dec ((SV*)padlist); 565 SvREFCNT_dec ((SV*)padlist);
401 } 566 }
402} 567}
403 568
404static int 569static int
405coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 570coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
406{ 571{
407 AV *padlist; 572 AV *padlist;
408 AV *av = (AV *)mg->mg_obj; 573 AV *av = (AV *)mg->mg_obj;
574
575 /* perl manages to free our internal AV and _then_ call us */
576 if (IN_DESTRUCT)
577 return 0;
409 578
410 /* casting is fun. */ 579 /* casting is fun. */
411 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 580 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
412 free_padlist (aTHX_ padlist); 581 free_padlist (aTHX_ padlist);
413 582
414 SvREFCNT_dec (av); /* sv_magicext increased the refcount */ 583 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
415 584
416 return 0; 585 return 0;
417} 586}
418
419#define CORO_MAGIC_type_cv 26
420#define CORO_MAGIC_type_state PERL_MAGIC_ext
421 587
422static MGVTBL coro_cv_vtbl = { 588static MGVTBL coro_cv_vtbl = {
423 0, 0, 0, 0, 589 0, 0, 0, 0,
424 coro_cv_free 590 coro_cv_free
425}; 591};
426 592
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 */ 593/* the next two functions merely cache the padlists */
471static void 594ECB_INLINE void
472get_padlist (pTHX_ CV *cv) 595get_padlist (pTHX_ CV *cv)
473{ 596{
474 MAGIC *mg = CORO_MAGIC_cv (cv); 597 MAGIC *mg = CORO_MAGIC_cv (cv);
475 AV *av; 598 AV *av;
476 599
477 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 600 if (ecb_expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0))
478 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 601 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
479 else 602 else
480 { 603 {
481#if CORO_PREFER_PERL_FUNCTIONS 604#if CORO_PREFER_PERL_FUNCTIONS
482 /* this is probably cleaner? but also slower! */ 605 /* this is probably cleaner? but also slower! */
… …
489 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 612 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
490#endif 613#endif
491 } 614 }
492} 615}
493 616
494static void 617ECB_INLINE void
495put_padlist (pTHX_ CV *cv) 618put_padlist (pTHX_ CV *cv)
496{ 619{
497 MAGIC *mg = CORO_MAGIC_cv (cv); 620 MAGIC *mg = CORO_MAGIC_cv (cv);
498 AV *av; 621 AV *av;
499 622
500 if (expect_false (!mg)) 623 if (ecb_expect_false (!mg))
501 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 624 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
502 625
503 av = (AV *)mg->mg_obj; 626 av = (AV *)mg->mg_obj;
504 627
505 if (expect_false (AvFILLp (av) >= AvMAX (av))) 628 if (ecb_expect_false (AvFILLp (av) >= AvMAX (av)))
506 av_extend (av, AvMAX (av) + 1); 629 av_extend (av, AvFILLp (av) + 1);
507 630
508 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 631 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
509} 632}
510 633
511/** load & save, init *******************************************************/ 634/** load & save, init *******************************************************/
635
636/* swap sv heads, at least logically */
637static void
638swap_svs (pTHX_ Coro__State c)
639{
640 int i;
641
642 for (i = 0; i <= AvFILLp (c->swap_sv); )
643 {
644 SV *a = AvARRAY (c->swap_sv)[i++];
645 SV *b = AvARRAY (c->swap_sv)[i++];
646
647 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
648 SV tmp;
649
650 /* swap sv_any */
651 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
652
653 /* swap sv_flags */
654 SvFLAGS (&tmp) = SvFLAGS (a);
655 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
656 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
657
658#if PERL_VERSION_ATLEAST (5,10,0)
659 /* perl 5.10 complicates this _quite_ a bit, but it also is
660 * much faster, so no quarrels here. alternatively, we could
661 * sv_upgrade to avoid this.
662 */
663 {
664 /* swap sv_u */
665 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
666
667 /* if SvANY points to the head, we need to adjust the pointers,
668 * as the pointer for a still points to b, and maybe vice versa.
669 */
670 #define svany_in_head(type) \
671 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
672
673 if (svany_in_head (SvTYPE (a)))
674 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
675
676 if (svany_in_head (SvTYPE (b)))
677 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
678 }
679#endif
680 }
681}
682
683#define SWAP_SVS(coro) \
684 if (ecb_expect_false ((coro)->swap_sv)) \
685 swap_svs (aTHX_ (coro))
686
687static void
688on_enterleave_call (pTHX_ SV *cb);
512 689
513static void 690static void
514load_perl (pTHX_ Coro__State c) 691load_perl (pTHX_ Coro__State c)
515{ 692{
516 perl_slots *slot = c->slot; 693 perl_slots *slot = c->slot;
517 c->slot = 0; 694 c->slot = 0;
518 695
519 PL_mainstack = c->mainstack; 696 PL_mainstack = c->mainstack;
520 697
521 GvSV (PL_defgv) = slot->defsv; 698#if CORO_JIT
522 GvAV (PL_defgv) = slot->defav; 699 load_perl_slots (slot);
523 GvSV (PL_errgv) = slot->errsv; 700#else
524 GvSV (irsgv) = slot->irsgv;
525
526 #define VAR(name,type) PL_ ## name = slot->name; 701 #define VARx(name,expr,type) expr = slot->name;
527 # include "state.h" 702 # include "state.h"
528 #undef VAR 703 #undef VARx
704#endif
529 705
530 { 706 {
531 dSP; 707 dSP;
532 708
533 CV *cv; 709 CV *cv;
534 710
535 /* now do the ugly restore mess */ 711 /* now do the ugly restore mess */
536 while (expect_true (cv = (CV *)POPs)) 712 while (ecb_expect_true (cv = (CV *)POPs))
537 { 713 {
538 put_padlist (aTHX_ cv); /* mark this padlist as available */ 714 put_padlist (aTHX_ cv); /* mark this padlist as available */
539 CvDEPTH (cv) = PTR2IV (POPs); 715 CvDEPTH (cv) = PTR2IV (POPs);
540 CvPADLIST (cv) = (AV *)POPs; 716 CvPADLIST (cv) = (AV *)POPs;
541 } 717 }
… …
543 PUTBACK; 719 PUTBACK;
544 } 720 }
545 721
546 slf_frame = c->slf_frame; 722 slf_frame = c->slf_frame;
547 CORO_THROW = c->except; 723 CORO_THROW = c->except;
724
725 if (ecb_expect_false (enable_times))
726 {
727 if (ecb_expect_false (!times_valid))
728 coro_times_update ();
729
730 coro_times_sub (c);
731 }
732
733 if (ecb_expect_false (c->on_enter))
734 {
735 int i;
736
737 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
738 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
739 }
740
741 SWAP_SVS (c);
548} 742}
549 743
550static void 744static void
551save_perl (pTHX_ Coro__State c) 745save_perl (pTHX_ Coro__State c)
552{ 746{
747 SWAP_SVS (c);
748
749 if (ecb_expect_false (c->on_leave))
750 {
751 int i;
752
753 for (i = AvFILLp (c->on_leave); i >= 0; --i)
754 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
755 }
756
757 times_valid = 0;
758
759 if (ecb_expect_false (enable_times))
760 {
761 coro_times_update (); times_valid = 1;
762 coro_times_add (c);
763 }
764
553 c->except = CORO_THROW; 765 c->except = CORO_THROW;
554 c->slf_frame = slf_frame; 766 c->slf_frame = slf_frame;
555 767
556 { 768 {
557 dSP; 769 dSP;
… …
566 778
567 XPUSHs (Nullsv); 779 XPUSHs (Nullsv);
568 /* this loop was inspired by pp_caller */ 780 /* this loop was inspired by pp_caller */
569 for (;;) 781 for (;;)
570 { 782 {
571 while (expect_true (cxix >= 0)) 783 while (ecb_expect_true (cxix >= 0))
572 { 784 {
573 PERL_CONTEXT *cx = &ccstk[cxix--]; 785 PERL_CONTEXT *cx = &ccstk[cxix--];
574 786
575 if (expect_true (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT)) 787 if (ecb_expect_true (CxTYPE (cx) == CXt_SUB) || ecb_expect_false (CxTYPE (cx) == CXt_FORMAT))
576 { 788 {
577 CV *cv = cx->blk_sub.cv; 789 CV *cv = cx->blk_sub.cv;
578 790
579 if (expect_true (CvDEPTH (cv))) 791 if (ecb_expect_true (CvDEPTH (cv)))
580 { 792 {
581 EXTEND (SP, 3); 793 EXTEND (SP, 3);
582 PUSHs ((SV *)CvPADLIST (cv)); 794 PUSHs ((SV *)CvPADLIST (cv));
583 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv))); 795 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
584 PUSHs ((SV *)cv); 796 PUSHs ((SV *)cv);
… …
587 get_padlist (aTHX_ cv); 799 get_padlist (aTHX_ cv);
588 } 800 }
589 } 801 }
590 } 802 }
591 803
592 if (expect_true (top_si->si_type == PERLSI_MAIN)) 804 if (ecb_expect_true (top_si->si_type == PERLSI_MAIN))
593 break; 805 break;
594 806
595 top_si = top_si->si_prev; 807 top_si = top_si->si_prev;
596 ccstk = top_si->si_cxstack; 808 ccstk = top_si->si_cxstack;
597 cxix = top_si->si_cxix; 809 cxix = top_si->si_cxix;
… …
599 811
600 PUTBACK; 812 PUTBACK;
601 } 813 }
602 814
603 /* allocate some space on the context stack for our purposes */ 815 /* allocate some space on the context stack for our purposes */
604 /* we manually unroll here, as usually 2 slots is enough */ 816 if (ecb_expect_false (cxstack_ix + SLOT_COUNT >= cxstack_max))
605 if (SLOT_COUNT >= 1) CXINC;
606 if (SLOT_COUNT >= 2) CXINC;
607 if (SLOT_COUNT >= 3) CXINC;
608 { 817 {
609 int i; 818 unsigned int i;
819
610 for (i = 3; i < SLOT_COUNT; ++i) 820 for (i = 0; i < SLOT_COUNT; ++i)
611 CXINC; 821 CXINC;
612 } 822
613 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 823 cxstack_ix -= SLOT_COUNT; /* undo allocation */
824 }
614 825
615 c->mainstack = PL_mainstack; 826 c->mainstack = PL_mainstack;
616 827
617 { 828 {
618 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 829 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
619 830
620 slot->defav = GvAV (PL_defgv); 831#if CORO_JIT
621 slot->defsv = DEFSV; 832 save_perl_slots (slot);
622 slot->errsv = ERRSV; 833#else
623 slot->irsgv = GvSV (irsgv);
624
625 #define VAR(name,type) slot->name = PL_ ## name; 834 #define VARx(name,expr,type) slot->name = expr;
626 # include "state.h" 835 # include "state.h"
627 #undef VAR 836 #undef VARx
837#endif
628 } 838 }
629} 839}
630 840
631/* 841/*
632 * allocate various perl stacks. This is almost an exact copy 842 * allocate various perl stacks. This is almost an exact copy
… …
638# define coro_init_stacks(thx) init_stacks () 848# define coro_init_stacks(thx) init_stacks ()
639#else 849#else
640static void 850static void
641coro_init_stacks (pTHX) 851coro_init_stacks (pTHX)
642{ 852{
643 PL_curstackinfo = new_stackinfo(32, 8); 853 PL_curstackinfo = new_stackinfo(32, 4 + SLOT_COUNT); /* 3 is minimum due to perl rounding down in scope.c:GROW() */
644 PL_curstackinfo->si_type = PERLSI_MAIN; 854 PL_curstackinfo->si_type = PERLSI_MAIN;
645 PL_curstack = PL_curstackinfo->si_stack; 855 PL_curstack = PL_curstackinfo->si_stack;
646 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 856 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
647 857
648 PL_stack_base = AvARRAY(PL_curstack); 858 PL_stack_base = AvARRAY(PL_curstack);
… …
755#endif 965#endif
756 966
757/* 967/*
758 * This overrides the default magic get method of %SIG elements. 968 * This overrides the default magic get method of %SIG elements.
759 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook 969 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
760 * and instead of tryign to save and restore the hash elements, we just provide 970 * and instead of trying to save and restore the hash elements (extremely slow),
761 * readback here. 971 * we just provide our own readback here.
762 * We only do this when the hook is != 0, as they are often set to 0 temporarily,
763 * not expecting this to actually change the hook. This is a potential problem
764 * when a schedule happens then, but we ignore this.
765 */ 972 */
766static int 973static int ecb_cold
767coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 974coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
768{ 975{
769 const char *s = MgPV_nolen_const (mg); 976 const char *s = MgPV_nolen_const (mg);
770 977
771 if (*s == '_') 978 if (*s == '_')
… …
783 } 990 }
784 991
785 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 992 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
786} 993}
787 994
788static int 995static int ecb_cold
789coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 996coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
790{ 997{
791 const char *s = MgPV_nolen_const (mg); 998 const char *s = MgPV_nolen_const (mg);
792 999
793 if (*s == '_') 1000 if (*s == '_')
… …
807 } 1014 }
808 1015
809 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0; 1016 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
810} 1017}
811 1018
812static int 1019static int ecb_cold
813coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1020coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
814{ 1021{
815 const char *s = MgPV_nolen_const (mg); 1022 const char *s = MgPV_nolen_const (mg);
816 1023
817 if (*s == '_') 1024 if (*s == '_')
… …
822 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 1029 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
823 1030
824 if (svp) 1031 if (svp)
825 { 1032 {
826 SV *old = *svp; 1033 SV *old = *svp;
827 *svp = newSVsv (sv); 1034 *svp = SvOK (sv) ? newSVsv (sv) : 0;
828 SvREFCNT_dec (old); 1035 SvREFCNT_dec (old);
829 return 0; 1036 return 0;
830 } 1037 }
831 } 1038 }
832 1039
… …
850slf_check_repeat (pTHX_ struct CoroSLF *frame) 1057slf_check_repeat (pTHX_ struct CoroSLF *frame)
851{ 1058{
852 return 1; 1059 return 1;
853} 1060}
854 1061
855static UNOP coro_setup_op; 1062static UNOP init_perl_op;
856 1063
857static void NOINLINE /* noinline to keep it out of the transfer fast path */ 1064ecb_noinline static void /* noinline to keep it out of the transfer fast path */
858coro_setup (pTHX_ struct coro *coro) 1065init_perl (pTHX_ struct coro *coro)
859{ 1066{
860 /* 1067 /*
861 * emulate part of the perl startup here. 1068 * emulate part of the perl startup here.
862 */ 1069 */
863 coro_init_stacks (aTHX); 1070 coro_init_stacks (aTHX);
864 1071
865 PL_runops = RUNOPS_DEFAULT; 1072 PL_runops = RUNOPS_DEFAULT;
866 PL_curcop = &PL_compiling; 1073 PL_curcop = &PL_compiling;
867 PL_in_eval = EVAL_NULL; 1074 PL_in_eval = EVAL_NULL;
868 PL_comppad = 0; 1075 PL_comppad = 0;
1076 PL_comppad_name = 0;
1077 PL_comppad_name_fill = 0;
1078 PL_comppad_name_floor = 0;
869 PL_curpm = 0; 1079 PL_curpm = 0;
870 PL_curpad = 0; 1080 PL_curpad = 0;
871 PL_localizing = 0; 1081 PL_localizing = 0;
872 PL_dirty = 0;
873 PL_restartop = 0; 1082 PL_restartop = 0;
874#if PERL_VERSION_ATLEAST (5,10,0) 1083#if PERL_VERSION_ATLEAST (5,10,0)
875 PL_parser = 0; 1084 PL_parser = 0;
876#endif 1085#endif
1086 PL_hints = 0;
877 1087
878 /* recreate the die/warn hooks */ 1088 /* recreate the die/warn hooks */
879 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1089 PL_diehook = SvREFCNT_inc (rv_diehook);
880 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1090 PL_warnhook = SvREFCNT_inc (rv_warnhook);
881 1091
882 GvSV (PL_defgv) = newSV (0); 1092 GvSV (PL_defgv) = newSV (0);
883 GvAV (PL_defgv) = coro->args; coro->args = 0; 1093 GvAV (PL_defgv) = coro->args; coro->args = 0;
884 GvSV (PL_errgv) = newSV (0); 1094 GvSV (PL_errgv) = newSV (0);
885 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1095 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
1096 GvHV (PL_hintgv) = 0;
886 PL_rs = newSVsv (GvSV (irsgv)); 1097 PL_rs = newSVsv (GvSV (irsgv));
887 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1098 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
888 1099
889 { 1100 {
890 dSP; 1101 dSP;
… …
905 /* this newly created coroutine might be run on an existing cctx which most 1116 /* this newly created coroutine might be run on an existing cctx which most
906 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here. 1117 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
907 */ 1118 */
908 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1119 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
909 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */ 1120 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
1121 slf_frame.destroy = 0;
910 1122
911 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1123 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */
912 coro_setup_op.op_next = PL_op; 1124 init_perl_op.op_next = PL_op;
913 coro_setup_op.op_type = OP_ENTERSUB; 1125 init_perl_op.op_type = OP_ENTERSUB;
914 coro_setup_op.op_ppaddr = pp_slf; 1126 init_perl_op.op_ppaddr = pp_slf;
915 /* no flags etc. required, as an init function won't be called */ 1127 /* no flags etc. required, as an init function won't be called */
916 1128
917 PL_op = (OP *)&coro_setup_op; 1129 PL_op = (OP *)&init_perl_op;
918 1130
919 /* copy throw, in case it was set before coro_setup */ 1131 /* copy throw, in case it was set before init_perl */
920 CORO_THROW = coro->except; 1132 CORO_THROW = coro->except;
921}
922 1133
1134 SWAP_SVS (coro);
1135
1136 if (ecb_expect_false (enable_times))
1137 {
1138 coro_times_update ();
1139 coro_times_sub (coro);
1140 }
1141}
1142
923static void 1143static void
924coro_destruct (pTHX_ struct coro *coro) 1144coro_unwind_stacks (pTHX)
925{ 1145{
926 if (!IN_DESTRUCT) 1146 if (!IN_DESTRUCT)
927 { 1147 {
928 /* restore all saved variables and stuff */ 1148 /* restore all saved variables and stuff */
929 LEAVE_SCOPE (0); 1149 LEAVE_SCOPE (0);
… …
937 POPSTACK_TO (PL_mainstack); 1157 POPSTACK_TO (PL_mainstack);
938 1158
939 /* unwind main stack */ 1159 /* unwind main stack */
940 dounwind (-1); 1160 dounwind (-1);
941 } 1161 }
1162}
942 1163
943 SvREFCNT_dec (GvSV (PL_defgv)); 1164static void
944 SvREFCNT_dec (GvAV (PL_defgv)); 1165destroy_perl (pTHX_ struct coro *coro)
945 SvREFCNT_dec (GvSV (PL_errgv)); 1166{
946 SvREFCNT_dec (PL_defoutgv); 1167 SV *svf [9];
947 SvREFCNT_dec (PL_rs);
948 SvREFCNT_dec (GvSV (irsgv));
949 1168
950 SvREFCNT_dec (PL_diehook);
951 SvREFCNT_dec (PL_warnhook);
952 1169 {
1170 SV *old_current = SvRV (coro_current);
1171 struct coro *current = SvSTATE (old_current);
1172
1173 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1174
1175 save_perl (aTHX_ current);
1176
1177 /* this will cause transfer_check to croak on block*/
1178 SvRV_set (coro_current, (SV *)coro->hv);
1179
1180 load_perl (aTHX_ coro);
1181
1182 coro_unwind_stacks (aTHX);
1183
1184 /* restore swapped sv's */
1185 SWAP_SVS (coro);
1186
1187 coro_destruct_stacks (aTHX);
1188
1189 // now save some sv's to be free'd later
1190 svf [0] = GvSV (PL_defgv);
1191 svf [1] = (SV *)GvAV (PL_defgv);
1192 svf [2] = GvSV (PL_errgv);
1193 svf [3] = (SV *)PL_defoutgv;
1194 svf [4] = PL_rs;
1195 svf [5] = GvSV (irsgv);
1196 svf [6] = (SV *)GvHV (PL_hintgv);
1197 svf [7] = PL_diehook;
1198 svf [8] = PL_warnhook;
1199 assert (9 == sizeof (svf) / sizeof (*svf));
1200
1201 SvRV_set (coro_current, old_current);
1202
1203 load_perl (aTHX_ current);
1204 }
1205
1206 {
1207 unsigned int i;
1208
1209 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i)
1210 SvREFCNT_dec (svf [i]);
1211
953 SvREFCNT_dec (coro->saved_deffh); 1212 SvREFCNT_dec (coro->saved_deffh);
954 SvREFCNT_dec (coro->rouse_cb); 1213 SvREFCNT_dec (coro->rouse_cb);
955 SvREFCNT_dec (coro->invoke_cb); 1214 SvREFCNT_dec (coro->invoke_cb);
956 SvREFCNT_dec (coro->invoke_av); 1215 SvREFCNT_dec (coro->invoke_av);
957 1216 }
958 coro_destruct_stacks (aTHX);
959} 1217}
960 1218
961INLINE void 1219ECB_INLINE void
962free_coro_mortal (pTHX) 1220free_coro_mortal (pTHX)
963{ 1221{
964 if (expect_true (coro_mortal)) 1222 if (ecb_expect_true (coro_mortal))
965 { 1223 {
966 SvREFCNT_dec (coro_mortal); 1224 SvREFCNT_dec ((SV *)coro_mortal);
967 coro_mortal = 0; 1225 coro_mortal = 0;
968 } 1226 }
969} 1227}
970 1228
971static int 1229static int
972runops_trace (pTHX) 1230runops_trace (pTHX)
973{ 1231{
974 COP *oldcop = 0; 1232 COP *oldcop = 0;
975 int oldcxix = -2; 1233 int oldcxix = -2;
976 struct coro *coro = SvSTATE_current; /* trace cctx is tied to specific coro */
977 coro_cctx *cctx = coro->cctx;
978 1234
979 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX))) 1235 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX)))
980 { 1236 {
981 PERL_ASYNC_CHECK (); 1237 PERL_ASYNC_CHECK ();
982 1238
983 if (cctx->flags & CC_TRACE_ALL) 1239 if (cctx_current->flags & CC_TRACE_ALL)
984 { 1240 {
985 if (PL_op->op_type == OP_LEAVESUB && cctx->flags & CC_TRACE_SUB) 1241 if (PL_op->op_type == OP_LEAVESUB && cctx_current->flags & CC_TRACE_SUB)
986 { 1242 {
987 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1243 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
988 SV **bot, **top; 1244 SV **bot, **top;
989 AV *av = newAV (); /* return values */ 1245 AV *av = newAV (); /* return values */
990 SV **cb; 1246 SV **cb;
… …
1027 1283
1028 if (PL_curcop != &PL_compiling) 1284 if (PL_curcop != &PL_compiling)
1029 { 1285 {
1030 SV **cb; 1286 SV **cb;
1031 1287
1032 if (oldcxix != cxstack_ix && cctx->flags & CC_TRACE_SUB) 1288 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB)
1033 { 1289 {
1034 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1290 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1035 1291
1036 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1292 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1037 { 1293 {
… …
1060 } 1316 }
1061 1317
1062 oldcxix = cxstack_ix; 1318 oldcxix = cxstack_ix;
1063 } 1319 }
1064 1320
1065 if (cctx->flags & CC_TRACE_LINE) 1321 if (cctx_current->flags & CC_TRACE_LINE)
1066 { 1322 {
1067 dSP; 1323 dSP;
1068 1324
1069 PL_runops = RUNOPS_DEFAULT; 1325 PL_runops = RUNOPS_DEFAULT;
1070 ENTER; 1326 ENTER;
… …
1106 1362
1107 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1363 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1108} 1364}
1109 1365
1110/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1366/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1111static void NOINLINE 1367static void ecb_noinline
1112cctx_prepare (pTHX) 1368cctx_prepare (pTHX)
1113{ 1369{
1114 PL_top_env = &PL_start_env; 1370 PL_top_env = &PL_start_env;
1115 1371
1116 if (cctx_current->flags & CC_TRACE) 1372 if (cctx_current->flags & CC_TRACE)
… …
1127 slf_frame.prepare = slf_prepare_set_stacklevel; 1383 slf_frame.prepare = slf_prepare_set_stacklevel;
1128 slf_frame.check = slf_check_set_stacklevel; 1384 slf_frame.check = slf_check_set_stacklevel;
1129} 1385}
1130 1386
1131/* the tail of transfer: execute stuff we can only do after a transfer */ 1387/* the tail of transfer: execute stuff we can only do after a transfer */
1132INLINE void 1388ECB_INLINE void
1133transfer_tail (pTHX) 1389transfer_tail (pTHX)
1134{ 1390{
1135 free_coro_mortal (aTHX); 1391 free_coro_mortal (aTHX);
1136} 1392}
1137 1393
… …
1162 /* somebody or something will hit me for both perl_run and PL_restartop */ 1418 /* somebody or something will hit me for both perl_run and PL_restartop */
1163 PL_restartop = PL_op; 1419 PL_restartop = PL_op;
1164 perl_run (PL_curinterp); 1420 perl_run (PL_curinterp);
1165 /* 1421 /*
1166 * Unfortunately, there is no way to get at the return values of the 1422 * Unfortunately, there is no way to get at the return values of the
1167 * coro body here, as perl_run destroys these 1423 * coro body here, as perl_run destroys these. Likewise, we cannot catch
1424 * runtime errors here, as this is just a random interpreter, not a thread.
1168 */ 1425 */
1169 1426
1170 /* 1427 /*
1171 * If perl-run returns we assume exit() was being called or the coro 1428 * If perl-run returns we assume exit() was being called or the coro
1172 * fell off the end, which seems to be the only valid (non-bug) 1429 * fell off the end, which seems to be the only valid (non-bug)
1173 * reason for perl_run to return. We try to exit by jumping to the 1430 * reason for perl_run to return. We try to exit by jumping to the
1174 * bootstrap-time "top" top_env, as we cannot restore the "main" 1431 * bootstrap-time "top" top_env, as we cannot restore the "main"
1175 * coroutine as Coro has no such concept 1432 * coroutine as Coro has no such concept.
1433 * This actually isn't valid with the pthread backend, but OSes requiring
1434 * that backend are too broken to do it in a standards-compliant way.
1176 */ 1435 */
1177 PL_top_env = main_top_env; 1436 PL_top_env = main_top_env;
1178 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */ 1437 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1179 } 1438 }
1180} 1439}
… …
1257cctx_destroy (coro_cctx *cctx) 1516cctx_destroy (coro_cctx *cctx)
1258{ 1517{
1259 if (!cctx) 1518 if (!cctx)
1260 return; 1519 return;
1261 1520
1262 assert (cctx != cctx_current);//D temporary 1521 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1263 1522
1264 --cctx_count; 1523 --cctx_count;
1265 coro_destroy (&cctx->cctx); 1524 coro_destroy (&cctx->cctx);
1266 1525
1267 /* coro_transfer creates new, empty cctx's */ 1526 /* coro_transfer creates new, empty cctx's */
… …
1286#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE)) 1545#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE))
1287 1546
1288static coro_cctx * 1547static coro_cctx *
1289cctx_get (pTHX) 1548cctx_get (pTHX)
1290{ 1549{
1291 while (expect_true (cctx_first)) 1550 while (ecb_expect_true (cctx_first))
1292 { 1551 {
1293 coro_cctx *cctx = cctx_first; 1552 coro_cctx *cctx = cctx_first;
1294 cctx_first = cctx->next; 1553 cctx_first = cctx->next;
1295 --cctx_idle; 1554 --cctx_idle;
1296 1555
1297 if (expect_true (!CCTX_EXPIRED (cctx))) 1556 if (ecb_expect_true (!CCTX_EXPIRED (cctx)))
1298 return cctx; 1557 return cctx;
1299 1558
1300 cctx_destroy (cctx); 1559 cctx_destroy (cctx);
1301 } 1560 }
1302 1561
… …
1307cctx_put (coro_cctx *cctx) 1566cctx_put (coro_cctx *cctx)
1308{ 1567{
1309 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1568 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr));
1310 1569
1311 /* free another cctx if overlimit */ 1570 /* free another cctx if overlimit */
1312 if (expect_false (cctx_idle >= cctx_max_idle)) 1571 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1313 { 1572 {
1314 coro_cctx *first = cctx_first; 1573 coro_cctx *first = cctx_first;
1315 cctx_first = first->next; 1574 cctx_first = first->next;
1316 --cctx_idle; 1575 --cctx_idle;
1317 1576
… …
1328static void 1587static void
1329transfer_check (pTHX_ struct coro *prev, struct coro *next) 1588transfer_check (pTHX_ struct coro *prev, struct coro *next)
1330{ 1589{
1331 /* TODO: throwing up here is considered harmful */ 1590 /* TODO: throwing up here is considered harmful */
1332 1591
1333 if (expect_true (prev != next)) 1592 if (ecb_expect_true (prev != next))
1334 { 1593 {
1335 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1594 if (ecb_expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1336 croak ("Coro::State::transfer called with non-running/new prev Coro::State, but can only transfer from running or new states,"); 1595 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1337 1596
1338 if (expect_false (next->flags & CF_RUNNING)) 1597 if (ecb_expect_false (next->flags & (CF_RUNNING | CF_ZOMBIE | CF_SUSPENDED)))
1339 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states,");
1340
1341 if (expect_false (next->flags & CF_DESTROYED))
1342 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states,"); 1598 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1343 1599
1344#if !PERL_VERSION_ATLEAST (5,10,0) 1600#if !PERL_VERSION_ATLEAST (5,10,0)
1345 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1601 if (ecb_expect_false (PL_lex_state != LEX_NOTPARSING))
1346 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,"); 1602 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1347#endif 1603#endif
1348 } 1604 }
1349} 1605}
1350 1606
1351/* always use the TRANSFER macro */ 1607/* always use the TRANSFER macro */
1352static void NOINLINE /* noinline so we have a fixed stackframe */ 1608static void ecb_noinline /* noinline so we have a fixed stackframe */
1353transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1609transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1354{ 1610{
1355 dSTACKLEVEL; 1611 dSTACKLEVEL;
1356 1612
1357 /* sometimes transfer is only called to set idle_sp */ 1613 /* sometimes transfer is only called to set idle_sp */
1358 if (expect_false (!prev)) 1614 if (ecb_expect_false (!prev))
1359 { 1615 {
1360 cctx_current->idle_sp = STACKLEVEL; 1616 cctx_current->idle_sp = STACKLEVEL;
1361 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1617 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1362 } 1618 }
1363 else if (expect_true (prev != next)) 1619 else if (ecb_expect_true (prev != next))
1364 { 1620 {
1365 coro_cctx *cctx_prev; 1621 coro_cctx *cctx_prev;
1366 1622
1367 if (expect_false (prev->flags & CF_NEW)) 1623 if (ecb_expect_false (prev->flags & CF_NEW))
1368 { 1624 {
1369 /* create a new empty/source context */ 1625 /* create a new empty/source context */
1370 prev->flags &= ~CF_NEW; 1626 prev->flags &= ~CF_NEW;
1371 prev->flags |= CF_RUNNING; 1627 prev->flags |= CF_RUNNING;
1372 } 1628 }
… …
1375 next->flags |= CF_RUNNING; 1631 next->flags |= CF_RUNNING;
1376 1632
1377 /* first get rid of the old state */ 1633 /* first get rid of the old state */
1378 save_perl (aTHX_ prev); 1634 save_perl (aTHX_ prev);
1379 1635
1380 if (expect_false (next->flags & CF_NEW)) 1636 if (ecb_expect_false (next->flags & CF_NEW))
1381 { 1637 {
1382 /* need to start coroutine */ 1638 /* need to start coroutine */
1383 next->flags &= ~CF_NEW; 1639 next->flags &= ~CF_NEW;
1384 /* setup coroutine call */ 1640 /* setup coroutine call */
1385 coro_setup (aTHX_ next); 1641 init_perl (aTHX_ next);
1386 } 1642 }
1387 else 1643 else
1388 load_perl (aTHX_ next); 1644 load_perl (aTHX_ next);
1389 1645
1390 /* possibly untie and reuse the cctx */ 1646 /* possibly untie and reuse the cctx */
1391 if (expect_true ( 1647 if (ecb_expect_true (
1392 cctx_current->idle_sp == STACKLEVEL 1648 cctx_current->idle_sp == STACKLEVEL
1393 && !(cctx_current->flags & CC_TRACE) 1649 && !(cctx_current->flags & CC_TRACE)
1394 && !force_cctx 1650 && !force_cctx
1395 )) 1651 ))
1396 { 1652 {
1397 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1653 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */
1398 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te)); 1654 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1399 1655
1400 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */ 1656 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */
1401 /* without this the next cctx_get might destroy the prev__cctx while still in use */ 1657 /* without this the next cctx_get might destroy the running cctx while still in use */
1402 if (expect_false (CCTX_EXPIRED (cctx_current))) 1658 if (ecb_expect_false (CCTX_EXPIRED (cctx_current)))
1403 if (!next->cctx) 1659 if (ecb_expect_true (!next->cctx))
1404 next->cctx = cctx_get (aTHX); 1660 next->cctx = cctx_get (aTHX);
1405 1661
1406 cctx_put (cctx_current); 1662 cctx_put (cctx_current);
1407 assert (!prev->cctx);//D temporary
1408 } 1663 }
1409 else 1664 else
1410 prev->cctx = cctx_current; 1665 prev->cctx = cctx_current;
1411 1666
1412 ++next->usecount; 1667 ++next->usecount;
1413 1668
1414 cctx_prev = cctx_current; 1669 cctx_prev = cctx_current;
1415 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX); 1670 cctx_current = ecb_expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1416 1671
1417 next->cctx = 0; 1672 next->cctx = 0;
1418 1673
1419 if (expect_false (cctx_prev != cctx_current)) 1674 if (ecb_expect_false (cctx_prev != cctx_current))
1420 { 1675 {
1421 cctx_prev->top_env = PL_top_env; 1676 cctx_prev->top_env = PL_top_env;
1422 PL_top_env = cctx_current->top_env; 1677 PL_top_env = cctx_current->top_env;
1423 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx); 1678 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1424 } 1679 }
… …
1430#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx)) 1685#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1431#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1686#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1432 1687
1433/** high level stuff ********************************************************/ 1688/** high level stuff ********************************************************/
1434 1689
1690/* this function is actually Coro, not Coro::State, but we call it from here */
1691/* because it is convenient - but it hasn't been declared yet for that reason */
1435static int 1692static void
1693coro_call_on_destroy (pTHX_ struct coro *coro);
1694
1695static void
1436coro_state_destroy (pTHX_ struct coro *coro) 1696coro_state_destroy (pTHX_ struct coro *coro)
1437{ 1697{
1438 if (coro->flags & CF_DESTROYED) 1698 if (coro->flags & CF_ZOMBIE)
1439 return 0; 1699 return;
1440 1700
1441 if (coro->on_destroy)
1442 coro->on_destroy (aTHX_ coro); 1701 slf_destroy (aTHX_ coro);
1443 1702
1444 coro->flags |= CF_DESTROYED; 1703 coro->flags |= CF_ZOMBIE;
1445 1704
1446 if (coro->flags & CF_READY) 1705 if (coro->flags & CF_READY)
1447 { 1706 {
1448 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1707 /* reduce nready, as destroying a ready coro effectively unreadies it */
1449 /* alternative: look through all ready queues and remove the coro */ 1708 /* alternative: look through all ready queues and remove the coro */
1450 --coro_nready; 1709 --coro_nready;
1451 } 1710 }
1452 else 1711 else
1453 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1712 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1454 1713
1455 if (coro->mainstack && coro->mainstack != main_mainstack) 1714 if (coro->next) coro->next->prev = coro->prev;
1456 { 1715 if (coro->prev) coro->prev->next = coro->next;
1457 struct coro temp; 1716 if (coro == coro_first) coro_first = coro->next;
1458 1717
1459 assert (("FATAL: tried to destroy currently running coroutine (please report)", !(coro->flags & CF_RUNNING))); 1718 if (coro->mainstack
1460 1719 && coro->mainstack != main_mainstack
1461 save_perl (aTHX_ &temp); 1720 && coro->slot
1721 && !PL_dirty)
1462 load_perl (aTHX_ coro); 1722 destroy_perl (aTHX_ coro);
1463
1464 coro_destruct (aTHX_ coro);
1465
1466 load_perl (aTHX_ &temp);
1467
1468 coro->slot = 0;
1469 }
1470 1723
1471 cctx_destroy (coro->cctx); 1724 cctx_destroy (coro->cctx);
1472 SvREFCNT_dec (coro->startcv); 1725 SvREFCNT_dec (coro->startcv);
1473 SvREFCNT_dec (coro->args); 1726 SvREFCNT_dec (coro->args);
1727 SvREFCNT_dec (coro->swap_sv);
1474 SvREFCNT_dec (CORO_THROW); 1728 SvREFCNT_dec (CORO_THROW);
1475 1729
1476 if (coro->next) coro->next->prev = coro->prev; 1730 coro_call_on_destroy (aTHX_ coro);
1477 if (coro->prev) coro->prev->next = coro->next;
1478 if (coro == coro_first) coro_first = coro->next;
1479 1731
1480 return 1; 1732 /* more destruction mayhem in coro_state_free */
1481} 1733}
1482 1734
1483static int 1735static int
1484coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1736coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1485{ 1737{
1486 struct coro *coro = (struct coro *)mg->mg_ptr; 1738 struct coro *coro = (struct coro *)mg->mg_ptr;
1487 mg->mg_ptr = 0; 1739 mg->mg_ptr = 0;
1488 1740
1489 coro->hv = 0;
1490
1491 if (--coro->refcnt < 0)
1492 {
1493 coro_state_destroy (aTHX_ coro); 1741 coro_state_destroy (aTHX_ coro);
1742 SvREFCNT_dec (coro->on_destroy);
1743 SvREFCNT_dec (coro->status);
1744
1494 Safefree (coro); 1745 Safefree (coro);
1495 }
1496 1746
1497 return 0; 1747 return 0;
1498} 1748}
1499 1749
1500static int 1750static int ecb_cold
1501coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1751coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1502{ 1752{
1503 struct coro *coro = (struct coro *)mg->mg_ptr; 1753 /* called when perl clones the current process the slow way (windows process emulation) */
1504 1754 /* WE SIMply nuke the pointers in the copy, causing perl to croak */
1505 ++coro->refcnt; 1755 mg->mg_ptr = 0;
1756 mg->mg_virtual = 0;
1506 1757
1507 return 0; 1758 return 0;
1508} 1759}
1509 1760
1510static MGVTBL coro_state_vtbl = { 1761static MGVTBL coro_state_vtbl = {
… …
1533 1784
1534 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1785 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1535 TRANSFER (ta, 1); 1786 TRANSFER (ta, 1);
1536} 1787}
1537 1788
1538/*****************************************************************************/
1539/* gensub: simple closure generation utility */
1540
1541#define GENSUB_ARG CvXSUBANY (cv).any_ptr
1542
1543/* create a closure from XS, returns a code reference */
1544/* the arg can be accessed via GENSUB_ARG from the callback */
1545/* the callback must use dXSARGS/XSRETURN */
1546static SV *
1547gensub (pTHX_ void (*xsub)(pTHX_ CV *), void *arg)
1548{
1549 CV *cv = (CV *)newSV (0);
1550
1551 sv_upgrade ((SV *)cv, SVt_PVCV);
1552
1553 CvANON_on (cv);
1554 CvISXSUB_on (cv);
1555 CvXSUB (cv) = xsub;
1556 GENSUB_ARG = arg;
1557
1558 return newRV_noinc ((SV *)cv);
1559}
1560
1561/** Coro ********************************************************************/ 1789/** Coro ********************************************************************/
1562 1790
1563INLINE void 1791ECB_INLINE void
1564coro_enq (pTHX_ struct coro *coro) 1792coro_enq (pTHX_ struct coro *coro)
1565{ 1793{
1566 av_push (coro_ready [coro->prio - PRIO_MIN], SvREFCNT_inc_NN (coro->hv)); 1794 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1567}
1568 1795
1569INLINE SV * 1796 SvREFCNT_inc_NN (coro->hv);
1797
1798 coro->next_ready = 0;
1799 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1800 ready [1] = coro;
1801}
1802
1803ECB_INLINE struct coro *
1570coro_deq (pTHX) 1804coro_deq (pTHX)
1571{ 1805{
1572 int prio; 1806 int prio;
1573 1807
1574 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; ) 1808 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
1575 if (AvFILLp (coro_ready [prio]) >= 0) 1809 {
1576 return av_shift (coro_ready [prio]); 1810 struct coro **ready = coro_ready [prio];
1811
1812 if (ready [0])
1813 {
1814 struct coro *coro = ready [0];
1815 ready [0] = coro->next_ready;
1816 return coro;
1817 }
1818 }
1577 1819
1578 return 0; 1820 return 0;
1821}
1822
1823static void
1824invoke_sv_ready_hook_helper (void)
1825{
1826 dTHX;
1827 dSP;
1828
1829 ENTER;
1830 SAVETMPS;
1831
1832 PUSHMARK (SP);
1833 PUTBACK;
1834 call_sv (coro_readyhook, G_VOID | G_DISCARD);
1835
1836 FREETMPS;
1837 LEAVE;
1579} 1838}
1580 1839
1581static int 1840static int
1582api_ready (pTHX_ SV *coro_sv) 1841api_ready (pTHX_ SV *coro_sv)
1583{ 1842{
1584 struct coro *coro;
1585 SV *sv_hook;
1586 void (*xs_hook)(void);
1587
1588 if (SvROK (coro_sv))
1589 coro_sv = SvRV (coro_sv);
1590
1591 coro = SvSTATE (coro_sv); 1843 struct coro *coro = SvSTATE (coro_sv);
1592 1844
1593 if (coro->flags & CF_READY) 1845 if (coro->flags & CF_READY)
1594 return 0; 1846 return 0;
1595 1847
1596 coro->flags |= CF_READY; 1848 coro->flags |= CF_READY;
1597 1849
1598 sv_hook = coro_nready ? 0 : coro_readyhook;
1599 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1600
1601 coro_enq (aTHX_ coro); 1850 coro_enq (aTHX_ coro);
1602 ++coro_nready;
1603 1851
1604 if (sv_hook) 1852 if (!coro_nready++)
1605 { 1853 if (coroapi.readyhook)
1606 dSP; 1854 coroapi.readyhook ();
1607
1608 ENTER;
1609 SAVETMPS;
1610
1611 PUSHMARK (SP);
1612 PUTBACK;
1613 call_sv (sv_hook, G_VOID | G_DISCARD);
1614
1615 FREETMPS;
1616 LEAVE;
1617 }
1618
1619 if (xs_hook)
1620 xs_hook ();
1621 1855
1622 return 1; 1856 return 1;
1623} 1857}
1624 1858
1625static int 1859static int
… …
1627{ 1861{
1628 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1862 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1629} 1863}
1630 1864
1631/* expects to own a reference to next->hv */ 1865/* expects to own a reference to next->hv */
1632INLINE void 1866ECB_INLINE void
1633prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1867prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1634{ 1868{
1635 SV *prev_sv = SvRV (coro_current); 1869 SV *prev_sv = SvRV (coro_current);
1636 1870
1637 ta->prev = SvSTATE_hv (prev_sv); 1871 ta->prev = SvSTATE_hv (prev_sv);
… …
1648static void 1882static void
1649prepare_schedule (pTHX_ struct coro_transfer_args *ta) 1883prepare_schedule (pTHX_ struct coro_transfer_args *ta)
1650{ 1884{
1651 for (;;) 1885 for (;;)
1652 { 1886 {
1653 SV *next_sv = coro_deq (aTHX); 1887 struct coro *next = coro_deq (aTHX);
1654 1888
1655 if (expect_true (next_sv)) 1889 if (ecb_expect_true (next))
1656 { 1890 {
1657 struct coro *next = SvSTATE_hv (next_sv);
1658
1659 /* cannot transfer to destroyed coros, skip and look for next */ 1891 /* cannot transfer to destroyed coros, skip and look for next */
1660 if (expect_false (next->flags & CF_DESTROYED)) 1892 if (ecb_expect_false (next->flags & (CF_ZOMBIE | CF_SUSPENDED)))
1661 SvREFCNT_dec (next_sv); /* coro_nready has already been taken care of by destroy */ 1893 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1662 else 1894 else
1663 { 1895 {
1664 next->flags &= ~CF_READY; 1896 next->flags &= ~CF_READY;
1665 --coro_nready; 1897 --coro_nready;
1666 1898
… …
1669 } 1901 }
1670 } 1902 }
1671 else 1903 else
1672 { 1904 {
1673 /* nothing to schedule: call the idle handler */ 1905 /* nothing to schedule: call the idle handler */
1906 if (SvROK (sv_idle)
1907 && SvOBJECT (SvRV (sv_idle)))
1908 {
1909 if (SvRV (sv_idle) == SvRV (coro_current))
1910 croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught");
1911
1912 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1913 api_ready (aTHX_ SvRV (sv_idle));
1914 --coro_nready;
1915 }
1916 else
1917 {
1918 /* TODO: deprecated, remove, cannot work reliably *//*D*/
1674 dSP; 1919 dSP;
1675 1920
1676 ENTER; 1921 ENTER;
1677 SAVETMPS; 1922 SAVETMPS;
1678 1923
1679 PUSHMARK (SP); 1924 PUSHMARK (SP);
1680 PUTBACK; 1925 PUTBACK;
1681 call_sv (get_sv ("Coro::idle", FALSE), G_VOID | G_DISCARD); 1926 call_sv (sv_idle, G_VOID | G_DISCARD);
1682 1927
1683 FREETMPS; 1928 FREETMPS;
1684 LEAVE; 1929 LEAVE;
1930 }
1685 } 1931 }
1686 } 1932 }
1687} 1933}
1688 1934
1689INLINE void 1935ECB_INLINE void
1690prepare_cede (pTHX_ struct coro_transfer_args *ta) 1936prepare_cede (pTHX_ struct coro_transfer_args *ta)
1691{ 1937{
1692 api_ready (aTHX_ coro_current); 1938 api_ready (aTHX_ coro_current);
1693 prepare_schedule (aTHX_ ta); 1939 prepare_schedule (aTHX_ ta);
1694} 1940}
1695 1941
1696INLINE void 1942ECB_INLINE void
1697prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 1943prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1698{ 1944{
1699 SV *prev = SvRV (coro_current); 1945 SV *prev = SvRV (coro_current);
1700 1946
1701 if (coro_nready) 1947 if (coro_nready)
… …
1731{ 1977{
1732 struct coro_transfer_args ta; 1978 struct coro_transfer_args ta;
1733 1979
1734 prepare_cede (aTHX_ &ta); 1980 prepare_cede (aTHX_ &ta);
1735 1981
1736 if (expect_true (ta.prev != ta.next)) 1982 if (ecb_expect_true (ta.prev != ta.next))
1737 { 1983 {
1738 TRANSFER (ta, 1); 1984 TRANSFER (ta, 1);
1739 return 1; 1985 return 1;
1740 } 1986 }
1741 else 1987 else
… …
1760static void 2006static void
1761api_trace (pTHX_ SV *coro_sv, int flags) 2007api_trace (pTHX_ SV *coro_sv, int flags)
1762{ 2008{
1763 struct coro *coro = SvSTATE (coro_sv); 2009 struct coro *coro = SvSTATE (coro_sv);
1764 2010
2011 if (coro->flags & CF_RUNNING)
2012 croak ("cannot enable tracing on a running coroutine, caught");
2013
1765 if (flags & CC_TRACE) 2014 if (flags & CC_TRACE)
1766 { 2015 {
1767 if (!coro->cctx) 2016 if (!coro->cctx)
1768 coro->cctx = cctx_new_run (); 2017 coro->cctx = cctx_new_run ();
1769 else if (!(coro->cctx->flags & CC_TRACE)) 2018 else if (!(coro->cctx->flags & CC_TRACE))
1770 croak ("cannot enable tracing on coroutine with custom stack,"); 2019 croak ("cannot enable tracing on coroutine with custom stack, caught");
1771 2020
1772 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL)); 2021 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL));
1773 } 2022 }
1774 else if (coro->cctx && coro->cctx->flags & CC_TRACE) 2023 else if (coro->cctx && coro->cctx->flags & CC_TRACE)
1775 { 2024 {
… …
1781 coro->slot->runops = RUNOPS_DEFAULT; 2030 coro->slot->runops = RUNOPS_DEFAULT;
1782 } 2031 }
1783} 2032}
1784 2033
1785static void 2034static void
2035coro_push_av (pTHX_ AV *av, I32 gimme_v)
2036{
2037 if (AvFILLp (av) >= 0 && gimme_v != G_VOID)
2038 {
2039 dSP;
2040
2041 if (gimme_v == G_SCALAR)
2042 XPUSHs (AvARRAY (av)[AvFILLp (av)]);
2043 else
2044 {
2045 int i;
2046 EXTEND (SP, AvFILLp (av) + 1);
2047
2048 for (i = 0; i <= AvFILLp (av); ++i)
2049 PUSHs (AvARRAY (av)[i]);
2050 }
2051
2052 PUTBACK;
2053 }
2054}
2055
2056static void
2057coro_push_on_destroy (pTHX_ struct coro *coro, SV *cb)
2058{
2059 if (!coro->on_destroy)
2060 coro->on_destroy = newAV ();
2061
2062 av_push (coro->on_destroy, cb);
2063}
2064
2065static void
2066slf_destroy_join (pTHX_ struct CoroSLF *frame)
2067{
2068 SvREFCNT_dec ((SV *)((struct coro *)frame->data)->hv);
2069}
2070
2071static int
2072slf_check_join (pTHX_ struct CoroSLF *frame)
2073{
2074 struct coro *coro = (struct coro *)frame->data;
2075
2076 if (!coro->status)
2077 return 1;
2078
2079 frame->destroy = 0;
2080
2081 coro_push_av (aTHX_ coro->status, GIMME_V);
2082
2083 SvREFCNT_dec ((SV *)coro->hv);
2084
2085 return 0;
2086}
2087
2088static void
2089slf_init_join (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2090{
2091 struct coro *coro = SvSTATE (items > 0 ? arg [0] : &PL_sv_undef);
2092
2093 if (items > 1)
2094 croak ("join called with too many arguments");
2095
2096 if (coro->status)
2097 frame->prepare = prepare_nop;
2098 else
2099 {
2100 coro_push_on_destroy (aTHX_ coro, SvREFCNT_inc_NN (SvRV (coro_current)));
2101 frame->prepare = prepare_schedule;
2102 }
2103
2104 frame->check = slf_check_join;
2105 frame->destroy = slf_destroy_join;
2106 frame->data = (void *)coro;
2107 SvREFCNT_inc (coro->hv);
2108}
2109
2110static void
1786coro_call_on_destroy (pTHX_ struct coro *coro) 2111coro_call_on_destroy (pTHX_ struct coro *coro)
1787{ 2112{
1788 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2113 AV *od = coro->on_destroy;
1789 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1790 2114
1791 if (on_destroyp) 2115 if (!od)
1792 { 2116 return;
1793 AV *on_destroy = (AV *)SvRV (*on_destroyp);
1794 2117
1795 while (AvFILLp (on_destroy) >= 0) 2118 while (AvFILLp (od) >= 0)
2119 {
2120 SV *cb = sv_2mortal (av_pop (od));
2121
2122 /* coro hv's (and only hv's at the moment) are supported as well */
2123 if (SvSTATEhv_p (aTHX_ cb))
2124 api_ready (aTHX_ cb);
2125 else
1796 { 2126 {
1797 dSP; /* don't disturb outer sp */ 2127 dSP; /* don't disturb outer sp */
1798 SV *cb = av_pop (on_destroy);
1799
1800 PUSHMARK (SP); 2128 PUSHMARK (SP);
1801 2129
1802 if (statusp) 2130 if (coro->status)
1803 { 2131 {
1804 int i; 2132 PUTBACK;
1805 AV *status = (AV *)SvRV (*statusp); 2133 coro_push_av (aTHX_ coro->status, G_ARRAY);
1806 EXTEND (SP, AvFILLp (status) + 1); 2134 SPAGAIN;
1807
1808 for (i = 0; i <= AvFILLp (status); ++i)
1809 PUSHs (AvARRAY (status)[i]);
1810 } 2135 }
1811 2136
1812 PUTBACK; 2137 PUTBACK;
1813 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD); 2138 call_sv (cb, G_VOID | G_DISCARD);
1814 } 2139 }
1815 } 2140 }
1816} 2141}
1817 2142
1818static void 2143static void
1819slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2144coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
1820{ 2145{
2146 AV *av;
2147
2148 if (coro->status)
2149 {
2150 av = coro->status;
2151 av_clear (av);
2152 }
2153 else
2154 av = coro->status = newAV ();
2155
2156 /* items are actually not so common, so optimise for this case */
2157 if (items)
2158 {
1821 int i; 2159 int i;
1822 HV *hv = (HV *)SvRV (coro_current);
1823 AV *av = newAV ();
1824 2160
1825 av_extend (av, items - 1); 2161 av_extend (av, items - 1);
2162
1826 for (i = 0; i < items; ++i) 2163 for (i = 0; i < items; ++i)
1827 av_push (av, SvREFCNT_inc_NN (arg [i])); 2164 av_push (av, SvREFCNT_inc_NN (arg [i]));
2165 }
2166}
1828 2167
1829 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 2168static void
1830 2169slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2170{
1831 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */ 2171 av_push (av_destroy, (SV *)newRV_inc ((SV *)coro_hv)); /* RVinc for perl */
1832 api_ready (aTHX_ sv_manager); 2172 api_ready (aTHX_ sv_manager);
1833 2173
1834 frame->prepare = prepare_schedule; 2174 frame->prepare = prepare_schedule;
1835 frame->check = slf_check_repeat; 2175 frame->check = slf_check_repeat;
2176
2177 /* as a minor optimisation, we could unwind all stacks here */
2178 /* but that puts extra pressure on pp_slf, and is not worth much */
2179 /*coro_unwind_stacks (aTHX);*/
2180}
2181
2182static void
2183slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2184{
2185 HV *coro_hv = (HV *)SvRV (coro_current);
2186
2187 coro_set_status (aTHX_ SvSTATE ((SV *)coro_hv), arg, items);
2188 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2189}
2190
2191static void
2192slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2193{
2194 HV *coro_hv;
2195 struct coro *coro;
2196
2197 if (items <= 0)
2198 croak ("Coro::cancel called without coro object,");
2199
2200 coro = SvSTATE (arg [0]);
2201 coro_hv = coro->hv;
2202
2203 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2204
2205 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2206 {
2207 /* coro currently busy cancelling something, so just notify it */
2208 coro->slf_frame.data = (void *)coro;
2209
2210 frame->prepare = prepare_nop;
2211 frame->check = slf_check_nop;
2212 }
2213 else if (coro_hv == (HV *)SvRV (coro_current))
2214 {
2215 /* cancelling the current coro is allowed, and equals terminate */
2216 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2217 }
2218 else
2219 {
2220 struct coro *self = SvSTATE_current;
2221
2222 /* otherwise we cancel directly, purely for speed reasons
2223 * unfortunately, this requires some magic trickery, as
2224 * somebody else could cancel us, so we have to fight the cancellation.
2225 * this is ugly, and hopefully fully worth the extra speed.
2226 * besides, I can't get the slow-but-safe version working...
2227 */
2228 slf_frame.data = 0;
2229 self->flags |= CF_NOCANCEL;
2230 coro_state_destroy (aTHX_ coro);
2231 self->flags &= ~CF_NOCANCEL;
2232
2233 if (slf_frame.data)
2234 {
2235 /* while we were busy we have been cancelled, so terminate */
2236 slf_init_terminate_cancel_common (aTHX_ frame, self->hv);
2237 }
2238 else
2239 {
2240 frame->prepare = prepare_nop;
2241 frame->check = slf_check_nop;
2242 }
2243 }
2244}
2245
2246static int
2247slf_check_safe_cancel (pTHX_ struct CoroSLF *frame)
2248{
2249 frame->prepare = 0;
2250 coro_unwind_stacks (aTHX);
2251
2252 slf_init_terminate_cancel_common (aTHX_ frame, (HV *)SvRV (coro_current));
2253
2254 return 1;
2255}
2256
2257static int
2258safe_cancel (pTHX_ struct coro *coro, SV **arg, int items)
2259{
2260 if (coro->cctx)
2261 croak ("coro inside C callback, unable to cancel at this time, caught");
2262
2263 if (coro->flags & CF_NEW)
2264 {
2265 coro_set_status (aTHX_ coro, arg, items);
2266 coro_state_destroy (aTHX_ coro);
2267 }
2268 else
2269 {
2270 if (!coro->slf_frame.prepare)
2271 croak ("coro outside an SLF function, unable to cancel at this time, caught");
2272
2273 slf_destroy (aTHX_ coro);
2274
2275 coro_set_status (aTHX_ coro, arg, items);
2276 coro->slf_frame.prepare = prepare_nop;
2277 coro->slf_frame.check = slf_check_safe_cancel;
2278
2279 api_ready (aTHX_ (SV *)coro->hv);
2280 }
2281
2282 return 1;
1836} 2283}
1837 2284
1838/*****************************************************************************/ 2285/*****************************************************************************/
1839/* async pool handler */ 2286/* async pool handler */
1840 2287
… …
1871slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2318slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1872{ 2319{
1873 HV *hv = (HV *)SvRV (coro_current); 2320 HV *hv = (HV *)SvRV (coro_current);
1874 struct coro *coro = SvSTATE_hv ((SV *)hv); 2321 struct coro *coro = SvSTATE_hv ((SV *)hv);
1875 2322
1876 if (expect_true (coro->saved_deffh)) 2323 if (ecb_expect_true (coro->saved_deffh))
1877 { 2324 {
1878 /* subsequent iteration */ 2325 /* subsequent iteration */
1879 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2326 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1880 coro->saved_deffh = 0; 2327 coro->saved_deffh = 0;
1881 2328
1882 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 2329 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
1883 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2330 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1884 { 2331 {
1885 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate); 2332 slf_init_terminate_cancel_common (aTHX_ frame, hv);
1886 coro->invoke_av = newAV (); 2333 return;
1887
1888 frame->prepare = prepare_nop;
1889 } 2334 }
1890 else 2335 else
1891 { 2336 {
1892 av_clear (GvAV (PL_defgv)); 2337 av_clear (GvAV (PL_defgv));
1893 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2338 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
… …
1918 2363
1919static void 2364static void
1920coro_rouse_callback (pTHX_ CV *cv) 2365coro_rouse_callback (pTHX_ CV *cv)
1921{ 2366{
1922 dXSARGS; 2367 dXSARGS;
1923 SV *data = (SV *)GENSUB_ARG; 2368 SV *data = (SV *)S_GENSUB_ARG;
1924 2369
1925 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2370 if (SvTYPE (SvRV (data)) != SVt_PVAV)
1926 { 2371 {
1927 /* first call, set args */ 2372 /* first call, set args */
2373 SV *coro = SvRV (data);
1928 AV *av = newAV (); 2374 AV *av = newAV ();
1929 SV *coro = SvRV (data);
1930 2375
1931 SvRV_set (data, (SV *)av); 2376 SvRV_set (data, (SV *)av);
1932 api_ready (aTHX_ coro);
1933 SvREFCNT_dec (coro);
1934 2377
1935 /* better take a full copy of the arguments */ 2378 /* better take a full copy of the arguments */
1936 while (items--) 2379 while (items--)
1937 av_store (av, items, newSVsv (ST (items))); 2380 av_store (av, items, newSVsv (ST (items)));
2381
2382 api_ready (aTHX_ coro);
2383 SvREFCNT_dec (coro);
1938 } 2384 }
1939 2385
1940 XSRETURN_EMPTY; 2386 XSRETURN_EMPTY;
1941} 2387}
1942 2388
… …
1959 2405
1960 EXTEND (SP, AvFILLp (av) + 1); 2406 EXTEND (SP, AvFILLp (av) + 1);
1961 for (i = 0; i <= AvFILLp (av); ++i) 2407 for (i = 0; i <= AvFILLp (av); ++i)
1962 PUSHs (sv_2mortal (AvARRAY (av)[i])); 2408 PUSHs (sv_2mortal (AvARRAY (av)[i]));
1963 2409
1964 /* we have stolen the elements, so ste length to zero and free */ 2410 /* we have stolen the elements, so set length to zero and free */
1965 AvFILLp (av) = -1; 2411 AvFILLp (av) = -1;
1966 av_undef (av); 2412 av_undef (av);
1967 2413
1968 PUTBACK; 2414 PUTBACK;
1969 } 2415 }
… …
1993 || SvTYPE (SvRV (cb)) != SVt_PVCV 2439 || SvTYPE (SvRV (cb)) != SVt_PVCV
1994 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2440 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
1995 croak ("Coro::rouse_wait called with illegal callback argument,"); 2441 croak ("Coro::rouse_wait called with illegal callback argument,");
1996 2442
1997 { 2443 {
1998 CV *cv = (CV *)SvRV (cb); /* for GENSUB_ARG */ 2444 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
1999 SV *data = (SV *)GENSUB_ARG; 2445 SV *data = (SV *)S_GENSUB_ARG;
2000 2446
2001 frame->data = (void *)data; 2447 frame->data = (void *)data;
2002 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule; 2448 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
2003 frame->check = slf_check_rouse_wait; 2449 frame->check = slf_check_rouse_wait;
2004 } 2450 }
… …
2008coro_new_rouse_cb (pTHX) 2454coro_new_rouse_cb (pTHX)
2009{ 2455{
2010 HV *hv = (HV *)SvRV (coro_current); 2456 HV *hv = (HV *)SvRV (coro_current);
2011 struct coro *coro = SvSTATE_hv (hv); 2457 struct coro *coro = SvSTATE_hv (hv);
2012 SV *data = newRV_inc ((SV *)hv); 2458 SV *data = newRV_inc ((SV *)hv);
2013 SV *cb = gensub (aTHX_ coro_rouse_callback, (void *)data); 2459 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
2014 2460
2015 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0); 2461 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0);
2016 SvREFCNT_dec (data); /* magicext increases the refcount */ 2462 SvREFCNT_dec (data); /* magicext increases the refcount */
2017 2463
2018 SvREFCNT_dec (coro->rouse_cb); 2464 SvREFCNT_dec (coro->rouse_cb);
… …
2115static void 2561static void
2116slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2562slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2117{ 2563{
2118 frame->prepare = prepare_cede_notself; 2564 frame->prepare = prepare_cede_notself;
2119 frame->check = slf_check_nop; 2565 frame->check = slf_check_nop;
2566}
2567
2568/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2569static void
2570slf_destroy (pTHX_ struct coro *coro)
2571{
2572 /* this callback is reserved for slf functions needing to do cleanup */
2573 if (coro->slf_frame.destroy && coro->slf_frame.prepare && !PL_dirty)
2574 coro->slf_frame.destroy (aTHX_ &coro->slf_frame);
2575
2576 /*
2577 * The on_destroy above most likely is from an SLF call.
2578 * Since by definition the SLF call will not finish when we destroy
2579 * the coro, we will have to force-finish it here, otherwise
2580 * cleanup functions cannot call SLF functions.
2581 */
2582 coro->slf_frame.prepare = 0;
2120} 2583}
2121 2584
2122/* 2585/*
2123 * these not obviously related functions are all rolled into one 2586 * these not obviously related functions are all rolled into one
2124 * function to increase chances that they all will call transfer with the same 2587 * function to increase chances that they all will call transfer with the same
… …
2131 I32 checkmark; /* mark SP to see how many elements check has pushed */ 2594 I32 checkmark; /* mark SP to see how many elements check has pushed */
2132 2595
2133 /* set up the slf frame, unless it has already been set-up */ 2596 /* set up the slf frame, unless it has already been set-up */
2134 /* the latter happens when a new coro has been started */ 2597 /* the latter happens when a new coro has been started */
2135 /* or when a new cctx was attached to an existing coroutine */ 2598 /* or when a new cctx was attached to an existing coroutine */
2136 if (expect_true (!slf_frame.prepare)) 2599 if (ecb_expect_true (!slf_frame.prepare))
2137 { 2600 {
2138 /* first iteration */ 2601 /* first iteration */
2139 dSP; 2602 dSP;
2140 SV **arg = PL_stack_base + TOPMARK + 1; 2603 SV **arg = PL_stack_base + TOPMARK + 1;
2141 int items = SP - arg; /* args without function object */ 2604 int items = SP - arg; /* args without function object */
… …
2182 while (slf_frame.check (aTHX_ &slf_frame)); 2645 while (slf_frame.check (aTHX_ &slf_frame));
2183 2646
2184 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */ 2647 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */
2185 2648
2186 /* exception handling */ 2649 /* exception handling */
2187 if (expect_false (CORO_THROW)) 2650 if (ecb_expect_false (CORO_THROW))
2188 { 2651 {
2189 SV *exception = sv_2mortal (CORO_THROW); 2652 SV *exception = sv_2mortal (CORO_THROW);
2190 2653
2191 CORO_THROW = 0; 2654 CORO_THROW = 0;
2192 sv_setsv (ERRSV, exception); 2655 sv_setsv (ERRSV, exception);
2193 croak (0); 2656 croak (0);
2194 } 2657 }
2195 2658
2196 /* return value handling - mostly like entersub */ 2659 /* return value handling - mostly like entersub */
2197 /* make sure we put something on the stack in scalar context */ 2660 /* make sure we put something on the stack in scalar context */
2198 if (GIMME_V == G_SCALAR) 2661 if (GIMME_V == G_SCALAR
2662 && ecb_expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2199 { 2663 {
2200 dSP; 2664 dSP;
2201 SV **bot = PL_stack_base + checkmark; 2665 SV **bot = PL_stack_base + checkmark;
2202 2666
2203 if (sp == bot) /* too few, push undef */ 2667 if (sp == bot) /* too few, push undef */
2204 bot [1] = &PL_sv_undef; 2668 bot [1] = &PL_sv_undef;
2205 else if (sp != bot + 1) /* too many, take last one */ 2669 else /* too many, take last one */
2206 bot [1] = *sp; 2670 bot [1] = *sp;
2207 2671
2208 SP = bot + 1; 2672 SP = bot + 1;
2209 2673
2210 PUTBACK; 2674 PUTBACK;
… …
2243 if (PL_op->op_flags & OPf_STACKED) 2707 if (PL_op->op_flags & OPf_STACKED)
2244 { 2708 {
2245 if (items > slf_arga) 2709 if (items > slf_arga)
2246 { 2710 {
2247 slf_arga = items; 2711 slf_arga = items;
2248 free (slf_argv); 2712 Safefree (slf_argv);
2249 slf_argv = malloc (slf_arga * sizeof (SV *)); 2713 New (0, slf_argv, slf_arga, SV *);
2250 } 2714 }
2251 2715
2252 slf_argc = items; 2716 slf_argc = items;
2253 2717
2254 for (i = 0; i < items; ++i) 2718 for (i = 0; i < items; ++i)
… …
2259 2723
2260 PL_op->op_ppaddr = pp_slf; 2724 PL_op->op_ppaddr = pp_slf;
2261 /*PL_op->op_type = OP_CUSTOM; /* we do behave like entersub still */ 2725 /*PL_op->op_type = OP_CUSTOM; /* we do behave like entersub still */
2262 2726
2263 PL_op = (OP *)&slf_restore; 2727 PL_op = (OP *)&slf_restore;
2728}
2729
2730/*****************************************************************************/
2731/* dynamic wind */
2732
2733static void
2734on_enterleave_call (pTHX_ SV *cb)
2735{
2736 dSP;
2737
2738 PUSHSTACK;
2739
2740 PUSHMARK (SP);
2741 PUTBACK;
2742 call_sv (cb, G_VOID | G_DISCARD);
2743 SPAGAIN;
2744
2745 POPSTACK;
2746}
2747
2748static SV *
2749coro_avp_pop_and_free (pTHX_ AV **avp)
2750{
2751 AV *av = *avp;
2752 SV *res = av_pop (av);
2753
2754 if (AvFILLp (av) < 0)
2755 {
2756 *avp = 0;
2757 SvREFCNT_dec (av);
2758 }
2759
2760 return res;
2761}
2762
2763static void
2764coro_pop_on_enter (pTHX_ void *coro)
2765{
2766 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_enter);
2767 SvREFCNT_dec (cb);
2768}
2769
2770static void
2771coro_pop_on_leave (pTHX_ void *coro)
2772{
2773 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2774 on_enterleave_call (aTHX_ sv_2mortal (cb));
2264} 2775}
2265 2776
2266/*****************************************************************************/ 2777/*****************************************************************************/
2267/* PerlIO::cede */ 2778/* PerlIO::cede */
2268 2779
… …
2270{ 2781{
2271 PerlIOBuf base; 2782 PerlIOBuf base;
2272 NV next, every; 2783 NV next, every;
2273} PerlIOCede; 2784} PerlIOCede;
2274 2785
2275static IV 2786static IV ecb_cold
2276PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab) 2787PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab)
2277{ 2788{
2278 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2789 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2279 2790
2280 self->every = SvCUR (arg) ? SvNV (arg) : 0.01; 2791 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
2281 self->next = nvtime () + self->every; 2792 self->next = nvtime () + self->every;
2282 2793
2283 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab); 2794 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
2284} 2795}
2285 2796
2286static SV * 2797static SV * ecb_cold
2287PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags) 2798PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
2288{ 2799{
2289 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2800 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2290 2801
2291 return newSVnv (self->every); 2802 return newSVnv (self->every);
… …
2342/* Coro::Semaphore & Coro::Signal */ 2853/* Coro::Semaphore & Coro::Signal */
2343 2854
2344static SV * 2855static SV *
2345coro_waitarray_new (pTHX_ int count) 2856coro_waitarray_new (pTHX_ int count)
2346{ 2857{
2347 /* a semaphore contains a counter IV in $sem->[0] and any waiters after that */ 2858 /* a waitarray=semaphore contains a counter IV in $sem->[0] and any waiters after that */
2348 AV *av = newAV (); 2859 AV *av = newAV ();
2349 SV **ary; 2860 SV **ary;
2350 2861
2351 /* unfortunately, building manually saves memory */ 2862 /* unfortunately, building manually saves memory */
2352 Newx (ary, 2, SV *); 2863 Newx (ary, 2, SV *);
2353 AvALLOC (av) = ary; 2864 AvALLOC (av) = ary;
2865#if PERL_VERSION_ATLEAST (5,10,0)
2354 /*AvARRAY (av) = ary;*/ 2866 AvARRAY (av) = ary;
2867#else
2355 SvPVX ((SV *)av) = (char *)ary; /* 5.8.8 needs this syntax instead of AvARRAY = ary */ 2868 /* 5.8.8 needs this syntax instead of AvARRAY = ary, yet */
2869 /* -DDEBUGGING flags this as a bug, despite it perfectly working */
2870 SvPVX ((SV *)av) = (char *)ary;
2871#endif
2356 AvMAX (av) = 1; 2872 AvMAX (av) = 1;
2357 AvFILLp (av) = 0; 2873 AvFILLp (av) = 0;
2358 ary [0] = newSViv (count); 2874 ary [0] = newSViv (count);
2359 2875
2360 return newRV_noinc ((SV *)av); 2876 return newRV_noinc ((SV *)av);
… …
2398 SvREFCNT_dec (cb); 2914 SvREFCNT_dec (cb);
2399 } 2915 }
2400} 2916}
2401 2917
2402static void 2918static void
2403coro_semaphore_on_destroy (pTHX_ struct coro *coro) 2919coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2404{ 2920{
2405 /* call $sem->adjust (0) to possibly wake up some other waiters */ 2921 /* call $sem->adjust (0) to possibly wake up some other waiters */
2406 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 2922 coro_semaphore_adjust (aTHX_ (AV *)frame->data, 0);
2407} 2923}
2408 2924
2409static int 2925static int
2410slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire) 2926slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2411{ 2927{
2412 AV *av = (AV *)frame->data; 2928 AV *av = (AV *)frame->data;
2413 SV *count_sv = AvARRAY (av)[0]; 2929 SV *count_sv = AvARRAY (av)[0];
2930 SV *coro_hv = SvRV (coro_current);
2414 2931
2415 /* if we are about to throw, don't actually acquire the lock, just throw */ 2932 /* if we are about to throw, don't actually acquire the lock, just throw */
2416 if (CORO_THROW) 2933 if (CORO_THROW)
2417 return 0; 2934 return 0;
2418 else if (SvIVX (count_sv) > 0) 2935 else if (SvIVX (count_sv) > 0)
2419 { 2936 {
2420 SvSTATE_current->on_destroy = 0; 2937 frame->destroy = 0;
2421 2938
2422 if (acquire) 2939 if (acquire)
2423 SvIVX (count_sv) = SvIVX (count_sv) - 1; 2940 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2424 else 2941 else
2425 coro_semaphore_adjust (aTHX_ av, 0); 2942 coro_semaphore_adjust (aTHX_ av, 0);
… …
2430 { 2947 {
2431 int i; 2948 int i;
2432 /* if we were woken up but can't down, we look through the whole */ 2949 /* if we were woken up but can't down, we look through the whole */
2433 /* waiters list and only add us if we aren't in there already */ 2950 /* waiters list and only add us if we aren't in there already */
2434 /* this avoids some degenerate memory usage cases */ 2951 /* this avoids some degenerate memory usage cases */
2435 2952 for (i = AvFILLp (av); i > 0; --i) // i > 0 is not an off-by-one bug
2436 for (i = 1; i <= AvFILLp (av); ++i)
2437 if (AvARRAY (av)[i] == SvRV (coro_current)) 2953 if (AvARRAY (av)[i] == coro_hv)
2438 return 1; 2954 return 1;
2439 2955
2440 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2956 av_push (av, SvREFCNT_inc (coro_hv));
2441 return 1; 2957 return 1;
2442 } 2958 }
2443} 2959}
2444 2960
2445static int 2961static int
… …
2468 { 2984 {
2469 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2985 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2470 2986
2471 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 2987 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2472 frame->prepare = prepare_schedule; 2988 frame->prepare = prepare_schedule;
2473
2474 /* to avoid race conditions when a woken-up coro gets terminated */ 2989 /* to avoid race conditions when a woken-up coro gets terminated */
2475 /* we arrange for a temporary on_destroy that calls adjust (0) */ 2990 /* we arrange for a temporary on_destroy that calls adjust (0) */
2476 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 2991 frame->destroy = coro_semaphore_destroy;
2477 } 2992 }
2478} 2993}
2479 2994
2480static void 2995static void
2481slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2996slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
… …
2489{ 3004{
2490 if (items >= 2) 3005 if (items >= 2)
2491 { 3006 {
2492 /* callback form */ 3007 /* callback form */
2493 AV *av = (AV *)SvRV (arg [0]); 3008 AV *av = (AV *)SvRV (arg [0]);
2494 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 3009 SV *cb_cv = s_get_cv_croak (arg [1]);
2495 3010
2496 av_push (av, (SV *)SvREFCNT_inc_NN (cb_cv)); 3011 av_push (av, SvREFCNT_inc_NN (cb_cv));
2497 3012
2498 if (SvIVX (AvARRAY (av)[0]) > 0) 3013 if (SvIVX (AvARRAY (av)[0]) > 0)
2499 coro_semaphore_adjust (aTHX_ av, 0); 3014 coro_semaphore_adjust (aTHX_ av, 0);
2500 3015
2501 frame->prepare = prepare_nop; 3016 frame->prepare = prepare_nop;
… …
2525 AvARRAY (av)[0] = AvARRAY (av)[1]; 3040 AvARRAY (av)[0] = AvARRAY (av)[1];
2526 AvARRAY (av)[1] = cb; 3041 AvARRAY (av)[1] = cb;
2527 3042
2528 cb = av_shift (av); 3043 cb = av_shift (av);
2529 3044
3045 if (SvTYPE (cb) == SVt_PVCV)
3046 {
3047 dSP;
3048 PUSHMARK (SP);
3049 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
3050 PUTBACK;
3051 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
3052 }
3053 else
3054 {
2530 api_ready (aTHX_ cb); 3055 api_ready (aTHX_ cb);
2531 sv_setiv (cb, 0); /* signal waiter */ 3056 sv_setiv (cb, 0); /* signal waiter */
3057 }
3058
2532 SvREFCNT_dec (cb); 3059 SvREFCNT_dec (cb);
2533 3060
2534 --count; 3061 --count;
2535 } 3062 }
2536} 3063}
… …
2545static void 3072static void
2546slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 3073slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2547{ 3074{
2548 AV *av = (AV *)SvRV (arg [0]); 3075 AV *av = (AV *)SvRV (arg [0]);
2549 3076
3077 if (items >= 2)
3078 {
3079 SV *cb_cv = s_get_cv_croak (arg [1]);
3080 av_push (av, SvREFCNT_inc_NN (cb_cv));
3081
2550 if (SvIVX (AvARRAY (av)[0])) 3082 if (SvIVX (AvARRAY (av)[0]))
3083 coro_signal_wake (aTHX_ av, 1); /* must be the only waiter */
3084
3085 frame->prepare = prepare_nop;
3086 frame->check = slf_check_nop;
3087 }
3088 else if (SvIVX (AvARRAY (av)[0]))
2551 { 3089 {
2552 SvIVX (AvARRAY (av)[0]) = 0; 3090 SvIVX (AvARRAY (av)[0]) = 0;
2553 frame->prepare = prepare_nop; 3091 frame->prepare = prepare_nop;
2554 frame->check = slf_check_nop; 3092 frame->check = slf_check_nop;
2555 } 3093 }
2556 else 3094 else
2557 { 3095 {
2558 SV *waiter = newRV_inc (SvRV (coro_current)); /* owned by signal av */ 3096 SV *waiter = newSVsv (coro_current); /* owned by signal av */
2559 3097
2560 av_push (av, waiter); 3098 av_push (av, waiter);
2561 3099
2562 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */ 3100 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */
2563 frame->prepare = prepare_schedule; 3101 frame->prepare = prepare_schedule;
… …
2581 3119
2582static void 3120static void
2583coro_aio_callback (pTHX_ CV *cv) 3121coro_aio_callback (pTHX_ CV *cv)
2584{ 3122{
2585 dXSARGS; 3123 dXSARGS;
2586 AV *state = (AV *)GENSUB_ARG; 3124 AV *state = (AV *)S_GENSUB_ARG;
2587 SV *coro = av_pop (state); 3125 SV *coro = av_pop (state);
2588 SV *data_sv = newSV (sizeof (struct io_state)); 3126 SV *data_sv = newSV (sizeof (struct io_state));
2589 3127
2590 av_extend (state, items - 1); 3128 av_extend (state, items - 1);
2591 3129
… …
2676 dSP; 3214 dSP;
2677 3215
2678 static SV *prio_cv; 3216 static SV *prio_cv;
2679 static SV *prio_sv; 3217 static SV *prio_sv;
2680 3218
2681 if (expect_false (!prio_cv)) 3219 if (ecb_expect_false (!prio_cv))
2682 { 3220 {
2683 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0); 3221 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0);
2684 prio_sv = newSViv (0); 3222 prio_sv = newSViv (0);
2685 } 3223 }
2686 3224
… …
2705 3243
2706 for (i = 0; i < items; ++i) 3244 for (i = 0; i < items; ++i)
2707 PUSHs (arg [i]); 3245 PUSHs (arg [i]);
2708 3246
2709 /* now push the callback closure */ 3247 /* now push the callback closure */
2710 PUSHs (sv_2mortal (gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state)))); 3248 PUSHs (sv_2mortal (s_gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state))));
2711 3249
2712 /* now call the AIO function - we assume our request is uncancelable */ 3250 /* now call the AIO function - we assume our request is uncancelable */
2713 PUTBACK; 3251 PUTBACK;
2714 call_sv ((SV *)req, G_VOID | G_DISCARD); 3252 call_sv ((SV *)req, G_VOID | G_DISCARD);
2715 } 3253 }
2716 3254
2717 /* now that the requets is going, we loop toll we have a result */ 3255 /* now that the request is going, we loop till we have a result */
2718 frame->data = (void *)state; 3256 frame->data = (void *)state;
2719 frame->prepare = prepare_schedule; 3257 frame->prepare = prepare_schedule;
2720 frame->check = slf_check_aio_req; 3258 frame->check = slf_check_aio_req;
2721} 3259}
2722 3260
… …
2732 3270
2733/*****************************************************************************/ 3271/*****************************************************************************/
2734 3272
2735#if CORO_CLONE 3273#if CORO_CLONE
2736# include "clone.c" 3274# include "clone.c"
3275#endif
3276
3277/*****************************************************************************/
3278
3279static SV *
3280coro_new (pTHX_ HV *stash, SV **argv, int argc, int is_coro)
3281{
3282 SV *coro_sv;
3283 struct coro *coro;
3284 MAGIC *mg;
3285 HV *hv;
3286 SV *cb;
3287 int i;
3288
3289 if (argc > 0)
3290 {
3291 cb = s_get_cv_croak (argv [0]);
3292
3293 if (!is_coro)
3294 {
3295 if (CvISXSUB (cb))
3296 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
3297
3298 if (!CvROOT (cb))
3299 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
3300 }
3301 }
3302
3303 Newz (0, coro, 1, struct coro);
3304 coro->args = newAV ();
3305 coro->flags = CF_NEW;
3306
3307 if (coro_first) coro_first->prev = coro;
3308 coro->next = coro_first;
3309 coro_first = coro;
3310
3311 coro->hv = hv = newHV ();
3312 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
3313 mg->mg_flags |= MGf_DUP;
3314 coro_sv = sv_bless (newRV_noinc ((SV *)hv), stash);
3315
3316 if (argc > 0)
3317 {
3318 av_extend (coro->args, argc + is_coro - 1);
3319
3320 if (is_coro)
3321 {
3322 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
3323 cb = (SV *)cv_coro_run;
3324 }
3325
3326 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3327
3328 for (i = 1; i < argc; i++)
3329 av_push (coro->args, newSVsv (argv [i]));
3330 }
3331
3332 return coro_sv;
3333}
3334
3335#ifndef __cplusplus
3336ecb_cold XS(boot_Coro__State);
3337#endif
3338
3339#if CORO_JIT
3340
3341static void ecb_noinline ecb_cold
3342pushav_3uv (pTHX_ UV a, UV b, UV c)
3343{
3344 dSP;
3345 AV *av = newAV ();
3346
3347 av_store (av, 2, newSVuv (c));
3348 av_store (av, 1, newSVuv (b));
3349 av_store (av, 0, newSVuv (a));
3350
3351 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
3352
3353 PUTBACK;
3354}
3355
3356static void ecb_noinline ecb_cold
3357jit_init (pTHX)
3358{
3359 dSP;
3360 SV *load, *save;
3361 char *map_base;
3362 char *load_ptr, *save_ptr;
3363 STRLEN load_len, save_len;
3364 int count;
3365
3366 PUSHMARK (SP);
3367 PUTBACK;
3368#define VARx(name,expr,type) pushav_3uv (aTHX_ (UV)&(expr), offsetof (perl_slots, name), sizeof (type));
3369# include "state.h"
3370#undef VARx
3371 count = call_pv ("Coro::State::_jit", G_ARRAY);
3372 SPAGAIN;
3373
3374 save = POPs; save_ptr = SvPVbyte (save, save_len);
3375 load = POPs; load_ptr = SvPVbyte (load, load_len);
3376
3377 map_base = mmap (0, load_len + save_len + 16, PROT_EXEC | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3378
3379 assert (("Coro: unable mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3380
3381 load_perl_slots = (load_save_perl_slots_type)map_base;
3382 memcpy (map_base, load_ptr, load_len);
3383
3384 map_base += (load_len + 15) & ~15;
3385
3386 save_perl_slots = (load_save_perl_slots_type)map_base;
3387 memcpy (map_base, save_ptr, save_len);
3388}
3389
2737#endif 3390#endif
2738 3391
2739MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3392MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2740 3393
2741PROTOTYPES: DISABLE 3394PROTOTYPES: DISABLE
… …
2747 coro_thx = PERL_GET_CONTEXT; 3400 coro_thx = PERL_GET_CONTEXT;
2748# endif 3401# endif
2749#endif 3402#endif
2750 BOOT_PAGESIZE; 3403 BOOT_PAGESIZE;
2751 3404
3405 /* perl defines these to check for existance first, but why it doesn't */
3406 /* just create them one at init time is not clear to me, except for */
3407 /* programs trying to delete them, but... */
3408 /* anyway, we declare this as invalid and make sure they are initialised here */
3409 DEFSV;
3410 ERRSV;
3411
2752 cctx_current = cctx_new_empty (); 3412 cctx_current = cctx_new_empty ();
2753 3413
2754 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3414 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
2755 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3415 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
2756 3416
… …
2795 coroapi.prepare_nop = prepare_nop; 3455 coroapi.prepare_nop = prepare_nop;
2796 coroapi.prepare_schedule = prepare_schedule; 3456 coroapi.prepare_schedule = prepare_schedule;
2797 coroapi.prepare_cede = prepare_cede; 3457 coroapi.prepare_cede = prepare_cede;
2798 coroapi.prepare_cede_notself = prepare_cede_notself; 3458 coroapi.prepare_cede_notself = prepare_cede_notself;
2799 3459
2800 { 3460 time_init (aTHX);
2801 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
2802 3461
2803 if (!svp) croak ("Time::HiRes is required");
2804 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
2805
2806 nvtime = INT2PTR (double (*)(), SvIV (*svp));
2807 }
2808
2809 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 3462 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3463#if CORO_JIT
3464 PUTBACK;
3465 require_pv ("Coro/jit-" CORO_JIT_TYPE ".pl");
3466 jit_init (aTHX);
3467 perl_eval_pv ("undef &Coro::State::_jit", 1);
3468 SPAGAIN;
3469#endif
2810} 3470}
2811 3471
2812SV * 3472SV *
2813new (char *klass, ...) 3473new (SV *klass, ...)
2814 ALIAS: 3474 ALIAS:
2815 Coro::new = 1 3475 Coro::new = 1
2816 CODE: 3476 CODE:
2817{ 3477 RETVAL = coro_new (aTHX_ ix ? coro_stash : coro_state_stash, &ST (1), items - 1, ix);
2818 struct coro *coro; 3478 OUTPUT:
2819 MAGIC *mg;
2820 HV *hv;
2821 CV *cb;
2822 int i;
2823
2824 if (items > 1)
2825 {
2826 cb = coro_sv_2cv (aTHX_ ST (1));
2827
2828 if (!ix)
2829 {
2830 if (CvISXSUB (cb))
2831 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
2832
2833 if (!CvROOT (cb))
2834 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
2835 }
2836 }
2837
2838 Newz (0, coro, 1, struct coro);
2839 coro->args = newAV ();
2840 coro->flags = CF_NEW;
2841
2842 if (coro_first) coro_first->prev = coro;
2843 coro->next = coro_first;
2844 coro_first = coro;
2845
2846 coro->hv = hv = newHV ();
2847 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
2848 mg->mg_flags |= MGf_DUP;
2849 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
2850
2851 if (items > 1)
2852 {
2853 av_extend (coro->args, items - 1 + ix - 1);
2854
2855 if (ix)
2856 {
2857 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
2858 cb = cv_coro_run;
2859 }
2860
2861 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
2862
2863 for (i = 2; i < items; i++)
2864 av_push (coro->args, newSVsv (ST (i)));
2865 }
2866}
2867 OUTPUT:
2868 RETVAL 3479 RETVAL
2869 3480
2870void 3481void
2871transfer (...) 3482transfer (...)
2872 PROTOTYPE: $$ 3483 PROTOTYPE: $$
2873 CODE: 3484 CODE:
2874 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3485 CORO_EXECUTE_SLF_XS (slf_init_transfer);
2875 3486
2876bool
2877_destroy (SV *coro_sv)
2878 CODE:
2879 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
2880 OUTPUT:
2881 RETVAL
2882
2883void 3487void
2884_exit (int code) 3488_exit (int code)
2885 PROTOTYPE: $ 3489 PROTOTYPE: $
2886 CODE: 3490 CODE:
2887 _exit (code); 3491 _exit (code);
… …
2889SV * 3493SV *
2890clone (Coro::State coro) 3494clone (Coro::State coro)
2891 CODE: 3495 CODE:
2892{ 3496{
2893#if CORO_CLONE 3497#if CORO_CLONE
2894 struct coro *ncoro = coro_clone (coro); 3498 struct coro *ncoro = coro_clone (aTHX_ coro);
2895 MAGIC *mg; 3499 MAGIC *mg;
2896 /* TODO: too much duplication */ 3500 /* TODO: too much duplication */
2897 ncoro->hv = newHV (); 3501 ncoro->hv = newHV ();
2898 mg = sv_magicext ((SV *)ncoro->hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)ncoro, 0); 3502 mg = sv_magicext ((SV *)ncoro->hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)ncoro, 0);
2899 mg->mg_flags |= MGf_DUP; 3503 mg->mg_flags |= MGf_DUP;
… …
2961 eval = 1 3565 eval = 1
2962 CODE: 3566 CODE:
2963{ 3567{
2964 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3568 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
2965 { 3569 {
2966 struct coro temp; 3570 struct coro *current = SvSTATE_current;
3571 struct CoroSLF slf_save;
2967 3572
2968 if (!(coro->flags & CF_RUNNING)) 3573 if (current != coro)
2969 { 3574 {
2970 PUTBACK; 3575 PUTBACK;
2971 save_perl (aTHX_ &temp); 3576 save_perl (aTHX_ current);
2972 load_perl (aTHX_ coro); 3577 load_perl (aTHX_ coro);
3578 /* the coro is most likely in an active SLF call.
3579 * while not strictly required (the code we execute is
3580 * not allowed to call any SLF functions), it's cleaner
3581 * to reinitialise the slf_frame and restore it later.
3582 * This might one day allow us to actually do SLF calls
3583 * from code executed here.
3584 */
3585 slf_save = slf_frame;
3586 slf_frame.prepare = 0;
3587 SPAGAIN;
2973 } 3588 }
2974 3589
2975 {
2976 dSP;
2977 ENTER;
2978 SAVETMPS;
2979 PUTBACK;
2980 PUSHSTACK; 3590 PUSHSTACK;
3591
2981 PUSHMARK (SP); 3592 PUSHMARK (SP);
3593 PUTBACK;
2982 3594
2983 if (ix) 3595 if (ix)
2984 eval_sv (coderef, 0); 3596 eval_sv (coderef, 0);
2985 else 3597 else
2986 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 3598 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
2987 3599
2988 POPSTACK; 3600 POPSTACK;
2989 SPAGAIN; 3601 SPAGAIN;
2990 FREETMPS;
2991 LEAVE;
2992 PUTBACK;
2993 }
2994 3602
2995 if (!(coro->flags & CF_RUNNING)) 3603 if (current != coro)
2996 { 3604 {
3605 PUTBACK;
3606 slf_frame = slf_save;
2997 save_perl (aTHX_ coro); 3607 save_perl (aTHX_ coro);
2998 load_perl (aTHX_ &temp); 3608 load_perl (aTHX_ current);
2999 SPAGAIN; 3609 SPAGAIN;
3000 } 3610 }
3001 } 3611 }
3002} 3612}
3003 3613
… …
3006 PROTOTYPE: $ 3616 PROTOTYPE: $
3007 ALIAS: 3617 ALIAS:
3008 is_ready = CF_READY 3618 is_ready = CF_READY
3009 is_running = CF_RUNNING 3619 is_running = CF_RUNNING
3010 is_new = CF_NEW 3620 is_new = CF_NEW
3011 is_destroyed = CF_DESTROYED 3621 is_destroyed = CF_ZOMBIE
3622 is_zombie = CF_ZOMBIE
3623 is_suspended = CF_SUSPENDED
3012 CODE: 3624 CODE:
3013 RETVAL = boolSV (coro->flags & ix); 3625 RETVAL = boolSV (coro->flags & ix);
3014 OUTPUT: 3626 OUTPUT:
3015 RETVAL 3627 RETVAL
3016 3628
3017void 3629void
3018throw (Coro::State self, SV *throw = &PL_sv_undef) 3630throw (Coro::State self, SV *exception = &PL_sv_undef)
3019 PROTOTYPE: $;$ 3631 PROTOTYPE: $;$
3020 CODE: 3632 CODE:
3021{ 3633{
3022 struct coro *current = SvSTATE_current; 3634 struct coro *current = SvSTATE_current;
3023 SV **throwp = self == current ? &CORO_THROW : &self->except; 3635 SV **exceptionp = self == current ? &CORO_THROW : &self->except;
3024 SvREFCNT_dec (*throwp); 3636 SvREFCNT_dec (*exceptionp);
3025 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3637 SvGETMAGIC (exception);
3638 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3026} 3639}
3027 3640
3028void 3641void
3029api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3642api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3030 PROTOTYPE: $;$ 3643 PROTOTYPE: $;$
… …
3032 3645
3033SV * 3646SV *
3034has_cctx (Coro::State coro) 3647has_cctx (Coro::State coro)
3035 PROTOTYPE: $ 3648 PROTOTYPE: $
3036 CODE: 3649 CODE:
3037 RETVAL = boolSV (!!coro->cctx); 3650 /* maybe manage the running flag differently */
3651 RETVAL = boolSV (!!coro->cctx || (coro->flags & CF_RUNNING));
3038 OUTPUT: 3652 OUTPUT:
3039 RETVAL 3653 RETVAL
3040 3654
3041int 3655int
3042is_traced (Coro::State coro) 3656is_traced (Coro::State coro)
… …
3062 3676
3063void 3677void
3064force_cctx () 3678force_cctx ()
3065 PROTOTYPE: 3679 PROTOTYPE:
3066 CODE: 3680 CODE:
3067 SvSTATE_current->cctx->idle_sp = 0; 3681 cctx_current->idle_sp = 0;
3068 3682
3069void 3683void
3070swap_defsv (Coro::State self) 3684swap_defsv (Coro::State self)
3071 PROTOTYPE: $ 3685 PROTOTYPE: $
3072 ALIAS: 3686 ALIAS:
… …
3080 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv; 3694 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
3081 3695
3082 SV *tmp = *src; *src = *dst; *dst = tmp; 3696 SV *tmp = *src; *src = *dst; *dst = tmp;
3083 } 3697 }
3084 3698
3699void
3700cancel (Coro::State self)
3701 CODE:
3702 coro_state_destroy (aTHX_ self);
3703
3704SV *
3705enable_times (int enabled = enable_times)
3706 CODE:
3707{
3708 RETVAL = boolSV (enable_times);
3709
3710 if (enabled != enable_times)
3711 {
3712 enable_times = enabled;
3713
3714 coro_times_update ();
3715 (enabled ? coro_times_sub : coro_times_add)(SvSTATE (coro_current));
3716 }
3717}
3718 OUTPUT:
3719 RETVAL
3720
3721void
3722times (Coro::State self)
3723 PPCODE:
3724{
3725 struct coro *current = SvSTATE (coro_current);
3726
3727 if (ecb_expect_false (current == self))
3728 {
3729 coro_times_update ();
3730 coro_times_add (SvSTATE (coro_current));
3731 }
3732
3733 EXTEND (SP, 2);
3734 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3735 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3736
3737 if (ecb_expect_false (current == self))
3738 coro_times_sub (SvSTATE (coro_current));
3739}
3740
3741void
3742swap_sv (Coro::State coro, SV *sv, SV *swapsv)
3743 CODE:
3744{
3745 struct coro *current = SvSTATE_current;
3746
3747 if (current == coro)
3748 SWAP_SVS (current);
3749
3750 if (!coro->swap_sv)
3751 coro->swap_sv = newAV ();
3752
3753 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv )));
3754 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv)));
3755
3756 if (current == coro)
3757 SWAP_SVS (current);
3758}
3759
3085 3760
3086MODULE = Coro::State PACKAGE = Coro 3761MODULE = Coro::State PACKAGE = Coro
3087 3762
3088BOOT: 3763BOOT:
3089{ 3764{
3090 int i;
3091
3092 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3765 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3093 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3766 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3094 cv_coro_run = get_cv ( "Coro::_terminate", GV_ADD); 3767 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3095 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3096 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 3768 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3097 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 3769 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3098 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 3770 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3099 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 3771 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3772 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3100 3773
3101 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3774 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3102 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3775 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3103 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 3776 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3104 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new); 3777 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3105 3778
3106 coro_stash = gv_stashpv ("Coro", TRUE); 3779 coro_stash = gv_stashpv ("Coro", TRUE);
3107 3780
3108 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 3781 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3109 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 3782 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3110 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 3783 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
3111 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 3784 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (CORO_PRIO_LOW));
3112 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE)); 3785 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (CORO_PRIO_IDLE));
3113 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN)); 3786 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (CORO_PRIO_MIN));
3114
3115 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
3116 coro_ready[i] = newAV ();
3117 3787
3118 { 3788 {
3119 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 3789 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
3120 3790
3121 coroapi.schedule = api_schedule; 3791 coroapi.schedule = api_schedule;
… …
3131 sv_setiv (sv, (IV)&coroapi); 3801 sv_setiv (sv, (IV)&coroapi);
3132 SvREADONLY_on (sv); 3802 SvREADONLY_on (sv);
3133 } 3803 }
3134} 3804}
3135 3805
3806SV *
3807async (...)
3808 PROTOTYPE: &@
3809 CODE:
3810 RETVAL = coro_new (aTHX_ coro_stash, &ST (0), items, 1);
3811 api_ready (aTHX_ RETVAL);
3812 OUTPUT:
3813 RETVAL
3814
3815void
3816_destroy (Coro::State coro)
3817 CODE:
3818 /* used by the manager thread */
3819 coro_state_destroy (aTHX_ coro);
3820
3821void
3822on_destroy (Coro::State coro, SV *cb)
3823 CODE:
3824 coro_push_on_destroy (aTHX_ coro, newSVsv (cb));
3825
3826void
3827join (...)
3828 CODE:
3829 CORO_EXECUTE_SLF_XS (slf_init_join);
3830
3136void 3831void
3137terminate (...) 3832terminate (...)
3138 CODE: 3833 CODE:
3139 CORO_EXECUTE_SLF_XS (slf_init_terminate); 3834 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3140 3835
3141void 3836void
3837cancel (...)
3838 CODE:
3839 CORO_EXECUTE_SLF_XS (slf_init_cancel);
3840
3841int
3842safe_cancel (Coro::State self, ...)
3843 C_ARGS: aTHX_ self, &ST (1), items - 1
3844
3845void
3142schedule (...) 3846schedule (...)
3143 CODE: 3847 CODE:
3144 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3848 CORO_EXECUTE_SLF_XS (slf_init_schedule);
3145 3849
3146void 3850void
… …
3160 3864
3161void 3865void
3162cede_notself (...) 3866cede_notself (...)
3163 CODE: 3867 CODE:
3164 CORO_EXECUTE_SLF_XS (slf_init_cede_notself); 3868 CORO_EXECUTE_SLF_XS (slf_init_cede_notself);
3165
3166void
3167_cancel (Coro::State self)
3168 CODE:
3169 coro_state_destroy (aTHX_ self);
3170 coro_call_on_destroy (aTHX_ self);
3171 3869
3172void 3870void
3173_set_current (SV *current) 3871_set_current (SV *current)
3174 PROTOTYPE: $ 3872 PROTOTYPE: $
3175 CODE: 3873 CODE:
… …
3179void 3877void
3180_set_readyhook (SV *hook) 3878_set_readyhook (SV *hook)
3181 PROTOTYPE: $ 3879 PROTOTYPE: $
3182 CODE: 3880 CODE:
3183 SvREFCNT_dec (coro_readyhook); 3881 SvREFCNT_dec (coro_readyhook);
3882 SvGETMAGIC (hook);
3883 if (SvOK (hook))
3884 {
3184 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0; 3885 coro_readyhook = newSVsv (hook);
3886 CORO_READYHOOK = invoke_sv_ready_hook_helper;
3887 }
3888 else
3889 {
3890 coro_readyhook = 0;
3891 CORO_READYHOOK = 0;
3892 }
3185 3893
3186int 3894int
3187prio (Coro::State coro, int newprio = 0) 3895prio (Coro::State coro, int newprio = 0)
3188 PROTOTYPE: $;$ 3896 PROTOTYPE: $;$
3189 ALIAS: 3897 ALIAS:
… …
3195 if (items > 1) 3903 if (items > 1)
3196 { 3904 {
3197 if (ix) 3905 if (ix)
3198 newprio = coro->prio - newprio; 3906 newprio = coro->prio - newprio;
3199 3907
3200 if (newprio < PRIO_MIN) newprio = PRIO_MIN; 3908 if (newprio < CORO_PRIO_MIN) newprio = CORO_PRIO_MIN;
3201 if (newprio > PRIO_MAX) newprio = PRIO_MAX; 3909 if (newprio > CORO_PRIO_MAX) newprio = CORO_PRIO_MAX;
3202 3910
3203 coro->prio = newprio; 3911 coro->prio = newprio;
3204 } 3912 }
3205} 3913}
3206 OUTPUT: 3914 OUTPUT:
… …
3221 RETVAL = coro_nready; 3929 RETVAL = coro_nready;
3222 OUTPUT: 3930 OUTPUT:
3223 RETVAL 3931 RETVAL
3224 3932
3225void 3933void
3934suspend (Coro::State self)
3935 PROTOTYPE: $
3936 CODE:
3937 self->flags |= CF_SUSPENDED;
3938
3939void
3940resume (Coro::State self)
3941 PROTOTYPE: $
3942 CODE:
3943 self->flags &= ~CF_SUSPENDED;
3944
3945void
3226_pool_handler (...) 3946_pool_handler (...)
3227 CODE: 3947 CODE:
3228 CORO_EXECUTE_SLF_XS (slf_init_pool_handler); 3948 CORO_EXECUTE_SLF_XS (slf_init_pool_handler);
3229 3949
3230void 3950void
… …
3241 for (i = 1; i < items; ++i) 3961 for (i = 1; i < items; ++i)
3242 av_push (av, SvREFCNT_inc_NN (ST (i))); 3962 av_push (av, SvREFCNT_inc_NN (ST (i)));
3243 3963
3244 if ((SV *)hv == &PL_sv_undef) 3964 if ((SV *)hv == &PL_sv_undef)
3245 { 3965 {
3246 PUSHMARK (SP); 3966 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3247 EXTEND (SP, 2);
3248 PUSHs (sv_Coro);
3249 PUSHs ((SV *)cv_pool_handler);
3250 PUTBACK;
3251 call_sv ((SV *)cv_coro_state_new, G_SCALAR);
3252 SPAGAIN;
3253
3254 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs)); 3967 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
3968 SvREFCNT_dec (sv);
3255 } 3969 }
3256 3970
3257 { 3971 {
3258 struct coro *coro = SvSTATE_hv (hv); 3972 struct coro *coro = SvSTATE_hv (hv);
3259 3973
… …
3283rouse_wait (...) 3997rouse_wait (...)
3284 PROTOTYPE: ;$ 3998 PROTOTYPE: ;$
3285 PPCODE: 3999 PPCODE:
3286 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait); 4000 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait);
3287 4001
4002void
4003on_enter (SV *block)
4004 ALIAS:
4005 on_leave = 1
4006 PROTOTYPE: &
4007 CODE:
4008{
4009 struct coro *coro = SvSTATE_current;
4010 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
4011
4012 block = s_get_cv_croak (block);
4013
4014 if (!*avp)
4015 *avp = newAV ();
4016
4017 av_push (*avp, SvREFCNT_inc (block));
4018
4019 if (!ix)
4020 on_enterleave_call (aTHX_ block);
4021
4022 LEAVE; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
4023 SAVEDESTRUCTOR_X (ix ? coro_pop_on_leave : coro_pop_on_enter, (void *)coro);
4024 ENTER; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
4025}
4026
3288 4027
3289MODULE = Coro::State PACKAGE = PerlIO::cede 4028MODULE = Coro::State PACKAGE = PerlIO::cede
3290 4029
3291BOOT: 4030BOOT:
3292 PerlIO_define_layer (aTHX_ &PerlIO_cede); 4031 PerlIO_define_layer (aTHX_ &PerlIO_cede);
… …
3295MODULE = Coro::State PACKAGE = Coro::Semaphore 4034MODULE = Coro::State PACKAGE = Coro::Semaphore
3296 4035
3297SV * 4036SV *
3298new (SV *klass, SV *count = 0) 4037new (SV *klass, SV *count = 0)
3299 CODE: 4038 CODE:
4039{
4040 int semcnt = 1;
4041
4042 if (count)
4043 {
4044 SvGETMAGIC (count);
4045
4046 if (SvOK (count))
4047 semcnt = SvIV (count);
4048 }
4049
3300 RETVAL = sv_bless ( 4050 RETVAL = sv_bless (
3301 coro_waitarray_new (aTHX_ count && SvOK (count) ? SvIV (count) : 1), 4051 coro_waitarray_new (aTHX_ semcnt),
3302 GvSTASH (CvGV (cv)) 4052 GvSTASH (CvGV (cv))
3303 ); 4053 );
4054}
3304 OUTPUT: 4055 OUTPUT:
3305 RETVAL 4056 RETVAL
3306 4057
3307# helper for Coro::Channel 4058# helper for Coro::Channel and others
3308SV * 4059SV *
3309_alloc (int count) 4060_alloc (int count)
3310 CODE: 4061 CODE:
3311 RETVAL = coro_waitarray_new (aTHX_ count); 4062 RETVAL = coro_waitarray_new (aTHX_ count);
3312 OUTPUT: 4063 OUTPUT:
… …
3370 for (i = 1; i <= wcount; ++i) 4121 for (i = 1; i <= wcount; ++i)
3371 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i]))); 4122 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i])));
3372 } 4123 }
3373} 4124}
3374 4125
4126MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
4127
4128void
4129_may_delete (SV *sem, int count, int extra_refs)
4130 PPCODE:
4131{
4132 AV *av = (AV *)SvRV (sem);
4133
4134 if (SvREFCNT ((SV *)av) == 1 + extra_refs
4135 && AvFILLp (av) == 0 /* no waiters, just count */
4136 && SvIV (AvARRAY (av)[0]) == count)
4137 XSRETURN_YES;
4138
4139 XSRETURN_NO;
4140}
4141
3375MODULE = Coro::State PACKAGE = Coro::Signal 4142MODULE = Coro::State PACKAGE = Coro::Signal
3376 4143
3377SV * 4144SV *
3378new (SV *klass) 4145new (SV *klass)
3379 CODE: 4146 CODE:
… …
3450 4217
3451void 4218void
3452_register (char *target, char *proto, SV *req) 4219_register (char *target, char *proto, SV *req)
3453 CODE: 4220 CODE:
3454{ 4221{
3455 CV *req_cv = coro_sv_2cv (aTHX_ req); 4222 SV *req_cv = s_get_cv_croak (req);
3456 /* newXSproto doesn't return the CV on 5.8 */ 4223 /* newXSproto doesn't return the CV on 5.8 */
3457 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 4224 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3458 sv_setpv ((SV *)slf_cv, proto); 4225 sv_setpv ((SV *)slf_cv, proto);
3459 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0); 4226 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
3460} 4227}
3461 4228
4229MODULE = Coro::State PACKAGE = Coro::Select
4230
4231void
4232patch_pp_sselect ()
4233 CODE:
4234 if (!coro_old_pp_sselect)
4235 {
4236 coro_select_select = (SV *)get_cv ("Coro::Select::select", 0);
4237 coro_old_pp_sselect = PL_ppaddr [OP_SSELECT];
4238 PL_ppaddr [OP_SSELECT] = coro_pp_sselect;
4239 }
4240
4241void
4242unpatch_pp_sselect ()
4243 CODE:
4244 if (coro_old_pp_sselect)
4245 {
4246 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
4247 coro_old_pp_sselect = 0;
4248 }
4249

Diff Legend

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