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.339 by root, Mon Dec 15 00:28:30 2008 UTC vs.
Revision 1.424 by root, Fri Nov 30 19:27:28 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#if defined(_WIN32)
31# undef HAS_GETTIMEOFDAY
18# undef setjmp 32# undef setjmp
19# undef longjmp 33# undef longjmp
20# undef _exit 34# undef _exit
21# define setjmp _setjmp /* deep magic */ 35# define setjmp _setjmp /* deep magic */
22#else 36#else
23# include <inttypes.h> /* most portable stdint.h */ 37# include <inttypes.h> /* most portable stdint.h */
24#endif 38#endif
25 39
26#ifdef HAVE_MMAP 40#if HAVE_MMAP
27# include <unistd.h> 41# include <unistd.h>
28# include <sys/mman.h> 42# include <sys/mman.h>
29# ifndef MAP_ANONYMOUS 43# ifndef MAP_ANONYMOUS
30# ifdef MAP_ANON 44# ifdef MAP_ANON
31# define MAP_ANONYMOUS MAP_ANON 45# define MAP_ANONYMOUS MAP_ANON
… …
51#endif 65#endif
52 66
53/* the maximum number of idle cctx that will be pooled */ 67/* the maximum number of idle cctx that will be pooled */
54static int cctx_max_idle = 4; 68static int cctx_max_idle = 4;
55 69
56#define PERL_VERSION_ATLEAST(a,b,c) \ 70#if defined(DEBUGGING) && PERL_VERSION_ATLEAST(5,12,0)
57 (PERL_REVISION > (a) \ 71# 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 72#endif
114 73
115#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 74#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
116# undef CORO_STACKGUARD 75# undef CORO_STACKGUARD
117#endif 76#endif
… …
135# define STACKLEVEL ((void *)&stacklevel) 94# define STACKLEVEL ((void *)&stacklevel)
136#endif 95#endif
137 96
138#define IN_DESTRUCT PL_dirty 97#define IN_DESTRUCT PL_dirty
139 98
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" 99#include "CoroAPI.h"
156#define GCoroAPI (&coroapi) /* very sneaky */ 100#define GCoroAPI (&coroapi) /* very sneaky */
157 101
158#ifdef USE_ITHREADS 102#ifdef USE_ITHREADS
159# if CORO_PTHREAD 103# if CORO_PTHREAD
160static void *coro_thx; 104static void *coro_thx;
161# endif 105# endif
162#endif 106#endif
163 107
108#ifdef __linux
109# include <time.h> /* for timespec */
110# include <syscall.h> /* for SYS_* */
111# ifdef SYS_clock_gettime
112# define coro_clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
113# define CORO_CLOCK_MONOTONIC 1
114# define CORO_CLOCK_THREAD_CPUTIME_ID 3
115# endif
116#endif
117
164static double (*nvtime)(); /* so why doesn't it take void? */ 118static double (*nvtime)(); /* so why doesn't it take void? */
119static void (*u2time)(pTHX_ UV ret[2]);
165 120
166/* we hijack an hopefully unused CV flag for our purposes */ 121/* we hijack an hopefully unused CV flag for our purposes */
167#define CVf_SLF 0x4000 122#define CVf_SLF 0x4000
168static OP *pp_slf (pTHX); 123static OP *pp_slf (pTHX);
124static void slf_destroy (pTHX_ struct coro *coro);
169 125
170static U32 cctx_gen; 126static U32 cctx_gen;
171static size_t cctx_stacksize = CORO_STACKSIZE; 127static size_t cctx_stacksize = CORO_STACKSIZE;
172static struct CoroAPI coroapi; 128static struct CoroAPI coroapi;
173static AV *main_mainstack; /* used to differentiate between $main and others */ 129static AV *main_mainstack; /* used to differentiate between $main and others */
… …
190static SV *sv_pool_size; 146static SV *sv_pool_size;
191static SV *sv_async_pool_idle; /* description string */ 147static SV *sv_async_pool_idle; /* description string */
192static AV *av_async_pool; /* idle pool */ 148static AV *av_async_pool; /* idle pool */
193static SV *sv_Coro; /* class string */ 149static SV *sv_Coro; /* class string */
194static CV *cv_pool_handler; 150static CV *cv_pool_handler;
195static CV *cv_coro_state_new;
196 151
197/* Coro::AnyEvent */ 152/* Coro::AnyEvent */
198static SV *sv_activity; 153static SV *sv_activity;
199 154
155/* enable processtime/realtime profiling */
156static char enable_times;
157typedef U32 coro_ts[2];
158static coro_ts time_real, time_cpu;
159static char times_valid;
160
200static struct coro_cctx *cctx_first; 161static struct coro_cctx *cctx_first;
201static int cctx_count, cctx_idle; 162static int cctx_count, cctx_idle;
202 163
203enum { 164enum
165{
204 CC_MAPPED = 0x01, 166 CC_MAPPED = 0x01,
205 CC_NOREUSE = 0x02, /* throw this away after tracing */ 167 CC_NOREUSE = 0x02, /* throw this away after tracing */
206 CC_TRACE = 0x04, 168 CC_TRACE = 0x04,
207 CC_TRACE_SUB = 0x08, /* trace sub calls */ 169 CC_TRACE_SUB = 0x08, /* trace sub calls */
208 CC_TRACE_LINE = 0x10, /* trace each statement */ 170 CC_TRACE_LINE = 0x10, /* trace each statement */
… …
218 void *sptr; 180 void *sptr;
219 size_t ssize; 181 size_t ssize;
220 182
221 /* cpu state */ 183 /* cpu state */
222 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 184 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
185#ifndef NDEBUG
223 JMPENV *idle_te; /* same as idle_sp, but for top_env, TODO: remove once stable */ 186 JMPENV *idle_te; /* same as idle_sp, but for top_env */
187#endif
224 JMPENV *top_env; 188 JMPENV *top_env;
225 coro_context cctx; 189 coro_context cctx;
226 190
227 U32 gen; 191 U32 gen;
228#if CORO_USE_VALGRIND 192#if CORO_USE_VALGRIND
229 int valgrind_id; 193 int valgrind_id;
230#endif 194#endif
231 unsigned char flags; 195 unsigned char flags;
232} coro_cctx; 196} coro_cctx;
233 197
234coro_cctx *cctx_current; /* the currently running cctx */ 198static coro_cctx *cctx_current; /* the currently running cctx */
235 199
236/*****************************************************************************/ 200/*****************************************************************************/
237 201
202static MGVTBL coro_state_vtbl;
203
238enum { 204enum
205{
239 CF_RUNNING = 0x0001, /* coroutine is running */ 206 CF_RUNNING = 0x0001, /* coroutine is running */
240 CF_READY = 0x0002, /* coroutine is ready */ 207 CF_READY = 0x0002, /* coroutine is ready */
241 CF_NEW = 0x0004, /* has never been switched to */ 208 CF_NEW = 0x0004, /* has never been switched to */
242 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 209 CF_ZOMBIE = 0x0008, /* coroutine data has been freed */
210 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
211 CF_NOCANCEL = 0x0020, /* cannot cancel, set slf_frame.data to 1 (hackish) */
243}; 212};
244 213
245/* the structure where most of the perl state is stored, overlaid on the cxstack */ 214/* the structure where most of the perl state is stored, overlaid on the cxstack */
246typedef struct 215typedef struct
247{ 216{
248 SV *defsv;
249 AV *defav;
250 SV *errsv;
251 SV *irsgv;
252 HV *hinthv;
253#define VAR(name,type) type name; 217 #define VARx(name,expr,type) type name;
254# include "state.h" 218 #include "state.h"
255#undef VAR
256} perl_slots; 219} perl_slots;
257 220
221/* how many context stack entries do we need for perl_slots */
258#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT)) 222#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
259 223
260/* this is a structure representing a perl-level coroutine */ 224/* this is a structure representing a perl-level coroutine */
261struct coro { 225struct coro
226{
262 /* the C coroutine allocated to this perl coroutine, if any */ 227 /* the C coroutine allocated to this perl coroutine, if any */
263 coro_cctx *cctx; 228 coro_cctx *cctx;
229
230 /* ready queue */
231 struct coro *next_ready;
264 232
265 /* state data */ 233 /* state data */
266 struct CoroSLF slf_frame; /* saved slf frame */ 234 struct CoroSLF slf_frame; /* saved slf frame */
267 AV *mainstack; 235 AV *mainstack;
268 perl_slots *slot; /* basically the saved sp */ 236 perl_slots *slot; /* basically the saved sp */
269 237
270 CV *startcv; /* the CV to execute */ 238 CV *startcv; /* the CV to execute */
271 AV *args; /* data associated with this coroutine (initial args) */ 239 AV *args; /* data associated with this coroutine (initial args) */
272 int refcnt; /* coroutines are refcounted, yes */
273 int flags; /* CF_ flags */ 240 int flags; /* CF_ flags */
274 HV *hv; /* the perl hash associated with this coro, if any */ 241 HV *hv; /* the perl hash associated with this coro, if any */
275 void (*on_destroy)(pTHX_ struct coro *coro);
276 242
277 /* statistics */ 243 /* statistics */
278 int usecount; /* number of transfers to this coro */ 244 int usecount; /* number of transfers to this coro */
279 245
280 /* coro process data */ 246 /* coro process data */
281 int prio; 247 int prio;
282 SV *except; /* exception to be thrown */ 248 SV *except; /* exception to be thrown */
283 SV *rouse_cb; 249 SV *rouse_cb; /* last rouse callback */
250 AV *on_destroy; /* callbacks or coros to notify on destroy */
251 AV *status; /* the exit status list */
284 252
285 /* async_pool */ 253 /* async_pool */
286 SV *saved_deffh; 254 SV *saved_deffh;
287 SV *invoke_cb; 255 SV *invoke_cb;
288 AV *invoke_av; 256 AV *invoke_av;
289 257
290 /* on_enter/on_leave */ 258 /* on_enter/on_leave */
291 AV *on_enter; 259 AV *on_enter;
292 AV *on_leave; 260 AV *on_leave;
293 261
262 /* swap_sv */
263 AV *swap_sv;
264
265 /* times */
266 coro_ts t_cpu, t_real;
267
294 /* linked list */ 268 /* linked list */
295 struct coro *next, *prev; 269 struct coro *next, *prev;
296}; 270};
297 271
298typedef struct coro *Coro__State; 272typedef struct coro *Coro__State;
299typedef struct coro *Coro__State_or_hashref; 273typedef struct coro *Coro__State_or_hashref;
300 274
301/* the following variables are effectively part of the perl context */ 275/* the following variables are effectively part of the perl context */
302/* and get copied between struct coro and these variables */ 276/* and get copied between struct coro and these variables */
303/* the mainr easonw e don't support windows process emulation */ 277/* the main reason we don't support windows process emulation */
304static struct CoroSLF slf_frame; /* the current slf frame */ 278static struct CoroSLF slf_frame; /* the current slf frame */
305 279
306/** Coro ********************************************************************/ 280/** Coro ********************************************************************/
307 281
308#define PRIO_MAX 3 282#define CORO_PRIO_MAX 3
309#define PRIO_HIGH 1 283#define CORO_PRIO_HIGH 1
310#define PRIO_NORMAL 0 284#define CORO_PRIO_NORMAL 0
311#define PRIO_LOW -1 285#define CORO_PRIO_LOW -1
312#define PRIO_IDLE -3 286#define CORO_PRIO_IDLE -3
313#define PRIO_MIN -4 287#define CORO_PRIO_MIN -4
314 288
315/* for Coro.pm */ 289/* for Coro.pm */
316static SV *coro_current; 290static SV *coro_current;
317static SV *coro_readyhook; 291static SV *coro_readyhook;
318static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1]; 292static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
319static CV *cv_coro_run, *cv_coro_terminate; 293static CV *cv_coro_run;
320static struct coro *coro_first; 294static struct coro *coro_first;
321#define coro_nready coroapi.nready 295#define coro_nready coroapi.nready
322 296
297/** JIT *********************************************************************/
298
299#if CORO_JIT
300 /* APPLE doesn't have HAVE_MMAP though */
301 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__)
302 #ifndef CORO_JIT_TYPE
303 #if __x86_64 && CORO_JIT_UNIXY
304 #define CORO_JIT_TYPE "amd64-unix"
305 #elif __i386 && CORO_JIT_UNIXY
306 #define CORO_JIT_TYPE "x86-unix"
307 #endif
308 #endif
309#endif
310
311#if !defined(CORO_JIT_TYPE) || !HAVE_MMAP
312 #undef CORO_JIT
313#endif
314
315#if CORO_JIT
316 typedef void (*load_save_perl_slots_type)(perl_slots *);
317 static load_save_perl_slots_type load_perl_slots, save_perl_slots;
318#endif
319
320/** Coro::Select ************************************************************/
321
322static OP *(*coro_old_pp_sselect) (pTHX);
323static SV *coro_select_select;
324
325/* horrible hack, but if it works... */
326static OP *
327coro_pp_sselect (pTHX)
328{
329 dSP;
330 PUSHMARK (SP - 4); /* fake argument list */
331 XPUSHs (coro_select_select);
332 PUTBACK;
333
334 /* entersub is an UNOP, select a LISTOP... keep your fingers crossed */
335 PL_op->op_flags |= OPf_STACKED;
336 PL_op->op_private = 0;
337 return PL_ppaddr [OP_ENTERSUB](aTHX);
338}
339
340/** time stuff **************************************************************/
341
342#ifdef HAS_GETTIMEOFDAY
343
344ecb_inline void
345coro_u2time (pTHX_ UV ret[2])
346{
347 struct timeval tv;
348 gettimeofday (&tv, 0);
349
350 ret [0] = tv.tv_sec;
351 ret [1] = tv.tv_usec;
352}
353
354ecb_inline double
355coro_nvtime (void)
356{
357 struct timeval tv;
358 gettimeofday (&tv, 0);
359
360 return tv.tv_sec + tv.tv_usec * 1e-6;
361}
362
363ecb_inline void
364time_init (pTHX)
365{
366 nvtime = coro_nvtime;
367 u2time = coro_u2time;
368}
369
370#else
371
372ecb_inline void
373time_init (pTHX)
374{
375 SV **svp;
376
377 require_pv ("Time/HiRes.pm");
378
379 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
380
381 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
382 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught");
383
384 nvtime = INT2PTR (double (*)(), SvIV (*svp));
385
386 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
387 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
388}
389
390#endif
391
323/** lowlevel stuff **********************************************************/ 392/** lowlevel stuff **********************************************************/
324 393
325static SV * 394static SV * ecb_noinline
326coro_get_sv (pTHX_ const char *name, int create) 395coro_get_sv (pTHX_ const char *name, int create)
327{ 396{
328#if PERL_VERSION_ATLEAST (5,10,0) 397#if PERL_VERSION_ATLEAST (5,10,0)
329 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 398 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
330 get_sv (name, create); 399 get_sv (name, create);
331#endif 400#endif
332 return get_sv (name, create); 401 return get_sv (name, create);
333} 402}
334 403
335static AV * 404static AV * ecb_noinline
336coro_get_av (pTHX_ const char *name, int create) 405coro_get_av (pTHX_ const char *name, int create)
337{ 406{
338#if PERL_VERSION_ATLEAST (5,10,0) 407#if PERL_VERSION_ATLEAST (5,10,0)
339 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 408 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
340 get_av (name, create); 409 get_av (name, create);
341#endif 410#endif
342 return get_av (name, create); 411 return get_av (name, create);
343} 412}
344 413
345static HV * 414static HV * ecb_noinline
346coro_get_hv (pTHX_ const char *name, int create) 415coro_get_hv (pTHX_ const char *name, int create)
347{ 416{
348#if PERL_VERSION_ATLEAST (5,10,0) 417#if PERL_VERSION_ATLEAST (5,10,0)
349 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 418 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
350 get_hv (name, create); 419 get_hv (name, create);
351#endif 420#endif
352 return get_hv (name, create); 421 return get_hv (name, create);
353} 422}
354 423
355/* may croak */ 424ecb_inline void
356INLINE CV * 425coro_times_update (void)
357coro_sv_2cv (pTHX_ SV *sv)
358{ 426{
359 HV *st; 427#ifdef coro_clock_gettime
360 GV *gvp; 428 struct timespec ts;
361 CV *cv = sv_2cv (sv, &st, &gvp, 0);
362 429
363 if (!cv) 430 ts.tv_sec = ts.tv_nsec = 0;
364 croak ("code reference expected"); 431 coro_clock_gettime (CORO_CLOCK_THREAD_CPUTIME_ID, &ts);
432 time_cpu [0] = ts.tv_sec; time_cpu [1] = ts.tv_nsec;
365 433
366 return cv; 434 ts.tv_sec = ts.tv_nsec = 0;
435 coro_clock_gettime (CORO_CLOCK_MONOTONIC, &ts);
436 time_real [0] = ts.tv_sec; time_real [1] = ts.tv_nsec;
437#else
438 dTHX;
439 UV tv[2];
440
441 u2time (aTHX_ tv);
442 time_real [0] = tv [0];
443 time_real [1] = tv [1] * 1000;
444#endif
445}
446
447ecb_inline void
448coro_times_add (struct coro *c)
449{
450 c->t_real [1] += time_real [1];
451 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
452 c->t_real [0] += time_real [0];
453
454 c->t_cpu [1] += time_cpu [1];
455 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
456 c->t_cpu [0] += time_cpu [0];
457}
458
459ecb_inline void
460coro_times_sub (struct coro *c)
461{
462 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; }
463 c->t_real [1] -= time_real [1];
464 c->t_real [0] -= time_real [0];
465
466 if (c->t_cpu [1] < time_cpu [1]) { c->t_cpu [1] += 1000000000; --c->t_cpu [0]; }
467 c->t_cpu [1] -= time_cpu [1];
468 c->t_cpu [0] -= time_cpu [0];
367} 469}
368 470
369/*****************************************************************************/ 471/*****************************************************************************/
370/* magic glue */ 472/* magic glue */
371 473
372#define CORO_MAGIC_type_cv 26 474#define CORO_MAGIC_type_cv 26
373#define CORO_MAGIC_type_state PERL_MAGIC_ext 475#define CORO_MAGIC_type_state PERL_MAGIC_ext
374 476
375#define CORO_MAGIC_NN(sv, type) \ 477#define CORO_MAGIC_NN(sv, type) \
376 (expect_true (SvMAGIC (sv)->mg_type == type) \ 478 (ecb_expect_true (SvMAGIC (sv)->mg_type == type) \
377 ? SvMAGIC (sv) \ 479 ? SvMAGIC (sv) \
378 : mg_find (sv, type)) 480 : mg_find (sv, type))
379 481
380#define CORO_MAGIC(sv, type) \ 482#define CORO_MAGIC(sv, type) \
381 (expect_true (SvMAGIC (sv)) \ 483 (ecb_expect_true (SvMAGIC (sv)) \
382 ? CORO_MAGIC_NN (sv, type) \ 484 ? CORO_MAGIC_NN (sv, type) \
383 : 0) 485 : 0)
384 486
385#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv) 487#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
386#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state) 488#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
387 489
388INLINE struct coro * 490ecb_inline MAGIC *
491SvSTATEhv_p (pTHX_ SV *coro)
492{
493 MAGIC *mg;
494
495 if (ecb_expect_true (
496 SvTYPE (coro) == SVt_PVHV
497 && (mg = CORO_MAGIC_state (coro))
498 && mg->mg_virtual == &coro_state_vtbl
499 ))
500 return mg;
501
502 return 0;
503}
504
505ecb_inline struct coro *
389SvSTATE_ (pTHX_ SV *coro) 506SvSTATE_ (pTHX_ SV *coro)
390{ 507{
391 HV *stash;
392 MAGIC *mg; 508 MAGIC *mg;
393 509
394 if (SvROK (coro)) 510 if (SvROK (coro))
395 coro = SvRV (coro); 511 coro = SvRV (coro);
396 512
397 if (expect_false (SvTYPE (coro) != SVt_PVHV)) 513 mg = SvSTATEhv_p (aTHX_ coro);
514 if (!mg)
398 croak ("Coro::State object required"); 515 croak ("Coro::State object required");
399 516
400 stash = SvSTASH (coro);
401 if (expect_false (stash != coro_stash && stash != coro_state_stash))
402 {
403 /* very slow, but rare, check */
404 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
405 croak ("Coro::State object required");
406 }
407
408 mg = CORO_MAGIC_state (coro);
409 return (struct coro *)mg->mg_ptr; 517 return (struct coro *)mg->mg_ptr;
410} 518}
411 519
412#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 520#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
413 521
… …
416#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 524#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
417 525
418/*****************************************************************************/ 526/*****************************************************************************/
419/* padlist management and caching */ 527/* padlist management and caching */
420 528
421static AV * 529ecb_inline AV *
422coro_derive_padlist (pTHX_ CV *cv) 530coro_derive_padlist (pTHX_ CV *cv)
423{ 531{
424 AV *padlist = CvPADLIST (cv); 532 AV *padlist = CvPADLIST (cv);
425 AV *newpadlist, *newpad; 533 AV *newpadlist, *newpad;
426 534
… …
438 av_store (newpadlist, 1, (SV *)newpad); 546 av_store (newpadlist, 1, (SV *)newpad);
439 547
440 return newpadlist; 548 return newpadlist;
441} 549}
442 550
443static void 551ecb_inline void
444free_padlist (pTHX_ AV *padlist) 552free_padlist (pTHX_ AV *padlist)
445{ 553{
446 /* may be during global destruction */ 554 /* may be during global destruction */
447 if (!IN_DESTRUCT) 555 if (!IN_DESTRUCT)
448 { 556 {
… …
472coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 580coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
473{ 581{
474 AV *padlist; 582 AV *padlist;
475 AV *av = (AV *)mg->mg_obj; 583 AV *av = (AV *)mg->mg_obj;
476 584
585 /* perl manages to free our internal AV and _then_ call us */
586 if (IN_DESTRUCT)
587 return 0;
588
477 /* casting is fun. */ 589 /* casting is fun. */
478 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 590 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
479 free_padlist (aTHX_ padlist); 591 free_padlist (aTHX_ padlist);
480 592
481 SvREFCNT_dec (av); /* sv_magicext increased the refcount */ 593 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
… …
487 0, 0, 0, 0, 599 0, 0, 0, 0,
488 coro_cv_free 600 coro_cv_free
489}; 601};
490 602
491/* the next two functions merely cache the padlists */ 603/* the next two functions merely cache the padlists */
492static void 604ecb_inline void
493get_padlist (pTHX_ CV *cv) 605get_padlist (pTHX_ CV *cv)
494{ 606{
495 MAGIC *mg = CORO_MAGIC_cv (cv); 607 MAGIC *mg = CORO_MAGIC_cv (cv);
496 AV *av; 608 AV *av;
497 609
498 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 610 if (ecb_expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0))
499 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 611 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
500 else 612 else
501 { 613 {
502#if CORO_PREFER_PERL_FUNCTIONS 614#if CORO_PREFER_PERL_FUNCTIONS
503 /* this is probably cleaner? but also slower! */ 615 /* this is probably cleaner? but also slower! */
… …
510 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 622 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
511#endif 623#endif
512 } 624 }
513} 625}
514 626
515static void 627ecb_inline void
516put_padlist (pTHX_ CV *cv) 628put_padlist (pTHX_ CV *cv)
517{ 629{
518 MAGIC *mg = CORO_MAGIC_cv (cv); 630 MAGIC *mg = CORO_MAGIC_cv (cv);
519 AV *av; 631 AV *av;
520 632
521 if (expect_false (!mg)) 633 if (ecb_expect_false (!mg))
522 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 634 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
523 635
524 av = (AV *)mg->mg_obj; 636 av = (AV *)mg->mg_obj;
525 637
526 if (expect_false (AvFILLp (av) >= AvMAX (av))) 638 if (ecb_expect_false (AvFILLp (av) >= AvMAX (av)))
527 av_extend (av, AvFILLp (av) + 1); 639 av_extend (av, AvFILLp (av) + 1);
528 640
529 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 641 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
530} 642}
531 643
532/** load & save, init *******************************************************/ 644/** load & save, init *******************************************************/
645
646ecb_inline void
647swap_sv (SV *a, SV *b)
648{
649 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
650 SV tmp;
651
652 /* swap sv_any */
653 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
654
655 /* swap sv_flags */
656 SvFLAGS (&tmp) = SvFLAGS (a);
657 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
658 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
659
660#if PERL_VERSION_ATLEAST (5,10,0)
661 /* perl 5.10 and later complicates this _quite_ a bit, but it also
662 * is much faster, so no quarrels here. alternatively, we could
663 * sv_upgrade to avoid this.
664 */
665 {
666 /* swap sv_u */
667 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
668
669 /* if SvANY points to the head, we need to adjust the pointers,
670 * as the pointer for a still points to b, and maybe vice versa.
671 */
672 #define svany_in_head(type) \
673 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
674
675 if (svany_in_head (SvTYPE (a)))
676 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
677
678 if (svany_in_head (SvTYPE (b)))
679 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
680 }
681#endif
682}
683
684/* swap sv heads, at least logically */
685static void
686swap_svs (pTHX_ Coro__State c)
687{
688 int i;
689
690 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
691 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
692}
693
694#define SWAP_SVS(coro) \
695 if (ecb_expect_false ((coro)->swap_sv)) \
696 swap_svs (aTHX_ (coro))
533 697
534static void 698static void
535on_enterleave_call (pTHX_ SV *cb); 699on_enterleave_call (pTHX_ SV *cb);
536 700
537static void 701static void
… …
540 perl_slots *slot = c->slot; 704 perl_slots *slot = c->slot;
541 c->slot = 0; 705 c->slot = 0;
542 706
543 PL_mainstack = c->mainstack; 707 PL_mainstack = c->mainstack;
544 708
545 GvSV (PL_defgv) = slot->defsv; 709#if CORO_JIT
546 GvAV (PL_defgv) = slot->defav; 710 load_perl_slots (slot);
547 GvSV (PL_errgv) = slot->errsv; 711#else
548 GvSV (irsgv) = slot->irsgv;
549 GvHV (PL_hintgv) = slot->hinthv;
550
551 #define VAR(name,type) PL_ ## name = slot->name; 712 #define VARx(name,expr,type) expr = slot->name;
552 # include "state.h" 713 #include "state.h"
553 #undef VAR 714#endif
554 715
555 { 716 {
556 dSP; 717 dSP;
557 718
558 CV *cv; 719 CV *cv;
559 720
560 /* now do the ugly restore mess */ 721 /* now do the ugly restore mess */
561 while (expect_true (cv = (CV *)POPs)) 722 while (ecb_expect_true (cv = (CV *)POPs))
562 { 723 {
563 put_padlist (aTHX_ cv); /* mark this padlist as available */ 724 put_padlist (aTHX_ cv); /* mark this padlist as available */
564 CvDEPTH (cv) = PTR2IV (POPs); 725 CvDEPTH (cv) = PTR2IV (POPs);
565 CvPADLIST (cv) = (AV *)POPs; 726 CvPADLIST (cv) = (AV *)POPs;
566 } 727 }
… …
569 } 730 }
570 731
571 slf_frame = c->slf_frame; 732 slf_frame = c->slf_frame;
572 CORO_THROW = c->except; 733 CORO_THROW = c->except;
573 734
735 if (ecb_expect_false (enable_times))
736 {
737 if (ecb_expect_false (!times_valid))
738 coro_times_update ();
739
740 coro_times_sub (c);
741 }
742
574 if (expect_false (c->on_enter)) 743 if (ecb_expect_false (c->on_enter))
575 { 744 {
576 int i; 745 int i;
577 746
578 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 747 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
579 on_enterleave_call (AvARRAY (c->on_enter)[i]); 748 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
580 } 749 }
750
751 SWAP_SVS (c);
581} 752}
582 753
583static void 754static void
584save_perl (pTHX_ Coro__State c) 755save_perl (pTHX_ Coro__State c)
585{ 756{
757 SWAP_SVS (c);
758
586 if (expect_false (c->on_leave)) 759 if (ecb_expect_false (c->on_leave))
587 { 760 {
588 int i; 761 int i;
589 762
590 for (i = AvFILLp (c->on_leave); i >= 0; --i) 763 for (i = AvFILLp (c->on_leave); i >= 0; --i)
591 on_enterleave_call (AvARRAY (c->on_leave)[i]); 764 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
765 }
766
767 times_valid = 0;
768
769 if (ecb_expect_false (enable_times))
770 {
771 coro_times_update (); times_valid = 1;
772 coro_times_add (c);
592 } 773 }
593 774
594 c->except = CORO_THROW; 775 c->except = CORO_THROW;
595 c->slf_frame = slf_frame; 776 c->slf_frame = slf_frame;
596 777
… …
607 788
608 XPUSHs (Nullsv); 789 XPUSHs (Nullsv);
609 /* this loop was inspired by pp_caller */ 790 /* this loop was inspired by pp_caller */
610 for (;;) 791 for (;;)
611 { 792 {
612 while (expect_true (cxix >= 0)) 793 while (ecb_expect_true (cxix >= 0))
613 { 794 {
614 PERL_CONTEXT *cx = &ccstk[cxix--]; 795 PERL_CONTEXT *cx = &ccstk[cxix--];
615 796
616 if (expect_true (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT)) 797 if (ecb_expect_true (CxTYPE (cx) == CXt_SUB) || ecb_expect_false (CxTYPE (cx) == CXt_FORMAT))
617 { 798 {
618 CV *cv = cx->blk_sub.cv; 799 CV *cv = cx->blk_sub.cv;
619 800
620 if (expect_true (CvDEPTH (cv))) 801 if (ecb_expect_true (CvDEPTH (cv)))
621 { 802 {
622 EXTEND (SP, 3); 803 EXTEND (SP, 3);
623 PUSHs ((SV *)CvPADLIST (cv)); 804 PUSHs ((SV *)CvPADLIST (cv));
624 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv))); 805 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
625 PUSHs ((SV *)cv); 806 PUSHs ((SV *)cv);
… …
628 get_padlist (aTHX_ cv); 809 get_padlist (aTHX_ cv);
629 } 810 }
630 } 811 }
631 } 812 }
632 813
633 if (expect_true (top_si->si_type == PERLSI_MAIN)) 814 if (ecb_expect_true (top_si->si_type == PERLSI_MAIN))
634 break; 815 break;
635 816
636 top_si = top_si->si_prev; 817 top_si = top_si->si_prev;
637 ccstk = top_si->si_cxstack; 818 ccstk = top_si->si_cxstack;
638 cxix = top_si->si_cxix; 819 cxix = top_si->si_cxix;
… …
640 821
641 PUTBACK; 822 PUTBACK;
642 } 823 }
643 824
644 /* allocate some space on the context stack for our purposes */ 825 /* allocate some space on the context stack for our purposes */
645 /* we manually unroll here, as usually 2 slots is enough */ 826 if (ecb_expect_false (cxstack_ix + (int)SLOT_COUNT >= cxstack_max))
646 if (SLOT_COUNT >= 1) CXINC;
647 if (SLOT_COUNT >= 2) CXINC;
648 if (SLOT_COUNT >= 3) CXINC;
649 { 827 {
650 int i; 828 unsigned int i;
829
651 for (i = 3; i < SLOT_COUNT; ++i) 830 for (i = 0; i < SLOT_COUNT; ++i)
652 CXINC; 831 CXINC;
653 } 832
654 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 833 cxstack_ix -= SLOT_COUNT; /* undo allocation */
834 }
655 835
656 c->mainstack = PL_mainstack; 836 c->mainstack = PL_mainstack;
657 837
658 { 838 {
659 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 839 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
660 840
661 slot->defav = GvAV (PL_defgv); 841#if CORO_JIT
662 slot->defsv = DEFSV; 842 save_perl_slots (slot);
663 slot->errsv = ERRSV; 843#else
664 slot->irsgv = GvSV (irsgv);
665 slot->hinthv = GvHV (PL_hintgv);
666
667 #define VAR(name,type) slot->name = PL_ ## name; 844 #define VARx(name,expr,type) slot->name = expr;
668 # include "state.h" 845 #include "state.h"
669 #undef VAR 846#endif
670 } 847 }
671} 848}
672 849
673/* 850/*
674 * allocate various perl stacks. This is almost an exact copy 851 * allocate various perl stacks. This is almost an exact copy
… …
680# define coro_init_stacks(thx) init_stacks () 857# define coro_init_stacks(thx) init_stacks ()
681#else 858#else
682static void 859static void
683coro_init_stacks (pTHX) 860coro_init_stacks (pTHX)
684{ 861{
685 PL_curstackinfo = new_stackinfo(32, 8); 862 PL_curstackinfo = new_stackinfo(32, 4 + SLOT_COUNT); /* 3 is minimum due to perl rounding down in scope.c:GROW() */
686 PL_curstackinfo->si_type = PERLSI_MAIN; 863 PL_curstackinfo->si_type = PERLSI_MAIN;
687 PL_curstack = PL_curstackinfo->si_stack; 864 PL_curstack = PL_curstackinfo->si_stack;
688 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 865 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
689 866
690 PL_stack_base = AvARRAY(PL_curstack); 867 PL_stack_base = AvARRAY(PL_curstack);
… …
705#endif 882#endif
706 883
707 New(54,PL_scopestack,8,I32); 884 New(54,PL_scopestack,8,I32);
708 PL_scopestack_ix = 0; 885 PL_scopestack_ix = 0;
709 PL_scopestack_max = 8; 886 PL_scopestack_max = 8;
887#if HAS_SCOPESTACK_NAME
888 New(54,PL_scopestack_name,8,const char*);
889#endif
710 890
711 New(54,PL_savestack,24,ANY); 891 New(54,PL_savestack,24,ANY);
712 PL_savestack_ix = 0; 892 PL_savestack_ix = 0;
713 PL_savestack_max = 24; 893 PL_savestack_max = 24;
714 894
… …
742 } 922 }
743 923
744 Safefree (PL_tmps_stack); 924 Safefree (PL_tmps_stack);
745 Safefree (PL_markstack); 925 Safefree (PL_markstack);
746 Safefree (PL_scopestack); 926 Safefree (PL_scopestack);
927#if HAS_SCOPESTACK_NAME
928 Safefree (PL_scopestack_name);
929#endif
747 Safefree (PL_savestack); 930 Safefree (PL_savestack);
748#if !PERL_VERSION_ATLEAST (5,10,0) 931#if !PERL_VERSION_ATLEAST (5,10,0)
749 Safefree (PL_retstack); 932 Safefree (PL_retstack);
750#endif 933#endif
751} 934}
… …
797#endif 980#endif
798 981
799/* 982/*
800 * This overrides the default magic get method of %SIG elements. 983 * This overrides the default magic get method of %SIG elements.
801 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook 984 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
802 * and instead of trying to save and restore the hash elements, we just provide 985 * and instead of trying to save and restore the hash elements (extremely slow),
803 * readback here. 986 * we just provide our own readback here.
804 */ 987 */
805static int 988static int ecb_cold
806coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 989coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
807{ 990{
808 const char *s = MgPV_nolen_const (mg); 991 const char *s = MgPV_nolen_const (mg);
809 992
810 if (*s == '_') 993 if (*s == '_')
811 { 994 {
812 SV **svp = 0; 995 SV **svp = 0;
813 996
814 if (strEQ (s, "__DIE__" )) svp = &PL_diehook; 997 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
815 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 998 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
816 999
817 if (svp) 1000 if (svp)
818 { 1001 {
819 sv_setsv (sv, *svp ? *svp : &PL_sv_undef); 1002 SV *ssv;
1003
1004 if (!*svp)
1005 ssv = &PL_sv_undef;
1006 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */
1007 ssv = sv_2mortal (newRV_inc (*svp));
1008 else
1009 ssv = *svp;
1010
1011 sv_setsv (sv, ssv);
820 return 0; 1012 return 0;
821 } 1013 }
822 } 1014 }
823 1015
824 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 1016 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
825} 1017}
826 1018
827static int 1019static int ecb_cold
828coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1020coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
829{ 1021{
830 const char *s = MgPV_nolen_const (mg); 1022 const char *s = MgPV_nolen_const (mg);
831 1023
832 if (*s == '_') 1024 if (*s == '_')
… …
846 } 1038 }
847 1039
848 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0; 1040 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
849} 1041}
850 1042
851static int 1043static int ecb_cold
852coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1044coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
853{ 1045{
854 const char *s = MgPV_nolen_const (mg); 1046 const char *s = MgPV_nolen_const (mg);
855 1047
856 if (*s == '_') 1048 if (*s == '_')
… …
889slf_check_repeat (pTHX_ struct CoroSLF *frame) 1081slf_check_repeat (pTHX_ struct CoroSLF *frame)
890{ 1082{
891 return 1; 1083 return 1;
892} 1084}
893 1085
894static UNOP coro_setup_op; 1086static UNOP init_perl_op;
895 1087
896static void NOINLINE /* noinline to keep it out of the transfer fast path */ 1088ecb_noinline static void /* noinline to keep it out of the transfer fast path */
897coro_setup (pTHX_ struct coro *coro) 1089init_perl (pTHX_ struct coro *coro)
898{ 1090{
899 /* 1091 /*
900 * emulate part of the perl startup here. 1092 * emulate part of the perl startup here.
901 */ 1093 */
902 coro_init_stacks (aTHX); 1094 coro_init_stacks (aTHX);
… …
909 PL_comppad_name_fill = 0; 1101 PL_comppad_name_fill = 0;
910 PL_comppad_name_floor = 0; 1102 PL_comppad_name_floor = 0;
911 PL_curpm = 0; 1103 PL_curpm = 0;
912 PL_curpad = 0; 1104 PL_curpad = 0;
913 PL_localizing = 0; 1105 PL_localizing = 0;
914 PL_dirty = 0;
915 PL_restartop = 0; 1106 PL_restartop = 0;
916#if PERL_VERSION_ATLEAST (5,10,0) 1107#if PERL_VERSION_ATLEAST (5,10,0)
917 PL_parser = 0; 1108 PL_parser = 0;
918#endif 1109#endif
919 PL_hints = 0; 1110 PL_hints = 0;
920 1111
921 /* recreate the die/warn hooks */ 1112 /* recreate the die/warn hooks */
922 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1113 PL_diehook = SvREFCNT_inc (rv_diehook);
923 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1114 PL_warnhook = SvREFCNT_inc (rv_warnhook);
924 1115
925 GvSV (PL_defgv) = newSV (0); 1116 GvSV (PL_defgv) = newSV (0);
926 GvAV (PL_defgv) = coro->args; coro->args = 0; 1117 GvAV (PL_defgv) = coro->args; coro->args = 0;
927 GvSV (PL_errgv) = newSV (0); 1118 GvSV (PL_errgv) = newSV (0);
928 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1119 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
929 GvHV (PL_hintgv) = 0; 1120 GvHV (PL_hintgv) = 0;
… …
949 /* this newly created coroutine might be run on an existing cctx which most 1140 /* this newly created coroutine might be run on an existing cctx which most
950 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here. 1141 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
951 */ 1142 */
952 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1143 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
953 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */ 1144 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
1145 slf_frame.destroy = 0;
954 1146
955 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1147 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */
956 coro_setup_op.op_next = PL_op; 1148 init_perl_op.op_next = PL_op;
957 coro_setup_op.op_type = OP_ENTERSUB; 1149 init_perl_op.op_type = OP_ENTERSUB;
958 coro_setup_op.op_ppaddr = pp_slf; 1150 init_perl_op.op_ppaddr = pp_slf;
959 /* no flags etc. required, as an init function won't be called */ 1151 /* no flags etc. required, as an init function won't be called */
960 1152
961 PL_op = (OP *)&coro_setup_op; 1153 PL_op = (OP *)&init_perl_op;
962 1154
963 /* copy throw, in case it was set before coro_setup */ 1155 /* copy throw, in case it was set before init_perl */
964 CORO_THROW = coro->except; 1156 CORO_THROW = coro->except;
1157
1158 SWAP_SVS (coro);
1159
1160 if (ecb_expect_false (enable_times))
1161 {
1162 coro_times_update ();
1163 coro_times_sub (coro);
1164 }
965} 1165}
966 1166
967static void 1167static void
968coro_unwind_stacks (pTHX) 1168coro_unwind_stacks (pTHX)
969{ 1169{
… …
984 dounwind (-1); 1184 dounwind (-1);
985 } 1185 }
986} 1186}
987 1187
988static void 1188static void
989coro_destruct_perl (pTHX_ struct coro *coro) 1189destroy_perl (pTHX_ struct coro *coro)
990{ 1190{
1191 SV *svf [9];
1192
1193 {
1194 SV *old_current = SvRV (coro_current);
1195 struct coro *current = SvSTATE (old_current);
1196
1197 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1198
1199 save_perl (aTHX_ current);
1200
1201 /* this will cause transfer_check to croak on block*/
1202 SvRV_set (coro_current, (SV *)coro->hv);
1203
1204 load_perl (aTHX_ coro);
1205
991 coro_unwind_stacks (aTHX); 1206 coro_unwind_stacks (aTHX);
992 1207
993 SvREFCNT_dec (GvSV (PL_defgv)); 1208 /* restore swapped sv's */
994 SvREFCNT_dec (GvAV (PL_defgv)); 1209 SWAP_SVS (coro);
995 SvREFCNT_dec (GvSV (PL_errgv));
996 SvREFCNT_dec (PL_defoutgv);
997 SvREFCNT_dec (PL_rs);
998 SvREFCNT_dec (GvSV (irsgv));
999 SvREFCNT_dec (GvHV (PL_hintgv));
1000 1210
1001 SvREFCNT_dec (PL_diehook); 1211 coro_destruct_stacks (aTHX);
1002 SvREFCNT_dec (PL_warnhook); 1212
1213 /* now save some sv's to be free'd later */
1214 svf [0] = GvSV (PL_defgv);
1215 svf [1] = (SV *)GvAV (PL_defgv);
1216 svf [2] = GvSV (PL_errgv);
1217 svf [3] = (SV *)PL_defoutgv;
1218 svf [4] = PL_rs;
1219 svf [5] = GvSV (irsgv);
1220 svf [6] = (SV *)GvHV (PL_hintgv);
1221 svf [7] = PL_diehook;
1222 svf [8] = PL_warnhook;
1223 assert (9 == sizeof (svf) / sizeof (*svf));
1224
1225 SvRV_set (coro_current, old_current);
1226
1227 load_perl (aTHX_ current);
1003 1228 }
1229
1230 {
1231 unsigned int i;
1232
1233 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i)
1234 SvREFCNT_dec (svf [i]);
1235
1004 SvREFCNT_dec (coro->saved_deffh); 1236 SvREFCNT_dec (coro->saved_deffh);
1005 SvREFCNT_dec (coro->rouse_cb); 1237 SvREFCNT_dec (coro->rouse_cb);
1006 SvREFCNT_dec (coro->invoke_cb); 1238 SvREFCNT_dec (coro->invoke_cb);
1007 SvREFCNT_dec (coro->invoke_av); 1239 SvREFCNT_dec (coro->invoke_av);
1008 1240 }
1009 coro_destruct_stacks (aTHX);
1010} 1241}
1011 1242
1012INLINE void 1243ecb_inline void
1013free_coro_mortal (pTHX) 1244free_coro_mortal (pTHX)
1014{ 1245{
1015 if (expect_true (coro_mortal)) 1246 if (ecb_expect_true (coro_mortal))
1016 { 1247 {
1017 SvREFCNT_dec (coro_mortal); 1248 SvREFCNT_dec ((SV *)coro_mortal);
1018 coro_mortal = 0; 1249 coro_mortal = 0;
1019 } 1250 }
1020} 1251}
1021 1252
1022static int 1253static int
… …
1155 1386
1156 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1387 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1157} 1388}
1158 1389
1159/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1390/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1160static void NOINLINE 1391static void ecb_noinline
1161cctx_prepare (pTHX) 1392cctx_prepare (pTHX)
1162{ 1393{
1163 PL_top_env = &PL_start_env; 1394 PL_top_env = &PL_start_env;
1164 1395
1165 if (cctx_current->flags & CC_TRACE) 1396 if (cctx_current->flags & CC_TRACE)
… …
1176 slf_frame.prepare = slf_prepare_set_stacklevel; 1407 slf_frame.prepare = slf_prepare_set_stacklevel;
1177 slf_frame.check = slf_check_set_stacklevel; 1408 slf_frame.check = slf_check_set_stacklevel;
1178} 1409}
1179 1410
1180/* the tail of transfer: execute stuff we can only do after a transfer */ 1411/* the tail of transfer: execute stuff we can only do after a transfer */
1181INLINE void 1412ecb_inline void
1182transfer_tail (pTHX) 1413transfer_tail (pTHX)
1183{ 1414{
1184 free_coro_mortal (aTHX); 1415 free_coro_mortal (aTHX);
1416}
1417
1418/* try to exit the same way perl's main function would do */
1419/* we do not bother resetting the environment or other things *7
1420/* that are not, uhm, essential */
1421/* this obviously also doesn't work when perl is embedded */
1422static void ecb_noinline ecb_cold
1423perlish_exit (pTHX)
1424{
1425 int exitstatus = perl_destruct (PL_curinterp);
1426 perl_free (PL_curinterp);
1427 exit (exitstatus);
1185} 1428}
1186 1429
1187/* 1430/*
1188 * this is a _very_ stripped down perl interpreter ;) 1431 * this is a _very_ stripped down perl interpreter ;)
1189 */ 1432 */
… …
1211 /* somebody or something will hit me for both perl_run and PL_restartop */ 1454 /* somebody or something will hit me for both perl_run and PL_restartop */
1212 PL_restartop = PL_op; 1455 PL_restartop = PL_op;
1213 perl_run (PL_curinterp); 1456 perl_run (PL_curinterp);
1214 /* 1457 /*
1215 * Unfortunately, there is no way to get at the return values of the 1458 * Unfortunately, there is no way to get at the return values of the
1216 * coro body here, as perl_run destroys these 1459 * coro body here, as perl_run destroys these. Likewise, we cannot catch
1460 * runtime errors here, as this is just a random interpreter, not a thread.
1217 */ 1461 */
1218 1462
1219 /* 1463 /*
1220 * If perl-run returns we assume exit() was being called or the coro 1464 * If perl-run returns we assume exit() was being called or the coro
1221 * fell off the end, which seems to be the only valid (non-bug) 1465 * fell off the end, which seems to be the only valid (non-bug)
1222 * reason for perl_run to return. We try to exit by jumping to the 1466 * reason for perl_run to return. We try to mimic whatever perl is normally
1223 * bootstrap-time "top" top_env, as we cannot restore the "main" 1467 * doing in that case. YMMV.
1224 * coroutine as Coro has no such concept.
1225 * This actually isn't valid with the pthread backend, but OSes requiring
1226 * that backend are too broken to do it in a standards-compliant way.
1227 */ 1468 */
1228 PL_top_env = main_top_env; 1469 perlish_exit (aTHX);
1229 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1230 } 1470 }
1231} 1471}
1232 1472
1233static coro_cctx * 1473static coro_cctx *
1234cctx_new () 1474cctx_new (void)
1235{ 1475{
1236 coro_cctx *cctx; 1476 coro_cctx *cctx;
1237 1477
1238 ++cctx_count; 1478 ++cctx_count;
1239 New (0, cctx, 1, coro_cctx); 1479 New (0, cctx, 1, coro_cctx);
… …
1245 return cctx; 1485 return cctx;
1246} 1486}
1247 1487
1248/* create a new cctx only suitable as source */ 1488/* create a new cctx only suitable as source */
1249static coro_cctx * 1489static coro_cctx *
1250cctx_new_empty () 1490cctx_new_empty (void)
1251{ 1491{
1252 coro_cctx *cctx = cctx_new (); 1492 coro_cctx *cctx = cctx_new ();
1253 1493
1254 cctx->sptr = 0; 1494 cctx->sptr = 0;
1255 coro_create (&cctx->cctx, 0, 0, 0, 0); 1495 coro_create (&cctx->cctx, 0, 0, 0, 0);
… …
1257 return cctx; 1497 return cctx;
1258} 1498}
1259 1499
1260/* create a new cctx suitable as destination/running a perl interpreter */ 1500/* create a new cctx suitable as destination/running a perl interpreter */
1261static coro_cctx * 1501static coro_cctx *
1262cctx_new_run () 1502cctx_new_run (void)
1263{ 1503{
1264 coro_cctx *cctx = cctx_new (); 1504 coro_cctx *cctx = cctx_new ();
1265 void *stack_start; 1505 void *stack_start;
1266 size_t stack_size; 1506 size_t stack_size;
1267 1507
1268#if HAVE_MMAP 1508#if HAVE_MMAP
1269 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE; 1509 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1270 /* mmap supposedly does allocate-on-write for us */ 1510 /* mmap supposedly does allocate-on-write for us */
1271 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0); 1511 cctx->sptr = mmap (0, cctx->ssize, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_ANONYMOUS, -1, 0);
1272 1512
1273 if (cctx->sptr != (void *)-1) 1513 if (cctx->sptr != (void *)-1)
1274 { 1514 {
1275 #if CORO_STACKGUARD 1515 #if CORO_STACKGUARD
1276 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE); 1516 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
… …
1308cctx_destroy (coro_cctx *cctx) 1548cctx_destroy (coro_cctx *cctx)
1309{ 1549{
1310 if (!cctx) 1550 if (!cctx)
1311 return; 1551 return;
1312 1552
1313 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary? 1553 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1314 1554
1315 --cctx_count; 1555 --cctx_count;
1316 coro_destroy (&cctx->cctx); 1556 coro_destroy (&cctx->cctx);
1317 1557
1318 /* coro_transfer creates new, empty cctx's */ 1558 /* coro_transfer creates new, empty cctx's */
… …
1337#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE)) 1577#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE))
1338 1578
1339static coro_cctx * 1579static coro_cctx *
1340cctx_get (pTHX) 1580cctx_get (pTHX)
1341{ 1581{
1342 while (expect_true (cctx_first)) 1582 while (ecb_expect_true (cctx_first))
1343 { 1583 {
1344 coro_cctx *cctx = cctx_first; 1584 coro_cctx *cctx = cctx_first;
1345 cctx_first = cctx->next; 1585 cctx_first = cctx->next;
1346 --cctx_idle; 1586 --cctx_idle;
1347 1587
1348 if (expect_true (!CCTX_EXPIRED (cctx))) 1588 if (ecb_expect_true (!CCTX_EXPIRED (cctx)))
1349 return cctx; 1589 return cctx;
1350 1590
1351 cctx_destroy (cctx); 1591 cctx_destroy (cctx);
1352 } 1592 }
1353 1593
… …
1358cctx_put (coro_cctx *cctx) 1598cctx_put (coro_cctx *cctx)
1359{ 1599{
1360 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1600 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr));
1361 1601
1362 /* free another cctx if overlimit */ 1602 /* free another cctx if overlimit */
1363 if (expect_false (cctx_idle >= cctx_max_idle)) 1603 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1364 { 1604 {
1365 coro_cctx *first = cctx_first; 1605 coro_cctx *first = cctx_first;
1366 cctx_first = first->next; 1606 cctx_first = first->next;
1367 --cctx_idle; 1607 --cctx_idle;
1368 1608
… …
1379static void 1619static void
1380transfer_check (pTHX_ struct coro *prev, struct coro *next) 1620transfer_check (pTHX_ struct coro *prev, struct coro *next)
1381{ 1621{
1382 /* TODO: throwing up here is considered harmful */ 1622 /* TODO: throwing up here is considered harmful */
1383 1623
1384 if (expect_true (prev != next)) 1624 if (ecb_expect_true (prev != next))
1385 { 1625 {
1386 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1626 if (ecb_expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1387 croak ("Coro::State::transfer called with a suspended prev Coro::State, but can only transfer from running or new states,"); 1627 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1388 1628
1389 if (expect_false (next->flags & CF_RUNNING)) 1629 if (ecb_expect_false (next->flags & (CF_RUNNING | CF_ZOMBIE | CF_SUSPENDED)))
1390 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states,");
1391
1392 if (expect_false (next->flags & CF_DESTROYED))
1393 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states,"); 1630 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1394 1631
1395#if !PERL_VERSION_ATLEAST (5,10,0) 1632#if !PERL_VERSION_ATLEAST (5,10,0)
1396 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1633 if (ecb_expect_false (PL_lex_state != LEX_NOTPARSING))
1397 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,"); 1634 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1398#endif 1635#endif
1399 } 1636 }
1400} 1637}
1401 1638
1402/* always use the TRANSFER macro */ 1639/* always use the TRANSFER macro */
1403static void NOINLINE /* noinline so we have a fixed stackframe */ 1640static void ecb_noinline /* noinline so we have a fixed stackframe */
1404transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1641transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1405{ 1642{
1406 dSTACKLEVEL; 1643 dSTACKLEVEL;
1407 1644
1408 /* sometimes transfer is only called to set idle_sp */ 1645 /* sometimes transfer is only called to set idle_sp */
1409 if (expect_false (!prev)) 1646 if (ecb_expect_false (!prev))
1410 { 1647 {
1411 cctx_current->idle_sp = STACKLEVEL; 1648 cctx_current->idle_sp = STACKLEVEL;
1412 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1649 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1413 } 1650 }
1414 else if (expect_true (prev != next)) 1651 else if (ecb_expect_true (prev != next))
1415 { 1652 {
1416 coro_cctx *cctx_prev; 1653 coro_cctx *cctx_prev;
1417 1654
1418 if (expect_false (prev->flags & CF_NEW)) 1655 if (ecb_expect_false (prev->flags & CF_NEW))
1419 { 1656 {
1420 /* create a new empty/source context */ 1657 /* create a new empty/source context */
1421 prev->flags &= ~CF_NEW; 1658 prev->flags &= ~CF_NEW;
1422 prev->flags |= CF_RUNNING; 1659 prev->flags |= CF_RUNNING;
1423 } 1660 }
… …
1426 next->flags |= CF_RUNNING; 1663 next->flags |= CF_RUNNING;
1427 1664
1428 /* first get rid of the old state */ 1665 /* first get rid of the old state */
1429 save_perl (aTHX_ prev); 1666 save_perl (aTHX_ prev);
1430 1667
1431 if (expect_false (next->flags & CF_NEW)) 1668 if (ecb_expect_false (next->flags & CF_NEW))
1432 { 1669 {
1433 /* need to start coroutine */ 1670 /* need to start coroutine */
1434 next->flags &= ~CF_NEW; 1671 next->flags &= ~CF_NEW;
1435 /* setup coroutine call */ 1672 /* setup coroutine call */
1436 coro_setup (aTHX_ next); 1673 init_perl (aTHX_ next);
1437 } 1674 }
1438 else 1675 else
1439 load_perl (aTHX_ next); 1676 load_perl (aTHX_ next);
1440 1677
1441 /* possibly untie and reuse the cctx */ 1678 /* possibly untie and reuse the cctx */
1442 if (expect_true ( 1679 if (ecb_expect_true (
1443 cctx_current->idle_sp == STACKLEVEL 1680 cctx_current->idle_sp == STACKLEVEL
1444 && !(cctx_current->flags & CC_TRACE) 1681 && !(cctx_current->flags & CC_TRACE)
1445 && !force_cctx 1682 && !force_cctx
1446 )) 1683 ))
1447 { 1684 {
1448 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1685 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */
1449 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te)); 1686 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1450 1687
1451 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */ 1688 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */
1452 /* without this the next cctx_get might destroy the running cctx while still in use */ 1689 /* without this the next cctx_get might destroy the running cctx while still in use */
1453 if (expect_false (CCTX_EXPIRED (cctx_current))) 1690 if (ecb_expect_false (CCTX_EXPIRED (cctx_current)))
1454 if (expect_true (!next->cctx)) 1691 if (ecb_expect_true (!next->cctx))
1455 next->cctx = cctx_get (aTHX); 1692 next->cctx = cctx_get (aTHX);
1456 1693
1457 cctx_put (cctx_current); 1694 cctx_put (cctx_current);
1458 } 1695 }
1459 else 1696 else
1460 prev->cctx = cctx_current; 1697 prev->cctx = cctx_current;
1461 1698
1462 ++next->usecount; 1699 ++next->usecount;
1463 1700
1464 cctx_prev = cctx_current; 1701 cctx_prev = cctx_current;
1465 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX); 1702 cctx_current = ecb_expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1466 1703
1467 next->cctx = 0; 1704 next->cctx = 0;
1468 1705
1469 if (expect_false (cctx_prev != cctx_current)) 1706 if (ecb_expect_false (cctx_prev != cctx_current))
1470 { 1707 {
1471 cctx_prev->top_env = PL_top_env; 1708 cctx_prev->top_env = PL_top_env;
1472 PL_top_env = cctx_current->top_env; 1709 PL_top_env = cctx_current->top_env;
1473 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx); 1710 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1474 } 1711 }
… …
1480#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx)) 1717#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1481#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1718#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1482 1719
1483/** high level stuff ********************************************************/ 1720/** high level stuff ********************************************************/
1484 1721
1722/* this function is actually Coro, not Coro::State, but we call it from here */
1723/* because it is convenient - but it hasn't been declared yet for that reason */
1485static int 1724static void
1725coro_call_on_destroy (pTHX_ struct coro *coro);
1726
1727static void
1486coro_state_destroy (pTHX_ struct coro *coro) 1728coro_state_destroy (pTHX_ struct coro *coro)
1487{ 1729{
1488 if (coro->flags & CF_DESTROYED) 1730 if (coro->flags & CF_ZOMBIE)
1489 return 0; 1731 return;
1490 1732
1491 if (coro->on_destroy)
1492 coro->on_destroy (aTHX_ coro); 1733 slf_destroy (aTHX_ coro);
1493 1734
1494 coro->flags |= CF_DESTROYED; 1735 coro->flags |= CF_ZOMBIE;
1495 1736
1496 if (coro->flags & CF_READY) 1737 if (coro->flags & CF_READY)
1497 { 1738 {
1498 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1739 /* reduce nready, as destroying a ready coro effectively unreadies it */
1499 /* alternative: look through all ready queues and remove the coro */ 1740 /* alternative: look through all ready queues and remove the coro */
1500 --coro_nready; 1741 --coro_nready;
1501 } 1742 }
1502 else 1743 else
1503 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1744 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1745
1746 if (coro->next) coro->next->prev = coro->prev;
1747 if (coro->prev) coro->prev->next = coro->next;
1748 if (coro == coro_first) coro_first = coro->next;
1504 1749
1505 if (coro->mainstack 1750 if (coro->mainstack
1506 && coro->mainstack != main_mainstack 1751 && coro->mainstack != main_mainstack
1507 && coro->slot 1752 && coro->slot
1508 && !PL_dirty) 1753 && !PL_dirty)
1509 {
1510 struct coro *current = SvSTATE_current;
1511
1512 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1513
1514 save_perl (aTHX_ current);
1515 load_perl (aTHX_ coro);
1516
1517 coro_destruct_perl (aTHX_ coro); 1754 destroy_perl (aTHX_ coro);
1518
1519 load_perl (aTHX_ current);
1520
1521 coro->slot = 0;
1522 }
1523 1755
1524 cctx_destroy (coro->cctx); 1756 cctx_destroy (coro->cctx);
1525 SvREFCNT_dec (coro->startcv); 1757 SvREFCNT_dec (coro->startcv);
1526 SvREFCNT_dec (coro->args); 1758 SvREFCNT_dec (coro->args);
1759 SvREFCNT_dec (coro->swap_sv);
1527 SvREFCNT_dec (CORO_THROW); 1760 SvREFCNT_dec (CORO_THROW);
1528 1761
1529 if (coro->next) coro->next->prev = coro->prev; 1762 coro_call_on_destroy (aTHX_ coro);
1530 if (coro->prev) coro->prev->next = coro->next;
1531 if (coro == coro_first) coro_first = coro->next;
1532 1763
1533 return 1; 1764 /* more destruction mayhem in coro_state_free */
1534} 1765}
1535 1766
1536static int 1767static int
1537coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1768coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1538{ 1769{
1539 struct coro *coro = (struct coro *)mg->mg_ptr; 1770 struct coro *coro = (struct coro *)mg->mg_ptr;
1540 mg->mg_ptr = 0; 1771 mg->mg_ptr = 0;
1541 1772
1542 coro->hv = 0;
1543
1544 if (--coro->refcnt < 0)
1545 {
1546 coro_state_destroy (aTHX_ coro); 1773 coro_state_destroy (aTHX_ coro);
1774 SvREFCNT_dec (coro->on_destroy);
1775 SvREFCNT_dec (coro->status);
1776
1547 Safefree (coro); 1777 Safefree (coro);
1548 }
1549 1778
1550 return 0; 1779 return 0;
1551} 1780}
1552 1781
1553static int 1782static int ecb_cold
1554coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1783coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1555{ 1784{
1556 struct coro *coro = (struct coro *)mg->mg_ptr; 1785 /* called when perl clones the current process the slow way (windows process emulation) */
1557 1786 /* WE SIMply nuke the pointers in the copy, causing perl to croak */
1558 ++coro->refcnt; 1787 mg->mg_ptr = 0;
1788 mg->mg_virtual = 0;
1559 1789
1560 return 0; 1790 return 0;
1561} 1791}
1562 1792
1563static MGVTBL coro_state_vtbl = { 1793static MGVTBL coro_state_vtbl = {
… …
1586 1816
1587 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1817 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1588 TRANSFER (ta, 1); 1818 TRANSFER (ta, 1);
1589} 1819}
1590 1820
1591/*****************************************************************************/
1592/* gensub: simple closure generation utility */
1593
1594#define GENSUB_ARG CvXSUBANY (cv).any_ptr
1595
1596/* create a closure from XS, returns a code reference */
1597/* the arg can be accessed via GENSUB_ARG from the callback */
1598/* the callback must use dXSARGS/XSRETURN */
1599static SV *
1600gensub (pTHX_ void (*xsub)(pTHX_ CV *), void *arg)
1601{
1602 CV *cv = (CV *)newSV (0);
1603
1604 sv_upgrade ((SV *)cv, SVt_PVCV);
1605
1606 CvANON_on (cv);
1607 CvISXSUB_on (cv);
1608 CvXSUB (cv) = xsub;
1609 GENSUB_ARG = arg;
1610
1611 return newRV_noinc ((SV *)cv);
1612}
1613
1614/** Coro ********************************************************************/ 1821/** Coro ********************************************************************/
1615 1822
1616INLINE void 1823ecb_inline void
1617coro_enq (pTHX_ struct coro *coro) 1824coro_enq (pTHX_ struct coro *coro)
1618{ 1825{
1619 av_push (coro_ready [coro->prio - PRIO_MIN], SvREFCNT_inc_NN (coro->hv)); 1826 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1620}
1621 1827
1622INLINE SV * 1828 SvREFCNT_inc_NN (coro->hv);
1829
1830 coro->next_ready = 0;
1831 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1832 ready [1] = coro;
1833}
1834
1835ecb_inline struct coro *
1623coro_deq (pTHX) 1836coro_deq (pTHX)
1624{ 1837{
1625 int prio; 1838 int prio;
1626 1839
1627 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; ) 1840 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
1628 if (AvFILLp (coro_ready [prio]) >= 0) 1841 {
1629 return av_shift (coro_ready [prio]); 1842 struct coro **ready = coro_ready [prio];
1843
1844 if (ready [0])
1845 {
1846 struct coro *coro = ready [0];
1847 ready [0] = coro->next_ready;
1848 return coro;
1849 }
1850 }
1630 1851
1631 return 0; 1852 return 0;
1853}
1854
1855static void
1856invoke_sv_ready_hook_helper (void)
1857{
1858 dTHX;
1859 dSP;
1860
1861 ENTER;
1862 SAVETMPS;
1863
1864 PUSHMARK (SP);
1865 PUTBACK;
1866 call_sv (coro_readyhook, G_VOID | G_DISCARD);
1867
1868 FREETMPS;
1869 LEAVE;
1632} 1870}
1633 1871
1634static int 1872static int
1635api_ready (pTHX_ SV *coro_sv) 1873api_ready (pTHX_ SV *coro_sv)
1636{ 1874{
1637 struct coro *coro;
1638 SV *sv_hook;
1639 void (*xs_hook)(void);
1640
1641 coro = SvSTATE (coro_sv); 1875 struct coro *coro = SvSTATE (coro_sv);
1642 1876
1643 if (coro->flags & CF_READY) 1877 if (coro->flags & CF_READY)
1644 return 0; 1878 return 0;
1645 1879
1646 coro->flags |= CF_READY; 1880 coro->flags |= CF_READY;
1647 1881
1648 sv_hook = coro_nready ? 0 : coro_readyhook;
1649 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1650
1651 coro_enq (aTHX_ coro); 1882 coro_enq (aTHX_ coro);
1652 ++coro_nready;
1653 1883
1654 if (sv_hook) 1884 if (!coro_nready++)
1655 { 1885 if (coroapi.readyhook)
1656 dSP; 1886 coroapi.readyhook ();
1657
1658 ENTER;
1659 SAVETMPS;
1660
1661 PUSHMARK (SP);
1662 PUTBACK;
1663 call_sv (sv_hook, G_VOID | G_DISCARD);
1664
1665 FREETMPS;
1666 LEAVE;
1667 }
1668
1669 if (xs_hook)
1670 xs_hook ();
1671 1887
1672 return 1; 1888 return 1;
1673} 1889}
1674 1890
1675static int 1891static int
… …
1677{ 1893{
1678 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1894 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1679} 1895}
1680 1896
1681/* expects to own a reference to next->hv */ 1897/* expects to own a reference to next->hv */
1682INLINE void 1898ecb_inline void
1683prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1899prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1684{ 1900{
1685 SV *prev_sv = SvRV (coro_current); 1901 SV *prev_sv = SvRV (coro_current);
1686 1902
1687 ta->prev = SvSTATE_hv (prev_sv); 1903 ta->prev = SvSTATE_hv (prev_sv);
… …
1698static void 1914static void
1699prepare_schedule (pTHX_ struct coro_transfer_args *ta) 1915prepare_schedule (pTHX_ struct coro_transfer_args *ta)
1700{ 1916{
1701 for (;;) 1917 for (;;)
1702 { 1918 {
1703 SV *next_sv = coro_deq (aTHX); 1919 struct coro *next = coro_deq (aTHX);
1704 1920
1705 if (expect_true (next_sv)) 1921 if (ecb_expect_true (next))
1706 { 1922 {
1707 struct coro *next = SvSTATE_hv (next_sv);
1708
1709 /* cannot transfer to destroyed coros, skip and look for next */ 1923 /* cannot transfer to destroyed coros, skip and look for next */
1710 if (expect_false (next->flags & CF_DESTROYED)) 1924 if (ecb_expect_false (next->flags & (CF_ZOMBIE | CF_SUSPENDED)))
1711 SvREFCNT_dec (next_sv); /* coro_nready has already been taken care of by destroy */ 1925 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1712 else 1926 else
1713 { 1927 {
1714 next->flags &= ~CF_READY; 1928 next->flags &= ~CF_READY;
1715 --coro_nready; 1929 --coro_nready;
1716 1930
… …
1722 { 1936 {
1723 /* nothing to schedule: call the idle handler */ 1937 /* nothing to schedule: call the idle handler */
1724 if (SvROK (sv_idle) 1938 if (SvROK (sv_idle)
1725 && SvOBJECT (SvRV (sv_idle))) 1939 && SvOBJECT (SvRV (sv_idle)))
1726 { 1940 {
1941 if (SvRV (sv_idle) == SvRV (coro_current))
1942 croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught");
1943
1727 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 1944 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1728 api_ready (aTHX_ SvRV (sv_idle)); 1945 api_ready (aTHX_ SvRV (sv_idle));
1729 --coro_nready; 1946 --coro_nready;
1730 } 1947 }
1731 else 1948 else
1732 { 1949 {
1950 /* TODO: deprecated, remove, cannot work reliably *//*D*/
1733 dSP; 1951 dSP;
1734 1952
1735 ENTER; 1953 ENTER;
1736 SAVETMPS; 1954 SAVETMPS;
1737 1955
… …
1744 } 1962 }
1745 } 1963 }
1746 } 1964 }
1747} 1965}
1748 1966
1749INLINE void 1967ecb_inline void
1750prepare_cede (pTHX_ struct coro_transfer_args *ta) 1968prepare_cede (pTHX_ struct coro_transfer_args *ta)
1751{ 1969{
1752 api_ready (aTHX_ coro_current); 1970 api_ready (aTHX_ coro_current);
1753 prepare_schedule (aTHX_ ta); 1971 prepare_schedule (aTHX_ ta);
1754} 1972}
1755 1973
1756INLINE void 1974ecb_inline void
1757prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 1975prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1758{ 1976{
1759 SV *prev = SvRV (coro_current); 1977 SV *prev = SvRV (coro_current);
1760 1978
1761 if (coro_nready) 1979 if (coro_nready)
… …
1791{ 2009{
1792 struct coro_transfer_args ta; 2010 struct coro_transfer_args ta;
1793 2011
1794 prepare_cede (aTHX_ &ta); 2012 prepare_cede (aTHX_ &ta);
1795 2013
1796 if (expect_true (ta.prev != ta.next)) 2014 if (ecb_expect_true (ta.prev != ta.next))
1797 { 2015 {
1798 TRANSFER (ta, 1); 2016 TRANSFER (ta, 1);
1799 return 1; 2017 return 1;
1800 } 2018 }
1801 else 2019 else
… …
1844 coro->slot->runops = RUNOPS_DEFAULT; 2062 coro->slot->runops = RUNOPS_DEFAULT;
1845 } 2063 }
1846} 2064}
1847 2065
1848static void 2066static void
2067coro_push_av (pTHX_ AV *av, I32 gimme_v)
2068{
2069 if (AvFILLp (av) >= 0 && gimme_v != G_VOID)
2070 {
2071 dSP;
2072
2073 if (gimme_v == G_SCALAR)
2074 XPUSHs (AvARRAY (av)[AvFILLp (av)]);
2075 else
2076 {
2077 int i;
2078 EXTEND (SP, AvFILLp (av) + 1);
2079
2080 for (i = 0; i <= AvFILLp (av); ++i)
2081 PUSHs (AvARRAY (av)[i]);
2082 }
2083
2084 PUTBACK;
2085 }
2086}
2087
2088static void
2089coro_push_on_destroy (pTHX_ struct coro *coro, SV *cb)
2090{
2091 if (!coro->on_destroy)
2092 coro->on_destroy = newAV ();
2093
2094 av_push (coro->on_destroy, cb);
2095}
2096
2097static void
2098slf_destroy_join (pTHX_ struct CoroSLF *frame)
2099{
2100 SvREFCNT_dec ((SV *)((struct coro *)frame->data)->hv);
2101}
2102
2103static int
2104slf_check_join (pTHX_ struct CoroSLF *frame)
2105{
2106 struct coro *coro = (struct coro *)frame->data;
2107
2108 if (!coro->status)
2109 return 1;
2110
2111 frame->destroy = 0;
2112
2113 coro_push_av (aTHX_ coro->status, GIMME_V);
2114
2115 SvREFCNT_dec ((SV *)coro->hv);
2116
2117 return 0;
2118}
2119
2120static void
2121slf_init_join (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2122{
2123 struct coro *coro = SvSTATE (items > 0 ? arg [0] : &PL_sv_undef);
2124
2125 if (items > 1)
2126 croak ("join called with too many arguments");
2127
2128 if (coro->status)
2129 frame->prepare = prepare_nop;
2130 else
2131 {
2132 coro_push_on_destroy (aTHX_ coro, SvREFCNT_inc_NN (SvRV (coro_current)));
2133 frame->prepare = prepare_schedule;
2134 }
2135
2136 frame->check = slf_check_join;
2137 frame->destroy = slf_destroy_join;
2138 frame->data = (void *)coro;
2139 SvREFCNT_inc (coro->hv);
2140}
2141
2142static void
1849coro_call_on_destroy (pTHX_ struct coro *coro) 2143coro_call_on_destroy (pTHX_ struct coro *coro)
1850{ 2144{
1851 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2145 AV *od = coro->on_destroy;
1852 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1853 2146
1854 if (on_destroyp) 2147 if (!od)
1855 { 2148 return;
1856 AV *on_destroy = (AV *)SvRV (*on_destroyp);
1857 2149
1858 while (AvFILLp (on_destroy) >= 0) 2150 while (AvFILLp (od) >= 0)
2151 {
2152 SV *cb = sv_2mortal (av_pop (od));
2153
2154 /* coro hv's (and only hv's at the moment) are supported as well */
2155 if (SvSTATEhv_p (aTHX_ cb))
2156 api_ready (aTHX_ cb);
2157 else
1859 { 2158 {
1860 dSP; /* don't disturb outer sp */ 2159 dSP; /* don't disturb outer sp */
1861 SV *cb = av_pop (on_destroy);
1862
1863 PUSHMARK (SP); 2160 PUSHMARK (SP);
1864 2161
1865 if (statusp) 2162 if (coro->status)
1866 { 2163 {
1867 int i; 2164 PUTBACK;
1868 AV *status = (AV *)SvRV (*statusp); 2165 coro_push_av (aTHX_ coro->status, G_ARRAY);
1869 EXTEND (SP, AvFILLp (status) + 1); 2166 SPAGAIN;
1870
1871 for (i = 0; i <= AvFILLp (status); ++i)
1872 PUSHs (AvARRAY (status)[i]);
1873 } 2167 }
1874 2168
1875 PUTBACK; 2169 PUTBACK;
1876 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD); 2170 call_sv (cb, G_VOID | G_DISCARD);
1877 } 2171 }
1878 } 2172 }
1879} 2173}
1880 2174
1881static void 2175static void
1882slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2176coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
1883{ 2177{
2178 AV *av;
2179
2180 if (coro->status)
2181 {
2182 av = coro->status;
2183 av_clear (av);
2184 }
2185 else
2186 av = coro->status = newAV ();
2187
2188 /* items are actually not so common, so optimise for this case */
2189 if (items)
2190 {
1884 int i; 2191 int i;
1885 HV *hv = (HV *)SvRV (coro_current);
1886 AV *av = newAV ();
1887 2192
1888 av_extend (av, items - 1); 2193 av_extend (av, items - 1);
2194
1889 for (i = 0; i < items; ++i) 2195 for (i = 0; i < items; ++i)
1890 av_push (av, SvREFCNT_inc_NN (arg [i])); 2196 av_push (av, SvREFCNT_inc_NN (arg [i]));
2197 }
2198}
1891 2199
1892 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 2200static void
1893 2201slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2202{
1894 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */ 2203 av_push (av_destroy, (SV *)newRV_inc ((SV *)coro_hv)); /* RVinc for perl */
1895 api_ready (aTHX_ sv_manager); 2204 api_ready (aTHX_ sv_manager);
1896 2205
1897 frame->prepare = prepare_schedule; 2206 frame->prepare = prepare_schedule;
1898 frame->check = slf_check_repeat; 2207 frame->check = slf_check_repeat;
1899 2208
1900 /* as a minor optimisation, we could unwind all stacks here */ 2209 /* as a minor optimisation, we could unwind all stacks here */
1901 /* but that puts extra pressure on pp_slf, and is not worth much */ 2210 /* but that puts extra pressure on pp_slf, and is not worth much */
1902 /*coro_unwind_stacks (aTHX);*/ 2211 /*coro_unwind_stacks (aTHX);*/
2212}
2213
2214static void
2215slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2216{
2217 HV *coro_hv = (HV *)SvRV (coro_current);
2218
2219 coro_set_status (aTHX_ SvSTATE ((SV *)coro_hv), arg, items);
2220 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2221}
2222
2223static void
2224slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2225{
2226 HV *coro_hv;
2227 struct coro *coro;
2228
2229 if (items <= 0)
2230 croak ("Coro::cancel called without coro object,");
2231
2232 coro = SvSTATE (arg [0]);
2233 coro_hv = coro->hv;
2234
2235 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2236
2237 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2238 {
2239 /* coro currently busy cancelling something, so just notify it */
2240 coro->slf_frame.data = (void *)coro;
2241
2242 frame->prepare = prepare_nop;
2243 frame->check = slf_check_nop;
2244 }
2245 else if (coro_hv == (HV *)SvRV (coro_current))
2246 {
2247 /* cancelling the current coro is allowed, and equals terminate */
2248 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2249 }
2250 else
2251 {
2252 struct coro *self = SvSTATE_current;
2253
2254 /* otherwise we cancel directly, purely for speed reasons
2255 * unfortunately, this requires some magic trickery, as
2256 * somebody else could cancel us, so we have to fight the cancellation.
2257 * this is ugly, and hopefully fully worth the extra speed.
2258 * besides, I can't get the slow-but-safe version working...
2259 */
2260 slf_frame.data = 0;
2261 self->flags |= CF_NOCANCEL;
2262 coro_state_destroy (aTHX_ coro);
2263 self->flags &= ~CF_NOCANCEL;
2264
2265 if (slf_frame.data)
2266 {
2267 /* while we were busy we have been cancelled, so terminate */
2268 slf_init_terminate_cancel_common (aTHX_ frame, self->hv);
2269 }
2270 else
2271 {
2272 frame->prepare = prepare_nop;
2273 frame->check = slf_check_nop;
2274 }
2275 }
2276}
2277
2278static int
2279slf_check_safe_cancel (pTHX_ struct CoroSLF *frame)
2280{
2281 frame->prepare = 0;
2282 coro_unwind_stacks (aTHX);
2283
2284 slf_init_terminate_cancel_common (aTHX_ frame, (HV *)SvRV (coro_current));
2285
2286 return 1;
2287}
2288
2289static int
2290safe_cancel (pTHX_ struct coro *coro, SV **arg, int items)
2291{
2292 if (coro->cctx)
2293 croak ("coro inside C callback, unable to cancel at this time, caught");
2294
2295 if (coro->flags & CF_NEW)
2296 {
2297 coro_set_status (aTHX_ coro, arg, items);
2298 coro_state_destroy (aTHX_ coro);
2299 }
2300 else
2301 {
2302 if (!coro->slf_frame.prepare)
2303 croak ("coro outside an SLF function, unable to cancel at this time, caught");
2304
2305 slf_destroy (aTHX_ coro);
2306
2307 coro_set_status (aTHX_ coro, arg, items);
2308 coro->slf_frame.prepare = prepare_nop;
2309 coro->slf_frame.check = slf_check_safe_cancel;
2310
2311 api_ready (aTHX_ (SV *)coro->hv);
2312 }
2313
2314 return 1;
1903} 2315}
1904 2316
1905/*****************************************************************************/ 2317/*****************************************************************************/
1906/* async pool handler */ 2318/* async pool handler */
1907 2319
… …
1938slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2350slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1939{ 2351{
1940 HV *hv = (HV *)SvRV (coro_current); 2352 HV *hv = (HV *)SvRV (coro_current);
1941 struct coro *coro = SvSTATE_hv ((SV *)hv); 2353 struct coro *coro = SvSTATE_hv ((SV *)hv);
1942 2354
1943 if (expect_true (coro->saved_deffh)) 2355 if (ecb_expect_true (coro->saved_deffh))
1944 { 2356 {
1945 /* subsequent iteration */ 2357 /* subsequent iteration */
1946 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2358 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1947 coro->saved_deffh = 0; 2359 coro->saved_deffh = 0;
1948 2360
1949 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 2361 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
1950 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2362 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1951 { 2363 {
1952 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate); 2364 slf_init_terminate_cancel_common (aTHX_ frame, hv);
1953 coro->invoke_av = newAV (); 2365 return;
1954
1955 frame->prepare = prepare_nop;
1956 } 2366 }
1957 else 2367 else
1958 { 2368 {
1959 av_clear (GvAV (PL_defgv)); 2369 av_clear (GvAV (PL_defgv));
1960 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2370 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
… …
1985 2395
1986static void 2396static void
1987coro_rouse_callback (pTHX_ CV *cv) 2397coro_rouse_callback (pTHX_ CV *cv)
1988{ 2398{
1989 dXSARGS; 2399 dXSARGS;
1990 SV *data = (SV *)GENSUB_ARG; 2400 SV *data = (SV *)S_GENSUB_ARG;
1991 2401
1992 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2402 if (SvTYPE (SvRV (data)) != SVt_PVAV)
1993 { 2403 {
1994 /* first call, set args */ 2404 /* first call, set args */
2405 SV *coro = SvRV (data);
1995 AV *av = newAV (); 2406 AV *av = newAV ();
1996 SV *coro = SvRV (data);
1997 2407
1998 SvRV_set (data, (SV *)av); 2408 SvRV_set (data, (SV *)av);
1999 api_ready (aTHX_ coro);
2000 SvREFCNT_dec (coro);
2001 2409
2002 /* better take a full copy of the arguments */ 2410 /* better take a full copy of the arguments */
2003 while (items--) 2411 while (items--)
2004 av_store (av, items, newSVsv (ST (items))); 2412 av_store (av, items, newSVsv (ST (items)));
2413
2414 api_ready (aTHX_ coro);
2415 SvREFCNT_dec (coro);
2005 } 2416 }
2006 2417
2007 XSRETURN_EMPTY; 2418 XSRETURN_EMPTY;
2008} 2419}
2009 2420
2010static int 2421static int
2011slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2422slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
2012{ 2423{
2013 SV *data = (SV *)frame->data; 2424 SV *data = (SV *)frame->data;
2014 2425
2015 if (CORO_THROW) 2426 if (CORO_THROW)
2016 return 0; 2427 return 0;
2017 2428
2018 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2429 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2019 return 1; 2430 return 1;
… …
2026 2437
2027 EXTEND (SP, AvFILLp (av) + 1); 2438 EXTEND (SP, AvFILLp (av) + 1);
2028 for (i = 0; i <= AvFILLp (av); ++i) 2439 for (i = 0; i <= AvFILLp (av); ++i)
2029 PUSHs (sv_2mortal (AvARRAY (av)[i])); 2440 PUSHs (sv_2mortal (AvARRAY (av)[i]));
2030 2441
2031 /* we have stolen the elements, so ste length to zero and free */ 2442 /* we have stolen the elements, so set length to zero and free */
2032 AvFILLp (av) = -1; 2443 AvFILLp (av) = -1;
2033 av_undef (av); 2444 av_undef (av);
2034 2445
2035 PUTBACK; 2446 PUTBACK;
2036 } 2447 }
… …
2055 cb = sv_2mortal (coro->rouse_cb); 2466 cb = sv_2mortal (coro->rouse_cb);
2056 coro->rouse_cb = 0; 2467 coro->rouse_cb = 0;
2057 } 2468 }
2058 2469
2059 if (!SvROK (cb) 2470 if (!SvROK (cb)
2060 || SvTYPE (SvRV (cb)) != SVt_PVCV 2471 || SvTYPE (SvRV (cb)) != SVt_PVCV
2061 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2472 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2062 croak ("Coro::rouse_wait called with illegal callback argument,"); 2473 croak ("Coro::rouse_wait called with illegal callback argument,");
2063 2474
2064 { 2475 {
2065 CV *cv = (CV *)SvRV (cb); /* for GENSUB_ARG */ 2476 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
2066 SV *data = (SV *)GENSUB_ARG; 2477 SV *data = (SV *)S_GENSUB_ARG;
2067 2478
2068 frame->data = (void *)data; 2479 frame->data = (void *)data;
2069 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule; 2480 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
2070 frame->check = slf_check_rouse_wait; 2481 frame->check = slf_check_rouse_wait;
2071 } 2482 }
… …
2075coro_new_rouse_cb (pTHX) 2486coro_new_rouse_cb (pTHX)
2076{ 2487{
2077 HV *hv = (HV *)SvRV (coro_current); 2488 HV *hv = (HV *)SvRV (coro_current);
2078 struct coro *coro = SvSTATE_hv (hv); 2489 struct coro *coro = SvSTATE_hv (hv);
2079 SV *data = newRV_inc ((SV *)hv); 2490 SV *data = newRV_inc ((SV *)hv);
2080 SV *cb = gensub (aTHX_ coro_rouse_callback, (void *)data); 2491 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
2081 2492
2082 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0); 2493 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0);
2083 SvREFCNT_dec (data); /* magicext increases the refcount */ 2494 SvREFCNT_dec (data); /* magicext increases the refcount */
2084 2495
2085 SvREFCNT_dec (coro->rouse_cb); 2496 SvREFCNT_dec (coro->rouse_cb);
… …
2182static void 2593static void
2183slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2594slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2184{ 2595{
2185 frame->prepare = prepare_cede_notself; 2596 frame->prepare = prepare_cede_notself;
2186 frame->check = slf_check_nop; 2597 frame->check = slf_check_nop;
2598}
2599
2600/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2601static void
2602slf_destroy (pTHX_ struct coro *coro)
2603{
2604 /* this callback is reserved for slf functions needing to do cleanup */
2605 if (coro->slf_frame.destroy && coro->slf_frame.prepare && !PL_dirty)
2606 coro->slf_frame.destroy (aTHX_ &coro->slf_frame);
2607
2608 /*
2609 * The on_destroy above most likely is from an SLF call.
2610 * Since by definition the SLF call will not finish when we destroy
2611 * the coro, we will have to force-finish it here, otherwise
2612 * cleanup functions cannot call SLF functions.
2613 */
2614 coro->slf_frame.prepare = 0;
2187} 2615}
2188 2616
2189/* 2617/*
2190 * these not obviously related functions are all rolled into one 2618 * these not obviously related functions are all rolled into one
2191 * function to increase chances that they all will call transfer with the same 2619 * function to increase chances that they all will call transfer with the same
… …
2198 I32 checkmark; /* mark SP to see how many elements check has pushed */ 2626 I32 checkmark; /* mark SP to see how many elements check has pushed */
2199 2627
2200 /* set up the slf frame, unless it has already been set-up */ 2628 /* set up the slf frame, unless it has already been set-up */
2201 /* the latter happens when a new coro has been started */ 2629 /* the latter happens when a new coro has been started */
2202 /* or when a new cctx was attached to an existing coroutine */ 2630 /* or when a new cctx was attached to an existing coroutine */
2203 if (expect_true (!slf_frame.prepare)) 2631 if (ecb_expect_true (!slf_frame.prepare))
2204 { 2632 {
2205 /* first iteration */ 2633 /* first iteration */
2206 dSP; 2634 dSP;
2207 SV **arg = PL_stack_base + TOPMARK + 1; 2635 SV **arg = PL_stack_base + TOPMARK + 1;
2208 int items = SP - arg; /* args without function object */ 2636 int items = SP - arg; /* args without function object */
… …
2249 while (slf_frame.check (aTHX_ &slf_frame)); 2677 while (slf_frame.check (aTHX_ &slf_frame));
2250 2678
2251 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */ 2679 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */
2252 2680
2253 /* exception handling */ 2681 /* exception handling */
2254 if (expect_false (CORO_THROW)) 2682 if (ecb_expect_false (CORO_THROW))
2255 { 2683 {
2256 SV *exception = sv_2mortal (CORO_THROW); 2684 SV *exception = sv_2mortal (CORO_THROW);
2257 2685
2258 CORO_THROW = 0; 2686 CORO_THROW = 0;
2259 sv_setsv (ERRSV, exception); 2687 sv_setsv (ERRSV, exception);
2260 croak (0); 2688 croak (0);
2261 } 2689 }
2262 2690
2263 /* return value handling - mostly like entersub */ 2691 /* return value handling - mostly like entersub */
2264 /* make sure we put something on the stack in scalar context */ 2692 /* make sure we put something on the stack in scalar context */
2265 if (GIMME_V == G_SCALAR) 2693 if (GIMME_V == G_SCALAR
2694 && ecb_expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2266 { 2695 {
2267 dSP; 2696 dSP;
2268 SV **bot = PL_stack_base + checkmark; 2697 SV **bot = PL_stack_base + checkmark;
2269 2698
2270 if (sp == bot) /* too few, push undef */ 2699 if (sp == bot) /* too few, push undef */
2271 bot [1] = &PL_sv_undef; 2700 bot [1] = &PL_sv_undef;
2272 else if (sp != bot + 1) /* too many, take last one */ 2701 else /* too many, take last one */
2273 bot [1] = *sp; 2702 bot [1] = *sp;
2274 2703
2275 SP = bot + 1; 2704 SP = bot + 1;
2276 2705
2277 PUTBACK; 2706 PUTBACK;
… …
2310 if (PL_op->op_flags & OPf_STACKED) 2739 if (PL_op->op_flags & OPf_STACKED)
2311 { 2740 {
2312 if (items > slf_arga) 2741 if (items > slf_arga)
2313 { 2742 {
2314 slf_arga = items; 2743 slf_arga = items;
2315 free (slf_argv); 2744 Safefree (slf_argv);
2316 slf_argv = malloc (slf_arga * sizeof (SV *)); 2745 New (0, slf_argv, slf_arga, SV *);
2317 } 2746 }
2318 2747
2319 slf_argc = items; 2748 slf_argc = items;
2320 2749
2321 for (i = 0; i < items; ++i) 2750 for (i = 0; i < items; ++i)
… …
2347 2776
2348 POPSTACK; 2777 POPSTACK;
2349} 2778}
2350 2779
2351static SV * 2780static SV *
2352coro_avp_pop_and_free (AV **avp) 2781coro_avp_pop_and_free (pTHX_ AV **avp)
2353{ 2782{
2354 AV *av = *avp; 2783 AV *av = *avp;
2355 SV *res = av_pop (av); 2784 SV *res = av_pop (av);
2356 2785
2357 if (AvFILLp (av) < 0) 2786 if (AvFILLp (av) < 0)
… …
2364} 2793}
2365 2794
2366static void 2795static void
2367coro_pop_on_enter (pTHX_ void *coro) 2796coro_pop_on_enter (pTHX_ void *coro)
2368{ 2797{
2369 SV *cb = coro_avp_pop_and_free (&((struct coro *)coro)->on_enter); 2798 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_enter);
2370 SvREFCNT_dec (cb); 2799 SvREFCNT_dec (cb);
2371} 2800}
2372 2801
2373static void 2802static void
2374coro_pop_on_leave (pTHX_ void *coro) 2803coro_pop_on_leave (pTHX_ void *coro)
2375{ 2804{
2376 SV *cb = coro_avp_pop_and_free (&((struct coro *)coro)->on_leave); 2805 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2377 on_enterleave_call (sv_2mortal (cb)); 2806 on_enterleave_call (aTHX_ sv_2mortal (cb));
2378} 2807}
2379 2808
2380/*****************************************************************************/ 2809/*****************************************************************************/
2381/* PerlIO::cede */ 2810/* PerlIO::cede */
2382 2811
… …
2384{ 2813{
2385 PerlIOBuf base; 2814 PerlIOBuf base;
2386 NV next, every; 2815 NV next, every;
2387} PerlIOCede; 2816} PerlIOCede;
2388 2817
2389static IV 2818static IV ecb_cold
2390PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab) 2819PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab)
2391{ 2820{
2392 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2821 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2393 2822
2394 self->every = SvCUR (arg) ? SvNV (arg) : 0.01; 2823 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
2395 self->next = nvtime () + self->every; 2824 self->next = nvtime () + self->every;
2396 2825
2397 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab); 2826 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
2398} 2827}
2399 2828
2400static SV * 2829static SV * ecb_cold
2401PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags) 2830PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
2402{ 2831{
2403 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2832 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2404 2833
2405 return newSVnv (self->every); 2834 return newSVnv (self->every);
… …
2456/* Coro::Semaphore & Coro::Signal */ 2885/* Coro::Semaphore & Coro::Signal */
2457 2886
2458static SV * 2887static SV *
2459coro_waitarray_new (pTHX_ int count) 2888coro_waitarray_new (pTHX_ int count)
2460{ 2889{
2461 /* a semaphore contains a counter IV in $sem->[0] and any waiters after that */ 2890 /* a waitarray=semaphore contains a counter IV in $sem->[0] and any waiters after that */
2462 AV *av = newAV (); 2891 AV *av = newAV ();
2463 SV **ary; 2892 SV **ary;
2464 2893
2465 /* unfortunately, building manually saves memory */ 2894 /* unfortunately, building manually saves memory */
2466 Newx (ary, 2, SV *); 2895 Newx (ary, 2, SV *);
… …
2517 SvREFCNT_dec (cb); 2946 SvREFCNT_dec (cb);
2518 } 2947 }
2519} 2948}
2520 2949
2521static void 2950static void
2522coro_semaphore_on_destroy (pTHX_ struct coro *coro) 2951coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2523{ 2952{
2524 /* call $sem->adjust (0) to possibly wake up some other waiters */ 2953 /* call $sem->adjust (0) to possibly wake up some other waiters */
2525 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 2954 coro_semaphore_adjust (aTHX_ (AV *)frame->data, 0);
2526} 2955}
2527 2956
2528static int 2957static int
2529slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire) 2958slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2530{ 2959{
2531 AV *av = (AV *)frame->data; 2960 AV *av = (AV *)frame->data;
2532 SV *count_sv = AvARRAY (av)[0]; 2961 SV *count_sv = AvARRAY (av)[0];
2962 SV *coro_hv = SvRV (coro_current);
2533 2963
2534 /* if we are about to throw, don't actually acquire the lock, just throw */ 2964 /* if we are about to throw, don't actually acquire the lock, just throw */
2535 if (CORO_THROW) 2965 if (CORO_THROW)
2536 return 0; 2966 return 0;
2537 else if (SvIVX (count_sv) > 0) 2967 else if (SvIVX (count_sv) > 0)
2538 { 2968 {
2539 SvSTATE_current->on_destroy = 0; 2969 frame->destroy = 0;
2540 2970
2541 if (acquire) 2971 if (acquire)
2542 SvIVX (count_sv) = SvIVX (count_sv) - 1; 2972 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2543 else 2973 else
2544 coro_semaphore_adjust (aTHX_ av, 0); 2974 coro_semaphore_adjust (aTHX_ av, 0);
… …
2549 { 2979 {
2550 int i; 2980 int i;
2551 /* if we were woken up but can't down, we look through the whole */ 2981 /* if we were woken up but can't down, we look through the whole */
2552 /* waiters list and only add us if we aren't in there already */ 2982 /* waiters list and only add us if we aren't in there already */
2553 /* this avoids some degenerate memory usage cases */ 2983 /* this avoids some degenerate memory usage cases */
2554 2984 for (i = AvFILLp (av); i > 0; --i) /* i > 0 is not an off-by-one bug */
2555 for (i = 1; i <= AvFILLp (av); ++i)
2556 if (AvARRAY (av)[i] == SvRV (coro_current)) 2985 if (AvARRAY (av)[i] == coro_hv)
2557 return 1; 2986 return 1;
2558 2987
2559 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2988 av_push (av, SvREFCNT_inc (coro_hv));
2560 return 1; 2989 return 1;
2561 } 2990 }
2562} 2991}
2563 2992
2564static int 2993static int
… …
2587 { 3016 {
2588 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3017 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2589 3018
2590 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 3019 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2591 frame->prepare = prepare_schedule; 3020 frame->prepare = prepare_schedule;
2592
2593 /* to avoid race conditions when a woken-up coro gets terminated */ 3021 /* to avoid race conditions when a woken-up coro gets terminated */
2594 /* we arrange for a temporary on_destroy that calls adjust (0) */ 3022 /* we arrange for a temporary on_destroy that calls adjust (0) */
2595 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 3023 frame->destroy = coro_semaphore_destroy;
2596 } 3024 }
2597} 3025}
2598 3026
2599static void 3027static void
2600slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 3028slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
… …
2608{ 3036{
2609 if (items >= 2) 3037 if (items >= 2)
2610 { 3038 {
2611 /* callback form */ 3039 /* callback form */
2612 AV *av = (AV *)SvRV (arg [0]); 3040 AV *av = (AV *)SvRV (arg [0]);
2613 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 3041 SV *cb_cv = s_get_cv_croak (arg [1]);
2614 3042
2615 av_push (av, (SV *)SvREFCNT_inc_NN (cb_cv)); 3043 av_push (av, SvREFCNT_inc_NN (cb_cv));
2616 3044
2617 if (SvIVX (AvARRAY (av)[0]) > 0) 3045 if (SvIVX (AvARRAY (av)[0]) > 0)
2618 coro_semaphore_adjust (aTHX_ av, 0); 3046 coro_semaphore_adjust (aTHX_ av, 0);
2619 3047
2620 frame->prepare = prepare_nop; 3048 frame->prepare = prepare_nop;
… …
2644 AvARRAY (av)[0] = AvARRAY (av)[1]; 3072 AvARRAY (av)[0] = AvARRAY (av)[1];
2645 AvARRAY (av)[1] = cb; 3073 AvARRAY (av)[1] = cb;
2646 3074
2647 cb = av_shift (av); 3075 cb = av_shift (av);
2648 3076
3077 if (SvTYPE (cb) == SVt_PVCV)
3078 {
3079 dSP;
3080 PUSHMARK (SP);
3081 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
3082 PUTBACK;
3083 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
3084 }
3085 else
3086 {
2649 api_ready (aTHX_ cb); 3087 api_ready (aTHX_ cb);
2650 sv_setiv (cb, 0); /* signal waiter */ 3088 sv_setiv (cb, 0); /* signal waiter */
3089 }
3090
2651 SvREFCNT_dec (cb); 3091 SvREFCNT_dec (cb);
2652 3092
2653 --count; 3093 --count;
2654 } 3094 }
2655} 3095}
… …
2664static void 3104static void
2665slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 3105slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2666{ 3106{
2667 AV *av = (AV *)SvRV (arg [0]); 3107 AV *av = (AV *)SvRV (arg [0]);
2668 3108
3109 if (items >= 2)
3110 {
3111 SV *cb_cv = s_get_cv_croak (arg [1]);
3112 av_push (av, SvREFCNT_inc_NN (cb_cv));
3113
2669 if (SvIVX (AvARRAY (av)[0])) 3114 if (SvIVX (AvARRAY (av)[0]))
3115 coro_signal_wake (aTHX_ av, 1); /* must be the only waiter */
3116
3117 frame->prepare = prepare_nop;
3118 frame->check = slf_check_nop;
3119 }
3120 else if (SvIVX (AvARRAY (av)[0]))
2670 { 3121 {
2671 SvIVX (AvARRAY (av)[0]) = 0; 3122 SvIVX (AvARRAY (av)[0]) = 0;
2672 frame->prepare = prepare_nop; 3123 frame->prepare = prepare_nop;
2673 frame->check = slf_check_nop; 3124 frame->check = slf_check_nop;
2674 } 3125 }
2675 else 3126 else
2676 { 3127 {
2677 SV *waiter = newRV_inc (SvRV (coro_current)); /* owned by signal av */ 3128 SV *waiter = newSVsv (coro_current); /* owned by signal av */
2678 3129
2679 av_push (av, waiter); 3130 av_push (av, waiter);
2680 3131
2681 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */ 3132 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */
2682 frame->prepare = prepare_schedule; 3133 frame->prepare = prepare_schedule;
… …
2700 3151
2701static void 3152static void
2702coro_aio_callback (pTHX_ CV *cv) 3153coro_aio_callback (pTHX_ CV *cv)
2703{ 3154{
2704 dXSARGS; 3155 dXSARGS;
2705 AV *state = (AV *)GENSUB_ARG; 3156 AV *state = (AV *)S_GENSUB_ARG;
2706 SV *coro = av_pop (state); 3157 SV *coro = av_pop (state);
2707 SV *data_sv = newSV (sizeof (struct io_state)); 3158 SV *data_sv = newSV (sizeof (struct io_state));
2708 3159
2709 av_extend (state, items - 1); 3160 av_extend (state, items - 1);
2710 3161
… …
2795 dSP; 3246 dSP;
2796 3247
2797 static SV *prio_cv; 3248 static SV *prio_cv;
2798 static SV *prio_sv; 3249 static SV *prio_sv;
2799 3250
2800 if (expect_false (!prio_cv)) 3251 if (ecb_expect_false (!prio_cv))
2801 { 3252 {
2802 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0); 3253 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0);
2803 prio_sv = newSViv (0); 3254 prio_sv = newSViv (0);
2804 } 3255 }
2805 3256
… …
2824 3275
2825 for (i = 0; i < items; ++i) 3276 for (i = 0; i < items; ++i)
2826 PUSHs (arg [i]); 3277 PUSHs (arg [i]);
2827 3278
2828 /* now push the callback closure */ 3279 /* now push the callback closure */
2829 PUSHs (sv_2mortal (gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state)))); 3280 PUSHs (sv_2mortal (s_gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state))));
2830 3281
2831 /* now call the AIO function - we assume our request is uncancelable */ 3282 /* now call the AIO function - we assume our request is uncancelable */
2832 PUTBACK; 3283 PUTBACK;
2833 call_sv ((SV *)req, G_VOID | G_DISCARD); 3284 call_sv ((SV *)req, G_VOID | G_DISCARD);
2834 } 3285 }
2835 3286
2836 /* now that the requets is going, we loop toll we have a result */ 3287 /* now that the request is going, we loop till we have a result */
2837 frame->data = (void *)state; 3288 frame->data = (void *)state;
2838 frame->prepare = prepare_schedule; 3289 frame->prepare = prepare_schedule;
2839 frame->check = slf_check_aio_req; 3290 frame->check = slf_check_aio_req;
2840} 3291}
2841 3292
… …
2851 3302
2852/*****************************************************************************/ 3303/*****************************************************************************/
2853 3304
2854#if CORO_CLONE 3305#if CORO_CLONE
2855# include "clone.c" 3306# include "clone.c"
3307#endif
3308
3309/*****************************************************************************/
3310
3311static SV *
3312coro_new (pTHX_ HV *stash, SV **argv, int argc, int is_coro)
3313{
3314 SV *coro_sv;
3315 struct coro *coro;
3316 MAGIC *mg;
3317 HV *hv;
3318 SV *cb;
3319 int i;
3320
3321 if (argc > 0)
3322 {
3323 cb = s_get_cv_croak (argv [0]);
3324
3325 if (!is_coro)
3326 {
3327 if (CvISXSUB (cb))
3328 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
3329
3330 if (!CvROOT (cb))
3331 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
3332 }
3333 }
3334
3335 Newz (0, coro, 1, struct coro);
3336 coro->args = newAV ();
3337 coro->flags = CF_NEW;
3338
3339 if (coro_first) coro_first->prev = coro;
3340 coro->next = coro_first;
3341 coro_first = coro;
3342
3343 coro->hv = hv = newHV ();
3344 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
3345 mg->mg_flags |= MGf_DUP;
3346 coro_sv = sv_bless (newRV_noinc ((SV *)hv), stash);
3347
3348 if (argc > 0)
3349 {
3350 av_extend (coro->args, argc + is_coro - 1);
3351
3352 if (is_coro)
3353 {
3354 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
3355 cb = (SV *)cv_coro_run;
3356 }
3357
3358 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3359
3360 for (i = 1; i < argc; i++)
3361 av_push (coro->args, newSVsv (argv [i]));
3362 }
3363
3364 return coro_sv;
3365}
3366
3367#ifndef __cplusplus
3368ecb_cold XS(boot_Coro__State);
3369#endif
3370
3371#if CORO_JIT
3372
3373static void ecb_noinline ecb_cold
3374pushav_4uv (pTHX_ UV a, UV b, UV c, UV d)
3375{
3376 dSP;
3377 AV *av = newAV ();
3378
3379 av_store (av, 3, newSVuv (d));
3380 av_store (av, 2, newSVuv (c));
3381 av_store (av, 1, newSVuv (b));
3382 av_store (av, 0, newSVuv (a));
3383
3384 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
3385
3386 PUTBACK;
3387}
3388
3389static void ecb_noinline ecb_cold
3390jit_init (pTHX)
3391{
3392 dSP;
3393 SV *load, *save;
3394 char *map_base;
3395 char *load_ptr, *save_ptr;
3396 STRLEN load_len, save_len, map_len;
3397 int count;
3398
3399 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3400
3401 PUSHMARK (SP);
3402 #define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type));
3403 #include "state.h"
3404 count = call_pv ("Coro::State::_jit", G_ARRAY);
3405 SPAGAIN;
3406
3407 save = POPs; save_ptr = SvPVbyte (save, save_len);
3408 load = POPs; load_ptr = SvPVbyte (load, load_len);
3409
3410 map_len = load_len + save_len + 16;
3411
3412 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3413
3414 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3415
3416 load_perl_slots = (load_save_perl_slots_type)map_base;
3417 memcpy (map_base, load_ptr, load_len);
3418
3419 map_base += (load_len + 15) & ~15;
3420
3421 save_perl_slots = (load_save_perl_slots_type)map_base;
3422 memcpy (map_base, save_ptr, save_len);
3423
3424 /* we are good citizens and try to make the page read-only, so the evil evil */
3425 /* hackers might have it a bit more difficult */
3426 mprotect (map_base, map_len, PROT_READ | PROT_EXEC);
3427
3428 PUTBACK;
3429 eval_pv ("undef &Coro::State::_jit", 1);
3430}
3431
2856#endif 3432#endif
2857 3433
2858MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3434MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2859 3435
2860PROTOTYPES: DISABLE 3436PROTOTYPES: DISABLE
… …
2865# if CORO_PTHREAD 3441# if CORO_PTHREAD
2866 coro_thx = PERL_GET_CONTEXT; 3442 coro_thx = PERL_GET_CONTEXT;
2867# endif 3443# endif
2868#endif 3444#endif
2869 BOOT_PAGESIZE; 3445 BOOT_PAGESIZE;
3446
3447 /* perl defines these to check for existance first, but why it doesn't */
3448 /* just create them one at init time is not clear to me, except for */
3449 /* programs trying to delete them, but... */
3450 /* anyway, we declare this as invalid and make sure they are initialised here */
3451 DEFSV;
3452 ERRSV;
2870 3453
2871 cctx_current = cctx_new_empty (); 3454 cctx_current = cctx_new_empty ();
2872 3455
2873 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3456 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
2874 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3457 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
… …
2914 coroapi.prepare_nop = prepare_nop; 3497 coroapi.prepare_nop = prepare_nop;
2915 coroapi.prepare_schedule = prepare_schedule; 3498 coroapi.prepare_schedule = prepare_schedule;
2916 coroapi.prepare_cede = prepare_cede; 3499 coroapi.prepare_cede = prepare_cede;
2917 coroapi.prepare_cede_notself = prepare_cede_notself; 3500 coroapi.prepare_cede_notself = prepare_cede_notself;
2918 3501
2919 { 3502 time_init (aTHX);
2920 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
2921 3503
2922 if (!svp) croak ("Time::HiRes is required");
2923 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
2924
2925 nvtime = INT2PTR (double (*)(), SvIV (*svp));
2926 }
2927
2928 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 3504 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3505#if CORO_JIT
3506 PUTBACK;
3507 jit_init (aTHX);
3508 SPAGAIN;
3509#endif
2929} 3510}
2930 3511
2931SV * 3512SV *
2932new (char *klass, ...) 3513new (SV *klass, ...)
2933 ALIAS: 3514 ALIAS:
2934 Coro::new = 1 3515 Coro::new = 1
2935 CODE: 3516 CODE:
2936{ 3517 RETVAL = coro_new (aTHX_ ix ? coro_stash : coro_state_stash, &ST (1), items - 1, ix);
2937 struct coro *coro; 3518 OUTPUT:
2938 MAGIC *mg;
2939 HV *hv;
2940 CV *cb;
2941 int i;
2942
2943 if (items > 1)
2944 {
2945 cb = coro_sv_2cv (aTHX_ ST (1));
2946
2947 if (!ix)
2948 {
2949 if (CvISXSUB (cb))
2950 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
2951
2952 if (!CvROOT (cb))
2953 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
2954 }
2955 }
2956
2957 Newz (0, coro, 1, struct coro);
2958 coro->args = newAV ();
2959 coro->flags = CF_NEW;
2960
2961 if (coro_first) coro_first->prev = coro;
2962 coro->next = coro_first;
2963 coro_first = coro;
2964
2965 coro->hv = hv = newHV ();
2966 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
2967 mg->mg_flags |= MGf_DUP;
2968 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
2969
2970 if (items > 1)
2971 {
2972 av_extend (coro->args, items - 1 + ix - 1);
2973
2974 if (ix)
2975 {
2976 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
2977 cb = cv_coro_run;
2978 }
2979
2980 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
2981
2982 for (i = 2; i < items; i++)
2983 av_push (coro->args, newSVsv (ST (i)));
2984 }
2985}
2986 OUTPUT:
2987 RETVAL 3519 RETVAL
2988 3520
2989void 3521void
2990transfer (...) 3522transfer (...)
2991 PROTOTYPE: $$ 3523 PROTOTYPE: $$
2992 CODE: 3524 CODE:
2993 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3525 CORO_EXECUTE_SLF_XS (slf_init_transfer);
2994
2995bool
2996_destroy (SV *coro_sv)
2997 CODE:
2998 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
2999 OUTPUT:
3000 RETVAL
3001 3526
3002void 3527void
3003_exit (int code) 3528_exit (int code)
3004 PROTOTYPE: $ 3529 PROTOTYPE: $
3005 CODE: 3530 CODE:
… …
3081 CODE: 3606 CODE:
3082{ 3607{
3083 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3608 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
3084 { 3609 {
3085 struct coro *current = SvSTATE_current; 3610 struct coro *current = SvSTATE_current;
3611 struct CoroSLF slf_save;
3086 3612
3087 if (current != coro) 3613 if (current != coro)
3088 { 3614 {
3089 PUTBACK; 3615 PUTBACK;
3090 save_perl (aTHX_ current); 3616 save_perl (aTHX_ current);
3091 load_perl (aTHX_ coro); 3617 load_perl (aTHX_ coro);
3618 /* the coro is most likely in an active SLF call.
3619 * while not strictly required (the code we execute is
3620 * not allowed to call any SLF functions), it's cleaner
3621 * to reinitialise the slf_frame and restore it later.
3622 * This might one day allow us to actually do SLF calls
3623 * from code executed here.
3624 */
3625 slf_save = slf_frame;
3626 slf_frame.prepare = 0;
3092 SPAGAIN; 3627 SPAGAIN;
3093 } 3628 }
3094 3629
3095 PUSHSTACK; 3630 PUSHSTACK;
3096 3631
… …
3100 if (ix) 3635 if (ix)
3101 eval_sv (coderef, 0); 3636 eval_sv (coderef, 0);
3102 else 3637 else
3103 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 3638 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
3104 3639
3640 POPSTACK;
3105 SPAGAIN; 3641 SPAGAIN;
3106 POPSTACK;
3107 3642
3108 if (current != coro) 3643 if (current != coro)
3109 { 3644 {
3110 PUTBACK; 3645 PUTBACK;
3646 slf_frame = slf_save;
3111 save_perl (aTHX_ coro); 3647 save_perl (aTHX_ coro);
3112 load_perl (aTHX_ current); 3648 load_perl (aTHX_ current);
3113 SPAGAIN; 3649 SPAGAIN;
3114 } 3650 }
3115 } 3651 }
… …
3120 PROTOTYPE: $ 3656 PROTOTYPE: $
3121 ALIAS: 3657 ALIAS:
3122 is_ready = CF_READY 3658 is_ready = CF_READY
3123 is_running = CF_RUNNING 3659 is_running = CF_RUNNING
3124 is_new = CF_NEW 3660 is_new = CF_NEW
3125 is_destroyed = CF_DESTROYED 3661 is_destroyed = CF_ZOMBIE
3662 is_zombie = CF_ZOMBIE
3663 is_suspended = CF_SUSPENDED
3126 CODE: 3664 CODE:
3127 RETVAL = boolSV (coro->flags & ix); 3665 RETVAL = boolSV (coro->flags & ix);
3128 OUTPUT: 3666 OUTPUT:
3129 RETVAL 3667 RETVAL
3130 3668
3131void 3669void
3132throw (Coro::State self, SV *throw = &PL_sv_undef) 3670throw (SV *self, SV *exception = &PL_sv_undef)
3133 PROTOTYPE: $;$ 3671 PROTOTYPE: $;$
3134 CODE: 3672 CODE:
3135{ 3673{
3674 struct coro *coro = SvSTATE (self);
3136 struct coro *current = SvSTATE_current; 3675 struct coro *current = SvSTATE_current;
3137 SV **throwp = self == current ? &CORO_THROW : &self->except; 3676 SV **exceptionp = coro == current ? &CORO_THROW : &coro->except;
3138 SvREFCNT_dec (*throwp); 3677 SvREFCNT_dec (*exceptionp);
3139 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3678 SvGETMAGIC (exception);
3679 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3680
3681 api_ready (aTHX_ self);
3140} 3682}
3141 3683
3142void 3684void
3143api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3685api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3144 PROTOTYPE: $;$ 3686 PROTOTYPE: $;$
… …
3195 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv; 3737 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
3196 3738
3197 SV *tmp = *src; *src = *dst; *dst = tmp; 3739 SV *tmp = *src; *src = *dst; *dst = tmp;
3198 } 3740 }
3199 3741
3742void
3743cancel (Coro::State self)
3744 CODE:
3745 coro_state_destroy (aTHX_ self);
3746
3747SV *
3748enable_times (int enabled = enable_times)
3749 CODE:
3750{
3751 RETVAL = boolSV (enable_times);
3752
3753 if (enabled != enable_times)
3754 {
3755 enable_times = enabled;
3756
3757 coro_times_update ();
3758 (enabled ? coro_times_sub : coro_times_add)(SvSTATE (coro_current));
3759 }
3760}
3761 OUTPUT:
3762 RETVAL
3763
3764void
3765times (Coro::State self)
3766 PPCODE:
3767{
3768 struct coro *current = SvSTATE (coro_current);
3769
3770 if (ecb_expect_false (current == self))
3771 {
3772 coro_times_update ();
3773 coro_times_add (SvSTATE (coro_current));
3774 }
3775
3776 EXTEND (SP, 2);
3777 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3778 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3779
3780 if (ecb_expect_false (current == self))
3781 coro_times_sub (SvSTATE (coro_current));
3782}
3783
3784void
3785swap_sv (Coro::State coro, SV *sv, SV *swapsv)
3786 CODE:
3787{
3788 struct coro *current = SvSTATE_current;
3789
3790 if (current == coro)
3791 SWAP_SVS (current);
3792
3793 if (!coro->swap_sv)
3794 coro->swap_sv = newAV ();
3795
3796 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv )));
3797 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv)));
3798
3799 if (current == coro)
3800 SWAP_SVS (current);
3801}
3802
3200 3803
3201MODULE = Coro::State PACKAGE = Coro 3804MODULE = Coro::State PACKAGE = Coro
3202 3805
3203BOOT: 3806BOOT:
3204{ 3807{
3205 int i;
3206
3207 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3808 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3208 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3809 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3209 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 3810 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3210 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3211 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 3811 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3212 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 3812 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3213 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 3813 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3214 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 3814 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3215 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 3815 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3216 3816
3217 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3817 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3218 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3818 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3219 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 3819 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3220 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new); 3820 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3221 3821
3222 coro_stash = gv_stashpv ("Coro", TRUE); 3822 coro_stash = gv_stashpv ("Coro", TRUE);
3223 3823
3224 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 3824 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3225 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 3825 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3226 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 3826 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
3227 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 3827 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (CORO_PRIO_LOW));
3228 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE)); 3828 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (CORO_PRIO_IDLE));
3229 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN)); 3829 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (CORO_PRIO_MIN));
3230
3231 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
3232 coro_ready[i] = newAV ();
3233 3830
3234 { 3831 {
3235 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 3832 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
3236 3833
3237 coroapi.schedule = api_schedule; 3834 coroapi.schedule = api_schedule;
… …
3247 sv_setiv (sv, (IV)&coroapi); 3844 sv_setiv (sv, (IV)&coroapi);
3248 SvREADONLY_on (sv); 3845 SvREADONLY_on (sv);
3249 } 3846 }
3250} 3847}
3251 3848
3849SV *
3850async (...)
3851 PROTOTYPE: &@
3852 CODE:
3853 RETVAL = coro_new (aTHX_ coro_stash, &ST (0), items, 1);
3854 api_ready (aTHX_ RETVAL);
3855 OUTPUT:
3856 RETVAL
3857
3858void
3859_destroy (Coro::State coro)
3860 CODE:
3861 /* used by the manager thread */
3862 coro_state_destroy (aTHX_ coro);
3863
3864void
3865on_destroy (Coro::State coro, SV *cb)
3866 CODE:
3867 coro_push_on_destroy (aTHX_ coro, newSVsv (cb));
3868
3869void
3870join (...)
3871 CODE:
3872 CORO_EXECUTE_SLF_XS (slf_init_join);
3873
3252void 3874void
3253terminate (...) 3875terminate (...)
3254 CODE: 3876 CODE:
3255 CORO_EXECUTE_SLF_XS (slf_init_terminate); 3877 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3256 3878
3257void 3879void
3880cancel (...)
3881 CODE:
3882 CORO_EXECUTE_SLF_XS (slf_init_cancel);
3883
3884int
3885safe_cancel (Coro::State self, ...)
3886 C_ARGS: aTHX_ self, &ST (1), items - 1
3887
3888void
3258schedule (...) 3889schedule (...)
3259 CODE: 3890 CODE:
3260 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3891 CORO_EXECUTE_SLF_XS (slf_init_schedule);
3261 3892
3262void 3893void
… …
3276 3907
3277void 3908void
3278cede_notself (...) 3909cede_notself (...)
3279 CODE: 3910 CODE:
3280 CORO_EXECUTE_SLF_XS (slf_init_cede_notself); 3911 CORO_EXECUTE_SLF_XS (slf_init_cede_notself);
3281
3282void
3283_cancel (Coro::State self)
3284 CODE:
3285 coro_state_destroy (aTHX_ self);
3286 coro_call_on_destroy (aTHX_ self);
3287 3912
3288void 3913void
3289_set_current (SV *current) 3914_set_current (SV *current)
3290 PROTOTYPE: $ 3915 PROTOTYPE: $
3291 CODE: 3916 CODE:
… …
3295void 3920void
3296_set_readyhook (SV *hook) 3921_set_readyhook (SV *hook)
3297 PROTOTYPE: $ 3922 PROTOTYPE: $
3298 CODE: 3923 CODE:
3299 SvREFCNT_dec (coro_readyhook); 3924 SvREFCNT_dec (coro_readyhook);
3925 SvGETMAGIC (hook);
3926 if (SvOK (hook))
3927 {
3300 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0; 3928 coro_readyhook = newSVsv (hook);
3929 CORO_READYHOOK = invoke_sv_ready_hook_helper;
3930 }
3931 else
3932 {
3933 coro_readyhook = 0;
3934 CORO_READYHOOK = 0;
3935 }
3301 3936
3302int 3937int
3303prio (Coro::State coro, int newprio = 0) 3938prio (Coro::State coro, int newprio = 0)
3304 PROTOTYPE: $;$ 3939 PROTOTYPE: $;$
3305 ALIAS: 3940 ALIAS:
… …
3311 if (items > 1) 3946 if (items > 1)
3312 { 3947 {
3313 if (ix) 3948 if (ix)
3314 newprio = coro->prio - newprio; 3949 newprio = coro->prio - newprio;
3315 3950
3316 if (newprio < PRIO_MIN) newprio = PRIO_MIN; 3951 if (newprio < CORO_PRIO_MIN) newprio = CORO_PRIO_MIN;
3317 if (newprio > PRIO_MAX) newprio = PRIO_MAX; 3952 if (newprio > CORO_PRIO_MAX) newprio = CORO_PRIO_MAX;
3318 3953
3319 coro->prio = newprio; 3954 coro->prio = newprio;
3320 } 3955 }
3321} 3956}
3322 OUTPUT: 3957 OUTPUT:
… …
3337 RETVAL = coro_nready; 3972 RETVAL = coro_nready;
3338 OUTPUT: 3973 OUTPUT:
3339 RETVAL 3974 RETVAL
3340 3975
3341void 3976void
3977suspend (Coro::State self)
3978 PROTOTYPE: $
3979 CODE:
3980 self->flags |= CF_SUSPENDED;
3981
3982void
3983resume (Coro::State self)
3984 PROTOTYPE: $
3985 CODE:
3986 self->flags &= ~CF_SUSPENDED;
3987
3988void
3342_pool_handler (...) 3989_pool_handler (...)
3343 CODE: 3990 CODE:
3344 CORO_EXECUTE_SLF_XS (slf_init_pool_handler); 3991 CORO_EXECUTE_SLF_XS (slf_init_pool_handler);
3345 3992
3346void 3993void
… …
3357 for (i = 1; i < items; ++i) 4004 for (i = 1; i < items; ++i)
3358 av_push (av, SvREFCNT_inc_NN (ST (i))); 4005 av_push (av, SvREFCNT_inc_NN (ST (i)));
3359 4006
3360 if ((SV *)hv == &PL_sv_undef) 4007 if ((SV *)hv == &PL_sv_undef)
3361 { 4008 {
3362 PUSHMARK (SP); 4009 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3363 EXTEND (SP, 2);
3364 PUSHs (sv_Coro);
3365 PUSHs ((SV *)cv_pool_handler);
3366 PUTBACK;
3367 call_sv ((SV *)cv_coro_state_new, G_SCALAR);
3368 SPAGAIN;
3369
3370 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs)); 4010 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
4011 SvREFCNT_dec (sv);
3371 } 4012 }
3372 4013
3373 { 4014 {
3374 struct coro *coro = SvSTATE_hv (hv); 4015 struct coro *coro = SvSTATE_hv (hv);
3375 4016
… …
3409 CODE: 4050 CODE:
3410{ 4051{
3411 struct coro *coro = SvSTATE_current; 4052 struct coro *coro = SvSTATE_current;
3412 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 4053 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3413 4054
3414 block = (SV *)coro_sv_2cv (block); 4055 block = s_get_cv_croak (block);
3415 4056
3416 if (!*avp) 4057 if (!*avp)
3417 *avp = newAV (); 4058 *avp = newAV ();
3418 4059
3419 av_push (*avp, SvREFCNT_inc (block)); 4060 av_push (*avp, SvREFCNT_inc (block));
3420 4061
3421 if (!ix) 4062 if (!ix)
3422 on_enterleave_call (aTHX_ block); 4063 on_enterleave_call (aTHX_ block);
3423 4064
3424 LEAVE; /* pp_entersub unfortunately forces an ENTER/LEAVE around xs calls */ 4065 LEAVE; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
3425 SAVEDESTRUCTOR_X (ix ? coro_pop_on_leave : coro_pop_on_enter, (void *)coro); 4066 SAVEDESTRUCTOR_X (ix ? coro_pop_on_leave : coro_pop_on_enter, (void *)coro);
3426 ENTER; /* pp_entersub unfortunately forces an ENTER/LEAVE around xs calls */ 4067 ENTER; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
3427} 4068}
3428 4069
3429 4070
3430MODULE = Coro::State PACKAGE = PerlIO::cede 4071MODULE = Coro::State PACKAGE = PerlIO::cede
3431 4072
… …
3436MODULE = Coro::State PACKAGE = Coro::Semaphore 4077MODULE = Coro::State PACKAGE = Coro::Semaphore
3437 4078
3438SV * 4079SV *
3439new (SV *klass, SV *count = 0) 4080new (SV *klass, SV *count = 0)
3440 CODE: 4081 CODE:
4082{
4083 int semcnt = 1;
4084
4085 if (count)
4086 {
4087 SvGETMAGIC (count);
4088
4089 if (SvOK (count))
4090 semcnt = SvIV (count);
4091 }
4092
3441 RETVAL = sv_bless ( 4093 RETVAL = sv_bless (
3442 coro_waitarray_new (aTHX_ count && SvOK (count) ? SvIV (count) : 1), 4094 coro_waitarray_new (aTHX_ semcnt),
3443 GvSTASH (CvGV (cv)) 4095 GvSTASH (CvGV (cv))
3444 ); 4096 );
4097}
3445 OUTPUT: 4098 OUTPUT:
3446 RETVAL 4099 RETVAL
3447 4100
3448# helper for Coro::Channel 4101# helper for Coro::Channel and others
3449SV * 4102SV *
3450_alloc (int count) 4103_alloc (int count)
3451 CODE: 4104 CODE:
3452 RETVAL = coro_waitarray_new (aTHX_ count); 4105 RETVAL = coro_waitarray_new (aTHX_ count);
3453 OUTPUT: 4106 OUTPUT:
… …
3511 for (i = 1; i <= wcount; ++i) 4164 for (i = 1; i <= wcount; ++i)
3512 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i]))); 4165 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i])));
3513 } 4166 }
3514} 4167}
3515 4168
4169MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
4170
4171void
4172_may_delete (SV *sem, int count, unsigned int extra_refs)
4173 PPCODE:
4174{
4175 AV *av = (AV *)SvRV (sem);
4176
4177 if (SvREFCNT ((SV *)av) == 1 + extra_refs
4178 && AvFILLp (av) == 0 /* no waiters, just count */
4179 && SvIV (AvARRAY (av)[0]) == count)
4180 XSRETURN_YES;
4181
4182 XSRETURN_NO;
4183}
4184
3516MODULE = Coro::State PACKAGE = Coro::Signal 4185MODULE = Coro::State PACKAGE = Coro::Signal
3517 4186
3518SV * 4187SV *
3519new (SV *klass) 4188new (SV *klass)
3520 CODE: 4189 CODE:
… …
3591 4260
3592void 4261void
3593_register (char *target, char *proto, SV *req) 4262_register (char *target, char *proto, SV *req)
3594 CODE: 4263 CODE:
3595{ 4264{
3596 CV *req_cv = coro_sv_2cv (aTHX_ req); 4265 SV *req_cv = s_get_cv_croak (req);
3597 /* newXSproto doesn't return the CV on 5.8 */ 4266 /* newXSproto doesn't return the CV on 5.8 */
3598 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 4267 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3599 sv_setpv ((SV *)slf_cv, proto); 4268 sv_setpv ((SV *)slf_cv, proto);
3600 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0); 4269 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
3601} 4270}
3602 4271
4272MODULE = Coro::State PACKAGE = Coro::Select
4273
4274void
4275patch_pp_sselect ()
4276 CODE:
4277 if (!coro_old_pp_sselect)
4278 {
4279 coro_select_select = (SV *)get_cv ("Coro::Select::select", 0);
4280 coro_old_pp_sselect = PL_ppaddr [OP_SSELECT];
4281 PL_ppaddr [OP_SSELECT] = coro_pp_sselect;
4282 }
4283
4284void
4285unpatch_pp_sselect ()
4286 CODE:
4287 if (coro_old_pp_sselect)
4288 {
4289 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
4290 coro_old_pp_sselect = 0;
4291 }
4292

Diff Legend

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