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.337 by root, Fri Dec 5 18:26:10 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 */
202 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
203 CF_NOCANCEL = 0x0020, /* cannot cancel, set slf_frame.data to 1 (hackish) */
243}; 204};
244 205
245/* 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 */
246typedef struct 207typedef struct
247{ 208{
… …
253#define VAR(name,type) type name; 214#define VAR(name,type) type name;
254# include "state.h" 215# include "state.h"
255#undef VAR 216#undef VAR
256} perl_slots; 217} perl_slots;
257 218
219// how many context stack entries do we need for perl_slots
258#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT)) 220#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
259 221
260/* this is a structure representing a perl-level coroutine */ 222/* this is a structure representing a perl-level coroutine */
261struct coro { 223struct coro
224{
262 /* the C coroutine allocated to this perl coroutine, if any */ 225 /* the C coroutine allocated to this perl coroutine, if any */
263 coro_cctx *cctx; 226 coro_cctx *cctx;
227
228 /* ready queue */
229 struct coro *next_ready;
264 230
265 /* state data */ 231 /* state data */
266 struct CoroSLF slf_frame; /* saved slf frame */ 232 struct CoroSLF slf_frame; /* saved slf frame */
267 AV *mainstack; 233 AV *mainstack;
268 perl_slots *slot; /* basically the saved sp */ 234 perl_slots *slot; /* basically the saved sp */
269 235
270 CV *startcv; /* the CV to execute */ 236 CV *startcv; /* the CV to execute */
271 AV *args; /* data associated with this coroutine (initial args) */ 237 AV *args; /* data associated with this coroutine (initial args) */
272 int refcnt; /* coroutines are refcounted, yes */
273 int flags; /* CF_ flags */ 238 int flags; /* CF_ flags */
274 HV *hv; /* the perl hash associated with this coro, if any */ 239 HV *hv; /* the perl hash associated with this coro, if any */
275 void (*on_destroy)(pTHX_ struct coro *coro);
276 240
277 /* statistics */ 241 /* statistics */
278 int usecount; /* number of transfers to this coro */ 242 int usecount; /* number of transfers to this coro */
279 243
280 /* coro process data */ 244 /* coro process data */
281 int prio; 245 int prio;
282 SV *except; /* exception to be thrown */ 246 SV *except; /* exception to be thrown */
283 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 */
284 250
285 /* async_pool */ 251 /* async_pool */
286 SV *saved_deffh; 252 SV *saved_deffh;
287 SV *invoke_cb; 253 SV *invoke_cb;
288 AV *invoke_av; 254 AV *invoke_av;
289 255
256 /* on_enter/on_leave */
257 AV *on_enter;
258 AV *on_leave;
259
260 /* swap_sv */
261 AV *swap_sv;
262
263 /* times */
264 coro_ts t_cpu, t_real;
265
290 /* linked list */ 266 /* linked list */
291 struct coro *next, *prev; 267 struct coro *next, *prev;
292}; 268};
293 269
294typedef struct coro *Coro__State; 270typedef struct coro *Coro__State;
295typedef struct coro *Coro__State_or_hashref; 271typedef struct coro *Coro__State_or_hashref;
296 272
297/* the following variables are effectively part of the perl context */ 273/* the following variables are effectively part of the perl context */
298/* and get copied between struct coro and these variables */ 274/* and get copied between struct coro and these variables */
299/* the mainr easonw e don't support windows process emulation */ 275/* the main reason we don't support windows process emulation */
300static struct CoroSLF slf_frame; /* the current slf frame */ 276static struct CoroSLF slf_frame; /* the current slf frame */
301 277
302/** Coro ********************************************************************/ 278/** Coro ********************************************************************/
303 279
304#define PRIO_MAX 3 280#define CORO_PRIO_MAX 3
305#define PRIO_HIGH 1 281#define CORO_PRIO_HIGH 1
306#define PRIO_NORMAL 0 282#define CORO_PRIO_NORMAL 0
307#define PRIO_LOW -1 283#define CORO_PRIO_LOW -1
308#define PRIO_IDLE -3 284#define CORO_PRIO_IDLE -3
309#define PRIO_MIN -4 285#define CORO_PRIO_MIN -4
310 286
311/* for Coro.pm */ 287/* for Coro.pm */
312static SV *coro_current; 288static SV *coro_current;
313static SV *coro_readyhook; 289static SV *coro_readyhook;
314static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1]; 290static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
315static CV *cv_coro_run, *cv_coro_terminate; 291static CV *cv_coro_run;
316static struct coro *coro_first; 292static struct coro *coro_first;
317#define coro_nready coroapi.nready 293#define coro_nready coroapi.nready
318 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
319/** lowlevel stuff **********************************************************/ 367/** lowlevel stuff **********************************************************/
320 368
321static SV * 369static SV * ecb_noinline
322coro_get_sv (pTHX_ const char *name, int create) 370coro_get_sv (pTHX_ const char *name, int create)
323{ 371{
324#if PERL_VERSION_ATLEAST (5,10,0) 372#if PERL_VERSION_ATLEAST (5,10,0)
325 /* 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 */
326 get_sv (name, create); 374 get_sv (name, create);
327#endif 375#endif
328 return get_sv (name, create); 376 return get_sv (name, create);
329} 377}
330 378
331static AV * 379static AV * ecb_noinline
332coro_get_av (pTHX_ const char *name, int create) 380coro_get_av (pTHX_ const char *name, int create)
333{ 381{
334#if PERL_VERSION_ATLEAST (5,10,0) 382#if PERL_VERSION_ATLEAST (5,10,0)
335 /* 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 */
336 get_av (name, create); 384 get_av (name, create);
337#endif 385#endif
338 return get_av (name, create); 386 return get_av (name, create);
339} 387}
340 388
341static HV * 389static HV * ecb_noinline
342coro_get_hv (pTHX_ const char *name, int create) 390coro_get_hv (pTHX_ const char *name, int create)
343{ 391{
344#if PERL_VERSION_ATLEAST (5,10,0) 392#if PERL_VERSION_ATLEAST (5,10,0)
345 /* 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 */
346 get_hv (name, create); 394 get_hv (name, create);
347#endif 395#endif
348 return get_hv (name, create); 396 return get_hv (name, create);
349} 397}
350 398
351/* may croak */ 399ECB_INLINE void
352INLINE CV * 400coro_times_update ()
353coro_sv_2cv (pTHX_ SV *sv)
354{ 401{
355 HV *st; 402#ifdef coro_clock_gettime
356 GV *gvp; 403 struct timespec ts;
357 return sv_2cv (sv, &st, &gvp, 0); 404
405 ts.tv_sec = ts.tv_nsec = 0;
406 coro_clock_gettime (CORO_CLOCK_THREAD_CPUTIME_ID, &ts);
407 time_cpu [0] = ts.tv_sec; time_cpu [1] = ts.tv_nsec;
408
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];
358} 444}
359 445
360/*****************************************************************************/ 446/*****************************************************************************/
361/* magic glue */ 447/* magic glue */
362 448
363#define CORO_MAGIC_type_cv 26 449#define CORO_MAGIC_type_cv 26
364#define CORO_MAGIC_type_state PERL_MAGIC_ext 450#define CORO_MAGIC_type_state PERL_MAGIC_ext
365 451
366#define CORO_MAGIC_NN(sv, type) \ 452#define CORO_MAGIC_NN(sv, type) \
367 (expect_true (SvMAGIC (sv)->mg_type == type) \ 453 (ecb_expect_true (SvMAGIC (sv)->mg_type == type) \
368 ? SvMAGIC (sv) \ 454 ? SvMAGIC (sv) \
369 : mg_find (sv, type)) 455 : mg_find (sv, type))
370 456
371#define CORO_MAGIC(sv, type) \ 457#define CORO_MAGIC(sv, type) \
372 (expect_true (SvMAGIC (sv)) \ 458 (ecb_expect_true (SvMAGIC (sv)) \
373 ? CORO_MAGIC_NN (sv, type) \ 459 ? CORO_MAGIC_NN (sv, type) \
374 : 0) 460 : 0)
375 461
376#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)
377#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)
378 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
379INLINE struct coro * 480ECB_INLINE struct coro *
380SvSTATE_ (pTHX_ SV *coro) 481SvSTATE_ (pTHX_ SV *coro)
381{ 482{
382 HV *stash;
383 MAGIC *mg; 483 MAGIC *mg;
384 484
385 if (SvROK (coro)) 485 if (SvROK (coro))
386 coro = SvRV (coro); 486 coro = SvRV (coro);
387 487
388 if (expect_false (SvTYPE (coro) != SVt_PVHV)) 488 mg = SvSTATEhv_p (aTHX_ coro);
489 if (!mg)
389 croak ("Coro::State object required"); 490 croak ("Coro::State object required");
390 491
391 stash = SvSTASH (coro);
392 if (expect_false (stash != coro_stash && stash != coro_state_stash))
393 {
394 /* very slow, but rare, check */
395 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
396 croak ("Coro::State object required");
397 }
398
399 mg = CORO_MAGIC_state (coro);
400 return (struct coro *)mg->mg_ptr; 492 return (struct coro *)mg->mg_ptr;
401} 493}
402 494
403#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 495#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
404 496
… …
407#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 499#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
408 500
409/*****************************************************************************/ 501/*****************************************************************************/
410/* padlist management and caching */ 502/* padlist management and caching */
411 503
412static AV * 504ECB_INLINE AV *
413coro_derive_padlist (pTHX_ CV *cv) 505coro_derive_padlist (pTHX_ CV *cv)
414{ 506{
415 AV *padlist = CvPADLIST (cv); 507 AV *padlist = CvPADLIST (cv);
416 AV *newpadlist, *newpad; 508 AV *newpadlist, *newpad;
417 509
… …
429 av_store (newpadlist, 1, (SV *)newpad); 521 av_store (newpadlist, 1, (SV *)newpad);
430 522
431 return newpadlist; 523 return newpadlist;
432} 524}
433 525
434static void 526ECB_INLINE void
435free_padlist (pTHX_ AV *padlist) 527free_padlist (pTHX_ AV *padlist)
436{ 528{
437 /* may be during global destruction */ 529 /* may be during global destruction */
438 if (!IN_DESTRUCT) 530 if (!IN_DESTRUCT)
439 { 531 {
… …
463coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 555coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
464{ 556{
465 AV *padlist; 557 AV *padlist;
466 AV *av = (AV *)mg->mg_obj; 558 AV *av = (AV *)mg->mg_obj;
467 559
560 /* perl manages to free our internal AV and _then_ call us */
561 if (IN_DESTRUCT)
562 return 0;
563
468 /* casting is fun. */ 564 /* casting is fun. */
469 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 565 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
470 free_padlist (aTHX_ padlist); 566 free_padlist (aTHX_ padlist);
471 567
472 SvREFCNT_dec (av); /* sv_magicext increased the refcount */ 568 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
… …
478 0, 0, 0, 0, 574 0, 0, 0, 0,
479 coro_cv_free 575 coro_cv_free
480}; 576};
481 577
482/* the next two functions merely cache the padlists */ 578/* the next two functions merely cache the padlists */
483static void 579ECB_INLINE void
484get_padlist (pTHX_ CV *cv) 580get_padlist (pTHX_ CV *cv)
485{ 581{
486 MAGIC *mg = CORO_MAGIC_cv (cv); 582 MAGIC *mg = CORO_MAGIC_cv (cv);
487 AV *av; 583 AV *av;
488 584
489 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 585 if (ecb_expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0))
490 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 586 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
491 else 587 else
492 { 588 {
493#if CORO_PREFER_PERL_FUNCTIONS 589#if CORO_PREFER_PERL_FUNCTIONS
494 /* this is probably cleaner? but also slower! */ 590 /* this is probably cleaner? but also slower! */
… …
501 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 597 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
502#endif 598#endif
503 } 599 }
504} 600}
505 601
506static void 602ECB_INLINE void
507put_padlist (pTHX_ CV *cv) 603put_padlist (pTHX_ CV *cv)
508{ 604{
509 MAGIC *mg = CORO_MAGIC_cv (cv); 605 MAGIC *mg = CORO_MAGIC_cv (cv);
510 AV *av; 606 AV *av;
511 607
512 if (expect_false (!mg)) 608 if (ecb_expect_false (!mg))
513 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);
514 610
515 av = (AV *)mg->mg_obj; 611 av = (AV *)mg->mg_obj;
516 612
517 if (expect_false (AvFILLp (av) >= AvMAX (av))) 613 if (ecb_expect_false (AvFILLp (av) >= AvMAX (av)))
518 av_extend (av, AvFILLp (av) + 1); 614 av_extend (av, AvFILLp (av) + 1);
519 615
520 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 616 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
521} 617}
522 618
523/** 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))
671
672static void
673on_enterleave_call (pTHX_ SV *cb);
524 674
525static void 675static void
526load_perl (pTHX_ Coro__State c) 676load_perl (pTHX_ Coro__State c)
527{ 677{
528 perl_slots *slot = c->slot; 678 perl_slots *slot = c->slot;
… …
544 dSP; 694 dSP;
545 695
546 CV *cv; 696 CV *cv;
547 697
548 /* now do the ugly restore mess */ 698 /* now do the ugly restore mess */
549 while (expect_true (cv = (CV *)POPs)) 699 while (ecb_expect_true (cv = (CV *)POPs))
550 { 700 {
551 put_padlist (aTHX_ cv); /* mark this padlist as available */ 701 put_padlist (aTHX_ cv); /* mark this padlist as available */
552 CvDEPTH (cv) = PTR2IV (POPs); 702 CvDEPTH (cv) = PTR2IV (POPs);
553 CvPADLIST (cv) = (AV *)POPs; 703 CvPADLIST (cv) = (AV *)POPs;
554 } 704 }
… …
556 PUTBACK; 706 PUTBACK;
557 } 707 }
558 708
559 slf_frame = c->slf_frame; 709 slf_frame = c->slf_frame;
560 CORO_THROW = c->except; 710 CORO_THROW = c->except;
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
720 if (ecb_expect_false (c->on_enter))
721 {
722 int i;
723
724 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
725 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
726 }
727
728 SWAP_SVS (c);
561} 729}
562 730
563static void 731static void
564save_perl (pTHX_ Coro__State c) 732save_perl (pTHX_ Coro__State c)
565{ 733{
734 SWAP_SVS (c);
735
736 if (ecb_expect_false (c->on_leave))
737 {
738 int i;
739
740 for (i = AvFILLp (c->on_leave); i >= 0; --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);
750 }
751
566 c->except = CORO_THROW; 752 c->except = CORO_THROW;
567 c->slf_frame = slf_frame; 753 c->slf_frame = slf_frame;
568 754
569 { 755 {
570 dSP; 756 dSP;
… …
579 765
580 XPUSHs (Nullsv); 766 XPUSHs (Nullsv);
581 /* this loop was inspired by pp_caller */ 767 /* this loop was inspired by pp_caller */
582 for (;;) 768 for (;;)
583 { 769 {
584 while (expect_true (cxix >= 0)) 770 while (ecb_expect_true (cxix >= 0))
585 { 771 {
586 PERL_CONTEXT *cx = &ccstk[cxix--]; 772 PERL_CONTEXT *cx = &ccstk[cxix--];
587 773
588 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))
589 { 775 {
590 CV *cv = cx->blk_sub.cv; 776 CV *cv = cx->blk_sub.cv;
591 777
592 if (expect_true (CvDEPTH (cv))) 778 if (ecb_expect_true (CvDEPTH (cv)))
593 { 779 {
594 EXTEND (SP, 3); 780 EXTEND (SP, 3);
595 PUSHs ((SV *)CvPADLIST (cv)); 781 PUSHs ((SV *)CvPADLIST (cv));
596 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv))); 782 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
597 PUSHs ((SV *)cv); 783 PUSHs ((SV *)cv);
… …
600 get_padlist (aTHX_ cv); 786 get_padlist (aTHX_ cv);
601 } 787 }
602 } 788 }
603 } 789 }
604 790
605 if (expect_true (top_si->si_type == PERLSI_MAIN)) 791 if (ecb_expect_true (top_si->si_type == PERLSI_MAIN))
606 break; 792 break;
607 793
608 top_si = top_si->si_prev; 794 top_si = top_si->si_prev;
609 ccstk = top_si->si_cxstack; 795 ccstk = top_si->si_cxstack;
610 cxix = top_si->si_cxix; 796 cxix = top_si->si_cxix;
… …
612 798
613 PUTBACK; 799 PUTBACK;
614 } 800 }
615 801
616 /* allocate some space on the context stack for our purposes */ 802 /* allocate some space on the context stack for our purposes */
617 /* we manually unroll here, as usually 2 slots is enough */ 803 if (ecb_expect_false (cxstack_ix + SLOT_COUNT >= cxstack_max))
618 if (SLOT_COUNT >= 1) CXINC;
619 if (SLOT_COUNT >= 2) CXINC;
620 if (SLOT_COUNT >= 3) CXINC;
621 { 804 {
622 int i; 805 unsigned int i;
806
623 for (i = 3; i < SLOT_COUNT; ++i) 807 for (i = 0; i < SLOT_COUNT; ++i)
624 CXINC; 808 CXINC;
625 } 809
626 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 810 cxstack_ix -= SLOT_COUNT; /* undo allocation */
811 }
627 812
628 c->mainstack = PL_mainstack; 813 c->mainstack = PL_mainstack;
629 814
630 { 815 {
631 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 816 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
… …
652# define coro_init_stacks(thx) init_stacks () 837# define coro_init_stacks(thx) init_stacks ()
653#else 838#else
654static void 839static void
655coro_init_stacks (pTHX) 840coro_init_stacks (pTHX)
656{ 841{
657 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() */
658 PL_curstackinfo->si_type = PERLSI_MAIN; 843 PL_curstackinfo->si_type = PERLSI_MAIN;
659 PL_curstack = PL_curstackinfo->si_stack; 844 PL_curstack = PL_curstackinfo->si_stack;
660 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 845 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
661 846
662 PL_stack_base = AvARRAY(PL_curstack); 847 PL_stack_base = AvARRAY(PL_curstack);
… …
769#endif 954#endif
770 955
771/* 956/*
772 * This overrides the default magic get method of %SIG elements. 957 * This overrides the default magic get method of %SIG elements.
773 * 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
774 * and instead of tryign to save and restore the hash elements, we just provide 959 * and instead of trying to save and restore the hash elements (extremely slow),
775 * readback here. 960 * we just provide our own readback here.
776 * We only do this when the hook is != 0, as they are often set to 0 temporarily,
777 * not expecting this to actually change the hook. This is a potential problem
778 * when a schedule happens then, but we ignore this.
779 */ 961 */
780static int 962static int ecb_cold
781coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 963coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
782{ 964{
783 const char *s = MgPV_nolen_const (mg); 965 const char *s = MgPV_nolen_const (mg);
784 966
785 if (*s == '_') 967 if (*s == '_')
… …
797 } 979 }
798 980
799 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 981 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
800} 982}
801 983
802static int 984static int ecb_cold
803coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 985coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
804{ 986{
805 const char *s = MgPV_nolen_const (mg); 987 const char *s = MgPV_nolen_const (mg);
806 988
807 if (*s == '_') 989 if (*s == '_')
… …
821 } 1003 }
822 1004
823 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0; 1005 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
824} 1006}
825 1007
826static int 1008static int ecb_cold
827coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1009coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
828{ 1010{
829 const char *s = MgPV_nolen_const (mg); 1011 const char *s = MgPV_nolen_const (mg);
830 1012
831 if (*s == '_') 1013 if (*s == '_')
… …
836 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 1018 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
837 1019
838 if (svp) 1020 if (svp)
839 { 1021 {
840 SV *old = *svp; 1022 SV *old = *svp;
841 *svp = newSVsv (sv); 1023 *svp = SvOK (sv) ? newSVsv (sv) : 0;
842 SvREFCNT_dec (old); 1024 SvREFCNT_dec (old);
843 return 0; 1025 return 0;
844 } 1026 }
845 } 1027 }
846 1028
… …
864slf_check_repeat (pTHX_ struct CoroSLF *frame) 1046slf_check_repeat (pTHX_ struct CoroSLF *frame)
865{ 1047{
866 return 1; 1048 return 1;
867} 1049}
868 1050
869static UNOP coro_setup_op; 1051static UNOP init_perl_op;
870 1052
871static 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 */
872coro_setup (pTHX_ struct coro *coro) 1054init_perl (pTHX_ struct coro *coro)
873{ 1055{
874 /* 1056 /*
875 * emulate part of the perl startup here. 1057 * emulate part of the perl startup here.
876 */ 1058 */
877 coro_init_stacks (aTHX); 1059 coro_init_stacks (aTHX);
… …
884 PL_comppad_name_fill = 0; 1066 PL_comppad_name_fill = 0;
885 PL_comppad_name_floor = 0; 1067 PL_comppad_name_floor = 0;
886 PL_curpm = 0; 1068 PL_curpm = 0;
887 PL_curpad = 0; 1069 PL_curpad = 0;
888 PL_localizing = 0; 1070 PL_localizing = 0;
889 PL_dirty = 0;
890 PL_restartop = 0; 1071 PL_restartop = 0;
891#if PERL_VERSION_ATLEAST (5,10,0) 1072#if PERL_VERSION_ATLEAST (5,10,0)
892 PL_parser = 0; 1073 PL_parser = 0;
893#endif 1074#endif
894 PL_hints = 0; 1075 PL_hints = 0;
895 1076
896 /* recreate the die/warn hooks */ 1077 /* recreate the die/warn hooks */
897 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1078 PL_diehook = SvREFCNT_inc (rv_diehook);
898 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1079 PL_warnhook = SvREFCNT_inc (rv_warnhook);
899 1080
900 GvSV (PL_defgv) = newSV (0); 1081 GvSV (PL_defgv) = newSV (0);
901 GvAV (PL_defgv) = coro->args; coro->args = 0; 1082 GvAV (PL_defgv) = coro->args; coro->args = 0;
902 GvSV (PL_errgv) = newSV (0); 1083 GvSV (PL_errgv) = newSV (0);
903 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);
… …
924 /* 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
925 * 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.
926 */ 1107 */
927 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 */
928 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;
929 1111
930 /* 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 */
931 coro_setup_op.op_next = PL_op; 1113 init_perl_op.op_next = PL_op;
932 coro_setup_op.op_type = OP_ENTERSUB; 1114 init_perl_op.op_type = OP_ENTERSUB;
933 coro_setup_op.op_ppaddr = pp_slf; 1115 init_perl_op.op_ppaddr = pp_slf;
934 /* 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 */
935 1117
936 PL_op = (OP *)&coro_setup_op; 1118 PL_op = (OP *)&init_perl_op;
937 1119
938 /* copy throw, in case it was set before coro_setup */ 1120 /* copy throw, in case it was set before init_perl */
939 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 }
940} 1130}
941 1131
942static void 1132static void
943coro_unwind_stacks (pTHX) 1133coro_unwind_stacks (pTHX)
944{ 1134{
… …
959 dounwind (-1); 1149 dounwind (-1);
960 } 1150 }
961} 1151}
962 1152
963static void 1153static void
964coro_destruct_perl (pTHX_ struct coro *coro) 1154destroy_perl (pTHX_ struct coro *coro)
965{ 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
966 coro_unwind_stacks (aTHX); 1171 coro_unwind_stacks (aTHX);
967 1172
968 SvREFCNT_dec (GvSV (PL_defgv)); 1173 /* restore swapped sv's */
969 SvREFCNT_dec (GvAV (PL_defgv)); 1174 SWAP_SVS (coro);
970 SvREFCNT_dec (GvSV (PL_errgv));
971 SvREFCNT_dec (PL_defoutgv);
972 SvREFCNT_dec (PL_rs);
973 SvREFCNT_dec (GvSV (irsgv));
974 SvREFCNT_dec (GvHV (PL_hintgv));
975 1175
976 SvREFCNT_dec (PL_diehook); 1176 coro_destruct_stacks (aTHX);
977 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);
978 1193 }
1194
1195 {
1196 unsigned int i;
1197
1198 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i)
1199 SvREFCNT_dec (svf [i]);
1200
979 SvREFCNT_dec (coro->saved_deffh); 1201 SvREFCNT_dec (coro->saved_deffh);
980 SvREFCNT_dec (coro->rouse_cb); 1202 SvREFCNT_dec (coro->rouse_cb);
981 SvREFCNT_dec (coro->invoke_cb); 1203 SvREFCNT_dec (coro->invoke_cb);
982 SvREFCNT_dec (coro->invoke_av); 1204 SvREFCNT_dec (coro->invoke_av);
983 1205 }
984 coro_destruct_stacks (aTHX);
985} 1206}
986 1207
987INLINE void 1208ECB_INLINE void
988free_coro_mortal (pTHX) 1209free_coro_mortal (pTHX)
989{ 1210{
990 if (expect_true (coro_mortal)) 1211 if (ecb_expect_true (coro_mortal))
991 { 1212 {
992 SvREFCNT_dec (coro_mortal); 1213 SvREFCNT_dec ((SV *)coro_mortal);
993 coro_mortal = 0; 1214 coro_mortal = 0;
994 } 1215 }
995} 1216}
996 1217
997static int 1218static int
… …
1130 1351
1131 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 */
1132} 1353}
1133 1354
1134/* 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 */
1135static void NOINLINE 1356static void ecb_noinline
1136cctx_prepare (pTHX) 1357cctx_prepare (pTHX)
1137{ 1358{
1138 PL_top_env = &PL_start_env; 1359 PL_top_env = &PL_start_env;
1139 1360
1140 if (cctx_current->flags & CC_TRACE) 1361 if (cctx_current->flags & CC_TRACE)
… …
1151 slf_frame.prepare = slf_prepare_set_stacklevel; 1372 slf_frame.prepare = slf_prepare_set_stacklevel;
1152 slf_frame.check = slf_check_set_stacklevel; 1373 slf_frame.check = slf_check_set_stacklevel;
1153} 1374}
1154 1375
1155/* 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 */
1156INLINE void 1377ECB_INLINE void
1157transfer_tail (pTHX) 1378transfer_tail (pTHX)
1158{ 1379{
1159 free_coro_mortal (aTHX); 1380 free_coro_mortal (aTHX);
1160} 1381}
1161 1382
… …
1186 /* 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 */
1187 PL_restartop = PL_op; 1408 PL_restartop = PL_op;
1188 perl_run (PL_curinterp); 1409 perl_run (PL_curinterp);
1189 /* 1410 /*
1190 * 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
1191 * 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.
1192 */ 1414 */
1193 1415
1194 /* 1416 /*
1195 * 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
1196 * 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)
… …
1283cctx_destroy (coro_cctx *cctx) 1505cctx_destroy (coro_cctx *cctx)
1284{ 1506{
1285 if (!cctx) 1507 if (!cctx)
1286 return; 1508 return;
1287 1509
1288 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary? 1510 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1289 1511
1290 --cctx_count; 1512 --cctx_count;
1291 coro_destroy (&cctx->cctx); 1513 coro_destroy (&cctx->cctx);
1292 1514
1293 /* coro_transfer creates new, empty cctx's */ 1515 /* coro_transfer creates new, empty cctx's */
… …
1312#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))
1313 1535
1314static coro_cctx * 1536static coro_cctx *
1315cctx_get (pTHX) 1537cctx_get (pTHX)
1316{ 1538{
1317 while (expect_true (cctx_first)) 1539 while (ecb_expect_true (cctx_first))
1318 { 1540 {
1319 coro_cctx *cctx = cctx_first; 1541 coro_cctx *cctx = cctx_first;
1320 cctx_first = cctx->next; 1542 cctx_first = cctx->next;
1321 --cctx_idle; 1543 --cctx_idle;
1322 1544
1323 if (expect_true (!CCTX_EXPIRED (cctx))) 1545 if (ecb_expect_true (!CCTX_EXPIRED (cctx)))
1324 return cctx; 1546 return cctx;
1325 1547
1326 cctx_destroy (cctx); 1548 cctx_destroy (cctx);
1327 } 1549 }
1328 1550
… …
1333cctx_put (coro_cctx *cctx) 1555cctx_put (coro_cctx *cctx)
1334{ 1556{
1335 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));
1336 1558
1337 /* free another cctx if overlimit */ 1559 /* free another cctx if overlimit */
1338 if (expect_false (cctx_idle >= cctx_max_idle)) 1560 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1339 { 1561 {
1340 coro_cctx *first = cctx_first; 1562 coro_cctx *first = cctx_first;
1341 cctx_first = first->next; 1563 cctx_first = first->next;
1342 --cctx_idle; 1564 --cctx_idle;
1343 1565
… …
1354static void 1576static void
1355transfer_check (pTHX_ struct coro *prev, struct coro *next) 1577transfer_check (pTHX_ struct coro *prev, struct coro *next)
1356{ 1578{
1357 /* TODO: throwing up here is considered harmful */ 1579 /* TODO: throwing up here is considered harmful */
1358 1580
1359 if (expect_true (prev != next)) 1581 if (ecb_expect_true (prev != next))
1360 { 1582 {
1361 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1583 if (ecb_expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1362 croak ("Coro::State::transfer called with a suspended 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,");
1363 1585
1364 if (expect_false (next->flags & CF_RUNNING)) 1586 if (ecb_expect_false (next->flags & (CF_RUNNING | CF_ZOMBIE | CF_SUSPENDED)))
1365 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states,");
1366
1367 if (expect_false (next->flags & CF_DESTROYED))
1368 croak ("Coro::State::transfer called with destroyed 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,");
1369 1588
1370#if !PERL_VERSION_ATLEAST (5,10,0) 1589#if !PERL_VERSION_ATLEAST (5,10,0)
1371 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1590 if (ecb_expect_false (PL_lex_state != LEX_NOTPARSING))
1372 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,");
1373#endif 1592#endif
1374 } 1593 }
1375} 1594}
1376 1595
1377/* always use the TRANSFER macro */ 1596/* always use the TRANSFER macro */
1378static void NOINLINE /* noinline so we have a fixed stackframe */ 1597static void ecb_noinline /* noinline so we have a fixed stackframe */
1379transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1598transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1380{ 1599{
1381 dSTACKLEVEL; 1600 dSTACKLEVEL;
1382 1601
1383 /* sometimes transfer is only called to set idle_sp */ 1602 /* sometimes transfer is only called to set idle_sp */
1384 if (expect_false (!prev)) 1603 if (ecb_expect_false (!prev))
1385 { 1604 {
1386 cctx_current->idle_sp = STACKLEVEL; 1605 cctx_current->idle_sp = STACKLEVEL;
1387 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 */
1388 } 1607 }
1389 else if (expect_true (prev != next)) 1608 else if (ecb_expect_true (prev != next))
1390 { 1609 {
1391 coro_cctx *cctx_prev; 1610 coro_cctx *cctx_prev;
1392 1611
1393 if (expect_false (prev->flags & CF_NEW)) 1612 if (ecb_expect_false (prev->flags & CF_NEW))
1394 { 1613 {
1395 /* create a new empty/source context */ 1614 /* create a new empty/source context */
1396 prev->flags &= ~CF_NEW; 1615 prev->flags &= ~CF_NEW;
1397 prev->flags |= CF_RUNNING; 1616 prev->flags |= CF_RUNNING;
1398 } 1617 }
… …
1401 next->flags |= CF_RUNNING; 1620 next->flags |= CF_RUNNING;
1402 1621
1403 /* first get rid of the old state */ 1622 /* first get rid of the old state */
1404 save_perl (aTHX_ prev); 1623 save_perl (aTHX_ prev);
1405 1624
1406 if (expect_false (next->flags & CF_NEW)) 1625 if (ecb_expect_false (next->flags & CF_NEW))
1407 { 1626 {
1408 /* need to start coroutine */ 1627 /* need to start coroutine */
1409 next->flags &= ~CF_NEW; 1628 next->flags &= ~CF_NEW;
1410 /* setup coroutine call */ 1629 /* setup coroutine call */
1411 coro_setup (aTHX_ next); 1630 init_perl (aTHX_ next);
1412 } 1631 }
1413 else 1632 else
1414 load_perl (aTHX_ next); 1633 load_perl (aTHX_ next);
1415 1634
1416 /* possibly untie and reuse the cctx */ 1635 /* possibly untie and reuse the cctx */
1417 if (expect_true ( 1636 if (ecb_expect_true (
1418 cctx_current->idle_sp == STACKLEVEL 1637 cctx_current->idle_sp == STACKLEVEL
1419 && !(cctx_current->flags & CC_TRACE) 1638 && !(cctx_current->flags & CC_TRACE)
1420 && !force_cctx 1639 && !force_cctx
1421 )) 1640 ))
1422 { 1641 {
1423 /* 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 */
1424 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));
1425 1644
1426 /* 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. */
1427 /* 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 */
1428 if (expect_false (CCTX_EXPIRED (cctx_current))) 1647 if (ecb_expect_false (CCTX_EXPIRED (cctx_current)))
1429 if (expect_true (!next->cctx)) 1648 if (ecb_expect_true (!next->cctx))
1430 next->cctx = cctx_get (aTHX); 1649 next->cctx = cctx_get (aTHX);
1431 1650
1432 cctx_put (cctx_current); 1651 cctx_put (cctx_current);
1433 } 1652 }
1434 else 1653 else
1435 prev->cctx = cctx_current; 1654 prev->cctx = cctx_current;
1436 1655
1437 ++next->usecount; 1656 ++next->usecount;
1438 1657
1439 cctx_prev = cctx_current; 1658 cctx_prev = cctx_current;
1440 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX); 1659 cctx_current = ecb_expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1441 1660
1442 next->cctx = 0; 1661 next->cctx = 0;
1443 1662
1444 if (expect_false (cctx_prev != cctx_current)) 1663 if (ecb_expect_false (cctx_prev != cctx_current))
1445 { 1664 {
1446 cctx_prev->top_env = PL_top_env; 1665 cctx_prev->top_env = PL_top_env;
1447 PL_top_env = cctx_current->top_env; 1666 PL_top_env = cctx_current->top_env;
1448 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx); 1667 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1449 } 1668 }
… …
1455#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))
1456#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1675#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1457 1676
1458/** high level stuff ********************************************************/ 1677/** high level stuff ********************************************************/
1459 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 */
1460static int 1681static void
1682coro_call_on_destroy (pTHX_ struct coro *coro);
1683
1684static void
1461coro_state_destroy (pTHX_ struct coro *coro) 1685coro_state_destroy (pTHX_ struct coro *coro)
1462{ 1686{
1463 if (coro->flags & CF_DESTROYED) 1687 if (coro->flags & CF_ZOMBIE)
1464 return 0; 1688 return;
1465 1689
1466 if (coro->on_destroy)
1467 coro->on_destroy (aTHX_ coro); 1690 slf_destroy (aTHX_ coro);
1468 1691
1469 coro->flags |= CF_DESTROYED; 1692 coro->flags |= CF_ZOMBIE;
1470 1693
1471 if (coro->flags & CF_READY) 1694 if (coro->flags & CF_READY)
1472 { 1695 {
1473 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1696 /* reduce nready, as destroying a ready coro effectively unreadies it */
1474 /* alternative: look through all ready queues and remove the coro */ 1697 /* alternative: look through all ready queues and remove the coro */
1475 --coro_nready; 1698 --coro_nready;
1476 } 1699 }
1477 else 1700 else
1478 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;
1479 1706
1480 if (coro->mainstack 1707 if (coro->mainstack
1481 && coro->mainstack != main_mainstack 1708 && coro->mainstack != main_mainstack
1482 && coro->slot 1709 && coro->slot
1483 && !PL_dirty) 1710 && !PL_dirty)
1484 {
1485 struct coro temp;
1486
1487 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1488
1489 save_perl (aTHX_ &temp);
1490 load_perl (aTHX_ coro);
1491
1492 coro_destruct_perl (aTHX_ coro); 1711 destroy_perl (aTHX_ coro);
1493
1494 load_perl (aTHX_ &temp);
1495
1496 coro->slot = 0;
1497 }
1498 1712
1499 cctx_destroy (coro->cctx); 1713 cctx_destroy (coro->cctx);
1500 SvREFCNT_dec (coro->startcv); 1714 SvREFCNT_dec (coro->startcv);
1501 SvREFCNT_dec (coro->args); 1715 SvREFCNT_dec (coro->args);
1716 SvREFCNT_dec (coro->swap_sv);
1502 SvREFCNT_dec (CORO_THROW); 1717 SvREFCNT_dec (CORO_THROW);
1503 1718
1504 if (coro->next) coro->next->prev = coro->prev; 1719 coro_call_on_destroy (aTHX_ coro);
1505 if (coro->prev) coro->prev->next = coro->next;
1506 if (coro == coro_first) coro_first = coro->next;
1507 1720
1508 return 1; 1721 /* more destruction mayhem in coro_state_free */
1509} 1722}
1510 1723
1511static int 1724static int
1512coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1725coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1513{ 1726{
1514 struct coro *coro = (struct coro *)mg->mg_ptr; 1727 struct coro *coro = (struct coro *)mg->mg_ptr;
1515 mg->mg_ptr = 0; 1728 mg->mg_ptr = 0;
1516 1729
1517 coro->hv = 0;
1518
1519 if (--coro->refcnt < 0)
1520 {
1521 coro_state_destroy (aTHX_ coro); 1730 coro_state_destroy (aTHX_ coro);
1731 SvREFCNT_dec (coro->on_destroy);
1732 SvREFCNT_dec (coro->status);
1733
1522 Safefree (coro); 1734 Safefree (coro);
1523 }
1524 1735
1525 return 0; 1736 return 0;
1526} 1737}
1527 1738
1528static int 1739static int ecb_cold
1529coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1740coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1530{ 1741{
1531 struct coro *coro = (struct coro *)mg->mg_ptr; 1742 /* called when perl clones the current process the slow way (windows process emulation) */
1532 1743 /* WE SIMply nuke the pointers in the copy, causing perl to croak */
1533 ++coro->refcnt; 1744 mg->mg_ptr = 0;
1745 mg->mg_virtual = 0;
1534 1746
1535 return 0; 1747 return 0;
1536} 1748}
1537 1749
1538static MGVTBL coro_state_vtbl = { 1750static MGVTBL coro_state_vtbl = {
… …
1561 1773
1562 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1774 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1563 TRANSFER (ta, 1); 1775 TRANSFER (ta, 1);
1564} 1776}
1565 1777
1566/*****************************************************************************/
1567/* gensub: simple closure generation utility */
1568
1569#define GENSUB_ARG CvXSUBANY (cv).any_ptr
1570
1571/* create a closure from XS, returns a code reference */
1572/* the arg can be accessed via GENSUB_ARG from the callback */
1573/* the callback must use dXSARGS/XSRETURN */
1574static SV *
1575gensub (pTHX_ void (*xsub)(pTHX_ CV *), void *arg)
1576{
1577 CV *cv = (CV *)newSV (0);
1578
1579 sv_upgrade ((SV *)cv, SVt_PVCV);
1580
1581 CvANON_on (cv);
1582 CvISXSUB_on (cv);
1583 CvXSUB (cv) = xsub;
1584 GENSUB_ARG = arg;
1585
1586 return newRV_noinc ((SV *)cv);
1587}
1588
1589/** Coro ********************************************************************/ 1778/** Coro ********************************************************************/
1590 1779
1591INLINE void 1780ECB_INLINE void
1592coro_enq (pTHX_ struct coro *coro) 1781coro_enq (pTHX_ struct coro *coro)
1593{ 1782{
1594 av_push (coro_ready [coro->prio - PRIO_MIN], SvREFCNT_inc_NN (coro->hv)); 1783 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1595}
1596 1784
1597INLINE 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 *
1598coro_deq (pTHX) 1793coro_deq (pTHX)
1599{ 1794{
1600 int prio; 1795 int prio;
1601 1796
1602 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; ) 1797 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
1603 if (AvFILLp (coro_ready [prio]) >= 0) 1798 {
1604 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 }
1605 1808
1606 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;
1607} 1827}
1608 1828
1609static int 1829static int
1610api_ready (pTHX_ SV *coro_sv) 1830api_ready (pTHX_ SV *coro_sv)
1611{ 1831{
1612 struct coro *coro;
1613 SV *sv_hook;
1614 void (*xs_hook)(void);
1615
1616 coro = SvSTATE (coro_sv); 1832 struct coro *coro = SvSTATE (coro_sv);
1617 1833
1618 if (coro->flags & CF_READY) 1834 if (coro->flags & CF_READY)
1619 return 0; 1835 return 0;
1620 1836
1621 coro->flags |= CF_READY; 1837 coro->flags |= CF_READY;
1622 1838
1623 sv_hook = coro_nready ? 0 : coro_readyhook;
1624 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1625
1626 coro_enq (aTHX_ coro); 1839 coro_enq (aTHX_ coro);
1627 ++coro_nready;
1628 1840
1629 if (sv_hook) 1841 if (!coro_nready++)
1630 { 1842 if (coroapi.readyhook)
1631 dSP; 1843 coroapi.readyhook ();
1632
1633 ENTER;
1634 SAVETMPS;
1635
1636 PUSHMARK (SP);
1637 PUTBACK;
1638 call_sv (sv_hook, G_VOID | G_DISCARD);
1639
1640 FREETMPS;
1641 LEAVE;
1642 }
1643
1644 if (xs_hook)
1645 xs_hook ();
1646 1844
1647 return 1; 1845 return 1;
1648} 1846}
1649 1847
1650static int 1848static int
… …
1652{ 1850{
1653 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1851 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1654} 1852}
1655 1853
1656/* expects to own a reference to next->hv */ 1854/* expects to own a reference to next->hv */
1657INLINE void 1855ECB_INLINE void
1658prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1856prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1659{ 1857{
1660 SV *prev_sv = SvRV (coro_current); 1858 SV *prev_sv = SvRV (coro_current);
1661 1859
1662 ta->prev = SvSTATE_hv (prev_sv); 1860 ta->prev = SvSTATE_hv (prev_sv);
… …
1673static void 1871static void
1674prepare_schedule (pTHX_ struct coro_transfer_args *ta) 1872prepare_schedule (pTHX_ struct coro_transfer_args *ta)
1675{ 1873{
1676 for (;;) 1874 for (;;)
1677 { 1875 {
1678 SV *next_sv = coro_deq (aTHX); 1876 struct coro *next = coro_deq (aTHX);
1679 1877
1680 if (expect_true (next_sv)) 1878 if (ecb_expect_true (next))
1681 { 1879 {
1682 struct coro *next = SvSTATE_hv (next_sv);
1683
1684 /* cannot transfer to destroyed coros, skip and look for next */ 1880 /* cannot transfer to destroyed coros, skip and look for next */
1685 if (expect_false (next->flags & CF_DESTROYED)) 1881 if (ecb_expect_false (next->flags & (CF_ZOMBIE | CF_SUSPENDED)))
1686 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 */
1687 else 1883 else
1688 { 1884 {
1689 next->flags &= ~CF_READY; 1885 next->flags &= ~CF_READY;
1690 --coro_nready; 1886 --coro_nready;
1691 1887
… …
1697 { 1893 {
1698 /* nothing to schedule: call the idle handler */ 1894 /* nothing to schedule: call the idle handler */
1699 if (SvROK (sv_idle) 1895 if (SvROK (sv_idle)
1700 && SvOBJECT (SvRV (sv_idle))) 1896 && SvOBJECT (SvRV (sv_idle)))
1701 { 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
1702 ++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 */
1703 api_ready (aTHX_ SvRV (sv_idle)); 1902 api_ready (aTHX_ SvRV (sv_idle));
1704 --coro_nready; 1903 --coro_nready;
1705 } 1904 }
1706 else 1905 else
1707 { 1906 {
1907 /* TODO: deprecated, remove, cannot work reliably *//*D*/
1708 dSP; 1908 dSP;
1709 1909
1710 ENTER; 1910 ENTER;
1711 SAVETMPS; 1911 SAVETMPS;
1712 1912
… …
1719 } 1919 }
1720 } 1920 }
1721 } 1921 }
1722} 1922}
1723 1923
1724INLINE void 1924ECB_INLINE void
1725prepare_cede (pTHX_ struct coro_transfer_args *ta) 1925prepare_cede (pTHX_ struct coro_transfer_args *ta)
1726{ 1926{
1727 api_ready (aTHX_ coro_current); 1927 api_ready (aTHX_ coro_current);
1728 prepare_schedule (aTHX_ ta); 1928 prepare_schedule (aTHX_ ta);
1729} 1929}
1730 1930
1731INLINE void 1931ECB_INLINE void
1732prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 1932prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1733{ 1933{
1734 SV *prev = SvRV (coro_current); 1934 SV *prev = SvRV (coro_current);
1735 1935
1736 if (coro_nready) 1936 if (coro_nready)
… …
1766{ 1966{
1767 struct coro_transfer_args ta; 1967 struct coro_transfer_args ta;
1768 1968
1769 prepare_cede (aTHX_ &ta); 1969 prepare_cede (aTHX_ &ta);
1770 1970
1771 if (expect_true (ta.prev != ta.next)) 1971 if (ecb_expect_true (ta.prev != ta.next))
1772 { 1972 {
1773 TRANSFER (ta, 1); 1973 TRANSFER (ta, 1);
1774 return 1; 1974 return 1;
1775 } 1975 }
1776 else 1976 else
… …
1819 coro->slot->runops = RUNOPS_DEFAULT; 2019 coro->slot->runops = RUNOPS_DEFAULT;
1820 } 2020 }
1821} 2021}
1822 2022
1823static 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
1824coro_call_on_destroy (pTHX_ struct coro *coro) 2100coro_call_on_destroy (pTHX_ struct coro *coro)
1825{ 2101{
1826 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2102 AV *od = coro->on_destroy;
1827 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1828 2103
1829 if (on_destroyp) 2104 if (!od)
1830 { 2105 return;
1831 AV *on_destroy = (AV *)SvRV (*on_destroyp);
1832 2106
1833 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
1834 { 2115 {
1835 dSP; /* don't disturb outer sp */ 2116 dSP; /* don't disturb outer sp */
1836 SV *cb = av_pop (on_destroy);
1837
1838 PUSHMARK (SP); 2117 PUSHMARK (SP);
1839 2118
1840 if (statusp) 2119 if (coro->status)
1841 { 2120 {
1842 int i; 2121 PUTBACK;
1843 AV *status = (AV *)SvRV (*statusp); 2122 coro_push_av (aTHX_ coro->status, G_ARRAY);
1844 EXTEND (SP, AvFILLp (status) + 1); 2123 SPAGAIN;
1845
1846 for (i = 0; i <= AvFILLp (status); ++i)
1847 PUSHs (AvARRAY (status)[i]);
1848 } 2124 }
1849 2125
1850 PUTBACK; 2126 PUTBACK;
1851 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD); 2127 call_sv (cb, G_VOID | G_DISCARD);
1852 } 2128 }
1853 } 2129 }
1854} 2130}
1855 2131
1856static void 2132static void
1857slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2133coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
1858{ 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 {
1859 int i; 2148 int i;
1860 HV *hv = (HV *)SvRV (coro_current);
1861 AV *av = newAV ();
1862 2149
1863 av_extend (av, items - 1); 2150 av_extend (av, items - 1);
2151
1864 for (i = 0; i < items; ++i) 2152 for (i = 0; i < items; ++i)
1865 av_push (av, SvREFCNT_inc_NN (arg [i])); 2153 av_push (av, SvREFCNT_inc_NN (arg [i]));
2154 }
2155}
1866 2156
1867 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 2157static void
1868 2158slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2159{
1869 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 */
1870 api_ready (aTHX_ sv_manager); 2161 api_ready (aTHX_ sv_manager);
1871 2162
1872 frame->prepare = prepare_schedule; 2163 frame->prepare = prepare_schedule;
1873 frame->check = slf_check_repeat; 2164 frame->check = slf_check_repeat;
1874 2165
1875 /* as a minor optimisation, we could unwind all stacks here */ 2166 /* as a minor optimisation, we could unwind all stacks here */
1876 /* 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 */
1877 /*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;
1878} 2272}
1879 2273
1880/*****************************************************************************/ 2274/*****************************************************************************/
1881/* async pool handler */ 2275/* async pool handler */
1882 2276
… …
1913slf_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)
1914{ 2308{
1915 HV *hv = (HV *)SvRV (coro_current); 2309 HV *hv = (HV *)SvRV (coro_current);
1916 struct coro *coro = SvSTATE_hv ((SV *)hv); 2310 struct coro *coro = SvSTATE_hv ((SV *)hv);
1917 2311
1918 if (expect_true (coro->saved_deffh)) 2312 if (ecb_expect_true (coro->saved_deffh))
1919 { 2313 {
1920 /* subsequent iteration */ 2314 /* subsequent iteration */
1921 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2315 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1922 coro->saved_deffh = 0; 2316 coro->saved_deffh = 0;
1923 2317
1924 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 2318 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
1925 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2319 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1926 { 2320 {
1927 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate); 2321 slf_init_terminate_cancel_common (aTHX_ frame, hv);
1928 coro->invoke_av = newAV (); 2322 return;
1929
1930 frame->prepare = prepare_nop;
1931 } 2323 }
1932 else 2324 else
1933 { 2325 {
1934 av_clear (GvAV (PL_defgv)); 2326 av_clear (GvAV (PL_defgv));
1935 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);
… …
1960 2352
1961static void 2353static void
1962coro_rouse_callback (pTHX_ CV *cv) 2354coro_rouse_callback (pTHX_ CV *cv)
1963{ 2355{
1964 dXSARGS; 2356 dXSARGS;
1965 SV *data = (SV *)GENSUB_ARG; 2357 SV *data = (SV *)S_GENSUB_ARG;
1966 2358
1967 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2359 if (SvTYPE (SvRV (data)) != SVt_PVAV)
1968 { 2360 {
1969 /* first call, set args */ 2361 /* first call, set args */
2362 SV *coro = SvRV (data);
1970 AV *av = newAV (); 2363 AV *av = newAV ();
1971 SV *coro = SvRV (data);
1972 2364
1973 SvRV_set (data, (SV *)av); 2365 SvRV_set (data, (SV *)av);
1974 api_ready (aTHX_ coro);
1975 SvREFCNT_dec (coro);
1976 2366
1977 /* better take a full copy of the arguments */ 2367 /* better take a full copy of the arguments */
1978 while (items--) 2368 while (items--)
1979 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);
1980 } 2373 }
1981 2374
1982 XSRETURN_EMPTY; 2375 XSRETURN_EMPTY;
1983} 2376}
1984 2377
… …
2001 2394
2002 EXTEND (SP, AvFILLp (av) + 1); 2395 EXTEND (SP, AvFILLp (av) + 1);
2003 for (i = 0; i <= AvFILLp (av); ++i) 2396 for (i = 0; i <= AvFILLp (av); ++i)
2004 PUSHs (sv_2mortal (AvARRAY (av)[i])); 2397 PUSHs (sv_2mortal (AvARRAY (av)[i]));
2005 2398
2006 /* 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 */
2007 AvFILLp (av) = -1; 2400 AvFILLp (av) = -1;
2008 av_undef (av); 2401 av_undef (av);
2009 2402
2010 PUTBACK; 2403 PUTBACK;
2011 } 2404 }
… …
2035 || SvTYPE (SvRV (cb)) != SVt_PVCV 2428 || SvTYPE (SvRV (cb)) != SVt_PVCV
2036 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2429 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2037 croak ("Coro::rouse_wait called with illegal callback argument,"); 2430 croak ("Coro::rouse_wait called with illegal callback argument,");
2038 2431
2039 { 2432 {
2040 CV *cv = (CV *)SvRV (cb); /* for GENSUB_ARG */ 2433 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
2041 SV *data = (SV *)GENSUB_ARG; 2434 SV *data = (SV *)S_GENSUB_ARG;
2042 2435
2043 frame->data = (void *)data; 2436 frame->data = (void *)data;
2044 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule; 2437 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
2045 frame->check = slf_check_rouse_wait; 2438 frame->check = slf_check_rouse_wait;
2046 } 2439 }
… …
2050coro_new_rouse_cb (pTHX) 2443coro_new_rouse_cb (pTHX)
2051{ 2444{
2052 HV *hv = (HV *)SvRV (coro_current); 2445 HV *hv = (HV *)SvRV (coro_current);
2053 struct coro *coro = SvSTATE_hv (hv); 2446 struct coro *coro = SvSTATE_hv (hv);
2054 SV *data = newRV_inc ((SV *)hv); 2447 SV *data = newRV_inc ((SV *)hv);
2055 SV *cb = gensub (aTHX_ coro_rouse_callback, (void *)data); 2448 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
2056 2449
2057 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);
2058 SvREFCNT_dec (data); /* magicext increases the refcount */ 2451 SvREFCNT_dec (data); /* magicext increases the refcount */
2059 2452
2060 SvREFCNT_dec (coro->rouse_cb); 2453 SvREFCNT_dec (coro->rouse_cb);
… …
2157static void 2550static void
2158slf_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)
2159{ 2552{
2160 frame->prepare = prepare_cede_notself; 2553 frame->prepare = prepare_cede_notself;
2161 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;
2162} 2572}
2163 2573
2164/* 2574/*
2165 * these not obviously related functions are all rolled into one 2575 * these not obviously related functions are all rolled into one
2166 * 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
… …
2173 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 */
2174 2584
2175 /* 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 */
2176 /* the latter happens when a new coro has been started */ 2586 /* the latter happens when a new coro has been started */
2177 /* or when a new cctx was attached to an existing coroutine */ 2587 /* or when a new cctx was attached to an existing coroutine */
2178 if (expect_true (!slf_frame.prepare)) 2588 if (ecb_expect_true (!slf_frame.prepare))
2179 { 2589 {
2180 /* first iteration */ 2590 /* first iteration */
2181 dSP; 2591 dSP;
2182 SV **arg = PL_stack_base + TOPMARK + 1; 2592 SV **arg = PL_stack_base + TOPMARK + 1;
2183 int items = SP - arg; /* args without function object */ 2593 int items = SP - arg; /* args without function object */
… …
2224 while (slf_frame.check (aTHX_ &slf_frame)); 2634 while (slf_frame.check (aTHX_ &slf_frame));
2225 2635
2226 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 */
2227 2637
2228 /* exception handling */ 2638 /* exception handling */
2229 if (expect_false (CORO_THROW)) 2639 if (ecb_expect_false (CORO_THROW))
2230 { 2640 {
2231 SV *exception = sv_2mortal (CORO_THROW); 2641 SV *exception = sv_2mortal (CORO_THROW);
2232 2642
2233 CORO_THROW = 0; 2643 CORO_THROW = 0;
2234 sv_setsv (ERRSV, exception); 2644 sv_setsv (ERRSV, exception);
2235 croak (0); 2645 croak (0);
2236 } 2646 }
2237 2647
2238 /* return value handling - mostly like entersub */ 2648 /* return value handling - mostly like entersub */
2239 /* make sure we put something on the stack in scalar context */ 2649 /* make sure we put something on the stack in scalar context */
2240 if (GIMME_V == G_SCALAR) 2650 if (GIMME_V == G_SCALAR
2651 && ecb_expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2241 { 2652 {
2242 dSP; 2653 dSP;
2243 SV **bot = PL_stack_base + checkmark; 2654 SV **bot = PL_stack_base + checkmark;
2244 2655
2245 if (sp == bot) /* too few, push undef */ 2656 if (sp == bot) /* too few, push undef */
2246 bot [1] = &PL_sv_undef; 2657 bot [1] = &PL_sv_undef;
2247 else if (sp != bot + 1) /* too many, take last one */ 2658 else /* too many, take last one */
2248 bot [1] = *sp; 2659 bot [1] = *sp;
2249 2660
2250 SP = bot + 1; 2661 SP = bot + 1;
2251 2662
2252 PUTBACK; 2663 PUTBACK;
… …
2285 if (PL_op->op_flags & OPf_STACKED) 2696 if (PL_op->op_flags & OPf_STACKED)
2286 { 2697 {
2287 if (items > slf_arga) 2698 if (items > slf_arga)
2288 { 2699 {
2289 slf_arga = items; 2700 slf_arga = items;
2290 free (slf_argv); 2701 Safefree (slf_argv);
2291 slf_argv = malloc (slf_arga * sizeof (SV *)); 2702 New (0, slf_argv, slf_arga, SV *);
2292 } 2703 }
2293 2704
2294 slf_argc = items; 2705 slf_argc = items;
2295 2706
2296 for (i = 0; i < items; ++i) 2707 for (i = 0; i < items; ++i)
… …
2301 2712
2302 PL_op->op_ppaddr = pp_slf; 2713 PL_op->op_ppaddr = pp_slf;
2303 /*PL_op->op_type = OP_CUSTOM; /* we do behave like entersub still */ 2714 /*PL_op->op_type = OP_CUSTOM; /* we do behave like entersub still */
2304 2715
2305 PL_op = (OP *)&slf_restore; 2716 PL_op = (OP *)&slf_restore;
2717}
2718
2719/*****************************************************************************/
2720/* dynamic wind */
2721
2722static void
2723on_enterleave_call (pTHX_ SV *cb)
2724{
2725 dSP;
2726
2727 PUSHSTACK;
2728
2729 PUSHMARK (SP);
2730 PUTBACK;
2731 call_sv (cb, G_VOID | G_DISCARD);
2732 SPAGAIN;
2733
2734 POPSTACK;
2735}
2736
2737static SV *
2738coro_avp_pop_and_free (pTHX_ AV **avp)
2739{
2740 AV *av = *avp;
2741 SV *res = av_pop (av);
2742
2743 if (AvFILLp (av) < 0)
2744 {
2745 *avp = 0;
2746 SvREFCNT_dec (av);
2747 }
2748
2749 return res;
2750}
2751
2752static void
2753coro_pop_on_enter (pTHX_ void *coro)
2754{
2755 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_enter);
2756 SvREFCNT_dec (cb);
2757}
2758
2759static void
2760coro_pop_on_leave (pTHX_ void *coro)
2761{
2762 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2763 on_enterleave_call (aTHX_ sv_2mortal (cb));
2306} 2764}
2307 2765
2308/*****************************************************************************/ 2766/*****************************************************************************/
2309/* PerlIO::cede */ 2767/* PerlIO::cede */
2310 2768
… …
2312{ 2770{
2313 PerlIOBuf base; 2771 PerlIOBuf base;
2314 NV next, every; 2772 NV next, every;
2315} PerlIOCede; 2773} PerlIOCede;
2316 2774
2317static IV 2775static IV ecb_cold
2318PerlIOCede_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)
2319{ 2777{
2320 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2778 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2321 2779
2322 self->every = SvCUR (arg) ? SvNV (arg) : 0.01; 2780 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
2323 self->next = nvtime () + self->every; 2781 self->next = nvtime () + self->every;
2324 2782
2325 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab); 2783 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
2326} 2784}
2327 2785
2328static SV * 2786static SV * ecb_cold
2329PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags) 2787PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
2330{ 2788{
2331 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2789 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2332 2790
2333 return newSVnv (self->every); 2791 return newSVnv (self->every);
… …
2384/* Coro::Semaphore & Coro::Signal */ 2842/* Coro::Semaphore & Coro::Signal */
2385 2843
2386static SV * 2844static SV *
2387coro_waitarray_new (pTHX_ int count) 2845coro_waitarray_new (pTHX_ int count)
2388{ 2846{
2389 /* 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 */
2390 AV *av = newAV (); 2848 AV *av = newAV ();
2391 SV **ary; 2849 SV **ary;
2392 2850
2393 /* unfortunately, building manually saves memory */ 2851 /* unfortunately, building manually saves memory */
2394 Newx (ary, 2, SV *); 2852 Newx (ary, 2, SV *);
… …
2445 SvREFCNT_dec (cb); 2903 SvREFCNT_dec (cb);
2446 } 2904 }
2447} 2905}
2448 2906
2449static void 2907static void
2450coro_semaphore_on_destroy (pTHX_ struct coro *coro) 2908coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2451{ 2909{
2452 /* call $sem->adjust (0) to possibly wake up some other waiters */ 2910 /* call $sem->adjust (0) to possibly wake up some other waiters */
2453 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 2911 coro_semaphore_adjust (aTHX_ (AV *)frame->data, 0);
2454} 2912}
2455 2913
2456static int 2914static int
2457slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire) 2915slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2458{ 2916{
2459 AV *av = (AV *)frame->data; 2917 AV *av = (AV *)frame->data;
2460 SV *count_sv = AvARRAY (av)[0]; 2918 SV *count_sv = AvARRAY (av)[0];
2919 SV *coro_hv = SvRV (coro_current);
2461 2920
2462 /* 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 */
2463 if (CORO_THROW) 2922 if (CORO_THROW)
2464 return 0; 2923 return 0;
2465 else if (SvIVX (count_sv) > 0) 2924 else if (SvIVX (count_sv) > 0)
2466 { 2925 {
2467 SvSTATE_current->on_destroy = 0; 2926 frame->destroy = 0;
2468 2927
2469 if (acquire) 2928 if (acquire)
2470 SvIVX (count_sv) = SvIVX (count_sv) - 1; 2929 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2471 else 2930 else
2472 coro_semaphore_adjust (aTHX_ av, 0); 2931 coro_semaphore_adjust (aTHX_ av, 0);
… …
2477 { 2936 {
2478 int i; 2937 int i;
2479 /* 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 */
2480 /* 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 */
2481 /* this avoids some degenerate memory usage cases */ 2940 /* this avoids some degenerate memory usage cases */
2482 2941 for (i = AvFILLp (av); i > 0; --i) // i > 0 is not an off-by-one bug
2483 for (i = 1; i <= AvFILLp (av); ++i)
2484 if (AvARRAY (av)[i] == SvRV (coro_current)) 2942 if (AvARRAY (av)[i] == coro_hv)
2485 return 1; 2943 return 1;
2486 2944
2487 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2945 av_push (av, SvREFCNT_inc (coro_hv));
2488 return 1; 2946 return 1;
2489 } 2947 }
2490} 2948}
2491 2949
2492static int 2950static int
… …
2515 { 2973 {
2516 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2974 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2517 2975
2518 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 2976 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2519 frame->prepare = prepare_schedule; 2977 frame->prepare = prepare_schedule;
2520
2521 /* to avoid race conditions when a woken-up coro gets terminated */ 2978 /* to avoid race conditions when a woken-up coro gets terminated */
2522 /* we arrange for a temporary on_destroy that calls adjust (0) */ 2979 /* we arrange for a temporary on_destroy that calls adjust (0) */
2523 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 2980 frame->destroy = coro_semaphore_destroy;
2524 } 2981 }
2525} 2982}
2526 2983
2527static void 2984static void
2528slf_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)
… …
2536{ 2993{
2537 if (items >= 2) 2994 if (items >= 2)
2538 { 2995 {
2539 /* callback form */ 2996 /* callback form */
2540 AV *av = (AV *)SvRV (arg [0]); 2997 AV *av = (AV *)SvRV (arg [0]);
2541 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 2998 SV *cb_cv = s_get_cv_croak (arg [1]);
2542 2999
2543 av_push (av, (SV *)SvREFCNT_inc_NN (cb_cv)); 3000 av_push (av, SvREFCNT_inc_NN (cb_cv));
2544 3001
2545 if (SvIVX (AvARRAY (av)[0]) > 0) 3002 if (SvIVX (AvARRAY (av)[0]) > 0)
2546 coro_semaphore_adjust (aTHX_ av, 0); 3003 coro_semaphore_adjust (aTHX_ av, 0);
2547 3004
2548 frame->prepare = prepare_nop; 3005 frame->prepare = prepare_nop;
… …
2572 AvARRAY (av)[0] = AvARRAY (av)[1]; 3029 AvARRAY (av)[0] = AvARRAY (av)[1];
2573 AvARRAY (av)[1] = cb; 3030 AvARRAY (av)[1] = cb;
2574 3031
2575 cb = av_shift (av); 3032 cb = av_shift (av);
2576 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 {
2577 api_ready (aTHX_ cb); 3044 api_ready (aTHX_ cb);
2578 sv_setiv (cb, 0); /* signal waiter */ 3045 sv_setiv (cb, 0); /* signal waiter */
3046 }
3047
2579 SvREFCNT_dec (cb); 3048 SvREFCNT_dec (cb);
2580 3049
2581 --count; 3050 --count;
2582 } 3051 }
2583} 3052}
… …
2592static void 3061static void
2593slf_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)
2594{ 3063{
2595 AV *av = (AV *)SvRV (arg [0]); 3064 AV *av = (AV *)SvRV (arg [0]);
2596 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
2597 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]))
2598 { 3078 {
2599 SvIVX (AvARRAY (av)[0]) = 0; 3079 SvIVX (AvARRAY (av)[0]) = 0;
2600 frame->prepare = prepare_nop; 3080 frame->prepare = prepare_nop;
2601 frame->check = slf_check_nop; 3081 frame->check = slf_check_nop;
2602 } 3082 }
2603 else 3083 else
2604 { 3084 {
2605 SV *waiter = newRV_inc (SvRV (coro_current)); /* owned by signal av */ 3085 SV *waiter = newSVsv (coro_current); /* owned by signal av */
2606 3086
2607 av_push (av, waiter); 3087 av_push (av, waiter);
2608 3088
2609 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 */
2610 frame->prepare = prepare_schedule; 3090 frame->prepare = prepare_schedule;
… …
2628 3108
2629static void 3109static void
2630coro_aio_callback (pTHX_ CV *cv) 3110coro_aio_callback (pTHX_ CV *cv)
2631{ 3111{
2632 dXSARGS; 3112 dXSARGS;
2633 AV *state = (AV *)GENSUB_ARG; 3113 AV *state = (AV *)S_GENSUB_ARG;
2634 SV *coro = av_pop (state); 3114 SV *coro = av_pop (state);
2635 SV *data_sv = newSV (sizeof (struct io_state)); 3115 SV *data_sv = newSV (sizeof (struct io_state));
2636 3116
2637 av_extend (state, items - 1); 3117 av_extend (state, items - 1);
2638 3118
… …
2723 dSP; 3203 dSP;
2724 3204
2725 static SV *prio_cv; 3205 static SV *prio_cv;
2726 static SV *prio_sv; 3206 static SV *prio_sv;
2727 3207
2728 if (expect_false (!prio_cv)) 3208 if (ecb_expect_false (!prio_cv))
2729 { 3209 {
2730 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0); 3210 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0);
2731 prio_sv = newSViv (0); 3211 prio_sv = newSViv (0);
2732 } 3212 }
2733 3213
… …
2752 3232
2753 for (i = 0; i < items; ++i) 3233 for (i = 0; i < items; ++i)
2754 PUSHs (arg [i]); 3234 PUSHs (arg [i]);
2755 3235
2756 /* now push the callback closure */ 3236 /* now push the callback closure */
2757 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))));
2758 3238
2759 /* now call the AIO function - we assume our request is uncancelable */ 3239 /* now call the AIO function - we assume our request is uncancelable */
2760 PUTBACK; 3240 PUTBACK;
2761 call_sv ((SV *)req, G_VOID | G_DISCARD); 3241 call_sv ((SV *)req, G_VOID | G_DISCARD);
2762 } 3242 }
2763 3243
2764 /* 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 */
2765 frame->data = (void *)state; 3245 frame->data = (void *)state;
2766 frame->prepare = prepare_schedule; 3246 frame->prepare = prepare_schedule;
2767 frame->check = slf_check_aio_req; 3247 frame->check = slf_check_aio_req;
2768} 3248}
2769 3249
… …
2779 3259
2780/*****************************************************************************/ 3260/*****************************************************************************/
2781 3261
2782#if CORO_CLONE 3262#if CORO_CLONE
2783# 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);
2784#endif 3326#endif
2785 3327
2786MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3328MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2787 3329
2788PROTOTYPES: DISABLE 3330PROTOTYPES: DISABLE
… …
2842 coroapi.prepare_nop = prepare_nop; 3384 coroapi.prepare_nop = prepare_nop;
2843 coroapi.prepare_schedule = prepare_schedule; 3385 coroapi.prepare_schedule = prepare_schedule;
2844 coroapi.prepare_cede = prepare_cede; 3386 coroapi.prepare_cede = prepare_cede;
2845 coroapi.prepare_cede_notself = prepare_cede_notself; 3387 coroapi.prepare_cede_notself = prepare_cede_notself;
2846 3388
2847 { 3389 time_init (aTHX);
2848 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
2849 3390
2850 if (!svp) croak ("Time::HiRes is required");
2851 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
2852
2853 nvtime = INT2PTR (double (*)(), SvIV (*svp));
2854 }
2855
2856 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 3391 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
2857} 3392}
2858 3393
2859SV * 3394SV *
2860new (char *klass, ...) 3395new (SV *klass, ...)
2861 ALIAS: 3396 ALIAS:
2862 Coro::new = 1 3397 Coro::new = 1
2863 CODE: 3398 CODE:
2864{ 3399 RETVAL = coro_new (aTHX_ ix ? coro_stash : coro_state_stash, &ST (1), items - 1, ix);
2865 struct coro *coro; 3400 OUTPUT:
2866 MAGIC *mg;
2867 HV *hv;
2868 CV *cb;
2869 int i;
2870
2871 if (items > 1)
2872 {
2873 cb = coro_sv_2cv (aTHX_ ST (1));
2874
2875 if (!ix)
2876 {
2877 if (CvISXSUB (cb))
2878 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
2879
2880 if (!CvROOT (cb))
2881 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
2882 }
2883 }
2884
2885 Newz (0, coro, 1, struct coro);
2886 coro->args = newAV ();
2887 coro->flags = CF_NEW;
2888
2889 if (coro_first) coro_first->prev = coro;
2890 coro->next = coro_first;
2891 coro_first = coro;
2892
2893 coro->hv = hv = newHV ();
2894 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
2895 mg->mg_flags |= MGf_DUP;
2896 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
2897
2898 if (items > 1)
2899 {
2900 av_extend (coro->args, items - 1 + ix - 1);
2901
2902 if (ix)
2903 {
2904 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
2905 cb = cv_coro_run;
2906 }
2907
2908 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
2909
2910 for (i = 2; i < items; i++)
2911 av_push (coro->args, newSVsv (ST (i)));
2912 }
2913}
2914 OUTPUT:
2915 RETVAL 3401 RETVAL
2916 3402
2917void 3403void
2918transfer (...) 3404transfer (...)
2919 PROTOTYPE: $$ 3405 PROTOTYPE: $$
2920 CODE: 3406 CODE:
2921 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3407 CORO_EXECUTE_SLF_XS (slf_init_transfer);
2922
2923bool
2924_destroy (SV *coro_sv)
2925 CODE:
2926 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
2927 OUTPUT:
2928 RETVAL
2929 3408
2930void 3409void
2931_exit (int code) 3410_exit (int code)
2932 PROTOTYPE: $ 3411 PROTOTYPE: $
2933 CODE: 3412 CODE:
… …
3008 eval = 1 3487 eval = 1
3009 CODE: 3488 CODE:
3010{ 3489{
3011 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3490 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
3012 { 3491 {
3013 struct coro temp; 3492 struct coro *current = SvSTATE_current;
3493 struct CoroSLF slf_save;
3014 3494
3015 if (!(coro->flags & CF_RUNNING)) 3495 if (current != coro)
3016 { 3496 {
3017 PUTBACK; 3497 PUTBACK;
3018 save_perl (aTHX_ &temp); 3498 save_perl (aTHX_ current);
3019 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;
3509 SPAGAIN;
3020 } 3510 }
3021 3511
3022 {
3023 dSP;
3024 ENTER;
3025 SAVETMPS;
3026 PUTBACK;
3027 PUSHSTACK; 3512 PUSHSTACK;
3513
3028 PUSHMARK (SP); 3514 PUSHMARK (SP);
3515 PUTBACK;
3029 3516
3030 if (ix) 3517 if (ix)
3031 eval_sv (coderef, 0); 3518 eval_sv (coderef, 0);
3032 else 3519 else
3033 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 3520 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
3034 3521
3035 POPSTACK; 3522 POPSTACK;
3036 SPAGAIN; 3523 SPAGAIN;
3037 FREETMPS;
3038 LEAVE;
3039 PUTBACK;
3040 }
3041 3524
3042 if (!(coro->flags & CF_RUNNING)) 3525 if (current != coro)
3043 { 3526 {
3527 PUTBACK;
3528 slf_frame = slf_save;
3044 save_perl (aTHX_ coro); 3529 save_perl (aTHX_ coro);
3045 load_perl (aTHX_ &temp); 3530 load_perl (aTHX_ current);
3046 SPAGAIN; 3531 SPAGAIN;
3047 } 3532 }
3048 } 3533 }
3049} 3534}
3050 3535
… …
3053 PROTOTYPE: $ 3538 PROTOTYPE: $
3054 ALIAS: 3539 ALIAS:
3055 is_ready = CF_READY 3540 is_ready = CF_READY
3056 is_running = CF_RUNNING 3541 is_running = CF_RUNNING
3057 is_new = CF_NEW 3542 is_new = CF_NEW
3058 is_destroyed = CF_DESTROYED 3543 is_destroyed = CF_ZOMBIE
3544 is_zombie = CF_ZOMBIE
3545 is_suspended = CF_SUSPENDED
3059 CODE: 3546 CODE:
3060 RETVAL = boolSV (coro->flags & ix); 3547 RETVAL = boolSV (coro->flags & ix);
3061 OUTPUT: 3548 OUTPUT:
3062 RETVAL 3549 RETVAL
3063 3550
3064void 3551void
3065throw (Coro::State self, SV *throw = &PL_sv_undef) 3552throw (Coro::State self, SV *exception = &PL_sv_undef)
3066 PROTOTYPE: $;$ 3553 PROTOTYPE: $;$
3067 CODE: 3554 CODE:
3068{ 3555{
3069 struct coro *current = SvSTATE_current; 3556 struct coro *current = SvSTATE_current;
3070 SV **throwp = self == current ? &CORO_THROW : &self->except; 3557 SV **exceptionp = self == current ? &CORO_THROW : &self->except;
3071 SvREFCNT_dec (*throwp); 3558 SvREFCNT_dec (*exceptionp);
3072 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3559 SvGETMAGIC (exception);
3560 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3073} 3561}
3074 3562
3075void 3563void
3076api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3564api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3077 PROTOTYPE: $;$ 3565 PROTOTYPE: $;$
… …
3128 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv; 3616 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
3129 3617
3130 SV *tmp = *src; *src = *dst; *dst = tmp; 3618 SV *tmp = *src; *src = *dst; *dst = tmp;
3131 } 3619 }
3132 3620
3621void
3622cancel (Coro::State self)
3623 CODE:
3624 coro_state_destroy (aTHX_ self);
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}
3681
3133 3682
3134MODULE = Coro::State PACKAGE = Coro 3683MODULE = Coro::State PACKAGE = Coro
3135 3684
3136BOOT: 3685BOOT:
3137{ 3686{
3138 int i;
3139
3140 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3687 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3141 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3688 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3142 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 3689 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3143 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3144 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);
3145 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 3691 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3146 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 3692 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3147 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 3693 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3148 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 3694 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3149 3695
3150 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);
3151 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3697 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3152 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);
3153 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 */
3154 3700
3155 coro_stash = gv_stashpv ("Coro", TRUE); 3701 coro_stash = gv_stashpv ("Coro", TRUE);
3156 3702
3157 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 3703 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3158 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 3704 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3159 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 3705 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
3160 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 3706 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (CORO_PRIO_LOW));
3161 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE)); 3707 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (CORO_PRIO_IDLE));
3162 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN)); 3708 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (CORO_PRIO_MIN));
3163
3164 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
3165 coro_ready[i] = newAV ();
3166 3709
3167 { 3710 {
3168 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 3711 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
3169 3712
3170 coroapi.schedule = api_schedule; 3713 coroapi.schedule = api_schedule;
… …
3180 sv_setiv (sv, (IV)&coroapi); 3723 sv_setiv (sv, (IV)&coroapi);
3181 SvREADONLY_on (sv); 3724 SvREADONLY_on (sv);
3182 } 3725 }
3183} 3726}
3184 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
3185void 3753void
3186terminate (...) 3754terminate (...)
3187 CODE: 3755 CODE:
3188 CORO_EXECUTE_SLF_XS (slf_init_terminate); 3756 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3189 3757
3190void 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
3766
3767void
3191schedule (...) 3768schedule (...)
3192 CODE: 3769 CODE:
3193 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3770 CORO_EXECUTE_SLF_XS (slf_init_schedule);
3194 3771
3195void 3772void
… …
3209 3786
3210void 3787void
3211cede_notself (...) 3788cede_notself (...)
3212 CODE: 3789 CODE:
3213 CORO_EXECUTE_SLF_XS (slf_init_cede_notself); 3790 CORO_EXECUTE_SLF_XS (slf_init_cede_notself);
3214
3215void
3216_cancel (Coro::State self)
3217 CODE:
3218 coro_state_destroy (aTHX_ self);
3219 coro_call_on_destroy (aTHX_ self);
3220 3791
3221void 3792void
3222_set_current (SV *current) 3793_set_current (SV *current)
3223 PROTOTYPE: $ 3794 PROTOTYPE: $
3224 CODE: 3795 CODE:
… …
3228void 3799void
3229_set_readyhook (SV *hook) 3800_set_readyhook (SV *hook)
3230 PROTOTYPE: $ 3801 PROTOTYPE: $
3231 CODE: 3802 CODE:
3232 SvREFCNT_dec (coro_readyhook); 3803 SvREFCNT_dec (coro_readyhook);
3804 SvGETMAGIC (hook);
3805 if (SvOK (hook))
3806 {
3233 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 }
3234 3815
3235int 3816int
3236prio (Coro::State coro, int newprio = 0) 3817prio (Coro::State coro, int newprio = 0)
3237 PROTOTYPE: $;$ 3818 PROTOTYPE: $;$
3238 ALIAS: 3819 ALIAS:
… …
3244 if (items > 1) 3825 if (items > 1)
3245 { 3826 {
3246 if (ix) 3827 if (ix)
3247 newprio = coro->prio - newprio; 3828 newprio = coro->prio - newprio;
3248 3829
3249 if (newprio < PRIO_MIN) newprio = PRIO_MIN; 3830 if (newprio < CORO_PRIO_MIN) newprio = CORO_PRIO_MIN;
3250 if (newprio > PRIO_MAX) newprio = PRIO_MAX; 3831 if (newprio > CORO_PRIO_MAX) newprio = CORO_PRIO_MAX;
3251 3832
3252 coro->prio = newprio; 3833 coro->prio = newprio;
3253 } 3834 }
3254} 3835}
3255 OUTPUT: 3836 OUTPUT:
… …
3270 RETVAL = coro_nready; 3851 RETVAL = coro_nready;
3271 OUTPUT: 3852 OUTPUT:
3272 RETVAL 3853 RETVAL
3273 3854
3274void 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
3275_pool_handler (...) 3868_pool_handler (...)
3276 CODE: 3869 CODE:
3277 CORO_EXECUTE_SLF_XS (slf_init_pool_handler); 3870 CORO_EXECUTE_SLF_XS (slf_init_pool_handler);
3278 3871
3279void 3872void
… …
3290 for (i = 1; i < items; ++i) 3883 for (i = 1; i < items; ++i)
3291 av_push (av, SvREFCNT_inc_NN (ST (i))); 3884 av_push (av, SvREFCNT_inc_NN (ST (i)));
3292 3885
3293 if ((SV *)hv == &PL_sv_undef) 3886 if ((SV *)hv == &PL_sv_undef)
3294 { 3887 {
3295 PUSHMARK (SP); 3888 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3296 EXTEND (SP, 2);
3297 PUSHs (sv_Coro);
3298 PUSHs ((SV *)cv_pool_handler);
3299 PUTBACK;
3300 call_sv ((SV *)cv_coro_state_new, G_SCALAR);
3301 SPAGAIN;
3302
3303 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs)); 3889 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
3890 SvREFCNT_dec (sv);
3304 } 3891 }
3305 3892
3306 { 3893 {
3307 struct coro *coro = SvSTATE_hv (hv); 3894 struct coro *coro = SvSTATE_hv (hv);
3308 3895
… …
3332rouse_wait (...) 3919rouse_wait (...)
3333 PROTOTYPE: ;$ 3920 PROTOTYPE: ;$
3334 PPCODE: 3921 PPCODE:
3335 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait); 3922 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait);
3336 3923
3924void
3925on_enter (SV *block)
3926 ALIAS:
3927 on_leave = 1
3928 PROTOTYPE: &
3929 CODE:
3930{
3931 struct coro *coro = SvSTATE_current;
3932 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3933
3934 block = s_get_cv_croak (block);
3935
3936 if (!*avp)
3937 *avp = newAV ();
3938
3939 av_push (*avp, SvREFCNT_inc (block));
3940
3941 if (!ix)
3942 on_enterleave_call (aTHX_ block);
3943
3944 LEAVE; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
3945 SAVEDESTRUCTOR_X (ix ? coro_pop_on_leave : coro_pop_on_enter, (void *)coro);
3946 ENTER; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
3947}
3948
3337 3949
3338MODULE = Coro::State PACKAGE = PerlIO::cede 3950MODULE = Coro::State PACKAGE = PerlIO::cede
3339 3951
3340BOOT: 3952BOOT:
3341 PerlIO_define_layer (aTHX_ &PerlIO_cede); 3953 PerlIO_define_layer (aTHX_ &PerlIO_cede);
… …
3344MODULE = Coro::State PACKAGE = Coro::Semaphore 3956MODULE = Coro::State PACKAGE = Coro::Semaphore
3345 3957
3346SV * 3958SV *
3347new (SV *klass, SV *count = 0) 3959new (SV *klass, SV *count = 0)
3348 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
3349 RETVAL = sv_bless ( 3972 RETVAL = sv_bless (
3350 coro_waitarray_new (aTHX_ count && SvOK (count) ? SvIV (count) : 1), 3973 coro_waitarray_new (aTHX_ semcnt),
3351 GvSTASH (CvGV (cv)) 3974 GvSTASH (CvGV (cv))
3352 ); 3975 );
3976}
3353 OUTPUT: 3977 OUTPUT:
3354 RETVAL 3978 RETVAL
3355 3979
3356# helper for Coro::Channel 3980# helper for Coro::Channel and others
3357SV * 3981SV *
3358_alloc (int count) 3982_alloc (int count)
3359 CODE: 3983 CODE:
3360 RETVAL = coro_waitarray_new (aTHX_ count); 3984 RETVAL = coro_waitarray_new (aTHX_ count);
3361 OUTPUT: 3985 OUTPUT:
… …
3419 for (i = 1; i <= wcount; ++i) 4043 for (i = 1; i <= wcount; ++i)
3420 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i]))); 4044 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i])));
3421 } 4045 }
3422} 4046}
3423 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
3424MODULE = Coro::State PACKAGE = Coro::Signal 4064MODULE = Coro::State PACKAGE = Coro::Signal
3425 4065
3426SV * 4066SV *
3427new (SV *klass) 4067new (SV *klass)
3428 CODE: 4068 CODE:
… …
3499 4139
3500void 4140void
3501_register (char *target, char *proto, SV *req) 4141_register (char *target, char *proto, SV *req)
3502 CODE: 4142 CODE:
3503{ 4143{
3504 CV *req_cv = coro_sv_2cv (aTHX_ req); 4144 SV *req_cv = s_get_cv_croak (req);
3505 /* newXSproto doesn't return the CV on 5.8 */ 4145 /* newXSproto doesn't return the CV on 5.8 */
3506 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 4146 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3507 sv_setpv ((SV *)slf_cv, proto); 4147 sv_setpv ((SV *)slf_cv, proto);
3508 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);
3509} 4149}
3510 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