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.314 by root, Thu Nov 20 03:24:39 2008 UTC vs.
Revision 1.391 by root, Thu Mar 31 04:24:19 2011 UTC

1/* this works around a bug in mingw32 providing a non-working setjmp */
2#define USE_NO_MINGW_SETJMP_TWO_ARGS
3
4#define NDEBUG 1
5
1#include "libcoro/coro.c" 6#include "libcoro/coro.c"
2 7
3#define PERL_NO_GET_CONTEXT 8#define PERL_NO_GET_CONTEXT
4#define PERL_EXT 9#define PERL_EXT
5 10
6#include "EXTERN.h" 11#include "EXTERN.h"
7#include "perl.h" 12#include "perl.h"
8#include "XSUB.h" 13#include "XSUB.h"
9#include "perliol.h" 14#include "perliol.h"
10 15
11#include "patchlevel.h" 16#include "schmorp.h"
12 17
13#include <stdio.h> 18#include <stdio.h>
14#include <errno.h> 19#include <errno.h>
15#include <assert.h> 20#include <assert.h>
16 21
17#ifdef WIN32 22#ifndef SVs_PADSTALE
23# define SVs_PADSTALE 0
24#endif
25
26#if defined(_WIN32)
27# undef HAS_GETTIMEOFDAY
18# undef setjmp 28# undef setjmp
19# undef longjmp 29# undef longjmp
20# undef _exit 30# undef _exit
21# define setjmp _setjmp /* deep magic */ 31# define setjmp _setjmp /* deep magic */
22#else 32#else
… …
51#endif 61#endif
52 62
53/* the maximum number of idle cctx that will be pooled */ 63/* the maximum number of idle cctx that will be pooled */
54static int cctx_max_idle = 4; 64static int cctx_max_idle = 4;
55 65
56#define PERL_VERSION_ATLEAST(a,b,c) \
57 (PERL_REVISION > (a) \
58 || (PERL_REVISION == (a) \
59 && (PERL_VERSION > (b) \
60 || (PERL_VERSION == (b) && PERL_SUBVERSION >= (c)))))
61
62#if !PERL_VERSION_ATLEAST (5,6,0)
63# ifndef PL_ppaddr
64# define PL_ppaddr ppaddr
65# endif
66# ifndef call_sv
67# define call_sv perl_call_sv
68# endif
69# ifndef get_sv
70# define get_sv perl_get_sv
71# endif
72# ifndef get_cv
73# define get_cv perl_get_cv
74# endif
75# ifndef IS_PADGV
76# define IS_PADGV(v) 0
77# endif
78# ifndef IS_PADCONST
79# define IS_PADCONST(v) 0
80# endif
81#endif
82
83/* 5.11 */
84#ifndef CxHASARGS
85# define CxHASARGS(cx) (cx)->blk_sub.hasargs
86#endif
87
88/* 5.10.0 */
89#ifndef SvREFCNT_inc_NN
90# define SvREFCNT_inc_NN(sv) SvREFCNT_inc (sv)
91#endif
92
93/* 5.8.8 */
94#ifndef GV_NOTQUAL
95# define GV_NOTQUAL 0
96#endif
97#ifndef newSV
98# define newSV(l) NEWSV(0,l)
99#endif
100#ifndef CvISXSUB_on
101# define CvISXSUB_on(cv) (void)cv
102#endif
103#ifndef CvISXSUB
104# define CvISXSUB(cv) (CvXSUB (cv) ? TRUE : FALSE)
105#endif
106
107/* 5.8.7 */
108#ifndef SvRV_set
109# define SvRV_set(s,v) SvRV(s) = (v)
110#endif
111
112#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 66#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
113# undef CORO_STACKGUARD 67# undef CORO_STACKGUARD
114#endif 68#endif
115 69
116#ifndef CORO_STACKGUARD 70#ifndef CORO_STACKGUARD
… …
130#else 84#else
131# define dSTACKLEVEL volatile void *stacklevel 85# define dSTACKLEVEL volatile void *stacklevel
132# define STACKLEVEL ((void *)&stacklevel) 86# define STACKLEVEL ((void *)&stacklevel)
133#endif 87#endif
134 88
135#define IN_DESTRUCT (PL_main_cv == Nullcv) 89#define IN_DESTRUCT PL_dirty
136 90
137#if __GNUC__ >= 3 91#if __GNUC__ >= 3
138# define attribute(x) __attribute__(x) 92# define attribute(x) __attribute__(x)
139# define expect(expr,value) __builtin_expect ((expr),(value)) 93# define expect(expr,value) __builtin_expect ((expr), (value))
140# define INLINE static inline 94# define INLINE static inline
141#else 95#else
142# define attribute(x) 96# define attribute(x)
143# define expect(expr,value) (expr) 97# define expect(expr,value) (expr)
144# define INLINE static 98# define INLINE static
… …
156# if CORO_PTHREAD 110# if CORO_PTHREAD
157static void *coro_thx; 111static void *coro_thx;
158# endif 112# endif
159#endif 113#endif
160 114
115#ifdef __linux
116# include <time.h> /* for timespec */
117# include <syscall.h> /* for SYS_* */
118# ifdef SYS_clock_gettime
119# define coro_clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
120# define CORO_CLOCK_MONOTONIC 1
121# define CORO_CLOCK_THREAD_CPUTIME_ID 3
122# endif
123#endif
124
161static double (*nvtime)(); /* so why doesn't it take void? */ 125static double (*nvtime)(); /* so why doesn't it take void? */
126static void (*u2time)(pTHX_ UV ret[2]);
162 127
163/* we hijack an hopefully unused CV flag for our purposes */ 128/* we hijack an hopefully unused CV flag for our purposes */
164#define CVf_SLF 0x4000 129#define CVf_SLF 0x4000
165static OP *pp_slf (pTHX); 130static OP *pp_slf (pTHX);
166 131
… …
170static AV *main_mainstack; /* used to differentiate between $main and others */ 135static AV *main_mainstack; /* used to differentiate between $main and others */
171static JMPENV *main_top_env; 136static JMPENV *main_top_env;
172static HV *coro_state_stash, *coro_stash; 137static HV *coro_state_stash, *coro_stash;
173static volatile SV *coro_mortal; /* will be freed/thrown after next transfer */ 138static volatile SV *coro_mortal; /* will be freed/thrown after next transfer */
174 139
140static AV *av_destroy; /* destruction queue */
141static SV *sv_manager; /* the manager coro */
142static SV *sv_idle; /* $Coro::idle */
143
175static GV *irsgv; /* $/ */ 144static GV *irsgv; /* $/ */
176static GV *stdoutgv; /* *STDOUT */ 145static GV *stdoutgv; /* *STDOUT */
177static SV *rv_diehook; 146static SV *rv_diehook;
178static SV *rv_warnhook; 147static SV *rv_warnhook;
179static HV *hv_sig; /* %SIG */ 148static HV *hv_sig; /* %SIG */
180 149
181/* async_pool helper stuff */ 150/* async_pool helper stuff */
182static SV *sv_pool_rss; 151static SV *sv_pool_rss;
183static SV *sv_pool_size; 152static SV *sv_pool_size;
184static SV *sv_async_pool_idle; 153static SV *sv_async_pool_idle; /* description string */
185static AV *av_async_pool; 154static AV *av_async_pool; /* idle pool */
186static SV *sv_Coro; 155static SV *sv_Coro; /* class string */
187static CV *cv_pool_handler; 156static CV *cv_pool_handler;
188static CV *cv_coro_new;
189 157
190/* Coro::AnyEvent */ 158/* Coro::AnyEvent */
191static 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;
192 166
193static struct coro_cctx *cctx_first; 167static struct coro_cctx *cctx_first;
194static int cctx_count, cctx_idle; 168static int cctx_count, cctx_idle;
195 169
196enum { 170enum {
… …
222 int valgrind_id; 196 int valgrind_id;
223#endif 197#endif
224 unsigned char flags; 198 unsigned char flags;
225} coro_cctx; 199} coro_cctx;
226 200
201coro_cctx *cctx_current; /* the currently running cctx */
202
203/*****************************************************************************/
204
227enum { 205enum {
228 CF_RUNNING = 0x0001, /* coroutine is running */ 206 CF_RUNNING = 0x0001, /* coroutine is running */
229 CF_READY = 0x0002, /* coroutine is ready */ 207 CF_READY = 0x0002, /* coroutine is ready */
230 CF_NEW = 0x0004, /* has never been switched to */ 208 CF_NEW = 0x0004, /* has never been switched to */
231 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 */
232}; 211};
233 212
234/* 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 */
235typedef struct 214typedef struct
236{ 215{
237 SV *defsv; 216 SV *defsv;
238 AV *defav; 217 AV *defav;
239 SV *errsv; 218 SV *errsv;
240 SV *irsgv; 219 SV *irsgv;
220 HV *hinthv;
241#define VAR(name,type) type name; 221#define VAR(name,type) type name;
242# include "state.h" 222# include "state.h"
243#undef VAR 223#undef VAR
244} perl_slots; 224} perl_slots;
245 225
… …
247 227
248/* this is a structure representing a perl-level coroutine */ 228/* this is a structure representing a perl-level coroutine */
249struct coro { 229struct coro {
250 /* the C coroutine allocated to this perl coroutine, if any */ 230 /* the C coroutine allocated to this perl coroutine, if any */
251 coro_cctx *cctx; 231 coro_cctx *cctx;
232
233 /* ready queue */
234 struct coro *next_ready;
252 235
253 /* state data */ 236 /* state data */
254 struct CoroSLF slf_frame; /* saved slf frame */ 237 struct CoroSLF slf_frame; /* saved slf frame */
255 AV *mainstack; 238 AV *mainstack;
256 perl_slots *slot; /* basically the saved sp */ 239 perl_slots *slot; /* basically the saved sp */
… …
258 CV *startcv; /* the CV to execute */ 241 CV *startcv; /* the CV to execute */
259 AV *args; /* data associated with this coroutine (initial args) */ 242 AV *args; /* data associated with this coroutine (initial args) */
260 int refcnt; /* coroutines are refcounted, yes */ 243 int refcnt; /* coroutines are refcounted, yes */
261 int flags; /* CF_ flags */ 244 int flags; /* CF_ flags */
262 HV *hv; /* the perl hash associated with this coro, if any */ 245 HV *hv; /* the perl hash associated with this coro, if any */
263 void (*on_destroy)(pTHX_ struct coro *coro); 246 void (*on_destroy)(pTHX_ struct coro *coro); /* for temporary use by xs in critical sections */
264 247
265 /* statistics */ 248 /* statistics */
266 int usecount; /* number of transfers to this coro */ 249 int usecount; /* number of transfers to this coro */
267 250
268 /* coro process data */ 251 /* coro process data */
… …
273 /* async_pool */ 256 /* async_pool */
274 SV *saved_deffh; 257 SV *saved_deffh;
275 SV *invoke_cb; 258 SV *invoke_cb;
276 AV *invoke_av; 259 AV *invoke_av;
277 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;
270
278 /* linked list */ 271 /* linked list */
279 struct coro *next, *prev; 272 struct coro *next, *prev;
280}; 273};
281 274
282typedef struct coro *Coro__State; 275typedef struct coro *Coro__State;
… …
287/* the mainr easonw e don't support windows process emulation */ 280/* the mainr easonw e don't support windows process emulation */
288static struct CoroSLF slf_frame; /* the current slf frame */ 281static struct CoroSLF slf_frame; /* the current slf frame */
289 282
290/** Coro ********************************************************************/ 283/** Coro ********************************************************************/
291 284
292#define PRIO_MAX 3 285#define CORO_PRIO_MAX 3
293#define PRIO_HIGH 1 286#define CORO_PRIO_HIGH 1
294#define PRIO_NORMAL 0 287#define CORO_PRIO_NORMAL 0
295#define PRIO_LOW -1 288#define CORO_PRIO_LOW -1
296#define PRIO_IDLE -3 289#define CORO_PRIO_IDLE -3
297#define PRIO_MIN -4 290#define CORO_PRIO_MIN -4
298 291
299/* for Coro.pm */ 292/* for Coro.pm */
300static SV *coro_current; 293static SV *coro_current;
301static SV *coro_readyhook; 294static SV *coro_readyhook;
302static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1]; 295static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
303static CV *cv_coro_run, *cv_coro_terminate; 296static CV *cv_coro_run, *cv_coro_terminate;
304static struct coro *coro_first; 297static struct coro *coro_first;
305#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
306 371
307/** lowlevel stuff **********************************************************/ 372/** lowlevel stuff **********************************************************/
308 373
309static SV * 374static SV *
310coro_get_sv (pTHX_ const char *name, int create) 375coro_get_sv (pTHX_ const char *name, int create)
… …
334 get_hv (name, create); 399 get_hv (name, create);
335#endif 400#endif
336 return get_hv (name, create); 401 return get_hv (name, create);
337} 402}
338 403
339/* may croak */ 404INLINE void
340INLINE CV * 405coro_times_update ()
341coro_sv_2cv (pTHX_ SV *sv)
342{ 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{
343 HV *st; 473 HV *stash;
344 GV *gvp; 474 MAGIC *mg;
345 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;
346} 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 */
347 502
348static AV * 503static AV *
349coro_clone_padlist (pTHX_ CV *cv) 504coro_derive_padlist (pTHX_ CV *cv)
350{ 505{
351 AV *padlist = CvPADLIST (cv); 506 AV *padlist = CvPADLIST (cv);
352 AV *newpadlist, *newpad; 507 AV *newpadlist, *newpad;
353 508
354 newpadlist = newAV (); 509 newpadlist = newAV ();
… …
359 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 514 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
360#endif 515#endif
361 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 516 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
362 --AvFILLp (padlist); 517 --AvFILLp (padlist);
363 518
364 av_store (newpadlist, 0, SvREFCNT_inc_NN (*av_fetch (padlist, 0, FALSE))); 519 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0]));
365 av_store (newpadlist, 1, (SV *)newpad); 520 av_store (newpadlist, 1, (SV *)newpad);
366 521
367 return newpadlist; 522 return newpadlist;
368} 523}
369 524
370static void 525static void
371free_padlist (pTHX_ AV *padlist) 526free_padlist (pTHX_ AV *padlist)
372{ 527{
373 /* may be during global destruction */ 528 /* may be during global destruction */
374 if (SvREFCNT (padlist)) 529 if (!IN_DESTRUCT)
375 { 530 {
376 I32 i = AvFILLp (padlist); 531 I32 i = AvFILLp (padlist);
377 while (i >= 0) 532
533 while (i > 0) /* special-case index 0 */
378 { 534 {
379 SV **svp = av_fetch (padlist, i--, FALSE); 535 /* we try to be extra-careful here */
380 if (svp) 536 AV *av = (AV *)AvARRAY (padlist)[i--];
381 { 537 I32 j = AvFILLp (av);
382 SV *sv; 538
383 while (&PL_sv_undef != (sv = av_pop ((AV *)*svp))) 539 while (j >= 0)
540 SvREFCNT_dec (AvARRAY (av)[j--]);
541
542 AvFILLp (av) = -1;
384 SvREFCNT_dec (sv); 543 SvREFCNT_dec (av);
385
386 SvREFCNT_dec (*svp);
387 }
388 } 544 }
389 545
546 SvREFCNT_dec (AvARRAY (padlist)[0]);
547
548 AvFILLp (padlist) = -1;
390 SvREFCNT_dec ((SV*)padlist); 549 SvREFCNT_dec ((SV*)padlist);
391 } 550 }
392} 551}
393 552
394static int 553static int
395coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 554coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
396{ 555{
397 AV *padlist; 556 AV *padlist;
398 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;
399 562
400 /* casting is fun. */ 563 /* casting is fun. */
401 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 564 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
402 free_padlist (aTHX_ padlist); 565 free_padlist (aTHX_ padlist);
403 566
404 SvREFCNT_dec (av); /* sv_magicext increased the refcount */ 567 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
405 568
406 return 0; 569 return 0;
407} 570}
408
409#define CORO_MAGIC_type_cv 26
410#define CORO_MAGIC_type_state PERL_MAGIC_ext
411 571
412static MGVTBL coro_cv_vtbl = { 572static MGVTBL coro_cv_vtbl = {
413 0, 0, 0, 0, 573 0, 0, 0, 0,
414 coro_cv_free 574 coro_cv_free
415}; 575};
416
417#define CORO_MAGIC_NN(sv, type) \
418 (expect_true (SvMAGIC (sv)->mg_type == type) \
419 ? SvMAGIC (sv) \
420 : mg_find (sv, type))
421
422#define CORO_MAGIC(sv, type) \
423 (expect_true (SvMAGIC (sv)) \
424 ? CORO_MAGIC_NN (sv, type) \
425 : 0)
426
427#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
428#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
429
430INLINE struct coro *
431SvSTATE_ (pTHX_ SV *coro)
432{
433 HV *stash;
434 MAGIC *mg;
435
436 if (SvROK (coro))
437 coro = SvRV (coro);
438
439 if (expect_false (SvTYPE (coro) != SVt_PVHV))
440 croak ("Coro::State object required");
441
442 stash = SvSTASH (coro);
443 if (expect_false (stash != coro_stash && stash != coro_state_stash))
444 {
445 /* very slow, but rare, check */
446 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
447 croak ("Coro::State object required");
448 }
449
450 mg = CORO_MAGIC_state (coro);
451 return (struct coro *)mg->mg_ptr;
452}
453
454#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
455
456/* faster than SvSTATE, but expects a coroutine hv */
457#define SvSTATE_hv(hv) ((struct coro *)CORO_MAGIC_NN ((SV *)hv, CORO_MAGIC_type_state)->mg_ptr)
458#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
459 576
460/* the next two functions merely cache the padlists */ 577/* the next two functions merely cache the padlists */
461static void 578static void
462get_padlist (pTHX_ CV *cv) 579get_padlist (pTHX_ CV *cv)
463{ 580{
… …
474 CV *cp = Perl_cv_clone (aTHX_ cv); 591 CV *cp = Perl_cv_clone (aTHX_ cv);
475 CvPADLIST (cv) = CvPADLIST (cp); 592 CvPADLIST (cv) = CvPADLIST (cp);
476 CvPADLIST (cp) = 0; 593 CvPADLIST (cp) = 0;
477 SvREFCNT_dec (cp); 594 SvREFCNT_dec (cp);
478#else 595#else
479 CvPADLIST (cv) = coro_clone_padlist (aTHX_ cv); 596 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
480#endif 597#endif
481 } 598 }
482} 599}
483 600
484static void 601static void
… …
491 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);
492 609
493 av = (AV *)mg->mg_obj; 610 av = (AV *)mg->mg_obj;
494 611
495 if (expect_false (AvFILLp (av) >= AvMAX (av))) 612 if (expect_false (AvFILLp (av) >= AvMAX (av)))
496 av_extend (av, AvMAX (av) + 1); 613 av_extend (av, AvFILLp (av) + 1);
497 614
498 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 615 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
499} 616}
500 617
501/** 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);
502 673
503static void 674static void
504load_perl (pTHX_ Coro__State c) 675load_perl (pTHX_ Coro__State c)
505{ 676{
506 perl_slots *slot = c->slot; 677 perl_slots *slot = c->slot;
507 c->slot = 0; 678 c->slot = 0;
508 679
509 PL_mainstack = c->mainstack; 680 PL_mainstack = c->mainstack;
510 681
511 GvSV (PL_defgv) = slot->defsv; 682 GvSV (PL_defgv) = slot->defsv;
512 GvAV (PL_defgv) = slot->defav; 683 GvAV (PL_defgv) = slot->defav;
513 GvSV (PL_errgv) = slot->errsv; 684 GvSV (PL_errgv) = slot->errsv;
514 GvSV (irsgv) = slot->irsgv; 685 GvSV (irsgv) = slot->irsgv;
686 GvHV (PL_hintgv) = slot->hinthv;
515 687
516 #define VAR(name,type) PL_ ## name = slot->name; 688 #define VAR(name,type) PL_ ## name = slot->name;
517 # include "state.h" 689 # include "state.h"
518 #undef VAR 690 #undef VAR
519 691
… …
533 PUTBACK; 705 PUTBACK;
534 } 706 }
535 707
536 slf_frame = c->slf_frame; 708 slf_frame = c->slf_frame;
537 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);
538} 728}
539 729
540static void 730static void
541save_perl (pTHX_ Coro__State c) 731save_perl (pTHX_ Coro__State c)
542{ 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
543 c->except = CORO_THROW; 751 c->except = CORO_THROW;
544 c->slf_frame = slf_frame; 752 c->slf_frame = slf_frame;
545 753
546 { 754 {
547 dSP; 755 dSP;
… …
560 { 768 {
561 while (expect_true (cxix >= 0)) 769 while (expect_true (cxix >= 0))
562 { 770 {
563 PERL_CONTEXT *cx = &ccstk[cxix--]; 771 PERL_CONTEXT *cx = &ccstk[cxix--];
564 772
565 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))
566 { 774 {
567 CV *cv = cx->blk_sub.cv; 775 CV *cv = cx->blk_sub.cv;
568 776
569 if (expect_true (CvDEPTH (cv))) 777 if (expect_true (CvDEPTH (cv)))
570 { 778 {
… …
594 /* we manually unroll here, as usually 2 slots is enough */ 802 /* we manually unroll here, as usually 2 slots is enough */
595 if (SLOT_COUNT >= 1) CXINC; 803 if (SLOT_COUNT >= 1) CXINC;
596 if (SLOT_COUNT >= 2) CXINC; 804 if (SLOT_COUNT >= 2) CXINC;
597 if (SLOT_COUNT >= 3) CXINC; 805 if (SLOT_COUNT >= 3) CXINC;
598 { 806 {
599 int i; 807 unsigned int i;
600 for (i = 3; i < SLOT_COUNT; ++i) 808 for (i = 3; i < SLOT_COUNT; ++i)
601 CXINC; 809 CXINC;
602 } 810 }
603 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 811 cxstack_ix -= SLOT_COUNT; /* undo allocation */
604 812
605 c->mainstack = PL_mainstack; 813 c->mainstack = PL_mainstack;
606 814
607 { 815 {
608 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 816 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
609 817
610 slot->defav = GvAV (PL_defgv); 818 slot->defav = GvAV (PL_defgv);
611 slot->defsv = DEFSV; 819 slot->defsv = DEFSV;
612 slot->errsv = ERRSV; 820 slot->errsv = ERRSV;
613 slot->irsgv = GvSV (irsgv); 821 slot->irsgv = GvSV (irsgv);
822 slot->hinthv = GvHV (PL_hintgv);
614 823
615 #define VAR(name,type) slot->name = PL_ ## name; 824 #define VAR(name,type) slot->name = PL_ ## name;
616 # include "state.h" 825 # include "state.h"
617 #undef VAR 826 #undef VAR
618 } 827 }
… …
745#endif 954#endif
746 955
747/* 956/*
748 * This overrides the default magic get method of %SIG elements. 957 * This overrides the default magic get method of %SIG elements.
749 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook 958 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
750 * and instead of tryign to save and restore the hash elements, we just provide 959 * and instead of trying to save and restore the hash elements, we just provide
751 * readback here. 960 * readback here.
752 * We only do this when the hook is != 0, as they are often set to 0 temporarily,
753 * not expecting this to actually change the hook. This is a potential problem
754 * when a schedule happens then, but we ignore this.
755 */ 961 */
756static int 962static int
757coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 963coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
758{ 964{
759 const char *s = MgPV_nolen_const (mg); 965 const char *s = MgPV_nolen_const (mg);
… …
812 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 1018 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
813 1019
814 if (svp) 1020 if (svp)
815 { 1021 {
816 SV *old = *svp; 1022 SV *old = *svp;
817 *svp = newSVsv (sv); 1023 *svp = SvOK (sv) ? newSVsv (sv) : 0;
818 SvREFCNT_dec (old); 1024 SvREFCNT_dec (old);
819 return 0; 1025 return 0;
820 } 1026 }
821 } 1027 }
822 1028
… …
834slf_check_nop (pTHX_ struct CoroSLF *frame) 1040slf_check_nop (pTHX_ struct CoroSLF *frame)
835{ 1041{
836 return 0; 1042 return 0;
837} 1043}
838 1044
839static UNOP coro_setup_op; 1045static int
1046slf_check_repeat (pTHX_ struct CoroSLF *frame)
1047{
1048 return 1;
1049}
1050
1051static UNOP init_perl_op;
840 1052
841static 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 */
842coro_setup (pTHX_ struct coro *coro) 1054init_perl (pTHX_ struct coro *coro)
843{ 1055{
844 /* 1056 /*
845 * emulate part of the perl startup here. 1057 * emulate part of the perl startup here.
846 */ 1058 */
847 coro_init_stacks (aTHX); 1059 coro_init_stacks (aTHX);
848 1060
849 PL_runops = RUNOPS_DEFAULT; 1061 PL_runops = RUNOPS_DEFAULT;
850 PL_curcop = &PL_compiling; 1062 PL_curcop = &PL_compiling;
851 PL_in_eval = EVAL_NULL; 1063 PL_in_eval = EVAL_NULL;
852 PL_comppad = 0; 1064 PL_comppad = 0;
1065 PL_comppad_name = 0;
1066 PL_comppad_name_fill = 0;
1067 PL_comppad_name_floor = 0;
853 PL_curpm = 0; 1068 PL_curpm = 0;
854 PL_curpad = 0; 1069 PL_curpad = 0;
855 PL_localizing = 0; 1070 PL_localizing = 0;
856 PL_dirty = 0;
857 PL_restartop = 0; 1071 PL_restartop = 0;
858#if PERL_VERSION_ATLEAST (5,10,0) 1072#if PERL_VERSION_ATLEAST (5,10,0)
859 PL_parser = 0; 1073 PL_parser = 0;
860#endif 1074#endif
1075 PL_hints = 0;
861 1076
862 /* recreate the die/warn hooks */ 1077 /* recreate the die/warn hooks */
863 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 );
864 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);
865 1080
866 GvSV (PL_defgv) = newSV (0); 1081 GvSV (PL_defgv) = newSV (0);
867 GvAV (PL_defgv) = coro->args; coro->args = 0; 1082 GvAV (PL_defgv) = coro->args; coro->args = 0;
868 GvSV (PL_errgv) = newSV (0); 1083 GvSV (PL_errgv) = newSV (0);
869 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;
870 PL_rs = newSVsv (GvSV (irsgv)); 1086 PL_rs = newSVsv (GvSV (irsgv));
871 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1087 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
872 1088
873 { 1089 {
874 dSP; 1090 dSP;
… …
891 */ 1107 */
892 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 */
893 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 */
894 1110
895 /* 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 */
896 coro_setup_op.op_next = PL_op; 1112 init_perl_op.op_next = PL_op;
897 coro_setup_op.op_type = OP_CUSTOM; 1113 init_perl_op.op_type = OP_ENTERSUB;
898 coro_setup_op.op_ppaddr = pp_slf; 1114 init_perl_op.op_ppaddr = pp_slf;
899 /* 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 */
900 1116
901 PL_op = (OP *)&coro_setup_op; 1117 PL_op = (OP *)&init_perl_op;
902 1118
903 /* copy throw, in case it was set before coro_setup */ 1119 /* copy throw, in case it was set before init_perl */
904 CORO_THROW = coro->except; 1120 CORO_THROW = coro->except;
905}
906 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
907static void 1131static void
908coro_destruct (pTHX_ struct coro *coro) 1132coro_unwind_stacks (pTHX)
909{ 1133{
910 if (!IN_DESTRUCT) 1134 if (!IN_DESTRUCT)
911 { 1135 {
912 /* restore all saved variables and stuff */ 1136 /* restore all saved variables and stuff */
913 LEAVE_SCOPE (0); 1137 LEAVE_SCOPE (0);
… …
921 POPSTACK_TO (PL_mainstack); 1145 POPSTACK_TO (PL_mainstack);
922 1146
923 /* unwind main stack */ 1147 /* unwind main stack */
924 dounwind (-1); 1148 dounwind (-1);
925 } 1149 }
1150}
926 1151
927 SvREFCNT_dec (GvSV (PL_defgv)); 1152static void
928 SvREFCNT_dec (GvAV (PL_defgv)); 1153destroy_perl (pTHX_ struct coro *coro)
929 SvREFCNT_dec (GvSV (PL_errgv)); 1154{
930 SvREFCNT_dec (PL_defoutgv); 1155 SV *svf [9];
931 SvREFCNT_dec (PL_rs);
932 SvREFCNT_dec (GvSV (irsgv));
933 1156
934 SvREFCNT_dec (PL_diehook);
935 SvREFCNT_dec (PL_warnhook);
936 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
937 SvREFCNT_dec (coro->saved_deffh); 1192 SvREFCNT_dec (coro->saved_deffh);
938 SvREFCNT_dec (coro->rouse_cb); 1193 SvREFCNT_dec (coro->rouse_cb);
939 SvREFCNT_dec (coro->invoke_cb); 1194 SvREFCNT_dec (coro->invoke_cb);
940 SvREFCNT_dec (coro->invoke_av); 1195 SvREFCNT_dec (coro->invoke_av);
941 1196 }
942 coro_destruct_stacks (aTHX);
943} 1197}
944 1198
945INLINE void 1199INLINE void
946free_coro_mortal (pTHX) 1200free_coro_mortal (pTHX)
947{ 1201{
… …
955static int 1209static int
956runops_trace (pTHX) 1210runops_trace (pTHX)
957{ 1211{
958 COP *oldcop = 0; 1212 COP *oldcop = 0;
959 int oldcxix = -2; 1213 int oldcxix = -2;
960 struct coro *coro = SvSTATE_current; /* trace cctx is tied to specific coro */
961 coro_cctx *cctx = coro->cctx;
962 1214
963 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX))) 1215 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX)))
964 { 1216 {
965 PERL_ASYNC_CHECK (); 1217 PERL_ASYNC_CHECK ();
966 1218
967 if (cctx->flags & CC_TRACE_ALL) 1219 if (cctx_current->flags & CC_TRACE_ALL)
968 { 1220 {
969 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)
970 { 1222 {
971 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1223 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
972 SV **bot, **top; 1224 SV **bot, **top;
973 AV *av = newAV (); /* return values */ 1225 AV *av = newAV (); /* return values */
974 SV **cb; 1226 SV **cb;
… …
1011 1263
1012 if (PL_curcop != &PL_compiling) 1264 if (PL_curcop != &PL_compiling)
1013 { 1265 {
1014 SV **cb; 1266 SV **cb;
1015 1267
1016 if (oldcxix != cxstack_ix && cctx->flags & CC_TRACE_SUB) 1268 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB)
1017 { 1269 {
1018 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1270 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1019 1271
1020 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1272 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1021 { 1273 {
1022 runops_proc_t old_runops = PL_runops;
1023 dSP; 1274 dSP;
1024 GV *gv = CvGV (cx->blk_sub.cv); 1275 GV *gv = CvGV (cx->blk_sub.cv);
1025 SV *fullname = sv_2mortal (newSV (0)); 1276 SV *fullname = sv_2mortal (newSV (0));
1026 1277
1027 if (isGV (gv)) 1278 if (isGV (gv))
… …
1045 } 1296 }
1046 1297
1047 oldcxix = cxstack_ix; 1298 oldcxix = cxstack_ix;
1048 } 1299 }
1049 1300
1050 if (cctx->flags & CC_TRACE_LINE) 1301 if (cctx_current->flags & CC_TRACE_LINE)
1051 { 1302 {
1052 dSP; 1303 dSP;
1053 1304
1054 PL_runops = RUNOPS_DEFAULT; 1305 PL_runops = RUNOPS_DEFAULT;
1055 ENTER; 1306 ENTER;
… …
1074 1325
1075 TAINT_NOT; 1326 TAINT_NOT;
1076 return 0; 1327 return 0;
1077} 1328}
1078 1329
1079static struct coro_cctx *cctx_ssl_cctx;
1080static struct CoroSLF cctx_ssl_frame; 1330static struct CoroSLF cctx_ssl_frame;
1081 1331
1082static void 1332static void
1083slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta) 1333slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta)
1084{ 1334{
1085 ta->prev = (struct coro *)cctx_ssl_cctx;
1086 ta->next = 0; 1335 ta->prev = 0;
1087} 1336}
1088 1337
1089static int 1338static int
1090slf_check_set_stacklevel (pTHX_ struct CoroSLF *frame) 1339slf_check_set_stacklevel (pTHX_ struct CoroSLF *frame)
1091{ 1340{
… …
1094 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 */
1095} 1344}
1096 1345
1097/* 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 */
1098static void NOINLINE 1347static void NOINLINE
1099cctx_prepare (pTHX_ coro_cctx *cctx) 1348cctx_prepare (pTHX)
1100{ 1349{
1101 PL_top_env = &PL_start_env; 1350 PL_top_env = &PL_start_env;
1102 1351
1103 if (cctx->flags & CC_TRACE) 1352 if (cctx_current->flags & CC_TRACE)
1104 PL_runops = runops_trace; 1353 PL_runops = runops_trace;
1105 1354
1106 /* 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
1107 * that can lead to creation of a new cctx */ 1356 * that can lead to creation of a new cctx */
1108 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)",
1109 slf_frame.prepare && PL_op->op_ppaddr == pp_slf)); 1358 slf_frame.prepare && PL_op->op_ppaddr == pp_slf));
1110 1359
1111 /* 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 */
1112 cctx_ssl_cctx = cctx;
1113 cctx_ssl_frame = slf_frame; 1361 cctx_ssl_frame = slf_frame;
1114 1362
1115 slf_frame.prepare = slf_prepare_set_stacklevel; 1363 slf_frame.prepare = slf_prepare_set_stacklevel;
1116 slf_frame.check = slf_check_set_stacklevel; 1364 slf_frame.check = slf_check_set_stacklevel;
1117} 1365}
… …
1140 /* normally we would need to skip the entersub here */ 1388 /* normally we would need to skip the entersub here */
1141 /* 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 */
1142 /* PL_nop = PL_nop->op_next */ 1390 /* PL_nop = PL_nop->op_next */
1143 1391
1144 /* inject a fake subroutine call to cctx_init */ 1392 /* inject a fake subroutine call to cctx_init */
1145 cctx_prepare (aTHX_ (coro_cctx *)arg); 1393 cctx_prepare (aTHX);
1146 1394
1147 /* cctx_run is the alternative tail of transfer() */ 1395 /* cctx_run is the alternative tail of transfer() */
1148 transfer_tail (aTHX); 1396 transfer_tail (aTHX);
1149 1397
1150 /* 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 */
1151 PL_restartop = PL_op; 1399 PL_restartop = PL_op;
1152 perl_run (PL_curinterp); 1400 perl_run (PL_curinterp);
1153 /* 1401 /*
1154 * 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
1155 * 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.
1156 */ 1405 */
1157 1406
1158 /* 1407 /*
1159 * 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
1160 * 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)
1161 * 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
1162 * bootstrap-time "top" top_env, as we cannot restore the "main" 1411 * bootstrap-time "top" top_env, as we cannot restore the "main"
1163 * 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.
1164 */ 1415 */
1165 PL_top_env = main_top_env; 1416 PL_top_env = main_top_env;
1166 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 */
1167 } 1418 }
1168} 1419}
… …
1245cctx_destroy (coro_cctx *cctx) 1496cctx_destroy (coro_cctx *cctx)
1246{ 1497{
1247 if (!cctx) 1498 if (!cctx)
1248 return; 1499 return;
1249 1500
1501 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary?
1502
1250 --cctx_count; 1503 --cctx_count;
1251 coro_destroy (&cctx->cctx); 1504 coro_destroy (&cctx->cctx);
1252 1505
1253 /* coro_transfer creates new, empty cctx's */ 1506 /* coro_transfer creates new, empty cctx's */
1254 if (cctx->sptr) 1507 if (cctx->sptr)
… …
1317 /* TODO: throwing up here is considered harmful */ 1570 /* TODO: throwing up here is considered harmful */
1318 1571
1319 if (expect_true (prev != next)) 1572 if (expect_true (prev != next))
1320 { 1573 {
1321 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1574 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1322 croak ("Coro::State::transfer called with non-running/new prev Coro::State, but can only transfer from running or new states,"); 1575 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1323 1576
1324 if (expect_false (next->flags & CF_RUNNING))
1325 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states,");
1326
1327 if (expect_false (next->flags & CF_DESTROYED)) 1577 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED)))
1328 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states,"); 1578 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1329 1579
1330#if !PERL_VERSION_ATLEAST (5,10,0) 1580#if !PERL_VERSION_ATLEAST (5,10,0)
1331 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1581 if (expect_false (PL_lex_state != LEX_NOTPARSING))
1332 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,"); 1582 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1333#endif 1583#endif
… …
1339transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1589transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1340{ 1590{
1341 dSTACKLEVEL; 1591 dSTACKLEVEL;
1342 1592
1343 /* sometimes transfer is only called to set idle_sp */ 1593 /* sometimes transfer is only called to set idle_sp */
1344 if (expect_false (!next)) 1594 if (expect_false (!prev))
1345 { 1595 {
1346 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1596 cctx_current->idle_sp = STACKLEVEL;
1347 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 */
1348 } 1598 }
1349 else if (expect_true (prev != next)) 1599 else if (expect_true (prev != next))
1350 { 1600 {
1351 coro_cctx *prev__cctx; 1601 coro_cctx *cctx_prev;
1352 1602
1353 if (expect_false (prev->flags & CF_NEW)) 1603 if (expect_false (prev->flags & CF_NEW))
1354 { 1604 {
1355 /* create a new empty/source context */ 1605 /* create a new empty/source context */
1356 prev->cctx = cctx_new_empty ();
1357 prev->flags &= ~CF_NEW; 1606 prev->flags &= ~CF_NEW;
1358 prev->flags |= CF_RUNNING; 1607 prev->flags |= CF_RUNNING;
1359 } 1608 }
1360 1609
1361 prev->flags &= ~CF_RUNNING; 1610 prev->flags &= ~CF_RUNNING;
… …
1367 if (expect_false (next->flags & CF_NEW)) 1616 if (expect_false (next->flags & CF_NEW))
1368 { 1617 {
1369 /* need to start coroutine */ 1618 /* need to start coroutine */
1370 next->flags &= ~CF_NEW; 1619 next->flags &= ~CF_NEW;
1371 /* setup coroutine call */ 1620 /* setup coroutine call */
1372 coro_setup (aTHX_ next); 1621 init_perl (aTHX_ next);
1373 } 1622 }
1374 else 1623 else
1375 load_perl (aTHX_ next); 1624 load_perl (aTHX_ next);
1376 1625
1377 prev__cctx = prev->cctx;
1378
1379 /* possibly untie and reuse the cctx */ 1626 /* possibly untie and reuse the cctx */
1380 if (expect_true ( 1627 if (expect_true (
1381 prev__cctx->idle_sp == STACKLEVEL 1628 cctx_current->idle_sp == STACKLEVEL
1382 && !(prev__cctx->flags & CC_TRACE) 1629 && !(cctx_current->flags & CC_TRACE)
1383 && !force_cctx 1630 && !force_cctx
1384 )) 1631 ))
1385 { 1632 {
1386 /* 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 */
1387 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));
1388 1635
1389 prev->cctx = 0;
1390
1391 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */ 1636 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */
1392 /* without this the next cctx_get might destroy the prev__cctx while still in use */ 1637 /* without this the next cctx_get might destroy the running cctx while still in use */
1393 if (expect_false (CCTX_EXPIRED (prev__cctx))) 1638 if (expect_false (CCTX_EXPIRED (cctx_current)))
1394 if (!next->cctx) 1639 if (expect_true (!next->cctx))
1395 next->cctx = cctx_get (aTHX); 1640 next->cctx = cctx_get (aTHX);
1396 1641
1397 cctx_put (prev__cctx); 1642 cctx_put (cctx_current);
1398 } 1643 }
1644 else
1645 prev->cctx = cctx_current;
1399 1646
1400 ++next->usecount; 1647 ++next->usecount;
1401 1648
1402 if (expect_true (!next->cctx)) 1649 cctx_prev = cctx_current;
1403 next->cctx = cctx_get (aTHX); 1650 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1404 1651
1405 if (expect_false (prev__cctx != next->cctx)) 1652 next->cctx = 0;
1653
1654 if (expect_false (cctx_prev != cctx_current))
1406 { 1655 {
1407 prev__cctx->top_env = PL_top_env; 1656 cctx_prev->top_env = PL_top_env;
1408 PL_top_env = next->cctx->top_env; 1657 PL_top_env = cctx_current->top_env;
1409 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1658 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1410 } 1659 }
1411 1660
1412 transfer_tail (aTHX); 1661 transfer_tail (aTHX);
1413 } 1662 }
1414} 1663}
… …
1422coro_state_destroy (pTHX_ struct coro *coro) 1671coro_state_destroy (pTHX_ struct coro *coro)
1423{ 1672{
1424 if (coro->flags & CF_DESTROYED) 1673 if (coro->flags & CF_DESTROYED)
1425 return 0; 1674 return 0;
1426 1675
1427 if (coro->on_destroy) 1676 if (coro->on_destroy && !PL_dirty)
1428 coro->on_destroy (aTHX_ coro); 1677 coro->on_destroy (aTHX_ coro);
1429 1678
1430 coro->flags |= CF_DESTROYED; 1679 coro->flags |= CF_DESTROYED;
1431 1680
1432 if (coro->flags & CF_READY) 1681 if (coro->flags & CF_READY)
… …
1436 --coro_nready; 1685 --coro_nready;
1437 } 1686 }
1438 else 1687 else
1439 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 */
1440 1689
1441 if (coro->mainstack && coro->mainstack != main_mainstack) 1690 if (coro->mainstack
1442 { 1691 && coro->mainstack != main_mainstack
1443 struct coro temp; 1692 && coro->slot
1444 1693 && !PL_dirty)
1445 assert (("FATAL: tried to destroy currently running coroutine (please report)", !(coro->flags & CF_RUNNING)));
1446
1447 save_perl (aTHX_ &temp);
1448 load_perl (aTHX_ coro); 1694 destroy_perl (aTHX_ coro);
1449 1695
1450 coro_destruct (aTHX_ coro); 1696 if (coro->next) coro->next->prev = coro->prev;
1451 1697 if (coro->prev) coro->prev->next = coro->next;
1452 load_perl (aTHX_ &temp); 1698 if (coro == coro_first) coro_first = coro->next;
1453
1454 coro->slot = 0;
1455 }
1456 1699
1457 cctx_destroy (coro->cctx); 1700 cctx_destroy (coro->cctx);
1458 SvREFCNT_dec (coro->startcv); 1701 SvREFCNT_dec (coro->startcv);
1459 SvREFCNT_dec (coro->args); 1702 SvREFCNT_dec (coro->args);
1703 SvREFCNT_dec (coro->swap_sv);
1460 SvREFCNT_dec (CORO_THROW); 1704 SvREFCNT_dec (CORO_THROW);
1461
1462 if (coro->next) coro->next->prev = coro->prev;
1463 if (coro->prev) coro->prev->next = coro->next;
1464 if (coro == coro_first) coro_first = coro->next;
1465 1705
1466 return 1; 1706 return 1;
1467} 1707}
1468 1708
1469static int 1709static int
… …
1519 1759
1520 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1760 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1521 TRANSFER (ta, 1); 1761 TRANSFER (ta, 1);
1522} 1762}
1523 1763
1524/*****************************************************************************/
1525/* gensub: simple closure generation utility */
1526
1527#define GENSUB_ARG CvXSUBANY (cv).any_ptr
1528
1529/* create a closure from XS, returns a code reference */
1530/* the arg can be accessed via GENSUB_ARG from the callback */
1531/* the callback must use dXSARGS/XSRETURN */
1532static SV *
1533gensub (pTHX_ void (*xsub)(pTHX_ CV *), void *arg)
1534{
1535 CV *cv = (CV *)newSV (0);
1536
1537 sv_upgrade ((SV *)cv, SVt_PVCV);
1538
1539 CvANON_on (cv);
1540 CvISXSUB_on (cv);
1541 CvXSUB (cv) = xsub;
1542 GENSUB_ARG = arg;
1543
1544 return newRV_noinc ((SV *)cv);
1545}
1546
1547/** Coro ********************************************************************/ 1764/** Coro ********************************************************************/
1548 1765
1549INLINE void 1766INLINE void
1550coro_enq (pTHX_ struct coro *coro) 1767coro_enq (pTHX_ struct coro *coro)
1551{ 1768{
1552 av_push (coro_ready [coro->prio - PRIO_MIN], SvREFCNT_inc_NN (coro->hv)); 1769 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1553}
1554 1770
1555INLINE 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 *
1556coro_deq (pTHX) 1779coro_deq (pTHX)
1557{ 1780{
1558 int prio; 1781 int prio;
1559 1782
1560 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; ) 1783 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
1561 if (AvFILLp (coro_ready [prio]) >= 0) 1784 {
1562 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 }
1563 1794
1564 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;
1565} 1813}
1566 1814
1567static int 1815static int
1568api_ready (pTHX_ SV *coro_sv) 1816api_ready (pTHX_ SV *coro_sv)
1569{ 1817{
1570 struct coro *coro;
1571 SV *sv_hook;
1572 void (*xs_hook)(void);
1573
1574 if (SvROK (coro_sv))
1575 coro_sv = SvRV (coro_sv);
1576
1577 coro = SvSTATE (coro_sv); 1818 struct coro *coro = SvSTATE (coro_sv);
1578 1819
1579 if (coro->flags & CF_READY) 1820 if (coro->flags & CF_READY)
1580 return 0; 1821 return 0;
1581 1822
1582 coro->flags |= CF_READY; 1823 coro->flags |= CF_READY;
1583 1824
1584 sv_hook = coro_nready ? 0 : coro_readyhook;
1585 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1586
1587 coro_enq (aTHX_ coro); 1825 coro_enq (aTHX_ coro);
1588 ++coro_nready;
1589 1826
1590 if (sv_hook) 1827 if (!coro_nready++)
1591 { 1828 if (coroapi.readyhook)
1592 dSP; 1829 coroapi.readyhook ();
1593
1594 ENTER;
1595 SAVETMPS;
1596
1597 PUSHMARK (SP);
1598 PUTBACK;
1599 call_sv (sv_hook, G_VOID | G_DISCARD);
1600
1601 FREETMPS;
1602 LEAVE;
1603 }
1604
1605 if (xs_hook)
1606 xs_hook ();
1607 1830
1608 return 1; 1831 return 1;
1609} 1832}
1610 1833
1611static int 1834static int
1612api_is_ready (pTHX_ SV *coro_sv) 1835api_is_ready (pTHX_ SV *coro_sv)
1613{ 1836{
1614 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1837 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1615} 1838}
1616 1839
1840/* expects to own a reference to next->hv */
1617INLINE void 1841INLINE void
1618prepare_schedule (pTHX_ struct coro_transfer_args *ta) 1842prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1619{ 1843{
1620 SV *prev_sv, *next_sv;
1621
1622 for (;;)
1623 {
1624 next_sv = coro_deq (aTHX);
1625
1626 /* nothing to schedule: call the idle handler */
1627 if (expect_false (!next_sv))
1628 {
1629 dSP;
1630
1631 ENTER;
1632 SAVETMPS;
1633
1634 PUSHMARK (SP);
1635 PUTBACK;
1636 call_sv (get_sv ("Coro::idle", FALSE), G_VOID | G_DISCARD);
1637
1638 FREETMPS;
1639 LEAVE;
1640 continue;
1641 }
1642
1643 ta->next = SvSTATE_hv (next_sv);
1644
1645 /* cannot transfer to destroyed coros, skip and look for next */
1646 if (expect_false (ta->next->flags & CF_DESTROYED))
1647 {
1648 SvREFCNT_dec (next_sv);
1649 /* coro_nready has already been taken care of by destroy */
1650 continue;
1651 }
1652
1653 --coro_nready;
1654 break;
1655 }
1656
1657 /* free this only after the transfer */
1658 prev_sv = SvRV (coro_current); 1844 SV *prev_sv = SvRV (coro_current);
1845
1659 ta->prev = SvSTATE_hv (prev_sv); 1846 ta->prev = SvSTATE_hv (prev_sv);
1847 ta->next = next;
1848
1660 TRANSFER_CHECK (*ta); 1849 TRANSFER_CHECK (*ta);
1661 assert (("FATAL: next coroutine isn't marked as ready in Coro (please report)", ta->next->flags & CF_READY)); 1850
1662 ta->next->flags &= ~CF_READY;
1663 SvRV_set (coro_current, next_sv); 1851 SvRV_set (coro_current, (SV *)next->hv);
1664 1852
1665 free_coro_mortal (aTHX); 1853 free_coro_mortal (aTHX);
1666 coro_mortal = prev_sv; 1854 coro_mortal = prev_sv;
1667} 1855}
1668 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
1669INLINE void 1910INLINE void
1670prepare_cede (pTHX_ struct coro_transfer_args *ta) 1911prepare_cede (pTHX_ struct coro_transfer_args *ta)
1671{ 1912{
1672 api_ready (aTHX_ coro_current); 1913 api_ready (aTHX_ coro_current);
1673 prepare_schedule (aTHX_ ta); 1914 prepare_schedule (aTHX_ ta);
… …
1692{ 1933{
1693 struct coro_transfer_args ta; 1934 struct coro_transfer_args ta;
1694 1935
1695 prepare_schedule (aTHX_ &ta); 1936 prepare_schedule (aTHX_ &ta);
1696 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);
1697} 1948}
1698 1949
1699static int 1950static int
1700api_cede (pTHX) 1951api_cede (pTHX)
1701{ 1952{
… …
1730static void 1981static void
1731api_trace (pTHX_ SV *coro_sv, int flags) 1982api_trace (pTHX_ SV *coro_sv, int flags)
1732{ 1983{
1733 struct coro *coro = SvSTATE (coro_sv); 1984 struct coro *coro = SvSTATE (coro_sv);
1734 1985
1986 if (coro->flags & CF_RUNNING)
1987 croak ("cannot enable tracing on a running coroutine, caught");
1988
1735 if (flags & CC_TRACE) 1989 if (flags & CC_TRACE)
1736 { 1990 {
1737 if (!coro->cctx) 1991 if (!coro->cctx)
1738 coro->cctx = cctx_new_run (); 1992 coro->cctx = cctx_new_run ();
1739 else if (!(coro->cctx->flags & CC_TRACE)) 1993 else if (!(coro->cctx->flags & CC_TRACE))
1740 croak ("cannot enable tracing on coroutine with custom stack,"); 1994 croak ("cannot enable tracing on coroutine with custom stack, caught");
1741 1995
1742 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL)); 1996 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL));
1743 } 1997 }
1744 else if (coro->cctx && coro->cctx->flags & CC_TRACE) 1998 else if (coro->cctx && coro->cctx->flags & CC_TRACE)
1745 { 1999 {
… …
1748 if (coro->flags & CF_RUNNING) 2002 if (coro->flags & CF_RUNNING)
1749 PL_runops = RUNOPS_DEFAULT; 2003 PL_runops = RUNOPS_DEFAULT;
1750 else 2004 else
1751 coro->slot->runops = RUNOPS_DEFAULT; 2005 coro->slot->runops = RUNOPS_DEFAULT;
1752 } 2006 }
2007}
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
2014 if (on_destroyp)
2015 {
2016 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
2017 AV *on_destroy = sv_2mortal (SvREFCNT_inc ((AV *)SvRV (*on_destroyp)));
2018 AV *status = statusp ? sv_2mortal (SvREFCNT_inc ((AV *)SvRV (*statusp))) : 0;
2019
2020 while (AvFILLp (on_destroy) >= 0)
2021 {
2022 dSP; /* don't disturb outer sp */
2023 SV *cb = av_pop (on_destroy);
2024
2025 PUSHMARK (SP);
2026
2027 if (statusp)
2028 {
2029 int i;
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);*/
1753} 2069}
1754 2070
1755/*****************************************************************************/ 2071/*****************************************************************************/
1756/* async pool handler */ 2072/* async pool handler */
1757 2073
… …
1835 2151
1836static void 2152static void
1837coro_rouse_callback (pTHX_ CV *cv) 2153coro_rouse_callback (pTHX_ CV *cv)
1838{ 2154{
1839 dXSARGS; 2155 dXSARGS;
1840 SV *data = (SV *)GENSUB_ARG; 2156 SV *data = (SV *)S_GENSUB_ARG;
1841 2157
1842 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2158 if (SvTYPE (SvRV (data)) != SVt_PVAV)
1843 { 2159 {
1844 /* first call, set args */ 2160 /* first call, set args */
2161 SV *coro = SvRV (data);
1845 AV *av = newAV (); 2162 AV *av = newAV ();
1846 SV *coro = SvRV (data);
1847 2163
1848 SvRV_set (data, (SV *)av); 2164 SvRV_set (data, (SV *)av);
1849 api_ready (aTHX_ coro);
1850 SvREFCNT_dec (coro);
1851 2165
1852 /* better take a full copy of the arguments */ 2166 /* better take a full copy of the arguments */
1853 while (items--) 2167 while (items--)
1854 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);
1855 } 2172 }
1856 2173
1857 XSRETURN_EMPTY; 2174 XSRETURN_EMPTY;
1858} 2175}
1859 2176
… …
1876 2193
1877 EXTEND (SP, AvFILLp (av) + 1); 2194 EXTEND (SP, AvFILLp (av) + 1);
1878 for (i = 0; i <= AvFILLp (av); ++i) 2195 for (i = 0; i <= AvFILLp (av); ++i)
1879 PUSHs (sv_2mortal (AvARRAY (av)[i])); 2196 PUSHs (sv_2mortal (AvARRAY (av)[i]));
1880 2197
1881 /* 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 */
1882 AvFILLp (av) = -1; 2199 AvFILLp (av) = -1;
1883 av_undef (av); 2200 av_undef (av);
1884 2201
1885 PUTBACK; 2202 PUTBACK;
1886 } 2203 }
… …
1910 || SvTYPE (SvRV (cb)) != SVt_PVCV 2227 || SvTYPE (SvRV (cb)) != SVt_PVCV
1911 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2228 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
1912 croak ("Coro::rouse_wait called with illegal callback argument,"); 2229 croak ("Coro::rouse_wait called with illegal callback argument,");
1913 2230
1914 { 2231 {
1915 CV *cv = (CV *)SvRV (cb); /* for GENSUB_ARG */ 2232 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
1916 SV *data = (SV *)GENSUB_ARG; 2233 SV *data = (SV *)S_GENSUB_ARG;
1917 2234
1918 frame->data = (void *)data; 2235 frame->data = (void *)data;
1919 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule; 2236 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
1920 frame->check = slf_check_rouse_wait; 2237 frame->check = slf_check_rouse_wait;
1921 } 2238 }
… …
1925coro_new_rouse_cb (pTHX) 2242coro_new_rouse_cb (pTHX)
1926{ 2243{
1927 HV *hv = (HV *)SvRV (coro_current); 2244 HV *hv = (HV *)SvRV (coro_current);
1928 struct coro *coro = SvSTATE_hv (hv); 2245 struct coro *coro = SvSTATE_hv (hv);
1929 SV *data = newRV_inc ((SV *)hv); 2246 SV *data = newRV_inc ((SV *)hv);
1930 SV *cb = gensub (aTHX_ coro_rouse_callback, (void *)data); 2247 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
1931 2248
1932 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);
1933 SvREFCNT_dec (data); /* magicext increases the refcount */ 2250 SvREFCNT_dec (data); /* magicext increases the refcount */
1934 2251
1935 SvREFCNT_dec (coro->rouse_cb); 2252 SvREFCNT_dec (coro->rouse_cb);
… …
1990static void 2307static void
1991slf_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)
1992{ 2309{
1993 frame->prepare = prepare_schedule; 2310 frame->prepare = prepare_schedule;
1994 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);
1995} 2340}
1996 2341
1997static void 2342static void
1998slf_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)
1999{ 2344{
… …
2132 if (PL_op->op_flags & OPf_STACKED) 2477 if (PL_op->op_flags & OPf_STACKED)
2133 { 2478 {
2134 if (items > slf_arga) 2479 if (items > slf_arga)
2135 { 2480 {
2136 slf_arga = items; 2481 slf_arga = items;
2137 free (slf_argv); 2482 Safefree (slf_argv);
2138 slf_argv = malloc (slf_arga * sizeof (SV *)); 2483 New (0, slf_argv, slf_arga, SV *);
2139 } 2484 }
2140 2485
2141 slf_argc = items; 2486 slf_argc = items;
2142 2487
2143 for (i = 0; i < items; ++i) 2488 for (i = 0; i < items; ++i)
… …
2145 } 2490 }
2146 else 2491 else
2147 slf_argc = 0; 2492 slf_argc = 0;
2148 2493
2149 PL_op->op_ppaddr = pp_slf; 2494 PL_op->op_ppaddr = pp_slf;
2150 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 */
2151 2496
2152 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));
2153} 2545}
2154 2546
2155/*****************************************************************************/ 2547/*****************************************************************************/
2156/* PerlIO::cede */ 2548/* PerlIO::cede */
2157 2549
… …
2231/* Coro::Semaphore & Coro::Signal */ 2623/* Coro::Semaphore & Coro::Signal */
2232 2624
2233static SV * 2625static SV *
2234coro_waitarray_new (pTHX_ int count) 2626coro_waitarray_new (pTHX_ int count)
2235{ 2627{
2236 /* 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 */
2237 AV *av = newAV (); 2629 AV *av = newAV ();
2238 SV **ary; 2630 SV **ary;
2239 2631
2240 /* unfortunately, building manually saves memory */ 2632 /* unfortunately, building manually saves memory */
2241 Newx (ary, 2, SV *); 2633 Newx (ary, 2, SV *);
2242 AvALLOC (av) = ary; 2634 AvALLOC (av) = ary;
2635#if PERL_VERSION_ATLEAST (5,10,0)
2243 /*AvARRAY (av) = ary;*/ 2636 AvARRAY (av) = ary;
2637#else
2244 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
2245 AvMAX (av) = 1; 2642 AvMAX (av) = 1;
2246 AvFILLp (av) = 0; 2643 AvFILLp (av) = 0;
2247 ary [0] = newSViv (count); 2644 ary [0] = newSViv (count);
2248 2645
2249 return newRV_noinc ((SV *)av); 2646 return newRV_noinc ((SV *)av);
… …
2378{ 2775{
2379 if (items >= 2) 2776 if (items >= 2)
2380 { 2777 {
2381 /* callback form */ 2778 /* callback form */
2382 AV *av = (AV *)SvRV (arg [0]); 2779 AV *av = (AV *)SvRV (arg [0]);
2383 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 2780 SV *cb_cv = s_get_cv_croak (arg [1]);
2384 2781
2385 av_push (av, (SV *)SvREFCNT_inc_NN (cb_cv)); 2782 av_push (av, SvREFCNT_inc_NN (cb_cv));
2386 2783
2387 if (SvIVX (AvARRAY (av)[0]) > 0) 2784 if (SvIVX (AvARRAY (av)[0]) > 0)
2388 coro_semaphore_adjust (aTHX_ av, 0); 2785 coro_semaphore_adjust (aTHX_ av, 0);
2389 2786
2390 frame->prepare = prepare_nop; 2787 frame->prepare = prepare_nop;
… …
2414 AvARRAY (av)[0] = AvARRAY (av)[1]; 2811 AvARRAY (av)[0] = AvARRAY (av)[1];
2415 AvARRAY (av)[1] = cb; 2812 AvARRAY (av)[1] = cb;
2416 2813
2417 cb = av_shift (av); 2814 cb = av_shift (av);
2418 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 {
2419 api_ready (aTHX_ cb); 2826 api_ready (aTHX_ cb);
2420 sv_setiv (cb, 0); /* signal waiter */ 2827 sv_setiv (cb, 0); /* signal waiter */
2828 }
2829
2421 SvREFCNT_dec (cb); 2830 SvREFCNT_dec (cb);
2422 2831
2423 --count; 2832 --count;
2424 } 2833 }
2425} 2834}
… …
2434static void 2843static void
2435slf_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)
2436{ 2845{
2437 AV *av = (AV *)SvRV (arg [0]); 2846 AV *av = (AV *)SvRV (arg [0]);
2438 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
2439 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]))
2440 { 2860 {
2441 SvIVX (AvARRAY (av)[0]) = 0; 2861 SvIVX (AvARRAY (av)[0]) = 0;
2442 frame->prepare = prepare_nop; 2862 frame->prepare = prepare_nop;
2443 frame->check = slf_check_nop; 2863 frame->check = slf_check_nop;
2444 } 2864 }
2445 else 2865 else
2446 { 2866 {
2447 SV *waiter = newRV_inc (SvRV (coro_current)); /* owned by signal av */ 2867 SV *waiter = newSVsv (coro_current); /* owned by signal av */
2448 2868
2449 av_push (av, waiter); 2869 av_push (av, waiter);
2450 2870
2451 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 */
2452 frame->prepare = prepare_schedule; 2872 frame->prepare = prepare_schedule;
… …
2470 2890
2471static void 2891static void
2472coro_aio_callback (pTHX_ CV *cv) 2892coro_aio_callback (pTHX_ CV *cv)
2473{ 2893{
2474 dXSARGS; 2894 dXSARGS;
2475 AV *state = (AV *)GENSUB_ARG; 2895 AV *state = (AV *)S_GENSUB_ARG;
2476 SV *coro = av_pop (state); 2896 SV *coro = av_pop (state);
2477 SV *data_sv = newSV (sizeof (struct io_state)); 2897 SV *data_sv = newSV (sizeof (struct io_state));
2478 2898
2479 av_extend (state, items - 1); 2899 av_extend (state, items - 1);
2480 2900
… …
2594 3014
2595 for (i = 0; i < items; ++i) 3015 for (i = 0; i < items; ++i)
2596 PUSHs (arg [i]); 3016 PUSHs (arg [i]);
2597 3017
2598 /* now push the callback closure */ 3018 /* now push the callback closure */
2599 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))));
2600 3020
2601 /* now call the AIO function - we assume our request is uncancelable */ 3021 /* now call the AIO function - we assume our request is uncancelable */
2602 PUTBACK; 3022 PUTBACK;
2603 call_sv ((SV *)req, G_VOID | G_DISCARD); 3023 call_sv ((SV *)req, G_VOID | G_DISCARD);
2604 } 3024 }
2605 3025
2606 /* 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 */
2607 frame->data = (void *)state; 3027 frame->data = (void *)state;
2608 frame->prepare = prepare_schedule; 3028 frame->prepare = prepare_schedule;
2609 frame->check = slf_check_aio_req; 3029 frame->check = slf_check_aio_req;
2610} 3030}
2611 3031
… …
2618 3038
2619 XSRETURN_EMPTY; 3039 XSRETURN_EMPTY;
2620} 3040}
2621 3041
2622/*****************************************************************************/ 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}
2623 3105
2624MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3106MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2625 3107
2626PROTOTYPES: DISABLE 3108PROTOTYPES: DISABLE
2627 3109
… …
2632 coro_thx = PERL_GET_CONTEXT; 3114 coro_thx = PERL_GET_CONTEXT;
2633# endif 3115# endif
2634#endif 3116#endif
2635 BOOT_PAGESIZE; 3117 BOOT_PAGESIZE;
2636 3118
3119 cctx_current = cctx_new_empty ();
3120
2637 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3121 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
2638 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3122 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
2639 3123
2640 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;
2641 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;
… …
2660 3144
2661 { 3145 {
2662 SV *slf = sv_2mortal (newSViv (PTR2IV (pp_slf))); 3146 SV *slf = sv_2mortal (newSViv (PTR2IV (pp_slf)));
2663 3147
2664 if (!PL_custom_op_names) PL_custom_op_names = newHV (); 3148 if (!PL_custom_op_names) PL_custom_op_names = newHV ();
2665 hv_store_ent (PL_custom_op_names, slf, 3149 hv_store_ent (PL_custom_op_names, slf, newSVpv ("coro_slf", 0), 0);
2666 newSVpv ("coro_slf", 0), 0);
2667 3150
2668 if (!PL_custom_op_descs) PL_custom_op_descs = newHV (); 3151 if (!PL_custom_op_descs) PL_custom_op_descs = newHV ();
2669 hv_store_ent (PL_custom_op_descs, slf, 3152 hv_store_ent (PL_custom_op_descs, slf, newSVpv ("coro schedule like function", 0), 0);
2670 newSVpv ("coro schedule like function", 0), 0);
2671 } 3153 }
2672 3154
2673 coroapi.ver = CORO_API_VERSION; 3155 coroapi.ver = CORO_API_VERSION;
2674 coroapi.rev = CORO_API_REVISION; 3156 coroapi.rev = CORO_API_REVISION;
2675 3157
… …
2680 coroapi.prepare_nop = prepare_nop; 3162 coroapi.prepare_nop = prepare_nop;
2681 coroapi.prepare_schedule = prepare_schedule; 3163 coroapi.prepare_schedule = prepare_schedule;
2682 coroapi.prepare_cede = prepare_cede; 3164 coroapi.prepare_cede = prepare_cede;
2683 coroapi.prepare_cede_notself = prepare_cede_notself; 3165 coroapi.prepare_cede_notself = prepare_cede_notself;
2684 3166
2685 { 3167 time_init (aTHX);
2686 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
2687 3168
2688 if (!svp) croak ("Time::HiRes is required");
2689 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
2690
2691 nvtime = INT2PTR (double (*)(), SvIV (*svp));
2692 }
2693
2694 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 3169 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
2695} 3170}
2696 3171
2697SV * 3172SV *
2698new (char *klass, ...) 3173new (SV *klass, ...)
2699 ALIAS: 3174 ALIAS:
2700 Coro::new = 1 3175 Coro::new = 1
2701 CODE: 3176 CODE:
2702{ 3177 RETVAL = coro_new (aTHX_ ix ? coro_stash : coro_state_stash, &ST (1), items - 1, ix);
2703 struct coro *coro; 3178 OUTPUT:
2704 MAGIC *mg;
2705 HV *hv;
2706 CV *cb;
2707 int i;
2708
2709 if (items > 1)
2710 {
2711 cb = coro_sv_2cv (aTHX_ ST (1));
2712
2713 if (!ix)
2714 {
2715 if (CvISXSUB (cb))
2716 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
2717
2718 if (!CvROOT (cb))
2719 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
2720 }
2721 }
2722
2723 Newz (0, coro, 1, struct coro);
2724 coro->args = newAV ();
2725 coro->flags = CF_NEW;
2726
2727 if (coro_first) coro_first->prev = coro;
2728 coro->next = coro_first;
2729 coro_first = coro;
2730
2731 coro->hv = hv = newHV ();
2732 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
2733 mg->mg_flags |= MGf_DUP;
2734 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
2735
2736 if (items > 1)
2737 {
2738 av_extend (coro->args, items - 1 + ix - 1);
2739
2740 if (ix)
2741 {
2742 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
2743 cb = cv_coro_run;
2744 }
2745
2746 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
2747
2748 for (i = 2; i < items; i++)
2749 av_push (coro->args, newSVsv (ST (i)));
2750 }
2751}
2752 OUTPUT:
2753 RETVAL 3179 RETVAL
2754 3180
2755void 3181void
2756transfer (...) 3182transfer (...)
2757 PROTOTYPE: $$ 3183 PROTOTYPE: $$
… …
2768void 3194void
2769_exit (int code) 3195_exit (int code)
2770 PROTOTYPE: $ 3196 PROTOTYPE: $
2771 CODE: 3197 CODE:
2772 _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
2773 3218
2774int 3219int
2775cctx_stacksize (int new_stacksize = 0) 3220cctx_stacksize (int new_stacksize = 0)
2776 PROTOTYPE: ;$ 3221 PROTOTYPE: ;$
2777 CODE: 3222 CODE:
… …
2827 eval = 1 3272 eval = 1
2828 CODE: 3273 CODE:
2829{ 3274{
2830 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3275 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
2831 { 3276 {
2832 struct coro temp; 3277 struct coro *current = SvSTATE_current;
2833 3278
2834 if (!(coro->flags & CF_RUNNING)) 3279 if (current != coro)
2835 { 3280 {
2836 PUTBACK; 3281 PUTBACK;
2837 save_perl (aTHX_ &temp); 3282 save_perl (aTHX_ current);
2838 load_perl (aTHX_ coro); 3283 load_perl (aTHX_ coro);
3284 SPAGAIN;
2839 } 3285 }
2840 3286
2841 {
2842 dSP;
2843 ENTER;
2844 SAVETMPS;
2845 PUTBACK;
2846 PUSHSTACK; 3287 PUSHSTACK;
3288
2847 PUSHMARK (SP); 3289 PUSHMARK (SP);
3290 PUTBACK;
2848 3291
2849 if (ix) 3292 if (ix)
2850 eval_sv (coderef, 0); 3293 eval_sv (coderef, 0);
2851 else 3294 else
2852 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 3295 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
2853 3296
2854 POPSTACK; 3297 POPSTACK;
2855 SPAGAIN; 3298 SPAGAIN;
2856 FREETMPS;
2857 LEAVE;
2858 PUTBACK;
2859 }
2860 3299
2861 if (!(coro->flags & CF_RUNNING)) 3300 if (current != coro)
2862 { 3301 {
3302 PUTBACK;
2863 save_perl (aTHX_ coro); 3303 save_perl (aTHX_ coro);
2864 load_perl (aTHX_ &temp); 3304 load_perl (aTHX_ current);
2865 SPAGAIN; 3305 SPAGAIN;
2866 } 3306 }
2867 } 3307 }
2868} 3308}
2869 3309
… …
2873 ALIAS: 3313 ALIAS:
2874 is_ready = CF_READY 3314 is_ready = CF_READY
2875 is_running = CF_RUNNING 3315 is_running = CF_RUNNING
2876 is_new = CF_NEW 3316 is_new = CF_NEW
2877 is_destroyed = CF_DESTROYED 3317 is_destroyed = CF_DESTROYED
3318 is_suspended = CF_SUSPENDED
2878 CODE: 3319 CODE:
2879 RETVAL = boolSV (coro->flags & ix); 3320 RETVAL = boolSV (coro->flags & ix);
2880 OUTPUT: 3321 OUTPUT:
2881 RETVAL 3322 RETVAL
2882 3323
2883void 3324void
2884throw (Coro::State self, SV *throw = &PL_sv_undef) 3325throw (Coro::State self, SV *exception = &PL_sv_undef)
2885 PROTOTYPE: $;$ 3326 PROTOTYPE: $;$
2886 CODE: 3327 CODE:
2887{ 3328{
2888 struct coro *current = SvSTATE_current; 3329 struct coro *current = SvSTATE_current;
2889 SV **throwp = self == current ? &CORO_THROW : &self->except; 3330 SV **exceptionp = self == current ? &CORO_THROW : &self->except;
2890 SvREFCNT_dec (*throwp); 3331 SvREFCNT_dec (*exceptionp);
2891 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3332 SvGETMAGIC (exception);
3333 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
2892} 3334}
2893 3335
2894void 3336void
2895api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3337api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
2896 PROTOTYPE: $;$ 3338 PROTOTYPE: $;$
… …
2898 3340
2899SV * 3341SV *
2900has_cctx (Coro::State coro) 3342has_cctx (Coro::State coro)
2901 PROTOTYPE: $ 3343 PROTOTYPE: $
2902 CODE: 3344 CODE:
2903 RETVAL = boolSV (!!coro->cctx); 3345 /* maybe manage the running flag differently */
3346 RETVAL = boolSV (!!coro->cctx || (coro->flags & CF_RUNNING));
2904 OUTPUT: 3347 OUTPUT:
2905 RETVAL 3348 RETVAL
2906 3349
2907int 3350int
2908is_traced (Coro::State coro) 3351is_traced (Coro::State coro)
… …
2928 3371
2929void 3372void
2930force_cctx () 3373force_cctx ()
2931 PROTOTYPE: 3374 PROTOTYPE:
2932 CODE: 3375 CODE:
2933 SvSTATE_current->cctx->idle_sp = 0; 3376 cctx_current->idle_sp = 0;
2934 3377
2935void 3378void
2936swap_defsv (Coro::State self) 3379swap_defsv (Coro::State self)
2937 PROTOTYPE: $ 3380 PROTOTYPE: $
2938 ALIAS: 3381 ALIAS:
… …
2946 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv; 3389 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
2947 3390
2948 SV *tmp = *src; *src = *dst; *dst = tmp; 3391 SV *tmp = *src; *src = *dst; *dst = tmp;
2949 } 3392 }
2950 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
3400SV *
3401enable_times (int enabled = enable_times)
3402 CODE:
3403{
3404 RETVAL = boolSV (enable_times);
3405
3406 if (enabled != enable_times)
3407 {
3408 enable_times = enabled;
3409
3410 coro_times_update ();
3411 (enabled ? coro_times_sub : coro_times_add)(SvSTATE (coro_current));
3412 }
3413}
3414 OUTPUT:
3415 RETVAL
3416
3417void
3418times (Coro::State self)
3419 PPCODE:
3420{
3421 struct coro *current = SvSTATE (coro_current);
3422
3423 if (expect_false (current == self))
3424 {
3425 coro_times_update ();
3426 coro_times_add (SvSTATE (coro_current));
3427 }
3428
3429 EXTEND (SP, 2);
3430 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3431 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3432
3433 if (expect_false (current == self))
3434 coro_times_sub (SvSTATE (coro_current));
3435}
3436
3437void
3438swap_sv (Coro::State coro, SV *sv, SV *swapsv)
3439 CODE:
3440{
3441 struct coro *current = SvSTATE_current;
3442
3443 if (current == coro)
3444 SWAP_SVS (current);
3445
3446 if (!coro->swap_sv)
3447 coro->swap_sv = newAV ();
3448
3449 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv )));
3450 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv)));
3451
3452 if (current == coro)
3453 SWAP_SVS (current);
3454}
3455
2951 3456
2952MODULE = Coro::State PACKAGE = Coro 3457MODULE = Coro::State PACKAGE = Coro
2953 3458
2954BOOT: 3459BOOT:
2955{ 3460{
2956 int i;
2957
2958 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
2959 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3461 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
2960 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3462 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
2961 cv_coro_run = get_cv ( "Coro::_terminate", GV_ADD); 3463 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
2962 cv_coro_terminate = get_cv ( "Coro::terminate", GV_ADD); 3464 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
2963 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); 3465 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
2964 SvREADONLY_on (coro_current); 3466 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3467 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3468 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3469 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
2965 3470
2966 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3471 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
2967 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3472 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
2968 cv_pool_handler = get_cv ("Coro::_pool_handler", 0); SvREADONLY_on (cv_pool_handler); 3473 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
2969 cv_coro_new = get_cv ("Coro::new", 0); SvREADONLY_on (cv_coro_new); 3474 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
2970 3475
2971 coro_stash = gv_stashpv ("Coro", TRUE); 3476 coro_stash = gv_stashpv ("Coro", TRUE);
2972 3477
2973 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 3478 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
2974 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 3479 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
2975 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 3480 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
2976 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 3481 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (CORO_PRIO_LOW));
2977 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE)); 3482 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (CORO_PRIO_IDLE));
2978 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN)); 3483 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (CORO_PRIO_MIN));
2979
2980 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
2981 coro_ready[i] = newAV ();
2982 3484
2983 { 3485 {
2984 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 3486 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
2985 3487
2986 coroapi.schedule = api_schedule; 3488 coroapi.schedule = api_schedule;
3489 coroapi.schedule_to = api_schedule_to;
2987 coroapi.cede = api_cede; 3490 coroapi.cede = api_cede;
2988 coroapi.cede_notself = api_cede_notself; 3491 coroapi.cede_notself = api_cede_notself;
2989 coroapi.ready = api_ready; 3492 coroapi.ready = api_ready;
2990 coroapi.is_ready = api_is_ready; 3493 coroapi.is_ready = api_is_ready;
2991 coroapi.nready = coro_nready; 3494 coroapi.nready = coro_nready;
… …
2995 sv_setiv (sv, (IV)&coroapi); 3498 sv_setiv (sv, (IV)&coroapi);
2996 SvREADONLY_on (sv); 3499 SvREADONLY_on (sv);
2997 } 3500 }
2998} 3501}
2999 3502
3503SV *
3504async (...)
3505 PROTOTYPE: &@
3506 CODE:
3507 RETVAL = coro_new (aTHX_ coro_stash, &ST (0), items, 1);
3508 api_ready (aTHX_ RETVAL);
3509 OUTPUT:
3510 RETVAL
3511
3512void
3513terminate (...)
3514 CODE:
3515 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3516
3000void 3517void
3001schedule (...) 3518schedule (...)
3002 CODE: 3519 CODE:
3003 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3520 CORO_EXECUTE_SLF_XS (slf_init_schedule);
3521
3522void
3523schedule_to (...)
3524 CODE:
3525 CORO_EXECUTE_SLF_XS (slf_init_schedule_to);
3526
3527void
3528cede_to (...)
3529 CODE:
3530 CORO_EXECUTE_SLF_XS (slf_init_cede_to);
3004 3531
3005void 3532void
3006cede (...) 3533cede (...)
3007 CODE: 3534 CODE:
3008 CORO_EXECUTE_SLF_XS (slf_init_cede); 3535 CORO_EXECUTE_SLF_XS (slf_init_cede);
… …
3022void 3549void
3023_set_readyhook (SV *hook) 3550_set_readyhook (SV *hook)
3024 PROTOTYPE: $ 3551 PROTOTYPE: $
3025 CODE: 3552 CODE:
3026 SvREFCNT_dec (coro_readyhook); 3553 SvREFCNT_dec (coro_readyhook);
3554 SvGETMAGIC (hook);
3555 if (SvOK (hook))
3556 {
3027 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0; 3557 coro_readyhook = newSVsv (hook);
3558 CORO_READYHOOK = invoke_sv_ready_hook_helper;
3559 }
3560 else
3561 {
3562 coro_readyhook = 0;
3563 CORO_READYHOOK = 0;
3564 }
3028 3565
3029int 3566int
3030prio (Coro::State coro, int newprio = 0) 3567prio (Coro::State coro, int newprio = 0)
3031 PROTOTYPE: $;$ 3568 PROTOTYPE: $;$
3032 ALIAS: 3569 ALIAS:
… …
3038 if (items > 1) 3575 if (items > 1)
3039 { 3576 {
3040 if (ix) 3577 if (ix)
3041 newprio = coro->prio - newprio; 3578 newprio = coro->prio - newprio;
3042 3579
3043 if (newprio < PRIO_MIN) newprio = PRIO_MIN; 3580 if (newprio < CORO_PRIO_MIN) newprio = CORO_PRIO_MIN;
3044 if (newprio > PRIO_MAX) newprio = PRIO_MAX; 3581 if (newprio > CORO_PRIO_MAX) newprio = CORO_PRIO_MAX;
3045 3582
3046 coro->prio = newprio; 3583 coro->prio = newprio;
3047 } 3584 }
3048} 3585}
3049 OUTPUT: 3586 OUTPUT:
… …
3064 RETVAL = coro_nready; 3601 RETVAL = coro_nready;
3065 OUTPUT: 3602 OUTPUT:
3066 RETVAL 3603 RETVAL
3067 3604
3068void 3605void
3606suspend (Coro::State self)
3607 PROTOTYPE: $
3608 CODE:
3609 self->flags |= CF_SUSPENDED;
3610
3611void
3612resume (Coro::State self)
3613 PROTOTYPE: $
3614 CODE:
3615 self->flags &= ~CF_SUSPENDED;
3616
3617void
3069_pool_handler (...) 3618_pool_handler (...)
3070 CODE: 3619 CODE:
3071 CORO_EXECUTE_SLF_XS (slf_init_pool_handler); 3620 CORO_EXECUTE_SLF_XS (slf_init_pool_handler);
3072 3621
3073void 3622void
… …
3084 for (i = 1; i < items; ++i) 3633 for (i = 1; i < items; ++i)
3085 av_push (av, SvREFCNT_inc_NN (ST (i))); 3634 av_push (av, SvREFCNT_inc_NN (ST (i)));
3086 3635
3087 if ((SV *)hv == &PL_sv_undef) 3636 if ((SV *)hv == &PL_sv_undef)
3088 { 3637 {
3089 PUSHMARK (SP); 3638 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3090 EXTEND (SP, 2);
3091 PUSHs (sv_Coro);
3092 PUSHs ((SV *)cv_pool_handler);
3093 PUTBACK;
3094 call_sv ((SV *)cv_coro_new, G_SCALAR);
3095 SPAGAIN;
3096
3097 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs)); 3639 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
3640 SvREFCNT_dec (sv);
3098 } 3641 }
3099 3642
3100 { 3643 {
3101 struct coro *coro = SvSTATE_hv (hv); 3644 struct coro *coro = SvSTATE_hv (hv);
3102 3645
… …
3126rouse_wait (...) 3669rouse_wait (...)
3127 PROTOTYPE: ;$ 3670 PROTOTYPE: ;$
3128 PPCODE: 3671 PPCODE:
3129 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait); 3672 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait);
3130 3673
3674void
3675on_enter (SV *block)
3676 ALIAS:
3677 on_leave = 1
3678 PROTOTYPE: &
3679 CODE:
3680{
3681 struct coro *coro = SvSTATE_current;
3682 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3683
3684 block = s_get_cv_croak (block);
3685
3686 if (!*avp)
3687 *avp = newAV ();
3688
3689 av_push (*avp, SvREFCNT_inc (block));
3690
3691 if (!ix)
3692 on_enterleave_call (aTHX_ block);
3693
3694 LEAVE; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
3695 SAVEDESTRUCTOR_X (ix ? coro_pop_on_leave : coro_pop_on_enter, (void *)coro);
3696 ENTER; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
3697}
3698
3131 3699
3132MODULE = Coro::State PACKAGE = PerlIO::cede 3700MODULE = Coro::State PACKAGE = PerlIO::cede
3133 3701
3134BOOT: 3702BOOT:
3135 PerlIO_define_layer (aTHX_ &PerlIO_cede); 3703 PerlIO_define_layer (aTHX_ &PerlIO_cede);
… …
3138MODULE = Coro::State PACKAGE = Coro::Semaphore 3706MODULE = Coro::State PACKAGE = Coro::Semaphore
3139 3707
3140SV * 3708SV *
3141new (SV *klass, SV *count = 0) 3709new (SV *klass, SV *count = 0)
3142 CODE: 3710 CODE:
3711{
3712 int semcnt = 1;
3713
3714 if (count)
3715 {
3716 SvGETMAGIC (count);
3717
3718 if (SvOK (count))
3719 semcnt = SvIV (count);
3720 }
3721
3143 RETVAL = sv_bless ( 3722 RETVAL = sv_bless (
3144 coro_waitarray_new (aTHX_ count && SvOK (count) ? SvIV (count) : 1), 3723 coro_waitarray_new (aTHX_ semcnt),
3145 GvSTASH (CvGV (cv)) 3724 GvSTASH (CvGV (cv))
3146 ); 3725 );
3726}
3147 OUTPUT: 3727 OUTPUT:
3148 RETVAL 3728 RETVAL
3149 3729
3150# helper for Coro::Channel 3730# helper for Coro::Channel and others
3151SV * 3731SV *
3152_alloc (int count) 3732_alloc (int count)
3153 CODE: 3733 CODE:
3154 RETVAL = coro_waitarray_new (aTHX_ count); 3734 RETVAL = coro_waitarray_new (aTHX_ count);
3155 OUTPUT: 3735 OUTPUT:
… …
3213 for (i = 1; i <= wcount; ++i) 3793 for (i = 1; i <= wcount; ++i)
3214 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i]))); 3794 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i])));
3215 } 3795 }
3216} 3796}
3217 3797
3798MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3799
3800void
3801_may_delete (SV *sem, int count, int extra_refs)
3802 PPCODE:
3803{
3804 AV *av = (AV *)SvRV (sem);
3805
3806 if (SvREFCNT ((SV *)av) == 1 + extra_refs
3807 && AvFILLp (av) == 0 /* no waiters, just count */
3808 && SvIV (AvARRAY (av)[0]) == count)
3809 XSRETURN_YES;
3810
3811 XSRETURN_NO;
3812}
3813
3218MODULE = Coro::State PACKAGE = Coro::Signal 3814MODULE = Coro::State PACKAGE = Coro::Signal
3219 3815
3220SV * 3816SV *
3221new (SV *klass) 3817new (SV *klass)
3222 CODE: 3818 CODE:
… …
3293 3889
3294void 3890void
3295_register (char *target, char *proto, SV *req) 3891_register (char *target, char *proto, SV *req)
3296 CODE: 3892 CODE:
3297{ 3893{
3298 CV *req_cv = coro_sv_2cv (aTHX_ req); 3894 SV *req_cv = s_get_cv_croak (req);
3299 /* newXSproto doesn't return the CV on 5.8 */ 3895 /* newXSproto doesn't return the CV on 5.8 */
3300 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 3896 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3301 sv_setpv ((SV *)slf_cv, proto); 3897 sv_setpv ((SV *)slf_cv, proto);
3302 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0); 3898 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
3303} 3899}
3304 3900
3901MODULE = Coro::State PACKAGE = Coro::Select
3902
3903void
3904patch_pp_sselect ()
3905 CODE:
3906 if (!coro_old_pp_sselect)
3907 {
3908 coro_select_select = (SV *)get_cv ("Coro::Select::select", 0);
3909 coro_old_pp_sselect = PL_ppaddr [OP_SSELECT];
3910 PL_ppaddr [OP_SSELECT] = coro_pp_sselect;
3911 }
3912
3913void
3914unpatch_pp_sselect ()
3915 CODE:
3916 if (coro_old_pp_sselect)
3917 {
3918 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
3919 coro_old_pp_sselect = 0;
3920 }
3921

Diff Legend

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