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.362 by root, Wed Jul 1 07:58:45 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
101
102/* used in state.h */
103#define VAR(name,type) VARx(name, PL_ ## name, type)
163 104
164#ifdef __linux 105#ifdef __linux
165# include <time.h> /* for timespec */ 106# include <time.h> /* for timespec */
166# include <syscall.h> /* for SYS_* */ 107# include <syscall.h> /* for SYS_* */
167# ifdef SYS_clock_gettime 108# ifdef SYS_clock_gettime
… …
175static void (*u2time)(pTHX_ UV ret[2]); 116static void (*u2time)(pTHX_ UV ret[2]);
176 117
177/* we hijack an hopefully unused CV flag for our purposes */ 118/* we hijack an hopefully unused CV flag for our purposes */
178#define CVf_SLF 0x4000 119#define CVf_SLF 0x4000
179static OP *pp_slf (pTHX); 120static OP *pp_slf (pTHX);
121static void slf_destroy (pTHX_ struct coro *coro);
180 122
181static U32 cctx_gen; 123static U32 cctx_gen;
182static size_t cctx_stacksize = CORO_STACKSIZE; 124static size_t cctx_stacksize = CORO_STACKSIZE;
183static struct CoroAPI coroapi; 125static struct CoroAPI coroapi;
184static AV *main_mainstack; /* used to differentiate between $main and others */ 126static AV *main_mainstack; /* used to differentiate between $main and others */
… …
201static SV *sv_pool_size; 143static SV *sv_pool_size;
202static SV *sv_async_pool_idle; /* description string */ 144static SV *sv_async_pool_idle; /* description string */
203static AV *av_async_pool; /* idle pool */ 145static AV *av_async_pool; /* idle pool */
204static SV *sv_Coro; /* class string */ 146static SV *sv_Coro; /* class string */
205static CV *cv_pool_handler; 147static CV *cv_pool_handler;
206static CV *cv_coro_state_new;
207 148
208/* Coro::AnyEvent */ 149/* Coro::AnyEvent */
209static SV *sv_activity; 150static SV *sv_activity;
210 151
211/* enable processtime/realtime profiling */ 152/* enable processtime/realtime profiling */
… …
215static char times_valid; 156static char times_valid;
216 157
217static struct coro_cctx *cctx_first; 158static struct coro_cctx *cctx_first;
218static int cctx_count, cctx_idle; 159static int cctx_count, cctx_idle;
219 160
220enum { 161enum
162{
221 CC_MAPPED = 0x01, 163 CC_MAPPED = 0x01,
222 CC_NOREUSE = 0x02, /* throw this away after tracing */ 164 CC_NOREUSE = 0x02, /* throw this away after tracing */
223 CC_TRACE = 0x04, 165 CC_TRACE = 0x04,
224 CC_TRACE_SUB = 0x08, /* trace sub calls */ 166 CC_TRACE_SUB = 0x08, /* trace sub calls */
225 CC_TRACE_LINE = 0x10, /* trace each statement */ 167 CC_TRACE_LINE = 0x10, /* trace each statement */
… …
246 int valgrind_id; 188 int valgrind_id;
247#endif 189#endif
248 unsigned char flags; 190 unsigned char flags;
249} coro_cctx; 191} coro_cctx;
250 192
251coro_cctx *cctx_current; /* the currently running cctx */ 193static coro_cctx *cctx_current; /* the currently running cctx */
252 194
253/*****************************************************************************/ 195/*****************************************************************************/
254 196
197static MGVTBL coro_state_vtbl;
198
255enum { 199enum
200{
256 CF_RUNNING = 0x0001, /* coroutine is running */ 201 CF_RUNNING = 0x0001, /* coroutine is running */
257 CF_READY = 0x0002, /* coroutine is ready */ 202 CF_READY = 0x0002, /* coroutine is ready */
258 CF_NEW = 0x0004, /* has never been switched to */ 203 CF_NEW = 0x0004, /* has never been switched to */
259 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 204 CF_ZOMBIE = 0x0008, /* coroutine data has been freed */
260 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) */
261}; 207};
262 208
263/* 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 */
264typedef struct 210typedef struct
265{ 211{
266 SV *defsv;
267 AV *defav;
268 SV *errsv;
269 SV *irsgv;
270 HV *hinthv;
271#define VAR(name,type) type name; 212#define VARx(name,expr,type) type name;
272# include "state.h" 213# include "state.h"
273#undef VAR 214#undef VARx
274} perl_slots; 215} perl_slots;
275 216
217// how many context stack entries do we need for perl_slots
276#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))
277 219
278/* this is a structure representing a perl-level coroutine */ 220/* this is a structure representing a perl-level coroutine */
279struct coro { 221struct coro
222{
280 /* the C coroutine allocated to this perl coroutine, if any */ 223 /* the C coroutine allocated to this perl coroutine, if any */
281 coro_cctx *cctx; 224 coro_cctx *cctx;
282 225
283 /* ready queue */ 226 /* ready queue */
284 struct coro *next_ready; 227 struct coro *next_ready;
… …
286 /* state data */ 229 /* state data */
287 struct CoroSLF slf_frame; /* saved slf frame */ 230 struct CoroSLF slf_frame; /* saved slf frame */
288 AV *mainstack; 231 AV *mainstack;
289 perl_slots *slot; /* basically the saved sp */ 232 perl_slots *slot; /* basically the saved sp */
290 233
291 CV *startcv; /* the CV to execute */ 234 CV *startcv; /* the CV to execute */
292 AV *args; /* data associated with this coroutine (initial args) */ 235 AV *args; /* data associated with this coroutine (initial args) */
293 int refcnt; /* coroutines are refcounted, yes */
294 int flags; /* CF_ flags */ 236 int flags; /* CF_ flags */
295 HV *hv; /* the perl hash associated with this coro, if any */ 237 HV *hv; /* the perl hash associated with this coro, if any */
296 void (*on_destroy)(pTHX_ struct coro *coro);
297 238
298 /* statistics */ 239 /* statistics */
299 int usecount; /* number of transfers to this coro */ 240 int usecount; /* number of transfers to this coro */
300 241
301 /* coro process data */ 242 /* coro process data */
302 int prio; 243 int prio;
303 SV *except; /* exception to be thrown */ 244 SV *except; /* exception to be thrown */
304 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 */
305 248
306 /* async_pool */ 249 /* async_pool */
307 SV *saved_deffh; 250 SV *saved_deffh;
308 SV *invoke_cb; 251 SV *invoke_cb;
309 AV *invoke_av; 252 AV *invoke_av;
310 253
311 /* on_enter/on_leave */ 254 /* on_enter/on_leave */
312 AV *on_enter; 255 AV *on_enter;
313 AV *on_leave; 256 AV *on_leave;
314 257
258 /* swap_sv */
259 AV *swap_sv;
260
315 /* times */ 261 /* times */
316 coro_ts t_cpu, t_real; 262 coro_ts t_cpu, t_real;
317 263
318 /* linked list */ 264 /* linked list */
319 struct coro *next, *prev; 265 struct coro *next, *prev;
… …
322typedef struct coro *Coro__State; 268typedef struct coro *Coro__State;
323typedef struct coro *Coro__State_or_hashref; 269typedef struct coro *Coro__State_or_hashref;
324 270
325/* the following variables are effectively part of the perl context */ 271/* the following variables are effectively part of the perl context */
326/* and get copied between struct coro and these variables */ 272/* and get copied between struct coro and these variables */
327/* the mainr easonw e don't support windows process emulation */ 273/* the main reason we don't support windows process emulation */
328static struct CoroSLF slf_frame; /* the current slf frame */ 274static struct CoroSLF slf_frame; /* the current slf frame */
329 275
330/** Coro ********************************************************************/ 276/** Coro ********************************************************************/
331 277
332#define CORO_PRIO_MAX 3 278#define CORO_PRIO_MAX 3
… …
338 284
339/* for Coro.pm */ 285/* for Coro.pm */
340static SV *coro_current; 286static SV *coro_current;
341static SV *coro_readyhook; 287static SV *coro_readyhook;
342static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */ 288static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
343static CV *cv_coro_run, *cv_coro_terminate; 289static CV *cv_coro_run;
344static struct coro *coro_first; 290static struct coro *coro_first;
345#define coro_nready coroapi.nready 291#define coro_nready coroapi.nready
346 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
347/** lowlevel stuff **********************************************************/ 386/** lowlevel stuff **********************************************************/
348 387
349static SV * 388static SV * ecb_noinline
350coro_get_sv (pTHX_ const char *name, int create) 389coro_get_sv (pTHX_ const char *name, int create)
351{ 390{
352#if PERL_VERSION_ATLEAST (5,10,0) 391#if PERL_VERSION_ATLEAST (5,10,0)
353 /* 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 */
354 get_sv (name, create); 393 get_sv (name, create);
355#endif 394#endif
356 return get_sv (name, create); 395 return get_sv (name, create);
357} 396}
358 397
359static AV * 398static AV * ecb_noinline
360coro_get_av (pTHX_ const char *name, int create) 399coro_get_av (pTHX_ const char *name, int create)
361{ 400{
362#if PERL_VERSION_ATLEAST (5,10,0) 401#if PERL_VERSION_ATLEAST (5,10,0)
363 /* 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 */
364 get_av (name, create); 403 get_av (name, create);
365#endif 404#endif
366 return get_av (name, create); 405 return get_av (name, create);
367} 406}
368 407
369static HV * 408static HV * ecb_noinline
370coro_get_hv (pTHX_ const char *name, int create) 409coro_get_hv (pTHX_ const char *name, int create)
371{ 410{
372#if PERL_VERSION_ATLEAST (5,10,0) 411#if PERL_VERSION_ATLEAST (5,10,0)
373 /* 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 */
374 get_hv (name, create); 413 get_hv (name, create);
375#endif 414#endif
376 return get_hv (name, create); 415 return get_hv (name, create);
377} 416}
378 417
379/* may croak */
380INLINE CV *
381coro_sv_2cv (pTHX_ SV *sv)
382{
383 HV *st;
384 GV *gvp;
385 CV *cv = sv_2cv (sv, &st, &gvp, 0);
386
387 if (!cv)
388 croak ("code reference expected");
389
390 return cv;
391}
392
393INLINE void 418ECB_INLINE void
394coro_times_update () 419coro_times_update ()
395{ 420{
396#ifdef coro_clock_gettime 421#ifdef coro_clock_gettime
397 struct timespec ts; 422 struct timespec ts;
398 423
… …
411 time_real [0] = tv [0]; 436 time_real [0] = tv [0];
412 time_real [1] = tv [1] * 1000; 437 time_real [1] = tv [1] * 1000;
413#endif 438#endif
414} 439}
415 440
416INLINE void 441ECB_INLINE void
417coro_times_add (struct coro *c) 442coro_times_add (struct coro *c)
418{ 443{
419 c->t_real [1] += time_real [1]; 444 c->t_real [1] += time_real [1];
420 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; } 445 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
421 c->t_real [0] += time_real [0]; 446 c->t_real [0] += time_real [0];
… …
423 c->t_cpu [1] += time_cpu [1]; 448 c->t_cpu [1] += time_cpu [1];
424 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; } 449 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
425 c->t_cpu [0] += time_cpu [0]; 450 c->t_cpu [0] += time_cpu [0];
426} 451}
427 452
428INLINE void 453ECB_INLINE void
429coro_times_sub (struct coro *c) 454coro_times_sub (struct coro *c)
430{ 455{
431 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; } 456 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; }
432 c->t_real [1] -= time_real [1]; 457 c->t_real [1] -= time_real [1];
433 c->t_real [0] -= time_real [0]; 458 c->t_real [0] -= time_real [0];
… …
441/* magic glue */ 466/* magic glue */
442 467
443#define CORO_MAGIC_type_cv 26 468#define CORO_MAGIC_type_cv 26
444#define CORO_MAGIC_type_state PERL_MAGIC_ext 469#define CORO_MAGIC_type_state PERL_MAGIC_ext
445 470
446#define CORO_MAGIC_NN(sv, type) \ 471#define CORO_MAGIC_NN(sv, type) \
447 (expect_true (SvMAGIC (sv)->mg_type == type) \ 472 (ecb_expect_true (SvMAGIC (sv)->mg_type == type) \
448 ? SvMAGIC (sv) \ 473 ? SvMAGIC (sv) \
449 : mg_find (sv, type)) 474 : mg_find (sv, type))
450 475
451#define CORO_MAGIC(sv, type) \ 476#define CORO_MAGIC(sv, type) \
452 (expect_true (SvMAGIC (sv)) \ 477 (ecb_expect_true (SvMAGIC (sv)) \
453 ? CORO_MAGIC_NN (sv, type) \ 478 ? CORO_MAGIC_NN (sv, type) \
454 : 0) 479 : 0)
455 480
456#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)
457#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)
458 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
459INLINE struct coro * 499ECB_INLINE struct coro *
460SvSTATE_ (pTHX_ SV *coro) 500SvSTATE_ (pTHX_ SV *coro)
461{ 501{
462 HV *stash;
463 MAGIC *mg; 502 MAGIC *mg;
464 503
465 if (SvROK (coro)) 504 if (SvROK (coro))
466 coro = SvRV (coro); 505 coro = SvRV (coro);
467 506
468 if (expect_false (SvTYPE (coro) != SVt_PVHV)) 507 mg = SvSTATEhv_p (aTHX_ coro);
508 if (!mg)
469 croak ("Coro::State object required"); 509 croak ("Coro::State object required");
470 510
471 stash = SvSTASH (coro);
472 if (expect_false (stash != coro_stash && stash != coro_state_stash))
473 {
474 /* very slow, but rare, check */
475 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
476 croak ("Coro::State object required");
477 }
478
479 mg = CORO_MAGIC_state (coro);
480 return (struct coro *)mg->mg_ptr; 511 return (struct coro *)mg->mg_ptr;
481} 512}
482 513
483#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 514#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
484 515
… …
487#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 518#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
488 519
489/*****************************************************************************/ 520/*****************************************************************************/
490/* padlist management and caching */ 521/* padlist management and caching */
491 522
492static AV * 523ECB_INLINE AV *
493coro_derive_padlist (pTHX_ CV *cv) 524coro_derive_padlist (pTHX_ CV *cv)
494{ 525{
495 AV *padlist = CvPADLIST (cv); 526 AV *padlist = CvPADLIST (cv);
496 AV *newpadlist, *newpad; 527 AV *newpadlist, *newpad;
497 528
… …
509 av_store (newpadlist, 1, (SV *)newpad); 540 av_store (newpadlist, 1, (SV *)newpad);
510 541
511 return newpadlist; 542 return newpadlist;
512} 543}
513 544
514static void 545ECB_INLINE void
515free_padlist (pTHX_ AV *padlist) 546free_padlist (pTHX_ AV *padlist)
516{ 547{
517 /* may be during global destruction */ 548 /* may be during global destruction */
518 if (!IN_DESTRUCT) 549 if (!IN_DESTRUCT)
519 { 550 {
… …
562 0, 0, 0, 0, 593 0, 0, 0, 0,
563 coro_cv_free 594 coro_cv_free
564}; 595};
565 596
566/* the next two functions merely cache the padlists */ 597/* the next two functions merely cache the padlists */
567static void 598ECB_INLINE void
568get_padlist (pTHX_ CV *cv) 599get_padlist (pTHX_ CV *cv)
569{ 600{
570 MAGIC *mg = CORO_MAGIC_cv (cv); 601 MAGIC *mg = CORO_MAGIC_cv (cv);
571 AV *av; 602 AV *av;
572 603
573 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 604 if (ecb_expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0))
574 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 605 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
575 else 606 else
576 { 607 {
577#if CORO_PREFER_PERL_FUNCTIONS 608#if CORO_PREFER_PERL_FUNCTIONS
578 /* this is probably cleaner? but also slower! */ 609 /* this is probably cleaner? but also slower! */
… …
585 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 616 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
586#endif 617#endif
587 } 618 }
588} 619}
589 620
590static void 621ECB_INLINE void
591put_padlist (pTHX_ CV *cv) 622put_padlist (pTHX_ CV *cv)
592{ 623{
593 MAGIC *mg = CORO_MAGIC_cv (cv); 624 MAGIC *mg = CORO_MAGIC_cv (cv);
594 AV *av; 625 AV *av;
595 626
596 if (expect_false (!mg)) 627 if (ecb_expect_false (!mg))
597 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);
598 629
599 av = (AV *)mg->mg_obj; 630 av = (AV *)mg->mg_obj;
600 631
601 if (expect_false (AvFILLp (av) >= AvMAX (av))) 632 if (ecb_expect_false (AvFILLp (av) >= AvMAX (av)))
602 av_extend (av, AvFILLp (av) + 1); 633 av_extend (av, AvFILLp (av) + 1);
603 634
604 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 635 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
605} 636}
606 637
607/** 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))
608 690
609static void 691static void
610on_enterleave_call (pTHX_ SV *cb); 692on_enterleave_call (pTHX_ SV *cb);
611 693
612static void 694static void
… …
615 perl_slots *slot = c->slot; 697 perl_slots *slot = c->slot;
616 c->slot = 0; 698 c->slot = 0;
617 699
618 PL_mainstack = c->mainstack; 700 PL_mainstack = c->mainstack;
619 701
620 GvSV (PL_defgv) = slot->defsv; 702#if CORO_JIT
621 GvAV (PL_defgv) = slot->defav; 703 load_perl_slots (slot);
622 GvSV (PL_errgv) = slot->errsv; 704#else
623 GvSV (irsgv) = slot->irsgv;
624 GvHV (PL_hintgv) = slot->hinthv;
625
626 #define VAR(name,type) PL_ ## name = slot->name; 705 #define VARx(name,expr,type) expr = slot->name;
627 # include "state.h" 706 # include "state.h"
628 #undef VAR 707 #undef VARx
708#endif
629 709
630 { 710 {
631 dSP; 711 dSP;
632 712
633 CV *cv; 713 CV *cv;
634 714
635 /* now do the ugly restore mess */ 715 /* now do the ugly restore mess */
636 while (expect_true (cv = (CV *)POPs)) 716 while (ecb_expect_true (cv = (CV *)POPs))
637 { 717 {
638 put_padlist (aTHX_ cv); /* mark this padlist as available */ 718 put_padlist (aTHX_ cv); /* mark this padlist as available */
639 CvDEPTH (cv) = PTR2IV (POPs); 719 CvDEPTH (cv) = PTR2IV (POPs);
640 CvPADLIST (cv) = (AV *)POPs; 720 CvPADLIST (cv) = (AV *)POPs;
641 } 721 }
… …
644 } 724 }
645 725
646 slf_frame = c->slf_frame; 726 slf_frame = c->slf_frame;
647 CORO_THROW = c->except; 727 CORO_THROW = c->except;
648 728
649 if (expect_false (enable_times)) 729 if (ecb_expect_false (enable_times))
650 { 730 {
651 if (expect_false (!times_valid)) 731 if (ecb_expect_false (!times_valid))
652 coro_times_update (); 732 coro_times_update ();
653 733
654 coro_times_sub (c); 734 coro_times_sub (c);
655 } 735 }
656 736
657 if (expect_false (c->on_enter)) 737 if (ecb_expect_false (c->on_enter))
658 { 738 {
659 int i; 739 int i;
660 740
661 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 741 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
662 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 742 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
663 } 743 }
744
745 SWAP_SVS (c);
664} 746}
665 747
666static void 748static void
667save_perl (pTHX_ Coro__State c) 749save_perl (pTHX_ Coro__State c)
668{ 750{
751 SWAP_SVS (c);
752
669 if (expect_false (c->on_leave)) 753 if (ecb_expect_false (c->on_leave))
670 { 754 {
671 int i; 755 int i;
672 756
673 for (i = AvFILLp (c->on_leave); i >= 0; --i) 757 for (i = AvFILLp (c->on_leave); i >= 0; --i)
674 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]); 758 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
675 } 759 }
676 760
677 times_valid = 0; 761 times_valid = 0;
678 762
679 if (expect_false (enable_times)) 763 if (ecb_expect_false (enable_times))
680 { 764 {
681 coro_times_update (); times_valid = 1; 765 coro_times_update (); times_valid = 1;
682 coro_times_add (c); 766 coro_times_add (c);
683 } 767 }
684 768
… …
698 782
699 XPUSHs (Nullsv); 783 XPUSHs (Nullsv);
700 /* this loop was inspired by pp_caller */ 784 /* this loop was inspired by pp_caller */
701 for (;;) 785 for (;;)
702 { 786 {
703 while (expect_true (cxix >= 0)) 787 while (ecb_expect_true (cxix >= 0))
704 { 788 {
705 PERL_CONTEXT *cx = &ccstk[cxix--]; 789 PERL_CONTEXT *cx = &ccstk[cxix--];
706 790
707 if (expect_true (CxTYPE (cx) == CXt_SUB) || expect_false (CxTYPE (cx) == CXt_FORMAT)) 791 if (ecb_expect_true (CxTYPE (cx) == CXt_SUB) || ecb_expect_false (CxTYPE (cx) == CXt_FORMAT))
708 { 792 {
709 CV *cv = cx->blk_sub.cv; 793 CV *cv = cx->blk_sub.cv;
710 794
711 if (expect_true (CvDEPTH (cv))) 795 if (ecb_expect_true (CvDEPTH (cv)))
712 { 796 {
713 EXTEND (SP, 3); 797 EXTEND (SP, 3);
714 PUSHs ((SV *)CvPADLIST (cv)); 798 PUSHs ((SV *)CvPADLIST (cv));
715 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv))); 799 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
716 PUSHs ((SV *)cv); 800 PUSHs ((SV *)cv);
… …
719 get_padlist (aTHX_ cv); 803 get_padlist (aTHX_ cv);
720 } 804 }
721 } 805 }
722 } 806 }
723 807
724 if (expect_true (top_si->si_type == PERLSI_MAIN)) 808 if (ecb_expect_true (top_si->si_type == PERLSI_MAIN))
725 break; 809 break;
726 810
727 top_si = top_si->si_prev; 811 top_si = top_si->si_prev;
728 ccstk = top_si->si_cxstack; 812 ccstk = top_si->si_cxstack;
729 cxix = top_si->si_cxix; 813 cxix = top_si->si_cxix;
… …
731 815
732 PUTBACK; 816 PUTBACK;
733 } 817 }
734 818
735 /* allocate some space on the context stack for our purposes */ 819 /* allocate some space on the context stack for our purposes */
736 /* we manually unroll here, as usually 2 slots is enough */ 820 if (ecb_expect_false (cxstack_ix + SLOT_COUNT >= cxstack_max))
737 if (SLOT_COUNT >= 1) CXINC;
738 if (SLOT_COUNT >= 2) CXINC;
739 if (SLOT_COUNT >= 3) CXINC;
740 { 821 {
741 unsigned int i; 822 unsigned int i;
823
742 for (i = 3; i < SLOT_COUNT; ++i) 824 for (i = 0; i < SLOT_COUNT; ++i)
743 CXINC; 825 CXINC;
744 } 826
745 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 827 cxstack_ix -= SLOT_COUNT; /* undo allocation */
828 }
746 829
747 c->mainstack = PL_mainstack; 830 c->mainstack = PL_mainstack;
748 831
749 { 832 {
750 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 833 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
751 834
752 slot->defav = GvAV (PL_defgv); 835#if CORO_JIT
753 slot->defsv = DEFSV; 836 save_perl_slots (slot);
754 slot->errsv = ERRSV; 837#else
755 slot->irsgv = GvSV (irsgv);
756 slot->hinthv = GvHV (PL_hintgv);
757
758 #define VAR(name,type) slot->name = PL_ ## name; 838 #define VARx(name,expr,type) slot->name = expr;
759 # include "state.h" 839 # include "state.h"
760 #undef VAR 840 #undef VARx
841#endif
761 } 842 }
762} 843}
763 844
764/* 845/*
765 * allocate various perl stacks. This is almost an exact copy 846 * allocate various perl stacks. This is almost an exact copy
… …
771# define coro_init_stacks(thx) init_stacks () 852# define coro_init_stacks(thx) init_stacks ()
772#else 853#else
773static void 854static void
774coro_init_stacks (pTHX) 855coro_init_stacks (pTHX)
775{ 856{
776 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() */
777 PL_curstackinfo->si_type = PERLSI_MAIN; 858 PL_curstackinfo->si_type = PERLSI_MAIN;
778 PL_curstack = PL_curstackinfo->si_stack; 859 PL_curstack = PL_curstackinfo->si_stack;
779 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 860 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
780 861
781 PL_stack_base = AvARRAY(PL_curstack); 862 PL_stack_base = AvARRAY(PL_curstack);
… …
888#endif 969#endif
889 970
890/* 971/*
891 * This overrides the default magic get method of %SIG elements. 972 * This overrides the default magic get method of %SIG elements.
892 * 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
893 * 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),
894 * readback here. 975 * we just provide our own readback here.
895 */ 976 */
896static int 977static int ecb_cold
897coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 978coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
898{ 979{
899 const char *s = MgPV_nolen_const (mg); 980 const char *s = MgPV_nolen_const (mg);
900 981
901 if (*s == '_') 982 if (*s == '_')
… …
913 } 994 }
914 995
915 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 996 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
916} 997}
917 998
918static int 999static int ecb_cold
919coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1000coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
920{ 1001{
921 const char *s = MgPV_nolen_const (mg); 1002 const char *s = MgPV_nolen_const (mg);
922 1003
923 if (*s == '_') 1004 if (*s == '_')
… …
937 } 1018 }
938 1019
939 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0; 1020 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
940} 1021}
941 1022
942static int 1023static int ecb_cold
943coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1024coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
944{ 1025{
945 const char *s = MgPV_nolen_const (mg); 1026 const char *s = MgPV_nolen_const (mg);
946 1027
947 if (*s == '_') 1028 if (*s == '_')
… …
980slf_check_repeat (pTHX_ struct CoroSLF *frame) 1061slf_check_repeat (pTHX_ struct CoroSLF *frame)
981{ 1062{
982 return 1; 1063 return 1;
983} 1064}
984 1065
985static UNOP coro_setup_op; 1066static UNOP init_perl_op;
986 1067
987static 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 */
988coro_setup (pTHX_ struct coro *coro) 1069init_perl (pTHX_ struct coro *coro)
989{ 1070{
990 /* 1071 /*
991 * emulate part of the perl startup here. 1072 * emulate part of the perl startup here.
992 */ 1073 */
993 coro_init_stacks (aTHX); 1074 coro_init_stacks (aTHX);
… …
1000 PL_comppad_name_fill = 0; 1081 PL_comppad_name_fill = 0;
1001 PL_comppad_name_floor = 0; 1082 PL_comppad_name_floor = 0;
1002 PL_curpm = 0; 1083 PL_curpm = 0;
1003 PL_curpad = 0; 1084 PL_curpad = 0;
1004 PL_localizing = 0; 1085 PL_localizing = 0;
1005 PL_dirty = 0;
1006 PL_restartop = 0; 1086 PL_restartop = 0;
1007#if PERL_VERSION_ATLEAST (5,10,0) 1087#if PERL_VERSION_ATLEAST (5,10,0)
1008 PL_parser = 0; 1088 PL_parser = 0;
1009#endif 1089#endif
1010 PL_hints = 0; 1090 PL_hints = 0;
1011 1091
1012 /* recreate the die/warn hooks */ 1092 /* recreate the die/warn hooks */
1013 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1093 PL_diehook = SvREFCNT_inc (rv_diehook);
1014 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1094 PL_warnhook = SvREFCNT_inc (rv_warnhook);
1015 1095
1016 GvSV (PL_defgv) = newSV (0); 1096 GvSV (PL_defgv) = newSV (0);
1017 GvAV (PL_defgv) = coro->args; coro->args = 0; 1097 GvAV (PL_defgv) = coro->args; coro->args = 0;
1018 GvSV (PL_errgv) = newSV (0); 1098 GvSV (PL_errgv) = newSV (0);
1019 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);
… …
1040 /* 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
1041 * 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.
1042 */ 1122 */
1043 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 */
1044 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;
1045 1126
1046 /* 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 */
1047 coro_setup_op.op_next = PL_op; 1128 init_perl_op.op_next = PL_op;
1048 coro_setup_op.op_type = OP_ENTERSUB; 1129 init_perl_op.op_type = OP_ENTERSUB;
1049 coro_setup_op.op_ppaddr = pp_slf; 1130 init_perl_op.op_ppaddr = pp_slf;
1050 /* 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 */
1051 1132
1052 PL_op = (OP *)&coro_setup_op; 1133 PL_op = (OP *)&init_perl_op;
1053 1134
1054 /* copy throw, in case it was set before coro_setup */ 1135 /* copy throw, in case it was set before init_perl */
1055 CORO_THROW = coro->except; 1136 CORO_THROW = coro->except;
1056 1137
1138 SWAP_SVS (coro);
1139
1057 if (expect_false (enable_times)) 1140 if (ecb_expect_false (enable_times))
1058 { 1141 {
1059 coro_times_update (); 1142 coro_times_update ();
1060 coro_times_sub (coro); 1143 coro_times_sub (coro);
1061 } 1144 }
1062} 1145}
… …
1081 dounwind (-1); 1164 dounwind (-1);
1082 } 1165 }
1083} 1166}
1084 1167
1085static void 1168static void
1086coro_destruct_perl (pTHX_ struct coro *coro) 1169destroy_perl (pTHX_ struct coro *coro)
1087{ 1170{
1088 SV *svf [9]; 1171 SV *svf [9];
1089 1172
1090 { 1173 {
1174 SV *old_current = SvRV (coro_current);
1091 struct coro *current = SvSTATE_current; 1175 struct coro *current = SvSTATE (old_current);
1092 1176
1093 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));
1094 1178
1095 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
1096 load_perl (aTHX_ coro); 1184 load_perl (aTHX_ coro);
1097 1185
1098 coro_unwind_stacks (aTHX); 1186 coro_unwind_stacks (aTHX);
1187
1188 /* restore swapped sv's */
1189 SWAP_SVS (coro);
1190
1099 coro_destruct_stacks (aTHX); 1191 coro_destruct_stacks (aTHX);
1100 1192
1101 // now save some sv's to be free'd later 1193 // now save some sv's to be free'd later
1102 svf [0] = GvSV (PL_defgv); 1194 svf [0] = GvSV (PL_defgv);
1103 svf [1] = (SV *)GvAV (PL_defgv); 1195 svf [1] = (SV *)GvAV (PL_defgv);
… …
1108 svf [6] = (SV *)GvHV (PL_hintgv); 1200 svf [6] = (SV *)GvHV (PL_hintgv);
1109 svf [7] = PL_diehook; 1201 svf [7] = PL_diehook;
1110 svf [8] = PL_warnhook; 1202 svf [8] = PL_warnhook;
1111 assert (9 == sizeof (svf) / sizeof (*svf)); 1203 assert (9 == sizeof (svf) / sizeof (*svf));
1112 1204
1205 SvRV_set (coro_current, old_current);
1206
1113 load_perl (aTHX_ current); 1207 load_perl (aTHX_ current);
1114 } 1208 }
1115 1209
1116 { 1210 {
1117 unsigned int i; 1211 unsigned int i;
… …
1124 SvREFCNT_dec (coro->invoke_cb); 1218 SvREFCNT_dec (coro->invoke_cb);
1125 SvREFCNT_dec (coro->invoke_av); 1219 SvREFCNT_dec (coro->invoke_av);
1126 } 1220 }
1127} 1221}
1128 1222
1129INLINE void 1223ECB_INLINE void
1130free_coro_mortal (pTHX) 1224free_coro_mortal (pTHX)
1131{ 1225{
1132 if (expect_true (coro_mortal)) 1226 if (ecb_expect_true (coro_mortal))
1133 { 1227 {
1134 SvREFCNT_dec (coro_mortal); 1228 SvREFCNT_dec ((SV *)coro_mortal);
1135 coro_mortal = 0; 1229 coro_mortal = 0;
1136 } 1230 }
1137} 1231}
1138 1232
1139static int 1233static int
… …
1272 1366
1273 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 */
1274} 1368}
1275 1369
1276/* 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 */
1277static void NOINLINE 1371static void ecb_noinline
1278cctx_prepare (pTHX) 1372cctx_prepare (pTHX)
1279{ 1373{
1280 PL_top_env = &PL_start_env; 1374 PL_top_env = &PL_start_env;
1281 1375
1282 if (cctx_current->flags & CC_TRACE) 1376 if (cctx_current->flags & CC_TRACE)
… …
1293 slf_frame.prepare = slf_prepare_set_stacklevel; 1387 slf_frame.prepare = slf_prepare_set_stacklevel;
1294 slf_frame.check = slf_check_set_stacklevel; 1388 slf_frame.check = slf_check_set_stacklevel;
1295} 1389}
1296 1390
1297/* 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 */
1298INLINE void 1392ECB_INLINE void
1299transfer_tail (pTHX) 1393transfer_tail (pTHX)
1300{ 1394{
1301 free_coro_mortal (aTHX); 1395 free_coro_mortal (aTHX);
1302} 1396}
1303 1397
… …
1328 /* 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 */
1329 PL_restartop = PL_op; 1423 PL_restartop = PL_op;
1330 perl_run (PL_curinterp); 1424 perl_run (PL_curinterp);
1331 /* 1425 /*
1332 * 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
1333 * 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.
1334 */ 1429 */
1335 1430
1336 /* 1431 /*
1337 * 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
1338 * 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)
… …
1425cctx_destroy (coro_cctx *cctx) 1520cctx_destroy (coro_cctx *cctx)
1426{ 1521{
1427 if (!cctx) 1522 if (!cctx)
1428 return; 1523 return;
1429 1524
1430 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary? 1525 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1431 1526
1432 --cctx_count; 1527 --cctx_count;
1433 coro_destroy (&cctx->cctx); 1528 coro_destroy (&cctx->cctx);
1434 1529
1435 /* coro_transfer creates new, empty cctx's */ 1530 /* coro_transfer creates new, empty cctx's */
… …
1454#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))
1455 1550
1456static coro_cctx * 1551static coro_cctx *
1457cctx_get (pTHX) 1552cctx_get (pTHX)
1458{ 1553{
1459 while (expect_true (cctx_first)) 1554 while (ecb_expect_true (cctx_first))
1460 { 1555 {
1461 coro_cctx *cctx = cctx_first; 1556 coro_cctx *cctx = cctx_first;
1462 cctx_first = cctx->next; 1557 cctx_first = cctx->next;
1463 --cctx_idle; 1558 --cctx_idle;
1464 1559
1465 if (expect_true (!CCTX_EXPIRED (cctx))) 1560 if (ecb_expect_true (!CCTX_EXPIRED (cctx)))
1466 return cctx; 1561 return cctx;
1467 1562
1468 cctx_destroy (cctx); 1563 cctx_destroy (cctx);
1469 } 1564 }
1470 1565
… …
1475cctx_put (coro_cctx *cctx) 1570cctx_put (coro_cctx *cctx)
1476{ 1571{
1477 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));
1478 1573
1479 /* free another cctx if overlimit */ 1574 /* free another cctx if overlimit */
1480 if (expect_false (cctx_idle >= cctx_max_idle)) 1575 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1481 { 1576 {
1482 coro_cctx *first = cctx_first; 1577 coro_cctx *first = cctx_first;
1483 cctx_first = first->next; 1578 cctx_first = first->next;
1484 --cctx_idle; 1579 --cctx_idle;
1485 1580
… …
1496static void 1591static void
1497transfer_check (pTHX_ struct coro *prev, struct coro *next) 1592transfer_check (pTHX_ struct coro *prev, struct coro *next)
1498{ 1593{
1499 /* TODO: throwing up here is considered harmful */ 1594 /* TODO: throwing up here is considered harmful */
1500 1595
1501 if (expect_true (prev != next)) 1596 if (ecb_expect_true (prev != next))
1502 { 1597 {
1503 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1598 if (ecb_expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1504 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,");
1505 1600
1506 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED))) 1601 if (ecb_expect_false (next->flags & (CF_RUNNING | CF_ZOMBIE | CF_SUSPENDED)))
1507 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,");
1508 1603
1509#if !PERL_VERSION_ATLEAST (5,10,0) 1604#if !PERL_VERSION_ATLEAST (5,10,0)
1510 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1605 if (ecb_expect_false (PL_lex_state != LEX_NOTPARSING))
1511 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,");
1512#endif 1607#endif
1513 } 1608 }
1514} 1609}
1515 1610
1516/* always use the TRANSFER macro */ 1611/* always use the TRANSFER macro */
1517static void NOINLINE /* noinline so we have a fixed stackframe */ 1612static void ecb_noinline /* noinline so we have a fixed stackframe */
1518transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1613transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1519{ 1614{
1520 dSTACKLEVEL; 1615 dSTACKLEVEL;
1521 1616
1522 /* sometimes transfer is only called to set idle_sp */ 1617 /* sometimes transfer is only called to set idle_sp */
1523 if (expect_false (!prev)) 1618 if (ecb_expect_false (!prev))
1524 { 1619 {
1525 cctx_current->idle_sp = STACKLEVEL; 1620 cctx_current->idle_sp = STACKLEVEL;
1526 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 */
1527 } 1622 }
1528 else if (expect_true (prev != next)) 1623 else if (ecb_expect_true (prev != next))
1529 { 1624 {
1530 coro_cctx *cctx_prev; 1625 coro_cctx *cctx_prev;
1531 1626
1532 if (expect_false (prev->flags & CF_NEW)) 1627 if (ecb_expect_false (prev->flags & CF_NEW))
1533 { 1628 {
1534 /* create a new empty/source context */ 1629 /* create a new empty/source context */
1535 prev->flags &= ~CF_NEW; 1630 prev->flags &= ~CF_NEW;
1536 prev->flags |= CF_RUNNING; 1631 prev->flags |= CF_RUNNING;
1537 } 1632 }
… …
1540 next->flags |= CF_RUNNING; 1635 next->flags |= CF_RUNNING;
1541 1636
1542 /* first get rid of the old state */ 1637 /* first get rid of the old state */
1543 save_perl (aTHX_ prev); 1638 save_perl (aTHX_ prev);
1544 1639
1545 if (expect_false (next->flags & CF_NEW)) 1640 if (ecb_expect_false (next->flags & CF_NEW))
1546 { 1641 {
1547 /* need to start coroutine */ 1642 /* need to start coroutine */
1548 next->flags &= ~CF_NEW; 1643 next->flags &= ~CF_NEW;
1549 /* setup coroutine call */ 1644 /* setup coroutine call */
1550 coro_setup (aTHX_ next); 1645 init_perl (aTHX_ next);
1551 } 1646 }
1552 else 1647 else
1553 load_perl (aTHX_ next); 1648 load_perl (aTHX_ next);
1554 1649
1555 /* possibly untie and reuse the cctx */ 1650 /* possibly untie and reuse the cctx */
1556 if (expect_true ( 1651 if (ecb_expect_true (
1557 cctx_current->idle_sp == STACKLEVEL 1652 cctx_current->idle_sp == STACKLEVEL
1558 && !(cctx_current->flags & CC_TRACE) 1653 && !(cctx_current->flags & CC_TRACE)
1559 && !force_cctx 1654 && !force_cctx
1560 )) 1655 ))
1561 { 1656 {
1562 /* 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 */
1563 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));
1564 1659
1565 /* 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. */
1566 /* 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 */
1567 if (expect_false (CCTX_EXPIRED (cctx_current))) 1662 if (ecb_expect_false (CCTX_EXPIRED (cctx_current)))
1568 if (expect_true (!next->cctx)) 1663 if (ecb_expect_true (!next->cctx))
1569 next->cctx = cctx_get (aTHX); 1664 next->cctx = cctx_get (aTHX);
1570 1665
1571 cctx_put (cctx_current); 1666 cctx_put (cctx_current);
1572 } 1667 }
1573 else 1668 else
1574 prev->cctx = cctx_current; 1669 prev->cctx = cctx_current;
1575 1670
1576 ++next->usecount; 1671 ++next->usecount;
1577 1672
1578 cctx_prev = cctx_current; 1673 cctx_prev = cctx_current;
1579 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX); 1674 cctx_current = ecb_expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1580 1675
1581 next->cctx = 0; 1676 next->cctx = 0;
1582 1677
1583 if (expect_false (cctx_prev != cctx_current)) 1678 if (ecb_expect_false (cctx_prev != cctx_current))
1584 { 1679 {
1585 cctx_prev->top_env = PL_top_env; 1680 cctx_prev->top_env = PL_top_env;
1586 PL_top_env = cctx_current->top_env; 1681 PL_top_env = cctx_current->top_env;
1587 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx); 1682 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1588 } 1683 }
… …
1594#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))
1595#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1690#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1596 1691
1597/** high level stuff ********************************************************/ 1692/** high level stuff ********************************************************/
1598 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 */
1599static int 1696static void
1697coro_call_on_destroy (pTHX_ struct coro *coro);
1698
1699static void
1600coro_state_destroy (pTHX_ struct coro *coro) 1700coro_state_destroy (pTHX_ struct coro *coro)
1601{ 1701{
1602 if (coro->flags & CF_DESTROYED) 1702 if (coro->flags & CF_ZOMBIE)
1603 return 0; 1703 return;
1604 1704
1605 if (coro->on_destroy && !PL_dirty)
1606 coro->on_destroy (aTHX_ coro); 1705 slf_destroy (aTHX_ coro);
1607 1706
1608 coro->flags |= CF_DESTROYED; 1707 coro->flags |= CF_ZOMBIE;
1609 1708
1610 if (coro->flags & CF_READY) 1709 if (coro->flags & CF_READY)
1611 { 1710 {
1612 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1711 /* reduce nready, as destroying a ready coro effectively unreadies it */
1613 /* alternative: look through all ready queues and remove the coro */ 1712 /* alternative: look through all ready queues and remove the coro */
1614 --coro_nready; 1713 --coro_nready;
1615 } 1714 }
1616 else 1715 else
1617 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;
1618 1721
1619 if (coro->mainstack 1722 if (coro->mainstack
1620 && coro->mainstack != main_mainstack 1723 && coro->mainstack != main_mainstack
1621 && coro->slot 1724 && coro->slot
1622 && !PL_dirty) 1725 && !PL_dirty)
1623 coro_destruct_perl (aTHX_ coro); 1726 destroy_perl (aTHX_ coro);
1624 1727
1625 cctx_destroy (coro->cctx); 1728 cctx_destroy (coro->cctx);
1626 SvREFCNT_dec (coro->startcv); 1729 SvREFCNT_dec (coro->startcv);
1627 SvREFCNT_dec (coro->args); 1730 SvREFCNT_dec (coro->args);
1731 SvREFCNT_dec (coro->swap_sv);
1628 SvREFCNT_dec (CORO_THROW); 1732 SvREFCNT_dec (CORO_THROW);
1629 1733
1630 if (coro->next) coro->next->prev = coro->prev; 1734 coro_call_on_destroy (aTHX_ coro);
1631 if (coro->prev) coro->prev->next = coro->next;
1632 if (coro == coro_first) coro_first = coro->next;
1633 1735
1634 return 1; 1736 /* more destruction mayhem in coro_state_free */
1635} 1737}
1636 1738
1637static int 1739static int
1638coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1740coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1639{ 1741{
1640 struct coro *coro = (struct coro *)mg->mg_ptr; 1742 struct coro *coro = (struct coro *)mg->mg_ptr;
1641 mg->mg_ptr = 0; 1743 mg->mg_ptr = 0;
1642 1744
1643 coro->hv = 0;
1644
1645 if (--coro->refcnt < 0)
1646 {
1647 coro_state_destroy (aTHX_ coro); 1745 coro_state_destroy (aTHX_ coro);
1746 SvREFCNT_dec (coro->on_destroy);
1747 SvREFCNT_dec (coro->status);
1748
1648 Safefree (coro); 1749 Safefree (coro);
1649 }
1650 1750
1651 return 0; 1751 return 0;
1652} 1752}
1653 1753
1654static int 1754static int ecb_cold
1655coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1755coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1656{ 1756{
1657 struct coro *coro = (struct coro *)mg->mg_ptr; 1757 /* called when perl clones the current process the slow way (windows process emulation) */
1658 1758 /* WE SIMply nuke the pointers in the copy, causing perl to croak */
1659 ++coro->refcnt; 1759 mg->mg_ptr = 0;
1760 mg->mg_virtual = 0;
1660 1761
1661 return 0; 1762 return 0;
1662} 1763}
1663 1764
1664static MGVTBL coro_state_vtbl = { 1765static MGVTBL coro_state_vtbl = {
… …
1687 1788
1688 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1789 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1689 TRANSFER (ta, 1); 1790 TRANSFER (ta, 1);
1690} 1791}
1691 1792
1692/*****************************************************************************/
1693/* gensub: simple closure generation utility */
1694
1695#define GENSUB_ARG CvXSUBANY (cv).any_ptr
1696
1697/* create a closure from XS, returns a code reference */
1698/* the arg can be accessed via GENSUB_ARG from the callback */
1699/* the callback must use dXSARGS/XSRETURN */
1700static SV *
1701gensub (pTHX_ void (*xsub)(pTHX_ CV *), void *arg)
1702{
1703 CV *cv = (CV *)newSV (0);
1704
1705 sv_upgrade ((SV *)cv, SVt_PVCV);
1706
1707 CvANON_on (cv);
1708 CvISXSUB_on (cv);
1709 CvXSUB (cv) = xsub;
1710 GENSUB_ARG = arg;
1711
1712 return newRV_noinc ((SV *)cv);
1713}
1714
1715/** Coro ********************************************************************/ 1793/** Coro ********************************************************************/
1716 1794
1717INLINE void 1795ECB_INLINE void
1718coro_enq (pTHX_ struct coro *coro) 1796coro_enq (pTHX_ struct coro *coro)
1719{ 1797{
1720 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN]; 1798 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1721 1799
1722 SvREFCNT_inc_NN (coro->hv); 1800 SvREFCNT_inc_NN (coro->hv);
… …
1724 coro->next_ready = 0; 1802 coro->next_ready = 0;
1725 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro; 1803 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1726 ready [1] = coro; 1804 ready [1] = coro;
1727} 1805}
1728 1806
1729INLINE struct coro * 1807ECB_INLINE struct coro *
1730coro_deq (pTHX) 1808coro_deq (pTHX)
1731{ 1809{
1732 int prio; 1810 int prio;
1733 1811
1734 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; ) 1812 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
… …
1744 } 1822 }
1745 1823
1746 return 0; 1824 return 0;
1747} 1825}
1748 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
1749static int 1844static int
1750api_ready (pTHX_ SV *coro_sv) 1845api_ready (pTHX_ SV *coro_sv)
1751{ 1846{
1752 struct coro *coro;
1753 SV *sv_hook;
1754 void (*xs_hook)(void);
1755
1756 coro = SvSTATE (coro_sv); 1847 struct coro *coro = SvSTATE (coro_sv);
1757 1848
1758 if (coro->flags & CF_READY) 1849 if (coro->flags & CF_READY)
1759 return 0; 1850 return 0;
1760 1851
1761 coro->flags |= CF_READY; 1852 coro->flags |= CF_READY;
1762 1853
1763 sv_hook = coro_nready ? 0 : coro_readyhook;
1764 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1765
1766 coro_enq (aTHX_ coro); 1854 coro_enq (aTHX_ coro);
1767 ++coro_nready;
1768 1855
1769 if (sv_hook) 1856 if (!coro_nready++)
1770 { 1857 if (coroapi.readyhook)
1771 dSP; 1858 coroapi.readyhook ();
1772
1773 ENTER;
1774 SAVETMPS;
1775
1776 PUSHMARK (SP);
1777 PUTBACK;
1778 call_sv (sv_hook, G_VOID | G_DISCARD);
1779
1780 FREETMPS;
1781 LEAVE;
1782 }
1783
1784 if (xs_hook)
1785 xs_hook ();
1786 1859
1787 return 1; 1860 return 1;
1788} 1861}
1789 1862
1790static int 1863static int
… …
1792{ 1865{
1793 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1866 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1794} 1867}
1795 1868
1796/* expects to own a reference to next->hv */ 1869/* expects to own a reference to next->hv */
1797INLINE void 1870ECB_INLINE void
1798prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1871prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1799{ 1872{
1800 SV *prev_sv = SvRV (coro_current); 1873 SV *prev_sv = SvRV (coro_current);
1801 1874
1802 ta->prev = SvSTATE_hv (prev_sv); 1875 ta->prev = SvSTATE_hv (prev_sv);
… …
1815{ 1888{
1816 for (;;) 1889 for (;;)
1817 { 1890 {
1818 struct coro *next = coro_deq (aTHX); 1891 struct coro *next = coro_deq (aTHX);
1819 1892
1820 if (expect_true (next)) 1893 if (ecb_expect_true (next))
1821 { 1894 {
1822 /* cannot transfer to destroyed coros, skip and look for next */ 1895 /* cannot transfer to destroyed coros, skip and look for next */
1823 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED))) 1896 if (ecb_expect_false (next->flags & (CF_ZOMBIE | CF_SUSPENDED)))
1824 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 */
1825 else 1898 else
1826 { 1899 {
1827 next->flags &= ~CF_READY; 1900 next->flags &= ~CF_READY;
1828 --coro_nready; 1901 --coro_nready;
… …
1835 { 1908 {
1836 /* nothing to schedule: call the idle handler */ 1909 /* nothing to schedule: call the idle handler */
1837 if (SvROK (sv_idle) 1910 if (SvROK (sv_idle)
1838 && SvOBJECT (SvRV (sv_idle))) 1911 && SvOBJECT (SvRV (sv_idle)))
1839 { 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
1840 ++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 */
1841 api_ready (aTHX_ SvRV (sv_idle)); 1917 api_ready (aTHX_ SvRV (sv_idle));
1842 --coro_nready; 1918 --coro_nready;
1843 } 1919 }
1844 else 1920 else
1845 { 1921 {
1922 /* TODO: deprecated, remove, cannot work reliably *//*D*/
1846 dSP; 1923 dSP;
1847 1924
1848 ENTER; 1925 ENTER;
1849 SAVETMPS; 1926 SAVETMPS;
1850 1927
… …
1857 } 1934 }
1858 } 1935 }
1859 } 1936 }
1860} 1937}
1861 1938
1862INLINE void 1939ECB_INLINE void
1863prepare_cede (pTHX_ struct coro_transfer_args *ta) 1940prepare_cede (pTHX_ struct coro_transfer_args *ta)
1864{ 1941{
1865 api_ready (aTHX_ coro_current); 1942 api_ready (aTHX_ coro_current);
1866 prepare_schedule (aTHX_ ta); 1943 prepare_schedule (aTHX_ ta);
1867} 1944}
1868 1945
1869INLINE void 1946ECB_INLINE void
1870prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 1947prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1871{ 1948{
1872 SV *prev = SvRV (coro_current); 1949 SV *prev = SvRV (coro_current);
1873 1950
1874 if (coro_nready) 1951 if (coro_nready)
… …
1904{ 1981{
1905 struct coro_transfer_args ta; 1982 struct coro_transfer_args ta;
1906 1983
1907 prepare_cede (aTHX_ &ta); 1984 prepare_cede (aTHX_ &ta);
1908 1985
1909 if (expect_true (ta.prev != ta.next)) 1986 if (ecb_expect_true (ta.prev != ta.next))
1910 { 1987 {
1911 TRANSFER (ta, 1); 1988 TRANSFER (ta, 1);
1912 return 1; 1989 return 1;
1913 } 1990 }
1914 else 1991 else
… …
1957 coro->slot->runops = RUNOPS_DEFAULT; 2034 coro->slot->runops = RUNOPS_DEFAULT;
1958 } 2035 }
1959} 2036}
1960 2037
1961static 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
1962coro_call_on_destroy (pTHX_ struct coro *coro) 2115coro_call_on_destroy (pTHX_ struct coro *coro)
1963{ 2116{
1964 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2117 AV *od = coro->on_destroy;
1965 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1966 2118
1967 if (on_destroyp) 2119 if (!od)
1968 { 2120 return;
1969 AV *on_destroy = (AV *)SvRV (*on_destroyp);
1970 2121
1971 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
1972 { 2130 {
1973 dSP; /* don't disturb outer sp */ 2131 dSP; /* don't disturb outer sp */
1974 SV *cb = av_pop (on_destroy);
1975
1976 PUSHMARK (SP); 2132 PUSHMARK (SP);
1977 2133
1978 if (statusp) 2134 if (coro->status)
1979 { 2135 {
1980 int i; 2136 PUTBACK;
1981 AV *status = (AV *)SvRV (*statusp); 2137 coro_push_av (aTHX_ coro->status, G_ARRAY);
1982 EXTEND (SP, AvFILLp (status) + 1); 2138 SPAGAIN;
1983
1984 for (i = 0; i <= AvFILLp (status); ++i)
1985 PUSHs (AvARRAY (status)[i]);
1986 } 2139 }
1987 2140
1988 PUTBACK; 2141 PUTBACK;
1989 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD); 2142 call_sv (cb, G_VOID | G_DISCARD);
1990 } 2143 }
1991 } 2144 }
1992} 2145}
1993 2146
1994static void 2147static void
1995slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2148coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
1996{ 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 {
1997 int i; 2163 int i;
1998 HV *hv = (HV *)SvRV (coro_current);
1999 AV *av = newAV ();
2000 2164
2001 av_extend (av, items - 1); 2165 av_extend (av, items - 1);
2166
2002 for (i = 0; i < items; ++i) 2167 for (i = 0; i < items; ++i)
2003 av_push (av, SvREFCNT_inc_NN (arg [i])); 2168 av_push (av, SvREFCNT_inc_NN (arg [i]));
2169 }
2170}
2004 2171
2005 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 2172static void
2006 2173slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2174{
2007 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 */
2008 api_ready (aTHX_ sv_manager); 2176 api_ready (aTHX_ sv_manager);
2009 2177
2010 frame->prepare = prepare_schedule; 2178 frame->prepare = prepare_schedule;
2011 frame->check = slf_check_repeat; 2179 frame->check = slf_check_repeat;
2012 2180
2013 /* as a minor optimisation, we could unwind all stacks here */ 2181 /* as a minor optimisation, we could unwind all stacks here */
2014 /* 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 */
2015 /*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;
2016} 2287}
2017 2288
2018/*****************************************************************************/ 2289/*****************************************************************************/
2019/* async pool handler */ 2290/* async pool handler */
2020 2291
… …
2051slf_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)
2052{ 2323{
2053 HV *hv = (HV *)SvRV (coro_current); 2324 HV *hv = (HV *)SvRV (coro_current);
2054 struct coro *coro = SvSTATE_hv ((SV *)hv); 2325 struct coro *coro = SvSTATE_hv ((SV *)hv);
2055 2326
2056 if (expect_true (coro->saved_deffh)) 2327 if (ecb_expect_true (coro->saved_deffh))
2057 { 2328 {
2058 /* subsequent iteration */ 2329 /* subsequent iteration */
2059 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2330 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
2060 coro->saved_deffh = 0; 2331 coro->saved_deffh = 0;
2061 2332
2062 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 2333 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
2063 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2334 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
2064 { 2335 {
2065 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate); 2336 slf_init_terminate_cancel_common (aTHX_ frame, hv);
2066 coro->invoke_av = newAV (); 2337 return;
2067
2068 frame->prepare = prepare_nop;
2069 } 2338 }
2070 else 2339 else
2071 { 2340 {
2072 av_clear (GvAV (PL_defgv)); 2341 av_clear (GvAV (PL_defgv));
2073 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);
… …
2098 2367
2099static void 2368static void
2100coro_rouse_callback (pTHX_ CV *cv) 2369coro_rouse_callback (pTHX_ CV *cv)
2101{ 2370{
2102 dXSARGS; 2371 dXSARGS;
2103 SV *data = (SV *)GENSUB_ARG; 2372 SV *data = (SV *)S_GENSUB_ARG;
2104 2373
2105 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2374 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2106 { 2375 {
2107 /* first call, set args */ 2376 /* first call, set args */
2108 SV *coro = SvRV (data); 2377 SV *coro = SvRV (data);
… …
2174 || SvTYPE (SvRV (cb)) != SVt_PVCV 2443 || SvTYPE (SvRV (cb)) != SVt_PVCV
2175 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2444 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2176 croak ("Coro::rouse_wait called with illegal callback argument,"); 2445 croak ("Coro::rouse_wait called with illegal callback argument,");
2177 2446
2178 { 2447 {
2179 CV *cv = (CV *)SvRV (cb); /* for GENSUB_ARG */ 2448 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
2180 SV *data = (SV *)GENSUB_ARG; 2449 SV *data = (SV *)S_GENSUB_ARG;
2181 2450
2182 frame->data = (void *)data; 2451 frame->data = (void *)data;
2183 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule; 2452 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
2184 frame->check = slf_check_rouse_wait; 2453 frame->check = slf_check_rouse_wait;
2185 } 2454 }
… …
2189coro_new_rouse_cb (pTHX) 2458coro_new_rouse_cb (pTHX)
2190{ 2459{
2191 HV *hv = (HV *)SvRV (coro_current); 2460 HV *hv = (HV *)SvRV (coro_current);
2192 struct coro *coro = SvSTATE_hv (hv); 2461 struct coro *coro = SvSTATE_hv (hv);
2193 SV *data = newRV_inc ((SV *)hv); 2462 SV *data = newRV_inc ((SV *)hv);
2194 SV *cb = gensub (aTHX_ coro_rouse_callback, (void *)data); 2463 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
2195 2464
2196 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);
2197 SvREFCNT_dec (data); /* magicext increases the refcount */ 2466 SvREFCNT_dec (data); /* magicext increases the refcount */
2198 2467
2199 SvREFCNT_dec (coro->rouse_cb); 2468 SvREFCNT_dec (coro->rouse_cb);
… …
2296static void 2565static void
2297slf_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)
2298{ 2567{
2299 frame->prepare = prepare_cede_notself; 2568 frame->prepare = prepare_cede_notself;
2300 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;
2301} 2587}
2302 2588
2303/* 2589/*
2304 * these not obviously related functions are all rolled into one 2590 * these not obviously related functions are all rolled into one
2305 * 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
… …
2312 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 */
2313 2599
2314 /* 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 */
2315 /* the latter happens when a new coro has been started */ 2601 /* the latter happens when a new coro has been started */
2316 /* or when a new cctx was attached to an existing coroutine */ 2602 /* or when a new cctx was attached to an existing coroutine */
2317 if (expect_true (!slf_frame.prepare)) 2603 if (ecb_expect_true (!slf_frame.prepare))
2318 { 2604 {
2319 /* first iteration */ 2605 /* first iteration */
2320 dSP; 2606 dSP;
2321 SV **arg = PL_stack_base + TOPMARK + 1; 2607 SV **arg = PL_stack_base + TOPMARK + 1;
2322 int items = SP - arg; /* args without function object */ 2608 int items = SP - arg; /* args without function object */
… …
2363 while (slf_frame.check (aTHX_ &slf_frame)); 2649 while (slf_frame.check (aTHX_ &slf_frame));
2364 2650
2365 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 */
2366 2652
2367 /* exception handling */ 2653 /* exception handling */
2368 if (expect_false (CORO_THROW)) 2654 if (ecb_expect_false (CORO_THROW))
2369 { 2655 {
2370 SV *exception = sv_2mortal (CORO_THROW); 2656 SV *exception = sv_2mortal (CORO_THROW);
2371 2657
2372 CORO_THROW = 0; 2658 CORO_THROW = 0;
2373 sv_setsv (ERRSV, exception); 2659 sv_setsv (ERRSV, exception);
2374 croak (0); 2660 croak (0);
2375 } 2661 }
2376 2662
2377 /* return value handling - mostly like entersub */ 2663 /* return value handling - mostly like entersub */
2378 /* make sure we put something on the stack in scalar context */ 2664 /* make sure we put something on the stack in scalar context */
2379 if (GIMME_V == G_SCALAR) 2665 if (GIMME_V == G_SCALAR
2666 && ecb_expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2380 { 2667 {
2381 dSP; 2668 dSP;
2382 SV **bot = PL_stack_base + checkmark; 2669 SV **bot = PL_stack_base + checkmark;
2383 2670
2384 if (sp == bot) /* too few, push undef */ 2671 if (sp == bot) /* too few, push undef */
2385 bot [1] = &PL_sv_undef; 2672 bot [1] = &PL_sv_undef;
2386 else if (sp != bot + 1) /* too many, take last one */ 2673 else /* too many, take last one */
2387 bot [1] = *sp; 2674 bot [1] = *sp;
2388 2675
2389 SP = bot + 1; 2676 SP = bot + 1;
2390 2677
2391 PUTBACK; 2678 PUTBACK;
… …
2424 if (PL_op->op_flags & OPf_STACKED) 2711 if (PL_op->op_flags & OPf_STACKED)
2425 { 2712 {
2426 if (items > slf_arga) 2713 if (items > slf_arga)
2427 { 2714 {
2428 slf_arga = items; 2715 slf_arga = items;
2429 free (slf_argv); 2716 Safefree (slf_argv);
2430 slf_argv = malloc (slf_arga * sizeof (SV *)); 2717 New (0, slf_argv, slf_arga, SV *);
2431 } 2718 }
2432 2719
2433 slf_argc = items; 2720 slf_argc = items;
2434 2721
2435 for (i = 0; i < items; ++i) 2722 for (i = 0; i < items; ++i)
… …
2498{ 2785{
2499 PerlIOBuf base; 2786 PerlIOBuf base;
2500 NV next, every; 2787 NV next, every;
2501} PerlIOCede; 2788} PerlIOCede;
2502 2789
2503static IV 2790static IV ecb_cold
2504PerlIOCede_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)
2505{ 2792{
2506 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2793 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2507 2794
2508 self->every = SvCUR (arg) ? SvNV (arg) : 0.01; 2795 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
2509 self->next = nvtime () + self->every; 2796 self->next = nvtime () + self->every;
2510 2797
2511 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab); 2798 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
2512} 2799}
2513 2800
2514static SV * 2801static SV * ecb_cold
2515PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags) 2802PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
2516{ 2803{
2517 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2804 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2518 2805
2519 return newSVnv (self->every); 2806 return newSVnv (self->every);
… …
2631 SvREFCNT_dec (cb); 2918 SvREFCNT_dec (cb);
2632 } 2919 }
2633} 2920}
2634 2921
2635static void 2922static void
2636coro_semaphore_on_destroy (pTHX_ struct coro *coro) 2923coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2637{ 2924{
2638 /* call $sem->adjust (0) to possibly wake up some other waiters */ 2925 /* call $sem->adjust (0) to possibly wake up some other waiters */
2639 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 2926 coro_semaphore_adjust (aTHX_ (AV *)frame->data, 0);
2640} 2927}
2641 2928
2642static int 2929static int
2643slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire) 2930slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2644{ 2931{
2645 AV *av = (AV *)frame->data; 2932 AV *av = (AV *)frame->data;
2646 SV *count_sv = AvARRAY (av)[0]; 2933 SV *count_sv = AvARRAY (av)[0];
2934 SV *coro_hv = SvRV (coro_current);
2647 2935
2648 /* 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 */
2649 if (CORO_THROW) 2937 if (CORO_THROW)
2650 return 0; 2938 return 0;
2651 else if (SvIVX (count_sv) > 0) 2939 else if (SvIVX (count_sv) > 0)
2652 { 2940 {
2653 SvSTATE_current->on_destroy = 0; 2941 frame->destroy = 0;
2654 2942
2655 if (acquire) 2943 if (acquire)
2656 SvIVX (count_sv) = SvIVX (count_sv) - 1; 2944 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2657 else 2945 else
2658 coro_semaphore_adjust (aTHX_ av, 0); 2946 coro_semaphore_adjust (aTHX_ av, 0);
… …
2663 { 2951 {
2664 int i; 2952 int i;
2665 /* 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 */
2666 /* 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 */
2667 /* this avoids some degenerate memory usage cases */ 2955 /* this avoids some degenerate memory usage cases */
2668 2956 for (i = AvFILLp (av); i > 0; --i) // i > 0 is not an off-by-one bug
2669 for (i = 1; i <= AvFILLp (av); ++i)
2670 if (AvARRAY (av)[i] == SvRV (coro_current)) 2957 if (AvARRAY (av)[i] == coro_hv)
2671 return 1; 2958 return 1;
2672 2959
2673 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2960 av_push (av, SvREFCNT_inc (coro_hv));
2674 return 1; 2961 return 1;
2675 } 2962 }
2676} 2963}
2677 2964
2678static int 2965static int
… …
2701 { 2988 {
2702 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2989 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2703 2990
2704 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 2991 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2705 frame->prepare = prepare_schedule; 2992 frame->prepare = prepare_schedule;
2706
2707 /* to avoid race conditions when a woken-up coro gets terminated */ 2993 /* to avoid race conditions when a woken-up coro gets terminated */
2708 /* we arrange for a temporary on_destroy that calls adjust (0) */ 2994 /* we arrange for a temporary on_destroy that calls adjust (0) */
2709 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 2995 frame->destroy = coro_semaphore_destroy;
2710 } 2996 }
2711} 2997}
2712 2998
2713static void 2999static void
2714slf_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)
… …
2722{ 3008{
2723 if (items >= 2) 3009 if (items >= 2)
2724 { 3010 {
2725 /* callback form */ 3011 /* callback form */
2726 AV *av = (AV *)SvRV (arg [0]); 3012 AV *av = (AV *)SvRV (arg [0]);
2727 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 3013 SV *cb_cv = s_get_cv_croak (arg [1]);
2728 3014
2729 av_push (av, SvREFCNT_inc_NN (cb_cv)); 3015 av_push (av, SvREFCNT_inc_NN (cb_cv));
2730 3016
2731 if (SvIVX (AvARRAY (av)[0]) > 0) 3017 if (SvIVX (AvARRAY (av)[0]) > 0)
2732 coro_semaphore_adjust (aTHX_ av, 0); 3018 coro_semaphore_adjust (aTHX_ av, 0);
… …
2792{ 3078{
2793 AV *av = (AV *)SvRV (arg [0]); 3079 AV *av = (AV *)SvRV (arg [0]);
2794 3080
2795 if (items >= 2) 3081 if (items >= 2)
2796 { 3082 {
2797 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 3083 SV *cb_cv = s_get_cv_croak (arg [1]);
2798 av_push (av, SvREFCNT_inc_NN (cb_cv)); 3084 av_push (av, SvREFCNT_inc_NN (cb_cv));
2799 3085
2800 if (SvIVX (AvARRAY (av)[0])) 3086 if (SvIVX (AvARRAY (av)[0]))
2801 coro_signal_wake (aTHX_ av, 1); /* ust be the only waiter */ 3087 coro_signal_wake (aTHX_ av, 1); /* must be the only waiter */
2802 3088
2803 frame->prepare = prepare_nop; 3089 frame->prepare = prepare_nop;
2804 frame->check = slf_check_nop; 3090 frame->check = slf_check_nop;
2805 } 3091 }
2806 else if (SvIVX (AvARRAY (av)[0])) 3092 else if (SvIVX (AvARRAY (av)[0]))
… …
2837 3123
2838static void 3124static void
2839coro_aio_callback (pTHX_ CV *cv) 3125coro_aio_callback (pTHX_ CV *cv)
2840{ 3126{
2841 dXSARGS; 3127 dXSARGS;
2842 AV *state = (AV *)GENSUB_ARG; 3128 AV *state = (AV *)S_GENSUB_ARG;
2843 SV *coro = av_pop (state); 3129 SV *coro = av_pop (state);
2844 SV *data_sv = newSV (sizeof (struct io_state)); 3130 SV *data_sv = newSV (sizeof (struct io_state));
2845 3131
2846 av_extend (state, items - 1); 3132 av_extend (state, items - 1);
2847 3133
… …
2932 dSP; 3218 dSP;
2933 3219
2934 static SV *prio_cv; 3220 static SV *prio_cv;
2935 static SV *prio_sv; 3221 static SV *prio_sv;
2936 3222
2937 if (expect_false (!prio_cv)) 3223 if (ecb_expect_false (!prio_cv))
2938 { 3224 {
2939 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0); 3225 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0);
2940 prio_sv = newSViv (0); 3226 prio_sv = newSViv (0);
2941 } 3227 }
2942 3228
… …
2961 3247
2962 for (i = 0; i < items; ++i) 3248 for (i = 0; i < items; ++i)
2963 PUSHs (arg [i]); 3249 PUSHs (arg [i]);
2964 3250
2965 /* now push the callback closure */ 3251 /* now push the callback closure */
2966 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))));
2967 3253
2968 /* now call the AIO function - we assume our request is uncancelable */ 3254 /* now call the AIO function - we assume our request is uncancelable */
2969 PUTBACK; 3255 PUTBACK;
2970 call_sv ((SV *)req, G_VOID | G_DISCARD); 3256 call_sv ((SV *)req, G_VOID | G_DISCARD);
2971 } 3257 }
2972 3258
2973 /* 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 */
2974 frame->data = (void *)state; 3260 frame->data = (void *)state;
2975 frame->prepare = prepare_schedule; 3261 frame->prepare = prepare_schedule;
2976 frame->check = slf_check_aio_req; 3262 frame->check = slf_check_aio_req;
2977} 3263}
2978 3264
… …
2988 3274
2989/*****************************************************************************/ 3275/*****************************************************************************/
2990 3276
2991#if CORO_CLONE 3277#if CORO_CLONE
2992# 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
2993#endif 3398#endif
2994 3399
2995MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3400MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2996 3401
2997PROTOTYPES: DISABLE 3402PROTOTYPES: DISABLE
… …
3003 coro_thx = PERL_GET_CONTEXT; 3408 coro_thx = PERL_GET_CONTEXT;
3004# endif 3409# endif
3005#endif 3410#endif
3006 BOOT_PAGESIZE; 3411 BOOT_PAGESIZE;
3007 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
3008 cctx_current = cctx_new_empty (); 3420 cctx_current = cctx_new_empty ();
3009 3421
3010 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3422 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
3011 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3423 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
3012 3424
… …
3051 coroapi.prepare_nop = prepare_nop; 3463 coroapi.prepare_nop = prepare_nop;
3052 coroapi.prepare_schedule = prepare_schedule; 3464 coroapi.prepare_schedule = prepare_schedule;
3053 coroapi.prepare_cede = prepare_cede; 3465 coroapi.prepare_cede = prepare_cede;
3054 coroapi.prepare_cede_notself = prepare_cede_notself; 3466 coroapi.prepare_cede_notself = prepare_cede_notself;
3055 3467
3056 { 3468 time_init (aTHX);
3057 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
3058
3059 if (!svp) croak ("Time::HiRes is required");
3060 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
3061
3062 nvtime = INT2PTR (double (*)(), SvIV (*svp));
3063
3064 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
3065 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
3066 }
3067 3469
3068 assert (("PRIO_NORMAL must be 0", !CORO_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
3069} 3476}
3070 3477
3071SV * 3478SV *
3072new (char *klass, ...) 3479new (SV *klass, ...)
3073 ALIAS: 3480 ALIAS:
3074 Coro::new = 1 3481 Coro::new = 1
3075 CODE: 3482 CODE:
3076{ 3483 RETVAL = coro_new (aTHX_ ix ? coro_stash : coro_state_stash, &ST (1), items - 1, ix);
3077 struct coro *coro; 3484 OUTPUT:
3078 MAGIC *mg;
3079 HV *hv;
3080 CV *cb;
3081 int i;
3082
3083 if (items > 1)
3084 {
3085 cb = coro_sv_2cv (aTHX_ ST (1));
3086
3087 if (!ix)
3088 {
3089 if (CvISXSUB (cb))
3090 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
3091
3092 if (!CvROOT (cb))
3093 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
3094 }
3095 }
3096
3097 Newz (0, coro, 1, struct coro);
3098 coro->args = newAV ();
3099 coro->flags = CF_NEW;
3100
3101 if (coro_first) coro_first->prev = coro;
3102 coro->next = coro_first;
3103 coro_first = coro;
3104
3105 coro->hv = hv = newHV ();
3106 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
3107 mg->mg_flags |= MGf_DUP;
3108 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
3109
3110 if (items > 1)
3111 {
3112 av_extend (coro->args, items - 1 + ix - 1);
3113
3114 if (ix)
3115 {
3116 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
3117 cb = cv_coro_run;
3118 }
3119
3120 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3121
3122 for (i = 2; i < items; i++)
3123 av_push (coro->args, newSVsv (ST (i)));
3124 }
3125}
3126 OUTPUT:
3127 RETVAL 3485 RETVAL
3128 3486
3129void 3487void
3130transfer (...) 3488transfer (...)
3131 PROTOTYPE: $$ 3489 PROTOTYPE: $$
3132 CODE: 3490 CODE:
3133 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3491 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3134
3135bool
3136_destroy (SV *coro_sv)
3137 CODE:
3138 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
3139 OUTPUT:
3140 RETVAL
3141 3492
3142void 3493void
3143_exit (int code) 3494_exit (int code)
3144 PROTOTYPE: $ 3495 PROTOTYPE: $
3145 CODE: 3496 CODE:
… …
3221 CODE: 3572 CODE:
3222{ 3573{
3223 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3574 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
3224 { 3575 {
3225 struct coro *current = SvSTATE_current; 3576 struct coro *current = SvSTATE_current;
3577 struct CoroSLF slf_save;
3226 3578
3227 if (current != coro) 3579 if (current != coro)
3228 { 3580 {
3229 PUTBACK; 3581 PUTBACK;
3230 save_perl (aTHX_ current); 3582 save_perl (aTHX_ current);
3231 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;
3232 SPAGAIN; 3593 SPAGAIN;
3233 } 3594 }
3234 3595
3235 PUSHSTACK; 3596 PUSHSTACK;
3236 3597
… …
3246 SPAGAIN; 3607 SPAGAIN;
3247 3608
3248 if (current != coro) 3609 if (current != coro)
3249 { 3610 {
3250 PUTBACK; 3611 PUTBACK;
3612 slf_frame = slf_save;
3251 save_perl (aTHX_ coro); 3613 save_perl (aTHX_ coro);
3252 load_perl (aTHX_ current); 3614 load_perl (aTHX_ current);
3253 SPAGAIN; 3615 SPAGAIN;
3254 } 3616 }
3255 } 3617 }
… …
3260 PROTOTYPE: $ 3622 PROTOTYPE: $
3261 ALIAS: 3623 ALIAS:
3262 is_ready = CF_READY 3624 is_ready = CF_READY
3263 is_running = CF_RUNNING 3625 is_running = CF_RUNNING
3264 is_new = CF_NEW 3626 is_new = CF_NEW
3265 is_destroyed = CF_DESTROYED 3627 is_destroyed = CF_ZOMBIE
3628 is_zombie = CF_ZOMBIE
3266 is_suspended = CF_SUSPENDED 3629 is_suspended = CF_SUSPENDED
3267 CODE: 3630 CODE:
3268 RETVAL = boolSV (coro->flags & ix); 3631 RETVAL = boolSV (coro->flags & ix);
3269 OUTPUT: 3632 OUTPUT:
3270 RETVAL 3633 RETVAL
3271 3634
3272void 3635void
3273throw (Coro::State self, SV *throw = &PL_sv_undef) 3636throw (Coro::State self, SV *exception = &PL_sv_undef)
3274 PROTOTYPE: $;$ 3637 PROTOTYPE: $;$
3275 CODE: 3638 CODE:
3276{ 3639{
3277 struct coro *current = SvSTATE_current; 3640 struct coro *current = SvSTATE_current;
3278 SV **throwp = self == current ? &CORO_THROW : &self->except; 3641 SV **exceptionp = self == current ? &CORO_THROW : &self->except;
3279 SvREFCNT_dec (*throwp); 3642 SvREFCNT_dec (*exceptionp);
3280 SvGETMAGIC (throw); 3643 SvGETMAGIC (exception);
3281 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3644 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3282} 3645}
3283 3646
3284void 3647void
3285api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3648api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3286 PROTOTYPE: $;$ 3649 PROTOTYPE: $;$
… …
3341 3704
3342void 3705void
3343cancel (Coro::State self) 3706cancel (Coro::State self)
3344 CODE: 3707 CODE:
3345 coro_state_destroy (aTHX_ self); 3708 coro_state_destroy (aTHX_ self);
3346 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */
3347
3348 3709
3349SV * 3710SV *
3350enable_times (int enabled = enable_times) 3711enable_times (int enabled = enable_times)
3351 CODE: 3712 CODE:
3352{ 3713{
… …
3367times (Coro::State self) 3728times (Coro::State self)
3368 PPCODE: 3729 PPCODE:
3369{ 3730{
3370 struct coro *current = SvSTATE (coro_current); 3731 struct coro *current = SvSTATE (coro_current);
3371 3732
3372 if (expect_false (current == self)) 3733 if (ecb_expect_false (current == self))
3373 { 3734 {
3374 coro_times_update (); 3735 coro_times_update ();
3375 coro_times_add (SvSTATE (coro_current)); 3736 coro_times_add (SvSTATE (coro_current));
3376 } 3737 }
3377 3738
3378 EXTEND (SP, 2); 3739 EXTEND (SP, 2);
3379 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9))); 3740 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3380 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9))); 3741 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3381 3742
3382 if (expect_false (current == self)) 3743 if (ecb_expect_false (current == self))
3383 coro_times_sub (SvSTATE (coro_current)); 3744 coro_times_sub (SvSTATE (coro_current));
3384} 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}
3765
3385 3766
3386MODULE = Coro::State PACKAGE = Coro 3767MODULE = Coro::State PACKAGE = Coro
3387 3768
3388BOOT: 3769BOOT:
3389{ 3770{
3390 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3771 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3391 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3772 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3392 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 3773 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3393 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3394 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);
3395 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 3775 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3396 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 3776 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3397 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 3777 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3398 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 3778 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3399 3779
3400 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);
3401 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3781 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3402 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);
3403 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 */
3404 3784
3405 coro_stash = gv_stashpv ("Coro", TRUE); 3785 coro_stash = gv_stashpv ("Coro", TRUE);
3406 3786
3407 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 3787 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3408 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 3788 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3409 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL)); 3789 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
… …
3427 sv_setiv (sv, (IV)&coroapi); 3807 sv_setiv (sv, (IV)&coroapi);
3428 SvREADONLY_on (sv); 3808 SvREADONLY_on (sv);
3429 } 3809 }
3430} 3810}
3431 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
3432void 3837void
3433terminate (...) 3838terminate (...)
3434 CODE: 3839 CODE:
3435 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
3436 3850
3437void 3851void
3438schedule (...) 3852schedule (...)
3439 CODE: 3853 CODE:
3440 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3854 CORO_EXECUTE_SLF_XS (slf_init_schedule);
… …
3470_set_readyhook (SV *hook) 3884_set_readyhook (SV *hook)
3471 PROTOTYPE: $ 3885 PROTOTYPE: $
3472 CODE: 3886 CODE:
3473 SvREFCNT_dec (coro_readyhook); 3887 SvREFCNT_dec (coro_readyhook);
3474 SvGETMAGIC (hook); 3888 SvGETMAGIC (hook);
3889 if (SvOK (hook))
3890 {
3475 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 }
3476 3899
3477int 3900int
3478prio (Coro::State coro, int newprio = 0) 3901prio (Coro::State coro, int newprio = 0)
3479 PROTOTYPE: $;$ 3902 PROTOTYPE: $;$
3480 ALIAS: 3903 ALIAS:
… …
3544 for (i = 1; i < items; ++i) 3967 for (i = 1; i < items; ++i)
3545 av_push (av, SvREFCNT_inc_NN (ST (i))); 3968 av_push (av, SvREFCNT_inc_NN (ST (i)));
3546 3969
3547 if ((SV *)hv == &PL_sv_undef) 3970 if ((SV *)hv == &PL_sv_undef)
3548 { 3971 {
3549 PUSHMARK (SP); 3972 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3550 EXTEND (SP, 2);
3551 PUSHs (sv_Coro);
3552 PUSHs ((SV *)cv_pool_handler);
3553 PUTBACK;
3554 call_sv ((SV *)cv_coro_state_new, G_SCALAR);
3555 SPAGAIN;
3556
3557 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs)); 3973 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
3974 SvREFCNT_dec (sv);
3558 } 3975 }
3559 3976
3560 { 3977 {
3561 struct coro *coro = SvSTATE_hv (hv); 3978 struct coro *coro = SvSTATE_hv (hv);
3562 3979
… …
3596 CODE: 4013 CODE:
3597{ 4014{
3598 struct coro *coro = SvSTATE_current; 4015 struct coro *coro = SvSTATE_current;
3599 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 4016 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3600 4017
3601 block = (SV *)coro_sv_2cv (aTHX_ block); 4018 block = s_get_cv_croak (block);
3602 4019
3603 if (!*avp) 4020 if (!*avp)
3604 *avp = newAV (); 4021 *avp = newAV ();
3605 4022
3606 av_push (*avp, SvREFCNT_inc (block)); 4023 av_push (*avp, SvREFCNT_inc (block));
… …
3806 4223
3807void 4224void
3808_register (char *target, char *proto, SV *req) 4225_register (char *target, char *proto, SV *req)
3809 CODE: 4226 CODE:
3810{ 4227{
3811 CV *req_cv = coro_sv_2cv (aTHX_ req); 4228 SV *req_cv = s_get_cv_croak (req);
3812 /* newXSproto doesn't return the CV on 5.8 */ 4229 /* newXSproto doesn't return the CV on 5.8 */
3813 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 4230 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3814 sv_setpv ((SV *)slf_cv, proto); 4231 sv_setpv ((SV *)slf_cv, proto);
3815 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);
3816} 4233}
3817 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