ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/Coro/Coro/State.xs
(Generate patch)

Comparing Coro/Coro/State.xs (file contents):
Revision 1.359 by root, Mon Jun 29 05:07:19 2009 UTC vs.
Revision 1.402 by root, Sun May 22 13:07:23 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#ifndef Newx
107# define Newx(ptr,nitems,type) New (0,ptr,nitems,type)
108#endif
109
110/* 5.8.7 */
111#ifndef SvRV_set
112# define SvRV_set(s,v) SvRV(s) = (v)
113#endif
114
115#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 66#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
116# undef CORO_STACKGUARD 67# undef CORO_STACKGUARD
117#endif 68#endif
118 69
119#ifndef CORO_STACKGUARD 70#ifndef CORO_STACKGUARD
170# define CORO_CLOCK_THREAD_CPUTIME_ID 3 121# define CORO_CLOCK_THREAD_CPUTIME_ID 3
171# endif 122# endif
172#endif 123#endif
173 124
174static 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]);
175 127
176/* we hijack an hopefully unused CV flag for our purposes */ 128/* we hijack an hopefully unused CV flag for our purposes */
177#define CVf_SLF 0x4000 129#define CVf_SLF 0x4000
178static OP *pp_slf (pTHX); 130static OP *pp_slf (pTHX);
131static void slf_destroy (pTHX_ struct coro *coro);
179 132
180static U32 cctx_gen; 133static U32 cctx_gen;
181static size_t cctx_stacksize = CORO_STACKSIZE; 134static size_t cctx_stacksize = CORO_STACKSIZE;
182static struct CoroAPI coroapi; 135static struct CoroAPI coroapi;
183static AV *main_mainstack; /* used to differentiate between $main and others */ 136static AV *main_mainstack; /* used to differentiate between $main and others */
200static SV *sv_pool_size; 153static SV *sv_pool_size;
201static SV *sv_async_pool_idle; /* description string */ 154static SV *sv_async_pool_idle; /* description string */
202static AV *av_async_pool; /* idle pool */ 155static AV *av_async_pool; /* idle pool */
203static SV *sv_Coro; /* class string */ 156static SV *sv_Coro; /* class string */
204static CV *cv_pool_handler; 157static CV *cv_pool_handler;
205static CV *cv_coro_state_new;
206 158
207/* Coro::AnyEvent */ 159/* Coro::AnyEvent */
208static SV *sv_activity; 160static SV *sv_activity;
209 161
210/* enable processtime/realtime profiling */ 162/* enable processtime/realtime profiling */
211static char profile_times; 163static char enable_times;
212typedef U32 coro_ts[2]; 164typedef U32 coro_ts[2];
165static coro_ts time_real, time_cpu;
166static char times_valid;
213 167
214static struct coro_cctx *cctx_first; 168static struct coro_cctx *cctx_first;
215static int cctx_count, cctx_idle; 169static int cctx_count, cctx_idle;
216 170
217enum { 171enum
172{
218 CC_MAPPED = 0x01, 173 CC_MAPPED = 0x01,
219 CC_NOREUSE = 0x02, /* throw this away after tracing */ 174 CC_NOREUSE = 0x02, /* throw this away after tracing */
220 CC_TRACE = 0x04, 175 CC_TRACE = 0x04,
221 CC_TRACE_SUB = 0x08, /* trace sub calls */ 176 CC_TRACE_SUB = 0x08, /* trace sub calls */
222 CC_TRACE_LINE = 0x10, /* trace each statement */ 177 CC_TRACE_LINE = 0x10, /* trace each statement */
243 int valgrind_id; 198 int valgrind_id;
244#endif 199#endif
245 unsigned char flags; 200 unsigned char flags;
246} coro_cctx; 201} coro_cctx;
247 202
248coro_cctx *cctx_current; /* the currently running cctx */ 203static coro_cctx *cctx_current; /* the currently running cctx */
249 204
250/*****************************************************************************/ 205/*****************************************************************************/
251 206
207static MGVTBL coro_state_vtbl;
208
252enum { 209enum
210{
253 CF_RUNNING = 0x0001, /* coroutine is running */ 211 CF_RUNNING = 0x0001, /* coroutine is running */
254 CF_READY = 0x0002, /* coroutine is ready */ 212 CF_READY = 0x0002, /* coroutine is ready */
255 CF_NEW = 0x0004, /* has never been switched to */ 213 CF_NEW = 0x0004, /* has never been switched to */
256 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 214 CF_ZOMBIE = 0x0008, /* coroutine data has been freed */
257 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */ 215 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
216 CF_NOCANCEL = 0x0020, /* cannot cancel, set slf_frame.data to 1 (hackish) */
258}; 217};
259 218
260/* the structure where most of the perl state is stored, overlaid on the cxstack */ 219/* the structure where most of the perl state is stored, overlaid on the cxstack */
261typedef struct 220typedef struct
262{ 221{
268#define VAR(name,type) type name; 227#define VAR(name,type) type name;
269# include "state.h" 228# include "state.h"
270#undef VAR 229#undef VAR
271} perl_slots; 230} perl_slots;
272 231
232// how many context stack entries do we need for perl_slots
273#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT)) 233#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
274 234
275/* this is a structure representing a perl-level coroutine */ 235/* this is a structure representing a perl-level coroutine */
276struct coro { 236struct coro
237{
277 /* the C coroutine allocated to this perl coroutine, if any */ 238 /* the C coroutine allocated to this perl coroutine, if any */
278 coro_cctx *cctx; 239 coro_cctx *cctx;
279 240
280 /* ready queue */ 241 /* ready queue */
281 struct coro *next_ready; 242 struct coro *next_ready;
283 /* state data */ 244 /* state data */
284 struct CoroSLF slf_frame; /* saved slf frame */ 245 struct CoroSLF slf_frame; /* saved slf frame */
285 AV *mainstack; 246 AV *mainstack;
286 perl_slots *slot; /* basically the saved sp */ 247 perl_slots *slot; /* basically the saved sp */
287 248
288 CV *startcv; /* the CV to execute */ 249 CV *startcv; /* the CV to execute */
289 AV *args; /* data associated with this coroutine (initial args) */ 250 AV *args; /* data associated with this coroutine (initial args) */
290 int refcnt; /* coroutines are refcounted, yes */
291 int flags; /* CF_ flags */ 251 int flags; /* CF_ flags */
292 HV *hv; /* the perl hash associated with this coro, if any */ 252 HV *hv; /* the perl hash associated with this coro, if any */
293 void (*on_destroy)(pTHX_ struct coro *coro);
294 253
295 /* statistics */ 254 /* statistics */
296 int usecount; /* number of transfers to this coro */ 255 int usecount; /* number of transfers to this coro */
297 256
298 /* coro process data */ 257 /* coro process data */
299 int prio; 258 int prio;
300 SV *except; /* exception to be thrown */ 259 SV *except; /* exception to be thrown */
301 SV *rouse_cb; 260 SV *rouse_cb; /* last rouse callback */
261 AV *on_destroy; /* callbacks or coros to notify on destroy */
262 AV *status; /* the exit status list */
302 263
303 /* async_pool */ 264 /* async_pool */
304 SV *saved_deffh; 265 SV *saved_deffh;
305 SV *invoke_cb; 266 SV *invoke_cb;
306 AV *invoke_av; 267 AV *invoke_av;
307 268
308 /* on_enter/on_leave */ 269 /* on_enter/on_leave */
309 AV *on_enter; 270 AV *on_enter;
310 AV *on_leave; 271 AV *on_leave;
311 272
273 /* swap_sv */
274 AV *swap_sv;
275
276 /* times */
277 coro_ts t_cpu, t_real;
278
312 /* linked list */ 279 /* linked list */
313 struct coro *next, *prev; 280 struct coro *next, *prev;
314}; 281};
315 282
316typedef struct coro *Coro__State; 283typedef struct coro *Coro__State;
317typedef struct coro *Coro__State_or_hashref; 284typedef struct coro *Coro__State_or_hashref;
318 285
319/* the following variables are effectively part of the perl context */ 286/* the following variables are effectively part of the perl context */
320/* and get copied between struct coro and these variables */ 287/* and get copied between struct coro and these variables */
321/* the mainr easonw e don't support windows process emulation */ 288/* the main reason we don't support windows process emulation */
322static struct CoroSLF slf_frame; /* the current slf frame */ 289static struct CoroSLF slf_frame; /* the current slf frame */
323 290
324/** Coro ********************************************************************/ 291/** Coro ********************************************************************/
325 292
326#define CORO_PRIO_MAX 3 293#define CORO_PRIO_MAX 3
332 299
333/* for Coro.pm */ 300/* for Coro.pm */
334static SV *coro_current; 301static SV *coro_current;
335static SV *coro_readyhook; 302static SV *coro_readyhook;
336static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */ 303static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
337static CV *cv_coro_run, *cv_coro_terminate; 304static CV *cv_coro_run;
338static struct coro *coro_first; 305static struct coro *coro_first;
339#define coro_nready coroapi.nready 306#define coro_nready coroapi.nready
307
308/** Coro::Select ************************************************************/
309
310static OP *(*coro_old_pp_sselect) (pTHX);
311static SV *coro_select_select;
312
313/* horrible hack, but if it works... */
314static OP *
315coro_pp_sselect (pTHX)
316{
317 dSP;
318 PUSHMARK (SP - 4); /* fake argument list */
319 XPUSHs (coro_select_select);
320 PUTBACK;
321
322 /* entersub is an UNOP, select a LISTOP... keep your fingers crossed */
323 PL_op->op_flags |= OPf_STACKED;
324 PL_op->op_private = 0;
325 return PL_ppaddr [OP_ENTERSUB](aTHX);
326}
327
328/** time stuff **************************************************************/
329
330#ifdef HAS_GETTIMEOFDAY
331
332static void
333coro_u2time (pTHX_ UV ret[2])
334{
335 struct timeval tv;
336 gettimeofday (&tv, 0);
337
338 ret [0] = tv.tv_sec;
339 ret [1] = tv.tv_usec;
340}
341
342static double
343coro_nvtime ()
344{
345 struct timeval tv;
346 gettimeofday (&tv, 0);
347
348 return tv.tv_sec + tv.tv_usec * 1e-6;
349}
350
351static void
352time_init (pTHX)
353{
354 nvtime = coro_nvtime;
355 u2time = coro_u2time;
356}
357
358#else
359
360static void
361time_init (pTHX)
362{
363 SV **svp;
364
365 require_pv ("Time/HiRes.pm");
366
367 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
368
369 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
370 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught");
371
372 nvtime = INT2PTR (double (*)(), SvIV (*svp));
373
374 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
375 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
376}
377
378#endif
340 379
341/** lowlevel stuff **********************************************************/ 380/** lowlevel stuff **********************************************************/
342 381
343static SV * 382static SV *
344coro_get_sv (pTHX_ const char *name, int create) 383coro_get_sv (pTHX_ const char *name, int create)
368 get_hv (name, create); 407 get_hv (name, create);
369#endif 408#endif
370 return get_hv (name, create); 409 return get_hv (name, create);
371} 410}
372 411
373/* may croak */ 412INLINE void
374INLINE CV * 413coro_times_update ()
375coro_sv_2cv (pTHX_ SV *sv)
376{ 414{
377 HV *st; 415#ifdef coro_clock_gettime
378 GV *gvp; 416 struct timespec ts;
379 CV *cv = sv_2cv (sv, &st, &gvp, 0);
380 417
381 if (!cv) 418 ts.tv_sec = ts.tv_nsec = 0;
382 croak ("code reference expected"); 419 coro_clock_gettime (CORO_CLOCK_THREAD_CPUTIME_ID, &ts);
420 time_cpu [0] = ts.tv_sec; time_cpu [1] = ts.tv_nsec;
383 421
384 return cv; 422 ts.tv_sec = ts.tv_nsec = 0;
423 coro_clock_gettime (CORO_CLOCK_MONOTONIC, &ts);
424 time_real [0] = ts.tv_sec; time_real [1] = ts.tv_nsec;
425#else
426 dTHX;
427 UV tv[2];
428
429 u2time (aTHX_ tv);
430 time_real [0] = tv [0];
431 time_real [1] = tv [1] * 1000;
432#endif
433}
434
435INLINE void
436coro_times_add (struct coro *c)
437{
438 c->t_real [1] += time_real [1];
439 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
440 c->t_real [0] += time_real [0];
441
442 c->t_cpu [1] += time_cpu [1];
443 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
444 c->t_cpu [0] += time_cpu [0];
445}
446
447INLINE void
448coro_times_sub (struct coro *c)
449{
450 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; }
451 c->t_real [1] -= time_real [1];
452 c->t_real [0] -= time_real [0];
453
454 if (c->t_cpu [1] < time_cpu [1]) { c->t_cpu [1] += 1000000000; --c->t_cpu [0]; }
455 c->t_cpu [1] -= time_cpu [1];
456 c->t_cpu [0] -= time_cpu [0];
385} 457}
386 458
387/*****************************************************************************/ 459/*****************************************************************************/
388/* magic glue */ 460/* magic glue */
389 461
401 : 0) 473 : 0)
402 474
403#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv) 475#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
404#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state) 476#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
405 477
478INLINE MAGIC *
479SvSTATEhv_p (pTHX_ SV *coro)
480{
481 MAGIC *mg;
482
483 if (expect_true (
484 SvTYPE (coro) == SVt_PVHV
485 && (mg = CORO_MAGIC_state (coro))
486 && mg->mg_virtual == &coro_state_vtbl
487 ))
488 return mg;
489
490 return 0;
491}
492
406INLINE struct coro * 493INLINE struct coro *
407SvSTATE_ (pTHX_ SV *coro) 494SvSTATE_ (pTHX_ SV *coro)
408{ 495{
409 HV *stash;
410 MAGIC *mg; 496 MAGIC *mg;
411 497
412 if (SvROK (coro)) 498 if (SvROK (coro))
413 coro = SvRV (coro); 499 coro = SvRV (coro);
414 500
415 if (expect_false (SvTYPE (coro) != SVt_PVHV)) 501 mg = SvSTATEhv_p (aTHX_ coro);
502 if (!mg)
416 croak ("Coro::State object required"); 503 croak ("Coro::State object required");
417 504
418 stash = SvSTASH (coro);
419 if (expect_false (stash != coro_stash && stash != coro_state_stash))
420 {
421 /* very slow, but rare, check */
422 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
423 croak ("Coro::State object required");
424 }
425
426 mg = CORO_MAGIC_state (coro);
427 return (struct coro *)mg->mg_ptr; 505 return (struct coro *)mg->mg_ptr;
428} 506}
429 507
430#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 508#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
431 509
492 AV *padlist; 570 AV *padlist;
493 AV *av = (AV *)mg->mg_obj; 571 AV *av = (AV *)mg->mg_obj;
494 572
495 /* perl manages to free our internal AV and _then_ call us */ 573 /* perl manages to free our internal AV and _then_ call us */
496 if (IN_DESTRUCT) 574 if (IN_DESTRUCT)
497 return; 575 return 0;
498 576
499 /* casting is fun. */ 577 /* casting is fun. */
500 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 578 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
501 free_padlist (aTHX_ padlist); 579 free_padlist (aTHX_ padlist);
502 580
551 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 629 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
552} 630}
553 631
554/** load & save, init *******************************************************/ 632/** load & save, init *******************************************************/
555 633
634/* swap sv heads, at least logically */
635static void
636swap_svs (pTHX_ Coro__State c)
637{
638 int i;
639
640 for (i = 0; i <= AvFILLp (c->swap_sv); )
641 {
642 SV *a = AvARRAY (c->swap_sv)[i++];
643 SV *b = AvARRAY (c->swap_sv)[i++];
644
645 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
646 SV tmp;
647
648 /* swap sv_any */
649 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
650
651 /* swap sv_flags */
652 SvFLAGS (&tmp) = SvFLAGS (a);
653 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
654 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
655
656#if PERL_VERSION_ATLEAST (5,10,0)
657 /* perl 5.10 complicates this _quite_ a bit, but it also is
658 * much faster, so no quarrels here. alternatively, we could
659 * sv_upgrade to avoid this.
660 */
661 {
662 /* swap sv_u */
663 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
664
665 /* if SvANY points to the head, we need to adjust the pointers,
666 * as the pointer for a still points to b, and maybe vice versa.
667 */
668 #define svany_in_head(type) \
669 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
670
671 if (svany_in_head (SvTYPE (a)))
672 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
673
674 if (svany_in_head (SvTYPE (b)))
675 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
676 }
677#endif
678 }
679}
680
681#define SWAP_SVS(coro) \
682 if (expect_false ((coro)->swap_sv)) \
683 swap_svs (aTHX_ (coro))
684
556static void 685static void
557on_enterleave_call (pTHX_ SV *cb); 686on_enterleave_call (pTHX_ SV *cb);
558 687
559static void 688static void
560load_perl (pTHX_ Coro__State c) 689load_perl (pTHX_ Coro__State c)
591 } 720 }
592 721
593 slf_frame = c->slf_frame; 722 slf_frame = c->slf_frame;
594 CORO_THROW = c->except; 723 CORO_THROW = c->except;
595 724
725 if (expect_false (enable_times))
726 {
727 if (expect_false (!times_valid))
728 coro_times_update ();
729
730 coro_times_sub (c);
731 }
732
596 if (expect_false (c->on_enter)) 733 if (expect_false (c->on_enter))
597 { 734 {
598 int i; 735 int i;
599 736
600 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 737 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
601 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 738 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
602 } 739 }
740
741 SWAP_SVS (c);
603} 742}
604 743
605static void 744static void
606save_perl (pTHX_ Coro__State c) 745save_perl (pTHX_ Coro__State c)
607{ 746{
747 SWAP_SVS (c);
748
608 if (expect_false (c->on_leave)) 749 if (expect_false (c->on_leave))
609 { 750 {
610 int i; 751 int i;
611 752
612 for (i = AvFILLp (c->on_leave); i >= 0; --i) 753 for (i = AvFILLp (c->on_leave); i >= 0; --i)
613 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]); 754 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
755 }
756
757 times_valid = 0;
758
759 if (expect_false (enable_times))
760 {
761 coro_times_update (); times_valid = 1;
762 coro_times_add (c);
614 } 763 }
615 764
616 c->except = CORO_THROW; 765 c->except = CORO_THROW;
617 c->slf_frame = slf_frame; 766 c->slf_frame = slf_frame;
618 767
662 811
663 PUTBACK; 812 PUTBACK;
664 } 813 }
665 814
666 /* allocate some space on the context stack for our purposes */ 815 /* allocate some space on the context stack for our purposes */
667 /* we manually unroll here, as usually 2 slots is enough */ 816 if (expect_false (cxstack_ix + SLOT_COUNT >= cxstack_max))
668 if (SLOT_COUNT >= 1) CXINC;
669 if (SLOT_COUNT >= 2) CXINC;
670 if (SLOT_COUNT >= 3) CXINC;
671 { 817 {
672 int i; 818 unsigned int i;
819
673 for (i = 3; i < SLOT_COUNT; ++i) 820 for (i = 0; i < SLOT_COUNT; ++i)
674 CXINC; 821 CXINC;
675 } 822
676 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 823 cxstack_ix -= SLOT_COUNT; /* undo allocation */
824 }
677 825
678 c->mainstack = PL_mainstack; 826 c->mainstack = PL_mainstack;
679 827
680 { 828 {
681 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 829 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
702# define coro_init_stacks(thx) init_stacks () 850# define coro_init_stacks(thx) init_stacks ()
703#else 851#else
704static void 852static void
705coro_init_stacks (pTHX) 853coro_init_stacks (pTHX)
706{ 854{
707 PL_curstackinfo = new_stackinfo(32, 8); 855 PL_curstackinfo = new_stackinfo(32, 4 + SLOT_COUNT); /* 3 is minimum due to perl rounding down in scope.c:GROW() */
708 PL_curstackinfo->si_type = PERLSI_MAIN; 856 PL_curstackinfo->si_type = PERLSI_MAIN;
709 PL_curstack = PL_curstackinfo->si_stack; 857 PL_curstack = PL_curstackinfo->si_stack;
710 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 858 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
711 859
712 PL_stack_base = AvARRAY(PL_curstack); 860 PL_stack_base = AvARRAY(PL_curstack);
819#endif 967#endif
820 968
821/* 969/*
822 * This overrides the default magic get method of %SIG elements. 970 * This overrides the default magic get method of %SIG elements.
823 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook 971 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
824 * and instead of trying to save and restore the hash elements, we just provide 972 * and instead of trying to save and restore the hash elements (extremely slow),
825 * readback here. 973 * we just provide our own readback here.
826 */ 974 */
827static int 975static int
828coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 976coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
829{ 977{
830 const char *s = MgPV_nolen_const (mg); 978 const char *s = MgPV_nolen_const (mg);
911slf_check_repeat (pTHX_ struct CoroSLF *frame) 1059slf_check_repeat (pTHX_ struct CoroSLF *frame)
912{ 1060{
913 return 1; 1061 return 1;
914} 1062}
915 1063
916static UNOP coro_setup_op; 1064static UNOP init_perl_op;
917 1065
918static void NOINLINE /* noinline to keep it out of the transfer fast path */ 1066static void NOINLINE /* noinline to keep it out of the transfer fast path */
919coro_setup (pTHX_ struct coro *coro) 1067init_perl (pTHX_ struct coro *coro)
920{ 1068{
921 /* 1069 /*
922 * emulate part of the perl startup here. 1070 * emulate part of the perl startup here.
923 */ 1071 */
924 coro_init_stacks (aTHX); 1072 coro_init_stacks (aTHX);
931 PL_comppad_name_fill = 0; 1079 PL_comppad_name_fill = 0;
932 PL_comppad_name_floor = 0; 1080 PL_comppad_name_floor = 0;
933 PL_curpm = 0; 1081 PL_curpm = 0;
934 PL_curpad = 0; 1082 PL_curpad = 0;
935 PL_localizing = 0; 1083 PL_localizing = 0;
936 PL_dirty = 0;
937 PL_restartop = 0; 1084 PL_restartop = 0;
938#if PERL_VERSION_ATLEAST (5,10,0) 1085#if PERL_VERSION_ATLEAST (5,10,0)
939 PL_parser = 0; 1086 PL_parser = 0;
940#endif 1087#endif
941 PL_hints = 0; 1088 PL_hints = 0;
942 1089
943 /* recreate the die/warn hooks */ 1090 /* recreate the die/warn hooks */
944 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1091 PL_diehook = SvREFCNT_inc (rv_diehook);
945 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1092 PL_warnhook = SvREFCNT_inc (rv_warnhook);
946 1093
947 GvSV (PL_defgv) = newSV (0); 1094 GvSV (PL_defgv) = newSV (0);
948 GvAV (PL_defgv) = coro->args; coro->args = 0; 1095 GvAV (PL_defgv) = coro->args; coro->args = 0;
949 GvSV (PL_errgv) = newSV (0); 1096 GvSV (PL_errgv) = newSV (0);
950 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1097 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
971 /* this newly created coroutine might be run on an existing cctx which most 1118 /* this newly created coroutine might be run on an existing cctx which most
972 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here. 1119 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
973 */ 1120 */
974 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1121 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
975 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */ 1122 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
1123 slf_frame.destroy = 0;
976 1124
977 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1125 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */
978 coro_setup_op.op_next = PL_op; 1126 init_perl_op.op_next = PL_op;
979 coro_setup_op.op_type = OP_ENTERSUB; 1127 init_perl_op.op_type = OP_ENTERSUB;
980 coro_setup_op.op_ppaddr = pp_slf; 1128 init_perl_op.op_ppaddr = pp_slf;
981 /* no flags etc. required, as an init function won't be called */ 1129 /* no flags etc. required, as an init function won't be called */
982 1130
983 PL_op = (OP *)&coro_setup_op; 1131 PL_op = (OP *)&init_perl_op;
984 1132
985 /* copy throw, in case it was set before coro_setup */ 1133 /* copy throw, in case it was set before init_perl */
986 CORO_THROW = coro->except; 1134 CORO_THROW = coro->except;
1135
1136 SWAP_SVS (coro);
1137
1138 if (expect_false (enable_times))
1139 {
1140 coro_times_update ();
1141 coro_times_sub (coro);
1142 }
987} 1143}
988 1144
989static void 1145static void
990coro_unwind_stacks (pTHX) 1146coro_unwind_stacks (pTHX)
991{ 1147{
1006 dounwind (-1); 1162 dounwind (-1);
1007 } 1163 }
1008} 1164}
1009 1165
1010static void 1166static void
1011coro_destruct_perl (pTHX_ struct coro *coro) 1167destroy_perl (pTHX_ struct coro *coro)
1012{ 1168{
1013 SV *svf [9]; 1169 SV *svf [9];
1014 1170
1015 { 1171 {
1172 SV *old_current = SvRV (coro_current);
1016 struct coro *current = SvSTATE_current; 1173 struct coro *current = SvSTATE (old_current);
1017 1174
1018 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack)); 1175 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1019 1176
1020 save_perl (aTHX_ current); 1177 save_perl (aTHX_ current);
1178
1179 /* this will cause transfer_check to croak on block*/
1180 SvRV_set (coro_current, (SV *)coro->hv);
1181
1021 load_perl (aTHX_ coro); 1182 load_perl (aTHX_ coro);
1022 1183
1023 coro_unwind_stacks (aTHX); 1184 coro_unwind_stacks (aTHX);
1185
1186 /* restore swapped sv's */
1187 SWAP_SVS (coro);
1188
1024 coro_destruct_stacks (aTHX); 1189 coro_destruct_stacks (aTHX);
1025 1190
1026 // now save some sv's to be free'd later 1191 // now save some sv's to be free'd later
1027 svf [0] = GvSV (PL_defgv); 1192 svf [0] = GvSV (PL_defgv);
1028 svf [1] = (SV *)GvAV (PL_defgv); 1193 svf [1] = (SV *)GvAV (PL_defgv);
1033 svf [6] = (SV *)GvHV (PL_hintgv); 1198 svf [6] = (SV *)GvHV (PL_hintgv);
1034 svf [7] = PL_diehook; 1199 svf [7] = PL_diehook;
1035 svf [8] = PL_warnhook; 1200 svf [8] = PL_warnhook;
1036 assert (9 == sizeof (svf) / sizeof (*svf)); 1201 assert (9 == sizeof (svf) / sizeof (*svf));
1037 1202
1203 SvRV_set (coro_current, old_current);
1204
1038 load_perl (aTHX_ current); 1205 load_perl (aTHX_ current);
1039 } 1206 }
1040 1207
1041 { 1208 {
1042 int i; 1209 unsigned int i;
1043 1210
1044 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i) 1211 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i)
1045 SvREFCNT_dec (svf [i]); 1212 SvREFCNT_dec (svf [i]);
1046 1213
1047 SvREFCNT_dec (coro->saved_deffh); 1214 SvREFCNT_dec (coro->saved_deffh);
1054INLINE void 1221INLINE void
1055free_coro_mortal (pTHX) 1222free_coro_mortal (pTHX)
1056{ 1223{
1057 if (expect_true (coro_mortal)) 1224 if (expect_true (coro_mortal))
1058 { 1225 {
1059 SvREFCNT_dec (coro_mortal); 1226 SvREFCNT_dec ((SV *)coro_mortal);
1060 coro_mortal = 0; 1227 coro_mortal = 0;
1061 } 1228 }
1062} 1229}
1063 1230
1064static int 1231static int
1253 /* somebody or something will hit me for both perl_run and PL_restartop */ 1420 /* somebody or something will hit me for both perl_run and PL_restartop */
1254 PL_restartop = PL_op; 1421 PL_restartop = PL_op;
1255 perl_run (PL_curinterp); 1422 perl_run (PL_curinterp);
1256 /* 1423 /*
1257 * Unfortunately, there is no way to get at the return values of the 1424 * Unfortunately, there is no way to get at the return values of the
1258 * coro body here, as perl_run destroys these 1425 * coro body here, as perl_run destroys these. Likewise, we cannot catch
1426 * runtime errors here, as this is just a random interpreter, not a thread.
1259 */ 1427 */
1260 1428
1261 /* 1429 /*
1262 * If perl-run returns we assume exit() was being called or the coro 1430 * If perl-run returns we assume exit() was being called or the coro
1263 * fell off the end, which seems to be the only valid (non-bug) 1431 * fell off the end, which seems to be the only valid (non-bug)
1350cctx_destroy (coro_cctx *cctx) 1518cctx_destroy (coro_cctx *cctx)
1351{ 1519{
1352 if (!cctx) 1520 if (!cctx)
1353 return; 1521 return;
1354 1522
1355 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary? 1523 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1356 1524
1357 --cctx_count; 1525 --cctx_count;
1358 coro_destroy (&cctx->cctx); 1526 coro_destroy (&cctx->cctx);
1359 1527
1360 /* coro_transfer creates new, empty cctx's */ 1528 /* coro_transfer creates new, empty cctx's */
1426 if (expect_true (prev != next)) 1594 if (expect_true (prev != next))
1427 { 1595 {
1428 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1596 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1429 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,"); 1597 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1430 1598
1431 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED))) 1599 if (expect_false (next->flags & (CF_RUNNING | CF_ZOMBIE | CF_SUSPENDED)))
1432 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,"); 1600 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1433 1601
1434#if !PERL_VERSION_ATLEAST (5,10,0) 1602#if !PERL_VERSION_ATLEAST (5,10,0)
1435 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1603 if (expect_false (PL_lex_state != LEX_NOTPARSING))
1436 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,"); 1604 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1470 if (expect_false (next->flags & CF_NEW)) 1638 if (expect_false (next->flags & CF_NEW))
1471 { 1639 {
1472 /* need to start coroutine */ 1640 /* need to start coroutine */
1473 next->flags &= ~CF_NEW; 1641 next->flags &= ~CF_NEW;
1474 /* setup coroutine call */ 1642 /* setup coroutine call */
1475 coro_setup (aTHX_ next); 1643 init_perl (aTHX_ next);
1476 } 1644 }
1477 else 1645 else
1478 load_perl (aTHX_ next); 1646 load_perl (aTHX_ next);
1479 1647
1480 /* possibly untie and reuse the cctx */ 1648 /* possibly untie and reuse the cctx */
1519#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx)) 1687#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1520#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1688#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1521 1689
1522/** high level stuff ********************************************************/ 1690/** high level stuff ********************************************************/
1523 1691
1692/* this function is actually Coro, not Coro::State, but we call it from here */
1693/* because it is convenient - but it hasn't been declared yet for that reason */
1524static int 1694static void
1695coro_call_on_destroy (pTHX_ struct coro *coro);
1696
1697static void
1525coro_state_destroy (pTHX_ struct coro *coro) 1698coro_state_destroy (pTHX_ struct coro *coro)
1526{ 1699{
1527 if (coro->flags & CF_DESTROYED) 1700 if (coro->flags & CF_ZOMBIE)
1528 return 0; 1701 return;
1529 1702
1530 if (coro->on_destroy && !PL_dirty)
1531 coro->on_destroy (aTHX_ coro); 1703 slf_destroy (aTHX_ coro);
1532 1704
1533 coro->flags |= CF_DESTROYED; 1705 coro->flags |= CF_ZOMBIE;
1534 1706
1535 if (coro->flags & CF_READY) 1707 if (coro->flags & CF_READY)
1536 { 1708 {
1537 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1709 /* reduce nready, as destroying a ready coro effectively unreadies it */
1538 /* alternative: look through all ready queues and remove the coro */ 1710 /* alternative: look through all ready queues and remove the coro */
1539 --coro_nready; 1711 --coro_nready;
1540 } 1712 }
1541 else 1713 else
1542 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1714 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1715
1716 if (coro->next) coro->next->prev = coro->prev;
1717 if (coro->prev) coro->prev->next = coro->next;
1718 if (coro == coro_first) coro_first = coro->next;
1543 1719
1544 if (coro->mainstack 1720 if (coro->mainstack
1545 && coro->mainstack != main_mainstack 1721 && coro->mainstack != main_mainstack
1546 && coro->slot 1722 && coro->slot
1547 && !PL_dirty) 1723 && !PL_dirty)
1548 coro_destruct_perl (aTHX_ coro); 1724 destroy_perl (aTHX_ coro);
1549 1725
1550 cctx_destroy (coro->cctx); 1726 cctx_destroy (coro->cctx);
1551 SvREFCNT_dec (coro->startcv); 1727 SvREFCNT_dec (coro->startcv);
1552 SvREFCNT_dec (coro->args); 1728 SvREFCNT_dec (coro->args);
1729 SvREFCNT_dec (coro->swap_sv);
1553 SvREFCNT_dec (CORO_THROW); 1730 SvREFCNT_dec (CORO_THROW);
1554 1731
1555 if (coro->next) coro->next->prev = coro->prev; 1732 coro_call_on_destroy (aTHX_ coro);
1556 if (coro->prev) coro->prev->next = coro->next;
1557 if (coro == coro_first) coro_first = coro->next;
1558 1733
1559 return 1; 1734 /* more destruction mayhem in coro_state_free */
1560} 1735}
1561 1736
1562static int 1737static int
1563coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1738coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1564{ 1739{
1565 struct coro *coro = (struct coro *)mg->mg_ptr; 1740 struct coro *coro = (struct coro *)mg->mg_ptr;
1566 mg->mg_ptr = 0; 1741 mg->mg_ptr = 0;
1567 1742
1568 coro->hv = 0;
1569
1570 if (--coro->refcnt < 0)
1571 {
1572 coro_state_destroy (aTHX_ coro); 1743 coro_state_destroy (aTHX_ coro);
1744 SvREFCNT_dec (coro->on_destroy);
1745 SvREFCNT_dec (coro->status);
1746
1573 Safefree (coro); 1747 Safefree (coro);
1574 }
1575 1748
1576 return 0; 1749 return 0;
1577} 1750}
1578 1751
1579static int 1752static int
1580coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1753coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1581{ 1754{
1582 struct coro *coro = (struct coro *)mg->mg_ptr; 1755 /* called when perl clones the current process the slow way (windows process emulation) */
1583 1756 /* WE SIMply nuke the pointers in the copy, causing perl to croak */
1584 ++coro->refcnt; 1757 mg->mg_ptr = 0;
1758 mg->mg_virtual = 0;
1585 1759
1586 return 0; 1760 return 0;
1587} 1761}
1588 1762
1589static MGVTBL coro_state_vtbl = { 1763static MGVTBL coro_state_vtbl = {
1612 1786
1613 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1787 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1614 TRANSFER (ta, 1); 1788 TRANSFER (ta, 1);
1615} 1789}
1616 1790
1617/*****************************************************************************/
1618/* gensub: simple closure generation utility */
1619
1620#define GENSUB_ARG CvXSUBANY (cv).any_ptr
1621
1622/* create a closure from XS, returns a code reference */
1623/* the arg can be accessed via GENSUB_ARG from the callback */
1624/* the callback must use dXSARGS/XSRETURN */
1625static SV *
1626gensub (pTHX_ void (*xsub)(pTHX_ CV *), void *arg)
1627{
1628 CV *cv = (CV *)newSV (0);
1629
1630 sv_upgrade ((SV *)cv, SVt_PVCV);
1631
1632 CvANON_on (cv);
1633 CvISXSUB_on (cv);
1634 CvXSUB (cv) = xsub;
1635 GENSUB_ARG = arg;
1636
1637 return newRV_noinc ((SV *)cv);
1638}
1639
1640/** Coro ********************************************************************/ 1791/** Coro ********************************************************************/
1641 1792
1642INLINE void 1793INLINE void
1643coro_enq (pTHX_ struct coro *coro) 1794coro_enq (pTHX_ struct coro *coro)
1644{ 1795{
1669 } 1820 }
1670 1821
1671 return 0; 1822 return 0;
1672} 1823}
1673 1824
1825static void
1826invoke_sv_ready_hook_helper (void)
1827{
1828 dTHX;
1829 dSP;
1830
1831 ENTER;
1832 SAVETMPS;
1833
1834 PUSHMARK (SP);
1835 PUTBACK;
1836 call_sv (coro_readyhook, G_VOID | G_DISCARD);
1837
1838 FREETMPS;
1839 LEAVE;
1840}
1841
1674static int 1842static int
1675api_ready (pTHX_ SV *coro_sv) 1843api_ready (pTHX_ SV *coro_sv)
1676{ 1844{
1677 struct coro *coro;
1678 SV *sv_hook;
1679 void (*xs_hook)(void);
1680
1681 coro = SvSTATE (coro_sv); 1845 struct coro *coro = SvSTATE (coro_sv);
1682 1846
1683 if (coro->flags & CF_READY) 1847 if (coro->flags & CF_READY)
1684 return 0; 1848 return 0;
1685 1849
1686 coro->flags |= CF_READY; 1850 coro->flags |= CF_READY;
1687 1851
1688 sv_hook = coro_nready ? 0 : coro_readyhook;
1689 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1690
1691 coro_enq (aTHX_ coro); 1852 coro_enq (aTHX_ coro);
1692 ++coro_nready;
1693 1853
1694 if (sv_hook) 1854 if (!coro_nready++)
1695 { 1855 if (coroapi.readyhook)
1696 dSP; 1856 coroapi.readyhook ();
1697
1698 ENTER;
1699 SAVETMPS;
1700
1701 PUSHMARK (SP);
1702 PUTBACK;
1703 call_sv (sv_hook, G_VOID | G_DISCARD);
1704
1705 FREETMPS;
1706 LEAVE;
1707 }
1708
1709 if (xs_hook)
1710 xs_hook ();
1711 1857
1712 return 1; 1858 return 1;
1713} 1859}
1714 1860
1715static int 1861static int
1743 struct coro *next = coro_deq (aTHX); 1889 struct coro *next = coro_deq (aTHX);
1744 1890
1745 if (expect_true (next)) 1891 if (expect_true (next))
1746 { 1892 {
1747 /* cannot transfer to destroyed coros, skip and look for next */ 1893 /* cannot transfer to destroyed coros, skip and look for next */
1748 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED))) 1894 if (expect_false (next->flags & (CF_ZOMBIE | CF_SUSPENDED)))
1749 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */ 1895 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1750 else 1896 else
1751 { 1897 {
1752 next->flags &= ~CF_READY; 1898 next->flags &= ~CF_READY;
1753 --coro_nready; 1899 --coro_nready;
1760 { 1906 {
1761 /* nothing to schedule: call the idle handler */ 1907 /* nothing to schedule: call the idle handler */
1762 if (SvROK (sv_idle) 1908 if (SvROK (sv_idle)
1763 && SvOBJECT (SvRV (sv_idle))) 1909 && SvOBJECT (SvRV (sv_idle)))
1764 { 1910 {
1911 if (SvRV (sv_idle) == SvRV (coro_current))
1912 croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught");
1913
1765 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 1914 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1766 api_ready (aTHX_ SvRV (sv_idle)); 1915 api_ready (aTHX_ SvRV (sv_idle));
1767 --coro_nready; 1916 --coro_nready;
1768 } 1917 }
1769 else 1918 else
1770 { 1919 {
1920 /* TODO: deprecated, remove, cannot work reliably *//*D*/
1771 dSP; 1921 dSP;
1772 1922
1773 ENTER; 1923 ENTER;
1774 SAVETMPS; 1924 SAVETMPS;
1775 1925
1882 coro->slot->runops = RUNOPS_DEFAULT; 2032 coro->slot->runops = RUNOPS_DEFAULT;
1883 } 2033 }
1884} 2034}
1885 2035
1886static void 2036static void
2037coro_push_av (pTHX_ AV *av, I32 gimme_v)
2038{
2039 if (AvFILLp (av) >= 0 && gimme_v != G_VOID)
2040 {
2041 dSP;
2042
2043 if (gimme_v == G_SCALAR)
2044 XPUSHs (AvARRAY (av)[AvFILLp (av)]);
2045 else
2046 {
2047 int i;
2048 EXTEND (SP, AvFILLp (av) + 1);
2049
2050 for (i = 0; i <= AvFILLp (av); ++i)
2051 PUSHs (AvARRAY (av)[i]);
2052 }
2053
2054 PUTBACK;
2055 }
2056}
2057
2058static void
2059coro_push_on_destroy (pTHX_ struct coro *coro, SV *cb)
2060{
2061 if (!coro->on_destroy)
2062 coro->on_destroy = newAV ();
2063
2064 av_push (coro->on_destroy, cb);
2065}
2066
2067static void
2068slf_destroy_join (pTHX_ struct CoroSLF *frame)
2069{
2070 SvREFCNT_dec ((SV *)((struct coro *)frame->data)->hv);
2071}
2072
2073static int
2074slf_check_join (pTHX_ struct CoroSLF *frame)
2075{
2076 struct coro *coro = (struct coro *)frame->data;
2077
2078 if (!coro->status)
2079 return 1;
2080
2081 frame->destroy = 0;
2082
2083 coro_push_av (aTHX_ coro->status, GIMME_V);
2084
2085 SvREFCNT_dec ((SV *)coro->hv);
2086
2087 return 0;
2088}
2089
2090static void
2091slf_init_join (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2092{
2093 struct coro *coro = SvSTATE (items > 0 ? arg [0] : &PL_sv_undef);
2094
2095 if (items > 1)
2096 croak ("join called with too many arguments");
2097
2098 if (coro->status)
2099 frame->prepare = prepare_nop;
2100 else
2101 {
2102 coro_push_on_destroy (aTHX_ coro, SvREFCNT_inc_NN (SvRV (coro_current)));
2103 frame->prepare = prepare_schedule;
2104 }
2105
2106 frame->check = slf_check_join;
2107 frame->destroy = slf_destroy_join;
2108 frame->data = (void *)coro;
2109 SvREFCNT_inc (coro->hv);
2110}
2111
2112static void
1887coro_call_on_destroy (pTHX_ struct coro *coro) 2113coro_call_on_destroy (pTHX_ struct coro *coro)
1888{ 2114{
1889 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2115 AV *od = coro->on_destroy;
1890 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1891 2116
1892 if (on_destroyp) 2117 if (!od)
1893 { 2118 return;
1894 AV *on_destroy = (AV *)SvRV (*on_destroyp);
1895 2119
1896 while (AvFILLp (on_destroy) >= 0) 2120 while (AvFILLp (od) >= 0)
2121 {
2122 SV *cb = sv_2mortal (av_pop (od));
2123
2124 /* coro hv's (and only hv's at the moment) are supported as well */
2125 if (SvSTATEhv_p (aTHX_ cb))
2126 api_ready (aTHX_ cb);
2127 else
1897 { 2128 {
1898 dSP; /* don't disturb outer sp */ 2129 dSP; /* don't disturb outer sp */
1899 SV *cb = av_pop (on_destroy);
1900
1901 PUSHMARK (SP); 2130 PUSHMARK (SP);
1902 2131
1903 if (statusp) 2132 if (coro->status)
1904 { 2133 {
1905 int i; 2134 PUTBACK;
1906 AV *status = (AV *)SvRV (*statusp); 2135 coro_push_av (aTHX_ coro->status, G_ARRAY);
1907 EXTEND (SP, AvFILLp (status) + 1); 2136 SPAGAIN;
1908
1909 for (i = 0; i <= AvFILLp (status); ++i)
1910 PUSHs (AvARRAY (status)[i]);
1911 } 2137 }
1912 2138
1913 PUTBACK; 2139 PUTBACK;
1914 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD); 2140 call_sv (cb, G_VOID | G_DISCARD);
1915 } 2141 }
1916 } 2142 }
1917} 2143}
1918 2144
1919static void 2145static void
1920slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2146coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
1921{ 2147{
2148 AV *av;
2149
2150 if (coro->status)
2151 {
2152 av = coro->status;
2153 av_clear (av);
2154 }
2155 else
2156 av = coro->status = newAV ();
2157
2158 /* items are actually not so common, so optimise for this case */
2159 if (items)
2160 {
1922 int i; 2161 int i;
1923 HV *hv = (HV *)SvRV (coro_current);
1924 AV *av = newAV ();
1925 2162
1926 av_extend (av, items - 1); 2163 av_extend (av, items - 1);
2164
1927 for (i = 0; i < items; ++i) 2165 for (i = 0; i < items; ++i)
1928 av_push (av, SvREFCNT_inc_NN (arg [i])); 2166 av_push (av, SvREFCNT_inc_NN (arg [i]));
2167 }
2168}
1929 2169
1930 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 2170static void
1931 2171slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2172{
1932 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */ 2173 av_push (av_destroy, (SV *)newRV_inc ((SV *)coro_hv)); /* RVinc for perl */
1933 api_ready (aTHX_ sv_manager); 2174 api_ready (aTHX_ sv_manager);
1934 2175
1935 frame->prepare = prepare_schedule; 2176 frame->prepare = prepare_schedule;
1936 frame->check = slf_check_repeat; 2177 frame->check = slf_check_repeat;
1937 2178
1938 /* as a minor optimisation, we could unwind all stacks here */ 2179 /* as a minor optimisation, we could unwind all stacks here */
1939 /* but that puts extra pressure on pp_slf, and is not worth much */ 2180 /* but that puts extra pressure on pp_slf, and is not worth much */
1940 /*coro_unwind_stacks (aTHX);*/ 2181 /*coro_unwind_stacks (aTHX);*/
2182}
2183
2184static void
2185slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2186{
2187 HV *coro_hv = (HV *)SvRV (coro_current);
2188
2189 coro_set_status (aTHX_ SvSTATE ((SV *)coro_hv), arg, items);
2190 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2191}
2192
2193static void
2194slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2195{
2196 HV *coro_hv;
2197 struct coro *coro;
2198
2199 if (items <= 0)
2200 croak ("Coro::cancel called without coro object,");
2201
2202 coro = SvSTATE (arg [0]);
2203 coro_hv = coro->hv;
2204
2205 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2206
2207 if (expect_false (coro->flags & CF_NOCANCEL))
2208 {
2209 /* coro currently busy cancelling something, so just notify it */
2210 coro->slf_frame.data = (void *)coro;
2211
2212 frame->prepare = prepare_nop;
2213 frame->check = slf_check_nop;
2214 }
2215 else if (coro_hv == (HV *)SvRV (coro_current))
2216 {
2217 /* cancelling the current coro is allowed, and equals terminate */
2218 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2219 }
2220 else
2221 {
2222 struct coro *self = SvSTATE_current;
2223
2224 /* otherwise we cancel directly, purely for speed reasons
2225 * unfortunately, this requires some magic trickery, as
2226 * somebody else could cancel us, so we have to fight the cancellation.
2227 * this is ugly, and hopefully fully worth the extra speed.
2228 * besides, I can't get the slow-but-safe version working...
2229 */
2230 slf_frame.data = 0;
2231 self->flags |= CF_NOCANCEL;
2232 coro_state_destroy (aTHX_ coro);
2233 self->flags &= ~CF_NOCANCEL;
2234
2235 if (slf_frame.data)
2236 {
2237 /* while we were busy we have been cancelled, so terminate */
2238 slf_init_terminate_cancel_common (aTHX_ frame, self->hv);
2239 }
2240 else
2241 {
2242 frame->prepare = prepare_nop;
2243 frame->check = slf_check_nop;
2244 }
2245 }
2246}
2247
2248static int
2249slf_check_safe_cancel (pTHX_ struct CoroSLF *frame)
2250{
2251 frame->prepare = 0;
2252 coro_unwind_stacks (aTHX);
2253
2254 slf_init_terminate_cancel_common (aTHX_ frame, (HV *)SvRV (coro_current));
2255
2256 return 1;
2257}
2258
2259static int
2260safe_cancel (pTHX_ struct coro *coro, SV **arg, int items)
2261{
2262 if (coro->cctx)
2263 croak ("coro inside C callback, unable to cancel at this time, caught");
2264
2265 if (coro->flags & CF_NEW)
2266 {
2267 coro_set_status (aTHX_ coro, arg, items);
2268 coro_state_destroy (aTHX_ coro);
2269 }
2270 else
2271 {
2272 if (!coro->slf_frame.prepare)
2273 croak ("coro outside an SLF function, unable to cancel at this time, caught");
2274
2275 slf_destroy (aTHX_ coro);
2276
2277 coro_set_status (aTHX_ coro, arg, items);
2278 coro->slf_frame.prepare = prepare_nop;
2279 coro->slf_frame.check = slf_check_safe_cancel;
2280
2281 api_ready (aTHX_ (SV *)coro->hv);
2282 }
2283
2284 return 1;
1941} 2285}
1942 2286
1943/*****************************************************************************/ 2287/*****************************************************************************/
1944/* async pool handler */ 2288/* async pool handler */
1945 2289
1985 coro->saved_deffh = 0; 2329 coro->saved_deffh = 0;
1986 2330
1987 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 2331 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
1988 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2332 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1989 { 2333 {
1990 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate); 2334 slf_init_terminate_cancel_common (aTHX_ frame, hv);
1991 coro->invoke_av = newAV (); 2335 return;
1992
1993 frame->prepare = prepare_nop;
1994 } 2336 }
1995 else 2337 else
1996 { 2338 {
1997 av_clear (GvAV (PL_defgv)); 2339 av_clear (GvAV (PL_defgv));
1998 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2340 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
2023 2365
2024static void 2366static void
2025coro_rouse_callback (pTHX_ CV *cv) 2367coro_rouse_callback (pTHX_ CV *cv)
2026{ 2368{
2027 dXSARGS; 2369 dXSARGS;
2028 SV *data = (SV *)GENSUB_ARG; 2370 SV *data = (SV *)S_GENSUB_ARG;
2029 2371
2030 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2372 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2031 { 2373 {
2032 /* first call, set args */ 2374 /* first call, set args */
2033 SV *coro = SvRV (data); 2375 SV *coro = SvRV (data);
2099 || SvTYPE (SvRV (cb)) != SVt_PVCV 2441 || SvTYPE (SvRV (cb)) != SVt_PVCV
2100 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2442 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2101 croak ("Coro::rouse_wait called with illegal callback argument,"); 2443 croak ("Coro::rouse_wait called with illegal callback argument,");
2102 2444
2103 { 2445 {
2104 CV *cv = (CV *)SvRV (cb); /* for GENSUB_ARG */ 2446 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
2105 SV *data = (SV *)GENSUB_ARG; 2447 SV *data = (SV *)S_GENSUB_ARG;
2106 2448
2107 frame->data = (void *)data; 2449 frame->data = (void *)data;
2108 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule; 2450 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
2109 frame->check = slf_check_rouse_wait; 2451 frame->check = slf_check_rouse_wait;
2110 } 2452 }
2114coro_new_rouse_cb (pTHX) 2456coro_new_rouse_cb (pTHX)
2115{ 2457{
2116 HV *hv = (HV *)SvRV (coro_current); 2458 HV *hv = (HV *)SvRV (coro_current);
2117 struct coro *coro = SvSTATE_hv (hv); 2459 struct coro *coro = SvSTATE_hv (hv);
2118 SV *data = newRV_inc ((SV *)hv); 2460 SV *data = newRV_inc ((SV *)hv);
2119 SV *cb = gensub (aTHX_ coro_rouse_callback, (void *)data); 2461 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
2120 2462
2121 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0); 2463 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0);
2122 SvREFCNT_dec (data); /* magicext increases the refcount */ 2464 SvREFCNT_dec (data); /* magicext increases the refcount */
2123 2465
2124 SvREFCNT_dec (coro->rouse_cb); 2466 SvREFCNT_dec (coro->rouse_cb);
2221static void 2563static void
2222slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2564slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2223{ 2565{
2224 frame->prepare = prepare_cede_notself; 2566 frame->prepare = prepare_cede_notself;
2225 frame->check = slf_check_nop; 2567 frame->check = slf_check_nop;
2568}
2569
2570/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2571static void
2572slf_destroy (pTHX_ struct coro *coro)
2573{
2574 /* this callback is reserved for slf functions needing to do cleanup */
2575 if (coro->slf_frame.destroy && coro->slf_frame.prepare && !PL_dirty)
2576 coro->slf_frame.destroy (aTHX_ &coro->slf_frame);
2577
2578 /*
2579 * The on_destroy above most likely is from an SLF call.
2580 * Since by definition the SLF call will not finish when we destroy
2581 * the coro, we will have to force-finish it here, otherwise
2582 * cleanup functions cannot call SLF functions.
2583 */
2584 coro->slf_frame.prepare = 0;
2226} 2585}
2227 2586
2228/* 2587/*
2229 * these not obviously related functions are all rolled into one 2588 * these not obviously related functions are all rolled into one
2230 * function to increase chances that they all will call transfer with the same 2589 * function to increase chances that they all will call transfer with the same
2299 croak (0); 2658 croak (0);
2300 } 2659 }
2301 2660
2302 /* return value handling - mostly like entersub */ 2661 /* return value handling - mostly like entersub */
2303 /* make sure we put something on the stack in scalar context */ 2662 /* make sure we put something on the stack in scalar context */
2304 if (GIMME_V == G_SCALAR) 2663 if (GIMME_V == G_SCALAR
2664 && expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2305 { 2665 {
2306 dSP; 2666 dSP;
2307 SV **bot = PL_stack_base + checkmark; 2667 SV **bot = PL_stack_base + checkmark;
2308 2668
2309 if (sp == bot) /* too few, push undef */ 2669 if (sp == bot) /* too few, push undef */
2310 bot [1] = &PL_sv_undef; 2670 bot [1] = &PL_sv_undef;
2311 else if (sp != bot + 1) /* too many, take last one */ 2671 else /* too many, take last one */
2312 bot [1] = *sp; 2672 bot [1] = *sp;
2313 2673
2314 SP = bot + 1; 2674 SP = bot + 1;
2315 2675
2316 PUTBACK; 2676 PUTBACK;
2349 if (PL_op->op_flags & OPf_STACKED) 2709 if (PL_op->op_flags & OPf_STACKED)
2350 { 2710 {
2351 if (items > slf_arga) 2711 if (items > slf_arga)
2352 { 2712 {
2353 slf_arga = items; 2713 slf_arga = items;
2354 free (slf_argv); 2714 Safefree (slf_argv);
2355 slf_argv = malloc (slf_arga * sizeof (SV *)); 2715 New (0, slf_argv, slf_arga, SV *);
2356 } 2716 }
2357 2717
2358 slf_argc = items; 2718 slf_argc = items;
2359 2719
2360 for (i = 0; i < items; ++i) 2720 for (i = 0; i < items; ++i)
2556 SvREFCNT_dec (cb); 2916 SvREFCNT_dec (cb);
2557 } 2917 }
2558} 2918}
2559 2919
2560static void 2920static void
2561coro_semaphore_on_destroy (pTHX_ struct coro *coro) 2921coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2562{ 2922{
2563 /* call $sem->adjust (0) to possibly wake up some other waiters */ 2923 /* call $sem->adjust (0) to possibly wake up some other waiters */
2564 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 2924 coro_semaphore_adjust (aTHX_ (AV *)frame->data, 0);
2565} 2925}
2566 2926
2567static int 2927static int
2568slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire) 2928slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2569{ 2929{
2570 AV *av = (AV *)frame->data; 2930 AV *av = (AV *)frame->data;
2571 SV *count_sv = AvARRAY (av)[0]; 2931 SV *count_sv = AvARRAY (av)[0];
2932 SV *coro_hv = SvRV (coro_current);
2572 2933
2573 /* if we are about to throw, don't actually acquire the lock, just throw */ 2934 /* if we are about to throw, don't actually acquire the lock, just throw */
2574 if (CORO_THROW) 2935 if (CORO_THROW)
2575 return 0; 2936 return 0;
2576 else if (SvIVX (count_sv) > 0) 2937 else if (SvIVX (count_sv) > 0)
2577 { 2938 {
2578 SvSTATE_current->on_destroy = 0; 2939 frame->destroy = 0;
2579 2940
2580 if (acquire) 2941 if (acquire)
2581 SvIVX (count_sv) = SvIVX (count_sv) - 1; 2942 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2582 else 2943 else
2583 coro_semaphore_adjust (aTHX_ av, 0); 2944 coro_semaphore_adjust (aTHX_ av, 0);
2588 { 2949 {
2589 int i; 2950 int i;
2590 /* if we were woken up but can't down, we look through the whole */ 2951 /* if we were woken up but can't down, we look through the whole */
2591 /* waiters list and only add us if we aren't in there already */ 2952 /* waiters list and only add us if we aren't in there already */
2592 /* this avoids some degenerate memory usage cases */ 2953 /* this avoids some degenerate memory usage cases */
2593 2954 for (i = AvFILLp (av); i > 0; --i) // i > 0 is not an off-by-one bug
2594 for (i = 1; i <= AvFILLp (av); ++i)
2595 if (AvARRAY (av)[i] == SvRV (coro_current)) 2955 if (AvARRAY (av)[i] == coro_hv)
2596 return 1; 2956 return 1;
2597 2957
2598 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2958 av_push (av, SvREFCNT_inc (coro_hv));
2599 return 1; 2959 return 1;
2600 } 2960 }
2601} 2961}
2602 2962
2603static int 2963static int
2626 { 2986 {
2627 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2987 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2628 2988
2629 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 2989 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2630 frame->prepare = prepare_schedule; 2990 frame->prepare = prepare_schedule;
2631
2632 /* to avoid race conditions when a woken-up coro gets terminated */ 2991 /* to avoid race conditions when a woken-up coro gets terminated */
2633 /* we arrange for a temporary on_destroy that calls adjust (0) */ 2992 /* we arrange for a temporary on_destroy that calls adjust (0) */
2634 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 2993 frame->destroy = coro_semaphore_destroy;
2635 } 2994 }
2636} 2995}
2637 2996
2638static void 2997static void
2639slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2998slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2647{ 3006{
2648 if (items >= 2) 3007 if (items >= 2)
2649 { 3008 {
2650 /* callback form */ 3009 /* callback form */
2651 AV *av = (AV *)SvRV (arg [0]); 3010 AV *av = (AV *)SvRV (arg [0]);
2652 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 3011 SV *cb_cv = s_get_cv_croak (arg [1]);
2653 3012
2654 av_push (av, SvREFCNT_inc_NN (cb_cv)); 3013 av_push (av, SvREFCNT_inc_NN (cb_cv));
2655 3014
2656 if (SvIVX (AvARRAY (av)[0]) > 0) 3015 if (SvIVX (AvARRAY (av)[0]) > 0)
2657 coro_semaphore_adjust (aTHX_ av, 0); 3016 coro_semaphore_adjust (aTHX_ av, 0);
2717{ 3076{
2718 AV *av = (AV *)SvRV (arg [0]); 3077 AV *av = (AV *)SvRV (arg [0]);
2719 3078
2720 if (items >= 2) 3079 if (items >= 2)
2721 { 3080 {
2722 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 3081 SV *cb_cv = s_get_cv_croak (arg [1]);
2723 av_push (av, SvREFCNT_inc_NN (cb_cv)); 3082 av_push (av, SvREFCNT_inc_NN (cb_cv));
2724 3083
2725 if (SvIVX (AvARRAY (av)[0])) 3084 if (SvIVX (AvARRAY (av)[0]))
2726 coro_signal_wake (aTHX_ av, 1); /* ust be the only waiter */ 3085 coro_signal_wake (aTHX_ av, 1); /* must be the only waiter */
2727 3086
2728 frame->prepare = prepare_nop; 3087 frame->prepare = prepare_nop;
2729 frame->check = slf_check_nop; 3088 frame->check = slf_check_nop;
2730 } 3089 }
2731 else if (SvIVX (AvARRAY (av)[0])) 3090 else if (SvIVX (AvARRAY (av)[0]))
2762 3121
2763static void 3122static void
2764coro_aio_callback (pTHX_ CV *cv) 3123coro_aio_callback (pTHX_ CV *cv)
2765{ 3124{
2766 dXSARGS; 3125 dXSARGS;
2767 AV *state = (AV *)GENSUB_ARG; 3126 AV *state = (AV *)S_GENSUB_ARG;
2768 SV *coro = av_pop (state); 3127 SV *coro = av_pop (state);
2769 SV *data_sv = newSV (sizeof (struct io_state)); 3128 SV *data_sv = newSV (sizeof (struct io_state));
2770 3129
2771 av_extend (state, items - 1); 3130 av_extend (state, items - 1);
2772 3131
2886 3245
2887 for (i = 0; i < items; ++i) 3246 for (i = 0; i < items; ++i)
2888 PUSHs (arg [i]); 3247 PUSHs (arg [i]);
2889 3248
2890 /* now push the callback closure */ 3249 /* now push the callback closure */
2891 PUSHs (sv_2mortal (gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state)))); 3250 PUSHs (sv_2mortal (s_gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state))));
2892 3251
2893 /* now call the AIO function - we assume our request is uncancelable */ 3252 /* now call the AIO function - we assume our request is uncancelable */
2894 PUTBACK; 3253 PUTBACK;
2895 call_sv ((SV *)req, G_VOID | G_DISCARD); 3254 call_sv ((SV *)req, G_VOID | G_DISCARD);
2896 } 3255 }
2897 3256
2898 /* now that the requets is going, we loop toll we have a result */ 3257 /* now that the request is going, we loop till we have a result */
2899 frame->data = (void *)state; 3258 frame->data = (void *)state;
2900 frame->prepare = prepare_schedule; 3259 frame->prepare = prepare_schedule;
2901 frame->check = slf_check_aio_req; 3260 frame->check = slf_check_aio_req;
2902} 3261}
2903 3262
2914/*****************************************************************************/ 3273/*****************************************************************************/
2915 3274
2916#if CORO_CLONE 3275#if CORO_CLONE
2917# include "clone.c" 3276# include "clone.c"
2918#endif 3277#endif
3278
3279/*****************************************************************************/
3280
3281static SV *
3282coro_new (pTHX_ HV *stash, SV **argv, int argc, int is_coro)
3283{
3284 SV *coro_sv;
3285 struct coro *coro;
3286 MAGIC *mg;
3287 HV *hv;
3288 SV *cb;
3289 int i;
3290
3291 if (argc > 0)
3292 {
3293 cb = s_get_cv_croak (argv [0]);
3294
3295 if (!is_coro)
3296 {
3297 if (CvISXSUB (cb))
3298 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
3299
3300 if (!CvROOT (cb))
3301 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
3302 }
3303 }
3304
3305 Newz (0, coro, 1, struct coro);
3306 coro->args = newAV ();
3307 coro->flags = CF_NEW;
3308
3309 if (coro_first) coro_first->prev = coro;
3310 coro->next = coro_first;
3311 coro_first = coro;
3312
3313 coro->hv = hv = newHV ();
3314 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
3315 mg->mg_flags |= MGf_DUP;
3316 coro_sv = sv_bless (newRV_noinc ((SV *)hv), stash);
3317
3318 if (argc > 0)
3319 {
3320 av_extend (coro->args, argc + is_coro - 1);
3321
3322 if (is_coro)
3323 {
3324 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
3325 cb = (SV *)cv_coro_run;
3326 }
3327
3328 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3329
3330 for (i = 1; i < argc; i++)
3331 av_push (coro->args, newSVsv (argv [i]));
3332 }
3333
3334 return coro_sv;
3335}
2919 3336
2920MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3337MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2921 3338
2922PROTOTYPES: DISABLE 3339PROTOTYPES: DISABLE
2923 3340
2976 coroapi.prepare_nop = prepare_nop; 3393 coroapi.prepare_nop = prepare_nop;
2977 coroapi.prepare_schedule = prepare_schedule; 3394 coroapi.prepare_schedule = prepare_schedule;
2978 coroapi.prepare_cede = prepare_cede; 3395 coroapi.prepare_cede = prepare_cede;
2979 coroapi.prepare_cede_notself = prepare_cede_notself; 3396 coroapi.prepare_cede_notself = prepare_cede_notself;
2980 3397
2981 { 3398 time_init (aTHX);
2982 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
2983
2984 if (!svp) croak ("Time::HiRes is required");
2985 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
2986
2987 nvtime = INT2PTR (double (*)(), SvIV (*svp));
2988 }
2989 3399
2990 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL)); 3400 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
2991} 3401}
2992 3402
2993SV * 3403SV *
2994new (char *klass, ...) 3404new (SV *klass, ...)
2995 ALIAS: 3405 ALIAS:
2996 Coro::new = 1 3406 Coro::new = 1
2997 CODE: 3407 CODE:
2998{ 3408 RETVAL = coro_new (aTHX_ ix ? coro_stash : coro_state_stash, &ST (1), items - 1, ix);
2999 struct coro *coro; 3409 OUTPUT:
3000 MAGIC *mg;
3001 HV *hv;
3002 CV *cb;
3003 int i;
3004
3005 if (items > 1)
3006 {
3007 cb = coro_sv_2cv (aTHX_ ST (1));
3008
3009 if (!ix)
3010 {
3011 if (CvISXSUB (cb))
3012 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
3013
3014 if (!CvROOT (cb))
3015 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
3016 }
3017 }
3018
3019 Newz (0, coro, 1, struct coro);
3020 coro->args = newAV ();
3021 coro->flags = CF_NEW;
3022
3023 if (coro_first) coro_first->prev = coro;
3024 coro->next = coro_first;
3025 coro_first = coro;
3026
3027 coro->hv = hv = newHV ();
3028 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
3029 mg->mg_flags |= MGf_DUP;
3030 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
3031
3032 if (items > 1)
3033 {
3034 av_extend (coro->args, items - 1 + ix - 1);
3035
3036 if (ix)
3037 {
3038 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
3039 cb = cv_coro_run;
3040 }
3041
3042 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3043
3044 for (i = 2; i < items; i++)
3045 av_push (coro->args, newSVsv (ST (i)));
3046 }
3047}
3048 OUTPUT:
3049 RETVAL 3410 RETVAL
3050 3411
3051void 3412void
3052transfer (...) 3413transfer (...)
3053 PROTOTYPE: $$ 3414 PROTOTYPE: $$
3054 CODE: 3415 CODE:
3055 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3416 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3056
3057bool
3058_destroy (SV *coro_sv)
3059 CODE:
3060 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
3061 OUTPUT:
3062 RETVAL
3063 3417
3064void 3418void
3065_exit (int code) 3419_exit (int code)
3066 PROTOTYPE: $ 3420 PROTOTYPE: $
3067 CODE: 3421 CODE:
3143 CODE: 3497 CODE:
3144{ 3498{
3145 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3499 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
3146 { 3500 {
3147 struct coro *current = SvSTATE_current; 3501 struct coro *current = SvSTATE_current;
3502 struct CoroSLF slf_save;
3148 3503
3149 if (current != coro) 3504 if (current != coro)
3150 { 3505 {
3151 PUTBACK; 3506 PUTBACK;
3152 save_perl (aTHX_ current); 3507 save_perl (aTHX_ current);
3153 load_perl (aTHX_ coro); 3508 load_perl (aTHX_ coro);
3509 /* the coro is most likely in an active SLF call.
3510 * while not strictly required (the code we execute is
3511 * not allowed to call any SLF functions), it's cleaner
3512 * to reinitialise the slf_frame and restore it later.
3513 * This might one day allow us to actually do SLF calls
3514 * from code executed here.
3515 */
3516 slf_save = slf_frame;
3517 slf_frame.prepare = 0;
3154 SPAGAIN; 3518 SPAGAIN;
3155 } 3519 }
3156 3520
3157 PUSHSTACK; 3521 PUSHSTACK;
3158 3522
3168 SPAGAIN; 3532 SPAGAIN;
3169 3533
3170 if (current != coro) 3534 if (current != coro)
3171 { 3535 {
3172 PUTBACK; 3536 PUTBACK;
3537 slf_frame = slf_save;
3173 save_perl (aTHX_ coro); 3538 save_perl (aTHX_ coro);
3174 load_perl (aTHX_ current); 3539 load_perl (aTHX_ current);
3175 SPAGAIN; 3540 SPAGAIN;
3176 } 3541 }
3177 } 3542 }
3182 PROTOTYPE: $ 3547 PROTOTYPE: $
3183 ALIAS: 3548 ALIAS:
3184 is_ready = CF_READY 3549 is_ready = CF_READY
3185 is_running = CF_RUNNING 3550 is_running = CF_RUNNING
3186 is_new = CF_NEW 3551 is_new = CF_NEW
3187 is_destroyed = CF_DESTROYED 3552 is_destroyed = CF_ZOMBIE
3553 is_zombie = CF_ZOMBIE
3188 is_suspended = CF_SUSPENDED 3554 is_suspended = CF_SUSPENDED
3189 CODE: 3555 CODE:
3190 RETVAL = boolSV (coro->flags & ix); 3556 RETVAL = boolSV (coro->flags & ix);
3191 OUTPUT: 3557 OUTPUT:
3192 RETVAL 3558 RETVAL
3193 3559
3194void 3560void
3195throw (Coro::State self, SV *throw = &PL_sv_undef) 3561throw (Coro::State self, SV *exception = &PL_sv_undef)
3196 PROTOTYPE: $;$ 3562 PROTOTYPE: $;$
3197 CODE: 3563 CODE:
3198{ 3564{
3199 struct coro *current = SvSTATE_current; 3565 struct coro *current = SvSTATE_current;
3200 SV **throwp = self == current ? &CORO_THROW : &self->except; 3566 SV **exceptionp = self == current ? &CORO_THROW : &self->except;
3201 SvREFCNT_dec (*throwp); 3567 SvREFCNT_dec (*exceptionp);
3202 SvGETMAGIC (throw); 3568 SvGETMAGIC (exception);
3203 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3569 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3204} 3570}
3205 3571
3206void 3572void
3207api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3573api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3208 PROTOTYPE: $;$ 3574 PROTOTYPE: $;$
3263 3629
3264void 3630void
3265cancel (Coro::State self) 3631cancel (Coro::State self)
3266 CODE: 3632 CODE:
3267 coro_state_destroy (aTHX_ self); 3633 coro_state_destroy (aTHX_ self);
3268 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */ 3634
3635SV *
3636enable_times (int enabled = enable_times)
3637 CODE:
3638{
3639 RETVAL = boolSV (enable_times);
3640
3641 if (enabled != enable_times)
3642 {
3643 enable_times = enabled;
3644
3645 coro_times_update ();
3646 (enabled ? coro_times_sub : coro_times_add)(SvSTATE (coro_current));
3647 }
3648}
3649 OUTPUT:
3650 RETVAL
3651
3652void
3653times (Coro::State self)
3654 PPCODE:
3655{
3656 struct coro *current = SvSTATE (coro_current);
3657
3658 if (expect_false (current == self))
3659 {
3660 coro_times_update ();
3661 coro_times_add (SvSTATE (coro_current));
3662 }
3663
3664 EXTEND (SP, 2);
3665 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3666 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3667
3668 if (expect_false (current == self))
3669 coro_times_sub (SvSTATE (coro_current));
3670}
3671
3672void
3673swap_sv (Coro::State coro, SV *sv, SV *swapsv)
3674 CODE:
3675{
3676 struct coro *current = SvSTATE_current;
3677
3678 if (current == coro)
3679 SWAP_SVS (current);
3680
3681 if (!coro->swap_sv)
3682 coro->swap_sv = newAV ();
3683
3684 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv )));
3685 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv)));
3686
3687 if (current == coro)
3688 SWAP_SVS (current);
3689}
3269 3690
3270 3691
3271MODULE = Coro::State PACKAGE = Coro 3692MODULE = Coro::State PACKAGE = Coro
3272 3693
3273BOOT: 3694BOOT:
3274{ 3695{
3275 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3696 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3276 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3697 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3277 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 3698 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3278 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3279 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 3699 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3280 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 3700 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3281 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 3701 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3282 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 3702 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3283 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 3703 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3284 3704
3285 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3705 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3286 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3706 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3287 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 3707 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3288 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new); 3708 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3289 3709
3290 coro_stash = gv_stashpv ("Coro", TRUE); 3710 coro_stash = gv_stashpv ("Coro", TRUE);
3291 3711
3292 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 3712 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3293 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 3713 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3294 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL)); 3714 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
3312 sv_setiv (sv, (IV)&coroapi); 3732 sv_setiv (sv, (IV)&coroapi);
3313 SvREADONLY_on (sv); 3733 SvREADONLY_on (sv);
3314 } 3734 }
3315} 3735}
3316 3736
3737SV *
3738async (...)
3739 PROTOTYPE: &@
3740 CODE:
3741 RETVAL = coro_new (aTHX_ coro_stash, &ST (0), items, 1);
3742 api_ready (aTHX_ RETVAL);
3743 OUTPUT:
3744 RETVAL
3745
3746void
3747_destroy (Coro::State coro)
3748 CODE:
3749 /* used by the manager thread */
3750 coro_state_destroy (aTHX_ coro);
3751
3752void
3753on_destroy (Coro::State coro, SV *cb)
3754 CODE:
3755 coro_push_on_destroy (aTHX_ coro, newSVsv (cb));
3756
3757void
3758join (...)
3759 CODE:
3760 CORO_EXECUTE_SLF_XS (slf_init_join);
3761
3317void 3762void
3318terminate (...) 3763terminate (...)
3319 CODE: 3764 CODE:
3320 CORO_EXECUTE_SLF_XS (slf_init_terminate); 3765 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3766
3767void
3768cancel (...)
3769 CODE:
3770 CORO_EXECUTE_SLF_XS (slf_init_cancel);
3771
3772int
3773safe_cancel (Coro::State self, ...)
3774 C_ARGS: aTHX_ self, &ST (1), items - 1
3321 3775
3322void 3776void
3323schedule (...) 3777schedule (...)
3324 CODE: 3778 CODE:
3325 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3779 CORO_EXECUTE_SLF_XS (slf_init_schedule);
3355_set_readyhook (SV *hook) 3809_set_readyhook (SV *hook)
3356 PROTOTYPE: $ 3810 PROTOTYPE: $
3357 CODE: 3811 CODE:
3358 SvREFCNT_dec (coro_readyhook); 3812 SvREFCNT_dec (coro_readyhook);
3359 SvGETMAGIC (hook); 3813 SvGETMAGIC (hook);
3814 if (SvOK (hook))
3815 {
3360 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0; 3816 coro_readyhook = newSVsv (hook);
3817 CORO_READYHOOK = invoke_sv_ready_hook_helper;
3818 }
3819 else
3820 {
3821 coro_readyhook = 0;
3822 CORO_READYHOOK = 0;
3823 }
3361 3824
3362int 3825int
3363prio (Coro::State coro, int newprio = 0) 3826prio (Coro::State coro, int newprio = 0)
3364 PROTOTYPE: $;$ 3827 PROTOTYPE: $;$
3365 ALIAS: 3828 ALIAS:
3429 for (i = 1; i < items; ++i) 3892 for (i = 1; i < items; ++i)
3430 av_push (av, SvREFCNT_inc_NN (ST (i))); 3893 av_push (av, SvREFCNT_inc_NN (ST (i)));
3431 3894
3432 if ((SV *)hv == &PL_sv_undef) 3895 if ((SV *)hv == &PL_sv_undef)
3433 { 3896 {
3434 PUSHMARK (SP); 3897 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3435 EXTEND (SP, 2);
3436 PUSHs (sv_Coro);
3437 PUSHs ((SV *)cv_pool_handler);
3438 PUTBACK;
3439 call_sv ((SV *)cv_coro_state_new, G_SCALAR);
3440 SPAGAIN;
3441
3442 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs)); 3898 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
3899 SvREFCNT_dec (sv);
3443 } 3900 }
3444 3901
3445 { 3902 {
3446 struct coro *coro = SvSTATE_hv (hv); 3903 struct coro *coro = SvSTATE_hv (hv);
3447 3904
3481 CODE: 3938 CODE:
3482{ 3939{
3483 struct coro *coro = SvSTATE_current; 3940 struct coro *coro = SvSTATE_current;
3484 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 3941 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3485 3942
3486 block = (SV *)coro_sv_2cv (aTHX_ block); 3943 block = s_get_cv_croak (block);
3487 3944
3488 if (!*avp) 3945 if (!*avp)
3489 *avp = newAV (); 3946 *avp = newAV ();
3490 3947
3491 av_push (*avp, SvREFCNT_inc (block)); 3948 av_push (*avp, SvREFCNT_inc (block));
3691 4148
3692void 4149void
3693_register (char *target, char *proto, SV *req) 4150_register (char *target, char *proto, SV *req)
3694 CODE: 4151 CODE:
3695{ 4152{
3696 CV *req_cv = coro_sv_2cv (aTHX_ req); 4153 SV *req_cv = s_get_cv_croak (req);
3697 /* newXSproto doesn't return the CV on 5.8 */ 4154 /* newXSproto doesn't return the CV on 5.8 */
3698 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 4155 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3699 sv_setpv ((SV *)slf_cv, proto); 4156 sv_setpv ((SV *)slf_cv, proto);
3700 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0); 4157 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
3701} 4158}
3702 4159
4160MODULE = Coro::State PACKAGE = Coro::Select
4161
4162void
4163patch_pp_sselect ()
4164 CODE:
4165 if (!coro_old_pp_sselect)
4166 {
4167 coro_select_select = (SV *)get_cv ("Coro::Select::select", 0);
4168 coro_old_pp_sselect = PL_ppaddr [OP_SSELECT];
4169 PL_ppaddr [OP_SSELECT] = coro_pp_sselect;
4170 }
4171
4172void
4173unpatch_pp_sselect ()
4174 CODE:
4175 if (coro_old_pp_sselect)
4176 {
4177 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
4178 coro_old_pp_sselect = 0;
4179 }
4180

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines