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

Diff Legend

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