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.324 by root, Sat Nov 22 07:02:28 2008 UTC vs.
Revision 1.386 by root, Sat Feb 19 06:51:23 2011 UTC

1/* this works around a bug in mingw32 providing a non-working setjmp */
2#define USE_NO_MINGW_SETJMP_TWO_ARGS
3
4#define NDEBUG 1
5
1#include "libcoro/coro.c" 6#include "libcoro/coro.c"
2 7
3#define PERL_NO_GET_CONTEXT 8#define PERL_NO_GET_CONTEXT
4#define PERL_EXT 9#define PERL_EXT
5 10
6#include "EXTERN.h" 11#include "EXTERN.h"
7#include "perl.h" 12#include "perl.h"
8#include "XSUB.h" 13#include "XSUB.h"
9#include "perliol.h" 14#include "perliol.h"
10 15
11#include "patchlevel.h" 16#include "schmorp.h"
12 17
13#include <stdio.h> 18#include <stdio.h>
14#include <errno.h> 19#include <errno.h>
15#include <assert.h> 20#include <assert.h>
21
22#ifndef SVs_PADSTALE
23# define SVs_PADSTALE 0
24#endif
16 25
17#ifdef WIN32 26#ifdef WIN32
18# undef setjmp 27# undef setjmp
19# undef longjmp 28# undef longjmp
20# undef _exit 29# undef _exit
… …
51#endif 60#endif
52 61
53/* the maximum number of idle cctx that will be pooled */ 62/* the maximum number of idle cctx that will be pooled */
54static int cctx_max_idle = 4; 63static int cctx_max_idle = 4;
55 64
56#define PERL_VERSION_ATLEAST(a,b,c) \
57 (PERL_REVISION > (a) \
58 || (PERL_REVISION == (a) \
59 && (PERL_VERSION > (b) \
60 || (PERL_VERSION == (b) && PERL_SUBVERSION >= (c)))))
61
62#if !PERL_VERSION_ATLEAST (5,6,0)
63# ifndef PL_ppaddr
64# define PL_ppaddr ppaddr
65# endif
66# ifndef call_sv
67# define call_sv perl_call_sv
68# endif
69# ifndef get_sv
70# define get_sv perl_get_sv
71# endif
72# ifndef get_cv
73# define get_cv perl_get_cv
74# endif
75# ifndef IS_PADGV
76# define IS_PADGV(v) 0
77# endif
78# ifndef IS_PADCONST
79# define IS_PADCONST(v) 0
80# endif
81#endif
82
83/* 5.11 */
84#ifndef CxHASARGS
85# define CxHASARGS(cx) (cx)->blk_sub.hasargs
86#endif
87
88/* 5.10.0 */
89#ifndef SvREFCNT_inc_NN
90# define SvREFCNT_inc_NN(sv) SvREFCNT_inc (sv)
91#endif
92
93/* 5.8.8 */
94#ifndef GV_NOTQUAL
95# define GV_NOTQUAL 0
96#endif
97#ifndef newSV
98# define newSV(l) NEWSV(0,l)
99#endif
100#ifndef CvISXSUB_on
101# define CvISXSUB_on(cv) (void)cv
102#endif
103#ifndef CvISXSUB
104# define CvISXSUB(cv) (CvXSUB (cv) ? TRUE : FALSE)
105#endif
106#ifndef Newx
107# define Newx(ptr,nitems,type) New (0,ptr,nitems,type)
108#endif
109
110/* 5.8.7 */
111#ifndef SvRV_set
112# define SvRV_set(s,v) SvRV(s) = (v)
113#endif
114
115#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 65#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
116# undef CORO_STACKGUARD 66# undef CORO_STACKGUARD
117#endif 67#endif
118 68
119#ifndef CORO_STACKGUARD 69#ifndef CORO_STACKGUARD
… …
133#else 83#else
134# define dSTACKLEVEL volatile void *stacklevel 84# define dSTACKLEVEL volatile void *stacklevel
135# define STACKLEVEL ((void *)&stacklevel) 85# define STACKLEVEL ((void *)&stacklevel)
136#endif 86#endif
137 87
138#define IN_DESTRUCT (PL_main_cv == Nullcv) 88#define IN_DESTRUCT PL_dirty
139 89
140#if __GNUC__ >= 3 90#if __GNUC__ >= 3
141# define attribute(x) __attribute__(x) 91# define attribute(x) __attribute__(x)
142# define expect(expr,value) __builtin_expect ((expr),(value)) 92# define expect(expr,value) __builtin_expect ((expr), (value))
143# define INLINE static inline 93# define INLINE static inline
144#else 94#else
145# define attribute(x) 95# define attribute(x)
146# define expect(expr,value) (expr) 96# define expect(expr,value) (expr)
147# define INLINE static 97# define INLINE static
… …
159# if CORO_PTHREAD 109# if CORO_PTHREAD
160static void *coro_thx; 110static void *coro_thx;
161# endif 111# endif
162#endif 112#endif
163 113
114#ifdef __linux
115# include <time.h> /* for timespec */
116# include <syscall.h> /* for SYS_* */
117# ifdef SYS_clock_gettime
118# define coro_clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
119# define CORO_CLOCK_MONOTONIC 1
120# define CORO_CLOCK_THREAD_CPUTIME_ID 3
121# endif
122#endif
123
164static double (*nvtime)(); /* so why doesn't it take void? */ 124static double (*nvtime)(); /* so why doesn't it take void? */
125static void (*u2time)(pTHX_ UV ret[2]);
165 126
166/* we hijack an hopefully unused CV flag for our purposes */ 127/* we hijack an hopefully unused CV flag for our purposes */
167#define CVf_SLF 0x4000 128#define CVf_SLF 0x4000
168static OP *pp_slf (pTHX); 129static OP *pp_slf (pTHX);
169 130
… …
175static HV *coro_state_stash, *coro_stash; 136static HV *coro_state_stash, *coro_stash;
176static volatile SV *coro_mortal; /* will be freed/thrown after next transfer */ 137static volatile SV *coro_mortal; /* will be freed/thrown after next transfer */
177 138
178static AV *av_destroy; /* destruction queue */ 139static AV *av_destroy; /* destruction queue */
179static SV *sv_manager; /* the manager coro */ 140static SV *sv_manager; /* the manager coro */
141static SV *sv_idle; /* $Coro::idle */
180 142
181static GV *irsgv; /* $/ */ 143static GV *irsgv; /* $/ */
182static GV *stdoutgv; /* *STDOUT */ 144static GV *stdoutgv; /* *STDOUT */
183static SV *rv_diehook; 145static SV *rv_diehook;
184static SV *rv_warnhook; 146static SV *rv_warnhook;
… …
189static SV *sv_pool_size; 151static SV *sv_pool_size;
190static SV *sv_async_pool_idle; /* description string */ 152static SV *sv_async_pool_idle; /* description string */
191static AV *av_async_pool; /* idle pool */ 153static AV *av_async_pool; /* idle pool */
192static SV *sv_Coro; /* class string */ 154static SV *sv_Coro; /* class string */
193static CV *cv_pool_handler; 155static CV *cv_pool_handler;
194static CV *cv_coro_state_new;
195 156
196/* Coro::AnyEvent */ 157/* Coro::AnyEvent */
197static SV *sv_activity; 158static SV *sv_activity;
159
160/* enable processtime/realtime profiling */
161static char enable_times;
162typedef U32 coro_ts[2];
163static coro_ts time_real, time_cpu;
164static char times_valid;
198 165
199static struct coro_cctx *cctx_first; 166static struct coro_cctx *cctx_first;
200static int cctx_count, cctx_idle; 167static int cctx_count, cctx_idle;
201 168
202enum { 169enum {
… …
237enum { 204enum {
238 CF_RUNNING = 0x0001, /* coroutine is running */ 205 CF_RUNNING = 0x0001, /* coroutine is running */
239 CF_READY = 0x0002, /* coroutine is ready */ 206 CF_READY = 0x0002, /* coroutine is ready */
240 CF_NEW = 0x0004, /* has never been switched to */ 207 CF_NEW = 0x0004, /* has never been switched to */
241 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 208 CF_DESTROYED = 0x0008, /* coroutine data has been freed */
209 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
242}; 210};
243 211
244/* the structure where most of the perl state is stored, overlaid on the cxstack */ 212/* the structure where most of the perl state is stored, overlaid on the cxstack */
245typedef struct 213typedef struct
246{ 214{
247 SV *defsv; 215 SV *defsv;
248 AV *defav; 216 AV *defav;
249 SV *errsv; 217 SV *errsv;
250 SV *irsgv; 218 SV *irsgv;
219 HV *hinthv;
251#define VAR(name,type) type name; 220#define VAR(name,type) type name;
252# include "state.h" 221# include "state.h"
253#undef VAR 222#undef VAR
254} perl_slots; 223} perl_slots;
255 224
… …
257 226
258/* this is a structure representing a perl-level coroutine */ 227/* this is a structure representing a perl-level coroutine */
259struct coro { 228struct coro {
260 /* the C coroutine allocated to this perl coroutine, if any */ 229 /* the C coroutine allocated to this perl coroutine, if any */
261 coro_cctx *cctx; 230 coro_cctx *cctx;
231
232 /* ready queue */
233 struct coro *next_ready;
262 234
263 /* state data */ 235 /* state data */
264 struct CoroSLF slf_frame; /* saved slf frame */ 236 struct CoroSLF slf_frame; /* saved slf frame */
265 AV *mainstack; 237 AV *mainstack;
266 perl_slots *slot; /* basically the saved sp */ 238 perl_slots *slot; /* basically the saved sp */
… …
268 CV *startcv; /* the CV to execute */ 240 CV *startcv; /* the CV to execute */
269 AV *args; /* data associated with this coroutine (initial args) */ 241 AV *args; /* data associated with this coroutine (initial args) */
270 int refcnt; /* coroutines are refcounted, yes */ 242 int refcnt; /* coroutines are refcounted, yes */
271 int flags; /* CF_ flags */ 243 int flags; /* CF_ flags */
272 HV *hv; /* the perl hash associated with this coro, if any */ 244 HV *hv; /* the perl hash associated with this coro, if any */
273 void (*on_destroy)(pTHX_ struct coro *coro); 245 void (*on_destroy)(pTHX_ struct coro *coro); /* for temporary use by xs in critical sections */
274 246
275 /* statistics */ 247 /* statistics */
276 int usecount; /* number of transfers to this coro */ 248 int usecount; /* number of transfers to this coro */
277 249
278 /* coro process data */ 250 /* coro process data */
… …
283 /* async_pool */ 255 /* async_pool */
284 SV *saved_deffh; 256 SV *saved_deffh;
285 SV *invoke_cb; 257 SV *invoke_cb;
286 AV *invoke_av; 258 AV *invoke_av;
287 259
260 /* on_enter/on_leave */
261 AV *on_enter;
262 AV *on_leave;
263
264 /* swap_sv */
265 AV *swap_sv;
266
267 /* times */
268 coro_ts t_cpu, t_real;
269
288 /* linked list */ 270 /* linked list */
289 struct coro *next, *prev; 271 struct coro *next, *prev;
290}; 272};
291 273
292typedef struct coro *Coro__State; 274typedef struct coro *Coro__State;
… …
297/* the mainr easonw e don't support windows process emulation */ 279/* the mainr easonw e don't support windows process emulation */
298static struct CoroSLF slf_frame; /* the current slf frame */ 280static struct CoroSLF slf_frame; /* the current slf frame */
299 281
300/** Coro ********************************************************************/ 282/** Coro ********************************************************************/
301 283
302#define PRIO_MAX 3 284#define CORO_PRIO_MAX 3
303#define PRIO_HIGH 1 285#define CORO_PRIO_HIGH 1
304#define PRIO_NORMAL 0 286#define CORO_PRIO_NORMAL 0
305#define PRIO_LOW -1 287#define CORO_PRIO_LOW -1
306#define PRIO_IDLE -3 288#define CORO_PRIO_IDLE -3
307#define PRIO_MIN -4 289#define CORO_PRIO_MIN -4
308 290
309/* for Coro.pm */ 291/* for Coro.pm */
310static SV *coro_current; 292static SV *coro_current;
311static SV *coro_readyhook; 293static SV *coro_readyhook;
312static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1]; 294static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
313static CV *cv_coro_run, *cv_coro_terminate; 295static CV *cv_coro_run, *cv_coro_terminate;
314static struct coro *coro_first; 296static struct coro *coro_first;
315#define coro_nready coroapi.nready 297#define coro_nready coroapi.nready
298
299/** Coro::Select ************************************************************/
300
301static OP *(*coro_old_pp_sselect) (pTHX);
302static SV *coro_select_select;
303
304/* horrible hack, but if it works... */
305static OP *
306coro_pp_sselect (pTHX)
307{
308 dSP;
309 PUSHMARK (SP - 4); /* fake argument list */
310 XPUSHs (coro_select_select);
311 PUTBACK;
312
313 /* entersub is an UNOP, select a LISTOP... keep your fingers crossed */
314 PL_op->op_flags |= OPf_STACKED;
315 PL_op->op_private = 0;
316 return PL_ppaddr [OP_ENTERSUB](aTHX);
317}
318
319/** time stuff **************************************************************/
320
321#ifdef HAS_GETTIMEOFDAY
322
323static void
324coro_u2time (aTHX_ UV ret[2])
325{
326 struct timeval tv;
327 gettimeofday (&tv, 0);
328
329 ret [0] = tv.tv_sec;
330 ret [1] = tv.tv_usec;
331}
332
333static double
334coro_nvtime ()
335{
336 struct timeval tv;
337 gettimeofday (&tv, 0);
338
339 return tv.tv_sec + tv.tv_usec * 1e-6;
340}
341
342static void
343time_init (void)
344{
345 nvtime = coro_nvtime;
346 u2time = coro_u2time;
347}
348
349#else
350
351static void
352time_init (void)
353{
354 SV **svp;
355
356 require_pv ("Time::HiRes");
357
358 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
359
360 if (!svp) croak ("Time::HiRes is required");
361 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
362
363 nvtime = INT2PTR (double (*)(), SvIV (*svp));
364
365 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
366 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
367}
368
369#endif
316 370
317/** lowlevel stuff **********************************************************/ 371/** lowlevel stuff **********************************************************/
318 372
319static SV * 373static SV *
320coro_get_sv (pTHX_ const char *name, int create) 374coro_get_sv (pTHX_ const char *name, int create)
… …
344 get_hv (name, create); 398 get_hv (name, create);
345#endif 399#endif
346 return get_hv (name, create); 400 return get_hv (name, create);
347} 401}
348 402
349/* may croak */ 403INLINE void
350INLINE CV * 404coro_times_update ()
351coro_sv_2cv (pTHX_ SV *sv)
352{ 405{
406#ifdef coro_clock_gettime
407 struct timespec ts;
408
409 ts.tv_sec = ts.tv_nsec = 0;
410 coro_clock_gettime (CORO_CLOCK_THREAD_CPUTIME_ID, &ts);
411 time_cpu [0] = ts.tv_sec; time_cpu [1] = ts.tv_nsec;
412
413 ts.tv_sec = ts.tv_nsec = 0;
414 coro_clock_gettime (CORO_CLOCK_MONOTONIC, &ts);
415 time_real [0] = ts.tv_sec; time_real [1] = ts.tv_nsec;
416#else
417 dTHX;
418 UV tv[2];
419
420 u2time (aTHX_ tv);
421 time_real [0] = tv [0];
422 time_real [1] = tv [1] * 1000;
423#endif
424}
425
426INLINE void
427coro_times_add (struct coro *c)
428{
429 c->t_real [1] += time_real [1];
430 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
431 c->t_real [0] += time_real [0];
432
433 c->t_cpu [1] += time_cpu [1];
434 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
435 c->t_cpu [0] += time_cpu [0];
436}
437
438INLINE void
439coro_times_sub (struct coro *c)
440{
441 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; }
442 c->t_real [1] -= time_real [1];
443 c->t_real [0] -= time_real [0];
444
445 if (c->t_cpu [1] < time_cpu [1]) { c->t_cpu [1] += 1000000000; --c->t_cpu [0]; }
446 c->t_cpu [1] -= time_cpu [1];
447 c->t_cpu [0] -= time_cpu [0];
448}
449
450/*****************************************************************************/
451/* magic glue */
452
453#define CORO_MAGIC_type_cv 26
454#define CORO_MAGIC_type_state PERL_MAGIC_ext
455
456#define CORO_MAGIC_NN(sv, type) \
457 (expect_true (SvMAGIC (sv)->mg_type == type) \
458 ? SvMAGIC (sv) \
459 : mg_find (sv, type))
460
461#define CORO_MAGIC(sv, type) \
462 (expect_true (SvMAGIC (sv)) \
463 ? CORO_MAGIC_NN (sv, type) \
464 : 0)
465
466#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
467#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
468
469INLINE struct coro *
470SvSTATE_ (pTHX_ SV *coro)
471{
353 HV *st; 472 HV *stash;
354 GV *gvp; 473 MAGIC *mg;
355 return sv_2cv (sv, &st, &gvp, 0); 474
475 if (SvROK (coro))
476 coro = SvRV (coro);
477
478 if (expect_false (SvTYPE (coro) != SVt_PVHV))
479 croak ("Coro::State object required");
480
481 stash = SvSTASH (coro);
482 if (expect_false (stash != coro_stash && stash != coro_state_stash))
483 {
484 /* very slow, but rare, check */
485 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
486 croak ("Coro::State object required");
487 }
488
489 mg = CORO_MAGIC_state (coro);
490 return (struct coro *)mg->mg_ptr;
356} 491}
492
493#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
494
495/* faster than SvSTATE, but expects a coroutine hv */
496#define SvSTATE_hv(hv) ((struct coro *)CORO_MAGIC_NN ((SV *)hv, CORO_MAGIC_type_state)->mg_ptr)
497#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
498
499/*****************************************************************************/
500/* padlist management and caching */
357 501
358static AV * 502static AV *
359coro_derive_padlist (pTHX_ CV *cv) 503coro_derive_padlist (pTHX_ CV *cv)
360{ 504{
361 AV *padlist = CvPADLIST (cv); 505 AV *padlist = CvPADLIST (cv);
… …
369 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 513 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
370#endif 514#endif
371 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 515 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
372 --AvFILLp (padlist); 516 --AvFILLp (padlist);
373 517
374 av_store (newpadlist, 0, SvREFCNT_inc_NN (*av_fetch (padlist, 0, FALSE))); 518 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0]));
375 av_store (newpadlist, 1, (SV *)newpad); 519 av_store (newpadlist, 1, (SV *)newpad);
376 520
377 return newpadlist; 521 return newpadlist;
378} 522}
379 523
380static void 524static void
381free_padlist (pTHX_ AV *padlist) 525free_padlist (pTHX_ AV *padlist)
382{ 526{
383 /* may be during global destruction */ 527 /* may be during global destruction */
384 if (SvREFCNT (padlist)) 528 if (!IN_DESTRUCT)
385 { 529 {
386 I32 i = AvFILLp (padlist); 530 I32 i = AvFILLp (padlist);
387 while (i >= 0) 531
532 while (i > 0) /* special-case index 0 */
388 { 533 {
389 SV **svp = av_fetch (padlist, i--, FALSE); 534 /* we try to be extra-careful here */
390 if (svp) 535 AV *av = (AV *)AvARRAY (padlist)[i--];
391 { 536 I32 j = AvFILLp (av);
392 SV *sv; 537
393 while (&PL_sv_undef != (sv = av_pop ((AV *)*svp))) 538 while (j >= 0)
539 SvREFCNT_dec (AvARRAY (av)[j--]);
540
541 AvFILLp (av) = -1;
394 SvREFCNT_dec (sv); 542 SvREFCNT_dec (av);
395
396 SvREFCNT_dec (*svp);
397 }
398 } 543 }
399 544
545 SvREFCNT_dec (AvARRAY (padlist)[0]);
546
547 AvFILLp (padlist) = -1;
400 SvREFCNT_dec ((SV*)padlist); 548 SvREFCNT_dec ((SV*)padlist);
401 } 549 }
402} 550}
403 551
404static int 552static int
405coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 553coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
406{ 554{
407 AV *padlist; 555 AV *padlist;
408 AV *av = (AV *)mg->mg_obj; 556 AV *av = (AV *)mg->mg_obj;
557
558 /* perl manages to free our internal AV and _then_ call us */
559 if (IN_DESTRUCT)
560 return 0;
409 561
410 /* casting is fun. */ 562 /* casting is fun. */
411 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 563 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
412 free_padlist (aTHX_ padlist); 564 free_padlist (aTHX_ padlist);
413 565
414 SvREFCNT_dec (av); /* sv_magicext increased the refcount */ 566 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
415 567
416 return 0; 568 return 0;
417} 569}
418
419#define CORO_MAGIC_type_cv 26
420#define CORO_MAGIC_type_state PERL_MAGIC_ext
421 570
422static MGVTBL coro_cv_vtbl = { 571static MGVTBL coro_cv_vtbl = {
423 0, 0, 0, 0, 572 0, 0, 0, 0,
424 coro_cv_free 573 coro_cv_free
425}; 574};
426
427#define CORO_MAGIC_NN(sv, type) \
428 (expect_true (SvMAGIC (sv)->mg_type == type) \
429 ? SvMAGIC (sv) \
430 : mg_find (sv, type))
431
432#define CORO_MAGIC(sv, type) \
433 (expect_true (SvMAGIC (sv)) \
434 ? CORO_MAGIC_NN (sv, type) \
435 : 0)
436
437#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
438#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
439
440INLINE struct coro *
441SvSTATE_ (pTHX_ SV *coro)
442{
443 HV *stash;
444 MAGIC *mg;
445
446 if (SvROK (coro))
447 coro = SvRV (coro);
448
449 if (expect_false (SvTYPE (coro) != SVt_PVHV))
450 croak ("Coro::State object required");
451
452 stash = SvSTASH (coro);
453 if (expect_false (stash != coro_stash && stash != coro_state_stash))
454 {
455 /* very slow, but rare, check */
456 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
457 croak ("Coro::State object required");
458 }
459
460 mg = CORO_MAGIC_state (coro);
461 return (struct coro *)mg->mg_ptr;
462}
463
464#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
465
466/* faster than SvSTATE, but expects a coroutine hv */
467#define SvSTATE_hv(hv) ((struct coro *)CORO_MAGIC_NN ((SV *)hv, CORO_MAGIC_type_state)->mg_ptr)
468#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
469 575
470/* the next two functions merely cache the padlists */ 576/* the next two functions merely cache the padlists */
471static void 577static void
472get_padlist (pTHX_ CV *cv) 578get_padlist (pTHX_ CV *cv)
473{ 579{
… …
501 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 607 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
502 608
503 av = (AV *)mg->mg_obj; 609 av = (AV *)mg->mg_obj;
504 610
505 if (expect_false (AvFILLp (av) >= AvMAX (av))) 611 if (expect_false (AvFILLp (av) >= AvMAX (av)))
506 av_extend (av, AvMAX (av) + 1); 612 av_extend (av, AvFILLp (av) + 1);
507 613
508 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 614 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
509} 615}
510 616
511/** load & save, init *******************************************************/ 617/** load & save, init *******************************************************/
618
619/* swap sv heads, at least logically */
620static void
621swap_svs (pTHX_ Coro__State c)
622{
623 int i;
624
625 for (i = 0; i <= AvFILLp (c->swap_sv); )
626 {
627 SV *a = AvARRAY (c->swap_sv)[i++];
628 SV *b = AvARRAY (c->swap_sv)[i++];
629
630 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
631 SV tmp;
632
633 /* swap sv_any */
634 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
635
636 /* swap sv_flags */
637 SvFLAGS (&tmp) = SvFLAGS (a);
638 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
639 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
640
641#if PERL_VERSION_ATLEAST (5,10,0)
642 /* perl 5.10 complicates this _quite_ a bit, but it also is
643 * much faster, so no quarrels here. alternatively, we could
644 * sv_upgrade to avoid this.
645 */
646 {
647 /* swap sv_u */
648 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
649
650 /* if SvANY points to the head, we need to adjust the pointers,
651 * as the pointer for a still points to b, and maybe vice versa.
652 */
653 #define svany_in_head(type) \
654 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
655
656 if (svany_in_head (SvTYPE (a)))
657 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
658
659 if (svany_in_head (SvTYPE (b)))
660 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
661 }
662#endif
663 }
664}
665
666#define SWAP_SVS(coro) \
667 if (expect_false ((coro)->swap_sv)) \
668 swap_svs (aTHX_ (coro))
669
670static void
671on_enterleave_call (pTHX_ SV *cb);
512 672
513static void 673static void
514load_perl (pTHX_ Coro__State c) 674load_perl (pTHX_ Coro__State c)
515{ 675{
516 perl_slots *slot = c->slot; 676 perl_slots *slot = c->slot;
517 c->slot = 0; 677 c->slot = 0;
518 678
519 PL_mainstack = c->mainstack; 679 PL_mainstack = c->mainstack;
520 680
521 GvSV (PL_defgv) = slot->defsv; 681 GvSV (PL_defgv) = slot->defsv;
522 GvAV (PL_defgv) = slot->defav; 682 GvAV (PL_defgv) = slot->defav;
523 GvSV (PL_errgv) = slot->errsv; 683 GvSV (PL_errgv) = slot->errsv;
524 GvSV (irsgv) = slot->irsgv; 684 GvSV (irsgv) = slot->irsgv;
685 GvHV (PL_hintgv) = slot->hinthv;
525 686
526 #define VAR(name,type) PL_ ## name = slot->name; 687 #define VAR(name,type) PL_ ## name = slot->name;
527 # include "state.h" 688 # include "state.h"
528 #undef VAR 689 #undef VAR
529 690
… …
543 PUTBACK; 704 PUTBACK;
544 } 705 }
545 706
546 slf_frame = c->slf_frame; 707 slf_frame = c->slf_frame;
547 CORO_THROW = c->except; 708 CORO_THROW = c->except;
709
710 if (expect_false (enable_times))
711 {
712 if (expect_false (!times_valid))
713 coro_times_update ();
714
715 coro_times_sub (c);
716 }
717
718 if (expect_false (c->on_enter))
719 {
720 int i;
721
722 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
723 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
724 }
725
726 SWAP_SVS (c);
548} 727}
549 728
550static void 729static void
551save_perl (pTHX_ Coro__State c) 730save_perl (pTHX_ Coro__State c)
552{ 731{
732 SWAP_SVS (c);
733
734 if (expect_false (c->on_leave))
735 {
736 int i;
737
738 for (i = AvFILLp (c->on_leave); i >= 0; --i)
739 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
740 }
741
742 times_valid = 0;
743
744 if (expect_false (enable_times))
745 {
746 coro_times_update (); times_valid = 1;
747 coro_times_add (c);
748 }
749
553 c->except = CORO_THROW; 750 c->except = CORO_THROW;
554 c->slf_frame = slf_frame; 751 c->slf_frame = slf_frame;
555 752
556 { 753 {
557 dSP; 754 dSP;
… …
570 { 767 {
571 while (expect_true (cxix >= 0)) 768 while (expect_true (cxix >= 0))
572 { 769 {
573 PERL_CONTEXT *cx = &ccstk[cxix--]; 770 PERL_CONTEXT *cx = &ccstk[cxix--];
574 771
575 if (expect_true (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT)) 772 if (expect_true (CxTYPE (cx) == CXt_SUB) || expect_false (CxTYPE (cx) == CXt_FORMAT))
576 { 773 {
577 CV *cv = cx->blk_sub.cv; 774 CV *cv = cx->blk_sub.cv;
578 775
579 if (expect_true (CvDEPTH (cv))) 776 if (expect_true (CvDEPTH (cv)))
580 { 777 {
… …
604 /* we manually unroll here, as usually 2 slots is enough */ 801 /* we manually unroll here, as usually 2 slots is enough */
605 if (SLOT_COUNT >= 1) CXINC; 802 if (SLOT_COUNT >= 1) CXINC;
606 if (SLOT_COUNT >= 2) CXINC; 803 if (SLOT_COUNT >= 2) CXINC;
607 if (SLOT_COUNT >= 3) CXINC; 804 if (SLOT_COUNT >= 3) CXINC;
608 { 805 {
609 int i; 806 unsigned int i;
610 for (i = 3; i < SLOT_COUNT; ++i) 807 for (i = 3; i < SLOT_COUNT; ++i)
611 CXINC; 808 CXINC;
612 } 809 }
613 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 810 cxstack_ix -= SLOT_COUNT; /* undo allocation */
614 811
615 c->mainstack = PL_mainstack; 812 c->mainstack = PL_mainstack;
616 813
617 { 814 {
618 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 815 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
619 816
620 slot->defav = GvAV (PL_defgv); 817 slot->defav = GvAV (PL_defgv);
621 slot->defsv = DEFSV; 818 slot->defsv = DEFSV;
622 slot->errsv = ERRSV; 819 slot->errsv = ERRSV;
623 slot->irsgv = GvSV (irsgv); 820 slot->irsgv = GvSV (irsgv);
821 slot->hinthv = GvHV (PL_hintgv);
624 822
625 #define VAR(name,type) slot->name = PL_ ## name; 823 #define VAR(name,type) slot->name = PL_ ## name;
626 # include "state.h" 824 # include "state.h"
627 #undef VAR 825 #undef VAR
628 } 826 }
… …
755#endif 953#endif
756 954
757/* 955/*
758 * This overrides the default magic get method of %SIG elements. 956 * This overrides the default magic get method of %SIG elements.
759 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook 957 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
760 * and instead of tryign to save and restore the hash elements, we just provide 958 * and instead of trying to save and restore the hash elements, we just provide
761 * readback here. 959 * readback here.
762 * We only do this when the hook is != 0, as they are often set to 0 temporarily,
763 * not expecting this to actually change the hook. This is a potential problem
764 * when a schedule happens then, but we ignore this.
765 */ 960 */
766static int 961static int
767coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 962coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
768{ 963{
769 const char *s = MgPV_nolen_const (mg); 964 const char *s = MgPV_nolen_const (mg);
… …
822 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 1017 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
823 1018
824 if (svp) 1019 if (svp)
825 { 1020 {
826 SV *old = *svp; 1021 SV *old = *svp;
827 *svp = newSVsv (sv); 1022 *svp = SvOK (sv) ? newSVsv (sv) : 0;
828 SvREFCNT_dec (old); 1023 SvREFCNT_dec (old);
829 return 0; 1024 return 0;
830 } 1025 }
831 } 1026 }
832 1027
… …
850slf_check_repeat (pTHX_ struct CoroSLF *frame) 1045slf_check_repeat (pTHX_ struct CoroSLF *frame)
851{ 1046{
852 return 1; 1047 return 1;
853} 1048}
854 1049
855static UNOP coro_setup_op; 1050static UNOP init_perl_op;
856 1051
857static void NOINLINE /* noinline to keep it out of the transfer fast path */ 1052static void NOINLINE /* noinline to keep it out of the transfer fast path */
858coro_setup (pTHX_ struct coro *coro) 1053init_perl (pTHX_ struct coro *coro)
859{ 1054{
860 /* 1055 /*
861 * emulate part of the perl startup here. 1056 * emulate part of the perl startup here.
862 */ 1057 */
863 coro_init_stacks (aTHX); 1058 coro_init_stacks (aTHX);
864 1059
865 PL_runops = RUNOPS_DEFAULT; 1060 PL_runops = RUNOPS_DEFAULT;
866 PL_curcop = &PL_compiling; 1061 PL_curcop = &PL_compiling;
867 PL_in_eval = EVAL_NULL; 1062 PL_in_eval = EVAL_NULL;
868 PL_comppad = 0; 1063 PL_comppad = 0;
1064 PL_comppad_name = 0;
1065 PL_comppad_name_fill = 0;
1066 PL_comppad_name_floor = 0;
869 PL_curpm = 0; 1067 PL_curpm = 0;
870 PL_curpad = 0; 1068 PL_curpad = 0;
871 PL_localizing = 0; 1069 PL_localizing = 0;
872 PL_dirty = 0;
873 PL_restartop = 0; 1070 PL_restartop = 0;
874#if PERL_VERSION_ATLEAST (5,10,0) 1071#if PERL_VERSION_ATLEAST (5,10,0)
875 PL_parser = 0; 1072 PL_parser = 0;
876#endif 1073#endif
1074 PL_hints = 0;
877 1075
878 /* recreate the die/warn hooks */ 1076 /* recreate the die/warn hooks */
879 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1077 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook );
880 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1078 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook);
881 1079
882 GvSV (PL_defgv) = newSV (0); 1080 GvSV (PL_defgv) = newSV (0);
883 GvAV (PL_defgv) = coro->args; coro->args = 0; 1081 GvAV (PL_defgv) = coro->args; coro->args = 0;
884 GvSV (PL_errgv) = newSV (0); 1082 GvSV (PL_errgv) = newSV (0);
885 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1083 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
1084 GvHV (PL_hintgv) = 0;
886 PL_rs = newSVsv (GvSV (irsgv)); 1085 PL_rs = newSVsv (GvSV (irsgv));
887 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1086 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
888 1087
889 { 1088 {
890 dSP; 1089 dSP;
… …
907 */ 1106 */
908 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1107 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
909 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */ 1108 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
910 1109
911 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1110 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */
912 coro_setup_op.op_next = PL_op; 1111 init_perl_op.op_next = PL_op;
913 coro_setup_op.op_type = OP_ENTERSUB; 1112 init_perl_op.op_type = OP_ENTERSUB;
914 coro_setup_op.op_ppaddr = pp_slf; 1113 init_perl_op.op_ppaddr = pp_slf;
915 /* no flags etc. required, as an init function won't be called */ 1114 /* no flags etc. required, as an init function won't be called */
916 1115
917 PL_op = (OP *)&coro_setup_op; 1116 PL_op = (OP *)&init_perl_op;
918 1117
919 /* copy throw, in case it was set before coro_setup */ 1118 /* copy throw, in case it was set before init_perl */
920 CORO_THROW = coro->except; 1119 CORO_THROW = coro->except;
921}
922 1120
1121 SWAP_SVS (coro);
1122
1123 if (expect_false (enable_times))
1124 {
1125 coro_times_update ();
1126 coro_times_sub (coro);
1127 }
1128}
1129
923static void 1130static void
924coro_destruct (pTHX_ struct coro *coro) 1131coro_unwind_stacks (pTHX)
925{ 1132{
926 if (!IN_DESTRUCT) 1133 if (!IN_DESTRUCT)
927 { 1134 {
928 /* restore all saved variables and stuff */ 1135 /* restore all saved variables and stuff */
929 LEAVE_SCOPE (0); 1136 LEAVE_SCOPE (0);
… …
937 POPSTACK_TO (PL_mainstack); 1144 POPSTACK_TO (PL_mainstack);
938 1145
939 /* unwind main stack */ 1146 /* unwind main stack */
940 dounwind (-1); 1147 dounwind (-1);
941 } 1148 }
1149}
942 1150
943 SvREFCNT_dec (GvSV (PL_defgv)); 1151static void
944 SvREFCNT_dec (GvAV (PL_defgv)); 1152destroy_perl (pTHX_ struct coro *coro)
945 SvREFCNT_dec (GvSV (PL_errgv)); 1153{
946 SvREFCNT_dec (PL_defoutgv); 1154 SV *svf [9];
947 SvREFCNT_dec (PL_rs);
948 SvREFCNT_dec (GvSV (irsgv));
949 1155
950 SvREFCNT_dec (PL_diehook);
951 SvREFCNT_dec (PL_warnhook);
952 1156 {
1157 struct coro *current = SvSTATE_current;
1158
1159 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1160
1161 save_perl (aTHX_ current);
1162 load_perl (aTHX_ coro);
1163
1164 coro_unwind_stacks (aTHX);
1165 coro_destruct_stacks (aTHX);
1166
1167 /* restore swapped sv's */
1168 SWAP_SVS (coro);
1169
1170 // now save some sv's to be free'd later
1171 svf [0] = GvSV (PL_defgv);
1172 svf [1] = (SV *)GvAV (PL_defgv);
1173 svf [2] = GvSV (PL_errgv);
1174 svf [3] = (SV *)PL_defoutgv;
1175 svf [4] = PL_rs;
1176 svf [5] = GvSV (irsgv);
1177 svf [6] = (SV *)GvHV (PL_hintgv);
1178 svf [7] = PL_diehook;
1179 svf [8] = PL_warnhook;
1180 assert (9 == sizeof (svf) / sizeof (*svf));
1181
1182 load_perl (aTHX_ current);
1183 }
1184
1185 {
1186 unsigned int i;
1187
1188 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i)
1189 SvREFCNT_dec (svf [i]);
1190
953 SvREFCNT_dec (coro->saved_deffh); 1191 SvREFCNT_dec (coro->saved_deffh);
954 SvREFCNT_dec (coro->rouse_cb); 1192 SvREFCNT_dec (coro->rouse_cb);
955 SvREFCNT_dec (coro->invoke_cb); 1193 SvREFCNT_dec (coro->invoke_cb);
956 SvREFCNT_dec (coro->invoke_av); 1194 SvREFCNT_dec (coro->invoke_av);
957 1195 }
958 coro_destruct_stacks (aTHX);
959} 1196}
960 1197
961INLINE void 1198INLINE void
962free_coro_mortal (pTHX) 1199free_coro_mortal (pTHX)
963{ 1200{
… …
1160 /* somebody or something will hit me for both perl_run and PL_restartop */ 1397 /* somebody or something will hit me for both perl_run and PL_restartop */
1161 PL_restartop = PL_op; 1398 PL_restartop = PL_op;
1162 perl_run (PL_curinterp); 1399 perl_run (PL_curinterp);
1163 /* 1400 /*
1164 * Unfortunately, there is no way to get at the return values of the 1401 * Unfortunately, there is no way to get at the return values of the
1165 * coro body here, as perl_run destroys these 1402 * coro body here, as perl_run destroys these. Likewise, we cannot catch
1403 * runtime errors here, as this is just a random interpreter, not a thread.
1166 */ 1404 */
1167 1405
1168 /* 1406 /*
1169 * If perl-run returns we assume exit() was being called or the coro 1407 * If perl-run returns we assume exit() was being called or the coro
1170 * fell off the end, which seems to be the only valid (non-bug) 1408 * fell off the end, which seems to be the only valid (non-bug)
1171 * reason for perl_run to return. We try to exit by jumping to the 1409 * reason for perl_run to return. We try to exit by jumping to the
1172 * bootstrap-time "top" top_env, as we cannot restore the "main" 1410 * bootstrap-time "top" top_env, as we cannot restore the "main"
1173 * coroutine as Coro has no such concept 1411 * coroutine as Coro has no such concept.
1412 * This actually isn't valid with the pthread backend, but OSes requiring
1413 * that backend are too broken to do it in a standards-compliant way.
1174 */ 1414 */
1175 PL_top_env = main_top_env; 1415 PL_top_env = main_top_env;
1176 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */ 1416 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1177 } 1417 }
1178} 1418}
… …
1255cctx_destroy (coro_cctx *cctx) 1495cctx_destroy (coro_cctx *cctx)
1256{ 1496{
1257 if (!cctx) 1497 if (!cctx)
1258 return; 1498 return;
1259 1499
1260 assert (cctx != cctx_current);//D temporary 1500 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary?
1261 1501
1262 --cctx_count; 1502 --cctx_count;
1263 coro_destroy (&cctx->cctx); 1503 coro_destroy (&cctx->cctx);
1264 1504
1265 /* coro_transfer creates new, empty cctx's */ 1505 /* coro_transfer creates new, empty cctx's */
… …
1329 /* TODO: throwing up here is considered harmful */ 1569 /* TODO: throwing up here is considered harmful */
1330 1570
1331 if (expect_true (prev != next)) 1571 if (expect_true (prev != next))
1332 { 1572 {
1333 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1573 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1334 croak ("Coro::State::transfer called with non-running/new prev Coro::State, but can only transfer from running or new states,"); 1574 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1335 1575
1336 if (expect_false (next->flags & CF_RUNNING))
1337 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states,");
1338
1339 if (expect_false (next->flags & CF_DESTROYED)) 1576 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED)))
1340 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states,"); 1577 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1341 1578
1342#if !PERL_VERSION_ATLEAST (5,10,0) 1579#if !PERL_VERSION_ATLEAST (5,10,0)
1343 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1580 if (expect_false (PL_lex_state != LEX_NOTPARSING))
1344 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,"); 1581 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1345#endif 1582#endif
… …
1378 if (expect_false (next->flags & CF_NEW)) 1615 if (expect_false (next->flags & CF_NEW))
1379 { 1616 {
1380 /* need to start coroutine */ 1617 /* need to start coroutine */
1381 next->flags &= ~CF_NEW; 1618 next->flags &= ~CF_NEW;
1382 /* setup coroutine call */ 1619 /* setup coroutine call */
1383 coro_setup (aTHX_ next); 1620 init_perl (aTHX_ next);
1384 } 1621 }
1385 else 1622 else
1386 load_perl (aTHX_ next); 1623 load_perl (aTHX_ next);
1387
1388 assert (!prev->cctx);//D temporary
1389 1624
1390 /* possibly untie and reuse the cctx */ 1625 /* possibly untie and reuse the cctx */
1391 if (expect_true ( 1626 if (expect_true (
1392 cctx_current->idle_sp == STACKLEVEL 1627 cctx_current->idle_sp == STACKLEVEL
1393 && !(cctx_current->flags & CC_TRACE) 1628 && !(cctx_current->flags & CC_TRACE)
… …
1435coro_state_destroy (pTHX_ struct coro *coro) 1670coro_state_destroy (pTHX_ struct coro *coro)
1436{ 1671{
1437 if (coro->flags & CF_DESTROYED) 1672 if (coro->flags & CF_DESTROYED)
1438 return 0; 1673 return 0;
1439 1674
1440 if (coro->on_destroy) 1675 if (coro->on_destroy && !PL_dirty)
1441 coro->on_destroy (aTHX_ coro); 1676 coro->on_destroy (aTHX_ coro);
1442 1677
1443 coro->flags |= CF_DESTROYED; 1678 coro->flags |= CF_DESTROYED;
1444 1679
1445 if (coro->flags & CF_READY) 1680 if (coro->flags & CF_READY)
… …
1449 --coro_nready; 1684 --coro_nready;
1450 } 1685 }
1451 else 1686 else
1452 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1687 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1453 1688
1454 if (coro->mainstack && coro->mainstack != main_mainstack) 1689 if (coro->mainstack
1455 { 1690 && coro->mainstack != main_mainstack
1456 struct coro temp; 1691 && coro->slot
1457 1692 && !PL_dirty)
1458 assert (("FATAL: tried to destroy currently running coroutine (please report)", !(coro->flags & CF_RUNNING)));
1459
1460 save_perl (aTHX_ &temp);
1461 load_perl (aTHX_ coro); 1693 destroy_perl (aTHX_ coro);
1462 1694
1463 coro_destruct (aTHX_ coro); 1695 if (coro->next) coro->next->prev = coro->prev;
1464 1696 if (coro->prev) coro->prev->next = coro->next;
1465 load_perl (aTHX_ &temp); 1697 if (coro == coro_first) coro_first = coro->next;
1466
1467 coro->slot = 0;
1468 }
1469 1698
1470 cctx_destroy (coro->cctx); 1699 cctx_destroy (coro->cctx);
1471 SvREFCNT_dec (coro->startcv); 1700 SvREFCNT_dec (coro->startcv);
1472 SvREFCNT_dec (coro->args); 1701 SvREFCNT_dec (coro->args);
1702 SvREFCNT_dec (coro->swap_sv);
1473 SvREFCNT_dec (CORO_THROW); 1703 SvREFCNT_dec (CORO_THROW);
1474
1475 if (coro->next) coro->next->prev = coro->prev;
1476 if (coro->prev) coro->prev->next = coro->next;
1477 if (coro == coro_first) coro_first = coro->next;
1478 1704
1479 return 1; 1705 return 1;
1480} 1706}
1481 1707
1482static int 1708static int
… …
1532 1758
1533 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1759 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1534 TRANSFER (ta, 1); 1760 TRANSFER (ta, 1);
1535} 1761}
1536 1762
1537/*****************************************************************************/
1538/* gensub: simple closure generation utility */
1539
1540#define GENSUB_ARG CvXSUBANY (cv).any_ptr
1541
1542/* create a closure from XS, returns a code reference */
1543/* the arg can be accessed via GENSUB_ARG from the callback */
1544/* the callback must use dXSARGS/XSRETURN */
1545static SV *
1546gensub (pTHX_ void (*xsub)(pTHX_ CV *), void *arg)
1547{
1548 CV *cv = (CV *)newSV (0);
1549
1550 sv_upgrade ((SV *)cv, SVt_PVCV);
1551
1552 CvANON_on (cv);
1553 CvISXSUB_on (cv);
1554 CvXSUB (cv) = xsub;
1555 GENSUB_ARG = arg;
1556
1557 return newRV_noinc ((SV *)cv);
1558}
1559
1560/** Coro ********************************************************************/ 1763/** Coro ********************************************************************/
1561 1764
1562INLINE void 1765INLINE void
1563coro_enq (pTHX_ struct coro *coro) 1766coro_enq (pTHX_ struct coro *coro)
1564{ 1767{
1565 av_push (coro_ready [coro->prio - PRIO_MIN], SvREFCNT_inc_NN (coro->hv)); 1768 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1566}
1567 1769
1568INLINE SV * 1770 SvREFCNT_inc_NN (coro->hv);
1771
1772 coro->next_ready = 0;
1773 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1774 ready [1] = coro;
1775}
1776
1777INLINE struct coro *
1569coro_deq (pTHX) 1778coro_deq (pTHX)
1570{ 1779{
1571 int prio; 1780 int prio;
1572 1781
1573 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; ) 1782 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
1574 if (AvFILLp (coro_ready [prio]) >= 0) 1783 {
1575 return av_shift (coro_ready [prio]); 1784 struct coro **ready = coro_ready [prio];
1785
1786 if (ready [0])
1787 {
1788 struct coro *coro = ready [0];
1789 ready [0] = coro->next_ready;
1790 return coro;
1791 }
1792 }
1576 1793
1577 return 0; 1794 return 0;
1795}
1796
1797static void
1798invoke_sv_ready_hook_helper (void)
1799{
1800 dTHX;
1801 dSP;
1802
1803 ENTER;
1804 SAVETMPS;
1805
1806 PUSHMARK (SP);
1807 PUTBACK;
1808 call_sv (coro_readyhook, G_VOID | G_DISCARD);
1809
1810 FREETMPS;
1811 LEAVE;
1578} 1812}
1579 1813
1580static int 1814static int
1581api_ready (pTHX_ SV *coro_sv) 1815api_ready (pTHX_ SV *coro_sv)
1582{ 1816{
1583 struct coro *coro;
1584 SV *sv_hook;
1585 void (*xs_hook)(void);
1586
1587 if (SvROK (coro_sv))
1588 coro_sv = SvRV (coro_sv);
1589
1590 coro = SvSTATE (coro_sv); 1817 struct coro *coro = SvSTATE (coro_sv);
1591 1818
1592 if (coro->flags & CF_READY) 1819 if (coro->flags & CF_READY)
1593 return 0; 1820 return 0;
1594 1821
1595 coro->flags |= CF_READY; 1822 coro->flags |= CF_READY;
1596 1823
1597 sv_hook = coro_nready ? 0 : coro_readyhook;
1598 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1599
1600 coro_enq (aTHX_ coro); 1824 coro_enq (aTHX_ coro);
1601 ++coro_nready;
1602 1825
1603 if (sv_hook) 1826 if (!coro_nready++)
1604 { 1827 if (coroapi.readyhook)
1605 dSP; 1828 coroapi.readyhook ();
1606
1607 ENTER;
1608 SAVETMPS;
1609
1610 PUSHMARK (SP);
1611 PUTBACK;
1612 call_sv (sv_hook, G_VOID | G_DISCARD);
1613
1614 FREETMPS;
1615 LEAVE;
1616 }
1617
1618 if (xs_hook)
1619 xs_hook ();
1620 1829
1621 return 1; 1830 return 1;
1622} 1831}
1623 1832
1624static int 1833static int
… …
1647static void 1856static void
1648prepare_schedule (pTHX_ struct coro_transfer_args *ta) 1857prepare_schedule (pTHX_ struct coro_transfer_args *ta)
1649{ 1858{
1650 for (;;) 1859 for (;;)
1651 { 1860 {
1652 SV *next_sv = coro_deq (aTHX); 1861 struct coro *next = coro_deq (aTHX);
1653 1862
1654 if (expect_true (next_sv)) 1863 if (expect_true (next))
1655 { 1864 {
1656 struct coro *next = SvSTATE_hv (next_sv);
1657
1658 /* cannot transfer to destroyed coros, skip and look for next */ 1865 /* cannot transfer to destroyed coros, skip and look for next */
1659 if (expect_false (next->flags & CF_DESTROYED)) 1866 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED)))
1660 SvREFCNT_dec (next_sv); /* coro_nready has already been taken care of by destroy */ 1867 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1661 else 1868 else
1662 { 1869 {
1663 next->flags &= ~CF_READY; 1870 next->flags &= ~CF_READY;
1664 --coro_nready; 1871 --coro_nready;
1665 1872
… …
1668 } 1875 }
1669 } 1876 }
1670 else 1877 else
1671 { 1878 {
1672 /* nothing to schedule: call the idle handler */ 1879 /* nothing to schedule: call the idle handler */
1880 if (SvROK (sv_idle)
1881 && SvOBJECT (SvRV (sv_idle)))
1882 {
1883 if (SvRV (sv_idle) == SvRV (coro_current))
1884 croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught");
1885
1886 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1887 api_ready (aTHX_ SvRV (sv_idle));
1888 --coro_nready;
1889 }
1890 else
1891 {
1892 /* TODO: deprecated, remove, cannot work reliably *//*D*/
1673 dSP; 1893 dSP;
1674 1894
1675 ENTER; 1895 ENTER;
1676 SAVETMPS; 1896 SAVETMPS;
1677 1897
1678 PUSHMARK (SP); 1898 PUSHMARK (SP);
1679 PUTBACK; 1899 PUTBACK;
1680 call_sv (get_sv ("Coro::idle", FALSE), G_VOID | G_DISCARD); 1900 call_sv (sv_idle, G_VOID | G_DISCARD);
1681 1901
1682 FREETMPS; 1902 FREETMPS;
1683 LEAVE; 1903 LEAVE;
1904 }
1684 } 1905 }
1685 } 1906 }
1686} 1907}
1687 1908
1688INLINE void 1909INLINE void
… …
1822{ 2043{
1823 int i; 2044 int i;
1824 HV *hv = (HV *)SvRV (coro_current); 2045 HV *hv = (HV *)SvRV (coro_current);
1825 AV *av = newAV (); 2046 AV *av = newAV ();
1826 2047
2048 /* items are actually not so common, so optimise for this case */
2049 if (items)
2050 {
1827 av_extend (av, items - 1); 2051 av_extend (av, items - 1);
2052
1828 for (i = 0; i < items; ++i) 2053 for (i = 0; i < items; ++i)
1829 av_push (av, SvREFCNT_inc_NN (arg [i])); 2054 av_push (av, SvREFCNT_inc_NN (arg [i]));
2055 }
1830 2056
1831 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 2057 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0);
1832 2058
1833 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */ 2059 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */
1834 api_ready (aTHX_ sv_manager); 2060 api_ready (aTHX_ sv_manager);
1835 2061
1836 frame->prepare = prepare_schedule; 2062 frame->prepare = prepare_schedule;
1837 frame->check = slf_check_repeat; 2063 frame->check = slf_check_repeat;
2064
2065 /* as a minor optimisation, we could unwind all stacks here */
2066 /* but that puts extra pressure on pp_slf, and is not worth much */
2067 /*coro_unwind_stacks (aTHX);*/
1838} 2068}
1839 2069
1840/*****************************************************************************/ 2070/*****************************************************************************/
1841/* async pool handler */ 2071/* async pool handler */
1842 2072
… …
1920 2150
1921static void 2151static void
1922coro_rouse_callback (pTHX_ CV *cv) 2152coro_rouse_callback (pTHX_ CV *cv)
1923{ 2153{
1924 dXSARGS; 2154 dXSARGS;
1925 SV *data = (SV *)GENSUB_ARG; 2155 SV *data = (SV *)S_GENSUB_ARG;
1926 2156
1927 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2157 if (SvTYPE (SvRV (data)) != SVt_PVAV)
1928 { 2158 {
1929 /* first call, set args */ 2159 /* first call, set args */
2160 SV *coro = SvRV (data);
1930 AV *av = newAV (); 2161 AV *av = newAV ();
1931 SV *coro = SvRV (data);
1932 2162
1933 SvRV_set (data, (SV *)av); 2163 SvRV_set (data, (SV *)av);
1934 api_ready (aTHX_ coro);
1935 SvREFCNT_dec (coro);
1936 2164
1937 /* better take a full copy of the arguments */ 2165 /* better take a full copy of the arguments */
1938 while (items--) 2166 while (items--)
1939 av_store (av, items, newSVsv (ST (items))); 2167 av_store (av, items, newSVsv (ST (items)));
2168
2169 api_ready (aTHX_ coro);
2170 SvREFCNT_dec (coro);
1940 } 2171 }
1941 2172
1942 XSRETURN_EMPTY; 2173 XSRETURN_EMPTY;
1943} 2174}
1944 2175
… …
1961 2192
1962 EXTEND (SP, AvFILLp (av) + 1); 2193 EXTEND (SP, AvFILLp (av) + 1);
1963 for (i = 0; i <= AvFILLp (av); ++i) 2194 for (i = 0; i <= AvFILLp (av); ++i)
1964 PUSHs (sv_2mortal (AvARRAY (av)[i])); 2195 PUSHs (sv_2mortal (AvARRAY (av)[i]));
1965 2196
1966 /* we have stolen the elements, so ste length to zero and free */ 2197 /* we have stolen the elements, so set length to zero and free */
1967 AvFILLp (av) = -1; 2198 AvFILLp (av) = -1;
1968 av_undef (av); 2199 av_undef (av);
1969 2200
1970 PUTBACK; 2201 PUTBACK;
1971 } 2202 }
… …
1995 || SvTYPE (SvRV (cb)) != SVt_PVCV 2226 || SvTYPE (SvRV (cb)) != SVt_PVCV
1996 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2227 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
1997 croak ("Coro::rouse_wait called with illegal callback argument,"); 2228 croak ("Coro::rouse_wait called with illegal callback argument,");
1998 2229
1999 { 2230 {
2000 CV *cv = (CV *)SvRV (cb); /* for GENSUB_ARG */ 2231 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
2001 SV *data = (SV *)GENSUB_ARG; 2232 SV *data = (SV *)S_GENSUB_ARG;
2002 2233
2003 frame->data = (void *)data; 2234 frame->data = (void *)data;
2004 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule; 2235 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
2005 frame->check = slf_check_rouse_wait; 2236 frame->check = slf_check_rouse_wait;
2006 } 2237 }
… …
2010coro_new_rouse_cb (pTHX) 2241coro_new_rouse_cb (pTHX)
2011{ 2242{
2012 HV *hv = (HV *)SvRV (coro_current); 2243 HV *hv = (HV *)SvRV (coro_current);
2013 struct coro *coro = SvSTATE_hv (hv); 2244 struct coro *coro = SvSTATE_hv (hv);
2014 SV *data = newRV_inc ((SV *)hv); 2245 SV *data = newRV_inc ((SV *)hv);
2015 SV *cb = gensub (aTHX_ coro_rouse_callback, (void *)data); 2246 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
2016 2247
2017 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0); 2248 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0);
2018 SvREFCNT_dec (data); /* magicext increases the refcount */ 2249 SvREFCNT_dec (data); /* magicext increases the refcount */
2019 2250
2020 SvREFCNT_dec (coro->rouse_cb); 2251 SvREFCNT_dec (coro->rouse_cb);
… …
2245 if (PL_op->op_flags & OPf_STACKED) 2476 if (PL_op->op_flags & OPf_STACKED)
2246 { 2477 {
2247 if (items > slf_arga) 2478 if (items > slf_arga)
2248 { 2479 {
2249 slf_arga = items; 2480 slf_arga = items;
2250 free (slf_argv); 2481 Safefree (slf_argv);
2251 slf_argv = malloc (slf_arga * sizeof (SV *)); 2482 New (0, slf_argv, slf_arga, SV *);
2252 } 2483 }
2253 2484
2254 slf_argc = items; 2485 slf_argc = items;
2255 2486
2256 for (i = 0; i < items; ++i) 2487 for (i = 0; i < items; ++i)
… …
2261 2492
2262 PL_op->op_ppaddr = pp_slf; 2493 PL_op->op_ppaddr = pp_slf;
2263 /*PL_op->op_type = OP_CUSTOM; /* we do behave like entersub still */ 2494 /*PL_op->op_type = OP_CUSTOM; /* we do behave like entersub still */
2264 2495
2265 PL_op = (OP *)&slf_restore; 2496 PL_op = (OP *)&slf_restore;
2497}
2498
2499/*****************************************************************************/
2500/* dynamic wind */
2501
2502static void
2503on_enterleave_call (pTHX_ SV *cb)
2504{
2505 dSP;
2506
2507 PUSHSTACK;
2508
2509 PUSHMARK (SP);
2510 PUTBACK;
2511 call_sv (cb, G_VOID | G_DISCARD);
2512 SPAGAIN;
2513
2514 POPSTACK;
2515}
2516
2517static SV *
2518coro_avp_pop_and_free (pTHX_ AV **avp)
2519{
2520 AV *av = *avp;
2521 SV *res = av_pop (av);
2522
2523 if (AvFILLp (av) < 0)
2524 {
2525 *avp = 0;
2526 SvREFCNT_dec (av);
2527 }
2528
2529 return res;
2530}
2531
2532static void
2533coro_pop_on_enter (pTHX_ void *coro)
2534{
2535 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_enter);
2536 SvREFCNT_dec (cb);
2537}
2538
2539static void
2540coro_pop_on_leave (pTHX_ void *coro)
2541{
2542 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2543 on_enterleave_call (aTHX_ sv_2mortal (cb));
2266} 2544}
2267 2545
2268/*****************************************************************************/ 2546/*****************************************************************************/
2269/* PerlIO::cede */ 2547/* PerlIO::cede */
2270 2548
… …
2344/* Coro::Semaphore & Coro::Signal */ 2622/* Coro::Semaphore & Coro::Signal */
2345 2623
2346static SV * 2624static SV *
2347coro_waitarray_new (pTHX_ int count) 2625coro_waitarray_new (pTHX_ int count)
2348{ 2626{
2349 /* a semaphore contains a counter IV in $sem->[0] and any waiters after that */ 2627 /* a waitarray=semaphore contains a counter IV in $sem->[0] and any waiters after that */
2350 AV *av = newAV (); 2628 AV *av = newAV ();
2351 SV **ary; 2629 SV **ary;
2352 2630
2353 /* unfortunately, building manually saves memory */ 2631 /* unfortunately, building manually saves memory */
2354 Newx (ary, 2, SV *); 2632 Newx (ary, 2, SV *);
2355 AvALLOC (av) = ary; 2633 AvALLOC (av) = ary;
2634#if PERL_VERSION_ATLEAST (5,10,0)
2356 /*AvARRAY (av) = ary;*/ 2635 AvARRAY (av) = ary;
2636#else
2357 SvPVX ((SV *)av) = (char *)ary; /* 5.8.8 needs this syntax instead of AvARRAY = ary */ 2637 /* 5.8.8 needs this syntax instead of AvARRAY = ary, yet */
2638 /* -DDEBUGGING flags this as a bug, despite it perfectly working */
2639 SvPVX ((SV *)av) = (char *)ary;
2640#endif
2358 AvMAX (av) = 1; 2641 AvMAX (av) = 1;
2359 AvFILLp (av) = 0; 2642 AvFILLp (av) = 0;
2360 ary [0] = newSViv (count); 2643 ary [0] = newSViv (count);
2361 2644
2362 return newRV_noinc ((SV *)av); 2645 return newRV_noinc ((SV *)av);
… …
2491{ 2774{
2492 if (items >= 2) 2775 if (items >= 2)
2493 { 2776 {
2494 /* callback form */ 2777 /* callback form */
2495 AV *av = (AV *)SvRV (arg [0]); 2778 AV *av = (AV *)SvRV (arg [0]);
2496 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 2779 SV *cb_cv = s_get_cv_croak (arg [1]);
2497 2780
2498 av_push (av, (SV *)SvREFCNT_inc_NN (cb_cv)); 2781 av_push (av, SvREFCNT_inc_NN (cb_cv));
2499 2782
2500 if (SvIVX (AvARRAY (av)[0]) > 0) 2783 if (SvIVX (AvARRAY (av)[0]) > 0)
2501 coro_semaphore_adjust (aTHX_ av, 0); 2784 coro_semaphore_adjust (aTHX_ av, 0);
2502 2785
2503 frame->prepare = prepare_nop; 2786 frame->prepare = prepare_nop;
… …
2527 AvARRAY (av)[0] = AvARRAY (av)[1]; 2810 AvARRAY (av)[0] = AvARRAY (av)[1];
2528 AvARRAY (av)[1] = cb; 2811 AvARRAY (av)[1] = cb;
2529 2812
2530 cb = av_shift (av); 2813 cb = av_shift (av);
2531 2814
2815 if (SvTYPE (cb) == SVt_PVCV)
2816 {
2817 dSP;
2818 PUSHMARK (SP);
2819 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2820 PUTBACK;
2821 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2822 }
2823 else
2824 {
2532 api_ready (aTHX_ cb); 2825 api_ready (aTHX_ cb);
2533 sv_setiv (cb, 0); /* signal waiter */ 2826 sv_setiv (cb, 0); /* signal waiter */
2827 }
2828
2534 SvREFCNT_dec (cb); 2829 SvREFCNT_dec (cb);
2535 2830
2536 --count; 2831 --count;
2537 } 2832 }
2538} 2833}
… …
2547static void 2842static void
2548slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2843slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2549{ 2844{
2550 AV *av = (AV *)SvRV (arg [0]); 2845 AV *av = (AV *)SvRV (arg [0]);
2551 2846
2847 if (items >= 2)
2848 {
2849 SV *cb_cv = s_get_cv_croak (arg [1]);
2850 av_push (av, SvREFCNT_inc_NN (cb_cv));
2851
2552 if (SvIVX (AvARRAY (av)[0])) 2852 if (SvIVX (AvARRAY (av)[0]))
2853 coro_signal_wake (aTHX_ av, 1); /* must be the only waiter */
2854
2855 frame->prepare = prepare_nop;
2856 frame->check = slf_check_nop;
2857 }
2858 else if (SvIVX (AvARRAY (av)[0]))
2553 { 2859 {
2554 SvIVX (AvARRAY (av)[0]) = 0; 2860 SvIVX (AvARRAY (av)[0]) = 0;
2555 frame->prepare = prepare_nop; 2861 frame->prepare = prepare_nop;
2556 frame->check = slf_check_nop; 2862 frame->check = slf_check_nop;
2557 } 2863 }
2558 else 2864 else
2559 { 2865 {
2560 SV *waiter = newRV_inc (SvRV (coro_current)); /* owned by signal av */ 2866 SV *waiter = newSVsv (coro_current); /* owned by signal av */
2561 2867
2562 av_push (av, waiter); 2868 av_push (av, waiter);
2563 2869
2564 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */ 2870 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */
2565 frame->prepare = prepare_schedule; 2871 frame->prepare = prepare_schedule;
… …
2583 2889
2584static void 2890static void
2585coro_aio_callback (pTHX_ CV *cv) 2891coro_aio_callback (pTHX_ CV *cv)
2586{ 2892{
2587 dXSARGS; 2893 dXSARGS;
2588 AV *state = (AV *)GENSUB_ARG; 2894 AV *state = (AV *)S_GENSUB_ARG;
2589 SV *coro = av_pop (state); 2895 SV *coro = av_pop (state);
2590 SV *data_sv = newSV (sizeof (struct io_state)); 2896 SV *data_sv = newSV (sizeof (struct io_state));
2591 2897
2592 av_extend (state, items - 1); 2898 av_extend (state, items - 1);
2593 2899
… …
2707 3013
2708 for (i = 0; i < items; ++i) 3014 for (i = 0; i < items; ++i)
2709 PUSHs (arg [i]); 3015 PUSHs (arg [i]);
2710 3016
2711 /* now push the callback closure */ 3017 /* now push the callback closure */
2712 PUSHs (sv_2mortal (gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state)))); 3018 PUSHs (sv_2mortal (s_gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state))));
2713 3019
2714 /* now call the AIO function - we assume our request is uncancelable */ 3020 /* now call the AIO function - we assume our request is uncancelable */
2715 PUTBACK; 3021 PUTBACK;
2716 call_sv ((SV *)req, G_VOID | G_DISCARD); 3022 call_sv ((SV *)req, G_VOID | G_DISCARD);
2717 } 3023 }
2718 3024
2719 /* now that the requets is going, we loop toll we have a result */ 3025 /* now that the request is going, we loop till we have a result */
2720 frame->data = (void *)state; 3026 frame->data = (void *)state;
2721 frame->prepare = prepare_schedule; 3027 frame->prepare = prepare_schedule;
2722 frame->check = slf_check_aio_req; 3028 frame->check = slf_check_aio_req;
2723} 3029}
2724 3030
… …
2735/*****************************************************************************/ 3041/*****************************************************************************/
2736 3042
2737#if CORO_CLONE 3043#if CORO_CLONE
2738# include "clone.c" 3044# include "clone.c"
2739#endif 3045#endif
3046
3047/*****************************************************************************/
3048
3049static SV *
3050coro_new (pTHX_ HV *stash, SV **argv, int argc, int is_coro)
3051{
3052 SV *coro_sv;
3053 struct coro *coro;
3054 MAGIC *mg;
3055 HV *hv;
3056 SV *cb;
3057 int i;
3058
3059 if (argc > 0)
3060 {
3061 cb = s_get_cv_croak (argv [0]);
3062
3063 if (!is_coro)
3064 {
3065 if (CvISXSUB (cb))
3066 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
3067
3068 if (!CvROOT (cb))
3069 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
3070 }
3071 }
3072
3073 Newz (0, coro, 1, struct coro);
3074 coro->args = newAV ();
3075 coro->flags = CF_NEW;
3076
3077 if (coro_first) coro_first->prev = coro;
3078 coro->next = coro_first;
3079 coro_first = coro;
3080
3081 coro->hv = hv = newHV ();
3082 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
3083 mg->mg_flags |= MGf_DUP;
3084 coro_sv = sv_bless (newRV_noinc ((SV *)hv), stash);
3085
3086 if (argc > 0)
3087 {
3088 av_extend (coro->args, argc + is_coro - 1);
3089
3090 if (is_coro)
3091 {
3092 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
3093 cb = (SV *)cv_coro_run;
3094 }
3095
3096 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3097
3098 for (i = 1; i < argc; i++)
3099 av_push (coro->args, newSVsv (argv [i]));
3100 }
3101
3102 return coro_sv;
3103}
2740 3104
2741MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3105MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2742 3106
2743PROTOTYPES: DISABLE 3107PROTOTYPES: DISABLE
2744 3108
… …
2797 coroapi.prepare_nop = prepare_nop; 3161 coroapi.prepare_nop = prepare_nop;
2798 coroapi.prepare_schedule = prepare_schedule; 3162 coroapi.prepare_schedule = prepare_schedule;
2799 coroapi.prepare_cede = prepare_cede; 3163 coroapi.prepare_cede = prepare_cede;
2800 coroapi.prepare_cede_notself = prepare_cede_notself; 3164 coroapi.prepare_cede_notself = prepare_cede_notself;
2801 3165
2802 { 3166 time_init ();
2803 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
2804 3167
2805 if (!svp) croak ("Time::HiRes is required");
2806 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
2807
2808 nvtime = INT2PTR (double (*)(), SvIV (*svp));
2809 }
2810
2811 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 3168 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
2812} 3169}
2813 3170
2814SV * 3171SV *
2815new (char *klass, ...) 3172new (SV *klass, ...)
2816 ALIAS: 3173 ALIAS:
2817 Coro::new = 1 3174 Coro::new = 1
2818 CODE: 3175 CODE:
2819{ 3176 RETVAL = coro_new (aTHX_ ix ? coro_stash : coro_state_stash, &ST (1), items - 1, ix);
2820 struct coro *coro; 3177 OUTPUT:
2821 MAGIC *mg;
2822 HV *hv;
2823 CV *cb;
2824 int i;
2825
2826 if (items > 1)
2827 {
2828 cb = coro_sv_2cv (aTHX_ ST (1));
2829
2830 if (!ix)
2831 {
2832 if (CvISXSUB (cb))
2833 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
2834
2835 if (!CvROOT (cb))
2836 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
2837 }
2838 }
2839
2840 Newz (0, coro, 1, struct coro);
2841 coro->args = newAV ();
2842 coro->flags = CF_NEW;
2843
2844 if (coro_first) coro_first->prev = coro;
2845 coro->next = coro_first;
2846 coro_first = coro;
2847
2848 coro->hv = hv = newHV ();
2849 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
2850 mg->mg_flags |= MGf_DUP;
2851 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
2852
2853 if (items > 1)
2854 {
2855 av_extend (coro->args, items - 1 + ix - 1);
2856
2857 if (ix)
2858 {
2859 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
2860 cb = cv_coro_run;
2861 }
2862
2863 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
2864
2865 for (i = 2; i < items; i++)
2866 av_push (coro->args, newSVsv (ST (i)));
2867 }
2868}
2869 OUTPUT:
2870 RETVAL 3178 RETVAL
2871 3179
2872void 3180void
2873transfer (...) 3181transfer (...)
2874 PROTOTYPE: $$ 3182 PROTOTYPE: $$
… …
2891SV * 3199SV *
2892clone (Coro::State coro) 3200clone (Coro::State coro)
2893 CODE: 3201 CODE:
2894{ 3202{
2895#if CORO_CLONE 3203#if CORO_CLONE
2896 struct coro *ncoro = coro_clone (coro); 3204 struct coro *ncoro = coro_clone (aTHX_ coro);
2897 MAGIC *mg; 3205 MAGIC *mg;
2898 /* TODO: too much duplication */ 3206 /* TODO: too much duplication */
2899 ncoro->hv = newHV (); 3207 ncoro->hv = newHV ();
2900 mg = sv_magicext ((SV *)ncoro->hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)ncoro, 0); 3208 mg = sv_magicext ((SV *)ncoro->hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)ncoro, 0);
2901 mg->mg_flags |= MGf_DUP; 3209 mg->mg_flags |= MGf_DUP;
… …
2963 eval = 1 3271 eval = 1
2964 CODE: 3272 CODE:
2965{ 3273{
2966 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3274 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
2967 { 3275 {
2968 struct coro temp; 3276 struct coro *current = SvSTATE_current;
2969 3277
2970 if (!(coro->flags & CF_RUNNING)) 3278 if (current != coro)
2971 { 3279 {
2972 PUTBACK; 3280 PUTBACK;
2973 save_perl (aTHX_ &temp); 3281 save_perl (aTHX_ current);
2974 load_perl (aTHX_ coro); 3282 load_perl (aTHX_ coro);
3283 SPAGAIN;
2975 } 3284 }
2976 3285
2977 {
2978 dSP;
2979 ENTER;
2980 SAVETMPS;
2981 PUTBACK;
2982 PUSHSTACK; 3286 PUSHSTACK;
3287
2983 PUSHMARK (SP); 3288 PUSHMARK (SP);
3289 PUTBACK;
2984 3290
2985 if (ix) 3291 if (ix)
2986 eval_sv (coderef, 0); 3292 eval_sv (coderef, 0);
2987 else 3293 else
2988 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 3294 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
2989 3295
2990 POPSTACK; 3296 POPSTACK;
2991 SPAGAIN; 3297 SPAGAIN;
2992 FREETMPS;
2993 LEAVE;
2994 PUTBACK;
2995 }
2996 3298
2997 if (!(coro->flags & CF_RUNNING)) 3299 if (current != coro)
2998 { 3300 {
3301 PUTBACK;
2999 save_perl (aTHX_ coro); 3302 save_perl (aTHX_ coro);
3000 load_perl (aTHX_ &temp); 3303 load_perl (aTHX_ current);
3001 SPAGAIN; 3304 SPAGAIN;
3002 } 3305 }
3003 } 3306 }
3004} 3307}
3005 3308
… …
3009 ALIAS: 3312 ALIAS:
3010 is_ready = CF_READY 3313 is_ready = CF_READY
3011 is_running = CF_RUNNING 3314 is_running = CF_RUNNING
3012 is_new = CF_NEW 3315 is_new = CF_NEW
3013 is_destroyed = CF_DESTROYED 3316 is_destroyed = CF_DESTROYED
3317 is_suspended = CF_SUSPENDED
3014 CODE: 3318 CODE:
3015 RETVAL = boolSV (coro->flags & ix); 3319 RETVAL = boolSV (coro->flags & ix);
3016 OUTPUT: 3320 OUTPUT:
3017 RETVAL 3321 RETVAL
3018 3322
3019void 3323void
3020throw (Coro::State self, SV *throw = &PL_sv_undef) 3324throw (Coro::State self, SV *exception = &PL_sv_undef)
3021 PROTOTYPE: $;$ 3325 PROTOTYPE: $;$
3022 CODE: 3326 CODE:
3023{ 3327{
3024 struct coro *current = SvSTATE_current; 3328 struct coro *current = SvSTATE_current;
3025 SV **throwp = self == current ? &CORO_THROW : &self->except; 3329 SV **exceptionp = self == current ? &CORO_THROW : &self->except;
3026 SvREFCNT_dec (*throwp); 3330 SvREFCNT_dec (*exceptionp);
3027 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3331 SvGETMAGIC (exception);
3332 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3028} 3333}
3029 3334
3030void 3335void
3031api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3336api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3032 PROTOTYPE: $;$ 3337 PROTOTYPE: $;$
… …
3083 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv; 3388 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
3084 3389
3085 SV *tmp = *src; *src = *dst; *dst = tmp; 3390 SV *tmp = *src; *src = *dst; *dst = tmp;
3086 } 3391 }
3087 3392
3393void
3394cancel (Coro::State self)
3395 CODE:
3396 coro_state_destroy (aTHX_ self);
3397 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */
3398
3399
3400SV *
3401enable_times (int enabled = enable_times)
3402 CODE:
3403{
3404 RETVAL = boolSV (enable_times);
3405
3406 if (enabled != enable_times)
3407 {
3408 enable_times = enabled;
3409
3410 coro_times_update ();
3411 (enabled ? coro_times_sub : coro_times_add)(SvSTATE (coro_current));
3412 }
3413}
3414 OUTPUT:
3415 RETVAL
3416
3417void
3418times (Coro::State self)
3419 PPCODE:
3420{
3421 struct coro *current = SvSTATE (coro_current);
3422
3423 if (expect_false (current == self))
3424 {
3425 coro_times_update ();
3426 coro_times_add (SvSTATE (coro_current));
3427 }
3428
3429 EXTEND (SP, 2);
3430 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3431 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3432
3433 if (expect_false (current == self))
3434 coro_times_sub (SvSTATE (coro_current));
3435}
3436
3437void
3438swap_sv (Coro::State coro, SV *sv, SV *swapsv)
3439 CODE:
3440{
3441 struct coro *current = SvSTATE_current;
3442
3443 if (current == coro)
3444 SWAP_SVS (current);
3445
3446 if (!coro->swap_sv)
3447 coro->swap_sv = newAV ();
3448
3449 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv )));
3450 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv)));
3451
3452 if (current == coro)
3453 SWAP_SVS (current);
3454}
3455
3088 3456
3089MODULE = Coro::State PACKAGE = Coro 3457MODULE = Coro::State PACKAGE = Coro
3090 3458
3091BOOT: 3459BOOT:
3092{ 3460{
3093 int i;
3094
3095 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3461 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3096 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3462 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3097 cv_coro_run = get_cv ( "Coro::_terminate", GV_ADD); 3463 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3098 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD); 3464 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3099 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 3465 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3100 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 3466 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3101 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 3467 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3102 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 3468 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3469 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3103 3470
3104 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3471 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3105 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3472 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3106 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 3473 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3107 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new); 3474 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3108 3475
3109 coro_stash = gv_stashpv ("Coro", TRUE); 3476 coro_stash = gv_stashpv ("Coro", TRUE);
3110 3477
3111 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 3478 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3112 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 3479 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3113 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 3480 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
3114 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 3481 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (CORO_PRIO_LOW));
3115 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE)); 3482 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (CORO_PRIO_IDLE));
3116 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN)); 3483 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (CORO_PRIO_MIN));
3117
3118 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
3119 coro_ready[i] = newAV ();
3120 3484
3121 { 3485 {
3122 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 3486 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
3123 3487
3124 coroapi.schedule = api_schedule; 3488 coroapi.schedule = api_schedule;
… …
3134 sv_setiv (sv, (IV)&coroapi); 3498 sv_setiv (sv, (IV)&coroapi);
3135 SvREADONLY_on (sv); 3499 SvREADONLY_on (sv);
3136 } 3500 }
3137} 3501}
3138 3502
3503SV *
3504async (...)
3505 PROTOTYPE: &@
3506 CODE:
3507 RETVAL = coro_new (aTHX_ coro_stash, &ST (0), items, 1);
3508 api_ready (aTHX_ RETVAL);
3509 OUTPUT:
3510 RETVAL
3511
3139void 3512void
3140terminate (...) 3513terminate (...)
3141 CODE: 3514 CODE:
3142 CORO_EXECUTE_SLF_XS (slf_init_terminate); 3515 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3143 3516
… …
3163 3536
3164void 3537void
3165cede_notself (...) 3538cede_notself (...)
3166 CODE: 3539 CODE:
3167 CORO_EXECUTE_SLF_XS (slf_init_cede_notself); 3540 CORO_EXECUTE_SLF_XS (slf_init_cede_notself);
3168
3169void
3170_cancel (Coro::State self)
3171 CODE:
3172 coro_state_destroy (aTHX_ self);
3173 coro_call_on_destroy (aTHX_ self);
3174 3541
3175void 3542void
3176_set_current (SV *current) 3543_set_current (SV *current)
3177 PROTOTYPE: $ 3544 PROTOTYPE: $
3178 CODE: 3545 CODE:
… …
3182void 3549void
3183_set_readyhook (SV *hook) 3550_set_readyhook (SV *hook)
3184 PROTOTYPE: $ 3551 PROTOTYPE: $
3185 CODE: 3552 CODE:
3186 SvREFCNT_dec (coro_readyhook); 3553 SvREFCNT_dec (coro_readyhook);
3554 SvGETMAGIC (hook);
3555 if (SvOK (hook))
3556 {
3187 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0; 3557 coro_readyhook = newSVsv (hook);
3558 CORO_READYHOOK = invoke_sv_ready_hook_helper;
3559 }
3560 else
3561 {
3562 coro_readyhook = 0;
3563 CORO_READYHOOK = 0;
3564 }
3188 3565
3189int 3566int
3190prio (Coro::State coro, int newprio = 0) 3567prio (Coro::State coro, int newprio = 0)
3191 PROTOTYPE: $;$ 3568 PROTOTYPE: $;$
3192 ALIAS: 3569 ALIAS:
… …
3198 if (items > 1) 3575 if (items > 1)
3199 { 3576 {
3200 if (ix) 3577 if (ix)
3201 newprio = coro->prio - newprio; 3578 newprio = coro->prio - newprio;
3202 3579
3203 if (newprio < PRIO_MIN) newprio = PRIO_MIN; 3580 if (newprio < CORO_PRIO_MIN) newprio = CORO_PRIO_MIN;
3204 if (newprio > PRIO_MAX) newprio = PRIO_MAX; 3581 if (newprio > CORO_PRIO_MAX) newprio = CORO_PRIO_MAX;
3205 3582
3206 coro->prio = newprio; 3583 coro->prio = newprio;
3207 } 3584 }
3208} 3585}
3209 OUTPUT: 3586 OUTPUT:
… …
3224 RETVAL = coro_nready; 3601 RETVAL = coro_nready;
3225 OUTPUT: 3602 OUTPUT:
3226 RETVAL 3603 RETVAL
3227 3604
3228void 3605void
3606suspend (Coro::State self)
3607 PROTOTYPE: $
3608 CODE:
3609 self->flags |= CF_SUSPENDED;
3610
3611void
3612resume (Coro::State self)
3613 PROTOTYPE: $
3614 CODE:
3615 self->flags &= ~CF_SUSPENDED;
3616
3617void
3229_pool_handler (...) 3618_pool_handler (...)
3230 CODE: 3619 CODE:
3231 CORO_EXECUTE_SLF_XS (slf_init_pool_handler); 3620 CORO_EXECUTE_SLF_XS (slf_init_pool_handler);
3232 3621
3233void 3622void
… …
3244 for (i = 1; i < items; ++i) 3633 for (i = 1; i < items; ++i)
3245 av_push (av, SvREFCNT_inc_NN (ST (i))); 3634 av_push (av, SvREFCNT_inc_NN (ST (i)));
3246 3635
3247 if ((SV *)hv == &PL_sv_undef) 3636 if ((SV *)hv == &PL_sv_undef)
3248 { 3637 {
3249 PUSHMARK (SP); 3638 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3250 EXTEND (SP, 2);
3251 PUSHs (sv_Coro);
3252 PUSHs ((SV *)cv_pool_handler);
3253 PUTBACK;
3254 call_sv ((SV *)cv_coro_state_new, G_SCALAR);
3255 SPAGAIN;
3256
3257 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs)); 3639 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
3640 SvREFCNT_dec (sv);
3258 } 3641 }
3259 3642
3260 { 3643 {
3261 struct coro *coro = SvSTATE_hv (hv); 3644 struct coro *coro = SvSTATE_hv (hv);
3262 3645
… …
3286rouse_wait (...) 3669rouse_wait (...)
3287 PROTOTYPE: ;$ 3670 PROTOTYPE: ;$
3288 PPCODE: 3671 PPCODE:
3289 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait); 3672 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait);
3290 3673
3674void
3675on_enter (SV *block)
3676 ALIAS:
3677 on_leave = 1
3678 PROTOTYPE: &
3679 CODE:
3680{
3681 struct coro *coro = SvSTATE_current;
3682 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3683
3684 block = s_get_cv_croak (block);
3685
3686 if (!*avp)
3687 *avp = newAV ();
3688
3689 av_push (*avp, SvREFCNT_inc (block));
3690
3691 if (!ix)
3692 on_enterleave_call (aTHX_ block);
3693
3694 LEAVE; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
3695 SAVEDESTRUCTOR_X (ix ? coro_pop_on_leave : coro_pop_on_enter, (void *)coro);
3696 ENTER; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
3697}
3698
3291 3699
3292MODULE = Coro::State PACKAGE = PerlIO::cede 3700MODULE = Coro::State PACKAGE = PerlIO::cede
3293 3701
3294BOOT: 3702BOOT:
3295 PerlIO_define_layer (aTHX_ &PerlIO_cede); 3703 PerlIO_define_layer (aTHX_ &PerlIO_cede);
… …
3298MODULE = Coro::State PACKAGE = Coro::Semaphore 3706MODULE = Coro::State PACKAGE = Coro::Semaphore
3299 3707
3300SV * 3708SV *
3301new (SV *klass, SV *count = 0) 3709new (SV *klass, SV *count = 0)
3302 CODE: 3710 CODE:
3711{
3712 int semcnt = 1;
3713
3714 if (count)
3715 {
3716 SvGETMAGIC (count);
3717
3718 if (SvOK (count))
3719 semcnt = SvIV (count);
3720 }
3721
3303 RETVAL = sv_bless ( 3722 RETVAL = sv_bless (
3304 coro_waitarray_new (aTHX_ count && SvOK (count) ? SvIV (count) : 1), 3723 coro_waitarray_new (aTHX_ semcnt),
3305 GvSTASH (CvGV (cv)) 3724 GvSTASH (CvGV (cv))
3306 ); 3725 );
3726}
3307 OUTPUT: 3727 OUTPUT:
3308 RETVAL 3728 RETVAL
3309 3729
3310# helper for Coro::Channel 3730# helper for Coro::Channel and others
3311SV * 3731SV *
3312_alloc (int count) 3732_alloc (int count)
3313 CODE: 3733 CODE:
3314 RETVAL = coro_waitarray_new (aTHX_ count); 3734 RETVAL = coro_waitarray_new (aTHX_ count);
3315 OUTPUT: 3735 OUTPUT:
… …
3373 for (i = 1; i <= wcount; ++i) 3793 for (i = 1; i <= wcount; ++i)
3374 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i]))); 3794 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i])));
3375 } 3795 }
3376} 3796}
3377 3797
3798MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3799
3800void
3801_may_delete (SV *sem, int count, int extra_refs)
3802 PPCODE:
3803{
3804 AV *av = (AV *)SvRV (sem);
3805
3806 if (SvREFCNT ((SV *)av) == 1 + extra_refs
3807 && AvFILLp (av) == 0 /* no waiters, just count */
3808 && SvIV (AvARRAY (av)[0]) == count)
3809 XSRETURN_YES;
3810
3811 XSRETURN_NO;
3812}
3813
3378MODULE = Coro::State PACKAGE = Coro::Signal 3814MODULE = Coro::State PACKAGE = Coro::Signal
3379 3815
3380SV * 3816SV *
3381new (SV *klass) 3817new (SV *klass)
3382 CODE: 3818 CODE:
… …
3453 3889
3454void 3890void
3455_register (char *target, char *proto, SV *req) 3891_register (char *target, char *proto, SV *req)
3456 CODE: 3892 CODE:
3457{ 3893{
3458 CV *req_cv = coro_sv_2cv (aTHX_ req); 3894 SV *req_cv = s_get_cv_croak (req);
3459 /* newXSproto doesn't return the CV on 5.8 */ 3895 /* newXSproto doesn't return the CV on 5.8 */
3460 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 3896 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3461 sv_setpv ((SV *)slf_cv, proto); 3897 sv_setpv ((SV *)slf_cv, proto);
3462 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0); 3898 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
3463} 3899}
3464 3900
3901MODULE = Coro::State PACKAGE = Coro::Select
3902
3903void
3904patch_pp_sselect ()
3905 CODE:
3906 if (!coro_old_pp_sselect)
3907 {
3908 coro_select_select = (SV *)get_cv ("Coro::Select::select", 0);
3909 coro_old_pp_sselect = PL_ppaddr [OP_SSELECT];
3910 PL_ppaddr [OP_SSELECT] = coro_pp_sselect;
3911 }
3912
3913void
3914unpatch_pp_sselect ()
3915 CODE:
3916 if (coro_old_pp_sselect)
3917 {
3918 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
3919 coro_old_pp_sselect = 0;
3920 }
3921

Diff Legend

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