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.361 by root, Wed Jul 1 07:26:40 2009 UTC vs.
Revision 1.406 by root, Sat Jun 11 13:49:00 2011 UTC

1/* this works around a bug in mingw32 providing a non-working setjmp */
2#define USE_NO_MINGW_SETJMP_TWO_ARGS
3
4#define NDEBUG 1
5
1#include "libcoro/coro.c" 6#include "libcoro/coro.c"
2 7
3#define PERL_NO_GET_CONTEXT 8#define PERL_NO_GET_CONTEXT
4#define PERL_EXT 9#define PERL_EXT
5 10
6#include "EXTERN.h" 11#include "EXTERN.h"
7#include "perl.h" 12#include "perl.h"
8#include "XSUB.h" 13#include "XSUB.h"
9#include "perliol.h" 14#include "perliol.h"
10 15
11#include "patchlevel.h" 16#include "schmorp.h"
17#include "ecb.h"
12 18
19#include <stddef.h>
13#include <stdio.h> 20#include <stdio.h>
14#include <errno.h> 21#include <errno.h>
15#include <assert.h> 22#include <assert.h>
16 23
17#ifdef WIN32 24#ifndef SVs_PADSTALE
25# define SVs_PADSTALE 0
26#endif
27
28#if defined(_WIN32)
29# undef HAS_GETTIMEOFDAY
18# undef setjmp 30# undef setjmp
19# undef longjmp 31# undef longjmp
20# undef _exit 32# undef _exit
21# define setjmp _setjmp /* deep magic */ 33# define setjmp _setjmp /* deep magic */
22#else 34#else
… …
51#endif 63#endif
52 64
53/* the maximum number of idle cctx that will be pooled */ 65/* the maximum number of idle cctx that will be pooled */
54static int cctx_max_idle = 4; 66static int cctx_max_idle = 4;
55 67
56#define PERL_VERSION_ATLEAST(a,b,c) \
57 (PERL_REVISION > (a) \
58 || (PERL_REVISION == (a) \
59 && (PERL_VERSION > (b) \
60 || (PERL_VERSION == (b) && PERL_SUBVERSION >= (c)))))
61
62#if !PERL_VERSION_ATLEAST (5,6,0)
63# ifndef PL_ppaddr
64# define PL_ppaddr ppaddr
65# endif
66# ifndef call_sv
67# define call_sv perl_call_sv
68# endif
69# ifndef get_sv
70# define get_sv perl_get_sv
71# endif
72# ifndef get_cv
73# define get_cv perl_get_cv
74# endif
75# ifndef IS_PADGV
76# define IS_PADGV(v) 0
77# endif
78# ifndef IS_PADCONST
79# define IS_PADCONST(v) 0
80# endif
81#endif
82
83/* 5.11 */
84#ifndef CxHASARGS
85# define CxHASARGS(cx) (cx)->blk_sub.hasargs
86#endif
87
88/* 5.10.0 */
89#ifndef SvREFCNT_inc_NN
90# define SvREFCNT_inc_NN(sv) SvREFCNT_inc (sv)
91#endif
92
93/* 5.8.8 */
94#ifndef GV_NOTQUAL
95# define GV_NOTQUAL 0
96#endif
97#ifndef newSV
98# define newSV(l) NEWSV(0,l)
99#endif
100#ifndef CvISXSUB_on
101# define CvISXSUB_on(cv) (void)cv
102#endif
103#ifndef CvISXSUB
104# define CvISXSUB(cv) (CvXSUB (cv) ? TRUE : FALSE)
105#endif
106#ifndef Newx
107# define Newx(ptr,nitems,type) New (0,ptr,nitems,type)
108#endif
109
110/* 5.8.7 */
111#ifndef SvRV_set
112# define SvRV_set(s,v) SvRV(s) = (v)
113#endif
114
115#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 68#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
116# undef CORO_STACKGUARD 69# undef CORO_STACKGUARD
117#endif 70#endif
118 71
119#ifndef CORO_STACKGUARD 72#ifndef CORO_STACKGUARD
… …
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 #else
301 #undef CORO_JIT
302 #endif
303 #endif
304#endif
305
306#if CORO_JIT
307static load_save_perl_slots_type load_perl_slots, save_perl_slots;
308#endif
309
310/** Coro::Select ************************************************************/
311
312static OP *(*coro_old_pp_sselect) (pTHX);
313static SV *coro_select_select;
314
315/* horrible hack, but if it works... */
316static OP *
317coro_pp_sselect (pTHX)
318{
319 dSP;
320 PUSHMARK (SP - 4); /* fake argument list */
321 XPUSHs (coro_select_select);
322 PUTBACK;
323
324 /* entersub is an UNOP, select a LISTOP... keep your fingers crossed */
325 PL_op->op_flags |= OPf_STACKED;
326 PL_op->op_private = 0;
327 return PL_ppaddr [OP_ENTERSUB](aTHX);
328}
329
330/** time stuff **************************************************************/
331
332#ifdef HAS_GETTIMEOFDAY
333
334ECB_INLINE void
335coro_u2time (pTHX_ UV ret[2])
336{
337 struct timeval tv;
338 gettimeofday (&tv, 0);
339
340 ret [0] = tv.tv_sec;
341 ret [1] = tv.tv_usec;
342}
343
344ECB_INLINE double
345coro_nvtime ()
346{
347 struct timeval tv;
348 gettimeofday (&tv, 0);
349
350 return tv.tv_sec + tv.tv_usec * 1e-6;
351}
352
353ECB_INLINE void
354time_init (pTHX)
355{
356 nvtime = coro_nvtime;
357 u2time = coro_u2time;
358}
359
360#else
361
362ECB_INLINE void
363time_init (pTHX)
364{
365 SV **svp;
366
367 require_pv ("Time/HiRes.pm");
368
369 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
370
371 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
372 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught");
373
374 nvtime = INT2PTR (double (*)(), SvIV (*svp));
375
376 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
377 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
378}
379
380#endif
381
347/** lowlevel stuff **********************************************************/ 382/** lowlevel stuff **********************************************************/
348 383
349static SV * 384static SV * ecb_noinline
350coro_get_sv (pTHX_ const char *name, int create) 385coro_get_sv (pTHX_ const char *name, int create)
351{ 386{
352#if PERL_VERSION_ATLEAST (5,10,0) 387#if PERL_VERSION_ATLEAST (5,10,0)
353 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 388 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
354 get_sv (name, create); 389 get_sv (name, create);
355#endif 390#endif
356 return get_sv (name, create); 391 return get_sv (name, create);
357} 392}
358 393
359static AV * 394static AV * ecb_noinline
360coro_get_av (pTHX_ const char *name, int create) 395coro_get_av (pTHX_ const char *name, int create)
361{ 396{
362#if PERL_VERSION_ATLEAST (5,10,0) 397#if PERL_VERSION_ATLEAST (5,10,0)
363 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 398 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
364 get_av (name, create); 399 get_av (name, create);
365#endif 400#endif
366 return get_av (name, create); 401 return get_av (name, create);
367} 402}
368 403
369static HV * 404static HV * ecb_noinline
370coro_get_hv (pTHX_ const char *name, int create) 405coro_get_hv (pTHX_ const char *name, int create)
371{ 406{
372#if PERL_VERSION_ATLEAST (5,10,0) 407#if PERL_VERSION_ATLEAST (5,10,0)
373 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 408 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
374 get_hv (name, create); 409 get_hv (name, create);
375#endif 410#endif
376 return get_hv (name, create); 411 return get_hv (name, create);
377} 412}
378 413
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 414ECB_INLINE void
394coro_times_update () 415coro_times_update ()
395{ 416{
396#ifdef coro_clock_gettime 417#ifdef coro_clock_gettime
397 struct timespec ts; 418 struct timespec ts;
398 419
… …
405 time_real [0] = ts.tv_sec; time_real [1] = ts.tv_nsec; 426 time_real [0] = ts.tv_sec; time_real [1] = ts.tv_nsec;
406#else 427#else
407 dTHX; 428 dTHX;
408 UV tv[2]; 429 UV tv[2];
409 430
410 u2time (aTHX_ &tv); 431 u2time (aTHX_ tv);
411 time_real [0] = tv [0]; 432 time_real [0] = tv [0];
412 time_real [1] = tv [1] * 1000; 433 time_real [1] = tv [1] * 1000;
413#endif 434#endif
414} 435}
415 436
416INLINE void 437ECB_INLINE void
417coro_times_add (struct coro *c) 438coro_times_add (struct coro *c)
418{ 439{
419 c->t_real [1] += time_real [1]; 440 c->t_real [1] += time_real [1];
420 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; } 441 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
421 c->t_real [0] += time_real [0]; 442 c->t_real [0] += time_real [0];
… …
423 c->t_cpu [1] += time_cpu [1]; 444 c->t_cpu [1] += time_cpu [1];
424 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; } 445 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
425 c->t_cpu [0] += time_cpu [0]; 446 c->t_cpu [0] += time_cpu [0];
426} 447}
427 448
428INLINE void 449ECB_INLINE void
429coro_times_sub (struct coro *c) 450coro_times_sub (struct coro *c)
430{ 451{
431 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; } 452 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]; 453 c->t_real [1] -= time_real [1];
433 c->t_real [0] -= time_real [0]; 454 c->t_real [0] -= time_real [0];
… …
441/* magic glue */ 462/* magic glue */
442 463
443#define CORO_MAGIC_type_cv 26 464#define CORO_MAGIC_type_cv 26
444#define CORO_MAGIC_type_state PERL_MAGIC_ext 465#define CORO_MAGIC_type_state PERL_MAGIC_ext
445 466
446#define CORO_MAGIC_NN(sv, type) \ 467#define CORO_MAGIC_NN(sv, type) \
447 (expect_true (SvMAGIC (sv)->mg_type == type) \ 468 (ecb_expect_true (SvMAGIC (sv)->mg_type == type) \
448 ? SvMAGIC (sv) \ 469 ? SvMAGIC (sv) \
449 : mg_find (sv, type)) 470 : mg_find (sv, type))
450 471
451#define CORO_MAGIC(sv, type) \ 472#define CORO_MAGIC(sv, type) \
452 (expect_true (SvMAGIC (sv)) \ 473 (ecb_expect_true (SvMAGIC (sv)) \
453 ? CORO_MAGIC_NN (sv, type) \ 474 ? CORO_MAGIC_NN (sv, type) \
454 : 0) 475 : 0)
455 476
456#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv) 477#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) 478#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
458 479
480ECB_INLINE MAGIC *
481SvSTATEhv_p (pTHX_ SV *coro)
482{
483 MAGIC *mg;
484
485 if (ecb_expect_true (
486 SvTYPE (coro) == SVt_PVHV
487 && (mg = CORO_MAGIC_state (coro))
488 && mg->mg_virtual == &coro_state_vtbl
489 ))
490 return mg;
491
492 return 0;
493}
494
459INLINE struct coro * 495ECB_INLINE struct coro *
460SvSTATE_ (pTHX_ SV *coro) 496SvSTATE_ (pTHX_ SV *coro)
461{ 497{
462 HV *stash;
463 MAGIC *mg; 498 MAGIC *mg;
464 499
465 if (SvROK (coro)) 500 if (SvROK (coro))
466 coro = SvRV (coro); 501 coro = SvRV (coro);
467 502
468 if (expect_false (SvTYPE (coro) != SVt_PVHV)) 503 mg = SvSTATEhv_p (aTHX_ coro);
504 if (!mg)
469 croak ("Coro::State object required"); 505 croak ("Coro::State object required");
470 506
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; 507 return (struct coro *)mg->mg_ptr;
481} 508}
482 509
483#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 510#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
484 511
… …
487#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 514#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
488 515
489/*****************************************************************************/ 516/*****************************************************************************/
490/* padlist management and caching */ 517/* padlist management and caching */
491 518
492static AV * 519ECB_INLINE AV *
493coro_derive_padlist (pTHX_ CV *cv) 520coro_derive_padlist (pTHX_ CV *cv)
494{ 521{
495 AV *padlist = CvPADLIST (cv); 522 AV *padlist = CvPADLIST (cv);
496 AV *newpadlist, *newpad; 523 AV *newpadlist, *newpad;
497 524
… …
509 av_store (newpadlist, 1, (SV *)newpad); 536 av_store (newpadlist, 1, (SV *)newpad);
510 537
511 return newpadlist; 538 return newpadlist;
512} 539}
513 540
514static void 541ECB_INLINE void
515free_padlist (pTHX_ AV *padlist) 542free_padlist (pTHX_ AV *padlist)
516{ 543{
517 /* may be during global destruction */ 544 /* may be during global destruction */
518 if (!IN_DESTRUCT) 545 if (!IN_DESTRUCT)
519 { 546 {
… …
545 AV *padlist; 572 AV *padlist;
546 AV *av = (AV *)mg->mg_obj; 573 AV *av = (AV *)mg->mg_obj;
547 574
548 /* perl manages to free our internal AV and _then_ call us */ 575 /* perl manages to free our internal AV and _then_ call us */
549 if (IN_DESTRUCT) 576 if (IN_DESTRUCT)
550 return; 577 return 0;
551 578
552 /* casting is fun. */ 579 /* casting is fun. */
553 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 580 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
554 free_padlist (aTHX_ padlist); 581 free_padlist (aTHX_ padlist);
555 582
… …
562 0, 0, 0, 0, 589 0, 0, 0, 0,
563 coro_cv_free 590 coro_cv_free
564}; 591};
565 592
566/* the next two functions merely cache the padlists */ 593/* the next two functions merely cache the padlists */
567static void 594ECB_INLINE void
568get_padlist (pTHX_ CV *cv) 595get_padlist (pTHX_ CV *cv)
569{ 596{
570 MAGIC *mg = CORO_MAGIC_cv (cv); 597 MAGIC *mg = CORO_MAGIC_cv (cv);
571 AV *av; 598 AV *av;
572 599
573 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 600 if (ecb_expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0))
574 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 601 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
575 else 602 else
576 { 603 {
577#if CORO_PREFER_PERL_FUNCTIONS 604#if CORO_PREFER_PERL_FUNCTIONS
578 /* this is probably cleaner? but also slower! */ 605 /* this is probably cleaner? but also slower! */
… …
585 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 612 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
586#endif 613#endif
587 } 614 }
588} 615}
589 616
590static void 617ECB_INLINE void
591put_padlist (pTHX_ CV *cv) 618put_padlist (pTHX_ CV *cv)
592{ 619{
593 MAGIC *mg = CORO_MAGIC_cv (cv); 620 MAGIC *mg = CORO_MAGIC_cv (cv);
594 AV *av; 621 AV *av;
595 622
596 if (expect_false (!mg)) 623 if (ecb_expect_false (!mg))
597 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 624 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
598 625
599 av = (AV *)mg->mg_obj; 626 av = (AV *)mg->mg_obj;
600 627
601 if (expect_false (AvFILLp (av) >= AvMAX (av))) 628 if (ecb_expect_false (AvFILLp (av) >= AvMAX (av)))
602 av_extend (av, AvFILLp (av) + 1); 629 av_extend (av, AvFILLp (av) + 1);
603 630
604 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 631 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
605} 632}
606 633
607/** load & save, init *******************************************************/ 634/** load & save, init *******************************************************/
635
636/* swap sv heads, at least logically */
637static void
638swap_svs (pTHX_ Coro__State c)
639{
640 int i;
641
642 for (i = 0; i <= AvFILLp (c->swap_sv); )
643 {
644 SV *a = AvARRAY (c->swap_sv)[i++];
645 SV *b = AvARRAY (c->swap_sv)[i++];
646
647 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
648 SV tmp;
649
650 /* swap sv_any */
651 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
652
653 /* swap sv_flags */
654 SvFLAGS (&tmp) = SvFLAGS (a);
655 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
656 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
657
658#if PERL_VERSION_ATLEAST (5,10,0)
659 /* perl 5.10 complicates this _quite_ a bit, but it also is
660 * much faster, so no quarrels here. alternatively, we could
661 * sv_upgrade to avoid this.
662 */
663 {
664 /* swap sv_u */
665 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
666
667 /* if SvANY points to the head, we need to adjust the pointers,
668 * as the pointer for a still points to b, and maybe vice versa.
669 */
670 #define svany_in_head(type) \
671 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
672
673 if (svany_in_head (SvTYPE (a)))
674 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
675
676 if (svany_in_head (SvTYPE (b)))
677 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
678 }
679#endif
680 }
681}
682
683#define SWAP_SVS(coro) \
684 if (ecb_expect_false ((coro)->swap_sv)) \
685 swap_svs (aTHX_ (coro))
608 686
609static void 687static void
610on_enterleave_call (pTHX_ SV *cb); 688on_enterleave_call (pTHX_ SV *cb);
611 689
612static void 690static void
… …
615 perl_slots *slot = c->slot; 693 perl_slots *slot = c->slot;
616 c->slot = 0; 694 c->slot = 0;
617 695
618 PL_mainstack = c->mainstack; 696 PL_mainstack = c->mainstack;
619 697
620 GvSV (PL_defgv) = slot->defsv; 698#if CORO_JIT
621 GvAV (PL_defgv) = slot->defav; 699 load_perl_slots (slot);
622 GvSV (PL_errgv) = slot->errsv; 700#else
623 GvSV (irsgv) = slot->irsgv;
624 GvHV (PL_hintgv) = slot->hinthv;
625
626 #define VAR(name,type) PL_ ## name = slot->name; 701 #define VARx(name,expr,type) expr = slot->name;
627 # include "state.h" 702 # include "state.h"
628 #undef VAR 703 #undef VARx
704#endif
629 705
630 { 706 {
631 dSP; 707 dSP;
632 708
633 CV *cv; 709 CV *cv;
634 710
635 /* now do the ugly restore mess */ 711 /* now do the ugly restore mess */
636 while (expect_true (cv = (CV *)POPs)) 712 while (ecb_expect_true (cv = (CV *)POPs))
637 { 713 {
638 put_padlist (aTHX_ cv); /* mark this padlist as available */ 714 put_padlist (aTHX_ cv); /* mark this padlist as available */
639 CvDEPTH (cv) = PTR2IV (POPs); 715 CvDEPTH (cv) = PTR2IV (POPs);
640 CvPADLIST (cv) = (AV *)POPs; 716 CvPADLIST (cv) = (AV *)POPs;
641 } 717 }
… …
644 } 720 }
645 721
646 slf_frame = c->slf_frame; 722 slf_frame = c->slf_frame;
647 CORO_THROW = c->except; 723 CORO_THROW = c->except;
648 724
649 if (expect_false (enable_times)) 725 if (ecb_expect_false (enable_times))
650 { 726 {
651 if (expect_false (!times_valid)) 727 if (ecb_expect_false (!times_valid))
652 coro_times_update (); 728 coro_times_update ();
653 729
654 coro_times_sub (c); 730 coro_times_sub (c);
655 } 731 }
656 732
657 if (expect_false (c->on_enter)) 733 if (ecb_expect_false (c->on_enter))
658 { 734 {
659 int i; 735 int i;
660 736
661 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 737 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
662 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 738 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
663 } 739 }
740
741 SWAP_SVS (c);
664} 742}
665 743
666static void 744static void
667save_perl (pTHX_ Coro__State c) 745save_perl (pTHX_ Coro__State c)
668{ 746{
747 SWAP_SVS (c);
748
669 if (expect_false (c->on_leave)) 749 if (ecb_expect_false (c->on_leave))
670 { 750 {
671 int i; 751 int i;
672 752
673 for (i = AvFILLp (c->on_leave); i >= 0; --i) 753 for (i = AvFILLp (c->on_leave); i >= 0; --i)
674 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]); 754 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
675 } 755 }
676 756
677 times_valid = 0; 757 times_valid = 0;
678 758
679 if (expect_false (enable_times)) 759 if (ecb_expect_false (enable_times))
680 { 760 {
681 coro_times_update (); times_valid = 1; 761 coro_times_update (); times_valid = 1;
682 coro_times_add (c); 762 coro_times_add (c);
683 } 763 }
684 764
… …
698 778
699 XPUSHs (Nullsv); 779 XPUSHs (Nullsv);
700 /* this loop was inspired by pp_caller */ 780 /* this loop was inspired by pp_caller */
701 for (;;) 781 for (;;)
702 { 782 {
703 while (expect_true (cxix >= 0)) 783 while (ecb_expect_true (cxix >= 0))
704 { 784 {
705 PERL_CONTEXT *cx = &ccstk[cxix--]; 785 PERL_CONTEXT *cx = &ccstk[cxix--];
706 786
707 if (expect_true (CxTYPE (cx) == CXt_SUB) || expect_false (CxTYPE (cx) == CXt_FORMAT)) 787 if (ecb_expect_true (CxTYPE (cx) == CXt_SUB) || ecb_expect_false (CxTYPE (cx) == CXt_FORMAT))
708 { 788 {
709 CV *cv = cx->blk_sub.cv; 789 CV *cv = cx->blk_sub.cv;
710 790
711 if (expect_true (CvDEPTH (cv))) 791 if (ecb_expect_true (CvDEPTH (cv)))
712 { 792 {
713 EXTEND (SP, 3); 793 EXTEND (SP, 3);
714 PUSHs ((SV *)CvPADLIST (cv)); 794 PUSHs ((SV *)CvPADLIST (cv));
715 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv))); 795 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
716 PUSHs ((SV *)cv); 796 PUSHs ((SV *)cv);
… …
719 get_padlist (aTHX_ cv); 799 get_padlist (aTHX_ cv);
720 } 800 }
721 } 801 }
722 } 802 }
723 803
724 if (expect_true (top_si->si_type == PERLSI_MAIN)) 804 if (ecb_expect_true (top_si->si_type == PERLSI_MAIN))
725 break; 805 break;
726 806
727 top_si = top_si->si_prev; 807 top_si = top_si->si_prev;
728 ccstk = top_si->si_cxstack; 808 ccstk = top_si->si_cxstack;
729 cxix = top_si->si_cxix; 809 cxix = top_si->si_cxix;
… …
731 811
732 PUTBACK; 812 PUTBACK;
733 } 813 }
734 814
735 /* allocate some space on the context stack for our purposes */ 815 /* allocate some space on the context stack for our purposes */
736 /* we manually unroll here, as usually 2 slots is enough */ 816 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 { 817 {
741 int i; 818 unsigned int i;
819
742 for (i = 3; i < SLOT_COUNT; ++i) 820 for (i = 0; i < SLOT_COUNT; ++i)
743 CXINC; 821 CXINC;
744 } 822
745 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 823 cxstack_ix -= SLOT_COUNT; /* undo allocation */
824 }
746 825
747 c->mainstack = PL_mainstack; 826 c->mainstack = PL_mainstack;
748 827
749 { 828 {
750 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 829 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
751 830
752 slot->defav = GvAV (PL_defgv); 831#if CORO_JIT
753 slot->defsv = DEFSV; 832 save_perl_slots (slot);
754 slot->errsv = ERRSV; 833#else
755 slot->irsgv = GvSV (irsgv);
756 slot->hinthv = GvHV (PL_hintgv);
757
758 #define VAR(name,type) slot->name = PL_ ## name; 834 #define VARx(name,expr,type) slot->name = expr;
759 # include "state.h" 835 # include "state.h"
760 #undef VAR 836 #undef VARx
837#endif
761 } 838 }
762} 839}
763 840
764/* 841/*
765 * allocate various perl stacks. This is almost an exact copy 842 * allocate various perl stacks. This is almost an exact copy
… …
771# define coro_init_stacks(thx) init_stacks () 848# define coro_init_stacks(thx) init_stacks ()
772#else 849#else
773static void 850static void
774coro_init_stacks (pTHX) 851coro_init_stacks (pTHX)
775{ 852{
776 PL_curstackinfo = new_stackinfo(32, 8); 853 PL_curstackinfo = new_stackinfo(32, 4 + SLOT_COUNT); /* 3 is minimum due to perl rounding down in scope.c:GROW() */
777 PL_curstackinfo->si_type = PERLSI_MAIN; 854 PL_curstackinfo->si_type = PERLSI_MAIN;
778 PL_curstack = PL_curstackinfo->si_stack; 855 PL_curstack = PL_curstackinfo->si_stack;
779 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 856 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
780 857
781 PL_stack_base = AvARRAY(PL_curstack); 858 PL_stack_base = AvARRAY(PL_curstack);
… …
888#endif 965#endif
889 966
890/* 967/*
891 * This overrides the default magic get method of %SIG elements. 968 * 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 969 * 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 970 * and instead of trying to save and restore the hash elements (extremely slow),
894 * readback here. 971 * we just provide our own readback here.
895 */ 972 */
896static int 973static int ecb_cold
897coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 974coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
898{ 975{
899 const char *s = MgPV_nolen_const (mg); 976 const char *s = MgPV_nolen_const (mg);
900 977
901 if (*s == '_') 978 if (*s == '_')
… …
913 } 990 }
914 991
915 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 992 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
916} 993}
917 994
918static int 995static int ecb_cold
919coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 996coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
920{ 997{
921 const char *s = MgPV_nolen_const (mg); 998 const char *s = MgPV_nolen_const (mg);
922 999
923 if (*s == '_') 1000 if (*s == '_')
… …
937 } 1014 }
938 1015
939 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0; 1016 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
940} 1017}
941 1018
942static int 1019static int ecb_cold
943coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1020coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
944{ 1021{
945 const char *s = MgPV_nolen_const (mg); 1022 const char *s = MgPV_nolen_const (mg);
946 1023
947 if (*s == '_') 1024 if (*s == '_')
… …
980slf_check_repeat (pTHX_ struct CoroSLF *frame) 1057slf_check_repeat (pTHX_ struct CoroSLF *frame)
981{ 1058{
982 return 1; 1059 return 1;
983} 1060}
984 1061
985static UNOP coro_setup_op; 1062static UNOP init_perl_op;
986 1063
987static void NOINLINE /* noinline to keep it out of the transfer fast path */ 1064ecb_noinline static void /* noinline to keep it out of the transfer fast path */
988coro_setup (pTHX_ struct coro *coro) 1065init_perl (pTHX_ struct coro *coro)
989{ 1066{
990 /* 1067 /*
991 * emulate part of the perl startup here. 1068 * emulate part of the perl startup here.
992 */ 1069 */
993 coro_init_stacks (aTHX); 1070 coro_init_stacks (aTHX);
… …
1000 PL_comppad_name_fill = 0; 1077 PL_comppad_name_fill = 0;
1001 PL_comppad_name_floor = 0; 1078 PL_comppad_name_floor = 0;
1002 PL_curpm = 0; 1079 PL_curpm = 0;
1003 PL_curpad = 0; 1080 PL_curpad = 0;
1004 PL_localizing = 0; 1081 PL_localizing = 0;
1005 PL_dirty = 0;
1006 PL_restartop = 0; 1082 PL_restartop = 0;
1007#if PERL_VERSION_ATLEAST (5,10,0) 1083#if PERL_VERSION_ATLEAST (5,10,0)
1008 PL_parser = 0; 1084 PL_parser = 0;
1009#endif 1085#endif
1010 PL_hints = 0; 1086 PL_hints = 0;
1011 1087
1012 /* recreate the die/warn hooks */ 1088 /* recreate the die/warn hooks */
1013 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1089 PL_diehook = SvREFCNT_inc (rv_diehook);
1014 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1090 PL_warnhook = SvREFCNT_inc (rv_warnhook);
1015 1091
1016 GvSV (PL_defgv) = newSV (0); 1092 GvSV (PL_defgv) = newSV (0);
1017 GvAV (PL_defgv) = coro->args; coro->args = 0; 1093 GvAV (PL_defgv) = coro->args; coro->args = 0;
1018 GvSV (PL_errgv) = newSV (0); 1094 GvSV (PL_errgv) = newSV (0);
1019 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1095 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
… …
1040 /* this newly created coroutine might be run on an existing cctx which most 1116 /* this newly created coroutine might be run on an existing cctx which most
1041 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here. 1117 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
1042 */ 1118 */
1043 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1119 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
1044 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */ 1120 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
1121 slf_frame.destroy = 0;
1045 1122
1046 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1123 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */
1047 coro_setup_op.op_next = PL_op; 1124 init_perl_op.op_next = PL_op;
1048 coro_setup_op.op_type = OP_ENTERSUB; 1125 init_perl_op.op_type = OP_ENTERSUB;
1049 coro_setup_op.op_ppaddr = pp_slf; 1126 init_perl_op.op_ppaddr = pp_slf;
1050 /* no flags etc. required, as an init function won't be called */ 1127 /* no flags etc. required, as an init function won't be called */
1051 1128
1052 PL_op = (OP *)&coro_setup_op; 1129 PL_op = (OP *)&init_perl_op;
1053 1130
1054 /* copy throw, in case it was set before coro_setup */ 1131 /* copy throw, in case it was set before init_perl */
1055 CORO_THROW = coro->except; 1132 CORO_THROW = coro->except;
1056 1133
1134 SWAP_SVS (coro);
1135
1057 if (expect_false (enable_times)) 1136 if (ecb_expect_false (enable_times))
1058 { 1137 {
1059 coro_times_update (); 1138 coro_times_update ();
1060 coro_times_sub (coro); 1139 coro_times_sub (coro);
1061 } 1140 }
1062} 1141}
… …
1081 dounwind (-1); 1160 dounwind (-1);
1082 } 1161 }
1083} 1162}
1084 1163
1085static void 1164static void
1086coro_destruct_perl (pTHX_ struct coro *coro) 1165destroy_perl (pTHX_ struct coro *coro)
1087{ 1166{
1088 SV *svf [9]; 1167 SV *svf [9];
1089 1168
1090 { 1169 {
1170 SV *old_current = SvRV (coro_current);
1091 struct coro *current = SvSTATE_current; 1171 struct coro *current = SvSTATE (old_current);
1092 1172
1093 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack)); 1173 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1094 1174
1095 save_perl (aTHX_ current); 1175 save_perl (aTHX_ current);
1176
1177 /* this will cause transfer_check to croak on block*/
1178 SvRV_set (coro_current, (SV *)coro->hv);
1179
1096 load_perl (aTHX_ coro); 1180 load_perl (aTHX_ coro);
1097 1181
1098 coro_unwind_stacks (aTHX); 1182 coro_unwind_stacks (aTHX);
1183
1184 /* restore swapped sv's */
1185 SWAP_SVS (coro);
1186
1099 coro_destruct_stacks (aTHX); 1187 coro_destruct_stacks (aTHX);
1100 1188
1101 // now save some sv's to be free'd later 1189 // now save some sv's to be free'd later
1102 svf [0] = GvSV (PL_defgv); 1190 svf [0] = GvSV (PL_defgv);
1103 svf [1] = (SV *)GvAV (PL_defgv); 1191 svf [1] = (SV *)GvAV (PL_defgv);
… …
1108 svf [6] = (SV *)GvHV (PL_hintgv); 1196 svf [6] = (SV *)GvHV (PL_hintgv);
1109 svf [7] = PL_diehook; 1197 svf [7] = PL_diehook;
1110 svf [8] = PL_warnhook; 1198 svf [8] = PL_warnhook;
1111 assert (9 == sizeof (svf) / sizeof (*svf)); 1199 assert (9 == sizeof (svf) / sizeof (*svf));
1112 1200
1201 SvRV_set (coro_current, old_current);
1202
1113 load_perl (aTHX_ current); 1203 load_perl (aTHX_ current);
1114 } 1204 }
1115 1205
1116 { 1206 {
1117 int i; 1207 unsigned int i;
1118 1208
1119 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i) 1209 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i)
1120 SvREFCNT_dec (svf [i]); 1210 SvREFCNT_dec (svf [i]);
1121 1211
1122 SvREFCNT_dec (coro->saved_deffh); 1212 SvREFCNT_dec (coro->saved_deffh);
… …
1124 SvREFCNT_dec (coro->invoke_cb); 1214 SvREFCNT_dec (coro->invoke_cb);
1125 SvREFCNT_dec (coro->invoke_av); 1215 SvREFCNT_dec (coro->invoke_av);
1126 } 1216 }
1127} 1217}
1128 1218
1129INLINE void 1219ECB_INLINE void
1130free_coro_mortal (pTHX) 1220free_coro_mortal (pTHX)
1131{ 1221{
1132 if (expect_true (coro_mortal)) 1222 if (ecb_expect_true (coro_mortal))
1133 { 1223 {
1134 SvREFCNT_dec (coro_mortal); 1224 SvREFCNT_dec ((SV *)coro_mortal);
1135 coro_mortal = 0; 1225 coro_mortal = 0;
1136 } 1226 }
1137} 1227}
1138 1228
1139static int 1229static int
… …
1272 1362
1273 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1363 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1274} 1364}
1275 1365
1276/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1366/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1277static void NOINLINE 1367static void ecb_noinline
1278cctx_prepare (pTHX) 1368cctx_prepare (pTHX)
1279{ 1369{
1280 PL_top_env = &PL_start_env; 1370 PL_top_env = &PL_start_env;
1281 1371
1282 if (cctx_current->flags & CC_TRACE) 1372 if (cctx_current->flags & CC_TRACE)
… …
1293 slf_frame.prepare = slf_prepare_set_stacklevel; 1383 slf_frame.prepare = slf_prepare_set_stacklevel;
1294 slf_frame.check = slf_check_set_stacklevel; 1384 slf_frame.check = slf_check_set_stacklevel;
1295} 1385}
1296 1386
1297/* the tail of transfer: execute stuff we can only do after a transfer */ 1387/* the tail of transfer: execute stuff we can only do after a transfer */
1298INLINE void 1388ECB_INLINE void
1299transfer_tail (pTHX) 1389transfer_tail (pTHX)
1300{ 1390{
1301 free_coro_mortal (aTHX); 1391 free_coro_mortal (aTHX);
1302} 1392}
1303 1393
… …
1328 /* somebody or something will hit me for both perl_run and PL_restartop */ 1418 /* somebody or something will hit me for both perl_run and PL_restartop */
1329 PL_restartop = PL_op; 1419 PL_restartop = PL_op;
1330 perl_run (PL_curinterp); 1420 perl_run (PL_curinterp);
1331 /* 1421 /*
1332 * Unfortunately, there is no way to get at the return values of the 1422 * Unfortunately, there is no way to get at the return values of the
1333 * coro body here, as perl_run destroys these 1423 * coro body here, as perl_run destroys these. Likewise, we cannot catch
1424 * runtime errors here, as this is just a random interpreter, not a thread.
1334 */ 1425 */
1335 1426
1336 /* 1427 /*
1337 * If perl-run returns we assume exit() was being called or the coro 1428 * If perl-run returns we assume exit() was being called or the coro
1338 * fell off the end, which seems to be the only valid (non-bug) 1429 * fell off the end, which seems to be the only valid (non-bug)
… …
1425cctx_destroy (coro_cctx *cctx) 1516cctx_destroy (coro_cctx *cctx)
1426{ 1517{
1427 if (!cctx) 1518 if (!cctx)
1428 return; 1519 return;
1429 1520
1430 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary? 1521 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1431 1522
1432 --cctx_count; 1523 --cctx_count;
1433 coro_destroy (&cctx->cctx); 1524 coro_destroy (&cctx->cctx);
1434 1525
1435 /* coro_transfer creates new, empty cctx's */ 1526 /* coro_transfer creates new, empty cctx's */
… …
1454#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE)) 1545#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE))
1455 1546
1456static coro_cctx * 1547static coro_cctx *
1457cctx_get (pTHX) 1548cctx_get (pTHX)
1458{ 1549{
1459 while (expect_true (cctx_first)) 1550 while (ecb_expect_true (cctx_first))
1460 { 1551 {
1461 coro_cctx *cctx = cctx_first; 1552 coro_cctx *cctx = cctx_first;
1462 cctx_first = cctx->next; 1553 cctx_first = cctx->next;
1463 --cctx_idle; 1554 --cctx_idle;
1464 1555
1465 if (expect_true (!CCTX_EXPIRED (cctx))) 1556 if (ecb_expect_true (!CCTX_EXPIRED (cctx)))
1466 return cctx; 1557 return cctx;
1467 1558
1468 cctx_destroy (cctx); 1559 cctx_destroy (cctx);
1469 } 1560 }
1470 1561
… …
1475cctx_put (coro_cctx *cctx) 1566cctx_put (coro_cctx *cctx)
1476{ 1567{
1477 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1568 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr));
1478 1569
1479 /* free another cctx if overlimit */ 1570 /* free another cctx if overlimit */
1480 if (expect_false (cctx_idle >= cctx_max_idle)) 1571 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1481 { 1572 {
1482 coro_cctx *first = cctx_first; 1573 coro_cctx *first = cctx_first;
1483 cctx_first = first->next; 1574 cctx_first = first->next;
1484 --cctx_idle; 1575 --cctx_idle;
1485 1576
… …
1496static void 1587static void
1497transfer_check (pTHX_ struct coro *prev, struct coro *next) 1588transfer_check (pTHX_ struct coro *prev, struct coro *next)
1498{ 1589{
1499 /* TODO: throwing up here is considered harmful */ 1590 /* TODO: throwing up here is considered harmful */
1500 1591
1501 if (expect_true (prev != next)) 1592 if (ecb_expect_true (prev != next))
1502 { 1593 {
1503 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1594 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,"); 1595 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1505 1596
1506 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED))) 1597 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,"); 1598 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1508 1599
1509#if !PERL_VERSION_ATLEAST (5,10,0) 1600#if !PERL_VERSION_ATLEAST (5,10,0)
1510 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1601 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,"); 1602 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1512#endif 1603#endif
1513 } 1604 }
1514} 1605}
1515 1606
1516/* always use the TRANSFER macro */ 1607/* always use the TRANSFER macro */
1517static void NOINLINE /* noinline so we have a fixed stackframe */ 1608static void ecb_noinline /* noinline so we have a fixed stackframe */
1518transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1609transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1519{ 1610{
1520 dSTACKLEVEL; 1611 dSTACKLEVEL;
1521 1612
1522 /* sometimes transfer is only called to set idle_sp */ 1613 /* sometimes transfer is only called to set idle_sp */
1523 if (expect_false (!prev)) 1614 if (ecb_expect_false (!prev))
1524 { 1615 {
1525 cctx_current->idle_sp = STACKLEVEL; 1616 cctx_current->idle_sp = STACKLEVEL;
1526 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1617 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1527 } 1618 }
1528 else if (expect_true (prev != next)) 1619 else if (ecb_expect_true (prev != next))
1529 { 1620 {
1530 coro_cctx *cctx_prev; 1621 coro_cctx *cctx_prev;
1531 1622
1532 if (expect_false (prev->flags & CF_NEW)) 1623 if (ecb_expect_false (prev->flags & CF_NEW))
1533 { 1624 {
1534 /* create a new empty/source context */ 1625 /* create a new empty/source context */
1535 prev->flags &= ~CF_NEW; 1626 prev->flags &= ~CF_NEW;
1536 prev->flags |= CF_RUNNING; 1627 prev->flags |= CF_RUNNING;
1537 } 1628 }
… …
1540 next->flags |= CF_RUNNING; 1631 next->flags |= CF_RUNNING;
1541 1632
1542 /* first get rid of the old state */ 1633 /* first get rid of the old state */
1543 save_perl (aTHX_ prev); 1634 save_perl (aTHX_ prev);
1544 1635
1545 if (expect_false (next->flags & CF_NEW)) 1636 if (ecb_expect_false (next->flags & CF_NEW))
1546 { 1637 {
1547 /* need to start coroutine */ 1638 /* need to start coroutine */
1548 next->flags &= ~CF_NEW; 1639 next->flags &= ~CF_NEW;
1549 /* setup coroutine call */ 1640 /* setup coroutine call */
1550 coro_setup (aTHX_ next); 1641 init_perl (aTHX_ next);
1551 } 1642 }
1552 else 1643 else
1553 load_perl (aTHX_ next); 1644 load_perl (aTHX_ next);
1554 1645
1555 /* possibly untie and reuse the cctx */ 1646 /* possibly untie and reuse the cctx */
1556 if (expect_true ( 1647 if (ecb_expect_true (
1557 cctx_current->idle_sp == STACKLEVEL 1648 cctx_current->idle_sp == STACKLEVEL
1558 && !(cctx_current->flags & CC_TRACE) 1649 && !(cctx_current->flags & CC_TRACE)
1559 && !force_cctx 1650 && !force_cctx
1560 )) 1651 ))
1561 { 1652 {
1562 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1653 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */
1563 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te)); 1654 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1564 1655
1565 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */ 1656 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */
1566 /* without this the next cctx_get might destroy the running cctx while still in use */ 1657 /* without this the next cctx_get might destroy the running cctx while still in use */
1567 if (expect_false (CCTX_EXPIRED (cctx_current))) 1658 if (ecb_expect_false (CCTX_EXPIRED (cctx_current)))
1568 if (expect_true (!next->cctx)) 1659 if (ecb_expect_true (!next->cctx))
1569 next->cctx = cctx_get (aTHX); 1660 next->cctx = cctx_get (aTHX);
1570 1661
1571 cctx_put (cctx_current); 1662 cctx_put (cctx_current);
1572 } 1663 }
1573 else 1664 else
1574 prev->cctx = cctx_current; 1665 prev->cctx = cctx_current;
1575 1666
1576 ++next->usecount; 1667 ++next->usecount;
1577 1668
1578 cctx_prev = cctx_current; 1669 cctx_prev = cctx_current;
1579 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX); 1670 cctx_current = ecb_expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1580 1671
1581 next->cctx = 0; 1672 next->cctx = 0;
1582 1673
1583 if (expect_false (cctx_prev != cctx_current)) 1674 if (ecb_expect_false (cctx_prev != cctx_current))
1584 { 1675 {
1585 cctx_prev->top_env = PL_top_env; 1676 cctx_prev->top_env = PL_top_env;
1586 PL_top_env = cctx_current->top_env; 1677 PL_top_env = cctx_current->top_env;
1587 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx); 1678 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1588 } 1679 }
… …
1594#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx)) 1685#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1595#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1686#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1596 1687
1597/** high level stuff ********************************************************/ 1688/** high level stuff ********************************************************/
1598 1689
1690/* this function is actually Coro, not Coro::State, but we call it from here */
1691/* because it is convenient - but it hasn't been declared yet for that reason */
1599static int 1692static void
1693coro_call_on_destroy (pTHX_ struct coro *coro);
1694
1695static void
1600coro_state_destroy (pTHX_ struct coro *coro) 1696coro_state_destroy (pTHX_ struct coro *coro)
1601{ 1697{
1602 if (coro->flags & CF_DESTROYED) 1698 if (coro->flags & CF_ZOMBIE)
1603 return 0; 1699 return;
1604 1700
1605 if (coro->on_destroy && !PL_dirty)
1606 coro->on_destroy (aTHX_ coro); 1701 slf_destroy (aTHX_ coro);
1607 1702
1608 coro->flags |= CF_DESTROYED; 1703 coro->flags |= CF_ZOMBIE;
1609 1704
1610 if (coro->flags & CF_READY) 1705 if (coro->flags & CF_READY)
1611 { 1706 {
1612 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1707 /* reduce nready, as destroying a ready coro effectively unreadies it */
1613 /* alternative: look through all ready queues and remove the coro */ 1708 /* alternative: look through all ready queues and remove the coro */
1614 --coro_nready; 1709 --coro_nready;
1615 } 1710 }
1616 else 1711 else
1617 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1712 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1713
1714 if (coro->next) coro->next->prev = coro->prev;
1715 if (coro->prev) coro->prev->next = coro->next;
1716 if (coro == coro_first) coro_first = coro->next;
1618 1717
1619 if (coro->mainstack 1718 if (coro->mainstack
1620 && coro->mainstack != main_mainstack 1719 && coro->mainstack != main_mainstack
1621 && coro->slot 1720 && coro->slot
1622 && !PL_dirty) 1721 && !PL_dirty)
1623 coro_destruct_perl (aTHX_ coro); 1722 destroy_perl (aTHX_ coro);
1624 1723
1625 cctx_destroy (coro->cctx); 1724 cctx_destroy (coro->cctx);
1626 SvREFCNT_dec (coro->startcv); 1725 SvREFCNT_dec (coro->startcv);
1627 SvREFCNT_dec (coro->args); 1726 SvREFCNT_dec (coro->args);
1727 SvREFCNT_dec (coro->swap_sv);
1628 SvREFCNT_dec (CORO_THROW); 1728 SvREFCNT_dec (CORO_THROW);
1629 1729
1630 if (coro->next) coro->next->prev = coro->prev; 1730 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 1731
1634 return 1; 1732 /* more destruction mayhem in coro_state_free */
1635} 1733}
1636 1734
1637static int 1735static int
1638coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1736coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1639{ 1737{
1640 struct coro *coro = (struct coro *)mg->mg_ptr; 1738 struct coro *coro = (struct coro *)mg->mg_ptr;
1641 mg->mg_ptr = 0; 1739 mg->mg_ptr = 0;
1642 1740
1643 coro->hv = 0;
1644
1645 if (--coro->refcnt < 0)
1646 {
1647 coro_state_destroy (aTHX_ coro); 1741 coro_state_destroy (aTHX_ coro);
1742 SvREFCNT_dec (coro->on_destroy);
1743 SvREFCNT_dec (coro->status);
1744
1648 Safefree (coro); 1745 Safefree (coro);
1649 }
1650 1746
1651 return 0; 1747 return 0;
1652} 1748}
1653 1749
1654static int 1750static int ecb_cold
1655coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1751coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1656{ 1752{
1657 struct coro *coro = (struct coro *)mg->mg_ptr; 1753 /* called when perl clones the current process the slow way (windows process emulation) */
1658 1754 /* WE SIMply nuke the pointers in the copy, causing perl to croak */
1659 ++coro->refcnt; 1755 mg->mg_ptr = 0;
1756 mg->mg_virtual = 0;
1660 1757
1661 return 0; 1758 return 0;
1662} 1759}
1663 1760
1664static MGVTBL coro_state_vtbl = { 1761static MGVTBL coro_state_vtbl = {
… …
1687 1784
1688 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1785 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1689 TRANSFER (ta, 1); 1786 TRANSFER (ta, 1);
1690} 1787}
1691 1788
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 ********************************************************************/ 1789/** Coro ********************************************************************/
1716 1790
1717INLINE void 1791ECB_INLINE void
1718coro_enq (pTHX_ struct coro *coro) 1792coro_enq (pTHX_ struct coro *coro)
1719{ 1793{
1720 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN]; 1794 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1721 1795
1722 SvREFCNT_inc_NN (coro->hv); 1796 SvREFCNT_inc_NN (coro->hv);
… …
1724 coro->next_ready = 0; 1798 coro->next_ready = 0;
1725 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro; 1799 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1726 ready [1] = coro; 1800 ready [1] = coro;
1727} 1801}
1728 1802
1729INLINE struct coro * 1803ECB_INLINE struct coro *
1730coro_deq (pTHX) 1804coro_deq (pTHX)
1731{ 1805{
1732 int prio; 1806 int prio;
1733 1807
1734 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; ) 1808 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
… …
1744 } 1818 }
1745 1819
1746 return 0; 1820 return 0;
1747} 1821}
1748 1822
1823static void
1824invoke_sv_ready_hook_helper (void)
1825{
1826 dTHX;
1827 dSP;
1828
1829 ENTER;
1830 SAVETMPS;
1831
1832 PUSHMARK (SP);
1833 PUTBACK;
1834 call_sv (coro_readyhook, G_VOID | G_DISCARD);
1835
1836 FREETMPS;
1837 LEAVE;
1838}
1839
1749static int 1840static int
1750api_ready (pTHX_ SV *coro_sv) 1841api_ready (pTHX_ SV *coro_sv)
1751{ 1842{
1752 struct coro *coro;
1753 SV *sv_hook;
1754 void (*xs_hook)(void);
1755
1756 coro = SvSTATE (coro_sv); 1843 struct coro *coro = SvSTATE (coro_sv);
1757 1844
1758 if (coro->flags & CF_READY) 1845 if (coro->flags & CF_READY)
1759 return 0; 1846 return 0;
1760 1847
1761 coro->flags |= CF_READY; 1848 coro->flags |= CF_READY;
1762 1849
1763 sv_hook = coro_nready ? 0 : coro_readyhook;
1764 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1765
1766 coro_enq (aTHX_ coro); 1850 coro_enq (aTHX_ coro);
1767 ++coro_nready;
1768 1851
1769 if (sv_hook) 1852 if (!coro_nready++)
1770 { 1853 if (coroapi.readyhook)
1771 dSP; 1854 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 1855
1787 return 1; 1856 return 1;
1788} 1857}
1789 1858
1790static int 1859static int
… …
1792{ 1861{
1793 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1862 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1794} 1863}
1795 1864
1796/* expects to own a reference to next->hv */ 1865/* expects to own a reference to next->hv */
1797INLINE void 1866ECB_INLINE void
1798prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1867prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1799{ 1868{
1800 SV *prev_sv = SvRV (coro_current); 1869 SV *prev_sv = SvRV (coro_current);
1801 1870
1802 ta->prev = SvSTATE_hv (prev_sv); 1871 ta->prev = SvSTATE_hv (prev_sv);
… …
1815{ 1884{
1816 for (;;) 1885 for (;;)
1817 { 1886 {
1818 struct coro *next = coro_deq (aTHX); 1887 struct coro *next = coro_deq (aTHX);
1819 1888
1820 if (expect_true (next)) 1889 if (ecb_expect_true (next))
1821 { 1890 {
1822 /* cannot transfer to destroyed coros, skip and look for next */ 1891 /* cannot transfer to destroyed coros, skip and look for next */
1823 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED))) 1892 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 */ 1893 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1825 else 1894 else
1826 { 1895 {
1827 next->flags &= ~CF_READY; 1896 next->flags &= ~CF_READY;
1828 --coro_nready; 1897 --coro_nready;
… …
1835 { 1904 {
1836 /* nothing to schedule: call the idle handler */ 1905 /* nothing to schedule: call the idle handler */
1837 if (SvROK (sv_idle) 1906 if (SvROK (sv_idle)
1838 && SvOBJECT (SvRV (sv_idle))) 1907 && SvOBJECT (SvRV (sv_idle)))
1839 { 1908 {
1909 if (SvRV (sv_idle) == SvRV (coro_current))
1910 croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught");
1911
1840 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 1912 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1841 api_ready (aTHX_ SvRV (sv_idle)); 1913 api_ready (aTHX_ SvRV (sv_idle));
1842 --coro_nready; 1914 --coro_nready;
1843 } 1915 }
1844 else 1916 else
1845 { 1917 {
1918 /* TODO: deprecated, remove, cannot work reliably *//*D*/
1846 dSP; 1919 dSP;
1847 1920
1848 ENTER; 1921 ENTER;
1849 SAVETMPS; 1922 SAVETMPS;
1850 1923
… …
1857 } 1930 }
1858 } 1931 }
1859 } 1932 }
1860} 1933}
1861 1934
1862INLINE void 1935ECB_INLINE void
1863prepare_cede (pTHX_ struct coro_transfer_args *ta) 1936prepare_cede (pTHX_ struct coro_transfer_args *ta)
1864{ 1937{
1865 api_ready (aTHX_ coro_current); 1938 api_ready (aTHX_ coro_current);
1866 prepare_schedule (aTHX_ ta); 1939 prepare_schedule (aTHX_ ta);
1867} 1940}
1868 1941
1869INLINE void 1942ECB_INLINE void
1870prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 1943prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1871{ 1944{
1872 SV *prev = SvRV (coro_current); 1945 SV *prev = SvRV (coro_current);
1873 1946
1874 if (coro_nready) 1947 if (coro_nready)
… …
1904{ 1977{
1905 struct coro_transfer_args ta; 1978 struct coro_transfer_args ta;
1906 1979
1907 prepare_cede (aTHX_ &ta); 1980 prepare_cede (aTHX_ &ta);
1908 1981
1909 if (expect_true (ta.prev != ta.next)) 1982 if (ecb_expect_true (ta.prev != ta.next))
1910 { 1983 {
1911 TRANSFER (ta, 1); 1984 TRANSFER (ta, 1);
1912 return 1; 1985 return 1;
1913 } 1986 }
1914 else 1987 else
… …
1957 coro->slot->runops = RUNOPS_DEFAULT; 2030 coro->slot->runops = RUNOPS_DEFAULT;
1958 } 2031 }
1959} 2032}
1960 2033
1961static void 2034static void
2035coro_push_av (pTHX_ AV *av, I32 gimme_v)
2036{
2037 if (AvFILLp (av) >= 0 && gimme_v != G_VOID)
2038 {
2039 dSP;
2040
2041 if (gimme_v == G_SCALAR)
2042 XPUSHs (AvARRAY (av)[AvFILLp (av)]);
2043 else
2044 {
2045 int i;
2046 EXTEND (SP, AvFILLp (av) + 1);
2047
2048 for (i = 0; i <= AvFILLp (av); ++i)
2049 PUSHs (AvARRAY (av)[i]);
2050 }
2051
2052 PUTBACK;
2053 }
2054}
2055
2056static void
2057coro_push_on_destroy (pTHX_ struct coro *coro, SV *cb)
2058{
2059 if (!coro->on_destroy)
2060 coro->on_destroy = newAV ();
2061
2062 av_push (coro->on_destroy, cb);
2063}
2064
2065static void
2066slf_destroy_join (pTHX_ struct CoroSLF *frame)
2067{
2068 SvREFCNT_dec ((SV *)((struct coro *)frame->data)->hv);
2069}
2070
2071static int
2072slf_check_join (pTHX_ struct CoroSLF *frame)
2073{
2074 struct coro *coro = (struct coro *)frame->data;
2075
2076 if (!coro->status)
2077 return 1;
2078
2079 frame->destroy = 0;
2080
2081 coro_push_av (aTHX_ coro->status, GIMME_V);
2082
2083 SvREFCNT_dec ((SV *)coro->hv);
2084
2085 return 0;
2086}
2087
2088static void
2089slf_init_join (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2090{
2091 struct coro *coro = SvSTATE (items > 0 ? arg [0] : &PL_sv_undef);
2092
2093 if (items > 1)
2094 croak ("join called with too many arguments");
2095
2096 if (coro->status)
2097 frame->prepare = prepare_nop;
2098 else
2099 {
2100 coro_push_on_destroy (aTHX_ coro, SvREFCNT_inc_NN (SvRV (coro_current)));
2101 frame->prepare = prepare_schedule;
2102 }
2103
2104 frame->check = slf_check_join;
2105 frame->destroy = slf_destroy_join;
2106 frame->data = (void *)coro;
2107 SvREFCNT_inc (coro->hv);
2108}
2109
2110static void
1962coro_call_on_destroy (pTHX_ struct coro *coro) 2111coro_call_on_destroy (pTHX_ struct coro *coro)
1963{ 2112{
1964 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2113 AV *od = coro->on_destroy;
1965 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1966 2114
1967 if (on_destroyp) 2115 if (!od)
1968 { 2116 return;
1969 AV *on_destroy = (AV *)SvRV (*on_destroyp);
1970 2117
1971 while (AvFILLp (on_destroy) >= 0) 2118 while (AvFILLp (od) >= 0)
2119 {
2120 SV *cb = sv_2mortal (av_pop (od));
2121
2122 /* coro hv's (and only hv's at the moment) are supported as well */
2123 if (SvSTATEhv_p (aTHX_ cb))
2124 api_ready (aTHX_ cb);
2125 else
1972 { 2126 {
1973 dSP; /* don't disturb outer sp */ 2127 dSP; /* don't disturb outer sp */
1974 SV *cb = av_pop (on_destroy);
1975
1976 PUSHMARK (SP); 2128 PUSHMARK (SP);
1977 2129
1978 if (statusp) 2130 if (coro->status)
1979 { 2131 {
1980 int i; 2132 PUTBACK;
1981 AV *status = (AV *)SvRV (*statusp); 2133 coro_push_av (aTHX_ coro->status, G_ARRAY);
1982 EXTEND (SP, AvFILLp (status) + 1); 2134 SPAGAIN;
1983
1984 for (i = 0; i <= AvFILLp (status); ++i)
1985 PUSHs (AvARRAY (status)[i]);
1986 } 2135 }
1987 2136
1988 PUTBACK; 2137 PUTBACK;
1989 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD); 2138 call_sv (cb, G_VOID | G_DISCARD);
1990 } 2139 }
1991 } 2140 }
1992} 2141}
1993 2142
1994static void 2143static void
1995slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2144coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
1996{ 2145{
2146 AV *av;
2147
2148 if (coro->status)
2149 {
2150 av = coro->status;
2151 av_clear (av);
2152 }
2153 else
2154 av = coro->status = newAV ();
2155
2156 /* items are actually not so common, so optimise for this case */
2157 if (items)
2158 {
1997 int i; 2159 int i;
1998 HV *hv = (HV *)SvRV (coro_current);
1999 AV *av = newAV ();
2000 2160
2001 av_extend (av, items - 1); 2161 av_extend (av, items - 1);
2162
2002 for (i = 0; i < items; ++i) 2163 for (i = 0; i < items; ++i)
2003 av_push (av, SvREFCNT_inc_NN (arg [i])); 2164 av_push (av, SvREFCNT_inc_NN (arg [i]));
2165 }
2166}
2004 2167
2005 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 2168static void
2006 2169slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2170{
2007 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */ 2171 av_push (av_destroy, (SV *)newRV_inc ((SV *)coro_hv)); /* RVinc for perl */
2008 api_ready (aTHX_ sv_manager); 2172 api_ready (aTHX_ sv_manager);
2009 2173
2010 frame->prepare = prepare_schedule; 2174 frame->prepare = prepare_schedule;
2011 frame->check = slf_check_repeat; 2175 frame->check = slf_check_repeat;
2012 2176
2013 /* as a minor optimisation, we could unwind all stacks here */ 2177 /* as a minor optimisation, we could unwind all stacks here */
2014 /* but that puts extra pressure on pp_slf, and is not worth much */ 2178 /* but that puts extra pressure on pp_slf, and is not worth much */
2015 /*coro_unwind_stacks (aTHX);*/ 2179 /*coro_unwind_stacks (aTHX);*/
2180}
2181
2182static void
2183slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2184{
2185 HV *coro_hv = (HV *)SvRV (coro_current);
2186
2187 coro_set_status (aTHX_ SvSTATE ((SV *)coro_hv), arg, items);
2188 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2189}
2190
2191static void
2192slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2193{
2194 HV *coro_hv;
2195 struct coro *coro;
2196
2197 if (items <= 0)
2198 croak ("Coro::cancel called without coro object,");
2199
2200 coro = SvSTATE (arg [0]);
2201 coro_hv = coro->hv;
2202
2203 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2204
2205 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2206 {
2207 /* coro currently busy cancelling something, so just notify it */
2208 coro->slf_frame.data = (void *)coro;
2209
2210 frame->prepare = prepare_nop;
2211 frame->check = slf_check_nop;
2212 }
2213 else if (coro_hv == (HV *)SvRV (coro_current))
2214 {
2215 /* cancelling the current coro is allowed, and equals terminate */
2216 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2217 }
2218 else
2219 {
2220 struct coro *self = SvSTATE_current;
2221
2222 /* otherwise we cancel directly, purely for speed reasons
2223 * unfortunately, this requires some magic trickery, as
2224 * somebody else could cancel us, so we have to fight the cancellation.
2225 * this is ugly, and hopefully fully worth the extra speed.
2226 * besides, I can't get the slow-but-safe version working...
2227 */
2228 slf_frame.data = 0;
2229 self->flags |= CF_NOCANCEL;
2230 coro_state_destroy (aTHX_ coro);
2231 self->flags &= ~CF_NOCANCEL;
2232
2233 if (slf_frame.data)
2234 {
2235 /* while we were busy we have been cancelled, so terminate */
2236 slf_init_terminate_cancel_common (aTHX_ frame, self->hv);
2237 }
2238 else
2239 {
2240 frame->prepare = prepare_nop;
2241 frame->check = slf_check_nop;
2242 }
2243 }
2244}
2245
2246static int
2247slf_check_safe_cancel (pTHX_ struct CoroSLF *frame)
2248{
2249 frame->prepare = 0;
2250 coro_unwind_stacks (aTHX);
2251
2252 slf_init_terminate_cancel_common (aTHX_ frame, (HV *)SvRV (coro_current));
2253
2254 return 1;
2255}
2256
2257static int
2258safe_cancel (pTHX_ struct coro *coro, SV **arg, int items)
2259{
2260 if (coro->cctx)
2261 croak ("coro inside C callback, unable to cancel at this time, caught");
2262
2263 if (coro->flags & CF_NEW)
2264 {
2265 coro_set_status (aTHX_ coro, arg, items);
2266 coro_state_destroy (aTHX_ coro);
2267 }
2268 else
2269 {
2270 if (!coro->slf_frame.prepare)
2271 croak ("coro outside an SLF function, unable to cancel at this time, caught");
2272
2273 slf_destroy (aTHX_ coro);
2274
2275 coro_set_status (aTHX_ coro, arg, items);
2276 coro->slf_frame.prepare = prepare_nop;
2277 coro->slf_frame.check = slf_check_safe_cancel;
2278
2279 api_ready (aTHX_ (SV *)coro->hv);
2280 }
2281
2282 return 1;
2016} 2283}
2017 2284
2018/*****************************************************************************/ 2285/*****************************************************************************/
2019/* async pool handler */ 2286/* async pool handler */
2020 2287
… …
2051slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2318slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2052{ 2319{
2053 HV *hv = (HV *)SvRV (coro_current); 2320 HV *hv = (HV *)SvRV (coro_current);
2054 struct coro *coro = SvSTATE_hv ((SV *)hv); 2321 struct coro *coro = SvSTATE_hv ((SV *)hv);
2055 2322
2056 if (expect_true (coro->saved_deffh)) 2323 if (ecb_expect_true (coro->saved_deffh))
2057 { 2324 {
2058 /* subsequent iteration */ 2325 /* subsequent iteration */
2059 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2326 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
2060 coro->saved_deffh = 0; 2327 coro->saved_deffh = 0;
2061 2328
2062 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 2329 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
2063 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2330 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
2064 { 2331 {
2065 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate); 2332 slf_init_terminate_cancel_common (aTHX_ frame, hv);
2066 coro->invoke_av = newAV (); 2333 return;
2067
2068 frame->prepare = prepare_nop;
2069 } 2334 }
2070 else 2335 else
2071 { 2336 {
2072 av_clear (GvAV (PL_defgv)); 2337 av_clear (GvAV (PL_defgv));
2073 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2338 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
… …
2098 2363
2099static void 2364static void
2100coro_rouse_callback (pTHX_ CV *cv) 2365coro_rouse_callback (pTHX_ CV *cv)
2101{ 2366{
2102 dXSARGS; 2367 dXSARGS;
2103 SV *data = (SV *)GENSUB_ARG; 2368 SV *data = (SV *)S_GENSUB_ARG;
2104 2369
2105 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2370 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2106 { 2371 {
2107 /* first call, set args */ 2372 /* first call, set args */
2108 SV *coro = SvRV (data); 2373 SV *coro = SvRV (data);
… …
2174 || SvTYPE (SvRV (cb)) != SVt_PVCV 2439 || SvTYPE (SvRV (cb)) != SVt_PVCV
2175 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2440 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2176 croak ("Coro::rouse_wait called with illegal callback argument,"); 2441 croak ("Coro::rouse_wait called with illegal callback argument,");
2177 2442
2178 { 2443 {
2179 CV *cv = (CV *)SvRV (cb); /* for GENSUB_ARG */ 2444 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
2180 SV *data = (SV *)GENSUB_ARG; 2445 SV *data = (SV *)S_GENSUB_ARG;
2181 2446
2182 frame->data = (void *)data; 2447 frame->data = (void *)data;
2183 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule; 2448 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
2184 frame->check = slf_check_rouse_wait; 2449 frame->check = slf_check_rouse_wait;
2185 } 2450 }
… …
2189coro_new_rouse_cb (pTHX) 2454coro_new_rouse_cb (pTHX)
2190{ 2455{
2191 HV *hv = (HV *)SvRV (coro_current); 2456 HV *hv = (HV *)SvRV (coro_current);
2192 struct coro *coro = SvSTATE_hv (hv); 2457 struct coro *coro = SvSTATE_hv (hv);
2193 SV *data = newRV_inc ((SV *)hv); 2458 SV *data = newRV_inc ((SV *)hv);
2194 SV *cb = gensub (aTHX_ coro_rouse_callback, (void *)data); 2459 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
2195 2460
2196 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0); 2461 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0);
2197 SvREFCNT_dec (data); /* magicext increases the refcount */ 2462 SvREFCNT_dec (data); /* magicext increases the refcount */
2198 2463
2199 SvREFCNT_dec (coro->rouse_cb); 2464 SvREFCNT_dec (coro->rouse_cb);
… …
2296static void 2561static void
2297slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2562slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2298{ 2563{
2299 frame->prepare = prepare_cede_notself; 2564 frame->prepare = prepare_cede_notself;
2300 frame->check = slf_check_nop; 2565 frame->check = slf_check_nop;
2566}
2567
2568/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2569static void
2570slf_destroy (pTHX_ struct coro *coro)
2571{
2572 /* this callback is reserved for slf functions needing to do cleanup */
2573 if (coro->slf_frame.destroy && coro->slf_frame.prepare && !PL_dirty)
2574 coro->slf_frame.destroy (aTHX_ &coro->slf_frame);
2575
2576 /*
2577 * The on_destroy above most likely is from an SLF call.
2578 * Since by definition the SLF call will not finish when we destroy
2579 * the coro, we will have to force-finish it here, otherwise
2580 * cleanup functions cannot call SLF functions.
2581 */
2582 coro->slf_frame.prepare = 0;
2301} 2583}
2302 2584
2303/* 2585/*
2304 * these not obviously related functions are all rolled into one 2586 * these not obviously related functions are all rolled into one
2305 * function to increase chances that they all will call transfer with the same 2587 * function to increase chances that they all will call transfer with the same
… …
2312 I32 checkmark; /* mark SP to see how many elements check has pushed */ 2594 I32 checkmark; /* mark SP to see how many elements check has pushed */
2313 2595
2314 /* set up the slf frame, unless it has already been set-up */ 2596 /* set up the slf frame, unless it has already been set-up */
2315 /* the latter happens when a new coro has been started */ 2597 /* the latter happens when a new coro has been started */
2316 /* or when a new cctx was attached to an existing coroutine */ 2598 /* or when a new cctx was attached to an existing coroutine */
2317 if (expect_true (!slf_frame.prepare)) 2599 if (ecb_expect_true (!slf_frame.prepare))
2318 { 2600 {
2319 /* first iteration */ 2601 /* first iteration */
2320 dSP; 2602 dSP;
2321 SV **arg = PL_stack_base + TOPMARK + 1; 2603 SV **arg = PL_stack_base + TOPMARK + 1;
2322 int items = SP - arg; /* args without function object */ 2604 int items = SP - arg; /* args without function object */
… …
2363 while (slf_frame.check (aTHX_ &slf_frame)); 2645 while (slf_frame.check (aTHX_ &slf_frame));
2364 2646
2365 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */ 2647 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */
2366 2648
2367 /* exception handling */ 2649 /* exception handling */
2368 if (expect_false (CORO_THROW)) 2650 if (ecb_expect_false (CORO_THROW))
2369 { 2651 {
2370 SV *exception = sv_2mortal (CORO_THROW); 2652 SV *exception = sv_2mortal (CORO_THROW);
2371 2653
2372 CORO_THROW = 0; 2654 CORO_THROW = 0;
2373 sv_setsv (ERRSV, exception); 2655 sv_setsv (ERRSV, exception);
2374 croak (0); 2656 croak (0);
2375 } 2657 }
2376 2658
2377 /* return value handling - mostly like entersub */ 2659 /* return value handling - mostly like entersub */
2378 /* make sure we put something on the stack in scalar context */ 2660 /* make sure we put something on the stack in scalar context */
2379 if (GIMME_V == G_SCALAR) 2661 if (GIMME_V == G_SCALAR
2662 && ecb_expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2380 { 2663 {
2381 dSP; 2664 dSP;
2382 SV **bot = PL_stack_base + checkmark; 2665 SV **bot = PL_stack_base + checkmark;
2383 2666
2384 if (sp == bot) /* too few, push undef */ 2667 if (sp == bot) /* too few, push undef */
2385 bot [1] = &PL_sv_undef; 2668 bot [1] = &PL_sv_undef;
2386 else if (sp != bot + 1) /* too many, take last one */ 2669 else /* too many, take last one */
2387 bot [1] = *sp; 2670 bot [1] = *sp;
2388 2671
2389 SP = bot + 1; 2672 SP = bot + 1;
2390 2673
2391 PUTBACK; 2674 PUTBACK;
… …
2424 if (PL_op->op_flags & OPf_STACKED) 2707 if (PL_op->op_flags & OPf_STACKED)
2425 { 2708 {
2426 if (items > slf_arga) 2709 if (items > slf_arga)
2427 { 2710 {
2428 slf_arga = items; 2711 slf_arga = items;
2429 free (slf_argv); 2712 Safefree (slf_argv);
2430 slf_argv = malloc (slf_arga * sizeof (SV *)); 2713 New (0, slf_argv, slf_arga, SV *);
2431 } 2714 }
2432 2715
2433 slf_argc = items; 2716 slf_argc = items;
2434 2717
2435 for (i = 0; i < items; ++i) 2718 for (i = 0; i < items; ++i)
… …
2498{ 2781{
2499 PerlIOBuf base; 2782 PerlIOBuf base;
2500 NV next, every; 2783 NV next, every;
2501} PerlIOCede; 2784} PerlIOCede;
2502 2785
2503static IV 2786static IV ecb_cold
2504PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab) 2787PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab)
2505{ 2788{
2506 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2789 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2507 2790
2508 self->every = SvCUR (arg) ? SvNV (arg) : 0.01; 2791 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
2509 self->next = nvtime () + self->every; 2792 self->next = nvtime () + self->every;
2510 2793
2511 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab); 2794 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
2512} 2795}
2513 2796
2514static SV * 2797static SV * ecb_cold
2515PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags) 2798PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
2516{ 2799{
2517 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2800 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2518 2801
2519 return newSVnv (self->every); 2802 return newSVnv (self->every);
… …
2631 SvREFCNT_dec (cb); 2914 SvREFCNT_dec (cb);
2632 } 2915 }
2633} 2916}
2634 2917
2635static void 2918static void
2636coro_semaphore_on_destroy (pTHX_ struct coro *coro) 2919coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2637{ 2920{
2638 /* call $sem->adjust (0) to possibly wake up some other waiters */ 2921 /* call $sem->adjust (0) to possibly wake up some other waiters */
2639 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 2922 coro_semaphore_adjust (aTHX_ (AV *)frame->data, 0);
2640} 2923}
2641 2924
2642static int 2925static int
2643slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire) 2926slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2644{ 2927{
2645 AV *av = (AV *)frame->data; 2928 AV *av = (AV *)frame->data;
2646 SV *count_sv = AvARRAY (av)[0]; 2929 SV *count_sv = AvARRAY (av)[0];
2930 SV *coro_hv = SvRV (coro_current);
2647 2931
2648 /* if we are about to throw, don't actually acquire the lock, just throw */ 2932 /* if we are about to throw, don't actually acquire the lock, just throw */
2649 if (CORO_THROW) 2933 if (CORO_THROW)
2650 return 0; 2934 return 0;
2651 else if (SvIVX (count_sv) > 0) 2935 else if (SvIVX (count_sv) > 0)
2652 { 2936 {
2653 SvSTATE_current->on_destroy = 0; 2937 frame->destroy = 0;
2654 2938
2655 if (acquire) 2939 if (acquire)
2656 SvIVX (count_sv) = SvIVX (count_sv) - 1; 2940 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2657 else 2941 else
2658 coro_semaphore_adjust (aTHX_ av, 0); 2942 coro_semaphore_adjust (aTHX_ av, 0);
… …
2663 { 2947 {
2664 int i; 2948 int i;
2665 /* if we were woken up but can't down, we look through the whole */ 2949 /* if we were woken up but can't down, we look through the whole */
2666 /* waiters list and only add us if we aren't in there already */ 2950 /* waiters list and only add us if we aren't in there already */
2667 /* this avoids some degenerate memory usage cases */ 2951 /* this avoids some degenerate memory usage cases */
2668 2952 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)) 2953 if (AvARRAY (av)[i] == coro_hv)
2671 return 1; 2954 return 1;
2672 2955
2673 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2956 av_push (av, SvREFCNT_inc (coro_hv));
2674 return 1; 2957 return 1;
2675 } 2958 }
2676} 2959}
2677 2960
2678static int 2961static int
… …
2701 { 2984 {
2702 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2985 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2703 2986
2704 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 2987 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2705 frame->prepare = prepare_schedule; 2988 frame->prepare = prepare_schedule;
2706
2707 /* to avoid race conditions when a woken-up coro gets terminated */ 2989 /* to avoid race conditions when a woken-up coro gets terminated */
2708 /* we arrange for a temporary on_destroy that calls adjust (0) */ 2990 /* we arrange for a temporary on_destroy that calls adjust (0) */
2709 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 2991 frame->destroy = coro_semaphore_destroy;
2710 } 2992 }
2711} 2993}
2712 2994
2713static void 2995static void
2714slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2996slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
… …
2722{ 3004{
2723 if (items >= 2) 3005 if (items >= 2)
2724 { 3006 {
2725 /* callback form */ 3007 /* callback form */
2726 AV *av = (AV *)SvRV (arg [0]); 3008 AV *av = (AV *)SvRV (arg [0]);
2727 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 3009 SV *cb_cv = s_get_cv_croak (arg [1]);
2728 3010
2729 av_push (av, SvREFCNT_inc_NN (cb_cv)); 3011 av_push (av, SvREFCNT_inc_NN (cb_cv));
2730 3012
2731 if (SvIVX (AvARRAY (av)[0]) > 0) 3013 if (SvIVX (AvARRAY (av)[0]) > 0)
2732 coro_semaphore_adjust (aTHX_ av, 0); 3014 coro_semaphore_adjust (aTHX_ av, 0);
… …
2792{ 3074{
2793 AV *av = (AV *)SvRV (arg [0]); 3075 AV *av = (AV *)SvRV (arg [0]);
2794 3076
2795 if (items >= 2) 3077 if (items >= 2)
2796 { 3078 {
2797 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 3079 SV *cb_cv = s_get_cv_croak (arg [1]);
2798 av_push (av, SvREFCNT_inc_NN (cb_cv)); 3080 av_push (av, SvREFCNT_inc_NN (cb_cv));
2799 3081
2800 if (SvIVX (AvARRAY (av)[0])) 3082 if (SvIVX (AvARRAY (av)[0]))
2801 coro_signal_wake (aTHX_ av, 1); /* ust be the only waiter */ 3083 coro_signal_wake (aTHX_ av, 1); /* must be the only waiter */
2802 3084
2803 frame->prepare = prepare_nop; 3085 frame->prepare = prepare_nop;
2804 frame->check = slf_check_nop; 3086 frame->check = slf_check_nop;
2805 } 3087 }
2806 else if (SvIVX (AvARRAY (av)[0])) 3088 else if (SvIVX (AvARRAY (av)[0]))
… …
2837 3119
2838static void 3120static void
2839coro_aio_callback (pTHX_ CV *cv) 3121coro_aio_callback (pTHX_ CV *cv)
2840{ 3122{
2841 dXSARGS; 3123 dXSARGS;
2842 AV *state = (AV *)GENSUB_ARG; 3124 AV *state = (AV *)S_GENSUB_ARG;
2843 SV *coro = av_pop (state); 3125 SV *coro = av_pop (state);
2844 SV *data_sv = newSV (sizeof (struct io_state)); 3126 SV *data_sv = newSV (sizeof (struct io_state));
2845 3127
2846 av_extend (state, items - 1); 3128 av_extend (state, items - 1);
2847 3129
… …
2932 dSP; 3214 dSP;
2933 3215
2934 static SV *prio_cv; 3216 static SV *prio_cv;
2935 static SV *prio_sv; 3217 static SV *prio_sv;
2936 3218
2937 if (expect_false (!prio_cv)) 3219 if (ecb_expect_false (!prio_cv))
2938 { 3220 {
2939 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0); 3221 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0);
2940 prio_sv = newSViv (0); 3222 prio_sv = newSViv (0);
2941 } 3223 }
2942 3224
… …
2961 3243
2962 for (i = 0; i < items; ++i) 3244 for (i = 0; i < items; ++i)
2963 PUSHs (arg [i]); 3245 PUSHs (arg [i]);
2964 3246
2965 /* now push the callback closure */ 3247 /* now push the callback closure */
2966 PUSHs (sv_2mortal (gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state)))); 3248 PUSHs (sv_2mortal (s_gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state))));
2967 3249
2968 /* now call the AIO function - we assume our request is uncancelable */ 3250 /* now call the AIO function - we assume our request is uncancelable */
2969 PUTBACK; 3251 PUTBACK;
2970 call_sv ((SV *)req, G_VOID | G_DISCARD); 3252 call_sv ((SV *)req, G_VOID | G_DISCARD);
2971 } 3253 }
2972 3254
2973 /* now that the requets is going, we loop toll we have a result */ 3255 /* now that the request is going, we loop till we have a result */
2974 frame->data = (void *)state; 3256 frame->data = (void *)state;
2975 frame->prepare = prepare_schedule; 3257 frame->prepare = prepare_schedule;
2976 frame->check = slf_check_aio_req; 3258 frame->check = slf_check_aio_req;
2977} 3259}
2978 3260
… …
2988 3270
2989/*****************************************************************************/ 3271/*****************************************************************************/
2990 3272
2991#if CORO_CLONE 3273#if CORO_CLONE
2992# include "clone.c" 3274# include "clone.c"
3275#endif
3276
3277/*****************************************************************************/
3278
3279static SV *
3280coro_new (pTHX_ HV *stash, SV **argv, int argc, int is_coro)
3281{
3282 SV *coro_sv;
3283 struct coro *coro;
3284 MAGIC *mg;
3285 HV *hv;
3286 SV *cb;
3287 int i;
3288
3289 if (argc > 0)
3290 {
3291 cb = s_get_cv_croak (argv [0]);
3292
3293 if (!is_coro)
3294 {
3295 if (CvISXSUB (cb))
3296 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
3297
3298 if (!CvROOT (cb))
3299 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
3300 }
3301 }
3302
3303 Newz (0, coro, 1, struct coro);
3304 coro->args = newAV ();
3305 coro->flags = CF_NEW;
3306
3307 if (coro_first) coro_first->prev = coro;
3308 coro->next = coro_first;
3309 coro_first = coro;
3310
3311 coro->hv = hv = newHV ();
3312 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
3313 mg->mg_flags |= MGf_DUP;
3314 coro_sv = sv_bless (newRV_noinc ((SV *)hv), stash);
3315
3316 if (argc > 0)
3317 {
3318 av_extend (coro->args, argc + is_coro - 1);
3319
3320 if (is_coro)
3321 {
3322 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
3323 cb = (SV *)cv_coro_run;
3324 }
3325
3326 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3327
3328 for (i = 1; i < argc; i++)
3329 av_push (coro->args, newSVsv (argv [i]));
3330 }
3331
3332 return coro_sv;
3333}
3334
3335#ifndef __cplusplus
3336ecb_cold XS(boot_Coro__State);
3337#endif
3338
3339#if CORO_JIT
3340
3341static void ecb_noinline ecb_cold
3342pushav_3uv (pTHX_ UV a, UV b, UV c)
3343{
3344 dSP;
3345 AV *av = newAV ();
3346
3347 av_store (av, 2, newSVuv (c));
3348 av_store (av, 1, newSVuv (b));
3349 av_store (av, 0, newSVuv (a));
3350
3351 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
3352
3353 PUTBACK;
3354}
3355
3356static void ecb_noinline ecb_cold
3357jit_init (pTHX)
3358{
3359 dSP;
3360 SV *load, *save;
3361 char *map_base;
3362 char *load_ptr, *save_ptr;
3363 STRLEN load_len, save_len;
3364 int count;
3365
3366 PUSHMARK (SP);
3367 PUTBACK;
3368#define VARx(name,expr,type) pushav_3uv (aTHX_ (UV)&(expr), offsetof (perl_slots, name), sizeof (type));
3369# include "state.h"
3370#undef VARx
3371 count = call_pv ("Coro::State::_jit", G_ARRAY);
3372 SPAGAIN;
3373
3374 save = POPs; save_ptr = SvPVbyte (save, save_len);
3375 load = POPs; load_ptr = SvPVbyte (load, load_len);
3376
3377 map_base = mmap (0, load_len + save_len + 16, PROT_EXEC | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3378
3379 assert (("Coro: unable mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3380
3381 load_perl_slots = (load_save_perl_slots_type)map_base;
3382 memcpy (map_base, load_ptr, load_len);
3383
3384 map_base += (load_len + 15) & ~15;
3385
3386 save_perl_slots = (load_save_perl_slots_type)map_base;
3387 memcpy (map_base, save_ptr, save_len);
3388}
3389
2993#endif 3390#endif
2994 3391
2995MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3392MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2996 3393
2997PROTOTYPES: DISABLE 3394PROTOTYPES: DISABLE
… …
3003 coro_thx = PERL_GET_CONTEXT; 3400 coro_thx = PERL_GET_CONTEXT;
3004# endif 3401# endif
3005#endif 3402#endif
3006 BOOT_PAGESIZE; 3403 BOOT_PAGESIZE;
3007 3404
3405 /* perl defines these to check for existance first, but why it doesn't */
3406 /* just create them one at init time is not clear to me, except for */
3407 /* programs trying to delete them, but... */
3408 /* anyway, we declare this as invalid and make sure they are initialised here */
3409 DEFSV;
3410 ERRSV;
3411
3008 cctx_current = cctx_new_empty (); 3412 cctx_current = cctx_new_empty ();
3009 3413
3010 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3414 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
3011 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3415 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
3012 3416
… …
3051 coroapi.prepare_nop = prepare_nop; 3455 coroapi.prepare_nop = prepare_nop;
3052 coroapi.prepare_schedule = prepare_schedule; 3456 coroapi.prepare_schedule = prepare_schedule;
3053 coroapi.prepare_cede = prepare_cede; 3457 coroapi.prepare_cede = prepare_cede;
3054 coroapi.prepare_cede_notself = prepare_cede_notself; 3458 coroapi.prepare_cede_notself = prepare_cede_notself;
3055 3459
3056 { 3460 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 (double (*)(), SvIV (*svp));
3066 }
3067 3461
3068 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL)); 3462 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3463#if CORO_JIT
3464 PUTBACK;
3465 require_pv ("Coro/jit-" CORO_JIT_TYPE ".pl");
3466 jit_init (aTHX);
3467 perl_eval_pv ("undef &Coro::State::_jit", 1);
3468 SPAGAIN;
3469#endif
3069} 3470}
3070 3471
3071SV * 3472SV *
3072new (char *klass, ...) 3473new (SV *klass, ...)
3073 ALIAS: 3474 ALIAS:
3074 Coro::new = 1 3475 Coro::new = 1
3075 CODE: 3476 CODE:
3076{ 3477 RETVAL = coro_new (aTHX_ ix ? coro_stash : coro_state_stash, &ST (1), items - 1, ix);
3077 struct coro *coro; 3478 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 3479 RETVAL
3128 3480
3129void 3481void
3130transfer (...) 3482transfer (...)
3131 PROTOTYPE: $$ 3483 PROTOTYPE: $$
3132 CODE: 3484 CODE:
3133 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3485 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 3486
3142void 3487void
3143_exit (int code) 3488_exit (int code)
3144 PROTOTYPE: $ 3489 PROTOTYPE: $
3145 CODE: 3490 CODE:
… …
3221 CODE: 3566 CODE:
3222{ 3567{
3223 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3568 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
3224 { 3569 {
3225 struct coro *current = SvSTATE_current; 3570 struct coro *current = SvSTATE_current;
3571 struct CoroSLF slf_save;
3226 3572
3227 if (current != coro) 3573 if (current != coro)
3228 { 3574 {
3229 PUTBACK; 3575 PUTBACK;
3230 save_perl (aTHX_ current); 3576 save_perl (aTHX_ current);
3231 load_perl (aTHX_ coro); 3577 load_perl (aTHX_ coro);
3578 /* the coro is most likely in an active SLF call.
3579 * while not strictly required (the code we execute is
3580 * not allowed to call any SLF functions), it's cleaner
3581 * to reinitialise the slf_frame and restore it later.
3582 * This might one day allow us to actually do SLF calls
3583 * from code executed here.
3584 */
3585 slf_save = slf_frame;
3586 slf_frame.prepare = 0;
3232 SPAGAIN; 3587 SPAGAIN;
3233 } 3588 }
3234 3589
3235 PUSHSTACK; 3590 PUSHSTACK;
3236 3591
… …
3246 SPAGAIN; 3601 SPAGAIN;
3247 3602
3248 if (current != coro) 3603 if (current != coro)
3249 { 3604 {
3250 PUTBACK; 3605 PUTBACK;
3606 slf_frame = slf_save;
3251 save_perl (aTHX_ coro); 3607 save_perl (aTHX_ coro);
3252 load_perl (aTHX_ current); 3608 load_perl (aTHX_ current);
3253 SPAGAIN; 3609 SPAGAIN;
3254 } 3610 }
3255 } 3611 }
… …
3260 PROTOTYPE: $ 3616 PROTOTYPE: $
3261 ALIAS: 3617 ALIAS:
3262 is_ready = CF_READY 3618 is_ready = CF_READY
3263 is_running = CF_RUNNING 3619 is_running = CF_RUNNING
3264 is_new = CF_NEW 3620 is_new = CF_NEW
3265 is_destroyed = CF_DESTROYED 3621 is_destroyed = CF_ZOMBIE
3622 is_zombie = CF_ZOMBIE
3266 is_suspended = CF_SUSPENDED 3623 is_suspended = CF_SUSPENDED
3267 CODE: 3624 CODE:
3268 RETVAL = boolSV (coro->flags & ix); 3625 RETVAL = boolSV (coro->flags & ix);
3269 OUTPUT: 3626 OUTPUT:
3270 RETVAL 3627 RETVAL
3271 3628
3272void 3629void
3273throw (Coro::State self, SV *throw = &PL_sv_undef) 3630throw (Coro::State self, SV *exception = &PL_sv_undef)
3274 PROTOTYPE: $;$ 3631 PROTOTYPE: $;$
3275 CODE: 3632 CODE:
3276{ 3633{
3277 struct coro *current = SvSTATE_current; 3634 struct coro *current = SvSTATE_current;
3278 SV **throwp = self == current ? &CORO_THROW : &self->except; 3635 SV **exceptionp = self == current ? &CORO_THROW : &self->except;
3279 SvREFCNT_dec (*throwp); 3636 SvREFCNT_dec (*exceptionp);
3280 SvGETMAGIC (throw); 3637 SvGETMAGIC (exception);
3281 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3638 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3282} 3639}
3283 3640
3284void 3641void
3285api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3642api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3286 PROTOTYPE: $;$ 3643 PROTOTYPE: $;$
… …
3341 3698
3342void 3699void
3343cancel (Coro::State self) 3700cancel (Coro::State self)
3344 CODE: 3701 CODE:
3345 coro_state_destroy (aTHX_ self); 3702 coro_state_destroy (aTHX_ self);
3346 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */
3347
3348 3703
3349SV * 3704SV *
3350enable_times (int enabled = enable_times) 3705enable_times (int enabled = enable_times)
3351 CODE: 3706 CODE:
3352{ 3707{
… …
3367times (Coro::State self) 3722times (Coro::State self)
3368 PPCODE: 3723 PPCODE:
3369{ 3724{
3370 struct coro *current = SvSTATE (coro_current); 3725 struct coro *current = SvSTATE (coro_current);
3371 3726
3372 if (expect_false (current == self)) 3727 if (ecb_expect_false (current == self))
3373 { 3728 {
3374 coro_times_update (); 3729 coro_times_update ();
3375 coro_times_add (SvSTATE (coro_current)); 3730 coro_times_add (SvSTATE (coro_current));
3376 } 3731 }
3377 3732
3378 EXTEND (SP, 2); 3733 EXTEND (SP, 2);
3379 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9))); 3734 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))); 3735 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3381 3736
3382 if (expect_false (current == self)) 3737 if (ecb_expect_false (current == self))
3383 coro_times_sub (SvSTATE (coro_current)); 3738 coro_times_sub (SvSTATE (coro_current));
3384} 3739}
3740
3741void
3742swap_sv (Coro::State coro, SV *sv, SV *swapsv)
3743 CODE:
3744{
3745 struct coro *current = SvSTATE_current;
3746
3747 if (current == coro)
3748 SWAP_SVS (current);
3749
3750 if (!coro->swap_sv)
3751 coro->swap_sv = newAV ();
3752
3753 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv )));
3754 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv)));
3755
3756 if (current == coro)
3757 SWAP_SVS (current);
3758}
3759
3385 3760
3386MODULE = Coro::State PACKAGE = Coro 3761MODULE = Coro::State PACKAGE = Coro
3387 3762
3388BOOT: 3763BOOT:
3389{ 3764{
3390 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3765 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3391 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3766 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3392 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 3767 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); 3768 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); 3769 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3396 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 3770 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3397 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 3771 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3398 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 3772 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3399 3773
3400 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3774 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3401 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3775 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); 3776 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); 3777 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3404 3778
3405 coro_stash = gv_stashpv ("Coro", TRUE); 3779 coro_stash = gv_stashpv ("Coro", TRUE);
3406 3780
3407 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 3781 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3408 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 3782 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3409 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL)); 3783 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
… …
3427 sv_setiv (sv, (IV)&coroapi); 3801 sv_setiv (sv, (IV)&coroapi);
3428 SvREADONLY_on (sv); 3802 SvREADONLY_on (sv);
3429 } 3803 }
3430} 3804}
3431 3805
3806SV *
3807async (...)
3808 PROTOTYPE: &@
3809 CODE:
3810 RETVAL = coro_new (aTHX_ coro_stash, &ST (0), items, 1);
3811 api_ready (aTHX_ RETVAL);
3812 OUTPUT:
3813 RETVAL
3814
3815void
3816_destroy (Coro::State coro)
3817 CODE:
3818 /* used by the manager thread */
3819 coro_state_destroy (aTHX_ coro);
3820
3821void
3822on_destroy (Coro::State coro, SV *cb)
3823 CODE:
3824 coro_push_on_destroy (aTHX_ coro, newSVsv (cb));
3825
3826void
3827join (...)
3828 CODE:
3829 CORO_EXECUTE_SLF_XS (slf_init_join);
3830
3432void 3831void
3433terminate (...) 3832terminate (...)
3434 CODE: 3833 CODE:
3435 CORO_EXECUTE_SLF_XS (slf_init_terminate); 3834 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3835
3836void
3837cancel (...)
3838 CODE:
3839 CORO_EXECUTE_SLF_XS (slf_init_cancel);
3840
3841int
3842safe_cancel (Coro::State self, ...)
3843 C_ARGS: aTHX_ self, &ST (1), items - 1
3436 3844
3437void 3845void
3438schedule (...) 3846schedule (...)
3439 CODE: 3847 CODE:
3440 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3848 CORO_EXECUTE_SLF_XS (slf_init_schedule);
… …
3470_set_readyhook (SV *hook) 3878_set_readyhook (SV *hook)
3471 PROTOTYPE: $ 3879 PROTOTYPE: $
3472 CODE: 3880 CODE:
3473 SvREFCNT_dec (coro_readyhook); 3881 SvREFCNT_dec (coro_readyhook);
3474 SvGETMAGIC (hook); 3882 SvGETMAGIC (hook);
3883 if (SvOK (hook))
3884 {
3475 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0; 3885 coro_readyhook = newSVsv (hook);
3886 CORO_READYHOOK = invoke_sv_ready_hook_helper;
3887 }
3888 else
3889 {
3890 coro_readyhook = 0;
3891 CORO_READYHOOK = 0;
3892 }
3476 3893
3477int 3894int
3478prio (Coro::State coro, int newprio = 0) 3895prio (Coro::State coro, int newprio = 0)
3479 PROTOTYPE: $;$ 3896 PROTOTYPE: $;$
3480 ALIAS: 3897 ALIAS:
… …
3544 for (i = 1; i < items; ++i) 3961 for (i = 1; i < items; ++i)
3545 av_push (av, SvREFCNT_inc_NN (ST (i))); 3962 av_push (av, SvREFCNT_inc_NN (ST (i)));
3546 3963
3547 if ((SV *)hv == &PL_sv_undef) 3964 if ((SV *)hv == &PL_sv_undef)
3548 { 3965 {
3549 PUSHMARK (SP); 3966 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)); 3967 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
3968 SvREFCNT_dec (sv);
3558 } 3969 }
3559 3970
3560 { 3971 {
3561 struct coro *coro = SvSTATE_hv (hv); 3972 struct coro *coro = SvSTATE_hv (hv);
3562 3973
… …
3596 CODE: 4007 CODE:
3597{ 4008{
3598 struct coro *coro = SvSTATE_current; 4009 struct coro *coro = SvSTATE_current;
3599 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 4010 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3600 4011
3601 block = (SV *)coro_sv_2cv (aTHX_ block); 4012 block = s_get_cv_croak (block);
3602 4013
3603 if (!*avp) 4014 if (!*avp)
3604 *avp = newAV (); 4015 *avp = newAV ();
3605 4016
3606 av_push (*avp, SvREFCNT_inc (block)); 4017 av_push (*avp, SvREFCNT_inc (block));
… …
3806 4217
3807void 4218void
3808_register (char *target, char *proto, SV *req) 4219_register (char *target, char *proto, SV *req)
3809 CODE: 4220 CODE:
3810{ 4221{
3811 CV *req_cv = coro_sv_2cv (aTHX_ req); 4222 SV *req_cv = s_get_cv_croak (req);
3812 /* newXSproto doesn't return the CV on 5.8 */ 4223 /* newXSproto doesn't return the CV on 5.8 */
3813 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 4224 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3814 sv_setpv ((SV *)slf_cv, proto); 4225 sv_setpv ((SV *)slf_cv, proto);
3815 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0); 4226 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
3816} 4227}
3817 4228
4229MODULE = Coro::State PACKAGE = Coro::Select
4230
4231void
4232patch_pp_sselect ()
4233 CODE:
4234 if (!coro_old_pp_sselect)
4235 {
4236 coro_select_select = (SV *)get_cv ("Coro::Select::select", 0);
4237 coro_old_pp_sselect = PL_ppaddr [OP_SSELECT];
4238 PL_ppaddr [OP_SSELECT] = coro_pp_sselect;
4239 }
4240
4241void
4242unpatch_pp_sselect ()
4243 CODE:
4244 if (coro_old_pp_sselect)
4245 {
4246 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
4247 coro_old_pp_sselect = 0;
4248 }
4249

Diff Legend

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