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.359 by root, Mon Jun 29 05:07:19 2009 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
… …
170# define CORO_CLOCK_THREAD_CPUTIME_ID 3 108# define CORO_CLOCK_THREAD_CPUTIME_ID 3
171# endif 109# endif
172#endif 110#endif
173 111
174static 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]);
175 114
176/* we hijack an hopefully unused CV flag for our purposes */ 115/* we hijack an hopefully unused CV flag for our purposes */
177#define CVf_SLF 0x4000 116#define CVf_SLF 0x4000
178static OP *pp_slf (pTHX); 117static OP *pp_slf (pTHX);
118static void slf_destroy (pTHX_ struct coro *coro);
179 119
180static U32 cctx_gen; 120static U32 cctx_gen;
181static size_t cctx_stacksize = CORO_STACKSIZE; 121static size_t cctx_stacksize = CORO_STACKSIZE;
182static struct CoroAPI coroapi; 122static struct CoroAPI coroapi;
183static AV *main_mainstack; /* used to differentiate between $main and others */ 123static AV *main_mainstack; /* used to differentiate between $main and others */
… …
200static SV *sv_pool_size; 140static SV *sv_pool_size;
201static SV *sv_async_pool_idle; /* description string */ 141static SV *sv_async_pool_idle; /* description string */
202static AV *av_async_pool; /* idle pool */ 142static AV *av_async_pool; /* idle pool */
203static SV *sv_Coro; /* class string */ 143static SV *sv_Coro; /* class string */
204static CV *cv_pool_handler; 144static CV *cv_pool_handler;
205static CV *cv_coro_state_new;
206 145
207/* Coro::AnyEvent */ 146/* Coro::AnyEvent */
208static SV *sv_activity; 147static SV *sv_activity;
209 148
210/* enable processtime/realtime profiling */ 149/* enable processtime/realtime profiling */
211static char profile_times; 150static char enable_times;
212typedef U32 coro_ts[2]; 151typedef U32 coro_ts[2];
152static coro_ts time_real, time_cpu;
153static char times_valid;
213 154
214static struct coro_cctx *cctx_first; 155static struct coro_cctx *cctx_first;
215static int cctx_count, cctx_idle; 156static int cctx_count, cctx_idle;
216 157
217enum { 158enum
159{
218 CC_MAPPED = 0x01, 160 CC_MAPPED = 0x01,
219 CC_NOREUSE = 0x02, /* throw this away after tracing */ 161 CC_NOREUSE = 0x02, /* throw this away after tracing */
220 CC_TRACE = 0x04, 162 CC_TRACE = 0x04,
221 CC_TRACE_SUB = 0x08, /* trace sub calls */ 163 CC_TRACE_SUB = 0x08, /* trace sub calls */
222 CC_TRACE_LINE = 0x10, /* trace each statement */ 164 CC_TRACE_LINE = 0x10, /* trace each statement */
… …
243 int valgrind_id; 185 int valgrind_id;
244#endif 186#endif
245 unsigned char flags; 187 unsigned char flags;
246} coro_cctx; 188} coro_cctx;
247 189
248coro_cctx *cctx_current; /* the currently running cctx */ 190static coro_cctx *cctx_current; /* the currently running cctx */
249 191
250/*****************************************************************************/ 192/*****************************************************************************/
251 193
194static MGVTBL coro_state_vtbl;
195
252enum { 196enum
197{
253 CF_RUNNING = 0x0001, /* coroutine is running */ 198 CF_RUNNING = 0x0001, /* coroutine is running */
254 CF_READY = 0x0002, /* coroutine is ready */ 199 CF_READY = 0x0002, /* coroutine is ready */
255 CF_NEW = 0x0004, /* has never been switched to */ 200 CF_NEW = 0x0004, /* has never been switched to */
256 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 201 CF_ZOMBIE = 0x0008, /* coroutine data has been freed */
257 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */ 202 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
203 CF_NOCANCEL = 0x0020, /* cannot cancel, set slf_frame.data to 1 (hackish) */
258}; 204};
259 205
260/* 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 */
261typedef struct 207typedef struct
262{ 208{
… …
268#define VAR(name,type) type name; 214#define VAR(name,type) type name;
269# include "state.h" 215# include "state.h"
270#undef VAR 216#undef VAR
271} perl_slots; 217} perl_slots;
272 218
219// how many context stack entries do we need for perl_slots
273#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))
274 221
275/* this is a structure representing a perl-level coroutine */ 222/* this is a structure representing a perl-level coroutine */
276struct coro { 223struct coro
224{
277 /* the C coroutine allocated to this perl coroutine, if any */ 225 /* the C coroutine allocated to this perl coroutine, if any */
278 coro_cctx *cctx; 226 coro_cctx *cctx;
279 227
280 /* ready queue */ 228 /* ready queue */
281 struct coro *next_ready; 229 struct coro *next_ready;
… …
283 /* state data */ 231 /* state data */
284 struct CoroSLF slf_frame; /* saved slf frame */ 232 struct CoroSLF slf_frame; /* saved slf frame */
285 AV *mainstack; 233 AV *mainstack;
286 perl_slots *slot; /* basically the saved sp */ 234 perl_slots *slot; /* basically the saved sp */
287 235
288 CV *startcv; /* the CV to execute */ 236 CV *startcv; /* the CV to execute */
289 AV *args; /* data associated with this coroutine (initial args) */ 237 AV *args; /* data associated with this coroutine (initial args) */
290 int refcnt; /* coroutines are refcounted, yes */
291 int flags; /* CF_ flags */ 238 int flags; /* CF_ flags */
292 HV *hv; /* the perl hash associated with this coro, if any */ 239 HV *hv; /* the perl hash associated with this coro, if any */
293 void (*on_destroy)(pTHX_ struct coro *coro);
294 240
295 /* statistics */ 241 /* statistics */
296 int usecount; /* number of transfers to this coro */ 242 int usecount; /* number of transfers to this coro */
297 243
298 /* coro process data */ 244 /* coro process data */
299 int prio; 245 int prio;
300 SV *except; /* exception to be thrown */ 246 SV *except; /* exception to be thrown */
301 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 */
302 250
303 /* async_pool */ 251 /* async_pool */
304 SV *saved_deffh; 252 SV *saved_deffh;
305 SV *invoke_cb; 253 SV *invoke_cb;
306 AV *invoke_av; 254 AV *invoke_av;
307 255
308 /* on_enter/on_leave */ 256 /* on_enter/on_leave */
309 AV *on_enter; 257 AV *on_enter;
310 AV *on_leave; 258 AV *on_leave;
311 259
260 /* swap_sv */
261 AV *swap_sv;
262
263 /* times */
264 coro_ts t_cpu, t_real;
265
312 /* linked list */ 266 /* linked list */
313 struct coro *next, *prev; 267 struct coro *next, *prev;
314}; 268};
315 269
316typedef struct coro *Coro__State; 270typedef struct coro *Coro__State;
317typedef struct coro *Coro__State_or_hashref; 271typedef struct coro *Coro__State_or_hashref;
318 272
319/* the following variables are effectively part of the perl context */ 273/* the following variables are effectively part of the perl context */
320/* and get copied between struct coro and these variables */ 274/* and get copied between struct coro and these variables */
321/* the mainr easonw e don't support windows process emulation */ 275/* the main reason we don't support windows process emulation */
322static struct CoroSLF slf_frame; /* the current slf frame */ 276static struct CoroSLF slf_frame; /* the current slf frame */
323 277
324/** Coro ********************************************************************/ 278/** Coro ********************************************************************/
325 279
326#define CORO_PRIO_MAX 3 280#define CORO_PRIO_MAX 3
… …
332 286
333/* for Coro.pm */ 287/* for Coro.pm */
334static SV *coro_current; 288static SV *coro_current;
335static SV *coro_readyhook; 289static SV *coro_readyhook;
336static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */ 290static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
337static CV *cv_coro_run, *cv_coro_terminate; 291static CV *cv_coro_run;
338static struct coro *coro_first; 292static struct coro *coro_first;
339#define coro_nready coroapi.nready 293#define coro_nready coroapi.nready
340 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
341/** lowlevel stuff **********************************************************/ 367/** lowlevel stuff **********************************************************/
342 368
343static SV * 369static SV * ecb_noinline
344coro_get_sv (pTHX_ const char *name, int create) 370coro_get_sv (pTHX_ const char *name, int create)
345{ 371{
346#if PERL_VERSION_ATLEAST (5,10,0) 372#if PERL_VERSION_ATLEAST (5,10,0)
347 /* 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 */
348 get_sv (name, create); 374 get_sv (name, create);
349#endif 375#endif
350 return get_sv (name, create); 376 return get_sv (name, create);
351} 377}
352 378
353static AV * 379static AV * ecb_noinline
354coro_get_av (pTHX_ const char *name, int create) 380coro_get_av (pTHX_ const char *name, int create)
355{ 381{
356#if PERL_VERSION_ATLEAST (5,10,0) 382#if PERL_VERSION_ATLEAST (5,10,0)
357 /* 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 */
358 get_av (name, create); 384 get_av (name, create);
359#endif 385#endif
360 return get_av (name, create); 386 return get_av (name, create);
361} 387}
362 388
363static HV * 389static HV * ecb_noinline
364coro_get_hv (pTHX_ const char *name, int create) 390coro_get_hv (pTHX_ const char *name, int create)
365{ 391{
366#if PERL_VERSION_ATLEAST (5,10,0) 392#if PERL_VERSION_ATLEAST (5,10,0)
367 /* 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 */
368 get_hv (name, create); 394 get_hv (name, create);
369#endif 395#endif
370 return get_hv (name, create); 396 return get_hv (name, create);
371} 397}
372 398
373/* may croak */ 399ECB_INLINE void
374INLINE CV * 400coro_times_update ()
375coro_sv_2cv (pTHX_ SV *sv)
376{ 401{
377 HV *st; 402#ifdef coro_clock_gettime
378 GV *gvp; 403 struct timespec ts;
379 CV *cv = sv_2cv (sv, &st, &gvp, 0);
380 404
381 if (!cv) 405 ts.tv_sec = ts.tv_nsec = 0;
382 croak ("code reference expected"); 406 coro_clock_gettime (CORO_CLOCK_THREAD_CPUTIME_ID, &ts);
407 time_cpu [0] = ts.tv_sec; time_cpu [1] = ts.tv_nsec;
383 408
384 return cv; 409 ts.tv_sec = ts.tv_nsec = 0;
410 coro_clock_gettime (CORO_CLOCK_MONOTONIC, &ts);
411 time_real [0] = ts.tv_sec; time_real [1] = ts.tv_nsec;
412#else
413 dTHX;
414 UV tv[2];
415
416 u2time (aTHX_ tv);
417 time_real [0] = tv [0];
418 time_real [1] = tv [1] * 1000;
419#endif
420}
421
422ECB_INLINE void
423coro_times_add (struct coro *c)
424{
425 c->t_real [1] += time_real [1];
426 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
427 c->t_real [0] += time_real [0];
428
429 c->t_cpu [1] += time_cpu [1];
430 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
431 c->t_cpu [0] += time_cpu [0];
432}
433
434ECB_INLINE void
435coro_times_sub (struct coro *c)
436{
437 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; }
438 c->t_real [1] -= time_real [1];
439 c->t_real [0] -= time_real [0];
440
441 if (c->t_cpu [1] < time_cpu [1]) { c->t_cpu [1] += 1000000000; --c->t_cpu [0]; }
442 c->t_cpu [1] -= time_cpu [1];
443 c->t_cpu [0] -= time_cpu [0];
385} 444}
386 445
387/*****************************************************************************/ 446/*****************************************************************************/
388/* magic glue */ 447/* magic glue */
389 448
390#define CORO_MAGIC_type_cv 26 449#define CORO_MAGIC_type_cv 26
391#define CORO_MAGIC_type_state PERL_MAGIC_ext 450#define CORO_MAGIC_type_state PERL_MAGIC_ext
392 451
393#define CORO_MAGIC_NN(sv, type) \ 452#define CORO_MAGIC_NN(sv, type) \
394 (expect_true (SvMAGIC (sv)->mg_type == type) \ 453 (ecb_expect_true (SvMAGIC (sv)->mg_type == type) \
395 ? SvMAGIC (sv) \ 454 ? SvMAGIC (sv) \
396 : mg_find (sv, type)) 455 : mg_find (sv, type))
397 456
398#define CORO_MAGIC(sv, type) \ 457#define CORO_MAGIC(sv, type) \
399 (expect_true (SvMAGIC (sv)) \ 458 (ecb_expect_true (SvMAGIC (sv)) \
400 ? CORO_MAGIC_NN (sv, type) \ 459 ? CORO_MAGIC_NN (sv, type) \
401 : 0) 460 : 0)
402 461
403#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)
404#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)
405 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
406INLINE struct coro * 480ECB_INLINE struct coro *
407SvSTATE_ (pTHX_ SV *coro) 481SvSTATE_ (pTHX_ SV *coro)
408{ 482{
409 HV *stash;
410 MAGIC *mg; 483 MAGIC *mg;
411 484
412 if (SvROK (coro)) 485 if (SvROK (coro))
413 coro = SvRV (coro); 486 coro = SvRV (coro);
414 487
415 if (expect_false (SvTYPE (coro) != SVt_PVHV)) 488 mg = SvSTATEhv_p (aTHX_ coro);
489 if (!mg)
416 croak ("Coro::State object required"); 490 croak ("Coro::State object required");
417 491
418 stash = SvSTASH (coro);
419 if (expect_false (stash != coro_stash && stash != coro_state_stash))
420 {
421 /* very slow, but rare, check */
422 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
423 croak ("Coro::State object required");
424 }
425
426 mg = CORO_MAGIC_state (coro);
427 return (struct coro *)mg->mg_ptr; 492 return (struct coro *)mg->mg_ptr;
428} 493}
429 494
430#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 495#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
431 496
… …
434#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 499#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
435 500
436/*****************************************************************************/ 501/*****************************************************************************/
437/* padlist management and caching */ 502/* padlist management and caching */
438 503
439static AV * 504ECB_INLINE AV *
440coro_derive_padlist (pTHX_ CV *cv) 505coro_derive_padlist (pTHX_ CV *cv)
441{ 506{
442 AV *padlist = CvPADLIST (cv); 507 AV *padlist = CvPADLIST (cv);
443 AV *newpadlist, *newpad; 508 AV *newpadlist, *newpad;
444 509
… …
456 av_store (newpadlist, 1, (SV *)newpad); 521 av_store (newpadlist, 1, (SV *)newpad);
457 522
458 return newpadlist; 523 return newpadlist;
459} 524}
460 525
461static void 526ECB_INLINE void
462free_padlist (pTHX_ AV *padlist) 527free_padlist (pTHX_ AV *padlist)
463{ 528{
464 /* may be during global destruction */ 529 /* may be during global destruction */
465 if (!IN_DESTRUCT) 530 if (!IN_DESTRUCT)
466 { 531 {
… …
492 AV *padlist; 557 AV *padlist;
493 AV *av = (AV *)mg->mg_obj; 558 AV *av = (AV *)mg->mg_obj;
494 559
495 /* perl manages to free our internal AV and _then_ call us */ 560 /* perl manages to free our internal AV and _then_ call us */
496 if (IN_DESTRUCT) 561 if (IN_DESTRUCT)
497 return; 562 return 0;
498 563
499 /* casting is fun. */ 564 /* casting is fun. */
500 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 565 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
501 free_padlist (aTHX_ padlist); 566 free_padlist (aTHX_ padlist);
502 567
… …
509 0, 0, 0, 0, 574 0, 0, 0, 0,
510 coro_cv_free 575 coro_cv_free
511}; 576};
512 577
513/* the next two functions merely cache the padlists */ 578/* the next two functions merely cache the padlists */
514static void 579ECB_INLINE void
515get_padlist (pTHX_ CV *cv) 580get_padlist (pTHX_ CV *cv)
516{ 581{
517 MAGIC *mg = CORO_MAGIC_cv (cv); 582 MAGIC *mg = CORO_MAGIC_cv (cv);
518 AV *av; 583 AV *av;
519 584
520 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 585 if (ecb_expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0))
521 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 586 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
522 else 587 else
523 { 588 {
524#if CORO_PREFER_PERL_FUNCTIONS 589#if CORO_PREFER_PERL_FUNCTIONS
525 /* this is probably cleaner? but also slower! */ 590 /* this is probably cleaner? but also slower! */
… …
532 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 597 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
533#endif 598#endif
534 } 599 }
535} 600}
536 601
537static void 602ECB_INLINE void
538put_padlist (pTHX_ CV *cv) 603put_padlist (pTHX_ CV *cv)
539{ 604{
540 MAGIC *mg = CORO_MAGIC_cv (cv); 605 MAGIC *mg = CORO_MAGIC_cv (cv);
541 AV *av; 606 AV *av;
542 607
543 if (expect_false (!mg)) 608 if (ecb_expect_false (!mg))
544 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);
545 610
546 av = (AV *)mg->mg_obj; 611 av = (AV *)mg->mg_obj;
547 612
548 if (expect_false (AvFILLp (av) >= AvMAX (av))) 613 if (ecb_expect_false (AvFILLp (av) >= AvMAX (av)))
549 av_extend (av, AvFILLp (av) + 1); 614 av_extend (av, AvFILLp (av) + 1);
550 615
551 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 616 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
552} 617}
553 618
554/** 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))
555 671
556static void 672static void
557on_enterleave_call (pTHX_ SV *cb); 673on_enterleave_call (pTHX_ SV *cb);
558 674
559static void 675static void
… …
578 dSP; 694 dSP;
579 695
580 CV *cv; 696 CV *cv;
581 697
582 /* now do the ugly restore mess */ 698 /* now do the ugly restore mess */
583 while (expect_true (cv = (CV *)POPs)) 699 while (ecb_expect_true (cv = (CV *)POPs))
584 { 700 {
585 put_padlist (aTHX_ cv); /* mark this padlist as available */ 701 put_padlist (aTHX_ cv); /* mark this padlist as available */
586 CvDEPTH (cv) = PTR2IV (POPs); 702 CvDEPTH (cv) = PTR2IV (POPs);
587 CvPADLIST (cv) = (AV *)POPs; 703 CvPADLIST (cv) = (AV *)POPs;
588 } 704 }
… …
591 } 707 }
592 708
593 slf_frame = c->slf_frame; 709 slf_frame = c->slf_frame;
594 CORO_THROW = c->except; 710 CORO_THROW = c->except;
595 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
596 if (expect_false (c->on_enter)) 720 if (ecb_expect_false (c->on_enter))
597 { 721 {
598 int i; 722 int i;
599 723
600 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 724 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
601 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 725 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
602 } 726 }
727
728 SWAP_SVS (c);
603} 729}
604 730
605static void 731static void
606save_perl (pTHX_ Coro__State c) 732save_perl (pTHX_ Coro__State c)
607{ 733{
734 SWAP_SVS (c);
735
608 if (expect_false (c->on_leave)) 736 if (ecb_expect_false (c->on_leave))
609 { 737 {
610 int i; 738 int i;
611 739
612 for (i = AvFILLp (c->on_leave); i >= 0; --i) 740 for (i = AvFILLp (c->on_leave); i >= 0; --i)
613 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]); 741 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
742 }
743
744 times_valid = 0;
745
746 if (ecb_expect_false (enable_times))
747 {
748 coro_times_update (); times_valid = 1;
749 coro_times_add (c);
614 } 750 }
615 751
616 c->except = CORO_THROW; 752 c->except = CORO_THROW;
617 c->slf_frame = slf_frame; 753 c->slf_frame = slf_frame;
618 754
… …
629 765
630 XPUSHs (Nullsv); 766 XPUSHs (Nullsv);
631 /* this loop was inspired by pp_caller */ 767 /* this loop was inspired by pp_caller */
632 for (;;) 768 for (;;)
633 { 769 {
634 while (expect_true (cxix >= 0)) 770 while (ecb_expect_true (cxix >= 0))
635 { 771 {
636 PERL_CONTEXT *cx = &ccstk[cxix--]; 772 PERL_CONTEXT *cx = &ccstk[cxix--];
637 773
638 if (expect_true (CxTYPE (cx) == CXt_SUB) || expect_false (CxTYPE (cx) == CXt_FORMAT)) 774 if (ecb_expect_true (CxTYPE (cx) == CXt_SUB) || ecb_expect_false (CxTYPE (cx) == CXt_FORMAT))
639 { 775 {
640 CV *cv = cx->blk_sub.cv; 776 CV *cv = cx->blk_sub.cv;
641 777
642 if (expect_true (CvDEPTH (cv))) 778 if (ecb_expect_true (CvDEPTH (cv)))
643 { 779 {
644 EXTEND (SP, 3); 780 EXTEND (SP, 3);
645 PUSHs ((SV *)CvPADLIST (cv)); 781 PUSHs ((SV *)CvPADLIST (cv));
646 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv))); 782 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
647 PUSHs ((SV *)cv); 783 PUSHs ((SV *)cv);
… …
650 get_padlist (aTHX_ cv); 786 get_padlist (aTHX_ cv);
651 } 787 }
652 } 788 }
653 } 789 }
654 790
655 if (expect_true (top_si->si_type == PERLSI_MAIN)) 791 if (ecb_expect_true (top_si->si_type == PERLSI_MAIN))
656 break; 792 break;
657 793
658 top_si = top_si->si_prev; 794 top_si = top_si->si_prev;
659 ccstk = top_si->si_cxstack; 795 ccstk = top_si->si_cxstack;
660 cxix = top_si->si_cxix; 796 cxix = top_si->si_cxix;
… …
662 798
663 PUTBACK; 799 PUTBACK;
664 } 800 }
665 801
666 /* allocate some space on the context stack for our purposes */ 802 /* allocate some space on the context stack for our purposes */
667 /* we manually unroll here, as usually 2 slots is enough */ 803 if (ecb_expect_false (cxstack_ix + SLOT_COUNT >= cxstack_max))
668 if (SLOT_COUNT >= 1) CXINC;
669 if (SLOT_COUNT >= 2) CXINC;
670 if (SLOT_COUNT >= 3) CXINC;
671 { 804 {
672 int i; 805 unsigned int i;
806
673 for (i = 3; i < SLOT_COUNT; ++i) 807 for (i = 0; i < SLOT_COUNT; ++i)
674 CXINC; 808 CXINC;
675 } 809
676 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 810 cxstack_ix -= SLOT_COUNT; /* undo allocation */
811 }
677 812
678 c->mainstack = PL_mainstack; 813 c->mainstack = PL_mainstack;
679 814
680 { 815 {
681 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 816 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
… …
702# define coro_init_stacks(thx) init_stacks () 837# define coro_init_stacks(thx) init_stacks ()
703#else 838#else
704static void 839static void
705coro_init_stacks (pTHX) 840coro_init_stacks (pTHX)
706{ 841{
707 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() */
708 PL_curstackinfo->si_type = PERLSI_MAIN; 843 PL_curstackinfo->si_type = PERLSI_MAIN;
709 PL_curstack = PL_curstackinfo->si_stack; 844 PL_curstack = PL_curstackinfo->si_stack;
710 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 845 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
711 846
712 PL_stack_base = AvARRAY(PL_curstack); 847 PL_stack_base = AvARRAY(PL_curstack);
… …
819#endif 954#endif
820 955
821/* 956/*
822 * This overrides the default magic get method of %SIG elements. 957 * This overrides the default magic get method of %SIG elements.
823 * 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
824 * and instead of trying to save and restore the hash elements, we just provide 959 * and instead of trying to save and restore the hash elements (extremely slow),
825 * readback here. 960 * we just provide our own readback here.
826 */ 961 */
827static int 962static int ecb_cold
828coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 963coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
829{ 964{
830 const char *s = MgPV_nolen_const (mg); 965 const char *s = MgPV_nolen_const (mg);
831 966
832 if (*s == '_') 967 if (*s == '_')
… …
844 } 979 }
845 980
846 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 981 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
847} 982}
848 983
849static int 984static int ecb_cold
850coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 985coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
851{ 986{
852 const char *s = MgPV_nolen_const (mg); 987 const char *s = MgPV_nolen_const (mg);
853 988
854 if (*s == '_') 989 if (*s == '_')
… …
868 } 1003 }
869 1004
870 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0; 1005 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
871} 1006}
872 1007
873static int 1008static int ecb_cold
874coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1009coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
875{ 1010{
876 const char *s = MgPV_nolen_const (mg); 1011 const char *s = MgPV_nolen_const (mg);
877 1012
878 if (*s == '_') 1013 if (*s == '_')
… …
911slf_check_repeat (pTHX_ struct CoroSLF *frame) 1046slf_check_repeat (pTHX_ struct CoroSLF *frame)
912{ 1047{
913 return 1; 1048 return 1;
914} 1049}
915 1050
916static UNOP coro_setup_op; 1051static UNOP init_perl_op;
917 1052
918static 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 */
919coro_setup (pTHX_ struct coro *coro) 1054init_perl (pTHX_ struct coro *coro)
920{ 1055{
921 /* 1056 /*
922 * emulate part of the perl startup here. 1057 * emulate part of the perl startup here.
923 */ 1058 */
924 coro_init_stacks (aTHX); 1059 coro_init_stacks (aTHX);
… …
931 PL_comppad_name_fill = 0; 1066 PL_comppad_name_fill = 0;
932 PL_comppad_name_floor = 0; 1067 PL_comppad_name_floor = 0;
933 PL_curpm = 0; 1068 PL_curpm = 0;
934 PL_curpad = 0; 1069 PL_curpad = 0;
935 PL_localizing = 0; 1070 PL_localizing = 0;
936 PL_dirty = 0;
937 PL_restartop = 0; 1071 PL_restartop = 0;
938#if PERL_VERSION_ATLEAST (5,10,0) 1072#if PERL_VERSION_ATLEAST (5,10,0)
939 PL_parser = 0; 1073 PL_parser = 0;
940#endif 1074#endif
941 PL_hints = 0; 1075 PL_hints = 0;
942 1076
943 /* recreate the die/warn hooks */ 1077 /* recreate the die/warn hooks */
944 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1078 PL_diehook = SvREFCNT_inc (rv_diehook);
945 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1079 PL_warnhook = SvREFCNT_inc (rv_warnhook);
946 1080
947 GvSV (PL_defgv) = newSV (0); 1081 GvSV (PL_defgv) = newSV (0);
948 GvAV (PL_defgv) = coro->args; coro->args = 0; 1082 GvAV (PL_defgv) = coro->args; coro->args = 0;
949 GvSV (PL_errgv) = newSV (0); 1083 GvSV (PL_errgv) = newSV (0);
950 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);
… …
971 /* 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
972 * 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.
973 */ 1107 */
974 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 */
975 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;
976 1111
977 /* 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 */
978 coro_setup_op.op_next = PL_op; 1113 init_perl_op.op_next = PL_op;
979 coro_setup_op.op_type = OP_ENTERSUB; 1114 init_perl_op.op_type = OP_ENTERSUB;
980 coro_setup_op.op_ppaddr = pp_slf; 1115 init_perl_op.op_ppaddr = pp_slf;
981 /* 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 */
982 1117
983 PL_op = (OP *)&coro_setup_op; 1118 PL_op = (OP *)&init_perl_op;
984 1119
985 /* copy throw, in case it was set before coro_setup */ 1120 /* copy throw, in case it was set before init_perl */
986 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 }
987} 1130}
988 1131
989static void 1132static void
990coro_unwind_stacks (pTHX) 1133coro_unwind_stacks (pTHX)
991{ 1134{
… …
1006 dounwind (-1); 1149 dounwind (-1);
1007 } 1150 }
1008} 1151}
1009 1152
1010static void 1153static void
1011coro_destruct_perl (pTHX_ struct coro *coro) 1154destroy_perl (pTHX_ struct coro *coro)
1012{ 1155{
1013 SV *svf [9]; 1156 SV *svf [9];
1014 1157
1015 { 1158 {
1159 SV *old_current = SvRV (coro_current);
1016 struct coro *current = SvSTATE_current; 1160 struct coro *current = SvSTATE (old_current);
1017 1161
1018 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack)); 1162 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1019 1163
1020 save_perl (aTHX_ current); 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
1021 load_perl (aTHX_ coro); 1169 load_perl (aTHX_ coro);
1022 1170
1023 coro_unwind_stacks (aTHX); 1171 coro_unwind_stacks (aTHX);
1172
1173 /* restore swapped sv's */
1174 SWAP_SVS (coro);
1175
1024 coro_destruct_stacks (aTHX); 1176 coro_destruct_stacks (aTHX);
1025 1177
1026 // now save some sv's to be free'd later 1178 // now save some sv's to be free'd later
1027 svf [0] = GvSV (PL_defgv); 1179 svf [0] = GvSV (PL_defgv);
1028 svf [1] = (SV *)GvAV (PL_defgv); 1180 svf [1] = (SV *)GvAV (PL_defgv);
… …
1033 svf [6] = (SV *)GvHV (PL_hintgv); 1185 svf [6] = (SV *)GvHV (PL_hintgv);
1034 svf [7] = PL_diehook; 1186 svf [7] = PL_diehook;
1035 svf [8] = PL_warnhook; 1187 svf [8] = PL_warnhook;
1036 assert (9 == sizeof (svf) / sizeof (*svf)); 1188 assert (9 == sizeof (svf) / sizeof (*svf));
1037 1189
1190 SvRV_set (coro_current, old_current);
1191
1038 load_perl (aTHX_ current); 1192 load_perl (aTHX_ current);
1039 } 1193 }
1040 1194
1041 { 1195 {
1042 int i; 1196 unsigned int i;
1043 1197
1044 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i) 1198 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i)
1045 SvREFCNT_dec (svf [i]); 1199 SvREFCNT_dec (svf [i]);
1046 1200
1047 SvREFCNT_dec (coro->saved_deffh); 1201 SvREFCNT_dec (coro->saved_deffh);
… …
1049 SvREFCNT_dec (coro->invoke_cb); 1203 SvREFCNT_dec (coro->invoke_cb);
1050 SvREFCNT_dec (coro->invoke_av); 1204 SvREFCNT_dec (coro->invoke_av);
1051 } 1205 }
1052} 1206}
1053 1207
1054INLINE void 1208ECB_INLINE void
1055free_coro_mortal (pTHX) 1209free_coro_mortal (pTHX)
1056{ 1210{
1057 if (expect_true (coro_mortal)) 1211 if (ecb_expect_true (coro_mortal))
1058 { 1212 {
1059 SvREFCNT_dec (coro_mortal); 1213 SvREFCNT_dec ((SV *)coro_mortal);
1060 coro_mortal = 0; 1214 coro_mortal = 0;
1061 } 1215 }
1062} 1216}
1063 1217
1064static int 1218static int
… …
1197 1351
1198 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 */
1199} 1353}
1200 1354
1201/* 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 */
1202static void NOINLINE 1356static void ecb_noinline
1203cctx_prepare (pTHX) 1357cctx_prepare (pTHX)
1204{ 1358{
1205 PL_top_env = &PL_start_env; 1359 PL_top_env = &PL_start_env;
1206 1360
1207 if (cctx_current->flags & CC_TRACE) 1361 if (cctx_current->flags & CC_TRACE)
… …
1218 slf_frame.prepare = slf_prepare_set_stacklevel; 1372 slf_frame.prepare = slf_prepare_set_stacklevel;
1219 slf_frame.check = slf_check_set_stacklevel; 1373 slf_frame.check = slf_check_set_stacklevel;
1220} 1374}
1221 1375
1222/* 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 */
1223INLINE void 1377ECB_INLINE void
1224transfer_tail (pTHX) 1378transfer_tail (pTHX)
1225{ 1379{
1226 free_coro_mortal (aTHX); 1380 free_coro_mortal (aTHX);
1227} 1381}
1228 1382
… …
1253 /* 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 */
1254 PL_restartop = PL_op; 1408 PL_restartop = PL_op;
1255 perl_run (PL_curinterp); 1409 perl_run (PL_curinterp);
1256 /* 1410 /*
1257 * 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
1258 * 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.
1259 */ 1414 */
1260 1415
1261 /* 1416 /*
1262 * 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
1263 * 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)
… …
1350cctx_destroy (coro_cctx *cctx) 1505cctx_destroy (coro_cctx *cctx)
1351{ 1506{
1352 if (!cctx) 1507 if (!cctx)
1353 return; 1508 return;
1354 1509
1355 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary? 1510 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1356 1511
1357 --cctx_count; 1512 --cctx_count;
1358 coro_destroy (&cctx->cctx); 1513 coro_destroy (&cctx->cctx);
1359 1514
1360 /* coro_transfer creates new, empty cctx's */ 1515 /* coro_transfer creates new, empty cctx's */
… …
1379#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))
1380 1535
1381static coro_cctx * 1536static coro_cctx *
1382cctx_get (pTHX) 1537cctx_get (pTHX)
1383{ 1538{
1384 while (expect_true (cctx_first)) 1539 while (ecb_expect_true (cctx_first))
1385 { 1540 {
1386 coro_cctx *cctx = cctx_first; 1541 coro_cctx *cctx = cctx_first;
1387 cctx_first = cctx->next; 1542 cctx_first = cctx->next;
1388 --cctx_idle; 1543 --cctx_idle;
1389 1544
1390 if (expect_true (!CCTX_EXPIRED (cctx))) 1545 if (ecb_expect_true (!CCTX_EXPIRED (cctx)))
1391 return cctx; 1546 return cctx;
1392 1547
1393 cctx_destroy (cctx); 1548 cctx_destroy (cctx);
1394 } 1549 }
1395 1550
… …
1400cctx_put (coro_cctx *cctx) 1555cctx_put (coro_cctx *cctx)
1401{ 1556{
1402 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));
1403 1558
1404 /* free another cctx if overlimit */ 1559 /* free another cctx if overlimit */
1405 if (expect_false (cctx_idle >= cctx_max_idle)) 1560 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1406 { 1561 {
1407 coro_cctx *first = cctx_first; 1562 coro_cctx *first = cctx_first;
1408 cctx_first = first->next; 1563 cctx_first = first->next;
1409 --cctx_idle; 1564 --cctx_idle;
1410 1565
… …
1421static void 1576static void
1422transfer_check (pTHX_ struct coro *prev, struct coro *next) 1577transfer_check (pTHX_ struct coro *prev, struct coro *next)
1423{ 1578{
1424 /* TODO: throwing up here is considered harmful */ 1579 /* TODO: throwing up here is considered harmful */
1425 1580
1426 if (expect_true (prev != next)) 1581 if (ecb_expect_true (prev != next))
1427 { 1582 {
1428 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1583 if (ecb_expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1429 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,"); 1584 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1430 1585
1431 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED))) 1586 if (ecb_expect_false (next->flags & (CF_RUNNING | CF_ZOMBIE | CF_SUSPENDED)))
1432 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,"); 1587 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1433 1588
1434#if !PERL_VERSION_ATLEAST (5,10,0) 1589#if !PERL_VERSION_ATLEAST (5,10,0)
1435 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1590 if (ecb_expect_false (PL_lex_state != LEX_NOTPARSING))
1436 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,");
1437#endif 1592#endif
1438 } 1593 }
1439} 1594}
1440 1595
1441/* always use the TRANSFER macro */ 1596/* always use the TRANSFER macro */
1442static void NOINLINE /* noinline so we have a fixed stackframe */ 1597static void ecb_noinline /* noinline so we have a fixed stackframe */
1443transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1598transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1444{ 1599{
1445 dSTACKLEVEL; 1600 dSTACKLEVEL;
1446 1601
1447 /* sometimes transfer is only called to set idle_sp */ 1602 /* sometimes transfer is only called to set idle_sp */
1448 if (expect_false (!prev)) 1603 if (ecb_expect_false (!prev))
1449 { 1604 {
1450 cctx_current->idle_sp = STACKLEVEL; 1605 cctx_current->idle_sp = STACKLEVEL;
1451 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 */
1452 } 1607 }
1453 else if (expect_true (prev != next)) 1608 else if (ecb_expect_true (prev != next))
1454 { 1609 {
1455 coro_cctx *cctx_prev; 1610 coro_cctx *cctx_prev;
1456 1611
1457 if (expect_false (prev->flags & CF_NEW)) 1612 if (ecb_expect_false (prev->flags & CF_NEW))
1458 { 1613 {
1459 /* create a new empty/source context */ 1614 /* create a new empty/source context */
1460 prev->flags &= ~CF_NEW; 1615 prev->flags &= ~CF_NEW;
1461 prev->flags |= CF_RUNNING; 1616 prev->flags |= CF_RUNNING;
1462 } 1617 }
… …
1465 next->flags |= CF_RUNNING; 1620 next->flags |= CF_RUNNING;
1466 1621
1467 /* first get rid of the old state */ 1622 /* first get rid of the old state */
1468 save_perl (aTHX_ prev); 1623 save_perl (aTHX_ prev);
1469 1624
1470 if (expect_false (next->flags & CF_NEW)) 1625 if (ecb_expect_false (next->flags & CF_NEW))
1471 { 1626 {
1472 /* need to start coroutine */ 1627 /* need to start coroutine */
1473 next->flags &= ~CF_NEW; 1628 next->flags &= ~CF_NEW;
1474 /* setup coroutine call */ 1629 /* setup coroutine call */
1475 coro_setup (aTHX_ next); 1630 init_perl (aTHX_ next);
1476 } 1631 }
1477 else 1632 else
1478 load_perl (aTHX_ next); 1633 load_perl (aTHX_ next);
1479 1634
1480 /* possibly untie and reuse the cctx */ 1635 /* possibly untie and reuse the cctx */
1481 if (expect_true ( 1636 if (ecb_expect_true (
1482 cctx_current->idle_sp == STACKLEVEL 1637 cctx_current->idle_sp == STACKLEVEL
1483 && !(cctx_current->flags & CC_TRACE) 1638 && !(cctx_current->flags & CC_TRACE)
1484 && !force_cctx 1639 && !force_cctx
1485 )) 1640 ))
1486 { 1641 {
1487 /* 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 */
1488 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));
1489 1644
1490 /* 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. */
1491 /* 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 */
1492 if (expect_false (CCTX_EXPIRED (cctx_current))) 1647 if (ecb_expect_false (CCTX_EXPIRED (cctx_current)))
1493 if (expect_true (!next->cctx)) 1648 if (ecb_expect_true (!next->cctx))
1494 next->cctx = cctx_get (aTHX); 1649 next->cctx = cctx_get (aTHX);
1495 1650
1496 cctx_put (cctx_current); 1651 cctx_put (cctx_current);
1497 } 1652 }
1498 else 1653 else
1499 prev->cctx = cctx_current; 1654 prev->cctx = cctx_current;
1500 1655
1501 ++next->usecount; 1656 ++next->usecount;
1502 1657
1503 cctx_prev = cctx_current; 1658 cctx_prev = cctx_current;
1504 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX); 1659 cctx_current = ecb_expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1505 1660
1506 next->cctx = 0; 1661 next->cctx = 0;
1507 1662
1508 if (expect_false (cctx_prev != cctx_current)) 1663 if (ecb_expect_false (cctx_prev != cctx_current))
1509 { 1664 {
1510 cctx_prev->top_env = PL_top_env; 1665 cctx_prev->top_env = PL_top_env;
1511 PL_top_env = cctx_current->top_env; 1666 PL_top_env = cctx_current->top_env;
1512 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx); 1667 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1513 } 1668 }
… …
1519#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))
1520#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1675#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1521 1676
1522/** high level stuff ********************************************************/ 1677/** high level stuff ********************************************************/
1523 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 */
1524static int 1681static void
1682coro_call_on_destroy (pTHX_ struct coro *coro);
1683
1684static void
1525coro_state_destroy (pTHX_ struct coro *coro) 1685coro_state_destroy (pTHX_ struct coro *coro)
1526{ 1686{
1527 if (coro->flags & CF_DESTROYED) 1687 if (coro->flags & CF_ZOMBIE)
1528 return 0; 1688 return;
1529 1689
1530 if (coro->on_destroy && !PL_dirty)
1531 coro->on_destroy (aTHX_ coro); 1690 slf_destroy (aTHX_ coro);
1532 1691
1533 coro->flags |= CF_DESTROYED; 1692 coro->flags |= CF_ZOMBIE;
1534 1693
1535 if (coro->flags & CF_READY) 1694 if (coro->flags & CF_READY)
1536 { 1695 {
1537 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1696 /* reduce nready, as destroying a ready coro effectively unreadies it */
1538 /* alternative: look through all ready queues and remove the coro */ 1697 /* alternative: look through all ready queues and remove the coro */
1539 --coro_nready; 1698 --coro_nready;
1540 } 1699 }
1541 else 1700 else
1542 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;
1543 1706
1544 if (coro->mainstack 1707 if (coro->mainstack
1545 && coro->mainstack != main_mainstack 1708 && coro->mainstack != main_mainstack
1546 && coro->slot 1709 && coro->slot
1547 && !PL_dirty) 1710 && !PL_dirty)
1548 coro_destruct_perl (aTHX_ coro); 1711 destroy_perl (aTHX_ coro);
1549 1712
1550 cctx_destroy (coro->cctx); 1713 cctx_destroy (coro->cctx);
1551 SvREFCNT_dec (coro->startcv); 1714 SvREFCNT_dec (coro->startcv);
1552 SvREFCNT_dec (coro->args); 1715 SvREFCNT_dec (coro->args);
1716 SvREFCNT_dec (coro->swap_sv);
1553 SvREFCNT_dec (CORO_THROW); 1717 SvREFCNT_dec (CORO_THROW);
1554 1718
1555 if (coro->next) coro->next->prev = coro->prev; 1719 coro_call_on_destroy (aTHX_ coro);
1556 if (coro->prev) coro->prev->next = coro->next;
1557 if (coro == coro_first) coro_first = coro->next;
1558 1720
1559 return 1; 1721 /* more destruction mayhem in coro_state_free */
1560} 1722}
1561 1723
1562static int 1724static int
1563coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1725coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1564{ 1726{
1565 struct coro *coro = (struct coro *)mg->mg_ptr; 1727 struct coro *coro = (struct coro *)mg->mg_ptr;
1566 mg->mg_ptr = 0; 1728 mg->mg_ptr = 0;
1567 1729
1568 coro->hv = 0;
1569
1570 if (--coro->refcnt < 0)
1571 {
1572 coro_state_destroy (aTHX_ coro); 1730 coro_state_destroy (aTHX_ coro);
1731 SvREFCNT_dec (coro->on_destroy);
1732 SvREFCNT_dec (coro->status);
1733
1573 Safefree (coro); 1734 Safefree (coro);
1574 }
1575 1735
1576 return 0; 1736 return 0;
1577} 1737}
1578 1738
1579static int 1739static int ecb_cold
1580coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1740coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1581{ 1741{
1582 struct coro *coro = (struct coro *)mg->mg_ptr; 1742 /* called when perl clones the current process the slow way (windows process emulation) */
1583 1743 /* WE SIMply nuke the pointers in the copy, causing perl to croak */
1584 ++coro->refcnt; 1744 mg->mg_ptr = 0;
1745 mg->mg_virtual = 0;
1585 1746
1586 return 0; 1747 return 0;
1587} 1748}
1588 1749
1589static MGVTBL coro_state_vtbl = { 1750static MGVTBL coro_state_vtbl = {
… …
1612 1773
1613 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1774 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1614 TRANSFER (ta, 1); 1775 TRANSFER (ta, 1);
1615} 1776}
1616 1777
1617/*****************************************************************************/
1618/* gensub: simple closure generation utility */
1619
1620#define GENSUB_ARG CvXSUBANY (cv).any_ptr
1621
1622/* create a closure from XS, returns a code reference */
1623/* the arg can be accessed via GENSUB_ARG from the callback */
1624/* the callback must use dXSARGS/XSRETURN */
1625static SV *
1626gensub (pTHX_ void (*xsub)(pTHX_ CV *), void *arg)
1627{
1628 CV *cv = (CV *)newSV (0);
1629
1630 sv_upgrade ((SV *)cv, SVt_PVCV);
1631
1632 CvANON_on (cv);
1633 CvISXSUB_on (cv);
1634 CvXSUB (cv) = xsub;
1635 GENSUB_ARG = arg;
1636
1637 return newRV_noinc ((SV *)cv);
1638}
1639
1640/** Coro ********************************************************************/ 1778/** Coro ********************************************************************/
1641 1779
1642INLINE void 1780ECB_INLINE void
1643coro_enq (pTHX_ struct coro *coro) 1781coro_enq (pTHX_ struct coro *coro)
1644{ 1782{
1645 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN]; 1783 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1646 1784
1647 SvREFCNT_inc_NN (coro->hv); 1785 SvREFCNT_inc_NN (coro->hv);
… …
1649 coro->next_ready = 0; 1787 coro->next_ready = 0;
1650 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro; 1788 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1651 ready [1] = coro; 1789 ready [1] = coro;
1652} 1790}
1653 1791
1654INLINE struct coro * 1792ECB_INLINE struct coro *
1655coro_deq (pTHX) 1793coro_deq (pTHX)
1656{ 1794{
1657 int prio; 1795 int prio;
1658 1796
1659 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; ) 1797 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
… …
1669 } 1807 }
1670 1808
1671 return 0; 1809 return 0;
1672} 1810}
1673 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;
1827}
1828
1674static int 1829static int
1675api_ready (pTHX_ SV *coro_sv) 1830api_ready (pTHX_ SV *coro_sv)
1676{ 1831{
1677 struct coro *coro;
1678 SV *sv_hook;
1679 void (*xs_hook)(void);
1680
1681 coro = SvSTATE (coro_sv); 1832 struct coro *coro = SvSTATE (coro_sv);
1682 1833
1683 if (coro->flags & CF_READY) 1834 if (coro->flags & CF_READY)
1684 return 0; 1835 return 0;
1685 1836
1686 coro->flags |= CF_READY; 1837 coro->flags |= CF_READY;
1687 1838
1688 sv_hook = coro_nready ? 0 : coro_readyhook;
1689 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1690
1691 coro_enq (aTHX_ coro); 1839 coro_enq (aTHX_ coro);
1692 ++coro_nready;
1693 1840
1694 if (sv_hook) 1841 if (!coro_nready++)
1695 { 1842 if (coroapi.readyhook)
1696 dSP; 1843 coroapi.readyhook ();
1697
1698 ENTER;
1699 SAVETMPS;
1700
1701 PUSHMARK (SP);
1702 PUTBACK;
1703 call_sv (sv_hook, G_VOID | G_DISCARD);
1704
1705 FREETMPS;
1706 LEAVE;
1707 }
1708
1709 if (xs_hook)
1710 xs_hook ();
1711 1844
1712 return 1; 1845 return 1;
1713} 1846}
1714 1847
1715static int 1848static int
… …
1717{ 1850{
1718 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1851 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1719} 1852}
1720 1853
1721/* expects to own a reference to next->hv */ 1854/* expects to own a reference to next->hv */
1722INLINE void 1855ECB_INLINE void
1723prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1856prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1724{ 1857{
1725 SV *prev_sv = SvRV (coro_current); 1858 SV *prev_sv = SvRV (coro_current);
1726 1859
1727 ta->prev = SvSTATE_hv (prev_sv); 1860 ta->prev = SvSTATE_hv (prev_sv);
… …
1740{ 1873{
1741 for (;;) 1874 for (;;)
1742 { 1875 {
1743 struct coro *next = coro_deq (aTHX); 1876 struct coro *next = coro_deq (aTHX);
1744 1877
1745 if (expect_true (next)) 1878 if (ecb_expect_true (next))
1746 { 1879 {
1747 /* cannot transfer to destroyed coros, skip and look for next */ 1880 /* cannot transfer to destroyed coros, skip and look for next */
1748 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED))) 1881 if (ecb_expect_false (next->flags & (CF_ZOMBIE | CF_SUSPENDED)))
1749 SvREFCNT_dec (next->hv); /* 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 */
1750 else 1883 else
1751 { 1884 {
1752 next->flags &= ~CF_READY; 1885 next->flags &= ~CF_READY;
1753 --coro_nready; 1886 --coro_nready;
… …
1760 { 1893 {
1761 /* nothing to schedule: call the idle handler */ 1894 /* nothing to schedule: call the idle handler */
1762 if (SvROK (sv_idle) 1895 if (SvROK (sv_idle)
1763 && SvOBJECT (SvRV (sv_idle))) 1896 && SvOBJECT (SvRV (sv_idle)))
1764 { 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
1765 ++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 */
1766 api_ready (aTHX_ SvRV (sv_idle)); 1902 api_ready (aTHX_ SvRV (sv_idle));
1767 --coro_nready; 1903 --coro_nready;
1768 } 1904 }
1769 else 1905 else
1770 { 1906 {
1907 /* TODO: deprecated, remove, cannot work reliably *//*D*/
1771 dSP; 1908 dSP;
1772 1909
1773 ENTER; 1910 ENTER;
1774 SAVETMPS; 1911 SAVETMPS;
1775 1912
… …
1782 } 1919 }
1783 } 1920 }
1784 } 1921 }
1785} 1922}
1786 1923
1787INLINE void 1924ECB_INLINE void
1788prepare_cede (pTHX_ struct coro_transfer_args *ta) 1925prepare_cede (pTHX_ struct coro_transfer_args *ta)
1789{ 1926{
1790 api_ready (aTHX_ coro_current); 1927 api_ready (aTHX_ coro_current);
1791 prepare_schedule (aTHX_ ta); 1928 prepare_schedule (aTHX_ ta);
1792} 1929}
1793 1930
1794INLINE void 1931ECB_INLINE void
1795prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 1932prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1796{ 1933{
1797 SV *prev = SvRV (coro_current); 1934 SV *prev = SvRV (coro_current);
1798 1935
1799 if (coro_nready) 1936 if (coro_nready)
… …
1829{ 1966{
1830 struct coro_transfer_args ta; 1967 struct coro_transfer_args ta;
1831 1968
1832 prepare_cede (aTHX_ &ta); 1969 prepare_cede (aTHX_ &ta);
1833 1970
1834 if (expect_true (ta.prev != ta.next)) 1971 if (ecb_expect_true (ta.prev != ta.next))
1835 { 1972 {
1836 TRANSFER (ta, 1); 1973 TRANSFER (ta, 1);
1837 return 1; 1974 return 1;
1838 } 1975 }
1839 else 1976 else
… …
1882 coro->slot->runops = RUNOPS_DEFAULT; 2019 coro->slot->runops = RUNOPS_DEFAULT;
1883 } 2020 }
1884} 2021}
1885 2022
1886static 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
1887coro_call_on_destroy (pTHX_ struct coro *coro) 2100coro_call_on_destroy (pTHX_ struct coro *coro)
1888{ 2101{
1889 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2102 AV *od = coro->on_destroy;
1890 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1891 2103
1892 if (on_destroyp) 2104 if (!od)
1893 { 2105 return;
1894 AV *on_destroy = (AV *)SvRV (*on_destroyp);
1895 2106
1896 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
1897 { 2115 {
1898 dSP; /* don't disturb outer sp */ 2116 dSP; /* don't disturb outer sp */
1899 SV *cb = av_pop (on_destroy);
1900
1901 PUSHMARK (SP); 2117 PUSHMARK (SP);
1902 2118
1903 if (statusp) 2119 if (coro->status)
1904 { 2120 {
1905 int i; 2121 PUTBACK;
1906 AV *status = (AV *)SvRV (*statusp); 2122 coro_push_av (aTHX_ coro->status, G_ARRAY);
1907 EXTEND (SP, AvFILLp (status) + 1); 2123 SPAGAIN;
1908
1909 for (i = 0; i <= AvFILLp (status); ++i)
1910 PUSHs (AvARRAY (status)[i]);
1911 } 2124 }
1912 2125
1913 PUTBACK; 2126 PUTBACK;
1914 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD); 2127 call_sv (cb, G_VOID | G_DISCARD);
1915 } 2128 }
1916 } 2129 }
1917} 2130}
1918 2131
1919static void 2132static void
1920slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2133coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
1921{ 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 {
1922 int i; 2148 int i;
1923 HV *hv = (HV *)SvRV (coro_current);
1924 AV *av = newAV ();
1925 2149
1926 av_extend (av, items - 1); 2150 av_extend (av, items - 1);
2151
1927 for (i = 0; i < items; ++i) 2152 for (i = 0; i < items; ++i)
1928 av_push (av, SvREFCNT_inc_NN (arg [i])); 2153 av_push (av, SvREFCNT_inc_NN (arg [i]));
2154 }
2155}
1929 2156
1930 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 2157static void
1931 2158slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2159{
1932 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 */
1933 api_ready (aTHX_ sv_manager); 2161 api_ready (aTHX_ sv_manager);
1934 2162
1935 frame->prepare = prepare_schedule; 2163 frame->prepare = prepare_schedule;
1936 frame->check = slf_check_repeat; 2164 frame->check = slf_check_repeat;
1937 2165
1938 /* as a minor optimisation, we could unwind all stacks here */ 2166 /* as a minor optimisation, we could unwind all stacks here */
1939 /* 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 */
1940 /*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;
1941} 2272}
1942 2273
1943/*****************************************************************************/ 2274/*****************************************************************************/
1944/* async pool handler */ 2275/* async pool handler */
1945 2276
… …
1976slf_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)
1977{ 2308{
1978 HV *hv = (HV *)SvRV (coro_current); 2309 HV *hv = (HV *)SvRV (coro_current);
1979 struct coro *coro = SvSTATE_hv ((SV *)hv); 2310 struct coro *coro = SvSTATE_hv ((SV *)hv);
1980 2311
1981 if (expect_true (coro->saved_deffh)) 2312 if (ecb_expect_true (coro->saved_deffh))
1982 { 2313 {
1983 /* subsequent iteration */ 2314 /* subsequent iteration */
1984 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2315 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1985 coro->saved_deffh = 0; 2316 coro->saved_deffh = 0;
1986 2317
1987 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 2318 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
1988 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2319 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1989 { 2320 {
1990 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate); 2321 slf_init_terminate_cancel_common (aTHX_ frame, hv);
1991 coro->invoke_av = newAV (); 2322 return;
1992
1993 frame->prepare = prepare_nop;
1994 } 2323 }
1995 else 2324 else
1996 { 2325 {
1997 av_clear (GvAV (PL_defgv)); 2326 av_clear (GvAV (PL_defgv));
1998 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);
… …
2023 2352
2024static void 2353static void
2025coro_rouse_callback (pTHX_ CV *cv) 2354coro_rouse_callback (pTHX_ CV *cv)
2026{ 2355{
2027 dXSARGS; 2356 dXSARGS;
2028 SV *data = (SV *)GENSUB_ARG; 2357 SV *data = (SV *)S_GENSUB_ARG;
2029 2358
2030 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2359 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2031 { 2360 {
2032 /* first call, set args */ 2361 /* first call, set args */
2033 SV *coro = SvRV (data); 2362 SV *coro = SvRV (data);
… …
2099 || SvTYPE (SvRV (cb)) != SVt_PVCV 2428 || SvTYPE (SvRV (cb)) != SVt_PVCV
2100 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2429 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2101 croak ("Coro::rouse_wait called with illegal callback argument,"); 2430 croak ("Coro::rouse_wait called with illegal callback argument,");
2102 2431
2103 { 2432 {
2104 CV *cv = (CV *)SvRV (cb); /* for GENSUB_ARG */ 2433 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
2105 SV *data = (SV *)GENSUB_ARG; 2434 SV *data = (SV *)S_GENSUB_ARG;
2106 2435
2107 frame->data = (void *)data; 2436 frame->data = (void *)data;
2108 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule; 2437 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
2109 frame->check = slf_check_rouse_wait; 2438 frame->check = slf_check_rouse_wait;
2110 } 2439 }
… …
2114coro_new_rouse_cb (pTHX) 2443coro_new_rouse_cb (pTHX)
2115{ 2444{
2116 HV *hv = (HV *)SvRV (coro_current); 2445 HV *hv = (HV *)SvRV (coro_current);
2117 struct coro *coro = SvSTATE_hv (hv); 2446 struct coro *coro = SvSTATE_hv (hv);
2118 SV *data = newRV_inc ((SV *)hv); 2447 SV *data = newRV_inc ((SV *)hv);
2119 SV *cb = gensub (aTHX_ coro_rouse_callback, (void *)data); 2448 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
2120 2449
2121 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);
2122 SvREFCNT_dec (data); /* magicext increases the refcount */ 2451 SvREFCNT_dec (data); /* magicext increases the refcount */
2123 2452
2124 SvREFCNT_dec (coro->rouse_cb); 2453 SvREFCNT_dec (coro->rouse_cb);
… …
2221static void 2550static void
2222slf_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)
2223{ 2552{
2224 frame->prepare = prepare_cede_notself; 2553 frame->prepare = prepare_cede_notself;
2225 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;
2226} 2572}
2227 2573
2228/* 2574/*
2229 * these not obviously related functions are all rolled into one 2575 * these not obviously related functions are all rolled into one
2230 * 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
… …
2237 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 */
2238 2584
2239 /* 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 */
2240 /* the latter happens when a new coro has been started */ 2586 /* the latter happens when a new coro has been started */
2241 /* or when a new cctx was attached to an existing coroutine */ 2587 /* or when a new cctx was attached to an existing coroutine */
2242 if (expect_true (!slf_frame.prepare)) 2588 if (ecb_expect_true (!slf_frame.prepare))
2243 { 2589 {
2244 /* first iteration */ 2590 /* first iteration */
2245 dSP; 2591 dSP;
2246 SV **arg = PL_stack_base + TOPMARK + 1; 2592 SV **arg = PL_stack_base + TOPMARK + 1;
2247 int items = SP - arg; /* args without function object */ 2593 int items = SP - arg; /* args without function object */
… …
2288 while (slf_frame.check (aTHX_ &slf_frame)); 2634 while (slf_frame.check (aTHX_ &slf_frame));
2289 2635
2290 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 */
2291 2637
2292 /* exception handling */ 2638 /* exception handling */
2293 if (expect_false (CORO_THROW)) 2639 if (ecb_expect_false (CORO_THROW))
2294 { 2640 {
2295 SV *exception = sv_2mortal (CORO_THROW); 2641 SV *exception = sv_2mortal (CORO_THROW);
2296 2642
2297 CORO_THROW = 0; 2643 CORO_THROW = 0;
2298 sv_setsv (ERRSV, exception); 2644 sv_setsv (ERRSV, exception);
2299 croak (0); 2645 croak (0);
2300 } 2646 }
2301 2647
2302 /* return value handling - mostly like entersub */ 2648 /* return value handling - mostly like entersub */
2303 /* make sure we put something on the stack in scalar context */ 2649 /* make sure we put something on the stack in scalar context */
2304 if (GIMME_V == G_SCALAR) 2650 if (GIMME_V == G_SCALAR
2651 && ecb_expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2305 { 2652 {
2306 dSP; 2653 dSP;
2307 SV **bot = PL_stack_base + checkmark; 2654 SV **bot = PL_stack_base + checkmark;
2308 2655
2309 if (sp == bot) /* too few, push undef */ 2656 if (sp == bot) /* too few, push undef */
2310 bot [1] = &PL_sv_undef; 2657 bot [1] = &PL_sv_undef;
2311 else if (sp != bot + 1) /* too many, take last one */ 2658 else /* too many, take last one */
2312 bot [1] = *sp; 2659 bot [1] = *sp;
2313 2660
2314 SP = bot + 1; 2661 SP = bot + 1;
2315 2662
2316 PUTBACK; 2663 PUTBACK;
… …
2349 if (PL_op->op_flags & OPf_STACKED) 2696 if (PL_op->op_flags & OPf_STACKED)
2350 { 2697 {
2351 if (items > slf_arga) 2698 if (items > slf_arga)
2352 { 2699 {
2353 slf_arga = items; 2700 slf_arga = items;
2354 free (slf_argv); 2701 Safefree (slf_argv);
2355 slf_argv = malloc (slf_arga * sizeof (SV *)); 2702 New (0, slf_argv, slf_arga, SV *);
2356 } 2703 }
2357 2704
2358 slf_argc = items; 2705 slf_argc = items;
2359 2706
2360 for (i = 0; i < items; ++i) 2707 for (i = 0; i < items; ++i)
… …
2423{ 2770{
2424 PerlIOBuf base; 2771 PerlIOBuf base;
2425 NV next, every; 2772 NV next, every;
2426} PerlIOCede; 2773} PerlIOCede;
2427 2774
2428static IV 2775static IV ecb_cold
2429PerlIOCede_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)
2430{ 2777{
2431 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2778 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2432 2779
2433 self->every = SvCUR (arg) ? SvNV (arg) : 0.01; 2780 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
2434 self->next = nvtime () + self->every; 2781 self->next = nvtime () + self->every;
2435 2782
2436 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab); 2783 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
2437} 2784}
2438 2785
2439static SV * 2786static SV * ecb_cold
2440PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags) 2787PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
2441{ 2788{
2442 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2789 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2443 2790
2444 return newSVnv (self->every); 2791 return newSVnv (self->every);
… …
2556 SvREFCNT_dec (cb); 2903 SvREFCNT_dec (cb);
2557 } 2904 }
2558} 2905}
2559 2906
2560static void 2907static void
2561coro_semaphore_on_destroy (pTHX_ struct coro *coro) 2908coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2562{ 2909{
2563 /* call $sem->adjust (0) to possibly wake up some other waiters */ 2910 /* call $sem->adjust (0) to possibly wake up some other waiters */
2564 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 2911 coro_semaphore_adjust (aTHX_ (AV *)frame->data, 0);
2565} 2912}
2566 2913
2567static int 2914static int
2568slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire) 2915slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2569{ 2916{
2570 AV *av = (AV *)frame->data; 2917 AV *av = (AV *)frame->data;
2571 SV *count_sv = AvARRAY (av)[0]; 2918 SV *count_sv = AvARRAY (av)[0];
2919 SV *coro_hv = SvRV (coro_current);
2572 2920
2573 /* 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 */
2574 if (CORO_THROW) 2922 if (CORO_THROW)
2575 return 0; 2923 return 0;
2576 else if (SvIVX (count_sv) > 0) 2924 else if (SvIVX (count_sv) > 0)
2577 { 2925 {
2578 SvSTATE_current->on_destroy = 0; 2926 frame->destroy = 0;
2579 2927
2580 if (acquire) 2928 if (acquire)
2581 SvIVX (count_sv) = SvIVX (count_sv) - 1; 2929 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2582 else 2930 else
2583 coro_semaphore_adjust (aTHX_ av, 0); 2931 coro_semaphore_adjust (aTHX_ av, 0);
… …
2588 { 2936 {
2589 int i; 2937 int i;
2590 /* 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 */
2591 /* 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 */
2592 /* this avoids some degenerate memory usage cases */ 2940 /* this avoids some degenerate memory usage cases */
2593 2941 for (i = AvFILLp (av); i > 0; --i) // i > 0 is not an off-by-one bug
2594 for (i = 1; i <= AvFILLp (av); ++i)
2595 if (AvARRAY (av)[i] == SvRV (coro_current)) 2942 if (AvARRAY (av)[i] == coro_hv)
2596 return 1; 2943 return 1;
2597 2944
2598 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2945 av_push (av, SvREFCNT_inc (coro_hv));
2599 return 1; 2946 return 1;
2600 } 2947 }
2601} 2948}
2602 2949
2603static int 2950static int
… …
2626 { 2973 {
2627 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2974 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2628 2975
2629 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 2976 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2630 frame->prepare = prepare_schedule; 2977 frame->prepare = prepare_schedule;
2631
2632 /* to avoid race conditions when a woken-up coro gets terminated */ 2978 /* to avoid race conditions when a woken-up coro gets terminated */
2633 /* we arrange for a temporary on_destroy that calls adjust (0) */ 2979 /* we arrange for a temporary on_destroy that calls adjust (0) */
2634 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 2980 frame->destroy = coro_semaphore_destroy;
2635 } 2981 }
2636} 2982}
2637 2983
2638static void 2984static void
2639slf_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)
… …
2647{ 2993{
2648 if (items >= 2) 2994 if (items >= 2)
2649 { 2995 {
2650 /* callback form */ 2996 /* callback form */
2651 AV *av = (AV *)SvRV (arg [0]); 2997 AV *av = (AV *)SvRV (arg [0]);
2652 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 2998 SV *cb_cv = s_get_cv_croak (arg [1]);
2653 2999
2654 av_push (av, SvREFCNT_inc_NN (cb_cv)); 3000 av_push (av, SvREFCNT_inc_NN (cb_cv));
2655 3001
2656 if (SvIVX (AvARRAY (av)[0]) > 0) 3002 if (SvIVX (AvARRAY (av)[0]) > 0)
2657 coro_semaphore_adjust (aTHX_ av, 0); 3003 coro_semaphore_adjust (aTHX_ av, 0);
… …
2717{ 3063{
2718 AV *av = (AV *)SvRV (arg [0]); 3064 AV *av = (AV *)SvRV (arg [0]);
2719 3065
2720 if (items >= 2) 3066 if (items >= 2)
2721 { 3067 {
2722 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 3068 SV *cb_cv = s_get_cv_croak (arg [1]);
2723 av_push (av, SvREFCNT_inc_NN (cb_cv)); 3069 av_push (av, SvREFCNT_inc_NN (cb_cv));
2724 3070
2725 if (SvIVX (AvARRAY (av)[0])) 3071 if (SvIVX (AvARRAY (av)[0]))
2726 coro_signal_wake (aTHX_ av, 1); /* ust be the only waiter */ 3072 coro_signal_wake (aTHX_ av, 1); /* must be the only waiter */
2727 3073
2728 frame->prepare = prepare_nop; 3074 frame->prepare = prepare_nop;
2729 frame->check = slf_check_nop; 3075 frame->check = slf_check_nop;
2730 } 3076 }
2731 else if (SvIVX (AvARRAY (av)[0])) 3077 else if (SvIVX (AvARRAY (av)[0]))
… …
2762 3108
2763static void 3109static void
2764coro_aio_callback (pTHX_ CV *cv) 3110coro_aio_callback (pTHX_ CV *cv)
2765{ 3111{
2766 dXSARGS; 3112 dXSARGS;
2767 AV *state = (AV *)GENSUB_ARG; 3113 AV *state = (AV *)S_GENSUB_ARG;
2768 SV *coro = av_pop (state); 3114 SV *coro = av_pop (state);
2769 SV *data_sv = newSV (sizeof (struct io_state)); 3115 SV *data_sv = newSV (sizeof (struct io_state));
2770 3116
2771 av_extend (state, items - 1); 3117 av_extend (state, items - 1);
2772 3118
… …
2857 dSP; 3203 dSP;
2858 3204
2859 static SV *prio_cv; 3205 static SV *prio_cv;
2860 static SV *prio_sv; 3206 static SV *prio_sv;
2861 3207
2862 if (expect_false (!prio_cv)) 3208 if (ecb_expect_false (!prio_cv))
2863 { 3209 {
2864 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0); 3210 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0);
2865 prio_sv = newSViv (0); 3211 prio_sv = newSViv (0);
2866 } 3212 }
2867 3213
… …
2886 3232
2887 for (i = 0; i < items; ++i) 3233 for (i = 0; i < items; ++i)
2888 PUSHs (arg [i]); 3234 PUSHs (arg [i]);
2889 3235
2890 /* now push the callback closure */ 3236 /* now push the callback closure */
2891 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))));
2892 3238
2893 /* now call the AIO function - we assume our request is uncancelable */ 3239 /* now call the AIO function - we assume our request is uncancelable */
2894 PUTBACK; 3240 PUTBACK;
2895 call_sv ((SV *)req, G_VOID | G_DISCARD); 3241 call_sv ((SV *)req, G_VOID | G_DISCARD);
2896 } 3242 }
2897 3243
2898 /* 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 */
2899 frame->data = (void *)state; 3245 frame->data = (void *)state;
2900 frame->prepare = prepare_schedule; 3246 frame->prepare = prepare_schedule;
2901 frame->check = slf_check_aio_req; 3247 frame->check = slf_check_aio_req;
2902} 3248}
2903 3249
… …
2913 3259
2914/*****************************************************************************/ 3260/*****************************************************************************/
2915 3261
2916#if CORO_CLONE 3262#if CORO_CLONE
2917# 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);
2918#endif 3326#endif
2919 3327
2920MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3328MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2921 3329
2922PROTOTYPES: DISABLE 3330PROTOTYPES: DISABLE
… …
2976 coroapi.prepare_nop = prepare_nop; 3384 coroapi.prepare_nop = prepare_nop;
2977 coroapi.prepare_schedule = prepare_schedule; 3385 coroapi.prepare_schedule = prepare_schedule;
2978 coroapi.prepare_cede = prepare_cede; 3386 coroapi.prepare_cede = prepare_cede;
2979 coroapi.prepare_cede_notself = prepare_cede_notself; 3387 coroapi.prepare_cede_notself = prepare_cede_notself;
2980 3388
2981 { 3389 time_init (aTHX);
2982 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
2983
2984 if (!svp) croak ("Time::HiRes is required");
2985 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
2986
2987 nvtime = INT2PTR (double (*)(), SvIV (*svp));
2988 }
2989 3390
2990 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL)); 3391 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
2991} 3392}
2992 3393
2993SV * 3394SV *
2994new (char *klass, ...) 3395new (SV *klass, ...)
2995 ALIAS: 3396 ALIAS:
2996 Coro::new = 1 3397 Coro::new = 1
2997 CODE: 3398 CODE:
2998{ 3399 RETVAL = coro_new (aTHX_ ix ? coro_stash : coro_state_stash, &ST (1), items - 1, ix);
2999 struct coro *coro; 3400 OUTPUT:
3000 MAGIC *mg;
3001 HV *hv;
3002 CV *cb;
3003 int i;
3004
3005 if (items > 1)
3006 {
3007 cb = coro_sv_2cv (aTHX_ ST (1));
3008
3009 if (!ix)
3010 {
3011 if (CvISXSUB (cb))
3012 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
3013
3014 if (!CvROOT (cb))
3015 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
3016 }
3017 }
3018
3019 Newz (0, coro, 1, struct coro);
3020 coro->args = newAV ();
3021 coro->flags = CF_NEW;
3022
3023 if (coro_first) coro_first->prev = coro;
3024 coro->next = coro_first;
3025 coro_first = coro;
3026
3027 coro->hv = hv = newHV ();
3028 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
3029 mg->mg_flags |= MGf_DUP;
3030 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
3031
3032 if (items > 1)
3033 {
3034 av_extend (coro->args, items - 1 + ix - 1);
3035
3036 if (ix)
3037 {
3038 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
3039 cb = cv_coro_run;
3040 }
3041
3042 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3043
3044 for (i = 2; i < items; i++)
3045 av_push (coro->args, newSVsv (ST (i)));
3046 }
3047}
3048 OUTPUT:
3049 RETVAL 3401 RETVAL
3050 3402
3051void 3403void
3052transfer (...) 3404transfer (...)
3053 PROTOTYPE: $$ 3405 PROTOTYPE: $$
3054 CODE: 3406 CODE:
3055 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3407 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3056
3057bool
3058_destroy (SV *coro_sv)
3059 CODE:
3060 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
3061 OUTPUT:
3062 RETVAL
3063 3408
3064void 3409void
3065_exit (int code) 3410_exit (int code)
3066 PROTOTYPE: $ 3411 PROTOTYPE: $
3067 CODE: 3412 CODE:
… …
3143 CODE: 3488 CODE:
3144{ 3489{
3145 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3490 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
3146 { 3491 {
3147 struct coro *current = SvSTATE_current; 3492 struct coro *current = SvSTATE_current;
3493 struct CoroSLF slf_save;
3148 3494
3149 if (current != coro) 3495 if (current != coro)
3150 { 3496 {
3151 PUTBACK; 3497 PUTBACK;
3152 save_perl (aTHX_ current); 3498 save_perl (aTHX_ current);
3153 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;
3154 SPAGAIN; 3509 SPAGAIN;
3155 } 3510 }
3156 3511
3157 PUSHSTACK; 3512 PUSHSTACK;
3158 3513
… …
3168 SPAGAIN; 3523 SPAGAIN;
3169 3524
3170 if (current != coro) 3525 if (current != coro)
3171 { 3526 {
3172 PUTBACK; 3527 PUTBACK;
3528 slf_frame = slf_save;
3173 save_perl (aTHX_ coro); 3529 save_perl (aTHX_ coro);
3174 load_perl (aTHX_ current); 3530 load_perl (aTHX_ current);
3175 SPAGAIN; 3531 SPAGAIN;
3176 } 3532 }
3177 } 3533 }
… …
3182 PROTOTYPE: $ 3538 PROTOTYPE: $
3183 ALIAS: 3539 ALIAS:
3184 is_ready = CF_READY 3540 is_ready = CF_READY
3185 is_running = CF_RUNNING 3541 is_running = CF_RUNNING
3186 is_new = CF_NEW 3542 is_new = CF_NEW
3187 is_destroyed = CF_DESTROYED 3543 is_destroyed = CF_ZOMBIE
3544 is_zombie = CF_ZOMBIE
3188 is_suspended = CF_SUSPENDED 3545 is_suspended = CF_SUSPENDED
3189 CODE: 3546 CODE:
3190 RETVAL = boolSV (coro->flags & ix); 3547 RETVAL = boolSV (coro->flags & ix);
3191 OUTPUT: 3548 OUTPUT:
3192 RETVAL 3549 RETVAL
3193 3550
3194void 3551void
3195throw (Coro::State self, SV *throw = &PL_sv_undef) 3552throw (Coro::State self, SV *exception = &PL_sv_undef)
3196 PROTOTYPE: $;$ 3553 PROTOTYPE: $;$
3197 CODE: 3554 CODE:
3198{ 3555{
3199 struct coro *current = SvSTATE_current; 3556 struct coro *current = SvSTATE_current;
3200 SV **throwp = self == current ? &CORO_THROW : &self->except; 3557 SV **exceptionp = self == current ? &CORO_THROW : &self->except;
3201 SvREFCNT_dec (*throwp); 3558 SvREFCNT_dec (*exceptionp);
3202 SvGETMAGIC (throw); 3559 SvGETMAGIC (exception);
3203 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3560 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3204} 3561}
3205 3562
3206void 3563void
3207api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3564api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3208 PROTOTYPE: $;$ 3565 PROTOTYPE: $;$
… …
3263 3620
3264void 3621void
3265cancel (Coro::State self) 3622cancel (Coro::State self)
3266 CODE: 3623 CODE:
3267 coro_state_destroy (aTHX_ self); 3624 coro_state_destroy (aTHX_ self);
3268 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */ 3625
3626SV *
3627enable_times (int enabled = enable_times)
3628 CODE:
3629{
3630 RETVAL = boolSV (enable_times);
3631
3632 if (enabled != enable_times)
3633 {
3634 enable_times = enabled;
3635
3636 coro_times_update ();
3637 (enabled ? coro_times_sub : coro_times_add)(SvSTATE (coro_current));
3638 }
3639}
3640 OUTPUT:
3641 RETVAL
3642
3643void
3644times (Coro::State self)
3645 PPCODE:
3646{
3647 struct coro *current = SvSTATE (coro_current);
3648
3649 if (ecb_expect_false (current == self))
3650 {
3651 coro_times_update ();
3652 coro_times_add (SvSTATE (coro_current));
3653 }
3654
3655 EXTEND (SP, 2);
3656 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3657 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3658
3659 if (ecb_expect_false (current == self))
3660 coro_times_sub (SvSTATE (coro_current));
3661}
3662
3663void
3664swap_sv (Coro::State coro, SV *sv, SV *swapsv)
3665 CODE:
3666{
3667 struct coro *current = SvSTATE_current;
3668
3669 if (current == coro)
3670 SWAP_SVS (current);
3671
3672 if (!coro->swap_sv)
3673 coro->swap_sv = newAV ();
3674
3675 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv )));
3676 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv)));
3677
3678 if (current == coro)
3679 SWAP_SVS (current);
3680}
3269 3681
3270 3682
3271MODULE = Coro::State PACKAGE = Coro 3683MODULE = Coro::State PACKAGE = Coro
3272 3684
3273BOOT: 3685BOOT:
3274{ 3686{
3275 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3687 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3276 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3688 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3277 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 3689 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3278 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3279 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);
3280 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 3691 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3281 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 3692 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3282 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 3693 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3283 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 3694 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3284 3695
3285 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);
3286 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3697 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3287 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);
3288 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 */
3289 3700
3290 coro_stash = gv_stashpv ("Coro", TRUE); 3701 coro_stash = gv_stashpv ("Coro", TRUE);
3291 3702
3292 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 3703 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3293 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 3704 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3294 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL)); 3705 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
… …
3312 sv_setiv (sv, (IV)&coroapi); 3723 sv_setiv (sv, (IV)&coroapi);
3313 SvREADONLY_on (sv); 3724 SvREADONLY_on (sv);
3314 } 3725 }
3315} 3726}
3316 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
3317void 3753void
3318terminate (...) 3754terminate (...)
3319 CODE: 3755 CODE:
3320 CORO_EXECUTE_SLF_XS (slf_init_terminate); 3756 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3757
3758void
3759cancel (...)
3760 CODE:
3761 CORO_EXECUTE_SLF_XS (slf_init_cancel);
3762
3763int
3764safe_cancel (Coro::State self, ...)
3765 C_ARGS: aTHX_ self, &ST (1), items - 1
3321 3766
3322void 3767void
3323schedule (...) 3768schedule (...)
3324 CODE: 3769 CODE:
3325 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3770 CORO_EXECUTE_SLF_XS (slf_init_schedule);
… …
3355_set_readyhook (SV *hook) 3800_set_readyhook (SV *hook)
3356 PROTOTYPE: $ 3801 PROTOTYPE: $
3357 CODE: 3802 CODE:
3358 SvREFCNT_dec (coro_readyhook); 3803 SvREFCNT_dec (coro_readyhook);
3359 SvGETMAGIC (hook); 3804 SvGETMAGIC (hook);
3805 if (SvOK (hook))
3806 {
3360 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 }
3361 3815
3362int 3816int
3363prio (Coro::State coro, int newprio = 0) 3817prio (Coro::State coro, int newprio = 0)
3364 PROTOTYPE: $;$ 3818 PROTOTYPE: $;$
3365 ALIAS: 3819 ALIAS:
… …
3429 for (i = 1; i < items; ++i) 3883 for (i = 1; i < items; ++i)
3430 av_push (av, SvREFCNT_inc_NN (ST (i))); 3884 av_push (av, SvREFCNT_inc_NN (ST (i)));
3431 3885
3432 if ((SV *)hv == &PL_sv_undef) 3886 if ((SV *)hv == &PL_sv_undef)
3433 { 3887 {
3434 PUSHMARK (SP); 3888 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3435 EXTEND (SP, 2);
3436 PUSHs (sv_Coro);
3437 PUSHs ((SV *)cv_pool_handler);
3438 PUTBACK;
3439 call_sv ((SV *)cv_coro_state_new, G_SCALAR);
3440 SPAGAIN;
3441
3442 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs)); 3889 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
3890 SvREFCNT_dec (sv);
3443 } 3891 }
3444 3892
3445 { 3893 {
3446 struct coro *coro = SvSTATE_hv (hv); 3894 struct coro *coro = SvSTATE_hv (hv);
3447 3895
… …
3481 CODE: 3929 CODE:
3482{ 3930{
3483 struct coro *coro = SvSTATE_current; 3931 struct coro *coro = SvSTATE_current;
3484 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 3932 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3485 3933
3486 block = (SV *)coro_sv_2cv (aTHX_ block); 3934 block = s_get_cv_croak (block);
3487 3935
3488 if (!*avp) 3936 if (!*avp)
3489 *avp = newAV (); 3937 *avp = newAV ();
3490 3938
3491 av_push (*avp, SvREFCNT_inc (block)); 3939 av_push (*avp, SvREFCNT_inc (block));
… …
3691 4139
3692void 4140void
3693_register (char *target, char *proto, SV *req) 4141_register (char *target, char *proto, SV *req)
3694 CODE: 4142 CODE:
3695{ 4143{
3696 CV *req_cv = coro_sv_2cv (aTHX_ req); 4144 SV *req_cv = s_get_cv_croak (req);
3697 /* newXSproto doesn't return the CV on 5.8 */ 4145 /* newXSproto doesn't return the CV on 5.8 */
3698 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 4146 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3699 sv_setpv ((SV *)slf_cv, proto); 4147 sv_setpv ((SV *)slf_cv, proto);
3700 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);
3701} 4149}
3702 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