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.352 by root, Sat Jun 20 08:58:50 2009 UTC vs.
Revision 1.409 by root, Sun Jun 12 04:29:15 2011 UTC

1/* this works around a bug in mingw32 providing a non-working setjmp */
2#define USE_NO_MINGW_SETJMP_TWO_ARGS
3
4#define NDEBUG 1
5
1#include "libcoro/coro.c" 6#include "libcoro/coro.c"
2 7
3#define PERL_NO_GET_CONTEXT 8#define PERL_NO_GET_CONTEXT
4#define PERL_EXT 9#define PERL_EXT
5 10
6#include "EXTERN.h" 11#include "EXTERN.h"
7#include "perl.h" 12#include "perl.h"
8#include "XSUB.h" 13#include "XSUB.h"
9#include "perliol.h" 14#include "perliol.h"
10 15
11#include "patchlevel.h" 16#include "schmorp.h"
17#include "ecb.h"
12 18
19#include <stddef.h>
13#include <stdio.h> 20#include <stdio.h>
14#include <errno.h> 21#include <errno.h>
15#include <assert.h> 22#include <assert.h>
16 23
17#ifdef WIN32 24#ifndef SVs_PADSTALE
25# define SVs_PADSTALE 0
26#endif
27
28#if defined(_WIN32)
29# undef HAS_GETTIMEOFDAY
18# undef setjmp 30# undef setjmp
19# undef longjmp 31# undef longjmp
20# undef _exit 32# undef _exit
21# define setjmp _setjmp /* deep magic */ 33# define setjmp _setjmp /* deep magic */
22#else 34#else
… …
51#endif 63#endif
52 64
53/* the maximum number of idle cctx that will be pooled */ 65/* the maximum number of idle cctx that will be pooled */
54static int cctx_max_idle = 4; 66static int cctx_max_idle = 4;
55 67
56#define PERL_VERSION_ATLEAST(a,b,c) \
57 (PERL_REVISION > (a) \
58 || (PERL_REVISION == (a) \
59 && (PERL_VERSION > (b) \
60 || (PERL_VERSION == (b) && PERL_SUBVERSION >= (c)))))
61
62#if !PERL_VERSION_ATLEAST (5,6,0)
63# ifndef PL_ppaddr
64# define PL_ppaddr ppaddr
65# endif
66# ifndef call_sv
67# define call_sv perl_call_sv
68# endif
69# ifndef get_sv
70# define get_sv perl_get_sv
71# endif
72# ifndef get_cv
73# define get_cv perl_get_cv
74# endif
75# ifndef IS_PADGV
76# define IS_PADGV(v) 0
77# endif
78# ifndef IS_PADCONST
79# define IS_PADCONST(v) 0
80# endif
81#endif
82
83/* 5.11 */
84#ifndef CxHASARGS
85# define CxHASARGS(cx) (cx)->blk_sub.hasargs
86#endif
87
88/* 5.10.0 */
89#ifndef SvREFCNT_inc_NN
90# define SvREFCNT_inc_NN(sv) SvREFCNT_inc (sv)
91#endif
92
93/* 5.8.8 */
94#ifndef GV_NOTQUAL
95# define GV_NOTQUAL 0
96#endif
97#ifndef newSV
98# define newSV(l) NEWSV(0,l)
99#endif
100#ifndef CvISXSUB_on
101# define CvISXSUB_on(cv) (void)cv
102#endif
103#ifndef CvISXSUB
104# define CvISXSUB(cv) (CvXSUB (cv) ? TRUE : FALSE)
105#endif
106#ifndef Newx
107# define Newx(ptr,nitems,type) New (0,ptr,nitems,type)
108#endif
109
110/* 5.8.7 */
111#ifndef SvRV_set
112# define SvRV_set(s,v) SvRV(s) = (v)
113#endif
114
115#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 68#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
116# undef CORO_STACKGUARD 69# undef CORO_STACKGUARD
117#endif 70#endif
118 71
119#ifndef CORO_STACKGUARD 72#ifndef CORO_STACKGUARD
… …
135# define STACKLEVEL ((void *)&stacklevel) 88# define STACKLEVEL ((void *)&stacklevel)
136#endif 89#endif
137 90
138#define IN_DESTRUCT PL_dirty 91#define IN_DESTRUCT PL_dirty
139 92
140#if __GNUC__ >= 3
141# define attribute(x) __attribute__(x)
142# define expect(expr,value) __builtin_expect ((expr),(value))
143# define INLINE static inline
144#else
145# define attribute(x)
146# define expect(expr,value) (expr)
147# define INLINE static
148#endif
149
150#define expect_false(expr) expect ((expr) != 0, 0)
151#define expect_true(expr) expect ((expr) != 0, 1)
152
153#define NOINLINE attribute ((noinline))
154
155#include "CoroAPI.h" 93#include "CoroAPI.h"
156#define GCoroAPI (&coroapi) /* very sneaky */ 94#define GCoroAPI (&coroapi) /* very sneaky */
157 95
158#ifdef USE_ITHREADS 96#ifdef USE_ITHREADS
159# if CORO_PTHREAD 97# if CORO_PTHREAD
160static void *coro_thx; 98static void *coro_thx;
161# endif 99# endif
162#endif 100#endif
163 101
102/* used in state.h */
103#define VAR(name,type) VARx(name, PL_ ## name, type)
104
105#ifdef __linux
106# include <time.h> /* for timespec */
107# include <syscall.h> /* for SYS_* */
108# ifdef SYS_clock_gettime
109# define coro_clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
110# define CORO_CLOCK_MONOTONIC 1
111# define CORO_CLOCK_THREAD_CPUTIME_ID 3
112# endif
113#endif
114
164static double (*nvtime)(); /* so why doesn't it take void? */ 115static double (*nvtime)(); /* so why doesn't it take void? */
116static void (*u2time)(pTHX_ UV ret[2]);
165 117
166/* we hijack an hopefully unused CV flag for our purposes */ 118/* we hijack an hopefully unused CV flag for our purposes */
167#define CVf_SLF 0x4000 119#define CVf_SLF 0x4000
168static OP *pp_slf (pTHX); 120static OP *pp_slf (pTHX);
121static void slf_destroy (pTHX_ struct coro *coro);
169 122
170static U32 cctx_gen; 123static U32 cctx_gen;
171static size_t cctx_stacksize = CORO_STACKSIZE; 124static size_t cctx_stacksize = CORO_STACKSIZE;
172static struct CoroAPI coroapi; 125static struct CoroAPI coroapi;
173static AV *main_mainstack; /* used to differentiate between $main and others */ 126static AV *main_mainstack; /* used to differentiate between $main and others */
… …
190static SV *sv_pool_size; 143static SV *sv_pool_size;
191static SV *sv_async_pool_idle; /* description string */ 144static SV *sv_async_pool_idle; /* description string */
192static AV *av_async_pool; /* idle pool */ 145static AV *av_async_pool; /* idle pool */
193static SV *sv_Coro; /* class string */ 146static SV *sv_Coro; /* class string */
194static CV *cv_pool_handler; 147static CV *cv_pool_handler;
195static CV *cv_coro_state_new;
196 148
197/* Coro::AnyEvent */ 149/* Coro::AnyEvent */
198static SV *sv_activity; 150static SV *sv_activity;
199 151
152/* enable processtime/realtime profiling */
153static char enable_times;
154typedef U32 coro_ts[2];
155static coro_ts time_real, time_cpu;
156static char times_valid;
157
200static struct coro_cctx *cctx_first; 158static struct coro_cctx *cctx_first;
201static int cctx_count, cctx_idle; 159static int cctx_count, cctx_idle;
202 160
203enum { 161enum
162{
204 CC_MAPPED = 0x01, 163 CC_MAPPED = 0x01,
205 CC_NOREUSE = 0x02, /* throw this away after tracing */ 164 CC_NOREUSE = 0x02, /* throw this away after tracing */
206 CC_TRACE = 0x04, 165 CC_TRACE = 0x04,
207 CC_TRACE_SUB = 0x08, /* trace sub calls */ 166 CC_TRACE_SUB = 0x08, /* trace sub calls */
208 CC_TRACE_LINE = 0x10, /* trace each statement */ 167 CC_TRACE_LINE = 0x10, /* trace each statement */
… …
229 int valgrind_id; 188 int valgrind_id;
230#endif 189#endif
231 unsigned char flags; 190 unsigned char flags;
232} coro_cctx; 191} coro_cctx;
233 192
234coro_cctx *cctx_current; /* the currently running cctx */ 193static coro_cctx *cctx_current; /* the currently running cctx */
235 194
236/*****************************************************************************/ 195/*****************************************************************************/
237 196
197static MGVTBL coro_state_vtbl;
198
238enum { 199enum
200{
239 CF_RUNNING = 0x0001, /* coroutine is running */ 201 CF_RUNNING = 0x0001, /* coroutine is running */
240 CF_READY = 0x0002, /* coroutine is ready */ 202 CF_READY = 0x0002, /* coroutine is ready */
241 CF_NEW = 0x0004, /* has never been switched to */ 203 CF_NEW = 0x0004, /* has never been switched to */
242 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 204 CF_ZOMBIE = 0x0008, /* coroutine data has been freed */
243 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */ 205 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
206 CF_NOCANCEL = 0x0020, /* cannot cancel, set slf_frame.data to 1 (hackish) */
244}; 207};
245 208
246/* 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 */
247typedef struct 210typedef struct
248{ 211{
249 SV *defsv;
250 AV *defav;
251 SV *errsv;
252 SV *irsgv;
253 HV *hinthv;
254#define VAR(name,type) type name; 212#define VARx(name,expr,type) type name;
255# include "state.h" 213# include "state.h"
256#undef VAR 214#undef VARx
257} perl_slots; 215} perl_slots;
258 216
217// how many context stack entries do we need for perl_slots
259#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))
260 219
261/* this is a structure representing a perl-level coroutine */ 220/* this is a structure representing a perl-level coroutine */
262struct coro { 221struct coro
222{
263 /* the C coroutine allocated to this perl coroutine, if any */ 223 /* the C coroutine allocated to this perl coroutine, if any */
264 coro_cctx *cctx; 224 coro_cctx *cctx;
265 225
266 /* ready queue */ 226 /* ready queue */
267 struct coro *next_ready; 227 struct coro *next_ready;
… …
269 /* state data */ 229 /* state data */
270 struct CoroSLF slf_frame; /* saved slf frame */ 230 struct CoroSLF slf_frame; /* saved slf frame */
271 AV *mainstack; 231 AV *mainstack;
272 perl_slots *slot; /* basically the saved sp */ 232 perl_slots *slot; /* basically the saved sp */
273 233
274 CV *startcv; /* the CV to execute */ 234 CV *startcv; /* the CV to execute */
275 AV *args; /* data associated with this coroutine (initial args) */ 235 AV *args; /* data associated with this coroutine (initial args) */
276 int refcnt; /* coroutines are refcounted, yes */
277 int flags; /* CF_ flags */ 236 int flags; /* CF_ flags */
278 HV *hv; /* the perl hash associated with this coro, if any */ 237 HV *hv; /* the perl hash associated with this coro, if any */
279 void (*on_destroy)(pTHX_ struct coro *coro);
280 238
281 /* statistics */ 239 /* statistics */
282 int usecount; /* number of transfers to this coro */ 240 int usecount; /* number of transfers to this coro */
283 241
284 /* coro process data */ 242 /* coro process data */
285 int prio; 243 int prio;
286 SV *except; /* exception to be thrown */ 244 SV *except; /* exception to be thrown */
287 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 */
288 248
289 /* async_pool */ 249 /* async_pool */
290 SV *saved_deffh; 250 SV *saved_deffh;
291 SV *invoke_cb; 251 SV *invoke_cb;
292 AV *invoke_av; 252 AV *invoke_av;
293 253
294 /* on_enter/on_leave */ 254 /* on_enter/on_leave */
295 AV *on_enter; 255 AV *on_enter;
296 AV *on_leave; 256 AV *on_leave;
297 257
258 /* swap_sv */
259 AV *swap_sv;
260
261 /* times */
262 coro_ts t_cpu, t_real;
263
298 /* linked list */ 264 /* linked list */
299 struct coro *next, *prev; 265 struct coro *next, *prev;
300}; 266};
301 267
302typedef struct coro *Coro__State; 268typedef struct coro *Coro__State;
303typedef struct coro *Coro__State_or_hashref; 269typedef struct coro *Coro__State_or_hashref;
304 270
305/* the following variables are effectively part of the perl context */ 271/* the following variables are effectively part of the perl context */
306/* and get copied between struct coro and these variables */ 272/* and get copied between struct coro and these variables */
307/* the mainr easonw e don't support windows process emulation */ 273/* the main reason we don't support windows process emulation */
308static struct CoroSLF slf_frame; /* the current slf frame */ 274static struct CoroSLF slf_frame; /* the current slf frame */
309 275
310/** Coro ********************************************************************/ 276/** Coro ********************************************************************/
311 277
312#define PRIO_MAX 3 278#define CORO_PRIO_MAX 3
313#define PRIO_HIGH 1 279#define CORO_PRIO_HIGH 1
314#define PRIO_NORMAL 0 280#define CORO_PRIO_NORMAL 0
315#define PRIO_LOW -1 281#define CORO_PRIO_LOW -1
316#define PRIO_IDLE -3 282#define CORO_PRIO_IDLE -3
317#define PRIO_MIN -4 283#define CORO_PRIO_MIN -4
318 284
319/* for Coro.pm */ 285/* for Coro.pm */
320static SV *coro_current; 286static SV *coro_current;
321static SV *coro_readyhook; 287static SV *coro_readyhook;
322static struct coro *coro_ready [PRIO_MAX - PRIO_MIN + 1][2]; /* head|tail */ 288static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
323static CV *cv_coro_run, *cv_coro_terminate; 289static CV *cv_coro_run;
324static struct coro *coro_first; 290static struct coro *coro_first;
325#define coro_nready coroapi.nready 291#define coro_nready coroapi.nready
326 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 x x x x
305 #undef CORO_JIT
306 #endif
307 #endif
308#endif
309
310#if CORO_JIT
311static load_save_perl_slots_type load_perl_slots, save_perl_slots;
312#endif
313
314/** Coro::Select ************************************************************/
315
316static OP *(*coro_old_pp_sselect) (pTHX);
317static SV *coro_select_select;
318
319/* horrible hack, but if it works... */
320static OP *
321coro_pp_sselect (pTHX)
322{
323 dSP;
324 PUSHMARK (SP - 4); /* fake argument list */
325 XPUSHs (coro_select_select);
326 PUTBACK;
327
328 /* entersub is an UNOP, select a LISTOP... keep your fingers crossed */
329 PL_op->op_flags |= OPf_STACKED;
330 PL_op->op_private = 0;
331 return PL_ppaddr [OP_ENTERSUB](aTHX);
332}
333
334/** time stuff **************************************************************/
335
336#ifdef HAS_GETTIMEOFDAY
337
338ECB_INLINE void
339coro_u2time (pTHX_ UV ret[2])
340{
341 struct timeval tv;
342 gettimeofday (&tv, 0);
343
344 ret [0] = tv.tv_sec;
345 ret [1] = tv.tv_usec;
346}
347
348ECB_INLINE double
349coro_nvtime ()
350{
351 struct timeval tv;
352 gettimeofday (&tv, 0);
353
354 return tv.tv_sec + tv.tv_usec * 1e-6;
355}
356
357ECB_INLINE void
358time_init (pTHX)
359{
360 nvtime = coro_nvtime;
361 u2time = coro_u2time;
362}
363
364#else
365
366ECB_INLINE void
367time_init (pTHX)
368{
369 SV **svp;
370
371 require_pv ("Time/HiRes.pm");
372
373 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
374
375 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
376 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught");
377
378 nvtime = INT2PTR (double (*)(), SvIV (*svp));
379
380 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
381 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
382}
383
384#endif
385
327/** lowlevel stuff **********************************************************/ 386/** lowlevel stuff **********************************************************/
328 387
329static SV * 388static SV * ecb_noinline
330coro_get_sv (pTHX_ const char *name, int create) 389coro_get_sv (pTHX_ const char *name, int create)
331{ 390{
332#if PERL_VERSION_ATLEAST (5,10,0) 391#if PERL_VERSION_ATLEAST (5,10,0)
333 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 392 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
334 get_sv (name, create); 393 get_sv (name, create);
335#endif 394#endif
336 return get_sv (name, create); 395 return get_sv (name, create);
337} 396}
338 397
339static AV * 398static AV * ecb_noinline
340coro_get_av (pTHX_ const char *name, int create) 399coro_get_av (pTHX_ const char *name, int create)
341{ 400{
342#if PERL_VERSION_ATLEAST (5,10,0) 401#if PERL_VERSION_ATLEAST (5,10,0)
343 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 402 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
344 get_av (name, create); 403 get_av (name, create);
345#endif 404#endif
346 return get_av (name, create); 405 return get_av (name, create);
347} 406}
348 407
349static HV * 408static HV * ecb_noinline
350coro_get_hv (pTHX_ const char *name, int create) 409coro_get_hv (pTHX_ const char *name, int create)
351{ 410{
352#if PERL_VERSION_ATLEAST (5,10,0) 411#if PERL_VERSION_ATLEAST (5,10,0)
353 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 412 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
354 get_hv (name, create); 413 get_hv (name, create);
355#endif 414#endif
356 return get_hv (name, create); 415 return get_hv (name, create);
357} 416}
358 417
359/* may croak */ 418ECB_INLINE void
360INLINE CV * 419coro_times_update ()
361coro_sv_2cv (pTHX_ SV *sv)
362{ 420{
363 HV *st; 421#ifdef coro_clock_gettime
364 GV *gvp; 422 struct timespec ts;
365 CV *cv = sv_2cv (sv, &st, &gvp, 0);
366 423
367 if (!cv) 424 ts.tv_sec = ts.tv_nsec = 0;
368 croak ("code reference expected"); 425 coro_clock_gettime (CORO_CLOCK_THREAD_CPUTIME_ID, &ts);
426 time_cpu [0] = ts.tv_sec; time_cpu [1] = ts.tv_nsec;
369 427
370 return cv; 428 ts.tv_sec = ts.tv_nsec = 0;
429 coro_clock_gettime (CORO_CLOCK_MONOTONIC, &ts);
430 time_real [0] = ts.tv_sec; time_real [1] = ts.tv_nsec;
431#else
432 dTHX;
433 UV tv[2];
434
435 u2time (aTHX_ tv);
436 time_real [0] = tv [0];
437 time_real [1] = tv [1] * 1000;
438#endif
439}
440
441ECB_INLINE void
442coro_times_add (struct coro *c)
443{
444 c->t_real [1] += time_real [1];
445 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
446 c->t_real [0] += time_real [0];
447
448 c->t_cpu [1] += time_cpu [1];
449 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
450 c->t_cpu [0] += time_cpu [0];
451}
452
453ECB_INLINE void
454coro_times_sub (struct coro *c)
455{
456 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; }
457 c->t_real [1] -= time_real [1];
458 c->t_real [0] -= time_real [0];
459
460 if (c->t_cpu [1] < time_cpu [1]) { c->t_cpu [1] += 1000000000; --c->t_cpu [0]; }
461 c->t_cpu [1] -= time_cpu [1];
462 c->t_cpu [0] -= time_cpu [0];
371} 463}
372 464
373/*****************************************************************************/ 465/*****************************************************************************/
374/* magic glue */ 466/* magic glue */
375 467
376#define CORO_MAGIC_type_cv 26 468#define CORO_MAGIC_type_cv 26
377#define CORO_MAGIC_type_state PERL_MAGIC_ext 469#define CORO_MAGIC_type_state PERL_MAGIC_ext
378 470
379#define CORO_MAGIC_NN(sv, type) \ 471#define CORO_MAGIC_NN(sv, type) \
380 (expect_true (SvMAGIC (sv)->mg_type == type) \ 472 (ecb_expect_true (SvMAGIC (sv)->mg_type == type) \
381 ? SvMAGIC (sv) \ 473 ? SvMAGIC (sv) \
382 : mg_find (sv, type)) 474 : mg_find (sv, type))
383 475
384#define CORO_MAGIC(sv, type) \ 476#define CORO_MAGIC(sv, type) \
385 (expect_true (SvMAGIC (sv)) \ 477 (ecb_expect_true (SvMAGIC (sv)) \
386 ? CORO_MAGIC_NN (sv, type) \ 478 ? CORO_MAGIC_NN (sv, type) \
387 : 0) 479 : 0)
388 480
389#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv) 481#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
390#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state) 482#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
391 483
484ECB_INLINE MAGIC *
485SvSTATEhv_p (pTHX_ SV *coro)
486{
487 MAGIC *mg;
488
489 if (ecb_expect_true (
490 SvTYPE (coro) == SVt_PVHV
491 && (mg = CORO_MAGIC_state (coro))
492 && mg->mg_virtual == &coro_state_vtbl
493 ))
494 return mg;
495
496 return 0;
497}
498
392INLINE struct coro * 499ECB_INLINE struct coro *
393SvSTATE_ (pTHX_ SV *coro) 500SvSTATE_ (pTHX_ SV *coro)
394{ 501{
395 HV *stash;
396 MAGIC *mg; 502 MAGIC *mg;
397 503
398 if (SvROK (coro)) 504 if (SvROK (coro))
399 coro = SvRV (coro); 505 coro = SvRV (coro);
400 506
401 if (expect_false (SvTYPE (coro) != SVt_PVHV)) 507 mg = SvSTATEhv_p (aTHX_ coro);
508 if (!mg)
402 croak ("Coro::State object required"); 509 croak ("Coro::State object required");
403 510
404 stash = SvSTASH (coro);
405 if (expect_false (stash != coro_stash && stash != coro_state_stash))
406 {
407 /* very slow, but rare, check */
408 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
409 croak ("Coro::State object required");
410 }
411
412 mg = CORO_MAGIC_state (coro);
413 return (struct coro *)mg->mg_ptr; 511 return (struct coro *)mg->mg_ptr;
414} 512}
415 513
416#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 514#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
417 515
… …
420#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 518#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
421 519
422/*****************************************************************************/ 520/*****************************************************************************/
423/* padlist management and caching */ 521/* padlist management and caching */
424 522
425static AV * 523ECB_INLINE AV *
426coro_derive_padlist (pTHX_ CV *cv) 524coro_derive_padlist (pTHX_ CV *cv)
427{ 525{
428 AV *padlist = CvPADLIST (cv); 526 AV *padlist = CvPADLIST (cv);
429 AV *newpadlist, *newpad; 527 AV *newpadlist, *newpad;
430 528
… …
442 av_store (newpadlist, 1, (SV *)newpad); 540 av_store (newpadlist, 1, (SV *)newpad);
443 541
444 return newpadlist; 542 return newpadlist;
445} 543}
446 544
447static void 545ECB_INLINE void
448free_padlist (pTHX_ AV *padlist) 546free_padlist (pTHX_ AV *padlist)
449{ 547{
450 /* may be during global destruction */ 548 /* may be during global destruction */
451 if (!IN_DESTRUCT) 549 if (!IN_DESTRUCT)
452 { 550 {
… …
476coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 574coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
477{ 575{
478 AV *padlist; 576 AV *padlist;
479 AV *av = (AV *)mg->mg_obj; 577 AV *av = (AV *)mg->mg_obj;
480 578
579 /* perl manages to free our internal AV and _then_ call us */
580 if (IN_DESTRUCT)
581 return 0;
582
481 /* casting is fun. */ 583 /* casting is fun. */
482 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 584 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
483 free_padlist (aTHX_ padlist); 585 free_padlist (aTHX_ padlist);
484 586
485 SvREFCNT_dec (av); /* sv_magicext increased the refcount */ 587 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
… …
491 0, 0, 0, 0, 593 0, 0, 0, 0,
492 coro_cv_free 594 coro_cv_free
493}; 595};
494 596
495/* the next two functions merely cache the padlists */ 597/* the next two functions merely cache the padlists */
496static void 598ECB_INLINE void
497get_padlist (pTHX_ CV *cv) 599get_padlist (pTHX_ CV *cv)
498{ 600{
499 MAGIC *mg = CORO_MAGIC_cv (cv); 601 MAGIC *mg = CORO_MAGIC_cv (cv);
500 AV *av; 602 AV *av;
501 603
502 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 604 if (ecb_expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0))
503 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 605 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
504 else 606 else
505 { 607 {
506#if CORO_PREFER_PERL_FUNCTIONS 608#if CORO_PREFER_PERL_FUNCTIONS
507 /* this is probably cleaner? but also slower! */ 609 /* this is probably cleaner? but also slower! */
… …
514 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 616 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
515#endif 617#endif
516 } 618 }
517} 619}
518 620
519static void 621ECB_INLINE void
520put_padlist (pTHX_ CV *cv) 622put_padlist (pTHX_ CV *cv)
521{ 623{
522 MAGIC *mg = CORO_MAGIC_cv (cv); 624 MAGIC *mg = CORO_MAGIC_cv (cv);
523 AV *av; 625 AV *av;
524 626
525 if (expect_false (!mg)) 627 if (ecb_expect_false (!mg))
526 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 628 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
527 629
528 av = (AV *)mg->mg_obj; 630 av = (AV *)mg->mg_obj;
529 631
530 if (expect_false (AvFILLp (av) >= AvMAX (av))) 632 if (ecb_expect_false (AvFILLp (av) >= AvMAX (av)))
531 av_extend (av, AvFILLp (av) + 1); 633 av_extend (av, AvFILLp (av) + 1);
532 634
533 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 635 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
534} 636}
535 637
536/** load & save, init *******************************************************/ 638/** load & save, init *******************************************************/
639
640/* swap sv heads, at least logically */
641static void
642swap_svs (pTHX_ Coro__State c)
643{
644 int i;
645
646 for (i = 0; i <= AvFILLp (c->swap_sv); )
647 {
648 SV *a = AvARRAY (c->swap_sv)[i++];
649 SV *b = AvARRAY (c->swap_sv)[i++];
650
651 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
652 SV tmp;
653
654 /* swap sv_any */
655 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
656
657 /* swap sv_flags */
658 SvFLAGS (&tmp) = SvFLAGS (a);
659 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
660 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
661
662#if PERL_VERSION_ATLEAST (5,10,0)
663 /* perl 5.10 complicates this _quite_ a bit, but it also is
664 * much faster, so no quarrels here. alternatively, we could
665 * sv_upgrade to avoid this.
666 */
667 {
668 /* swap sv_u */
669 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
670
671 /* if SvANY points to the head, we need to adjust the pointers,
672 * as the pointer for a still points to b, and maybe vice versa.
673 */
674 #define svany_in_head(type) \
675 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
676
677 if (svany_in_head (SvTYPE (a)))
678 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
679
680 if (svany_in_head (SvTYPE (b)))
681 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
682 }
683#endif
684 }
685}
686
687#define SWAP_SVS(coro) \
688 if (ecb_expect_false ((coro)->swap_sv)) \
689 swap_svs (aTHX_ (coro))
537 690
538static void 691static void
539on_enterleave_call (pTHX_ SV *cb); 692on_enterleave_call (pTHX_ SV *cb);
540 693
541static void 694static void
… …
544 perl_slots *slot = c->slot; 697 perl_slots *slot = c->slot;
545 c->slot = 0; 698 c->slot = 0;
546 699
547 PL_mainstack = c->mainstack; 700 PL_mainstack = c->mainstack;
548 701
549 GvSV (PL_defgv) = slot->defsv; 702#if CORO_JIT
550 GvAV (PL_defgv) = slot->defav; 703 load_perl_slots (slot);
551 GvSV (PL_errgv) = slot->errsv; 704#else
552 GvSV (irsgv) = slot->irsgv;
553 GvHV (PL_hintgv) = slot->hinthv;
554
555 #define VAR(name,type) PL_ ## name = slot->name; 705 #define VARx(name,expr,type) expr = slot->name;
556 # include "state.h" 706 # include "state.h"
557 #undef VAR 707 #undef VARx
708#endif
558 709
559 { 710 {
560 dSP; 711 dSP;
561 712
562 CV *cv; 713 CV *cv;
563 714
564 /* now do the ugly restore mess */ 715 /* now do the ugly restore mess */
565 while (expect_true (cv = (CV *)POPs)) 716 while (ecb_expect_true (cv = (CV *)POPs))
566 { 717 {
567 put_padlist (aTHX_ cv); /* mark this padlist as available */ 718 put_padlist (aTHX_ cv); /* mark this padlist as available */
568 CvDEPTH (cv) = PTR2IV (POPs); 719 CvDEPTH (cv) = PTR2IV (POPs);
569 CvPADLIST (cv) = (AV *)POPs; 720 CvPADLIST (cv) = (AV *)POPs;
570 } 721 }
… …
573 } 724 }
574 725
575 slf_frame = c->slf_frame; 726 slf_frame = c->slf_frame;
576 CORO_THROW = c->except; 727 CORO_THROW = c->except;
577 728
729 if (ecb_expect_false (enable_times))
730 {
731 if (ecb_expect_false (!times_valid))
732 coro_times_update ();
733
734 coro_times_sub (c);
735 }
736
578 if (expect_false (c->on_enter)) 737 if (ecb_expect_false (c->on_enter))
579 { 738 {
580 int i; 739 int i;
581 740
582 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 741 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
583 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 742 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
584 } 743 }
744
745 SWAP_SVS (c);
585} 746}
586 747
587static void 748static void
588save_perl (pTHX_ Coro__State c) 749save_perl (pTHX_ Coro__State c)
589{ 750{
751 SWAP_SVS (c);
752
590 if (expect_false (c->on_leave)) 753 if (ecb_expect_false (c->on_leave))
591 { 754 {
592 int i; 755 int i;
593 756
594 for (i = AvFILLp (c->on_leave); i >= 0; --i) 757 for (i = AvFILLp (c->on_leave); i >= 0; --i)
595 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]); 758 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
759 }
760
761 times_valid = 0;
762
763 if (ecb_expect_false (enable_times))
764 {
765 coro_times_update (); times_valid = 1;
766 coro_times_add (c);
596 } 767 }
597 768
598 c->except = CORO_THROW; 769 c->except = CORO_THROW;
599 c->slf_frame = slf_frame; 770 c->slf_frame = slf_frame;
600 771
… …
611 782
612 XPUSHs (Nullsv); 783 XPUSHs (Nullsv);
613 /* this loop was inspired by pp_caller */ 784 /* this loop was inspired by pp_caller */
614 for (;;) 785 for (;;)
615 { 786 {
616 while (expect_true (cxix >= 0)) 787 while (ecb_expect_true (cxix >= 0))
617 { 788 {
618 PERL_CONTEXT *cx = &ccstk[cxix--]; 789 PERL_CONTEXT *cx = &ccstk[cxix--];
619 790
620 if (expect_true (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT)) 791 if (ecb_expect_true (CxTYPE (cx) == CXt_SUB) || ecb_expect_false (CxTYPE (cx) == CXt_FORMAT))
621 { 792 {
622 CV *cv = cx->blk_sub.cv; 793 CV *cv = cx->blk_sub.cv;
623 794
624 if (expect_true (CvDEPTH (cv))) 795 if (ecb_expect_true (CvDEPTH (cv)))
625 { 796 {
626 EXTEND (SP, 3); 797 EXTEND (SP, 3);
627 PUSHs ((SV *)CvPADLIST (cv)); 798 PUSHs ((SV *)CvPADLIST (cv));
628 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv))); 799 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
629 PUSHs ((SV *)cv); 800 PUSHs ((SV *)cv);
… …
632 get_padlist (aTHX_ cv); 803 get_padlist (aTHX_ cv);
633 } 804 }
634 } 805 }
635 } 806 }
636 807
637 if (expect_true (top_si->si_type == PERLSI_MAIN)) 808 if (ecb_expect_true (top_si->si_type == PERLSI_MAIN))
638 break; 809 break;
639 810
640 top_si = top_si->si_prev; 811 top_si = top_si->si_prev;
641 ccstk = top_si->si_cxstack; 812 ccstk = top_si->si_cxstack;
642 cxix = top_si->si_cxix; 813 cxix = top_si->si_cxix;
… …
644 815
645 PUTBACK; 816 PUTBACK;
646 } 817 }
647 818
648 /* allocate some space on the context stack for our purposes */ 819 /* allocate some space on the context stack for our purposes */
649 /* we manually unroll here, as usually 2 slots is enough */ 820 if (ecb_expect_false (cxstack_ix + SLOT_COUNT >= cxstack_max))
650 if (SLOT_COUNT >= 1) CXINC;
651 if (SLOT_COUNT >= 2) CXINC;
652 if (SLOT_COUNT >= 3) CXINC;
653 { 821 {
654 int i; 822 unsigned int i;
823
655 for (i = 3; i < SLOT_COUNT; ++i) 824 for (i = 0; i < SLOT_COUNT; ++i)
656 CXINC; 825 CXINC;
657 } 826
658 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 827 cxstack_ix -= SLOT_COUNT; /* undo allocation */
828 }
659 829
660 c->mainstack = PL_mainstack; 830 c->mainstack = PL_mainstack;
661 831
662 { 832 {
663 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 833 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
664 834
665 slot->defav = GvAV (PL_defgv); 835#if CORO_JIT
666 slot->defsv = DEFSV; 836 save_perl_slots (slot);
667 slot->errsv = ERRSV; 837#else
668 slot->irsgv = GvSV (irsgv);
669 slot->hinthv = GvHV (PL_hintgv);
670
671 #define VAR(name,type) slot->name = PL_ ## name; 838 #define VARx(name,expr,type) slot->name = expr;
672 # include "state.h" 839 # include "state.h"
673 #undef VAR 840 #undef VARx
841#endif
674 } 842 }
675} 843}
676 844
677/* 845/*
678 * allocate various perl stacks. This is almost an exact copy 846 * allocate various perl stacks. This is almost an exact copy
… …
684# define coro_init_stacks(thx) init_stacks () 852# define coro_init_stacks(thx) init_stacks ()
685#else 853#else
686static void 854static void
687coro_init_stacks (pTHX) 855coro_init_stacks (pTHX)
688{ 856{
689 PL_curstackinfo = new_stackinfo(32, 8); 857 PL_curstackinfo = new_stackinfo(32, 4 + SLOT_COUNT); /* 3 is minimum due to perl rounding down in scope.c:GROW() */
690 PL_curstackinfo->si_type = PERLSI_MAIN; 858 PL_curstackinfo->si_type = PERLSI_MAIN;
691 PL_curstack = PL_curstackinfo->si_stack; 859 PL_curstack = PL_curstackinfo->si_stack;
692 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 860 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
693 861
694 PL_stack_base = AvARRAY(PL_curstack); 862 PL_stack_base = AvARRAY(PL_curstack);
… …
801#endif 969#endif
802 970
803/* 971/*
804 * This overrides the default magic get method of %SIG elements. 972 * This overrides the default magic get method of %SIG elements.
805 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook 973 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
806 * and instead of trying to save and restore the hash elements, we just provide 974 * and instead of trying to save and restore the hash elements (extremely slow),
807 * readback here. 975 * we just provide our own readback here.
808 */ 976 */
809static int 977static int ecb_cold
810coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 978coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
811{ 979{
812 const char *s = MgPV_nolen_const (mg); 980 const char *s = MgPV_nolen_const (mg);
813 981
814 if (*s == '_') 982 if (*s == '_')
… …
826 } 994 }
827 995
828 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 996 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
829} 997}
830 998
831static int 999static int ecb_cold
832coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1000coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
833{ 1001{
834 const char *s = MgPV_nolen_const (mg); 1002 const char *s = MgPV_nolen_const (mg);
835 1003
836 if (*s == '_') 1004 if (*s == '_')
… …
850 } 1018 }
851 1019
852 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0; 1020 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
853} 1021}
854 1022
855static int 1023static int ecb_cold
856coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1024coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
857{ 1025{
858 const char *s = MgPV_nolen_const (mg); 1026 const char *s = MgPV_nolen_const (mg);
859 1027
860 if (*s == '_') 1028 if (*s == '_')
… …
893slf_check_repeat (pTHX_ struct CoroSLF *frame) 1061slf_check_repeat (pTHX_ struct CoroSLF *frame)
894{ 1062{
895 return 1; 1063 return 1;
896} 1064}
897 1065
898static UNOP coro_setup_op; 1066static UNOP init_perl_op;
899 1067
900static void NOINLINE /* noinline to keep it out of the transfer fast path */ 1068ecb_noinline static void /* noinline to keep it out of the transfer fast path */
901coro_setup (pTHX_ struct coro *coro) 1069init_perl (pTHX_ struct coro *coro)
902{ 1070{
903 /* 1071 /*
904 * emulate part of the perl startup here. 1072 * emulate part of the perl startup here.
905 */ 1073 */
906 coro_init_stacks (aTHX); 1074 coro_init_stacks (aTHX);
… …
913 PL_comppad_name_fill = 0; 1081 PL_comppad_name_fill = 0;
914 PL_comppad_name_floor = 0; 1082 PL_comppad_name_floor = 0;
915 PL_curpm = 0; 1083 PL_curpm = 0;
916 PL_curpad = 0; 1084 PL_curpad = 0;
917 PL_localizing = 0; 1085 PL_localizing = 0;
918 PL_dirty = 0;
919 PL_restartop = 0; 1086 PL_restartop = 0;
920#if PERL_VERSION_ATLEAST (5,10,0) 1087#if PERL_VERSION_ATLEAST (5,10,0)
921 PL_parser = 0; 1088 PL_parser = 0;
922#endif 1089#endif
923 PL_hints = 0; 1090 PL_hints = 0;
924 1091
925 /* recreate the die/warn hooks */ 1092 /* recreate the die/warn hooks */
926 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1093 PL_diehook = SvREFCNT_inc (rv_diehook);
927 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1094 PL_warnhook = SvREFCNT_inc (rv_warnhook);
928 1095
929 GvSV (PL_defgv) = newSV (0); 1096 GvSV (PL_defgv) = newSV (0);
930 GvAV (PL_defgv) = coro->args; coro->args = 0; 1097 GvAV (PL_defgv) = coro->args; coro->args = 0;
931 GvSV (PL_errgv) = newSV (0); 1098 GvSV (PL_errgv) = newSV (0);
932 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1099 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
… …
953 /* this newly created coroutine might be run on an existing cctx which most 1120 /* this newly created coroutine might be run on an existing cctx which most
954 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here. 1121 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
955 */ 1122 */
956 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1123 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
957 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */ 1124 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
1125 slf_frame.destroy = 0;
958 1126
959 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1127 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */
960 coro_setup_op.op_next = PL_op; 1128 init_perl_op.op_next = PL_op;
961 coro_setup_op.op_type = OP_ENTERSUB; 1129 init_perl_op.op_type = OP_ENTERSUB;
962 coro_setup_op.op_ppaddr = pp_slf; 1130 init_perl_op.op_ppaddr = pp_slf;
963 /* no flags etc. required, as an init function won't be called */ 1131 /* no flags etc. required, as an init function won't be called */
964 1132
965 PL_op = (OP *)&coro_setup_op; 1133 PL_op = (OP *)&init_perl_op;
966 1134
967 /* copy throw, in case it was set before coro_setup */ 1135 /* copy throw, in case it was set before init_perl */
968 CORO_THROW = coro->except; 1136 CORO_THROW = coro->except;
1137
1138 SWAP_SVS (coro);
1139
1140 if (ecb_expect_false (enable_times))
1141 {
1142 coro_times_update ();
1143 coro_times_sub (coro);
1144 }
969} 1145}
970 1146
971static void 1147static void
972coro_unwind_stacks (pTHX) 1148coro_unwind_stacks (pTHX)
973{ 1149{
… …
988 dounwind (-1); 1164 dounwind (-1);
989 } 1165 }
990} 1166}
991 1167
992static void 1168static void
993coro_destruct_perl (pTHX_ struct coro *coro) 1169destroy_perl (pTHX_ struct coro *coro)
994{ 1170{
995 SV *svf [9]; 1171 SV *svf [9];
996 1172
997 { 1173 {
1174 SV *old_current = SvRV (coro_current);
998 struct coro *current = SvSTATE_current; 1175 struct coro *current = SvSTATE (old_current);
999 1176
1000 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack)); 1177 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1001 1178
1002 save_perl (aTHX_ current); 1179 save_perl (aTHX_ current);
1180
1181 /* this will cause transfer_check to croak on block*/
1182 SvRV_set (coro_current, (SV *)coro->hv);
1183
1003 load_perl (aTHX_ coro); 1184 load_perl (aTHX_ coro);
1004 1185
1005 coro_unwind_stacks (aTHX); 1186 coro_unwind_stacks (aTHX);
1187
1188 /* restore swapped sv's */
1189 SWAP_SVS (coro);
1190
1006 coro_destruct_stacks (aTHX); 1191 coro_destruct_stacks (aTHX);
1007 1192
1008 // now save some sv's to be free'd later 1193 // now save some sv's to be free'd later
1009 svf [0] = GvSV (PL_defgv); 1194 svf [0] = GvSV (PL_defgv);
1010 svf [1] = (SV *)GvAV (PL_defgv); 1195 svf [1] = (SV *)GvAV (PL_defgv);
… …
1015 svf [6] = (SV *)GvHV (PL_hintgv); 1200 svf [6] = (SV *)GvHV (PL_hintgv);
1016 svf [7] = PL_diehook; 1201 svf [7] = PL_diehook;
1017 svf [8] = PL_warnhook; 1202 svf [8] = PL_warnhook;
1018 assert (9 == sizeof (svf) / sizeof (*svf)); 1203 assert (9 == sizeof (svf) / sizeof (*svf));
1019 1204
1205 SvRV_set (coro_current, old_current);
1206
1020 load_perl (aTHX_ current); 1207 load_perl (aTHX_ current);
1021 } 1208 }
1022 1209
1023 { 1210 {
1024 int i; 1211 unsigned int i;
1025 1212
1026 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i) 1213 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i)
1027 SvREFCNT_dec (svf [i]); 1214 SvREFCNT_dec (svf [i]);
1028 1215
1029 SvREFCNT_dec (coro->saved_deffh); 1216 SvREFCNT_dec (coro->saved_deffh);
… …
1031 SvREFCNT_dec (coro->invoke_cb); 1218 SvREFCNT_dec (coro->invoke_cb);
1032 SvREFCNT_dec (coro->invoke_av); 1219 SvREFCNT_dec (coro->invoke_av);
1033 } 1220 }
1034} 1221}
1035 1222
1036INLINE void 1223ECB_INLINE void
1037free_coro_mortal (pTHX) 1224free_coro_mortal (pTHX)
1038{ 1225{
1039 if (expect_true (coro_mortal)) 1226 if (ecb_expect_true (coro_mortal))
1040 { 1227 {
1041 SvREFCNT_dec (coro_mortal); 1228 SvREFCNT_dec ((SV *)coro_mortal);
1042 coro_mortal = 0; 1229 coro_mortal = 0;
1043 } 1230 }
1044} 1231}
1045 1232
1046static int 1233static int
… …
1179 1366
1180 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1367 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1181} 1368}
1182 1369
1183/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1370/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1184static void NOINLINE 1371static void ecb_noinline
1185cctx_prepare (pTHX) 1372cctx_prepare (pTHX)
1186{ 1373{
1187 PL_top_env = &PL_start_env; 1374 PL_top_env = &PL_start_env;
1188 1375
1189 if (cctx_current->flags & CC_TRACE) 1376 if (cctx_current->flags & CC_TRACE)
… …
1200 slf_frame.prepare = slf_prepare_set_stacklevel; 1387 slf_frame.prepare = slf_prepare_set_stacklevel;
1201 slf_frame.check = slf_check_set_stacklevel; 1388 slf_frame.check = slf_check_set_stacklevel;
1202} 1389}
1203 1390
1204/* the tail of transfer: execute stuff we can only do after a transfer */ 1391/* the tail of transfer: execute stuff we can only do after a transfer */
1205INLINE void 1392ECB_INLINE void
1206transfer_tail (pTHX) 1393transfer_tail (pTHX)
1207{ 1394{
1208 free_coro_mortal (aTHX); 1395 free_coro_mortal (aTHX);
1209} 1396}
1210 1397
… …
1235 /* somebody or something will hit me for both perl_run and PL_restartop */ 1422 /* somebody or something will hit me for both perl_run and PL_restartop */
1236 PL_restartop = PL_op; 1423 PL_restartop = PL_op;
1237 perl_run (PL_curinterp); 1424 perl_run (PL_curinterp);
1238 /* 1425 /*
1239 * Unfortunately, there is no way to get at the return values of the 1426 * Unfortunately, there is no way to get at the return values of the
1240 * coro body here, as perl_run destroys these 1427 * coro body here, as perl_run destroys these. Likewise, we cannot catch
1428 * runtime errors here, as this is just a random interpreter, not a thread.
1241 */ 1429 */
1242 1430
1243 /* 1431 /*
1244 * If perl-run returns we assume exit() was being called or the coro 1432 * If perl-run returns we assume exit() was being called or the coro
1245 * fell off the end, which seems to be the only valid (non-bug) 1433 * fell off the end, which seems to be the only valid (non-bug)
… …
1332cctx_destroy (coro_cctx *cctx) 1520cctx_destroy (coro_cctx *cctx)
1333{ 1521{
1334 if (!cctx) 1522 if (!cctx)
1335 return; 1523 return;
1336 1524
1337 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary? 1525 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1338 1526
1339 --cctx_count; 1527 --cctx_count;
1340 coro_destroy (&cctx->cctx); 1528 coro_destroy (&cctx->cctx);
1341 1529
1342 /* coro_transfer creates new, empty cctx's */ 1530 /* coro_transfer creates new, empty cctx's */
… …
1361#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE)) 1549#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE))
1362 1550
1363static coro_cctx * 1551static coro_cctx *
1364cctx_get (pTHX) 1552cctx_get (pTHX)
1365{ 1553{
1366 while (expect_true (cctx_first)) 1554 while (ecb_expect_true (cctx_first))
1367 { 1555 {
1368 coro_cctx *cctx = cctx_first; 1556 coro_cctx *cctx = cctx_first;
1369 cctx_first = cctx->next; 1557 cctx_first = cctx->next;
1370 --cctx_idle; 1558 --cctx_idle;
1371 1559
1372 if (expect_true (!CCTX_EXPIRED (cctx))) 1560 if (ecb_expect_true (!CCTX_EXPIRED (cctx)))
1373 return cctx; 1561 return cctx;
1374 1562
1375 cctx_destroy (cctx); 1563 cctx_destroy (cctx);
1376 } 1564 }
1377 1565
… …
1382cctx_put (coro_cctx *cctx) 1570cctx_put (coro_cctx *cctx)
1383{ 1571{
1384 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1572 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr));
1385 1573
1386 /* free another cctx if overlimit */ 1574 /* free another cctx if overlimit */
1387 if (expect_false (cctx_idle >= cctx_max_idle)) 1575 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1388 { 1576 {
1389 coro_cctx *first = cctx_first; 1577 coro_cctx *first = cctx_first;
1390 cctx_first = first->next; 1578 cctx_first = first->next;
1391 --cctx_idle; 1579 --cctx_idle;
1392 1580
… …
1403static void 1591static void
1404transfer_check (pTHX_ struct coro *prev, struct coro *next) 1592transfer_check (pTHX_ struct coro *prev, struct coro *next)
1405{ 1593{
1406 /* TODO: throwing up here is considered harmful */ 1594 /* TODO: throwing up here is considered harmful */
1407 1595
1408 if (expect_true (prev != next)) 1596 if (ecb_expect_true (prev != next))
1409 { 1597 {
1410 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1598 if (ecb_expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1411 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,"); 1599 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1412 1600
1413 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED))) 1601 if (ecb_expect_false (next->flags & (CF_RUNNING | CF_ZOMBIE | CF_SUSPENDED)))
1414 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,"); 1602 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1415 1603
1416#if !PERL_VERSION_ATLEAST (5,10,0) 1604#if !PERL_VERSION_ATLEAST (5,10,0)
1417 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1605 if (ecb_expect_false (PL_lex_state != LEX_NOTPARSING))
1418 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,"); 1606 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1419#endif 1607#endif
1420 } 1608 }
1421} 1609}
1422 1610
1423/* always use the TRANSFER macro */ 1611/* always use the TRANSFER macro */
1424static void NOINLINE /* noinline so we have a fixed stackframe */ 1612static void ecb_noinline /* noinline so we have a fixed stackframe */
1425transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1613transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1426{ 1614{
1427 dSTACKLEVEL; 1615 dSTACKLEVEL;
1428 1616
1429 /* sometimes transfer is only called to set idle_sp */ 1617 /* sometimes transfer is only called to set idle_sp */
1430 if (expect_false (!prev)) 1618 if (ecb_expect_false (!prev))
1431 { 1619 {
1432 cctx_current->idle_sp = STACKLEVEL; 1620 cctx_current->idle_sp = STACKLEVEL;
1433 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1621 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1434 } 1622 }
1435 else if (expect_true (prev != next)) 1623 else if (ecb_expect_true (prev != next))
1436 { 1624 {
1437 coro_cctx *cctx_prev; 1625 coro_cctx *cctx_prev;
1438 1626
1439 if (expect_false (prev->flags & CF_NEW)) 1627 if (ecb_expect_false (prev->flags & CF_NEW))
1440 { 1628 {
1441 /* create a new empty/source context */ 1629 /* create a new empty/source context */
1442 prev->flags &= ~CF_NEW; 1630 prev->flags &= ~CF_NEW;
1443 prev->flags |= CF_RUNNING; 1631 prev->flags |= CF_RUNNING;
1444 } 1632 }
… …
1447 next->flags |= CF_RUNNING; 1635 next->flags |= CF_RUNNING;
1448 1636
1449 /* first get rid of the old state */ 1637 /* first get rid of the old state */
1450 save_perl (aTHX_ prev); 1638 save_perl (aTHX_ prev);
1451 1639
1452 if (expect_false (next->flags & CF_NEW)) 1640 if (ecb_expect_false (next->flags & CF_NEW))
1453 { 1641 {
1454 /* need to start coroutine */ 1642 /* need to start coroutine */
1455 next->flags &= ~CF_NEW; 1643 next->flags &= ~CF_NEW;
1456 /* setup coroutine call */ 1644 /* setup coroutine call */
1457 coro_setup (aTHX_ next); 1645 init_perl (aTHX_ next);
1458 } 1646 }
1459 else 1647 else
1460 load_perl (aTHX_ next); 1648 load_perl (aTHX_ next);
1461 1649
1462 /* possibly untie and reuse the cctx */ 1650 /* possibly untie and reuse the cctx */
1463 if (expect_true ( 1651 if (ecb_expect_true (
1464 cctx_current->idle_sp == STACKLEVEL 1652 cctx_current->idle_sp == STACKLEVEL
1465 && !(cctx_current->flags & CC_TRACE) 1653 && !(cctx_current->flags & CC_TRACE)
1466 && !force_cctx 1654 && !force_cctx
1467 )) 1655 ))
1468 { 1656 {
1469 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1657 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */
1470 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te)); 1658 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1471 1659
1472 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */ 1660 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */
1473 /* without this the next cctx_get might destroy the running cctx while still in use */ 1661 /* without this the next cctx_get might destroy the running cctx while still in use */
1474 if (expect_false (CCTX_EXPIRED (cctx_current))) 1662 if (ecb_expect_false (CCTX_EXPIRED (cctx_current)))
1475 if (expect_true (!next->cctx)) 1663 if (ecb_expect_true (!next->cctx))
1476 next->cctx = cctx_get (aTHX); 1664 next->cctx = cctx_get (aTHX);
1477 1665
1478 cctx_put (cctx_current); 1666 cctx_put (cctx_current);
1479 } 1667 }
1480 else 1668 else
1481 prev->cctx = cctx_current; 1669 prev->cctx = cctx_current;
1482 1670
1483 ++next->usecount; 1671 ++next->usecount;
1484 1672
1485 cctx_prev = cctx_current; 1673 cctx_prev = cctx_current;
1486 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX); 1674 cctx_current = ecb_expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1487 1675
1488 next->cctx = 0; 1676 next->cctx = 0;
1489 1677
1490 if (expect_false (cctx_prev != cctx_current)) 1678 if (ecb_expect_false (cctx_prev != cctx_current))
1491 { 1679 {
1492 cctx_prev->top_env = PL_top_env; 1680 cctx_prev->top_env = PL_top_env;
1493 PL_top_env = cctx_current->top_env; 1681 PL_top_env = cctx_current->top_env;
1494 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx); 1682 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1495 } 1683 }
… …
1501#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx)) 1689#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1502#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1690#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1503 1691
1504/** high level stuff ********************************************************/ 1692/** high level stuff ********************************************************/
1505 1693
1694/* this function is actually Coro, not Coro::State, but we call it from here */
1695/* because it is convenient - but it hasn't been declared yet for that reason */
1506static int 1696static void
1697coro_call_on_destroy (pTHX_ struct coro *coro);
1698
1699static void
1507coro_state_destroy (pTHX_ struct coro *coro) 1700coro_state_destroy (pTHX_ struct coro *coro)
1508{ 1701{
1509 if (coro->flags & CF_DESTROYED) 1702 if (coro->flags & CF_ZOMBIE)
1510 return 0; 1703 return;
1511 1704
1512 if (coro->on_destroy && !PL_dirty)
1513 coro->on_destroy (aTHX_ coro); 1705 slf_destroy (aTHX_ coro);
1514 1706
1515 coro->flags |= CF_DESTROYED; 1707 coro->flags |= CF_ZOMBIE;
1516 1708
1517 if (coro->flags & CF_READY) 1709 if (coro->flags & CF_READY)
1518 { 1710 {
1519 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1711 /* reduce nready, as destroying a ready coro effectively unreadies it */
1520 /* alternative: look through all ready queues and remove the coro */ 1712 /* alternative: look through all ready queues and remove the coro */
1521 --coro_nready; 1713 --coro_nready;
1522 } 1714 }
1523 else 1715 else
1524 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1716 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1717
1718 if (coro->next) coro->next->prev = coro->prev;
1719 if (coro->prev) coro->prev->next = coro->next;
1720 if (coro == coro_first) coro_first = coro->next;
1525 1721
1526 if (coro->mainstack 1722 if (coro->mainstack
1527 && coro->mainstack != main_mainstack 1723 && coro->mainstack != main_mainstack
1528 && coro->slot 1724 && coro->slot
1529 && !PL_dirty) 1725 && !PL_dirty)
1530 coro_destruct_perl (aTHX_ coro); 1726 destroy_perl (aTHX_ coro);
1531 1727
1532 cctx_destroy (coro->cctx); 1728 cctx_destroy (coro->cctx);
1533 SvREFCNT_dec (coro->startcv); 1729 SvREFCNT_dec (coro->startcv);
1534 SvREFCNT_dec (coro->args); 1730 SvREFCNT_dec (coro->args);
1731 SvREFCNT_dec (coro->swap_sv);
1535 SvREFCNT_dec (CORO_THROW); 1732 SvREFCNT_dec (CORO_THROW);
1536 1733
1537 if (coro->next) coro->next->prev = coro->prev; 1734 coro_call_on_destroy (aTHX_ coro);
1538 if (coro->prev) coro->prev->next = coro->next;
1539 if (coro == coro_first) coro_first = coro->next;
1540 1735
1541 return 1; 1736 /* more destruction mayhem in coro_state_free */
1542} 1737}
1543 1738
1544static int 1739static int
1545coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1740coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1546{ 1741{
1547 struct coro *coro = (struct coro *)mg->mg_ptr; 1742 struct coro *coro = (struct coro *)mg->mg_ptr;
1548 mg->mg_ptr = 0; 1743 mg->mg_ptr = 0;
1549 1744
1550 coro->hv = 0;
1551
1552 if (--coro->refcnt < 0)
1553 {
1554 coro_state_destroy (aTHX_ coro); 1745 coro_state_destroy (aTHX_ coro);
1746 SvREFCNT_dec (coro->on_destroy);
1747 SvREFCNT_dec (coro->status);
1748
1555 Safefree (coro); 1749 Safefree (coro);
1556 }
1557 1750
1558 return 0; 1751 return 0;
1559} 1752}
1560 1753
1561static int 1754static int ecb_cold
1562coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1755coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1563{ 1756{
1564 struct coro *coro = (struct coro *)mg->mg_ptr; 1757 /* called when perl clones the current process the slow way (windows process emulation) */
1565 1758 /* WE SIMply nuke the pointers in the copy, causing perl to croak */
1566 ++coro->refcnt; 1759 mg->mg_ptr = 0;
1760 mg->mg_virtual = 0;
1567 1761
1568 return 0; 1762 return 0;
1569} 1763}
1570 1764
1571static MGVTBL coro_state_vtbl = { 1765static MGVTBL coro_state_vtbl = {
… …
1594 1788
1595 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1789 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1596 TRANSFER (ta, 1); 1790 TRANSFER (ta, 1);
1597} 1791}
1598 1792
1599/*****************************************************************************/
1600/* gensub: simple closure generation utility */
1601
1602#define GENSUB_ARG CvXSUBANY (cv).any_ptr
1603
1604/* create a closure from XS, returns a code reference */
1605/* the arg can be accessed via GENSUB_ARG from the callback */
1606/* the callback must use dXSARGS/XSRETURN */
1607static SV *
1608gensub (pTHX_ void (*xsub)(pTHX_ CV *), void *arg)
1609{
1610 CV *cv = (CV *)newSV (0);
1611
1612 sv_upgrade ((SV *)cv, SVt_PVCV);
1613
1614 CvANON_on (cv);
1615 CvISXSUB_on (cv);
1616 CvXSUB (cv) = xsub;
1617 GENSUB_ARG = arg;
1618
1619 return newRV_noinc ((SV *)cv);
1620}
1621
1622/** Coro ********************************************************************/ 1793/** Coro ********************************************************************/
1623 1794
1624INLINE void 1795ECB_INLINE void
1625coro_enq (pTHX_ struct coro *coro) 1796coro_enq (pTHX_ struct coro *coro)
1626{ 1797{
1627 struct coro **ready = coro_ready [coro->prio - PRIO_MIN]; 1798 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1628 1799
1629 SvREFCNT_inc_NN (coro->hv); 1800 SvREFCNT_inc_NN (coro->hv);
1630 1801
1631 coro->next_ready = 0; 1802 coro->next_ready = 0;
1632 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro; 1803 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1633 ready [1] = coro; 1804 ready [1] = coro;
1634} 1805}
1635 1806
1636INLINE struct coro * 1807ECB_INLINE struct coro *
1637coro_deq (pTHX) 1808coro_deq (pTHX)
1638{ 1809{
1639 int prio; 1810 int prio;
1640 1811
1641 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; ) 1812 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
1642 { 1813 {
1643 struct coro **ready = coro_ready [prio]; 1814 struct coro **ready = coro_ready [prio];
1644 1815
1645 if (ready [0]) 1816 if (ready [0])
1646 { 1817 {
… …
1651 } 1822 }
1652 1823
1653 return 0; 1824 return 0;
1654} 1825}
1655 1826
1827static void
1828invoke_sv_ready_hook_helper (void)
1829{
1830 dTHX;
1831 dSP;
1832
1833 ENTER;
1834 SAVETMPS;
1835
1836 PUSHMARK (SP);
1837 PUTBACK;
1838 call_sv (coro_readyhook, G_VOID | G_DISCARD);
1839
1840 FREETMPS;
1841 LEAVE;
1842}
1843
1656static int 1844static int
1657api_ready (pTHX_ SV *coro_sv) 1845api_ready (pTHX_ SV *coro_sv)
1658{ 1846{
1659 struct coro *coro;
1660 SV *sv_hook;
1661 void (*xs_hook)(void);
1662
1663 coro = SvSTATE (coro_sv); 1847 struct coro *coro = SvSTATE (coro_sv);
1664 1848
1665 if (coro->flags & CF_READY) 1849 if (coro->flags & CF_READY)
1666 return 0; 1850 return 0;
1667 1851
1668 coro->flags |= CF_READY; 1852 coro->flags |= CF_READY;
1669 1853
1670 sv_hook = coro_nready ? 0 : coro_readyhook;
1671 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1672
1673 coro_enq (aTHX_ coro); 1854 coro_enq (aTHX_ coro);
1674 ++coro_nready;
1675 1855
1676 if (sv_hook) 1856 if (!coro_nready++)
1677 { 1857 if (coroapi.readyhook)
1678 dSP; 1858 coroapi.readyhook ();
1679
1680 ENTER;
1681 SAVETMPS;
1682
1683 PUSHMARK (SP);
1684 PUTBACK;
1685 call_sv (sv_hook, G_VOID | G_DISCARD);
1686
1687 FREETMPS;
1688 LEAVE;
1689 }
1690
1691 if (xs_hook)
1692 xs_hook ();
1693 1859
1694 return 1; 1860 return 1;
1695} 1861}
1696 1862
1697static int 1863static int
… …
1699{ 1865{
1700 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1866 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1701} 1867}
1702 1868
1703/* expects to own a reference to next->hv */ 1869/* expects to own a reference to next->hv */
1704INLINE void 1870ECB_INLINE void
1705prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1871prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1706{ 1872{
1707 SV *prev_sv = SvRV (coro_current); 1873 SV *prev_sv = SvRV (coro_current);
1708 1874
1709 ta->prev = SvSTATE_hv (prev_sv); 1875 ta->prev = SvSTATE_hv (prev_sv);
… …
1722{ 1888{
1723 for (;;) 1889 for (;;)
1724 { 1890 {
1725 struct coro *next = coro_deq (aTHX); 1891 struct coro *next = coro_deq (aTHX);
1726 1892
1727 if (expect_true (next)) 1893 if (ecb_expect_true (next))
1728 { 1894 {
1729 /* cannot transfer to destroyed coros, skip and look for next */ 1895 /* cannot transfer to destroyed coros, skip and look for next */
1730 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED))) 1896 if (ecb_expect_false (next->flags & (CF_ZOMBIE | CF_SUSPENDED)))
1731 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */ 1897 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1732 else 1898 else
1733 { 1899 {
1734 next->flags &= ~CF_READY; 1900 next->flags &= ~CF_READY;
1735 --coro_nready; 1901 --coro_nready;
… …
1742 { 1908 {
1743 /* nothing to schedule: call the idle handler */ 1909 /* nothing to schedule: call the idle handler */
1744 if (SvROK (sv_idle) 1910 if (SvROK (sv_idle)
1745 && SvOBJECT (SvRV (sv_idle))) 1911 && SvOBJECT (SvRV (sv_idle)))
1746 { 1912 {
1913 if (SvRV (sv_idle) == SvRV (coro_current))
1914 croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught");
1915
1747 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 1916 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1748 api_ready (aTHX_ SvRV (sv_idle)); 1917 api_ready (aTHX_ SvRV (sv_idle));
1749 --coro_nready; 1918 --coro_nready;
1750 } 1919 }
1751 else 1920 else
1752 { 1921 {
1922 /* TODO: deprecated, remove, cannot work reliably *//*D*/
1753 dSP; 1923 dSP;
1754 1924
1755 ENTER; 1925 ENTER;
1756 SAVETMPS; 1926 SAVETMPS;
1757 1927
… …
1764 } 1934 }
1765 } 1935 }
1766 } 1936 }
1767} 1937}
1768 1938
1769INLINE void 1939ECB_INLINE void
1770prepare_cede (pTHX_ struct coro_transfer_args *ta) 1940prepare_cede (pTHX_ struct coro_transfer_args *ta)
1771{ 1941{
1772 api_ready (aTHX_ coro_current); 1942 api_ready (aTHX_ coro_current);
1773 prepare_schedule (aTHX_ ta); 1943 prepare_schedule (aTHX_ ta);
1774} 1944}
1775 1945
1776INLINE void 1946ECB_INLINE void
1777prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 1947prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1778{ 1948{
1779 SV *prev = SvRV (coro_current); 1949 SV *prev = SvRV (coro_current);
1780 1950
1781 if (coro_nready) 1951 if (coro_nready)
… …
1811{ 1981{
1812 struct coro_transfer_args ta; 1982 struct coro_transfer_args ta;
1813 1983
1814 prepare_cede (aTHX_ &ta); 1984 prepare_cede (aTHX_ &ta);
1815 1985
1816 if (expect_true (ta.prev != ta.next)) 1986 if (ecb_expect_true (ta.prev != ta.next))
1817 { 1987 {
1818 TRANSFER (ta, 1); 1988 TRANSFER (ta, 1);
1819 return 1; 1989 return 1;
1820 } 1990 }
1821 else 1991 else
… …
1864 coro->slot->runops = RUNOPS_DEFAULT; 2034 coro->slot->runops = RUNOPS_DEFAULT;
1865 } 2035 }
1866} 2036}
1867 2037
1868static void 2038static void
2039coro_push_av (pTHX_ AV *av, I32 gimme_v)
2040{
2041 if (AvFILLp (av) >= 0 && gimme_v != G_VOID)
2042 {
2043 dSP;
2044
2045 if (gimme_v == G_SCALAR)
2046 XPUSHs (AvARRAY (av)[AvFILLp (av)]);
2047 else
2048 {
2049 int i;
2050 EXTEND (SP, AvFILLp (av) + 1);
2051
2052 for (i = 0; i <= AvFILLp (av); ++i)
2053 PUSHs (AvARRAY (av)[i]);
2054 }
2055
2056 PUTBACK;
2057 }
2058}
2059
2060static void
2061coro_push_on_destroy (pTHX_ struct coro *coro, SV *cb)
2062{
2063 if (!coro->on_destroy)
2064 coro->on_destroy = newAV ();
2065
2066 av_push (coro->on_destroy, cb);
2067}
2068
2069static void
2070slf_destroy_join (pTHX_ struct CoroSLF *frame)
2071{
2072 SvREFCNT_dec ((SV *)((struct coro *)frame->data)->hv);
2073}
2074
2075static int
2076slf_check_join (pTHX_ struct CoroSLF *frame)
2077{
2078 struct coro *coro = (struct coro *)frame->data;
2079
2080 if (!coro->status)
2081 return 1;
2082
2083 frame->destroy = 0;
2084
2085 coro_push_av (aTHX_ coro->status, GIMME_V);
2086
2087 SvREFCNT_dec ((SV *)coro->hv);
2088
2089 return 0;
2090}
2091
2092static void
2093slf_init_join (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2094{
2095 struct coro *coro = SvSTATE (items > 0 ? arg [0] : &PL_sv_undef);
2096
2097 if (items > 1)
2098 croak ("join called with too many arguments");
2099
2100 if (coro->status)
2101 frame->prepare = prepare_nop;
2102 else
2103 {
2104 coro_push_on_destroy (aTHX_ coro, SvREFCNT_inc_NN (SvRV (coro_current)));
2105 frame->prepare = prepare_schedule;
2106 }
2107
2108 frame->check = slf_check_join;
2109 frame->destroy = slf_destroy_join;
2110 frame->data = (void *)coro;
2111 SvREFCNT_inc (coro->hv);
2112}
2113
2114static void
1869coro_call_on_destroy (pTHX_ struct coro *coro) 2115coro_call_on_destroy (pTHX_ struct coro *coro)
1870{ 2116{
1871 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2117 AV *od = coro->on_destroy;
1872 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1873 2118
1874 if (on_destroyp) 2119 if (!od)
1875 { 2120 return;
1876 AV *on_destroy = (AV *)SvRV (*on_destroyp);
1877 2121
1878 while (AvFILLp (on_destroy) >= 0) 2122 while (AvFILLp (od) >= 0)
2123 {
2124 SV *cb = sv_2mortal (av_pop (od));
2125
2126 /* coro hv's (and only hv's at the moment) are supported as well */
2127 if (SvSTATEhv_p (aTHX_ cb))
2128 api_ready (aTHX_ cb);
2129 else
1879 { 2130 {
1880 dSP; /* don't disturb outer sp */ 2131 dSP; /* don't disturb outer sp */
1881 SV *cb = av_pop (on_destroy);
1882
1883 PUSHMARK (SP); 2132 PUSHMARK (SP);
1884 2133
1885 if (statusp) 2134 if (coro->status)
1886 { 2135 {
1887 int i; 2136 PUTBACK;
1888 AV *status = (AV *)SvRV (*statusp); 2137 coro_push_av (aTHX_ coro->status, G_ARRAY);
1889 EXTEND (SP, AvFILLp (status) + 1); 2138 SPAGAIN;
1890
1891 for (i = 0; i <= AvFILLp (status); ++i)
1892 PUSHs (AvARRAY (status)[i]);
1893 } 2139 }
1894 2140
1895 PUTBACK; 2141 PUTBACK;
1896 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD); 2142 call_sv (cb, G_VOID | G_DISCARD);
1897 } 2143 }
1898 } 2144 }
1899} 2145}
1900 2146
1901static void 2147static void
1902slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2148coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
1903{ 2149{
2150 AV *av;
2151
2152 if (coro->status)
2153 {
2154 av = coro->status;
2155 av_clear (av);
2156 }
2157 else
2158 av = coro->status = newAV ();
2159
2160 /* items are actually not so common, so optimise for this case */
2161 if (items)
2162 {
1904 int i; 2163 int i;
1905 HV *hv = (HV *)SvRV (coro_current);
1906 AV *av = newAV ();
1907 2164
1908 av_extend (av, items - 1); 2165 av_extend (av, items - 1);
2166
1909 for (i = 0; i < items; ++i) 2167 for (i = 0; i < items; ++i)
1910 av_push (av, SvREFCNT_inc_NN (arg [i])); 2168 av_push (av, SvREFCNT_inc_NN (arg [i]));
2169 }
2170}
1911 2171
1912 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 2172static void
1913 2173slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2174{
1914 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */ 2175 av_push (av_destroy, (SV *)newRV_inc ((SV *)coro_hv)); /* RVinc for perl */
1915 api_ready (aTHX_ sv_manager); 2176 api_ready (aTHX_ sv_manager);
1916 2177
1917 frame->prepare = prepare_schedule; 2178 frame->prepare = prepare_schedule;
1918 frame->check = slf_check_repeat; 2179 frame->check = slf_check_repeat;
1919 2180
1920 /* as a minor optimisation, we could unwind all stacks here */ 2181 /* as a minor optimisation, we could unwind all stacks here */
1921 /* but that puts extra pressure on pp_slf, and is not worth much */ 2182 /* but that puts extra pressure on pp_slf, and is not worth much */
1922 /*coro_unwind_stacks (aTHX);*/ 2183 /*coro_unwind_stacks (aTHX);*/
2184}
2185
2186static void
2187slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2188{
2189 HV *coro_hv = (HV *)SvRV (coro_current);
2190
2191 coro_set_status (aTHX_ SvSTATE ((SV *)coro_hv), arg, items);
2192 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2193}
2194
2195static void
2196slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2197{
2198 HV *coro_hv;
2199 struct coro *coro;
2200
2201 if (items <= 0)
2202 croak ("Coro::cancel called without coro object,");
2203
2204 coro = SvSTATE (arg [0]);
2205 coro_hv = coro->hv;
2206
2207 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2208
2209 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2210 {
2211 /* coro currently busy cancelling something, so just notify it */
2212 coro->slf_frame.data = (void *)coro;
2213
2214 frame->prepare = prepare_nop;
2215 frame->check = slf_check_nop;
2216 }
2217 else if (coro_hv == (HV *)SvRV (coro_current))
2218 {
2219 /* cancelling the current coro is allowed, and equals terminate */
2220 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2221 }
2222 else
2223 {
2224 struct coro *self = SvSTATE_current;
2225
2226 /* otherwise we cancel directly, purely for speed reasons
2227 * unfortunately, this requires some magic trickery, as
2228 * somebody else could cancel us, so we have to fight the cancellation.
2229 * this is ugly, and hopefully fully worth the extra speed.
2230 * besides, I can't get the slow-but-safe version working...
2231 */
2232 slf_frame.data = 0;
2233 self->flags |= CF_NOCANCEL;
2234 coro_state_destroy (aTHX_ coro);
2235 self->flags &= ~CF_NOCANCEL;
2236
2237 if (slf_frame.data)
2238 {
2239 /* while we were busy we have been cancelled, so terminate */
2240 slf_init_terminate_cancel_common (aTHX_ frame, self->hv);
2241 }
2242 else
2243 {
2244 frame->prepare = prepare_nop;
2245 frame->check = slf_check_nop;
2246 }
2247 }
2248}
2249
2250static int
2251slf_check_safe_cancel (pTHX_ struct CoroSLF *frame)
2252{
2253 frame->prepare = 0;
2254 coro_unwind_stacks (aTHX);
2255
2256 slf_init_terminate_cancel_common (aTHX_ frame, (HV *)SvRV (coro_current));
2257
2258 return 1;
2259}
2260
2261static int
2262safe_cancel (pTHX_ struct coro *coro, SV **arg, int items)
2263{
2264 if (coro->cctx)
2265 croak ("coro inside C callback, unable to cancel at this time, caught");
2266
2267 if (coro->flags & CF_NEW)
2268 {
2269 coro_set_status (aTHX_ coro, arg, items);
2270 coro_state_destroy (aTHX_ coro);
2271 }
2272 else
2273 {
2274 if (!coro->slf_frame.prepare)
2275 croak ("coro outside an SLF function, unable to cancel at this time, caught");
2276
2277 slf_destroy (aTHX_ coro);
2278
2279 coro_set_status (aTHX_ coro, arg, items);
2280 coro->slf_frame.prepare = prepare_nop;
2281 coro->slf_frame.check = slf_check_safe_cancel;
2282
2283 api_ready (aTHX_ (SV *)coro->hv);
2284 }
2285
2286 return 1;
1923} 2287}
1924 2288
1925/*****************************************************************************/ 2289/*****************************************************************************/
1926/* async pool handler */ 2290/* async pool handler */
1927 2291
… …
1958slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2322slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1959{ 2323{
1960 HV *hv = (HV *)SvRV (coro_current); 2324 HV *hv = (HV *)SvRV (coro_current);
1961 struct coro *coro = SvSTATE_hv ((SV *)hv); 2325 struct coro *coro = SvSTATE_hv ((SV *)hv);
1962 2326
1963 if (expect_true (coro->saved_deffh)) 2327 if (ecb_expect_true (coro->saved_deffh))
1964 { 2328 {
1965 /* subsequent iteration */ 2329 /* subsequent iteration */
1966 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2330 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1967 coro->saved_deffh = 0; 2331 coro->saved_deffh = 0;
1968 2332
1969 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 2333 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
1970 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2334 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1971 { 2335 {
1972 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate); 2336 slf_init_terminate_cancel_common (aTHX_ frame, hv);
1973 coro->invoke_av = newAV (); 2337 return;
1974
1975 frame->prepare = prepare_nop;
1976 } 2338 }
1977 else 2339 else
1978 { 2340 {
1979 av_clear (GvAV (PL_defgv)); 2341 av_clear (GvAV (PL_defgv));
1980 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2342 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
… …
2005 2367
2006static void 2368static void
2007coro_rouse_callback (pTHX_ CV *cv) 2369coro_rouse_callback (pTHX_ CV *cv)
2008{ 2370{
2009 dXSARGS; 2371 dXSARGS;
2010 SV *data = (SV *)GENSUB_ARG; 2372 SV *data = (SV *)S_GENSUB_ARG;
2011 2373
2012 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2374 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2013 { 2375 {
2014 /* first call, set args */ 2376 /* first call, set args */
2015 SV *coro = SvRV (data); 2377 SV *coro = SvRV (data);
… …
2081 || SvTYPE (SvRV (cb)) != SVt_PVCV 2443 || SvTYPE (SvRV (cb)) != SVt_PVCV
2082 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2444 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2083 croak ("Coro::rouse_wait called with illegal callback argument,"); 2445 croak ("Coro::rouse_wait called with illegal callback argument,");
2084 2446
2085 { 2447 {
2086 CV *cv = (CV *)SvRV (cb); /* for GENSUB_ARG */ 2448 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
2087 SV *data = (SV *)GENSUB_ARG; 2449 SV *data = (SV *)S_GENSUB_ARG;
2088 2450
2089 frame->data = (void *)data; 2451 frame->data = (void *)data;
2090 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule; 2452 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
2091 frame->check = slf_check_rouse_wait; 2453 frame->check = slf_check_rouse_wait;
2092 } 2454 }
… …
2096coro_new_rouse_cb (pTHX) 2458coro_new_rouse_cb (pTHX)
2097{ 2459{
2098 HV *hv = (HV *)SvRV (coro_current); 2460 HV *hv = (HV *)SvRV (coro_current);
2099 struct coro *coro = SvSTATE_hv (hv); 2461 struct coro *coro = SvSTATE_hv (hv);
2100 SV *data = newRV_inc ((SV *)hv); 2462 SV *data = newRV_inc ((SV *)hv);
2101 SV *cb = gensub (aTHX_ coro_rouse_callback, (void *)data); 2463 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
2102 2464
2103 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0); 2465 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0);
2104 SvREFCNT_dec (data); /* magicext increases the refcount */ 2466 SvREFCNT_dec (data); /* magicext increases the refcount */
2105 2467
2106 SvREFCNT_dec (coro->rouse_cb); 2468 SvREFCNT_dec (coro->rouse_cb);
… …
2203static void 2565static void
2204slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2566slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2205{ 2567{
2206 frame->prepare = prepare_cede_notself; 2568 frame->prepare = prepare_cede_notself;
2207 frame->check = slf_check_nop; 2569 frame->check = slf_check_nop;
2570}
2571
2572/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2573static void
2574slf_destroy (pTHX_ struct coro *coro)
2575{
2576 /* this callback is reserved for slf functions needing to do cleanup */
2577 if (coro->slf_frame.destroy && coro->slf_frame.prepare && !PL_dirty)
2578 coro->slf_frame.destroy (aTHX_ &coro->slf_frame);
2579
2580 /*
2581 * The on_destroy above most likely is from an SLF call.
2582 * Since by definition the SLF call will not finish when we destroy
2583 * the coro, we will have to force-finish it here, otherwise
2584 * cleanup functions cannot call SLF functions.
2585 */
2586 coro->slf_frame.prepare = 0;
2208} 2587}
2209 2588
2210/* 2589/*
2211 * these not obviously related functions are all rolled into one 2590 * these not obviously related functions are all rolled into one
2212 * function to increase chances that they all will call transfer with the same 2591 * function to increase chances that they all will call transfer with the same
… …
2219 I32 checkmark; /* mark SP to see how many elements check has pushed */ 2598 I32 checkmark; /* mark SP to see how many elements check has pushed */
2220 2599
2221 /* set up the slf frame, unless it has already been set-up */ 2600 /* set up the slf frame, unless it has already been set-up */
2222 /* the latter happens when a new coro has been started */ 2601 /* the latter happens when a new coro has been started */
2223 /* or when a new cctx was attached to an existing coroutine */ 2602 /* or when a new cctx was attached to an existing coroutine */
2224 if (expect_true (!slf_frame.prepare)) 2603 if (ecb_expect_true (!slf_frame.prepare))
2225 { 2604 {
2226 /* first iteration */ 2605 /* first iteration */
2227 dSP; 2606 dSP;
2228 SV **arg = PL_stack_base + TOPMARK + 1; 2607 SV **arg = PL_stack_base + TOPMARK + 1;
2229 int items = SP - arg; /* args without function object */ 2608 int items = SP - arg; /* args without function object */
… …
2270 while (slf_frame.check (aTHX_ &slf_frame)); 2649 while (slf_frame.check (aTHX_ &slf_frame));
2271 2650
2272 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */ 2651 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */
2273 2652
2274 /* exception handling */ 2653 /* exception handling */
2275 if (expect_false (CORO_THROW)) 2654 if (ecb_expect_false (CORO_THROW))
2276 { 2655 {
2277 SV *exception = sv_2mortal (CORO_THROW); 2656 SV *exception = sv_2mortal (CORO_THROW);
2278 2657
2279 CORO_THROW = 0; 2658 CORO_THROW = 0;
2280 sv_setsv (ERRSV, exception); 2659 sv_setsv (ERRSV, exception);
2281 croak (0); 2660 croak (0);
2282 } 2661 }
2283 2662
2284 /* return value handling - mostly like entersub */ 2663 /* return value handling - mostly like entersub */
2285 /* make sure we put something on the stack in scalar context */ 2664 /* make sure we put something on the stack in scalar context */
2286 if (GIMME_V == G_SCALAR) 2665 if (GIMME_V == G_SCALAR
2666 && ecb_expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2287 { 2667 {
2288 dSP; 2668 dSP;
2289 SV **bot = PL_stack_base + checkmark; 2669 SV **bot = PL_stack_base + checkmark;
2290 2670
2291 if (sp == bot) /* too few, push undef */ 2671 if (sp == bot) /* too few, push undef */
2292 bot [1] = &PL_sv_undef; 2672 bot [1] = &PL_sv_undef;
2293 else if (sp != bot + 1) /* too many, take last one */ 2673 else /* too many, take last one */
2294 bot [1] = *sp; 2674 bot [1] = *sp;
2295 2675
2296 SP = bot + 1; 2676 SP = bot + 1;
2297 2677
2298 PUTBACK; 2678 PUTBACK;
… …
2331 if (PL_op->op_flags & OPf_STACKED) 2711 if (PL_op->op_flags & OPf_STACKED)
2332 { 2712 {
2333 if (items > slf_arga) 2713 if (items > slf_arga)
2334 { 2714 {
2335 slf_arga = items; 2715 slf_arga = items;
2336 free (slf_argv); 2716 Safefree (slf_argv);
2337 slf_argv = malloc (slf_arga * sizeof (SV *)); 2717 New (0, slf_argv, slf_arga, SV *);
2338 } 2718 }
2339 2719
2340 slf_argc = items; 2720 slf_argc = items;
2341 2721
2342 for (i = 0; i < items; ++i) 2722 for (i = 0; i < items; ++i)
… …
2405{ 2785{
2406 PerlIOBuf base; 2786 PerlIOBuf base;
2407 NV next, every; 2787 NV next, every;
2408} PerlIOCede; 2788} PerlIOCede;
2409 2789
2410static IV 2790static IV ecb_cold
2411PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab) 2791PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab)
2412{ 2792{
2413 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2793 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2414 2794
2415 self->every = SvCUR (arg) ? SvNV (arg) : 0.01; 2795 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
2416 self->next = nvtime () + self->every; 2796 self->next = nvtime () + self->every;
2417 2797
2418 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab); 2798 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
2419} 2799}
2420 2800
2421static SV * 2801static SV * ecb_cold
2422PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags) 2802PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
2423{ 2803{
2424 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2804 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2425 2805
2426 return newSVnv (self->every); 2806 return newSVnv (self->every);
… …
2477/* Coro::Semaphore & Coro::Signal */ 2857/* Coro::Semaphore & Coro::Signal */
2478 2858
2479static SV * 2859static SV *
2480coro_waitarray_new (pTHX_ int count) 2860coro_waitarray_new (pTHX_ int count)
2481{ 2861{
2482 /* a semaphore contains a counter IV in $sem->[0] and any waiters after that */ 2862 /* a waitarray=semaphore contains a counter IV in $sem->[0] and any waiters after that */
2483 AV *av = newAV (); 2863 AV *av = newAV ();
2484 SV **ary; 2864 SV **ary;
2485 2865
2486 /* unfortunately, building manually saves memory */ 2866 /* unfortunately, building manually saves memory */
2487 Newx (ary, 2, SV *); 2867 Newx (ary, 2, SV *);
… …
2538 SvREFCNT_dec (cb); 2918 SvREFCNT_dec (cb);
2539 } 2919 }
2540} 2920}
2541 2921
2542static void 2922static void
2543coro_semaphore_on_destroy (pTHX_ struct coro *coro) 2923coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2544{ 2924{
2545 /* call $sem->adjust (0) to possibly wake up some other waiters */ 2925 /* call $sem->adjust (0) to possibly wake up some other waiters */
2546 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 2926 coro_semaphore_adjust (aTHX_ (AV *)frame->data, 0);
2547} 2927}
2548 2928
2549static int 2929static int
2550slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire) 2930slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2551{ 2931{
2552 AV *av = (AV *)frame->data; 2932 AV *av = (AV *)frame->data;
2553 SV *count_sv = AvARRAY (av)[0]; 2933 SV *count_sv = AvARRAY (av)[0];
2934 SV *coro_hv = SvRV (coro_current);
2554 2935
2555 /* if we are about to throw, don't actually acquire the lock, just throw */ 2936 /* if we are about to throw, don't actually acquire the lock, just throw */
2556 if (CORO_THROW) 2937 if (CORO_THROW)
2557 return 0; 2938 return 0;
2558 else if (SvIVX (count_sv) > 0) 2939 else if (SvIVX (count_sv) > 0)
2559 { 2940 {
2560 SvSTATE_current->on_destroy = 0; 2941 frame->destroy = 0;
2561 2942
2562 if (acquire) 2943 if (acquire)
2563 SvIVX (count_sv) = SvIVX (count_sv) - 1; 2944 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2564 else 2945 else
2565 coro_semaphore_adjust (aTHX_ av, 0); 2946 coro_semaphore_adjust (aTHX_ av, 0);
… …
2570 { 2951 {
2571 int i; 2952 int i;
2572 /* if we were woken up but can't down, we look through the whole */ 2953 /* if we were woken up but can't down, we look through the whole */
2573 /* waiters list and only add us if we aren't in there already */ 2954 /* waiters list and only add us if we aren't in there already */
2574 /* this avoids some degenerate memory usage cases */ 2955 /* this avoids some degenerate memory usage cases */
2575 2956 for (i = AvFILLp (av); i > 0; --i) // i > 0 is not an off-by-one bug
2576 for (i = 1; i <= AvFILLp (av); ++i)
2577 if (AvARRAY (av)[i] == SvRV (coro_current)) 2957 if (AvARRAY (av)[i] == coro_hv)
2578 return 1; 2958 return 1;
2579 2959
2580 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2960 av_push (av, SvREFCNT_inc (coro_hv));
2581 return 1; 2961 return 1;
2582 } 2962 }
2583} 2963}
2584 2964
2585static int 2965static int
… …
2608 { 2988 {
2609 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2989 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2610 2990
2611 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 2991 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2612 frame->prepare = prepare_schedule; 2992 frame->prepare = prepare_schedule;
2613
2614 /* to avoid race conditions when a woken-up coro gets terminated */ 2993 /* to avoid race conditions when a woken-up coro gets terminated */
2615 /* we arrange for a temporary on_destroy that calls adjust (0) */ 2994 /* we arrange for a temporary on_destroy that calls adjust (0) */
2616 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 2995 frame->destroy = coro_semaphore_destroy;
2617 } 2996 }
2618} 2997}
2619 2998
2620static void 2999static void
2621slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 3000slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
… …
2629{ 3008{
2630 if (items >= 2) 3009 if (items >= 2)
2631 { 3010 {
2632 /* callback form */ 3011 /* callback form */
2633 AV *av = (AV *)SvRV (arg [0]); 3012 AV *av = (AV *)SvRV (arg [0]);
2634 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 3013 SV *cb_cv = s_get_cv_croak (arg [1]);
2635 3014
2636 av_push (av, (SV *)SvREFCNT_inc_NN (cb_cv)); 3015 av_push (av, SvREFCNT_inc_NN (cb_cv));
2637 3016
2638 if (SvIVX (AvARRAY (av)[0]) > 0) 3017 if (SvIVX (AvARRAY (av)[0]) > 0)
2639 coro_semaphore_adjust (aTHX_ av, 0); 3018 coro_semaphore_adjust (aTHX_ av, 0);
2640 3019
2641 frame->prepare = prepare_nop; 3020 frame->prepare = prepare_nop;
… …
2665 AvARRAY (av)[0] = AvARRAY (av)[1]; 3044 AvARRAY (av)[0] = AvARRAY (av)[1];
2666 AvARRAY (av)[1] = cb; 3045 AvARRAY (av)[1] = cb;
2667 3046
2668 cb = av_shift (av); 3047 cb = av_shift (av);
2669 3048
3049 if (SvTYPE (cb) == SVt_PVCV)
3050 {
3051 dSP;
3052 PUSHMARK (SP);
3053 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
3054 PUTBACK;
3055 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
3056 }
3057 else
3058 {
2670 api_ready (aTHX_ cb); 3059 api_ready (aTHX_ cb);
2671 sv_setiv (cb, 0); /* signal waiter */ 3060 sv_setiv (cb, 0); /* signal waiter */
3061 }
3062
2672 SvREFCNT_dec (cb); 3063 SvREFCNT_dec (cb);
2673 3064
2674 --count; 3065 --count;
2675 } 3066 }
2676} 3067}
… …
2685static void 3076static void
2686slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 3077slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2687{ 3078{
2688 AV *av = (AV *)SvRV (arg [0]); 3079 AV *av = (AV *)SvRV (arg [0]);
2689 3080
3081 if (items >= 2)
3082 {
3083 SV *cb_cv = s_get_cv_croak (arg [1]);
3084 av_push (av, SvREFCNT_inc_NN (cb_cv));
3085
2690 if (SvIVX (AvARRAY (av)[0])) 3086 if (SvIVX (AvARRAY (av)[0]))
3087 coro_signal_wake (aTHX_ av, 1); /* must be the only waiter */
3088
3089 frame->prepare = prepare_nop;
3090 frame->check = slf_check_nop;
3091 }
3092 else if (SvIVX (AvARRAY (av)[0]))
2691 { 3093 {
2692 SvIVX (AvARRAY (av)[0]) = 0; 3094 SvIVX (AvARRAY (av)[0]) = 0;
2693 frame->prepare = prepare_nop; 3095 frame->prepare = prepare_nop;
2694 frame->check = slf_check_nop; 3096 frame->check = slf_check_nop;
2695 } 3097 }
2696 else 3098 else
2697 { 3099 {
2698 SV *waiter = newRV_inc (SvRV (coro_current)); /* owned by signal av */ 3100 SV *waiter = newSVsv (coro_current); /* owned by signal av */
2699 3101
2700 av_push (av, waiter); 3102 av_push (av, waiter);
2701 3103
2702 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */ 3104 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */
2703 frame->prepare = prepare_schedule; 3105 frame->prepare = prepare_schedule;
… …
2721 3123
2722static void 3124static void
2723coro_aio_callback (pTHX_ CV *cv) 3125coro_aio_callback (pTHX_ CV *cv)
2724{ 3126{
2725 dXSARGS; 3127 dXSARGS;
2726 AV *state = (AV *)GENSUB_ARG; 3128 AV *state = (AV *)S_GENSUB_ARG;
2727 SV *coro = av_pop (state); 3129 SV *coro = av_pop (state);
2728 SV *data_sv = newSV (sizeof (struct io_state)); 3130 SV *data_sv = newSV (sizeof (struct io_state));
2729 3131
2730 av_extend (state, items - 1); 3132 av_extend (state, items - 1);
2731 3133
… …
2816 dSP; 3218 dSP;
2817 3219
2818 static SV *prio_cv; 3220 static SV *prio_cv;
2819 static SV *prio_sv; 3221 static SV *prio_sv;
2820 3222
2821 if (expect_false (!prio_cv)) 3223 if (ecb_expect_false (!prio_cv))
2822 { 3224 {
2823 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0); 3225 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0);
2824 prio_sv = newSViv (0); 3226 prio_sv = newSViv (0);
2825 } 3227 }
2826 3228
… …
2845 3247
2846 for (i = 0; i < items; ++i) 3248 for (i = 0; i < items; ++i)
2847 PUSHs (arg [i]); 3249 PUSHs (arg [i]);
2848 3250
2849 /* now push the callback closure */ 3251 /* now push the callback closure */
2850 PUSHs (sv_2mortal (gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state)))); 3252 PUSHs (sv_2mortal (s_gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state))));
2851 3253
2852 /* now call the AIO function - we assume our request is uncancelable */ 3254 /* now call the AIO function - we assume our request is uncancelable */
2853 PUTBACK; 3255 PUTBACK;
2854 call_sv ((SV *)req, G_VOID | G_DISCARD); 3256 call_sv ((SV *)req, G_VOID | G_DISCARD);
2855 } 3257 }
2856 3258
2857 /* now that the requets is going, we loop toll we have a result */ 3259 /* now that the request is going, we loop till we have a result */
2858 frame->data = (void *)state; 3260 frame->data = (void *)state;
2859 frame->prepare = prepare_schedule; 3261 frame->prepare = prepare_schedule;
2860 frame->check = slf_check_aio_req; 3262 frame->check = slf_check_aio_req;
2861} 3263}
2862 3264
… …
2872 3274
2873/*****************************************************************************/ 3275/*****************************************************************************/
2874 3276
2875#if CORO_CLONE 3277#if CORO_CLONE
2876# include "clone.c" 3278# include "clone.c"
3279#endif
3280
3281/*****************************************************************************/
3282
3283static SV *
3284coro_new (pTHX_ HV *stash, SV **argv, int argc, int is_coro)
3285{
3286 SV *coro_sv;
3287 struct coro *coro;
3288 MAGIC *mg;
3289 HV *hv;
3290 SV *cb;
3291 int i;
3292
3293 if (argc > 0)
3294 {
3295 cb = s_get_cv_croak (argv [0]);
3296
3297 if (!is_coro)
3298 {
3299 if (CvISXSUB (cb))
3300 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
3301
3302 if (!CvROOT (cb))
3303 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
3304 }
3305 }
3306
3307 Newz (0, coro, 1, struct coro);
3308 coro->args = newAV ();
3309 coro->flags = CF_NEW;
3310
3311 if (coro_first) coro_first->prev = coro;
3312 coro->next = coro_first;
3313 coro_first = coro;
3314
3315 coro->hv = hv = newHV ();
3316 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
3317 mg->mg_flags |= MGf_DUP;
3318 coro_sv = sv_bless (newRV_noinc ((SV *)hv), stash);
3319
3320 if (argc > 0)
3321 {
3322 av_extend (coro->args, argc + is_coro - 1);
3323
3324 if (is_coro)
3325 {
3326 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
3327 cb = (SV *)cv_coro_run;
3328 }
3329
3330 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3331
3332 for (i = 1; i < argc; i++)
3333 av_push (coro->args, newSVsv (argv [i]));
3334 }
3335
3336 return coro_sv;
3337}
3338
3339#ifndef __cplusplus
3340ecb_cold XS(boot_Coro__State);
3341#endif
3342
3343#if CORO_JIT
3344
3345static void ecb_noinline ecb_cold
3346pushav_3uv (pTHX_ UV a, UV b, UV c)
3347{
3348 dSP;
3349 AV *av = newAV ();
3350
3351 av_store (av, 2, newSVuv (c));
3352 av_store (av, 1, newSVuv (b));
3353 av_store (av, 0, newSVuv (a));
3354
3355 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
3356
3357 PUTBACK;
3358}
3359
3360static void ecb_noinline ecb_cold
3361jit_init (pTHX)
3362{
3363 dSP;
3364 SV *load, *save;
3365 char *map_base;
3366 char *load_ptr, *save_ptr;
3367 STRLEN load_len, save_len;
3368 int count;
3369
3370 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3371
3372 PUSHMARK (SP);
3373#define VARx(name,expr,type) pushav_3uv (aTHX_ (UV)&(expr), offsetof (perl_slots, name), sizeof (type));
3374# include "state.h"
3375#undef VARx
3376 count = call_pv ("Coro::State::_jit", G_ARRAY);
3377 SPAGAIN;
3378
3379 save = POPs; save_ptr = SvPVbyte (save, save_len);
3380 load = POPs; load_ptr = SvPVbyte (load, load_len);
3381
3382 map_base = mmap (0, load_len + save_len + 16, PROT_EXEC | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3383
3384 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3385
3386 load_perl_slots = (load_save_perl_slots_type)map_base;
3387 memcpy (map_base, load_ptr, load_len);
3388
3389 map_base += (load_len + 15) & ~15;
3390
3391 save_perl_slots = (load_save_perl_slots_type)map_base;
3392 memcpy (map_base, save_ptr, save_len);
3393
3394 PUTBACK;
3395 eval_pv ("undef &Coro::State::_jit", 1);
3396}
3397
2877#endif 3398#endif
2878 3399
2879MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3400MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2880 3401
2881PROTOTYPES: DISABLE 3402PROTOTYPES: DISABLE
… …
2887 coro_thx = PERL_GET_CONTEXT; 3408 coro_thx = PERL_GET_CONTEXT;
2888# endif 3409# endif
2889#endif 3410#endif
2890 BOOT_PAGESIZE; 3411 BOOT_PAGESIZE;
2891 3412
3413 /* perl defines these to check for existance first, but why it doesn't */
3414 /* just create them one at init time is not clear to me, except for */
3415 /* programs trying to delete them, but... */
3416 /* anyway, we declare this as invalid and make sure they are initialised here */
3417 DEFSV;
3418 ERRSV;
3419
2892 cctx_current = cctx_new_empty (); 3420 cctx_current = cctx_new_empty ();
2893 3421
2894 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3422 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
2895 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3423 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
2896 3424
… …
2935 coroapi.prepare_nop = prepare_nop; 3463 coroapi.prepare_nop = prepare_nop;
2936 coroapi.prepare_schedule = prepare_schedule; 3464 coroapi.prepare_schedule = prepare_schedule;
2937 coroapi.prepare_cede = prepare_cede; 3465 coroapi.prepare_cede = prepare_cede;
2938 coroapi.prepare_cede_notself = prepare_cede_notself; 3466 coroapi.prepare_cede_notself = prepare_cede_notself;
2939 3467
2940 { 3468 time_init (aTHX);
2941 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
2942 3469
2943 if (!svp) croak ("Time::HiRes is required");
2944 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
2945
2946 nvtime = INT2PTR (double (*)(), SvIV (*svp));
2947 }
2948
2949 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 3470 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3471#if CORO_JIT
3472 PUTBACK;
3473 jit_init (aTHX);
3474 SPAGAIN;
3475#endif
2950} 3476}
2951 3477
2952SV * 3478SV *
2953new (char *klass, ...) 3479new (SV *klass, ...)
2954 ALIAS: 3480 ALIAS:
2955 Coro::new = 1 3481 Coro::new = 1
2956 CODE: 3482 CODE:
2957{ 3483 RETVAL = coro_new (aTHX_ ix ? coro_stash : coro_state_stash, &ST (1), items - 1, ix);
2958 struct coro *coro; 3484 OUTPUT:
2959 MAGIC *mg;
2960 HV *hv;
2961 CV *cb;
2962 int i;
2963
2964 if (items > 1)
2965 {
2966 cb = coro_sv_2cv (aTHX_ ST (1));
2967
2968 if (!ix)
2969 {
2970 if (CvISXSUB (cb))
2971 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
2972
2973 if (!CvROOT (cb))
2974 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
2975 }
2976 }
2977
2978 Newz (0, coro, 1, struct coro);
2979 coro->args = newAV ();
2980 coro->flags = CF_NEW;
2981
2982 if (coro_first) coro_first->prev = coro;
2983 coro->next = coro_first;
2984 coro_first = coro;
2985
2986 coro->hv = hv = newHV ();
2987 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
2988 mg->mg_flags |= MGf_DUP;
2989 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
2990
2991 if (items > 1)
2992 {
2993 av_extend (coro->args, items - 1 + ix - 1);
2994
2995 if (ix)
2996 {
2997 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
2998 cb = cv_coro_run;
2999 }
3000
3001 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3002
3003 for (i = 2; i < items; i++)
3004 av_push (coro->args, newSVsv (ST (i)));
3005 }
3006}
3007 OUTPUT:
3008 RETVAL 3485 RETVAL
3009 3486
3010void 3487void
3011transfer (...) 3488transfer (...)
3012 PROTOTYPE: $$ 3489 PROTOTYPE: $$
3013 CODE: 3490 CODE:
3014 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3491 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3015
3016bool
3017_destroy (SV *coro_sv)
3018 CODE:
3019 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
3020 OUTPUT:
3021 RETVAL
3022 3492
3023void 3493void
3024_exit (int code) 3494_exit (int code)
3025 PROTOTYPE: $ 3495 PROTOTYPE: $
3026 CODE: 3496 CODE:
… …
3102 CODE: 3572 CODE:
3103{ 3573{
3104 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3574 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
3105 { 3575 {
3106 struct coro *current = SvSTATE_current; 3576 struct coro *current = SvSTATE_current;
3577 struct CoroSLF slf_save;
3107 3578
3108 if (current != coro) 3579 if (current != coro)
3109 { 3580 {
3110 PUTBACK; 3581 PUTBACK;
3111 save_perl (aTHX_ current); 3582 save_perl (aTHX_ current);
3112 load_perl (aTHX_ coro); 3583 load_perl (aTHX_ coro);
3584 /* the coro is most likely in an active SLF call.
3585 * while not strictly required (the code we execute is
3586 * not allowed to call any SLF functions), it's cleaner
3587 * to reinitialise the slf_frame and restore it later.
3588 * This might one day allow us to actually do SLF calls
3589 * from code executed here.
3590 */
3591 slf_save = slf_frame;
3592 slf_frame.prepare = 0;
3113 SPAGAIN; 3593 SPAGAIN;
3114 } 3594 }
3115 3595
3116 PUSHSTACK; 3596 PUSHSTACK;
3117 3597
… …
3127 SPAGAIN; 3607 SPAGAIN;
3128 3608
3129 if (current != coro) 3609 if (current != coro)
3130 { 3610 {
3131 PUTBACK; 3611 PUTBACK;
3612 slf_frame = slf_save;
3132 save_perl (aTHX_ coro); 3613 save_perl (aTHX_ coro);
3133 load_perl (aTHX_ current); 3614 load_perl (aTHX_ current);
3134 SPAGAIN; 3615 SPAGAIN;
3135 } 3616 }
3136 } 3617 }
… …
3141 PROTOTYPE: $ 3622 PROTOTYPE: $
3142 ALIAS: 3623 ALIAS:
3143 is_ready = CF_READY 3624 is_ready = CF_READY
3144 is_running = CF_RUNNING 3625 is_running = CF_RUNNING
3145 is_new = CF_NEW 3626 is_new = CF_NEW
3146 is_destroyed = CF_DESTROYED 3627 is_destroyed = CF_ZOMBIE
3628 is_zombie = CF_ZOMBIE
3147 is_suspended = CF_SUSPENDED 3629 is_suspended = CF_SUSPENDED
3148 CODE: 3630 CODE:
3149 RETVAL = boolSV (coro->flags & ix); 3631 RETVAL = boolSV (coro->flags & ix);
3150 OUTPUT: 3632 OUTPUT:
3151 RETVAL 3633 RETVAL
3152 3634
3153void 3635void
3154throw (Coro::State self, SV *throw = &PL_sv_undef) 3636throw (Coro::State self, SV *exception = &PL_sv_undef)
3155 PROTOTYPE: $;$ 3637 PROTOTYPE: $;$
3156 CODE: 3638 CODE:
3157{ 3639{
3158 struct coro *current = SvSTATE_current; 3640 struct coro *current = SvSTATE_current;
3159 SV **throwp = self == current ? &CORO_THROW : &self->except; 3641 SV **exceptionp = self == current ? &CORO_THROW : &self->except;
3160 SvREFCNT_dec (*throwp); 3642 SvREFCNT_dec (*exceptionp);
3161 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3643 SvGETMAGIC (exception);
3644 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3162} 3645}
3163 3646
3164void 3647void
3165api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3648api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3166 PROTOTYPE: $;$ 3649 PROTOTYPE: $;$
… …
3221 3704
3222void 3705void
3223cancel (Coro::State self) 3706cancel (Coro::State self)
3224 CODE: 3707 CODE:
3225 coro_state_destroy (aTHX_ self); 3708 coro_state_destroy (aTHX_ self);
3226 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */ 3709
3710SV *
3711enable_times (int enabled = enable_times)
3712 CODE:
3713{
3714 RETVAL = boolSV (enable_times);
3715
3716 if (enabled != enable_times)
3717 {
3718 enable_times = enabled;
3719
3720 coro_times_update ();
3721 (enabled ? coro_times_sub : coro_times_add)(SvSTATE (coro_current));
3722 }
3723}
3724 OUTPUT:
3725 RETVAL
3726
3727void
3728times (Coro::State self)
3729 PPCODE:
3730{
3731 struct coro *current = SvSTATE (coro_current);
3732
3733 if (ecb_expect_false (current == self))
3734 {
3735 coro_times_update ();
3736 coro_times_add (SvSTATE (coro_current));
3737 }
3738
3739 EXTEND (SP, 2);
3740 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3741 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3742
3743 if (ecb_expect_false (current == self))
3744 coro_times_sub (SvSTATE (coro_current));
3745}
3746
3747void
3748swap_sv (Coro::State coro, SV *sv, SV *swapsv)
3749 CODE:
3750{
3751 struct coro *current = SvSTATE_current;
3752
3753 if (current == coro)
3754 SWAP_SVS (current);
3755
3756 if (!coro->swap_sv)
3757 coro->swap_sv = newAV ();
3758
3759 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv )));
3760 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv)));
3761
3762 if (current == coro)
3763 SWAP_SVS (current);
3764}
3227 3765
3228 3766
3229MODULE = Coro::State PACKAGE = Coro 3767MODULE = Coro::State PACKAGE = Coro
3230 3768
3231BOOT: 3769BOOT:
3232{ 3770{
3233 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3771 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3234 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3772 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3235 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 3773 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3236 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3237 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 3774 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3238 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 3775 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3239 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 3776 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3240 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 3777 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3241 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 3778 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3242 3779
3243 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3780 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3244 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3781 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3245 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 3782 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3246 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new); 3783 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3247 3784
3248 coro_stash = gv_stashpv ("Coro", TRUE); 3785 coro_stash = gv_stashpv ("Coro", TRUE);
3249 3786
3250 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 3787 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3251 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 3788 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3252 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 3789 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
3253 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 3790 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (CORO_PRIO_LOW));
3254 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE)); 3791 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (CORO_PRIO_IDLE));
3255 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN)); 3792 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (CORO_PRIO_MIN));
3256 3793
3257 { 3794 {
3258 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 3795 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
3259 3796
3260 coroapi.schedule = api_schedule; 3797 coroapi.schedule = api_schedule;
… …
3270 sv_setiv (sv, (IV)&coroapi); 3807 sv_setiv (sv, (IV)&coroapi);
3271 SvREADONLY_on (sv); 3808 SvREADONLY_on (sv);
3272 } 3809 }
3273} 3810}
3274 3811
3812SV *
3813async (...)
3814 PROTOTYPE: &@
3815 CODE:
3816 RETVAL = coro_new (aTHX_ coro_stash, &ST (0), items, 1);
3817 api_ready (aTHX_ RETVAL);
3818 OUTPUT:
3819 RETVAL
3820
3821void
3822_destroy (Coro::State coro)
3823 CODE:
3824 /* used by the manager thread */
3825 coro_state_destroy (aTHX_ coro);
3826
3827void
3828on_destroy (Coro::State coro, SV *cb)
3829 CODE:
3830 coro_push_on_destroy (aTHX_ coro, newSVsv (cb));
3831
3832void
3833join (...)
3834 CODE:
3835 CORO_EXECUTE_SLF_XS (slf_init_join);
3836
3275void 3837void
3276terminate (...) 3838terminate (...)
3277 CODE: 3839 CODE:
3278 CORO_EXECUTE_SLF_XS (slf_init_terminate); 3840 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3841
3842void
3843cancel (...)
3844 CODE:
3845 CORO_EXECUTE_SLF_XS (slf_init_cancel);
3846
3847int
3848safe_cancel (Coro::State self, ...)
3849 C_ARGS: aTHX_ self, &ST (1), items - 1
3279 3850
3280void 3851void
3281schedule (...) 3852schedule (...)
3282 CODE: 3853 CODE:
3283 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3854 CORO_EXECUTE_SLF_XS (slf_init_schedule);
… …
3312void 3883void
3313_set_readyhook (SV *hook) 3884_set_readyhook (SV *hook)
3314 PROTOTYPE: $ 3885 PROTOTYPE: $
3315 CODE: 3886 CODE:
3316 SvREFCNT_dec (coro_readyhook); 3887 SvREFCNT_dec (coro_readyhook);
3888 SvGETMAGIC (hook);
3889 if (SvOK (hook))
3890 {
3317 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0; 3891 coro_readyhook = newSVsv (hook);
3892 CORO_READYHOOK = invoke_sv_ready_hook_helper;
3893 }
3894 else
3895 {
3896 coro_readyhook = 0;
3897 CORO_READYHOOK = 0;
3898 }
3318 3899
3319int 3900int
3320prio (Coro::State coro, int newprio = 0) 3901prio (Coro::State coro, int newprio = 0)
3321 PROTOTYPE: $;$ 3902 PROTOTYPE: $;$
3322 ALIAS: 3903 ALIAS:
… …
3328 if (items > 1) 3909 if (items > 1)
3329 { 3910 {
3330 if (ix) 3911 if (ix)
3331 newprio = coro->prio - newprio; 3912 newprio = coro->prio - newprio;
3332 3913
3333 if (newprio < PRIO_MIN) newprio = PRIO_MIN; 3914 if (newprio < CORO_PRIO_MIN) newprio = CORO_PRIO_MIN;
3334 if (newprio > PRIO_MAX) newprio = PRIO_MAX; 3915 if (newprio > CORO_PRIO_MAX) newprio = CORO_PRIO_MAX;
3335 3916
3336 coro->prio = newprio; 3917 coro->prio = newprio;
3337 } 3918 }
3338} 3919}
3339 OUTPUT: 3920 OUTPUT:
… …
3386 for (i = 1; i < items; ++i) 3967 for (i = 1; i < items; ++i)
3387 av_push (av, SvREFCNT_inc_NN (ST (i))); 3968 av_push (av, SvREFCNT_inc_NN (ST (i)));
3388 3969
3389 if ((SV *)hv == &PL_sv_undef) 3970 if ((SV *)hv == &PL_sv_undef)
3390 { 3971 {
3391 PUSHMARK (SP); 3972 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3392 EXTEND (SP, 2);
3393 PUSHs (sv_Coro);
3394 PUSHs ((SV *)cv_pool_handler);
3395 PUTBACK;
3396 call_sv ((SV *)cv_coro_state_new, G_SCALAR);
3397 SPAGAIN;
3398
3399 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs)); 3973 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
3974 SvREFCNT_dec (sv);
3400 } 3975 }
3401 3976
3402 { 3977 {
3403 struct coro *coro = SvSTATE_hv (hv); 3978 struct coro *coro = SvSTATE_hv (hv);
3404 3979
… …
3438 CODE: 4013 CODE:
3439{ 4014{
3440 struct coro *coro = SvSTATE_current; 4015 struct coro *coro = SvSTATE_current;
3441 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 4016 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3442 4017
3443 block = (SV *)coro_sv_2cv (aTHX_ block); 4018 block = s_get_cv_croak (block);
3444 4019
3445 if (!*avp) 4020 if (!*avp)
3446 *avp = newAV (); 4021 *avp = newAV ();
3447 4022
3448 av_push (*avp, SvREFCNT_inc (block)); 4023 av_push (*avp, SvREFCNT_inc (block));
… …
3465MODULE = Coro::State PACKAGE = Coro::Semaphore 4040MODULE = Coro::State PACKAGE = Coro::Semaphore
3466 4041
3467SV * 4042SV *
3468new (SV *klass, SV *count = 0) 4043new (SV *klass, SV *count = 0)
3469 CODE: 4044 CODE:
4045{
4046 int semcnt = 1;
4047
4048 if (count)
4049 {
4050 SvGETMAGIC (count);
4051
4052 if (SvOK (count))
4053 semcnt = SvIV (count);
4054 }
4055
3470 RETVAL = sv_bless ( 4056 RETVAL = sv_bless (
3471 coro_waitarray_new (aTHX_ count && SvOK (count) ? SvIV (count) : 1), 4057 coro_waitarray_new (aTHX_ semcnt),
3472 GvSTASH (CvGV (cv)) 4058 GvSTASH (CvGV (cv))
3473 ); 4059 );
4060}
3474 OUTPUT: 4061 OUTPUT:
3475 RETVAL 4062 RETVAL
3476 4063
3477# helper for Coro::Channel and others 4064# helper for Coro::Channel and others
3478SV * 4065SV *
… …
3636 4223
3637void 4224void
3638_register (char *target, char *proto, SV *req) 4225_register (char *target, char *proto, SV *req)
3639 CODE: 4226 CODE:
3640{ 4227{
3641 CV *req_cv = coro_sv_2cv (aTHX_ req); 4228 SV *req_cv = s_get_cv_croak (req);
3642 /* newXSproto doesn't return the CV on 5.8 */ 4229 /* newXSproto doesn't return the CV on 5.8 */
3643 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 4230 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3644 sv_setpv ((SV *)slf_cv, proto); 4231 sv_setpv ((SV *)slf_cv, proto);
3645 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0); 4232 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
3646} 4233}
3647 4234
4235MODULE = Coro::State PACKAGE = Coro::Select
4236
4237void
4238patch_pp_sselect ()
4239 CODE:
4240 if (!coro_old_pp_sselect)
4241 {
4242 coro_select_select = (SV *)get_cv ("Coro::Select::select", 0);
4243 coro_old_pp_sselect = PL_ppaddr [OP_SSELECT];
4244 PL_ppaddr [OP_SSELECT] = coro_pp_sselect;
4245 }
4246
4247void
4248unpatch_pp_sselect ()
4249 CODE:
4250 if (coro_old_pp_sselect)
4251 {
4252 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
4253 coro_old_pp_sselect = 0;
4254 }
4255

Diff Legend

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