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.315 by root, Thu Nov 20 05:25:17 2008 UTC vs.
Revision 1.407 by root, Sat Jun 11 15:30:21 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 */
171static JMPENV *main_top_env; 127static JMPENV *main_top_env;
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
131static AV *av_destroy; /* destruction queue */
132static SV *sv_manager; /* the manager coro */
133static SV *sv_idle; /* $Coro::idle */
134
175static GV *irsgv; /* $/ */ 135static GV *irsgv; /* $/ */
176static GV *stdoutgv; /* *STDOUT */ 136static GV *stdoutgv; /* *STDOUT */
177static SV *rv_diehook; 137static SV *rv_diehook;
178static SV *rv_warnhook; 138static SV *rv_warnhook;
179static HV *hv_sig; /* %SIG */ 139static HV *hv_sig; /* %SIG */
180 140
181/* async_pool helper stuff */ 141/* async_pool helper stuff */
182static SV *sv_pool_rss; 142static SV *sv_pool_rss;
183static SV *sv_pool_size; 143static SV *sv_pool_size;
184static SV *sv_async_pool_idle; 144static SV *sv_async_pool_idle; /* description string */
185static AV *av_async_pool; 145static AV *av_async_pool; /* idle pool */
186static SV *sv_Coro; 146static SV *sv_Coro; /* class string */
187static CV *cv_pool_handler; 147static CV *cv_pool_handler;
188static CV *cv_coro_state_new;
189 148
190/* Coro::AnyEvent */ 149/* Coro::AnyEvent */
191static SV *sv_activity; 150static SV *sv_activity;
192 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
193static struct coro_cctx *cctx_first; 158static struct coro_cctx *cctx_first;
194static int cctx_count, cctx_idle; 159static int cctx_count, cctx_idle;
195 160
196enum { 161enum
162{
197 CC_MAPPED = 0x01, 163 CC_MAPPED = 0x01,
198 CC_NOREUSE = 0x02, /* throw this away after tracing */ 164 CC_NOREUSE = 0x02, /* throw this away after tracing */
199 CC_TRACE = 0x04, 165 CC_TRACE = 0x04,
200 CC_TRACE_SUB = 0x08, /* trace sub calls */ 166 CC_TRACE_SUB = 0x08, /* trace sub calls */
201 CC_TRACE_LINE = 0x10, /* trace each statement */ 167 CC_TRACE_LINE = 0x10, /* trace each statement */
… …
222 int valgrind_id; 188 int valgrind_id;
223#endif 189#endif
224 unsigned char flags; 190 unsigned char flags;
225} coro_cctx; 191} coro_cctx;
226 192
193static coro_cctx *cctx_current; /* the currently running cctx */
194
195/*****************************************************************************/
196
197static MGVTBL coro_state_vtbl;
198
227enum { 199enum
200{
228 CF_RUNNING = 0x0001, /* coroutine is running */ 201 CF_RUNNING = 0x0001, /* coroutine is running */
229 CF_READY = 0x0002, /* coroutine is ready */ 202 CF_READY = 0x0002, /* coroutine is ready */
230 CF_NEW = 0x0004, /* has never been switched to */ 203 CF_NEW = 0x0004, /* has never been switched to */
231 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) */
232}; 207};
233 208
234/* 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 */
235typedef struct 210typedef struct
236{ 211{
237 SV *defsv;
238 AV *defav;
239 SV *errsv;
240 SV *irsgv;
241#define VAR(name,type) type name; 212#define VARx(name,expr,type) type name;
242# include "state.h" 213# include "state.h"
243#undef VAR 214#undef VARx
244} perl_slots; 215} perl_slots;
245 216
217// how many context stack entries do we need for perl_slots
246#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))
247 219
248/* this is a structure representing a perl-level coroutine */ 220/* this is a structure representing a perl-level coroutine */
249struct coro { 221struct coro
222{
250 /* the C coroutine allocated to this perl coroutine, if any */ 223 /* the C coroutine allocated to this perl coroutine, if any */
251 coro_cctx *cctx; 224 coro_cctx *cctx;
225
226 /* ready queue */
227 struct coro *next_ready;
252 228
253 /* state data */ 229 /* state data */
254 struct CoroSLF slf_frame; /* saved slf frame */ 230 struct CoroSLF slf_frame; /* saved slf frame */
255 AV *mainstack; 231 AV *mainstack;
256 perl_slots *slot; /* basically the saved sp */ 232 perl_slots *slot; /* basically the saved sp */
257 233
258 CV *startcv; /* the CV to execute */ 234 CV *startcv; /* the CV to execute */
259 AV *args; /* data associated with this coroutine (initial args) */ 235 AV *args; /* data associated with this coroutine (initial args) */
260 int refcnt; /* coroutines are refcounted, yes */
261 int flags; /* CF_ flags */ 236 int flags; /* CF_ flags */
262 HV *hv; /* the perl hash associated with this coro, if any */ 237 HV *hv; /* the perl hash associated with this coro, if any */
263 void (*on_destroy)(pTHX_ struct coro *coro);
264 238
265 /* statistics */ 239 /* statistics */
266 int usecount; /* number of transfers to this coro */ 240 int usecount; /* number of transfers to this coro */
267 241
268 /* coro process data */ 242 /* coro process data */
269 int prio; 243 int prio;
270 SV *except; /* exception to be thrown */ 244 SV *except; /* exception to be thrown */
271 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 */
272 248
273 /* async_pool */ 249 /* async_pool */
274 SV *saved_deffh; 250 SV *saved_deffh;
275 SV *invoke_cb; 251 SV *invoke_cb;
276 AV *invoke_av; 252 AV *invoke_av;
277 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
278 /* linked list */ 264 /* linked list */
279 struct coro *next, *prev; 265 struct coro *next, *prev;
280}; 266};
281 267
282typedef struct coro *Coro__State; 268typedef struct coro *Coro__State;
283typedef struct coro *Coro__State_or_hashref; 269typedef struct coro *Coro__State_or_hashref;
284 270
285/* the following variables are effectively part of the perl context */ 271/* the following variables are effectively part of the perl context */
286/* and get copied between struct coro and these variables */ 272/* and get copied between struct coro and these variables */
287/* the mainr easonw e don't support windows process emulation */ 273/* the main reason we don't support windows process emulation */
288static struct CoroSLF slf_frame; /* the current slf frame */ 274static struct CoroSLF slf_frame; /* the current slf frame */
289 275
290/** Coro ********************************************************************/ 276/** Coro ********************************************************************/
291 277
292#define PRIO_MAX 3 278#define CORO_PRIO_MAX 3
293#define PRIO_HIGH 1 279#define CORO_PRIO_HIGH 1
294#define PRIO_NORMAL 0 280#define CORO_PRIO_NORMAL 0
295#define PRIO_LOW -1 281#define CORO_PRIO_LOW -1
296#define PRIO_IDLE -3 282#define CORO_PRIO_IDLE -3
297#define PRIO_MIN -4 283#define CORO_PRIO_MIN -4
298 284
299/* for Coro.pm */ 285/* for Coro.pm */
300static SV *coro_current; 286static SV *coro_current;
301static SV *coro_readyhook; 287static SV *coro_readyhook;
302static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1]; 288static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
303static CV *cv_coro_run, *cv_coro_terminate; 289static CV *cv_coro_run;
304static struct coro *coro_first; 290static struct coro *coro_first;
305#define coro_nready coroapi.nready 291#define coro_nready coroapi.nready
306 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
307/** lowlevel stuff **********************************************************/ 385/** lowlevel stuff **********************************************************/
308 386
309static SV * 387static SV * ecb_noinline
310coro_get_sv (pTHX_ const char *name, int create) 388coro_get_sv (pTHX_ const char *name, int create)
311{ 389{
312#if PERL_VERSION_ATLEAST (5,10,0) 390#if PERL_VERSION_ATLEAST (5,10,0)
313 /* 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 */
314 get_sv (name, create); 392 get_sv (name, create);
315#endif 393#endif
316 return get_sv (name, create); 394 return get_sv (name, create);
317} 395}
318 396
319static AV * 397static AV * ecb_noinline
320coro_get_av (pTHX_ const char *name, int create) 398coro_get_av (pTHX_ const char *name, int create)
321{ 399{
322#if PERL_VERSION_ATLEAST (5,10,0) 400#if PERL_VERSION_ATLEAST (5,10,0)
323 /* 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 */
324 get_av (name, create); 402 get_av (name, create);
325#endif 403#endif
326 return get_av (name, create); 404 return get_av (name, create);
327} 405}
328 406
329static HV * 407static HV * ecb_noinline
330coro_get_hv (pTHX_ const char *name, int create) 408coro_get_hv (pTHX_ const char *name, int create)
331{ 409{
332#if PERL_VERSION_ATLEAST (5,10,0) 410#if PERL_VERSION_ATLEAST (5,10,0)
333 /* 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 */
334 get_hv (name, create); 412 get_hv (name, create);
335#endif 413#endif
336 return get_hv (name, create); 414 return get_hv (name, create);
337} 415}
338 416
339/* 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
340INLINE CV * 522ECB_INLINE AV *
341coro_sv_2cv (pTHX_ SV *sv)
342{
343 HV *st;
344 GV *gvp;
345 return sv_2cv (sv, &st, &gvp, 0);
346}
347
348static AV *
349coro_clone_padlist (pTHX_ CV *cv) 523coro_derive_padlist (pTHX_ CV *cv)
350{ 524{
351 AV *padlist = CvPADLIST (cv); 525 AV *padlist = CvPADLIST (cv);
352 AV *newpadlist, *newpad; 526 AV *newpadlist, *newpad;
353 527
354 newpadlist = newAV (); 528 newpadlist = newAV ();
… …
359 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 533 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
360#endif 534#endif
361 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 535 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
362 --AvFILLp (padlist); 536 --AvFILLp (padlist);
363 537
364 av_store (newpadlist, 0, SvREFCNT_inc_NN (*av_fetch (padlist, 0, FALSE))); 538 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0]));
365 av_store (newpadlist, 1, (SV *)newpad); 539 av_store (newpadlist, 1, (SV *)newpad);
366 540
367 return newpadlist; 541 return newpadlist;
368} 542}
369 543
370static void 544ECB_INLINE void
371free_padlist (pTHX_ AV *padlist) 545free_padlist (pTHX_ AV *padlist)
372{ 546{
373 /* may be during global destruction */ 547 /* may be during global destruction */
374 if (SvREFCNT (padlist)) 548 if (!IN_DESTRUCT)
375 { 549 {
376 I32 i = AvFILLp (padlist); 550 I32 i = AvFILLp (padlist);
377 while (i >= 0) 551
552 while (i > 0) /* special-case index 0 */
378 { 553 {
379 SV **svp = av_fetch (padlist, i--, FALSE); 554 /* we try to be extra-careful here */
380 if (svp) 555 AV *av = (AV *)AvARRAY (padlist)[i--];
381 { 556 I32 j = AvFILLp (av);
382 SV *sv; 557
383 while (&PL_sv_undef != (sv = av_pop ((AV *)*svp))) 558 while (j >= 0)
559 SvREFCNT_dec (AvARRAY (av)[j--]);
560
561 AvFILLp (av) = -1;
384 SvREFCNT_dec (sv); 562 SvREFCNT_dec (av);
385
386 SvREFCNT_dec (*svp);
387 }
388 } 563 }
389 564
565 SvREFCNT_dec (AvARRAY (padlist)[0]);
566
567 AvFILLp (padlist) = -1;
390 SvREFCNT_dec ((SV*)padlist); 568 SvREFCNT_dec ((SV*)padlist);
391 } 569 }
392} 570}
393 571
394static int 572static int
395coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 573coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
396{ 574{
397 AV *padlist; 575 AV *padlist;
398 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;
399 581
400 /* casting is fun. */ 582 /* casting is fun. */
401 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 583 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
402 free_padlist (aTHX_ padlist); 584 free_padlist (aTHX_ padlist);
403 585
404 SvREFCNT_dec (av); /* sv_magicext increased the refcount */ 586 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
405 587
406 return 0; 588 return 0;
407} 589}
408
409#define CORO_MAGIC_type_cv 26
410#define CORO_MAGIC_type_state PERL_MAGIC_ext
411 590
412static MGVTBL coro_cv_vtbl = { 591static MGVTBL coro_cv_vtbl = {
413 0, 0, 0, 0, 592 0, 0, 0, 0,
414 coro_cv_free 593 coro_cv_free
415}; 594};
416 595
417#define CORO_MAGIC_NN(sv, type) \
418 (expect_true (SvMAGIC (sv)->mg_type == type) \
419 ? SvMAGIC (sv) \
420 : mg_find (sv, type))
421
422#define CORO_MAGIC(sv, type) \
423 (expect_true (SvMAGIC (sv)) \
424 ? CORO_MAGIC_NN (sv, type) \
425 : 0)
426
427#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
428#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
429
430INLINE struct coro *
431SvSTATE_ (pTHX_ SV *coro)
432{
433 HV *stash;
434 MAGIC *mg;
435
436 if (SvROK (coro))
437 coro = SvRV (coro);
438
439 if (expect_false (SvTYPE (coro) != SVt_PVHV))
440 croak ("Coro::State object required");
441
442 stash = SvSTASH (coro);
443 if (expect_false (stash != coro_stash && stash != coro_state_stash))
444 {
445 /* very slow, but rare, check */
446 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
447 croak ("Coro::State object required");
448 }
449
450 mg = CORO_MAGIC_state (coro);
451 return (struct coro *)mg->mg_ptr;
452}
453
454#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
455
456/* faster than SvSTATE, but expects a coroutine hv */
457#define SvSTATE_hv(hv) ((struct coro *)CORO_MAGIC_NN ((SV *)hv, CORO_MAGIC_type_state)->mg_ptr)
458#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
459
460/* the next two functions merely cache the padlists */ 596/* the next two functions merely cache the padlists */
461static void 597ECB_INLINE void
462get_padlist (pTHX_ CV *cv) 598get_padlist (pTHX_ CV *cv)
463{ 599{
464 MAGIC *mg = CORO_MAGIC_cv (cv); 600 MAGIC *mg = CORO_MAGIC_cv (cv);
465 AV *av; 601 AV *av;
466 602
467 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 603 if (ecb_expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0))
468 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 604 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
469 else 605 else
470 { 606 {
471#if CORO_PREFER_PERL_FUNCTIONS 607#if CORO_PREFER_PERL_FUNCTIONS
472 /* this is probably cleaner? but also slower! */ 608 /* this is probably cleaner? but also slower! */
… …
474 CV *cp = Perl_cv_clone (aTHX_ cv); 610 CV *cp = Perl_cv_clone (aTHX_ cv);
475 CvPADLIST (cv) = CvPADLIST (cp); 611 CvPADLIST (cv) = CvPADLIST (cp);
476 CvPADLIST (cp) = 0; 612 CvPADLIST (cp) = 0;
477 SvREFCNT_dec (cp); 613 SvREFCNT_dec (cp);
478#else 614#else
479 CvPADLIST (cv) = coro_clone_padlist (aTHX_ cv); 615 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
480#endif 616#endif
481 } 617 }
482} 618}
483 619
484static void 620ECB_INLINE void
485put_padlist (pTHX_ CV *cv) 621put_padlist (pTHX_ CV *cv)
486{ 622{
487 MAGIC *mg = CORO_MAGIC_cv (cv); 623 MAGIC *mg = CORO_MAGIC_cv (cv);
488 AV *av; 624 AV *av;
489 625
490 if (expect_false (!mg)) 626 if (ecb_expect_false (!mg))
491 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);
492 628
493 av = (AV *)mg->mg_obj; 629 av = (AV *)mg->mg_obj;
494 630
495 if (expect_false (AvFILLp (av) >= AvMAX (av))) 631 if (ecb_expect_false (AvFILLp (av) >= AvMAX (av)))
496 av_extend (av, AvMAX (av) + 1); 632 av_extend (av, AvFILLp (av) + 1);
497 633
498 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 634 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
499} 635}
500 636
501/** 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);
502 692
503static void 693static void
504load_perl (pTHX_ Coro__State c) 694load_perl (pTHX_ Coro__State c)
505{ 695{
506 perl_slots *slot = c->slot; 696 perl_slots *slot = c->slot;
507 c->slot = 0; 697 c->slot = 0;
508 698
509 PL_mainstack = c->mainstack; 699 PL_mainstack = c->mainstack;
510 700
511 GvSV (PL_defgv) = slot->defsv; 701#if CORO_JIT
512 GvAV (PL_defgv) = slot->defav; 702 load_perl_slots (slot);
513 GvSV (PL_errgv) = slot->errsv; 703#else
514 GvSV (irsgv) = slot->irsgv;
515
516 #define VAR(name,type) PL_ ## name = slot->name; 704 #define VARx(name,expr,type) expr = slot->name;
517 # include "state.h" 705 # include "state.h"
518 #undef VAR 706 #undef VARx
707#endif
519 708
520 { 709 {
521 dSP; 710 dSP;
522 711
523 CV *cv; 712 CV *cv;
524 713
525 /* now do the ugly restore mess */ 714 /* now do the ugly restore mess */
526 while (expect_true (cv = (CV *)POPs)) 715 while (ecb_expect_true (cv = (CV *)POPs))
527 { 716 {
528 put_padlist (aTHX_ cv); /* mark this padlist as available */ 717 put_padlist (aTHX_ cv); /* mark this padlist as available */
529 CvDEPTH (cv) = PTR2IV (POPs); 718 CvDEPTH (cv) = PTR2IV (POPs);
530 CvPADLIST (cv) = (AV *)POPs; 719 CvPADLIST (cv) = (AV *)POPs;
531 } 720 }
… …
533 PUTBACK; 722 PUTBACK;
534 } 723 }
535 724
536 slf_frame = c->slf_frame; 725 slf_frame = c->slf_frame;
537 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);
538} 745}
539 746
540static void 747static void
541save_perl (pTHX_ Coro__State c) 748save_perl (pTHX_ Coro__State c)
542{ 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
543 c->except = CORO_THROW; 768 c->except = CORO_THROW;
544 c->slf_frame = slf_frame; 769 c->slf_frame = slf_frame;
545 770
546 { 771 {
547 dSP; 772 dSP;
… …
556 781
557 XPUSHs (Nullsv); 782 XPUSHs (Nullsv);
558 /* this loop was inspired by pp_caller */ 783 /* this loop was inspired by pp_caller */
559 for (;;) 784 for (;;)
560 { 785 {
561 while (expect_true (cxix >= 0)) 786 while (ecb_expect_true (cxix >= 0))
562 { 787 {
563 PERL_CONTEXT *cx = &ccstk[cxix--]; 788 PERL_CONTEXT *cx = &ccstk[cxix--];
564 789
565 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))
566 { 791 {
567 CV *cv = cx->blk_sub.cv; 792 CV *cv = cx->blk_sub.cv;
568 793
569 if (expect_true (CvDEPTH (cv))) 794 if (ecb_expect_true (CvDEPTH (cv)))
570 { 795 {
571 EXTEND (SP, 3); 796 EXTEND (SP, 3);
572 PUSHs ((SV *)CvPADLIST (cv)); 797 PUSHs ((SV *)CvPADLIST (cv));
573 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv))); 798 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
574 PUSHs ((SV *)cv); 799 PUSHs ((SV *)cv);
… …
577 get_padlist (aTHX_ cv); 802 get_padlist (aTHX_ cv);
578 } 803 }
579 } 804 }
580 } 805 }
581 806
582 if (expect_true (top_si->si_type == PERLSI_MAIN)) 807 if (ecb_expect_true (top_si->si_type == PERLSI_MAIN))
583 break; 808 break;
584 809
585 top_si = top_si->si_prev; 810 top_si = top_si->si_prev;
586 ccstk = top_si->si_cxstack; 811 ccstk = top_si->si_cxstack;
587 cxix = top_si->si_cxix; 812 cxix = top_si->si_cxix;
… …
589 814
590 PUTBACK; 815 PUTBACK;
591 } 816 }
592 817
593 /* allocate some space on the context stack for our purposes */ 818 /* allocate some space on the context stack for our purposes */
594 /* we manually unroll here, as usually 2 slots is enough */ 819 if (ecb_expect_false (cxstack_ix + SLOT_COUNT >= cxstack_max))
595 if (SLOT_COUNT >= 1) CXINC;
596 if (SLOT_COUNT >= 2) CXINC;
597 if (SLOT_COUNT >= 3) CXINC;
598 { 820 {
599 int i; 821 unsigned int i;
822
600 for (i = 3; i < SLOT_COUNT; ++i) 823 for (i = 0; i < SLOT_COUNT; ++i)
601 CXINC; 824 CXINC;
602 } 825
603 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 826 cxstack_ix -= SLOT_COUNT; /* undo allocation */
827 }
604 828
605 c->mainstack = PL_mainstack; 829 c->mainstack = PL_mainstack;
606 830
607 { 831 {
608 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 832 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
609 833
610 slot->defav = GvAV (PL_defgv); 834#if CORO_JIT
611 slot->defsv = DEFSV; 835 save_perl_slots (slot);
612 slot->errsv = ERRSV; 836#else
613 slot->irsgv = GvSV (irsgv);
614
615 #define VAR(name,type) slot->name = PL_ ## name; 837 #define VARx(name,expr,type) slot->name = expr;
616 # include "state.h" 838 # include "state.h"
617 #undef VAR 839 #undef VARx
840#endif
618 } 841 }
619} 842}
620 843
621/* 844/*
622 * allocate various perl stacks. This is almost an exact copy 845 * allocate various perl stacks. This is almost an exact copy
… …
628# define coro_init_stacks(thx) init_stacks () 851# define coro_init_stacks(thx) init_stacks ()
629#else 852#else
630static void 853static void
631coro_init_stacks (pTHX) 854coro_init_stacks (pTHX)
632{ 855{
633 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() */
634 PL_curstackinfo->si_type = PERLSI_MAIN; 857 PL_curstackinfo->si_type = PERLSI_MAIN;
635 PL_curstack = PL_curstackinfo->si_stack; 858 PL_curstack = PL_curstackinfo->si_stack;
636 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 859 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
637 860
638 PL_stack_base = AvARRAY(PL_curstack); 861 PL_stack_base = AvARRAY(PL_curstack);
… …
745#endif 968#endif
746 969
747/* 970/*
748 * This overrides the default magic get method of %SIG elements. 971 * This overrides the default magic get method of %SIG elements.
749 * 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
750 * 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),
751 * readback here. 974 * we just provide our own readback here.
752 * We only do this when the hook is != 0, as they are often set to 0 temporarily,
753 * not expecting this to actually change the hook. This is a potential problem
754 * when a schedule happens then, but we ignore this.
755 */ 975 */
756static int 976static int ecb_cold
757coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 977coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
758{ 978{
759 const char *s = MgPV_nolen_const (mg); 979 const char *s = MgPV_nolen_const (mg);
760 980
761 if (*s == '_') 981 if (*s == '_')
… …
773 } 993 }
774 994
775 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 995 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
776} 996}
777 997
778static int 998static int ecb_cold
779coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 999coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
780{ 1000{
781 const char *s = MgPV_nolen_const (mg); 1001 const char *s = MgPV_nolen_const (mg);
782 1002
783 if (*s == '_') 1003 if (*s == '_')
… …
797 } 1017 }
798 1018
799 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0; 1019 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
800} 1020}
801 1021
802static int 1022static int ecb_cold
803coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1023coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
804{ 1024{
805 const char *s = MgPV_nolen_const (mg); 1025 const char *s = MgPV_nolen_const (mg);
806 1026
807 if (*s == '_') 1027 if (*s == '_')
… …
812 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 1032 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
813 1033
814 if (svp) 1034 if (svp)
815 { 1035 {
816 SV *old = *svp; 1036 SV *old = *svp;
817 *svp = newSVsv (sv); 1037 *svp = SvOK (sv) ? newSVsv (sv) : 0;
818 SvREFCNT_dec (old); 1038 SvREFCNT_dec (old);
819 return 0; 1039 return 0;
820 } 1040 }
821 } 1041 }
822 1042
… …
834slf_check_nop (pTHX_ struct CoroSLF *frame) 1054slf_check_nop (pTHX_ struct CoroSLF *frame)
835{ 1055{
836 return 0; 1056 return 0;
837} 1057}
838 1058
839static UNOP coro_setup_op; 1059static int
1060slf_check_repeat (pTHX_ struct CoroSLF *frame)
1061{
1062 return 1;
1063}
840 1064
841static void NOINLINE /* noinline to keep it out of the transfer fast path */ 1065static UNOP init_perl_op;
1066
1067ecb_noinline static void /* noinline to keep it out of the transfer fast path */
842coro_setup (pTHX_ struct coro *coro) 1068init_perl (pTHX_ struct coro *coro)
843{ 1069{
844 /* 1070 /*
845 * emulate part of the perl startup here. 1071 * emulate part of the perl startup here.
846 */ 1072 */
847 coro_init_stacks (aTHX); 1073 coro_init_stacks (aTHX);
848 1074
849 PL_runops = RUNOPS_DEFAULT; 1075 PL_runops = RUNOPS_DEFAULT;
850 PL_curcop = &PL_compiling; 1076 PL_curcop = &PL_compiling;
851 PL_in_eval = EVAL_NULL; 1077 PL_in_eval = EVAL_NULL;
852 PL_comppad = 0; 1078 PL_comppad = 0;
1079 PL_comppad_name = 0;
1080 PL_comppad_name_fill = 0;
1081 PL_comppad_name_floor = 0;
853 PL_curpm = 0; 1082 PL_curpm = 0;
854 PL_curpad = 0; 1083 PL_curpad = 0;
855 PL_localizing = 0; 1084 PL_localizing = 0;
856 PL_dirty = 0;
857 PL_restartop = 0; 1085 PL_restartop = 0;
858#if PERL_VERSION_ATLEAST (5,10,0) 1086#if PERL_VERSION_ATLEAST (5,10,0)
859 PL_parser = 0; 1087 PL_parser = 0;
860#endif 1088#endif
1089 PL_hints = 0;
861 1090
862 /* recreate the die/warn hooks */ 1091 /* recreate the die/warn hooks */
863 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1092 PL_diehook = SvREFCNT_inc (rv_diehook);
864 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1093 PL_warnhook = SvREFCNT_inc (rv_warnhook);
865 1094
866 GvSV (PL_defgv) = newSV (0); 1095 GvSV (PL_defgv) = newSV (0);
867 GvAV (PL_defgv) = coro->args; coro->args = 0; 1096 GvAV (PL_defgv) = coro->args; coro->args = 0;
868 GvSV (PL_errgv) = newSV (0); 1097 GvSV (PL_errgv) = newSV (0);
869 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;
870 PL_rs = newSVsv (GvSV (irsgv)); 1100 PL_rs = newSVsv (GvSV (irsgv));
871 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1101 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
872 1102
873 { 1103 {
874 dSP; 1104 dSP;
… …
889 /* 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
890 * 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.
891 */ 1121 */
892 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 */
893 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;
894 1125
895 /* 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 */
896 coro_setup_op.op_next = PL_op; 1127 init_perl_op.op_next = PL_op;
897 coro_setup_op.op_type = OP_CUSTOM; 1128 init_perl_op.op_type = OP_ENTERSUB;
898 coro_setup_op.op_ppaddr = pp_slf; 1129 init_perl_op.op_ppaddr = pp_slf;
899 /* 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 */
900 1131
901 PL_op = (OP *)&coro_setup_op; 1132 PL_op = (OP *)&init_perl_op;
902 1133
903 /* copy throw, in case it was set before coro_setup */ 1134 /* copy throw, in case it was set before init_perl */
904 CORO_THROW = coro->except; 1135 CORO_THROW = coro->except;
905}
906 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
907static void 1146static void
908coro_destruct (pTHX_ struct coro *coro) 1147coro_unwind_stacks (pTHX)
909{ 1148{
910 if (!IN_DESTRUCT) 1149 if (!IN_DESTRUCT)
911 { 1150 {
912 /* restore all saved variables and stuff */ 1151 /* restore all saved variables and stuff */
913 LEAVE_SCOPE (0); 1152 LEAVE_SCOPE (0);
… …
921 POPSTACK_TO (PL_mainstack); 1160 POPSTACK_TO (PL_mainstack);
922 1161
923 /* unwind main stack */ 1162 /* unwind main stack */
924 dounwind (-1); 1163 dounwind (-1);
925 } 1164 }
1165}
926 1166
927 SvREFCNT_dec (GvSV (PL_defgv)); 1167static void
928 SvREFCNT_dec (GvAV (PL_defgv)); 1168destroy_perl (pTHX_ struct coro *coro)
929 SvREFCNT_dec (GvSV (PL_errgv)); 1169{
930 SvREFCNT_dec (PL_defoutgv); 1170 SV *svf [9];
931 SvREFCNT_dec (PL_rs);
932 SvREFCNT_dec (GvSV (irsgv));
933 1171
934 SvREFCNT_dec (PL_diehook);
935 SvREFCNT_dec (PL_warnhook);
936 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
937 SvREFCNT_dec (coro->saved_deffh); 1215 SvREFCNT_dec (coro->saved_deffh);
938 SvREFCNT_dec (coro->rouse_cb); 1216 SvREFCNT_dec (coro->rouse_cb);
939 SvREFCNT_dec (coro->invoke_cb); 1217 SvREFCNT_dec (coro->invoke_cb);
940 SvREFCNT_dec (coro->invoke_av); 1218 SvREFCNT_dec (coro->invoke_av);
941 1219 }
942 coro_destruct_stacks (aTHX);
943} 1220}
944 1221
945INLINE void 1222ECB_INLINE void
946free_coro_mortal (pTHX) 1223free_coro_mortal (pTHX)
947{ 1224{
948 if (expect_true (coro_mortal)) 1225 if (ecb_expect_true (coro_mortal))
949 { 1226 {
950 SvREFCNT_dec (coro_mortal); 1227 SvREFCNT_dec ((SV *)coro_mortal);
951 coro_mortal = 0; 1228 coro_mortal = 0;
952 } 1229 }
953} 1230}
954 1231
955static int 1232static int
956runops_trace (pTHX) 1233runops_trace (pTHX)
957{ 1234{
958 COP *oldcop = 0; 1235 COP *oldcop = 0;
959 int oldcxix = -2; 1236 int oldcxix = -2;
960 struct coro *coro = SvSTATE_current; /* trace cctx is tied to specific coro */
961 coro_cctx *cctx = coro->cctx;
962 1237
963 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX))) 1238 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX)))
964 { 1239 {
965 PERL_ASYNC_CHECK (); 1240 PERL_ASYNC_CHECK ();
966 1241
967 if (cctx->flags & CC_TRACE_ALL) 1242 if (cctx_current->flags & CC_TRACE_ALL)
968 { 1243 {
969 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)
970 { 1245 {
971 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1246 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
972 SV **bot, **top; 1247 SV **bot, **top;
973 AV *av = newAV (); /* return values */ 1248 AV *av = newAV (); /* return values */
974 SV **cb; 1249 SV **cb;
… …
1011 1286
1012 if (PL_curcop != &PL_compiling) 1287 if (PL_curcop != &PL_compiling)
1013 { 1288 {
1014 SV **cb; 1289 SV **cb;
1015 1290
1016 if (oldcxix != cxstack_ix && cctx->flags & CC_TRACE_SUB) 1291 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB)
1017 { 1292 {
1018 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1293 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1019 1294
1020 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1295 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1021 { 1296 {
1022 runops_proc_t old_runops = PL_runops;
1023 dSP; 1297 dSP;
1024 GV *gv = CvGV (cx->blk_sub.cv); 1298 GV *gv = CvGV (cx->blk_sub.cv);
1025 SV *fullname = sv_2mortal (newSV (0)); 1299 SV *fullname = sv_2mortal (newSV (0));
1026 1300
1027 if (isGV (gv)) 1301 if (isGV (gv))
… …
1045 } 1319 }
1046 1320
1047 oldcxix = cxstack_ix; 1321 oldcxix = cxstack_ix;
1048 } 1322 }
1049 1323
1050 if (cctx->flags & CC_TRACE_LINE) 1324 if (cctx_current->flags & CC_TRACE_LINE)
1051 { 1325 {
1052 dSP; 1326 dSP;
1053 1327
1054 PL_runops = RUNOPS_DEFAULT; 1328 PL_runops = RUNOPS_DEFAULT;
1055 ENTER; 1329 ENTER;
… …
1074 1348
1075 TAINT_NOT; 1349 TAINT_NOT;
1076 return 0; 1350 return 0;
1077} 1351}
1078 1352
1079static struct coro_cctx *cctx_ssl_cctx;
1080static struct CoroSLF cctx_ssl_frame; 1353static struct CoroSLF cctx_ssl_frame;
1081 1354
1082static void 1355static void
1083slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta) 1356slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta)
1084{ 1357{
1085 ta->prev = (struct coro *)cctx_ssl_cctx;
1086 ta->next = 0; 1358 ta->prev = 0;
1087} 1359}
1088 1360
1089static int 1361static int
1090slf_check_set_stacklevel (pTHX_ struct CoroSLF *frame) 1362slf_check_set_stacklevel (pTHX_ struct CoroSLF *frame)
1091{ 1363{
… …
1093 1365
1094 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 */
1095} 1367}
1096 1368
1097/* 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 */
1098static void NOINLINE 1370static void ecb_noinline
1099cctx_prepare (pTHX_ coro_cctx *cctx) 1371cctx_prepare (pTHX)
1100{ 1372{
1101 PL_top_env = &PL_start_env; 1373 PL_top_env = &PL_start_env;
1102 1374
1103 if (cctx->flags & CC_TRACE) 1375 if (cctx_current->flags & CC_TRACE)
1104 PL_runops = runops_trace; 1376 PL_runops = runops_trace;
1105 1377
1106 /* 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
1107 * that can lead to creation of a new cctx */ 1379 * that can lead to creation of a new cctx */
1108 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)",
1109 slf_frame.prepare && PL_op->op_ppaddr == pp_slf)); 1381 slf_frame.prepare && PL_op->op_ppaddr == pp_slf));
1110 1382
1111 /* 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 */
1112 cctx_ssl_cctx = cctx;
1113 cctx_ssl_frame = slf_frame; 1384 cctx_ssl_frame = slf_frame;
1114 1385
1115 slf_frame.prepare = slf_prepare_set_stacklevel; 1386 slf_frame.prepare = slf_prepare_set_stacklevel;
1116 slf_frame.check = slf_check_set_stacklevel; 1387 slf_frame.check = slf_check_set_stacklevel;
1117} 1388}
1118 1389
1119/* 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 */
1120INLINE void 1391ECB_INLINE void
1121transfer_tail (pTHX) 1392transfer_tail (pTHX)
1122{ 1393{
1123 free_coro_mortal (aTHX); 1394 free_coro_mortal (aTHX);
1124} 1395}
1125 1396
… …
1140 /* normally we would need to skip the entersub here */ 1411 /* normally we would need to skip the entersub here */
1141 /* 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 */
1142 /* PL_nop = PL_nop->op_next */ 1413 /* PL_nop = PL_nop->op_next */
1143 1414
1144 /* inject a fake subroutine call to cctx_init */ 1415 /* inject a fake subroutine call to cctx_init */
1145 cctx_prepare (aTHX_ (coro_cctx *)arg); 1416 cctx_prepare (aTHX);
1146 1417
1147 /* cctx_run is the alternative tail of transfer() */ 1418 /* cctx_run is the alternative tail of transfer() */
1148 transfer_tail (aTHX); 1419 transfer_tail (aTHX);
1149 1420
1150 /* 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 */
1151 PL_restartop = PL_op; 1422 PL_restartop = PL_op;
1152 perl_run (PL_curinterp); 1423 perl_run (PL_curinterp);
1153 /* 1424 /*
1154 * 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
1155 * 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.
1156 */ 1428 */
1157 1429
1158 /* 1430 /*
1159 * 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
1160 * 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)
1161 * 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
1162 * bootstrap-time "top" top_env, as we cannot restore the "main" 1434 * bootstrap-time "top" top_env, as we cannot restore the "main"
1163 * 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.
1164 */ 1438 */
1165 PL_top_env = main_top_env; 1439 PL_top_env = main_top_env;
1166 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 */
1167 } 1441 }
1168} 1442}
… …
1245cctx_destroy (coro_cctx *cctx) 1519cctx_destroy (coro_cctx *cctx)
1246{ 1520{
1247 if (!cctx) 1521 if (!cctx)
1248 return; 1522 return;
1249 1523
1524 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1525
1250 --cctx_count; 1526 --cctx_count;
1251 coro_destroy (&cctx->cctx); 1527 coro_destroy (&cctx->cctx);
1252 1528
1253 /* coro_transfer creates new, empty cctx's */ 1529 /* coro_transfer creates new, empty cctx's */
1254 if (cctx->sptr) 1530 if (cctx->sptr)
… …
1272#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))
1273 1549
1274static coro_cctx * 1550static coro_cctx *
1275cctx_get (pTHX) 1551cctx_get (pTHX)
1276{ 1552{
1277 while (expect_true (cctx_first)) 1553 while (ecb_expect_true (cctx_first))
1278 { 1554 {
1279 coro_cctx *cctx = cctx_first; 1555 coro_cctx *cctx = cctx_first;
1280 cctx_first = cctx->next; 1556 cctx_first = cctx->next;
1281 --cctx_idle; 1557 --cctx_idle;
1282 1558
1283 if (expect_true (!CCTX_EXPIRED (cctx))) 1559 if (ecb_expect_true (!CCTX_EXPIRED (cctx)))
1284 return cctx; 1560 return cctx;
1285 1561
1286 cctx_destroy (cctx); 1562 cctx_destroy (cctx);
1287 } 1563 }
1288 1564
… …
1293cctx_put (coro_cctx *cctx) 1569cctx_put (coro_cctx *cctx)
1294{ 1570{
1295 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));
1296 1572
1297 /* free another cctx if overlimit */ 1573 /* free another cctx if overlimit */
1298 if (expect_false (cctx_idle >= cctx_max_idle)) 1574 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1299 { 1575 {
1300 coro_cctx *first = cctx_first; 1576 coro_cctx *first = cctx_first;
1301 cctx_first = first->next; 1577 cctx_first = first->next;
1302 --cctx_idle; 1578 --cctx_idle;
1303 1579
… …
1314static void 1590static void
1315transfer_check (pTHX_ struct coro *prev, struct coro *next) 1591transfer_check (pTHX_ struct coro *prev, struct coro *next)
1316{ 1592{
1317 /* TODO: throwing up here is considered harmful */ 1593 /* TODO: throwing up here is considered harmful */
1318 1594
1319 if (expect_true (prev != next)) 1595 if (ecb_expect_true (prev != next))
1320 { 1596 {
1321 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1597 if (ecb_expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1322 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,");
1323 1599
1324 if (expect_false (next->flags & CF_RUNNING)) 1600 if (ecb_expect_false (next->flags & (CF_RUNNING | CF_ZOMBIE | CF_SUSPENDED)))
1325 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states,");
1326
1327 if (expect_false (next->flags & CF_DESTROYED))
1328 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,");
1329 1602
1330#if !PERL_VERSION_ATLEAST (5,10,0) 1603#if !PERL_VERSION_ATLEAST (5,10,0)
1331 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1604 if (ecb_expect_false (PL_lex_state != LEX_NOTPARSING))
1332 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,");
1333#endif 1606#endif
1334 } 1607 }
1335} 1608}
1336 1609
1337/* always use the TRANSFER macro */ 1610/* always use the TRANSFER macro */
1338static void NOINLINE /* noinline so we have a fixed stackframe */ 1611static void ecb_noinline /* noinline so we have a fixed stackframe */
1339transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1612transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1340{ 1613{
1341 dSTACKLEVEL; 1614 dSTACKLEVEL;
1342 1615
1343 /* sometimes transfer is only called to set idle_sp */ 1616 /* sometimes transfer is only called to set idle_sp */
1344 if (expect_false (!next)) 1617 if (ecb_expect_false (!prev))
1345 { 1618 {
1346 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1619 cctx_current->idle_sp = STACKLEVEL;
1347 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 */
1348 } 1621 }
1349 else if (expect_true (prev != next)) 1622 else if (ecb_expect_true (prev != next))
1350 { 1623 {
1351 coro_cctx *prev__cctx; 1624 coro_cctx *cctx_prev;
1352 1625
1353 if (expect_false (prev->flags & CF_NEW)) 1626 if (ecb_expect_false (prev->flags & CF_NEW))
1354 { 1627 {
1355 /* create a new empty/source context */ 1628 /* create a new empty/source context */
1356 prev->cctx = cctx_new_empty ();
1357 prev->flags &= ~CF_NEW; 1629 prev->flags &= ~CF_NEW;
1358 prev->flags |= CF_RUNNING; 1630 prev->flags |= CF_RUNNING;
1359 } 1631 }
1360 1632
1361 prev->flags &= ~CF_RUNNING; 1633 prev->flags &= ~CF_RUNNING;
1362 next->flags |= CF_RUNNING; 1634 next->flags |= CF_RUNNING;
1363 1635
1364 /* first get rid of the old state */ 1636 /* first get rid of the old state */
1365 save_perl (aTHX_ prev); 1637 save_perl (aTHX_ prev);
1366 1638
1367 if (expect_false (next->flags & CF_NEW)) 1639 if (ecb_expect_false (next->flags & CF_NEW))
1368 { 1640 {
1369 /* need to start coroutine */ 1641 /* need to start coroutine */
1370 next->flags &= ~CF_NEW; 1642 next->flags &= ~CF_NEW;
1371 /* setup coroutine call */ 1643 /* setup coroutine call */
1372 coro_setup (aTHX_ next); 1644 init_perl (aTHX_ next);
1373 } 1645 }
1374 else 1646 else
1375 load_perl (aTHX_ next); 1647 load_perl (aTHX_ next);
1376 1648
1377 prev__cctx = prev->cctx;
1378
1379 /* possibly untie and reuse the cctx */ 1649 /* possibly untie and reuse the cctx */
1380 if (expect_true ( 1650 if (ecb_expect_true (
1381 prev__cctx->idle_sp == STACKLEVEL 1651 cctx_current->idle_sp == STACKLEVEL
1382 && !(prev__cctx->flags & CC_TRACE) 1652 && !(cctx_current->flags & CC_TRACE)
1383 && !force_cctx 1653 && !force_cctx
1384 )) 1654 ))
1385 { 1655 {
1386 /* 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 */
1387 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));
1388 1658
1389 prev->cctx = 0;
1390
1391 /* 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. */
1392 /* 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 */
1393 if (expect_false (CCTX_EXPIRED (prev__cctx))) 1661 if (ecb_expect_false (CCTX_EXPIRED (cctx_current)))
1394 if (!next->cctx) 1662 if (ecb_expect_true (!next->cctx))
1395 next->cctx = cctx_get (aTHX); 1663 next->cctx = cctx_get (aTHX);
1396 1664
1397 cctx_put (prev__cctx); 1665 cctx_put (cctx_current);
1398 } 1666 }
1667 else
1668 prev->cctx = cctx_current;
1399 1669
1400 ++next->usecount; 1670 ++next->usecount;
1401 1671
1402 if (expect_true (!next->cctx)) 1672 cctx_prev = cctx_current;
1403 next->cctx = cctx_get (aTHX); 1673 cctx_current = ecb_expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1404 1674
1405 if (expect_false (prev__cctx != next->cctx)) 1675 next->cctx = 0;
1676
1677 if (ecb_expect_false (cctx_prev != cctx_current))
1406 { 1678 {
1407 prev__cctx->top_env = PL_top_env; 1679 cctx_prev->top_env = PL_top_env;
1408 PL_top_env = next->cctx->top_env; 1680 PL_top_env = cctx_current->top_env;
1409 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1681 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1410 } 1682 }
1411 1683
1412 transfer_tail (aTHX); 1684 transfer_tail (aTHX);
1413 } 1685 }
1414} 1686}
… …
1416#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))
1417#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1689#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1418 1690
1419/** high level stuff ********************************************************/ 1691/** high level stuff ********************************************************/
1420 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 */
1421static int 1695static void
1696coro_call_on_destroy (pTHX_ struct coro *coro);
1697
1698static void
1422coro_state_destroy (pTHX_ struct coro *coro) 1699coro_state_destroy (pTHX_ struct coro *coro)
1423{ 1700{
1424 if (coro->flags & CF_DESTROYED) 1701 if (coro->flags & CF_ZOMBIE)
1425 return 0; 1702 return;
1426 1703
1427 if (coro->on_destroy)
1428 coro->on_destroy (aTHX_ coro); 1704 slf_destroy (aTHX_ coro);
1429 1705
1430 coro->flags |= CF_DESTROYED; 1706 coro->flags |= CF_ZOMBIE;
1431 1707
1432 if (coro->flags & CF_READY) 1708 if (coro->flags & CF_READY)
1433 { 1709 {
1434 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1710 /* reduce nready, as destroying a ready coro effectively unreadies it */
1435 /* alternative: look through all ready queues and remove the coro */ 1711 /* alternative: look through all ready queues and remove the coro */
1436 --coro_nready; 1712 --coro_nready;
1437 } 1713 }
1438 else 1714 else
1439 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 */
1440 1716
1441 if (coro->mainstack && coro->mainstack != main_mainstack) 1717 if (coro->next) coro->next->prev = coro->prev;
1442 { 1718 if (coro->prev) coro->prev->next = coro->next;
1443 struct coro temp; 1719 if (coro == coro_first) coro_first = coro->next;
1444 1720
1445 assert (("FATAL: tried to destroy currently running coroutine (please report)", !(coro->flags & CF_RUNNING))); 1721 if (coro->mainstack
1446 1722 && coro->mainstack != main_mainstack
1447 save_perl (aTHX_ &temp); 1723 && coro->slot
1724 && !PL_dirty)
1448 load_perl (aTHX_ coro); 1725 destroy_perl (aTHX_ coro);
1449
1450 coro_destruct (aTHX_ coro);
1451
1452 load_perl (aTHX_ &temp);
1453
1454 coro->slot = 0;
1455 }
1456 1726
1457 cctx_destroy (coro->cctx); 1727 cctx_destroy (coro->cctx);
1458 SvREFCNT_dec (coro->startcv); 1728 SvREFCNT_dec (coro->startcv);
1459 SvREFCNT_dec (coro->args); 1729 SvREFCNT_dec (coro->args);
1730 SvREFCNT_dec (coro->swap_sv);
1460 SvREFCNT_dec (CORO_THROW); 1731 SvREFCNT_dec (CORO_THROW);
1461 1732
1462 if (coro->next) coro->next->prev = coro->prev; 1733 coro_call_on_destroy (aTHX_ coro);
1463 if (coro->prev) coro->prev->next = coro->next;
1464 if (coro == coro_first) coro_first = coro->next;
1465 1734
1466 return 1; 1735 /* more destruction mayhem in coro_state_free */
1467} 1736}
1468 1737
1469static int 1738static int
1470coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1739coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1471{ 1740{
1472 struct coro *coro = (struct coro *)mg->mg_ptr; 1741 struct coro *coro = (struct coro *)mg->mg_ptr;
1473 mg->mg_ptr = 0; 1742 mg->mg_ptr = 0;
1474 1743
1475 coro->hv = 0;
1476
1477 if (--coro->refcnt < 0)
1478 {
1479 coro_state_destroy (aTHX_ coro); 1744 coro_state_destroy (aTHX_ coro);
1745 SvREFCNT_dec (coro->on_destroy);
1746 SvREFCNT_dec (coro->status);
1747
1480 Safefree (coro); 1748 Safefree (coro);
1481 }
1482 1749
1483 return 0; 1750 return 0;
1484} 1751}
1485 1752
1486static int 1753static int ecb_cold
1487coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1754coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1488{ 1755{
1489 struct coro *coro = (struct coro *)mg->mg_ptr; 1756 /* called when perl clones the current process the slow way (windows process emulation) */
1490 1757 /* WE SIMply nuke the pointers in the copy, causing perl to croak */
1491 ++coro->refcnt; 1758 mg->mg_ptr = 0;
1759 mg->mg_virtual = 0;
1492 1760
1493 return 0; 1761 return 0;
1494} 1762}
1495 1763
1496static MGVTBL coro_state_vtbl = { 1764static MGVTBL coro_state_vtbl = {
… …
1519 1787
1520 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1788 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1521 TRANSFER (ta, 1); 1789 TRANSFER (ta, 1);
1522} 1790}
1523 1791
1524/*****************************************************************************/
1525/* gensub: simple closure generation utility */
1526
1527#define GENSUB_ARG CvXSUBANY (cv).any_ptr
1528
1529/* create a closure from XS, returns a code reference */
1530/* the arg can be accessed via GENSUB_ARG from the callback */
1531/* the callback must use dXSARGS/XSRETURN */
1532static SV *
1533gensub (pTHX_ void (*xsub)(pTHX_ CV *), void *arg)
1534{
1535 CV *cv = (CV *)newSV (0);
1536
1537 sv_upgrade ((SV *)cv, SVt_PVCV);
1538
1539 CvANON_on (cv);
1540 CvISXSUB_on (cv);
1541 CvXSUB (cv) = xsub;
1542 GENSUB_ARG = arg;
1543
1544 return newRV_noinc ((SV *)cv);
1545}
1546
1547/** Coro ********************************************************************/ 1792/** Coro ********************************************************************/
1548 1793
1549INLINE void 1794ECB_INLINE void
1550coro_enq (pTHX_ struct coro *coro) 1795coro_enq (pTHX_ struct coro *coro)
1551{ 1796{
1552 av_push (coro_ready [coro->prio - PRIO_MIN], SvREFCNT_inc_NN (coro->hv)); 1797 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1553}
1554 1798
1555INLINE 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 *
1556coro_deq (pTHX) 1807coro_deq (pTHX)
1557{ 1808{
1558 int prio; 1809 int prio;
1559 1810
1560 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; ) 1811 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
1561 if (AvFILLp (coro_ready [prio]) >= 0) 1812 {
1562 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 }
1563 1822
1564 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;
1565} 1841}
1566 1842
1567static int 1843static int
1568api_ready (pTHX_ SV *coro_sv) 1844api_ready (pTHX_ SV *coro_sv)
1569{ 1845{
1570 struct coro *coro;
1571 SV *sv_hook;
1572 void (*xs_hook)(void);
1573
1574 if (SvROK (coro_sv))
1575 coro_sv = SvRV (coro_sv);
1576
1577 coro = SvSTATE (coro_sv); 1846 struct coro *coro = SvSTATE (coro_sv);
1578 1847
1579 if (coro->flags & CF_READY) 1848 if (coro->flags & CF_READY)
1580 return 0; 1849 return 0;
1581 1850
1582 coro->flags |= CF_READY; 1851 coro->flags |= CF_READY;
1583 1852
1584 sv_hook = coro_nready ? 0 : coro_readyhook;
1585 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1586
1587 coro_enq (aTHX_ coro); 1853 coro_enq (aTHX_ coro);
1588 ++coro_nready;
1589 1854
1590 if (sv_hook) 1855 if (!coro_nready++)
1591 { 1856 if (coroapi.readyhook)
1592 dSP; 1857 coroapi.readyhook ();
1593
1594 ENTER;
1595 SAVETMPS;
1596
1597 PUSHMARK (SP);
1598 PUTBACK;
1599 call_sv (sv_hook, G_VOID | G_DISCARD);
1600
1601 FREETMPS;
1602 LEAVE;
1603 }
1604
1605 if (xs_hook)
1606 xs_hook ();
1607 1858
1608 return 1; 1859 return 1;
1609} 1860}
1610 1861
1611static int 1862static int
1612api_is_ready (pTHX_ SV *coro_sv) 1863api_is_ready (pTHX_ SV *coro_sv)
1613{ 1864{
1614 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1865 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1615} 1866}
1616 1867
1868/* expects to own a reference to next->hv */
1617INLINE void 1869ECB_INLINE void
1618prepare_schedule (pTHX_ struct coro_transfer_args *ta) 1870prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1619{ 1871{
1620 SV *prev_sv, *next_sv;
1621
1622 for (;;)
1623 {
1624 next_sv = coro_deq (aTHX);
1625
1626 /* nothing to schedule: call the idle handler */
1627 if (expect_false (!next_sv))
1628 {
1629 dSP;
1630
1631 ENTER;
1632 SAVETMPS;
1633
1634 PUSHMARK (SP);
1635 PUTBACK;
1636 call_sv (get_sv ("Coro::idle", FALSE), G_VOID | G_DISCARD);
1637
1638 FREETMPS;
1639 LEAVE;
1640 continue;
1641 }
1642
1643 ta->next = SvSTATE_hv (next_sv);
1644
1645 /* cannot transfer to destroyed coros, skip and look for next */
1646 if (expect_false (ta->next->flags & CF_DESTROYED))
1647 {
1648 SvREFCNT_dec (next_sv);
1649 /* coro_nready has already been taken care of by destroy */
1650 continue;
1651 }
1652
1653 --coro_nready;
1654 break;
1655 }
1656
1657 /* free this only after the transfer */
1658 prev_sv = SvRV (coro_current); 1872 SV *prev_sv = SvRV (coro_current);
1873
1659 ta->prev = SvSTATE_hv (prev_sv); 1874 ta->prev = SvSTATE_hv (prev_sv);
1875 ta->next = next;
1876
1660 TRANSFER_CHECK (*ta); 1877 TRANSFER_CHECK (*ta);
1661 assert (("FATAL: next coroutine isn't marked as ready in Coro (please report)", ta->next->flags & CF_READY)); 1878
1662 ta->next->flags &= ~CF_READY;
1663 SvRV_set (coro_current, next_sv); 1879 SvRV_set (coro_current, (SV *)next->hv);
1664 1880
1665 free_coro_mortal (aTHX); 1881 free_coro_mortal (aTHX);
1666 coro_mortal = prev_sv; 1882 coro_mortal = prev_sv;
1667} 1883}
1668 1884
1885static void
1886prepare_schedule (pTHX_ struct coro_transfer_args *ta)
1887{
1888 for (;;)
1889 {
1890 struct coro *next = coro_deq (aTHX);
1891
1892 if (ecb_expect_true (next))
1893 {
1894 /* cannot transfer to destroyed coros, skip and look for next */
1895 if (ecb_expect_false (next->flags & (CF_ZOMBIE | CF_SUSPENDED)))
1896 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1897 else
1898 {
1899 next->flags &= ~CF_READY;
1900 --coro_nready;
1901
1902 prepare_schedule_to (aTHX_ ta, next);
1903 break;
1904 }
1905 }
1906 else
1907 {
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*/
1922 dSP;
1923
1924 ENTER;
1925 SAVETMPS;
1926
1927 PUSHMARK (SP);
1928 PUTBACK;
1929 call_sv (sv_idle, G_VOID | G_DISCARD);
1930
1931 FREETMPS;
1932 LEAVE;
1933 }
1934 }
1935 }
1936}
1937
1669INLINE void 1938ECB_INLINE void
1670prepare_cede (pTHX_ struct coro_transfer_args *ta) 1939prepare_cede (pTHX_ struct coro_transfer_args *ta)
1671{ 1940{
1672 api_ready (aTHX_ coro_current); 1941 api_ready (aTHX_ coro_current);
1673 prepare_schedule (aTHX_ ta); 1942 prepare_schedule (aTHX_ ta);
1674} 1943}
1675 1944
1676INLINE void 1945ECB_INLINE void
1677prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 1946prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1678{ 1947{
1679 SV *prev = SvRV (coro_current); 1948 SV *prev = SvRV (coro_current);
1680 1949
1681 if (coro_nready) 1950 if (coro_nready)
… …
1694 1963
1695 prepare_schedule (aTHX_ &ta); 1964 prepare_schedule (aTHX_ &ta);
1696 TRANSFER (ta, 1); 1965 TRANSFER (ta, 1);
1697} 1966}
1698 1967
1968static void
1969api_schedule_to (pTHX_ SV *coro_sv)
1970{
1971 struct coro_transfer_args ta;
1972 struct coro *next = SvSTATE (coro_sv);
1973
1974 SvREFCNT_inc_NN (coro_sv);
1975 prepare_schedule_to (aTHX_ &ta, next);
1976}
1977
1699static int 1978static int
1700api_cede (pTHX) 1979api_cede (pTHX)
1701{ 1980{
1702 struct coro_transfer_args ta; 1981 struct coro_transfer_args ta;
1703 1982
1704 prepare_cede (aTHX_ &ta); 1983 prepare_cede (aTHX_ &ta);
1705 1984
1706 if (expect_true (ta.prev != ta.next)) 1985 if (ecb_expect_true (ta.prev != ta.next))
1707 { 1986 {
1708 TRANSFER (ta, 1); 1987 TRANSFER (ta, 1);
1709 return 1; 1988 return 1;
1710 } 1989 }
1711 else 1990 else
… …
1730static void 2009static void
1731api_trace (pTHX_ SV *coro_sv, int flags) 2010api_trace (pTHX_ SV *coro_sv, int flags)
1732{ 2011{
1733 struct coro *coro = SvSTATE (coro_sv); 2012 struct coro *coro = SvSTATE (coro_sv);
1734 2013
2014 if (coro->flags & CF_RUNNING)
2015 croak ("cannot enable tracing on a running coroutine, caught");
2016
1735 if (flags & CC_TRACE) 2017 if (flags & CC_TRACE)
1736 { 2018 {
1737 if (!coro->cctx) 2019 if (!coro->cctx)
1738 coro->cctx = cctx_new_run (); 2020 coro->cctx = cctx_new_run ();
1739 else if (!(coro->cctx->flags & CC_TRACE)) 2021 else if (!(coro->cctx->flags & CC_TRACE))
1740 croak ("cannot enable tracing on coroutine with custom stack,"); 2022 croak ("cannot enable tracing on coroutine with custom stack, caught");
1741 2023
1742 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL)); 2024 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL));
1743 } 2025 }
1744 else if (coro->cctx && coro->cctx->flags & CC_TRACE) 2026 else if (coro->cctx && coro->cctx->flags & CC_TRACE)
1745 { 2027 {
… …
1748 if (coro->flags & CF_RUNNING) 2030 if (coro->flags & CF_RUNNING)
1749 PL_runops = RUNOPS_DEFAULT; 2031 PL_runops = RUNOPS_DEFAULT;
1750 else 2032 else
1751 coro->slot->runops = RUNOPS_DEFAULT; 2033 coro->slot->runops = RUNOPS_DEFAULT;
1752 } 2034 }
2035}
2036
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
2114coro_call_on_destroy (pTHX_ struct coro *coro)
2115{
2116 AV *od = coro->on_destroy;
2117
2118 if (!od)
2119 return;
2120
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
2129 {
2130 dSP; /* don't disturb outer sp */
2131 PUSHMARK (SP);
2132
2133 if (coro->status)
2134 {
2135 PUTBACK;
2136 coro_push_av (aTHX_ coro->status, G_ARRAY);
2137 SPAGAIN;
2138 }
2139
2140 PUTBACK;
2141 call_sv (cb, G_VOID | G_DISCARD);
2142 }
2143 }
2144}
2145
2146static void
2147coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
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 {
2162 int i;
2163
2164 av_extend (av, items - 1);
2165
2166 for (i = 0; i < items; ++i)
2167 av_push (av, SvREFCNT_inc_NN (arg [i]));
2168 }
2169}
2170
2171static void
2172slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2173{
2174 av_push (av_destroy, (SV *)newRV_inc ((SV *)coro_hv)); /* RVinc for perl */
2175 api_ready (aTHX_ sv_manager);
2176
2177 frame->prepare = prepare_schedule;
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;
1753} 2286}
1754 2287
1755/*****************************************************************************/ 2288/*****************************************************************************/
1756/* async pool handler */ 2289/* async pool handler */
1757 2290
… …
1788slf_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)
1789{ 2322{
1790 HV *hv = (HV *)SvRV (coro_current); 2323 HV *hv = (HV *)SvRV (coro_current);
1791 struct coro *coro = SvSTATE_hv ((SV *)hv); 2324 struct coro *coro = SvSTATE_hv ((SV *)hv);
1792 2325
1793 if (expect_true (coro->saved_deffh)) 2326 if (ecb_expect_true (coro->saved_deffh))
1794 { 2327 {
1795 /* subsequent iteration */ 2328 /* subsequent iteration */
1796 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2329 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1797 coro->saved_deffh = 0; 2330 coro->saved_deffh = 0;
1798 2331
1799 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 2332 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
1800 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2333 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1801 { 2334 {
1802 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate); 2335 slf_init_terminate_cancel_common (aTHX_ frame, hv);
1803 coro->invoke_av = newAV (); 2336 return;
1804
1805 frame->prepare = prepare_nop;
1806 } 2337 }
1807 else 2338 else
1808 { 2339 {
1809 av_clear (GvAV (PL_defgv)); 2340 av_clear (GvAV (PL_defgv));
1810 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);
… …
1835 2366
1836static void 2367static void
1837coro_rouse_callback (pTHX_ CV *cv) 2368coro_rouse_callback (pTHX_ CV *cv)
1838{ 2369{
1839 dXSARGS; 2370 dXSARGS;
1840 SV *data = (SV *)GENSUB_ARG; 2371 SV *data = (SV *)S_GENSUB_ARG;
1841 2372
1842 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2373 if (SvTYPE (SvRV (data)) != SVt_PVAV)
1843 { 2374 {
1844 /* first call, set args */ 2375 /* first call, set args */
2376 SV *coro = SvRV (data);
1845 AV *av = newAV (); 2377 AV *av = newAV ();
1846 SV *coro = SvRV (data);
1847 2378
1848 SvRV_set (data, (SV *)av); 2379 SvRV_set (data, (SV *)av);
1849 api_ready (aTHX_ coro);
1850 SvREFCNT_dec (coro);
1851 2380
1852 /* better take a full copy of the arguments */ 2381 /* better take a full copy of the arguments */
1853 while (items--) 2382 while (items--)
1854 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);
1855 } 2387 }
1856 2388
1857 XSRETURN_EMPTY; 2389 XSRETURN_EMPTY;
1858} 2390}
1859 2391
… …
1876 2408
1877 EXTEND (SP, AvFILLp (av) + 1); 2409 EXTEND (SP, AvFILLp (av) + 1);
1878 for (i = 0; i <= AvFILLp (av); ++i) 2410 for (i = 0; i <= AvFILLp (av); ++i)
1879 PUSHs (sv_2mortal (AvARRAY (av)[i])); 2411 PUSHs (sv_2mortal (AvARRAY (av)[i]));
1880 2412
1881 /* 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 */
1882 AvFILLp (av) = -1; 2414 AvFILLp (av) = -1;
1883 av_undef (av); 2415 av_undef (av);
1884 2416
1885 PUTBACK; 2417 PUTBACK;
1886 } 2418 }
… …
1910 || SvTYPE (SvRV (cb)) != SVt_PVCV 2442 || SvTYPE (SvRV (cb)) != SVt_PVCV
1911 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2443 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
1912 croak ("Coro::rouse_wait called with illegal callback argument,"); 2444 croak ("Coro::rouse_wait called with illegal callback argument,");
1913 2445
1914 { 2446 {
1915 CV *cv = (CV *)SvRV (cb); /* for GENSUB_ARG */ 2447 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
1916 SV *data = (SV *)GENSUB_ARG; 2448 SV *data = (SV *)S_GENSUB_ARG;
1917 2449
1918 frame->data = (void *)data; 2450 frame->data = (void *)data;
1919 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule; 2451 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
1920 frame->check = slf_check_rouse_wait; 2452 frame->check = slf_check_rouse_wait;
1921 } 2453 }
… …
1925coro_new_rouse_cb (pTHX) 2457coro_new_rouse_cb (pTHX)
1926{ 2458{
1927 HV *hv = (HV *)SvRV (coro_current); 2459 HV *hv = (HV *)SvRV (coro_current);
1928 struct coro *coro = SvSTATE_hv (hv); 2460 struct coro *coro = SvSTATE_hv (hv);
1929 SV *data = newRV_inc ((SV *)hv); 2461 SV *data = newRV_inc ((SV *)hv);
1930 SV *cb = gensub (aTHX_ coro_rouse_callback, (void *)data); 2462 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
1931 2463
1932 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);
1933 SvREFCNT_dec (data); /* magicext increases the refcount */ 2465 SvREFCNT_dec (data); /* magicext increases the refcount */
1934 2466
1935 SvREFCNT_dec (coro->rouse_cb); 2467 SvREFCNT_dec (coro->rouse_cb);
… …
1993 frame->prepare = prepare_schedule; 2525 frame->prepare = prepare_schedule;
1994 frame->check = slf_check_nop; 2526 frame->check = slf_check_nop;
1995} 2527}
1996 2528
1997static void 2529static void
2530slf_prepare_schedule_to (pTHX_ struct coro_transfer_args *ta)
2531{
2532 struct coro *next = (struct coro *)slf_frame.data;
2533
2534 SvREFCNT_inc_NN (next->hv);
2535 prepare_schedule_to (aTHX_ ta, next);
2536}
2537
2538static void
2539slf_init_schedule_to (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2540{
2541 if (!items)
2542 croak ("Coro::schedule_to expects a coroutine argument, caught");
2543
2544 frame->data = (void *)SvSTATE (arg [0]);
2545 frame->prepare = slf_prepare_schedule_to;
2546 frame->check = slf_check_nop;
2547}
2548
2549static void
2550slf_init_cede_to (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2551{
2552 api_ready (aTHX_ SvRV (coro_current));
2553
2554 slf_init_schedule_to (aTHX_ frame, cv, arg, items);
2555}
2556
2557static void
1998slf_init_cede (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2558slf_init_cede (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1999{ 2559{
2000 frame->prepare = prepare_cede; 2560 frame->prepare = prepare_cede;
2001 frame->check = slf_check_nop; 2561 frame->check = slf_check_nop;
2002} 2562}
… …
2004static void 2564static void
2005slf_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)
2006{ 2566{
2007 frame->prepare = prepare_cede_notself; 2567 frame->prepare = prepare_cede_notself;
2008 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;
2009} 2586}
2010 2587
2011/* 2588/*
2012 * these not obviously related functions are all rolled into one 2589 * these not obviously related functions are all rolled into one
2013 * 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
… …
2020 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 */
2021 2598
2022 /* 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 */
2023 /* the latter happens when a new coro has been started */ 2600 /* the latter happens when a new coro has been started */
2024 /* or when a new cctx was attached to an existing coroutine */ 2601 /* or when a new cctx was attached to an existing coroutine */
2025 if (expect_true (!slf_frame.prepare)) 2602 if (ecb_expect_true (!slf_frame.prepare))
2026 { 2603 {
2027 /* first iteration */ 2604 /* first iteration */
2028 dSP; 2605 dSP;
2029 SV **arg = PL_stack_base + TOPMARK + 1; 2606 SV **arg = PL_stack_base + TOPMARK + 1;
2030 int items = SP - arg; /* args without function object */ 2607 int items = SP - arg; /* args without function object */
… …
2071 while (slf_frame.check (aTHX_ &slf_frame)); 2648 while (slf_frame.check (aTHX_ &slf_frame));
2072 2649
2073 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 */
2074 2651
2075 /* exception handling */ 2652 /* exception handling */
2076 if (expect_false (CORO_THROW)) 2653 if (ecb_expect_false (CORO_THROW))
2077 { 2654 {
2078 SV *exception = sv_2mortal (CORO_THROW); 2655 SV *exception = sv_2mortal (CORO_THROW);
2079 2656
2080 CORO_THROW = 0; 2657 CORO_THROW = 0;
2081 sv_setsv (ERRSV, exception); 2658 sv_setsv (ERRSV, exception);
2082 croak (0); 2659 croak (0);
2083 } 2660 }
2084 2661
2085 /* return value handling - mostly like entersub */ 2662 /* return value handling - mostly like entersub */
2086 /* make sure we put something on the stack in scalar context */ 2663 /* make sure we put something on the stack in scalar context */
2087 if (GIMME_V == G_SCALAR) 2664 if (GIMME_V == G_SCALAR
2665 && ecb_expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2088 { 2666 {
2089 dSP; 2667 dSP;
2090 SV **bot = PL_stack_base + checkmark; 2668 SV **bot = PL_stack_base + checkmark;
2091 2669
2092 if (sp == bot) /* too few, push undef */ 2670 if (sp == bot) /* too few, push undef */
2093 bot [1] = &PL_sv_undef; 2671 bot [1] = &PL_sv_undef;
2094 else if (sp != bot + 1) /* too many, take last one */ 2672 else /* too many, take last one */
2095 bot [1] = *sp; 2673 bot [1] = *sp;
2096 2674
2097 SP = bot + 1; 2675 SP = bot + 1;
2098 2676
2099 PUTBACK; 2677 PUTBACK;
… …
2132 if (PL_op->op_flags & OPf_STACKED) 2710 if (PL_op->op_flags & OPf_STACKED)
2133 { 2711 {
2134 if (items > slf_arga) 2712 if (items > slf_arga)
2135 { 2713 {
2136 slf_arga = items; 2714 slf_arga = items;
2137 free (slf_argv); 2715 Safefree (slf_argv);
2138 slf_argv = malloc (slf_arga * sizeof (SV *)); 2716 New (0, slf_argv, slf_arga, SV *);
2139 } 2717 }
2140 2718
2141 slf_argc = items; 2719 slf_argc = items;
2142 2720
2143 for (i = 0; i < items; ++i) 2721 for (i = 0; i < items; ++i)
… …
2145 } 2723 }
2146 else 2724 else
2147 slf_argc = 0; 2725 slf_argc = 0;
2148 2726
2149 PL_op->op_ppaddr = pp_slf; 2727 PL_op->op_ppaddr = pp_slf;
2150 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 */
2151 2729
2152 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));
2153} 2778}
2154 2779
2155/*****************************************************************************/ 2780/*****************************************************************************/
2156/* PerlIO::cede */ 2781/* PerlIO::cede */
2157 2782
… …
2159{ 2784{
2160 PerlIOBuf base; 2785 PerlIOBuf base;
2161 NV next, every; 2786 NV next, every;
2162} PerlIOCede; 2787} PerlIOCede;
2163 2788
2164static IV 2789static IV ecb_cold
2165PerlIOCede_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)
2166{ 2791{
2167 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2792 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2168 2793
2169 self->every = SvCUR (arg) ? SvNV (arg) : 0.01; 2794 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
2170 self->next = nvtime () + self->every; 2795 self->next = nvtime () + self->every;
2171 2796
2172 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab); 2797 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
2173} 2798}
2174 2799
2175static SV * 2800static SV * ecb_cold
2176PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags) 2801PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
2177{ 2802{
2178 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2803 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2179 2804
2180 return newSVnv (self->every); 2805 return newSVnv (self->every);
… …
2231/* Coro::Semaphore & Coro::Signal */ 2856/* Coro::Semaphore & Coro::Signal */
2232 2857
2233static SV * 2858static SV *
2234coro_waitarray_new (pTHX_ int count) 2859coro_waitarray_new (pTHX_ int count)
2235{ 2860{
2236 /* 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 */
2237 AV *av = newAV (); 2862 AV *av = newAV ();
2238 SV **ary; 2863 SV **ary;
2239 2864
2240 /* unfortunately, building manually saves memory */ 2865 /* unfortunately, building manually saves memory */
2241 Newx (ary, 2, SV *); 2866 Newx (ary, 2, SV *);
2242 AvALLOC (av) = ary; 2867 AvALLOC (av) = ary;
2868#if PERL_VERSION_ATLEAST (5,10,0)
2243 /*AvARRAY (av) = ary;*/ 2869 AvARRAY (av) = ary;
2870#else
2244 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
2245 AvMAX (av) = 1; 2875 AvMAX (av) = 1;
2246 AvFILLp (av) = 0; 2876 AvFILLp (av) = 0;
2247 ary [0] = newSViv (count); 2877 ary [0] = newSViv (count);
2248 2878
2249 return newRV_noinc ((SV *)av); 2879 return newRV_noinc ((SV *)av);
… …
2287 SvREFCNT_dec (cb); 2917 SvREFCNT_dec (cb);
2288 } 2918 }
2289} 2919}
2290 2920
2291static void 2921static void
2292coro_semaphore_on_destroy (pTHX_ struct coro *coro) 2922coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2293{ 2923{
2294 /* call $sem->adjust (0) to possibly wake up some other waiters */ 2924 /* call $sem->adjust (0) to possibly wake up some other waiters */
2295 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 2925 coro_semaphore_adjust (aTHX_ (AV *)frame->data, 0);
2296} 2926}
2297 2927
2298static int 2928static int
2299slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire) 2929slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2300{ 2930{
2301 AV *av = (AV *)frame->data; 2931 AV *av = (AV *)frame->data;
2302 SV *count_sv = AvARRAY (av)[0]; 2932 SV *count_sv = AvARRAY (av)[0];
2933 SV *coro_hv = SvRV (coro_current);
2303 2934
2304 /* 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 */
2305 if (CORO_THROW) 2936 if (CORO_THROW)
2306 return 0; 2937 return 0;
2307 else if (SvIVX (count_sv) > 0) 2938 else if (SvIVX (count_sv) > 0)
2308 { 2939 {
2309 SvSTATE_current->on_destroy = 0; 2940 frame->destroy = 0;
2310 2941
2311 if (acquire) 2942 if (acquire)
2312 SvIVX (count_sv) = SvIVX (count_sv) - 1; 2943 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2313 else 2944 else
2314 coro_semaphore_adjust (aTHX_ av, 0); 2945 coro_semaphore_adjust (aTHX_ av, 0);
… …
2319 { 2950 {
2320 int i; 2951 int i;
2321 /* 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 */
2322 /* 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 */
2323 /* this avoids some degenerate memory usage cases */ 2954 /* this avoids some degenerate memory usage cases */
2324 2955 for (i = AvFILLp (av); i > 0; --i) // i > 0 is not an off-by-one bug
2325 for (i = 1; i <= AvFILLp (av); ++i)
2326 if (AvARRAY (av)[i] == SvRV (coro_current)) 2956 if (AvARRAY (av)[i] == coro_hv)
2327 return 1; 2957 return 1;
2328 2958
2329 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2959 av_push (av, SvREFCNT_inc (coro_hv));
2330 return 1; 2960 return 1;
2331 } 2961 }
2332} 2962}
2333 2963
2334static int 2964static int
… …
2357 { 2987 {
2358 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2988 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2359 2989
2360 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 2990 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2361 frame->prepare = prepare_schedule; 2991 frame->prepare = prepare_schedule;
2362
2363 /* to avoid race conditions when a woken-up coro gets terminated */ 2992 /* to avoid race conditions when a woken-up coro gets terminated */
2364 /* we arrange for a temporary on_destroy that calls adjust (0) */ 2993 /* we arrange for a temporary on_destroy that calls adjust (0) */
2365 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 2994 frame->destroy = coro_semaphore_destroy;
2366 } 2995 }
2367} 2996}
2368 2997
2369static void 2998static void
2370slf_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)
… …
2378{ 3007{
2379 if (items >= 2) 3008 if (items >= 2)
2380 { 3009 {
2381 /* callback form */ 3010 /* callback form */
2382 AV *av = (AV *)SvRV (arg [0]); 3011 AV *av = (AV *)SvRV (arg [0]);
2383 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 3012 SV *cb_cv = s_get_cv_croak (arg [1]);
2384 3013
2385 av_push (av, (SV *)SvREFCNT_inc_NN (cb_cv)); 3014 av_push (av, SvREFCNT_inc_NN (cb_cv));
2386 3015
2387 if (SvIVX (AvARRAY (av)[0]) > 0) 3016 if (SvIVX (AvARRAY (av)[0]) > 0)
2388 coro_semaphore_adjust (aTHX_ av, 0); 3017 coro_semaphore_adjust (aTHX_ av, 0);
2389 3018
2390 frame->prepare = prepare_nop; 3019 frame->prepare = prepare_nop;
… …
2414 AvARRAY (av)[0] = AvARRAY (av)[1]; 3043 AvARRAY (av)[0] = AvARRAY (av)[1];
2415 AvARRAY (av)[1] = cb; 3044 AvARRAY (av)[1] = cb;
2416 3045
2417 cb = av_shift (av); 3046 cb = av_shift (av);
2418 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 {
2419 api_ready (aTHX_ cb); 3058 api_ready (aTHX_ cb);
2420 sv_setiv (cb, 0); /* signal waiter */ 3059 sv_setiv (cb, 0); /* signal waiter */
3060 }
3061
2421 SvREFCNT_dec (cb); 3062 SvREFCNT_dec (cb);
2422 3063
2423 --count; 3064 --count;
2424 } 3065 }
2425} 3066}
… …
2434static void 3075static void
2435slf_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)
2436{ 3077{
2437 AV *av = (AV *)SvRV (arg [0]); 3078 AV *av = (AV *)SvRV (arg [0]);
2438 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
2439 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]))
2440 { 3092 {
2441 SvIVX (AvARRAY (av)[0]) = 0; 3093 SvIVX (AvARRAY (av)[0]) = 0;
2442 frame->prepare = prepare_nop; 3094 frame->prepare = prepare_nop;
2443 frame->check = slf_check_nop; 3095 frame->check = slf_check_nop;
2444 } 3096 }
2445 else 3097 else
2446 { 3098 {
2447 SV *waiter = newRV_inc (SvRV (coro_current)); /* owned by signal av */ 3099 SV *waiter = newSVsv (coro_current); /* owned by signal av */
2448 3100
2449 av_push (av, waiter); 3101 av_push (av, waiter);
2450 3102
2451 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 */
2452 frame->prepare = prepare_schedule; 3104 frame->prepare = prepare_schedule;
… …
2470 3122
2471static void 3123static void
2472coro_aio_callback (pTHX_ CV *cv) 3124coro_aio_callback (pTHX_ CV *cv)
2473{ 3125{
2474 dXSARGS; 3126 dXSARGS;
2475 AV *state = (AV *)GENSUB_ARG; 3127 AV *state = (AV *)S_GENSUB_ARG;
2476 SV *coro = av_pop (state); 3128 SV *coro = av_pop (state);
2477 SV *data_sv = newSV (sizeof (struct io_state)); 3129 SV *data_sv = newSV (sizeof (struct io_state));
2478 3130
2479 av_extend (state, items - 1); 3131 av_extend (state, items - 1);
2480 3132
… …
2565 dSP; 3217 dSP;
2566 3218
2567 static SV *prio_cv; 3219 static SV *prio_cv;
2568 static SV *prio_sv; 3220 static SV *prio_sv;
2569 3221
2570 if (expect_false (!prio_cv)) 3222 if (ecb_expect_false (!prio_cv))
2571 { 3223 {
2572 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0); 3224 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0);
2573 prio_sv = newSViv (0); 3225 prio_sv = newSViv (0);
2574 } 3226 }
2575 3227
… …
2594 3246
2595 for (i = 0; i < items; ++i) 3247 for (i = 0; i < items; ++i)
2596 PUSHs (arg [i]); 3248 PUSHs (arg [i]);
2597 3249
2598 /* now push the callback closure */ 3250 /* now push the callback closure */
2599 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))));
2600 3252
2601 /* now call the AIO function - we assume our request is uncancelable */ 3253 /* now call the AIO function - we assume our request is uncancelable */
2602 PUTBACK; 3254 PUTBACK;
2603 call_sv ((SV *)req, G_VOID | G_DISCARD); 3255 call_sv ((SV *)req, G_VOID | G_DISCARD);
2604 } 3256 }
2605 3257
2606 /* 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 */
2607 frame->data = (void *)state; 3259 frame->data = (void *)state;
2608 frame->prepare = prepare_schedule; 3260 frame->prepare = prepare_schedule;
2609 frame->check = slf_check_aio_req; 3261 frame->check = slf_check_aio_req;
2610} 3262}
2611 3263
… …
2618 3270
2619 XSRETURN_EMPTY; 3271 XSRETURN_EMPTY;
2620} 3272}
2621 3273
2622/*****************************************************************************/ 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 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
2623 3394
2624MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3395MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2625 3396
2626PROTOTYPES: DISABLE 3397PROTOTYPES: DISABLE
2627 3398
… …
2632 coro_thx = PERL_GET_CONTEXT; 3403 coro_thx = PERL_GET_CONTEXT;
2633# endif 3404# endif
2634#endif 3405#endif
2635 BOOT_PAGESIZE; 3406 BOOT_PAGESIZE;
2636 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
2637 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3417 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
2638 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3418 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
2639 3419
2640 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;
2641 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;
… …
2660 3440
2661 { 3441 {
2662 SV *slf = sv_2mortal (newSViv (PTR2IV (pp_slf))); 3442 SV *slf = sv_2mortal (newSViv (PTR2IV (pp_slf)));
2663 3443
2664 if (!PL_custom_op_names) PL_custom_op_names = newHV (); 3444 if (!PL_custom_op_names) PL_custom_op_names = newHV ();
2665 hv_store_ent (PL_custom_op_names, slf, 3445 hv_store_ent (PL_custom_op_names, slf, newSVpv ("coro_slf", 0), 0);
2666 newSVpv ("coro_slf", 0), 0);
2667 3446
2668 if (!PL_custom_op_descs) PL_custom_op_descs = newHV (); 3447 if (!PL_custom_op_descs) PL_custom_op_descs = newHV ();
2669 hv_store_ent (PL_custom_op_descs, slf, 3448 hv_store_ent (PL_custom_op_descs, slf, newSVpv ("coro schedule like function", 0), 0);
2670 newSVpv ("coro schedule like function", 0), 0);
2671 } 3449 }
2672 3450
2673 coroapi.ver = CORO_API_VERSION; 3451 coroapi.ver = CORO_API_VERSION;
2674 coroapi.rev = CORO_API_REVISION; 3452 coroapi.rev = CORO_API_REVISION;
2675 3453
… …
2680 coroapi.prepare_nop = prepare_nop; 3458 coroapi.prepare_nop = prepare_nop;
2681 coroapi.prepare_schedule = prepare_schedule; 3459 coroapi.prepare_schedule = prepare_schedule;
2682 coroapi.prepare_cede = prepare_cede; 3460 coroapi.prepare_cede = prepare_cede;
2683 coroapi.prepare_cede_notself = prepare_cede_notself; 3461 coroapi.prepare_cede_notself = prepare_cede_notself;
2684 3462
2685 { 3463 time_init (aTHX);
2686 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
2687 3464
2688 if (!svp) croak ("Time::HiRes is required");
2689 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
2690
2691 nvtime = INT2PTR (double (*)(), SvIV (*svp));
2692 }
2693
2694 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
2695} 3473}
2696 3474
2697SV * 3475SV *
2698new (char *klass, ...) 3476new (SV *klass, ...)
2699 ALIAS: 3477 ALIAS:
2700 Coro::new = 1 3478 Coro::new = 1
2701 CODE: 3479 CODE:
2702{ 3480 RETVAL = coro_new (aTHX_ ix ? coro_stash : coro_state_stash, &ST (1), items - 1, ix);
2703 struct coro *coro; 3481 OUTPUT:
2704 MAGIC *mg;
2705 HV *hv;
2706 CV *cb;
2707 int i;
2708
2709 if (items > 1)
2710 {
2711 cb = coro_sv_2cv (aTHX_ ST (1));
2712
2713 if (!ix)
2714 {
2715 if (CvISXSUB (cb))
2716 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
2717
2718 if (!CvROOT (cb))
2719 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
2720 }
2721 }
2722
2723 Newz (0, coro, 1, struct coro);
2724 coro->args = newAV ();
2725 coro->flags = CF_NEW;
2726
2727 if (coro_first) coro_first->prev = coro;
2728 coro->next = coro_first;
2729 coro_first = coro;
2730
2731 coro->hv = hv = newHV ();
2732 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
2733 mg->mg_flags |= MGf_DUP;
2734 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
2735
2736 if (items > 1)
2737 {
2738 av_extend (coro->args, items - 1 + ix - 1);
2739
2740 if (ix)
2741 {
2742 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
2743 cb = cv_coro_run;
2744 }
2745
2746 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
2747
2748 for (i = 2; i < items; i++)
2749 av_push (coro->args, newSVsv (ST (i)));
2750 }
2751}
2752 OUTPUT:
2753 RETVAL 3482 RETVAL
2754 3483
2755void 3484void
2756transfer (...) 3485transfer (...)
2757 PROTOTYPE: $$ 3486 PROTOTYPE: $$
2758 CODE: 3487 CODE:
2759 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3488 CORO_EXECUTE_SLF_XS (slf_init_transfer);
2760 3489
2761bool
2762_destroy (SV *coro_sv)
2763 CODE:
2764 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
2765 OUTPUT:
2766 RETVAL
2767
2768void 3490void
2769_exit (int code) 3491_exit (int code)
2770 PROTOTYPE: $ 3492 PROTOTYPE: $
2771 CODE: 3493 CODE:
2772 _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
2773 3514
2774int 3515int
2775cctx_stacksize (int new_stacksize = 0) 3516cctx_stacksize (int new_stacksize = 0)
2776 PROTOTYPE: ;$ 3517 PROTOTYPE: ;$
2777 CODE: 3518 CODE:
… …
2827 eval = 1 3568 eval = 1
2828 CODE: 3569 CODE:
2829{ 3570{
2830 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3571 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
2831 { 3572 {
2832 struct coro temp; 3573 struct coro *current = SvSTATE_current;
3574 struct CoroSLF slf_save;
2833 3575
2834 if (!(coro->flags & CF_RUNNING)) 3576 if (current != coro)
2835 { 3577 {
2836 PUTBACK; 3578 PUTBACK;
2837 save_perl (aTHX_ &temp); 3579 save_perl (aTHX_ current);
2838 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;
2839 } 3591 }
2840 3592
2841 {
2842 dSP;
2843 ENTER;
2844 SAVETMPS;
2845 PUTBACK;
2846 PUSHSTACK; 3593 PUSHSTACK;
3594
2847 PUSHMARK (SP); 3595 PUSHMARK (SP);
3596 PUTBACK;
2848 3597
2849 if (ix) 3598 if (ix)
2850 eval_sv (coderef, 0); 3599 eval_sv (coderef, 0);
2851 else 3600 else
2852 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 3601 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
2853 3602
2854 POPSTACK; 3603 POPSTACK;
2855 SPAGAIN; 3604 SPAGAIN;
2856 FREETMPS;
2857 LEAVE;
2858 PUTBACK;
2859 }
2860 3605
2861 if (!(coro->flags & CF_RUNNING)) 3606 if (current != coro)
2862 { 3607 {
3608 PUTBACK;
3609 slf_frame = slf_save;
2863 save_perl (aTHX_ coro); 3610 save_perl (aTHX_ coro);
2864 load_perl (aTHX_ &temp); 3611 load_perl (aTHX_ current);
2865 SPAGAIN; 3612 SPAGAIN;
2866 } 3613 }
2867 } 3614 }
2868} 3615}
2869 3616
… …
2872 PROTOTYPE: $ 3619 PROTOTYPE: $
2873 ALIAS: 3620 ALIAS:
2874 is_ready = CF_READY 3621 is_ready = CF_READY
2875 is_running = CF_RUNNING 3622 is_running = CF_RUNNING
2876 is_new = CF_NEW 3623 is_new = CF_NEW
2877 is_destroyed = CF_DESTROYED 3624 is_destroyed = CF_ZOMBIE
3625 is_zombie = CF_ZOMBIE
3626 is_suspended = CF_SUSPENDED
2878 CODE: 3627 CODE:
2879 RETVAL = boolSV (coro->flags & ix); 3628 RETVAL = boolSV (coro->flags & ix);
2880 OUTPUT: 3629 OUTPUT:
2881 RETVAL 3630 RETVAL
2882 3631
2883void 3632void
2884throw (Coro::State self, SV *throw = &PL_sv_undef) 3633throw (Coro::State self, SV *exception = &PL_sv_undef)
2885 PROTOTYPE: $;$ 3634 PROTOTYPE: $;$
2886 CODE: 3635 CODE:
2887{ 3636{
2888 struct coro *current = SvSTATE_current; 3637 struct coro *current = SvSTATE_current;
2889 SV **throwp = self == current ? &CORO_THROW : &self->except; 3638 SV **exceptionp = self == current ? &CORO_THROW : &self->except;
2890 SvREFCNT_dec (*throwp); 3639 SvREFCNT_dec (*exceptionp);
2891 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3640 SvGETMAGIC (exception);
3641 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
2892} 3642}
2893 3643
2894void 3644void
2895api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3645api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
2896 PROTOTYPE: $;$ 3646 PROTOTYPE: $;$
… …
2898 3648
2899SV * 3649SV *
2900has_cctx (Coro::State coro) 3650has_cctx (Coro::State coro)
2901 PROTOTYPE: $ 3651 PROTOTYPE: $
2902 CODE: 3652 CODE:
2903 RETVAL = boolSV (!!coro->cctx); 3653 /* maybe manage the running flag differently */
3654 RETVAL = boolSV (!!coro->cctx || (coro->flags & CF_RUNNING));
2904 OUTPUT: 3655 OUTPUT:
2905 RETVAL 3656 RETVAL
2906 3657
2907int 3658int
2908is_traced (Coro::State coro) 3659is_traced (Coro::State coro)
… …
2928 3679
2929void 3680void
2930force_cctx () 3681force_cctx ()
2931 PROTOTYPE: 3682 PROTOTYPE:
2932 CODE: 3683 CODE:
2933 SvSTATE_current->cctx->idle_sp = 0; 3684 cctx_current->idle_sp = 0;
2934 3685
2935void 3686void
2936swap_defsv (Coro::State self) 3687swap_defsv (Coro::State self)
2937 PROTOTYPE: $ 3688 PROTOTYPE: $
2938 ALIAS: 3689 ALIAS:
… …
2946 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv; 3697 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
2947 3698
2948 SV *tmp = *src; *src = *dst; *dst = tmp; 3699 SV *tmp = *src; *src = *dst; *dst = tmp;
2949 } 3700 }
2950 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
2951 3763
2952MODULE = Coro::State PACKAGE = Coro 3764MODULE = Coro::State PACKAGE = Coro
2953 3765
2954BOOT: 3766BOOT:
2955{ 3767{
2956 int i;
2957
2958 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
2959 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3768 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
2960 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3769 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
2961 cv_coro_run = get_cv ( "Coro::_terminate", GV_ADD); 3770 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
2962 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
2963 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);
3772 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3773 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3774 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3775 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
2964 3776
2965 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);
2966 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3778 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
2967 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);
2968 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 */
2969 3781
2970 coro_stash = gv_stashpv ("Coro", TRUE); 3782 coro_stash = gv_stashpv ("Coro", TRUE);
2971 3783
2972 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 3784 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
2973 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 3785 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
2974 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 3786 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
2975 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 3787 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (CORO_PRIO_LOW));
2976 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE)); 3788 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (CORO_PRIO_IDLE));
2977 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN)); 3789 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (CORO_PRIO_MIN));
2978
2979 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
2980 coro_ready[i] = newAV ();
2981 3790
2982 { 3791 {
2983 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 3792 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
2984 3793
2985 coroapi.schedule = api_schedule; 3794 coroapi.schedule = api_schedule;
3795 coroapi.schedule_to = api_schedule_to;
2986 coroapi.cede = api_cede; 3796 coroapi.cede = api_cede;
2987 coroapi.cede_notself = api_cede_notself; 3797 coroapi.cede_notself = api_cede_notself;
2988 coroapi.ready = api_ready; 3798 coroapi.ready = api_ready;
2989 coroapi.is_ready = api_is_ready; 3799 coroapi.is_ready = api_is_ready;
2990 coroapi.nready = coro_nready; 3800 coroapi.nready = coro_nready;
… …
2994 sv_setiv (sv, (IV)&coroapi); 3804 sv_setiv (sv, (IV)&coroapi);
2995 SvREADONLY_on (sv); 3805 SvREADONLY_on (sv);
2996 } 3806 }
2997} 3807}
2998 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
3834void
3835terminate (...)
3836 CODE:
3837 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3838
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
2999void 3848void
3000schedule (...) 3849schedule (...)
3001 CODE: 3850 CODE:
3002 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3851 CORO_EXECUTE_SLF_XS (slf_init_schedule);
3852
3853void
3854schedule_to (...)
3855 CODE:
3856 CORO_EXECUTE_SLF_XS (slf_init_schedule_to);
3857
3858void
3859cede_to (...)
3860 CODE:
3861 CORO_EXECUTE_SLF_XS (slf_init_cede_to);
3003 3862
3004void 3863void
3005cede (...) 3864cede (...)
3006 CODE: 3865 CODE:
3007 CORO_EXECUTE_SLF_XS (slf_init_cede); 3866 CORO_EXECUTE_SLF_XS (slf_init_cede);
… …
3021void 3880void
3022_set_readyhook (SV *hook) 3881_set_readyhook (SV *hook)
3023 PROTOTYPE: $ 3882 PROTOTYPE: $
3024 CODE: 3883 CODE:
3025 SvREFCNT_dec (coro_readyhook); 3884 SvREFCNT_dec (coro_readyhook);
3885 SvGETMAGIC (hook);
3886 if (SvOK (hook))
3887 {
3026 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 }
3027 3896
3028int 3897int
3029prio (Coro::State coro, int newprio = 0) 3898prio (Coro::State coro, int newprio = 0)
3030 PROTOTYPE: $;$ 3899 PROTOTYPE: $;$
3031 ALIAS: 3900 ALIAS:
… …
3037 if (items > 1) 3906 if (items > 1)
3038 { 3907 {
3039 if (ix) 3908 if (ix)
3040 newprio = coro->prio - newprio; 3909 newprio = coro->prio - newprio;
3041 3910
3042 if (newprio < PRIO_MIN) newprio = PRIO_MIN; 3911 if (newprio < CORO_PRIO_MIN) newprio = CORO_PRIO_MIN;
3043 if (newprio > PRIO_MAX) newprio = PRIO_MAX; 3912 if (newprio > CORO_PRIO_MAX) newprio = CORO_PRIO_MAX;
3044 3913
3045 coro->prio = newprio; 3914 coro->prio = newprio;
3046 } 3915 }
3047} 3916}
3048 OUTPUT: 3917 OUTPUT:
… …
3063 RETVAL = coro_nready; 3932 RETVAL = coro_nready;
3064 OUTPUT: 3933 OUTPUT:
3065 RETVAL 3934 RETVAL
3066 3935
3067void 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
3068_pool_handler (...) 3949_pool_handler (...)
3069 CODE: 3950 CODE:
3070 CORO_EXECUTE_SLF_XS (slf_init_pool_handler); 3951 CORO_EXECUTE_SLF_XS (slf_init_pool_handler);
3071 3952
3072void 3953void
… …
3083 for (i = 1; i < items; ++i) 3964 for (i = 1; i < items; ++i)
3084 av_push (av, SvREFCNT_inc_NN (ST (i))); 3965 av_push (av, SvREFCNT_inc_NN (ST (i)));
3085 3966
3086 if ((SV *)hv == &PL_sv_undef) 3967 if ((SV *)hv == &PL_sv_undef)
3087 { 3968 {
3088 PUSHMARK (SP); 3969 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3089 EXTEND (SP, 2);
3090 PUSHs (sv_Coro);
3091 PUSHs ((SV *)cv_pool_handler);
3092 PUTBACK;
3093 call_sv ((SV *)cv_coro_state_new, G_SCALAR);
3094 SPAGAIN;
3095
3096 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs)); 3970 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
3971 SvREFCNT_dec (sv);
3097 } 3972 }
3098 3973
3099 { 3974 {
3100 struct coro *coro = SvSTATE_hv (hv); 3975 struct coro *coro = SvSTATE_hv (hv);
3101 3976
… …
3125rouse_wait (...) 4000rouse_wait (...)
3126 PROTOTYPE: ;$ 4001 PROTOTYPE: ;$
3127 PPCODE: 4002 PPCODE:
3128 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait); 4003 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait);
3129 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
3130 4030
3131MODULE = Coro::State PACKAGE = PerlIO::cede 4031MODULE = Coro::State PACKAGE = PerlIO::cede
3132 4032
3133BOOT: 4033BOOT:
3134 PerlIO_define_layer (aTHX_ &PerlIO_cede); 4034 PerlIO_define_layer (aTHX_ &PerlIO_cede);
… …
3137MODULE = Coro::State PACKAGE = Coro::Semaphore 4037MODULE = Coro::State PACKAGE = Coro::Semaphore
3138 4038
3139SV * 4039SV *
3140new (SV *klass, SV *count = 0) 4040new (SV *klass, SV *count = 0)
3141 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
3142 RETVAL = sv_bless ( 4053 RETVAL = sv_bless (
3143 coro_waitarray_new (aTHX_ count && SvOK (count) ? SvIV (count) : 1), 4054 coro_waitarray_new (aTHX_ semcnt),
3144 GvSTASH (CvGV (cv)) 4055 GvSTASH (CvGV (cv))
3145 ); 4056 );
4057}
3146 OUTPUT: 4058 OUTPUT:
3147 RETVAL 4059 RETVAL
3148 4060
3149# helper for Coro::Channel 4061# helper for Coro::Channel and others
3150SV * 4062SV *
3151_alloc (int count) 4063_alloc (int count)
3152 CODE: 4064 CODE:
3153 RETVAL = coro_waitarray_new (aTHX_ count); 4065 RETVAL = coro_waitarray_new (aTHX_ count);
3154 OUTPUT: 4066 OUTPUT:
… …
3212 for (i = 1; i <= wcount; ++i) 4124 for (i = 1; i <= wcount; ++i)
3213 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i]))); 4125 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i])));
3214 } 4126 }
3215} 4127}
3216 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
3217MODULE = Coro::State PACKAGE = Coro::Signal 4145MODULE = Coro::State PACKAGE = Coro::Signal
3218 4146
3219SV * 4147SV *
3220new (SV *klass) 4148new (SV *klass)
3221 CODE: 4149 CODE:
… …
3292 4220
3293void 4221void
3294_register (char *target, char *proto, SV *req) 4222_register (char *target, char *proto, SV *req)
3295 CODE: 4223 CODE:
3296{ 4224{
3297 CV *req_cv = coro_sv_2cv (aTHX_ req); 4225 SV *req_cv = s_get_cv_croak (req);
3298 /* newXSproto doesn't return the CV on 5.8 */ 4226 /* newXSproto doesn't return the CV on 5.8 */
3299 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 4227 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3300 sv_setpv ((SV *)slf_cv, proto); 4228 sv_setpv ((SV *)slf_cv, proto);
3301 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);
3302} 4230}
3303 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