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.316 by root, Thu Nov 20 06:01:40 2008 UTC vs.
Revision 1.398 by root, Sat May 7 14:11:10 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"
12 17
13#include <stdio.h> 18#include <stdio.h>
14#include <errno.h> 19#include <errno.h>
15#include <assert.h> 20#include <assert.h>
16 21
17#ifdef WIN32 22#ifndef SVs_PADSTALE
23# define SVs_PADSTALE 0
24#endif
25
26#if defined(_WIN32)
27# undef HAS_GETTIMEOFDAY
18# undef setjmp 28# undef setjmp
19# undef longjmp 29# undef longjmp
20# undef _exit 30# undef _exit
21# define setjmp _setjmp /* deep magic */ 31# define setjmp _setjmp /* deep magic */
22#else 32#else
… …
51#endif 61#endif
52 62
53/* the maximum number of idle cctx that will be pooled */ 63/* the maximum number of idle cctx that will be pooled */
54static int cctx_max_idle = 4; 64static int cctx_max_idle = 4;
55 65
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
107/* 5.8.7 */
108#ifndef SvRV_set
109# define SvRV_set(s,v) SvRV(s) = (v)
110#endif
111
112#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 66#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
113# undef CORO_STACKGUARD 67# undef CORO_STACKGUARD
114#endif 68#endif
115 69
116#ifndef CORO_STACKGUARD 70#ifndef CORO_STACKGUARD
… …
130#else 84#else
131# define dSTACKLEVEL volatile void *stacklevel 85# define dSTACKLEVEL volatile void *stacklevel
132# define STACKLEVEL ((void *)&stacklevel) 86# define STACKLEVEL ((void *)&stacklevel)
133#endif 87#endif
134 88
135#define IN_DESTRUCT (PL_main_cv == Nullcv) 89#define IN_DESTRUCT PL_dirty
136 90
137#if __GNUC__ >= 3 91#if __GNUC__ >= 3
138# define attribute(x) __attribute__(x) 92# define attribute(x) __attribute__(x)
139# define expect(expr,value) __builtin_expect ((expr),(value)) 93# define expect(expr,value) __builtin_expect ((expr), (value))
140# define INLINE static inline 94# define INLINE static inline
141#else 95#else
142# define attribute(x) 96# define attribute(x)
143# define expect(expr,value) (expr) 97# define expect(expr,value) (expr)
144# define INLINE static 98# define INLINE static
… …
156# if CORO_PTHREAD 110# if CORO_PTHREAD
157static void *coro_thx; 111static void *coro_thx;
158# endif 112# endif
159#endif 113#endif
160 114
115#ifdef __linux
116# include <time.h> /* for timespec */
117# include <syscall.h> /* for SYS_* */
118# ifdef SYS_clock_gettime
119# define coro_clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
120# define CORO_CLOCK_MONOTONIC 1
121# define CORO_CLOCK_THREAD_CPUTIME_ID 3
122# endif
123#endif
124
161static double (*nvtime)(); /* so why doesn't it take void? */ 125static double (*nvtime)(); /* so why doesn't it take void? */
126static void (*u2time)(pTHX_ UV ret[2]);
162 127
163/* we hijack an hopefully unused CV flag for our purposes */ 128/* we hijack an hopefully unused CV flag for our purposes */
164#define CVf_SLF 0x4000 129#define CVf_SLF 0x4000
165static OP *pp_slf (pTHX); 130static OP *pp_slf (pTHX);
131static void slf_destroy (pTHX_ struct coro *coro);
166 132
167static U32 cctx_gen; 133static U32 cctx_gen;
168static size_t cctx_stacksize = CORO_STACKSIZE; 134static size_t cctx_stacksize = CORO_STACKSIZE;
169static struct CoroAPI coroapi; 135static struct CoroAPI coroapi;
170static AV *main_mainstack; /* used to differentiate between $main and others */ 136static AV *main_mainstack; /* used to differentiate between $main and others */
171static JMPENV *main_top_env; 137static JMPENV *main_top_env;
172static HV *coro_state_stash, *coro_stash; 138static HV *coro_state_stash, *coro_stash;
173static volatile SV *coro_mortal; /* will be freed/thrown after next transfer */ 139static volatile SV *coro_mortal; /* will be freed/thrown after next transfer */
174 140
141static AV *av_destroy; /* destruction queue */
142static SV *sv_manager; /* the manager coro */
143static SV *sv_idle; /* $Coro::idle */
144
175static GV *irsgv; /* $/ */ 145static GV *irsgv; /* $/ */
176static GV *stdoutgv; /* *STDOUT */ 146static GV *stdoutgv; /* *STDOUT */
177static SV *rv_diehook; 147static SV *rv_diehook;
178static SV *rv_warnhook; 148static SV *rv_warnhook;
179static HV *hv_sig; /* %SIG */ 149static HV *hv_sig; /* %SIG */
180 150
181/* async_pool helper stuff */ 151/* async_pool helper stuff */
182static SV *sv_pool_rss; 152static SV *sv_pool_rss;
183static SV *sv_pool_size; 153static SV *sv_pool_size;
184static SV *sv_async_pool_idle; 154static SV *sv_async_pool_idle; /* description string */
185static AV *av_async_pool; 155static AV *av_async_pool; /* idle pool */
186static SV *sv_Coro; 156static SV *sv_Coro; /* class string */
187static CV *cv_pool_handler; 157static CV *cv_pool_handler;
188static CV *cv_coro_state_new;
189 158
190/* Coro::AnyEvent */ 159/* Coro::AnyEvent */
191static SV *sv_activity; 160static SV *sv_activity;
161
162/* enable processtime/realtime profiling */
163static char enable_times;
164typedef U32 coro_ts[2];
165static coro_ts time_real, time_cpu;
166static char times_valid;
192 167
193static struct coro_cctx *cctx_first; 168static struct coro_cctx *cctx_first;
194static int cctx_count, cctx_idle; 169static int cctx_count, cctx_idle;
195 170
196enum { 171enum {
… …
222 int valgrind_id; 197 int valgrind_id;
223#endif 198#endif
224 unsigned char flags; 199 unsigned char flags;
225} coro_cctx; 200} coro_cctx;
226 201
202static coro_cctx *cctx_current; /* the currently running cctx */
203
204/*****************************************************************************/
205
227enum { 206enum {
228 CF_RUNNING = 0x0001, /* coroutine is running */ 207 CF_RUNNING = 0x0001, /* coroutine is running */
229 CF_READY = 0x0002, /* coroutine is ready */ 208 CF_READY = 0x0002, /* coroutine is ready */
230 CF_NEW = 0x0004, /* has never been switched to */ 209 CF_NEW = 0x0004, /* has never been switched to */
231 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 210 CF_DESTROYED = 0x0008, /* coroutine data has been freed */
211 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
212 CF_NOCANCEL = 0x0020, /* cannot cancel, set slf_frame.data to 1 (hackish) */
232}; 213};
233 214
234/* the structure where most of the perl state is stored, overlaid on the cxstack */ 215/* the structure where most of the perl state is stored, overlaid on the cxstack */
235typedef struct 216typedef struct
236{ 217{
237 SV *defsv; 218 SV *defsv;
238 AV *defav; 219 AV *defav;
239 SV *errsv; 220 SV *errsv;
240 SV *irsgv; 221 SV *irsgv;
222 HV *hinthv;
241#define VAR(name,type) type name; 223#define VAR(name,type) type name;
242# include "state.h" 224# include "state.h"
243#undef VAR 225#undef VAR
244} perl_slots; 226} perl_slots;
245 227
228// how many context stack entries do we need for perl_slots
246#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT)) 229#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
247 230
248/* this is a structure representing a perl-level coroutine */ 231/* this is a structure representing a perl-level coroutine */
249struct coro { 232struct coro {
250 /* the C coroutine allocated to this perl coroutine, if any */ 233 /* the C coroutine allocated to this perl coroutine, if any */
251 coro_cctx *cctx; 234 coro_cctx *cctx;
235
236 /* ready queue */
237 struct coro *next_ready;
252 238
253 /* state data */ 239 /* state data */
254 struct CoroSLF slf_frame; /* saved slf frame */ 240 struct CoroSLF slf_frame; /* saved slf frame */
255 AV *mainstack; 241 AV *mainstack;
256 perl_slots *slot; /* basically the saved sp */ 242 perl_slots *slot; /* basically the saved sp */
… …
258 CV *startcv; /* the CV to execute */ 244 CV *startcv; /* the CV to execute */
259 AV *args; /* data associated with this coroutine (initial args) */ 245 AV *args; /* data associated with this coroutine (initial args) */
260 int refcnt; /* coroutines are refcounted, yes */ 246 int refcnt; /* coroutines are refcounted, yes */
261 int flags; /* CF_ flags */ 247 int flags; /* CF_ flags */
262 HV *hv; /* the perl hash associated with this coro, if any */ 248 HV *hv; /* the perl hash associated with this coro, if any */
263 void (*on_destroy)(pTHX_ struct coro *coro);
264 249
265 /* statistics */ 250 /* statistics */
266 int usecount; /* number of transfers to this coro */ 251 int usecount; /* number of transfers to this coro */
267 252
268 /* coro process data */ 253 /* coro process data */
… …
273 /* async_pool */ 258 /* async_pool */
274 SV *saved_deffh; 259 SV *saved_deffh;
275 SV *invoke_cb; 260 SV *invoke_cb;
276 AV *invoke_av; 261 AV *invoke_av;
277 262
263 /* on_enter/on_leave */
264 AV *on_enter;
265 AV *on_leave;
266
267 /* swap_sv */
268 AV *swap_sv;
269
270 /* times */
271 coro_ts t_cpu, t_real;
272
278 /* linked list */ 273 /* linked list */
279 struct coro *next, *prev; 274 struct coro *next, *prev;
280}; 275};
281 276
282typedef struct coro *Coro__State; 277typedef struct coro *Coro__State;
283typedef struct coro *Coro__State_or_hashref; 278typedef struct coro *Coro__State_or_hashref;
284 279
285/* the following variables are effectively part of the perl context */ 280/* the following variables are effectively part of the perl context */
286/* and get copied between struct coro and these variables */ 281/* and get copied between struct coro and these variables */
287/* the mainr easonw e don't support windows process emulation */ 282/* the main reason we don't support windows process emulation */
288static struct CoroSLF slf_frame; /* the current slf frame */ 283static struct CoroSLF slf_frame; /* the current slf frame */
289 284
290/** Coro ********************************************************************/ 285/** Coro ********************************************************************/
291 286
292#define PRIO_MAX 3 287#define CORO_PRIO_MAX 3
293#define PRIO_HIGH 1 288#define CORO_PRIO_HIGH 1
294#define PRIO_NORMAL 0 289#define CORO_PRIO_NORMAL 0
295#define PRIO_LOW -1 290#define CORO_PRIO_LOW -1
296#define PRIO_IDLE -3 291#define CORO_PRIO_IDLE -3
297#define PRIO_MIN -4 292#define CORO_PRIO_MIN -4
298 293
299/* for Coro.pm */ 294/* for Coro.pm */
300static SV *coro_current; 295static SV *coro_current;
301static SV *coro_readyhook; 296static SV *coro_readyhook;
302static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1]; 297static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
303static CV *cv_coro_run, *cv_coro_terminate; 298static CV *cv_coro_run;
304static struct coro *coro_first; 299static struct coro *coro_first;
305#define coro_nready coroapi.nready 300#define coro_nready coroapi.nready
301
302/** Coro::Select ************************************************************/
303
304static OP *(*coro_old_pp_sselect) (pTHX);
305static SV *coro_select_select;
306
307/* horrible hack, but if it works... */
308static OP *
309coro_pp_sselect (pTHX)
310{
311 dSP;
312 PUSHMARK (SP - 4); /* fake argument list */
313 XPUSHs (coro_select_select);
314 PUTBACK;
315
316 /* entersub is an UNOP, select a LISTOP... keep your fingers crossed */
317 PL_op->op_flags |= OPf_STACKED;
318 PL_op->op_private = 0;
319 return PL_ppaddr [OP_ENTERSUB](aTHX);
320}
321
322/** time stuff **************************************************************/
323
324#ifdef HAS_GETTIMEOFDAY
325
326static void
327coro_u2time (pTHX_ UV ret[2])
328{
329 struct timeval tv;
330 gettimeofday (&tv, 0);
331
332 ret [0] = tv.tv_sec;
333 ret [1] = tv.tv_usec;
334}
335
336static double
337coro_nvtime ()
338{
339 struct timeval tv;
340 gettimeofday (&tv, 0);
341
342 return tv.tv_sec + tv.tv_usec * 1e-6;
343}
344
345static void
346time_init (pTHX)
347{
348 nvtime = coro_nvtime;
349 u2time = coro_u2time;
350}
351
352#else
353
354static void
355time_init (pTHX)
356{
357 SV **svp;
358
359 require_pv ("Time/HiRes.pm");
360
361 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
362
363 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
364 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught");
365
366 nvtime = INT2PTR (double (*)(), SvIV (*svp));
367
368 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
369 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
370}
371
372#endif
306 373
307/** lowlevel stuff **********************************************************/ 374/** lowlevel stuff **********************************************************/
308 375
309static SV * 376static SV *
310coro_get_sv (pTHX_ const char *name, int create) 377coro_get_sv (pTHX_ const char *name, int create)
… …
334 get_hv (name, create); 401 get_hv (name, create);
335#endif 402#endif
336 return get_hv (name, create); 403 return get_hv (name, create);
337} 404}
338 405
339/* may croak */ 406INLINE void
340INLINE CV * 407coro_times_update ()
341coro_sv_2cv (pTHX_ SV *sv)
342{ 408{
409#ifdef coro_clock_gettime
410 struct timespec ts;
411
412 ts.tv_sec = ts.tv_nsec = 0;
413 coro_clock_gettime (CORO_CLOCK_THREAD_CPUTIME_ID, &ts);
414 time_cpu [0] = ts.tv_sec; time_cpu [1] = ts.tv_nsec;
415
416 ts.tv_sec = ts.tv_nsec = 0;
417 coro_clock_gettime (CORO_CLOCK_MONOTONIC, &ts);
418 time_real [0] = ts.tv_sec; time_real [1] = ts.tv_nsec;
419#else
420 dTHX;
421 UV tv[2];
422
423 u2time (aTHX_ tv);
424 time_real [0] = tv [0];
425 time_real [1] = tv [1] * 1000;
426#endif
427}
428
429INLINE void
430coro_times_add (struct coro *c)
431{
432 c->t_real [1] += time_real [1];
433 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
434 c->t_real [0] += time_real [0];
435
436 c->t_cpu [1] += time_cpu [1];
437 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
438 c->t_cpu [0] += time_cpu [0];
439}
440
441INLINE void
442coro_times_sub (struct coro *c)
443{
444 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; }
445 c->t_real [1] -= time_real [1];
446 c->t_real [0] -= time_real [0];
447
448 if (c->t_cpu [1] < time_cpu [1]) { c->t_cpu [1] += 1000000000; --c->t_cpu [0]; }
449 c->t_cpu [1] -= time_cpu [1];
450 c->t_cpu [0] -= time_cpu [0];
451}
452
453/*****************************************************************************/
454/* magic glue */
455
456#define CORO_MAGIC_type_cv 26
457#define CORO_MAGIC_type_state PERL_MAGIC_ext
458
459#define CORO_MAGIC_NN(sv, type) \
460 (expect_true (SvMAGIC (sv)->mg_type == type) \
461 ? SvMAGIC (sv) \
462 : mg_find (sv, type))
463
464#define CORO_MAGIC(sv, type) \
465 (expect_true (SvMAGIC (sv)) \
466 ? CORO_MAGIC_NN (sv, type) \
467 : 0)
468
469#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
470#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
471
472INLINE struct coro *
473SvSTATE_ (pTHX_ SV *coro)
474{
343 HV *st; 475 HV *stash;
344 GV *gvp; 476 MAGIC *mg;
345 return sv_2cv (sv, &st, &gvp, 0); 477
478 if (SvROK (coro))
479 coro = SvRV (coro);
480
481 if (expect_false (SvTYPE (coro) != SVt_PVHV))
482 croak ("Coro::State object required");
483
484 stash = SvSTASH (coro);
485 if (expect_false (stash != coro_stash && stash != coro_state_stash))
486 {
487 /* very slow, but rare, check */
488 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
489 croak ("Coro::State object required");
490 }
491
492 mg = CORO_MAGIC_state (coro);
493 return (struct coro *)mg->mg_ptr;
346} 494}
495
496#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
497
498/* faster than SvSTATE, but expects a coroutine hv */
499#define SvSTATE_hv(hv) ((struct coro *)CORO_MAGIC_NN ((SV *)hv, CORO_MAGIC_type_state)->mg_ptr)
500#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
501
502/*****************************************************************************/
503/* padlist management and caching */
347 504
348static AV * 505static AV *
349coro_clone_padlist (pTHX_ CV *cv) 506coro_derive_padlist (pTHX_ CV *cv)
350{ 507{
351 AV *padlist = CvPADLIST (cv); 508 AV *padlist = CvPADLIST (cv);
352 AV *newpadlist, *newpad; 509 AV *newpadlist, *newpad;
353 510
354 newpadlist = newAV (); 511 newpadlist = newAV ();
… …
359 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 516 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
360#endif 517#endif
361 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 518 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
362 --AvFILLp (padlist); 519 --AvFILLp (padlist);
363 520
364 av_store (newpadlist, 0, SvREFCNT_inc_NN (*av_fetch (padlist, 0, FALSE))); 521 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0]));
365 av_store (newpadlist, 1, (SV *)newpad); 522 av_store (newpadlist, 1, (SV *)newpad);
366 523
367 return newpadlist; 524 return newpadlist;
368} 525}
369 526
370static void 527static void
371free_padlist (pTHX_ AV *padlist) 528free_padlist (pTHX_ AV *padlist)
372{ 529{
373 /* may be during global destruction */ 530 /* may be during global destruction */
374 if (SvREFCNT (padlist)) 531 if (!IN_DESTRUCT)
375 { 532 {
376 I32 i = AvFILLp (padlist); 533 I32 i = AvFILLp (padlist);
377 while (i >= 0) 534
535 while (i > 0) /* special-case index 0 */
378 { 536 {
379 SV **svp = av_fetch (padlist, i--, FALSE); 537 /* we try to be extra-careful here */
380 if (svp) 538 AV *av = (AV *)AvARRAY (padlist)[i--];
381 { 539 I32 j = AvFILLp (av);
382 SV *sv; 540
383 while (&PL_sv_undef != (sv = av_pop ((AV *)*svp))) 541 while (j >= 0)
542 SvREFCNT_dec (AvARRAY (av)[j--]);
543
544 AvFILLp (av) = -1;
384 SvREFCNT_dec (sv); 545 SvREFCNT_dec (av);
385
386 SvREFCNT_dec (*svp);
387 }
388 } 546 }
389 547
548 SvREFCNT_dec (AvARRAY (padlist)[0]);
549
550 AvFILLp (padlist) = -1;
390 SvREFCNT_dec ((SV*)padlist); 551 SvREFCNT_dec ((SV*)padlist);
391 } 552 }
392} 553}
393 554
394static int 555static int
395coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 556coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
396{ 557{
397 AV *padlist; 558 AV *padlist;
398 AV *av = (AV *)mg->mg_obj; 559 AV *av = (AV *)mg->mg_obj;
560
561 /* perl manages to free our internal AV and _then_ call us */
562 if (IN_DESTRUCT)
563 return 0;
399 564
400 /* casting is fun. */ 565 /* casting is fun. */
401 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 566 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
402 free_padlist (aTHX_ padlist); 567 free_padlist (aTHX_ padlist);
403 568
404 SvREFCNT_dec (av); /* sv_magicext increased the refcount */ 569 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
405 570
406 return 0; 571 return 0;
407} 572}
408
409#define CORO_MAGIC_type_cv 26
410#define CORO_MAGIC_type_state PERL_MAGIC_ext
411 573
412static MGVTBL coro_cv_vtbl = { 574static MGVTBL coro_cv_vtbl = {
413 0, 0, 0, 0, 575 0, 0, 0, 0,
414 coro_cv_free 576 coro_cv_free
415}; 577};
416
417#define CORO_MAGIC_NN(sv, type) \
418 (expect_true (SvMAGIC (sv)->mg_type == type) \
419 ? SvMAGIC (sv) \
420 : mg_find (sv, type))
421
422#define CORO_MAGIC(sv, type) \
423 (expect_true (SvMAGIC (sv)) \
424 ? CORO_MAGIC_NN (sv, type) \
425 : 0)
426
427#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
428#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
429
430INLINE struct coro *
431SvSTATE_ (pTHX_ SV *coro)
432{
433 HV *stash;
434 MAGIC *mg;
435
436 if (SvROK (coro))
437 coro = SvRV (coro);
438
439 if (expect_false (SvTYPE (coro) != SVt_PVHV))
440 croak ("Coro::State object required");
441
442 stash = SvSTASH (coro);
443 if (expect_false (stash != coro_stash && stash != coro_state_stash))
444 {
445 /* very slow, but rare, check */
446 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
447 croak ("Coro::State object required");
448 }
449
450 mg = CORO_MAGIC_state (coro);
451 return (struct coro *)mg->mg_ptr;
452}
453
454#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
455
456/* faster than SvSTATE, but expects a coroutine hv */
457#define SvSTATE_hv(hv) ((struct coro *)CORO_MAGIC_NN ((SV *)hv, CORO_MAGIC_type_state)->mg_ptr)
458#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
459 578
460/* the next two functions merely cache the padlists */ 579/* the next two functions merely cache the padlists */
461static void 580static void
462get_padlist (pTHX_ CV *cv) 581get_padlist (pTHX_ CV *cv)
463{ 582{
… …
474 CV *cp = Perl_cv_clone (aTHX_ cv); 593 CV *cp = Perl_cv_clone (aTHX_ cv);
475 CvPADLIST (cv) = CvPADLIST (cp); 594 CvPADLIST (cv) = CvPADLIST (cp);
476 CvPADLIST (cp) = 0; 595 CvPADLIST (cp) = 0;
477 SvREFCNT_dec (cp); 596 SvREFCNT_dec (cp);
478#else 597#else
479 CvPADLIST (cv) = coro_clone_padlist (aTHX_ cv); 598 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
480#endif 599#endif
481 } 600 }
482} 601}
483 602
484static void 603static void
… …
491 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 610 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
492 611
493 av = (AV *)mg->mg_obj; 612 av = (AV *)mg->mg_obj;
494 613
495 if (expect_false (AvFILLp (av) >= AvMAX (av))) 614 if (expect_false (AvFILLp (av) >= AvMAX (av)))
496 av_extend (av, AvMAX (av) + 1); 615 av_extend (av, AvFILLp (av) + 1);
497 616
498 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 617 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
499} 618}
500 619
501/** load & save, init *******************************************************/ 620/** load & save, init *******************************************************/
621
622/* swap sv heads, at least logically */
623static void
624swap_svs (pTHX_ Coro__State c)
625{
626 int i;
627
628 for (i = 0; i <= AvFILLp (c->swap_sv); )
629 {
630 SV *a = AvARRAY (c->swap_sv)[i++];
631 SV *b = AvARRAY (c->swap_sv)[i++];
632
633 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
634 SV tmp;
635
636 /* swap sv_any */
637 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
638
639 /* swap sv_flags */
640 SvFLAGS (&tmp) = SvFLAGS (a);
641 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
642 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
643
644#if PERL_VERSION_ATLEAST (5,10,0)
645 /* perl 5.10 complicates this _quite_ a bit, but it also is
646 * much faster, so no quarrels here. alternatively, we could
647 * sv_upgrade to avoid this.
648 */
649 {
650 /* swap sv_u */
651 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
652
653 /* if SvANY points to the head, we need to adjust the pointers,
654 * as the pointer for a still points to b, and maybe vice versa.
655 */
656 #define svany_in_head(type) \
657 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
658
659 if (svany_in_head (SvTYPE (a)))
660 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
661
662 if (svany_in_head (SvTYPE (b)))
663 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
664 }
665#endif
666 }
667}
668
669#define SWAP_SVS(coro) \
670 if (expect_false ((coro)->swap_sv)) \
671 swap_svs (aTHX_ (coro))
672
673static void
674on_enterleave_call (pTHX_ SV *cb);
502 675
503static void 676static void
504load_perl (pTHX_ Coro__State c) 677load_perl (pTHX_ Coro__State c)
505{ 678{
506 perl_slots *slot = c->slot; 679 perl_slots *slot = c->slot;
507 c->slot = 0; 680 c->slot = 0;
508 681
509 PL_mainstack = c->mainstack; 682 PL_mainstack = c->mainstack;
510 683
511 GvSV (PL_defgv) = slot->defsv; 684 GvSV (PL_defgv) = slot->defsv;
512 GvAV (PL_defgv) = slot->defav; 685 GvAV (PL_defgv) = slot->defav;
513 GvSV (PL_errgv) = slot->errsv; 686 GvSV (PL_errgv) = slot->errsv;
514 GvSV (irsgv) = slot->irsgv; 687 GvSV (irsgv) = slot->irsgv;
688 GvHV (PL_hintgv) = slot->hinthv;
515 689
516 #define VAR(name,type) PL_ ## name = slot->name; 690 #define VAR(name,type) PL_ ## name = slot->name;
517 # include "state.h" 691 # include "state.h"
518 #undef VAR 692 #undef VAR
519 693
… …
533 PUTBACK; 707 PUTBACK;
534 } 708 }
535 709
536 slf_frame = c->slf_frame; 710 slf_frame = c->slf_frame;
537 CORO_THROW = c->except; 711 CORO_THROW = c->except;
712
713 if (expect_false (enable_times))
714 {
715 if (expect_false (!times_valid))
716 coro_times_update ();
717
718 coro_times_sub (c);
719 }
720
721 if (expect_false (c->on_enter))
722 {
723 int i;
724
725 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
726 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
727 }
728
729 SWAP_SVS (c);
538} 730}
539 731
540static void 732static void
541save_perl (pTHX_ Coro__State c) 733save_perl (pTHX_ Coro__State c)
542{ 734{
735 SWAP_SVS (c);
736
737 if (expect_false (c->on_leave))
738 {
739 int i;
740
741 for (i = AvFILLp (c->on_leave); i >= 0; --i)
742 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
743 }
744
745 times_valid = 0;
746
747 if (expect_false (enable_times))
748 {
749 coro_times_update (); times_valid = 1;
750 coro_times_add (c);
751 }
752
543 c->except = CORO_THROW; 753 c->except = CORO_THROW;
544 c->slf_frame = slf_frame; 754 c->slf_frame = slf_frame;
545 755
546 { 756 {
547 dSP; 757 dSP;
… …
560 { 770 {
561 while (expect_true (cxix >= 0)) 771 while (expect_true (cxix >= 0))
562 { 772 {
563 PERL_CONTEXT *cx = &ccstk[cxix--]; 773 PERL_CONTEXT *cx = &ccstk[cxix--];
564 774
565 if (expect_true (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT)) 775 if (expect_true (CxTYPE (cx) == CXt_SUB) || expect_false (CxTYPE (cx) == CXt_FORMAT))
566 { 776 {
567 CV *cv = cx->blk_sub.cv; 777 CV *cv = cx->blk_sub.cv;
568 778
569 if (expect_true (CvDEPTH (cv))) 779 if (expect_true (CvDEPTH (cv)))
570 { 780 {
… …
589 799
590 PUTBACK; 800 PUTBACK;
591 } 801 }
592 802
593 /* allocate some space on the context stack for our purposes */ 803 /* allocate some space on the context stack for our purposes */
594 /* we manually unroll here, as usually 2 slots is enough */ 804 if (expect_false (cxstack_ix + SLOT_COUNT >= cxstack_max))
595 if (SLOT_COUNT >= 1) CXINC;
596 if (SLOT_COUNT >= 2) CXINC;
597 if (SLOT_COUNT >= 3) CXINC;
598 { 805 {
599 int i; 806 unsigned int i;
807
600 for (i = 3; i < SLOT_COUNT; ++i) 808 for (i = 0; i < SLOT_COUNT; ++i)
601 CXINC; 809 CXINC;
602 } 810
603 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 811 cxstack_ix -= SLOT_COUNT; /* undo allocation */
812 }
604 813
605 c->mainstack = PL_mainstack; 814 c->mainstack = PL_mainstack;
606 815
607 { 816 {
608 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 817 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
609 818
610 slot->defav = GvAV (PL_defgv); 819 slot->defav = GvAV (PL_defgv);
611 slot->defsv = DEFSV; 820 slot->defsv = DEFSV;
612 slot->errsv = ERRSV; 821 slot->errsv = ERRSV;
613 slot->irsgv = GvSV (irsgv); 822 slot->irsgv = GvSV (irsgv);
823 slot->hinthv = GvHV (PL_hintgv);
614 824
615 #define VAR(name,type) slot->name = PL_ ## name; 825 #define VAR(name,type) slot->name = PL_ ## name;
616 # include "state.h" 826 # include "state.h"
617 #undef VAR 827 #undef VAR
618 } 828 }
… …
628# define coro_init_stacks(thx) init_stacks () 838# define coro_init_stacks(thx) init_stacks ()
629#else 839#else
630static void 840static void
631coro_init_stacks (pTHX) 841coro_init_stacks (pTHX)
632{ 842{
633 PL_curstackinfo = new_stackinfo(32, 8); 843 PL_curstackinfo = new_stackinfo(32, 4 + SLOT_COUNT); /* 3 is minimum due to perl rounding down in scope.c:GROW() */
634 PL_curstackinfo->si_type = PERLSI_MAIN; 844 PL_curstackinfo->si_type = PERLSI_MAIN;
635 PL_curstack = PL_curstackinfo->si_stack; 845 PL_curstack = PL_curstackinfo->si_stack;
636 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 846 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
637 847
638 PL_stack_base = AvARRAY(PL_curstack); 848 PL_stack_base = AvARRAY(PL_curstack);
… …
745#endif 955#endif
746 956
747/* 957/*
748 * This overrides the default magic get method of %SIG elements. 958 * This overrides the default magic get method of %SIG elements.
749 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook 959 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
750 * and instead of tryign to save and restore the hash elements, we just provide 960 * and instead of trying to save and restore the hash elements, we just provide
751 * readback here. 961 * readback here.
752 * We only do this when the hook is != 0, as they are often set to 0 temporarily,
753 * not expecting this to actually change the hook. This is a potential problem
754 * when a schedule happens then, but we ignore this.
755 */ 962 */
756static int 963static int
757coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 964coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
758{ 965{
759 const char *s = MgPV_nolen_const (mg); 966 const char *s = MgPV_nolen_const (mg);
… …
812 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 1019 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
813 1020
814 if (svp) 1021 if (svp)
815 { 1022 {
816 SV *old = *svp; 1023 SV *old = *svp;
817 *svp = newSVsv (sv); 1024 *svp = SvOK (sv) ? newSVsv (sv) : 0;
818 SvREFCNT_dec (old); 1025 SvREFCNT_dec (old);
819 return 0; 1026 return 0;
820 } 1027 }
821 } 1028 }
822 1029
… …
834slf_check_nop (pTHX_ struct CoroSLF *frame) 1041slf_check_nop (pTHX_ struct CoroSLF *frame)
835{ 1042{
836 return 0; 1043 return 0;
837} 1044}
838 1045
839static UNOP coro_setup_op; 1046static int
1047slf_check_repeat (pTHX_ struct CoroSLF *frame)
1048{
1049 return 1;
1050}
1051
1052static UNOP init_perl_op;
840 1053
841static void NOINLINE /* noinline to keep it out of the transfer fast path */ 1054static void NOINLINE /* noinline to keep it out of the transfer fast path */
842coro_setup (pTHX_ struct coro *coro) 1055init_perl (pTHX_ struct coro *coro)
843{ 1056{
844 /* 1057 /*
845 * emulate part of the perl startup here. 1058 * emulate part of the perl startup here.
846 */ 1059 */
847 coro_init_stacks (aTHX); 1060 coro_init_stacks (aTHX);
848 1061
849 PL_runops = RUNOPS_DEFAULT; 1062 PL_runops = RUNOPS_DEFAULT;
850 PL_curcop = &PL_compiling; 1063 PL_curcop = &PL_compiling;
851 PL_in_eval = EVAL_NULL; 1064 PL_in_eval = EVAL_NULL;
852 PL_comppad = 0; 1065 PL_comppad = 0;
1066 PL_comppad_name = 0;
1067 PL_comppad_name_fill = 0;
1068 PL_comppad_name_floor = 0;
853 PL_curpm = 0; 1069 PL_curpm = 0;
854 PL_curpad = 0; 1070 PL_curpad = 0;
855 PL_localizing = 0; 1071 PL_localizing = 0;
856 PL_dirty = 0;
857 PL_restartop = 0; 1072 PL_restartop = 0;
858#if PERL_VERSION_ATLEAST (5,10,0) 1073#if PERL_VERSION_ATLEAST (5,10,0)
859 PL_parser = 0; 1074 PL_parser = 0;
860#endif 1075#endif
1076 PL_hints = 0;
861 1077
862 /* recreate the die/warn hooks */ 1078 /* recreate the die/warn hooks */
863 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1079 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook );
864 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1080 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook);
865 1081
866 GvSV (PL_defgv) = newSV (0); 1082 GvSV (PL_defgv) = newSV (0);
867 GvAV (PL_defgv) = coro->args; coro->args = 0; 1083 GvAV (PL_defgv) = coro->args; coro->args = 0;
868 GvSV (PL_errgv) = newSV (0); 1084 GvSV (PL_errgv) = newSV (0);
869 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1085 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
1086 GvHV (PL_hintgv) = 0;
870 PL_rs = newSVsv (GvSV (irsgv)); 1087 PL_rs = newSVsv (GvSV (irsgv));
871 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1088 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
872 1089
873 { 1090 {
874 dSP; 1091 dSP;
… …
891 */ 1108 */
892 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1109 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
893 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */ 1110 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
894 1111
895 /* 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 */
896 coro_setup_op.op_next = PL_op; 1113 init_perl_op.op_next = PL_op;
897 coro_setup_op.op_type = OP_CUSTOM; 1114 init_perl_op.op_type = OP_ENTERSUB;
898 coro_setup_op.op_ppaddr = pp_slf; 1115 init_perl_op.op_ppaddr = pp_slf;
899 /* 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 */
900 1117
901 PL_op = (OP *)&coro_setup_op; 1118 PL_op = (OP *)&init_perl_op;
902 1119
903 /* copy throw, in case it was set before coro_setup */ 1120 /* copy throw, in case it was set before init_perl */
904 CORO_THROW = coro->except; 1121 CORO_THROW = coro->except;
905}
906 1122
1123 SWAP_SVS (coro);
1124
1125 if (expect_false (enable_times))
1126 {
1127 coro_times_update ();
1128 coro_times_sub (coro);
1129 }
1130}
1131
907static void 1132static void
908coro_destruct (pTHX_ struct coro *coro) 1133coro_unwind_stacks (pTHX)
909{ 1134{
910 if (!IN_DESTRUCT) 1135 if (!IN_DESTRUCT)
911 { 1136 {
912 /* restore all saved variables and stuff */ 1137 /* restore all saved variables and stuff */
913 LEAVE_SCOPE (0); 1138 LEAVE_SCOPE (0);
… …
921 POPSTACK_TO (PL_mainstack); 1146 POPSTACK_TO (PL_mainstack);
922 1147
923 /* unwind main stack */ 1148 /* unwind main stack */
924 dounwind (-1); 1149 dounwind (-1);
925 } 1150 }
1151}
926 1152
927 SvREFCNT_dec (GvSV (PL_defgv)); 1153static void
928 SvREFCNT_dec (GvAV (PL_defgv)); 1154destroy_perl (pTHX_ struct coro *coro)
929 SvREFCNT_dec (GvSV (PL_errgv)); 1155{
930 SvREFCNT_dec (PL_defoutgv); 1156 SV *svf [9];
931 SvREFCNT_dec (PL_rs);
932 SvREFCNT_dec (GvSV (irsgv));
933 1157
934 SvREFCNT_dec (PL_diehook);
935 SvREFCNT_dec (PL_warnhook);
936 1158 {
1159 SV *old_current = SvRV (coro_current);
1160 struct coro *current = SvSTATE (old_current);
1161
1162 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1163
1164 save_perl (aTHX_ current);
1165
1166 /* this will cause transfer_check to croak on block*/
1167 SvRV_set (coro_current, (SV *)coro->hv);
1168
1169 load_perl (aTHX_ coro);
1170
1171 coro_unwind_stacks (aTHX);
1172 coro_destruct_stacks (aTHX);
1173
1174 /* restore swapped sv's */
1175 SWAP_SVS (coro);
1176
1177 // now save some sv's to be free'd later
1178 svf [0] = GvSV (PL_defgv);
1179 svf [1] = (SV *)GvAV (PL_defgv);
1180 svf [2] = GvSV (PL_errgv);
1181 svf [3] = (SV *)PL_defoutgv;
1182 svf [4] = PL_rs;
1183 svf [5] = GvSV (irsgv);
1184 svf [6] = (SV *)GvHV (PL_hintgv);
1185 svf [7] = PL_diehook;
1186 svf [8] = PL_warnhook;
1187 assert (9 == sizeof (svf) / sizeof (*svf));
1188
1189 SvRV_set (coro_current, old_current);
1190
1191 load_perl (aTHX_ current);
1192 }
1193
1194 {
1195 unsigned int i;
1196
1197 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i)
1198 SvREFCNT_dec (svf [i]);
1199
937 SvREFCNT_dec (coro->saved_deffh); 1200 SvREFCNT_dec (coro->saved_deffh);
938 SvREFCNT_dec (coro->rouse_cb); 1201 SvREFCNT_dec (coro->rouse_cb);
939 SvREFCNT_dec (coro->invoke_cb); 1202 SvREFCNT_dec (coro->invoke_cb);
940 SvREFCNT_dec (coro->invoke_av); 1203 SvREFCNT_dec (coro->invoke_av);
941 1204 }
942 coro_destruct_stacks (aTHX);
943} 1205}
944 1206
945INLINE void 1207INLINE void
946free_coro_mortal (pTHX) 1208free_coro_mortal (pTHX)
947{ 1209{
… …
955static int 1217static int
956runops_trace (pTHX) 1218runops_trace (pTHX)
957{ 1219{
958 COP *oldcop = 0; 1220 COP *oldcop = 0;
959 int oldcxix = -2; 1221 int oldcxix = -2;
960 struct coro *coro = SvSTATE_current; /* trace cctx is tied to specific coro */
961 coro_cctx *cctx = coro->cctx;
962 1222
963 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX))) 1223 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX)))
964 { 1224 {
965 PERL_ASYNC_CHECK (); 1225 PERL_ASYNC_CHECK ();
966 1226
967 if (cctx->flags & CC_TRACE_ALL) 1227 if (cctx_current->flags & CC_TRACE_ALL)
968 { 1228 {
969 if (PL_op->op_type == OP_LEAVESUB && cctx->flags & CC_TRACE_SUB) 1229 if (PL_op->op_type == OP_LEAVESUB && cctx_current->flags & CC_TRACE_SUB)
970 { 1230 {
971 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1231 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
972 SV **bot, **top; 1232 SV **bot, **top;
973 AV *av = newAV (); /* return values */ 1233 AV *av = newAV (); /* return values */
974 SV **cb; 1234 SV **cb;
… …
1011 1271
1012 if (PL_curcop != &PL_compiling) 1272 if (PL_curcop != &PL_compiling)
1013 { 1273 {
1014 SV **cb; 1274 SV **cb;
1015 1275
1016 if (oldcxix != cxstack_ix && cctx->flags & CC_TRACE_SUB) 1276 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB)
1017 { 1277 {
1018 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1278 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1019 1279
1020 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1280 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1021 { 1281 {
1022 runops_proc_t old_runops = PL_runops;
1023 dSP; 1282 dSP;
1024 GV *gv = CvGV (cx->blk_sub.cv); 1283 GV *gv = CvGV (cx->blk_sub.cv);
1025 SV *fullname = sv_2mortal (newSV (0)); 1284 SV *fullname = sv_2mortal (newSV (0));
1026 1285
1027 if (isGV (gv)) 1286 if (isGV (gv))
… …
1045 } 1304 }
1046 1305
1047 oldcxix = cxstack_ix; 1306 oldcxix = cxstack_ix;
1048 } 1307 }
1049 1308
1050 if (cctx->flags & CC_TRACE_LINE) 1309 if (cctx_current->flags & CC_TRACE_LINE)
1051 { 1310 {
1052 dSP; 1311 dSP;
1053 1312
1054 PL_runops = RUNOPS_DEFAULT; 1313 PL_runops = RUNOPS_DEFAULT;
1055 ENTER; 1314 ENTER;
… …
1074 1333
1075 TAINT_NOT; 1334 TAINT_NOT;
1076 return 0; 1335 return 0;
1077} 1336}
1078 1337
1079static struct coro_cctx *cctx_ssl_cctx;
1080static struct CoroSLF cctx_ssl_frame; 1338static struct CoroSLF cctx_ssl_frame;
1081 1339
1082static void 1340static void
1083slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta) 1341slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta)
1084{ 1342{
1085 ta->prev = (struct coro *)cctx_ssl_cctx;
1086 ta->next = 0; 1343 ta->prev = 0;
1087} 1344}
1088 1345
1089static int 1346static int
1090slf_check_set_stacklevel (pTHX_ struct CoroSLF *frame) 1347slf_check_set_stacklevel (pTHX_ struct CoroSLF *frame)
1091{ 1348{
… …
1094 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1351 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1095} 1352}
1096 1353
1097/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1354/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1098static void NOINLINE 1355static void NOINLINE
1099cctx_prepare (pTHX_ coro_cctx *cctx) 1356cctx_prepare (pTHX)
1100{ 1357{
1101 PL_top_env = &PL_start_env; 1358 PL_top_env = &PL_start_env;
1102 1359
1103 if (cctx->flags & CC_TRACE) 1360 if (cctx_current->flags & CC_TRACE)
1104 PL_runops = runops_trace; 1361 PL_runops = runops_trace;
1105 1362
1106 /* we already must be executing an SLF op, there is no other valid way 1363 /* we already must be executing an SLF op, there is no other valid way
1107 * that can lead to creation of a new cctx */ 1364 * that can lead to creation of a new cctx */
1108 assert (("FATAL: can't prepare slf-less cctx in Coro module (please report)", 1365 assert (("FATAL: can't prepare slf-less cctx in Coro module (please report)",
1109 slf_frame.prepare && PL_op->op_ppaddr == pp_slf)); 1366 slf_frame.prepare && PL_op->op_ppaddr == pp_slf));
1110 1367
1111 /* we must emulate leaving pp_slf, which is done inside slf_check_set_stacklevel */ 1368 /* we must emulate leaving pp_slf, which is done inside slf_check_set_stacklevel */
1112 cctx_ssl_cctx = cctx;
1113 cctx_ssl_frame = slf_frame; 1369 cctx_ssl_frame = slf_frame;
1114 1370
1115 slf_frame.prepare = slf_prepare_set_stacklevel; 1371 slf_frame.prepare = slf_prepare_set_stacklevel;
1116 slf_frame.check = slf_check_set_stacklevel; 1372 slf_frame.check = slf_check_set_stacklevel;
1117} 1373}
… …
1140 /* normally we would need to skip the entersub here */ 1396 /* normally we would need to skip the entersub here */
1141 /* not doing so will re-execute it, which is exactly what we want */ 1397 /* not doing so will re-execute it, which is exactly what we want */
1142 /* PL_nop = PL_nop->op_next */ 1398 /* PL_nop = PL_nop->op_next */
1143 1399
1144 /* inject a fake subroutine call to cctx_init */ 1400 /* inject a fake subroutine call to cctx_init */
1145 cctx_prepare (aTHX_ (coro_cctx *)arg); 1401 cctx_prepare (aTHX);
1146 1402
1147 /* cctx_run is the alternative tail of transfer() */ 1403 /* cctx_run is the alternative tail of transfer() */
1148 transfer_tail (aTHX); 1404 transfer_tail (aTHX);
1149 1405
1150 /* somebody or something will hit me for both perl_run and PL_restartop */ 1406 /* somebody or something will hit me for both perl_run and PL_restartop */
1151 PL_restartop = PL_op; 1407 PL_restartop = PL_op;
1152 perl_run (PL_curinterp); 1408 perl_run (PL_curinterp);
1153 /* 1409 /*
1154 * Unfortunately, there is no way to get at the return values of the 1410 * Unfortunately, there is no way to get at the return values of the
1155 * coro body here, as perl_run destroys these 1411 * coro body here, as perl_run destroys these. Likewise, we cannot catch
1412 * runtime errors here, as this is just a random interpreter, not a thread.
1156 */ 1413 */
1157 1414
1158 /* 1415 /*
1159 * If perl-run returns we assume exit() was being called or the coro 1416 * If perl-run returns we assume exit() was being called or the coro
1160 * fell off the end, which seems to be the only valid (non-bug) 1417 * fell off the end, which seems to be the only valid (non-bug)
1161 * reason for perl_run to return. We try to exit by jumping to the 1418 * reason for perl_run to return. We try to exit by jumping to the
1162 * bootstrap-time "top" top_env, as we cannot restore the "main" 1419 * bootstrap-time "top" top_env, as we cannot restore the "main"
1163 * coroutine as Coro has no such concept 1420 * coroutine as Coro has no such concept.
1421 * This actually isn't valid with the pthread backend, but OSes requiring
1422 * that backend are too broken to do it in a standards-compliant way.
1164 */ 1423 */
1165 PL_top_env = main_top_env; 1424 PL_top_env = main_top_env;
1166 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */ 1425 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1167 } 1426 }
1168} 1427}
… …
1245cctx_destroy (coro_cctx *cctx) 1504cctx_destroy (coro_cctx *cctx)
1246{ 1505{
1247 if (!cctx) 1506 if (!cctx)
1248 return; 1507 return;
1249 1508
1509 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1510
1250 --cctx_count; 1511 --cctx_count;
1251 coro_destroy (&cctx->cctx); 1512 coro_destroy (&cctx->cctx);
1252 1513
1253 /* coro_transfer creates new, empty cctx's */ 1514 /* coro_transfer creates new, empty cctx's */
1254 if (cctx->sptr) 1515 if (cctx->sptr)
… …
1317 /* TODO: throwing up here is considered harmful */ 1578 /* TODO: throwing up here is considered harmful */
1318 1579
1319 if (expect_true (prev != next)) 1580 if (expect_true (prev != next))
1320 { 1581 {
1321 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1582 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1322 croak ("Coro::State::transfer called with non-running/new prev Coro::State, but can only transfer from running or new states,"); 1583 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1323 1584
1324 if (expect_false (next->flags & CF_RUNNING))
1325 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states,");
1326
1327 if (expect_false (next->flags & CF_DESTROYED)) 1585 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED)))
1328 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states,"); 1586 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1329 1587
1330#if !PERL_VERSION_ATLEAST (5,10,0) 1588#if !PERL_VERSION_ATLEAST (5,10,0)
1331 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1589 if (expect_false (PL_lex_state != LEX_NOTPARSING))
1332 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,"); 1590 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1333#endif 1591#endif
… …
1339transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1597transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1340{ 1598{
1341 dSTACKLEVEL; 1599 dSTACKLEVEL;
1342 1600
1343 /* sometimes transfer is only called to set idle_sp */ 1601 /* sometimes transfer is only called to set idle_sp */
1344 if (expect_false (!next)) 1602 if (expect_false (!prev))
1345 { 1603 {
1346 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1604 cctx_current->idle_sp = STACKLEVEL;
1347 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1605 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1348 } 1606 }
1349 else if (expect_true (prev != next)) 1607 else if (expect_true (prev != next))
1350 { 1608 {
1351 coro_cctx *prev__cctx; 1609 coro_cctx *cctx_prev;
1352 1610
1353 if (expect_false (prev->flags & CF_NEW)) 1611 if (expect_false (prev->flags & CF_NEW))
1354 { 1612 {
1355 /* create a new empty/source context */ 1613 /* create a new empty/source context */
1356 prev->cctx = cctx_new_empty ();
1357 prev->flags &= ~CF_NEW; 1614 prev->flags &= ~CF_NEW;
1358 prev->flags |= CF_RUNNING; 1615 prev->flags |= CF_RUNNING;
1359 } 1616 }
1360 1617
1361 prev->flags &= ~CF_RUNNING; 1618 prev->flags &= ~CF_RUNNING;
… …
1367 if (expect_false (next->flags & CF_NEW)) 1624 if (expect_false (next->flags & CF_NEW))
1368 { 1625 {
1369 /* need to start coroutine */ 1626 /* need to start coroutine */
1370 next->flags &= ~CF_NEW; 1627 next->flags &= ~CF_NEW;
1371 /* setup coroutine call */ 1628 /* setup coroutine call */
1372 coro_setup (aTHX_ next); 1629 init_perl (aTHX_ next);
1373 } 1630 }
1374 else 1631 else
1375 load_perl (aTHX_ next); 1632 load_perl (aTHX_ next);
1376 1633
1377 prev__cctx = prev->cctx;
1378
1379 /* possibly untie and reuse the cctx */ 1634 /* possibly untie and reuse the cctx */
1380 if (expect_true ( 1635 if (expect_true (
1381 prev__cctx->idle_sp == STACKLEVEL 1636 cctx_current->idle_sp == STACKLEVEL
1382 && !(prev__cctx->flags & CC_TRACE) 1637 && !(cctx_current->flags & CC_TRACE)
1383 && !force_cctx 1638 && !force_cctx
1384 )) 1639 ))
1385 { 1640 {
1386 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1641 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */
1387 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == prev__cctx->idle_te)); 1642 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1388 1643
1389 prev->cctx = 0;
1390
1391 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */ 1644 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */
1392 /* without this the next cctx_get might destroy the prev__cctx while still in use */ 1645 /* without this the next cctx_get might destroy the running cctx while still in use */
1393 if (expect_false (CCTX_EXPIRED (prev__cctx))) 1646 if (expect_false (CCTX_EXPIRED (cctx_current)))
1394 if (!next->cctx) 1647 if (expect_true (!next->cctx))
1395 next->cctx = cctx_get (aTHX); 1648 next->cctx = cctx_get (aTHX);
1396 1649
1397 cctx_put (prev__cctx); 1650 cctx_put (cctx_current);
1398 } 1651 }
1652 else
1653 prev->cctx = cctx_current;
1399 1654
1400 ++next->usecount; 1655 ++next->usecount;
1401 1656
1402 if (expect_true (!next->cctx)) 1657 cctx_prev = cctx_current;
1403 next->cctx = cctx_get (aTHX); 1658 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1404 1659
1405 if (expect_false (prev__cctx != next->cctx)) 1660 next->cctx = 0;
1661
1662 if (expect_false (cctx_prev != cctx_current))
1406 { 1663 {
1407 prev__cctx->top_env = PL_top_env; 1664 cctx_prev->top_env = PL_top_env;
1408 PL_top_env = next->cctx->top_env; 1665 PL_top_env = cctx_current->top_env;
1409 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1666 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1410 } 1667 }
1411 1668
1412 transfer_tail (aTHX); 1669 transfer_tail (aTHX);
1413 } 1670 }
1414} 1671}
… …
1416#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx)) 1673#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1417#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1674#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1418 1675
1419/** high level stuff ********************************************************/ 1676/** high level stuff ********************************************************/
1420 1677
1421static int 1678static void
1422coro_state_destroy (pTHX_ struct coro *coro) 1679coro_state_destroy (pTHX_ struct coro *coro)
1423{ 1680{
1424 if (coro->flags & CF_DESTROYED) 1681 if (coro->flags & CF_DESTROYED)
1425 return 0; 1682 return;
1426 1683
1427 if (coro->on_destroy)
1428 coro->on_destroy (aTHX_ coro); 1684 slf_destroy (aTHX_ coro);
1429 1685
1430 coro->flags |= CF_DESTROYED; 1686 coro->flags |= CF_DESTROYED;
1431 1687
1432 if (coro->flags & CF_READY) 1688 if (coro->flags & CF_READY)
1433 { 1689 {
… …
1436 --coro_nready; 1692 --coro_nready;
1437 } 1693 }
1438 else 1694 else
1439 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1695 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1440 1696
1441 if (coro->mainstack && coro->mainstack != main_mainstack) 1697 if (coro->mainstack
1442 { 1698 && coro->mainstack != main_mainstack
1443 struct coro temp; 1699 && coro->slot
1444 1700 && !PL_dirty)
1445 assert (("FATAL: tried to destroy currently running coroutine (please report)", !(coro->flags & CF_RUNNING)));
1446
1447 save_perl (aTHX_ &temp);
1448 load_perl (aTHX_ coro); 1701 destroy_perl (aTHX_ coro);
1449 1702
1450 coro_destruct (aTHX_ coro); 1703 if (coro->next) coro->next->prev = coro->prev;
1451 1704 if (coro->prev) coro->prev->next = coro->next;
1452 load_perl (aTHX_ &temp); 1705 if (coro == coro_first) coro_first = coro->next;
1453
1454 coro->slot = 0;
1455 }
1456 1706
1457 cctx_destroy (coro->cctx); 1707 cctx_destroy (coro->cctx);
1458 SvREFCNT_dec (coro->startcv); 1708 SvREFCNT_dec (coro->startcv);
1459 SvREFCNT_dec (coro->args); 1709 SvREFCNT_dec (coro->args);
1710 SvREFCNT_dec (coro->swap_sv);
1460 SvREFCNT_dec (CORO_THROW); 1711 SvREFCNT_dec (CORO_THROW);
1461
1462 if (coro->next) coro->next->prev = coro->prev;
1463 if (coro->prev) coro->prev->next = coro->next;
1464 if (coro == coro_first) coro_first = coro->next;
1465
1466 return 1;
1467} 1712}
1468 1713
1469static int 1714static int
1470coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1715coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1471{ 1716{
… …
1519 1764
1520 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1765 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1521 TRANSFER (ta, 1); 1766 TRANSFER (ta, 1);
1522} 1767}
1523 1768
1524/*****************************************************************************/
1525/* gensub: simple closure generation utility */
1526
1527#define GENSUB_ARG CvXSUBANY (cv).any_ptr
1528
1529/* create a closure from XS, returns a code reference */
1530/* the arg can be accessed via GENSUB_ARG from the callback */
1531/* the callback must use dXSARGS/XSRETURN */
1532static SV *
1533gensub (pTHX_ void (*xsub)(pTHX_ CV *), void *arg)
1534{
1535 CV *cv = (CV *)newSV (0);
1536
1537 sv_upgrade ((SV *)cv, SVt_PVCV);
1538
1539 CvANON_on (cv);
1540 CvISXSUB_on (cv);
1541 CvXSUB (cv) = xsub;
1542 GENSUB_ARG = arg;
1543
1544 return newRV_noinc ((SV *)cv);
1545}
1546
1547/** Coro ********************************************************************/ 1769/** Coro ********************************************************************/
1548 1770
1549INLINE void 1771INLINE void
1550coro_enq (pTHX_ struct coro *coro) 1772coro_enq (pTHX_ struct coro *coro)
1551{ 1773{
1552 av_push (coro_ready [coro->prio - PRIO_MIN], SvREFCNT_inc_NN (coro->hv)); 1774 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1553}
1554 1775
1555INLINE SV * 1776 SvREFCNT_inc_NN (coro->hv);
1777
1778 coro->next_ready = 0;
1779 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1780 ready [1] = coro;
1781}
1782
1783INLINE struct coro *
1556coro_deq (pTHX) 1784coro_deq (pTHX)
1557{ 1785{
1558 int prio; 1786 int prio;
1559 1787
1560 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; ) 1788 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
1561 if (AvFILLp (coro_ready [prio]) >= 0) 1789 {
1562 return av_shift (coro_ready [prio]); 1790 struct coro **ready = coro_ready [prio];
1791
1792 if (ready [0])
1793 {
1794 struct coro *coro = ready [0];
1795 ready [0] = coro->next_ready;
1796 return coro;
1797 }
1798 }
1563 1799
1564 return 0; 1800 return 0;
1801}
1802
1803static void
1804invoke_sv_ready_hook_helper (void)
1805{
1806 dTHX;
1807 dSP;
1808
1809 ENTER;
1810 SAVETMPS;
1811
1812 PUSHMARK (SP);
1813 PUTBACK;
1814 call_sv (coro_readyhook, G_VOID | G_DISCARD);
1815
1816 FREETMPS;
1817 LEAVE;
1565} 1818}
1566 1819
1567static int 1820static int
1568api_ready (pTHX_ SV *coro_sv) 1821api_ready (pTHX_ SV *coro_sv)
1569{ 1822{
1570 struct coro *coro;
1571 SV *sv_hook;
1572 void (*xs_hook)(void);
1573
1574 if (SvROK (coro_sv))
1575 coro_sv = SvRV (coro_sv);
1576
1577 coro = SvSTATE (coro_sv); 1823 struct coro *coro = SvSTATE (coro_sv);
1578 1824
1579 if (coro->flags & CF_READY) 1825 if (coro->flags & CF_READY)
1580 return 0; 1826 return 0;
1581 1827
1582 coro->flags |= CF_READY; 1828 coro->flags |= CF_READY;
1583 1829
1584 sv_hook = coro_nready ? 0 : coro_readyhook;
1585 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1586
1587 coro_enq (aTHX_ coro); 1830 coro_enq (aTHX_ coro);
1588 ++coro_nready;
1589 1831
1590 if (sv_hook) 1832 if (!coro_nready++)
1591 { 1833 if (coroapi.readyhook)
1592 dSP; 1834 coroapi.readyhook ();
1593
1594 ENTER;
1595 SAVETMPS;
1596
1597 PUSHMARK (SP);
1598 PUTBACK;
1599 call_sv (sv_hook, G_VOID | G_DISCARD);
1600
1601 FREETMPS;
1602 LEAVE;
1603 }
1604
1605 if (xs_hook)
1606 xs_hook ();
1607 1835
1608 return 1; 1836 return 1;
1609} 1837}
1610 1838
1611static int 1839static int
… …
1614 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1842 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1615} 1843}
1616 1844
1617/* expects to own a reference to next->hv */ 1845/* expects to own a reference to next->hv */
1618INLINE void 1846INLINE void
1619prepare_cede_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1847prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1620{ 1848{
1621 SV *prev_sv = SvRV (coro_current); 1849 SV *prev_sv = SvRV (coro_current);
1622 1850
1623 ta->prev = SvSTATE_hv (prev_sv); 1851 ta->prev = SvSTATE_hv (prev_sv);
1624 ta->next = next; 1852 ta->next = next;
1625 1853
1626 TRANSFER_CHECK (*ta); 1854 TRANSFER_CHECK (*ta);
1627 1855
1628 SvRV_set (coro_current, next->hv); 1856 SvRV_set (coro_current, (SV *)next->hv);
1629 1857
1630 free_coro_mortal (aTHX); 1858 free_coro_mortal (aTHX);
1631 coro_mortal = prev_sv; 1859 coro_mortal = prev_sv;
1632} 1860}
1633 1861
1634static void 1862static void
1635prepare_schedule (pTHX_ struct coro_transfer_args *ta) 1863prepare_schedule (pTHX_ struct coro_transfer_args *ta)
1636{ 1864{
1637 for (;;) 1865 for (;;)
1638 { 1866 {
1639 SV *next_sv = coro_deq (aTHX); 1867 struct coro *next = coro_deq (aTHX);
1640 1868
1641 if (expect_false (!next_sv)) 1869 if (expect_true (next))
1642 { 1870 {
1643 /* nothing to schedule: call the idle handler */
1644 dSP;
1645
1646 ENTER;
1647 SAVETMPS;
1648
1649 PUSHMARK (SP);
1650 PUTBACK;
1651 call_sv (get_sv ("Coro::idle", FALSE), G_VOID | G_DISCARD);
1652
1653 FREETMPS;
1654 LEAVE;
1655 }
1656 else
1657 {
1658 struct coro *next = SvSTATE_hv (next_sv);
1659
1660 /* cannot transfer to destroyed coros, skip and look for next */ 1871 /* cannot transfer to destroyed coros, skip and look for next */
1661 if (expect_false (next->flags & CF_DESTROYED)) 1872 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED)))
1662 SvREFCNT_dec (next_sv); /* coro_nready has already been taken care of by destroy */ 1873 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1663 else 1874 else
1664 { 1875 {
1665 next->flags &= ~CF_READY; 1876 next->flags &= ~CF_READY;
1666 --coro_nready; 1877 --coro_nready;
1667 1878
1668 return prepare_cede_to (aTHX_ ta, next); 1879 prepare_schedule_to (aTHX_ ta, next);
1880 break;
1669 } 1881 }
1670 } 1882 }
1883 else
1884 {
1885 /* nothing to schedule: call the idle handler */
1886 if (SvROK (sv_idle)
1887 && SvOBJECT (SvRV (sv_idle)))
1888 {
1889 if (SvRV (sv_idle) == SvRV (coro_current))
1890 croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught");
1891
1892 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1893 api_ready (aTHX_ SvRV (sv_idle));
1894 --coro_nready;
1895 }
1896 else
1897 {
1898 /* TODO: deprecated, remove, cannot work reliably *//*D*/
1899 dSP;
1900
1901 ENTER;
1902 SAVETMPS;
1903
1904 PUSHMARK (SP);
1905 PUTBACK;
1906 call_sv (sv_idle, G_VOID | G_DISCARD);
1907
1908 FREETMPS;
1909 LEAVE;
1910 }
1911 }
1671 } 1912 }
1672} 1913}
1673 1914
1674INLINE void 1915INLINE void
1675prepare_cede (pTHX_ struct coro_transfer_args *ta) 1916prepare_cede (pTHX_ struct coro_transfer_args *ta)
… …
1697{ 1938{
1698 struct coro_transfer_args ta; 1939 struct coro_transfer_args ta;
1699 1940
1700 prepare_schedule (aTHX_ &ta); 1941 prepare_schedule (aTHX_ &ta);
1701 TRANSFER (ta, 1); 1942 TRANSFER (ta, 1);
1943}
1944
1945static void
1946api_schedule_to (pTHX_ SV *coro_sv)
1947{
1948 struct coro_transfer_args ta;
1949 struct coro *next = SvSTATE (coro_sv);
1950
1951 SvREFCNT_inc_NN (coro_sv);
1952 prepare_schedule_to (aTHX_ &ta, next);
1702} 1953}
1703 1954
1704static int 1955static int
1705api_cede (pTHX) 1956api_cede (pTHX)
1706{ 1957{
… …
1735static void 1986static void
1736api_trace (pTHX_ SV *coro_sv, int flags) 1987api_trace (pTHX_ SV *coro_sv, int flags)
1737{ 1988{
1738 struct coro *coro = SvSTATE (coro_sv); 1989 struct coro *coro = SvSTATE (coro_sv);
1739 1990
1991 if (coro->flags & CF_RUNNING)
1992 croak ("cannot enable tracing on a running coroutine, caught");
1993
1740 if (flags & CC_TRACE) 1994 if (flags & CC_TRACE)
1741 { 1995 {
1742 if (!coro->cctx) 1996 if (!coro->cctx)
1743 coro->cctx = cctx_new_run (); 1997 coro->cctx = cctx_new_run ();
1744 else if (!(coro->cctx->flags & CC_TRACE)) 1998 else if (!(coro->cctx->flags & CC_TRACE))
1745 croak ("cannot enable tracing on coroutine with custom stack,"); 1999 croak ("cannot enable tracing on coroutine with custom stack, caught");
1746 2000
1747 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL)); 2001 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL));
1748 } 2002 }
1749 else if (coro->cctx && coro->cctx->flags & CC_TRACE) 2003 else if (coro->cctx && coro->cctx->flags & CC_TRACE)
1750 { 2004 {
… …
1753 if (coro->flags & CF_RUNNING) 2007 if (coro->flags & CF_RUNNING)
1754 PL_runops = RUNOPS_DEFAULT; 2008 PL_runops = RUNOPS_DEFAULT;
1755 else 2009 else
1756 coro->slot->runops = RUNOPS_DEFAULT; 2010 coro->slot->runops = RUNOPS_DEFAULT;
1757 } 2011 }
2012}
2013
2014static void
2015coro_call_on_destroy (pTHX_ struct coro *coro)
2016{
2017 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0);
2018
2019 if (on_destroyp)
2020 {
2021 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
2022 AV *on_destroy = sv_2mortal (SvREFCNT_inc ((AV *)SvRV (*on_destroyp)));
2023 AV *status = statusp ? sv_2mortal (SvREFCNT_inc ((AV *)SvRV (*statusp))) : 0;
2024
2025 while (AvFILLp (on_destroy) >= 0)
2026 {
2027 dSP; /* don't disturb outer sp */
2028 SV *cb = av_pop (on_destroy);
2029
2030 PUSHMARK (SP);
2031
2032 if (statusp)
2033 {
2034 int i;
2035 EXTEND (SP, AvFILLp (status) + 1);
2036
2037 for (i = 0; i <= AvFILLp (status); ++i)
2038 PUSHs (AvARRAY (status)[i]);
2039 }
2040
2041 PUTBACK;
2042 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD);
2043 }
2044 }
2045}
2046
2047static void
2048coro_set_status (pTHX_ HV *coro_hv, SV **arg, int items)
2049{
2050 AV *av = newAV ();
2051
2052 /* items are actually not so common, so optimise for this case */
2053 if (items)
2054 {
2055 int i;
2056
2057 av_extend (av, items - 1);
2058
2059 for (i = 0; i < items; ++i)
2060 av_push (av, SvREFCNT_inc_NN (arg [i]));
2061 }
2062
2063 hv_store (coro_hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0);
2064}
2065
2066static void
2067slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2068{
2069 av_push (av_destroy, (SV *)newRV_inc ((SV *)coro_hv)); /* RVinc for perl */
2070 api_ready (aTHX_ sv_manager);
2071
2072 frame->prepare = prepare_schedule;
2073 frame->check = slf_check_repeat;
2074
2075 /* as a minor optimisation, we could unwind all stacks here */
2076 /* but that puts extra pressure on pp_slf, and is not worth much */
2077 /*coro_unwind_stacks (aTHX);*/
2078}
2079
2080static void
2081slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2082{
2083 HV *coro_hv = (HV *)SvRV (coro_current);
2084
2085 coro_set_status (aTHX_ coro_hv, arg, items);
2086 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2087}
2088
2089static void
2090slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2091{
2092 HV *coro_hv;
2093 struct coro *coro;
2094
2095 if (items <= 0)
2096 croak ("Coro::cancel called without coro object,");
2097
2098 coro = SvSTATE (arg [0]);
2099 coro_hv = coro->hv;
2100
2101 coro_set_status (aTHX_ coro_hv, arg + 1, items - 1);
2102
2103 if (expect_false (coro->flags & CF_NOCANCEL))
2104 {
2105 /* coro currently busy cancelling something, so just notify it */
2106 coro->slf_frame.data = (void *)coro;
2107
2108 frame->prepare = prepare_nop;
2109 frame->check = slf_check_nop;
2110 }
2111 else if (coro_hv == (HV *)SvRV (coro_current))
2112 {
2113 /* cancelling the current coro is allowed, and equals terminate */
2114 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2115 }
2116 else
2117 {
2118 struct coro *self = SvSTATE_current;
2119
2120 /* otherwise we cancel directly, purely for speed reasons
2121 * unfortunately, this requires some magic trickery, as
2122 * somebody else could cancel us, so we have to fight the cancellation.
2123 * this is ugly, and hopefully fully worth the extra speed.
2124 * besides, I can't get the slow-but-safe version working...
2125 */
2126 slf_frame.data = 0;
2127 self->flags |= CF_NOCANCEL;
2128
2129 coro_state_destroy (aTHX_ coro);
2130 coro_call_on_destroy (aTHX_ coro);
2131
2132 self->flags &= ~CF_NOCANCEL;
2133
2134 if (slf_frame.data)
2135 {
2136 /* while we were busy we have been cancelled, so terminate */
2137 slf_init_terminate_cancel_common (aTHX_ frame, self->hv);
2138 }
2139 else
2140 {
2141 frame->prepare = prepare_nop;
2142 frame->check = slf_check_nop;
2143 }
2144 }
2145}
2146
2147static int
2148slf_check_safe_cancel (pTHX_ struct CoroSLF *frame)
2149{
2150 frame->prepare = 0;
2151 coro_unwind_stacks (aTHX);
2152
2153 slf_init_terminate_cancel_common (aTHX_ frame, (HV *)SvRV (coro_current));
2154
2155 return 1;
2156}
2157
2158static int
2159safe_cancel (pTHX_ struct coro *coro, SV **arg, int items)
2160{
2161 if (coro->cctx)
2162 croak ("coro inside C callback, unable to cancel at this time, caught");
2163
2164 if (coro->flags & CF_NEW)
2165 {
2166 coro_set_status (aTHX_ coro->hv, arg, items);
2167 coro_state_destroy (aTHX_ coro);
2168 coro_call_on_destroy (aTHX_ coro);
2169 }
2170 else
2171 {
2172 if (!coro->slf_frame.prepare)
2173 croak ("coro outside an SLF function, unable to cancel at this time, caught");
2174
2175 slf_destroy (aTHX_ coro);
2176
2177 coro_set_status (aTHX_ coro->hv, arg, items);
2178 coro->slf_frame.prepare = prepare_nop;
2179 coro->slf_frame.check = slf_check_safe_cancel;
2180
2181 api_ready (aTHX_ coro->hv);
2182 }
2183
2184 return 1;
1758} 2185}
1759 2186
1760/*****************************************************************************/ 2187/*****************************************************************************/
1761/* async pool handler */ 2188/* async pool handler */
1762 2189
… …
1802 coro->saved_deffh = 0; 2229 coro->saved_deffh = 0;
1803 2230
1804 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 2231 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
1805 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2232 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1806 { 2233 {
1807 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate); 2234 slf_init_terminate_cancel_common (aTHX_ frame, hv);
1808 coro->invoke_av = newAV (); 2235 return;
1809
1810 frame->prepare = prepare_nop;
1811 } 2236 }
1812 else 2237 else
1813 { 2238 {
1814 av_clear (GvAV (PL_defgv)); 2239 av_clear (GvAV (PL_defgv));
1815 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2240 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
… …
1840 2265
1841static void 2266static void
1842coro_rouse_callback (pTHX_ CV *cv) 2267coro_rouse_callback (pTHX_ CV *cv)
1843{ 2268{
1844 dXSARGS; 2269 dXSARGS;
1845 SV *data = (SV *)GENSUB_ARG; 2270 SV *data = (SV *)S_GENSUB_ARG;
1846 2271
1847 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2272 if (SvTYPE (SvRV (data)) != SVt_PVAV)
1848 { 2273 {
1849 /* first call, set args */ 2274 /* first call, set args */
2275 SV *coro = SvRV (data);
1850 AV *av = newAV (); 2276 AV *av = newAV ();
1851 SV *coro = SvRV (data);
1852 2277
1853 SvRV_set (data, (SV *)av); 2278 SvRV_set (data, (SV *)av);
1854 api_ready (aTHX_ coro);
1855 SvREFCNT_dec (coro);
1856 2279
1857 /* better take a full copy of the arguments */ 2280 /* better take a full copy of the arguments */
1858 while (items--) 2281 while (items--)
1859 av_store (av, items, newSVsv (ST (items))); 2282 av_store (av, items, newSVsv (ST (items)));
2283
2284 api_ready (aTHX_ coro);
2285 SvREFCNT_dec (coro);
1860 } 2286 }
1861 2287
1862 XSRETURN_EMPTY; 2288 XSRETURN_EMPTY;
1863} 2289}
1864 2290
… …
1881 2307
1882 EXTEND (SP, AvFILLp (av) + 1); 2308 EXTEND (SP, AvFILLp (av) + 1);
1883 for (i = 0; i <= AvFILLp (av); ++i) 2309 for (i = 0; i <= AvFILLp (av); ++i)
1884 PUSHs (sv_2mortal (AvARRAY (av)[i])); 2310 PUSHs (sv_2mortal (AvARRAY (av)[i]));
1885 2311
1886 /* we have stolen the elements, so ste length to zero and free */ 2312 /* we have stolen the elements, so set length to zero and free */
1887 AvFILLp (av) = -1; 2313 AvFILLp (av) = -1;
1888 av_undef (av); 2314 av_undef (av);
1889 2315
1890 PUTBACK; 2316 PUTBACK;
1891 } 2317 }
… …
1915 || SvTYPE (SvRV (cb)) != SVt_PVCV 2341 || SvTYPE (SvRV (cb)) != SVt_PVCV
1916 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2342 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
1917 croak ("Coro::rouse_wait called with illegal callback argument,"); 2343 croak ("Coro::rouse_wait called with illegal callback argument,");
1918 2344
1919 { 2345 {
1920 CV *cv = (CV *)SvRV (cb); /* for GENSUB_ARG */ 2346 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
1921 SV *data = (SV *)GENSUB_ARG; 2347 SV *data = (SV *)S_GENSUB_ARG;
1922 2348
1923 frame->data = (void *)data; 2349 frame->data = (void *)data;
1924 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule; 2350 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
1925 frame->check = slf_check_rouse_wait; 2351 frame->check = slf_check_rouse_wait;
1926 } 2352 }
… …
1930coro_new_rouse_cb (pTHX) 2356coro_new_rouse_cb (pTHX)
1931{ 2357{
1932 HV *hv = (HV *)SvRV (coro_current); 2358 HV *hv = (HV *)SvRV (coro_current);
1933 struct coro *coro = SvSTATE_hv (hv); 2359 struct coro *coro = SvSTATE_hv (hv);
1934 SV *data = newRV_inc ((SV *)hv); 2360 SV *data = newRV_inc ((SV *)hv);
1935 SV *cb = gensub (aTHX_ coro_rouse_callback, (void *)data); 2361 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
1936 2362
1937 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0); 2363 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0);
1938 SvREFCNT_dec (data); /* magicext increases the refcount */ 2364 SvREFCNT_dec (data); /* magicext increases the refcount */
1939 2365
1940 SvREFCNT_dec (coro->rouse_cb); 2366 SvREFCNT_dec (coro->rouse_cb);
… …
1998 frame->prepare = prepare_schedule; 2424 frame->prepare = prepare_schedule;
1999 frame->check = slf_check_nop; 2425 frame->check = slf_check_nop;
2000} 2426}
2001 2427
2002static void 2428static void
2429slf_prepare_schedule_to (pTHX_ struct coro_transfer_args *ta)
2430{
2431 struct coro *next = (struct coro *)slf_frame.data;
2432
2433 SvREFCNT_inc_NN (next->hv);
2434 prepare_schedule_to (aTHX_ ta, next);
2435}
2436
2437static void
2438slf_init_schedule_to (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2439{
2440 if (!items)
2441 croak ("Coro::schedule_to expects a coroutine argument, caught");
2442
2443 frame->data = (void *)SvSTATE (arg [0]);
2444 frame->prepare = slf_prepare_schedule_to;
2445 frame->check = slf_check_nop;
2446}
2447
2448static void
2449slf_init_cede_to (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2450{
2451 api_ready (aTHX_ SvRV (coro_current));
2452
2453 slf_init_schedule_to (aTHX_ frame, cv, arg, items);
2454}
2455
2456static void
2003slf_init_cede (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2457slf_init_cede (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2004{ 2458{
2005 frame->prepare = prepare_cede; 2459 frame->prepare = prepare_cede;
2006 frame->check = slf_check_nop; 2460 frame->check = slf_check_nop;
2007} 2461}
… …
2009static void 2463static void
2010slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2464slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2011{ 2465{
2012 frame->prepare = prepare_cede_notself; 2466 frame->prepare = prepare_cede_notself;
2013 frame->check = slf_check_nop; 2467 frame->check = slf_check_nop;
2468}
2469
2470/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2471static void
2472slf_destroy (pTHX_ struct coro *coro)
2473{
2474 /* this callback is reserved for slf functions needing to do cleanup */
2475 if (coro->slf_frame.destroy && coro->slf_frame.prepare && !PL_dirty)
2476 coro->slf_frame.destroy (aTHX_ coro);
2477
2478 /*
2479 * The on_destroy above most likely is from an SLF call.
2480 * Since by definition the SLF call will not finish when we destroy
2481 * the coro, we will have to force-finish it here, otherwise
2482 * cleanup functions cannot call SLF functions.
2483 */
2484 coro->slf_frame.prepare = 0;
2014} 2485}
2015 2486
2016/* 2487/*
2017 * these not obviously related functions are all rolled into one 2488 * these not obviously related functions are all rolled into one
2018 * function to increase chances that they all will call transfer with the same 2489 * function to increase chances that they all will call transfer with the same
… …
2137 if (PL_op->op_flags & OPf_STACKED) 2608 if (PL_op->op_flags & OPf_STACKED)
2138 { 2609 {
2139 if (items > slf_arga) 2610 if (items > slf_arga)
2140 { 2611 {
2141 slf_arga = items; 2612 slf_arga = items;
2142 free (slf_argv); 2613 Safefree (slf_argv);
2143 slf_argv = malloc (slf_arga * sizeof (SV *)); 2614 New (0, slf_argv, slf_arga, SV *);
2144 } 2615 }
2145 2616
2146 slf_argc = items; 2617 slf_argc = items;
2147 2618
2148 for (i = 0; i < items; ++i) 2619 for (i = 0; i < items; ++i)
… …
2150 } 2621 }
2151 else 2622 else
2152 slf_argc = 0; 2623 slf_argc = 0;
2153 2624
2154 PL_op->op_ppaddr = pp_slf; 2625 PL_op->op_ppaddr = pp_slf;
2155 PL_op->op_type = OP_CUSTOM; /* maybe we should leave it at entersub? */ 2626 /*PL_op->op_type = OP_CUSTOM; /* we do behave like entersub still */
2156 2627
2157 PL_op = (OP *)&slf_restore; 2628 PL_op = (OP *)&slf_restore;
2629}
2630
2631/*****************************************************************************/
2632/* dynamic wind */
2633
2634static void
2635on_enterleave_call (pTHX_ SV *cb)
2636{
2637 dSP;
2638
2639 PUSHSTACK;
2640
2641 PUSHMARK (SP);
2642 PUTBACK;
2643 call_sv (cb, G_VOID | G_DISCARD);
2644 SPAGAIN;
2645
2646 POPSTACK;
2647}
2648
2649static SV *
2650coro_avp_pop_and_free (pTHX_ AV **avp)
2651{
2652 AV *av = *avp;
2653 SV *res = av_pop (av);
2654
2655 if (AvFILLp (av) < 0)
2656 {
2657 *avp = 0;
2658 SvREFCNT_dec (av);
2659 }
2660
2661 return res;
2662}
2663
2664static void
2665coro_pop_on_enter (pTHX_ void *coro)
2666{
2667 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_enter);
2668 SvREFCNT_dec (cb);
2669}
2670
2671static void
2672coro_pop_on_leave (pTHX_ void *coro)
2673{
2674 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2675 on_enterleave_call (aTHX_ sv_2mortal (cb));
2158} 2676}
2159 2677
2160/*****************************************************************************/ 2678/*****************************************************************************/
2161/* PerlIO::cede */ 2679/* PerlIO::cede */
2162 2680
… …
2236/* Coro::Semaphore & Coro::Signal */ 2754/* Coro::Semaphore & Coro::Signal */
2237 2755
2238static SV * 2756static SV *
2239coro_waitarray_new (pTHX_ int count) 2757coro_waitarray_new (pTHX_ int count)
2240{ 2758{
2241 /* a semaphore contains a counter IV in $sem->[0] and any waiters after that */ 2759 /* a waitarray=semaphore contains a counter IV in $sem->[0] and any waiters after that */
2242 AV *av = newAV (); 2760 AV *av = newAV ();
2243 SV **ary; 2761 SV **ary;
2244 2762
2245 /* unfortunately, building manually saves memory */ 2763 /* unfortunately, building manually saves memory */
2246 Newx (ary, 2, SV *); 2764 Newx (ary, 2, SV *);
2247 AvALLOC (av) = ary; 2765 AvALLOC (av) = ary;
2766#if PERL_VERSION_ATLEAST (5,10,0)
2248 /*AvARRAY (av) = ary;*/ 2767 AvARRAY (av) = ary;
2768#else
2249 SvPVX ((SV *)av) = (char *)ary; /* 5.8.8 needs this syntax instead of AvARRAY = ary */ 2769 /* 5.8.8 needs this syntax instead of AvARRAY = ary, yet */
2770 /* -DDEBUGGING flags this as a bug, despite it perfectly working */
2771 SvPVX ((SV *)av) = (char *)ary;
2772#endif
2250 AvMAX (av) = 1; 2773 AvMAX (av) = 1;
2251 AvFILLp (av) = 0; 2774 AvFILLp (av) = 0;
2252 ary [0] = newSViv (count); 2775 ary [0] = newSViv (count);
2253 2776
2254 return newRV_noinc ((SV *)av); 2777 return newRV_noinc ((SV *)av);
… …
2292 SvREFCNT_dec (cb); 2815 SvREFCNT_dec (cb);
2293 } 2816 }
2294} 2817}
2295 2818
2296static void 2819static void
2297coro_semaphore_on_destroy (pTHX_ struct coro *coro) 2820coro_semaphore_destroy (pTHX_ struct coro *coro)
2298{ 2821{
2299 /* call $sem->adjust (0) to possibly wake up some other waiters */ 2822 /* call $sem->adjust (0) to possibly wake up some other waiters */
2300 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 2823 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0);
2301} 2824}
2302 2825
… …
2309 /* if we are about to throw, don't actually acquire the lock, just throw */ 2832 /* if we are about to throw, don't actually acquire the lock, just throw */
2310 if (CORO_THROW) 2833 if (CORO_THROW)
2311 return 0; 2834 return 0;
2312 else if (SvIVX (count_sv) > 0) 2835 else if (SvIVX (count_sv) > 0)
2313 { 2836 {
2314 SvSTATE_current->on_destroy = 0; 2837 frame->destroy = 0;
2315 2838
2316 if (acquire) 2839 if (acquire)
2317 SvIVX (count_sv) = SvIVX (count_sv) - 1; 2840 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2318 else 2841 else
2319 coro_semaphore_adjust (aTHX_ av, 0); 2842 coro_semaphore_adjust (aTHX_ av, 0);
… …
2362 { 2885 {
2363 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2886 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2364 2887
2365 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 2888 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2366 frame->prepare = prepare_schedule; 2889 frame->prepare = prepare_schedule;
2367
2368 /* to avoid race conditions when a woken-up coro gets terminated */ 2890 /* to avoid race conditions when a woken-up coro gets terminated */
2369 /* we arrange for a temporary on_destroy that calls adjust (0) */ 2891 /* we arrange for a temporary on_destroy that calls adjust (0) */
2370 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 2892 frame->destroy = coro_semaphore_destroy;
2371 } 2893 }
2372} 2894}
2373 2895
2374static void 2896static void
2375slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2897slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
… …
2383{ 2905{
2384 if (items >= 2) 2906 if (items >= 2)
2385 { 2907 {
2386 /* callback form */ 2908 /* callback form */
2387 AV *av = (AV *)SvRV (arg [0]); 2909 AV *av = (AV *)SvRV (arg [0]);
2388 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 2910 SV *cb_cv = s_get_cv_croak (arg [1]);
2389 2911
2390 av_push (av, (SV *)SvREFCNT_inc_NN (cb_cv)); 2912 av_push (av, SvREFCNT_inc_NN (cb_cv));
2391 2913
2392 if (SvIVX (AvARRAY (av)[0]) > 0) 2914 if (SvIVX (AvARRAY (av)[0]) > 0)
2393 coro_semaphore_adjust (aTHX_ av, 0); 2915 coro_semaphore_adjust (aTHX_ av, 0);
2394 2916
2395 frame->prepare = prepare_nop; 2917 frame->prepare = prepare_nop;
… …
2419 AvARRAY (av)[0] = AvARRAY (av)[1]; 2941 AvARRAY (av)[0] = AvARRAY (av)[1];
2420 AvARRAY (av)[1] = cb; 2942 AvARRAY (av)[1] = cb;
2421 2943
2422 cb = av_shift (av); 2944 cb = av_shift (av);
2423 2945
2946 if (SvTYPE (cb) == SVt_PVCV)
2947 {
2948 dSP;
2949 PUSHMARK (SP);
2950 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2951 PUTBACK;
2952 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2953 }
2954 else
2955 {
2424 api_ready (aTHX_ cb); 2956 api_ready (aTHX_ cb);
2425 sv_setiv (cb, 0); /* signal waiter */ 2957 sv_setiv (cb, 0); /* signal waiter */
2958 }
2959
2426 SvREFCNT_dec (cb); 2960 SvREFCNT_dec (cb);
2427 2961
2428 --count; 2962 --count;
2429 } 2963 }
2430} 2964}
… …
2439static void 2973static void
2440slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2974slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2441{ 2975{
2442 AV *av = (AV *)SvRV (arg [0]); 2976 AV *av = (AV *)SvRV (arg [0]);
2443 2977
2978 if (items >= 2)
2979 {
2980 SV *cb_cv = s_get_cv_croak (arg [1]);
2981 av_push (av, SvREFCNT_inc_NN (cb_cv));
2982
2444 if (SvIVX (AvARRAY (av)[0])) 2983 if (SvIVX (AvARRAY (av)[0]))
2984 coro_signal_wake (aTHX_ av, 1); /* must be the only waiter */
2985
2986 frame->prepare = prepare_nop;
2987 frame->check = slf_check_nop;
2988 }
2989 else if (SvIVX (AvARRAY (av)[0]))
2445 { 2990 {
2446 SvIVX (AvARRAY (av)[0]) = 0; 2991 SvIVX (AvARRAY (av)[0]) = 0;
2447 frame->prepare = prepare_nop; 2992 frame->prepare = prepare_nop;
2448 frame->check = slf_check_nop; 2993 frame->check = slf_check_nop;
2449 } 2994 }
2450 else 2995 else
2451 { 2996 {
2452 SV *waiter = newRV_inc (SvRV (coro_current)); /* owned by signal av */ 2997 SV *waiter = newSVsv (coro_current); /* owned by signal av */
2453 2998
2454 av_push (av, waiter); 2999 av_push (av, waiter);
2455 3000
2456 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */ 3001 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */
2457 frame->prepare = prepare_schedule; 3002 frame->prepare = prepare_schedule;
… …
2475 3020
2476static void 3021static void
2477coro_aio_callback (pTHX_ CV *cv) 3022coro_aio_callback (pTHX_ CV *cv)
2478{ 3023{
2479 dXSARGS; 3024 dXSARGS;
2480 AV *state = (AV *)GENSUB_ARG; 3025 AV *state = (AV *)S_GENSUB_ARG;
2481 SV *coro = av_pop (state); 3026 SV *coro = av_pop (state);
2482 SV *data_sv = newSV (sizeof (struct io_state)); 3027 SV *data_sv = newSV (sizeof (struct io_state));
2483 3028
2484 av_extend (state, items - 1); 3029 av_extend (state, items - 1);
2485 3030
… …
2599 3144
2600 for (i = 0; i < items; ++i) 3145 for (i = 0; i < items; ++i)
2601 PUSHs (arg [i]); 3146 PUSHs (arg [i]);
2602 3147
2603 /* now push the callback closure */ 3148 /* now push the callback closure */
2604 PUSHs (sv_2mortal (gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state)))); 3149 PUSHs (sv_2mortal (s_gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state))));
2605 3150
2606 /* now call the AIO function - we assume our request is uncancelable */ 3151 /* now call the AIO function - we assume our request is uncancelable */
2607 PUTBACK; 3152 PUTBACK;
2608 call_sv ((SV *)req, G_VOID | G_DISCARD); 3153 call_sv ((SV *)req, G_VOID | G_DISCARD);
2609 } 3154 }
2610 3155
2611 /* now that the requets is going, we loop toll we have a result */ 3156 /* now that the request is going, we loop till we have a result */
2612 frame->data = (void *)state; 3157 frame->data = (void *)state;
2613 frame->prepare = prepare_schedule; 3158 frame->prepare = prepare_schedule;
2614 frame->check = slf_check_aio_req; 3159 frame->check = slf_check_aio_req;
2615} 3160}
2616 3161
… …
2623 3168
2624 XSRETURN_EMPTY; 3169 XSRETURN_EMPTY;
2625} 3170}
2626 3171
2627/*****************************************************************************/ 3172/*****************************************************************************/
3173
3174#if CORO_CLONE
3175# include "clone.c"
3176#endif
3177
3178/*****************************************************************************/
3179
3180static SV *
3181coro_new (pTHX_ HV *stash, SV **argv, int argc, int is_coro)
3182{
3183 SV *coro_sv;
3184 struct coro *coro;
3185 MAGIC *mg;
3186 HV *hv;
3187 SV *cb;
3188 int i;
3189
3190 if (argc > 0)
3191 {
3192 cb = s_get_cv_croak (argv [0]);
3193
3194 if (!is_coro)
3195 {
3196 if (CvISXSUB (cb))
3197 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
3198
3199 if (!CvROOT (cb))
3200 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
3201 }
3202 }
3203
3204 Newz (0, coro, 1, struct coro);
3205 coro->args = newAV ();
3206 coro->flags = CF_NEW;
3207
3208 if (coro_first) coro_first->prev = coro;
3209 coro->next = coro_first;
3210 coro_first = coro;
3211
3212 coro->hv = hv = newHV ();
3213 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
3214 mg->mg_flags |= MGf_DUP;
3215 coro_sv = sv_bless (newRV_noinc ((SV *)hv), stash);
3216
3217 if (argc > 0)
3218 {
3219 av_extend (coro->args, argc + is_coro - 1);
3220
3221 if (is_coro)
3222 {
3223 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
3224 cb = (SV *)cv_coro_run;
3225 }
3226
3227 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3228
3229 for (i = 1; i < argc; i++)
3230 av_push (coro->args, newSVsv (argv [i]));
3231 }
3232
3233 return coro_sv;
3234}
2628 3235
2629MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3236MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2630 3237
2631PROTOTYPES: DISABLE 3238PROTOTYPES: DISABLE
2632 3239
… …
2637 coro_thx = PERL_GET_CONTEXT; 3244 coro_thx = PERL_GET_CONTEXT;
2638# endif 3245# endif
2639#endif 3246#endif
2640 BOOT_PAGESIZE; 3247 BOOT_PAGESIZE;
2641 3248
3249 cctx_current = cctx_new_empty ();
3250
2642 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3251 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
2643 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3252 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
2644 3253
2645 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 3254 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get;
2646 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set; 3255 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set;
… …
2665 3274
2666 { 3275 {
2667 SV *slf = sv_2mortal (newSViv (PTR2IV (pp_slf))); 3276 SV *slf = sv_2mortal (newSViv (PTR2IV (pp_slf)));
2668 3277
2669 if (!PL_custom_op_names) PL_custom_op_names = newHV (); 3278 if (!PL_custom_op_names) PL_custom_op_names = newHV ();
2670 hv_store_ent (PL_custom_op_names, slf, 3279 hv_store_ent (PL_custom_op_names, slf, newSVpv ("coro_slf", 0), 0);
2671 newSVpv ("coro_slf", 0), 0);
2672 3280
2673 if (!PL_custom_op_descs) PL_custom_op_descs = newHV (); 3281 if (!PL_custom_op_descs) PL_custom_op_descs = newHV ();
2674 hv_store_ent (PL_custom_op_descs, slf, 3282 hv_store_ent (PL_custom_op_descs, slf, newSVpv ("coro schedule like function", 0), 0);
2675 newSVpv ("coro schedule like function", 0), 0);
2676 } 3283 }
2677 3284
2678 coroapi.ver = CORO_API_VERSION; 3285 coroapi.ver = CORO_API_VERSION;
2679 coroapi.rev = CORO_API_REVISION; 3286 coroapi.rev = CORO_API_REVISION;
2680 3287
… …
2685 coroapi.prepare_nop = prepare_nop; 3292 coroapi.prepare_nop = prepare_nop;
2686 coroapi.prepare_schedule = prepare_schedule; 3293 coroapi.prepare_schedule = prepare_schedule;
2687 coroapi.prepare_cede = prepare_cede; 3294 coroapi.prepare_cede = prepare_cede;
2688 coroapi.prepare_cede_notself = prepare_cede_notself; 3295 coroapi.prepare_cede_notself = prepare_cede_notself;
2689 3296
2690 { 3297 time_init (aTHX);
2691 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
2692 3298
2693 if (!svp) croak ("Time::HiRes is required");
2694 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
2695
2696 nvtime = INT2PTR (double (*)(), SvIV (*svp));
2697 }
2698
2699 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 3299 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
2700} 3300}
2701 3301
2702SV * 3302SV *
2703new (char *klass, ...) 3303new (SV *klass, ...)
2704 ALIAS: 3304 ALIAS:
2705 Coro::new = 1 3305 Coro::new = 1
2706 CODE: 3306 CODE:
2707{ 3307 RETVAL = coro_new (aTHX_ ix ? coro_stash : coro_state_stash, &ST (1), items - 1, ix);
2708 struct coro *coro; 3308 OUTPUT:
2709 MAGIC *mg;
2710 HV *hv;
2711 CV *cb;
2712 int i;
2713
2714 if (items > 1)
2715 {
2716 cb = coro_sv_2cv (aTHX_ ST (1));
2717
2718 if (!ix)
2719 {
2720 if (CvISXSUB (cb))
2721 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
2722
2723 if (!CvROOT (cb))
2724 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
2725 }
2726 }
2727
2728 Newz (0, coro, 1, struct coro);
2729 coro->args = newAV ();
2730 coro->flags = CF_NEW;
2731
2732 if (coro_first) coro_first->prev = coro;
2733 coro->next = coro_first;
2734 coro_first = coro;
2735
2736 coro->hv = hv = newHV ();
2737 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
2738 mg->mg_flags |= MGf_DUP;
2739 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
2740
2741 if (items > 1)
2742 {
2743 av_extend (coro->args, items - 1 + ix - 1);
2744
2745 if (ix)
2746 {
2747 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
2748 cb = cv_coro_run;
2749 }
2750
2751 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
2752
2753 for (i = 2; i < items; i++)
2754 av_push (coro->args, newSVsv (ST (i)));
2755 }
2756}
2757 OUTPUT:
2758 RETVAL 3309 RETVAL
2759 3310
2760void 3311void
2761transfer (...) 3312transfer (...)
2762 PROTOTYPE: $$ 3313 PROTOTYPE: $$
2763 CODE: 3314 CODE:
2764 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3315 CORO_EXECUTE_SLF_XS (slf_init_transfer);
2765 3316
2766bool
2767_destroy (SV *coro_sv)
2768 CODE:
2769 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
2770 OUTPUT:
2771 RETVAL
2772
2773void 3317void
2774_exit (int code) 3318_exit (int code)
2775 PROTOTYPE: $ 3319 PROTOTYPE: $
2776 CODE: 3320 CODE:
2777 _exit (code); 3321 _exit (code);
3322
3323SV *
3324clone (Coro::State coro)
3325 CODE:
3326{
3327#if CORO_CLONE
3328 struct coro *ncoro = coro_clone (aTHX_ coro);
3329 MAGIC *mg;
3330 /* TODO: too much duplication */
3331 ncoro->hv = newHV ();
3332 mg = sv_magicext ((SV *)ncoro->hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)ncoro, 0);
3333 mg->mg_flags |= MGf_DUP;
3334 RETVAL = sv_bless (newRV_noinc ((SV *)ncoro->hv), SvSTASH (coro->hv));
3335#else
3336 croak ("Coro::State->clone has not been configured into this installation of Coro, realised");
3337#endif
3338}
3339 OUTPUT:
3340 RETVAL
2778 3341
2779int 3342int
2780cctx_stacksize (int new_stacksize = 0) 3343cctx_stacksize (int new_stacksize = 0)
2781 PROTOTYPE: ;$ 3344 PROTOTYPE: ;$
2782 CODE: 3345 CODE:
… …
2832 eval = 1 3395 eval = 1
2833 CODE: 3396 CODE:
2834{ 3397{
2835 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3398 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
2836 { 3399 {
2837 struct coro temp; 3400 struct coro *current = SvSTATE_current;
3401 struct CoroSLF slf_save;
2838 3402
2839 if (!(coro->flags & CF_RUNNING)) 3403 if (current != coro)
2840 { 3404 {
2841 PUTBACK; 3405 PUTBACK;
2842 save_perl (aTHX_ &temp); 3406 save_perl (aTHX_ current);
2843 load_perl (aTHX_ coro); 3407 load_perl (aTHX_ coro);
3408 /* the coro is most likely in an active SLF call.
3409 * while not strictly required (the code we execute is
3410 * not allowed to call any SLF functions), it's cleaner
3411 * to reinitialise the slf_frame and restore it later.
3412 * This might one day allow us to actually do SLF calls
3413 * from code executed here.
3414 */
3415 slf_save = slf_frame;
3416 slf_frame.prepare = 0;
3417 SPAGAIN;
2844 } 3418 }
2845 3419
2846 {
2847 dSP;
2848 ENTER;
2849 SAVETMPS;
2850 PUTBACK;
2851 PUSHSTACK; 3420 PUSHSTACK;
3421
2852 PUSHMARK (SP); 3422 PUSHMARK (SP);
3423 PUTBACK;
2853 3424
2854 if (ix) 3425 if (ix)
2855 eval_sv (coderef, 0); 3426 eval_sv (coderef, 0);
2856 else 3427 else
2857 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 3428 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
2858 3429
2859 POPSTACK; 3430 POPSTACK;
2860 SPAGAIN; 3431 SPAGAIN;
2861 FREETMPS;
2862 LEAVE;
2863 PUTBACK;
2864 }
2865 3432
2866 if (!(coro->flags & CF_RUNNING)) 3433 if (current != coro)
2867 { 3434 {
3435 PUTBACK;
3436 slf_frame = slf_save;
2868 save_perl (aTHX_ coro); 3437 save_perl (aTHX_ coro);
2869 load_perl (aTHX_ &temp); 3438 load_perl (aTHX_ current);
2870 SPAGAIN; 3439 SPAGAIN;
2871 } 3440 }
2872 } 3441 }
2873} 3442}
2874 3443
… …
2878 ALIAS: 3447 ALIAS:
2879 is_ready = CF_READY 3448 is_ready = CF_READY
2880 is_running = CF_RUNNING 3449 is_running = CF_RUNNING
2881 is_new = CF_NEW 3450 is_new = CF_NEW
2882 is_destroyed = CF_DESTROYED 3451 is_destroyed = CF_DESTROYED
3452 is_suspended = CF_SUSPENDED
2883 CODE: 3453 CODE:
2884 RETVAL = boolSV (coro->flags & ix); 3454 RETVAL = boolSV (coro->flags & ix);
2885 OUTPUT: 3455 OUTPUT:
2886 RETVAL 3456 RETVAL
2887 3457
2888void 3458void
2889throw (Coro::State self, SV *throw = &PL_sv_undef) 3459throw (Coro::State self, SV *exception = &PL_sv_undef)
2890 PROTOTYPE: $;$ 3460 PROTOTYPE: $;$
2891 CODE: 3461 CODE:
2892{ 3462{
2893 struct coro *current = SvSTATE_current; 3463 struct coro *current = SvSTATE_current;
2894 SV **throwp = self == current ? &CORO_THROW : &self->except; 3464 SV **exceptionp = self == current ? &CORO_THROW : &self->except;
2895 SvREFCNT_dec (*throwp); 3465 SvREFCNT_dec (*exceptionp);
2896 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3466 SvGETMAGIC (exception);
3467 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
2897} 3468}
2898 3469
2899void 3470void
2900api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3471api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
2901 PROTOTYPE: $;$ 3472 PROTOTYPE: $;$
… …
2903 3474
2904SV * 3475SV *
2905has_cctx (Coro::State coro) 3476has_cctx (Coro::State coro)
2906 PROTOTYPE: $ 3477 PROTOTYPE: $
2907 CODE: 3478 CODE:
2908 RETVAL = boolSV (!!coro->cctx); 3479 /* maybe manage the running flag differently */
3480 RETVAL = boolSV (!!coro->cctx || (coro->flags & CF_RUNNING));
2909 OUTPUT: 3481 OUTPUT:
2910 RETVAL 3482 RETVAL
2911 3483
2912int 3484int
2913is_traced (Coro::State coro) 3485is_traced (Coro::State coro)
… …
2933 3505
2934void 3506void
2935force_cctx () 3507force_cctx ()
2936 PROTOTYPE: 3508 PROTOTYPE:
2937 CODE: 3509 CODE:
2938 SvSTATE_current->cctx->idle_sp = 0; 3510 cctx_current->idle_sp = 0;
2939 3511
2940void 3512void
2941swap_defsv (Coro::State self) 3513swap_defsv (Coro::State self)
2942 PROTOTYPE: $ 3514 PROTOTYPE: $
2943 ALIAS: 3515 ALIAS:
… …
2951 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv; 3523 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
2952 3524
2953 SV *tmp = *src; *src = *dst; *dst = tmp; 3525 SV *tmp = *src; *src = *dst; *dst = tmp;
2954 } 3526 }
2955 3527
3528void
3529cancel (Coro::State self)
3530 CODE:
3531 coro_state_destroy (aTHX_ self);
3532
3533SV *
3534enable_times (int enabled = enable_times)
3535 CODE:
3536{
3537 RETVAL = boolSV (enable_times);
3538
3539 if (enabled != enable_times)
3540 {
3541 enable_times = enabled;
3542
3543 coro_times_update ();
3544 (enabled ? coro_times_sub : coro_times_add)(SvSTATE (coro_current));
3545 }
3546}
3547 OUTPUT:
3548 RETVAL
3549
3550void
3551times (Coro::State self)
3552 PPCODE:
3553{
3554 struct coro *current = SvSTATE (coro_current);
3555
3556 if (expect_false (current == self))
3557 {
3558 coro_times_update ();
3559 coro_times_add (SvSTATE (coro_current));
3560 }
3561
3562 EXTEND (SP, 2);
3563 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3564 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3565
3566 if (expect_false (current == self))
3567 coro_times_sub (SvSTATE (coro_current));
3568}
3569
3570void
3571swap_sv (Coro::State coro, SV *sv, SV *swapsv)
3572 CODE:
3573{
3574 struct coro *current = SvSTATE_current;
3575
3576 if (current == coro)
3577 SWAP_SVS (current);
3578
3579 if (!coro->swap_sv)
3580 coro->swap_sv = newAV ();
3581
3582 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv )));
3583 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv)));
3584
3585 if (current == coro)
3586 SWAP_SVS (current);
3587}
3588
2956 3589
2957MODULE = Coro::State PACKAGE = Coro 3590MODULE = Coro::State PACKAGE = Coro
2958 3591
2959BOOT: 3592BOOT:
2960{ 3593{
2961 int i;
2962
2963 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
2964 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3594 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
2965 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3595 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
2966 cv_coro_run = get_cv ( "Coro::_terminate", GV_ADD); 3596 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
2967 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
2968 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 3597 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3598 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3599 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3600 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3601 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
2969 3602
2970 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3603 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
2971 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3604 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
2972 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 3605 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
2973 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new); 3606 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
2974 3607
2975 coro_stash = gv_stashpv ("Coro", TRUE); 3608 coro_stash = gv_stashpv ("Coro", TRUE);
2976 3609
2977 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 3610 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
2978 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 3611 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
2979 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 3612 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
2980 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 3613 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (CORO_PRIO_LOW));
2981 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE)); 3614 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (CORO_PRIO_IDLE));
2982 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN)); 3615 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (CORO_PRIO_MIN));
2983
2984 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
2985 coro_ready[i] = newAV ();
2986 3616
2987 { 3617 {
2988 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 3618 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
2989 3619
2990 coroapi.schedule = api_schedule; 3620 coroapi.schedule = api_schedule;
3621 coroapi.schedule_to = api_schedule_to;
2991 coroapi.cede = api_cede; 3622 coroapi.cede = api_cede;
2992 coroapi.cede_notself = api_cede_notself; 3623 coroapi.cede_notself = api_cede_notself;
2993 coroapi.ready = api_ready; 3624 coroapi.ready = api_ready;
2994 coroapi.is_ready = api_is_ready; 3625 coroapi.is_ready = api_is_ready;
2995 coroapi.nready = coro_nready; 3626 coroapi.nready = coro_nready;
… …
2999 sv_setiv (sv, (IV)&coroapi); 3630 sv_setiv (sv, (IV)&coroapi);
3000 SvREADONLY_on (sv); 3631 SvREADONLY_on (sv);
3001 } 3632 }
3002} 3633}
3003 3634
3635SV *
3636async (...)
3637 PROTOTYPE: &@
3638 CODE:
3639 RETVAL = coro_new (aTHX_ coro_stash, &ST (0), items, 1);
3640 api_ready (aTHX_ RETVAL);
3641 OUTPUT:
3642 RETVAL
3643
3644void
3645_destroy (Coro::State coro)
3646 CODE:
3647 /* used by the manager thread */
3648 coro_state_destroy (aTHX_ coro);
3649 coro_call_on_destroy (aTHX_ coro);
3650
3651void
3652terminate (...)
3653 CODE:
3654 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3655
3656void
3657cancel (...)
3658 CODE:
3659 CORO_EXECUTE_SLF_XS (slf_init_cancel);
3660
3661int
3662safe_cancel (Coro::State self, ...)
3663 C_ARGS: aTHX_ self, &ST (1), items - 1
3664
3004void 3665void
3005schedule (...) 3666schedule (...)
3006 CODE: 3667 CODE:
3007 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3668 CORO_EXECUTE_SLF_XS (slf_init_schedule);
3669
3670void
3671schedule_to (...)
3672 CODE:
3673 CORO_EXECUTE_SLF_XS (slf_init_schedule_to);
3674
3675void
3676cede_to (...)
3677 CODE:
3678 CORO_EXECUTE_SLF_XS (slf_init_cede_to);
3008 3679
3009void 3680void
3010cede (...) 3681cede (...)
3011 CODE: 3682 CODE:
3012 CORO_EXECUTE_SLF_XS (slf_init_cede); 3683 CORO_EXECUTE_SLF_XS (slf_init_cede);
… …
3026void 3697void
3027_set_readyhook (SV *hook) 3698_set_readyhook (SV *hook)
3028 PROTOTYPE: $ 3699 PROTOTYPE: $
3029 CODE: 3700 CODE:
3030 SvREFCNT_dec (coro_readyhook); 3701 SvREFCNT_dec (coro_readyhook);
3702 SvGETMAGIC (hook);
3703 if (SvOK (hook))
3704 {
3031 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0; 3705 coro_readyhook = newSVsv (hook);
3706 CORO_READYHOOK = invoke_sv_ready_hook_helper;
3707 }
3708 else
3709 {
3710 coro_readyhook = 0;
3711 CORO_READYHOOK = 0;
3712 }
3032 3713
3033int 3714int
3034prio (Coro::State coro, int newprio = 0) 3715prio (Coro::State coro, int newprio = 0)
3035 PROTOTYPE: $;$ 3716 PROTOTYPE: $;$
3036 ALIAS: 3717 ALIAS:
… …
3042 if (items > 1) 3723 if (items > 1)
3043 { 3724 {
3044 if (ix) 3725 if (ix)
3045 newprio = coro->prio - newprio; 3726 newprio = coro->prio - newprio;
3046 3727
3047 if (newprio < PRIO_MIN) newprio = PRIO_MIN; 3728 if (newprio < CORO_PRIO_MIN) newprio = CORO_PRIO_MIN;
3048 if (newprio > PRIO_MAX) newprio = PRIO_MAX; 3729 if (newprio > CORO_PRIO_MAX) newprio = CORO_PRIO_MAX;
3049 3730
3050 coro->prio = newprio; 3731 coro->prio = newprio;
3051 } 3732 }
3052} 3733}
3053 OUTPUT: 3734 OUTPUT:
… …
3068 RETVAL = coro_nready; 3749 RETVAL = coro_nready;
3069 OUTPUT: 3750 OUTPUT:
3070 RETVAL 3751 RETVAL
3071 3752
3072void 3753void
3754suspend (Coro::State self)
3755 PROTOTYPE: $
3756 CODE:
3757 self->flags |= CF_SUSPENDED;
3758
3759void
3760resume (Coro::State self)
3761 PROTOTYPE: $
3762 CODE:
3763 self->flags &= ~CF_SUSPENDED;
3764
3765void
3073_pool_handler (...) 3766_pool_handler (...)
3074 CODE: 3767 CODE:
3075 CORO_EXECUTE_SLF_XS (slf_init_pool_handler); 3768 CORO_EXECUTE_SLF_XS (slf_init_pool_handler);
3076 3769
3077void 3770void
… …
3088 for (i = 1; i < items; ++i) 3781 for (i = 1; i < items; ++i)
3089 av_push (av, SvREFCNT_inc_NN (ST (i))); 3782 av_push (av, SvREFCNT_inc_NN (ST (i)));
3090 3783
3091 if ((SV *)hv == &PL_sv_undef) 3784 if ((SV *)hv == &PL_sv_undef)
3092 { 3785 {
3093 PUSHMARK (SP); 3786 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3094 EXTEND (SP, 2);
3095 PUSHs (sv_Coro);
3096 PUSHs ((SV *)cv_pool_handler);
3097 PUTBACK;
3098 call_sv ((SV *)cv_coro_state_new, G_SCALAR);
3099 SPAGAIN;
3100
3101 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs)); 3787 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
3788 SvREFCNT_dec (sv);
3102 } 3789 }
3103 3790
3104 { 3791 {
3105 struct coro *coro = SvSTATE_hv (hv); 3792 struct coro *coro = SvSTATE_hv (hv);
3106 3793
… …
3130rouse_wait (...) 3817rouse_wait (...)
3131 PROTOTYPE: ;$ 3818 PROTOTYPE: ;$
3132 PPCODE: 3819 PPCODE:
3133 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait); 3820 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait);
3134 3821
3822void
3823on_enter (SV *block)
3824 ALIAS:
3825 on_leave = 1
3826 PROTOTYPE: &
3827 CODE:
3828{
3829 struct coro *coro = SvSTATE_current;
3830 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3831
3832 block = s_get_cv_croak (block);
3833
3834 if (!*avp)
3835 *avp = newAV ();
3836
3837 av_push (*avp, SvREFCNT_inc (block));
3838
3839 if (!ix)
3840 on_enterleave_call (aTHX_ block);
3841
3842 LEAVE; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
3843 SAVEDESTRUCTOR_X (ix ? coro_pop_on_leave : coro_pop_on_enter, (void *)coro);
3844 ENTER; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
3845}
3846
3135 3847
3136MODULE = Coro::State PACKAGE = PerlIO::cede 3848MODULE = Coro::State PACKAGE = PerlIO::cede
3137 3849
3138BOOT: 3850BOOT:
3139 PerlIO_define_layer (aTHX_ &PerlIO_cede); 3851 PerlIO_define_layer (aTHX_ &PerlIO_cede);
… …
3142MODULE = Coro::State PACKAGE = Coro::Semaphore 3854MODULE = Coro::State PACKAGE = Coro::Semaphore
3143 3855
3144SV * 3856SV *
3145new (SV *klass, SV *count = 0) 3857new (SV *klass, SV *count = 0)
3146 CODE: 3858 CODE:
3859{
3860 int semcnt = 1;
3861
3862 if (count)
3863 {
3864 SvGETMAGIC (count);
3865
3866 if (SvOK (count))
3867 semcnt = SvIV (count);
3868 }
3869
3147 RETVAL = sv_bless ( 3870 RETVAL = sv_bless (
3148 coro_waitarray_new (aTHX_ count && SvOK (count) ? SvIV (count) : 1), 3871 coro_waitarray_new (aTHX_ semcnt),
3149 GvSTASH (CvGV (cv)) 3872 GvSTASH (CvGV (cv))
3150 ); 3873 );
3874}
3151 OUTPUT: 3875 OUTPUT:
3152 RETVAL 3876 RETVAL
3153 3877
3154# helper for Coro::Channel 3878# helper for Coro::Channel and others
3155SV * 3879SV *
3156_alloc (int count) 3880_alloc (int count)
3157 CODE: 3881 CODE:
3158 RETVAL = coro_waitarray_new (aTHX_ count); 3882 RETVAL = coro_waitarray_new (aTHX_ count);
3159 OUTPUT: 3883 OUTPUT:
… …
3217 for (i = 1; i <= wcount; ++i) 3941 for (i = 1; i <= wcount; ++i)
3218 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i]))); 3942 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i])));
3219 } 3943 }
3220} 3944}
3221 3945
3946MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3947
3948void
3949_may_delete (SV *sem, int count, int extra_refs)
3950 PPCODE:
3951{
3952 AV *av = (AV *)SvRV (sem);
3953
3954 if (SvREFCNT ((SV *)av) == 1 + extra_refs
3955 && AvFILLp (av) == 0 /* no waiters, just count */
3956 && SvIV (AvARRAY (av)[0]) == count)
3957 XSRETURN_YES;
3958
3959 XSRETURN_NO;
3960}
3961
3222MODULE = Coro::State PACKAGE = Coro::Signal 3962MODULE = Coro::State PACKAGE = Coro::Signal
3223 3963
3224SV * 3964SV *
3225new (SV *klass) 3965new (SV *klass)
3226 CODE: 3966 CODE:
… …
3297 4037
3298void 4038void
3299_register (char *target, char *proto, SV *req) 4039_register (char *target, char *proto, SV *req)
3300 CODE: 4040 CODE:
3301{ 4041{
3302 CV *req_cv = coro_sv_2cv (aTHX_ req); 4042 SV *req_cv = s_get_cv_croak (req);
3303 /* newXSproto doesn't return the CV on 5.8 */ 4043 /* newXSproto doesn't return the CV on 5.8 */
3304 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 4044 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3305 sv_setpv ((SV *)slf_cv, proto); 4045 sv_setpv ((SV *)slf_cv, proto);
3306 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0); 4046 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
3307} 4047}
3308 4048
4049MODULE = Coro::State PACKAGE = Coro::Select
4050
4051void
4052patch_pp_sselect ()
4053 CODE:
4054 if (!coro_old_pp_sselect)
4055 {
4056 coro_select_select = (SV *)get_cv ("Coro::Select::select", 0);
4057 coro_old_pp_sselect = PL_ppaddr [OP_SSELECT];
4058 PL_ppaddr [OP_SSELECT] = coro_pp_sselect;
4059 }
4060
4061void
4062unpatch_pp_sselect ()
4063 CODE:
4064 if (coro_old_pp_sselect)
4065 {
4066 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
4067 coro_old_pp_sselect = 0;
4068 }
4069

Diff Legend

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