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.343 by root, Mon Dec 15 16:41:43 2008 UTC vs.
Revision 1.405 by root, Sat Jun 11 13:01:26 2011 UTC

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

Diff Legend

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