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.342 by root, Mon Dec 15 16:22:34 2008 UTC vs.
Revision 1.404 by root, Fri Jun 10 12:27:02 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#ifdef __linux
103# include <time.h> /* for timespec */
104# include <syscall.h> /* for SYS_* */
105# ifdef SYS_clock_gettime
106# define coro_clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
107# define CORO_CLOCK_MONOTONIC 1
108# define CORO_CLOCK_THREAD_CPUTIME_ID 3
109# endif
110#endif
111
164static double (*nvtime)(); /* so why doesn't it take void? */ 112static double (*nvtime)(); /* so why doesn't it take void? */
113static void (*u2time)(pTHX_ UV ret[2]);
165 114
166/* we hijack an hopefully unused CV flag for our purposes */ 115/* we hijack an hopefully unused CV flag for our purposes */
167#define CVf_SLF 0x4000 116#define CVf_SLF 0x4000
168static OP *pp_slf (pTHX); 117static OP *pp_slf (pTHX);
118static void slf_destroy (pTHX_ struct coro *coro);
169 119
170static U32 cctx_gen; 120static U32 cctx_gen;
171static size_t cctx_stacksize = CORO_STACKSIZE; 121static size_t cctx_stacksize = CORO_STACKSIZE;
172static struct CoroAPI coroapi; 122static struct CoroAPI coroapi;
173static AV *main_mainstack; /* used to differentiate between $main and others */ 123static AV *main_mainstack; /* used to differentiate between $main and others */
… …
190static SV *sv_pool_size; 140static SV *sv_pool_size;
191static SV *sv_async_pool_idle; /* description string */ 141static SV *sv_async_pool_idle; /* description string */
192static AV *av_async_pool; /* idle pool */ 142static AV *av_async_pool; /* idle pool */
193static SV *sv_Coro; /* class string */ 143static SV *sv_Coro; /* class string */
194static CV *cv_pool_handler; 144static CV *cv_pool_handler;
195static CV *cv_coro_state_new;
196 145
197/* Coro::AnyEvent */ 146/* Coro::AnyEvent */
198static SV *sv_activity; 147static SV *sv_activity;
199 148
149/* enable processtime/realtime profiling */
150static char enable_times;
151typedef U32 coro_ts[2];
152static coro_ts time_real, time_cpu;
153static char times_valid;
154
200static struct coro_cctx *cctx_first; 155static struct coro_cctx *cctx_first;
201static int cctx_count, cctx_idle; 156static int cctx_count, cctx_idle;
202 157
203enum { 158enum
159{
204 CC_MAPPED = 0x01, 160 CC_MAPPED = 0x01,
205 CC_NOREUSE = 0x02, /* throw this away after tracing */ 161 CC_NOREUSE = 0x02, /* throw this away after tracing */
206 CC_TRACE = 0x04, 162 CC_TRACE = 0x04,
207 CC_TRACE_SUB = 0x08, /* trace sub calls */ 163 CC_TRACE_SUB = 0x08, /* trace sub calls */
208 CC_TRACE_LINE = 0x10, /* trace each statement */ 164 CC_TRACE_LINE = 0x10, /* trace each statement */
… …
229 int valgrind_id; 185 int valgrind_id;
230#endif 186#endif
231 unsigned char flags; 187 unsigned char flags;
232} coro_cctx; 188} coro_cctx;
233 189
234coro_cctx *cctx_current; /* the currently running cctx */ 190static coro_cctx *cctx_current; /* the currently running cctx */
235 191
236/*****************************************************************************/ 192/*****************************************************************************/
237 193
194static MGVTBL coro_state_vtbl;
195
238enum { 196enum
197{
239 CF_RUNNING = 0x0001, /* coroutine is running */ 198 CF_RUNNING = 0x0001, /* coroutine is running */
240 CF_READY = 0x0002, /* coroutine is ready */ 199 CF_READY = 0x0002, /* coroutine is ready */
241 CF_NEW = 0x0004, /* has never been switched to */ 200 CF_NEW = 0x0004, /* has never been switched to */
242 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 201 CF_ZOMBIE = 0x0008, /* coroutine data has been freed */
243 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */ 202 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
203 CF_NOCANCEL = 0x0020, /* cannot cancel, set slf_frame.data to 1 (hackish) */
244}; 204};
245 205
246/* the structure where most of the perl state is stored, overlaid on the cxstack */ 206/* the structure where most of the perl state is stored, overlaid on the cxstack */
247typedef struct 207typedef struct
248{ 208{
… …
254#define VAR(name,type) type name; 214#define VAR(name,type) type name;
255# include "state.h" 215# include "state.h"
256#undef VAR 216#undef VAR
257} perl_slots; 217} perl_slots;
258 218
219// 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)) 220#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
260 221
261/* this is a structure representing a perl-level coroutine */ 222/* this is a structure representing a perl-level coroutine */
262struct coro { 223struct coro
224{
263 /* the C coroutine allocated to this perl coroutine, if any */ 225 /* the C coroutine allocated to this perl coroutine, if any */
264 coro_cctx *cctx; 226 coro_cctx *cctx;
227
228 /* ready queue */
229 struct coro *next_ready;
265 230
266 /* state data */ 231 /* state data */
267 struct CoroSLF slf_frame; /* saved slf frame */ 232 struct CoroSLF slf_frame; /* saved slf frame */
268 AV *mainstack; 233 AV *mainstack;
269 perl_slots *slot; /* basically the saved sp */ 234 perl_slots *slot; /* basically the saved sp */
270 235
271 CV *startcv; /* the CV to execute */ 236 CV *startcv; /* the CV to execute */
272 AV *args; /* data associated with this coroutine (initial args) */ 237 AV *args; /* data associated with this coroutine (initial args) */
273 int refcnt; /* coroutines are refcounted, yes */
274 int flags; /* CF_ flags */ 238 int flags; /* CF_ flags */
275 HV *hv; /* the perl hash associated with this coro, if any */ 239 HV *hv; /* the perl hash associated with this coro, if any */
276 void (*on_destroy)(pTHX_ struct coro *coro);
277 240
278 /* statistics */ 241 /* statistics */
279 int usecount; /* number of transfers to this coro */ 242 int usecount; /* number of transfers to this coro */
280 243
281 /* coro process data */ 244 /* coro process data */
282 int prio; 245 int prio;
283 SV *except; /* exception to be thrown */ 246 SV *except; /* exception to be thrown */
284 SV *rouse_cb; 247 SV *rouse_cb; /* last rouse callback */
248 AV *on_destroy; /* callbacks or coros to notify on destroy */
249 AV *status; /* the exit status list */
285 250
286 /* async_pool */ 251 /* async_pool */
287 SV *saved_deffh; 252 SV *saved_deffh;
288 SV *invoke_cb; 253 SV *invoke_cb;
289 AV *invoke_av; 254 AV *invoke_av;
290 255
291 /* on_enter/on_leave */ 256 /* on_enter/on_leave */
292 AV *on_enter; 257 AV *on_enter;
293 AV *on_leave; 258 AV *on_leave;
294 259
260 /* swap_sv */
261 AV *swap_sv;
262
263 /* times */
264 coro_ts t_cpu, t_real;
265
295 /* linked list */ 266 /* linked list */
296 struct coro *next, *prev; 267 struct coro *next, *prev;
297}; 268};
298 269
299typedef struct coro *Coro__State; 270typedef struct coro *Coro__State;
300typedef struct coro *Coro__State_or_hashref; 271typedef struct coro *Coro__State_or_hashref;
301 272
302/* the following variables are effectively part of the perl context */ 273/* the following variables are effectively part of the perl context */
303/* and get copied between struct coro and these variables */ 274/* and get copied between struct coro and these variables */
304/* the mainr easonw e don't support windows process emulation */ 275/* the main reason we don't support windows process emulation */
305static struct CoroSLF slf_frame; /* the current slf frame */ 276static struct CoroSLF slf_frame; /* the current slf frame */
306 277
307/** Coro ********************************************************************/ 278/** Coro ********************************************************************/
308 279
309#define PRIO_MAX 3 280#define CORO_PRIO_MAX 3
310#define PRIO_HIGH 1 281#define CORO_PRIO_HIGH 1
311#define PRIO_NORMAL 0 282#define CORO_PRIO_NORMAL 0
312#define PRIO_LOW -1 283#define CORO_PRIO_LOW -1
313#define PRIO_IDLE -3 284#define CORO_PRIO_IDLE -3
314#define PRIO_MIN -4 285#define CORO_PRIO_MIN -4
315 286
316/* for Coro.pm */ 287/* for Coro.pm */
317static SV *coro_current; 288static SV *coro_current;
318static SV *coro_readyhook; 289static SV *coro_readyhook;
319static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1]; 290static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
320static CV *cv_coro_run, *cv_coro_terminate; 291static CV *cv_coro_run;
321static struct coro *coro_first; 292static struct coro *coro_first;
322#define coro_nready coroapi.nready 293#define coro_nready coroapi.nready
323 294
295/** Coro::Select ************************************************************/
296
297static OP *(*coro_old_pp_sselect) (pTHX);
298static SV *coro_select_select;
299
300/* horrible hack, but if it works... */
301static OP *
302coro_pp_sselect (pTHX)
303{
304 dSP;
305 PUSHMARK (SP - 4); /* fake argument list */
306 XPUSHs (coro_select_select);
307 PUTBACK;
308
309 /* entersub is an UNOP, select a LISTOP... keep your fingers crossed */
310 PL_op->op_flags |= OPf_STACKED;
311 PL_op->op_private = 0;
312 return PL_ppaddr [OP_ENTERSUB](aTHX);
313}
314
315/** time stuff **************************************************************/
316
317#ifdef HAS_GETTIMEOFDAY
318
319ECB_INLINE void
320coro_u2time (pTHX_ UV ret[2])
321{
322 struct timeval tv;
323 gettimeofday (&tv, 0);
324
325 ret [0] = tv.tv_sec;
326 ret [1] = tv.tv_usec;
327}
328
329ECB_INLINE double
330coro_nvtime ()
331{
332 struct timeval tv;
333 gettimeofday (&tv, 0);
334
335 return tv.tv_sec + tv.tv_usec * 1e-6;
336}
337
338ECB_INLINE void
339time_init (pTHX)
340{
341 nvtime = coro_nvtime;
342 u2time = coro_u2time;
343}
344
345#else
346
347ECB_INLINE void
348time_init (pTHX)
349{
350 SV **svp;
351
352 require_pv ("Time/HiRes.pm");
353
354 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
355
356 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
357 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught");
358
359 nvtime = INT2PTR (double (*)(), SvIV (*svp));
360
361 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
362 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
363}
364
365#endif
366
324/** lowlevel stuff **********************************************************/ 367/** lowlevel stuff **********************************************************/
325 368
326static SV * 369static SV * ecb_noinline
327coro_get_sv (pTHX_ const char *name, int create) 370coro_get_sv (pTHX_ const char *name, int create)
328{ 371{
329#if PERL_VERSION_ATLEAST (5,10,0) 372#if PERL_VERSION_ATLEAST (5,10,0)
330 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 373 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
331 get_sv (name, create); 374 get_sv (name, create);
332#endif 375#endif
333 return get_sv (name, create); 376 return get_sv (name, create);
334} 377}
335 378
336static AV * 379static AV * ecb_noinline
337coro_get_av (pTHX_ const char *name, int create) 380coro_get_av (pTHX_ const char *name, int create)
338{ 381{
339#if PERL_VERSION_ATLEAST (5,10,0) 382#if PERL_VERSION_ATLEAST (5,10,0)
340 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 383 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
341 get_av (name, create); 384 get_av (name, create);
342#endif 385#endif
343 return get_av (name, create); 386 return get_av (name, create);
344} 387}
345 388
346static HV * 389static HV * ecb_noinline
347coro_get_hv (pTHX_ const char *name, int create) 390coro_get_hv (pTHX_ const char *name, int create)
348{ 391{
349#if PERL_VERSION_ATLEAST (5,10,0) 392#if PERL_VERSION_ATLEAST (5,10,0)
350 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 393 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
351 get_hv (name, create); 394 get_hv (name, create);
352#endif 395#endif
353 return get_hv (name, create); 396 return get_hv (name, create);
354} 397}
355 398
356/* may croak */ 399ECB_INLINE void
357INLINE CV * 400coro_times_update ()
358coro_sv_2cv (pTHX_ SV *sv)
359{ 401{
360 HV *st; 402#ifdef coro_clock_gettime
361 GV *gvp; 403 struct timespec ts;
362 CV *cv = sv_2cv (sv, &st, &gvp, 0);
363 404
364 if (!cv) 405 ts.tv_sec = ts.tv_nsec = 0;
365 croak ("code reference expected"); 406 coro_clock_gettime (CORO_CLOCK_THREAD_CPUTIME_ID, &ts);
407 time_cpu [0] = ts.tv_sec; time_cpu [1] = ts.tv_nsec;
366 408
367 return cv; 409 ts.tv_sec = ts.tv_nsec = 0;
410 coro_clock_gettime (CORO_CLOCK_MONOTONIC, &ts);
411 time_real [0] = ts.tv_sec; time_real [1] = ts.tv_nsec;
412#else
413 dTHX;
414 UV tv[2];
415
416 u2time (aTHX_ tv);
417 time_real [0] = tv [0];
418 time_real [1] = tv [1] * 1000;
419#endif
420}
421
422ECB_INLINE void
423coro_times_add (struct coro *c)
424{
425 c->t_real [1] += time_real [1];
426 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
427 c->t_real [0] += time_real [0];
428
429 c->t_cpu [1] += time_cpu [1];
430 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
431 c->t_cpu [0] += time_cpu [0];
432}
433
434ECB_INLINE void
435coro_times_sub (struct coro *c)
436{
437 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; }
438 c->t_real [1] -= time_real [1];
439 c->t_real [0] -= time_real [0];
440
441 if (c->t_cpu [1] < time_cpu [1]) { c->t_cpu [1] += 1000000000; --c->t_cpu [0]; }
442 c->t_cpu [1] -= time_cpu [1];
443 c->t_cpu [0] -= time_cpu [0];
368} 444}
369 445
370/*****************************************************************************/ 446/*****************************************************************************/
371/* magic glue */ 447/* magic glue */
372 448
373#define CORO_MAGIC_type_cv 26 449#define CORO_MAGIC_type_cv 26
374#define CORO_MAGIC_type_state PERL_MAGIC_ext 450#define CORO_MAGIC_type_state PERL_MAGIC_ext
375 451
376#define CORO_MAGIC_NN(sv, type) \ 452#define CORO_MAGIC_NN(sv, type) \
377 (expect_true (SvMAGIC (sv)->mg_type == type) \ 453 (ecb_expect_true (SvMAGIC (sv)->mg_type == type) \
378 ? SvMAGIC (sv) \ 454 ? SvMAGIC (sv) \
379 : mg_find (sv, type)) 455 : mg_find (sv, type))
380 456
381#define CORO_MAGIC(sv, type) \ 457#define CORO_MAGIC(sv, type) \
382 (expect_true (SvMAGIC (sv)) \ 458 (ecb_expect_true (SvMAGIC (sv)) \
383 ? CORO_MAGIC_NN (sv, type) \ 459 ? CORO_MAGIC_NN (sv, type) \
384 : 0) 460 : 0)
385 461
386#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv) 462#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) 463#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
388 464
465ECB_INLINE MAGIC *
466SvSTATEhv_p (pTHX_ SV *coro)
467{
468 MAGIC *mg;
469
470 if (ecb_expect_true (
471 SvTYPE (coro) == SVt_PVHV
472 && (mg = CORO_MAGIC_state (coro))
473 && mg->mg_virtual == &coro_state_vtbl
474 ))
475 return mg;
476
477 return 0;
478}
479
389INLINE struct coro * 480ECB_INLINE struct coro *
390SvSTATE_ (pTHX_ SV *coro) 481SvSTATE_ (pTHX_ SV *coro)
391{ 482{
392 HV *stash;
393 MAGIC *mg; 483 MAGIC *mg;
394 484
395 if (SvROK (coro)) 485 if (SvROK (coro))
396 coro = SvRV (coro); 486 coro = SvRV (coro);
397 487
398 if (expect_false (SvTYPE (coro) != SVt_PVHV)) 488 mg = SvSTATEhv_p (aTHX_ coro);
489 if (!mg)
399 croak ("Coro::State object required"); 490 croak ("Coro::State object required");
400 491
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; 492 return (struct coro *)mg->mg_ptr;
411} 493}
412 494
413#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 495#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
414 496
… …
417#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 499#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
418 500
419/*****************************************************************************/ 501/*****************************************************************************/
420/* padlist management and caching */ 502/* padlist management and caching */
421 503
422static AV * 504ECB_INLINE AV *
423coro_derive_padlist (pTHX_ CV *cv) 505coro_derive_padlist (pTHX_ CV *cv)
424{ 506{
425 AV *padlist = CvPADLIST (cv); 507 AV *padlist = CvPADLIST (cv);
426 AV *newpadlist, *newpad; 508 AV *newpadlist, *newpad;
427 509
… …
439 av_store (newpadlist, 1, (SV *)newpad); 521 av_store (newpadlist, 1, (SV *)newpad);
440 522
441 return newpadlist; 523 return newpadlist;
442} 524}
443 525
444static void 526ECB_INLINE void
445free_padlist (pTHX_ AV *padlist) 527free_padlist (pTHX_ AV *padlist)
446{ 528{
447 /* may be during global destruction */ 529 /* may be during global destruction */
448 if (!IN_DESTRUCT) 530 if (!IN_DESTRUCT)
449 { 531 {
… …
473coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 555coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
474{ 556{
475 AV *padlist; 557 AV *padlist;
476 AV *av = (AV *)mg->mg_obj; 558 AV *av = (AV *)mg->mg_obj;
477 559
560 /* perl manages to free our internal AV and _then_ call us */
561 if (IN_DESTRUCT)
562 return 0;
563
478 /* casting is fun. */ 564 /* casting is fun. */
479 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 565 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
480 free_padlist (aTHX_ padlist); 566 free_padlist (aTHX_ padlist);
481 567
482 SvREFCNT_dec (av); /* sv_magicext increased the refcount */ 568 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
… …
488 0, 0, 0, 0, 574 0, 0, 0, 0,
489 coro_cv_free 575 coro_cv_free
490}; 576};
491 577
492/* the next two functions merely cache the padlists */ 578/* the next two functions merely cache the padlists */
493static void 579ECB_INLINE void
494get_padlist (pTHX_ CV *cv) 580get_padlist (pTHX_ CV *cv)
495{ 581{
496 MAGIC *mg = CORO_MAGIC_cv (cv); 582 MAGIC *mg = CORO_MAGIC_cv (cv);
497 AV *av; 583 AV *av;
498 584
499 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 585 if (ecb_expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0))
500 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 586 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
501 else 587 else
502 { 588 {
503#if CORO_PREFER_PERL_FUNCTIONS 589#if CORO_PREFER_PERL_FUNCTIONS
504 /* this is probably cleaner? but also slower! */ 590 /* this is probably cleaner? but also slower! */
… …
511 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 597 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
512#endif 598#endif
513 } 599 }
514} 600}
515 601
516static void 602ECB_INLINE void
517put_padlist (pTHX_ CV *cv) 603put_padlist (pTHX_ CV *cv)
518{ 604{
519 MAGIC *mg = CORO_MAGIC_cv (cv); 605 MAGIC *mg = CORO_MAGIC_cv (cv);
520 AV *av; 606 AV *av;
521 607
522 if (expect_false (!mg)) 608 if (ecb_expect_false (!mg))
523 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 609 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
524 610
525 av = (AV *)mg->mg_obj; 611 av = (AV *)mg->mg_obj;
526 612
527 if (expect_false (AvFILLp (av) >= AvMAX (av))) 613 if (ecb_expect_false (AvFILLp (av) >= AvMAX (av)))
528 av_extend (av, AvFILLp (av) + 1); 614 av_extend (av, AvFILLp (av) + 1);
529 615
530 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 616 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
531} 617}
532 618
533/** load & save, init *******************************************************/ 619/** load & save, init *******************************************************/
620
621/* swap sv heads, at least logically */
622static void
623swap_svs (pTHX_ Coro__State c)
624{
625 int i;
626
627 for (i = 0; i <= AvFILLp (c->swap_sv); )
628 {
629 SV *a = AvARRAY (c->swap_sv)[i++];
630 SV *b = AvARRAY (c->swap_sv)[i++];
631
632 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
633 SV tmp;
634
635 /* swap sv_any */
636 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
637
638 /* swap sv_flags */
639 SvFLAGS (&tmp) = SvFLAGS (a);
640 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
641 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
642
643#if PERL_VERSION_ATLEAST (5,10,0)
644 /* perl 5.10 complicates this _quite_ a bit, but it also is
645 * much faster, so no quarrels here. alternatively, we could
646 * sv_upgrade to avoid this.
647 */
648 {
649 /* swap sv_u */
650 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
651
652 /* if SvANY points to the head, we need to adjust the pointers,
653 * as the pointer for a still points to b, and maybe vice versa.
654 */
655 #define svany_in_head(type) \
656 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
657
658 if (svany_in_head (SvTYPE (a)))
659 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
660
661 if (svany_in_head (SvTYPE (b)))
662 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
663 }
664#endif
665 }
666}
667
668#define SWAP_SVS(coro) \
669 if (ecb_expect_false ((coro)->swap_sv)) \
670 swap_svs (aTHX_ (coro))
534 671
535static void 672static void
536on_enterleave_call (pTHX_ SV *cb); 673on_enterleave_call (pTHX_ SV *cb);
537 674
538static void 675static void
… …
557 dSP; 694 dSP;
558 695
559 CV *cv; 696 CV *cv;
560 697
561 /* now do the ugly restore mess */ 698 /* now do the ugly restore mess */
562 while (expect_true (cv = (CV *)POPs)) 699 while (ecb_expect_true (cv = (CV *)POPs))
563 { 700 {
564 put_padlist (aTHX_ cv); /* mark this padlist as available */ 701 put_padlist (aTHX_ cv); /* mark this padlist as available */
565 CvDEPTH (cv) = PTR2IV (POPs); 702 CvDEPTH (cv) = PTR2IV (POPs);
566 CvPADLIST (cv) = (AV *)POPs; 703 CvPADLIST (cv) = (AV *)POPs;
567 } 704 }
… …
570 } 707 }
571 708
572 slf_frame = c->slf_frame; 709 slf_frame = c->slf_frame;
573 CORO_THROW = c->except; 710 CORO_THROW = c->except;
574 711
712 if (ecb_expect_false (enable_times))
713 {
714 if (ecb_expect_false (!times_valid))
715 coro_times_update ();
716
717 coro_times_sub (c);
718 }
719
575 if (expect_false (c->on_enter)) 720 if (ecb_expect_false (c->on_enter))
576 { 721 {
577 int i; 722 int i;
578 723
579 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 724 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
580 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 725 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
581 } 726 }
727
728 SWAP_SVS (c);
582} 729}
583 730
584static void 731static void
585save_perl (pTHX_ Coro__State c) 732save_perl (pTHX_ Coro__State c)
586{ 733{
734 SWAP_SVS (c);
735
587 if (expect_false (c->on_leave)) 736 if (ecb_expect_false (c->on_leave))
588 { 737 {
589 int i; 738 int i;
590 739
591 for (i = AvFILLp (c->on_leave); i >= 0; --i) 740 for (i = AvFILLp (c->on_leave); i >= 0; --i)
592 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]); 741 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
742 }
743
744 times_valid = 0;
745
746 if (ecb_expect_false (enable_times))
747 {
748 coro_times_update (); times_valid = 1;
749 coro_times_add (c);
593 } 750 }
594 751
595 c->except = CORO_THROW; 752 c->except = CORO_THROW;
596 c->slf_frame = slf_frame; 753 c->slf_frame = slf_frame;
597 754
… …
608 765
609 XPUSHs (Nullsv); 766 XPUSHs (Nullsv);
610 /* this loop was inspired by pp_caller */ 767 /* this loop was inspired by pp_caller */
611 for (;;) 768 for (;;)
612 { 769 {
613 while (expect_true (cxix >= 0)) 770 while (ecb_expect_true (cxix >= 0))
614 { 771 {
615 PERL_CONTEXT *cx = &ccstk[cxix--]; 772 PERL_CONTEXT *cx = &ccstk[cxix--];
616 773
617 if (expect_true (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT)) 774 if (ecb_expect_true (CxTYPE (cx) == CXt_SUB) || ecb_expect_false (CxTYPE (cx) == CXt_FORMAT))
618 { 775 {
619 CV *cv = cx->blk_sub.cv; 776 CV *cv = cx->blk_sub.cv;
620 777
621 if (expect_true (CvDEPTH (cv))) 778 if (ecb_expect_true (CvDEPTH (cv)))
622 { 779 {
623 EXTEND (SP, 3); 780 EXTEND (SP, 3);
624 PUSHs ((SV *)CvPADLIST (cv)); 781 PUSHs ((SV *)CvPADLIST (cv));
625 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv))); 782 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
626 PUSHs ((SV *)cv); 783 PUSHs ((SV *)cv);
… …
629 get_padlist (aTHX_ cv); 786 get_padlist (aTHX_ cv);
630 } 787 }
631 } 788 }
632 } 789 }
633 790
634 if (expect_true (top_si->si_type == PERLSI_MAIN)) 791 if (ecb_expect_true (top_si->si_type == PERLSI_MAIN))
635 break; 792 break;
636 793
637 top_si = top_si->si_prev; 794 top_si = top_si->si_prev;
638 ccstk = top_si->si_cxstack; 795 ccstk = top_si->si_cxstack;
639 cxix = top_si->si_cxix; 796 cxix = top_si->si_cxix;
… …
641 798
642 PUTBACK; 799 PUTBACK;
643 } 800 }
644 801
645 /* allocate some space on the context stack for our purposes */ 802 /* allocate some space on the context stack for our purposes */
646 /* we manually unroll here, as usually 2 slots is enough */ 803 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 { 804 {
651 int i; 805 unsigned int i;
806
652 for (i = 3; i < SLOT_COUNT; ++i) 807 for (i = 0; i < SLOT_COUNT; ++i)
653 CXINC; 808 CXINC;
654 } 809
655 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 810 cxstack_ix -= SLOT_COUNT; /* undo allocation */
811 }
656 812
657 c->mainstack = PL_mainstack; 813 c->mainstack = PL_mainstack;
658 814
659 { 815 {
660 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 816 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
… …
681# define coro_init_stacks(thx) init_stacks () 837# define coro_init_stacks(thx) init_stacks ()
682#else 838#else
683static void 839static void
684coro_init_stacks (pTHX) 840coro_init_stacks (pTHX)
685{ 841{
686 PL_curstackinfo = new_stackinfo(32, 8); 842 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; 843 PL_curstackinfo->si_type = PERLSI_MAIN;
688 PL_curstack = PL_curstackinfo->si_stack; 844 PL_curstack = PL_curstackinfo->si_stack;
689 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 845 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
690 846
691 PL_stack_base = AvARRAY(PL_curstack); 847 PL_stack_base = AvARRAY(PL_curstack);
… …
798#endif 954#endif
799 955
800/* 956/*
801 * This overrides the default magic get method of %SIG elements. 957 * 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 958 * 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 959 * and instead of trying to save and restore the hash elements (extremely slow),
804 * readback here. 960 * we just provide our own readback here.
805 */ 961 */
806static int 962static int ecb_cold
807coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 963coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
808{ 964{
809 const char *s = MgPV_nolen_const (mg); 965 const char *s = MgPV_nolen_const (mg);
810 966
811 if (*s == '_') 967 if (*s == '_')
… …
823 } 979 }
824 980
825 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 981 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
826} 982}
827 983
828static int 984static int ecb_cold
829coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 985coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
830{ 986{
831 const char *s = MgPV_nolen_const (mg); 987 const char *s = MgPV_nolen_const (mg);
832 988
833 if (*s == '_') 989 if (*s == '_')
… …
847 } 1003 }
848 1004
849 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0; 1005 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
850} 1006}
851 1007
852static int 1008static int ecb_cold
853coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1009coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
854{ 1010{
855 const char *s = MgPV_nolen_const (mg); 1011 const char *s = MgPV_nolen_const (mg);
856 1012
857 if (*s == '_') 1013 if (*s == '_')
… …
890slf_check_repeat (pTHX_ struct CoroSLF *frame) 1046slf_check_repeat (pTHX_ struct CoroSLF *frame)
891{ 1047{
892 return 1; 1048 return 1;
893} 1049}
894 1050
895static UNOP coro_setup_op; 1051static UNOP init_perl_op;
896 1052
897static void NOINLINE /* noinline to keep it out of the transfer fast path */ 1053ecb_noinline static void /* noinline to keep it out of the transfer fast path */
898coro_setup (pTHX_ struct coro *coro) 1054init_perl (pTHX_ struct coro *coro)
899{ 1055{
900 /* 1056 /*
901 * emulate part of the perl startup here. 1057 * emulate part of the perl startup here.
902 */ 1058 */
903 coro_init_stacks (aTHX); 1059 coro_init_stacks (aTHX);
… …
910 PL_comppad_name_fill = 0; 1066 PL_comppad_name_fill = 0;
911 PL_comppad_name_floor = 0; 1067 PL_comppad_name_floor = 0;
912 PL_curpm = 0; 1068 PL_curpm = 0;
913 PL_curpad = 0; 1069 PL_curpad = 0;
914 PL_localizing = 0; 1070 PL_localizing = 0;
915 PL_dirty = 0;
916 PL_restartop = 0; 1071 PL_restartop = 0;
917#if PERL_VERSION_ATLEAST (5,10,0) 1072#if PERL_VERSION_ATLEAST (5,10,0)
918 PL_parser = 0; 1073 PL_parser = 0;
919#endif 1074#endif
920 PL_hints = 0; 1075 PL_hints = 0;
921 1076
922 /* recreate the die/warn hooks */ 1077 /* recreate the die/warn hooks */
923 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1078 PL_diehook = SvREFCNT_inc (rv_diehook);
924 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1079 PL_warnhook = SvREFCNT_inc (rv_warnhook);
925 1080
926 GvSV (PL_defgv) = newSV (0); 1081 GvSV (PL_defgv) = newSV (0);
927 GvAV (PL_defgv) = coro->args; coro->args = 0; 1082 GvAV (PL_defgv) = coro->args; coro->args = 0;
928 GvSV (PL_errgv) = newSV (0); 1083 GvSV (PL_errgv) = newSV (0);
929 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1084 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 1105 /* 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. 1106 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
952 */ 1107 */
953 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1108 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 */ 1109 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
1110 slf_frame.destroy = 0;
955 1111
956 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1112 /* 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; 1113 init_perl_op.op_next = PL_op;
958 coro_setup_op.op_type = OP_ENTERSUB; 1114 init_perl_op.op_type = OP_ENTERSUB;
959 coro_setup_op.op_ppaddr = pp_slf; 1115 init_perl_op.op_ppaddr = pp_slf;
960 /* no flags etc. required, as an init function won't be called */ 1116 /* no flags etc. required, as an init function won't be called */
961 1117
962 PL_op = (OP *)&coro_setup_op; 1118 PL_op = (OP *)&init_perl_op;
963 1119
964 /* copy throw, in case it was set before coro_setup */ 1120 /* copy throw, in case it was set before init_perl */
965 CORO_THROW = coro->except; 1121 CORO_THROW = coro->except;
1122
1123 SWAP_SVS (coro);
1124
1125 if (ecb_expect_false (enable_times))
1126 {
1127 coro_times_update ();
1128 coro_times_sub (coro);
1129 }
966} 1130}
967 1131
968static void 1132static void
969coro_unwind_stacks (pTHX) 1133coro_unwind_stacks (pTHX)
970{ 1134{
… …
985 dounwind (-1); 1149 dounwind (-1);
986 } 1150 }
987} 1151}
988 1152
989static void 1153static void
990coro_destruct_perl (pTHX_ struct coro *coro) 1154destroy_perl (pTHX_ struct coro *coro)
991{ 1155{
1156 SV *svf [9];
1157
1158 {
1159 SV *old_current = SvRV (coro_current);
1160 struct coro *current = SvSTATE (old_current);
1161
1162 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1163
1164 save_perl (aTHX_ current);
1165
1166 /* this will cause transfer_check to croak on block*/
1167 SvRV_set (coro_current, (SV *)coro->hv);
1168
1169 load_perl (aTHX_ coro);
1170
992 coro_unwind_stacks (aTHX); 1171 coro_unwind_stacks (aTHX);
993 1172
994 SvREFCNT_dec (GvSV (PL_defgv)); 1173 /* restore swapped sv's */
995 SvREFCNT_dec (GvAV (PL_defgv)); 1174 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 1175
1002 SvREFCNT_dec (PL_diehook); 1176 coro_destruct_stacks (aTHX);
1003 SvREFCNT_dec (PL_warnhook); 1177
1178 // now save some sv's to be free'd later
1179 svf [0] = GvSV (PL_defgv);
1180 svf [1] = (SV *)GvAV (PL_defgv);
1181 svf [2] = GvSV (PL_errgv);
1182 svf [3] = (SV *)PL_defoutgv;
1183 svf [4] = PL_rs;
1184 svf [5] = GvSV (irsgv);
1185 svf [6] = (SV *)GvHV (PL_hintgv);
1186 svf [7] = PL_diehook;
1187 svf [8] = PL_warnhook;
1188 assert (9 == sizeof (svf) / sizeof (*svf));
1189
1190 SvRV_set (coro_current, old_current);
1191
1192 load_perl (aTHX_ current);
1004 1193 }
1194
1195 {
1196 unsigned int i;
1197
1198 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i)
1199 SvREFCNT_dec (svf [i]);
1200
1005 SvREFCNT_dec (coro->saved_deffh); 1201 SvREFCNT_dec (coro->saved_deffh);
1006 SvREFCNT_dec (coro->rouse_cb); 1202 SvREFCNT_dec (coro->rouse_cb);
1007 SvREFCNT_dec (coro->invoke_cb); 1203 SvREFCNT_dec (coro->invoke_cb);
1008 SvREFCNT_dec (coro->invoke_av); 1204 SvREFCNT_dec (coro->invoke_av);
1009 1205 }
1010 coro_destruct_stacks (aTHX);
1011} 1206}
1012 1207
1013INLINE void 1208ECB_INLINE void
1014free_coro_mortal (pTHX) 1209free_coro_mortal (pTHX)
1015{ 1210{
1016 if (expect_true (coro_mortal)) 1211 if (ecb_expect_true (coro_mortal))
1017 { 1212 {
1018 SvREFCNT_dec (coro_mortal); 1213 SvREFCNT_dec ((SV *)coro_mortal);
1019 coro_mortal = 0; 1214 coro_mortal = 0;
1020 } 1215 }
1021} 1216}
1022 1217
1023static int 1218static int
… …
1156 1351
1157 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1352 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1158} 1353}
1159 1354
1160/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1355/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1161static void NOINLINE 1356static void ecb_noinline
1162cctx_prepare (pTHX) 1357cctx_prepare (pTHX)
1163{ 1358{
1164 PL_top_env = &PL_start_env; 1359 PL_top_env = &PL_start_env;
1165 1360
1166 if (cctx_current->flags & CC_TRACE) 1361 if (cctx_current->flags & CC_TRACE)
… …
1177 slf_frame.prepare = slf_prepare_set_stacklevel; 1372 slf_frame.prepare = slf_prepare_set_stacklevel;
1178 slf_frame.check = slf_check_set_stacklevel; 1373 slf_frame.check = slf_check_set_stacklevel;
1179} 1374}
1180 1375
1181/* the tail of transfer: execute stuff we can only do after a transfer */ 1376/* the tail of transfer: execute stuff we can only do after a transfer */
1182INLINE void 1377ECB_INLINE void
1183transfer_tail (pTHX) 1378transfer_tail (pTHX)
1184{ 1379{
1185 free_coro_mortal (aTHX); 1380 free_coro_mortal (aTHX);
1186} 1381}
1187 1382
… …
1212 /* somebody or something will hit me for both perl_run and PL_restartop */ 1407 /* somebody or something will hit me for both perl_run and PL_restartop */
1213 PL_restartop = PL_op; 1408 PL_restartop = PL_op;
1214 perl_run (PL_curinterp); 1409 perl_run (PL_curinterp);
1215 /* 1410 /*
1216 * Unfortunately, there is no way to get at the return values of the 1411 * Unfortunately, there is no way to get at the return values of the
1217 * coro body here, as perl_run destroys these 1412 * coro body here, as perl_run destroys these. Likewise, we cannot catch
1413 * runtime errors here, as this is just a random interpreter, not a thread.
1218 */ 1414 */
1219 1415
1220 /* 1416 /*
1221 * If perl-run returns we assume exit() was being called or the coro 1417 * 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) 1418 * fell off the end, which seems to be the only valid (non-bug)
… …
1309cctx_destroy (coro_cctx *cctx) 1505cctx_destroy (coro_cctx *cctx)
1310{ 1506{
1311 if (!cctx) 1507 if (!cctx)
1312 return; 1508 return;
1313 1509
1314 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary? 1510 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1315 1511
1316 --cctx_count; 1512 --cctx_count;
1317 coro_destroy (&cctx->cctx); 1513 coro_destroy (&cctx->cctx);
1318 1514
1319 /* coro_transfer creates new, empty cctx's */ 1515 /* coro_transfer creates new, empty cctx's */
… …
1338#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE)) 1534#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE))
1339 1535
1340static coro_cctx * 1536static coro_cctx *
1341cctx_get (pTHX) 1537cctx_get (pTHX)
1342{ 1538{
1343 while (expect_true (cctx_first)) 1539 while (ecb_expect_true (cctx_first))
1344 { 1540 {
1345 coro_cctx *cctx = cctx_first; 1541 coro_cctx *cctx = cctx_first;
1346 cctx_first = cctx->next; 1542 cctx_first = cctx->next;
1347 --cctx_idle; 1543 --cctx_idle;
1348 1544
1349 if (expect_true (!CCTX_EXPIRED (cctx))) 1545 if (ecb_expect_true (!CCTX_EXPIRED (cctx)))
1350 return cctx; 1546 return cctx;
1351 1547
1352 cctx_destroy (cctx); 1548 cctx_destroy (cctx);
1353 } 1549 }
1354 1550
… …
1359cctx_put (coro_cctx *cctx) 1555cctx_put (coro_cctx *cctx)
1360{ 1556{
1361 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1557 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr));
1362 1558
1363 /* free another cctx if overlimit */ 1559 /* free another cctx if overlimit */
1364 if (expect_false (cctx_idle >= cctx_max_idle)) 1560 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1365 { 1561 {
1366 coro_cctx *first = cctx_first; 1562 coro_cctx *first = cctx_first;
1367 cctx_first = first->next; 1563 cctx_first = first->next;
1368 --cctx_idle; 1564 --cctx_idle;
1369 1565
… …
1380static void 1576static void
1381transfer_check (pTHX_ struct coro *prev, struct coro *next) 1577transfer_check (pTHX_ struct coro *prev, struct coro *next)
1382{ 1578{
1383 /* TODO: throwing up here is considered harmful */ 1579 /* TODO: throwing up here is considered harmful */
1384 1580
1385 if (expect_true (prev != next)) 1581 if (ecb_expect_true (prev != next))
1386 { 1582 {
1387 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1583 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,"); 1584 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1389 1585
1390 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED))) 1586 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,"); 1587 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1392 1588
1393#if !PERL_VERSION_ATLEAST (5,10,0) 1589#if !PERL_VERSION_ATLEAST (5,10,0)
1394 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1590 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,"); 1591 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1396#endif 1592#endif
1397 } 1593 }
1398} 1594}
1399 1595
1400/* always use the TRANSFER macro */ 1596/* always use the TRANSFER macro */
1401static void NOINLINE /* noinline so we have a fixed stackframe */ 1597static void ecb_noinline /* noinline so we have a fixed stackframe */
1402transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1598transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1403{ 1599{
1404 dSTACKLEVEL; 1600 dSTACKLEVEL;
1405 1601
1406 /* sometimes transfer is only called to set idle_sp */ 1602 /* sometimes transfer is only called to set idle_sp */
1407 if (expect_false (!prev)) 1603 if (ecb_expect_false (!prev))
1408 { 1604 {
1409 cctx_current->idle_sp = STACKLEVEL; 1605 cctx_current->idle_sp = STACKLEVEL;
1410 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1606 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1411 } 1607 }
1412 else if (expect_true (prev != next)) 1608 else if (ecb_expect_true (prev != next))
1413 { 1609 {
1414 coro_cctx *cctx_prev; 1610 coro_cctx *cctx_prev;
1415 1611
1416 if (expect_false (prev->flags & CF_NEW)) 1612 if (ecb_expect_false (prev->flags & CF_NEW))
1417 { 1613 {
1418 /* create a new empty/source context */ 1614 /* create a new empty/source context */
1419 prev->flags &= ~CF_NEW; 1615 prev->flags &= ~CF_NEW;
1420 prev->flags |= CF_RUNNING; 1616 prev->flags |= CF_RUNNING;
1421 } 1617 }
… …
1424 next->flags |= CF_RUNNING; 1620 next->flags |= CF_RUNNING;
1425 1621
1426 /* first get rid of the old state */ 1622 /* first get rid of the old state */
1427 save_perl (aTHX_ prev); 1623 save_perl (aTHX_ prev);
1428 1624
1429 if (expect_false (next->flags & CF_NEW)) 1625 if (ecb_expect_false (next->flags & CF_NEW))
1430 { 1626 {
1431 /* need to start coroutine */ 1627 /* need to start coroutine */
1432 next->flags &= ~CF_NEW; 1628 next->flags &= ~CF_NEW;
1433 /* setup coroutine call */ 1629 /* setup coroutine call */
1434 coro_setup (aTHX_ next); 1630 init_perl (aTHX_ next);
1435 } 1631 }
1436 else 1632 else
1437 load_perl (aTHX_ next); 1633 load_perl (aTHX_ next);
1438 1634
1439 /* possibly untie and reuse the cctx */ 1635 /* possibly untie and reuse the cctx */
1440 if (expect_true ( 1636 if (ecb_expect_true (
1441 cctx_current->idle_sp == STACKLEVEL 1637 cctx_current->idle_sp == STACKLEVEL
1442 && !(cctx_current->flags & CC_TRACE) 1638 && !(cctx_current->flags & CC_TRACE)
1443 && !force_cctx 1639 && !force_cctx
1444 )) 1640 ))
1445 { 1641 {
1446 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1642 /* 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)); 1643 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1448 1644
1449 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */ 1645 /* 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 */ 1646 /* without this the next cctx_get might destroy the running cctx while still in use */
1451 if (expect_false (CCTX_EXPIRED (cctx_current))) 1647 if (ecb_expect_false (CCTX_EXPIRED (cctx_current)))
1452 if (expect_true (!next->cctx)) 1648 if (ecb_expect_true (!next->cctx))
1453 next->cctx = cctx_get (aTHX); 1649 next->cctx = cctx_get (aTHX);
1454 1650
1455 cctx_put (cctx_current); 1651 cctx_put (cctx_current);
1456 } 1652 }
1457 else 1653 else
1458 prev->cctx = cctx_current; 1654 prev->cctx = cctx_current;
1459 1655
1460 ++next->usecount; 1656 ++next->usecount;
1461 1657
1462 cctx_prev = cctx_current; 1658 cctx_prev = cctx_current;
1463 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX); 1659 cctx_current = ecb_expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1464 1660
1465 next->cctx = 0; 1661 next->cctx = 0;
1466 1662
1467 if (expect_false (cctx_prev != cctx_current)) 1663 if (ecb_expect_false (cctx_prev != cctx_current))
1468 { 1664 {
1469 cctx_prev->top_env = PL_top_env; 1665 cctx_prev->top_env = PL_top_env;
1470 PL_top_env = cctx_current->top_env; 1666 PL_top_env = cctx_current->top_env;
1471 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx); 1667 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1472 } 1668 }
… …
1478#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx)) 1674#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) 1675#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1480 1676
1481/** high level stuff ********************************************************/ 1677/** high level stuff ********************************************************/
1482 1678
1679/* this function is actually Coro, not Coro::State, but we call it from here */
1680/* because it is convenient - but it hasn't been declared yet for that reason */
1483static int 1681static void
1682coro_call_on_destroy (pTHX_ struct coro *coro);
1683
1684static void
1484coro_state_destroy (pTHX_ struct coro *coro) 1685coro_state_destroy (pTHX_ struct coro *coro)
1485{ 1686{
1486 if (coro->flags & CF_DESTROYED) 1687 if (coro->flags & CF_ZOMBIE)
1487 return 0; 1688 return;
1488 1689
1489 if (coro->on_destroy)
1490 coro->on_destroy (aTHX_ coro); 1690 slf_destroy (aTHX_ coro);
1491 1691
1492 coro->flags |= CF_DESTROYED; 1692 coro->flags |= CF_ZOMBIE;
1493 1693
1494 if (coro->flags & CF_READY) 1694 if (coro->flags & CF_READY)
1495 { 1695 {
1496 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1696 /* reduce nready, as destroying a ready coro effectively unreadies it */
1497 /* alternative: look through all ready queues and remove the coro */ 1697 /* alternative: look through all ready queues and remove the coro */
1498 --coro_nready; 1698 --coro_nready;
1499 } 1699 }
1500 else 1700 else
1501 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1701 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1702
1703 if (coro->next) coro->next->prev = coro->prev;
1704 if (coro->prev) coro->prev->next = coro->next;
1705 if (coro == coro_first) coro_first = coro->next;
1502 1706
1503 if (coro->mainstack 1707 if (coro->mainstack
1504 && coro->mainstack != main_mainstack 1708 && coro->mainstack != main_mainstack
1505 && coro->slot 1709 && coro->slot
1506 && !PL_dirty) 1710 && !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); 1711 destroy_perl (aTHX_ coro);
1516
1517 load_perl (aTHX_ current);
1518
1519 coro->slot = 0;
1520 }
1521 1712
1522 cctx_destroy (coro->cctx); 1713 cctx_destroy (coro->cctx);
1523 SvREFCNT_dec (coro->startcv); 1714 SvREFCNT_dec (coro->startcv);
1524 SvREFCNT_dec (coro->args); 1715 SvREFCNT_dec (coro->args);
1716 SvREFCNT_dec (coro->swap_sv);
1525 SvREFCNT_dec (CORO_THROW); 1717 SvREFCNT_dec (CORO_THROW);
1526 1718
1527 if (coro->next) coro->next->prev = coro->prev; 1719 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 1720
1531 return 1; 1721 /* more destruction mayhem in coro_state_free */
1532} 1722}
1533 1723
1534static int 1724static int
1535coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1725coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1536{ 1726{
1537 struct coro *coro = (struct coro *)mg->mg_ptr; 1727 struct coro *coro = (struct coro *)mg->mg_ptr;
1538 mg->mg_ptr = 0; 1728 mg->mg_ptr = 0;
1539 1729
1540 coro->hv = 0;
1541
1542 if (--coro->refcnt < 0)
1543 {
1544 coro_state_destroy (aTHX_ coro); 1730 coro_state_destroy (aTHX_ coro);
1731 SvREFCNT_dec (coro->on_destroy);
1732 SvREFCNT_dec (coro->status);
1733
1545 Safefree (coro); 1734 Safefree (coro);
1546 }
1547 1735
1548 return 0; 1736 return 0;
1549} 1737}
1550 1738
1551static int 1739static int ecb_cold
1552coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1740coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1553{ 1741{
1554 struct coro *coro = (struct coro *)mg->mg_ptr; 1742 /* called when perl clones the current process the slow way (windows process emulation) */
1555 1743 /* WE SIMply nuke the pointers in the copy, causing perl to croak */
1556 ++coro->refcnt; 1744 mg->mg_ptr = 0;
1745 mg->mg_virtual = 0;
1557 1746
1558 return 0; 1747 return 0;
1559} 1748}
1560 1749
1561static MGVTBL coro_state_vtbl = { 1750static MGVTBL coro_state_vtbl = {
… …
1584 1773
1585 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1774 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1586 TRANSFER (ta, 1); 1775 TRANSFER (ta, 1);
1587} 1776}
1588 1777
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 ********************************************************************/ 1778/** Coro ********************************************************************/
1613 1779
1614INLINE void 1780ECB_INLINE void
1615coro_enq (pTHX_ struct coro *coro) 1781coro_enq (pTHX_ struct coro *coro)
1616{ 1782{
1617 av_push (coro_ready [coro->prio - PRIO_MIN], SvREFCNT_inc_NN (coro->hv)); 1783 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1618}
1619 1784
1620INLINE SV * 1785 SvREFCNT_inc_NN (coro->hv);
1786
1787 coro->next_ready = 0;
1788 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1789 ready [1] = coro;
1790}
1791
1792ECB_INLINE struct coro *
1621coro_deq (pTHX) 1793coro_deq (pTHX)
1622{ 1794{
1623 int prio; 1795 int prio;
1624 1796
1625 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; ) 1797 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
1626 if (AvFILLp (coro_ready [prio]) >= 0) 1798 {
1627 return av_shift (coro_ready [prio]); 1799 struct coro **ready = coro_ready [prio];
1800
1801 if (ready [0])
1802 {
1803 struct coro *coro = ready [0];
1804 ready [0] = coro->next_ready;
1805 return coro;
1806 }
1807 }
1628 1808
1629 return 0; 1809 return 0;
1810}
1811
1812static void
1813invoke_sv_ready_hook_helper (void)
1814{
1815 dTHX;
1816 dSP;
1817
1818 ENTER;
1819 SAVETMPS;
1820
1821 PUSHMARK (SP);
1822 PUTBACK;
1823 call_sv (coro_readyhook, G_VOID | G_DISCARD);
1824
1825 FREETMPS;
1826 LEAVE;
1630} 1827}
1631 1828
1632static int 1829static int
1633api_ready (pTHX_ SV *coro_sv) 1830api_ready (pTHX_ SV *coro_sv)
1634{ 1831{
1635 struct coro *coro;
1636 SV *sv_hook;
1637 void (*xs_hook)(void);
1638
1639 coro = SvSTATE (coro_sv); 1832 struct coro *coro = SvSTATE (coro_sv);
1640 1833
1641 if (coro->flags & CF_READY) 1834 if (coro->flags & CF_READY)
1642 return 0; 1835 return 0;
1643 1836
1644 coro->flags |= CF_READY; 1837 coro->flags |= CF_READY;
1645 1838
1646 sv_hook = coro_nready ? 0 : coro_readyhook;
1647 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1648
1649 coro_enq (aTHX_ coro); 1839 coro_enq (aTHX_ coro);
1650 ++coro_nready;
1651 1840
1652 if (sv_hook) 1841 if (!coro_nready++)
1653 { 1842 if (coroapi.readyhook)
1654 dSP; 1843 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 1844
1670 return 1; 1845 return 1;
1671} 1846}
1672 1847
1673static int 1848static int
… …
1675{ 1850{
1676 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1851 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1677} 1852}
1678 1853
1679/* expects to own a reference to next->hv */ 1854/* expects to own a reference to next->hv */
1680INLINE void 1855ECB_INLINE void
1681prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1856prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1682{ 1857{
1683 SV *prev_sv = SvRV (coro_current); 1858 SV *prev_sv = SvRV (coro_current);
1684 1859
1685 ta->prev = SvSTATE_hv (prev_sv); 1860 ta->prev = SvSTATE_hv (prev_sv);
… …
1696static void 1871static void
1697prepare_schedule (pTHX_ struct coro_transfer_args *ta) 1872prepare_schedule (pTHX_ struct coro_transfer_args *ta)
1698{ 1873{
1699 for (;;) 1874 for (;;)
1700 { 1875 {
1701 SV *next_sv = coro_deq (aTHX); 1876 struct coro *next = coro_deq (aTHX);
1702 1877
1703 if (expect_true (next_sv)) 1878 if (ecb_expect_true (next))
1704 { 1879 {
1705 struct coro *next = SvSTATE_hv (next_sv);
1706
1707 /* cannot transfer to destroyed coros, skip and look for next */ 1880 /* cannot transfer to destroyed coros, skip and look for next */
1708 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED))) 1881 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 */ 1882 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1710 else 1883 else
1711 { 1884 {
1712 next->flags &= ~CF_READY; 1885 next->flags &= ~CF_READY;
1713 --coro_nready; 1886 --coro_nready;
1714 1887
… …
1720 { 1893 {
1721 /* nothing to schedule: call the idle handler */ 1894 /* nothing to schedule: call the idle handler */
1722 if (SvROK (sv_idle) 1895 if (SvROK (sv_idle)
1723 && SvOBJECT (SvRV (sv_idle))) 1896 && SvOBJECT (SvRV (sv_idle)))
1724 { 1897 {
1898 if (SvRV (sv_idle) == SvRV (coro_current))
1899 croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught");
1900
1725 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 1901 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1726 api_ready (aTHX_ SvRV (sv_idle)); 1902 api_ready (aTHX_ SvRV (sv_idle));
1727 --coro_nready; 1903 --coro_nready;
1728 } 1904 }
1729 else 1905 else
1730 { 1906 {
1907 /* TODO: deprecated, remove, cannot work reliably *//*D*/
1731 dSP; 1908 dSP;
1732 1909
1733 ENTER; 1910 ENTER;
1734 SAVETMPS; 1911 SAVETMPS;
1735 1912
… …
1742 } 1919 }
1743 } 1920 }
1744 } 1921 }
1745} 1922}
1746 1923
1747INLINE void 1924ECB_INLINE void
1748prepare_cede (pTHX_ struct coro_transfer_args *ta) 1925prepare_cede (pTHX_ struct coro_transfer_args *ta)
1749{ 1926{
1750 api_ready (aTHX_ coro_current); 1927 api_ready (aTHX_ coro_current);
1751 prepare_schedule (aTHX_ ta); 1928 prepare_schedule (aTHX_ ta);
1752} 1929}
1753 1930
1754INLINE void 1931ECB_INLINE void
1755prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 1932prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1756{ 1933{
1757 SV *prev = SvRV (coro_current); 1934 SV *prev = SvRV (coro_current);
1758 1935
1759 if (coro_nready) 1936 if (coro_nready)
… …
1789{ 1966{
1790 struct coro_transfer_args ta; 1967 struct coro_transfer_args ta;
1791 1968
1792 prepare_cede (aTHX_ &ta); 1969 prepare_cede (aTHX_ &ta);
1793 1970
1794 if (expect_true (ta.prev != ta.next)) 1971 if (ecb_expect_true (ta.prev != ta.next))
1795 { 1972 {
1796 TRANSFER (ta, 1); 1973 TRANSFER (ta, 1);
1797 return 1; 1974 return 1;
1798 } 1975 }
1799 else 1976 else
… …
1842 coro->slot->runops = RUNOPS_DEFAULT; 2019 coro->slot->runops = RUNOPS_DEFAULT;
1843 } 2020 }
1844} 2021}
1845 2022
1846static void 2023static void
2024coro_push_av (pTHX_ AV *av, I32 gimme_v)
2025{
2026 if (AvFILLp (av) >= 0 && gimme_v != G_VOID)
2027 {
2028 dSP;
2029
2030 if (gimme_v == G_SCALAR)
2031 XPUSHs (AvARRAY (av)[AvFILLp (av)]);
2032 else
2033 {
2034 int i;
2035 EXTEND (SP, AvFILLp (av) + 1);
2036
2037 for (i = 0; i <= AvFILLp (av); ++i)
2038 PUSHs (AvARRAY (av)[i]);
2039 }
2040
2041 PUTBACK;
2042 }
2043}
2044
2045static void
2046coro_push_on_destroy (pTHX_ struct coro *coro, SV *cb)
2047{
2048 if (!coro->on_destroy)
2049 coro->on_destroy = newAV ();
2050
2051 av_push (coro->on_destroy, cb);
2052}
2053
2054static void
2055slf_destroy_join (pTHX_ struct CoroSLF *frame)
2056{
2057 SvREFCNT_dec ((SV *)((struct coro *)frame->data)->hv);
2058}
2059
2060static int
2061slf_check_join (pTHX_ struct CoroSLF *frame)
2062{
2063 struct coro *coro = (struct coro *)frame->data;
2064
2065 if (!coro->status)
2066 return 1;
2067
2068 frame->destroy = 0;
2069
2070 coro_push_av (aTHX_ coro->status, GIMME_V);
2071
2072 SvREFCNT_dec ((SV *)coro->hv);
2073
2074 return 0;
2075}
2076
2077static void
2078slf_init_join (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2079{
2080 struct coro *coro = SvSTATE (items > 0 ? arg [0] : &PL_sv_undef);
2081
2082 if (items > 1)
2083 croak ("join called with too many arguments");
2084
2085 if (coro->status)
2086 frame->prepare = prepare_nop;
2087 else
2088 {
2089 coro_push_on_destroy (aTHX_ coro, SvREFCNT_inc_NN (SvRV (coro_current)));
2090 frame->prepare = prepare_schedule;
2091 }
2092
2093 frame->check = slf_check_join;
2094 frame->destroy = slf_destroy_join;
2095 frame->data = (void *)coro;
2096 SvREFCNT_inc (coro->hv);
2097}
2098
2099static void
1847coro_call_on_destroy (pTHX_ struct coro *coro) 2100coro_call_on_destroy (pTHX_ struct coro *coro)
1848{ 2101{
1849 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2102 AV *od = coro->on_destroy;
1850 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1851 2103
1852 if (on_destroyp) 2104 if (!od)
1853 { 2105 return;
1854 AV *on_destroy = (AV *)SvRV (*on_destroyp);
1855 2106
1856 while (AvFILLp (on_destroy) >= 0) 2107 while (AvFILLp (od) >= 0)
2108 {
2109 SV *cb = sv_2mortal (av_pop (od));
2110
2111 /* coro hv's (and only hv's at the moment) are supported as well */
2112 if (SvSTATEhv_p (aTHX_ cb))
2113 api_ready (aTHX_ cb);
2114 else
1857 { 2115 {
1858 dSP; /* don't disturb outer sp */ 2116 dSP; /* don't disturb outer sp */
1859 SV *cb = av_pop (on_destroy);
1860
1861 PUSHMARK (SP); 2117 PUSHMARK (SP);
1862 2118
1863 if (statusp) 2119 if (coro->status)
1864 { 2120 {
1865 int i; 2121 PUTBACK;
1866 AV *status = (AV *)SvRV (*statusp); 2122 coro_push_av (aTHX_ coro->status, G_ARRAY);
1867 EXTEND (SP, AvFILLp (status) + 1); 2123 SPAGAIN;
1868
1869 for (i = 0; i <= AvFILLp (status); ++i)
1870 PUSHs (AvARRAY (status)[i]);
1871 } 2124 }
1872 2125
1873 PUTBACK; 2126 PUTBACK;
1874 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD); 2127 call_sv (cb, G_VOID | G_DISCARD);
1875 } 2128 }
1876 } 2129 }
1877} 2130}
1878 2131
1879static void 2132static void
1880slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2133coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
1881{ 2134{
2135 AV *av;
2136
2137 if (coro->status)
2138 {
2139 av = coro->status;
2140 av_clear (av);
2141 }
2142 else
2143 av = coro->status = newAV ();
2144
2145 /* items are actually not so common, so optimise for this case */
2146 if (items)
2147 {
1882 int i; 2148 int i;
1883 HV *hv = (HV *)SvRV (coro_current);
1884 AV *av = newAV ();
1885 2149
1886 av_extend (av, items - 1); 2150 av_extend (av, items - 1);
2151
1887 for (i = 0; i < items; ++i) 2152 for (i = 0; i < items; ++i)
1888 av_push (av, SvREFCNT_inc_NN (arg [i])); 2153 av_push (av, SvREFCNT_inc_NN (arg [i]));
2154 }
2155}
1889 2156
1890 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 2157static void
1891 2158slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2159{
1892 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */ 2160 av_push (av_destroy, (SV *)newRV_inc ((SV *)coro_hv)); /* RVinc for perl */
1893 api_ready (aTHX_ sv_manager); 2161 api_ready (aTHX_ sv_manager);
1894 2162
1895 frame->prepare = prepare_schedule; 2163 frame->prepare = prepare_schedule;
1896 frame->check = slf_check_repeat; 2164 frame->check = slf_check_repeat;
1897 2165
1898 /* as a minor optimisation, we could unwind all stacks here */ 2166 /* as a minor optimisation, we could unwind all stacks here */
1899 /* but that puts extra pressure on pp_slf, and is not worth much */ 2167 /* but that puts extra pressure on pp_slf, and is not worth much */
1900 /*coro_unwind_stacks (aTHX);*/ 2168 /*coro_unwind_stacks (aTHX);*/
2169}
2170
2171static void
2172slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2173{
2174 HV *coro_hv = (HV *)SvRV (coro_current);
2175
2176 coro_set_status (aTHX_ SvSTATE ((SV *)coro_hv), arg, items);
2177 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2178}
2179
2180static void
2181slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2182{
2183 HV *coro_hv;
2184 struct coro *coro;
2185
2186 if (items <= 0)
2187 croak ("Coro::cancel called without coro object,");
2188
2189 coro = SvSTATE (arg [0]);
2190 coro_hv = coro->hv;
2191
2192 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2193
2194 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2195 {
2196 /* coro currently busy cancelling something, so just notify it */
2197 coro->slf_frame.data = (void *)coro;
2198
2199 frame->prepare = prepare_nop;
2200 frame->check = slf_check_nop;
2201 }
2202 else if (coro_hv == (HV *)SvRV (coro_current))
2203 {
2204 /* cancelling the current coro is allowed, and equals terminate */
2205 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2206 }
2207 else
2208 {
2209 struct coro *self = SvSTATE_current;
2210
2211 /* otherwise we cancel directly, purely for speed reasons
2212 * unfortunately, this requires some magic trickery, as
2213 * somebody else could cancel us, so we have to fight the cancellation.
2214 * this is ugly, and hopefully fully worth the extra speed.
2215 * besides, I can't get the slow-but-safe version working...
2216 */
2217 slf_frame.data = 0;
2218 self->flags |= CF_NOCANCEL;
2219 coro_state_destroy (aTHX_ coro);
2220 self->flags &= ~CF_NOCANCEL;
2221
2222 if (slf_frame.data)
2223 {
2224 /* while we were busy we have been cancelled, so terminate */
2225 slf_init_terminate_cancel_common (aTHX_ frame, self->hv);
2226 }
2227 else
2228 {
2229 frame->prepare = prepare_nop;
2230 frame->check = slf_check_nop;
2231 }
2232 }
2233}
2234
2235static int
2236slf_check_safe_cancel (pTHX_ struct CoroSLF *frame)
2237{
2238 frame->prepare = 0;
2239 coro_unwind_stacks (aTHX);
2240
2241 slf_init_terminate_cancel_common (aTHX_ frame, (HV *)SvRV (coro_current));
2242
2243 return 1;
2244}
2245
2246static int
2247safe_cancel (pTHX_ struct coro *coro, SV **arg, int items)
2248{
2249 if (coro->cctx)
2250 croak ("coro inside C callback, unable to cancel at this time, caught");
2251
2252 if (coro->flags & CF_NEW)
2253 {
2254 coro_set_status (aTHX_ coro, arg, items);
2255 coro_state_destroy (aTHX_ coro);
2256 }
2257 else
2258 {
2259 if (!coro->slf_frame.prepare)
2260 croak ("coro outside an SLF function, unable to cancel at this time, caught");
2261
2262 slf_destroy (aTHX_ coro);
2263
2264 coro_set_status (aTHX_ coro, arg, items);
2265 coro->slf_frame.prepare = prepare_nop;
2266 coro->slf_frame.check = slf_check_safe_cancel;
2267
2268 api_ready (aTHX_ (SV *)coro->hv);
2269 }
2270
2271 return 1;
1901} 2272}
1902 2273
1903/*****************************************************************************/ 2274/*****************************************************************************/
1904/* async pool handler */ 2275/* async pool handler */
1905 2276
… …
1936slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2307slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1937{ 2308{
1938 HV *hv = (HV *)SvRV (coro_current); 2309 HV *hv = (HV *)SvRV (coro_current);
1939 struct coro *coro = SvSTATE_hv ((SV *)hv); 2310 struct coro *coro = SvSTATE_hv ((SV *)hv);
1940 2311
1941 if (expect_true (coro->saved_deffh)) 2312 if (ecb_expect_true (coro->saved_deffh))
1942 { 2313 {
1943 /* subsequent iteration */ 2314 /* subsequent iteration */
1944 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2315 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1945 coro->saved_deffh = 0; 2316 coro->saved_deffh = 0;
1946 2317
1947 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 2318 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
1948 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2319 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1949 { 2320 {
1950 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate); 2321 slf_init_terminate_cancel_common (aTHX_ frame, hv);
1951 coro->invoke_av = newAV (); 2322 return;
1952
1953 frame->prepare = prepare_nop;
1954 } 2323 }
1955 else 2324 else
1956 { 2325 {
1957 av_clear (GvAV (PL_defgv)); 2326 av_clear (GvAV (PL_defgv));
1958 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2327 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
… …
1983 2352
1984static void 2353static void
1985coro_rouse_callback (pTHX_ CV *cv) 2354coro_rouse_callback (pTHX_ CV *cv)
1986{ 2355{
1987 dXSARGS; 2356 dXSARGS;
1988 SV *data = (SV *)GENSUB_ARG; 2357 SV *data = (SV *)S_GENSUB_ARG;
1989 2358
1990 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2359 if (SvTYPE (SvRV (data)) != SVt_PVAV)
1991 { 2360 {
1992 /* first call, set args */ 2361 /* first call, set args */
2362 SV *coro = SvRV (data);
1993 AV *av = newAV (); 2363 AV *av = newAV ();
1994 SV *coro = SvRV (data);
1995 2364
1996 SvRV_set (data, (SV *)av); 2365 SvRV_set (data, (SV *)av);
1997 api_ready (aTHX_ coro);
1998 SvREFCNT_dec (coro);
1999 2366
2000 /* better take a full copy of the arguments */ 2367 /* better take a full copy of the arguments */
2001 while (items--) 2368 while (items--)
2002 av_store (av, items, newSVsv (ST (items))); 2369 av_store (av, items, newSVsv (ST (items)));
2370
2371 api_ready (aTHX_ coro);
2372 SvREFCNT_dec (coro);
2003 } 2373 }
2004 2374
2005 XSRETURN_EMPTY; 2375 XSRETURN_EMPTY;
2006} 2376}
2007 2377
… …
2024 2394
2025 EXTEND (SP, AvFILLp (av) + 1); 2395 EXTEND (SP, AvFILLp (av) + 1);
2026 for (i = 0; i <= AvFILLp (av); ++i) 2396 for (i = 0; i <= AvFILLp (av); ++i)
2027 PUSHs (sv_2mortal (AvARRAY (av)[i])); 2397 PUSHs (sv_2mortal (AvARRAY (av)[i]));
2028 2398
2029 /* we have stolen the elements, so ste length to zero and free */ 2399 /* we have stolen the elements, so set length to zero and free */
2030 AvFILLp (av) = -1; 2400 AvFILLp (av) = -1;
2031 av_undef (av); 2401 av_undef (av);
2032 2402
2033 PUTBACK; 2403 PUTBACK;
2034 } 2404 }
… …
2058 || SvTYPE (SvRV (cb)) != SVt_PVCV 2428 || SvTYPE (SvRV (cb)) != SVt_PVCV
2059 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2429 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2060 croak ("Coro::rouse_wait called with illegal callback argument,"); 2430 croak ("Coro::rouse_wait called with illegal callback argument,");
2061 2431
2062 { 2432 {
2063 CV *cv = (CV *)SvRV (cb); /* for GENSUB_ARG */ 2433 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
2064 SV *data = (SV *)GENSUB_ARG; 2434 SV *data = (SV *)S_GENSUB_ARG;
2065 2435
2066 frame->data = (void *)data; 2436 frame->data = (void *)data;
2067 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule; 2437 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
2068 frame->check = slf_check_rouse_wait; 2438 frame->check = slf_check_rouse_wait;
2069 } 2439 }
… …
2073coro_new_rouse_cb (pTHX) 2443coro_new_rouse_cb (pTHX)
2074{ 2444{
2075 HV *hv = (HV *)SvRV (coro_current); 2445 HV *hv = (HV *)SvRV (coro_current);
2076 struct coro *coro = SvSTATE_hv (hv); 2446 struct coro *coro = SvSTATE_hv (hv);
2077 SV *data = newRV_inc ((SV *)hv); 2447 SV *data = newRV_inc ((SV *)hv);
2078 SV *cb = gensub (aTHX_ coro_rouse_callback, (void *)data); 2448 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
2079 2449
2080 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0); 2450 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0);
2081 SvREFCNT_dec (data); /* magicext increases the refcount */ 2451 SvREFCNT_dec (data); /* magicext increases the refcount */
2082 2452
2083 SvREFCNT_dec (coro->rouse_cb); 2453 SvREFCNT_dec (coro->rouse_cb);
… …
2180static void 2550static void
2181slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2551slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2182{ 2552{
2183 frame->prepare = prepare_cede_notself; 2553 frame->prepare = prepare_cede_notself;
2184 frame->check = slf_check_nop; 2554 frame->check = slf_check_nop;
2555}
2556
2557/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2558static void
2559slf_destroy (pTHX_ struct coro *coro)
2560{
2561 /* this callback is reserved for slf functions needing to do cleanup */
2562 if (coro->slf_frame.destroy && coro->slf_frame.prepare && !PL_dirty)
2563 coro->slf_frame.destroy (aTHX_ &coro->slf_frame);
2564
2565 /*
2566 * The on_destroy above most likely is from an SLF call.
2567 * Since by definition the SLF call will not finish when we destroy
2568 * the coro, we will have to force-finish it here, otherwise
2569 * cleanup functions cannot call SLF functions.
2570 */
2571 coro->slf_frame.prepare = 0;
2185} 2572}
2186 2573
2187/* 2574/*
2188 * these not obviously related functions are all rolled into one 2575 * these not obviously related functions are all rolled into one
2189 * function to increase chances that they all will call transfer with the same 2576 * 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 */ 2583 I32 checkmark; /* mark SP to see how many elements check has pushed */
2197 2584
2198 /* set up the slf frame, unless it has already been set-up */ 2585 /* set up the slf frame, unless it has already been set-up */
2199 /* the latter happens when a new coro has been started */ 2586 /* the latter happens when a new coro has been started */
2200 /* or when a new cctx was attached to an existing coroutine */ 2587 /* or when a new cctx was attached to an existing coroutine */
2201 if (expect_true (!slf_frame.prepare)) 2588 if (ecb_expect_true (!slf_frame.prepare))
2202 { 2589 {
2203 /* first iteration */ 2590 /* first iteration */
2204 dSP; 2591 dSP;
2205 SV **arg = PL_stack_base + TOPMARK + 1; 2592 SV **arg = PL_stack_base + TOPMARK + 1;
2206 int items = SP - arg; /* args without function object */ 2593 int items = SP - arg; /* args without function object */
… …
2247 while (slf_frame.check (aTHX_ &slf_frame)); 2634 while (slf_frame.check (aTHX_ &slf_frame));
2248 2635
2249 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */ 2636 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */
2250 2637
2251 /* exception handling */ 2638 /* exception handling */
2252 if (expect_false (CORO_THROW)) 2639 if (ecb_expect_false (CORO_THROW))
2253 { 2640 {
2254 SV *exception = sv_2mortal (CORO_THROW); 2641 SV *exception = sv_2mortal (CORO_THROW);
2255 2642
2256 CORO_THROW = 0; 2643 CORO_THROW = 0;
2257 sv_setsv (ERRSV, exception); 2644 sv_setsv (ERRSV, exception);
2258 croak (0); 2645 croak (0);
2259 } 2646 }
2260 2647
2261 /* return value handling - mostly like entersub */ 2648 /* return value handling - mostly like entersub */
2262 /* make sure we put something on the stack in scalar context */ 2649 /* make sure we put something on the stack in scalar context */
2263 if (GIMME_V == G_SCALAR) 2650 if (GIMME_V == G_SCALAR
2651 && ecb_expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2264 { 2652 {
2265 dSP; 2653 dSP;
2266 SV **bot = PL_stack_base + checkmark; 2654 SV **bot = PL_stack_base + checkmark;
2267 2655
2268 if (sp == bot) /* too few, push undef */ 2656 if (sp == bot) /* too few, push undef */
2269 bot [1] = &PL_sv_undef; 2657 bot [1] = &PL_sv_undef;
2270 else if (sp != bot + 1) /* too many, take last one */ 2658 else /* too many, take last one */
2271 bot [1] = *sp; 2659 bot [1] = *sp;
2272 2660
2273 SP = bot + 1; 2661 SP = bot + 1;
2274 2662
2275 PUTBACK; 2663 PUTBACK;
… …
2308 if (PL_op->op_flags & OPf_STACKED) 2696 if (PL_op->op_flags & OPf_STACKED)
2309 { 2697 {
2310 if (items > slf_arga) 2698 if (items > slf_arga)
2311 { 2699 {
2312 slf_arga = items; 2700 slf_arga = items;
2313 free (slf_argv); 2701 Safefree (slf_argv);
2314 slf_argv = malloc (slf_arga * sizeof (SV *)); 2702 New (0, slf_argv, slf_arga, SV *);
2315 } 2703 }
2316 2704
2317 slf_argc = items; 2705 slf_argc = items;
2318 2706
2319 for (i = 0; i < items; ++i) 2707 for (i = 0; i < items; ++i)
… …
2382{ 2770{
2383 PerlIOBuf base; 2771 PerlIOBuf base;
2384 NV next, every; 2772 NV next, every;
2385} PerlIOCede; 2773} PerlIOCede;
2386 2774
2387static IV 2775static IV ecb_cold
2388PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab) 2776PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab)
2389{ 2777{
2390 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2778 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2391 2779
2392 self->every = SvCUR (arg) ? SvNV (arg) : 0.01; 2780 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
2393 self->next = nvtime () + self->every; 2781 self->next = nvtime () + self->every;
2394 2782
2395 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab); 2783 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
2396} 2784}
2397 2785
2398static SV * 2786static SV * ecb_cold
2399PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags) 2787PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
2400{ 2788{
2401 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2789 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2402 2790
2403 return newSVnv (self->every); 2791 return newSVnv (self->every);
… …
2454/* Coro::Semaphore & Coro::Signal */ 2842/* Coro::Semaphore & Coro::Signal */
2455 2843
2456static SV * 2844static SV *
2457coro_waitarray_new (pTHX_ int count) 2845coro_waitarray_new (pTHX_ int count)
2458{ 2846{
2459 /* a semaphore contains a counter IV in $sem->[0] and any waiters after that */ 2847 /* a waitarray=semaphore contains a counter IV in $sem->[0] and any waiters after that */
2460 AV *av = newAV (); 2848 AV *av = newAV ();
2461 SV **ary; 2849 SV **ary;
2462 2850
2463 /* unfortunately, building manually saves memory */ 2851 /* unfortunately, building manually saves memory */
2464 Newx (ary, 2, SV *); 2852 Newx (ary, 2, SV *);
… …
2515 SvREFCNT_dec (cb); 2903 SvREFCNT_dec (cb);
2516 } 2904 }
2517} 2905}
2518 2906
2519static void 2907static void
2520coro_semaphore_on_destroy (pTHX_ struct coro *coro) 2908coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2521{ 2909{
2522 /* call $sem->adjust (0) to possibly wake up some other waiters */ 2910 /* call $sem->adjust (0) to possibly wake up some other waiters */
2523 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 2911 coro_semaphore_adjust (aTHX_ (AV *)frame->data, 0);
2524} 2912}
2525 2913
2526static int 2914static int
2527slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire) 2915slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2528{ 2916{
2529 AV *av = (AV *)frame->data; 2917 AV *av = (AV *)frame->data;
2530 SV *count_sv = AvARRAY (av)[0]; 2918 SV *count_sv = AvARRAY (av)[0];
2919 SV *coro_hv = SvRV (coro_current);
2531 2920
2532 /* if we are about to throw, don't actually acquire the lock, just throw */ 2921 /* if we are about to throw, don't actually acquire the lock, just throw */
2533 if (CORO_THROW) 2922 if (CORO_THROW)
2534 return 0; 2923 return 0;
2535 else if (SvIVX (count_sv) > 0) 2924 else if (SvIVX (count_sv) > 0)
2536 { 2925 {
2537 SvSTATE_current->on_destroy = 0; 2926 frame->destroy = 0;
2538 2927
2539 if (acquire) 2928 if (acquire)
2540 SvIVX (count_sv) = SvIVX (count_sv) - 1; 2929 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2541 else 2930 else
2542 coro_semaphore_adjust (aTHX_ av, 0); 2931 coro_semaphore_adjust (aTHX_ av, 0);
… …
2547 { 2936 {
2548 int i; 2937 int i;
2549 /* if we were woken up but can't down, we look through the whole */ 2938 /* 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 */ 2939 /* waiters list and only add us if we aren't in there already */
2551 /* this avoids some degenerate memory usage cases */ 2940 /* this avoids some degenerate memory usage cases */
2552 2941 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)) 2942 if (AvARRAY (av)[i] == coro_hv)
2555 return 1; 2943 return 1;
2556 2944
2557 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2945 av_push (av, SvREFCNT_inc (coro_hv));
2558 return 1; 2946 return 1;
2559 } 2947 }
2560} 2948}
2561 2949
2562static int 2950static int
… …
2585 { 2973 {
2586 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2974 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2587 2975
2588 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 2976 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2589 frame->prepare = prepare_schedule; 2977 frame->prepare = prepare_schedule;
2590
2591 /* to avoid race conditions when a woken-up coro gets terminated */ 2978 /* to avoid race conditions when a woken-up coro gets terminated */
2592 /* we arrange for a temporary on_destroy that calls adjust (0) */ 2979 /* we arrange for a temporary on_destroy that calls adjust (0) */
2593 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 2980 frame->destroy = coro_semaphore_destroy;
2594 } 2981 }
2595} 2982}
2596 2983
2597static void 2984static void
2598slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2985slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
… …
2606{ 2993{
2607 if (items >= 2) 2994 if (items >= 2)
2608 { 2995 {
2609 /* callback form */ 2996 /* callback form */
2610 AV *av = (AV *)SvRV (arg [0]); 2997 AV *av = (AV *)SvRV (arg [0]);
2611 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 2998 SV *cb_cv = s_get_cv_croak (arg [1]);
2612 2999
2613 av_push (av, (SV *)SvREFCNT_inc_NN (cb_cv)); 3000 av_push (av, SvREFCNT_inc_NN (cb_cv));
2614 3001
2615 if (SvIVX (AvARRAY (av)[0]) > 0) 3002 if (SvIVX (AvARRAY (av)[0]) > 0)
2616 coro_semaphore_adjust (aTHX_ av, 0); 3003 coro_semaphore_adjust (aTHX_ av, 0);
2617 3004
2618 frame->prepare = prepare_nop; 3005 frame->prepare = prepare_nop;
… …
2642 AvARRAY (av)[0] = AvARRAY (av)[1]; 3029 AvARRAY (av)[0] = AvARRAY (av)[1];
2643 AvARRAY (av)[1] = cb; 3030 AvARRAY (av)[1] = cb;
2644 3031
2645 cb = av_shift (av); 3032 cb = av_shift (av);
2646 3033
3034 if (SvTYPE (cb) == SVt_PVCV)
3035 {
3036 dSP;
3037 PUSHMARK (SP);
3038 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
3039 PUTBACK;
3040 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
3041 }
3042 else
3043 {
2647 api_ready (aTHX_ cb); 3044 api_ready (aTHX_ cb);
2648 sv_setiv (cb, 0); /* signal waiter */ 3045 sv_setiv (cb, 0); /* signal waiter */
3046 }
3047
2649 SvREFCNT_dec (cb); 3048 SvREFCNT_dec (cb);
2650 3049
2651 --count; 3050 --count;
2652 } 3051 }
2653} 3052}
… …
2662static void 3061static void
2663slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 3062slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2664{ 3063{
2665 AV *av = (AV *)SvRV (arg [0]); 3064 AV *av = (AV *)SvRV (arg [0]);
2666 3065
3066 if (items >= 2)
3067 {
3068 SV *cb_cv = s_get_cv_croak (arg [1]);
3069 av_push (av, SvREFCNT_inc_NN (cb_cv));
3070
2667 if (SvIVX (AvARRAY (av)[0])) 3071 if (SvIVX (AvARRAY (av)[0]))
3072 coro_signal_wake (aTHX_ av, 1); /* must be the only waiter */
3073
3074 frame->prepare = prepare_nop;
3075 frame->check = slf_check_nop;
3076 }
3077 else if (SvIVX (AvARRAY (av)[0]))
2668 { 3078 {
2669 SvIVX (AvARRAY (av)[0]) = 0; 3079 SvIVX (AvARRAY (av)[0]) = 0;
2670 frame->prepare = prepare_nop; 3080 frame->prepare = prepare_nop;
2671 frame->check = slf_check_nop; 3081 frame->check = slf_check_nop;
2672 } 3082 }
2673 else 3083 else
2674 { 3084 {
2675 SV *waiter = newRV_inc (SvRV (coro_current)); /* owned by signal av */ 3085 SV *waiter = newSVsv (coro_current); /* owned by signal av */
2676 3086
2677 av_push (av, waiter); 3087 av_push (av, waiter);
2678 3088
2679 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */ 3089 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */
2680 frame->prepare = prepare_schedule; 3090 frame->prepare = prepare_schedule;
… …
2698 3108
2699static void 3109static void
2700coro_aio_callback (pTHX_ CV *cv) 3110coro_aio_callback (pTHX_ CV *cv)
2701{ 3111{
2702 dXSARGS; 3112 dXSARGS;
2703 AV *state = (AV *)GENSUB_ARG; 3113 AV *state = (AV *)S_GENSUB_ARG;
2704 SV *coro = av_pop (state); 3114 SV *coro = av_pop (state);
2705 SV *data_sv = newSV (sizeof (struct io_state)); 3115 SV *data_sv = newSV (sizeof (struct io_state));
2706 3116
2707 av_extend (state, items - 1); 3117 av_extend (state, items - 1);
2708 3118
… …
2793 dSP; 3203 dSP;
2794 3204
2795 static SV *prio_cv; 3205 static SV *prio_cv;
2796 static SV *prio_sv; 3206 static SV *prio_sv;
2797 3207
2798 if (expect_false (!prio_cv)) 3208 if (ecb_expect_false (!prio_cv))
2799 { 3209 {
2800 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0); 3210 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0);
2801 prio_sv = newSViv (0); 3211 prio_sv = newSViv (0);
2802 } 3212 }
2803 3213
… …
2822 3232
2823 for (i = 0; i < items; ++i) 3233 for (i = 0; i < items; ++i)
2824 PUSHs (arg [i]); 3234 PUSHs (arg [i]);
2825 3235
2826 /* now push the callback closure */ 3236 /* now push the callback closure */
2827 PUSHs (sv_2mortal (gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state)))); 3237 PUSHs (sv_2mortal (s_gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state))));
2828 3238
2829 /* now call the AIO function - we assume our request is uncancelable */ 3239 /* now call the AIO function - we assume our request is uncancelable */
2830 PUTBACK; 3240 PUTBACK;
2831 call_sv ((SV *)req, G_VOID | G_DISCARD); 3241 call_sv ((SV *)req, G_VOID | G_DISCARD);
2832 } 3242 }
2833 3243
2834 /* now that the requets is going, we loop toll we have a result */ 3244 /* now that the request is going, we loop till we have a result */
2835 frame->data = (void *)state; 3245 frame->data = (void *)state;
2836 frame->prepare = prepare_schedule; 3246 frame->prepare = prepare_schedule;
2837 frame->check = slf_check_aio_req; 3247 frame->check = slf_check_aio_req;
2838} 3248}
2839 3249
… …
2849 3259
2850/*****************************************************************************/ 3260/*****************************************************************************/
2851 3261
2852#if CORO_CLONE 3262#if CORO_CLONE
2853# include "clone.c" 3263# include "clone.c"
3264#endif
3265
3266/*****************************************************************************/
3267
3268static SV *
3269coro_new (pTHX_ HV *stash, SV **argv, int argc, int is_coro)
3270{
3271 SV *coro_sv;
3272 struct coro *coro;
3273 MAGIC *mg;
3274 HV *hv;
3275 SV *cb;
3276 int i;
3277
3278 if (argc > 0)
3279 {
3280 cb = s_get_cv_croak (argv [0]);
3281
3282 if (!is_coro)
3283 {
3284 if (CvISXSUB (cb))
3285 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
3286
3287 if (!CvROOT (cb))
3288 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
3289 }
3290 }
3291
3292 Newz (0, coro, 1, struct coro);
3293 coro->args = newAV ();
3294 coro->flags = CF_NEW;
3295
3296 if (coro_first) coro_first->prev = coro;
3297 coro->next = coro_first;
3298 coro_first = coro;
3299
3300 coro->hv = hv = newHV ();
3301 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
3302 mg->mg_flags |= MGf_DUP;
3303 coro_sv = sv_bless (newRV_noinc ((SV *)hv), stash);
3304
3305 if (argc > 0)
3306 {
3307 av_extend (coro->args, argc + is_coro - 1);
3308
3309 if (is_coro)
3310 {
3311 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
3312 cb = (SV *)cv_coro_run;
3313 }
3314
3315 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3316
3317 for (i = 1; i < argc; i++)
3318 av_push (coro->args, newSVsv (argv [i]));
3319 }
3320
3321 return coro_sv;
3322}
3323
3324#ifndef __cplusplus
3325ecb_cold XS(boot_Coro__State);
2854#endif 3326#endif
2855 3327
2856MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3328MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2857 3329
2858PROTOTYPES: DISABLE 3330PROTOTYPES: DISABLE
… …
2912 coroapi.prepare_nop = prepare_nop; 3384 coroapi.prepare_nop = prepare_nop;
2913 coroapi.prepare_schedule = prepare_schedule; 3385 coroapi.prepare_schedule = prepare_schedule;
2914 coroapi.prepare_cede = prepare_cede; 3386 coroapi.prepare_cede = prepare_cede;
2915 coroapi.prepare_cede_notself = prepare_cede_notself; 3387 coroapi.prepare_cede_notself = prepare_cede_notself;
2916 3388
2917 { 3389 time_init (aTHX);
2918 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
2919 3390
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)); 3391 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
2927} 3392}
2928 3393
2929SV * 3394SV *
2930new (char *klass, ...) 3395new (SV *klass, ...)
2931 ALIAS: 3396 ALIAS:
2932 Coro::new = 1 3397 Coro::new = 1
2933 CODE: 3398 CODE:
2934{ 3399 RETVAL = coro_new (aTHX_ ix ? coro_stash : coro_state_stash, &ST (1), items - 1, ix);
2935 struct coro *coro; 3400 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 3401 RETVAL
2986 3402
2987void 3403void
2988transfer (...) 3404transfer (...)
2989 PROTOTYPE: $$ 3405 PROTOTYPE: $$
2990 CODE: 3406 CODE:
2991 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3407 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 3408
3000void 3409void
3001_exit (int code) 3410_exit (int code)
3002 PROTOTYPE: $ 3411 PROTOTYPE: $
3003 CODE: 3412 CODE:
… …
3079 CODE: 3488 CODE:
3080{ 3489{
3081 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3490 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
3082 { 3491 {
3083 struct coro *current = SvSTATE_current; 3492 struct coro *current = SvSTATE_current;
3493 struct CoroSLF slf_save;
3084 3494
3085 if (current != coro) 3495 if (current != coro)
3086 { 3496 {
3087 PUTBACK; 3497 PUTBACK;
3088 save_perl (aTHX_ current); 3498 save_perl (aTHX_ current);
3089 load_perl (aTHX_ coro); 3499 load_perl (aTHX_ coro);
3500 /* the coro is most likely in an active SLF call.
3501 * while not strictly required (the code we execute is
3502 * not allowed to call any SLF functions), it's cleaner
3503 * to reinitialise the slf_frame and restore it later.
3504 * This might one day allow us to actually do SLF calls
3505 * from code executed here.
3506 */
3507 slf_save = slf_frame;
3508 slf_frame.prepare = 0;
3090 SPAGAIN; 3509 SPAGAIN;
3091 } 3510 }
3092 3511
3093 PUSHSTACK; 3512 PUSHSTACK;
3094 3513
… …
3104 SPAGAIN; 3523 SPAGAIN;
3105 3524
3106 if (current != coro) 3525 if (current != coro)
3107 { 3526 {
3108 PUTBACK; 3527 PUTBACK;
3528 slf_frame = slf_save;
3109 save_perl (aTHX_ coro); 3529 save_perl (aTHX_ coro);
3110 load_perl (aTHX_ current); 3530 load_perl (aTHX_ current);
3111 SPAGAIN; 3531 SPAGAIN;
3112 } 3532 }
3113 } 3533 }
… …
3118 PROTOTYPE: $ 3538 PROTOTYPE: $
3119 ALIAS: 3539 ALIAS:
3120 is_ready = CF_READY 3540 is_ready = CF_READY
3121 is_running = CF_RUNNING 3541 is_running = CF_RUNNING
3122 is_new = CF_NEW 3542 is_new = CF_NEW
3123 is_destroyed = CF_DESTROYED 3543 is_destroyed = CF_ZOMBIE
3544 is_zombie = CF_ZOMBIE
3124 is_suspended = CF_SUSPENDED 3545 is_suspended = CF_SUSPENDED
3125 CODE: 3546 CODE:
3126 RETVAL = boolSV (coro->flags & ix); 3547 RETVAL = boolSV (coro->flags & ix);
3127 OUTPUT: 3548 OUTPUT:
3128 RETVAL 3549 RETVAL
3129 3550
3130void 3551void
3131throw (Coro::State self, SV *throw = &PL_sv_undef) 3552throw (Coro::State self, SV *exception = &PL_sv_undef)
3132 PROTOTYPE: $;$ 3553 PROTOTYPE: $;$
3133 CODE: 3554 CODE:
3134{ 3555{
3135 struct coro *current = SvSTATE_current; 3556 struct coro *current = SvSTATE_current;
3136 SV **throwp = self == current ? &CORO_THROW : &self->except; 3557 SV **exceptionp = self == current ? &CORO_THROW : &self->except;
3137 SvREFCNT_dec (*throwp); 3558 SvREFCNT_dec (*exceptionp);
3138 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3559 SvGETMAGIC (exception);
3560 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3139} 3561}
3140 3562
3141void 3563void
3142api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3564api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3143 PROTOTYPE: $;$ 3565 PROTOTYPE: $;$
… …
3198 3620
3199void 3621void
3200cancel (Coro::State self) 3622cancel (Coro::State self)
3201 CODE: 3623 CODE:
3202 coro_state_destroy (aTHX_ self); 3624 coro_state_destroy (aTHX_ self);
3203 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */ 3625
3626SV *
3627enable_times (int enabled = enable_times)
3628 CODE:
3629{
3630 RETVAL = boolSV (enable_times);
3631
3632 if (enabled != enable_times)
3633 {
3634 enable_times = enabled;
3635
3636 coro_times_update ();
3637 (enabled ? coro_times_sub : coro_times_add)(SvSTATE (coro_current));
3638 }
3639}
3640 OUTPUT:
3641 RETVAL
3642
3643void
3644times (Coro::State self)
3645 PPCODE:
3646{
3647 struct coro *current = SvSTATE (coro_current);
3648
3649 if (ecb_expect_false (current == self))
3650 {
3651 coro_times_update ();
3652 coro_times_add (SvSTATE (coro_current));
3653 }
3654
3655 EXTEND (SP, 2);
3656 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3657 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3658
3659 if (ecb_expect_false (current == self))
3660 coro_times_sub (SvSTATE (coro_current));
3661}
3662
3663void
3664swap_sv (Coro::State coro, SV *sv, SV *swapsv)
3665 CODE:
3666{
3667 struct coro *current = SvSTATE_current;
3668
3669 if (current == coro)
3670 SWAP_SVS (current);
3671
3672 if (!coro->swap_sv)
3673 coro->swap_sv = newAV ();
3674
3675 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv )));
3676 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv)));
3677
3678 if (current == coro)
3679 SWAP_SVS (current);
3680}
3204 3681
3205 3682
3206MODULE = Coro::State PACKAGE = Coro 3683MODULE = Coro::State PACKAGE = Coro
3207 3684
3208BOOT: 3685BOOT:
3209{ 3686{
3210 int i;
3211
3212 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3687 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3213 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3688 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3214 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 3689 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); 3690 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); 3691 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3218 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 3692 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3219 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 3693 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3220 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 3694 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3221 3695
3222 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3696 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); 3697 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); 3698 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); 3699 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3226 3700
3227 coro_stash = gv_stashpv ("Coro", TRUE); 3701 coro_stash = gv_stashpv ("Coro", TRUE);
3228 3702
3229 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 3703 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3230 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 3704 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3231 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 3705 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
3232 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 3706 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (CORO_PRIO_LOW));
3233 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE)); 3707 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (CORO_PRIO_IDLE));
3234 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN)); 3708 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 3709
3239 { 3710 {
3240 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 3711 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
3241 3712
3242 coroapi.schedule = api_schedule; 3713 coroapi.schedule = api_schedule;
… …
3252 sv_setiv (sv, (IV)&coroapi); 3723 sv_setiv (sv, (IV)&coroapi);
3253 SvREADONLY_on (sv); 3724 SvREADONLY_on (sv);
3254 } 3725 }
3255} 3726}
3256 3727
3728SV *
3729async (...)
3730 PROTOTYPE: &@
3731 CODE:
3732 RETVAL = coro_new (aTHX_ coro_stash, &ST (0), items, 1);
3733 api_ready (aTHX_ RETVAL);
3734 OUTPUT:
3735 RETVAL
3736
3737void
3738_destroy (Coro::State coro)
3739 CODE:
3740 /* used by the manager thread */
3741 coro_state_destroy (aTHX_ coro);
3742
3743void
3744on_destroy (Coro::State coro, SV *cb)
3745 CODE:
3746 coro_push_on_destroy (aTHX_ coro, newSVsv (cb));
3747
3748void
3749join (...)
3750 CODE:
3751 CORO_EXECUTE_SLF_XS (slf_init_join);
3752
3257void 3753void
3258terminate (...) 3754terminate (...)
3259 CODE: 3755 CODE:
3260 CORO_EXECUTE_SLF_XS (slf_init_terminate); 3756 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3757
3758void
3759cancel (...)
3760 CODE:
3761 CORO_EXECUTE_SLF_XS (slf_init_cancel);
3762
3763int
3764safe_cancel (Coro::State self, ...)
3765 C_ARGS: aTHX_ self, &ST (1), items - 1
3261 3766
3262void 3767void
3263schedule (...) 3768schedule (...)
3264 CODE: 3769 CODE:
3265 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3770 CORO_EXECUTE_SLF_XS (slf_init_schedule);
… …
3294void 3799void
3295_set_readyhook (SV *hook) 3800_set_readyhook (SV *hook)
3296 PROTOTYPE: $ 3801 PROTOTYPE: $
3297 CODE: 3802 CODE:
3298 SvREFCNT_dec (coro_readyhook); 3803 SvREFCNT_dec (coro_readyhook);
3804 SvGETMAGIC (hook);
3805 if (SvOK (hook))
3806 {
3299 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0; 3807 coro_readyhook = newSVsv (hook);
3808 CORO_READYHOOK = invoke_sv_ready_hook_helper;
3809 }
3810 else
3811 {
3812 coro_readyhook = 0;
3813 CORO_READYHOOK = 0;
3814 }
3300 3815
3301int 3816int
3302prio (Coro::State coro, int newprio = 0) 3817prio (Coro::State coro, int newprio = 0)
3303 PROTOTYPE: $;$ 3818 PROTOTYPE: $;$
3304 ALIAS: 3819 ALIAS:
… …
3310 if (items > 1) 3825 if (items > 1)
3311 { 3826 {
3312 if (ix) 3827 if (ix)
3313 newprio = coro->prio - newprio; 3828 newprio = coro->prio - newprio;
3314 3829
3315 if (newprio < PRIO_MIN) newprio = PRIO_MIN; 3830 if (newprio < CORO_PRIO_MIN) newprio = CORO_PRIO_MIN;
3316 if (newprio > PRIO_MAX) newprio = PRIO_MAX; 3831 if (newprio > CORO_PRIO_MAX) newprio = CORO_PRIO_MAX;
3317 3832
3318 coro->prio = newprio; 3833 coro->prio = newprio;
3319 } 3834 }
3320} 3835}
3321 OUTPUT: 3836 OUTPUT:
… …
3336 RETVAL = coro_nready; 3851 RETVAL = coro_nready;
3337 OUTPUT: 3852 OUTPUT:
3338 RETVAL 3853 RETVAL
3339 3854
3340void 3855void
3856suspend (Coro::State self)
3857 PROTOTYPE: $
3858 CODE:
3859 self->flags |= CF_SUSPENDED;
3860
3861void
3862resume (Coro::State self)
3863 PROTOTYPE: $
3864 CODE:
3865 self->flags &= ~CF_SUSPENDED;
3866
3867void
3341_pool_handler (...) 3868_pool_handler (...)
3342 CODE: 3869 CODE:
3343 CORO_EXECUTE_SLF_XS (slf_init_pool_handler); 3870 CORO_EXECUTE_SLF_XS (slf_init_pool_handler);
3344 3871
3345void 3872void
… …
3356 for (i = 1; i < items; ++i) 3883 for (i = 1; i < items; ++i)
3357 av_push (av, SvREFCNT_inc_NN (ST (i))); 3884 av_push (av, SvREFCNT_inc_NN (ST (i)));
3358 3885
3359 if ((SV *)hv == &PL_sv_undef) 3886 if ((SV *)hv == &PL_sv_undef)
3360 { 3887 {
3361 PUSHMARK (SP); 3888 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)); 3889 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
3890 SvREFCNT_dec (sv);
3370 } 3891 }
3371 3892
3372 { 3893 {
3373 struct coro *coro = SvSTATE_hv (hv); 3894 struct coro *coro = SvSTATE_hv (hv);
3374 3895
… …
3408 CODE: 3929 CODE:
3409{ 3930{
3410 struct coro *coro = SvSTATE_current; 3931 struct coro *coro = SvSTATE_current;
3411 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 3932 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3412 3933
3413 block = (SV *)coro_sv_2cv (aTHX_ block); 3934 block = s_get_cv_croak (block);
3414 3935
3415 if (!*avp) 3936 if (!*avp)
3416 *avp = newAV (); 3937 *avp = newAV ();
3417 3938
3418 av_push (*avp, SvREFCNT_inc (block)); 3939 av_push (*avp, SvREFCNT_inc (block));
3419 3940
3420 if (!ix) 3941 if (!ix)
3421 on_enterleave_call (aTHX_ block); 3942 on_enterleave_call (aTHX_ block);
3422 3943
3423 LEAVE; /* pp_entersub unfortunately forces an ENTER/LEAVE around xs calls */ 3944 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); 3945 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 */ 3946 ENTER; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
3426} 3947}
3427 3948
3428 3949
3429MODULE = Coro::State PACKAGE = PerlIO::cede 3950MODULE = Coro::State PACKAGE = PerlIO::cede
3430 3951
… …
3435MODULE = Coro::State PACKAGE = Coro::Semaphore 3956MODULE = Coro::State PACKAGE = Coro::Semaphore
3436 3957
3437SV * 3958SV *
3438new (SV *klass, SV *count = 0) 3959new (SV *klass, SV *count = 0)
3439 CODE: 3960 CODE:
3961{
3962 int semcnt = 1;
3963
3964 if (count)
3965 {
3966 SvGETMAGIC (count);
3967
3968 if (SvOK (count))
3969 semcnt = SvIV (count);
3970 }
3971
3440 RETVAL = sv_bless ( 3972 RETVAL = sv_bless (
3441 coro_waitarray_new (aTHX_ count && SvOK (count) ? SvIV (count) : 1), 3973 coro_waitarray_new (aTHX_ semcnt),
3442 GvSTASH (CvGV (cv)) 3974 GvSTASH (CvGV (cv))
3443 ); 3975 );
3976}
3444 OUTPUT: 3977 OUTPUT:
3445 RETVAL 3978 RETVAL
3446 3979
3447# helper for Coro::Channel 3980# helper for Coro::Channel and others
3448SV * 3981SV *
3449_alloc (int count) 3982_alloc (int count)
3450 CODE: 3983 CODE:
3451 RETVAL = coro_waitarray_new (aTHX_ count); 3984 RETVAL = coro_waitarray_new (aTHX_ count);
3452 OUTPUT: 3985 OUTPUT:
… …
3510 for (i = 1; i <= wcount; ++i) 4043 for (i = 1; i <= wcount; ++i)
3511 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i]))); 4044 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i])));
3512 } 4045 }
3513} 4046}
3514 4047
4048MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
4049
4050void
4051_may_delete (SV *sem, int count, int extra_refs)
4052 PPCODE:
4053{
4054 AV *av = (AV *)SvRV (sem);
4055
4056 if (SvREFCNT ((SV *)av) == 1 + extra_refs
4057 && AvFILLp (av) == 0 /* no waiters, just count */
4058 && SvIV (AvARRAY (av)[0]) == count)
4059 XSRETURN_YES;
4060
4061 XSRETURN_NO;
4062}
4063
3515MODULE = Coro::State PACKAGE = Coro::Signal 4064MODULE = Coro::State PACKAGE = Coro::Signal
3516 4065
3517SV * 4066SV *
3518new (SV *klass) 4067new (SV *klass)
3519 CODE: 4068 CODE:
… …
3590 4139
3591void 4140void
3592_register (char *target, char *proto, SV *req) 4141_register (char *target, char *proto, SV *req)
3593 CODE: 4142 CODE:
3594{ 4143{
3595 CV *req_cv = coro_sv_2cv (aTHX_ req); 4144 SV *req_cv = s_get_cv_croak (req);
3596 /* newXSproto doesn't return the CV on 5.8 */ 4145 /* newXSproto doesn't return the CV on 5.8 */
3597 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 4146 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3598 sv_setpv ((SV *)slf_cv, proto); 4147 sv_setpv ((SV *)slf_cv, proto);
3599 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0); 4148 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
3600} 4149}
3601 4150
4151MODULE = Coro::State PACKAGE = Coro::Select
4152
4153void
4154patch_pp_sselect ()
4155 CODE:
4156 if (!coro_old_pp_sselect)
4157 {
4158 coro_select_select = (SV *)get_cv ("Coro::Select::select", 0);
4159 coro_old_pp_sselect = PL_ppaddr [OP_SSELECT];
4160 PL_ppaddr [OP_SSELECT] = coro_pp_sselect;
4161 }
4162
4163void
4164unpatch_pp_sselect ()
4165 CODE:
4166 if (coro_old_pp_sselect)
4167 {
4168 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
4169 coro_old_pp_sselect = 0;
4170 }
4171

Diff Legend

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