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.310 by root, Wed Nov 19 16:01:32 2008 UTC vs.
Revision 1.388 by root, Wed Feb 23 07:14:22 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
22#ifndef SVs_PADSTALE
23# define SVs_PADSTALE 0
24#endif
25
17#ifdef WIN32 26#ifdef 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) && PERLSUBVERSION >= (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
104/* 5.8.7 */
105#ifndef SvRV_set
106# define SvRV_set(s,v) SvRV(s) = (v)
107#endif
108
109#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 66#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
110# undef CORO_STACKGUARD 67# undef CORO_STACKGUARD
111#endif 68#endif
112 69
113#ifndef CORO_STACKGUARD 70#ifndef CORO_STACKGUARD
… …
127#else 84#else
128# define dSTACKLEVEL volatile void *stacklevel 85# define dSTACKLEVEL volatile void *stacklevel
129# define STACKLEVEL ((void *)&stacklevel) 86# define STACKLEVEL ((void *)&stacklevel)
130#endif 87#endif
131 88
132#define IN_DESTRUCT (PL_main_cv == Nullcv) 89#define IN_DESTRUCT PL_dirty
133 90
134#if __GNUC__ >= 3 91#if __GNUC__ >= 3
135# define attribute(x) __attribute__(x) 92# define attribute(x) __attribute__(x)
136# define expect(expr,value) __builtin_expect ((expr),(value)) 93# define expect(expr,value) __builtin_expect ((expr), (value))
137# define INLINE static inline 94# define INLINE static inline
138#else 95#else
139# define attribute(x) 96# define attribute(x)
140# define expect(expr,value) (expr) 97# define expect(expr,value) (expr)
141# define INLINE static 98# define INLINE static
… …
153# if CORO_PTHREAD 110# if CORO_PTHREAD
154static void *coro_thx; 111static void *coro_thx;
155# endif 112# endif
156#endif 113#endif
157 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
158static 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]);
159 127
160/* we hijack an hopefully unused CV flag for our purposes */ 128/* we hijack an hopefully unused CV flag for our purposes */
161#define CVf_SLF 0x4000 129#define CVf_SLF 0x4000
162static OP *pp_slf (pTHX); 130static OP *pp_slf (pTHX);
163 131
… …
167static AV *main_mainstack; /* used to differentiate between $main and others */ 135static AV *main_mainstack; /* used to differentiate between $main and others */
168static JMPENV *main_top_env; 136static JMPENV *main_top_env;
169static HV *coro_state_stash, *coro_stash; 137static HV *coro_state_stash, *coro_stash;
170static volatile SV *coro_mortal; /* will be freed/thrown after next transfer */ 138static volatile SV *coro_mortal; /* will be freed/thrown after next transfer */
171 139
140static AV *av_destroy; /* destruction queue */
141static SV *sv_manager; /* the manager coro */
142static SV *sv_idle; /* $Coro::idle */
143
172static GV *irsgv; /* $/ */ 144static GV *irsgv; /* $/ */
173static GV *stdoutgv; /* *STDOUT */ 145static GV *stdoutgv; /* *STDOUT */
174static SV *rv_diehook; 146static SV *rv_diehook;
175static SV *rv_warnhook; 147static SV *rv_warnhook;
176static HV *hv_sig; /* %SIG */ 148static HV *hv_sig; /* %SIG */
177 149
178/* async_pool helper stuff */ 150/* async_pool helper stuff */
179static SV *sv_pool_rss; 151static SV *sv_pool_rss;
180static SV *sv_pool_size; 152static SV *sv_pool_size;
153static SV *sv_async_pool_idle; /* description string */
181static AV *av_async_pool; 154static AV *av_async_pool; /* idle pool */
155static SV *sv_Coro; /* class string */
156static CV *cv_pool_handler;
182 157
183/* Coro::AnyEvent */ 158/* Coro::AnyEvent */
184static SV *sv_activity; 159static SV *sv_activity;
160
161/* enable processtime/realtime profiling */
162static char enable_times;
163typedef U32 coro_ts[2];
164static coro_ts time_real, time_cpu;
165static char times_valid;
185 166
186static struct coro_cctx *cctx_first; 167static struct coro_cctx *cctx_first;
187static int cctx_count, cctx_idle; 168static int cctx_count, cctx_idle;
188 169
189enum { 170enum {
… …
215 int valgrind_id; 196 int valgrind_id;
216#endif 197#endif
217 unsigned char flags; 198 unsigned char flags;
218} coro_cctx; 199} coro_cctx;
219 200
201coro_cctx *cctx_current; /* the currently running cctx */
202
203/*****************************************************************************/
204
220enum { 205enum {
221 CF_RUNNING = 0x0001, /* coroutine is running */ 206 CF_RUNNING = 0x0001, /* coroutine is running */
222 CF_READY = 0x0002, /* coroutine is ready */ 207 CF_READY = 0x0002, /* coroutine is ready */
223 CF_NEW = 0x0004, /* has never been switched to */ 208 CF_NEW = 0x0004, /* has never been switched to */
224 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 209 CF_DESTROYED = 0x0008, /* coroutine data has been freed */
210 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
225}; 211};
226 212
227/* the structure where most of the perl state is stored, overlaid on the cxstack */ 213/* the structure where most of the perl state is stored, overlaid on the cxstack */
228typedef struct 214typedef struct
229{ 215{
230 SV *defsv; 216 SV *defsv;
231 AV *defav; 217 AV *defav;
232 SV *errsv; 218 SV *errsv;
233 SV *irsgv; 219 SV *irsgv;
220 HV *hinthv;
234#define VAR(name,type) type name; 221#define VAR(name,type) type name;
235# include "state.h" 222# include "state.h"
236#undef VAR 223#undef VAR
237} perl_slots; 224} perl_slots;
238 225
… …
240 227
241/* this is a structure representing a perl-level coroutine */ 228/* this is a structure representing a perl-level coroutine */
242struct coro { 229struct coro {
243 /* the C coroutine allocated to this perl coroutine, if any */ 230 /* the C coroutine allocated to this perl coroutine, if any */
244 coro_cctx *cctx; 231 coro_cctx *cctx;
232
233 /* ready queue */
234 struct coro *next_ready;
245 235
246 /* state data */ 236 /* state data */
247 struct CoroSLF slf_frame; /* saved slf frame */ 237 struct CoroSLF slf_frame; /* saved slf frame */
248 AV *mainstack; 238 AV *mainstack;
249 perl_slots *slot; /* basically the saved sp */ 239 perl_slots *slot; /* basically the saved sp */
… …
251 CV *startcv; /* the CV to execute */ 241 CV *startcv; /* the CV to execute */
252 AV *args; /* data associated with this coroutine (initial args) */ 242 AV *args; /* data associated with this coroutine (initial args) */
253 int refcnt; /* coroutines are refcounted, yes */ 243 int refcnt; /* coroutines are refcounted, yes */
254 int flags; /* CF_ flags */ 244 int flags; /* CF_ flags */
255 HV *hv; /* the perl hash associated with this coro, if any */ 245 HV *hv; /* the perl hash associated with this coro, if any */
256 void (*on_destroy)(pTHX_ struct coro *coro); 246 void (*on_destroy)(pTHX_ struct coro *coro); /* for temporary use by xs in critical sections */
257 247
258 /* statistics */ 248 /* statistics */
259 int usecount; /* number of transfers to this coro */ 249 int usecount; /* number of transfers to this coro */
260 250
261 /* coro process data */ 251 /* coro process data */
… …
263 SV *except; /* exception to be thrown */ 253 SV *except; /* exception to be thrown */
264 SV *rouse_cb; 254 SV *rouse_cb;
265 255
266 /* async_pool */ 256 /* async_pool */
267 SV *saved_deffh; 257 SV *saved_deffh;
258 SV *invoke_cb;
259 AV *invoke_av;
260
261 /* on_enter/on_leave */
262 AV *on_enter;
263 AV *on_leave;
264
265 /* swap_sv */
266 AV *swap_sv;
267
268 /* times */
269 coro_ts t_cpu, t_real;
268 270
269 /* linked list */ 271 /* linked list */
270 struct coro *next, *prev; 272 struct coro *next, *prev;
271}; 273};
272 274
… …
278/* the mainr easonw e don't support windows process emulation */ 280/* the mainr easonw e don't support windows process emulation */
279static struct CoroSLF slf_frame; /* the current slf frame */ 281static struct CoroSLF slf_frame; /* the current slf frame */
280 282
281/** Coro ********************************************************************/ 283/** Coro ********************************************************************/
282 284
283#define PRIO_MAX 3 285#define CORO_PRIO_MAX 3
284#define PRIO_HIGH 1 286#define CORO_PRIO_HIGH 1
285#define PRIO_NORMAL 0 287#define CORO_PRIO_NORMAL 0
286#define PRIO_LOW -1 288#define CORO_PRIO_LOW -1
287#define PRIO_IDLE -3 289#define CORO_PRIO_IDLE -3
288#define PRIO_MIN -4 290#define CORO_PRIO_MIN -4
289 291
290/* for Coro.pm */ 292/* for Coro.pm */
291static SV *coro_current; 293static SV *coro_current;
292static SV *coro_readyhook; 294static SV *coro_readyhook;
293static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1]; 295static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
294static CV *cv_coro_run; 296static CV *cv_coro_run, *cv_coro_terminate;
295static struct coro *coro_first; 297static struct coro *coro_first;
296#define coro_nready coroapi.nready 298#define coro_nready coroapi.nready
299
300/** Coro::Select ************************************************************/
301
302static OP *(*coro_old_pp_sselect) (pTHX);
303static SV *coro_select_select;
304
305/* horrible hack, but if it works... */
306static OP *
307coro_pp_sselect (pTHX)
308{
309 dSP;
310 PUSHMARK (SP - 4); /* fake argument list */
311 XPUSHs (coro_select_select);
312 PUTBACK;
313
314 /* entersub is an UNOP, select a LISTOP... keep your fingers crossed */
315 PL_op->op_flags |= OPf_STACKED;
316 PL_op->op_private = 0;
317 return PL_ppaddr [OP_ENTERSUB](aTHX);
318}
319
320/** time stuff **************************************************************/
321
322#ifdef HAS_GETTIMEOFDAY
323
324static void
325coro_u2time (pTHX_ UV ret[2])
326{
327 struct timeval tv;
328 gettimeofday (&tv, 0);
329
330 ret [0] = tv.tv_sec;
331 ret [1] = tv.tv_usec;
332}
333
334static double
335coro_nvtime ()
336{
337 struct timeval tv;
338 gettimeofday (&tv, 0);
339
340 return tv.tv_sec + tv.tv_usec * 1e-6;
341}
342
343static void
344time_init (pTHX)
345{
346 nvtime = coro_nvtime;
347 u2time = coro_u2time;
348}
349
350#else
351
352static void
353time_init (pTHX)
354{
355 SV **svp;
356
357 require_pv ("Time/HiRes.pm");
358
359 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
360
361 if (!svp) croak ("Time::HiRes is required, but missing.");
362 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
363
364 nvtime = INT2PTR (double (*)(), SvIV (*svp));
365
366 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
367 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
368}
369
370#endif
297 371
298/** lowlevel stuff **********************************************************/ 372/** lowlevel stuff **********************************************************/
299 373
300static SV * 374static SV *
301coro_get_sv (pTHX_ const char *name, int create) 375coro_get_sv (pTHX_ const char *name, int create)
… …
325 get_hv (name, create); 399 get_hv (name, create);
326#endif 400#endif
327 return get_hv (name, create); 401 return get_hv (name, create);
328} 402}
329 403
330/* may croak */ 404INLINE void
331INLINE CV * 405coro_times_update ()
332coro_sv_2cv (SV *sv)
333{ 406{
407#ifdef coro_clock_gettime
408 struct timespec ts;
409
410 ts.tv_sec = ts.tv_nsec = 0;
411 coro_clock_gettime (CORO_CLOCK_THREAD_CPUTIME_ID, &ts);
412 time_cpu [0] = ts.tv_sec; time_cpu [1] = ts.tv_nsec;
413
414 ts.tv_sec = ts.tv_nsec = 0;
415 coro_clock_gettime (CORO_CLOCK_MONOTONIC, &ts);
416 time_real [0] = ts.tv_sec; time_real [1] = ts.tv_nsec;
417#else
418 dTHX;
419 UV tv[2];
420
421 u2time (aTHX_ tv);
422 time_real [0] = tv [0];
423 time_real [1] = tv [1] * 1000;
424#endif
425}
426
427INLINE void
428coro_times_add (struct coro *c)
429{
430 c->t_real [1] += time_real [1];
431 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
432 c->t_real [0] += time_real [0];
433
434 c->t_cpu [1] += time_cpu [1];
435 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
436 c->t_cpu [0] += time_cpu [0];
437}
438
439INLINE void
440coro_times_sub (struct coro *c)
441{
442 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; }
443 c->t_real [1] -= time_real [1];
444 c->t_real [0] -= time_real [0];
445
446 if (c->t_cpu [1] < time_cpu [1]) { c->t_cpu [1] += 1000000000; --c->t_cpu [0]; }
447 c->t_cpu [1] -= time_cpu [1];
448 c->t_cpu [0] -= time_cpu [0];
449}
450
451/*****************************************************************************/
452/* magic glue */
453
454#define CORO_MAGIC_type_cv 26
455#define CORO_MAGIC_type_state PERL_MAGIC_ext
456
457#define CORO_MAGIC_NN(sv, type) \
458 (expect_true (SvMAGIC (sv)->mg_type == type) \
459 ? SvMAGIC (sv) \
460 : mg_find (sv, type))
461
462#define CORO_MAGIC(sv, type) \
463 (expect_true (SvMAGIC (sv)) \
464 ? CORO_MAGIC_NN (sv, type) \
465 : 0)
466
467#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
468#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
469
470INLINE struct coro *
471SvSTATE_ (pTHX_ SV *coro)
472{
334 HV *st; 473 HV *stash;
335 GV *gvp; 474 MAGIC *mg;
336 return sv_2cv (sv, &st, &gvp, 0); 475
476 if (SvROK (coro))
477 coro = SvRV (coro);
478
479 if (expect_false (SvTYPE (coro) != SVt_PVHV))
480 croak ("Coro::State object required");
481
482 stash = SvSTASH (coro);
483 if (expect_false (stash != coro_stash && stash != coro_state_stash))
484 {
485 /* very slow, but rare, check */
486 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
487 croak ("Coro::State object required");
488 }
489
490 mg = CORO_MAGIC_state (coro);
491 return (struct coro *)mg->mg_ptr;
337} 492}
493
494#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
495
496/* faster than SvSTATE, but expects a coroutine hv */
497#define SvSTATE_hv(hv) ((struct coro *)CORO_MAGIC_NN ((SV *)hv, CORO_MAGIC_type_state)->mg_ptr)
498#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
499
500/*****************************************************************************/
501/* padlist management and caching */
338 502
339static AV * 503static AV *
340coro_clone_padlist (pTHX_ CV *cv) 504coro_derive_padlist (pTHX_ CV *cv)
341{ 505{
342 AV *padlist = CvPADLIST (cv); 506 AV *padlist = CvPADLIST (cv);
343 AV *newpadlist, *newpad; 507 AV *newpadlist, *newpad;
344 508
345 newpadlist = newAV (); 509 newpadlist = newAV ();
… …
350 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 514 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
351#endif 515#endif
352 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 516 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
353 --AvFILLp (padlist); 517 --AvFILLp (padlist);
354 518
355 av_store (newpadlist, 0, SvREFCNT_inc_NN (*av_fetch (padlist, 0, FALSE))); 519 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0]));
356 av_store (newpadlist, 1, (SV *)newpad); 520 av_store (newpadlist, 1, (SV *)newpad);
357 521
358 return newpadlist; 522 return newpadlist;
359} 523}
360 524
361static void 525static void
362free_padlist (pTHX_ AV *padlist) 526free_padlist (pTHX_ AV *padlist)
363{ 527{
364 /* may be during global destruction */ 528 /* may be during global destruction */
365 if (SvREFCNT (padlist)) 529 if (!IN_DESTRUCT)
366 { 530 {
367 I32 i = AvFILLp (padlist); 531 I32 i = AvFILLp (padlist);
368 while (i >= 0) 532
533 while (i > 0) /* special-case index 0 */
369 { 534 {
370 SV **svp = av_fetch (padlist, i--, FALSE); 535 /* we try to be extra-careful here */
371 if (svp) 536 AV *av = (AV *)AvARRAY (padlist)[i--];
372 { 537 I32 j = AvFILLp (av);
373 SV *sv; 538
374 while (&PL_sv_undef != (sv = av_pop ((AV *)*svp))) 539 while (j >= 0)
540 SvREFCNT_dec (AvARRAY (av)[j--]);
541
542 AvFILLp (av) = -1;
375 SvREFCNT_dec (sv); 543 SvREFCNT_dec (av);
376
377 SvREFCNT_dec (*svp);
378 }
379 } 544 }
380 545
546 SvREFCNT_dec (AvARRAY (padlist)[0]);
547
548 AvFILLp (padlist) = -1;
381 SvREFCNT_dec ((SV*)padlist); 549 SvREFCNT_dec ((SV*)padlist);
382 } 550 }
383} 551}
384 552
385static int 553static int
386coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 554coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
387{ 555{
388 AV *padlist; 556 AV *padlist;
389 AV *av = (AV *)mg->mg_obj; 557 AV *av = (AV *)mg->mg_obj;
558
559 /* perl manages to free our internal AV and _then_ call us */
560 if (IN_DESTRUCT)
561 return 0;
390 562
391 /* casting is fun. */ 563 /* casting is fun. */
392 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 564 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
393 free_padlist (aTHX_ padlist); 565 free_padlist (aTHX_ padlist);
394 566
395 SvREFCNT_dec (av); /* sv_magicext increased the refcount */ 567 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
396 568
397 return 0; 569 return 0;
398} 570}
399
400#define CORO_MAGIC_type_cv 26
401#define CORO_MAGIC_type_state PERL_MAGIC_ext
402 571
403static MGVTBL coro_cv_vtbl = { 572static MGVTBL coro_cv_vtbl = {
404 0, 0, 0, 0, 573 0, 0, 0, 0,
405 coro_cv_free 574 coro_cv_free
406}; 575};
407
408#define CORO_MAGIC_NN(sv, type) \
409 (expect_true (SvMAGIC (sv)->mg_type == type) \
410 ? SvMAGIC (sv) \
411 : mg_find (sv, type))
412
413#define CORO_MAGIC(sv, type) \
414 (expect_true (SvMAGIC (sv)) \
415 ? CORO_MAGIC_NN (sv, type) \
416 : 0)
417
418#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
419#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
420
421INLINE struct coro *
422SvSTATE_ (pTHX_ SV *coro)
423{
424 HV *stash;
425 MAGIC *mg;
426
427 if (SvROK (coro))
428 coro = SvRV (coro);
429
430 if (expect_false (SvTYPE (coro) != SVt_PVHV))
431 croak ("Coro::State object required");
432
433 stash = SvSTASH (coro);
434 if (expect_false (stash != coro_stash && stash != coro_state_stash))
435 {
436 /* very slow, but rare, check */
437 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
438 croak ("Coro::State object required");
439 }
440
441 mg = CORO_MAGIC_state (coro);
442 return (struct coro *)mg->mg_ptr;
443}
444
445#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
446
447/* faster than SvSTATE, but expects a coroutine hv */
448#define SvSTATE_hv(hv) ((struct coro *)CORO_MAGIC_NN ((SV *)hv, CORO_MAGIC_type_state)->mg_ptr)
449#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
450 576
451/* the next two functions merely cache the padlists */ 577/* the next two functions merely cache the padlists */
452static void 578static void
453get_padlist (pTHX_ CV *cv) 579get_padlist (pTHX_ CV *cv)
454{ 580{
… …
465 CV *cp = Perl_cv_clone (aTHX_ cv); 591 CV *cp = Perl_cv_clone (aTHX_ cv);
466 CvPADLIST (cv) = CvPADLIST (cp); 592 CvPADLIST (cv) = CvPADLIST (cp);
467 CvPADLIST (cp) = 0; 593 CvPADLIST (cp) = 0;
468 SvREFCNT_dec (cp); 594 SvREFCNT_dec (cp);
469#else 595#else
470 CvPADLIST (cv) = coro_clone_padlist (aTHX_ cv); 596 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
471#endif 597#endif
472 } 598 }
473} 599}
474 600
475static void 601static void
… …
482 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 608 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
483 609
484 av = (AV *)mg->mg_obj; 610 av = (AV *)mg->mg_obj;
485 611
486 if (expect_false (AvFILLp (av) >= AvMAX (av))) 612 if (expect_false (AvFILLp (av) >= AvMAX (av)))
487 av_extend (av, AvMAX (av) + 1); 613 av_extend (av, AvFILLp (av) + 1);
488 614
489 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 615 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
490} 616}
491 617
492/** load & save, init *******************************************************/ 618/** load & save, init *******************************************************/
619
620/* swap sv heads, at least logically */
621static void
622swap_svs (pTHX_ Coro__State c)
623{
624 int i;
625
626 for (i = 0; i <= AvFILLp (c->swap_sv); )
627 {
628 SV *a = AvARRAY (c->swap_sv)[i++];
629 SV *b = AvARRAY (c->swap_sv)[i++];
630
631 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
632 SV tmp;
633
634 /* swap sv_any */
635 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
636
637 /* swap sv_flags */
638 SvFLAGS (&tmp) = SvFLAGS (a);
639 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
640 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
641
642#if PERL_VERSION_ATLEAST (5,10,0)
643 /* perl 5.10 complicates this _quite_ a bit, but it also is
644 * much faster, so no quarrels here. alternatively, we could
645 * sv_upgrade to avoid this.
646 */
647 {
648 /* swap sv_u */
649 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
650
651 /* if SvANY points to the head, we need to adjust the pointers,
652 * as the pointer for a still points to b, and maybe vice versa.
653 */
654 #define svany_in_head(type) \
655 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
656
657 if (svany_in_head (SvTYPE (a)))
658 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
659
660 if (svany_in_head (SvTYPE (b)))
661 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
662 }
663#endif
664 }
665}
666
667#define SWAP_SVS(coro) \
668 if (expect_false ((coro)->swap_sv)) \
669 swap_svs (aTHX_ (coro))
670
671static void
672on_enterleave_call (pTHX_ SV *cb);
493 673
494static void 674static void
495load_perl (pTHX_ Coro__State c) 675load_perl (pTHX_ Coro__State c)
496{ 676{
497 perl_slots *slot = c->slot; 677 perl_slots *slot = c->slot;
498 c->slot = 0; 678 c->slot = 0;
499 679
500 PL_mainstack = c->mainstack; 680 PL_mainstack = c->mainstack;
501 681
502 GvSV (PL_defgv) = slot->defsv; 682 GvSV (PL_defgv) = slot->defsv;
503 GvAV (PL_defgv) = slot->defav; 683 GvAV (PL_defgv) = slot->defav;
504 GvSV (PL_errgv) = slot->errsv; 684 GvSV (PL_errgv) = slot->errsv;
505 GvSV (irsgv) = slot->irsgv; 685 GvSV (irsgv) = slot->irsgv;
686 GvHV (PL_hintgv) = slot->hinthv;
506 687
507 #define VAR(name,type) PL_ ## name = slot->name; 688 #define VAR(name,type) PL_ ## name = slot->name;
508 # include "state.h" 689 # include "state.h"
509 #undef VAR 690 #undef VAR
510 691
… …
524 PUTBACK; 705 PUTBACK;
525 } 706 }
526 707
527 slf_frame = c->slf_frame; 708 slf_frame = c->slf_frame;
528 CORO_THROW = c->except; 709 CORO_THROW = c->except;
710
711 if (expect_false (enable_times))
712 {
713 if (expect_false (!times_valid))
714 coro_times_update ();
715
716 coro_times_sub (c);
717 }
718
719 if (expect_false (c->on_enter))
720 {
721 int i;
722
723 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
724 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
725 }
726
727 SWAP_SVS (c);
529} 728}
530 729
531static void 730static void
532save_perl (pTHX_ Coro__State c) 731save_perl (pTHX_ Coro__State c)
533{ 732{
733 SWAP_SVS (c);
734
735 if (expect_false (c->on_leave))
736 {
737 int i;
738
739 for (i = AvFILLp (c->on_leave); i >= 0; --i)
740 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
741 }
742
743 times_valid = 0;
744
745 if (expect_false (enable_times))
746 {
747 coro_times_update (); times_valid = 1;
748 coro_times_add (c);
749 }
750
534 c->except = CORO_THROW; 751 c->except = CORO_THROW;
535 c->slf_frame = slf_frame; 752 c->slf_frame = slf_frame;
536 753
537 { 754 {
538 dSP; 755 dSP;
… …
551 { 768 {
552 while (expect_true (cxix >= 0)) 769 while (expect_true (cxix >= 0))
553 { 770 {
554 PERL_CONTEXT *cx = &ccstk[cxix--]; 771 PERL_CONTEXT *cx = &ccstk[cxix--];
555 772
556 if (expect_true (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT)) 773 if (expect_true (CxTYPE (cx) == CXt_SUB) || expect_false (CxTYPE (cx) == CXt_FORMAT))
557 { 774 {
558 CV *cv = cx->blk_sub.cv; 775 CV *cv = cx->blk_sub.cv;
559 776
560 if (expect_true (CvDEPTH (cv))) 777 if (expect_true (CvDEPTH (cv)))
561 { 778 {
… …
585 /* we manually unroll here, as usually 2 slots is enough */ 802 /* we manually unroll here, as usually 2 slots is enough */
586 if (SLOT_COUNT >= 1) CXINC; 803 if (SLOT_COUNT >= 1) CXINC;
587 if (SLOT_COUNT >= 2) CXINC; 804 if (SLOT_COUNT >= 2) CXINC;
588 if (SLOT_COUNT >= 3) CXINC; 805 if (SLOT_COUNT >= 3) CXINC;
589 { 806 {
590 int i; 807 unsigned int i;
591 for (i = 3; i < SLOT_COUNT; ++i) 808 for (i = 3; i < SLOT_COUNT; ++i)
592 CXINC; 809 CXINC;
593 } 810 }
594 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 811 cxstack_ix -= SLOT_COUNT; /* undo allocation */
595 812
596 c->mainstack = PL_mainstack; 813 c->mainstack = PL_mainstack;
597 814
598 { 815 {
599 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 816 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
600 817
601 slot->defav = GvAV (PL_defgv); 818 slot->defav = GvAV (PL_defgv);
602 slot->defsv = DEFSV; 819 slot->defsv = DEFSV;
603 slot->errsv = ERRSV; 820 slot->errsv = ERRSV;
604 slot->irsgv = GvSV (irsgv); 821 slot->irsgv = GvSV (irsgv);
822 slot->hinthv = GvHV (PL_hintgv);
605 823
606 #define VAR(name,type) slot->name = PL_ ## name; 824 #define VAR(name,type) slot->name = PL_ ## name;
607 # include "state.h" 825 # include "state.h"
608 #undef VAR 826 #undef VAR
609 } 827 }
… …
687#if !PERL_VERSION_ATLEAST (5,10,0) 905#if !PERL_VERSION_ATLEAST (5,10,0)
688 Safefree (PL_retstack); 906 Safefree (PL_retstack);
689#endif 907#endif
690} 908}
691 909
910#define CORO_RSS \
911 rss += sizeof (SYM (curstackinfo)); \
912 rss += (SYM (curstackinfo->si_cxmax) + 1) * sizeof (PERL_CONTEXT); \
913 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (SYM (curstack))) * sizeof (SV *); \
914 rss += SYM (tmps_max) * sizeof (SV *); \
915 rss += (SYM (markstack_max) - SYM (markstack_ptr)) * sizeof (I32); \
916 rss += SYM (scopestack_max) * sizeof (I32); \
917 rss += SYM (savestack_max) * sizeof (ANY);
918
692static size_t 919static size_t
693coro_rss (pTHX_ struct coro *coro) 920coro_rss (pTHX_ struct coro *coro)
694{ 921{
695 size_t rss = sizeof (*coro); 922 size_t rss = sizeof (*coro);
696 923
697 if (coro->mainstack) 924 if (coro->mainstack)
698 { 925 {
699 perl_slots tmp_slot;
700 perl_slots *slot;
701
702 if (coro->flags & CF_RUNNING) 926 if (coro->flags & CF_RUNNING)
703 { 927 {
704 slot = &tmp_slot; 928 #define SYM(sym) PL_ ## sym
705 929 CORO_RSS;
706 #define VAR(name,type) slot->name = PL_ ## name;
707 # include "state.h"
708 #undef VAR 930 #undef SYM
709 } 931 }
710 else 932 else
711 slot = coro->slot;
712
713 if (slot)
714 { 933 {
715 rss += sizeof (slot->curstackinfo); 934 #define SYM(sym) coro->slot->sym
716 rss += (slot->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT); 935 CORO_RSS;
717 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (slot->curstack)) * sizeof (SV *); 936 #undef SYM
718 rss += slot->tmps_max * sizeof (SV *);
719 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32);
720 rss += slot->scopestack_max * sizeof (I32);
721 rss += slot->savestack_max * sizeof (ANY);
722
723#if !PERL_VERSION_ATLEAST (5,10,0)
724 rss += slot->retstack_max * sizeof (OP *);
725#endif
726 } 937 }
727 } 938 }
728 939
729 return rss; 940 return rss;
730} 941}
… …
743#endif 954#endif
744 955
745/* 956/*
746 * This overrides the default magic get method of %SIG elements. 957 * This overrides the default magic get method of %SIG elements.
747 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook 958 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
748 * and instead of tryign to save and restore the hash elements, we just provide 959 * and instead of trying to save and restore the hash elements, we just provide
749 * readback here. 960 * readback here.
750 * We only do this when the hook is != 0, as they are often set to 0 temporarily,
751 * not expecting this to actually change the hook. This is a potential problem
752 * when a schedule happens then, but we ignore this.
753 */ 961 */
754static int 962static int
755coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 963coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
756{ 964{
757 const char *s = MgPV_nolen_const (mg); 965 const char *s = MgPV_nolen_const (mg);
… …
810 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 1018 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
811 1019
812 if (svp) 1020 if (svp)
813 { 1021 {
814 SV *old = *svp; 1022 SV *old = *svp;
815 *svp = newSVsv (sv); 1023 *svp = SvOK (sv) ? newSVsv (sv) : 0;
816 SvREFCNT_dec (old); 1024 SvREFCNT_dec (old);
817 return 0; 1025 return 0;
818 } 1026 }
819 } 1027 }
820 1028
… …
832slf_check_nop (pTHX_ struct CoroSLF *frame) 1040slf_check_nop (pTHX_ struct CoroSLF *frame)
833{ 1041{
834 return 0; 1042 return 0;
835} 1043}
836 1044
837static UNOP coro_setup_op; 1045static int
1046slf_check_repeat (pTHX_ struct CoroSLF *frame)
1047{
1048 return 1;
1049}
1050
1051static UNOP init_perl_op;
838 1052
839static void NOINLINE /* noinline to keep it out of the transfer fast path */ 1053static void NOINLINE /* noinline to keep it out of the transfer fast path */
840coro_setup (pTHX_ struct coro *coro) 1054init_perl (pTHX_ struct coro *coro)
841{ 1055{
842 /* 1056 /*
843 * emulate part of the perl startup here. 1057 * emulate part of the perl startup here.
844 */ 1058 */
845 coro_init_stacks (aTHX); 1059 coro_init_stacks (aTHX);
846 1060
847 PL_runops = RUNOPS_DEFAULT; 1061 PL_runops = RUNOPS_DEFAULT;
848 PL_curcop = &PL_compiling; 1062 PL_curcop = &PL_compiling;
849 PL_in_eval = EVAL_NULL; 1063 PL_in_eval = EVAL_NULL;
850 PL_comppad = 0; 1064 PL_comppad = 0;
1065 PL_comppad_name = 0;
1066 PL_comppad_name_fill = 0;
1067 PL_comppad_name_floor = 0;
851 PL_curpm = 0; 1068 PL_curpm = 0;
852 PL_curpad = 0; 1069 PL_curpad = 0;
853 PL_localizing = 0; 1070 PL_localizing = 0;
854 PL_dirty = 0;
855 PL_restartop = 0; 1071 PL_restartop = 0;
856#if PERL_VERSION_ATLEAST (5,10,0) 1072#if PERL_VERSION_ATLEAST (5,10,0)
857 PL_parser = 0; 1073 PL_parser = 0;
858#endif 1074#endif
1075 PL_hints = 0;
859 1076
860 /* recreate the die/warn hooks */ 1077 /* recreate the die/warn hooks */
861 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1078 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook );
862 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1079 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook);
863 1080
864 GvSV (PL_defgv) = newSV (0); 1081 GvSV (PL_defgv) = newSV (0);
865 GvAV (PL_defgv) = coro->args; coro->args = 0; 1082 GvAV (PL_defgv) = coro->args; coro->args = 0;
866 GvSV (PL_errgv) = newSV (0); 1083 GvSV (PL_errgv) = newSV (0);
867 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1084 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
1085 GvHV (PL_hintgv) = 0;
868 PL_rs = newSVsv (GvSV (irsgv)); 1086 PL_rs = newSVsv (GvSV (irsgv));
869 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1087 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
870 1088
871 { 1089 {
872 dSP; 1090 dSP;
… …
889 */ 1107 */
890 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1108 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
891 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */ 1109 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
892 1110
893 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1111 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */
894 coro_setup_op.op_next = PL_op; 1112 init_perl_op.op_next = PL_op;
895 coro_setup_op.op_type = OP_CUSTOM; 1113 init_perl_op.op_type = OP_ENTERSUB;
896 coro_setup_op.op_ppaddr = pp_slf; 1114 init_perl_op.op_ppaddr = pp_slf;
897 /* no flags etc. required, as an init function won't be called */ 1115 /* no flags etc. required, as an init function won't be called */
898 1116
899 PL_op = (OP *)&coro_setup_op; 1117 PL_op = (OP *)&init_perl_op;
900 1118
901 /* copy throw, in case it was set before coro_setup */ 1119 /* copy throw, in case it was set before init_perl */
902 CORO_THROW = coro->except; 1120 CORO_THROW = coro->except;
903}
904 1121
1122 SWAP_SVS (coro);
1123
1124 if (expect_false (enable_times))
1125 {
1126 coro_times_update ();
1127 coro_times_sub (coro);
1128 }
1129}
1130
905static void 1131static void
906coro_destruct (pTHX_ struct coro *coro) 1132coro_unwind_stacks (pTHX)
907{ 1133{
908 if (!IN_DESTRUCT) 1134 if (!IN_DESTRUCT)
909 { 1135 {
910 /* restore all saved variables and stuff */ 1136 /* restore all saved variables and stuff */
911 LEAVE_SCOPE (0); 1137 LEAVE_SCOPE (0);
… …
919 POPSTACK_TO (PL_mainstack); 1145 POPSTACK_TO (PL_mainstack);
920 1146
921 /* unwind main stack */ 1147 /* unwind main stack */
922 dounwind (-1); 1148 dounwind (-1);
923 } 1149 }
1150}
924 1151
925 SvREFCNT_dec (GvSV (PL_defgv)); 1152static void
926 SvREFCNT_dec (GvAV (PL_defgv)); 1153destroy_perl (pTHX_ struct coro *coro)
927 SvREFCNT_dec (GvSV (PL_errgv)); 1154{
928 SvREFCNT_dec (PL_defoutgv); 1155 SV *svf [9];
929 SvREFCNT_dec (PL_rs);
930 SvREFCNT_dec (GvSV (irsgv));
931 1156
932 SvREFCNT_dec (PL_diehook);
933 SvREFCNT_dec (PL_warnhook);
934 1157 {
1158 struct coro *current = SvSTATE_current;
1159
1160 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1161
1162 save_perl (aTHX_ current);
1163 load_perl (aTHX_ coro);
1164
1165 coro_unwind_stacks (aTHX);
1166 coro_destruct_stacks (aTHX);
1167
1168 /* restore swapped sv's */
1169 SWAP_SVS (coro);
1170
1171 // now save some sv's to be free'd later
1172 svf [0] = GvSV (PL_defgv);
1173 svf [1] = (SV *)GvAV (PL_defgv);
1174 svf [2] = GvSV (PL_errgv);
1175 svf [3] = (SV *)PL_defoutgv;
1176 svf [4] = PL_rs;
1177 svf [5] = GvSV (irsgv);
1178 svf [6] = (SV *)GvHV (PL_hintgv);
1179 svf [7] = PL_diehook;
1180 svf [8] = PL_warnhook;
1181 assert (9 == sizeof (svf) / sizeof (*svf));
1182
1183 load_perl (aTHX_ current);
1184 }
1185
1186 {
1187 unsigned int i;
1188
1189 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i)
1190 SvREFCNT_dec (svf [i]);
1191
935 SvREFCNT_dec (coro->saved_deffh); 1192 SvREFCNT_dec (coro->saved_deffh);
936 SvREFCNT_dec (coro->rouse_cb); 1193 SvREFCNT_dec (coro->rouse_cb);
937 1194 SvREFCNT_dec (coro->invoke_cb);
938 coro_destruct_stacks (aTHX); 1195 SvREFCNT_dec (coro->invoke_av);
1196 }
939} 1197}
940 1198
941INLINE void 1199INLINE void
942free_coro_mortal (pTHX) 1200free_coro_mortal (pTHX)
943{ 1201{
… …
951static int 1209static int
952runops_trace (pTHX) 1210runops_trace (pTHX)
953{ 1211{
954 COP *oldcop = 0; 1212 COP *oldcop = 0;
955 int oldcxix = -2; 1213 int oldcxix = -2;
956 struct coro *coro = SvSTATE_current; /* trace cctx is tied to specific coro */
957 coro_cctx *cctx = coro->cctx;
958 1214
959 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX))) 1215 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX)))
960 { 1216 {
961 PERL_ASYNC_CHECK (); 1217 PERL_ASYNC_CHECK ();
962 1218
963 if (cctx->flags & CC_TRACE_ALL) 1219 if (cctx_current->flags & CC_TRACE_ALL)
964 { 1220 {
965 if (PL_op->op_type == OP_LEAVESUB && cctx->flags & CC_TRACE_SUB) 1221 if (PL_op->op_type == OP_LEAVESUB && cctx_current->flags & CC_TRACE_SUB)
966 { 1222 {
967 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1223 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
968 SV **bot, **top; 1224 SV **bot, **top;
969 AV *av = newAV (); /* return values */ 1225 AV *av = newAV (); /* return values */
970 SV **cb; 1226 SV **cb;
… …
1007 1263
1008 if (PL_curcop != &PL_compiling) 1264 if (PL_curcop != &PL_compiling)
1009 { 1265 {
1010 SV **cb; 1266 SV **cb;
1011 1267
1012 if (oldcxix != cxstack_ix && cctx->flags & CC_TRACE_SUB) 1268 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB)
1013 { 1269 {
1014 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1270 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1015 1271
1016 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1272 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1017 { 1273 {
1018 runops_proc_t old_runops = PL_runops;
1019 dSP; 1274 dSP;
1020 GV *gv = CvGV (cx->blk_sub.cv); 1275 GV *gv = CvGV (cx->blk_sub.cv);
1021 SV *fullname = sv_2mortal (newSV (0)); 1276 SV *fullname = sv_2mortal (newSV (0));
1022 1277
1023 if (isGV (gv)) 1278 if (isGV (gv))
… …
1041 } 1296 }
1042 1297
1043 oldcxix = cxstack_ix; 1298 oldcxix = cxstack_ix;
1044 } 1299 }
1045 1300
1046 if (cctx->flags & CC_TRACE_LINE) 1301 if (cctx_current->flags & CC_TRACE_LINE)
1047 { 1302 {
1048 dSP; 1303 dSP;
1049 1304
1050 PL_runops = RUNOPS_DEFAULT; 1305 PL_runops = RUNOPS_DEFAULT;
1051 ENTER; 1306 ENTER;
… …
1070 1325
1071 TAINT_NOT; 1326 TAINT_NOT;
1072 return 0; 1327 return 0;
1073} 1328}
1074 1329
1075static struct coro_cctx *cctx_ssl_cctx;
1076static struct CoroSLF cctx_ssl_frame; 1330static struct CoroSLF cctx_ssl_frame;
1077 1331
1078static void 1332static void
1079slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta) 1333slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta)
1080{ 1334{
1081 ta->prev = (struct coro *)cctx_ssl_cctx;
1082 ta->next = 0; 1335 ta->prev = 0;
1083} 1336}
1084 1337
1085static int 1338static int
1086slf_check_set_stacklevel (pTHX_ struct CoroSLF *frame) 1339slf_check_set_stacklevel (pTHX_ struct CoroSLF *frame)
1087{ 1340{
… …
1090 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1343 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1091} 1344}
1092 1345
1093/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1346/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1094static void NOINLINE 1347static void NOINLINE
1095cctx_prepare (pTHX_ coro_cctx *cctx) 1348cctx_prepare (pTHX)
1096{ 1349{
1097 PL_top_env = &PL_start_env; 1350 PL_top_env = &PL_start_env;
1098 1351
1099 if (cctx->flags & CC_TRACE) 1352 if (cctx_current->flags & CC_TRACE)
1100 PL_runops = runops_trace; 1353 PL_runops = runops_trace;
1101 1354
1102 /* we already must be executing an SLF op, there is no other valid way 1355 /* we already must be executing an SLF op, there is no other valid way
1103 * that can lead to creation of a new cctx */ 1356 * that can lead to creation of a new cctx */
1104 assert (("FATAL: can't prepare slf-less cctx in Coro module (please report)", 1357 assert (("FATAL: can't prepare slf-less cctx in Coro module (please report)",
1105 slf_frame.prepare && PL_op->op_ppaddr == pp_slf)); 1358 slf_frame.prepare && PL_op->op_ppaddr == pp_slf));
1106 1359
1107 /* we must emulate leaving pp_slf, which is done inside slf_check_set_stacklevel */ 1360 /* we must emulate leaving pp_slf, which is done inside slf_check_set_stacklevel */
1108 cctx_ssl_cctx = cctx;
1109 cctx_ssl_frame = slf_frame; 1361 cctx_ssl_frame = slf_frame;
1110 1362
1111 slf_frame.prepare = slf_prepare_set_stacklevel; 1363 slf_frame.prepare = slf_prepare_set_stacklevel;
1112 slf_frame.check = slf_check_set_stacklevel; 1364 slf_frame.check = slf_check_set_stacklevel;
1113} 1365}
… …
1136 /* normally we would need to skip the entersub here */ 1388 /* normally we would need to skip the entersub here */
1137 /* not doing so will re-execute it, which is exactly what we want */ 1389 /* not doing so will re-execute it, which is exactly what we want */
1138 /* PL_nop = PL_nop->op_next */ 1390 /* PL_nop = PL_nop->op_next */
1139 1391
1140 /* inject a fake subroutine call to cctx_init */ 1392 /* inject a fake subroutine call to cctx_init */
1141 cctx_prepare (aTHX_ (coro_cctx *)arg); 1393 cctx_prepare (aTHX);
1142 1394
1143 /* cctx_run is the alternative tail of transfer() */ 1395 /* cctx_run is the alternative tail of transfer() */
1144 transfer_tail (aTHX); 1396 transfer_tail (aTHX);
1145 1397
1146 /* somebody or something will hit me for both perl_run and PL_restartop */ 1398 /* somebody or something will hit me for both perl_run and PL_restartop */
1147 PL_restartop = PL_op; 1399 PL_restartop = PL_op;
1148 perl_run (PL_curinterp); 1400 perl_run (PL_curinterp);
1149 /* 1401 /*
1150 * Unfortunately, there is no way to get at the return values of the 1402 * Unfortunately, there is no way to get at the return values of the
1151 * coro body here, as perl_run destroys these 1403 * coro body here, as perl_run destroys these. Likewise, we cannot catch
1404 * runtime errors here, as this is just a random interpreter, not a thread.
1152 */ 1405 */
1153 1406
1154 /* 1407 /*
1155 * If perl-run returns we assume exit() was being called or the coro 1408 * If perl-run returns we assume exit() was being called or the coro
1156 * fell off the end, which seems to be the only valid (non-bug) 1409 * fell off the end, which seems to be the only valid (non-bug)
1157 * reason for perl_run to return. We try to exit by jumping to the 1410 * reason for perl_run to return. We try to exit by jumping to the
1158 * bootstrap-time "top" top_env, as we cannot restore the "main" 1411 * bootstrap-time "top" top_env, as we cannot restore the "main"
1159 * coroutine as Coro has no such concept 1412 * coroutine as Coro has no such concept.
1413 * This actually isn't valid with the pthread backend, but OSes requiring
1414 * that backend are too broken to do it in a standards-compliant way.
1160 */ 1415 */
1161 PL_top_env = main_top_env; 1416 PL_top_env = main_top_env;
1162 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */ 1417 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1163 } 1418 }
1164} 1419}
… …
1241cctx_destroy (coro_cctx *cctx) 1496cctx_destroy (coro_cctx *cctx)
1242{ 1497{
1243 if (!cctx) 1498 if (!cctx)
1244 return; 1499 return;
1245 1500
1501 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary?
1502
1246 --cctx_count; 1503 --cctx_count;
1247 coro_destroy (&cctx->cctx); 1504 coro_destroy (&cctx->cctx);
1248 1505
1249 /* coro_transfer creates new, empty cctx's */ 1506 /* coro_transfer creates new, empty cctx's */
1250 if (cctx->sptr) 1507 if (cctx->sptr)
… …
1313 /* TODO: throwing up here is considered harmful */ 1570 /* TODO: throwing up here is considered harmful */
1314 1571
1315 if (expect_true (prev != next)) 1572 if (expect_true (prev != next))
1316 { 1573 {
1317 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1574 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1318 croak ("Coro::State::transfer called with non-running/new prev Coro::State, but can only transfer from running or new states,"); 1575 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1319 1576
1320 if (expect_false (next->flags & CF_RUNNING))
1321 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states,");
1322
1323 if (expect_false (next->flags & CF_DESTROYED)) 1577 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED)))
1324 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states,"); 1578 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1325 1579
1326#if !PERL_VERSION_ATLEAST (5,10,0) 1580#if !PERL_VERSION_ATLEAST (5,10,0)
1327 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1581 if (expect_false (PL_lex_state != LEX_NOTPARSING))
1328 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,"); 1582 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1329#endif 1583#endif
… …
1335transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1589transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1336{ 1590{
1337 dSTACKLEVEL; 1591 dSTACKLEVEL;
1338 1592
1339 /* sometimes transfer is only called to set idle_sp */ 1593 /* sometimes transfer is only called to set idle_sp */
1340 if (expect_false (!next)) 1594 if (expect_false (!prev))
1341 { 1595 {
1342 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1596 cctx_current->idle_sp = STACKLEVEL;
1343 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1597 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1344 } 1598 }
1345 else if (expect_true (prev != next)) 1599 else if (expect_true (prev != next))
1346 { 1600 {
1347 coro_cctx *prev__cctx; 1601 coro_cctx *cctx_prev;
1348 1602
1349 if (expect_false (prev->flags & CF_NEW)) 1603 if (expect_false (prev->flags & CF_NEW))
1350 { 1604 {
1351 /* create a new empty/source context */ 1605 /* create a new empty/source context */
1352 prev->cctx = cctx_new_empty ();
1353 prev->flags &= ~CF_NEW; 1606 prev->flags &= ~CF_NEW;
1354 prev->flags |= CF_RUNNING; 1607 prev->flags |= CF_RUNNING;
1355 } 1608 }
1356 1609
1357 prev->flags &= ~CF_RUNNING; 1610 prev->flags &= ~CF_RUNNING;
… …
1363 if (expect_false (next->flags & CF_NEW)) 1616 if (expect_false (next->flags & CF_NEW))
1364 { 1617 {
1365 /* need to start coroutine */ 1618 /* need to start coroutine */
1366 next->flags &= ~CF_NEW; 1619 next->flags &= ~CF_NEW;
1367 /* setup coroutine call */ 1620 /* setup coroutine call */
1368 coro_setup (aTHX_ next); 1621 init_perl (aTHX_ next);
1369 } 1622 }
1370 else 1623 else
1371 load_perl (aTHX_ next); 1624 load_perl (aTHX_ next);
1372 1625
1373 prev__cctx = prev->cctx;
1374
1375 /* possibly untie and reuse the cctx */ 1626 /* possibly untie and reuse the cctx */
1376 if (expect_true ( 1627 if (expect_true (
1377 prev__cctx->idle_sp == STACKLEVEL 1628 cctx_current->idle_sp == STACKLEVEL
1378 && !(prev__cctx->flags & CC_TRACE) 1629 && !(cctx_current->flags & CC_TRACE)
1379 && !force_cctx 1630 && !force_cctx
1380 )) 1631 ))
1381 { 1632 {
1382 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1633 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */
1383 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == prev__cctx->idle_te)); 1634 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1384 1635
1385 prev->cctx = 0;
1386
1387 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */ 1636 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */
1388 /* without this the next cctx_get might destroy the prev__cctx while still in use */ 1637 /* without this the next cctx_get might destroy the running cctx while still in use */
1389 if (expect_false (CCTX_EXPIRED (prev__cctx))) 1638 if (expect_false (CCTX_EXPIRED (cctx_current)))
1390 if (!next->cctx) 1639 if (expect_true (!next->cctx))
1391 next->cctx = cctx_get (aTHX); 1640 next->cctx = cctx_get (aTHX);
1392 1641
1393 cctx_put (prev__cctx); 1642 cctx_put (cctx_current);
1394 } 1643 }
1644 else
1645 prev->cctx = cctx_current;
1395 1646
1396 ++next->usecount; 1647 ++next->usecount;
1397 1648
1398 if (expect_true (!next->cctx)) 1649 cctx_prev = cctx_current;
1399 next->cctx = cctx_get (aTHX); 1650 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1400 1651
1401 if (expect_false (prev__cctx != next->cctx)) 1652 next->cctx = 0;
1653
1654 if (expect_false (cctx_prev != cctx_current))
1402 { 1655 {
1403 prev__cctx->top_env = PL_top_env; 1656 cctx_prev->top_env = PL_top_env;
1404 PL_top_env = next->cctx->top_env; 1657 PL_top_env = cctx_current->top_env;
1405 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1658 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1406 } 1659 }
1407 1660
1408 transfer_tail (aTHX); 1661 transfer_tail (aTHX);
1409 } 1662 }
1410} 1663}
… …
1418coro_state_destroy (pTHX_ struct coro *coro) 1671coro_state_destroy (pTHX_ struct coro *coro)
1419{ 1672{
1420 if (coro->flags & CF_DESTROYED) 1673 if (coro->flags & CF_DESTROYED)
1421 return 0; 1674 return 0;
1422 1675
1423 if (coro->on_destroy) 1676 if (coro->on_destroy && !PL_dirty)
1424 coro->on_destroy (aTHX_ coro); 1677 coro->on_destroy (aTHX_ coro);
1425 1678
1426 coro->flags |= CF_DESTROYED; 1679 coro->flags |= CF_DESTROYED;
1427 1680
1428 if (coro->flags & CF_READY) 1681 if (coro->flags & CF_READY)
… …
1432 --coro_nready; 1685 --coro_nready;
1433 } 1686 }
1434 else 1687 else
1435 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1688 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1436 1689
1437 if (coro->mainstack && coro->mainstack != main_mainstack) 1690 if (coro->mainstack
1438 { 1691 && coro->mainstack != main_mainstack
1439 struct coro temp; 1692 && coro->slot
1440 1693 && !PL_dirty)
1441 assert (("FATAL: tried to destroy currently running coroutine (please report)", !(coro->flags & CF_RUNNING)));
1442
1443 save_perl (aTHX_ &temp);
1444 load_perl (aTHX_ coro); 1694 destroy_perl (aTHX_ coro);
1445 1695
1446 coro_destruct (aTHX_ coro); 1696 if (coro->next) coro->next->prev = coro->prev;
1447 1697 if (coro->prev) coro->prev->next = coro->next;
1448 load_perl (aTHX_ &temp); 1698 if (coro == coro_first) coro_first = coro->next;
1449
1450 coro->slot = 0;
1451 }
1452 1699
1453 cctx_destroy (coro->cctx); 1700 cctx_destroy (coro->cctx);
1454 SvREFCNT_dec (coro->startcv); 1701 SvREFCNT_dec (coro->startcv);
1455 SvREFCNT_dec (coro->args); 1702 SvREFCNT_dec (coro->args);
1703 SvREFCNT_dec (coro->swap_sv);
1456 SvREFCNT_dec (CORO_THROW); 1704 SvREFCNT_dec (CORO_THROW);
1457
1458 if (coro->next) coro->next->prev = coro->prev;
1459 if (coro->prev) coro->prev->next = coro->next;
1460 if (coro == coro_first) coro_first = coro->next;
1461 1705
1462 return 1; 1706 return 1;
1463} 1707}
1464 1708
1465static int 1709static int
… …
1515 1759
1516 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1760 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1517 TRANSFER (ta, 1); 1761 TRANSFER (ta, 1);
1518} 1762}
1519 1763
1520/*****************************************************************************/
1521/* gensub: simple closure generation utility */
1522
1523#define GENSUB_ARG CvXSUBANY (cv).any_ptr
1524
1525/* create a closure from XS, returns a code reference */
1526/* the arg can be accessed via GENSUB_ARG from the callback */
1527/* the callback must use dXSARGS/XSRETURN */
1528static SV *
1529gensub (pTHX_ void (*xsub)(pTHX_ CV *), void *arg)
1530{
1531 CV *cv = (CV *)newSV (0);
1532
1533 sv_upgrade ((SV *)cv, SVt_PVCV);
1534
1535 CvANON_on (cv);
1536 CvISXSUB_on (cv);
1537 CvXSUB (cv) = xsub;
1538 GENSUB_ARG = arg;
1539
1540 return newRV_noinc ((SV *)cv);
1541}
1542
1543/** Coro ********************************************************************/ 1764/** Coro ********************************************************************/
1544 1765
1545INLINE void 1766INLINE void
1546coro_enq (pTHX_ struct coro *coro) 1767coro_enq (pTHX_ struct coro *coro)
1547{ 1768{
1548 av_push (coro_ready [coro->prio - PRIO_MIN], SvREFCNT_inc_NN (coro->hv)); 1769 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1549}
1550 1770
1551INLINE SV * 1771 SvREFCNT_inc_NN (coro->hv);
1772
1773 coro->next_ready = 0;
1774 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1775 ready [1] = coro;
1776}
1777
1778INLINE struct coro *
1552coro_deq (pTHX) 1779coro_deq (pTHX)
1553{ 1780{
1554 int prio; 1781 int prio;
1555 1782
1556 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; ) 1783 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
1557 if (AvFILLp (coro_ready [prio]) >= 0) 1784 {
1558 return av_shift (coro_ready [prio]); 1785 struct coro **ready = coro_ready [prio];
1786
1787 if (ready [0])
1788 {
1789 struct coro *coro = ready [0];
1790 ready [0] = coro->next_ready;
1791 return coro;
1792 }
1793 }
1559 1794
1560 return 0; 1795 return 0;
1796}
1797
1798static void
1799invoke_sv_ready_hook_helper (void)
1800{
1801 dTHX;
1802 dSP;
1803
1804 ENTER;
1805 SAVETMPS;
1806
1807 PUSHMARK (SP);
1808 PUTBACK;
1809 call_sv (coro_readyhook, G_VOID | G_DISCARD);
1810
1811 FREETMPS;
1812 LEAVE;
1561} 1813}
1562 1814
1563static int 1815static int
1564api_ready (pTHX_ SV *coro_sv) 1816api_ready (pTHX_ SV *coro_sv)
1565{ 1817{
1566 struct coro *coro;
1567 SV *sv_hook;
1568 void (*xs_hook)(void);
1569
1570 if (SvROK (coro_sv))
1571 coro_sv = SvRV (coro_sv);
1572
1573 coro = SvSTATE (coro_sv); 1818 struct coro *coro = SvSTATE (coro_sv);
1574 1819
1575 if (coro->flags & CF_READY) 1820 if (coro->flags & CF_READY)
1576 return 0; 1821 return 0;
1577 1822
1578 coro->flags |= CF_READY; 1823 coro->flags |= CF_READY;
1579 1824
1580 sv_hook = coro_nready ? 0 : coro_readyhook;
1581 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1582
1583 coro_enq (aTHX_ coro); 1825 coro_enq (aTHX_ coro);
1584 ++coro_nready;
1585 1826
1586 if (sv_hook) 1827 if (!coro_nready++)
1587 { 1828 if (coroapi.readyhook)
1588 dSP; 1829 coroapi.readyhook ();
1589
1590 ENTER;
1591 SAVETMPS;
1592
1593 PUSHMARK (SP);
1594 PUTBACK;
1595 call_sv (sv_hook, G_VOID | G_DISCARD);
1596
1597 FREETMPS;
1598 LEAVE;
1599 }
1600
1601 if (xs_hook)
1602 xs_hook ();
1603 1830
1604 return 1; 1831 return 1;
1605} 1832}
1606 1833
1607static int 1834static int
1608api_is_ready (pTHX_ SV *coro_sv) 1835api_is_ready (pTHX_ SV *coro_sv)
1609{ 1836{
1610 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1837 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1611} 1838}
1612 1839
1840/* expects to own a reference to next->hv */
1613INLINE void 1841INLINE void
1614prepare_schedule (pTHX_ struct coro_transfer_args *ta) 1842prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1615{ 1843{
1616 SV *prev_sv, *next_sv;
1617
1618 for (;;)
1619 {
1620 next_sv = coro_deq (aTHX);
1621
1622 /* nothing to schedule: call the idle handler */
1623 if (expect_false (!next_sv))
1624 {
1625 dSP;
1626
1627 ENTER;
1628 SAVETMPS;
1629
1630 PUSHMARK (SP);
1631 PUTBACK;
1632 call_sv (get_sv ("Coro::idle", FALSE), G_VOID | G_DISCARD);
1633
1634 FREETMPS;
1635 LEAVE;
1636 continue;
1637 }
1638
1639 ta->next = SvSTATE_hv (next_sv);
1640
1641 /* cannot transfer to destroyed coros, skip and look for next */
1642 if (expect_false (ta->next->flags & CF_DESTROYED))
1643 {
1644 SvREFCNT_dec (next_sv);
1645 /* coro_nready has already been taken care of by destroy */
1646 continue;
1647 }
1648
1649 --coro_nready;
1650 break;
1651 }
1652
1653 /* free this only after the transfer */
1654 prev_sv = SvRV (coro_current); 1844 SV *prev_sv = SvRV (coro_current);
1845
1655 ta->prev = SvSTATE_hv (prev_sv); 1846 ta->prev = SvSTATE_hv (prev_sv);
1847 ta->next = next;
1848
1656 TRANSFER_CHECK (*ta); 1849 TRANSFER_CHECK (*ta);
1657 assert (("FATAL: next coroutine isn't marked as ready in Coro (please report)", ta->next->flags & CF_READY)); 1850
1658 ta->next->flags &= ~CF_READY;
1659 SvRV_set (coro_current, next_sv); 1851 SvRV_set (coro_current, (SV *)next->hv);
1660 1852
1661 free_coro_mortal (aTHX); 1853 free_coro_mortal (aTHX);
1662 coro_mortal = prev_sv; 1854 coro_mortal = prev_sv;
1663} 1855}
1664 1856
1857static void
1858prepare_schedule (pTHX_ struct coro_transfer_args *ta)
1859{
1860 for (;;)
1861 {
1862 struct coro *next = coro_deq (aTHX);
1863
1864 if (expect_true (next))
1865 {
1866 /* cannot transfer to destroyed coros, skip and look for next */
1867 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED)))
1868 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1869 else
1870 {
1871 next->flags &= ~CF_READY;
1872 --coro_nready;
1873
1874 prepare_schedule_to (aTHX_ ta, next);
1875 break;
1876 }
1877 }
1878 else
1879 {
1880 /* nothing to schedule: call the idle handler */
1881 if (SvROK (sv_idle)
1882 && SvOBJECT (SvRV (sv_idle)))
1883 {
1884 if (SvRV (sv_idle) == SvRV (coro_current))
1885 croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught");
1886
1887 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1888 api_ready (aTHX_ SvRV (sv_idle));
1889 --coro_nready;
1890 }
1891 else
1892 {
1893 /* TODO: deprecated, remove, cannot work reliably *//*D*/
1894 dSP;
1895
1896 ENTER;
1897 SAVETMPS;
1898
1899 PUSHMARK (SP);
1900 PUTBACK;
1901 call_sv (sv_idle, G_VOID | G_DISCARD);
1902
1903 FREETMPS;
1904 LEAVE;
1905 }
1906 }
1907 }
1908}
1909
1665INLINE void 1910INLINE void
1666prepare_cede (pTHX_ struct coro_transfer_args *ta) 1911prepare_cede (pTHX_ struct coro_transfer_args *ta)
1667{ 1912{
1668 api_ready (aTHX_ coro_current); 1913 api_ready (aTHX_ coro_current);
1669 prepare_schedule (aTHX_ ta); 1914 prepare_schedule (aTHX_ ta);
… …
1688{ 1933{
1689 struct coro_transfer_args ta; 1934 struct coro_transfer_args ta;
1690 1935
1691 prepare_schedule (aTHX_ &ta); 1936 prepare_schedule (aTHX_ &ta);
1692 TRANSFER (ta, 1); 1937 TRANSFER (ta, 1);
1938}
1939
1940static void
1941api_schedule_to (pTHX_ SV *coro_sv)
1942{
1943 struct coro_transfer_args ta;
1944 struct coro *next = SvSTATE (coro_sv);
1945
1946 SvREFCNT_inc_NN (coro_sv);
1947 prepare_schedule_to (aTHX_ &ta, next);
1693} 1948}
1694 1949
1695static int 1950static int
1696api_cede (pTHX) 1951api_cede (pTHX)
1697{ 1952{
… …
1726static void 1981static void
1727api_trace (pTHX_ SV *coro_sv, int flags) 1982api_trace (pTHX_ SV *coro_sv, int flags)
1728{ 1983{
1729 struct coro *coro = SvSTATE (coro_sv); 1984 struct coro *coro = SvSTATE (coro_sv);
1730 1985
1986 if (coro->flags & CF_RUNNING)
1987 croak ("cannot enable tracing on a running coroutine, caught");
1988
1731 if (flags & CC_TRACE) 1989 if (flags & CC_TRACE)
1732 { 1990 {
1733 if (!coro->cctx) 1991 if (!coro->cctx)
1734 coro->cctx = cctx_new_run (); 1992 coro->cctx = cctx_new_run ();
1735 else if (!(coro->cctx->flags & CC_TRACE)) 1993 else if (!(coro->cctx->flags & CC_TRACE))
1736 croak ("cannot enable tracing on coroutine with custom stack,"); 1994 croak ("cannot enable tracing on coroutine with custom stack, caught");
1737 1995
1738 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL)); 1996 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL));
1739 } 1997 }
1740 else if (coro->cctx && coro->cctx->flags & CC_TRACE) 1998 else if (coro->cctx && coro->cctx->flags & CC_TRACE)
1741 { 1999 {
… …
1746 else 2004 else
1747 coro->slot->runops = RUNOPS_DEFAULT; 2005 coro->slot->runops = RUNOPS_DEFAULT;
1748 } 2006 }
1749} 2007}
1750 2008
2009static void
2010coro_call_on_destroy (pTHX_ struct coro *coro)
2011{
2012 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0);
2013 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
2014
2015 if (on_destroyp)
2016 {
2017 AV *on_destroy = (AV *)SvRV (*on_destroyp);
2018
2019 while (AvFILLp (on_destroy) >= 0)
2020 {
2021 dSP; /* don't disturb outer sp */
2022 SV *cb = av_pop (on_destroy);
2023
2024 PUSHMARK (SP);
2025
2026 if (statusp)
2027 {
2028 int i;
2029 AV *status = (AV *)SvRV (*statusp);
2030 EXTEND (SP, AvFILLp (status) + 1);
2031
2032 for (i = 0; i <= AvFILLp (status); ++i)
2033 PUSHs (AvARRAY (status)[i]);
2034 }
2035
2036 PUTBACK;
2037 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD);
2038 }
2039 }
2040}
2041
2042static void
2043slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2044{
2045 int i;
2046 HV *hv = (HV *)SvRV (coro_current);
2047 AV *av = newAV ();
2048
2049 /* items are actually not so common, so optimise for this case */
2050 if (items)
2051 {
2052 av_extend (av, items - 1);
2053
2054 for (i = 0; i < items; ++i)
2055 av_push (av, SvREFCNT_inc_NN (arg [i]));
2056 }
2057
2058 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0);
2059
2060 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */
2061 api_ready (aTHX_ sv_manager);
2062
2063 frame->prepare = prepare_schedule;
2064 frame->check = slf_check_repeat;
2065
2066 /* as a minor optimisation, we could unwind all stacks here */
2067 /* but that puts extra pressure on pp_slf, and is not worth much */
2068 /*coro_unwind_stacks (aTHX);*/
2069}
2070
2071/*****************************************************************************/
2072/* async pool handler */
2073
2074static int
2075slf_check_pool_handler (pTHX_ struct CoroSLF *frame)
2076{
2077 HV *hv = (HV *)SvRV (coro_current);
2078 struct coro *coro = (struct coro *)frame->data;
2079
2080 if (!coro->invoke_cb)
2081 return 1; /* loop till we have invoke */
2082 else
2083 {
2084 hv_store (hv, "desc", sizeof ("desc") - 1,
2085 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
2086
2087 coro->saved_deffh = SvREFCNT_inc_NN ((SV *)PL_defoutgv);
2088
2089 {
2090 dSP;
2091 XPUSHs (sv_2mortal (coro->invoke_cb)); coro->invoke_cb = 0;
2092 PUTBACK;
2093 }
2094
2095 SvREFCNT_dec (GvAV (PL_defgv));
2096 GvAV (PL_defgv) = coro->invoke_av;
2097 coro->invoke_av = 0;
2098
2099 return 0;
2100 }
2101}
2102
2103static void
2104slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2105{
2106 HV *hv = (HV *)SvRV (coro_current);
2107 struct coro *coro = SvSTATE_hv ((SV *)hv);
2108
2109 if (expect_true (coro->saved_deffh))
2110 {
2111 /* subsequent iteration */
2112 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
2113 coro->saved_deffh = 0;
2114
2115 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
2116 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
2117 {
2118 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate);
2119 coro->invoke_av = newAV ();
2120
2121 frame->prepare = prepare_nop;
2122 }
2123 else
2124 {
2125 av_clear (GvAV (PL_defgv));
2126 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
2127
2128 coro->prio = 0;
2129
2130 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
2131 api_trace (aTHX_ coro_current, 0);
2132
2133 frame->prepare = prepare_schedule;
2134 av_push (av_async_pool, SvREFCNT_inc (hv));
2135 }
2136 }
2137 else
2138 {
2139 /* first iteration, simply fall through */
2140 frame->prepare = prepare_nop;
2141 }
2142
2143 frame->check = slf_check_pool_handler;
2144 frame->data = (void *)coro;
2145}
2146
1751/*****************************************************************************/ 2147/*****************************************************************************/
1752/* rouse callback */ 2148/* rouse callback */
1753 2149
1754#define CORO_MAGIC_type_rouse PERL_MAGIC_ext 2150#define CORO_MAGIC_type_rouse PERL_MAGIC_ext
1755 2151
1756static void 2152static void
1757coro_rouse_callback (pTHX_ CV *cv) 2153coro_rouse_callback (pTHX_ CV *cv)
1758{ 2154{
1759 dXSARGS; 2155 dXSARGS;
1760 SV *data = (SV *)GENSUB_ARG; 2156 SV *data = (SV *)S_GENSUB_ARG;
1761 2157
1762 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2158 if (SvTYPE (SvRV (data)) != SVt_PVAV)
1763 { 2159 {
1764 /* first call, set args */ 2160 /* first call, set args */
1765 int i; 2161 SV *coro = SvRV (data);
1766 AV *av = newAV (); 2162 AV *av = newAV ();
1767 SV *coro = SvRV (data);
1768 2163
1769 SvRV_set (data, (SV *)av); 2164 SvRV_set (data, (SV *)av);
1770 api_ready (aTHX_ coro);
1771 SvREFCNT_dec (coro);
1772 2165
1773 /* better take a full copy of the arguments */ 2166 /* better take a full copy of the arguments */
1774 while (items--) 2167 while (items--)
1775 av_store (av, items, newSVsv (ST (items))); 2168 av_store (av, items, newSVsv (ST (items)));
2169
2170 api_ready (aTHX_ coro);
2171 SvREFCNT_dec (coro);
1776 } 2172 }
1777 2173
1778 XSRETURN_EMPTY; 2174 XSRETURN_EMPTY;
1779} 2175}
1780 2176
… …
1797 2193
1798 EXTEND (SP, AvFILLp (av) + 1); 2194 EXTEND (SP, AvFILLp (av) + 1);
1799 for (i = 0; i <= AvFILLp (av); ++i) 2195 for (i = 0; i <= AvFILLp (av); ++i)
1800 PUSHs (sv_2mortal (AvARRAY (av)[i])); 2196 PUSHs (sv_2mortal (AvARRAY (av)[i]));
1801 2197
1802 /* we have stolen the elements, so ste length to zero and free */ 2198 /* we have stolen the elements, so set length to zero and free */
1803 AvFILLp (av) = -1; 2199 AvFILLp (av) = -1;
1804 av_undef (av); 2200 av_undef (av);
1805 2201
1806 PUTBACK; 2202 PUTBACK;
1807 } 2203 }
… …
1831 || SvTYPE (SvRV (cb)) != SVt_PVCV 2227 || SvTYPE (SvRV (cb)) != SVt_PVCV
1832 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2228 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
1833 croak ("Coro::rouse_wait called with illegal callback argument,"); 2229 croak ("Coro::rouse_wait called with illegal callback argument,");
1834 2230
1835 { 2231 {
1836 CV *cv = (CV *)SvRV (cb); /* for GENSUB_ARG */ 2232 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
1837 SV *data = (SV *)GENSUB_ARG; 2233 SV *data = (SV *)S_GENSUB_ARG;
1838 2234
1839 frame->data = (void *)data; 2235 frame->data = (void *)data;
1840 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule; 2236 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
1841 frame->check = slf_check_rouse_wait; 2237 frame->check = slf_check_rouse_wait;
1842 } 2238 }
… …
1846coro_new_rouse_cb (pTHX) 2242coro_new_rouse_cb (pTHX)
1847{ 2243{
1848 HV *hv = (HV *)SvRV (coro_current); 2244 HV *hv = (HV *)SvRV (coro_current);
1849 struct coro *coro = SvSTATE_hv (hv); 2245 struct coro *coro = SvSTATE_hv (hv);
1850 SV *data = newRV_inc ((SV *)hv); 2246 SV *data = newRV_inc ((SV *)hv);
1851 SV *cb = gensub (aTHX_ coro_rouse_callback, (void *)data); 2247 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
1852 2248
1853 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0); 2249 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0);
1854 SvREFCNT_dec (data); /* magicext increases the refcount */ 2250 SvREFCNT_dec (data); /* magicext increases the refcount */
1855 2251
1856 SvREFCNT_dec (coro->rouse_cb); 2252 SvREFCNT_dec (coro->rouse_cb);
… …
1911static void 2307static void
1912slf_init_schedule (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2308slf_init_schedule (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1913{ 2309{
1914 frame->prepare = prepare_schedule; 2310 frame->prepare = prepare_schedule;
1915 frame->check = slf_check_nop; 2311 frame->check = slf_check_nop;
2312}
2313
2314static void
2315slf_prepare_schedule_to (pTHX_ struct coro_transfer_args *ta)
2316{
2317 struct coro *next = (struct coro *)slf_frame.data;
2318
2319 SvREFCNT_inc_NN (next->hv);
2320 prepare_schedule_to (aTHX_ ta, next);
2321}
2322
2323static void
2324slf_init_schedule_to (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2325{
2326 if (!items)
2327 croak ("Coro::schedule_to expects a coroutine argument, caught");
2328
2329 frame->data = (void *)SvSTATE (arg [0]);
2330 frame->prepare = slf_prepare_schedule_to;
2331 frame->check = slf_check_nop;
2332}
2333
2334static void
2335slf_init_cede_to (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2336{
2337 api_ready (aTHX_ SvRV (coro_current));
2338
2339 slf_init_schedule_to (aTHX_ frame, cv, arg, items);
1916} 2340}
1917 2341
1918static void 2342static void
1919slf_init_cede (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2343slf_init_cede (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1920{ 2344{
… …
2053 if (PL_op->op_flags & OPf_STACKED) 2477 if (PL_op->op_flags & OPf_STACKED)
2054 { 2478 {
2055 if (items > slf_arga) 2479 if (items > slf_arga)
2056 { 2480 {
2057 slf_arga = items; 2481 slf_arga = items;
2058 free (slf_argv); 2482 Safefree (slf_argv);
2059 slf_argv = malloc (slf_arga * sizeof (SV *)); 2483 New (0, slf_argv, slf_arga, SV *);
2060 } 2484 }
2061 2485
2062 slf_argc = items; 2486 slf_argc = items;
2063 2487
2064 for (i = 0; i < items; ++i) 2488 for (i = 0; i < items; ++i)
… …
2066 } 2490 }
2067 else 2491 else
2068 slf_argc = 0; 2492 slf_argc = 0;
2069 2493
2070 PL_op->op_ppaddr = pp_slf; 2494 PL_op->op_ppaddr = pp_slf;
2071 PL_op->op_type = OP_CUSTOM; /* maybe we should leave it at entersub? */ 2495 /*PL_op->op_type = OP_CUSTOM; /* we do behave like entersub still */
2072 2496
2073 PL_op = (OP *)&slf_restore; 2497 PL_op = (OP *)&slf_restore;
2498}
2499
2500/*****************************************************************************/
2501/* dynamic wind */
2502
2503static void
2504on_enterleave_call (pTHX_ SV *cb)
2505{
2506 dSP;
2507
2508 PUSHSTACK;
2509
2510 PUSHMARK (SP);
2511 PUTBACK;
2512 call_sv (cb, G_VOID | G_DISCARD);
2513 SPAGAIN;
2514
2515 POPSTACK;
2516}
2517
2518static SV *
2519coro_avp_pop_and_free (pTHX_ AV **avp)
2520{
2521 AV *av = *avp;
2522 SV *res = av_pop (av);
2523
2524 if (AvFILLp (av) < 0)
2525 {
2526 *avp = 0;
2527 SvREFCNT_dec (av);
2528 }
2529
2530 return res;
2531}
2532
2533static void
2534coro_pop_on_enter (pTHX_ void *coro)
2535{
2536 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_enter);
2537 SvREFCNT_dec (cb);
2538}
2539
2540static void
2541coro_pop_on_leave (pTHX_ void *coro)
2542{
2543 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2544 on_enterleave_call (aTHX_ sv_2mortal (cb));
2074} 2545}
2075 2546
2076/*****************************************************************************/ 2547/*****************************************************************************/
2077/* PerlIO::cede */ 2548/* PerlIO::cede */
2078 2549
… …
2152/* Coro::Semaphore & Coro::Signal */ 2623/* Coro::Semaphore & Coro::Signal */
2153 2624
2154static SV * 2625static SV *
2155coro_waitarray_new (pTHX_ int count) 2626coro_waitarray_new (pTHX_ int count)
2156{ 2627{
2157 /* a semaphore contains a counter IV in $sem->[0] and any waiters after that */ 2628 /* a waitarray=semaphore contains a counter IV in $sem->[0] and any waiters after that */
2158 AV *av = newAV (); 2629 AV *av = newAV ();
2159 SV **ary; 2630 SV **ary;
2160 2631
2161 /* unfortunately, building manually saves memory */ 2632 /* unfortunately, building manually saves memory */
2162 Newx (ary, 2, SV *); 2633 Newx (ary, 2, SV *);
2163 AvALLOC (av) = ary; 2634 AvALLOC (av) = ary;
2635#if PERL_VERSION_ATLEAST (5,10,0)
2164 /*AvARRAY (av) = ary;*/ 2636 AvARRAY (av) = ary;
2637#else
2165 SvPVX ((SV *)av) = (char *)ary; /* 5.8.8 needs this syntax instead of AvARRAY = ary */ 2638 /* 5.8.8 needs this syntax instead of AvARRAY = ary, yet */
2639 /* -DDEBUGGING flags this as a bug, despite it perfectly working */
2640 SvPVX ((SV *)av) = (char *)ary;
2641#endif
2166 AvMAX (av) = 1; 2642 AvMAX (av) = 1;
2167 AvFILLp (av) = 0; 2643 AvFILLp (av) = 0;
2168 ary [0] = newSViv (count); 2644 ary [0] = newSViv (count);
2169 2645
2170 return newRV_noinc ((SV *)av); 2646 return newRV_noinc ((SV *)av);
… …
2299{ 2775{
2300 if (items >= 2) 2776 if (items >= 2)
2301 { 2777 {
2302 /* callback form */ 2778 /* callback form */
2303 AV *av = (AV *)SvRV (arg [0]); 2779 AV *av = (AV *)SvRV (arg [0]);
2304 CV *cb_cv = coro_sv_2cv (arg [1]); 2780 SV *cb_cv = s_get_cv_croak (arg [1]);
2305 2781
2306 av_push (av, (SV *)SvREFCNT_inc_NN (cb_cv)); 2782 av_push (av, SvREFCNT_inc_NN (cb_cv));
2307 2783
2308 if (SvIVX (AvARRAY (av)[0]) > 0) 2784 if (SvIVX (AvARRAY (av)[0]) > 0)
2309 coro_semaphore_adjust (aTHX_ av, 0); 2785 coro_semaphore_adjust (aTHX_ av, 0);
2310 2786
2311 frame->prepare = prepare_nop; 2787 frame->prepare = prepare_nop;
… …
2335 AvARRAY (av)[0] = AvARRAY (av)[1]; 2811 AvARRAY (av)[0] = AvARRAY (av)[1];
2336 AvARRAY (av)[1] = cb; 2812 AvARRAY (av)[1] = cb;
2337 2813
2338 cb = av_shift (av); 2814 cb = av_shift (av);
2339 2815
2816 if (SvTYPE (cb) == SVt_PVCV)
2817 {
2818 dSP;
2819 PUSHMARK (SP);
2820 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2821 PUTBACK;
2822 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2823 }
2824 else
2825 {
2340 api_ready (aTHX_ cb); 2826 api_ready (aTHX_ cb);
2341 sv_setiv (cb, 0); /* signal waiter */ 2827 sv_setiv (cb, 0); /* signal waiter */
2828 }
2829
2342 SvREFCNT_dec (cb); 2830 SvREFCNT_dec (cb);
2343 2831
2344 --count; 2832 --count;
2345 } 2833 }
2346} 2834}
… …
2355static void 2843static void
2356slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2844slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2357{ 2845{
2358 AV *av = (AV *)SvRV (arg [0]); 2846 AV *av = (AV *)SvRV (arg [0]);
2359 2847
2848 if (items >= 2)
2849 {
2850 SV *cb_cv = s_get_cv_croak (arg [1]);
2851 av_push (av, SvREFCNT_inc_NN (cb_cv));
2852
2360 if (SvIVX (AvARRAY (av)[0])) 2853 if (SvIVX (AvARRAY (av)[0]))
2854 coro_signal_wake (aTHX_ av, 1); /* must be the only waiter */
2855
2856 frame->prepare = prepare_nop;
2857 frame->check = slf_check_nop;
2858 }
2859 else if (SvIVX (AvARRAY (av)[0]))
2361 { 2860 {
2362 SvIVX (AvARRAY (av)[0]) = 0; 2861 SvIVX (AvARRAY (av)[0]) = 0;
2363 frame->prepare = prepare_nop; 2862 frame->prepare = prepare_nop;
2364 frame->check = slf_check_nop; 2863 frame->check = slf_check_nop;
2365 } 2864 }
2366 else 2865 else
2367 { 2866 {
2368 SV *waiter = newRV_inc (SvRV (coro_current)); /* owned by signal av */ 2867 SV *waiter = newSVsv (coro_current); /* owned by signal av */
2369 2868
2370 av_push (av, waiter); 2869 av_push (av, waiter);
2371 2870
2372 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */ 2871 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */
2373 frame->prepare = prepare_schedule; 2872 frame->prepare = prepare_schedule;
… …
2391 2890
2392static void 2891static void
2393coro_aio_callback (pTHX_ CV *cv) 2892coro_aio_callback (pTHX_ CV *cv)
2394{ 2893{
2395 dXSARGS; 2894 dXSARGS;
2396 AV *state = (AV *)GENSUB_ARG; 2895 AV *state = (AV *)S_GENSUB_ARG;
2397 SV *coro = av_pop (state); 2896 SV *coro = av_pop (state);
2398 SV *data_sv = newSV (sizeof (struct io_state)); 2897 SV *data_sv = newSV (sizeof (struct io_state));
2399 2898
2400 av_extend (state, items); 2899 av_extend (state, items - 1);
2401 2900
2402 sv_upgrade (data_sv, SVt_PV); 2901 sv_upgrade (data_sv, SVt_PV);
2403 SvCUR_set (data_sv, sizeof (struct io_state)); 2902 SvCUR_set (data_sv, sizeof (struct io_state));
2404 SvPOK_only (data_sv); 2903 SvPOK_only (data_sv);
2405 2904
… …
2515 3014
2516 for (i = 0; i < items; ++i) 3015 for (i = 0; i < items; ++i)
2517 PUSHs (arg [i]); 3016 PUSHs (arg [i]);
2518 3017
2519 /* now push the callback closure */ 3018 /* now push the callback closure */
2520 PUSHs (sv_2mortal (gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state)))); 3019 PUSHs (sv_2mortal (s_gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state))));
2521 3020
2522 /* now call the AIO function - we assume our request is uncancelable */ 3021 /* now call the AIO function - we assume our request is uncancelable */
2523 PUTBACK; 3022 PUTBACK;
2524 call_sv ((SV *)req, G_VOID | G_DISCARD); 3023 call_sv ((SV *)req, G_VOID | G_DISCARD);
2525 } 3024 }
2526 3025
2527 /* now that the requets is going, we loop toll we have a result */ 3026 /* now that the request is going, we loop till we have a result */
2528 frame->data = (void *)state; 3027 frame->data = (void *)state;
2529 frame->prepare = prepare_schedule; 3028 frame->prepare = prepare_schedule;
2530 frame->check = slf_check_aio_req; 3029 frame->check = slf_check_aio_req;
2531} 3030}
2532 3031
… …
2539 3038
2540 XSRETURN_EMPTY; 3039 XSRETURN_EMPTY;
2541} 3040}
2542 3041
2543/*****************************************************************************/ 3042/*****************************************************************************/
3043
3044#if CORO_CLONE
3045# include "clone.c"
3046#endif
3047
3048/*****************************************************************************/
3049
3050static SV *
3051coro_new (pTHX_ HV *stash, SV **argv, int argc, int is_coro)
3052{
3053 SV *coro_sv;
3054 struct coro *coro;
3055 MAGIC *mg;
3056 HV *hv;
3057 SV *cb;
3058 int i;
3059
3060 if (argc > 0)
3061 {
3062 cb = s_get_cv_croak (argv [0]);
3063
3064 if (!is_coro)
3065 {
3066 if (CvISXSUB (cb))
3067 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
3068
3069 if (!CvROOT (cb))
3070 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
3071 }
3072 }
3073
3074 Newz (0, coro, 1, struct coro);
3075 coro->args = newAV ();
3076 coro->flags = CF_NEW;
3077
3078 if (coro_first) coro_first->prev = coro;
3079 coro->next = coro_first;
3080 coro_first = coro;
3081
3082 coro->hv = hv = newHV ();
3083 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
3084 mg->mg_flags |= MGf_DUP;
3085 coro_sv = sv_bless (newRV_noinc ((SV *)hv), stash);
3086
3087 if (argc > 0)
3088 {
3089 av_extend (coro->args, argc + is_coro - 1);
3090
3091 if (is_coro)
3092 {
3093 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
3094 cb = (SV *)cv_coro_run;
3095 }
3096
3097 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3098
3099 for (i = 1; i < argc; i++)
3100 av_push (coro->args, newSVsv (argv [i]));
3101 }
3102
3103 return coro_sv;
3104}
2544 3105
2545MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3106MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2546 3107
2547PROTOTYPES: DISABLE 3108PROTOTYPES: DISABLE
2548 3109
… …
2553 coro_thx = PERL_GET_CONTEXT; 3114 coro_thx = PERL_GET_CONTEXT;
2554# endif 3115# endif
2555#endif 3116#endif
2556 BOOT_PAGESIZE; 3117 BOOT_PAGESIZE;
2557 3118
3119 cctx_current = cctx_new_empty ();
3120
2558 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3121 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
2559 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3122 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
2560 3123
2561 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 3124 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get;
2562 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set; 3125 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set;
… …
2581 3144
2582 { 3145 {
2583 SV *slf = sv_2mortal (newSViv (PTR2IV (pp_slf))); 3146 SV *slf = sv_2mortal (newSViv (PTR2IV (pp_slf)));
2584 3147
2585 if (!PL_custom_op_names) PL_custom_op_names = newHV (); 3148 if (!PL_custom_op_names) PL_custom_op_names = newHV ();
2586 hv_store_ent (PL_custom_op_names, slf, 3149 hv_store_ent (PL_custom_op_names, slf, newSVpv ("coro_slf", 0), 0);
2587 newSVpv ("coro_slf", 0), 0);
2588 3150
2589 if (!PL_custom_op_descs) PL_custom_op_descs = newHV (); 3151 if (!PL_custom_op_descs) PL_custom_op_descs = newHV ();
2590 hv_store_ent (PL_custom_op_descs, slf, 3152 hv_store_ent (PL_custom_op_descs, slf, newSVpv ("coro schedule like function", 0), 0);
2591 newSVpv ("coro schedule like function", 0), 0);
2592 } 3153 }
2593 3154
2594 coroapi.ver = CORO_API_VERSION; 3155 coroapi.ver = CORO_API_VERSION;
2595 coroapi.rev = CORO_API_REVISION; 3156 coroapi.rev = CORO_API_REVISION;
2596 3157
… …
2601 coroapi.prepare_nop = prepare_nop; 3162 coroapi.prepare_nop = prepare_nop;
2602 coroapi.prepare_schedule = prepare_schedule; 3163 coroapi.prepare_schedule = prepare_schedule;
2603 coroapi.prepare_cede = prepare_cede; 3164 coroapi.prepare_cede = prepare_cede;
2604 coroapi.prepare_cede_notself = prepare_cede_notself; 3165 coroapi.prepare_cede_notself = prepare_cede_notself;
2605 3166
2606 { 3167 time_init (aTHX);
2607 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
2608 3168
2609 if (!svp) croak ("Time::HiRes is required");
2610 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
2611
2612 nvtime = INT2PTR (double (*)(), SvIV (*svp));
2613 }
2614
2615 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 3169 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
2616} 3170}
2617 3171
2618SV * 3172SV *
2619new (char *klass, ...) 3173new (SV *klass, ...)
2620 ALIAS: 3174 ALIAS:
2621 Coro::new = 1 3175 Coro::new = 1
2622 CODE: 3176 CODE:
2623{ 3177 RETVAL = coro_new (aTHX_ ix ? coro_stash : coro_state_stash, &ST (1), items - 1, ix);
2624 struct coro *coro; 3178 OUTPUT:
2625 MAGIC *mg;
2626 HV *hv;
2627 CV *cb;
2628 int i;
2629
2630 if (items > 1)
2631 {
2632 cb = coro_sv_2cv (ST (1));
2633
2634 if (!ix)
2635 {
2636 if (CvISXSUB (cb))
2637 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
2638
2639 if (!CvROOT (cb))
2640 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
2641 }
2642 }
2643
2644 Newz (0, coro, 1, struct coro);
2645 coro->args = newAV ();
2646 coro->flags = CF_NEW;
2647
2648 if (coro_first) coro_first->prev = coro;
2649 coro->next = coro_first;
2650 coro_first = coro;
2651
2652 coro->hv = hv = newHV ();
2653 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
2654 mg->mg_flags |= MGf_DUP;
2655 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
2656
2657 if (items > 1)
2658 {
2659 av_extend (coro->args, items - 1 + ix);
2660
2661 if (ix)
2662 {
2663 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
2664 cb = cv_coro_run;
2665 }
2666
2667 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
2668
2669 for (i = 2; i < items; i++)
2670 av_push (coro->args, newSVsv (ST (i)));
2671 }
2672}
2673 OUTPUT:
2674 RETVAL 3179 RETVAL
2675 3180
2676void 3181void
2677transfer (...) 3182transfer (...)
2678 PROTOTYPE: $$ 3183 PROTOTYPE: $$
… …
2689void 3194void
2690_exit (int code) 3195_exit (int code)
2691 PROTOTYPE: $ 3196 PROTOTYPE: $
2692 CODE: 3197 CODE:
2693 _exit (code); 3198 _exit (code);
3199
3200SV *
3201clone (Coro::State coro)
3202 CODE:
3203{
3204#if CORO_CLONE
3205 struct coro *ncoro = coro_clone (aTHX_ coro);
3206 MAGIC *mg;
3207 /* TODO: too much duplication */
3208 ncoro->hv = newHV ();
3209 mg = sv_magicext ((SV *)ncoro->hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)ncoro, 0);
3210 mg->mg_flags |= MGf_DUP;
3211 RETVAL = sv_bless (newRV_noinc ((SV *)ncoro->hv), SvSTASH (coro->hv));
3212#else
3213 croak ("Coro::State->clone has not been configured into this installation of Coro, realised");
3214#endif
3215}
3216 OUTPUT:
3217 RETVAL
2694 3218
2695int 3219int
2696cctx_stacksize (int new_stacksize = 0) 3220cctx_stacksize (int new_stacksize = 0)
2697 PROTOTYPE: ;$ 3221 PROTOTYPE: ;$
2698 CODE: 3222 CODE:
… …
2748 eval = 1 3272 eval = 1
2749 CODE: 3273 CODE:
2750{ 3274{
2751 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3275 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
2752 { 3276 {
2753 struct coro temp; 3277 struct coro *current = SvSTATE_current;
2754 3278
2755 if (!(coro->flags & CF_RUNNING)) 3279 if (current != coro)
2756 { 3280 {
2757 PUTBACK; 3281 PUTBACK;
2758 save_perl (aTHX_ &temp); 3282 save_perl (aTHX_ current);
2759 load_perl (aTHX_ coro); 3283 load_perl (aTHX_ coro);
3284 SPAGAIN;
2760 } 3285 }
2761 3286
2762 {
2763 dSP;
2764 ENTER;
2765 SAVETMPS;
2766 PUTBACK;
2767 PUSHSTACK; 3287 PUSHSTACK;
3288
2768 PUSHMARK (SP); 3289 PUSHMARK (SP);
3290 PUTBACK;
2769 3291
2770 if (ix) 3292 if (ix)
2771 eval_sv (coderef, 0); 3293 eval_sv (coderef, 0);
2772 else 3294 else
2773 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 3295 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
2774 3296
2775 POPSTACK; 3297 POPSTACK;
2776 SPAGAIN; 3298 SPAGAIN;
2777 FREETMPS;
2778 LEAVE;
2779 PUTBACK;
2780 }
2781 3299
2782 if (!(coro->flags & CF_RUNNING)) 3300 if (current != coro)
2783 { 3301 {
3302 PUTBACK;
2784 save_perl (aTHX_ coro); 3303 save_perl (aTHX_ coro);
2785 load_perl (aTHX_ &temp); 3304 load_perl (aTHX_ current);
2786 SPAGAIN; 3305 SPAGAIN;
2787 } 3306 }
2788 } 3307 }
2789} 3308}
2790 3309
… …
2794 ALIAS: 3313 ALIAS:
2795 is_ready = CF_READY 3314 is_ready = CF_READY
2796 is_running = CF_RUNNING 3315 is_running = CF_RUNNING
2797 is_new = CF_NEW 3316 is_new = CF_NEW
2798 is_destroyed = CF_DESTROYED 3317 is_destroyed = CF_DESTROYED
3318 is_suspended = CF_SUSPENDED
2799 CODE: 3319 CODE:
2800 RETVAL = boolSV (coro->flags & ix); 3320 RETVAL = boolSV (coro->flags & ix);
2801 OUTPUT: 3321 OUTPUT:
2802 RETVAL 3322 RETVAL
2803 3323
2804void 3324void
2805throw (Coro::State self, SV *throw = &PL_sv_undef) 3325throw (Coro::State self, SV *exception = &PL_sv_undef)
2806 PROTOTYPE: $;$ 3326 PROTOTYPE: $;$
2807 CODE: 3327 CODE:
2808{ 3328{
2809 struct coro *current = SvSTATE_current; 3329 struct coro *current = SvSTATE_current;
2810 SV **throwp = self == current ? &CORO_THROW : &self->except; 3330 SV **exceptionp = self == current ? &CORO_THROW : &self->except;
2811 SvREFCNT_dec (*throwp); 3331 SvREFCNT_dec (*exceptionp);
2812 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3332 SvGETMAGIC (exception);
3333 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
2813} 3334}
2814 3335
2815void 3336void
2816api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3337api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
2817 PROTOTYPE: $;$ 3338 PROTOTYPE: $;$
… …
2819 3340
2820SV * 3341SV *
2821has_cctx (Coro::State coro) 3342has_cctx (Coro::State coro)
2822 PROTOTYPE: $ 3343 PROTOTYPE: $
2823 CODE: 3344 CODE:
2824 RETVAL = boolSV (!!coro->cctx); 3345 /* maybe manage the running flag differently */
3346 RETVAL = boolSV (!!coro->cctx || (coro->flags & CF_RUNNING));
2825 OUTPUT: 3347 OUTPUT:
2826 RETVAL 3348 RETVAL
2827 3349
2828int 3350int
2829is_traced (Coro::State coro) 3351is_traced (Coro::State coro)
… …
2849 3371
2850void 3372void
2851force_cctx () 3373force_cctx ()
2852 PROTOTYPE: 3374 PROTOTYPE:
2853 CODE: 3375 CODE:
2854 SvSTATE_current->cctx->idle_sp = 0; 3376 cctx_current->idle_sp = 0;
2855 3377
2856void 3378void
2857swap_defsv (Coro::State self) 3379swap_defsv (Coro::State self)
2858 PROTOTYPE: $ 3380 PROTOTYPE: $
2859 ALIAS: 3381 ALIAS:
… …
2867 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv; 3389 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
2868 3390
2869 SV *tmp = *src; *src = *dst; *dst = tmp; 3391 SV *tmp = *src; *src = *dst; *dst = tmp;
2870 } 3392 }
2871 3393
3394void
3395cancel (Coro::State self)
3396 CODE:
3397 coro_state_destroy (aTHX_ self);
3398 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */
3399
3400
3401SV *
3402enable_times (int enabled = enable_times)
3403 CODE:
3404{
3405 RETVAL = boolSV (enable_times);
3406
3407 if (enabled != enable_times)
3408 {
3409 enable_times = enabled;
3410
3411 coro_times_update ();
3412 (enabled ? coro_times_sub : coro_times_add)(SvSTATE (coro_current));
3413 }
3414}
3415 OUTPUT:
3416 RETVAL
3417
3418void
3419times (Coro::State self)
3420 PPCODE:
3421{
3422 struct coro *current = SvSTATE (coro_current);
3423
3424 if (expect_false (current == self))
3425 {
3426 coro_times_update ();
3427 coro_times_add (SvSTATE (coro_current));
3428 }
3429
3430 EXTEND (SP, 2);
3431 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3432 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3433
3434 if (expect_false (current == self))
3435 coro_times_sub (SvSTATE (coro_current));
3436}
3437
3438void
3439swap_sv (Coro::State coro, SV *sv, SV *swapsv)
3440 CODE:
3441{
3442 struct coro *current = SvSTATE_current;
3443
3444 if (current == coro)
3445 SWAP_SVS (current);
3446
3447 if (!coro->swap_sv)
3448 coro->swap_sv = newAV ();
3449
3450 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv )));
3451 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv)));
3452
3453 if (current == coro)
3454 SWAP_SVS (current);
3455}
3456
2872 3457
2873MODULE = Coro::State PACKAGE = Coro 3458MODULE = Coro::State PACKAGE = Coro
2874 3459
2875BOOT: 3460BOOT:
2876{ 3461{
2877 int i;
2878
2879 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
2880 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3462 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
2881 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3463 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
2882 cv_coro_run = get_cv (aTHX_ "Coro::_terminate", GV_ADD); 3464 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3465 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
2883 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); 3466 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
2884 SvREADONLY_on (coro_current); 3467 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3468 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3469 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3470 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
2885 3471
3472 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3473 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3474 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3475 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3476
2886 coro_stash = gv_stashpv ("Coro", TRUE); 3477 coro_stash = gv_stashpv ("Coro", TRUE);
2887 3478
2888 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 3479 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
2889 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 3480 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
2890 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 3481 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
2891 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 3482 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (CORO_PRIO_LOW));
2892 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE)); 3483 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (CORO_PRIO_IDLE));
2893 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN)); 3484 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (CORO_PRIO_MIN));
2894
2895 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
2896 coro_ready[i] = newAV ();
2897 3485
2898 { 3486 {
2899 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 3487 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
2900 3488
2901 coroapi.schedule = api_schedule; 3489 coroapi.schedule = api_schedule;
3490 coroapi.schedule_to = api_schedule_to;
2902 coroapi.cede = api_cede; 3491 coroapi.cede = api_cede;
2903 coroapi.cede_notself = api_cede_notself; 3492 coroapi.cede_notself = api_cede_notself;
2904 coroapi.ready = api_ready; 3493 coroapi.ready = api_ready;
2905 coroapi.is_ready = api_is_ready; 3494 coroapi.is_ready = api_is_ready;
2906 coroapi.nready = coro_nready; 3495 coroapi.nready = coro_nready;
… …
2910 sv_setiv (sv, (IV)&coroapi); 3499 sv_setiv (sv, (IV)&coroapi);
2911 SvREADONLY_on (sv); 3500 SvREADONLY_on (sv);
2912 } 3501 }
2913} 3502}
2914 3503
3504SV *
3505async (...)
3506 PROTOTYPE: &@
3507 CODE:
3508 RETVAL = coro_new (aTHX_ coro_stash, &ST (0), items, 1);
3509 api_ready (aTHX_ RETVAL);
3510 OUTPUT:
3511 RETVAL
3512
3513void
3514terminate (...)
3515 CODE:
3516 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3517
2915void 3518void
2916schedule (...) 3519schedule (...)
2917 CODE: 3520 CODE:
2918 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3521 CORO_EXECUTE_SLF_XS (slf_init_schedule);
3522
3523void
3524schedule_to (...)
3525 CODE:
3526 CORO_EXECUTE_SLF_XS (slf_init_schedule_to);
3527
3528void
3529cede_to (...)
3530 CODE:
3531 CORO_EXECUTE_SLF_XS (slf_init_cede_to);
2919 3532
2920void 3533void
2921cede (...) 3534cede (...)
2922 CODE: 3535 CODE:
2923 CORO_EXECUTE_SLF_XS (slf_init_cede); 3536 CORO_EXECUTE_SLF_XS (slf_init_cede);
… …
2937void 3550void
2938_set_readyhook (SV *hook) 3551_set_readyhook (SV *hook)
2939 PROTOTYPE: $ 3552 PROTOTYPE: $
2940 CODE: 3553 CODE:
2941 SvREFCNT_dec (coro_readyhook); 3554 SvREFCNT_dec (coro_readyhook);
3555 SvGETMAGIC (hook);
3556 if (SvOK (hook))
3557 {
2942 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0; 3558 coro_readyhook = newSVsv (hook);
3559 CORO_READYHOOK = invoke_sv_ready_hook_helper;
3560 }
3561 else
3562 {
3563 coro_readyhook = 0;
3564 CORO_READYHOOK = 0;
3565 }
2943 3566
2944int 3567int
2945prio (Coro::State coro, int newprio = 0) 3568prio (Coro::State coro, int newprio = 0)
2946 PROTOTYPE: $;$ 3569 PROTOTYPE: $;$
2947 ALIAS: 3570 ALIAS:
… …
2953 if (items > 1) 3576 if (items > 1)
2954 { 3577 {
2955 if (ix) 3578 if (ix)
2956 newprio = coro->prio - newprio; 3579 newprio = coro->prio - newprio;
2957 3580
2958 if (newprio < PRIO_MIN) newprio = PRIO_MIN; 3581 if (newprio < CORO_PRIO_MIN) newprio = CORO_PRIO_MIN;
2959 if (newprio > PRIO_MAX) newprio = PRIO_MAX; 3582 if (newprio > CORO_PRIO_MAX) newprio = CORO_PRIO_MAX;
2960 3583
2961 coro->prio = newprio; 3584 coro->prio = newprio;
2962 } 3585 }
2963} 3586}
2964 OUTPUT: 3587 OUTPUT:
… …
2978 CODE: 3601 CODE:
2979 RETVAL = coro_nready; 3602 RETVAL = coro_nready;
2980 OUTPUT: 3603 OUTPUT:
2981 RETVAL 3604 RETVAL
2982 3605
2983# for async_pool speedup
2984void 3606void
2985_pool_1 (SV *cb) 3607suspend (Coro::State self)
3608 PROTOTYPE: $
2986 CODE: 3609 CODE:
2987{ 3610 self->flags |= CF_SUSPENDED;
2988 HV *hv = (HV *)SvRV (coro_current);
2989 struct coro *coro = SvSTATE_hv ((SV *)hv);
2990 AV *defav = GvAV (PL_defgv);
2991 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
2992 AV *invoke_av;
2993 int i, len;
2994 3611
2995 if (!invoke) 3612void
3613resume (Coro::State self)
3614 PROTOTYPE: $
3615 CODE:
3616 self->flags &= ~CF_SUSPENDED;
3617
3618void
3619_pool_handler (...)
3620 CODE:
3621 CORO_EXECUTE_SLF_XS (slf_init_pool_handler);
3622
3623void
3624async_pool (SV *cv, ...)
3625 PROTOTYPE: &@
3626 PPCODE:
3627{
3628 HV *hv = (HV *)av_pop (av_async_pool);
3629 AV *av = newAV ();
3630 SV *cb = ST (0);
3631 int i;
3632
3633 av_extend (av, items - 2);
3634 for (i = 1; i < items; ++i)
3635 av_push (av, SvREFCNT_inc_NN (ST (i)));
3636
3637 if ((SV *)hv == &PL_sv_undef)
2996 { 3638 {
2997 SV *old = PL_diehook; 3639 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
2998 PL_diehook = 0; 3640 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
2999 SvREFCNT_dec (old); 3641 SvREFCNT_dec (sv);
3000 croak ("\3async_pool terminate\2\n");
3001 } 3642 }
3002 3643
3003 SvREFCNT_dec (coro->saved_deffh);
3004 coro->saved_deffh = SvREFCNT_inc_NN ((SV *)PL_defoutgv);
3005
3006 hv_store (hv, "desc", sizeof ("desc") - 1,
3007 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
3008
3009 invoke_av = (AV *)SvRV (invoke);
3010 len = av_len (invoke_av);
3011
3012 sv_setsv (cb, AvARRAY (invoke_av)[0]);
3013
3014 if (len > 0)
3015 { 3644 {
3016 av_fill (defav, len - 1); 3645 struct coro *coro = SvSTATE_hv (hv);
3017 for (i = 0; i < len; ++i) 3646
3018 av_store (defav, i, SvREFCNT_inc_NN (AvARRAY (invoke_av)[i + 1])); 3647 assert (!coro->invoke_cb);
3648 assert (!coro->invoke_av);
3649 coro->invoke_cb = SvREFCNT_inc (cb);
3650 coro->invoke_av = av;
3019 } 3651 }
3020}
3021 3652
3022void 3653 api_ready (aTHX_ (SV *)hv);
3023_pool_2 (SV *cb)
3024 CODE:
3025{
3026 HV *hv = (HV *)SvRV (coro_current);
3027 struct coro *coro = SvSTATE_hv ((SV *)hv);
3028 3654
3029 sv_setsv (cb, &PL_sv_undef); 3655 if (GIMME_V != G_VOID)
3030 3656 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
3031 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 3657 else
3032 coro->saved_deffh = 0;
3033
3034 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
3035 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
3036 {
3037 SV *old = PL_diehook;
3038 PL_diehook = 0;
3039 SvREFCNT_dec (old); 3658 SvREFCNT_dec (hv);
3040 croak ("\3async_pool terminate\2\n");
3041 }
3042
3043 av_clear (GvAV (PL_defgv));
3044 hv_store (hv, "desc", sizeof ("desc") - 1,
3045 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
3046
3047 coro->prio = 0;
3048
3049 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
3050 api_trace (aTHX_ coro_current, 0);
3051
3052 av_push (av_async_pool, newSVsv (coro_current));
3053} 3659}
3054 3660
3055SV * 3661SV *
3056rouse_cb () 3662rouse_cb ()
3057 PROTOTYPE: 3663 PROTOTYPE:
… …
3064rouse_wait (...) 3670rouse_wait (...)
3065 PROTOTYPE: ;$ 3671 PROTOTYPE: ;$
3066 PPCODE: 3672 PPCODE:
3067 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait); 3673 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait);
3068 3674
3675void
3676on_enter (SV *block)
3677 ALIAS:
3678 on_leave = 1
3679 PROTOTYPE: &
3680 CODE:
3681{
3682 struct coro *coro = SvSTATE_current;
3683 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3684
3685 block = s_get_cv_croak (block);
3686
3687 if (!*avp)
3688 *avp = newAV ();
3689
3690 av_push (*avp, SvREFCNT_inc (block));
3691
3692 if (!ix)
3693 on_enterleave_call (aTHX_ block);
3694
3695 LEAVE; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
3696 SAVEDESTRUCTOR_X (ix ? coro_pop_on_leave : coro_pop_on_enter, (void *)coro);
3697 ENTER; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
3698}
3699
3069 3700
3070MODULE = Coro::State PACKAGE = PerlIO::cede 3701MODULE = Coro::State PACKAGE = PerlIO::cede
3071 3702
3072BOOT: 3703BOOT:
3073 PerlIO_define_layer (aTHX_ &PerlIO_cede); 3704 PerlIO_define_layer (aTHX_ &PerlIO_cede);
… …
3076MODULE = Coro::State PACKAGE = Coro::Semaphore 3707MODULE = Coro::State PACKAGE = Coro::Semaphore
3077 3708
3078SV * 3709SV *
3079new (SV *klass, SV *count = 0) 3710new (SV *klass, SV *count = 0)
3080 CODE: 3711 CODE:
3712{
3713 int semcnt = 1;
3714
3715 if (count)
3716 {
3717 SvGETMAGIC (count);
3718
3719 if (SvOK (count))
3720 semcnt = SvIV (count);
3721 }
3722
3081 RETVAL = sv_bless ( 3723 RETVAL = sv_bless (
3082 coro_waitarray_new (aTHX_ count && SvOK (count) ? SvIV (count) : 1), 3724 coro_waitarray_new (aTHX_ semcnt),
3083 GvSTASH (CvGV (cv)) 3725 GvSTASH (CvGV (cv))
3084 ); 3726 );
3727}
3085 OUTPUT: 3728 OUTPUT:
3086 RETVAL 3729 RETVAL
3087 3730
3088# helper for Coro::Channel 3731# helper for Coro::Channel and others
3089SV * 3732SV *
3090_alloc (int count) 3733_alloc (int count)
3091 CODE: 3734 CODE:
3092 RETVAL = coro_waitarray_new (aTHX_ count); 3735 RETVAL = coro_waitarray_new (aTHX_ count);
3093 OUTPUT: 3736 OUTPUT:
… …
3151 for (i = 1; i <= wcount; ++i) 3794 for (i = 1; i <= wcount; ++i)
3152 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i]))); 3795 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i])));
3153 } 3796 }
3154} 3797}
3155 3798
3799MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3800
3801void
3802_may_delete (SV *sem, int count, int extra_refs)
3803 PPCODE:
3804{
3805 AV *av = (AV *)SvRV (sem);
3806
3807 if (SvREFCNT ((SV *)av) == 1 + extra_refs
3808 && AvFILLp (av) == 0 /* no waiters, just count */
3809 && SvIV (AvARRAY (av)[0]) == count)
3810 XSRETURN_YES;
3811
3812 XSRETURN_NO;
3813}
3814
3156MODULE = Coro::State PACKAGE = Coro::Signal 3815MODULE = Coro::State PACKAGE = Coro::Signal
3157 3816
3158SV * 3817SV *
3159new (SV *klass) 3818new (SV *klass)
3160 CODE: 3819 CODE:
… …
3231 3890
3232void 3891void
3233_register (char *target, char *proto, SV *req) 3892_register (char *target, char *proto, SV *req)
3234 CODE: 3893 CODE:
3235{ 3894{
3236 CV *req_cv = coro_sv_2cv (req); 3895 SV *req_cv = s_get_cv_croak (req);
3237 /* newXSproto doesn't return the CV on 5.8 */ 3896 /* newXSproto doesn't return the CV on 5.8 */
3238 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 3897 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3239 sv_setpv ((SV *)slf_cv, proto); 3898 sv_setpv ((SV *)slf_cv, proto);
3240 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0); 3899 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
3241} 3900}
3242 3901
3902MODULE = Coro::State PACKAGE = Coro::Select
3903
3904void
3905patch_pp_sselect ()
3906 CODE:
3907 if (!coro_old_pp_sselect)
3908 {
3909 coro_select_select = (SV *)get_cv ("Coro::Select::select", 0);
3910 coro_old_pp_sselect = PL_ppaddr [OP_SSELECT];
3911 PL_ppaddr [OP_SSELECT] = coro_pp_sselect;
3912 }
3913
3914void
3915unpatch_pp_sselect ()
3916 CODE:
3917 if (coro_old_pp_sselect)
3918 {
3919 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
3920 coro_old_pp_sselect = 0;
3921 }
3922

Diff Legend

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