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.360 by root, Mon Jun 29 06:14:23 2009 UTC vs.
Revision 1.408 by root, Sat Jun 11 16:58:40 2011 UTC

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

Diff Legend

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