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.329 by root, Tue Nov 25 20:48:41 2008 UTC vs.
Revision 1.395 by root, Fri May 6 07:22:14 2011 UTC

1/* this works around a bug in mingw32 providing a non-working setjmp */
2#define USE_NO_MINGW_SETJMP_TWO_ARGS
3
4#define NDEBUG 1
5
1#include "libcoro/coro.c" 6#include "libcoro/coro.c"
2 7
3#define PERL_NO_GET_CONTEXT 8#define PERL_NO_GET_CONTEXT
4#define PERL_EXT 9#define PERL_EXT
5 10
6#include "EXTERN.h" 11#include "EXTERN.h"
7#include "perl.h" 12#include "perl.h"
8#include "XSUB.h" 13#include "XSUB.h"
9#include "perliol.h" 14#include "perliol.h"
10 15
11#include "patchlevel.h" 16#include "schmorp.h"
12 17
13#include <stdio.h> 18#include <stdio.h>
14#include <errno.h> 19#include <errno.h>
15#include <assert.h> 20#include <assert.h>
16 21
17#ifdef WIN32 22#ifndef SVs_PADSTALE
23# define SVs_PADSTALE 0
24#endif
25
26#if defined(_WIN32)
27# undef HAS_GETTIMEOFDAY
18# undef setjmp 28# undef setjmp
19# undef longjmp 29# undef longjmp
20# undef _exit 30# undef _exit
21# define setjmp _setjmp /* deep magic */ 31# define setjmp _setjmp /* deep magic */
22#else 32#else
… …
51#endif 61#endif
52 62
53/* the maximum number of idle cctx that will be pooled */ 63/* the maximum number of idle cctx that will be pooled */
54static int cctx_max_idle = 4; 64static int cctx_max_idle = 4;
55 65
56#define PERL_VERSION_ATLEAST(a,b,c) \
57 (PERL_REVISION > (a) \
58 || (PERL_REVISION == (a) \
59 && (PERL_VERSION > (b) \
60 || (PERL_VERSION == (b) && PERL_SUBVERSION >= (c)))))
61
62#if !PERL_VERSION_ATLEAST (5,6,0)
63# ifndef PL_ppaddr
64# define PL_ppaddr ppaddr
65# endif
66# ifndef call_sv
67# define call_sv perl_call_sv
68# endif
69# ifndef get_sv
70# define get_sv perl_get_sv
71# endif
72# ifndef get_cv
73# define get_cv perl_get_cv
74# endif
75# ifndef IS_PADGV
76# define IS_PADGV(v) 0
77# endif
78# ifndef IS_PADCONST
79# define IS_PADCONST(v) 0
80# endif
81#endif
82
83/* 5.11 */
84#ifndef CxHASARGS
85# define CxHASARGS(cx) (cx)->blk_sub.hasargs
86#endif
87
88/* 5.10.0 */
89#ifndef SvREFCNT_inc_NN
90# define SvREFCNT_inc_NN(sv) SvREFCNT_inc (sv)
91#endif
92
93/* 5.8.8 */
94#ifndef GV_NOTQUAL
95# define GV_NOTQUAL 0
96#endif
97#ifndef newSV
98# define newSV(l) NEWSV(0,l)
99#endif
100#ifndef CvISXSUB_on
101# define CvISXSUB_on(cv) (void)cv
102#endif
103#ifndef CvISXSUB
104# define CvISXSUB(cv) (CvXSUB (cv) ? TRUE : FALSE)
105#endif
106#ifndef Newx
107# define Newx(ptr,nitems,type) New (0,ptr,nitems,type)
108#endif
109
110/* 5.8.7 */
111#ifndef SvRV_set
112# define SvRV_set(s,v) SvRV(s) = (v)
113#endif
114
115#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 66#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
116# undef CORO_STACKGUARD 67# undef CORO_STACKGUARD
117#endif 68#endif
118 69
119#ifndef CORO_STACKGUARD 70#ifndef CORO_STACKGUARD
… …
133#else 84#else
134# define dSTACKLEVEL volatile void *stacklevel 85# define dSTACKLEVEL volatile void *stacklevel
135# define STACKLEVEL ((void *)&stacklevel) 86# define STACKLEVEL ((void *)&stacklevel)
136#endif 87#endif
137 88
138#define IN_DESTRUCT (PL_main_cv == Nullcv) 89#define IN_DESTRUCT PL_dirty
139 90
140#if __GNUC__ >= 3 91#if __GNUC__ >= 3
141# define attribute(x) __attribute__(x) 92# define attribute(x) __attribute__(x)
142# define expect(expr,value) __builtin_expect ((expr),(value)) 93# define expect(expr,value) __builtin_expect ((expr), (value))
143# define INLINE static inline 94# define INLINE static inline
144#else 95#else
145# define attribute(x) 96# define attribute(x)
146# define expect(expr,value) (expr) 97# define expect(expr,value) (expr)
147# define INLINE static 98# define INLINE static
… …
159# if CORO_PTHREAD 110# if CORO_PTHREAD
160static void *coro_thx; 111static void *coro_thx;
161# endif 112# endif
162#endif 113#endif
163 114
115#ifdef __linux
116# include <time.h> /* for timespec */
117# include <syscall.h> /* for SYS_* */
118# ifdef SYS_clock_gettime
119# define coro_clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
120# define CORO_CLOCK_MONOTONIC 1
121# define CORO_CLOCK_THREAD_CPUTIME_ID 3
122# endif
123#endif
124
164static double (*nvtime)(); /* so why doesn't it take void? */ 125static double (*nvtime)(); /* so why doesn't it take void? */
126static void (*u2time)(pTHX_ UV ret[2]);
165 127
166/* we hijack an hopefully unused CV flag for our purposes */ 128/* we hijack an hopefully unused CV flag for our purposes */
167#define CVf_SLF 0x4000 129#define CVf_SLF 0x4000
168static OP *pp_slf (pTHX); 130static OP *pp_slf (pTHX);
169 131
… …
190static SV *sv_pool_size; 152static SV *sv_pool_size;
191static SV *sv_async_pool_idle; /* description string */ 153static SV *sv_async_pool_idle; /* description string */
192static AV *av_async_pool; /* idle pool */ 154static AV *av_async_pool; /* idle pool */
193static SV *sv_Coro; /* class string */ 155static SV *sv_Coro; /* class string */
194static CV *cv_pool_handler; 156static CV *cv_pool_handler;
195static CV *cv_coro_state_new;
196 157
197/* Coro::AnyEvent */ 158/* Coro::AnyEvent */
198static SV *sv_activity; 159static SV *sv_activity;
160
161/* enable processtime/realtime profiling */
162static char enable_times;
163typedef U32 coro_ts[2];
164static coro_ts time_real, time_cpu;
165static char times_valid;
199 166
200static struct coro_cctx *cctx_first; 167static struct coro_cctx *cctx_first;
201static int cctx_count, cctx_idle; 168static int cctx_count, cctx_idle;
202 169
203enum { 170enum {
… …
229 int valgrind_id; 196 int valgrind_id;
230#endif 197#endif
231 unsigned char flags; 198 unsigned char flags;
232} coro_cctx; 199} coro_cctx;
233 200
234coro_cctx *cctx_current; /* the currently running cctx */ 201static coro_cctx *cctx_current; /* the currently running cctx */
235 202
236/*****************************************************************************/ 203/*****************************************************************************/
237 204
238enum { 205enum {
239 CF_RUNNING = 0x0001, /* coroutine is running */ 206 CF_RUNNING = 0x0001, /* coroutine is running */
240 CF_READY = 0x0002, /* coroutine is ready */ 207 CF_READY = 0x0002, /* coroutine is ready */
241 CF_NEW = 0x0004, /* has never been switched to */ 208 CF_NEW = 0x0004, /* has never been switched to */
242 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 209 CF_DESTROYED = 0x0008, /* coroutine data has been freed */
210 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
211 CF_NOCANCEL = 0x0020, /* cannot cancel, set slf_frame.data to 1 (hackish) */
243}; 212};
244 213
245/* the structure where most of the perl state is stored, overlaid on the cxstack */ 214/* the structure where most of the perl state is stored, overlaid on the cxstack */
246typedef struct 215typedef struct
247{ 216{
… …
260/* this is a structure representing a perl-level coroutine */ 229/* this is a structure representing a perl-level coroutine */
261struct coro { 230struct coro {
262 /* the C coroutine allocated to this perl coroutine, if any */ 231 /* the C coroutine allocated to this perl coroutine, if any */
263 coro_cctx *cctx; 232 coro_cctx *cctx;
264 233
234 /* ready queue */
235 struct coro *next_ready;
236
265 /* state data */ 237 /* state data */
266 struct CoroSLF slf_frame; /* saved slf frame */ 238 struct CoroSLF slf_frame; /* saved slf frame */
267 AV *mainstack; 239 AV *mainstack;
268 perl_slots *slot; /* basically the saved sp */ 240 perl_slots *slot; /* basically the saved sp */
269 241
270 CV *startcv; /* the CV to execute */ 242 CV *startcv; /* the CV to execute */
271 AV *args; /* data associated with this coroutine (initial args) */ 243 AV *args; /* data associated with this coroutine (initial args) */
272 int refcnt; /* coroutines are refcounted, yes */ 244 int refcnt; /* coroutines are refcounted, yes */
273 int flags; /* CF_ flags */ 245 int flags; /* CF_ flags */
274 HV *hv; /* the perl hash associated with this coro, if any */ 246 HV *hv; /* the perl hash associated with this coro, if any */
275 void (*on_destroy)(pTHX_ struct coro *coro); 247 void (*on_destroy)(pTHX_ struct coro *coro); /* for temporary use by xs in critical sections */
276 248
277 /* statistics */ 249 /* statistics */
278 int usecount; /* number of transfers to this coro */ 250 int usecount; /* number of transfers to this coro */
279 251
280 /* coro process data */ 252 /* coro process data */
… …
285 /* async_pool */ 257 /* async_pool */
286 SV *saved_deffh; 258 SV *saved_deffh;
287 SV *invoke_cb; 259 SV *invoke_cb;
288 AV *invoke_av; 260 AV *invoke_av;
289 261
262 /* on_enter/on_leave */
263 AV *on_enter;
264 AV *on_leave;
265
266 /* swap_sv */
267 AV *swap_sv;
268
269 /* times */
270 coro_ts t_cpu, t_real;
271
290 /* linked list */ 272 /* linked list */
291 struct coro *next, *prev; 273 struct coro *next, *prev;
292}; 274};
293 275
294typedef struct coro *Coro__State; 276typedef struct coro *Coro__State;
295typedef struct coro *Coro__State_or_hashref; 277typedef struct coro *Coro__State_or_hashref;
296 278
297/* the following variables are effectively part of the perl context */ 279/* the following variables are effectively part of the perl context */
298/* and get copied between struct coro and these variables */ 280/* and get copied between struct coro and these variables */
299/* the mainr easonw e don't support windows process emulation */ 281/* the main reason we don't support windows process emulation */
300static struct CoroSLF slf_frame; /* the current slf frame */ 282static struct CoroSLF slf_frame; /* the current slf frame */
301 283
302/** Coro ********************************************************************/ 284/** Coro ********************************************************************/
303 285
304#define PRIO_MAX 3 286#define CORO_PRIO_MAX 3
305#define PRIO_HIGH 1 287#define CORO_PRIO_HIGH 1
306#define PRIO_NORMAL 0 288#define CORO_PRIO_NORMAL 0
307#define PRIO_LOW -1 289#define CORO_PRIO_LOW -1
308#define PRIO_IDLE -3 290#define CORO_PRIO_IDLE -3
309#define PRIO_MIN -4 291#define CORO_PRIO_MIN -4
310 292
311/* for Coro.pm */ 293/* for Coro.pm */
312static SV *coro_current; 294static SV *coro_current;
313static SV *coro_readyhook; 295static SV *coro_readyhook;
314static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1]; 296static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
315static CV *cv_coro_run, *cv_coro_terminate; 297static CV *cv_coro_run, *cv_coro_terminate;
316static struct coro *coro_first; 298static struct coro *coro_first;
317#define coro_nready coroapi.nready 299#define coro_nready coroapi.nready
300
301/** Coro::Select ************************************************************/
302
303static OP *(*coro_old_pp_sselect) (pTHX);
304static SV *coro_select_select;
305
306/* horrible hack, but if it works... */
307static OP *
308coro_pp_sselect (pTHX)
309{
310 dSP;
311 PUSHMARK (SP - 4); /* fake argument list */
312 XPUSHs (coro_select_select);
313 PUTBACK;
314
315 /* entersub is an UNOP, select a LISTOP... keep your fingers crossed */
316 PL_op->op_flags |= OPf_STACKED;
317 PL_op->op_private = 0;
318 return PL_ppaddr [OP_ENTERSUB](aTHX);
319}
320
321/** time stuff **************************************************************/
322
323#ifdef HAS_GETTIMEOFDAY
324
325static void
326coro_u2time (pTHX_ UV ret[2])
327{
328 struct timeval tv;
329 gettimeofday (&tv, 0);
330
331 ret [0] = tv.tv_sec;
332 ret [1] = tv.tv_usec;
333}
334
335static double
336coro_nvtime ()
337{
338 struct timeval tv;
339 gettimeofday (&tv, 0);
340
341 return tv.tv_sec + tv.tv_usec * 1e-6;
342}
343
344static void
345time_init (pTHX)
346{
347 nvtime = coro_nvtime;
348 u2time = coro_u2time;
349}
350
351#else
352
353static void
354time_init (pTHX)
355{
356 SV **svp;
357
358 require_pv ("Time/HiRes.pm");
359
360 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
361
362 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
363 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught");
364
365 nvtime = INT2PTR (double (*)(), SvIV (*svp));
366
367 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
368 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
369}
370
371#endif
318 372
319/** lowlevel stuff **********************************************************/ 373/** lowlevel stuff **********************************************************/
320 374
321static SV * 375static SV *
322coro_get_sv (pTHX_ const char *name, int create) 376coro_get_sv (pTHX_ const char *name, int create)
… …
346 get_hv (name, create); 400 get_hv (name, create);
347#endif 401#endif
348 return get_hv (name, create); 402 return get_hv (name, create);
349} 403}
350 404
351/* may croak */ 405INLINE void
352INLINE CV * 406coro_times_update ()
353coro_sv_2cv (pTHX_ SV *sv)
354{ 407{
408#ifdef coro_clock_gettime
409 struct timespec ts;
410
411 ts.tv_sec = ts.tv_nsec = 0;
412 coro_clock_gettime (CORO_CLOCK_THREAD_CPUTIME_ID, &ts);
413 time_cpu [0] = ts.tv_sec; time_cpu [1] = ts.tv_nsec;
414
415 ts.tv_sec = ts.tv_nsec = 0;
416 coro_clock_gettime (CORO_CLOCK_MONOTONIC, &ts);
417 time_real [0] = ts.tv_sec; time_real [1] = ts.tv_nsec;
418#else
419 dTHX;
420 UV tv[2];
421
422 u2time (aTHX_ tv);
423 time_real [0] = tv [0];
424 time_real [1] = tv [1] * 1000;
425#endif
426}
427
428INLINE void
429coro_times_add (struct coro *c)
430{
431 c->t_real [1] += time_real [1];
432 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
433 c->t_real [0] += time_real [0];
434
435 c->t_cpu [1] += time_cpu [1];
436 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
437 c->t_cpu [0] += time_cpu [0];
438}
439
440INLINE void
441coro_times_sub (struct coro *c)
442{
443 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; }
444 c->t_real [1] -= time_real [1];
445 c->t_real [0] -= time_real [0];
446
447 if (c->t_cpu [1] < time_cpu [1]) { c->t_cpu [1] += 1000000000; --c->t_cpu [0]; }
448 c->t_cpu [1] -= time_cpu [1];
449 c->t_cpu [0] -= time_cpu [0];
450}
451
452/*****************************************************************************/
453/* magic glue */
454
455#define CORO_MAGIC_type_cv 26
456#define CORO_MAGIC_type_state PERL_MAGIC_ext
457
458#define CORO_MAGIC_NN(sv, type) \
459 (expect_true (SvMAGIC (sv)->mg_type == type) \
460 ? SvMAGIC (sv) \
461 : mg_find (sv, type))
462
463#define CORO_MAGIC(sv, type) \
464 (expect_true (SvMAGIC (sv)) \
465 ? CORO_MAGIC_NN (sv, type) \
466 : 0)
467
468#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
469#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
470
471INLINE struct coro *
472SvSTATE_ (pTHX_ SV *coro)
473{
355 HV *st; 474 HV *stash;
356 GV *gvp; 475 MAGIC *mg;
357 return sv_2cv (sv, &st, &gvp, 0); 476
477 if (SvROK (coro))
478 coro = SvRV (coro);
479
480 if (expect_false (SvTYPE (coro) != SVt_PVHV))
481 croak ("Coro::State object required");
482
483 stash = SvSTASH (coro);
484 if (expect_false (stash != coro_stash && stash != coro_state_stash))
485 {
486 /* very slow, but rare, check */
487 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
488 croak ("Coro::State object required");
489 }
490
491 mg = CORO_MAGIC_state (coro);
492 return (struct coro *)mg->mg_ptr;
358} 493}
494
495#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
496
497/* faster than SvSTATE, but expects a coroutine hv */
498#define SvSTATE_hv(hv) ((struct coro *)CORO_MAGIC_NN ((SV *)hv, CORO_MAGIC_type_state)->mg_ptr)
499#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
500
501/*****************************************************************************/
502/* padlist management and caching */
359 503
360static AV * 504static AV *
361coro_derive_padlist (pTHX_ CV *cv) 505coro_derive_padlist (pTHX_ CV *cv)
362{ 506{
363 AV *padlist = CvPADLIST (cv); 507 AV *padlist = CvPADLIST (cv);
… …
371 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 515 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
372#endif 516#endif
373 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 517 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
374 --AvFILLp (padlist); 518 --AvFILLp (padlist);
375 519
376 av_store (newpadlist, 0, SvREFCNT_inc_NN (*av_fetch (padlist, 0, FALSE))); 520 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0]));
377 av_store (newpadlist, 1, (SV *)newpad); 521 av_store (newpadlist, 1, (SV *)newpad);
378 522
379 return newpadlist; 523 return newpadlist;
380} 524}
381 525
382static void 526static void
383free_padlist (pTHX_ AV *padlist) 527free_padlist (pTHX_ AV *padlist)
384{ 528{
385 /* may be during global destruction */ 529 /* may be during global destruction */
386 if (SvREFCNT (padlist)) 530 if (!IN_DESTRUCT)
387 { 531 {
388 I32 i = AvFILLp (padlist); 532 I32 i = AvFILLp (padlist);
389 while (i >= 0) 533
534 while (i > 0) /* special-case index 0 */
390 { 535 {
391 SV **svp = av_fetch (padlist, i--, FALSE); 536 /* we try to be extra-careful here */
392 if (svp) 537 AV *av = (AV *)AvARRAY (padlist)[i--];
393 { 538 I32 j = AvFILLp (av);
394 SV *sv; 539
395 while (&PL_sv_undef != (sv = av_pop ((AV *)*svp))) 540 while (j >= 0)
541 SvREFCNT_dec (AvARRAY (av)[j--]);
542
543 AvFILLp (av) = -1;
396 SvREFCNT_dec (sv); 544 SvREFCNT_dec (av);
397
398 SvREFCNT_dec (*svp);
399 }
400 } 545 }
401 546
547 SvREFCNT_dec (AvARRAY (padlist)[0]);
548
549 AvFILLp (padlist) = -1;
402 SvREFCNT_dec ((SV*)padlist); 550 SvREFCNT_dec ((SV*)padlist);
403 } 551 }
404} 552}
405 553
406static int 554static int
407coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 555coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
408{ 556{
409 AV *padlist; 557 AV *padlist;
410 AV *av = (AV *)mg->mg_obj; 558 AV *av = (AV *)mg->mg_obj;
559
560 /* perl manages to free our internal AV and _then_ call us */
561 if (IN_DESTRUCT)
562 return 0;
411 563
412 /* casting is fun. */ 564 /* casting is fun. */
413 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 565 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
414 free_padlist (aTHX_ padlist); 566 free_padlist (aTHX_ padlist);
415 567
416 SvREFCNT_dec (av); /* sv_magicext increased the refcount */ 568 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
417 569
418 return 0; 570 return 0;
419} 571}
420
421#define CORO_MAGIC_type_cv 26
422#define CORO_MAGIC_type_state PERL_MAGIC_ext
423 572
424static MGVTBL coro_cv_vtbl = { 573static MGVTBL coro_cv_vtbl = {
425 0, 0, 0, 0, 574 0, 0, 0, 0,
426 coro_cv_free 575 coro_cv_free
427}; 576};
428
429#define CORO_MAGIC_NN(sv, type) \
430 (expect_true (SvMAGIC (sv)->mg_type == type) \
431 ? SvMAGIC (sv) \
432 : mg_find (sv, type))
433
434#define CORO_MAGIC(sv, type) \
435 (expect_true (SvMAGIC (sv)) \
436 ? CORO_MAGIC_NN (sv, type) \
437 : 0)
438
439#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
440#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
441
442INLINE struct coro *
443SvSTATE_ (pTHX_ SV *coro)
444{
445 HV *stash;
446 MAGIC *mg;
447
448 if (SvROK (coro))
449 coro = SvRV (coro);
450
451 if (expect_false (SvTYPE (coro) != SVt_PVHV))
452 croak ("Coro::State object required");
453
454 stash = SvSTASH (coro);
455 if (expect_false (stash != coro_stash && stash != coro_state_stash))
456 {
457 /* very slow, but rare, check */
458 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
459 croak ("Coro::State object required");
460 }
461
462 mg = CORO_MAGIC_state (coro);
463 return (struct coro *)mg->mg_ptr;
464}
465
466#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
467
468/* faster than SvSTATE, but expects a coroutine hv */
469#define SvSTATE_hv(hv) ((struct coro *)CORO_MAGIC_NN ((SV *)hv, CORO_MAGIC_type_state)->mg_ptr)
470#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
471 577
472/* the next two functions merely cache the padlists */ 578/* the next two functions merely cache the padlists */
473static void 579static void
474get_padlist (pTHX_ CV *cv) 580get_padlist (pTHX_ CV *cv)
475{ 581{
… …
503 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 609 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
504 610
505 av = (AV *)mg->mg_obj; 611 av = (AV *)mg->mg_obj;
506 612
507 if (expect_false (AvFILLp (av) >= AvMAX (av))) 613 if (expect_false (AvFILLp (av) >= AvMAX (av)))
508 av_extend (av, AvMAX (av) + 1); 614 av_extend (av, AvFILLp (av) + 1);
509 615
510 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 616 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
511} 617}
512 618
513/** load & save, init *******************************************************/ 619/** load & save, init *******************************************************/
620
621/* swap sv heads, at least logically */
622static void
623swap_svs (pTHX_ Coro__State c)
624{
625 int i;
626
627 for (i = 0; i <= AvFILLp (c->swap_sv); )
628 {
629 SV *a = AvARRAY (c->swap_sv)[i++];
630 SV *b = AvARRAY (c->swap_sv)[i++];
631
632 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
633 SV tmp;
634
635 /* swap sv_any */
636 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
637
638 /* swap sv_flags */
639 SvFLAGS (&tmp) = SvFLAGS (a);
640 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
641 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
642
643#if PERL_VERSION_ATLEAST (5,10,0)
644 /* perl 5.10 complicates this _quite_ a bit, but it also is
645 * much faster, so no quarrels here. alternatively, we could
646 * sv_upgrade to avoid this.
647 */
648 {
649 /* swap sv_u */
650 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
651
652 /* if SvANY points to the head, we need to adjust the pointers,
653 * as the pointer for a still points to b, and maybe vice versa.
654 */
655 #define svany_in_head(type) \
656 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
657
658 if (svany_in_head (SvTYPE (a)))
659 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
660
661 if (svany_in_head (SvTYPE (b)))
662 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
663 }
664#endif
665 }
666}
667
668#define SWAP_SVS(coro) \
669 if (expect_false ((coro)->swap_sv)) \
670 swap_svs (aTHX_ (coro))
671
672static void
673on_enterleave_call (pTHX_ SV *cb);
514 674
515static void 675static void
516load_perl (pTHX_ Coro__State c) 676load_perl (pTHX_ Coro__State c)
517{ 677{
518 perl_slots *slot = c->slot; 678 perl_slots *slot = c->slot;
… …
546 PUTBACK; 706 PUTBACK;
547 } 707 }
548 708
549 slf_frame = c->slf_frame; 709 slf_frame = c->slf_frame;
550 CORO_THROW = c->except; 710 CORO_THROW = c->except;
711
712 if (expect_false (enable_times))
713 {
714 if (expect_false (!times_valid))
715 coro_times_update ();
716
717 coro_times_sub (c);
718 }
719
720 if (expect_false (c->on_enter))
721 {
722 int i;
723
724 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
725 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
726 }
727
728 SWAP_SVS (c);
551} 729}
552 730
553static void 731static void
554save_perl (pTHX_ Coro__State c) 732save_perl (pTHX_ Coro__State c)
555{ 733{
734 SWAP_SVS (c);
735
736 if (expect_false (c->on_leave))
737 {
738 int i;
739
740 for (i = AvFILLp (c->on_leave); i >= 0; --i)
741 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
742 }
743
744 times_valid = 0;
745
746 if (expect_false (enable_times))
747 {
748 coro_times_update (); times_valid = 1;
749 coro_times_add (c);
750 }
751
556 c->except = CORO_THROW; 752 c->except = CORO_THROW;
557 c->slf_frame = slf_frame; 753 c->slf_frame = slf_frame;
558 754
559 { 755 {
560 dSP; 756 dSP;
… …
573 { 769 {
574 while (expect_true (cxix >= 0)) 770 while (expect_true (cxix >= 0))
575 { 771 {
576 PERL_CONTEXT *cx = &ccstk[cxix--]; 772 PERL_CONTEXT *cx = &ccstk[cxix--];
577 773
578 if (expect_true (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT)) 774 if (expect_true (CxTYPE (cx) == CXt_SUB) || expect_false (CxTYPE (cx) == CXt_FORMAT))
579 { 775 {
580 CV *cv = cx->blk_sub.cv; 776 CV *cv = cx->blk_sub.cv;
581 777
582 if (expect_true (CvDEPTH (cv))) 778 if (expect_true (CvDEPTH (cv)))
583 { 779 {
… …
607 /* we manually unroll here, as usually 2 slots is enough */ 803 /* we manually unroll here, as usually 2 slots is enough */
608 if (SLOT_COUNT >= 1) CXINC; 804 if (SLOT_COUNT >= 1) CXINC;
609 if (SLOT_COUNT >= 2) CXINC; 805 if (SLOT_COUNT >= 2) CXINC;
610 if (SLOT_COUNT >= 3) CXINC; 806 if (SLOT_COUNT >= 3) CXINC;
611 { 807 {
612 int i; 808 unsigned int i;
613 for (i = 3; i < SLOT_COUNT; ++i) 809 for (i = 3; i < SLOT_COUNT; ++i)
614 CXINC; 810 CXINC;
615 } 811 }
616 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 812 cxstack_ix -= SLOT_COUNT; /* undo allocation */
617 813
… …
759#endif 955#endif
760 956
761/* 957/*
762 * This overrides the default magic get method of %SIG elements. 958 * This overrides the default magic get method of %SIG elements.
763 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook 959 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
764 * and instead of tryign to save and restore the hash elements, we just provide 960 * and instead of trying to save and restore the hash elements, we just provide
765 * readback here. 961 * readback here.
766 * We only do this when the hook is != 0, as they are often set to 0 temporarily,
767 * not expecting this to actually change the hook. This is a potential problem
768 * when a schedule happens then, but we ignore this.
769 */ 962 */
770static int 963static int
771coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 964coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
772{ 965{
773 const char *s = MgPV_nolen_const (mg); 966 const char *s = MgPV_nolen_const (mg);
… …
826 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 1019 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
827 1020
828 if (svp) 1021 if (svp)
829 { 1022 {
830 SV *old = *svp; 1023 SV *old = *svp;
831 *svp = newSVsv (sv); 1024 *svp = SvOK (sv) ? newSVsv (sv) : 0;
832 SvREFCNT_dec (old); 1025 SvREFCNT_dec (old);
833 return 0; 1026 return 0;
834 } 1027 }
835 } 1028 }
836 1029
… …
854slf_check_repeat (pTHX_ struct CoroSLF *frame) 1047slf_check_repeat (pTHX_ struct CoroSLF *frame)
855{ 1048{
856 return 1; 1049 return 1;
857} 1050}
858 1051
859static UNOP coro_setup_op; 1052static UNOP init_perl_op;
860 1053
861static void NOINLINE /* noinline to keep it out of the transfer fast path */ 1054static void NOINLINE /* noinline to keep it out of the transfer fast path */
862coro_setup (pTHX_ struct coro *coro) 1055init_perl (pTHX_ struct coro *coro)
863{ 1056{
864 /* 1057 /*
865 * emulate part of the perl startup here. 1058 * emulate part of the perl startup here.
866 */ 1059 */
867 coro_init_stacks (aTHX); 1060 coro_init_stacks (aTHX);
… …
874 PL_comppad_name_fill = 0; 1067 PL_comppad_name_fill = 0;
875 PL_comppad_name_floor = 0; 1068 PL_comppad_name_floor = 0;
876 PL_curpm = 0; 1069 PL_curpm = 0;
877 PL_curpad = 0; 1070 PL_curpad = 0;
878 PL_localizing = 0; 1071 PL_localizing = 0;
879 PL_dirty = 0;
880 PL_restartop = 0; 1072 PL_restartop = 0;
881#if PERL_VERSION_ATLEAST (5,10,0) 1073#if PERL_VERSION_ATLEAST (5,10,0)
882 PL_parser = 0; 1074 PL_parser = 0;
883#endif 1075#endif
884 PL_hints = 0; 1076 PL_hints = 0;
… …
916 */ 1108 */
917 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1109 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
918 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */ 1110 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
919 1111
920 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1112 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */
921 coro_setup_op.op_next = PL_op; 1113 init_perl_op.op_next = PL_op;
922 coro_setup_op.op_type = OP_ENTERSUB; 1114 init_perl_op.op_type = OP_ENTERSUB;
923 coro_setup_op.op_ppaddr = pp_slf; 1115 init_perl_op.op_ppaddr = pp_slf;
924 /* no flags etc. required, as an init function won't be called */ 1116 /* no flags etc. required, as an init function won't be called */
925 1117
926 PL_op = (OP *)&coro_setup_op; 1118 PL_op = (OP *)&init_perl_op;
927 1119
928 /* copy throw, in case it was set before coro_setup */ 1120 /* copy throw, in case it was set before init_perl */
929 CORO_THROW = coro->except; 1121 CORO_THROW = coro->except;
930}
931 1122
1123 SWAP_SVS (coro);
1124
1125 if (expect_false (enable_times))
1126 {
1127 coro_times_update ();
1128 coro_times_sub (coro);
1129 }
1130}
1131
932static void 1132static void
933coro_destruct (pTHX_ struct coro *coro) 1133coro_unwind_stacks (pTHX)
934{ 1134{
935 if (!IN_DESTRUCT) 1135 if (!IN_DESTRUCT)
936 { 1136 {
937 /* restore all saved variables and stuff */ 1137 /* restore all saved variables and stuff */
938 LEAVE_SCOPE (0); 1138 LEAVE_SCOPE (0);
… …
946 POPSTACK_TO (PL_mainstack); 1146 POPSTACK_TO (PL_mainstack);
947 1147
948 /* unwind main stack */ 1148 /* unwind main stack */
949 dounwind (-1); 1149 dounwind (-1);
950 } 1150 }
1151}
951 1152
952 SvREFCNT_dec (GvSV (PL_defgv)); 1153static void
953 SvREFCNT_dec (GvAV (PL_defgv)); 1154destroy_perl (pTHX_ struct coro *coro)
954 SvREFCNT_dec (GvSV (PL_errgv)); 1155{
955 SvREFCNT_dec (PL_defoutgv); 1156 SV *svf [9];
956 SvREFCNT_dec (PL_rs);
957 SvREFCNT_dec (GvSV (irsgv));
958 SvREFCNT_dec (GvHV (PL_hintgv));
959 1157
960 SvREFCNT_dec (PL_diehook);
961 SvREFCNT_dec (PL_warnhook);
962 1158 {
1159 struct coro *current = SvSTATE_current;
1160
1161 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1162
1163 save_perl (aTHX_ current);
1164 /*SvRV_set (coro_current, (SV *)coro->hv);*/
1165 load_perl (aTHX_ coro);
1166
1167 coro_unwind_stacks (aTHX);
1168 coro_destruct_stacks (aTHX);
1169
1170 /* restore swapped sv's */
1171 SWAP_SVS (coro);
1172
1173 // now save some sv's to be free'd later
1174 svf [0] = GvSV (PL_defgv);
1175 svf [1] = (SV *)GvAV (PL_defgv);
1176 svf [2] = GvSV (PL_errgv);
1177 svf [3] = (SV *)PL_defoutgv;
1178 svf [4] = PL_rs;
1179 svf [5] = GvSV (irsgv);
1180 svf [6] = (SV *)GvHV (PL_hintgv);
1181 svf [7] = PL_diehook;
1182 svf [8] = PL_warnhook;
1183 assert (9 == sizeof (svf) / sizeof (*svf));
1184
1185 /*SvRV_set (coro_current, (SV *)current->hv);*/
1186 load_perl (aTHX_ current);
1187 }
1188
1189 {
1190 unsigned int i;
1191
1192 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i)
1193 SvREFCNT_dec (svf [i]);
1194
963 SvREFCNT_dec (coro->saved_deffh); 1195 SvREFCNT_dec (coro->saved_deffh);
964 SvREFCNT_dec (coro->rouse_cb); 1196 SvREFCNT_dec (coro->rouse_cb);
965 SvREFCNT_dec (coro->invoke_cb); 1197 SvREFCNT_dec (coro->invoke_cb);
966 SvREFCNT_dec (coro->invoke_av); 1198 SvREFCNT_dec (coro->invoke_av);
967 1199 }
968 coro_destruct_stacks (aTHX);
969} 1200}
970 1201
971INLINE void 1202INLINE void
972free_coro_mortal (pTHX) 1203free_coro_mortal (pTHX)
973{ 1204{
… …
1170 /* somebody or something will hit me for both perl_run and PL_restartop */ 1401 /* somebody or something will hit me for both perl_run and PL_restartop */
1171 PL_restartop = PL_op; 1402 PL_restartop = PL_op;
1172 perl_run (PL_curinterp); 1403 perl_run (PL_curinterp);
1173 /* 1404 /*
1174 * Unfortunately, there is no way to get at the return values of the 1405 * Unfortunately, there is no way to get at the return values of the
1175 * coro body here, as perl_run destroys these 1406 * coro body here, as perl_run destroys these. Likewise, we cannot catch
1407 * runtime errors here, as this is just a random interpreter, not a thread.
1176 */ 1408 */
1177 1409
1178 /* 1410 /*
1179 * If perl-run returns we assume exit() was being called or the coro 1411 * If perl-run returns we assume exit() was being called or the coro
1180 * fell off the end, which seems to be the only valid (non-bug) 1412 * fell off the end, which seems to be the only valid (non-bug)
… …
1267cctx_destroy (coro_cctx *cctx) 1499cctx_destroy (coro_cctx *cctx)
1268{ 1500{
1269 if (!cctx) 1501 if (!cctx)
1270 return; 1502 return;
1271 1503
1272 assert (cctx != cctx_current);//D temporary 1504 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1273 1505
1274 --cctx_count; 1506 --cctx_count;
1275 coro_destroy (&cctx->cctx); 1507 coro_destroy (&cctx->cctx);
1276 1508
1277 /* coro_transfer creates new, empty cctx's */ 1509 /* coro_transfer creates new, empty cctx's */
… …
1341 /* TODO: throwing up here is considered harmful */ 1573 /* TODO: throwing up here is considered harmful */
1342 1574
1343 if (expect_true (prev != next)) 1575 if (expect_true (prev != next))
1344 { 1576 {
1345 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1577 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1346 croak ("Coro::State::transfer called with a suspended prev Coro::State, but can only transfer from running or new states,"); 1578 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1347 1579
1348 if (expect_false (next->flags & CF_RUNNING))
1349 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states,");
1350
1351 if (expect_false (next->flags & CF_DESTROYED)) 1580 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED)))
1352 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states,"); 1581 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1353 1582
1354#if !PERL_VERSION_ATLEAST (5,10,0) 1583#if !PERL_VERSION_ATLEAST (5,10,0)
1355 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1584 if (expect_false (PL_lex_state != LEX_NOTPARSING))
1356 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,"); 1585 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1357#endif 1586#endif
… …
1390 if (expect_false (next->flags & CF_NEW)) 1619 if (expect_false (next->flags & CF_NEW))
1391 { 1620 {
1392 /* need to start coroutine */ 1621 /* need to start coroutine */
1393 next->flags &= ~CF_NEW; 1622 next->flags &= ~CF_NEW;
1394 /* setup coroutine call */ 1623 /* setup coroutine call */
1395 coro_setup (aTHX_ next); 1624 init_perl (aTHX_ next);
1396 } 1625 }
1397 else 1626 else
1398 load_perl (aTHX_ next); 1627 load_perl (aTHX_ next);
1399
1400 assert (!prev->cctx);//D temporary
1401 1628
1402 /* possibly untie and reuse the cctx */ 1629 /* possibly untie and reuse the cctx */
1403 if (expect_true ( 1630 if (expect_true (
1404 cctx_current->idle_sp == STACKLEVEL 1631 cctx_current->idle_sp == STACKLEVEL
1405 && !(cctx_current->flags & CC_TRACE) 1632 && !(cctx_current->flags & CC_TRACE)
… …
1441#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx)) 1668#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1442#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1669#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1443 1670
1444/** high level stuff ********************************************************/ 1671/** high level stuff ********************************************************/
1445 1672
1446static int 1673static void
1447coro_state_destroy (pTHX_ struct coro *coro) 1674coro_state_destroy (pTHX_ struct coro *coro)
1448{ 1675{
1449 if (coro->flags & CF_DESTROYED) 1676 if (coro->flags & CF_DESTROYED)
1450 return 0; 1677 return;
1451 1678
1679 /* this callback is reserved for slf functions needing to do cleanup */
1452 if (coro->on_destroy) 1680 if (coro->on_destroy && !PL_dirty)
1453 coro->on_destroy (aTHX_ coro); 1681 coro->on_destroy (aTHX_ coro);
1682
1683 /*
1684 * The on_destroy above most likely is from an SLF call.
1685 * Since by definition the SLF call will not finish when we destroy
1686 * the coro, we will have to force-finish it here, otherwise
1687 * cleanup functions cannot call SLF functions.
1688 */
1689 coro->slf_frame.prepare = 0;
1454 1690
1455 coro->flags |= CF_DESTROYED; 1691 coro->flags |= CF_DESTROYED;
1456 1692
1457 if (coro->flags & CF_READY) 1693 if (coro->flags & CF_READY)
1458 { 1694 {
… …
1461 --coro_nready; 1697 --coro_nready;
1462 } 1698 }
1463 else 1699 else
1464 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1700 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1465 1701
1466 if (coro->mainstack && coro->mainstack != main_mainstack) 1702 if (coro->mainstack
1467 { 1703 && coro->mainstack != main_mainstack
1468 struct coro temp; 1704 && coro->slot
1469 1705 && !PL_dirty)
1470 assert (("FATAL: tried to destroy currently running coroutine (please report)", !(coro->flags & CF_RUNNING)));
1471
1472 save_perl (aTHX_ &temp);
1473 load_perl (aTHX_ coro); 1706 destroy_perl (aTHX_ coro);
1474 1707
1475 coro_destruct (aTHX_ coro); 1708 if (coro->next) coro->next->prev = coro->prev;
1476 1709 if (coro->prev) coro->prev->next = coro->next;
1477 load_perl (aTHX_ &temp); 1710 if (coro == coro_first) coro_first = coro->next;
1478
1479 coro->slot = 0;
1480 }
1481 1711
1482 cctx_destroy (coro->cctx); 1712 cctx_destroy (coro->cctx);
1483 SvREFCNT_dec (coro->startcv); 1713 SvREFCNT_dec (coro->startcv);
1484 SvREFCNT_dec (coro->args); 1714 SvREFCNT_dec (coro->args);
1715 SvREFCNT_dec (coro->swap_sv);
1485 SvREFCNT_dec (CORO_THROW); 1716 SvREFCNT_dec (CORO_THROW);
1486
1487 if (coro->next) coro->next->prev = coro->prev;
1488 if (coro->prev) coro->prev->next = coro->next;
1489 if (coro == coro_first) coro_first = coro->next;
1490
1491 return 1;
1492} 1717}
1493 1718
1494static int 1719static int
1495coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1720coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1496{ 1721{
… …
1544 1769
1545 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1770 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1546 TRANSFER (ta, 1); 1771 TRANSFER (ta, 1);
1547} 1772}
1548 1773
1549/*****************************************************************************/
1550/* gensub: simple closure generation utility */
1551
1552#define GENSUB_ARG CvXSUBANY (cv).any_ptr
1553
1554/* create a closure from XS, returns a code reference */
1555/* the arg can be accessed via GENSUB_ARG from the callback */
1556/* the callback must use dXSARGS/XSRETURN */
1557static SV *
1558gensub (pTHX_ void (*xsub)(pTHX_ CV *), void *arg)
1559{
1560 CV *cv = (CV *)newSV (0);
1561
1562 sv_upgrade ((SV *)cv, SVt_PVCV);
1563
1564 CvANON_on (cv);
1565 CvISXSUB_on (cv);
1566 CvXSUB (cv) = xsub;
1567 GENSUB_ARG = arg;
1568
1569 return newRV_noinc ((SV *)cv);
1570}
1571
1572/** Coro ********************************************************************/ 1774/** Coro ********************************************************************/
1573 1775
1574INLINE void 1776INLINE void
1575coro_enq (pTHX_ struct coro *coro) 1777coro_enq (pTHX_ struct coro *coro)
1576{ 1778{
1577 av_push (coro_ready [coro->prio - PRIO_MIN], SvREFCNT_inc_NN (coro->hv)); 1779 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1578}
1579 1780
1580INLINE SV * 1781 SvREFCNT_inc_NN (coro->hv);
1782
1783 coro->next_ready = 0;
1784 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1785 ready [1] = coro;
1786}
1787
1788INLINE struct coro *
1581coro_deq (pTHX) 1789coro_deq (pTHX)
1582{ 1790{
1583 int prio; 1791 int prio;
1584 1792
1585 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; ) 1793 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
1586 if (AvFILLp (coro_ready [prio]) >= 0) 1794 {
1587 return av_shift (coro_ready [prio]); 1795 struct coro **ready = coro_ready [prio];
1796
1797 if (ready [0])
1798 {
1799 struct coro *coro = ready [0];
1800 ready [0] = coro->next_ready;
1801 return coro;
1802 }
1803 }
1588 1804
1589 return 0; 1805 return 0;
1806}
1807
1808static void
1809invoke_sv_ready_hook_helper (void)
1810{
1811 dTHX;
1812 dSP;
1813
1814 ENTER;
1815 SAVETMPS;
1816
1817 PUSHMARK (SP);
1818 PUTBACK;
1819 call_sv (coro_readyhook, G_VOID | G_DISCARD);
1820
1821 FREETMPS;
1822 LEAVE;
1590} 1823}
1591 1824
1592static int 1825static int
1593api_ready (pTHX_ SV *coro_sv) 1826api_ready (pTHX_ SV *coro_sv)
1594{ 1827{
1595 struct coro *coro;
1596 SV *sv_hook;
1597 void (*xs_hook)(void);
1598
1599 coro = SvSTATE (coro_sv); 1828 struct coro *coro = SvSTATE (coro_sv);
1600 1829
1601 if (coro->flags & CF_READY) 1830 if (coro->flags & CF_READY)
1602 return 0; 1831 return 0;
1603 1832
1604 coro->flags |= CF_READY; 1833 coro->flags |= CF_READY;
1605 1834
1606 sv_hook = coro_nready ? 0 : coro_readyhook;
1607 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1608
1609 coro_enq (aTHX_ coro); 1835 coro_enq (aTHX_ coro);
1610 ++coro_nready;
1611 1836
1612 if (sv_hook) 1837 if (!coro_nready++)
1613 { 1838 if (coroapi.readyhook)
1614 dSP; 1839 coroapi.readyhook ();
1615
1616 ENTER;
1617 SAVETMPS;
1618
1619 PUSHMARK (SP);
1620 PUTBACK;
1621 call_sv (sv_hook, G_VOID | G_DISCARD);
1622
1623 FREETMPS;
1624 LEAVE;
1625 }
1626
1627 if (xs_hook)
1628 xs_hook ();
1629 1840
1630 return 1; 1841 return 1;
1631} 1842}
1632 1843
1633static int 1844static int
… …
1656static void 1867static void
1657prepare_schedule (pTHX_ struct coro_transfer_args *ta) 1868prepare_schedule (pTHX_ struct coro_transfer_args *ta)
1658{ 1869{
1659 for (;;) 1870 for (;;)
1660 { 1871 {
1661 SV *next_sv = coro_deq (aTHX); 1872 struct coro *next = coro_deq (aTHX);
1662 1873
1663 if (expect_true (next_sv)) 1874 if (expect_true (next))
1664 { 1875 {
1665 struct coro *next = SvSTATE_hv (next_sv);
1666
1667 /* cannot transfer to destroyed coros, skip and look for next */ 1876 /* cannot transfer to destroyed coros, skip and look for next */
1668 if (expect_false (next->flags & CF_DESTROYED)) 1877 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED)))
1669 SvREFCNT_dec (next_sv); /* coro_nready has already been taken care of by destroy */ 1878 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1670 else 1879 else
1671 { 1880 {
1672 next->flags &= ~CF_READY; 1881 next->flags &= ~CF_READY;
1673 --coro_nready; 1882 --coro_nready;
1674 1883
… …
1680 { 1889 {
1681 /* nothing to schedule: call the idle handler */ 1890 /* nothing to schedule: call the idle handler */
1682 if (SvROK (sv_idle) 1891 if (SvROK (sv_idle)
1683 && SvOBJECT (SvRV (sv_idle))) 1892 && SvOBJECT (SvRV (sv_idle)))
1684 { 1893 {
1894 if (SvRV (sv_idle) == SvRV (coro_current))
1895 croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught");
1896
1685 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 1897 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1686 api_ready (aTHX_ SvRV (sv_idle)); 1898 api_ready (aTHX_ SvRV (sv_idle));
1687 --coro_nready; 1899 --coro_nready;
1688 } 1900 }
1689 else 1901 else
1690 { 1902 {
1903 /* TODO: deprecated, remove, cannot work reliably *//*D*/
1691 dSP; 1904 dSP;
1692 1905
1693 ENTER; 1906 ENTER;
1694 SAVETMPS; 1907 SAVETMPS;
1695 1908
… …
1805 2018
1806static void 2019static void
1807coro_call_on_destroy (pTHX_ struct coro *coro) 2020coro_call_on_destroy (pTHX_ struct coro *coro)
1808{ 2021{
1809 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2022 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0);
1810 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1811 2023
1812 if (on_destroyp) 2024 if (on_destroyp)
1813 { 2025 {
1814 AV *on_destroy = (AV *)SvRV (*on_destroyp); 2026 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
2027 AV *on_destroy = sv_2mortal (SvREFCNT_inc ((AV *)SvRV (*on_destroyp)));
2028 AV *status = statusp ? sv_2mortal (SvREFCNT_inc ((AV *)SvRV (*statusp))) : 0;
1815 2029
1816 while (AvFILLp (on_destroy) >= 0) 2030 while (AvFILLp (on_destroy) >= 0)
1817 { 2031 {
1818 dSP; /* don't disturb outer sp */ 2032 dSP; /* don't disturb outer sp */
1819 SV *cb = av_pop (on_destroy); 2033 SV *cb = av_pop (on_destroy);
… …
1821 PUSHMARK (SP); 2035 PUSHMARK (SP);
1822 2036
1823 if (statusp) 2037 if (statusp)
1824 { 2038 {
1825 int i; 2039 int i;
1826 AV *status = (AV *)SvRV (*statusp);
1827 EXTEND (SP, AvFILLp (status) + 1); 2040 EXTEND (SP, AvFILLp (status) + 1);
1828 2041
1829 for (i = 0; i <= AvFILLp (status); ++i) 2042 for (i = 0; i <= AvFILLp (status); ++i)
1830 PUSHs (AvARRAY (status)[i]); 2043 PUSHs (AvARRAY (status)[i]);
1831 } 2044 }
… …
1835 } 2048 }
1836 } 2049 }
1837} 2050}
1838 2051
1839static void 2052static void
1840slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2053coro_set_status (HV *coro_hv, SV **arg, int items)
1841{ 2054{
1842 int i;
1843 HV *hv = (HV *)SvRV (coro_current);
1844 AV *av = newAV (); 2055 AV *av = newAV ();
1845 2056
2057 /* items are actually not so common, so optimise for this case */
2058 if (items)
2059 {
2060 int i;
2061
1846 av_extend (av, items - 1); 2062 av_extend (av, items - 1);
2063
1847 for (i = 0; i < items; ++i) 2064 for (i = 0; i < items; ++i)
1848 av_push (av, SvREFCNT_inc_NN (arg [i])); 2065 av_push (av, SvREFCNT_inc_NN (arg [i]));
2066 }
1849 2067
1850 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 2068 hv_store (coro_hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0);
2069}
1851 2070
2071static void
2072slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2073{
1852 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */ 2074 av_push (av_destroy, (SV *)newRV_inc ((SV *)coro_hv)); /* RVinc for perl */
1853 api_ready (aTHX_ sv_manager); 2075 api_ready (aTHX_ sv_manager);
1854 2076
1855 frame->prepare = prepare_schedule; 2077 frame->prepare = prepare_schedule;
1856 frame->check = slf_check_repeat; 2078 frame->check = slf_check_repeat;
2079
2080 /* as a minor optimisation, we could unwind all stacks here */
2081 /* but that puts extra pressure on pp_slf, and is not worth much */
2082 /*coro_unwind_stacks (aTHX);*/
2083}
2084
2085static void
2086slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2087{
2088 HV *coro_hv = (HV *)SvRV (coro_current);
2089
2090 coro_set_status (coro_hv, arg, items);
2091 slf_init_terminate_cancel_common (frame, coro_hv);
2092}
2093
2094static void
2095slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2096{
2097 HV *coro_hv;
2098 struct coro *coro;
2099
2100 if (items <= 0)
2101 croak ("Coro::cancel called without coro object,");
2102
2103 coro = SvSTATE (arg [0]);
2104 coro_hv = coro->hv;
2105
2106 coro_set_status (coro_hv, arg + 1, items - 1);
2107
2108 if (expect_false (coro->flags & CF_NOCANCEL))
2109 {
2110 /* coro currently busy cancelling something, so just notify it */
2111 coro->slf_frame.data = (void *)coro;
2112
2113 frame->prepare = prepare_nop;
2114 frame->check = slf_check_nop;
2115 }
2116 else if (coro_hv == (HV *)SvRV (coro_current))
2117 {
2118 /* cancelling the current coro is allowed, and equals terminate */
2119 slf_init_terminate_cancel_common (frame, coro_hv);
2120 }
2121 else
2122 {
2123 struct coro *self = SvSTATE_current;
2124
2125 /* otherwise we cancel directly, purely for speed reasons
2126 * unfortunately, this requires some magic trickery, as
2127 * somebody else could cancel us, so we have to fight the cancellation.
2128 * this is ugly, and hopefully fully worth the extra speed.
2129 * besides, I can't get the slow-but-safe version working...
2130 */
2131 slf_frame.data = 0;
2132 self->flags |= CF_NOCANCEL;
2133
2134 coro_state_destroy (aTHX_ coro);
2135 coro_call_on_destroy (aTHX_ coro);
2136
2137 self->flags &= ~CF_NOCANCEL;
2138
2139 if (slf_frame.data)
2140 {
2141 /* while we were busy we have been cancelled, so terminate */
2142 slf_init_terminate_cancel_common (frame, self->hv);
2143 }
2144 else
2145 {
2146 frame->prepare = prepare_nop;
2147 frame->check = slf_check_nop;
2148 }
2149 }
1857} 2150}
1858 2151
1859/*****************************************************************************/ 2152/*****************************************************************************/
1860/* async pool handler */ 2153/* async pool handler */
1861 2154
… …
1939 2232
1940static void 2233static void
1941coro_rouse_callback (pTHX_ CV *cv) 2234coro_rouse_callback (pTHX_ CV *cv)
1942{ 2235{
1943 dXSARGS; 2236 dXSARGS;
1944 SV *data = (SV *)GENSUB_ARG; 2237 SV *data = (SV *)S_GENSUB_ARG;
1945 2238
1946 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2239 if (SvTYPE (SvRV (data)) != SVt_PVAV)
1947 { 2240 {
1948 /* first call, set args */ 2241 /* first call, set args */
2242 SV *coro = SvRV (data);
1949 AV *av = newAV (); 2243 AV *av = newAV ();
1950 SV *coro = SvRV (data);
1951 2244
1952 SvRV_set (data, (SV *)av); 2245 SvRV_set (data, (SV *)av);
1953 api_ready (aTHX_ coro);
1954 SvREFCNT_dec (coro);
1955 2246
1956 /* better take a full copy of the arguments */ 2247 /* better take a full copy of the arguments */
1957 while (items--) 2248 while (items--)
1958 av_store (av, items, newSVsv (ST (items))); 2249 av_store (av, items, newSVsv (ST (items)));
2250
2251 api_ready (aTHX_ coro);
2252 SvREFCNT_dec (coro);
1959 } 2253 }
1960 2254
1961 XSRETURN_EMPTY; 2255 XSRETURN_EMPTY;
1962} 2256}
1963 2257
… …
1980 2274
1981 EXTEND (SP, AvFILLp (av) + 1); 2275 EXTEND (SP, AvFILLp (av) + 1);
1982 for (i = 0; i <= AvFILLp (av); ++i) 2276 for (i = 0; i <= AvFILLp (av); ++i)
1983 PUSHs (sv_2mortal (AvARRAY (av)[i])); 2277 PUSHs (sv_2mortal (AvARRAY (av)[i]));
1984 2278
1985 /* we have stolen the elements, so ste length to zero and free */ 2279 /* we have stolen the elements, so set length to zero and free */
1986 AvFILLp (av) = -1; 2280 AvFILLp (av) = -1;
1987 av_undef (av); 2281 av_undef (av);
1988 2282
1989 PUTBACK; 2283 PUTBACK;
1990 } 2284 }
… …
2014 || SvTYPE (SvRV (cb)) != SVt_PVCV 2308 || SvTYPE (SvRV (cb)) != SVt_PVCV
2015 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2309 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2016 croak ("Coro::rouse_wait called with illegal callback argument,"); 2310 croak ("Coro::rouse_wait called with illegal callback argument,");
2017 2311
2018 { 2312 {
2019 CV *cv = (CV *)SvRV (cb); /* for GENSUB_ARG */ 2313 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
2020 SV *data = (SV *)GENSUB_ARG; 2314 SV *data = (SV *)S_GENSUB_ARG;
2021 2315
2022 frame->data = (void *)data; 2316 frame->data = (void *)data;
2023 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule; 2317 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
2024 frame->check = slf_check_rouse_wait; 2318 frame->check = slf_check_rouse_wait;
2025 } 2319 }
… …
2029coro_new_rouse_cb (pTHX) 2323coro_new_rouse_cb (pTHX)
2030{ 2324{
2031 HV *hv = (HV *)SvRV (coro_current); 2325 HV *hv = (HV *)SvRV (coro_current);
2032 struct coro *coro = SvSTATE_hv (hv); 2326 struct coro *coro = SvSTATE_hv (hv);
2033 SV *data = newRV_inc ((SV *)hv); 2327 SV *data = newRV_inc ((SV *)hv);
2034 SV *cb = gensub (aTHX_ coro_rouse_callback, (void *)data); 2328 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
2035 2329
2036 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0); 2330 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0);
2037 SvREFCNT_dec (data); /* magicext increases the refcount */ 2331 SvREFCNT_dec (data); /* magicext increases the refcount */
2038 2332
2039 SvREFCNT_dec (coro->rouse_cb); 2333 SvREFCNT_dec (coro->rouse_cb);
… …
2264 if (PL_op->op_flags & OPf_STACKED) 2558 if (PL_op->op_flags & OPf_STACKED)
2265 { 2559 {
2266 if (items > slf_arga) 2560 if (items > slf_arga)
2267 { 2561 {
2268 slf_arga = items; 2562 slf_arga = items;
2269 free (slf_argv); 2563 Safefree (slf_argv);
2270 slf_argv = malloc (slf_arga * sizeof (SV *)); 2564 New (0, slf_argv, slf_arga, SV *);
2271 } 2565 }
2272 2566
2273 slf_argc = items; 2567 slf_argc = items;
2274 2568
2275 for (i = 0; i < items; ++i) 2569 for (i = 0; i < items; ++i)
… …
2280 2574
2281 PL_op->op_ppaddr = pp_slf; 2575 PL_op->op_ppaddr = pp_slf;
2282 /*PL_op->op_type = OP_CUSTOM; /* we do behave like entersub still */ 2576 /*PL_op->op_type = OP_CUSTOM; /* we do behave like entersub still */
2283 2577
2284 PL_op = (OP *)&slf_restore; 2578 PL_op = (OP *)&slf_restore;
2579}
2580
2581/*****************************************************************************/
2582/* dynamic wind */
2583
2584static void
2585on_enterleave_call (pTHX_ SV *cb)
2586{
2587 dSP;
2588
2589 PUSHSTACK;
2590
2591 PUSHMARK (SP);
2592 PUTBACK;
2593 call_sv (cb, G_VOID | G_DISCARD);
2594 SPAGAIN;
2595
2596 POPSTACK;
2597}
2598
2599static SV *
2600coro_avp_pop_and_free (pTHX_ AV **avp)
2601{
2602 AV *av = *avp;
2603 SV *res = av_pop (av);
2604
2605 if (AvFILLp (av) < 0)
2606 {
2607 *avp = 0;
2608 SvREFCNT_dec (av);
2609 }
2610
2611 return res;
2612}
2613
2614static void
2615coro_pop_on_enter (pTHX_ void *coro)
2616{
2617 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_enter);
2618 SvREFCNT_dec (cb);
2619}
2620
2621static void
2622coro_pop_on_leave (pTHX_ void *coro)
2623{
2624 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2625 on_enterleave_call (aTHX_ sv_2mortal (cb));
2285} 2626}
2286 2627
2287/*****************************************************************************/ 2628/*****************************************************************************/
2288/* PerlIO::cede */ 2629/* PerlIO::cede */
2289 2630
… …
2363/* Coro::Semaphore & Coro::Signal */ 2704/* Coro::Semaphore & Coro::Signal */
2364 2705
2365static SV * 2706static SV *
2366coro_waitarray_new (pTHX_ int count) 2707coro_waitarray_new (pTHX_ int count)
2367{ 2708{
2368 /* a semaphore contains a counter IV in $sem->[0] and any waiters after that */ 2709 /* a waitarray=semaphore contains a counter IV in $sem->[0] and any waiters after that */
2369 AV *av = newAV (); 2710 AV *av = newAV ();
2370 SV **ary; 2711 SV **ary;
2371 2712
2372 /* unfortunately, building manually saves memory */ 2713 /* unfortunately, building manually saves memory */
2373 Newx (ary, 2, SV *); 2714 Newx (ary, 2, SV *);
… …
2515{ 2856{
2516 if (items >= 2) 2857 if (items >= 2)
2517 { 2858 {
2518 /* callback form */ 2859 /* callback form */
2519 AV *av = (AV *)SvRV (arg [0]); 2860 AV *av = (AV *)SvRV (arg [0]);
2520 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 2861 SV *cb_cv = s_get_cv_croak (arg [1]);
2521 2862
2522 av_push (av, (SV *)SvREFCNT_inc_NN (cb_cv)); 2863 av_push (av, SvREFCNT_inc_NN (cb_cv));
2523 2864
2524 if (SvIVX (AvARRAY (av)[0]) > 0) 2865 if (SvIVX (AvARRAY (av)[0]) > 0)
2525 coro_semaphore_adjust (aTHX_ av, 0); 2866 coro_semaphore_adjust (aTHX_ av, 0);
2526 2867
2527 frame->prepare = prepare_nop; 2868 frame->prepare = prepare_nop;
… …
2551 AvARRAY (av)[0] = AvARRAY (av)[1]; 2892 AvARRAY (av)[0] = AvARRAY (av)[1];
2552 AvARRAY (av)[1] = cb; 2893 AvARRAY (av)[1] = cb;
2553 2894
2554 cb = av_shift (av); 2895 cb = av_shift (av);
2555 2896
2897 if (SvTYPE (cb) == SVt_PVCV)
2898 {
2899 dSP;
2900 PUSHMARK (SP);
2901 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2902 PUTBACK;
2903 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2904 }
2905 else
2906 {
2556 api_ready (aTHX_ cb); 2907 api_ready (aTHX_ cb);
2557 sv_setiv (cb, 0); /* signal waiter */ 2908 sv_setiv (cb, 0); /* signal waiter */
2909 }
2910
2558 SvREFCNT_dec (cb); 2911 SvREFCNT_dec (cb);
2559 2912
2560 --count; 2913 --count;
2561 } 2914 }
2562} 2915}
… …
2571static void 2924static void
2572slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2925slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2573{ 2926{
2574 AV *av = (AV *)SvRV (arg [0]); 2927 AV *av = (AV *)SvRV (arg [0]);
2575 2928
2929 if (items >= 2)
2930 {
2931 SV *cb_cv = s_get_cv_croak (arg [1]);
2932 av_push (av, SvREFCNT_inc_NN (cb_cv));
2933
2576 if (SvIVX (AvARRAY (av)[0])) 2934 if (SvIVX (AvARRAY (av)[0]))
2935 coro_signal_wake (aTHX_ av, 1); /* must be the only waiter */
2936
2937 frame->prepare = prepare_nop;
2938 frame->check = slf_check_nop;
2939 }
2940 else if (SvIVX (AvARRAY (av)[0]))
2577 { 2941 {
2578 SvIVX (AvARRAY (av)[0]) = 0; 2942 SvIVX (AvARRAY (av)[0]) = 0;
2579 frame->prepare = prepare_nop; 2943 frame->prepare = prepare_nop;
2580 frame->check = slf_check_nop; 2944 frame->check = slf_check_nop;
2581 } 2945 }
2582 else 2946 else
2583 { 2947 {
2584 SV *waiter = newRV_inc (SvRV (coro_current)); /* owned by signal av */ 2948 SV *waiter = newSVsv (coro_current); /* owned by signal av */
2585 2949
2586 av_push (av, waiter); 2950 av_push (av, waiter);
2587 2951
2588 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */ 2952 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */
2589 frame->prepare = prepare_schedule; 2953 frame->prepare = prepare_schedule;
… …
2607 2971
2608static void 2972static void
2609coro_aio_callback (pTHX_ CV *cv) 2973coro_aio_callback (pTHX_ CV *cv)
2610{ 2974{
2611 dXSARGS; 2975 dXSARGS;
2612 AV *state = (AV *)GENSUB_ARG; 2976 AV *state = (AV *)S_GENSUB_ARG;
2613 SV *coro = av_pop (state); 2977 SV *coro = av_pop (state);
2614 SV *data_sv = newSV (sizeof (struct io_state)); 2978 SV *data_sv = newSV (sizeof (struct io_state));
2615 2979
2616 av_extend (state, items - 1); 2980 av_extend (state, items - 1);
2617 2981
… …
2731 3095
2732 for (i = 0; i < items; ++i) 3096 for (i = 0; i < items; ++i)
2733 PUSHs (arg [i]); 3097 PUSHs (arg [i]);
2734 3098
2735 /* now push the callback closure */ 3099 /* now push the callback closure */
2736 PUSHs (sv_2mortal (gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state)))); 3100 PUSHs (sv_2mortal (s_gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state))));
2737 3101
2738 /* now call the AIO function - we assume our request is uncancelable */ 3102 /* now call the AIO function - we assume our request is uncancelable */
2739 PUTBACK; 3103 PUTBACK;
2740 call_sv ((SV *)req, G_VOID | G_DISCARD); 3104 call_sv ((SV *)req, G_VOID | G_DISCARD);
2741 } 3105 }
2742 3106
2743 /* now that the requets is going, we loop toll we have a result */ 3107 /* now that the request is going, we loop till we have a result */
2744 frame->data = (void *)state; 3108 frame->data = (void *)state;
2745 frame->prepare = prepare_schedule; 3109 frame->prepare = prepare_schedule;
2746 frame->check = slf_check_aio_req; 3110 frame->check = slf_check_aio_req;
2747} 3111}
2748 3112
… …
2759/*****************************************************************************/ 3123/*****************************************************************************/
2760 3124
2761#if CORO_CLONE 3125#if CORO_CLONE
2762# include "clone.c" 3126# include "clone.c"
2763#endif 3127#endif
3128
3129/*****************************************************************************/
3130
3131static SV *
3132coro_new (pTHX_ HV *stash, SV **argv, int argc, int is_coro)
3133{
3134 SV *coro_sv;
3135 struct coro *coro;
3136 MAGIC *mg;
3137 HV *hv;
3138 SV *cb;
3139 int i;
3140
3141 if (argc > 0)
3142 {
3143 cb = s_get_cv_croak (argv [0]);
3144
3145 if (!is_coro)
3146 {
3147 if (CvISXSUB (cb))
3148 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
3149
3150 if (!CvROOT (cb))
3151 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
3152 }
3153 }
3154
3155 Newz (0, coro, 1, struct coro);
3156 coro->args = newAV ();
3157 coro->flags = CF_NEW;
3158
3159 if (coro_first) coro_first->prev = coro;
3160 coro->next = coro_first;
3161 coro_first = coro;
3162
3163 coro->hv = hv = newHV ();
3164 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
3165 mg->mg_flags |= MGf_DUP;
3166 coro_sv = sv_bless (newRV_noinc ((SV *)hv), stash);
3167
3168 if (argc > 0)
3169 {
3170 av_extend (coro->args, argc + is_coro - 1);
3171
3172 if (is_coro)
3173 {
3174 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
3175 cb = (SV *)cv_coro_run;
3176 }
3177
3178 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3179
3180 for (i = 1; i < argc; i++)
3181 av_push (coro->args, newSVsv (argv [i]));
3182 }
3183
3184 return coro_sv;
3185}
2764 3186
2765MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3187MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2766 3188
2767PROTOTYPES: DISABLE 3189PROTOTYPES: DISABLE
2768 3190
… …
2821 coroapi.prepare_nop = prepare_nop; 3243 coroapi.prepare_nop = prepare_nop;
2822 coroapi.prepare_schedule = prepare_schedule; 3244 coroapi.prepare_schedule = prepare_schedule;
2823 coroapi.prepare_cede = prepare_cede; 3245 coroapi.prepare_cede = prepare_cede;
2824 coroapi.prepare_cede_notself = prepare_cede_notself; 3246 coroapi.prepare_cede_notself = prepare_cede_notself;
2825 3247
2826 { 3248 time_init (aTHX);
2827 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
2828 3249
2829 if (!svp) croak ("Time::HiRes is required");
2830 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
2831
2832 nvtime = INT2PTR (double (*)(), SvIV (*svp));
2833 }
2834
2835 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 3250 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
2836} 3251}
2837 3252
2838SV * 3253SV *
2839new (char *klass, ...) 3254new (SV *klass, ...)
2840 ALIAS: 3255 ALIAS:
2841 Coro::new = 1 3256 Coro::new = 1
2842 CODE: 3257 CODE:
2843{ 3258 RETVAL = coro_new (aTHX_ ix ? coro_stash : coro_state_stash, &ST (1), items - 1, ix);
2844 struct coro *coro; 3259 OUTPUT:
2845 MAGIC *mg;
2846 HV *hv;
2847 CV *cb;
2848 int i;
2849
2850 if (items > 1)
2851 {
2852 cb = coro_sv_2cv (aTHX_ ST (1));
2853
2854 if (!ix)
2855 {
2856 if (CvISXSUB (cb))
2857 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
2858
2859 if (!CvROOT (cb))
2860 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
2861 }
2862 }
2863
2864 Newz (0, coro, 1, struct coro);
2865 coro->args = newAV ();
2866 coro->flags = CF_NEW;
2867
2868 if (coro_first) coro_first->prev = coro;
2869 coro->next = coro_first;
2870 coro_first = coro;
2871
2872 coro->hv = hv = newHV ();
2873 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
2874 mg->mg_flags |= MGf_DUP;
2875 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
2876
2877 if (items > 1)
2878 {
2879 av_extend (coro->args, items - 1 + ix - 1);
2880
2881 if (ix)
2882 {
2883 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
2884 cb = cv_coro_run;
2885 }
2886
2887 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
2888
2889 for (i = 2; i < items; i++)
2890 av_push (coro->args, newSVsv (ST (i)));
2891 }
2892}
2893 OUTPUT:
2894 RETVAL 3260 RETVAL
2895 3261
2896void 3262void
2897transfer (...) 3263transfer (...)
2898 PROTOTYPE: $$ 3264 PROTOTYPE: $$
2899 CODE: 3265 CODE:
2900 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3266 CORO_EXECUTE_SLF_XS (slf_init_transfer);
2901 3267
2902bool
2903_destroy (SV *coro_sv)
2904 CODE:
2905 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
2906 OUTPUT:
2907 RETVAL
2908
2909void 3268void
2910_exit (int code) 3269_exit (int code)
2911 PROTOTYPE: $ 3270 PROTOTYPE: $
2912 CODE: 3271 CODE:
2913 _exit (code); 3272 _exit (code);
… …
2915SV * 3274SV *
2916clone (Coro::State coro) 3275clone (Coro::State coro)
2917 CODE: 3276 CODE:
2918{ 3277{
2919#if CORO_CLONE 3278#if CORO_CLONE
2920 struct coro *ncoro = coro_clone (coro); 3279 struct coro *ncoro = coro_clone (aTHX_ coro);
2921 MAGIC *mg; 3280 MAGIC *mg;
2922 /* TODO: too much duplication */ 3281 /* TODO: too much duplication */
2923 ncoro->hv = newHV (); 3282 ncoro->hv = newHV ();
2924 mg = sv_magicext ((SV *)ncoro->hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)ncoro, 0); 3283 mg = sv_magicext ((SV *)ncoro->hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)ncoro, 0);
2925 mg->mg_flags |= MGf_DUP; 3284 mg->mg_flags |= MGf_DUP;
… …
2987 eval = 1 3346 eval = 1
2988 CODE: 3347 CODE:
2989{ 3348{
2990 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3349 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
2991 { 3350 {
2992 struct coro temp; 3351 struct coro *current = SvSTATE_current;
3352 struct CoroSLF slf_save;
2993 3353
2994 if (!(coro->flags & CF_RUNNING)) 3354 if (current != coro)
2995 { 3355 {
2996 PUTBACK; 3356 PUTBACK;
2997 save_perl (aTHX_ &temp); 3357 save_perl (aTHX_ current);
2998 load_perl (aTHX_ coro); 3358 load_perl (aTHX_ coro);
3359 /* the coro is most likely in an active SLF call.
3360 * while not strictly required (the code we execute is
3361 * not allowed to call any SLF functions), it's cleaner
3362 * to reinitialise the slf_frame and restore it later.
3363 * This might one day allow us to actually do SLF calls
3364 * from code executed here.
3365 */
3366 slf_save = slf_frame;
3367 slf_frame.prepare = 0;
3368 SPAGAIN;
2999 } 3369 }
3000 3370
3001 {
3002 dSP;
3003 ENTER;
3004 SAVETMPS;
3005 PUTBACK;
3006 PUSHSTACK; 3371 PUSHSTACK;
3372
3007 PUSHMARK (SP); 3373 PUSHMARK (SP);
3374 PUTBACK;
3008 3375
3009 if (ix) 3376 if (ix)
3010 eval_sv (coderef, 0); 3377 eval_sv (coderef, 0);
3011 else 3378 else
3012 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 3379 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
3013 3380
3014 POPSTACK; 3381 POPSTACK;
3015 SPAGAIN; 3382 SPAGAIN;
3016 FREETMPS;
3017 LEAVE;
3018 PUTBACK;
3019 }
3020 3383
3021 if (!(coro->flags & CF_RUNNING)) 3384 if (current != coro)
3022 { 3385 {
3386 PUTBACK;
3387 slf_frame = slf_save;
3023 save_perl (aTHX_ coro); 3388 save_perl (aTHX_ coro);
3024 load_perl (aTHX_ &temp); 3389 load_perl (aTHX_ current);
3025 SPAGAIN; 3390 SPAGAIN;
3026 } 3391 }
3027 } 3392 }
3028} 3393}
3029 3394
… …
3033 ALIAS: 3398 ALIAS:
3034 is_ready = CF_READY 3399 is_ready = CF_READY
3035 is_running = CF_RUNNING 3400 is_running = CF_RUNNING
3036 is_new = CF_NEW 3401 is_new = CF_NEW
3037 is_destroyed = CF_DESTROYED 3402 is_destroyed = CF_DESTROYED
3403 is_suspended = CF_SUSPENDED
3038 CODE: 3404 CODE:
3039 RETVAL = boolSV (coro->flags & ix); 3405 RETVAL = boolSV (coro->flags & ix);
3040 OUTPUT: 3406 OUTPUT:
3041 RETVAL 3407 RETVAL
3042 3408
3043void 3409void
3044throw (Coro::State self, SV *throw = &PL_sv_undef) 3410throw (Coro::State self, SV *exception = &PL_sv_undef)
3045 PROTOTYPE: $;$ 3411 PROTOTYPE: $;$
3046 CODE: 3412 CODE:
3047{ 3413{
3048 struct coro *current = SvSTATE_current; 3414 struct coro *current = SvSTATE_current;
3049 SV **throwp = self == current ? &CORO_THROW : &self->except; 3415 SV **exceptionp = self == current ? &CORO_THROW : &self->except;
3050 SvREFCNT_dec (*throwp); 3416 SvREFCNT_dec (*exceptionp);
3051 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3417 SvGETMAGIC (exception);
3418 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3052} 3419}
3053 3420
3054void 3421void
3055api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3422api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3056 PROTOTYPE: $;$ 3423 PROTOTYPE: $;$
… …
3107 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv; 3474 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
3108 3475
3109 SV *tmp = *src; *src = *dst; *dst = tmp; 3476 SV *tmp = *src; *src = *dst; *dst = tmp;
3110 } 3477 }
3111 3478
3479void
3480cancel (Coro::State self)
3481 CODE:
3482 coro_state_destroy (aTHX_ self);
3483
3484SV *
3485enable_times (int enabled = enable_times)
3486 CODE:
3487{
3488 RETVAL = boolSV (enable_times);
3489
3490 if (enabled != enable_times)
3491 {
3492 enable_times = enabled;
3493
3494 coro_times_update ();
3495 (enabled ? coro_times_sub : coro_times_add)(SvSTATE (coro_current));
3496 }
3497}
3498 OUTPUT:
3499 RETVAL
3500
3501void
3502times (Coro::State self)
3503 PPCODE:
3504{
3505 struct coro *current = SvSTATE (coro_current);
3506
3507 if (expect_false (current == self))
3508 {
3509 coro_times_update ();
3510 coro_times_add (SvSTATE (coro_current));
3511 }
3512
3513 EXTEND (SP, 2);
3514 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3515 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3516
3517 if (expect_false (current == self))
3518 coro_times_sub (SvSTATE (coro_current));
3519}
3520
3521void
3522swap_sv (Coro::State coro, SV *sv, SV *swapsv)
3523 CODE:
3524{
3525 struct coro *current = SvSTATE_current;
3526
3527 if (current == coro)
3528 SWAP_SVS (current);
3529
3530 if (!coro->swap_sv)
3531 coro->swap_sv = newAV ();
3532
3533 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv )));
3534 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv)));
3535
3536 if (current == coro)
3537 SWAP_SVS (current);
3538}
3539
3112 3540
3113MODULE = Coro::State PACKAGE = Coro 3541MODULE = Coro::State PACKAGE = Coro
3114 3542
3115BOOT: 3543BOOT:
3116{ 3544{
3117 int i;
3118
3119 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3545 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3120 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3546 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3121 cv_coro_run = get_cv ( "Coro::_terminate", GV_ADD); 3547 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3122 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD); 3548 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3123 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 3549 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3124 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 3550 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3125 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 3551 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3126 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 3552 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3127 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 3553 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3128 3554
3129 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3555 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3130 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3556 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3131 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 3557 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3132 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new); 3558 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3133 3559
3134 coro_stash = gv_stashpv ("Coro", TRUE); 3560 coro_stash = gv_stashpv ("Coro", TRUE);
3135 3561
3136 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 3562 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3137 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 3563 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3138 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 3564 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
3139 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 3565 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (CORO_PRIO_LOW));
3140 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE)); 3566 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (CORO_PRIO_IDLE));
3141 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN)); 3567 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (CORO_PRIO_MIN));
3142
3143 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
3144 coro_ready[i] = newAV ();
3145 3568
3146 { 3569 {
3147 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 3570 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
3148 3571
3149 coroapi.schedule = api_schedule; 3572 coroapi.schedule = api_schedule;
… …
3159 sv_setiv (sv, (IV)&coroapi); 3582 sv_setiv (sv, (IV)&coroapi);
3160 SvREADONLY_on (sv); 3583 SvREADONLY_on (sv);
3161 } 3584 }
3162} 3585}
3163 3586
3587SV *
3588async (...)
3589 PROTOTYPE: &@
3590 CODE:
3591 RETVAL = coro_new (aTHX_ coro_stash, &ST (0), items, 1);
3592 api_ready (aTHX_ RETVAL);
3593 OUTPUT:
3594 RETVAL
3595
3596void
3597_destroy (Coro::State coro)
3598 CODE:
3599 /* used by the manager thread */
3600 coro_state_destroy (aTHX_ coro);
3601 coro_call_on_destroy (aTHX_ coro);
3602
3164void 3603void
3165terminate (...) 3604terminate (...)
3166 CODE: 3605 CODE:
3167 CORO_EXECUTE_SLF_XS (slf_init_terminate); 3606 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3168 3607
3169void 3608void
3609cancel (...)
3610 CODE:
3611 CORO_EXECUTE_SLF_XS (slf_init_cancel);
3612
3613void
3170schedule (...) 3614schedule (...)
3171 CODE: 3615 CODE:
3172 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3616 CORO_EXECUTE_SLF_XS (slf_init_schedule);
3173 3617
3174void 3618void
… …
3188 3632
3189void 3633void
3190cede_notself (...) 3634cede_notself (...)
3191 CODE: 3635 CODE:
3192 CORO_EXECUTE_SLF_XS (slf_init_cede_notself); 3636 CORO_EXECUTE_SLF_XS (slf_init_cede_notself);
3193
3194void
3195_cancel (Coro::State self)
3196 CODE:
3197 coro_state_destroy (aTHX_ self);
3198 coro_call_on_destroy (aTHX_ self);
3199 3637
3200void 3638void
3201_set_current (SV *current) 3639_set_current (SV *current)
3202 PROTOTYPE: $ 3640 PROTOTYPE: $
3203 CODE: 3641 CODE:
… …
3207void 3645void
3208_set_readyhook (SV *hook) 3646_set_readyhook (SV *hook)
3209 PROTOTYPE: $ 3647 PROTOTYPE: $
3210 CODE: 3648 CODE:
3211 SvREFCNT_dec (coro_readyhook); 3649 SvREFCNT_dec (coro_readyhook);
3650 SvGETMAGIC (hook);
3651 if (SvOK (hook))
3652 {
3212 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0; 3653 coro_readyhook = newSVsv (hook);
3654 CORO_READYHOOK = invoke_sv_ready_hook_helper;
3655 }
3656 else
3657 {
3658 coro_readyhook = 0;
3659 CORO_READYHOOK = 0;
3660 }
3213 3661
3214int 3662int
3215prio (Coro::State coro, int newprio = 0) 3663prio (Coro::State coro, int newprio = 0)
3216 PROTOTYPE: $;$ 3664 PROTOTYPE: $;$
3217 ALIAS: 3665 ALIAS:
… …
3223 if (items > 1) 3671 if (items > 1)
3224 { 3672 {
3225 if (ix) 3673 if (ix)
3226 newprio = coro->prio - newprio; 3674 newprio = coro->prio - newprio;
3227 3675
3228 if (newprio < PRIO_MIN) newprio = PRIO_MIN; 3676 if (newprio < CORO_PRIO_MIN) newprio = CORO_PRIO_MIN;
3229 if (newprio > PRIO_MAX) newprio = PRIO_MAX; 3677 if (newprio > CORO_PRIO_MAX) newprio = CORO_PRIO_MAX;
3230 3678
3231 coro->prio = newprio; 3679 coro->prio = newprio;
3232 } 3680 }
3233} 3681}
3234 OUTPUT: 3682 OUTPUT:
… …
3249 RETVAL = coro_nready; 3697 RETVAL = coro_nready;
3250 OUTPUT: 3698 OUTPUT:
3251 RETVAL 3699 RETVAL
3252 3700
3253void 3701void
3702suspend (Coro::State self)
3703 PROTOTYPE: $
3704 CODE:
3705 self->flags |= CF_SUSPENDED;
3706
3707void
3708resume (Coro::State self)
3709 PROTOTYPE: $
3710 CODE:
3711 self->flags &= ~CF_SUSPENDED;
3712
3713void
3254_pool_handler (...) 3714_pool_handler (...)
3255 CODE: 3715 CODE:
3256 CORO_EXECUTE_SLF_XS (slf_init_pool_handler); 3716 CORO_EXECUTE_SLF_XS (slf_init_pool_handler);
3257 3717
3258void 3718void
… …
3269 for (i = 1; i < items; ++i) 3729 for (i = 1; i < items; ++i)
3270 av_push (av, SvREFCNT_inc_NN (ST (i))); 3730 av_push (av, SvREFCNT_inc_NN (ST (i)));
3271 3731
3272 if ((SV *)hv == &PL_sv_undef) 3732 if ((SV *)hv == &PL_sv_undef)
3273 { 3733 {
3274 PUSHMARK (SP); 3734 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3275 EXTEND (SP, 2);
3276 PUSHs (sv_Coro);
3277 PUSHs ((SV *)cv_pool_handler);
3278 PUTBACK;
3279 call_sv ((SV *)cv_coro_state_new, G_SCALAR);
3280 SPAGAIN;
3281
3282 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs)); 3735 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
3736 SvREFCNT_dec (sv);
3283 } 3737 }
3284 3738
3285 { 3739 {
3286 struct coro *coro = SvSTATE_hv (hv); 3740 struct coro *coro = SvSTATE_hv (hv);
3287 3741
… …
3311rouse_wait (...) 3765rouse_wait (...)
3312 PROTOTYPE: ;$ 3766 PROTOTYPE: ;$
3313 PPCODE: 3767 PPCODE:
3314 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait); 3768 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait);
3315 3769
3770void
3771on_enter (SV *block)
3772 ALIAS:
3773 on_leave = 1
3774 PROTOTYPE: &
3775 CODE:
3776{
3777 struct coro *coro = SvSTATE_current;
3778 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3779
3780 block = s_get_cv_croak (block);
3781
3782 if (!*avp)
3783 *avp = newAV ();
3784
3785 av_push (*avp, SvREFCNT_inc (block));
3786
3787 if (!ix)
3788 on_enterleave_call (aTHX_ block);
3789
3790 LEAVE; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
3791 SAVEDESTRUCTOR_X (ix ? coro_pop_on_leave : coro_pop_on_enter, (void *)coro);
3792 ENTER; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
3793}
3794
3316 3795
3317MODULE = Coro::State PACKAGE = PerlIO::cede 3796MODULE = Coro::State PACKAGE = PerlIO::cede
3318 3797
3319BOOT: 3798BOOT:
3320 PerlIO_define_layer (aTHX_ &PerlIO_cede); 3799 PerlIO_define_layer (aTHX_ &PerlIO_cede);
… …
3323MODULE = Coro::State PACKAGE = Coro::Semaphore 3802MODULE = Coro::State PACKAGE = Coro::Semaphore
3324 3803
3325SV * 3804SV *
3326new (SV *klass, SV *count = 0) 3805new (SV *klass, SV *count = 0)
3327 CODE: 3806 CODE:
3807{
3808 int semcnt = 1;
3809
3810 if (count)
3811 {
3812 SvGETMAGIC (count);
3813
3814 if (SvOK (count))
3815 semcnt = SvIV (count);
3816 }
3817
3328 RETVAL = sv_bless ( 3818 RETVAL = sv_bless (
3329 coro_waitarray_new (aTHX_ count && SvOK (count) ? SvIV (count) : 1), 3819 coro_waitarray_new (aTHX_ semcnt),
3330 GvSTASH (CvGV (cv)) 3820 GvSTASH (CvGV (cv))
3331 ); 3821 );
3822}
3332 OUTPUT: 3823 OUTPUT:
3333 RETVAL 3824 RETVAL
3334 3825
3335# helper for Coro::Channel 3826# helper for Coro::Channel and others
3336SV * 3827SV *
3337_alloc (int count) 3828_alloc (int count)
3338 CODE: 3829 CODE:
3339 RETVAL = coro_waitarray_new (aTHX_ count); 3830 RETVAL = coro_waitarray_new (aTHX_ count);
3340 OUTPUT: 3831 OUTPUT:
… …
3398 for (i = 1; i <= wcount; ++i) 3889 for (i = 1; i <= wcount; ++i)
3399 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i]))); 3890 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i])));
3400 } 3891 }
3401} 3892}
3402 3893
3894MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3895
3896void
3897_may_delete (SV *sem, int count, int extra_refs)
3898 PPCODE:
3899{
3900 AV *av = (AV *)SvRV (sem);
3901
3902 if (SvREFCNT ((SV *)av) == 1 + extra_refs
3903 && AvFILLp (av) == 0 /* no waiters, just count */
3904 && SvIV (AvARRAY (av)[0]) == count)
3905 XSRETURN_YES;
3906
3907 XSRETURN_NO;
3908}
3909
3403MODULE = Coro::State PACKAGE = Coro::Signal 3910MODULE = Coro::State PACKAGE = Coro::Signal
3404 3911
3405SV * 3912SV *
3406new (SV *klass) 3913new (SV *klass)
3407 CODE: 3914 CODE:
… …
3478 3985
3479void 3986void
3480_register (char *target, char *proto, SV *req) 3987_register (char *target, char *proto, SV *req)
3481 CODE: 3988 CODE:
3482{ 3989{
3483 CV *req_cv = coro_sv_2cv (aTHX_ req); 3990 SV *req_cv = s_get_cv_croak (req);
3484 /* newXSproto doesn't return the CV on 5.8 */ 3991 /* newXSproto doesn't return the CV on 5.8 */
3485 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 3992 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3486 sv_setpv ((SV *)slf_cv, proto); 3993 sv_setpv ((SV *)slf_cv, proto);
3487 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0); 3994 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
3488} 3995}
3489 3996
3997MODULE = Coro::State PACKAGE = Coro::Select
3998
3999void
4000patch_pp_sselect ()
4001 CODE:
4002 if (!coro_old_pp_sselect)
4003 {
4004 coro_select_select = (SV *)get_cv ("Coro::Select::select", 0);
4005 coro_old_pp_sselect = PL_ppaddr [OP_SSELECT];
4006 PL_ppaddr [OP_SSELECT] = coro_pp_sselect;
4007 }
4008
4009void
4010unpatch_pp_sselect ()
4011 CODE:
4012 if (coro_old_pp_sselect)
4013 {
4014 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
4015 coro_old_pp_sselect = 0;
4016 }
4017

Diff Legend

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