ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/Coro/Coro/State.xs
(Generate patch)

Comparing Coro/Coro/State.xs (file contents):
Revision 1.361 by root, Wed Jul 1 07:26:40 2009 UTC vs.
Revision 1.425 by root, Wed Dec 5 00:14:22 2012 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"
12 17
18#define ECB_NO_THREADS 1
19#include "ecb.h"
20
21#include <stddef.h>
13#include <stdio.h> 22#include <stdio.h>
14#include <errno.h> 23#include <errno.h>
15#include <assert.h> 24#include <assert.h>
16 25
17#ifdef WIN32 26#ifndef SVs_PADSTALE
27# define SVs_PADSTALE 0
28#endif
29
30#ifdef PadARRAY
31# define NEWPADAPI
32# define newPADLIST(var) (Newz (0, var, 1, PADLIST), Newx (PadlistARRAY (var), 2, PAD *))
33#else
34typedef AV PADNAMELIST;
35# if !PERL_VERSION_ATLEAST(5,8,0)
36typedef AV PADLIST;
37typedef AV PAD;
38# endif
39# define PadlistARRAY(pl) ((PAD **)AvARRAY (pl))
40# define PadlistMAX(pl) AvFILLp (pl)
41# define PadlistNAMES(pl) (*PadlistARRAY (pl))
42# define PadARRAY AvARRAY
43# define PadMAX AvFILLp
44# define newPADLIST(var) ((var) = newAV (), av_extend (var, 1))
45#endif
46
47#if defined(_WIN32)
48# undef HAS_GETTIMEOFDAY
18# undef setjmp 49# undef setjmp
19# undef longjmp 50# undef longjmp
20# undef _exit 51# undef _exit
21# define setjmp _setjmp /* deep magic */ 52# define setjmp _setjmp /* deep magic */
22#else 53#else
23# include <inttypes.h> /* most portable stdint.h */ 54# include <inttypes.h> /* most portable stdint.h */
24#endif 55#endif
25 56
26#ifdef HAVE_MMAP 57#if HAVE_MMAP
27# include <unistd.h> 58# include <unistd.h>
28# include <sys/mman.h> 59# include <sys/mman.h>
29# ifndef MAP_ANONYMOUS 60# ifndef MAP_ANONYMOUS
30# ifdef MAP_ANON 61# ifdef MAP_ANON
31# define MAP_ANONYMOUS MAP_ANON 62# define MAP_ANONYMOUS MAP_ANON
… …
51#endif 82#endif
52 83
53/* the maximum number of idle cctx that will be pooled */ 84/* the maximum number of idle cctx that will be pooled */
54static int cctx_max_idle = 4; 85static int cctx_max_idle = 4;
55 86
56#define PERL_VERSION_ATLEAST(a,b,c) \ 87#if defined(DEBUGGING) && PERL_VERSION_ATLEAST(5,12,0)
57 (PERL_REVISION > (a) \ 88# define HAS_SCOPESTACK_NAME 1
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 89#endif
114 90
115#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 91#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
116# undef CORO_STACKGUARD 92# undef CORO_STACKGUARD
117#endif 93#endif
… …
135# define STACKLEVEL ((void *)&stacklevel) 111# define STACKLEVEL ((void *)&stacklevel)
136#endif 112#endif
137 113
138#define IN_DESTRUCT PL_dirty 114#define IN_DESTRUCT PL_dirty
139 115
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" 116#include "CoroAPI.h"
156#define GCoroAPI (&coroapi) /* very sneaky */ 117#define GCoroAPI (&coroapi) /* very sneaky */
157 118
158#ifdef USE_ITHREADS 119#ifdef USE_ITHREADS
159# if CORO_PTHREAD 120# if CORO_PTHREAD
… …
175static void (*u2time)(pTHX_ UV ret[2]); 136static void (*u2time)(pTHX_ UV ret[2]);
176 137
177/* we hijack an hopefully unused CV flag for our purposes */ 138/* we hijack an hopefully unused CV flag for our purposes */
178#define CVf_SLF 0x4000 139#define CVf_SLF 0x4000
179static OP *pp_slf (pTHX); 140static OP *pp_slf (pTHX);
141static void slf_destroy (pTHX_ struct coro *coro);
180 142
181static U32 cctx_gen; 143static U32 cctx_gen;
182static size_t cctx_stacksize = CORO_STACKSIZE; 144static size_t cctx_stacksize = CORO_STACKSIZE;
183static struct CoroAPI coroapi; 145static struct CoroAPI coroapi;
184static AV *main_mainstack; /* used to differentiate between $main and others */ 146static AV *main_mainstack; /* used to differentiate between $main and others */
… …
201static SV *sv_pool_size; 163static SV *sv_pool_size;
202static SV *sv_async_pool_idle; /* description string */ 164static SV *sv_async_pool_idle; /* description string */
203static AV *av_async_pool; /* idle pool */ 165static AV *av_async_pool; /* idle pool */
204static SV *sv_Coro; /* class string */ 166static SV *sv_Coro; /* class string */
205static CV *cv_pool_handler; 167static CV *cv_pool_handler;
206static CV *cv_coro_state_new;
207 168
208/* Coro::AnyEvent */ 169/* Coro::AnyEvent */
209static SV *sv_activity; 170static SV *sv_activity;
210 171
211/* enable processtime/realtime profiling */ 172/* enable processtime/realtime profiling */
… …
215static char times_valid; 176static char times_valid;
216 177
217static struct coro_cctx *cctx_first; 178static struct coro_cctx *cctx_first;
218static int cctx_count, cctx_idle; 179static int cctx_count, cctx_idle;
219 180
220enum { 181enum
182{
221 CC_MAPPED = 0x01, 183 CC_MAPPED = 0x01,
222 CC_NOREUSE = 0x02, /* throw this away after tracing */ 184 CC_NOREUSE = 0x02, /* throw this away after tracing */
223 CC_TRACE = 0x04, 185 CC_TRACE = 0x04,
224 CC_TRACE_SUB = 0x08, /* trace sub calls */ 186 CC_TRACE_SUB = 0x08, /* trace sub calls */
225 CC_TRACE_LINE = 0x10, /* trace each statement */ 187 CC_TRACE_LINE = 0x10, /* trace each statement */
… …
235 void *sptr; 197 void *sptr;
236 size_t ssize; 198 size_t ssize;
237 199
238 /* cpu state */ 200 /* cpu state */
239 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 201 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
202#ifndef NDEBUG
240 JMPENV *idle_te; /* same as idle_sp, but for top_env, TODO: remove once stable */ 203 JMPENV *idle_te; /* same as idle_sp, but for top_env */
204#endif
241 JMPENV *top_env; 205 JMPENV *top_env;
242 coro_context cctx; 206 coro_context cctx;
243 207
244 U32 gen; 208 U32 gen;
245#if CORO_USE_VALGRIND 209#if CORO_USE_VALGRIND
246 int valgrind_id; 210 int valgrind_id;
247#endif 211#endif
248 unsigned char flags; 212 unsigned char flags;
249} coro_cctx; 213} coro_cctx;
250 214
251coro_cctx *cctx_current; /* the currently running cctx */ 215static coro_cctx *cctx_current; /* the currently running cctx */
252 216
253/*****************************************************************************/ 217/*****************************************************************************/
254 218
219static MGVTBL coro_state_vtbl;
220
255enum { 221enum
222{
256 CF_RUNNING = 0x0001, /* coroutine is running */ 223 CF_RUNNING = 0x0001, /* coroutine is running */
257 CF_READY = 0x0002, /* coroutine is ready */ 224 CF_READY = 0x0002, /* coroutine is ready */
258 CF_NEW = 0x0004, /* has never been switched to */ 225 CF_NEW = 0x0004, /* has never been switched to */
259 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 226 CF_ZOMBIE = 0x0008, /* coroutine data has been freed */
260 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */ 227 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
228 CF_NOCANCEL = 0x0020, /* cannot cancel, set slf_frame.data to 1 (hackish) */
261}; 229};
262 230
263/* the structure where most of the perl state is stored, overlaid on the cxstack */ 231/* the structure where most of the perl state is stored, overlaid on the cxstack */
264typedef struct 232typedef struct
265{ 233{
266 SV *defsv;
267 AV *defav;
268 SV *errsv;
269 SV *irsgv;
270 HV *hinthv;
271#define VAR(name,type) type name; 234 #define VARx(name,expr,type) type name;
272# include "state.h" 235 #include "state.h"
273#undef VAR
274} perl_slots; 236} perl_slots;
275 237
238/* 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)) 239#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
277 240
278/* this is a structure representing a perl-level coroutine */ 241/* this is a structure representing a perl-level coroutine */
279struct coro { 242struct coro
243{
280 /* the C coroutine allocated to this perl coroutine, if any */ 244 /* the C coroutine allocated to this perl coroutine, if any */
281 coro_cctx *cctx; 245 coro_cctx *cctx;
282 246
283 /* ready queue */ 247 /* ready queue */
284 struct coro *next_ready; 248 struct coro *next_ready;
… …
286 /* state data */ 250 /* state data */
287 struct CoroSLF slf_frame; /* saved slf frame */ 251 struct CoroSLF slf_frame; /* saved slf frame */
288 AV *mainstack; 252 AV *mainstack;
289 perl_slots *slot; /* basically the saved sp */ 253 perl_slots *slot; /* basically the saved sp */
290 254
291 CV *startcv; /* the CV to execute */ 255 CV *startcv; /* the CV to execute */
292 AV *args; /* data associated with this coroutine (initial args) */ 256 AV *args; /* data associated with this coroutine (initial args) */
293 int refcnt; /* coroutines are refcounted, yes */
294 int flags; /* CF_ flags */ 257 int flags; /* CF_ flags */
295 HV *hv; /* the perl hash associated with this coro, if any */ 258 HV *hv; /* the perl hash associated with this coro, if any */
296 void (*on_destroy)(pTHX_ struct coro *coro);
297 259
298 /* statistics */ 260 /* statistics */
299 int usecount; /* number of transfers to this coro */ 261 int usecount; /* number of transfers to this coro */
300 262
301 /* coro process data */ 263 /* coro process data */
302 int prio; 264 int prio;
303 SV *except; /* exception to be thrown */ 265 SV *except; /* exception to be thrown */
304 SV *rouse_cb; 266 SV *rouse_cb; /* last rouse callback */
267 AV *on_destroy; /* callbacks or coros to notify on destroy */
268 AV *status; /* the exit status list */
305 269
306 /* async_pool */ 270 /* async_pool */
307 SV *saved_deffh; 271 SV *saved_deffh;
308 SV *invoke_cb; 272 SV *invoke_cb;
309 AV *invoke_av; 273 AV *invoke_av;
310 274
311 /* on_enter/on_leave */ 275 /* on_enter/on_leave */
312 AV *on_enter; 276 AV *on_enter;
313 AV *on_leave; 277 AV *on_leave;
314 278
279 /* swap_sv */
280 AV *swap_sv;
281
315 /* times */ 282 /* times */
316 coro_ts t_cpu, t_real; 283 coro_ts t_cpu, t_real;
317 284
318 /* linked list */ 285 /* linked list */
319 struct coro *next, *prev; 286 struct coro *next, *prev;
… …
322typedef struct coro *Coro__State; 289typedef struct coro *Coro__State;
323typedef struct coro *Coro__State_or_hashref; 290typedef struct coro *Coro__State_or_hashref;
324 291
325/* the following variables are effectively part of the perl context */ 292/* the following variables are effectively part of the perl context */
326/* and get copied between struct coro and these variables */ 293/* and get copied between struct coro and these variables */
327/* the mainr easonw e don't support windows process emulation */ 294/* the main reason we don't support windows process emulation */
328static struct CoroSLF slf_frame; /* the current slf frame */ 295static struct CoroSLF slf_frame; /* the current slf frame */
329 296
330/** Coro ********************************************************************/ 297/** Coro ********************************************************************/
331 298
332#define CORO_PRIO_MAX 3 299#define CORO_PRIO_MAX 3
… …
338 305
339/* for Coro.pm */ 306/* for Coro.pm */
340static SV *coro_current; 307static SV *coro_current;
341static SV *coro_readyhook; 308static SV *coro_readyhook;
342static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */ 309static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
343static CV *cv_coro_run, *cv_coro_terminate; 310static CV *cv_coro_run;
344static struct coro *coro_first; 311static struct coro *coro_first;
345#define coro_nready coroapi.nready 312#define coro_nready coroapi.nready
346 313
314/** JIT *********************************************************************/
315
316#if CORO_JIT
317 /* APPLE doesn't have HAVE_MMAP though */
318 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__)
319 #ifndef CORO_JIT_TYPE
320 #if __x86_64 && CORO_JIT_UNIXY
321 #define CORO_JIT_TYPE "amd64-unix"
322 #elif __i386 && CORO_JIT_UNIXY
323 #define CORO_JIT_TYPE "x86-unix"
324 #endif
325 #endif
326#endif
327
328#if !defined(CORO_JIT_TYPE) || !HAVE_MMAP
329 #undef CORO_JIT
330#endif
331
332#if CORO_JIT
333 typedef void (*load_save_perl_slots_type)(perl_slots *);
334 static load_save_perl_slots_type load_perl_slots, save_perl_slots;
335#endif
336
337/** Coro::Select ************************************************************/
338
339static OP *(*coro_old_pp_sselect) (pTHX);
340static SV *coro_select_select;
341
342/* horrible hack, but if it works... */
343static OP *
344coro_pp_sselect (pTHX)
345{
346 dSP;
347 PUSHMARK (SP - 4); /* fake argument list */
348 XPUSHs (coro_select_select);
349 PUTBACK;
350
351 /* entersub is an UNOP, select a LISTOP... keep your fingers crossed */
352 PL_op->op_flags |= OPf_STACKED;
353 PL_op->op_private = 0;
354 return PL_ppaddr [OP_ENTERSUB](aTHX);
355}
356
357/** time stuff **************************************************************/
358
359#ifdef HAS_GETTIMEOFDAY
360
361ecb_inline void
362coro_u2time (pTHX_ UV ret[2])
363{
364 struct timeval tv;
365 gettimeofday (&tv, 0);
366
367 ret [0] = tv.tv_sec;
368 ret [1] = tv.tv_usec;
369}
370
371ecb_inline double
372coro_nvtime (void)
373{
374 struct timeval tv;
375 gettimeofday (&tv, 0);
376
377 return tv.tv_sec + tv.tv_usec * 1e-6;
378}
379
380ecb_inline void
381time_init (pTHX)
382{
383 nvtime = coro_nvtime;
384 u2time = coro_u2time;
385}
386
387#else
388
389ecb_inline void
390time_init (pTHX)
391{
392 SV **svp;
393
394 require_pv ("Time/HiRes.pm");
395
396 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
397
398 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
399 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught");
400
401 nvtime = INT2PTR (double (*)(), SvIV (*svp));
402
403 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
404 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
405}
406
407#endif
408
347/** lowlevel stuff **********************************************************/ 409/** lowlevel stuff **********************************************************/
348 410
349static SV * 411static SV * ecb_noinline
350coro_get_sv (pTHX_ const char *name, int create) 412coro_get_sv (pTHX_ const char *name, int create)
351{ 413{
352#if PERL_VERSION_ATLEAST (5,10,0) 414#if PERL_VERSION_ATLEAST (5,10,0)
353 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 415 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
354 get_sv (name, create); 416 get_sv (name, create);
355#endif 417#endif
356 return get_sv (name, create); 418 return get_sv (name, create);
357} 419}
358 420
359static AV * 421static AV * ecb_noinline
360coro_get_av (pTHX_ const char *name, int create) 422coro_get_av (pTHX_ const char *name, int create)
361{ 423{
362#if PERL_VERSION_ATLEAST (5,10,0) 424#if PERL_VERSION_ATLEAST (5,10,0)
363 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 425 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
364 get_av (name, create); 426 get_av (name, create);
365#endif 427#endif
366 return get_av (name, create); 428 return get_av (name, create);
367} 429}
368 430
369static HV * 431static HV * ecb_noinline
370coro_get_hv (pTHX_ const char *name, int create) 432coro_get_hv (pTHX_ const char *name, int create)
371{ 433{
372#if PERL_VERSION_ATLEAST (5,10,0) 434#if PERL_VERSION_ATLEAST (5,10,0)
373 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 435 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
374 get_hv (name, create); 436 get_hv (name, create);
375#endif 437#endif
376 return get_hv (name, create); 438 return get_hv (name, create);
377} 439}
378 440
379/* may croak */ 441ecb_inline void
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
394coro_times_update () 442coro_times_update (void)
395{ 443{
396#ifdef coro_clock_gettime 444#ifdef coro_clock_gettime
397 struct timespec ts; 445 struct timespec ts;
398 446
399 ts.tv_sec = ts.tv_nsec = 0; 447 ts.tv_sec = ts.tv_nsec = 0;
… …
405 time_real [0] = ts.tv_sec; time_real [1] = ts.tv_nsec; 453 time_real [0] = ts.tv_sec; time_real [1] = ts.tv_nsec;
406#else 454#else
407 dTHX; 455 dTHX;
408 UV tv[2]; 456 UV tv[2];
409 457
410 u2time (aTHX_ &tv); 458 u2time (aTHX_ tv);
411 time_real [0] = tv [0]; 459 time_real [0] = tv [0];
412 time_real [1] = tv [1] * 1000; 460 time_real [1] = tv [1] * 1000;
413#endif 461#endif
414} 462}
415 463
416INLINE void 464ecb_inline void
417coro_times_add (struct coro *c) 465coro_times_add (struct coro *c)
418{ 466{
419 c->t_real [1] += time_real [1]; 467 c->t_real [1] += time_real [1];
420 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; } 468 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
421 c->t_real [0] += time_real [0]; 469 c->t_real [0] += time_real [0];
… …
423 c->t_cpu [1] += time_cpu [1]; 471 c->t_cpu [1] += time_cpu [1];
424 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; } 472 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
425 c->t_cpu [0] += time_cpu [0]; 473 c->t_cpu [0] += time_cpu [0];
426} 474}
427 475
428INLINE void 476ecb_inline void
429coro_times_sub (struct coro *c) 477coro_times_sub (struct coro *c)
430{ 478{
431 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; } 479 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; }
432 c->t_real [1] -= time_real [1]; 480 c->t_real [1] -= time_real [1];
433 c->t_real [0] -= time_real [0]; 481 c->t_real [0] -= time_real [0];
… …
441/* magic glue */ 489/* magic glue */
442 490
443#define CORO_MAGIC_type_cv 26 491#define CORO_MAGIC_type_cv 26
444#define CORO_MAGIC_type_state PERL_MAGIC_ext 492#define CORO_MAGIC_type_state PERL_MAGIC_ext
445 493
446#define CORO_MAGIC_NN(sv, type) \ 494#define CORO_MAGIC_NN(sv, type) \
447 (expect_true (SvMAGIC (sv)->mg_type == type) \ 495 (ecb_expect_true (SvMAGIC (sv)->mg_type == type) \
448 ? SvMAGIC (sv) \ 496 ? SvMAGIC (sv) \
449 : mg_find (sv, type)) 497 : mg_find (sv, type))
450 498
451#define CORO_MAGIC(sv, type) \ 499#define CORO_MAGIC(sv, type) \
452 (expect_true (SvMAGIC (sv)) \ 500 (ecb_expect_true (SvMAGIC (sv)) \
453 ? CORO_MAGIC_NN (sv, type) \ 501 ? CORO_MAGIC_NN (sv, type) \
454 : 0) 502 : 0)
455 503
456#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv) 504#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
457#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state) 505#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
458 506
459INLINE struct coro * 507ecb_inline MAGIC *
508SvSTATEhv_p (pTHX_ SV *coro)
509{
510 MAGIC *mg;
511
512 if (ecb_expect_true (
513 SvTYPE (coro) == SVt_PVHV
514 && (mg = CORO_MAGIC_state (coro))
515 && mg->mg_virtual == &coro_state_vtbl
516 ))
517 return mg;
518
519 return 0;
520}
521
522ecb_inline struct coro *
460SvSTATE_ (pTHX_ SV *coro) 523SvSTATE_ (pTHX_ SV *coro)
461{ 524{
462 HV *stash;
463 MAGIC *mg; 525 MAGIC *mg;
464 526
465 if (SvROK (coro)) 527 if (SvROK (coro))
466 coro = SvRV (coro); 528 coro = SvRV (coro);
467 529
468 if (expect_false (SvTYPE (coro) != SVt_PVHV)) 530 mg = SvSTATEhv_p (aTHX_ coro);
531 if (!mg)
469 croak ("Coro::State object required"); 532 croak ("Coro::State object required");
470 533
471 stash = SvSTASH (coro);
472 if (expect_false (stash != coro_stash && stash != coro_state_stash))
473 {
474 /* very slow, but rare, check */
475 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
476 croak ("Coro::State object required");
477 }
478
479 mg = CORO_MAGIC_state (coro);
480 return (struct coro *)mg->mg_ptr; 534 return (struct coro *)mg->mg_ptr;
481} 535}
482 536
483#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 537#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
484 538
… …
487#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 541#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
488 542
489/*****************************************************************************/ 543/*****************************************************************************/
490/* padlist management and caching */ 544/* padlist management and caching */
491 545
492static AV * 546ecb_inline PADLIST *
493coro_derive_padlist (pTHX_ CV *cv) 547coro_derive_padlist (pTHX_ CV *cv)
494{ 548{
495 AV *padlist = CvPADLIST (cv); 549 PADLIST *padlist = CvPADLIST (cv);
496 AV *newpadlist, *newpad; 550 PADLIST *newpadlist;
551 PAD *newpad;
552 PADOFFSET const off = PadlistMAX (padlist) + 1;
497 553
498 newpadlist = newAV (); 554 newPADLIST(newpadlist);
555#if !PERL_VERSION_ATLEAST(5,15,3)
556 /* Padlists are AvREAL as of 5.15.3. See perl bug #98092 and perl commit 7d953ba. */
499 AvREAL_off (newpadlist); 557 AvREAL_off (newpadlist);
558#endif
500#if PERL_VERSION_ATLEAST (5,10,0) 559#if PERL_VERSION_ATLEAST (5,10,0)
501 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1); 560 Perl_pad_push (aTHX_ padlist, off);
502#else 561#else
503 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 562 Perl_pad_push (aTHX_ padlist, off, 1);
504#endif 563#endif
505 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 564 newpad = PadlistARRAY (padlist)[off];
506 --AvFILLp (padlist); 565 PadlistMAX (padlist) = off - 1;
507 566
508 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0])); 567 /* Already extended to 2 elements by newPADLIST. */
509 av_store (newpadlist, 1, (SV *)newpad); 568 PadlistMAX (newpadlist) = 1;
569 PadlistNAMES (newpadlist) = (PADNAMELIST *)SvREFCNT_inc_NN (PadlistNAMES (padlist));
570 PadlistARRAY (newpadlist)[1] = newpad;
510 571
511 return newpadlist; 572 return newpadlist;
512} 573}
513 574
514static void 575ecb_inline void
515free_padlist (pTHX_ AV *padlist) 576free_padlist (pTHX_ PADLIST *padlist)
516{ 577{
517 /* may be during global destruction */ 578 /* may be during global destruction */
518 if (!IN_DESTRUCT) 579 if (!IN_DESTRUCT)
519 { 580 {
520 I32 i = AvFILLp (padlist); 581 I32 i = PadlistMAX (padlist);
521 582
522 while (i > 0) /* special-case index 0 */ 583 while (i > 0) /* special-case index 0 */
523 { 584 {
524 /* we try to be extra-careful here */ 585 /* we try to be extra-careful here */
525 AV *av = (AV *)AvARRAY (padlist)[i--]; 586 PAD *pad = PadlistARRAY (padlist)[i--];
526 I32 j = AvFILLp (av); 587 I32 j = PadMAX (pad);
527 588
528 while (j >= 0) 589 while (j >= 0)
529 SvREFCNT_dec (AvARRAY (av)[j--]); 590 SvREFCNT_dec (PadARRAY (pad)[j--]);
530 591
531 AvFILLp (av) = -1; 592 PadMAX (pad) = -1;
532 SvREFCNT_dec (av); 593 SvREFCNT_dec (pad);
533 } 594 }
534 595
535 SvREFCNT_dec (AvARRAY (padlist)[0]); 596 SvREFCNT_dec (PadlistNAMES (padlist));
536 597
598#ifdef NEWPADAPI
599 Safefree (PadlistARRAY (padlist));
600 Safefree (padlist);
601#else
537 AvFILLp (padlist) = -1; 602 AvFILLp (padlist) = -1;
603 AvREAL_off (padlist);
538 SvREFCNT_dec ((SV*)padlist); 604 SvREFCNT_dec ((SV*)padlist);
605#endif
539 } 606 }
540} 607}
541 608
542static int 609static int
543coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 610coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
544{ 611{
545 AV *padlist; 612 PADLIST *padlist;
546 AV *av = (AV *)mg->mg_obj; 613 PADLIST **padlists = (PADLIST **)(mg->mg_ptr + sizeof(size_t));
614 size_t len = *(size_t *)mg->mg_ptr;
547 615
548 /* perl manages to free our internal AV and _then_ call us */ 616 /* perl manages to free our internal AV and _then_ call us */
549 if (IN_DESTRUCT) 617 if (IN_DESTRUCT)
550 return; 618 return 0;
551 619
552 /* casting is fun. */ 620 while (len--)
553 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
554 free_padlist (aTHX_ padlist); 621 free_padlist (aTHX_ padlists[len]);
555
556 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
557 622
558 return 0; 623 return 0;
559} 624}
560 625
561static MGVTBL coro_cv_vtbl = { 626static MGVTBL coro_cv_vtbl = {
562 0, 0, 0, 0, 627 0, 0, 0, 0,
563 coro_cv_free 628 coro_cv_free
564}; 629};
565 630
566/* the next two functions merely cache the padlists */ 631/* the next two functions merely cache the padlists */
567static void 632ecb_inline void
568get_padlist (pTHX_ CV *cv) 633get_padlist (pTHX_ CV *cv)
569{ 634{
570 MAGIC *mg = CORO_MAGIC_cv (cv); 635 MAGIC *mg = CORO_MAGIC_cv (cv);
571 AV *av; 636 size_t *lenp;
572 637
573 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 638 if (ecb_expect_true (mg && *(lenp = (size_t *)mg->mg_ptr)))
574 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 639 CvPADLIST (cv) = ((PADLIST **)(mg->mg_ptr + sizeof(size_t)))[--*lenp];
575 else 640 else
576 { 641 {
577#if CORO_PREFER_PERL_FUNCTIONS 642#if CORO_PREFER_PERL_FUNCTIONS
578 /* this is probably cleaner? but also slower! */ 643 /* this is probably cleaner? but also slower! */
579 /* in practise, it seems to be less stable */ 644 /* in practise, it seems to be less stable */
… …
585 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 650 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
586#endif 651#endif
587 } 652 }
588} 653}
589 654
590static void 655ecb_inline void
591put_padlist (pTHX_ CV *cv) 656put_padlist (pTHX_ CV *cv)
592{ 657{
593 MAGIC *mg = CORO_MAGIC_cv (cv); 658 MAGIC *mg = CORO_MAGIC_cv (cv);
594 AV *av;
595 659
596 if (expect_false (!mg)) 660 if (ecb_expect_false (!mg))
661 {
597 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 662 mg = sv_magicext ((SV *)cv, 0, CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
663 Newz (0, mg->mg_ptr ,sizeof (size_t) + sizeof (PADLIST *), char);
664 mg->mg_len = 1; /* so mg_free frees mg_ptr */
665 }
666 else
667 Renew (mg->mg_ptr,
668 sizeof(size_t) + (*(size_t *)mg->mg_ptr + 1) * sizeof(PADLIST *),
669 char);
598 670
599 av = (AV *)mg->mg_obj; 671 ((PADLIST **)(mg->mg_ptr + sizeof (size_t))) [(*(size_t *)mg->mg_ptr)++] = CvPADLIST (cv);
600
601 if (expect_false (AvFILLp (av) >= AvMAX (av)))
602 av_extend (av, AvFILLp (av) + 1);
603
604 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
605} 672}
606 673
607/** load & save, init *******************************************************/ 674/** load & save, init *******************************************************/
675
676ecb_inline void
677swap_sv (SV *a, SV *b)
678{
679 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
680 SV tmp;
681
682 /* swap sv_any */
683 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
684
685 /* swap sv_flags */
686 SvFLAGS (&tmp) = SvFLAGS (a);
687 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
688 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
689
690#if PERL_VERSION_ATLEAST (5,10,0)
691 /* perl 5.10 and later complicates this _quite_ a bit, but it also
692 * is much faster, so no quarrels here. alternatively, we could
693 * sv_upgrade to avoid this.
694 */
695 {
696 /* swap sv_u */
697 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
698
699 /* if SvANY points to the head, we need to adjust the pointers,
700 * as the pointer for a still points to b, and maybe vice versa.
701 */
702 #define svany_in_head(type) \
703 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
704
705 if (svany_in_head (SvTYPE (a)))
706 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
707
708 if (svany_in_head (SvTYPE (b)))
709 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
710 }
711#endif
712}
713
714/* swap sv heads, at least logically */
715static void
716swap_svs (pTHX_ Coro__State c)
717{
718 int i;
719
720 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
721 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
722}
723
724#define SWAP_SVS(coro) \
725 if (ecb_expect_false ((coro)->swap_sv)) \
726 swap_svs (aTHX_ (coro))
608 727
609static void 728static void
610on_enterleave_call (pTHX_ SV *cb); 729on_enterleave_call (pTHX_ SV *cb);
611 730
612static void 731static void
… …
615 perl_slots *slot = c->slot; 734 perl_slots *slot = c->slot;
616 c->slot = 0; 735 c->slot = 0;
617 736
618 PL_mainstack = c->mainstack; 737 PL_mainstack = c->mainstack;
619 738
620 GvSV (PL_defgv) = slot->defsv; 739#if CORO_JIT
621 GvAV (PL_defgv) = slot->defav; 740 load_perl_slots (slot);
622 GvSV (PL_errgv) = slot->errsv; 741#else
623 GvSV (irsgv) = slot->irsgv;
624 GvHV (PL_hintgv) = slot->hinthv;
625
626 #define VAR(name,type) PL_ ## name = slot->name; 742 #define VARx(name,expr,type) expr = slot->name;
627 # include "state.h" 743 #include "state.h"
628 #undef VAR 744#endif
629 745
630 { 746 {
631 dSP; 747 dSP;
632 748
633 CV *cv; 749 CV *cv;
634 750
635 /* now do the ugly restore mess */ 751 /* now do the ugly restore mess */
636 while (expect_true (cv = (CV *)POPs)) 752 while (ecb_expect_true (cv = (CV *)POPs))
637 { 753 {
638 put_padlist (aTHX_ cv); /* mark this padlist as available */ 754 put_padlist (aTHX_ cv); /* mark this padlist as available */
639 CvDEPTH (cv) = PTR2IV (POPs); 755 CvDEPTH (cv) = PTR2IV (POPs);
640 CvPADLIST (cv) = (AV *)POPs; 756 CvPADLIST (cv) = (PADLIST *)POPs;
641 } 757 }
642 758
643 PUTBACK; 759 PUTBACK;
644 } 760 }
645 761
646 slf_frame = c->slf_frame; 762 slf_frame = c->slf_frame;
647 CORO_THROW = c->except; 763 CORO_THROW = c->except;
648 764
649 if (expect_false (enable_times)) 765 if (ecb_expect_false (enable_times))
650 { 766 {
651 if (expect_false (!times_valid)) 767 if (ecb_expect_false (!times_valid))
652 coro_times_update (); 768 coro_times_update ();
653 769
654 coro_times_sub (c); 770 coro_times_sub (c);
655 } 771 }
656 772
657 if (expect_false (c->on_enter)) 773 if (ecb_expect_false (c->on_enter))
658 { 774 {
659 int i; 775 int i;
660 776
661 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 777 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
662 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 778 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
663 } 779 }
780
781 SWAP_SVS (c);
664} 782}
665 783
666static void 784static void
667save_perl (pTHX_ Coro__State c) 785save_perl (pTHX_ Coro__State c)
668{ 786{
787 SWAP_SVS (c);
788
669 if (expect_false (c->on_leave)) 789 if (ecb_expect_false (c->on_leave))
670 { 790 {
671 int i; 791 int i;
672 792
673 for (i = AvFILLp (c->on_leave); i >= 0; --i) 793 for (i = AvFILLp (c->on_leave); i >= 0; --i)
674 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]); 794 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
675 } 795 }
676 796
677 times_valid = 0; 797 times_valid = 0;
678 798
679 if (expect_false (enable_times)) 799 if (ecb_expect_false (enable_times))
680 { 800 {
681 coro_times_update (); times_valid = 1; 801 coro_times_update (); times_valid = 1;
682 coro_times_add (c); 802 coro_times_add (c);
683 } 803 }
684 804
… …
698 818
699 XPUSHs (Nullsv); 819 XPUSHs (Nullsv);
700 /* this loop was inspired by pp_caller */ 820 /* this loop was inspired by pp_caller */
701 for (;;) 821 for (;;)
702 { 822 {
703 while (expect_true (cxix >= 0)) 823 while (ecb_expect_true (cxix >= 0))
704 { 824 {
705 PERL_CONTEXT *cx = &ccstk[cxix--]; 825 PERL_CONTEXT *cx = &ccstk[cxix--];
706 826
707 if (expect_true (CxTYPE (cx) == CXt_SUB) || expect_false (CxTYPE (cx) == CXt_FORMAT)) 827 if (ecb_expect_true (CxTYPE (cx) == CXt_SUB) || ecb_expect_false (CxTYPE (cx) == CXt_FORMAT))
708 { 828 {
709 CV *cv = cx->blk_sub.cv; 829 CV *cv = cx->blk_sub.cv;
710 830
711 if (expect_true (CvDEPTH (cv))) 831 if (ecb_expect_true (CvDEPTH (cv)))
712 { 832 {
713 EXTEND (SP, 3); 833 EXTEND (SP, 3);
714 PUSHs ((SV *)CvPADLIST (cv)); 834 PUSHs ((SV *)CvPADLIST (cv));
715 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv))); 835 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
716 PUSHs ((SV *)cv); 836 PUSHs ((SV *)cv);
… …
719 get_padlist (aTHX_ cv); 839 get_padlist (aTHX_ cv);
720 } 840 }
721 } 841 }
722 } 842 }
723 843
724 if (expect_true (top_si->si_type == PERLSI_MAIN)) 844 if (ecb_expect_true (top_si->si_type == PERLSI_MAIN))
725 break; 845 break;
726 846
727 top_si = top_si->si_prev; 847 top_si = top_si->si_prev;
728 ccstk = top_si->si_cxstack; 848 ccstk = top_si->si_cxstack;
729 cxix = top_si->si_cxix; 849 cxix = top_si->si_cxix;
… …
731 851
732 PUTBACK; 852 PUTBACK;
733 } 853 }
734 854
735 /* allocate some space on the context stack for our purposes */ 855 /* allocate some space on the context stack for our purposes */
736 /* we manually unroll here, as usually 2 slots is enough */ 856 if (ecb_expect_false (cxstack_ix + (int)SLOT_COUNT >= cxstack_max))
737 if (SLOT_COUNT >= 1) CXINC;
738 if (SLOT_COUNT >= 2) CXINC;
739 if (SLOT_COUNT >= 3) CXINC;
740 { 857 {
741 int i; 858 unsigned int i;
859
742 for (i = 3; i < SLOT_COUNT; ++i) 860 for (i = 0; i < SLOT_COUNT; ++i)
743 CXINC; 861 CXINC;
744 } 862
745 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 863 cxstack_ix -= SLOT_COUNT; /* undo allocation */
864 }
746 865
747 c->mainstack = PL_mainstack; 866 c->mainstack = PL_mainstack;
748 867
749 { 868 {
750 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 869 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
751 870
752 slot->defav = GvAV (PL_defgv); 871#if CORO_JIT
753 slot->defsv = DEFSV; 872 save_perl_slots (slot);
754 slot->errsv = ERRSV; 873#else
755 slot->irsgv = GvSV (irsgv);
756 slot->hinthv = GvHV (PL_hintgv);
757
758 #define VAR(name,type) slot->name = PL_ ## name; 874 #define VARx(name,expr,type) slot->name = expr;
759 # include "state.h" 875 #include "state.h"
760 #undef VAR 876#endif
761 } 877 }
762} 878}
763 879
764/* 880/*
765 * allocate various perl stacks. This is almost an exact copy 881 * allocate various perl stacks. This is almost an exact copy
… …
771# define coro_init_stacks(thx) init_stacks () 887# define coro_init_stacks(thx) init_stacks ()
772#else 888#else
773static void 889static void
774coro_init_stacks (pTHX) 890coro_init_stacks (pTHX)
775{ 891{
776 PL_curstackinfo = new_stackinfo(32, 8); 892 PL_curstackinfo = new_stackinfo(32, 4 + SLOT_COUNT); /* 3 is minimum due to perl rounding down in scope.c:GROW() */
777 PL_curstackinfo->si_type = PERLSI_MAIN; 893 PL_curstackinfo->si_type = PERLSI_MAIN;
778 PL_curstack = PL_curstackinfo->si_stack; 894 PL_curstack = PL_curstackinfo->si_stack;
779 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 895 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
780 896
781 PL_stack_base = AvARRAY(PL_curstack); 897 PL_stack_base = AvARRAY(PL_curstack);
… …
796#endif 912#endif
797 913
798 New(54,PL_scopestack,8,I32); 914 New(54,PL_scopestack,8,I32);
799 PL_scopestack_ix = 0; 915 PL_scopestack_ix = 0;
800 PL_scopestack_max = 8; 916 PL_scopestack_max = 8;
917#if HAS_SCOPESTACK_NAME
918 New(54,PL_scopestack_name,8,const char*);
919#endif
801 920
802 New(54,PL_savestack,24,ANY); 921 New(54,PL_savestack,24,ANY);
803 PL_savestack_ix = 0; 922 PL_savestack_ix = 0;
804 PL_savestack_max = 24; 923 PL_savestack_max = 24;
805 924
… …
833 } 952 }
834 953
835 Safefree (PL_tmps_stack); 954 Safefree (PL_tmps_stack);
836 Safefree (PL_markstack); 955 Safefree (PL_markstack);
837 Safefree (PL_scopestack); 956 Safefree (PL_scopestack);
957#if HAS_SCOPESTACK_NAME
958 Safefree (PL_scopestack_name);
959#endif
838 Safefree (PL_savestack); 960 Safefree (PL_savestack);
839#if !PERL_VERSION_ATLEAST (5,10,0) 961#if !PERL_VERSION_ATLEAST (5,10,0)
840 Safefree (PL_retstack); 962 Safefree (PL_retstack);
841#endif 963#endif
842} 964}
… …
888#endif 1010#endif
889 1011
890/* 1012/*
891 * This overrides the default magic get method of %SIG elements. 1013 * This overrides the default magic get method of %SIG elements.
892 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook 1014 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
893 * and instead of trying to save and restore the hash elements, we just provide 1015 * and instead of trying to save and restore the hash elements (extremely slow),
894 * readback here. 1016 * we just provide our own readback here.
895 */ 1017 */
896static int 1018static int ecb_cold
897coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 1019coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
898{ 1020{
899 const char *s = MgPV_nolen_const (mg); 1021 const char *s = MgPV_nolen_const (mg);
900 1022
901 if (*s == '_') 1023 if (*s == '_')
902 { 1024 {
903 SV **svp = 0; 1025 SV **svp = 0;
904 1026
905 if (strEQ (s, "__DIE__" )) svp = &PL_diehook; 1027 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
906 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 1028 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
907 1029
908 if (svp) 1030 if (svp)
909 { 1031 {
910 sv_setsv (sv, *svp ? *svp : &PL_sv_undef); 1032 SV *ssv;
1033
1034 if (!*svp)
1035 ssv = &PL_sv_undef;
1036 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */
1037 ssv = sv_2mortal (newRV_inc (*svp));
1038 else
1039 ssv = *svp;
1040
1041 sv_setsv (sv, ssv);
911 return 0; 1042 return 0;
912 } 1043 }
913 } 1044 }
914 1045
915 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 1046 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
916} 1047}
917 1048
918static int 1049static int ecb_cold
919coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1050coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
920{ 1051{
921 const char *s = MgPV_nolen_const (mg); 1052 const char *s = MgPV_nolen_const (mg);
922 1053
923 if (*s == '_') 1054 if (*s == '_')
… …
937 } 1068 }
938 1069
939 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0; 1070 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
940} 1071}
941 1072
942static int 1073static int ecb_cold
943coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1074coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
944{ 1075{
945 const char *s = MgPV_nolen_const (mg); 1076 const char *s = MgPV_nolen_const (mg);
946 1077
947 if (*s == '_') 1078 if (*s == '_')
… …
980slf_check_repeat (pTHX_ struct CoroSLF *frame) 1111slf_check_repeat (pTHX_ struct CoroSLF *frame)
981{ 1112{
982 return 1; 1113 return 1;
983} 1114}
984 1115
985static UNOP coro_setup_op; 1116static UNOP init_perl_op;
986 1117
987static void NOINLINE /* noinline to keep it out of the transfer fast path */ 1118ecb_noinline static void /* noinline to keep it out of the transfer fast path */
988coro_setup (pTHX_ struct coro *coro) 1119init_perl (pTHX_ struct coro *coro)
989{ 1120{
990 /* 1121 /*
991 * emulate part of the perl startup here. 1122 * emulate part of the perl startup here.
992 */ 1123 */
993 coro_init_stacks (aTHX); 1124 coro_init_stacks (aTHX);
… …
1000 PL_comppad_name_fill = 0; 1131 PL_comppad_name_fill = 0;
1001 PL_comppad_name_floor = 0; 1132 PL_comppad_name_floor = 0;
1002 PL_curpm = 0; 1133 PL_curpm = 0;
1003 PL_curpad = 0; 1134 PL_curpad = 0;
1004 PL_localizing = 0; 1135 PL_localizing = 0;
1005 PL_dirty = 0;
1006 PL_restartop = 0; 1136 PL_restartop = 0;
1007#if PERL_VERSION_ATLEAST (5,10,0) 1137#if PERL_VERSION_ATLEAST (5,10,0)
1008 PL_parser = 0; 1138 PL_parser = 0;
1009#endif 1139#endif
1010 PL_hints = 0; 1140 PL_hints = 0;
1011 1141
1012 /* recreate the die/warn hooks */ 1142 /* recreate the die/warn hooks */
1013 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1143 PL_diehook = SvREFCNT_inc (rv_diehook);
1014 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1144 PL_warnhook = SvREFCNT_inc (rv_warnhook);
1015 1145
1016 GvSV (PL_defgv) = newSV (0); 1146 GvSV (PL_defgv) = newSV (0);
1017 GvAV (PL_defgv) = coro->args; coro->args = 0; 1147 GvAV (PL_defgv) = coro->args; coro->args = 0;
1018 GvSV (PL_errgv) = newSV (0); 1148 GvSV (PL_errgv) = newSV (0);
1019 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1149 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
1020 GvHV (PL_hintgv) = 0; 1150 GvHV (PL_hintgv) = 0;
… …
1040 /* this newly created coroutine might be run on an existing cctx which most 1170 /* this newly created coroutine might be run on an existing cctx which most
1041 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here. 1171 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
1042 */ 1172 */
1043 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1173 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
1044 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */ 1174 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
1175 slf_frame.destroy = 0;
1045 1176
1046 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1177 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */
1047 coro_setup_op.op_next = PL_op; 1178 init_perl_op.op_next = PL_op;
1048 coro_setup_op.op_type = OP_ENTERSUB; 1179 init_perl_op.op_type = OP_ENTERSUB;
1049 coro_setup_op.op_ppaddr = pp_slf; 1180 init_perl_op.op_ppaddr = pp_slf;
1050 /* no flags etc. required, as an init function won't be called */ 1181 /* no flags etc. required, as an init function won't be called */
1051 1182
1052 PL_op = (OP *)&coro_setup_op; 1183 PL_op = (OP *)&init_perl_op;
1053 1184
1054 /* copy throw, in case it was set before coro_setup */ 1185 /* copy throw, in case it was set before init_perl */
1055 CORO_THROW = coro->except; 1186 CORO_THROW = coro->except;
1056 1187
1188 SWAP_SVS (coro);
1189
1057 if (expect_false (enable_times)) 1190 if (ecb_expect_false (enable_times))
1058 { 1191 {
1059 coro_times_update (); 1192 coro_times_update ();
1060 coro_times_sub (coro); 1193 coro_times_sub (coro);
1061 } 1194 }
1062} 1195}
… …
1081 dounwind (-1); 1214 dounwind (-1);
1082 } 1215 }
1083} 1216}
1084 1217
1085static void 1218static void
1086coro_destruct_perl (pTHX_ struct coro *coro) 1219destroy_perl (pTHX_ struct coro *coro)
1087{ 1220{
1088 SV *svf [9]; 1221 SV *svf [9];
1089 1222
1090 { 1223 {
1224 SV *old_current = SvRV (coro_current);
1091 struct coro *current = SvSTATE_current; 1225 struct coro *current = SvSTATE (old_current);
1092 1226
1093 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack)); 1227 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1094 1228
1095 save_perl (aTHX_ current); 1229 save_perl (aTHX_ current);
1230
1231 /* this will cause transfer_check to croak on block*/
1232 SvRV_set (coro_current, (SV *)coro->hv);
1233
1096 load_perl (aTHX_ coro); 1234 load_perl (aTHX_ coro);
1097 1235
1098 coro_unwind_stacks (aTHX); 1236 coro_unwind_stacks (aTHX);
1237
1238 /* restore swapped sv's */
1239 SWAP_SVS (coro);
1240
1099 coro_destruct_stacks (aTHX); 1241 coro_destruct_stacks (aTHX);
1100 1242
1101 // now save some sv's to be free'd later 1243 /* now save some sv's to be free'd later */
1102 svf [0] = GvSV (PL_defgv); 1244 svf [0] = GvSV (PL_defgv);
1103 svf [1] = (SV *)GvAV (PL_defgv); 1245 svf [1] = (SV *)GvAV (PL_defgv);
1104 svf [2] = GvSV (PL_errgv); 1246 svf [2] = GvSV (PL_errgv);
1105 svf [3] = (SV *)PL_defoutgv; 1247 svf [3] = (SV *)PL_defoutgv;
1106 svf [4] = PL_rs; 1248 svf [4] = PL_rs;
… …
1108 svf [6] = (SV *)GvHV (PL_hintgv); 1250 svf [6] = (SV *)GvHV (PL_hintgv);
1109 svf [7] = PL_diehook; 1251 svf [7] = PL_diehook;
1110 svf [8] = PL_warnhook; 1252 svf [8] = PL_warnhook;
1111 assert (9 == sizeof (svf) / sizeof (*svf)); 1253 assert (9 == sizeof (svf) / sizeof (*svf));
1112 1254
1255 SvRV_set (coro_current, old_current);
1256
1113 load_perl (aTHX_ current); 1257 load_perl (aTHX_ current);
1114 } 1258 }
1115 1259
1116 { 1260 {
1117 int i; 1261 unsigned int i;
1118 1262
1119 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i) 1263 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i)
1120 SvREFCNT_dec (svf [i]); 1264 SvREFCNT_dec (svf [i]);
1121 1265
1122 SvREFCNT_dec (coro->saved_deffh); 1266 SvREFCNT_dec (coro->saved_deffh);
… …
1124 SvREFCNT_dec (coro->invoke_cb); 1268 SvREFCNT_dec (coro->invoke_cb);
1125 SvREFCNT_dec (coro->invoke_av); 1269 SvREFCNT_dec (coro->invoke_av);
1126 } 1270 }
1127} 1271}
1128 1272
1129INLINE void 1273ecb_inline void
1130free_coro_mortal (pTHX) 1274free_coro_mortal (pTHX)
1131{ 1275{
1132 if (expect_true (coro_mortal)) 1276 if (ecb_expect_true (coro_mortal))
1133 { 1277 {
1134 SvREFCNT_dec (coro_mortal); 1278 SvREFCNT_dec ((SV *)coro_mortal);
1135 coro_mortal = 0; 1279 coro_mortal = 0;
1136 } 1280 }
1137} 1281}
1138 1282
1139static int 1283static int
… …
1272 1416
1273 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1417 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1274} 1418}
1275 1419
1276/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1420/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1277static void NOINLINE 1421static void ecb_noinline
1278cctx_prepare (pTHX) 1422cctx_prepare (pTHX)
1279{ 1423{
1280 PL_top_env = &PL_start_env; 1424 PL_top_env = &PL_start_env;
1281 1425
1282 if (cctx_current->flags & CC_TRACE) 1426 if (cctx_current->flags & CC_TRACE)
… …
1293 slf_frame.prepare = slf_prepare_set_stacklevel; 1437 slf_frame.prepare = slf_prepare_set_stacklevel;
1294 slf_frame.check = slf_check_set_stacklevel; 1438 slf_frame.check = slf_check_set_stacklevel;
1295} 1439}
1296 1440
1297/* the tail of transfer: execute stuff we can only do after a transfer */ 1441/* the tail of transfer: execute stuff we can only do after a transfer */
1298INLINE void 1442ecb_inline void
1299transfer_tail (pTHX) 1443transfer_tail (pTHX)
1300{ 1444{
1301 free_coro_mortal (aTHX); 1445 free_coro_mortal (aTHX);
1446}
1447
1448/* try to exit the same way perl's main function would do */
1449/* we do not bother resetting the environment or other things *7
1450/* that are not, uhm, essential */
1451/* this obviously also doesn't work when perl is embedded */
1452static void ecb_noinline ecb_cold
1453perlish_exit (pTHX)
1454{
1455 int exitstatus = perl_destruct (PL_curinterp);
1456 perl_free (PL_curinterp);
1457 exit (exitstatus);
1302} 1458}
1303 1459
1304/* 1460/*
1305 * this is a _very_ stripped down perl interpreter ;) 1461 * this is a _very_ stripped down perl interpreter ;)
1306 */ 1462 */
… …
1328 /* somebody or something will hit me for both perl_run and PL_restartop */ 1484 /* somebody or something will hit me for both perl_run and PL_restartop */
1329 PL_restartop = PL_op; 1485 PL_restartop = PL_op;
1330 perl_run (PL_curinterp); 1486 perl_run (PL_curinterp);
1331 /* 1487 /*
1332 * Unfortunately, there is no way to get at the return values of the 1488 * Unfortunately, there is no way to get at the return values of the
1333 * coro body here, as perl_run destroys these 1489 * coro body here, as perl_run destroys these. Likewise, we cannot catch
1490 * runtime errors here, as this is just a random interpreter, not a thread.
1334 */ 1491 */
1335 1492
1336 /* 1493 /*
1337 * If perl-run returns we assume exit() was being called or the coro 1494 * If perl-run returns we assume exit() was being called or the coro
1338 * fell off the end, which seems to be the only valid (non-bug) 1495 * fell off the end, which seems to be the only valid (non-bug)
1339 * reason for perl_run to return. We try to exit by jumping to the 1496 * reason for perl_run to return. We try to mimic whatever perl is normally
1340 * bootstrap-time "top" top_env, as we cannot restore the "main" 1497 * doing in that case. YMMV.
1341 * coroutine as Coro has no such concept.
1342 * This actually isn't valid with the pthread backend, but OSes requiring
1343 * that backend are too broken to do it in a standards-compliant way.
1344 */ 1498 */
1345 PL_top_env = main_top_env; 1499 perlish_exit (aTHX);
1346 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1347 } 1500 }
1348} 1501}
1349 1502
1350static coro_cctx * 1503static coro_cctx *
1351cctx_new () 1504cctx_new (void)
1352{ 1505{
1353 coro_cctx *cctx; 1506 coro_cctx *cctx;
1354 1507
1355 ++cctx_count; 1508 ++cctx_count;
1356 New (0, cctx, 1, coro_cctx); 1509 New (0, cctx, 1, coro_cctx);
… …
1362 return cctx; 1515 return cctx;
1363} 1516}
1364 1517
1365/* create a new cctx only suitable as source */ 1518/* create a new cctx only suitable as source */
1366static coro_cctx * 1519static coro_cctx *
1367cctx_new_empty () 1520cctx_new_empty (void)
1368{ 1521{
1369 coro_cctx *cctx = cctx_new (); 1522 coro_cctx *cctx = cctx_new ();
1370 1523
1371 cctx->sptr = 0; 1524 cctx->sptr = 0;
1372 coro_create (&cctx->cctx, 0, 0, 0, 0); 1525 coro_create (&cctx->cctx, 0, 0, 0, 0);
… …
1374 return cctx; 1527 return cctx;
1375} 1528}
1376 1529
1377/* create a new cctx suitable as destination/running a perl interpreter */ 1530/* create a new cctx suitable as destination/running a perl interpreter */
1378static coro_cctx * 1531static coro_cctx *
1379cctx_new_run () 1532cctx_new_run (void)
1380{ 1533{
1381 coro_cctx *cctx = cctx_new (); 1534 coro_cctx *cctx = cctx_new ();
1382 void *stack_start; 1535 void *stack_start;
1383 size_t stack_size; 1536 size_t stack_size;
1384 1537
1385#if HAVE_MMAP 1538#if HAVE_MMAP
1386 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE; 1539 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1387 /* mmap supposedly does allocate-on-write for us */ 1540 /* mmap supposedly does allocate-on-write for us */
1388 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0); 1541 cctx->sptr = mmap (0, cctx->ssize, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_ANONYMOUS, -1, 0);
1389 1542
1390 if (cctx->sptr != (void *)-1) 1543 if (cctx->sptr != (void *)-1)
1391 { 1544 {
1392 #if CORO_STACKGUARD 1545 #if CORO_STACKGUARD
1393 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE); 1546 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
… …
1425cctx_destroy (coro_cctx *cctx) 1578cctx_destroy (coro_cctx *cctx)
1426{ 1579{
1427 if (!cctx) 1580 if (!cctx)
1428 return; 1581 return;
1429 1582
1430 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary? 1583 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1431 1584
1432 --cctx_count; 1585 --cctx_count;
1433 coro_destroy (&cctx->cctx); 1586 coro_destroy (&cctx->cctx);
1434 1587
1435 /* coro_transfer creates new, empty cctx's */ 1588 /* coro_transfer creates new, empty cctx's */
… …
1454#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE)) 1607#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE))
1455 1608
1456static coro_cctx * 1609static coro_cctx *
1457cctx_get (pTHX) 1610cctx_get (pTHX)
1458{ 1611{
1459 while (expect_true (cctx_first)) 1612 while (ecb_expect_true (cctx_first))
1460 { 1613 {
1461 coro_cctx *cctx = cctx_first; 1614 coro_cctx *cctx = cctx_first;
1462 cctx_first = cctx->next; 1615 cctx_first = cctx->next;
1463 --cctx_idle; 1616 --cctx_idle;
1464 1617
1465 if (expect_true (!CCTX_EXPIRED (cctx))) 1618 if (ecb_expect_true (!CCTX_EXPIRED (cctx)))
1466 return cctx; 1619 return cctx;
1467 1620
1468 cctx_destroy (cctx); 1621 cctx_destroy (cctx);
1469 } 1622 }
1470 1623
… …
1475cctx_put (coro_cctx *cctx) 1628cctx_put (coro_cctx *cctx)
1476{ 1629{
1477 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1630 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr));
1478 1631
1479 /* free another cctx if overlimit */ 1632 /* free another cctx if overlimit */
1480 if (expect_false (cctx_idle >= cctx_max_idle)) 1633 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1481 { 1634 {
1482 coro_cctx *first = cctx_first; 1635 coro_cctx *first = cctx_first;
1483 cctx_first = first->next; 1636 cctx_first = first->next;
1484 --cctx_idle; 1637 --cctx_idle;
1485 1638
… …
1496static void 1649static void
1497transfer_check (pTHX_ struct coro *prev, struct coro *next) 1650transfer_check (pTHX_ struct coro *prev, struct coro *next)
1498{ 1651{
1499 /* TODO: throwing up here is considered harmful */ 1652 /* TODO: throwing up here is considered harmful */
1500 1653
1501 if (expect_true (prev != next)) 1654 if (ecb_expect_true (prev != next))
1502 { 1655 {
1503 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1656 if (ecb_expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1504 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,"); 1657 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1505 1658
1506 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED))) 1659 if (ecb_expect_false (next->flags & (CF_RUNNING | CF_ZOMBIE | CF_SUSPENDED)))
1507 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,"); 1660 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1508 1661
1509#if !PERL_VERSION_ATLEAST (5,10,0) 1662#if !PERL_VERSION_ATLEAST (5,10,0)
1510 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1663 if (ecb_expect_false (PL_lex_state != LEX_NOTPARSING))
1511 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,"); 1664 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1512#endif 1665#endif
1513 } 1666 }
1514} 1667}
1515 1668
1516/* always use the TRANSFER macro */ 1669/* always use the TRANSFER macro */
1517static void NOINLINE /* noinline so we have a fixed stackframe */ 1670static void ecb_noinline /* noinline so we have a fixed stackframe */
1518transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1671transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1519{ 1672{
1520 dSTACKLEVEL; 1673 dSTACKLEVEL;
1521 1674
1522 /* sometimes transfer is only called to set idle_sp */ 1675 /* sometimes transfer is only called to set idle_sp */
1523 if (expect_false (!prev)) 1676 if (ecb_expect_false (!prev))
1524 { 1677 {
1525 cctx_current->idle_sp = STACKLEVEL; 1678 cctx_current->idle_sp = STACKLEVEL;
1526 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1679 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1527 } 1680 }
1528 else if (expect_true (prev != next)) 1681 else if (ecb_expect_true (prev != next))
1529 { 1682 {
1530 coro_cctx *cctx_prev; 1683 coro_cctx *cctx_prev;
1531 1684
1532 if (expect_false (prev->flags & CF_NEW)) 1685 if (ecb_expect_false (prev->flags & CF_NEW))
1533 { 1686 {
1534 /* create a new empty/source context */ 1687 /* create a new empty/source context */
1535 prev->flags &= ~CF_NEW; 1688 prev->flags &= ~CF_NEW;
1536 prev->flags |= CF_RUNNING; 1689 prev->flags |= CF_RUNNING;
1537 } 1690 }
… …
1540 next->flags |= CF_RUNNING; 1693 next->flags |= CF_RUNNING;
1541 1694
1542 /* first get rid of the old state */ 1695 /* first get rid of the old state */
1543 save_perl (aTHX_ prev); 1696 save_perl (aTHX_ prev);
1544 1697
1545 if (expect_false (next->flags & CF_NEW)) 1698 if (ecb_expect_false (next->flags & CF_NEW))
1546 { 1699 {
1547 /* need to start coroutine */ 1700 /* need to start coroutine */
1548 next->flags &= ~CF_NEW; 1701 next->flags &= ~CF_NEW;
1549 /* setup coroutine call */ 1702 /* setup coroutine call */
1550 coro_setup (aTHX_ next); 1703 init_perl (aTHX_ next);
1551 } 1704 }
1552 else 1705 else
1553 load_perl (aTHX_ next); 1706 load_perl (aTHX_ next);
1554 1707
1555 /* possibly untie and reuse the cctx */ 1708 /* possibly untie and reuse the cctx */
1556 if (expect_true ( 1709 if (ecb_expect_true (
1557 cctx_current->idle_sp == STACKLEVEL 1710 cctx_current->idle_sp == STACKLEVEL
1558 && !(cctx_current->flags & CC_TRACE) 1711 && !(cctx_current->flags & CC_TRACE)
1559 && !force_cctx 1712 && !force_cctx
1560 )) 1713 ))
1561 { 1714 {
1562 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1715 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */
1563 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te)); 1716 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1564 1717
1565 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */ 1718 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */
1566 /* without this the next cctx_get might destroy the running cctx while still in use */ 1719 /* without this the next cctx_get might destroy the running cctx while still in use */
1567 if (expect_false (CCTX_EXPIRED (cctx_current))) 1720 if (ecb_expect_false (CCTX_EXPIRED (cctx_current)))
1568 if (expect_true (!next->cctx)) 1721 if (ecb_expect_true (!next->cctx))
1569 next->cctx = cctx_get (aTHX); 1722 next->cctx = cctx_get (aTHX);
1570 1723
1571 cctx_put (cctx_current); 1724 cctx_put (cctx_current);
1572 } 1725 }
1573 else 1726 else
1574 prev->cctx = cctx_current; 1727 prev->cctx = cctx_current;
1575 1728
1576 ++next->usecount; 1729 ++next->usecount;
1577 1730
1578 cctx_prev = cctx_current; 1731 cctx_prev = cctx_current;
1579 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX); 1732 cctx_current = ecb_expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1580 1733
1581 next->cctx = 0; 1734 next->cctx = 0;
1582 1735
1583 if (expect_false (cctx_prev != cctx_current)) 1736 if (ecb_expect_false (cctx_prev != cctx_current))
1584 { 1737 {
1585 cctx_prev->top_env = PL_top_env; 1738 cctx_prev->top_env = PL_top_env;
1586 PL_top_env = cctx_current->top_env; 1739 PL_top_env = cctx_current->top_env;
1587 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx); 1740 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1588 } 1741 }
… …
1594#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx)) 1747#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1595#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1748#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1596 1749
1597/** high level stuff ********************************************************/ 1750/** high level stuff ********************************************************/
1598 1751
1752/* this function is actually Coro, not Coro::State, but we call it from here */
1753/* because it is convenient - but it hasn't been declared yet for that reason */
1599static int 1754static void
1755coro_call_on_destroy (pTHX_ struct coro *coro);
1756
1757static void
1600coro_state_destroy (pTHX_ struct coro *coro) 1758coro_state_destroy (pTHX_ struct coro *coro)
1601{ 1759{
1602 if (coro->flags & CF_DESTROYED) 1760 if (coro->flags & CF_ZOMBIE)
1603 return 0; 1761 return;
1604 1762
1605 if (coro->on_destroy && !PL_dirty)
1606 coro->on_destroy (aTHX_ coro); 1763 slf_destroy (aTHX_ coro);
1607 1764
1608 coro->flags |= CF_DESTROYED; 1765 coro->flags |= CF_ZOMBIE;
1609 1766
1610 if (coro->flags & CF_READY) 1767 if (coro->flags & CF_READY)
1611 { 1768 {
1612 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1769 /* reduce nready, as destroying a ready coro effectively unreadies it */
1613 /* alternative: look through all ready queues and remove the coro */ 1770 /* alternative: look through all ready queues and remove the coro */
1614 --coro_nready; 1771 --coro_nready;
1615 } 1772 }
1616 else 1773 else
1617 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1774 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1775
1776 if (coro->next) coro->next->prev = coro->prev;
1777 if (coro->prev) coro->prev->next = coro->next;
1778 if (coro == coro_first) coro_first = coro->next;
1618 1779
1619 if (coro->mainstack 1780 if (coro->mainstack
1620 && coro->mainstack != main_mainstack 1781 && coro->mainstack != main_mainstack
1621 && coro->slot 1782 && coro->slot
1622 && !PL_dirty) 1783 && !PL_dirty)
1623 coro_destruct_perl (aTHX_ coro); 1784 destroy_perl (aTHX_ coro);
1624 1785
1625 cctx_destroy (coro->cctx); 1786 cctx_destroy (coro->cctx);
1626 SvREFCNT_dec (coro->startcv); 1787 SvREFCNT_dec (coro->startcv);
1627 SvREFCNT_dec (coro->args); 1788 SvREFCNT_dec (coro->args);
1789 SvREFCNT_dec (coro->swap_sv);
1628 SvREFCNT_dec (CORO_THROW); 1790 SvREFCNT_dec (CORO_THROW);
1629 1791
1630 if (coro->next) coro->next->prev = coro->prev; 1792 coro_call_on_destroy (aTHX_ coro);
1631 if (coro->prev) coro->prev->next = coro->next;
1632 if (coro == coro_first) coro_first = coro->next;
1633 1793
1634 return 1; 1794 /* more destruction mayhem in coro_state_free */
1635} 1795}
1636 1796
1637static int 1797static int
1638coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1798coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1639{ 1799{
1640 struct coro *coro = (struct coro *)mg->mg_ptr; 1800 struct coro *coro = (struct coro *)mg->mg_ptr;
1641 mg->mg_ptr = 0; 1801 mg->mg_ptr = 0;
1642 1802
1643 coro->hv = 0;
1644
1645 if (--coro->refcnt < 0)
1646 {
1647 coro_state_destroy (aTHX_ coro); 1803 coro_state_destroy (aTHX_ coro);
1804 SvREFCNT_dec (coro->on_destroy);
1805 SvREFCNT_dec (coro->status);
1806
1648 Safefree (coro); 1807 Safefree (coro);
1649 }
1650 1808
1651 return 0; 1809 return 0;
1652} 1810}
1653 1811
1654static int 1812static int ecb_cold
1655coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1813coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1656{ 1814{
1657 struct coro *coro = (struct coro *)mg->mg_ptr; 1815 /* called when perl clones the current process the slow way (windows process emulation) */
1658 1816 /* WE SIMply nuke the pointers in the copy, causing perl to croak */
1659 ++coro->refcnt; 1817 mg->mg_ptr = 0;
1818 mg->mg_virtual = 0;
1660 1819
1661 return 0; 1820 return 0;
1662} 1821}
1663 1822
1664static MGVTBL coro_state_vtbl = { 1823static MGVTBL coro_state_vtbl = {
… …
1687 1846
1688 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1847 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1689 TRANSFER (ta, 1); 1848 TRANSFER (ta, 1);
1690} 1849}
1691 1850
1692/*****************************************************************************/
1693/* gensub: simple closure generation utility */
1694
1695#define GENSUB_ARG CvXSUBANY (cv).any_ptr
1696
1697/* create a closure from XS, returns a code reference */
1698/* the arg can be accessed via GENSUB_ARG from the callback */
1699/* the callback must use dXSARGS/XSRETURN */
1700static SV *
1701gensub (pTHX_ void (*xsub)(pTHX_ CV *), void *arg)
1702{
1703 CV *cv = (CV *)newSV (0);
1704
1705 sv_upgrade ((SV *)cv, SVt_PVCV);
1706
1707 CvANON_on (cv);
1708 CvISXSUB_on (cv);
1709 CvXSUB (cv) = xsub;
1710 GENSUB_ARG = arg;
1711
1712 return newRV_noinc ((SV *)cv);
1713}
1714
1715/** Coro ********************************************************************/ 1851/** Coro ********************************************************************/
1716 1852
1717INLINE void 1853ecb_inline void
1718coro_enq (pTHX_ struct coro *coro) 1854coro_enq (pTHX_ struct coro *coro)
1719{ 1855{
1720 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN]; 1856 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1721 1857
1722 SvREFCNT_inc_NN (coro->hv); 1858 SvREFCNT_inc_NN (coro->hv);
… …
1724 coro->next_ready = 0; 1860 coro->next_ready = 0;
1725 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro; 1861 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1726 ready [1] = coro; 1862 ready [1] = coro;
1727} 1863}
1728 1864
1729INLINE struct coro * 1865ecb_inline struct coro *
1730coro_deq (pTHX) 1866coro_deq (pTHX)
1731{ 1867{
1732 int prio; 1868 int prio;
1733 1869
1734 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; ) 1870 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
… …
1744 } 1880 }
1745 1881
1746 return 0; 1882 return 0;
1747} 1883}
1748 1884
1885static void
1886invoke_sv_ready_hook_helper (void)
1887{
1888 dTHX;
1889 dSP;
1890
1891 ENTER;
1892 SAVETMPS;
1893
1894 PUSHMARK (SP);
1895 PUTBACK;
1896 call_sv (coro_readyhook, G_VOID | G_DISCARD);
1897
1898 FREETMPS;
1899 LEAVE;
1900}
1901
1749static int 1902static int
1750api_ready (pTHX_ SV *coro_sv) 1903api_ready (pTHX_ SV *coro_sv)
1751{ 1904{
1752 struct coro *coro;
1753 SV *sv_hook;
1754 void (*xs_hook)(void);
1755
1756 coro = SvSTATE (coro_sv); 1905 struct coro *coro = SvSTATE (coro_sv);
1757 1906
1758 if (coro->flags & CF_READY) 1907 if (coro->flags & CF_READY)
1759 return 0; 1908 return 0;
1760 1909
1761 coro->flags |= CF_READY; 1910 coro->flags |= CF_READY;
1762 1911
1763 sv_hook = coro_nready ? 0 : coro_readyhook;
1764 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1765
1766 coro_enq (aTHX_ coro); 1912 coro_enq (aTHX_ coro);
1767 ++coro_nready;
1768 1913
1769 if (sv_hook) 1914 if (!coro_nready++)
1770 { 1915 if (coroapi.readyhook)
1771 dSP; 1916 coroapi.readyhook ();
1772
1773 ENTER;
1774 SAVETMPS;
1775
1776 PUSHMARK (SP);
1777 PUTBACK;
1778 call_sv (sv_hook, G_VOID | G_DISCARD);
1779
1780 FREETMPS;
1781 LEAVE;
1782 }
1783
1784 if (xs_hook)
1785 xs_hook ();
1786 1917
1787 return 1; 1918 return 1;
1788} 1919}
1789 1920
1790static int 1921static int
… …
1792{ 1923{
1793 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1924 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1794} 1925}
1795 1926
1796/* expects to own a reference to next->hv */ 1927/* expects to own a reference to next->hv */
1797INLINE void 1928ecb_inline void
1798prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1929prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1799{ 1930{
1800 SV *prev_sv = SvRV (coro_current); 1931 SV *prev_sv = SvRV (coro_current);
1801 1932
1802 ta->prev = SvSTATE_hv (prev_sv); 1933 ta->prev = SvSTATE_hv (prev_sv);
… …
1815{ 1946{
1816 for (;;) 1947 for (;;)
1817 { 1948 {
1818 struct coro *next = coro_deq (aTHX); 1949 struct coro *next = coro_deq (aTHX);
1819 1950
1820 if (expect_true (next)) 1951 if (ecb_expect_true (next))
1821 { 1952 {
1822 /* cannot transfer to destroyed coros, skip and look for next */ 1953 /* cannot transfer to destroyed coros, skip and look for next */
1823 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED))) 1954 if (ecb_expect_false (next->flags & (CF_ZOMBIE | CF_SUSPENDED)))
1824 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */ 1955 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1825 else 1956 else
1826 { 1957 {
1827 next->flags &= ~CF_READY; 1958 next->flags &= ~CF_READY;
1828 --coro_nready; 1959 --coro_nready;
… …
1835 { 1966 {
1836 /* nothing to schedule: call the idle handler */ 1967 /* nothing to schedule: call the idle handler */
1837 if (SvROK (sv_idle) 1968 if (SvROK (sv_idle)
1838 && SvOBJECT (SvRV (sv_idle))) 1969 && SvOBJECT (SvRV (sv_idle)))
1839 { 1970 {
1971 if (SvRV (sv_idle) == SvRV (coro_current))
1972 croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught");
1973
1840 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 1974 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1841 api_ready (aTHX_ SvRV (sv_idle)); 1975 api_ready (aTHX_ SvRV (sv_idle));
1842 --coro_nready; 1976 --coro_nready;
1843 } 1977 }
1844 else 1978 else
1845 { 1979 {
1980 /* TODO: deprecated, remove, cannot work reliably *//*D*/
1846 dSP; 1981 dSP;
1847 1982
1848 ENTER; 1983 ENTER;
1849 SAVETMPS; 1984 SAVETMPS;
1850 1985
… …
1857 } 1992 }
1858 } 1993 }
1859 } 1994 }
1860} 1995}
1861 1996
1862INLINE void 1997ecb_inline void
1863prepare_cede (pTHX_ struct coro_transfer_args *ta) 1998prepare_cede (pTHX_ struct coro_transfer_args *ta)
1864{ 1999{
1865 api_ready (aTHX_ coro_current); 2000 api_ready (aTHX_ coro_current);
1866 prepare_schedule (aTHX_ ta); 2001 prepare_schedule (aTHX_ ta);
1867} 2002}
1868 2003
1869INLINE void 2004ecb_inline void
1870prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 2005prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1871{ 2006{
1872 SV *prev = SvRV (coro_current); 2007 SV *prev = SvRV (coro_current);
1873 2008
1874 if (coro_nready) 2009 if (coro_nready)
… …
1904{ 2039{
1905 struct coro_transfer_args ta; 2040 struct coro_transfer_args ta;
1906 2041
1907 prepare_cede (aTHX_ &ta); 2042 prepare_cede (aTHX_ &ta);
1908 2043
1909 if (expect_true (ta.prev != ta.next)) 2044 if (ecb_expect_true (ta.prev != ta.next))
1910 { 2045 {
1911 TRANSFER (ta, 1); 2046 TRANSFER (ta, 1);
1912 return 1; 2047 return 1;
1913 } 2048 }
1914 else 2049 else
… …
1957 coro->slot->runops = RUNOPS_DEFAULT; 2092 coro->slot->runops = RUNOPS_DEFAULT;
1958 } 2093 }
1959} 2094}
1960 2095
1961static void 2096static void
2097coro_push_av (pTHX_ AV *av, I32 gimme_v)
2098{
2099 if (AvFILLp (av) >= 0 && gimme_v != G_VOID)
2100 {
2101 dSP;
2102
2103 if (gimme_v == G_SCALAR)
2104 XPUSHs (AvARRAY (av)[AvFILLp (av)]);
2105 else
2106 {
2107 int i;
2108 EXTEND (SP, AvFILLp (av) + 1);
2109
2110 for (i = 0; i <= AvFILLp (av); ++i)
2111 PUSHs (AvARRAY (av)[i]);
2112 }
2113
2114 PUTBACK;
2115 }
2116}
2117
2118static void
2119coro_push_on_destroy (pTHX_ struct coro *coro, SV *cb)
2120{
2121 if (!coro->on_destroy)
2122 coro->on_destroy = newAV ();
2123
2124 av_push (coro->on_destroy, cb);
2125}
2126
2127static void
2128slf_destroy_join (pTHX_ struct CoroSLF *frame)
2129{
2130 SvREFCNT_dec ((SV *)((struct coro *)frame->data)->hv);
2131}
2132
2133static int
2134slf_check_join (pTHX_ struct CoroSLF *frame)
2135{
2136 struct coro *coro = (struct coro *)frame->data;
2137
2138 if (!coro->status)
2139 return 1;
2140
2141 frame->destroy = 0;
2142
2143 coro_push_av (aTHX_ coro->status, GIMME_V);
2144
2145 SvREFCNT_dec ((SV *)coro->hv);
2146
2147 return 0;
2148}
2149
2150static void
2151slf_init_join (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2152{
2153 struct coro *coro = SvSTATE (items > 0 ? arg [0] : &PL_sv_undef);
2154
2155 if (items > 1)
2156 croak ("join called with too many arguments");
2157
2158 if (coro->status)
2159 frame->prepare = prepare_nop;
2160 else
2161 {
2162 coro_push_on_destroy (aTHX_ coro, SvREFCNT_inc_NN (SvRV (coro_current)));
2163 frame->prepare = prepare_schedule;
2164 }
2165
2166 frame->check = slf_check_join;
2167 frame->destroy = slf_destroy_join;
2168 frame->data = (void *)coro;
2169 SvREFCNT_inc (coro->hv);
2170}
2171
2172static void
1962coro_call_on_destroy (pTHX_ struct coro *coro) 2173coro_call_on_destroy (pTHX_ struct coro *coro)
1963{ 2174{
1964 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2175 AV *od = coro->on_destroy;
1965 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1966 2176
1967 if (on_destroyp) 2177 if (!od)
1968 { 2178 return;
1969 AV *on_destroy = (AV *)SvRV (*on_destroyp);
1970 2179
1971 while (AvFILLp (on_destroy) >= 0) 2180 while (AvFILLp (od) >= 0)
2181 {
2182 SV *cb = sv_2mortal (av_pop (od));
2183
2184 /* coro hv's (and only hv's at the moment) are supported as well */
2185 if (SvSTATEhv_p (aTHX_ cb))
2186 api_ready (aTHX_ cb);
2187 else
1972 { 2188 {
1973 dSP; /* don't disturb outer sp */ 2189 dSP; /* don't disturb outer sp */
1974 SV *cb = av_pop (on_destroy);
1975
1976 PUSHMARK (SP); 2190 PUSHMARK (SP);
1977 2191
1978 if (statusp) 2192 if (coro->status)
1979 { 2193 {
1980 int i; 2194 PUTBACK;
1981 AV *status = (AV *)SvRV (*statusp); 2195 coro_push_av (aTHX_ coro->status, G_ARRAY);
1982 EXTEND (SP, AvFILLp (status) + 1); 2196 SPAGAIN;
1983
1984 for (i = 0; i <= AvFILLp (status); ++i)
1985 PUSHs (AvARRAY (status)[i]);
1986 } 2197 }
1987 2198
1988 PUTBACK; 2199 PUTBACK;
1989 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD); 2200 call_sv (cb, G_VOID | G_DISCARD);
1990 } 2201 }
1991 } 2202 }
1992} 2203}
1993 2204
1994static void 2205static void
1995slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2206coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
1996{ 2207{
2208 AV *av;
2209
2210 if (coro->status)
2211 {
2212 av = coro->status;
2213 av_clear (av);
2214 }
2215 else
2216 av = coro->status = newAV ();
2217
2218 /* items are actually not so common, so optimise for this case */
2219 if (items)
2220 {
1997 int i; 2221 int i;
1998 HV *hv = (HV *)SvRV (coro_current);
1999 AV *av = newAV ();
2000 2222
2001 av_extend (av, items - 1); 2223 av_extend (av, items - 1);
2224
2002 for (i = 0; i < items; ++i) 2225 for (i = 0; i < items; ++i)
2003 av_push (av, SvREFCNT_inc_NN (arg [i])); 2226 av_push (av, SvREFCNT_inc_NN (arg [i]));
2227 }
2228}
2004 2229
2005 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 2230static void
2006 2231slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2232{
2007 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */ 2233 av_push (av_destroy, (SV *)newRV_inc ((SV *)coro_hv)); /* RVinc for perl */
2008 api_ready (aTHX_ sv_manager); 2234 api_ready (aTHX_ sv_manager);
2009 2235
2010 frame->prepare = prepare_schedule; 2236 frame->prepare = prepare_schedule;
2011 frame->check = slf_check_repeat; 2237 frame->check = slf_check_repeat;
2012 2238
2013 /* as a minor optimisation, we could unwind all stacks here */ 2239 /* as a minor optimisation, we could unwind all stacks here */
2014 /* but that puts extra pressure on pp_slf, and is not worth much */ 2240 /* but that puts extra pressure on pp_slf, and is not worth much */
2015 /*coro_unwind_stacks (aTHX);*/ 2241 /*coro_unwind_stacks (aTHX);*/
2242}
2243
2244static void
2245slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2246{
2247 HV *coro_hv = (HV *)SvRV (coro_current);
2248
2249 coro_set_status (aTHX_ SvSTATE ((SV *)coro_hv), arg, items);
2250 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2251}
2252
2253static void
2254slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2255{
2256 HV *coro_hv;
2257 struct coro *coro;
2258
2259 if (items <= 0)
2260 croak ("Coro::cancel called without coro object,");
2261
2262 coro = SvSTATE (arg [0]);
2263 coro_hv = coro->hv;
2264
2265 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2266
2267 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2268 {
2269 /* coro currently busy cancelling something, so just notify it */
2270 coro->slf_frame.data = (void *)coro;
2271
2272 frame->prepare = prepare_nop;
2273 frame->check = slf_check_nop;
2274 }
2275 else if (coro_hv == (HV *)SvRV (coro_current))
2276 {
2277 /* cancelling the current coro is allowed, and equals terminate */
2278 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2279 }
2280 else
2281 {
2282 struct coro *self = SvSTATE_current;
2283
2284 /* otherwise we cancel directly, purely for speed reasons
2285 * unfortunately, this requires some magic trickery, as
2286 * somebody else could cancel us, so we have to fight the cancellation.
2287 * this is ugly, and hopefully fully worth the extra speed.
2288 * besides, I can't get the slow-but-safe version working...
2289 */
2290 slf_frame.data = 0;
2291 self->flags |= CF_NOCANCEL;
2292 coro_state_destroy (aTHX_ coro);
2293 self->flags &= ~CF_NOCANCEL;
2294
2295 if (slf_frame.data)
2296 {
2297 /* while we were busy we have been cancelled, so terminate */
2298 slf_init_terminate_cancel_common (aTHX_ frame, self->hv);
2299 }
2300 else
2301 {
2302 frame->prepare = prepare_nop;
2303 frame->check = slf_check_nop;
2304 }
2305 }
2306}
2307
2308static int
2309slf_check_safe_cancel (pTHX_ struct CoroSLF *frame)
2310{
2311 frame->prepare = 0;
2312 coro_unwind_stacks (aTHX);
2313
2314 slf_init_terminate_cancel_common (aTHX_ frame, (HV *)SvRV (coro_current));
2315
2316 return 1;
2317}
2318
2319static int
2320safe_cancel (pTHX_ struct coro *coro, SV **arg, int items)
2321{
2322 if (coro->cctx)
2323 croak ("coro inside C callback, unable to cancel at this time, caught");
2324
2325 if (coro->flags & CF_NEW)
2326 {
2327 coro_set_status (aTHX_ coro, arg, items);
2328 coro_state_destroy (aTHX_ coro);
2329 }
2330 else
2331 {
2332 if (!coro->slf_frame.prepare)
2333 croak ("coro outside an SLF function, unable to cancel at this time, caught");
2334
2335 slf_destroy (aTHX_ coro);
2336
2337 coro_set_status (aTHX_ coro, arg, items);
2338 coro->slf_frame.prepare = prepare_nop;
2339 coro->slf_frame.check = slf_check_safe_cancel;
2340
2341 api_ready (aTHX_ (SV *)coro->hv);
2342 }
2343
2344 return 1;
2016} 2345}
2017 2346
2018/*****************************************************************************/ 2347/*****************************************************************************/
2019/* async pool handler */ 2348/* async pool handler */
2020 2349
… …
2051slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2380slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2052{ 2381{
2053 HV *hv = (HV *)SvRV (coro_current); 2382 HV *hv = (HV *)SvRV (coro_current);
2054 struct coro *coro = SvSTATE_hv ((SV *)hv); 2383 struct coro *coro = SvSTATE_hv ((SV *)hv);
2055 2384
2056 if (expect_true (coro->saved_deffh)) 2385 if (ecb_expect_true (coro->saved_deffh))
2057 { 2386 {
2058 /* subsequent iteration */ 2387 /* subsequent iteration */
2059 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2388 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
2060 coro->saved_deffh = 0; 2389 coro->saved_deffh = 0;
2061 2390
2062 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 2391 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
2063 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2392 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
2064 { 2393 {
2065 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate); 2394 slf_init_terminate_cancel_common (aTHX_ frame, hv);
2066 coro->invoke_av = newAV (); 2395 return;
2067
2068 frame->prepare = prepare_nop;
2069 } 2396 }
2070 else 2397 else
2071 { 2398 {
2072 av_clear (GvAV (PL_defgv)); 2399 av_clear (GvAV (PL_defgv));
2073 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2400 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
… …
2098 2425
2099static void 2426static void
2100coro_rouse_callback (pTHX_ CV *cv) 2427coro_rouse_callback (pTHX_ CV *cv)
2101{ 2428{
2102 dXSARGS; 2429 dXSARGS;
2103 SV *data = (SV *)GENSUB_ARG; 2430 SV *data = (SV *)S_GENSUB_ARG;
2104 2431
2105 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2432 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2106 { 2433 {
2107 /* first call, set args */ 2434 /* first call, set args */
2108 SV *coro = SvRV (data); 2435 SV *coro = SvRV (data);
… …
2123 2450
2124static int 2451static int
2125slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2452slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
2126{ 2453{
2127 SV *data = (SV *)frame->data; 2454 SV *data = (SV *)frame->data;
2128 2455
2129 if (CORO_THROW) 2456 if (CORO_THROW)
2130 return 0; 2457 return 0;
2131 2458
2132 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2459 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2133 return 1; 2460 return 1;
… …
2169 cb = sv_2mortal (coro->rouse_cb); 2496 cb = sv_2mortal (coro->rouse_cb);
2170 coro->rouse_cb = 0; 2497 coro->rouse_cb = 0;
2171 } 2498 }
2172 2499
2173 if (!SvROK (cb) 2500 if (!SvROK (cb)
2174 || SvTYPE (SvRV (cb)) != SVt_PVCV 2501 || SvTYPE (SvRV (cb)) != SVt_PVCV
2175 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2502 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2176 croak ("Coro::rouse_wait called with illegal callback argument,"); 2503 croak ("Coro::rouse_wait called with illegal callback argument,");
2177 2504
2178 { 2505 {
2179 CV *cv = (CV *)SvRV (cb); /* for GENSUB_ARG */ 2506 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
2180 SV *data = (SV *)GENSUB_ARG; 2507 SV *data = (SV *)S_GENSUB_ARG;
2181 2508
2182 frame->data = (void *)data; 2509 frame->data = (void *)data;
2183 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule; 2510 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
2184 frame->check = slf_check_rouse_wait; 2511 frame->check = slf_check_rouse_wait;
2185 } 2512 }
… …
2189coro_new_rouse_cb (pTHX) 2516coro_new_rouse_cb (pTHX)
2190{ 2517{
2191 HV *hv = (HV *)SvRV (coro_current); 2518 HV *hv = (HV *)SvRV (coro_current);
2192 struct coro *coro = SvSTATE_hv (hv); 2519 struct coro *coro = SvSTATE_hv (hv);
2193 SV *data = newRV_inc ((SV *)hv); 2520 SV *data = newRV_inc ((SV *)hv);
2194 SV *cb = gensub (aTHX_ coro_rouse_callback, (void *)data); 2521 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
2195 2522
2196 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0); 2523 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0);
2197 SvREFCNT_dec (data); /* magicext increases the refcount */ 2524 SvREFCNT_dec (data); /* magicext increases the refcount */
2198 2525
2199 SvREFCNT_dec (coro->rouse_cb); 2526 SvREFCNT_dec (coro->rouse_cb);
… …
2296static void 2623static void
2297slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2624slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2298{ 2625{
2299 frame->prepare = prepare_cede_notself; 2626 frame->prepare = prepare_cede_notself;
2300 frame->check = slf_check_nop; 2627 frame->check = slf_check_nop;
2628}
2629
2630/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2631static void
2632slf_destroy (pTHX_ struct coro *coro)
2633{
2634 /* this callback is reserved for slf functions needing to do cleanup */
2635 if (coro->slf_frame.destroy && coro->slf_frame.prepare && !PL_dirty)
2636 coro->slf_frame.destroy (aTHX_ &coro->slf_frame);
2637
2638 /*
2639 * The on_destroy above most likely is from an SLF call.
2640 * Since by definition the SLF call will not finish when we destroy
2641 * the coro, we will have to force-finish it here, otherwise
2642 * cleanup functions cannot call SLF functions.
2643 */
2644 coro->slf_frame.prepare = 0;
2301} 2645}
2302 2646
2303/* 2647/*
2304 * these not obviously related functions are all rolled into one 2648 * these not obviously related functions are all rolled into one
2305 * function to increase chances that they all will call transfer with the same 2649 * function to increase chances that they all will call transfer with the same
… …
2312 I32 checkmark; /* mark SP to see how many elements check has pushed */ 2656 I32 checkmark; /* mark SP to see how many elements check has pushed */
2313 2657
2314 /* set up the slf frame, unless it has already been set-up */ 2658 /* set up the slf frame, unless it has already been set-up */
2315 /* the latter happens when a new coro has been started */ 2659 /* the latter happens when a new coro has been started */
2316 /* or when a new cctx was attached to an existing coroutine */ 2660 /* or when a new cctx was attached to an existing coroutine */
2317 if (expect_true (!slf_frame.prepare)) 2661 if (ecb_expect_true (!slf_frame.prepare))
2318 { 2662 {
2319 /* first iteration */ 2663 /* first iteration */
2320 dSP; 2664 dSP;
2321 SV **arg = PL_stack_base + TOPMARK + 1; 2665 SV **arg = PL_stack_base + TOPMARK + 1;
2322 int items = SP - arg; /* args without function object */ 2666 int items = SP - arg; /* args without function object */
… …
2363 while (slf_frame.check (aTHX_ &slf_frame)); 2707 while (slf_frame.check (aTHX_ &slf_frame));
2364 2708
2365 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */ 2709 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */
2366 2710
2367 /* exception handling */ 2711 /* exception handling */
2368 if (expect_false (CORO_THROW)) 2712 if (ecb_expect_false (CORO_THROW))
2369 { 2713 {
2370 SV *exception = sv_2mortal (CORO_THROW); 2714 SV *exception = sv_2mortal (CORO_THROW);
2371 2715
2372 CORO_THROW = 0; 2716 CORO_THROW = 0;
2373 sv_setsv (ERRSV, exception); 2717 sv_setsv (ERRSV, exception);
2374 croak (0); 2718 croak (0);
2375 } 2719 }
2376 2720
2377 /* return value handling - mostly like entersub */ 2721 /* return value handling - mostly like entersub */
2378 /* make sure we put something on the stack in scalar context */ 2722 /* make sure we put something on the stack in scalar context */
2379 if (GIMME_V == G_SCALAR) 2723 if (GIMME_V == G_SCALAR
2724 && ecb_expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2380 { 2725 {
2381 dSP; 2726 dSP;
2382 SV **bot = PL_stack_base + checkmark; 2727 SV **bot = PL_stack_base + checkmark;
2383 2728
2384 if (sp == bot) /* too few, push undef */ 2729 if (sp == bot) /* too few, push undef */
2385 bot [1] = &PL_sv_undef; 2730 bot [1] = &PL_sv_undef;
2386 else if (sp != bot + 1) /* too many, take last one */ 2731 else /* too many, take last one */
2387 bot [1] = *sp; 2732 bot [1] = *sp;
2388 2733
2389 SP = bot + 1; 2734 SP = bot + 1;
2390 2735
2391 PUTBACK; 2736 PUTBACK;
… …
2424 if (PL_op->op_flags & OPf_STACKED) 2769 if (PL_op->op_flags & OPf_STACKED)
2425 { 2770 {
2426 if (items > slf_arga) 2771 if (items > slf_arga)
2427 { 2772 {
2428 slf_arga = items; 2773 slf_arga = items;
2429 free (slf_argv); 2774 Safefree (slf_argv);
2430 slf_argv = malloc (slf_arga * sizeof (SV *)); 2775 New (0, slf_argv, slf_arga, SV *);
2431 } 2776 }
2432 2777
2433 slf_argc = items; 2778 slf_argc = items;
2434 2779
2435 for (i = 0; i < items; ++i) 2780 for (i = 0; i < items; ++i)
… …
2498{ 2843{
2499 PerlIOBuf base; 2844 PerlIOBuf base;
2500 NV next, every; 2845 NV next, every;
2501} PerlIOCede; 2846} PerlIOCede;
2502 2847
2503static IV 2848static IV ecb_cold
2504PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab) 2849PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab)
2505{ 2850{
2506 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2851 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2507 2852
2508 self->every = SvCUR (arg) ? SvNV (arg) : 0.01; 2853 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
2509 self->next = nvtime () + self->every; 2854 self->next = nvtime () + self->every;
2510 2855
2511 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab); 2856 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
2512} 2857}
2513 2858
2514static SV * 2859static SV * ecb_cold
2515PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags) 2860PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
2516{ 2861{
2517 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2862 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2518 2863
2519 return newSVnv (self->every); 2864 return newSVnv (self->every);
… …
2631 SvREFCNT_dec (cb); 2976 SvREFCNT_dec (cb);
2632 } 2977 }
2633} 2978}
2634 2979
2635static void 2980static void
2636coro_semaphore_on_destroy (pTHX_ struct coro *coro) 2981coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2637{ 2982{
2638 /* call $sem->adjust (0) to possibly wake up some other waiters */ 2983 /* call $sem->adjust (0) to possibly wake up some other waiters */
2639 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 2984 coro_semaphore_adjust (aTHX_ (AV *)frame->data, 0);
2640} 2985}
2641 2986
2642static int 2987static int
2643slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire) 2988slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2644{ 2989{
2645 AV *av = (AV *)frame->data; 2990 AV *av = (AV *)frame->data;
2646 SV *count_sv = AvARRAY (av)[0]; 2991 SV *count_sv = AvARRAY (av)[0];
2992 SV *coro_hv = SvRV (coro_current);
2647 2993
2648 /* if we are about to throw, don't actually acquire the lock, just throw */ 2994 /* if we are about to throw, don't actually acquire the lock, just throw */
2649 if (CORO_THROW) 2995 if (CORO_THROW)
2650 return 0; 2996 return 0;
2651 else if (SvIVX (count_sv) > 0) 2997 else if (SvIVX (count_sv) > 0)
2652 { 2998 {
2653 SvSTATE_current->on_destroy = 0; 2999 frame->destroy = 0;
2654 3000
2655 if (acquire) 3001 if (acquire)
2656 SvIVX (count_sv) = SvIVX (count_sv) - 1; 3002 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2657 else 3003 else
2658 coro_semaphore_adjust (aTHX_ av, 0); 3004 coro_semaphore_adjust (aTHX_ av, 0);
… …
2663 { 3009 {
2664 int i; 3010 int i;
2665 /* if we were woken up but can't down, we look through the whole */ 3011 /* if we were woken up but can't down, we look through the whole */
2666 /* waiters list and only add us if we aren't in there already */ 3012 /* waiters list and only add us if we aren't in there already */
2667 /* this avoids some degenerate memory usage cases */ 3013 /* this avoids some degenerate memory usage cases */
2668 3014 for (i = AvFILLp (av); i > 0; --i) /* i > 0 is not an off-by-one bug */
2669 for (i = 1; i <= AvFILLp (av); ++i)
2670 if (AvARRAY (av)[i] == SvRV (coro_current)) 3015 if (AvARRAY (av)[i] == coro_hv)
2671 return 1; 3016 return 1;
2672 3017
2673 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3018 av_push (av, SvREFCNT_inc (coro_hv));
2674 return 1; 3019 return 1;
2675 } 3020 }
2676} 3021}
2677 3022
2678static int 3023static int
… …
2701 { 3046 {
2702 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3047 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2703 3048
2704 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 3049 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2705 frame->prepare = prepare_schedule; 3050 frame->prepare = prepare_schedule;
2706
2707 /* to avoid race conditions when a woken-up coro gets terminated */ 3051 /* to avoid race conditions when a woken-up coro gets terminated */
2708 /* we arrange for a temporary on_destroy that calls adjust (0) */ 3052 /* we arrange for a temporary on_destroy that calls adjust (0) */
2709 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 3053 frame->destroy = coro_semaphore_destroy;
2710 } 3054 }
2711} 3055}
2712 3056
2713static void 3057static void
2714slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 3058slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
… …
2722{ 3066{
2723 if (items >= 2) 3067 if (items >= 2)
2724 { 3068 {
2725 /* callback form */ 3069 /* callback form */
2726 AV *av = (AV *)SvRV (arg [0]); 3070 AV *av = (AV *)SvRV (arg [0]);
2727 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 3071 SV *cb_cv = s_get_cv_croak (arg [1]);
2728 3072
2729 av_push (av, SvREFCNT_inc_NN (cb_cv)); 3073 av_push (av, SvREFCNT_inc_NN (cb_cv));
2730 3074
2731 if (SvIVX (AvARRAY (av)[0]) > 0) 3075 if (SvIVX (AvARRAY (av)[0]) > 0)
2732 coro_semaphore_adjust (aTHX_ av, 0); 3076 coro_semaphore_adjust (aTHX_ av, 0);
… …
2792{ 3136{
2793 AV *av = (AV *)SvRV (arg [0]); 3137 AV *av = (AV *)SvRV (arg [0]);
2794 3138
2795 if (items >= 2) 3139 if (items >= 2)
2796 { 3140 {
2797 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 3141 SV *cb_cv = s_get_cv_croak (arg [1]);
2798 av_push (av, SvREFCNT_inc_NN (cb_cv)); 3142 av_push (av, SvREFCNT_inc_NN (cb_cv));
2799 3143
2800 if (SvIVX (AvARRAY (av)[0])) 3144 if (SvIVX (AvARRAY (av)[0]))
2801 coro_signal_wake (aTHX_ av, 1); /* ust be the only waiter */ 3145 coro_signal_wake (aTHX_ av, 1); /* must be the only waiter */
2802 3146
2803 frame->prepare = prepare_nop; 3147 frame->prepare = prepare_nop;
2804 frame->check = slf_check_nop; 3148 frame->check = slf_check_nop;
2805 } 3149 }
2806 else if (SvIVX (AvARRAY (av)[0])) 3150 else if (SvIVX (AvARRAY (av)[0]))
… …
2837 3181
2838static void 3182static void
2839coro_aio_callback (pTHX_ CV *cv) 3183coro_aio_callback (pTHX_ CV *cv)
2840{ 3184{
2841 dXSARGS; 3185 dXSARGS;
2842 AV *state = (AV *)GENSUB_ARG; 3186 AV *state = (AV *)S_GENSUB_ARG;
2843 SV *coro = av_pop (state); 3187 SV *coro = av_pop (state);
2844 SV *data_sv = newSV (sizeof (struct io_state)); 3188 SV *data_sv = newSV (sizeof (struct io_state));
2845 3189
2846 av_extend (state, items - 1); 3190 av_extend (state, items - 1);
2847 3191
… …
2932 dSP; 3276 dSP;
2933 3277
2934 static SV *prio_cv; 3278 static SV *prio_cv;
2935 static SV *prio_sv; 3279 static SV *prio_sv;
2936 3280
2937 if (expect_false (!prio_cv)) 3281 if (ecb_expect_false (!prio_cv))
2938 { 3282 {
2939 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0); 3283 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0);
2940 prio_sv = newSViv (0); 3284 prio_sv = newSViv (0);
2941 } 3285 }
2942 3286
… …
2961 3305
2962 for (i = 0; i < items; ++i) 3306 for (i = 0; i < items; ++i)
2963 PUSHs (arg [i]); 3307 PUSHs (arg [i]);
2964 3308
2965 /* now push the callback closure */ 3309 /* now push the callback closure */
2966 PUSHs (sv_2mortal (gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state)))); 3310 PUSHs (sv_2mortal (s_gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state))));
2967 3311
2968 /* now call the AIO function - we assume our request is uncancelable */ 3312 /* now call the AIO function - we assume our request is uncancelable */
2969 PUTBACK; 3313 PUTBACK;
2970 call_sv ((SV *)req, G_VOID | G_DISCARD); 3314 call_sv ((SV *)req, G_VOID | G_DISCARD);
2971 } 3315 }
2972 3316
2973 /* now that the requets is going, we loop toll we have a result */ 3317 /* now that the request is going, we loop till we have a result */
2974 frame->data = (void *)state; 3318 frame->data = (void *)state;
2975 frame->prepare = prepare_schedule; 3319 frame->prepare = prepare_schedule;
2976 frame->check = slf_check_aio_req; 3320 frame->check = slf_check_aio_req;
2977} 3321}
2978 3322
… …
2988 3332
2989/*****************************************************************************/ 3333/*****************************************************************************/
2990 3334
2991#if CORO_CLONE 3335#if CORO_CLONE
2992# include "clone.c" 3336# include "clone.c"
3337#endif
3338
3339/*****************************************************************************/
3340
3341static SV *
3342coro_new (pTHX_ HV *stash, SV **argv, int argc, int is_coro)
3343{
3344 SV *coro_sv;
3345 struct coro *coro;
3346 MAGIC *mg;
3347 HV *hv;
3348 SV *cb;
3349 int i;
3350
3351 if (argc > 0)
3352 {
3353 cb = s_get_cv_croak (argv [0]);
3354
3355 if (!is_coro)
3356 {
3357 if (CvISXSUB (cb))
3358 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
3359
3360 if (!CvROOT (cb))
3361 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
3362 }
3363 }
3364
3365 Newz (0, coro, 1, struct coro);
3366 coro->args = newAV ();
3367 coro->flags = CF_NEW;
3368
3369 if (coro_first) coro_first->prev = coro;
3370 coro->next = coro_first;
3371 coro_first = coro;
3372
3373 coro->hv = hv = newHV ();
3374 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
3375 mg->mg_flags |= MGf_DUP;
3376 coro_sv = sv_bless (newRV_noinc ((SV *)hv), stash);
3377
3378 if (argc > 0)
3379 {
3380 av_extend (coro->args, argc + is_coro - 1);
3381
3382 if (is_coro)
3383 {
3384 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
3385 cb = (SV *)cv_coro_run;
3386 }
3387
3388 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3389
3390 for (i = 1; i < argc; i++)
3391 av_push (coro->args, newSVsv (argv [i]));
3392 }
3393
3394 return coro_sv;
3395}
3396
3397#ifndef __cplusplus
3398ecb_cold XS(boot_Coro__State);
3399#endif
3400
3401#if CORO_JIT
3402
3403static void ecb_noinline ecb_cold
3404pushav_4uv (pTHX_ UV a, UV b, UV c, UV d)
3405{
3406 dSP;
3407 AV *av = newAV ();
3408
3409 av_store (av, 3, newSVuv (d));
3410 av_store (av, 2, newSVuv (c));
3411 av_store (av, 1, newSVuv (b));
3412 av_store (av, 0, newSVuv (a));
3413
3414 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
3415
3416 PUTBACK;
3417}
3418
3419static void ecb_noinline ecb_cold
3420jit_init (pTHX)
3421{
3422 dSP;
3423 SV *load, *save;
3424 char *map_base;
3425 char *load_ptr, *save_ptr;
3426 STRLEN load_len, save_len, map_len;
3427 int count;
3428
3429 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3430
3431 PUSHMARK (SP);
3432 #define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type));
3433 #include "state.h"
3434 count = call_pv ("Coro::State::_jit", G_ARRAY);
3435 SPAGAIN;
3436
3437 save = POPs; save_ptr = SvPVbyte (save, save_len);
3438 load = POPs; load_ptr = SvPVbyte (load, load_len);
3439
3440 map_len = load_len + save_len + 16;
3441
3442 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3443
3444 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3445
3446 load_perl_slots = (load_save_perl_slots_type)map_base;
3447 memcpy (map_base, load_ptr, load_len);
3448
3449 map_base += (load_len + 15) & ~15;
3450
3451 save_perl_slots = (load_save_perl_slots_type)map_base;
3452 memcpy (map_base, save_ptr, save_len);
3453
3454 /* we are good citizens and try to make the page read-only, so the evil evil */
3455 /* hackers might have it a bit more difficult */
3456 mprotect (map_base, map_len, PROT_READ | PROT_EXEC);
3457
3458 PUTBACK;
3459 eval_pv ("undef &Coro::State::_jit", 1);
3460}
3461
2993#endif 3462#endif
2994 3463
2995MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3464MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2996 3465
2997PROTOTYPES: DISABLE 3466PROTOTYPES: DISABLE
… …
3002# if CORO_PTHREAD 3471# if CORO_PTHREAD
3003 coro_thx = PERL_GET_CONTEXT; 3472 coro_thx = PERL_GET_CONTEXT;
3004# endif 3473# endif
3005#endif 3474#endif
3006 BOOT_PAGESIZE; 3475 BOOT_PAGESIZE;
3476
3477 /* perl defines these to check for existance first, but why it doesn't */
3478 /* just create them one at init time is not clear to me, except for */
3479 /* programs trying to delete them, but... */
3480 /* anyway, we declare this as invalid and make sure they are initialised here */
3481 DEFSV;
3482 ERRSV;
3007 3483
3008 cctx_current = cctx_new_empty (); 3484 cctx_current = cctx_new_empty ();
3009 3485
3010 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3486 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
3011 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3487 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
… …
3051 coroapi.prepare_nop = prepare_nop; 3527 coroapi.prepare_nop = prepare_nop;
3052 coroapi.prepare_schedule = prepare_schedule; 3528 coroapi.prepare_schedule = prepare_schedule;
3053 coroapi.prepare_cede = prepare_cede; 3529 coroapi.prepare_cede = prepare_cede;
3054 coroapi.prepare_cede_notself = prepare_cede_notself; 3530 coroapi.prepare_cede_notself = prepare_cede_notself;
3055 3531
3056 { 3532 time_init (aTHX);
3057 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
3058
3059 if (!svp) croak ("Time::HiRes is required");
3060 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
3061
3062 nvtime = INT2PTR (double (*)(), SvIV (*svp));
3063
3064 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
3065 u2time = INT2PTR (double (*)(), SvIV (*svp));
3066 }
3067 3533
3068 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL)); 3534 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3535#if CORO_JIT
3536 PUTBACK;
3537 jit_init (aTHX);
3538 SPAGAIN;
3539#endif
3069} 3540}
3070 3541
3071SV * 3542SV *
3072new (char *klass, ...) 3543new (SV *klass, ...)
3073 ALIAS: 3544 ALIAS:
3074 Coro::new = 1 3545 Coro::new = 1
3075 CODE: 3546 CODE:
3076{ 3547 RETVAL = coro_new (aTHX_ ix ? coro_stash : coro_state_stash, &ST (1), items - 1, ix);
3077 struct coro *coro; 3548 OUTPUT:
3078 MAGIC *mg;
3079 HV *hv;
3080 CV *cb;
3081 int i;
3082
3083 if (items > 1)
3084 {
3085 cb = coro_sv_2cv (aTHX_ ST (1));
3086
3087 if (!ix)
3088 {
3089 if (CvISXSUB (cb))
3090 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
3091
3092 if (!CvROOT (cb))
3093 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
3094 }
3095 }
3096
3097 Newz (0, coro, 1, struct coro);
3098 coro->args = newAV ();
3099 coro->flags = CF_NEW;
3100
3101 if (coro_first) coro_first->prev = coro;
3102 coro->next = coro_first;
3103 coro_first = coro;
3104
3105 coro->hv = hv = newHV ();
3106 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
3107 mg->mg_flags |= MGf_DUP;
3108 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
3109
3110 if (items > 1)
3111 {
3112 av_extend (coro->args, items - 1 + ix - 1);
3113
3114 if (ix)
3115 {
3116 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
3117 cb = cv_coro_run;
3118 }
3119
3120 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3121
3122 for (i = 2; i < items; i++)
3123 av_push (coro->args, newSVsv (ST (i)));
3124 }
3125}
3126 OUTPUT:
3127 RETVAL 3549 RETVAL
3128 3550
3129void 3551void
3130transfer (...) 3552transfer (...)
3131 PROTOTYPE: $$ 3553 PROTOTYPE: $$
3132 CODE: 3554 CODE:
3133 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3555 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3134
3135bool
3136_destroy (SV *coro_sv)
3137 CODE:
3138 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
3139 OUTPUT:
3140 RETVAL
3141 3556
3142void 3557void
3143_exit (int code) 3558_exit (int code)
3144 PROTOTYPE: $ 3559 PROTOTYPE: $
3145 CODE: 3560 CODE:
… …
3221 CODE: 3636 CODE:
3222{ 3637{
3223 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3638 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
3224 { 3639 {
3225 struct coro *current = SvSTATE_current; 3640 struct coro *current = SvSTATE_current;
3641 struct CoroSLF slf_save;
3226 3642
3227 if (current != coro) 3643 if (current != coro)
3228 { 3644 {
3229 PUTBACK; 3645 PUTBACK;
3230 save_perl (aTHX_ current); 3646 save_perl (aTHX_ current);
3231 load_perl (aTHX_ coro); 3647 load_perl (aTHX_ coro);
3648 /* the coro is most likely in an active SLF call.
3649 * while not strictly required (the code we execute is
3650 * not allowed to call any SLF functions), it's cleaner
3651 * to reinitialise the slf_frame and restore it later.
3652 * This might one day allow us to actually do SLF calls
3653 * from code executed here.
3654 */
3655 slf_save = slf_frame;
3656 slf_frame.prepare = 0;
3232 SPAGAIN; 3657 SPAGAIN;
3233 } 3658 }
3234 3659
3235 PUSHSTACK; 3660 PUSHSTACK;
3236 3661
… …
3246 SPAGAIN; 3671 SPAGAIN;
3247 3672
3248 if (current != coro) 3673 if (current != coro)
3249 { 3674 {
3250 PUTBACK; 3675 PUTBACK;
3676 slf_frame = slf_save;
3251 save_perl (aTHX_ coro); 3677 save_perl (aTHX_ coro);
3252 load_perl (aTHX_ current); 3678 load_perl (aTHX_ current);
3253 SPAGAIN; 3679 SPAGAIN;
3254 } 3680 }
3255 } 3681 }
… …
3260 PROTOTYPE: $ 3686 PROTOTYPE: $
3261 ALIAS: 3687 ALIAS:
3262 is_ready = CF_READY 3688 is_ready = CF_READY
3263 is_running = CF_RUNNING 3689 is_running = CF_RUNNING
3264 is_new = CF_NEW 3690 is_new = CF_NEW
3265 is_destroyed = CF_DESTROYED 3691 is_destroyed = CF_ZOMBIE
3692 is_zombie = CF_ZOMBIE
3266 is_suspended = CF_SUSPENDED 3693 is_suspended = CF_SUSPENDED
3267 CODE: 3694 CODE:
3268 RETVAL = boolSV (coro->flags & ix); 3695 RETVAL = boolSV (coro->flags & ix);
3269 OUTPUT: 3696 OUTPUT:
3270 RETVAL 3697 RETVAL
3271 3698
3272void 3699void
3273throw (Coro::State self, SV *throw = &PL_sv_undef) 3700throw (SV *self, SV *exception = &PL_sv_undef)
3274 PROTOTYPE: $;$ 3701 PROTOTYPE: $;$
3275 CODE: 3702 CODE:
3276{ 3703{
3704 struct coro *coro = SvSTATE (self);
3277 struct coro *current = SvSTATE_current; 3705 struct coro *current = SvSTATE_current;
3278 SV **throwp = self == current ? &CORO_THROW : &self->except; 3706 SV **exceptionp = coro == current ? &CORO_THROW : &coro->except;
3279 SvREFCNT_dec (*throwp); 3707 SvREFCNT_dec (*exceptionp);
3280 SvGETMAGIC (throw); 3708 SvGETMAGIC (exception);
3281 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3709 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3710
3711 api_ready (aTHX_ self);
3282} 3712}
3283 3713
3284void 3714void
3285api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3715api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3286 PROTOTYPE: $;$ 3716 PROTOTYPE: $;$
… …
3341 3771
3342void 3772void
3343cancel (Coro::State self) 3773cancel (Coro::State self)
3344 CODE: 3774 CODE:
3345 coro_state_destroy (aTHX_ self); 3775 coro_state_destroy (aTHX_ self);
3346 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */
3347
3348 3776
3349SV * 3777SV *
3350enable_times (int enabled = enable_times) 3778enable_times (int enabled = enable_times)
3351 CODE: 3779 CODE:
3352{ 3780{
… …
3367times (Coro::State self) 3795times (Coro::State self)
3368 PPCODE: 3796 PPCODE:
3369{ 3797{
3370 struct coro *current = SvSTATE (coro_current); 3798 struct coro *current = SvSTATE (coro_current);
3371 3799
3372 if (expect_false (current == self)) 3800 if (ecb_expect_false (current == self))
3373 { 3801 {
3374 coro_times_update (); 3802 coro_times_update ();
3375 coro_times_add (SvSTATE (coro_current)); 3803 coro_times_add (SvSTATE (coro_current));
3376 } 3804 }
3377 3805
3378 EXTEND (SP, 2); 3806 EXTEND (SP, 2);
3379 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9))); 3807 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3380 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9))); 3808 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3381 3809
3382 if (expect_false (current == self)) 3810 if (ecb_expect_false (current == self))
3383 coro_times_sub (SvSTATE (coro_current)); 3811 coro_times_sub (SvSTATE (coro_current));
3384} 3812}
3813
3814void
3815swap_sv (Coro::State coro, SV *sv, SV *swapsv)
3816 CODE:
3817{
3818 struct coro *current = SvSTATE_current;
3819
3820 if (current == coro)
3821 SWAP_SVS (current);
3822
3823 if (!coro->swap_sv)
3824 coro->swap_sv = newAV ();
3825
3826 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv )));
3827 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv)));
3828
3829 if (current == coro)
3830 SWAP_SVS (current);
3831}
3832
3385 3833
3386MODULE = Coro::State PACKAGE = Coro 3834MODULE = Coro::State PACKAGE = Coro
3387 3835
3388BOOT: 3836BOOT:
3389{ 3837{
3390 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3838 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3391 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3839 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3392 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 3840 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3393 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3394 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 3841 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3395 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 3842 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3396 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 3843 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3397 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 3844 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3398 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 3845 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3399 3846
3400 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3847 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3401 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3848 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3402 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 3849 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3403 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new); 3850 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3404 3851
3405 coro_stash = gv_stashpv ("Coro", TRUE); 3852 coro_stash = gv_stashpv ("Coro", TRUE);
3406 3853
3407 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 3854 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3408 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 3855 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
… …
3427 sv_setiv (sv, (IV)&coroapi); 3874 sv_setiv (sv, (IV)&coroapi);
3428 SvREADONLY_on (sv); 3875 SvREADONLY_on (sv);
3429 } 3876 }
3430} 3877}
3431 3878
3879SV *
3880async (...)
3881 PROTOTYPE: &@
3882 CODE:
3883 RETVAL = coro_new (aTHX_ coro_stash, &ST (0), items, 1);
3884 api_ready (aTHX_ RETVAL);
3885 OUTPUT:
3886 RETVAL
3887
3888void
3889_destroy (Coro::State coro)
3890 CODE:
3891 /* used by the manager thread */
3892 coro_state_destroy (aTHX_ coro);
3893
3894void
3895on_destroy (Coro::State coro, SV *cb)
3896 CODE:
3897 coro_push_on_destroy (aTHX_ coro, newSVsv (cb));
3898
3899void
3900join (...)
3901 CODE:
3902 CORO_EXECUTE_SLF_XS (slf_init_join);
3903
3432void 3904void
3433terminate (...) 3905terminate (...)
3434 CODE: 3906 CODE:
3435 CORO_EXECUTE_SLF_XS (slf_init_terminate); 3907 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3908
3909void
3910cancel (...)
3911 CODE:
3912 CORO_EXECUTE_SLF_XS (slf_init_cancel);
3913
3914int
3915safe_cancel (Coro::State self, ...)
3916 C_ARGS: aTHX_ self, &ST (1), items - 1
3436 3917
3437void 3918void
3438schedule (...) 3919schedule (...)
3439 CODE: 3920 CODE:
3440 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3921 CORO_EXECUTE_SLF_XS (slf_init_schedule);
… …
3470_set_readyhook (SV *hook) 3951_set_readyhook (SV *hook)
3471 PROTOTYPE: $ 3952 PROTOTYPE: $
3472 CODE: 3953 CODE:
3473 SvREFCNT_dec (coro_readyhook); 3954 SvREFCNT_dec (coro_readyhook);
3474 SvGETMAGIC (hook); 3955 SvGETMAGIC (hook);
3956 if (SvOK (hook))
3957 {
3475 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0; 3958 coro_readyhook = newSVsv (hook);
3959 CORO_READYHOOK = invoke_sv_ready_hook_helper;
3960 }
3961 else
3962 {
3963 coro_readyhook = 0;
3964 CORO_READYHOOK = 0;
3965 }
3476 3966
3477int 3967int
3478prio (Coro::State coro, int newprio = 0) 3968prio (Coro::State coro, int newprio = 0)
3479 PROTOTYPE: $;$ 3969 PROTOTYPE: $;$
3480 ALIAS: 3970 ALIAS:
… …
3544 for (i = 1; i < items; ++i) 4034 for (i = 1; i < items; ++i)
3545 av_push (av, SvREFCNT_inc_NN (ST (i))); 4035 av_push (av, SvREFCNT_inc_NN (ST (i)));
3546 4036
3547 if ((SV *)hv == &PL_sv_undef) 4037 if ((SV *)hv == &PL_sv_undef)
3548 { 4038 {
3549 PUSHMARK (SP); 4039 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3550 EXTEND (SP, 2);
3551 PUSHs (sv_Coro);
3552 PUSHs ((SV *)cv_pool_handler);
3553 PUTBACK;
3554 call_sv ((SV *)cv_coro_state_new, G_SCALAR);
3555 SPAGAIN;
3556
3557 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs)); 4040 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
4041 SvREFCNT_dec (sv);
3558 } 4042 }
3559 4043
3560 { 4044 {
3561 struct coro *coro = SvSTATE_hv (hv); 4045 struct coro *coro = SvSTATE_hv (hv);
3562 4046
… …
3596 CODE: 4080 CODE:
3597{ 4081{
3598 struct coro *coro = SvSTATE_current; 4082 struct coro *coro = SvSTATE_current;
3599 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 4083 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3600 4084
3601 block = (SV *)coro_sv_2cv (aTHX_ block); 4085 block = s_get_cv_croak (block);
3602 4086
3603 if (!*avp) 4087 if (!*avp)
3604 *avp = newAV (); 4088 *avp = newAV ();
3605 4089
3606 av_push (*avp, SvREFCNT_inc (block)); 4090 av_push (*avp, SvREFCNT_inc (block));
… …
3713} 4197}
3714 4198
3715MODULE = Coro::State PACKAGE = Coro::SemaphoreSet 4199MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3716 4200
3717void 4201void
3718_may_delete (SV *sem, int count, int extra_refs) 4202_may_delete (SV *sem, int count, unsigned int extra_refs)
3719 PPCODE: 4203 PPCODE:
3720{ 4204{
3721 AV *av = (AV *)SvRV (sem); 4205 AV *av = (AV *)SvRV (sem);
3722 4206
3723 if (SvREFCNT ((SV *)av) == 1 + extra_refs 4207 if (SvREFCNT ((SV *)av) == 1 + extra_refs
… …
3806 4290
3807void 4291void
3808_register (char *target, char *proto, SV *req) 4292_register (char *target, char *proto, SV *req)
3809 CODE: 4293 CODE:
3810{ 4294{
3811 CV *req_cv = coro_sv_2cv (aTHX_ req); 4295 SV *req_cv = s_get_cv_croak (req);
3812 /* newXSproto doesn't return the CV on 5.8 */ 4296 /* newXSproto doesn't return the CV on 5.8 */
3813 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 4297 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3814 sv_setpv ((SV *)slf_cv, proto); 4298 sv_setpv ((SV *)slf_cv, proto);
3815 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0); 4299 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
3816} 4300}
3817 4301
4302MODULE = Coro::State PACKAGE = Coro::Select
4303
4304void
4305patch_pp_sselect ()
4306 CODE:
4307 if (!coro_old_pp_sselect)
4308 {
4309 coro_select_select = (SV *)get_cv ("Coro::Select::select", 0);
4310 coro_old_pp_sselect = PL_ppaddr [OP_SSELECT];
4311 PL_ppaddr [OP_SSELECT] = coro_pp_sselect;
4312 }
4313
4314void
4315unpatch_pp_sselect ()
4316 CODE:
4317 if (coro_old_pp_sselect)
4318 {
4319 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
4320 coro_old_pp_sselect = 0;
4321 }
4322

Diff Legend

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