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

Comparing Coro/Coro/State.xs (file contents):
Revision 1.316 by root, Thu Nov 20 06:01:40 2008 UTC vs.
Revision 1.377 by root, Sat Oct 3 17:55:04 2009 UTC

1#define NDEBUG 1
2
1#include "libcoro/coro.c" 3#include "libcoro/coro.c"
2 4
3#define PERL_NO_GET_CONTEXT 5#define PERL_NO_GET_CONTEXT
4#define PERL_EXT 6#define PERL_EXT
5 7
6#include "EXTERN.h" 8#include "EXTERN.h"
7#include "perl.h" 9#include "perl.h"
8#include "XSUB.h" 10#include "XSUB.h"
9#include "perliol.h" 11#include "perliol.h"
10 12
11#include "patchlevel.h" 13#include "schmorp.h"
12 14
13#include <stdio.h> 15#include <stdio.h>
14#include <errno.h> 16#include <errno.h>
15#include <assert.h> 17#include <assert.h>
18
19#ifndef SVs_PADSTALE
20# define SVs_PADSTALE 0
21#endif
16 22
17#ifdef WIN32 23#ifdef WIN32
18# undef setjmp 24# undef setjmp
19# undef longjmp 25# undef longjmp
20# undef _exit 26# undef _exit
51#endif 57#endif
52 58
53/* the maximum number of idle cctx that will be pooled */ 59/* the maximum number of idle cctx that will be pooled */
54static int cctx_max_idle = 4; 60static int cctx_max_idle = 4;
55 61
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 62#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
113# undef CORO_STACKGUARD 63# undef CORO_STACKGUARD
114#endif 64#endif
115 65
116#ifndef CORO_STACKGUARD 66#ifndef CORO_STACKGUARD
130#else 80#else
131# define dSTACKLEVEL volatile void *stacklevel 81# define dSTACKLEVEL volatile void *stacklevel
132# define STACKLEVEL ((void *)&stacklevel) 82# define STACKLEVEL ((void *)&stacklevel)
133#endif 83#endif
134 84
135#define IN_DESTRUCT (PL_main_cv == Nullcv) 85#define IN_DESTRUCT PL_dirty
136 86
137#if __GNUC__ >= 3 87#if __GNUC__ >= 3
138# define attribute(x) __attribute__(x) 88# define attribute(x) __attribute__(x)
139# define expect(expr,value) __builtin_expect ((expr),(value)) 89# define expect(expr,value) __builtin_expect ((expr), (value))
140# define INLINE static inline 90# define INLINE static inline
141#else 91#else
142# define attribute(x) 92# define attribute(x)
143# define expect(expr,value) (expr) 93# define expect(expr,value) (expr)
144# define INLINE static 94# define INLINE static
156# if CORO_PTHREAD 106# if CORO_PTHREAD
157static void *coro_thx; 107static void *coro_thx;
158# endif 108# endif
159#endif 109#endif
160 110
111#ifdef __linux
112# include <time.h> /* for timespec */
113# include <syscall.h> /* for SYS_* */
114# ifdef SYS_clock_gettime
115# define coro_clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
116# define CORO_CLOCK_MONOTONIC 1
117# define CORO_CLOCK_THREAD_CPUTIME_ID 3
118# endif
119#endif
120
161static double (*nvtime)(); /* so why doesn't it take void? */ 121static double (*nvtime)(); /* so why doesn't it take void? */
122static void (*u2time)(pTHX_ UV ret[2]);
162 123
163/* we hijack an hopefully unused CV flag for our purposes */ 124/* we hijack an hopefully unused CV flag for our purposes */
164#define CVf_SLF 0x4000 125#define CVf_SLF 0x4000
165static OP *pp_slf (pTHX); 126static OP *pp_slf (pTHX);
166 127
170static AV *main_mainstack; /* used to differentiate between $main and others */ 131static AV *main_mainstack; /* used to differentiate between $main and others */
171static JMPENV *main_top_env; 132static JMPENV *main_top_env;
172static HV *coro_state_stash, *coro_stash; 133static HV *coro_state_stash, *coro_stash;
173static volatile SV *coro_mortal; /* will be freed/thrown after next transfer */ 134static volatile SV *coro_mortal; /* will be freed/thrown after next transfer */
174 135
136static AV *av_destroy; /* destruction queue */
137static SV *sv_manager; /* the manager coro */
138static SV *sv_idle; /* $Coro::idle */
139
175static GV *irsgv; /* $/ */ 140static GV *irsgv; /* $/ */
176static GV *stdoutgv; /* *STDOUT */ 141static GV *stdoutgv; /* *STDOUT */
177static SV *rv_diehook; 142static SV *rv_diehook;
178static SV *rv_warnhook; 143static SV *rv_warnhook;
179static HV *hv_sig; /* %SIG */ 144static HV *hv_sig; /* %SIG */
180 145
181/* async_pool helper stuff */ 146/* async_pool helper stuff */
182static SV *sv_pool_rss; 147static SV *sv_pool_rss;
183static SV *sv_pool_size; 148static SV *sv_pool_size;
184static SV *sv_async_pool_idle; 149static SV *sv_async_pool_idle; /* description string */
185static AV *av_async_pool; 150static AV *av_async_pool; /* idle pool */
186static SV *sv_Coro; 151static SV *sv_Coro; /* class string */
187static CV *cv_pool_handler; 152static CV *cv_pool_handler;
188static CV *cv_coro_state_new;
189 153
190/* Coro::AnyEvent */ 154/* Coro::AnyEvent */
191static SV *sv_activity; 155static SV *sv_activity;
156
157/* enable processtime/realtime profiling */
158static char enable_times;
159typedef U32 coro_ts[2];
160static coro_ts time_real, time_cpu;
161static char times_valid;
192 162
193static struct coro_cctx *cctx_first; 163static struct coro_cctx *cctx_first;
194static int cctx_count, cctx_idle; 164static int cctx_count, cctx_idle;
195 165
196enum { 166enum {
222 int valgrind_id; 192 int valgrind_id;
223#endif 193#endif
224 unsigned char flags; 194 unsigned char flags;
225} coro_cctx; 195} coro_cctx;
226 196
197coro_cctx *cctx_current; /* the currently running cctx */
198
199/*****************************************************************************/
200
227enum { 201enum {
228 CF_RUNNING = 0x0001, /* coroutine is running */ 202 CF_RUNNING = 0x0001, /* coroutine is running */
229 CF_READY = 0x0002, /* coroutine is ready */ 203 CF_READY = 0x0002, /* coroutine is ready */
230 CF_NEW = 0x0004, /* has never been switched to */ 204 CF_NEW = 0x0004, /* has never been switched to */
231 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 205 CF_DESTROYED = 0x0008, /* coroutine data has been freed */
206 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
232}; 207};
233 208
234/* the structure where most of the perl state is stored, overlaid on the cxstack */ 209/* the structure where most of the perl state is stored, overlaid on the cxstack */
235typedef struct 210typedef struct
236{ 211{
237 SV *defsv; 212 SV *defsv;
238 AV *defav; 213 AV *defav;
239 SV *errsv; 214 SV *errsv;
240 SV *irsgv; 215 SV *irsgv;
216 HV *hinthv;
241#define VAR(name,type) type name; 217#define VAR(name,type) type name;
242# include "state.h" 218# include "state.h"
243#undef VAR 219#undef VAR
244} perl_slots; 220} perl_slots;
245 221
247 223
248/* this is a structure representing a perl-level coroutine */ 224/* this is a structure representing a perl-level coroutine */
249struct coro { 225struct coro {
250 /* the C coroutine allocated to this perl coroutine, if any */ 226 /* the C coroutine allocated to this perl coroutine, if any */
251 coro_cctx *cctx; 227 coro_cctx *cctx;
228
229 /* ready queue */
230 struct coro *next_ready;
252 231
253 /* state data */ 232 /* state data */
254 struct CoroSLF slf_frame; /* saved slf frame */ 233 struct CoroSLF slf_frame; /* saved slf frame */
255 AV *mainstack; 234 AV *mainstack;
256 perl_slots *slot; /* basically the saved sp */ 235 perl_slots *slot; /* basically the saved sp */
273 /* async_pool */ 252 /* async_pool */
274 SV *saved_deffh; 253 SV *saved_deffh;
275 SV *invoke_cb; 254 SV *invoke_cb;
276 AV *invoke_av; 255 AV *invoke_av;
277 256
257 /* on_enter/on_leave */
258 AV *on_enter;
259 AV *on_leave;
260
261 /* swap_sv */
262 AV *swap_sv;
263
264 /* times */
265 coro_ts t_cpu, t_real;
266
278 /* linked list */ 267 /* linked list */
279 struct coro *next, *prev; 268 struct coro *next, *prev;
280}; 269};
281 270
282typedef struct coro *Coro__State; 271typedef struct coro *Coro__State;
287/* the mainr easonw e don't support windows process emulation */ 276/* the mainr easonw e don't support windows process emulation */
288static struct CoroSLF slf_frame; /* the current slf frame */ 277static struct CoroSLF slf_frame; /* the current slf frame */
289 278
290/** Coro ********************************************************************/ 279/** Coro ********************************************************************/
291 280
292#define PRIO_MAX 3 281#define CORO_PRIO_MAX 3
293#define PRIO_HIGH 1 282#define CORO_PRIO_HIGH 1
294#define PRIO_NORMAL 0 283#define CORO_PRIO_NORMAL 0
295#define PRIO_LOW -1 284#define CORO_PRIO_LOW -1
296#define PRIO_IDLE -3 285#define CORO_PRIO_IDLE -3
297#define PRIO_MIN -4 286#define CORO_PRIO_MIN -4
298 287
299/* for Coro.pm */ 288/* for Coro.pm */
300static SV *coro_current; 289static SV *coro_current;
301static SV *coro_readyhook; 290static SV *coro_readyhook;
302static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1]; 291static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
303static CV *cv_coro_run, *cv_coro_terminate; 292static CV *cv_coro_run, *cv_coro_terminate;
304static struct coro *coro_first; 293static struct coro *coro_first;
305#define coro_nready coroapi.nready 294#define coro_nready coroapi.nready
295
296/** Coro::Select ************************************************************/
297
298static OP *(*coro_old_pp_sselect) (pTHX);
299static SV *coro_select_select;
300
301/* horrible hack, but if it works... */
302static OP *
303coro_pp_sselect (pTHX)
304{
305 dSP;
306 PUSHMARK (SP - 4); /* fake argument list */
307 XPUSHs (coro_select_select);
308 PUTBACK;
309
310 /* entersub is an UNOP, select a LISTOP... keep your fingers crossed */
311 PL_op->op_flags |= OPf_STACKED;
312 PL_op->op_private = 0;
313 return PL_ppaddr [OP_ENTERSUB](aTHX);
314}
306 315
307/** lowlevel stuff **********************************************************/ 316/** lowlevel stuff **********************************************************/
308 317
309static SV * 318static SV *
310coro_get_sv (pTHX_ const char *name, int create) 319coro_get_sv (pTHX_ const char *name, int create)
334 get_hv (name, create); 343 get_hv (name, create);
335#endif 344#endif
336 return get_hv (name, create); 345 return get_hv (name, create);
337} 346}
338 347
339/* may croak */ 348INLINE void
340INLINE CV * 349coro_times_update ()
341coro_sv_2cv (pTHX_ SV *sv)
342{ 350{
351#ifdef coro_clock_gettime
352 struct timespec ts;
353
354 ts.tv_sec = ts.tv_nsec = 0;
355 coro_clock_gettime (CORO_CLOCK_THREAD_CPUTIME_ID, &ts);
356 time_cpu [0] = ts.tv_sec; time_cpu [1] = ts.tv_nsec;
357
358 ts.tv_sec = ts.tv_nsec = 0;
359 coro_clock_gettime (CORO_CLOCK_MONOTONIC, &ts);
360 time_real [0] = ts.tv_sec; time_real [1] = ts.tv_nsec;
361#else
362 dTHX;
363 UV tv[2];
364
365 u2time (aTHX_ tv);
366 time_real [0] = tv [0];
367 time_real [1] = tv [1] * 1000;
368#endif
369}
370
371INLINE void
372coro_times_add (struct coro *c)
373{
374 c->t_real [1] += time_real [1];
375 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
376 c->t_real [0] += time_real [0];
377
378 c->t_cpu [1] += time_cpu [1];
379 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
380 c->t_cpu [0] += time_cpu [0];
381}
382
383INLINE void
384coro_times_sub (struct coro *c)
385{
386 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; }
387 c->t_real [1] -= time_real [1];
388 c->t_real [0] -= time_real [0];
389
390 if (c->t_cpu [1] < time_cpu [1]) { c->t_cpu [1] += 1000000000; --c->t_cpu [0]; }
391 c->t_cpu [1] -= time_cpu [1];
392 c->t_cpu [0] -= time_cpu [0];
393}
394
395/*****************************************************************************/
396/* magic glue */
397
398#define CORO_MAGIC_type_cv 26
399#define CORO_MAGIC_type_state PERL_MAGIC_ext
400
401#define CORO_MAGIC_NN(sv, type) \
402 (expect_true (SvMAGIC (sv)->mg_type == type) \
403 ? SvMAGIC (sv) \
404 : mg_find (sv, type))
405
406#define CORO_MAGIC(sv, type) \
407 (expect_true (SvMAGIC (sv)) \
408 ? CORO_MAGIC_NN (sv, type) \
409 : 0)
410
411#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
412#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
413
414INLINE struct coro *
415SvSTATE_ (pTHX_ SV *coro)
416{
343 HV *st; 417 HV *stash;
344 GV *gvp; 418 MAGIC *mg;
345 return sv_2cv (sv, &st, &gvp, 0); 419
420 if (SvROK (coro))
421 coro = SvRV (coro);
422
423 if (expect_false (SvTYPE (coro) != SVt_PVHV))
424 croak ("Coro::State object required");
425
426 stash = SvSTASH (coro);
427 if (expect_false (stash != coro_stash && stash != coro_state_stash))
428 {
429 /* very slow, but rare, check */
430 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
431 croak ("Coro::State object required");
432 }
433
434 mg = CORO_MAGIC_state (coro);
435 return (struct coro *)mg->mg_ptr;
346} 436}
437
438#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
439
440/* faster than SvSTATE, but expects a coroutine hv */
441#define SvSTATE_hv(hv) ((struct coro *)CORO_MAGIC_NN ((SV *)hv, CORO_MAGIC_type_state)->mg_ptr)
442#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
443
444/*****************************************************************************/
445/* padlist management and caching */
347 446
348static AV * 447static AV *
349coro_clone_padlist (pTHX_ CV *cv) 448coro_derive_padlist (pTHX_ CV *cv)
350{ 449{
351 AV *padlist = CvPADLIST (cv); 450 AV *padlist = CvPADLIST (cv);
352 AV *newpadlist, *newpad; 451 AV *newpadlist, *newpad;
353 452
354 newpadlist = newAV (); 453 newpadlist = newAV ();
359 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 458 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
360#endif 459#endif
361 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 460 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
362 --AvFILLp (padlist); 461 --AvFILLp (padlist);
363 462
364 av_store (newpadlist, 0, SvREFCNT_inc_NN (*av_fetch (padlist, 0, FALSE))); 463 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0]));
365 av_store (newpadlist, 1, (SV *)newpad); 464 av_store (newpadlist, 1, (SV *)newpad);
366 465
367 return newpadlist; 466 return newpadlist;
368} 467}
369 468
370static void 469static void
371free_padlist (pTHX_ AV *padlist) 470free_padlist (pTHX_ AV *padlist)
372{ 471{
373 /* may be during global destruction */ 472 /* may be during global destruction */
374 if (SvREFCNT (padlist)) 473 if (!IN_DESTRUCT)
375 { 474 {
376 I32 i = AvFILLp (padlist); 475 I32 i = AvFILLp (padlist);
377 while (i >= 0) 476
477 while (i > 0) /* special-case index 0 */
378 { 478 {
379 SV **svp = av_fetch (padlist, i--, FALSE); 479 /* we try to be extra-careful here */
380 if (svp) 480 AV *av = (AV *)AvARRAY (padlist)[i--];
381 { 481 I32 j = AvFILLp (av);
382 SV *sv; 482
383 while (&PL_sv_undef != (sv = av_pop ((AV *)*svp))) 483 while (j >= 0)
484 SvREFCNT_dec (AvARRAY (av)[j--]);
485
486 AvFILLp (av) = -1;
384 SvREFCNT_dec (sv); 487 SvREFCNT_dec (av);
385
386 SvREFCNT_dec (*svp);
387 }
388 } 488 }
389 489
490 SvREFCNT_dec (AvARRAY (padlist)[0]);
491
492 AvFILLp (padlist) = -1;
390 SvREFCNT_dec ((SV*)padlist); 493 SvREFCNT_dec ((SV*)padlist);
391 } 494 }
392} 495}
393 496
394static int 497static int
395coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 498coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
396{ 499{
397 AV *padlist; 500 AV *padlist;
398 AV *av = (AV *)mg->mg_obj; 501 AV *av = (AV *)mg->mg_obj;
502
503 /* perl manages to free our internal AV and _then_ call us */
504 if (IN_DESTRUCT)
505 return 0;
399 506
400 /* casting is fun. */ 507 /* casting is fun. */
401 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 508 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
402 free_padlist (aTHX_ padlist); 509 free_padlist (aTHX_ padlist);
403 510
404 SvREFCNT_dec (av); /* sv_magicext increased the refcount */ 511 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
405 512
406 return 0; 513 return 0;
407} 514}
408
409#define CORO_MAGIC_type_cv 26
410#define CORO_MAGIC_type_state PERL_MAGIC_ext
411 515
412static MGVTBL coro_cv_vtbl = { 516static MGVTBL coro_cv_vtbl = {
413 0, 0, 0, 0, 517 0, 0, 0, 0,
414 coro_cv_free 518 coro_cv_free
415}; 519};
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 520
460/* the next two functions merely cache the padlists */ 521/* the next two functions merely cache the padlists */
461static void 522static void
462get_padlist (pTHX_ CV *cv) 523get_padlist (pTHX_ CV *cv)
463{ 524{
474 CV *cp = Perl_cv_clone (aTHX_ cv); 535 CV *cp = Perl_cv_clone (aTHX_ cv);
475 CvPADLIST (cv) = CvPADLIST (cp); 536 CvPADLIST (cv) = CvPADLIST (cp);
476 CvPADLIST (cp) = 0; 537 CvPADLIST (cp) = 0;
477 SvREFCNT_dec (cp); 538 SvREFCNT_dec (cp);
478#else 539#else
479 CvPADLIST (cv) = coro_clone_padlist (aTHX_ cv); 540 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
480#endif 541#endif
481 } 542 }
482} 543}
483 544
484static void 545static void
491 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 552 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
492 553
493 av = (AV *)mg->mg_obj; 554 av = (AV *)mg->mg_obj;
494 555
495 if (expect_false (AvFILLp (av) >= AvMAX (av))) 556 if (expect_false (AvFILLp (av) >= AvMAX (av)))
496 av_extend (av, AvMAX (av) + 1); 557 av_extend (av, AvFILLp (av) + 1);
497 558
498 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 559 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
499} 560}
500 561
501/** load & save, init *******************************************************/ 562/** load & save, init *******************************************************/
563
564/* swap sv heads, at least logically */
565static void
566swap_svs (pTHX_ Coro__State c)
567{
568 int i;
569
570 for (i = 0; i <= AvFILLp (c->swap_sv); )
571 {
572 SV *a = AvARRAY (c->swap_sv)[i++];
573 SV *b = AvARRAY (c->swap_sv)[i++];
574
575 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
576 SV tmp;
577
578 /* swap sv_any */
579 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
580
581 /* swap sv_flags */
582 SvFLAGS (&tmp) = SvFLAGS (a);
583 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
584 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
585
586#if PERL_VERSION_ATLEAST (5,10,0)
587 /* perl 5.10 complicates this _quite_ a bit, but it also is
588 * is much faster, so no quarrels here. alternatively, we could
589 * sv_upgrade to avoid this.
590 */
591 {
592 /* swap sv_u */
593 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
594
595 /* if SvANY points to the head, we need to adjust the pointers,
596 * as the pointer for a still points to b, and maybe vice versa.
597 */
598 #define svany_in_head(type) \
599 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
600
601 if (svany_in_head (SvTYPE (a)))
602 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
603
604 if (svany_in_head (SvTYPE (b)))
605 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
606 }
607#endif
608 }
609}
610
611#define SWAP_SVS(coro) \
612 if (expect_false ((coro)->swap_sv)) \
613 swap_svs (aTHX_ (coro))
614
615static void
616on_enterleave_call (pTHX_ SV *cb);
502 617
503static void 618static void
504load_perl (pTHX_ Coro__State c) 619load_perl (pTHX_ Coro__State c)
505{ 620{
506 perl_slots *slot = c->slot; 621 perl_slots *slot = c->slot;
507 c->slot = 0; 622 c->slot = 0;
508 623
509 PL_mainstack = c->mainstack; 624 PL_mainstack = c->mainstack;
510 625
511 GvSV (PL_defgv) = slot->defsv; 626 GvSV (PL_defgv) = slot->defsv;
512 GvAV (PL_defgv) = slot->defav; 627 GvAV (PL_defgv) = slot->defav;
513 GvSV (PL_errgv) = slot->errsv; 628 GvSV (PL_errgv) = slot->errsv;
514 GvSV (irsgv) = slot->irsgv; 629 GvSV (irsgv) = slot->irsgv;
630 GvHV (PL_hintgv) = slot->hinthv;
515 631
516 #define VAR(name,type) PL_ ## name = slot->name; 632 #define VAR(name,type) PL_ ## name = slot->name;
517 # include "state.h" 633 # include "state.h"
518 #undef VAR 634 #undef VAR
519 635
533 PUTBACK; 649 PUTBACK;
534 } 650 }
535 651
536 slf_frame = c->slf_frame; 652 slf_frame = c->slf_frame;
537 CORO_THROW = c->except; 653 CORO_THROW = c->except;
654
655 if (expect_false (enable_times))
656 {
657 if (expect_false (!times_valid))
658 coro_times_update ();
659
660 coro_times_sub (c);
661 }
662
663 if (expect_false (c->on_enter))
664 {
665 int i;
666
667 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
668 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
669 }
670
671 SWAP_SVS (c);
538} 672}
539 673
540static void 674static void
541save_perl (pTHX_ Coro__State c) 675save_perl (pTHX_ Coro__State c)
542{ 676{
677 SWAP_SVS (c);
678
679 if (expect_false (c->on_leave))
680 {
681 int i;
682
683 for (i = AvFILLp (c->on_leave); i >= 0; --i)
684 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
685 }
686
687 times_valid = 0;
688
689 if (expect_false (enable_times))
690 {
691 coro_times_update (); times_valid = 1;
692 coro_times_add (c);
693 }
694
543 c->except = CORO_THROW; 695 c->except = CORO_THROW;
544 c->slf_frame = slf_frame; 696 c->slf_frame = slf_frame;
545 697
546 { 698 {
547 dSP; 699 dSP;
560 { 712 {
561 while (expect_true (cxix >= 0)) 713 while (expect_true (cxix >= 0))
562 { 714 {
563 PERL_CONTEXT *cx = &ccstk[cxix--]; 715 PERL_CONTEXT *cx = &ccstk[cxix--];
564 716
565 if (expect_true (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT)) 717 if (expect_true (CxTYPE (cx) == CXt_SUB) || expect_false (CxTYPE (cx) == CXt_FORMAT))
566 { 718 {
567 CV *cv = cx->blk_sub.cv; 719 CV *cv = cx->blk_sub.cv;
568 720
569 if (expect_true (CvDEPTH (cv))) 721 if (expect_true (CvDEPTH (cv)))
570 { 722 {
594 /* we manually unroll here, as usually 2 slots is enough */ 746 /* we manually unroll here, as usually 2 slots is enough */
595 if (SLOT_COUNT >= 1) CXINC; 747 if (SLOT_COUNT >= 1) CXINC;
596 if (SLOT_COUNT >= 2) CXINC; 748 if (SLOT_COUNT >= 2) CXINC;
597 if (SLOT_COUNT >= 3) CXINC; 749 if (SLOT_COUNT >= 3) CXINC;
598 { 750 {
599 int i; 751 unsigned int i;
600 for (i = 3; i < SLOT_COUNT; ++i) 752 for (i = 3; i < SLOT_COUNT; ++i)
601 CXINC; 753 CXINC;
602 } 754 }
603 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 755 cxstack_ix -= SLOT_COUNT; /* undo allocation */
604 756
605 c->mainstack = PL_mainstack; 757 c->mainstack = PL_mainstack;
606 758
607 { 759 {
608 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 760 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
609 761
610 slot->defav = GvAV (PL_defgv); 762 slot->defav = GvAV (PL_defgv);
611 slot->defsv = DEFSV; 763 slot->defsv = DEFSV;
612 slot->errsv = ERRSV; 764 slot->errsv = ERRSV;
613 slot->irsgv = GvSV (irsgv); 765 slot->irsgv = GvSV (irsgv);
766 slot->hinthv = GvHV (PL_hintgv);
614 767
615 #define VAR(name,type) slot->name = PL_ ## name; 768 #define VAR(name,type) slot->name = PL_ ## name;
616 # include "state.h" 769 # include "state.h"
617 #undef VAR 770 #undef VAR
618 } 771 }
745#endif 898#endif
746 899
747/* 900/*
748 * This overrides the default magic get method of %SIG elements. 901 * 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 902 * 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 903 * and instead of trying to save and restore the hash elements, we just provide
751 * readback here. 904 * 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 */ 905 */
756static int 906static int
757coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 907coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
758{ 908{
759 const char *s = MgPV_nolen_const (mg); 909 const char *s = MgPV_nolen_const (mg);
812 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 962 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
813 963
814 if (svp) 964 if (svp)
815 { 965 {
816 SV *old = *svp; 966 SV *old = *svp;
817 *svp = newSVsv (sv); 967 *svp = SvOK (sv) ? newSVsv (sv) : 0;
818 SvREFCNT_dec (old); 968 SvREFCNT_dec (old);
819 return 0; 969 return 0;
820 } 970 }
821 } 971 }
822 972
834slf_check_nop (pTHX_ struct CoroSLF *frame) 984slf_check_nop (pTHX_ struct CoroSLF *frame)
835{ 985{
836 return 0; 986 return 0;
837} 987}
838 988
839static UNOP coro_setup_op; 989static int
990slf_check_repeat (pTHX_ struct CoroSLF *frame)
991{
992 return 1;
993}
994
995static UNOP init_perl_op;
840 996
841static void NOINLINE /* noinline to keep it out of the transfer fast path */ 997static void NOINLINE /* noinline to keep it out of the transfer fast path */
842coro_setup (pTHX_ struct coro *coro) 998init_perl (pTHX_ struct coro *coro)
843{ 999{
844 /* 1000 /*
845 * emulate part of the perl startup here. 1001 * emulate part of the perl startup here.
846 */ 1002 */
847 coro_init_stacks (aTHX); 1003 coro_init_stacks (aTHX);
848 1004
849 PL_runops = RUNOPS_DEFAULT; 1005 PL_runops = RUNOPS_DEFAULT;
850 PL_curcop = &PL_compiling; 1006 PL_curcop = &PL_compiling;
851 PL_in_eval = EVAL_NULL; 1007 PL_in_eval = EVAL_NULL;
852 PL_comppad = 0; 1008 PL_comppad = 0;
1009 PL_comppad_name = 0;
1010 PL_comppad_name_fill = 0;
1011 PL_comppad_name_floor = 0;
853 PL_curpm = 0; 1012 PL_curpm = 0;
854 PL_curpad = 0; 1013 PL_curpad = 0;
855 PL_localizing = 0; 1014 PL_localizing = 0;
856 PL_dirty = 0; 1015 PL_dirty = 0;
857 PL_restartop = 0; 1016 PL_restartop = 0;
858#if PERL_VERSION_ATLEAST (5,10,0) 1017#if PERL_VERSION_ATLEAST (5,10,0)
859 PL_parser = 0; 1018 PL_parser = 0;
860#endif 1019#endif
1020 PL_hints = 0;
861 1021
862 /* recreate the die/warn hooks */ 1022 /* recreate the die/warn hooks */
863 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1023 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); 1024 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook);
865 1025
866 GvSV (PL_defgv) = newSV (0); 1026 GvSV (PL_defgv) = newSV (0);
867 GvAV (PL_defgv) = coro->args; coro->args = 0; 1027 GvAV (PL_defgv) = coro->args; coro->args = 0;
868 GvSV (PL_errgv) = newSV (0); 1028 GvSV (PL_errgv) = newSV (0);
869 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1029 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
1030 GvHV (PL_hintgv) = 0;
870 PL_rs = newSVsv (GvSV (irsgv)); 1031 PL_rs = newSVsv (GvSV (irsgv));
871 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1032 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
872 1033
873 { 1034 {
874 dSP; 1035 dSP;
891 */ 1052 */
892 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1053 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 */ 1054 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
894 1055
895 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1056 /* 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; 1057 init_perl_op.op_next = PL_op;
897 coro_setup_op.op_type = OP_CUSTOM; 1058 init_perl_op.op_type = OP_ENTERSUB;
898 coro_setup_op.op_ppaddr = pp_slf; 1059 init_perl_op.op_ppaddr = pp_slf;
899 /* no flags etc. required, as an init function won't be called */ 1060 /* no flags etc. required, as an init function won't be called */
900 1061
901 PL_op = (OP *)&coro_setup_op; 1062 PL_op = (OP *)&init_perl_op;
902 1063
903 /* copy throw, in case it was set before coro_setup */ 1064 /* copy throw, in case it was set before init_perl */
904 CORO_THROW = coro->except; 1065 CORO_THROW = coro->except;
905}
906 1066
1067 SWAP_SVS (coro);
1068
1069 if (expect_false (enable_times))
1070 {
1071 coro_times_update ();
1072 coro_times_sub (coro);
1073 }
1074}
1075
907static void 1076static void
908coro_destruct (pTHX_ struct coro *coro) 1077coro_unwind_stacks (pTHX)
909{ 1078{
910 if (!IN_DESTRUCT) 1079 if (!IN_DESTRUCT)
911 { 1080 {
912 /* restore all saved variables and stuff */ 1081 /* restore all saved variables and stuff */
913 LEAVE_SCOPE (0); 1082 LEAVE_SCOPE (0);
921 POPSTACK_TO (PL_mainstack); 1090 POPSTACK_TO (PL_mainstack);
922 1091
923 /* unwind main stack */ 1092 /* unwind main stack */
924 dounwind (-1); 1093 dounwind (-1);
925 } 1094 }
1095}
926 1096
927 SvREFCNT_dec (GvSV (PL_defgv)); 1097static void
928 SvREFCNT_dec (GvAV (PL_defgv)); 1098destroy_perl (pTHX_ struct coro *coro)
929 SvREFCNT_dec (GvSV (PL_errgv)); 1099{
930 SvREFCNT_dec (PL_defoutgv); 1100 SV *svf [9];
931 SvREFCNT_dec (PL_rs);
932 SvREFCNT_dec (GvSV (irsgv));
933 1101
934 SvREFCNT_dec (PL_diehook);
935 SvREFCNT_dec (PL_warnhook);
936 1102 {
1103 struct coro *current = SvSTATE_current;
1104
1105 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1106
1107 save_perl (aTHX_ current);
1108 load_perl (aTHX_ coro);
1109
1110 coro_unwind_stacks (aTHX);
1111 coro_destruct_stacks (aTHX);
1112
1113 /* restore swapped sv's */
1114 SWAP_SVS (coro);
1115
1116 // now save some sv's to be free'd later
1117 svf [0] = GvSV (PL_defgv);
1118 svf [1] = (SV *)GvAV (PL_defgv);
1119 svf [2] = GvSV (PL_errgv);
1120 svf [3] = (SV *)PL_defoutgv;
1121 svf [4] = PL_rs;
1122 svf [5] = GvSV (irsgv);
1123 svf [6] = (SV *)GvHV (PL_hintgv);
1124 svf [7] = PL_diehook;
1125 svf [8] = PL_warnhook;
1126 assert (9 == sizeof (svf) / sizeof (*svf));
1127
1128 load_perl (aTHX_ current);
1129 }
1130
1131 {
1132 unsigned int i;
1133
1134 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i)
1135 SvREFCNT_dec (svf [i]);
1136
937 SvREFCNT_dec (coro->saved_deffh); 1137 SvREFCNT_dec (coro->saved_deffh);
938 SvREFCNT_dec (coro->rouse_cb); 1138 SvREFCNT_dec (coro->rouse_cb);
939 SvREFCNT_dec (coro->invoke_cb); 1139 SvREFCNT_dec (coro->invoke_cb);
940 SvREFCNT_dec (coro->invoke_av); 1140 SvREFCNT_dec (coro->invoke_av);
941 1141 }
942 coro_destruct_stacks (aTHX);
943} 1142}
944 1143
945INLINE void 1144INLINE void
946free_coro_mortal (pTHX) 1145free_coro_mortal (pTHX)
947{ 1146{
955static int 1154static int
956runops_trace (pTHX) 1155runops_trace (pTHX)
957{ 1156{
958 COP *oldcop = 0; 1157 COP *oldcop = 0;
959 int oldcxix = -2; 1158 int oldcxix = -2;
960 struct coro *coro = SvSTATE_current; /* trace cctx is tied to specific coro */
961 coro_cctx *cctx = coro->cctx;
962 1159
963 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX))) 1160 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX)))
964 { 1161 {
965 PERL_ASYNC_CHECK (); 1162 PERL_ASYNC_CHECK ();
966 1163
967 if (cctx->flags & CC_TRACE_ALL) 1164 if (cctx_current->flags & CC_TRACE_ALL)
968 { 1165 {
969 if (PL_op->op_type == OP_LEAVESUB && cctx->flags & CC_TRACE_SUB) 1166 if (PL_op->op_type == OP_LEAVESUB && cctx_current->flags & CC_TRACE_SUB)
970 { 1167 {
971 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1168 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
972 SV **bot, **top; 1169 SV **bot, **top;
973 AV *av = newAV (); /* return values */ 1170 AV *av = newAV (); /* return values */
974 SV **cb; 1171 SV **cb;
1011 1208
1012 if (PL_curcop != &PL_compiling) 1209 if (PL_curcop != &PL_compiling)
1013 { 1210 {
1014 SV **cb; 1211 SV **cb;
1015 1212
1016 if (oldcxix != cxstack_ix && cctx->flags & CC_TRACE_SUB) 1213 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB)
1017 { 1214 {
1018 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1215 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1019 1216
1020 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1217 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1021 { 1218 {
1022 runops_proc_t old_runops = PL_runops;
1023 dSP; 1219 dSP;
1024 GV *gv = CvGV (cx->blk_sub.cv); 1220 GV *gv = CvGV (cx->blk_sub.cv);
1025 SV *fullname = sv_2mortal (newSV (0)); 1221 SV *fullname = sv_2mortal (newSV (0));
1026 1222
1027 if (isGV (gv)) 1223 if (isGV (gv))
1045 } 1241 }
1046 1242
1047 oldcxix = cxstack_ix; 1243 oldcxix = cxstack_ix;
1048 } 1244 }
1049 1245
1050 if (cctx->flags & CC_TRACE_LINE) 1246 if (cctx_current->flags & CC_TRACE_LINE)
1051 { 1247 {
1052 dSP; 1248 dSP;
1053 1249
1054 PL_runops = RUNOPS_DEFAULT; 1250 PL_runops = RUNOPS_DEFAULT;
1055 ENTER; 1251 ENTER;
1074 1270
1075 TAINT_NOT; 1271 TAINT_NOT;
1076 return 0; 1272 return 0;
1077} 1273}
1078 1274
1079static struct coro_cctx *cctx_ssl_cctx;
1080static struct CoroSLF cctx_ssl_frame; 1275static struct CoroSLF cctx_ssl_frame;
1081 1276
1082static void 1277static void
1083slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta) 1278slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta)
1084{ 1279{
1085 ta->prev = (struct coro *)cctx_ssl_cctx;
1086 ta->next = 0; 1280 ta->prev = 0;
1087} 1281}
1088 1282
1089static int 1283static int
1090slf_check_set_stacklevel (pTHX_ struct CoroSLF *frame) 1284slf_check_set_stacklevel (pTHX_ struct CoroSLF *frame)
1091{ 1285{
1094 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1288 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1095} 1289}
1096 1290
1097/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1291/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1098static void NOINLINE 1292static void NOINLINE
1099cctx_prepare (pTHX_ coro_cctx *cctx) 1293cctx_prepare (pTHX)
1100{ 1294{
1101 PL_top_env = &PL_start_env; 1295 PL_top_env = &PL_start_env;
1102 1296
1103 if (cctx->flags & CC_TRACE) 1297 if (cctx_current->flags & CC_TRACE)
1104 PL_runops = runops_trace; 1298 PL_runops = runops_trace;
1105 1299
1106 /* we already must be executing an SLF op, there is no other valid way 1300 /* we already must be executing an SLF op, there is no other valid way
1107 * that can lead to creation of a new cctx */ 1301 * that can lead to creation of a new cctx */
1108 assert (("FATAL: can't prepare slf-less cctx in Coro module (please report)", 1302 assert (("FATAL: can't prepare slf-less cctx in Coro module (please report)",
1109 slf_frame.prepare && PL_op->op_ppaddr == pp_slf)); 1303 slf_frame.prepare && PL_op->op_ppaddr == pp_slf));
1110 1304
1111 /* we must emulate leaving pp_slf, which is done inside slf_check_set_stacklevel */ 1305 /* 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; 1306 cctx_ssl_frame = slf_frame;
1114 1307
1115 slf_frame.prepare = slf_prepare_set_stacklevel; 1308 slf_frame.prepare = slf_prepare_set_stacklevel;
1116 slf_frame.check = slf_check_set_stacklevel; 1309 slf_frame.check = slf_check_set_stacklevel;
1117} 1310}
1140 /* normally we would need to skip the entersub here */ 1333 /* normally we would need to skip the entersub here */
1141 /* not doing so will re-execute it, which is exactly what we want */ 1334 /* not doing so will re-execute it, which is exactly what we want */
1142 /* PL_nop = PL_nop->op_next */ 1335 /* PL_nop = PL_nop->op_next */
1143 1336
1144 /* inject a fake subroutine call to cctx_init */ 1337 /* inject a fake subroutine call to cctx_init */
1145 cctx_prepare (aTHX_ (coro_cctx *)arg); 1338 cctx_prepare (aTHX);
1146 1339
1147 /* cctx_run is the alternative tail of transfer() */ 1340 /* cctx_run is the alternative tail of transfer() */
1148 transfer_tail (aTHX); 1341 transfer_tail (aTHX);
1149 1342
1150 /* somebody or something will hit me for both perl_run and PL_restartop */ 1343 /* somebody or something will hit me for both perl_run and PL_restartop */
1151 PL_restartop = PL_op; 1344 PL_restartop = PL_op;
1152 perl_run (PL_curinterp); 1345 perl_run (PL_curinterp);
1153 /* 1346 /*
1154 * Unfortunately, there is no way to get at the return values of the 1347 * Unfortunately, there is no way to get at the return values of the
1155 * coro body here, as perl_run destroys these 1348 * coro body here, as perl_run destroys these. Likewise, we cannot catch
1349 * runtime errors here, as this is just a random interpreter, not a thread.
1156 */ 1350 */
1157 1351
1158 /* 1352 /*
1159 * If perl-run returns we assume exit() was being called or the coro 1353 * 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) 1354 * 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 1355 * 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" 1356 * bootstrap-time "top" top_env, as we cannot restore the "main"
1163 * coroutine as Coro has no such concept 1357 * coroutine as Coro has no such concept.
1358 * This actually isn't valid with the pthread backend, but OSes requiring
1359 * that backend are too broken to do it in a standards-compliant way.
1164 */ 1360 */
1165 PL_top_env = main_top_env; 1361 PL_top_env = main_top_env;
1166 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */ 1362 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1167 } 1363 }
1168} 1364}
1245cctx_destroy (coro_cctx *cctx) 1441cctx_destroy (coro_cctx *cctx)
1246{ 1442{
1247 if (!cctx) 1443 if (!cctx)
1248 return; 1444 return;
1249 1445
1446 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary?
1447
1250 --cctx_count; 1448 --cctx_count;
1251 coro_destroy (&cctx->cctx); 1449 coro_destroy (&cctx->cctx);
1252 1450
1253 /* coro_transfer creates new, empty cctx's */ 1451 /* coro_transfer creates new, empty cctx's */
1254 if (cctx->sptr) 1452 if (cctx->sptr)
1317 /* TODO: throwing up here is considered harmful */ 1515 /* TODO: throwing up here is considered harmful */
1318 1516
1319 if (expect_true (prev != next)) 1517 if (expect_true (prev != next))
1320 { 1518 {
1321 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1519 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,"); 1520 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1323 1521
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)) 1522 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,"); 1523 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1329 1524
1330#if !PERL_VERSION_ATLEAST (5,10,0) 1525#if !PERL_VERSION_ATLEAST (5,10,0)
1331 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1526 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,"); 1527 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1333#endif 1528#endif
1339transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1534transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1340{ 1535{
1341 dSTACKLEVEL; 1536 dSTACKLEVEL;
1342 1537
1343 /* sometimes transfer is only called to set idle_sp */ 1538 /* sometimes transfer is only called to set idle_sp */
1344 if (expect_false (!next)) 1539 if (expect_false (!prev))
1345 { 1540 {
1346 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1541 cctx_current->idle_sp = STACKLEVEL;
1347 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1542 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1348 } 1543 }
1349 else if (expect_true (prev != next)) 1544 else if (expect_true (prev != next))
1350 { 1545 {
1351 coro_cctx *prev__cctx; 1546 coro_cctx *cctx_prev;
1352 1547
1353 if (expect_false (prev->flags & CF_NEW)) 1548 if (expect_false (prev->flags & CF_NEW))
1354 { 1549 {
1355 /* create a new empty/source context */ 1550 /* create a new empty/source context */
1356 prev->cctx = cctx_new_empty ();
1357 prev->flags &= ~CF_NEW; 1551 prev->flags &= ~CF_NEW;
1358 prev->flags |= CF_RUNNING; 1552 prev->flags |= CF_RUNNING;
1359 } 1553 }
1360 1554
1361 prev->flags &= ~CF_RUNNING; 1555 prev->flags &= ~CF_RUNNING;
1367 if (expect_false (next->flags & CF_NEW)) 1561 if (expect_false (next->flags & CF_NEW))
1368 { 1562 {
1369 /* need to start coroutine */ 1563 /* need to start coroutine */
1370 next->flags &= ~CF_NEW; 1564 next->flags &= ~CF_NEW;
1371 /* setup coroutine call */ 1565 /* setup coroutine call */
1372 coro_setup (aTHX_ next); 1566 init_perl (aTHX_ next);
1373 } 1567 }
1374 else 1568 else
1375 load_perl (aTHX_ next); 1569 load_perl (aTHX_ next);
1376 1570
1377 prev__cctx = prev->cctx;
1378
1379 /* possibly untie and reuse the cctx */ 1571 /* possibly untie and reuse the cctx */
1380 if (expect_true ( 1572 if (expect_true (
1381 prev__cctx->idle_sp == STACKLEVEL 1573 cctx_current->idle_sp == STACKLEVEL
1382 && !(prev__cctx->flags & CC_TRACE) 1574 && !(cctx_current->flags & CC_TRACE)
1383 && !force_cctx 1575 && !force_cctx
1384 )) 1576 ))
1385 { 1577 {
1386 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1578 /* 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)); 1579 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1388 1580
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 */ 1581 /* 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 */ 1582 /* without this the next cctx_get might destroy the running cctx while still in use */
1393 if (expect_false (CCTX_EXPIRED (prev__cctx))) 1583 if (expect_false (CCTX_EXPIRED (cctx_current)))
1394 if (!next->cctx) 1584 if (expect_true (!next->cctx))
1395 next->cctx = cctx_get (aTHX); 1585 next->cctx = cctx_get (aTHX);
1396 1586
1397 cctx_put (prev__cctx); 1587 cctx_put (cctx_current);
1398 } 1588 }
1589 else
1590 prev->cctx = cctx_current;
1399 1591
1400 ++next->usecount; 1592 ++next->usecount;
1401 1593
1402 if (expect_true (!next->cctx)) 1594 cctx_prev = cctx_current;
1403 next->cctx = cctx_get (aTHX); 1595 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1404 1596
1405 if (expect_false (prev__cctx != next->cctx)) 1597 next->cctx = 0;
1598
1599 if (expect_false (cctx_prev != cctx_current))
1406 { 1600 {
1407 prev__cctx->top_env = PL_top_env; 1601 cctx_prev->top_env = PL_top_env;
1408 PL_top_env = next->cctx->top_env; 1602 PL_top_env = cctx_current->top_env;
1409 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1603 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1410 } 1604 }
1411 1605
1412 transfer_tail (aTHX); 1606 transfer_tail (aTHX);
1413 } 1607 }
1414} 1608}
1422coro_state_destroy (pTHX_ struct coro *coro) 1616coro_state_destroy (pTHX_ struct coro *coro)
1423{ 1617{
1424 if (coro->flags & CF_DESTROYED) 1618 if (coro->flags & CF_DESTROYED)
1425 return 0; 1619 return 0;
1426 1620
1427 if (coro->on_destroy) 1621 if (coro->on_destroy && !PL_dirty)
1428 coro->on_destroy (aTHX_ coro); 1622 coro->on_destroy (aTHX_ coro);
1429 1623
1430 coro->flags |= CF_DESTROYED; 1624 coro->flags |= CF_DESTROYED;
1431 1625
1432 if (coro->flags & CF_READY) 1626 if (coro->flags & CF_READY)
1436 --coro_nready; 1630 --coro_nready;
1437 } 1631 }
1438 else 1632 else
1439 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1633 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1440 1634
1441 if (coro->mainstack && coro->mainstack != main_mainstack) 1635 if (coro->mainstack
1442 { 1636 && coro->mainstack != main_mainstack
1443 struct coro temp; 1637 && coro->slot
1444 1638 && !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); 1639 destroy_perl (aTHX_ coro);
1449 1640
1450 coro_destruct (aTHX_ coro); 1641 if (coro->next) coro->next->prev = coro->prev;
1451 1642 if (coro->prev) coro->prev->next = coro->next;
1452 load_perl (aTHX_ &temp); 1643 if (coro == coro_first) coro_first = coro->next;
1453
1454 coro->slot = 0;
1455 }
1456 1644
1457 cctx_destroy (coro->cctx); 1645 cctx_destroy (coro->cctx);
1458 SvREFCNT_dec (coro->startcv); 1646 SvREFCNT_dec (coro->startcv);
1459 SvREFCNT_dec (coro->args); 1647 SvREFCNT_dec (coro->args);
1648 SvREFCNT_dec (coro->swap_sv);
1460 SvREFCNT_dec (CORO_THROW); 1649 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 1650
1466 return 1; 1651 return 1;
1467} 1652}
1468 1653
1469static int 1654static int
1519 1704
1520 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1705 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1521 TRANSFER (ta, 1); 1706 TRANSFER (ta, 1);
1522} 1707}
1523 1708
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 ********************************************************************/ 1709/** Coro ********************************************************************/
1548 1710
1549INLINE void 1711INLINE void
1550coro_enq (pTHX_ struct coro *coro) 1712coro_enq (pTHX_ struct coro *coro)
1551{ 1713{
1552 av_push (coro_ready [coro->prio - PRIO_MIN], SvREFCNT_inc_NN (coro->hv)); 1714 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1553}
1554 1715
1555INLINE SV * 1716 SvREFCNT_inc_NN (coro->hv);
1717
1718 coro->next_ready = 0;
1719 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1720 ready [1] = coro;
1721}
1722
1723INLINE struct coro *
1556coro_deq (pTHX) 1724coro_deq (pTHX)
1557{ 1725{
1558 int prio; 1726 int prio;
1559 1727
1560 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; ) 1728 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
1561 if (AvFILLp (coro_ready [prio]) >= 0) 1729 {
1562 return av_shift (coro_ready [prio]); 1730 struct coro **ready = coro_ready [prio];
1731
1732 if (ready [0])
1733 {
1734 struct coro *coro = ready [0];
1735 ready [0] = coro->next_ready;
1736 return coro;
1737 }
1738 }
1563 1739
1564 return 0; 1740 return 0;
1741}
1742
1743static void
1744invoke_sv_ready_hook_helper (void)
1745{
1746 dTHX;
1747 dSP;
1748
1749 ENTER;
1750 SAVETMPS;
1751
1752 PUSHMARK (SP);
1753 PUTBACK;
1754 call_sv (coro_readyhook, G_VOID | G_DISCARD);
1755
1756 FREETMPS;
1757 LEAVE;
1565} 1758}
1566 1759
1567static int 1760static int
1568api_ready (pTHX_ SV *coro_sv) 1761api_ready (pTHX_ SV *coro_sv)
1569{ 1762{
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); 1763 struct coro *coro = SvSTATE (coro_sv);
1578 1764
1579 if (coro->flags & CF_READY) 1765 if (coro->flags & CF_READY)
1580 return 0; 1766 return 0;
1581 1767
1582 coro->flags |= CF_READY; 1768 coro->flags |= CF_READY;
1583 1769
1584 sv_hook = coro_nready ? 0 : coro_readyhook;
1585 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1586
1587 coro_enq (aTHX_ coro); 1770 coro_enq (aTHX_ coro);
1588 ++coro_nready;
1589 1771
1590 if (sv_hook) 1772 if (!coro_nready++)
1591 { 1773 if (coroapi.readyhook)
1592 dSP; 1774 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 1775
1608 return 1; 1776 return 1;
1609} 1777}
1610 1778
1611static int 1779static int
1614 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1782 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1615} 1783}
1616 1784
1617/* expects to own a reference to next->hv */ 1785/* expects to own a reference to next->hv */
1618INLINE void 1786INLINE void
1619prepare_cede_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1787prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1620{ 1788{
1621 SV *prev_sv = SvRV (coro_current); 1789 SV *prev_sv = SvRV (coro_current);
1622 1790
1623 ta->prev = SvSTATE_hv (prev_sv); 1791 ta->prev = SvSTATE_hv (prev_sv);
1624 ta->next = next; 1792 ta->next = next;
1625 1793
1626 TRANSFER_CHECK (*ta); 1794 TRANSFER_CHECK (*ta);
1627 1795
1628 SvRV_set (coro_current, next->hv); 1796 SvRV_set (coro_current, (SV *)next->hv);
1629 1797
1630 free_coro_mortal (aTHX); 1798 free_coro_mortal (aTHX);
1631 coro_mortal = prev_sv; 1799 coro_mortal = prev_sv;
1632} 1800}
1633 1801
1634static void 1802static void
1635prepare_schedule (pTHX_ struct coro_transfer_args *ta) 1803prepare_schedule (pTHX_ struct coro_transfer_args *ta)
1636{ 1804{
1637 for (;;) 1805 for (;;)
1638 { 1806 {
1639 SV *next_sv = coro_deq (aTHX); 1807 struct coro *next = coro_deq (aTHX);
1640 1808
1641 if (expect_false (!next_sv)) 1809 if (expect_true (next))
1642 { 1810 {
1643 /* nothing to schedule: call the idle handler */
1644 dSP;
1645
1646 ENTER;
1647 SAVETMPS;
1648
1649 PUSHMARK (SP);
1650 PUTBACK;
1651 call_sv (get_sv ("Coro::idle", FALSE), G_VOID | G_DISCARD);
1652
1653 FREETMPS;
1654 LEAVE;
1655 }
1656 else
1657 {
1658 struct coro *next = SvSTATE_hv (next_sv);
1659
1660 /* cannot transfer to destroyed coros, skip and look for next */ 1811 /* cannot transfer to destroyed coros, skip and look for next */
1661 if (expect_false (next->flags & CF_DESTROYED)) 1812 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED)))
1662 SvREFCNT_dec (next_sv); /* coro_nready has already been taken care of by destroy */ 1813 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1663 else 1814 else
1664 { 1815 {
1665 next->flags &= ~CF_READY; 1816 next->flags &= ~CF_READY;
1666 --coro_nready; 1817 --coro_nready;
1667 1818
1668 return prepare_cede_to (aTHX_ ta, next); 1819 prepare_schedule_to (aTHX_ ta, next);
1820 break;
1669 } 1821 }
1670 } 1822 }
1823 else
1824 {
1825 /* nothing to schedule: call the idle handler */
1826 if (SvROK (sv_idle)
1827 && SvOBJECT (SvRV (sv_idle)))
1828 {
1829 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1830 api_ready (aTHX_ SvRV (sv_idle));
1831 --coro_nready;
1832 }
1833 else
1834 {
1835 /* TODO: deprecated, remove, cannot work reliably *//*D*/
1836 dSP;
1837
1838 ENTER;
1839 SAVETMPS;
1840
1841 PUSHMARK (SP);
1842 PUTBACK;
1843 call_sv (sv_idle, G_VOID | G_DISCARD);
1844
1845 FREETMPS;
1846 LEAVE;
1847 }
1848 }
1671 } 1849 }
1672} 1850}
1673 1851
1674INLINE void 1852INLINE void
1675prepare_cede (pTHX_ struct coro_transfer_args *ta) 1853prepare_cede (pTHX_ struct coro_transfer_args *ta)
1697{ 1875{
1698 struct coro_transfer_args ta; 1876 struct coro_transfer_args ta;
1699 1877
1700 prepare_schedule (aTHX_ &ta); 1878 prepare_schedule (aTHX_ &ta);
1701 TRANSFER (ta, 1); 1879 TRANSFER (ta, 1);
1880}
1881
1882static void
1883api_schedule_to (pTHX_ SV *coro_sv)
1884{
1885 struct coro_transfer_args ta;
1886 struct coro *next = SvSTATE (coro_sv);
1887
1888 SvREFCNT_inc_NN (coro_sv);
1889 prepare_schedule_to (aTHX_ &ta, next);
1702} 1890}
1703 1891
1704static int 1892static int
1705api_cede (pTHX) 1893api_cede (pTHX)
1706{ 1894{
1735static void 1923static void
1736api_trace (pTHX_ SV *coro_sv, int flags) 1924api_trace (pTHX_ SV *coro_sv, int flags)
1737{ 1925{
1738 struct coro *coro = SvSTATE (coro_sv); 1926 struct coro *coro = SvSTATE (coro_sv);
1739 1927
1928 if (coro->flags & CF_RUNNING)
1929 croak ("cannot enable tracing on a running coroutine, caught");
1930
1740 if (flags & CC_TRACE) 1931 if (flags & CC_TRACE)
1741 { 1932 {
1742 if (!coro->cctx) 1933 if (!coro->cctx)
1743 coro->cctx = cctx_new_run (); 1934 coro->cctx = cctx_new_run ();
1744 else if (!(coro->cctx->flags & CC_TRACE)) 1935 else if (!(coro->cctx->flags & CC_TRACE))
1745 croak ("cannot enable tracing on coroutine with custom stack,"); 1936 croak ("cannot enable tracing on coroutine with custom stack, caught");
1746 1937
1747 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL)); 1938 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL));
1748 } 1939 }
1749 else if (coro->cctx && coro->cctx->flags & CC_TRACE) 1940 else if (coro->cctx && coro->cctx->flags & CC_TRACE)
1750 { 1941 {
1753 if (coro->flags & CF_RUNNING) 1944 if (coro->flags & CF_RUNNING)
1754 PL_runops = RUNOPS_DEFAULT; 1945 PL_runops = RUNOPS_DEFAULT;
1755 else 1946 else
1756 coro->slot->runops = RUNOPS_DEFAULT; 1947 coro->slot->runops = RUNOPS_DEFAULT;
1757 } 1948 }
1949}
1950
1951static void
1952coro_call_on_destroy (pTHX_ struct coro *coro)
1953{
1954 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0);
1955 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1956
1957 if (on_destroyp)
1958 {
1959 AV *on_destroy = (AV *)SvRV (*on_destroyp);
1960
1961 while (AvFILLp (on_destroy) >= 0)
1962 {
1963 dSP; /* don't disturb outer sp */
1964 SV *cb = av_pop (on_destroy);
1965
1966 PUSHMARK (SP);
1967
1968 if (statusp)
1969 {
1970 int i;
1971 AV *status = (AV *)SvRV (*statusp);
1972 EXTEND (SP, AvFILLp (status) + 1);
1973
1974 for (i = 0; i <= AvFILLp (status); ++i)
1975 PUSHs (AvARRAY (status)[i]);
1976 }
1977
1978 PUTBACK;
1979 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD);
1980 }
1981 }
1982}
1983
1984static void
1985slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1986{
1987 int i;
1988 HV *hv = (HV *)SvRV (coro_current);
1989 AV *av = newAV ();
1990
1991 /* items are actually not so common, so optimise for this case */
1992 if (items)
1993 {
1994 av_extend (av, items - 1);
1995
1996 for (i = 0; i < items; ++i)
1997 av_push (av, SvREFCNT_inc_NN (arg [i]));
1998 }
1999
2000 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0);
2001
2002 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */
2003 api_ready (aTHX_ sv_manager);
2004
2005 frame->prepare = prepare_schedule;
2006 frame->check = slf_check_repeat;
2007
2008 /* as a minor optimisation, we could unwind all stacks here */
2009 /* but that puts extra pressure on pp_slf, and is not worth much */
2010 /*coro_unwind_stacks (aTHX);*/
1758} 2011}
1759 2012
1760/*****************************************************************************/ 2013/*****************************************************************************/
1761/* async pool handler */ 2014/* async pool handler */
1762 2015
1840 2093
1841static void 2094static void
1842coro_rouse_callback (pTHX_ CV *cv) 2095coro_rouse_callback (pTHX_ CV *cv)
1843{ 2096{
1844 dXSARGS; 2097 dXSARGS;
1845 SV *data = (SV *)GENSUB_ARG; 2098 SV *data = (SV *)S_GENSUB_ARG;
1846 2099
1847 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2100 if (SvTYPE (SvRV (data)) != SVt_PVAV)
1848 { 2101 {
1849 /* first call, set args */ 2102 /* first call, set args */
2103 SV *coro = SvRV (data);
1850 AV *av = newAV (); 2104 AV *av = newAV ();
1851 SV *coro = SvRV (data);
1852 2105
1853 SvRV_set (data, (SV *)av); 2106 SvRV_set (data, (SV *)av);
1854 api_ready (aTHX_ coro);
1855 SvREFCNT_dec (coro);
1856 2107
1857 /* better take a full copy of the arguments */ 2108 /* better take a full copy of the arguments */
1858 while (items--) 2109 while (items--)
1859 av_store (av, items, newSVsv (ST (items))); 2110 av_store (av, items, newSVsv (ST (items)));
2111
2112 api_ready (aTHX_ coro);
2113 SvREFCNT_dec (coro);
1860 } 2114 }
1861 2115
1862 XSRETURN_EMPTY; 2116 XSRETURN_EMPTY;
1863} 2117}
1864 2118
1881 2135
1882 EXTEND (SP, AvFILLp (av) + 1); 2136 EXTEND (SP, AvFILLp (av) + 1);
1883 for (i = 0; i <= AvFILLp (av); ++i) 2137 for (i = 0; i <= AvFILLp (av); ++i)
1884 PUSHs (sv_2mortal (AvARRAY (av)[i])); 2138 PUSHs (sv_2mortal (AvARRAY (av)[i]));
1885 2139
1886 /* we have stolen the elements, so ste length to zero and free */ 2140 /* we have stolen the elements, so set length to zero and free */
1887 AvFILLp (av) = -1; 2141 AvFILLp (av) = -1;
1888 av_undef (av); 2142 av_undef (av);
1889 2143
1890 PUTBACK; 2144 PUTBACK;
1891 } 2145 }
1915 || SvTYPE (SvRV (cb)) != SVt_PVCV 2169 || SvTYPE (SvRV (cb)) != SVt_PVCV
1916 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2170 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
1917 croak ("Coro::rouse_wait called with illegal callback argument,"); 2171 croak ("Coro::rouse_wait called with illegal callback argument,");
1918 2172
1919 { 2173 {
1920 CV *cv = (CV *)SvRV (cb); /* for GENSUB_ARG */ 2174 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
1921 SV *data = (SV *)GENSUB_ARG; 2175 SV *data = (SV *)S_GENSUB_ARG;
1922 2176
1923 frame->data = (void *)data; 2177 frame->data = (void *)data;
1924 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule; 2178 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
1925 frame->check = slf_check_rouse_wait; 2179 frame->check = slf_check_rouse_wait;
1926 } 2180 }
1930coro_new_rouse_cb (pTHX) 2184coro_new_rouse_cb (pTHX)
1931{ 2185{
1932 HV *hv = (HV *)SvRV (coro_current); 2186 HV *hv = (HV *)SvRV (coro_current);
1933 struct coro *coro = SvSTATE_hv (hv); 2187 struct coro *coro = SvSTATE_hv (hv);
1934 SV *data = newRV_inc ((SV *)hv); 2188 SV *data = newRV_inc ((SV *)hv);
1935 SV *cb = gensub (aTHX_ coro_rouse_callback, (void *)data); 2189 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
1936 2190
1937 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0); 2191 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0);
1938 SvREFCNT_dec (data); /* magicext increases the refcount */ 2192 SvREFCNT_dec (data); /* magicext increases the refcount */
1939 2193
1940 SvREFCNT_dec (coro->rouse_cb); 2194 SvREFCNT_dec (coro->rouse_cb);
1995static void 2249static void
1996slf_init_schedule (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2250slf_init_schedule (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1997{ 2251{
1998 frame->prepare = prepare_schedule; 2252 frame->prepare = prepare_schedule;
1999 frame->check = slf_check_nop; 2253 frame->check = slf_check_nop;
2254}
2255
2256static void
2257slf_prepare_schedule_to (pTHX_ struct coro_transfer_args *ta)
2258{
2259 struct coro *next = (struct coro *)slf_frame.data;
2260
2261 SvREFCNT_inc_NN (next->hv);
2262 prepare_schedule_to (aTHX_ ta, next);
2263}
2264
2265static void
2266slf_init_schedule_to (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2267{
2268 if (!items)
2269 croak ("Coro::schedule_to expects a coroutine argument, caught");
2270
2271 frame->data = (void *)SvSTATE (arg [0]);
2272 frame->prepare = slf_prepare_schedule_to;
2273 frame->check = slf_check_nop;
2274}
2275
2276static void
2277slf_init_cede_to (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2278{
2279 api_ready (aTHX_ SvRV (coro_current));
2280
2281 slf_init_schedule_to (aTHX_ frame, cv, arg, items);
2000} 2282}
2001 2283
2002static void 2284static void
2003slf_init_cede (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2285slf_init_cede (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2004{ 2286{
2150 } 2432 }
2151 else 2433 else
2152 slf_argc = 0; 2434 slf_argc = 0;
2153 2435
2154 PL_op->op_ppaddr = pp_slf; 2436 PL_op->op_ppaddr = pp_slf;
2155 PL_op->op_type = OP_CUSTOM; /* maybe we should leave it at entersub? */ 2437 /*PL_op->op_type = OP_CUSTOM; /* we do behave like entersub still */
2156 2438
2157 PL_op = (OP *)&slf_restore; 2439 PL_op = (OP *)&slf_restore;
2440}
2441
2442/*****************************************************************************/
2443/* dynamic wind */
2444
2445static void
2446on_enterleave_call (pTHX_ SV *cb)
2447{
2448 dSP;
2449
2450 PUSHSTACK;
2451
2452 PUSHMARK (SP);
2453 PUTBACK;
2454 call_sv (cb, G_VOID | G_DISCARD);
2455 SPAGAIN;
2456
2457 POPSTACK;
2458}
2459
2460static SV *
2461coro_avp_pop_and_free (pTHX_ AV **avp)
2462{
2463 AV *av = *avp;
2464 SV *res = av_pop (av);
2465
2466 if (AvFILLp (av) < 0)
2467 {
2468 *avp = 0;
2469 SvREFCNT_dec (av);
2470 }
2471
2472 return res;
2473}
2474
2475static void
2476coro_pop_on_enter (pTHX_ void *coro)
2477{
2478 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_enter);
2479 SvREFCNT_dec (cb);
2480}
2481
2482static void
2483coro_pop_on_leave (pTHX_ void *coro)
2484{
2485 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2486 on_enterleave_call (aTHX_ sv_2mortal (cb));
2158} 2487}
2159 2488
2160/*****************************************************************************/ 2489/*****************************************************************************/
2161/* PerlIO::cede */ 2490/* PerlIO::cede */
2162 2491
2236/* Coro::Semaphore & Coro::Signal */ 2565/* Coro::Semaphore & Coro::Signal */
2237 2566
2238static SV * 2567static SV *
2239coro_waitarray_new (pTHX_ int count) 2568coro_waitarray_new (pTHX_ int count)
2240{ 2569{
2241 /* a semaphore contains a counter IV in $sem->[0] and any waiters after that */ 2570 /* a waitarray=semaphore contains a counter IV in $sem->[0] and any waiters after that */
2242 AV *av = newAV (); 2571 AV *av = newAV ();
2243 SV **ary; 2572 SV **ary;
2244 2573
2245 /* unfortunately, building manually saves memory */ 2574 /* unfortunately, building manually saves memory */
2246 Newx (ary, 2, SV *); 2575 Newx (ary, 2, SV *);
2247 AvALLOC (av) = ary; 2576 AvALLOC (av) = ary;
2577#if PERL_VERSION_ATLEAST (5,10,0)
2248 /*AvARRAY (av) = ary;*/ 2578 AvARRAY (av) = ary;
2579#else
2249 SvPVX ((SV *)av) = (char *)ary; /* 5.8.8 needs this syntax instead of AvARRAY = ary */ 2580 /* 5.8.8 needs this syntax instead of AvARRAY = ary, yet */
2581 /* -DDEBUGGING flags this as a bug, despite it perfectly working */
2582 SvPVX ((SV *)av) = (char *)ary;
2583#endif
2250 AvMAX (av) = 1; 2584 AvMAX (av) = 1;
2251 AvFILLp (av) = 0; 2585 AvFILLp (av) = 0;
2252 ary [0] = newSViv (count); 2586 ary [0] = newSViv (count);
2253 2587
2254 return newRV_noinc ((SV *)av); 2588 return newRV_noinc ((SV *)av);
2383{ 2717{
2384 if (items >= 2) 2718 if (items >= 2)
2385 { 2719 {
2386 /* callback form */ 2720 /* callback form */
2387 AV *av = (AV *)SvRV (arg [0]); 2721 AV *av = (AV *)SvRV (arg [0]);
2388 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 2722 SV *cb_cv = s_get_cv_croak (arg [1]);
2389 2723
2390 av_push (av, (SV *)SvREFCNT_inc_NN (cb_cv)); 2724 av_push (av, SvREFCNT_inc_NN (cb_cv));
2391 2725
2392 if (SvIVX (AvARRAY (av)[0]) > 0) 2726 if (SvIVX (AvARRAY (av)[0]) > 0)
2393 coro_semaphore_adjust (aTHX_ av, 0); 2727 coro_semaphore_adjust (aTHX_ av, 0);
2394 2728
2395 frame->prepare = prepare_nop; 2729 frame->prepare = prepare_nop;
2419 AvARRAY (av)[0] = AvARRAY (av)[1]; 2753 AvARRAY (av)[0] = AvARRAY (av)[1];
2420 AvARRAY (av)[1] = cb; 2754 AvARRAY (av)[1] = cb;
2421 2755
2422 cb = av_shift (av); 2756 cb = av_shift (av);
2423 2757
2758 if (SvTYPE (cb) == SVt_PVCV)
2759 {
2760 dSP;
2761 PUSHMARK (SP);
2762 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2763 PUTBACK;
2764 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2765 }
2766 else
2767 {
2424 api_ready (aTHX_ cb); 2768 api_ready (aTHX_ cb);
2425 sv_setiv (cb, 0); /* signal waiter */ 2769 sv_setiv (cb, 0); /* signal waiter */
2770 }
2771
2426 SvREFCNT_dec (cb); 2772 SvREFCNT_dec (cb);
2427 2773
2428 --count; 2774 --count;
2429 } 2775 }
2430} 2776}
2439static void 2785static void
2440slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2786slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2441{ 2787{
2442 AV *av = (AV *)SvRV (arg [0]); 2788 AV *av = (AV *)SvRV (arg [0]);
2443 2789
2790 if (items >= 2)
2791 {
2792 SV *cb_cv = s_get_cv_croak (arg [1]);
2793 av_push (av, SvREFCNT_inc_NN (cb_cv));
2794
2444 if (SvIVX (AvARRAY (av)[0])) 2795 if (SvIVX (AvARRAY (av)[0]))
2796 coro_signal_wake (aTHX_ av, 1); /* ust be the only waiter */
2797
2798 frame->prepare = prepare_nop;
2799 frame->check = slf_check_nop;
2800 }
2801 else if (SvIVX (AvARRAY (av)[0]))
2445 { 2802 {
2446 SvIVX (AvARRAY (av)[0]) = 0; 2803 SvIVX (AvARRAY (av)[0]) = 0;
2447 frame->prepare = prepare_nop; 2804 frame->prepare = prepare_nop;
2448 frame->check = slf_check_nop; 2805 frame->check = slf_check_nop;
2449 } 2806 }
2450 else 2807 else
2451 { 2808 {
2452 SV *waiter = newRV_inc (SvRV (coro_current)); /* owned by signal av */ 2809 SV *waiter = newSVsv (coro_current); /* owned by signal av */
2453 2810
2454 av_push (av, waiter); 2811 av_push (av, waiter);
2455 2812
2456 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */ 2813 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */
2457 frame->prepare = prepare_schedule; 2814 frame->prepare = prepare_schedule;
2475 2832
2476static void 2833static void
2477coro_aio_callback (pTHX_ CV *cv) 2834coro_aio_callback (pTHX_ CV *cv)
2478{ 2835{
2479 dXSARGS; 2836 dXSARGS;
2480 AV *state = (AV *)GENSUB_ARG; 2837 AV *state = (AV *)S_GENSUB_ARG;
2481 SV *coro = av_pop (state); 2838 SV *coro = av_pop (state);
2482 SV *data_sv = newSV (sizeof (struct io_state)); 2839 SV *data_sv = newSV (sizeof (struct io_state));
2483 2840
2484 av_extend (state, items - 1); 2841 av_extend (state, items - 1);
2485 2842
2599 2956
2600 for (i = 0; i < items; ++i) 2957 for (i = 0; i < items; ++i)
2601 PUSHs (arg [i]); 2958 PUSHs (arg [i]);
2602 2959
2603 /* now push the callback closure */ 2960 /* now push the callback closure */
2604 PUSHs (sv_2mortal (gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state)))); 2961 PUSHs (sv_2mortal (s_gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state))));
2605 2962
2606 /* now call the AIO function - we assume our request is uncancelable */ 2963 /* now call the AIO function - we assume our request is uncancelable */
2607 PUTBACK; 2964 PUTBACK;
2608 call_sv ((SV *)req, G_VOID | G_DISCARD); 2965 call_sv ((SV *)req, G_VOID | G_DISCARD);
2609 } 2966 }
2623 2980
2624 XSRETURN_EMPTY; 2981 XSRETURN_EMPTY;
2625} 2982}
2626 2983
2627/*****************************************************************************/ 2984/*****************************************************************************/
2985
2986#if CORO_CLONE
2987# include "clone.c"
2988#endif
2989
2990/*****************************************************************************/
2991
2992static SV *
2993coro_new (pTHX_ HV *stash, SV **argv, int argc, int is_coro)
2994{
2995 SV *coro_sv;
2996 struct coro *coro;
2997 MAGIC *mg;
2998 HV *hv;
2999 SV *cb;
3000 int i;
3001
3002 if (argc > 0)
3003 {
3004 cb = s_get_cv_croak (argv [0]);
3005
3006 if (!is_coro)
3007 {
3008 if (CvISXSUB (cb))
3009 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
3010
3011 if (!CvROOT (cb))
3012 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
3013 }
3014 }
3015
3016 Newz (0, coro, 1, struct coro);
3017 coro->args = newAV ();
3018 coro->flags = CF_NEW;
3019
3020 if (coro_first) coro_first->prev = coro;
3021 coro->next = coro_first;
3022 coro_first = coro;
3023
3024 coro->hv = hv = newHV ();
3025 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
3026 mg->mg_flags |= MGf_DUP;
3027 coro_sv = sv_bless (newRV_noinc ((SV *)hv), stash);
3028
3029 if (argc > 0)
3030 {
3031 av_extend (coro->args, argc + is_coro - 1);
3032
3033 if (is_coro)
3034 {
3035 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
3036 cb = (SV *)cv_coro_run;
3037 }
3038
3039 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3040
3041 for (i = 1; i < argc; i++)
3042 av_push (coro->args, newSVsv (argv [i]));
3043 }
3044
3045 return coro_sv;
3046}
2628 3047
2629MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3048MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2630 3049
2631PROTOTYPES: DISABLE 3050PROTOTYPES: DISABLE
2632 3051
2637 coro_thx = PERL_GET_CONTEXT; 3056 coro_thx = PERL_GET_CONTEXT;
2638# endif 3057# endif
2639#endif 3058#endif
2640 BOOT_PAGESIZE; 3059 BOOT_PAGESIZE;
2641 3060
3061 cctx_current = cctx_new_empty ();
3062
2642 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3063 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
2643 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3064 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
2644 3065
2645 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 3066 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get;
2646 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set; 3067 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set;
2665 3086
2666 { 3087 {
2667 SV *slf = sv_2mortal (newSViv (PTR2IV (pp_slf))); 3088 SV *slf = sv_2mortal (newSViv (PTR2IV (pp_slf)));
2668 3089
2669 if (!PL_custom_op_names) PL_custom_op_names = newHV (); 3090 if (!PL_custom_op_names) PL_custom_op_names = newHV ();
2670 hv_store_ent (PL_custom_op_names, slf, 3091 hv_store_ent (PL_custom_op_names, slf, newSVpv ("coro_slf", 0), 0);
2671 newSVpv ("coro_slf", 0), 0);
2672 3092
2673 if (!PL_custom_op_descs) PL_custom_op_descs = newHV (); 3093 if (!PL_custom_op_descs) PL_custom_op_descs = newHV ();
2674 hv_store_ent (PL_custom_op_descs, slf, 3094 hv_store_ent (PL_custom_op_descs, slf, newSVpv ("coro schedule like function", 0), 0);
2675 newSVpv ("coro schedule like function", 0), 0);
2676 } 3095 }
2677 3096
2678 coroapi.ver = CORO_API_VERSION; 3097 coroapi.ver = CORO_API_VERSION;
2679 coroapi.rev = CORO_API_REVISION; 3098 coroapi.rev = CORO_API_REVISION;
2680 3099
2692 3111
2693 if (!svp) croak ("Time::HiRes is required"); 3112 if (!svp) croak ("Time::HiRes is required");
2694 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer"); 3113 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
2695 3114
2696 nvtime = INT2PTR (double (*)(), SvIV (*svp)); 3115 nvtime = INT2PTR (double (*)(), SvIV (*svp));
3116
3117 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
3118 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
2697 } 3119 }
2698 3120
2699 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 3121 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
2700} 3122}
2701 3123
2702SV * 3124SV *
2703new (char *klass, ...) 3125new (SV *klass, ...)
2704 ALIAS: 3126 ALIAS:
2705 Coro::new = 1 3127 Coro::new = 1
2706 CODE: 3128 CODE:
2707{ 3129 RETVAL = coro_new (aTHX_ ix ? coro_stash : coro_state_stash, &ST (1), items - 1, ix);
2708 struct coro *coro; 3130 OUTPUT:
2709 MAGIC *mg;
2710 HV *hv;
2711 CV *cb;
2712 int i;
2713
2714 if (items > 1)
2715 {
2716 cb = coro_sv_2cv (aTHX_ ST (1));
2717
2718 if (!ix)
2719 {
2720 if (CvISXSUB (cb))
2721 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
2722
2723 if (!CvROOT (cb))
2724 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
2725 }
2726 }
2727
2728 Newz (0, coro, 1, struct coro);
2729 coro->args = newAV ();
2730 coro->flags = CF_NEW;
2731
2732 if (coro_first) coro_first->prev = coro;
2733 coro->next = coro_first;
2734 coro_first = coro;
2735
2736 coro->hv = hv = newHV ();
2737 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
2738 mg->mg_flags |= MGf_DUP;
2739 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
2740
2741 if (items > 1)
2742 {
2743 av_extend (coro->args, items - 1 + ix - 1);
2744
2745 if (ix)
2746 {
2747 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
2748 cb = cv_coro_run;
2749 }
2750
2751 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
2752
2753 for (i = 2; i < items; i++)
2754 av_push (coro->args, newSVsv (ST (i)));
2755 }
2756}
2757 OUTPUT:
2758 RETVAL 3131 RETVAL
2759 3132
2760void 3133void
2761transfer (...) 3134transfer (...)
2762 PROTOTYPE: $$ 3135 PROTOTYPE: $$
2773void 3146void
2774_exit (int code) 3147_exit (int code)
2775 PROTOTYPE: $ 3148 PROTOTYPE: $
2776 CODE: 3149 CODE:
2777 _exit (code); 3150 _exit (code);
3151
3152SV *
3153clone (Coro::State coro)
3154 CODE:
3155{
3156#if CORO_CLONE
3157 struct coro *ncoro = coro_clone (aTHX_ coro);
3158 MAGIC *mg;
3159 /* TODO: too much duplication */
3160 ncoro->hv = newHV ();
3161 mg = sv_magicext ((SV *)ncoro->hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)ncoro, 0);
3162 mg->mg_flags |= MGf_DUP;
3163 RETVAL = sv_bless (newRV_noinc ((SV *)ncoro->hv), SvSTASH (coro->hv));
3164#else
3165 croak ("Coro::State->clone has not been configured into this installation of Coro, realised");
3166#endif
3167}
3168 OUTPUT:
3169 RETVAL
2778 3170
2779int 3171int
2780cctx_stacksize (int new_stacksize = 0) 3172cctx_stacksize (int new_stacksize = 0)
2781 PROTOTYPE: ;$ 3173 PROTOTYPE: ;$
2782 CODE: 3174 CODE:
2832 eval = 1 3224 eval = 1
2833 CODE: 3225 CODE:
2834{ 3226{
2835 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3227 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
2836 { 3228 {
2837 struct coro temp; 3229 struct coro *current = SvSTATE_current;
2838 3230
2839 if (!(coro->flags & CF_RUNNING)) 3231 if (current != coro)
2840 { 3232 {
2841 PUTBACK; 3233 PUTBACK;
2842 save_perl (aTHX_ &temp); 3234 save_perl (aTHX_ current);
2843 load_perl (aTHX_ coro); 3235 load_perl (aTHX_ coro);
3236 SPAGAIN;
2844 } 3237 }
2845 3238
2846 {
2847 dSP;
2848 ENTER;
2849 SAVETMPS;
2850 PUTBACK;
2851 PUSHSTACK; 3239 PUSHSTACK;
3240
2852 PUSHMARK (SP); 3241 PUSHMARK (SP);
3242 PUTBACK;
2853 3243
2854 if (ix) 3244 if (ix)
2855 eval_sv (coderef, 0); 3245 eval_sv (coderef, 0);
2856 else 3246 else
2857 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 3247 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
2858 3248
2859 POPSTACK; 3249 POPSTACK;
2860 SPAGAIN; 3250 SPAGAIN;
2861 FREETMPS;
2862 LEAVE;
2863 PUTBACK;
2864 }
2865 3251
2866 if (!(coro->flags & CF_RUNNING)) 3252 if (current != coro)
2867 { 3253 {
3254 PUTBACK;
2868 save_perl (aTHX_ coro); 3255 save_perl (aTHX_ coro);
2869 load_perl (aTHX_ &temp); 3256 load_perl (aTHX_ current);
2870 SPAGAIN; 3257 SPAGAIN;
2871 } 3258 }
2872 } 3259 }
2873} 3260}
2874 3261
2878 ALIAS: 3265 ALIAS:
2879 is_ready = CF_READY 3266 is_ready = CF_READY
2880 is_running = CF_RUNNING 3267 is_running = CF_RUNNING
2881 is_new = CF_NEW 3268 is_new = CF_NEW
2882 is_destroyed = CF_DESTROYED 3269 is_destroyed = CF_DESTROYED
3270 is_suspended = CF_SUSPENDED
2883 CODE: 3271 CODE:
2884 RETVAL = boolSV (coro->flags & ix); 3272 RETVAL = boolSV (coro->flags & ix);
2885 OUTPUT: 3273 OUTPUT:
2886 RETVAL 3274 RETVAL
2887 3275
2891 CODE: 3279 CODE:
2892{ 3280{
2893 struct coro *current = SvSTATE_current; 3281 struct coro *current = SvSTATE_current;
2894 SV **throwp = self == current ? &CORO_THROW : &self->except; 3282 SV **throwp = self == current ? &CORO_THROW : &self->except;
2895 SvREFCNT_dec (*throwp); 3283 SvREFCNT_dec (*throwp);
3284 SvGETMAGIC (throw);
2896 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3285 *throwp = SvOK (throw) ? newSVsv (throw) : 0;
2897} 3286}
2898 3287
2899void 3288void
2900api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3289api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
2903 3292
2904SV * 3293SV *
2905has_cctx (Coro::State coro) 3294has_cctx (Coro::State coro)
2906 PROTOTYPE: $ 3295 PROTOTYPE: $
2907 CODE: 3296 CODE:
2908 RETVAL = boolSV (!!coro->cctx); 3297 /* maybe manage the running flag differently */
3298 RETVAL = boolSV (!!coro->cctx || (coro->flags & CF_RUNNING));
2909 OUTPUT: 3299 OUTPUT:
2910 RETVAL 3300 RETVAL
2911 3301
2912int 3302int
2913is_traced (Coro::State coro) 3303is_traced (Coro::State coro)
2933 3323
2934void 3324void
2935force_cctx () 3325force_cctx ()
2936 PROTOTYPE: 3326 PROTOTYPE:
2937 CODE: 3327 CODE:
2938 SvSTATE_current->cctx->idle_sp = 0; 3328 cctx_current->idle_sp = 0;
2939 3329
2940void 3330void
2941swap_defsv (Coro::State self) 3331swap_defsv (Coro::State self)
2942 PROTOTYPE: $ 3332 PROTOTYPE: $
2943 ALIAS: 3333 ALIAS:
2951 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv; 3341 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
2952 3342
2953 SV *tmp = *src; *src = *dst; *dst = tmp; 3343 SV *tmp = *src; *src = *dst; *dst = tmp;
2954 } 3344 }
2955 3345
3346void
3347cancel (Coro::State self)
3348 CODE:
3349 coro_state_destroy (aTHX_ self);
3350 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */
3351
3352
3353SV *
3354enable_times (int enabled = enable_times)
3355 CODE:
3356{
3357 RETVAL = boolSV (enable_times);
3358
3359 if (enabled != enable_times)
3360 {
3361 enable_times = enabled;
3362
3363 coro_times_update ();
3364 (enabled ? coro_times_sub : coro_times_add)(SvSTATE (coro_current));
3365 }
3366}
3367 OUTPUT:
3368 RETVAL
3369
3370void
3371times (Coro::State self)
3372 PPCODE:
3373{
3374 struct coro *current = SvSTATE (coro_current);
3375
3376 if (expect_false (current == self))
3377 {
3378 coro_times_update ();
3379 coro_times_add (SvSTATE (coro_current));
3380 }
3381
3382 EXTEND (SP, 2);
3383 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3384 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3385
3386 if (expect_false (current == self))
3387 coro_times_sub (SvSTATE (coro_current));
3388}
3389
3390void
3391swap_sv (Coro::State coro, SV *sv, SV *swapsv)
3392 CODE:
3393{
3394 struct coro *current = SvSTATE_current;
3395
3396 if (current == coro)
3397 SWAP_SVS (current);
3398
3399 if (!coro->swap_sv)
3400 coro->swap_sv = newAV ();
3401
3402 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv )));
3403 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv)));
3404
3405 if (current == coro)
3406 SWAP_SVS (current);
3407}
3408
2956 3409
2957MODULE = Coro::State PACKAGE = Coro 3410MODULE = Coro::State PACKAGE = Coro
2958 3411
2959BOOT: 3412BOOT:
2960{ 3413{
2961 int i;
2962
2963 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
2964 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3414 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
2965 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3415 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
2966 cv_coro_run = get_cv ( "Coro::_terminate", GV_ADD); 3416 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
2967 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD); 3417 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
2968 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 3418 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3419 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3420 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3421 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3422 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
2969 3423
2970 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3424 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
2971 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3425 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
2972 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 3426 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
2973 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new); 3427 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
2974 3428
2975 coro_stash = gv_stashpv ("Coro", TRUE); 3429 coro_stash = gv_stashpv ("Coro", TRUE);
2976 3430
2977 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 3431 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
2978 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 3432 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
2979 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 3433 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
2980 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 3434 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (CORO_PRIO_LOW));
2981 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE)); 3435 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (CORO_PRIO_IDLE));
2982 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN)); 3436 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (CORO_PRIO_MIN));
2983
2984 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
2985 coro_ready[i] = newAV ();
2986 3437
2987 { 3438 {
2988 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 3439 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
2989 3440
2990 coroapi.schedule = api_schedule; 3441 coroapi.schedule = api_schedule;
3442 coroapi.schedule_to = api_schedule_to;
2991 coroapi.cede = api_cede; 3443 coroapi.cede = api_cede;
2992 coroapi.cede_notself = api_cede_notself; 3444 coroapi.cede_notself = api_cede_notself;
2993 coroapi.ready = api_ready; 3445 coroapi.ready = api_ready;
2994 coroapi.is_ready = api_is_ready; 3446 coroapi.is_ready = api_is_ready;
2995 coroapi.nready = coro_nready; 3447 coroapi.nready = coro_nready;
2999 sv_setiv (sv, (IV)&coroapi); 3451 sv_setiv (sv, (IV)&coroapi);
3000 SvREADONLY_on (sv); 3452 SvREADONLY_on (sv);
3001 } 3453 }
3002} 3454}
3003 3455
3456SV *
3457async (...)
3458 PROTOTYPE: &@
3459 CODE:
3460 RETVAL = coro_new (aTHX_ coro_stash, &ST (0), items, 1);
3461 api_ready (aTHX_ RETVAL);
3462 OUTPUT:
3463 RETVAL
3464
3465void
3466terminate (...)
3467 CODE:
3468 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3469
3004void 3470void
3005schedule (...) 3471schedule (...)
3006 CODE: 3472 CODE:
3007 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3473 CORO_EXECUTE_SLF_XS (slf_init_schedule);
3474
3475void
3476schedule_to (...)
3477 CODE:
3478 CORO_EXECUTE_SLF_XS (slf_init_schedule_to);
3479
3480void
3481cede_to (...)
3482 CODE:
3483 CORO_EXECUTE_SLF_XS (slf_init_cede_to);
3008 3484
3009void 3485void
3010cede (...) 3486cede (...)
3011 CODE: 3487 CODE:
3012 CORO_EXECUTE_SLF_XS (slf_init_cede); 3488 CORO_EXECUTE_SLF_XS (slf_init_cede);
3026void 3502void
3027_set_readyhook (SV *hook) 3503_set_readyhook (SV *hook)
3028 PROTOTYPE: $ 3504 PROTOTYPE: $
3029 CODE: 3505 CODE:
3030 SvREFCNT_dec (coro_readyhook); 3506 SvREFCNT_dec (coro_readyhook);
3507 SvGETMAGIC (hook);
3508 if (SvOK (hook))
3509 {
3031 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0; 3510 coro_readyhook = newSVsv (hook);
3511 CORO_READYHOOK = invoke_sv_ready_hook_helper;
3512 }
3513 else
3514 {
3515 coro_readyhook = 0;
3516 CORO_READYHOOK = 0;
3517 }
3032 3518
3033int 3519int
3034prio (Coro::State coro, int newprio = 0) 3520prio (Coro::State coro, int newprio = 0)
3035 PROTOTYPE: $;$ 3521 PROTOTYPE: $;$
3036 ALIAS: 3522 ALIAS:
3042 if (items > 1) 3528 if (items > 1)
3043 { 3529 {
3044 if (ix) 3530 if (ix)
3045 newprio = coro->prio - newprio; 3531 newprio = coro->prio - newprio;
3046 3532
3047 if (newprio < PRIO_MIN) newprio = PRIO_MIN; 3533 if (newprio < CORO_PRIO_MIN) newprio = CORO_PRIO_MIN;
3048 if (newprio > PRIO_MAX) newprio = PRIO_MAX; 3534 if (newprio > CORO_PRIO_MAX) newprio = CORO_PRIO_MAX;
3049 3535
3050 coro->prio = newprio; 3536 coro->prio = newprio;
3051 } 3537 }
3052} 3538}
3053 OUTPUT: 3539 OUTPUT:
3068 RETVAL = coro_nready; 3554 RETVAL = coro_nready;
3069 OUTPUT: 3555 OUTPUT:
3070 RETVAL 3556 RETVAL
3071 3557
3072void 3558void
3559suspend (Coro::State self)
3560 PROTOTYPE: $
3561 CODE:
3562 self->flags |= CF_SUSPENDED;
3563
3564void
3565resume (Coro::State self)
3566 PROTOTYPE: $
3567 CODE:
3568 self->flags &= ~CF_SUSPENDED;
3569
3570void
3073_pool_handler (...) 3571_pool_handler (...)
3074 CODE: 3572 CODE:
3075 CORO_EXECUTE_SLF_XS (slf_init_pool_handler); 3573 CORO_EXECUTE_SLF_XS (slf_init_pool_handler);
3076 3574
3077void 3575void
3088 for (i = 1; i < items; ++i) 3586 for (i = 1; i < items; ++i)
3089 av_push (av, SvREFCNT_inc_NN (ST (i))); 3587 av_push (av, SvREFCNT_inc_NN (ST (i)));
3090 3588
3091 if ((SV *)hv == &PL_sv_undef) 3589 if ((SV *)hv == &PL_sv_undef)
3092 { 3590 {
3093 PUSHMARK (SP); 3591 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3094 EXTEND (SP, 2);
3095 PUSHs (sv_Coro);
3096 PUSHs ((SV *)cv_pool_handler);
3097 PUTBACK;
3098 call_sv ((SV *)cv_coro_state_new, G_SCALAR);
3099 SPAGAIN;
3100
3101 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs)); 3592 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
3593 SvREFCNT_dec (sv);
3102 } 3594 }
3103 3595
3104 { 3596 {
3105 struct coro *coro = SvSTATE_hv (hv); 3597 struct coro *coro = SvSTATE_hv (hv);
3106 3598
3130rouse_wait (...) 3622rouse_wait (...)
3131 PROTOTYPE: ;$ 3623 PROTOTYPE: ;$
3132 PPCODE: 3624 PPCODE:
3133 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait); 3625 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait);
3134 3626
3627void
3628on_enter (SV *block)
3629 ALIAS:
3630 on_leave = 1
3631 PROTOTYPE: &
3632 CODE:
3633{
3634 struct coro *coro = SvSTATE_current;
3635 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3636
3637 block = s_get_cv_croak (block);
3638
3639 if (!*avp)
3640 *avp = newAV ();
3641
3642 av_push (*avp, SvREFCNT_inc (block));
3643
3644 if (!ix)
3645 on_enterleave_call (aTHX_ block);
3646
3647 LEAVE; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
3648 SAVEDESTRUCTOR_X (ix ? coro_pop_on_leave : coro_pop_on_enter, (void *)coro);
3649 ENTER; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
3650}
3651
3135 3652
3136MODULE = Coro::State PACKAGE = PerlIO::cede 3653MODULE = Coro::State PACKAGE = PerlIO::cede
3137 3654
3138BOOT: 3655BOOT:
3139 PerlIO_define_layer (aTHX_ &PerlIO_cede); 3656 PerlIO_define_layer (aTHX_ &PerlIO_cede);
3142MODULE = Coro::State PACKAGE = Coro::Semaphore 3659MODULE = Coro::State PACKAGE = Coro::Semaphore
3143 3660
3144SV * 3661SV *
3145new (SV *klass, SV *count = 0) 3662new (SV *klass, SV *count = 0)
3146 CODE: 3663 CODE:
3664{
3665 int semcnt = 1;
3666
3667 if (count)
3668 {
3669 SvGETMAGIC (count);
3670
3671 if (SvOK (count))
3672 semcnt = SvIV (count);
3673 }
3674
3147 RETVAL = sv_bless ( 3675 RETVAL = sv_bless (
3148 coro_waitarray_new (aTHX_ count && SvOK (count) ? SvIV (count) : 1), 3676 coro_waitarray_new (aTHX_ semcnt),
3149 GvSTASH (CvGV (cv)) 3677 GvSTASH (CvGV (cv))
3150 ); 3678 );
3679}
3151 OUTPUT: 3680 OUTPUT:
3152 RETVAL 3681 RETVAL
3153 3682
3154# helper for Coro::Channel 3683# helper for Coro::Channel and others
3155SV * 3684SV *
3156_alloc (int count) 3685_alloc (int count)
3157 CODE: 3686 CODE:
3158 RETVAL = coro_waitarray_new (aTHX_ count); 3687 RETVAL = coro_waitarray_new (aTHX_ count);
3159 OUTPUT: 3688 OUTPUT:
3217 for (i = 1; i <= wcount; ++i) 3746 for (i = 1; i <= wcount; ++i)
3218 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i]))); 3747 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i])));
3219 } 3748 }
3220} 3749}
3221 3750
3751MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3752
3753void
3754_may_delete (SV *sem, int count, int extra_refs)
3755 PPCODE:
3756{
3757 AV *av = (AV *)SvRV (sem);
3758
3759 if (SvREFCNT ((SV *)av) == 1 + extra_refs
3760 && AvFILLp (av) == 0 /* no waiters, just count */
3761 && SvIV (AvARRAY (av)[0]) == count)
3762 XSRETURN_YES;
3763
3764 XSRETURN_NO;
3765}
3766
3222MODULE = Coro::State PACKAGE = Coro::Signal 3767MODULE = Coro::State PACKAGE = Coro::Signal
3223 3768
3224SV * 3769SV *
3225new (SV *klass) 3770new (SV *klass)
3226 CODE: 3771 CODE:
3297 3842
3298void 3843void
3299_register (char *target, char *proto, SV *req) 3844_register (char *target, char *proto, SV *req)
3300 CODE: 3845 CODE:
3301{ 3846{
3302 CV *req_cv = coro_sv_2cv (aTHX_ req); 3847 SV *req_cv = s_get_cv_croak (req);
3303 /* newXSproto doesn't return the CV on 5.8 */ 3848 /* newXSproto doesn't return the CV on 5.8 */
3304 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 3849 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3305 sv_setpv ((SV *)slf_cv, proto); 3850 sv_setpv ((SV *)slf_cv, proto);
3306 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0); 3851 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
3307} 3852}
3308 3853
3854MODULE = Coro::State PACKAGE = Coro::Select
3855
3856void
3857patch_pp_sselect ()
3858 CODE:
3859 if (!coro_old_pp_sselect)
3860 {
3861 coro_select_select = (SV *)get_cv ("Coro::Select::select", 0);
3862 coro_old_pp_sselect = PL_ppaddr [OP_SSELECT];
3863 PL_ppaddr [OP_SSELECT] = coro_pp_sselect;
3864 }
3865
3866void
3867unpatch_pp_sselect ()
3868 CODE:
3869 if (coro_old_pp_sselect)
3870 {
3871 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
3872 coro_old_pp_sselect = 0;
3873 }
3874
3875

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines