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.328 by root, Tue Nov 25 09:49:43 2008 UTC vs.
Revision 1.374 by root, Fri Oct 2 19:55:59 2009 UTC

1#define NDEBUG 1
2
1#include "libcoro/coro.c" 3#include "libcoro/coro.c"
2 4
3#define PERL_NO_GET_CONTEXT 5#define PERL_NO_GET_CONTEXT
4#define PERL_EXT 6#define PERL_EXT
5 7
6#include "EXTERN.h" 8#include "EXTERN.h"
7#include "perl.h" 9#include "perl.h"
8#include "XSUB.h" 10#include "XSUB.h"
9#include "perliol.h" 11#include "perliol.h"
10 12
11#include "patchlevel.h" 13#include "schmorp.h"
12 14
13#include <stdio.h> 15#include <stdio.h>
14#include <errno.h> 16#include <errno.h>
15#include <assert.h> 17#include <assert.h>
18
19#ifndef SVs_PADSTALE
20# define SVs_PADSTALE 0
21#endif
16 22
17#ifdef WIN32 23#ifdef WIN32
18# undef setjmp 24# undef setjmp
19# undef longjmp 25# undef longjmp
20# undef _exit 26# undef _exit
51#endif 57#endif
52 58
53/* the maximum number of idle cctx that will be pooled */ 59/* the maximum number of idle cctx that will be pooled */
54static int cctx_max_idle = 4; 60static int cctx_max_idle = 4;
55 61
56#define PERL_VERSION_ATLEAST(a,b,c) \
57 (PERL_REVISION > (a) \
58 || (PERL_REVISION == (a) \
59 && (PERL_VERSION > (b) \
60 || (PERL_VERSION == (b) && PERL_SUBVERSION >= (c)))))
61
62#if !PERL_VERSION_ATLEAST (5,6,0)
63# ifndef PL_ppaddr
64# define PL_ppaddr ppaddr
65# endif
66# ifndef call_sv
67# define call_sv perl_call_sv
68# endif
69# ifndef get_sv
70# define get_sv perl_get_sv
71# endif
72# ifndef get_cv
73# define get_cv perl_get_cv
74# endif
75# ifndef IS_PADGV
76# define IS_PADGV(v) 0
77# endif
78# ifndef IS_PADCONST
79# define IS_PADCONST(v) 0
80# endif
81#endif
82
83/* 5.11 */
84#ifndef CxHASARGS
85# define CxHASARGS(cx) (cx)->blk_sub.hasargs
86#endif
87
88/* 5.10.0 */
89#ifndef SvREFCNT_inc_NN
90# define SvREFCNT_inc_NN(sv) SvREFCNT_inc (sv)
91#endif
92
93/* 5.8.8 */
94#ifndef GV_NOTQUAL
95# define GV_NOTQUAL 0
96#endif
97#ifndef newSV
98# define newSV(l) NEWSV(0,l)
99#endif
100#ifndef CvISXSUB_on
101# define CvISXSUB_on(cv) (void)cv
102#endif
103#ifndef CvISXSUB
104# define CvISXSUB(cv) (CvXSUB (cv) ? TRUE : FALSE)
105#endif
106#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 62#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
116# undef CORO_STACKGUARD 63# undef CORO_STACKGUARD
117#endif 64#endif
118 65
119#ifndef CORO_STACKGUARD 66#ifndef CORO_STACKGUARD
133#else 80#else
134# define dSTACKLEVEL volatile void *stacklevel 81# define dSTACKLEVEL volatile void *stacklevel
135# define STACKLEVEL ((void *)&stacklevel) 82# define STACKLEVEL ((void *)&stacklevel)
136#endif 83#endif
137 84
138#define IN_DESTRUCT (PL_main_cv == Nullcv) 85#define IN_DESTRUCT PL_dirty
139 86
140#if __GNUC__ >= 3 87#if __GNUC__ >= 3
141# define attribute(x) __attribute__(x) 88# define attribute(x) __attribute__(x)
142# define expect(expr,value) __builtin_expect ((expr),(value)) 89# define expect(expr,value) __builtin_expect ((expr), (value))
143# define INLINE static inline 90# define INLINE static inline
144#else 91#else
145# define attribute(x) 92# define attribute(x)
146# define expect(expr,value) (expr) 93# define expect(expr,value) (expr)
147# define INLINE static 94# define INLINE static
159# if CORO_PTHREAD 106# if CORO_PTHREAD
160static void *coro_thx; 107static void *coro_thx;
161# endif 108# endif
162#endif 109#endif
163 110
111#ifdef __linux
112# include <time.h> /* for timespec */
113# include <syscall.h> /* for SYS_* */
114# ifdef SYS_clock_gettime
115# define coro_clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
116# define CORO_CLOCK_MONOTONIC 1
117# define CORO_CLOCK_THREAD_CPUTIME_ID 3
118# endif
119#endif
120
164static double (*nvtime)(); /* so why doesn't it take void? */ 121static double (*nvtime)(); /* so why doesn't it take void? */
122static void (*u2time)(pTHX_ UV ret[2]);
165 123
166/* we hijack an hopefully unused CV flag for our purposes */ 124/* we hijack an hopefully unused CV flag for our purposes */
167#define CVf_SLF 0x4000 125#define CVf_SLF 0x4000
168static OP *pp_slf (pTHX); 126static OP *pp_slf (pTHX);
169 127
190static SV *sv_pool_size; 148static SV *sv_pool_size;
191static SV *sv_async_pool_idle; /* description string */ 149static SV *sv_async_pool_idle; /* description string */
192static AV *av_async_pool; /* idle pool */ 150static AV *av_async_pool; /* idle pool */
193static SV *sv_Coro; /* class string */ 151static SV *sv_Coro; /* class string */
194static CV *cv_pool_handler; 152static CV *cv_pool_handler;
195static CV *cv_coro_state_new;
196 153
197/* Coro::AnyEvent */ 154/* Coro::AnyEvent */
198static SV *sv_activity; 155static SV *sv_activity;
156
157/* enable processtime/realtime profiling */
158static char enable_times;
159typedef U32 coro_ts[2];
160static coro_ts time_real, time_cpu;
161static char times_valid;
199 162
200static struct coro_cctx *cctx_first; 163static struct coro_cctx *cctx_first;
201static int cctx_count, cctx_idle; 164static int cctx_count, cctx_idle;
202 165
203enum { 166enum {
238enum { 201enum {
239 CF_RUNNING = 0x0001, /* coroutine is running */ 202 CF_RUNNING = 0x0001, /* coroutine is running */
240 CF_READY = 0x0002, /* coroutine is ready */ 203 CF_READY = 0x0002, /* coroutine is ready */
241 CF_NEW = 0x0004, /* has never been switched to */ 204 CF_NEW = 0x0004, /* has never been switched to */
242 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 205 CF_DESTROYED = 0x0008, /* coroutine data has been freed */
206 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
243}; 207};
244 208
245/* the structure where most of the perl state is stored, overlaid on the cxstack */ 209/* the structure where most of the perl state is stored, overlaid on the cxstack */
246typedef struct 210typedef struct
247{ 211{
260/* this is a structure representing a perl-level coroutine */ 224/* this is a structure representing a perl-level coroutine */
261struct coro { 225struct coro {
262 /* the C coroutine allocated to this perl coroutine, if any */ 226 /* the C coroutine allocated to this perl coroutine, if any */
263 coro_cctx *cctx; 227 coro_cctx *cctx;
264 228
229 /* ready queue */
230 struct coro *next_ready;
231
265 /* state data */ 232 /* state data */
266 struct CoroSLF slf_frame; /* saved slf frame */ 233 struct CoroSLF slf_frame; /* saved slf frame */
267 AV *mainstack; 234 AV *mainstack;
268 perl_slots *slot; /* basically the saved sp */ 235 perl_slots *slot; /* basically the saved sp */
269 236
285 /* async_pool */ 252 /* async_pool */
286 SV *saved_deffh; 253 SV *saved_deffh;
287 SV *invoke_cb; 254 SV *invoke_cb;
288 AV *invoke_av; 255 AV *invoke_av;
289 256
257 /* on_enter/on_leave */
258 AV *on_enter;
259 AV *on_leave;
260
261 /* swap_sv */
262 AV *swap_sv;
263
264 /* times */
265 coro_ts t_cpu, t_real;
266
290 /* linked list */ 267 /* linked list */
291 struct coro *next, *prev; 268 struct coro *next, *prev;
292}; 269};
293 270
294typedef struct coro *Coro__State; 271typedef struct coro *Coro__State;
299/* the mainr easonw e don't support windows process emulation */ 276/* the mainr easonw e don't support windows process emulation */
300static struct CoroSLF slf_frame; /* the current slf frame */ 277static struct CoroSLF slf_frame; /* the current slf frame */
301 278
302/** Coro ********************************************************************/ 279/** Coro ********************************************************************/
303 280
304#define PRIO_MAX 3 281#define CORO_PRIO_MAX 3
305#define PRIO_HIGH 1 282#define CORO_PRIO_HIGH 1
306#define PRIO_NORMAL 0 283#define CORO_PRIO_NORMAL 0
307#define PRIO_LOW -1 284#define CORO_PRIO_LOW -1
308#define PRIO_IDLE -3 285#define CORO_PRIO_IDLE -3
309#define PRIO_MIN -4 286#define CORO_PRIO_MIN -4
310 287
311/* for Coro.pm */ 288/* for Coro.pm */
312static SV *coro_current; 289static SV *coro_current;
313static SV *coro_readyhook; 290static SV *coro_readyhook;
314static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1]; 291static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
315static CV *cv_coro_run, *cv_coro_terminate; 292static CV *cv_coro_run, *cv_coro_terminate;
316static struct coro *coro_first; 293static struct coro *coro_first;
317#define coro_nready coroapi.nready 294#define coro_nready coroapi.nready
295
296/** Coro::Select ************************************************************/
297
298static OP *(*coro_old_pp_sselect) (pTHX);
299static SV *coro_select_select;
300
301/* horrible hack, but if it works... */
302static OP *
303coro_pp_sselect (pTHX)
304{
305 dSP;
306 PUSHMARK (SP - 4); /* fake argument list */
307 XPUSHs (coro_select_select);
308 PUTBACK;
309
310 /* entersub is an UNOP, select a LISTOP... keep your fingers crossed */
311 PL_op->op_flags |= OPf_STACKED;
312 PL_op->op_private = 0;
313 return PL_ppaddr [OP_ENTERSUB](aTHX);
314}
318 315
319/** lowlevel stuff **********************************************************/ 316/** lowlevel stuff **********************************************************/
320 317
321static SV * 318static SV *
322coro_get_sv (pTHX_ const char *name, int create) 319coro_get_sv (pTHX_ const char *name, int create)
346 get_hv (name, create); 343 get_hv (name, create);
347#endif 344#endif
348 return get_hv (name, create); 345 return get_hv (name, create);
349} 346}
350 347
351/* may croak */ 348INLINE void
352INLINE CV * 349coro_times_update ()
353coro_sv_2cv (pTHX_ SV *sv)
354{ 350{
351#ifdef coro_clock_gettime
352 struct timespec ts;
353
354 ts.tv_sec = ts.tv_nsec = 0;
355 coro_clock_gettime (CORO_CLOCK_THREAD_CPUTIME_ID, &ts);
356 time_cpu [0] = ts.tv_sec; time_cpu [1] = ts.tv_nsec;
357
358 ts.tv_sec = ts.tv_nsec = 0;
359 coro_clock_gettime (CORO_CLOCK_MONOTONIC, &ts);
360 time_real [0] = ts.tv_sec; time_real [1] = ts.tv_nsec;
361#else
362 dTHX;
363 UV tv[2];
364
365 u2time (aTHX_ tv);
366 time_real [0] = tv [0];
367 time_real [1] = tv [1] * 1000;
368#endif
369}
370
371INLINE void
372coro_times_add (struct coro *c)
373{
374 c->t_real [1] += time_real [1];
375 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
376 c->t_real [0] += time_real [0];
377
378 c->t_cpu [1] += time_cpu [1];
379 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
380 c->t_cpu [0] += time_cpu [0];
381}
382
383INLINE void
384coro_times_sub (struct coro *c)
385{
386 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; }
387 c->t_real [1] -= time_real [1];
388 c->t_real [0] -= time_real [0];
389
390 if (c->t_cpu [1] < time_cpu [1]) { c->t_cpu [1] += 1000000000; --c->t_cpu [0]; }
391 c->t_cpu [1] -= time_cpu [1];
392 c->t_cpu [0] -= time_cpu [0];
393}
394
395/*****************************************************************************/
396/* magic glue */
397
398#define CORO_MAGIC_type_cv 26
399#define CORO_MAGIC_type_state PERL_MAGIC_ext
400
401#define CORO_MAGIC_NN(sv, type) \
402 (expect_true (SvMAGIC (sv)->mg_type == type) \
403 ? SvMAGIC (sv) \
404 : mg_find (sv, type))
405
406#define CORO_MAGIC(sv, type) \
407 (expect_true (SvMAGIC (sv)) \
408 ? CORO_MAGIC_NN (sv, type) \
409 : 0)
410
411#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
412#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
413
414INLINE struct coro *
415SvSTATE_ (pTHX_ SV *coro)
416{
355 HV *st; 417 HV *stash;
356 GV *gvp; 418 MAGIC *mg;
357 return sv_2cv (sv, &st, &gvp, 0); 419
420 if (SvROK (coro))
421 coro = SvRV (coro);
422
423 if (expect_false (SvTYPE (coro) != SVt_PVHV))
424 croak ("Coro::State object required");
425
426 stash = SvSTASH (coro);
427 if (expect_false (stash != coro_stash && stash != coro_state_stash))
428 {
429 /* very slow, but rare, check */
430 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
431 croak ("Coro::State object required");
432 }
433
434 mg = CORO_MAGIC_state (coro);
435 return (struct coro *)mg->mg_ptr;
358} 436}
437
438#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
439
440/* faster than SvSTATE, but expects a coroutine hv */
441#define SvSTATE_hv(hv) ((struct coro *)CORO_MAGIC_NN ((SV *)hv, CORO_MAGIC_type_state)->mg_ptr)
442#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
443
444/*****************************************************************************/
445/* padlist management and caching */
359 446
360static AV * 447static AV *
361coro_derive_padlist (pTHX_ CV *cv) 448coro_derive_padlist (pTHX_ CV *cv)
362{ 449{
363 AV *padlist = CvPADLIST (cv); 450 AV *padlist = CvPADLIST (cv);
371 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 458 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
372#endif 459#endif
373 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 460 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
374 --AvFILLp (padlist); 461 --AvFILLp (padlist);
375 462
376 av_store (newpadlist, 0, SvREFCNT_inc_NN (*av_fetch (padlist, 0, FALSE))); 463 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0]));
377 av_store (newpadlist, 1, (SV *)newpad); 464 av_store (newpadlist, 1, (SV *)newpad);
378 465
379 return newpadlist; 466 return newpadlist;
380} 467}
381 468
382static void 469static void
383free_padlist (pTHX_ AV *padlist) 470free_padlist (pTHX_ AV *padlist)
384{ 471{
385 /* may be during global destruction */ 472 /* may be during global destruction */
386 if (SvREFCNT (padlist)) 473 if (!IN_DESTRUCT)
387 { 474 {
388 I32 i = AvFILLp (padlist); 475 I32 i = AvFILLp (padlist);
389 while (i >= 0) 476
477 while (i > 0) /* special-case index 0 */
390 { 478 {
391 SV **svp = av_fetch (padlist, i--, FALSE); 479 /* we try to be extra-careful here */
392 if (svp) 480 AV *av = (AV *)AvARRAY (padlist)[i--];
393 { 481 I32 j = AvFILLp (av);
394 SV *sv; 482
395 while (&PL_sv_undef != (sv = av_pop ((AV *)*svp))) 483 while (j >= 0)
484 SvREFCNT_dec (AvARRAY (av)[j--]);
485
486 AvFILLp (av) = -1;
396 SvREFCNT_dec (sv); 487 SvREFCNT_dec (av);
397
398 SvREFCNT_dec (*svp);
399 }
400 } 488 }
401 489
490 SvREFCNT_dec (AvARRAY (padlist)[0]);
491
492 AvFILLp (padlist) = -1;
402 SvREFCNT_dec ((SV*)padlist); 493 SvREFCNT_dec ((SV*)padlist);
403 } 494 }
404} 495}
405 496
406static int 497static int
407coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 498coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
408{ 499{
409 AV *padlist; 500 AV *padlist;
410 AV *av = (AV *)mg->mg_obj; 501 AV *av = (AV *)mg->mg_obj;
502
503 /* perl manages to free our internal AV and _then_ call us */
504 if (IN_DESTRUCT)
505 return 0;
411 506
412 /* casting is fun. */ 507 /* casting is fun. */
413 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 508 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
414 free_padlist (aTHX_ padlist); 509 free_padlist (aTHX_ padlist);
415 510
416 SvREFCNT_dec (av); /* sv_magicext increased the refcount */ 511 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
417 512
418 return 0; 513 return 0;
419} 514}
420
421#define CORO_MAGIC_type_cv 26
422#define CORO_MAGIC_type_state PERL_MAGIC_ext
423 515
424static MGVTBL coro_cv_vtbl = { 516static MGVTBL coro_cv_vtbl = {
425 0, 0, 0, 0, 517 0, 0, 0, 0,
426 coro_cv_free 518 coro_cv_free
427}; 519};
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 520
472/* the next two functions merely cache the padlists */ 521/* the next two functions merely cache the padlists */
473static void 522static void
474get_padlist (pTHX_ CV *cv) 523get_padlist (pTHX_ CV *cv)
475{ 524{
503 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 552 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
504 553
505 av = (AV *)mg->mg_obj; 554 av = (AV *)mg->mg_obj;
506 555
507 if (expect_false (AvFILLp (av) >= AvMAX (av))) 556 if (expect_false (AvFILLp (av) >= AvMAX (av)))
508 av_extend (av, AvMAX (av) + 1); 557 av_extend (av, AvFILLp (av) + 1);
509 558
510 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 559 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
511} 560}
512 561
513/** load & save, init *******************************************************/ 562/** load & save, init *******************************************************/
563
564/* swap sv heads, at least logically */
565static void
566swap_svs (pTHX_ Coro__State c)
567{
568 int i;
569
570 for (i = 0; i <= AvFILLp (c->swap_sv); )
571 {
572 SV *a = AvARRAY (c->swap_sv)[i++];
573 SV *b = AvARRAY (c->swap_sv)[i++];
574
575 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
576 SV tmp;
577
578 /* swap sv_any */
579 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
580
581 /* swap sv_flags */
582 SvFLAGS (&tmp) = SvFLAGS (a);
583 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
584 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
585
586#if PERL_VERSION_ATLEAST (5,10,0)
587 /* perl 5.10 complicates this _quite_ a bit, but it also is
588 * is much faster, so no quarrels here. alternatively, we could
589 * sv_upgrade to avoid this.
590 */
591 {
592 /* swap sv_u */
593 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
594
595 /* if SvANY points to the head, we need to adjust the pointers,
596 * as the pointer for a still points to b, and maybe vice versa.
597 */
598 #define svany_in_head(type) \
599 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
600
601 if (svany_in_head (SvTYPE (a)))
602 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
603
604 if (svany_in_head (SvTYPE (b)))
605 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
606 }
607#endif
608 }
609}
610
611#define SWAP_SVS(coro) \
612 if (expect_false ((coro)->swap_sv)) \
613 swap_svs (aTHX_ (coro))
614
615static void
616on_enterleave_call (pTHX_ SV *cb);
514 617
515static void 618static void
516load_perl (pTHX_ Coro__State c) 619load_perl (pTHX_ Coro__State c)
517{ 620{
518 perl_slots *slot = c->slot; 621 perl_slots *slot = c->slot;
546 PUTBACK; 649 PUTBACK;
547 } 650 }
548 651
549 slf_frame = c->slf_frame; 652 slf_frame = c->slf_frame;
550 CORO_THROW = c->except; 653 CORO_THROW = c->except;
654
655 if (expect_false (enable_times))
656 {
657 if (expect_false (!times_valid))
658 coro_times_update ();
659
660 coro_times_sub (c);
661 }
662
663 if (expect_false (c->on_enter))
664 {
665 int i;
666
667 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
668 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
669 }
670
671 SWAP_SVS (c);
551} 672}
552 673
553static void 674static void
554save_perl (pTHX_ Coro__State c) 675save_perl (pTHX_ Coro__State c)
555{ 676{
677 SWAP_SVS (c);
678
679 if (expect_false (c->on_leave))
680 {
681 int i;
682
683 for (i = AvFILLp (c->on_leave); i >= 0; --i)
684 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
685 }
686
687 times_valid = 0;
688
689 if (expect_false (enable_times))
690 {
691 coro_times_update (); times_valid = 1;
692 coro_times_add (c);
693 }
694
556 c->except = CORO_THROW; 695 c->except = CORO_THROW;
557 c->slf_frame = slf_frame; 696 c->slf_frame = slf_frame;
558 697
559 { 698 {
560 dSP; 699 dSP;
573 { 712 {
574 while (expect_true (cxix >= 0)) 713 while (expect_true (cxix >= 0))
575 { 714 {
576 PERL_CONTEXT *cx = &ccstk[cxix--]; 715 PERL_CONTEXT *cx = &ccstk[cxix--];
577 716
578 if (expect_true (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT)) 717 if (expect_true (CxTYPE (cx) == CXt_SUB) || expect_false (CxTYPE (cx) == CXt_FORMAT))
579 { 718 {
580 CV *cv = cx->blk_sub.cv; 719 CV *cv = cx->blk_sub.cv;
581 720
582 if (expect_true (CvDEPTH (cv))) 721 if (expect_true (CvDEPTH (cv)))
583 { 722 {
584 EXTEND (SP, 3);
585 PUSHs ((SV *)CvPADLIST (cv)); 723 PUSHs ((SV *)CvPADLIST (cv));
586 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv))); 724 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
587 PUSHs ((SV *)cv); 725 PUSHs ((SV *)cv);
588 726
589 CvDEPTH (cv) = 0; 727 CvDEPTH (cv) = 0;
607 /* we manually unroll here, as usually 2 slots is enough */ 745 /* we manually unroll here, as usually 2 slots is enough */
608 if (SLOT_COUNT >= 1) CXINC; 746 if (SLOT_COUNT >= 1) CXINC;
609 if (SLOT_COUNT >= 2) CXINC; 747 if (SLOT_COUNT >= 2) CXINC;
610 if (SLOT_COUNT >= 3) CXINC; 748 if (SLOT_COUNT >= 3) CXINC;
611 { 749 {
612 int i; 750 unsigned int i;
613 for (i = 3; i < SLOT_COUNT; ++i) 751 for (i = 3; i < SLOT_COUNT; ++i)
614 CXINC; 752 CXINC;
615 } 753 }
616 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 754 cxstack_ix -= SLOT_COUNT; /* undo allocation */
617 755
759#endif 897#endif
760 898
761/* 899/*
762 * This overrides the default magic get method of %SIG elements. 900 * 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 901 * 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 902 * and instead of trying to save and restore the hash elements, we just provide
765 * readback here. 903 * 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 */ 904 */
770static int 905static int
771coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 906coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
772{ 907{
773 const char *s = MgPV_nolen_const (mg); 908 const char *s = MgPV_nolen_const (mg);
826 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 961 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
827 962
828 if (svp) 963 if (svp)
829 { 964 {
830 SV *old = *svp; 965 SV *old = *svp;
831 *svp = newSVsv (sv); 966 *svp = SvOK (sv) ? newSVsv (sv) : 0;
832 SvREFCNT_dec (old); 967 SvREFCNT_dec (old);
833 return 0; 968 return 0;
834 } 969 }
835 } 970 }
836 971
854slf_check_repeat (pTHX_ struct CoroSLF *frame) 989slf_check_repeat (pTHX_ struct CoroSLF *frame)
855{ 990{
856 return 1; 991 return 1;
857} 992}
858 993
859static UNOP coro_setup_op; 994static UNOP init_perl_op;
860 995
861static void NOINLINE /* noinline to keep it out of the transfer fast path */ 996static void NOINLINE /* noinline to keep it out of the transfer fast path */
862coro_setup (pTHX_ struct coro *coro) 997init_perl (pTHX_ struct coro *coro)
863{ 998{
864 /* 999 /*
865 * emulate part of the perl startup here. 1000 * emulate part of the perl startup here.
866 */ 1001 */
867 coro_init_stacks (aTHX); 1002 coro_init_stacks (aTHX);
916 */ 1051 */
917 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1052 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 */ 1053 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
919 1054
920 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1055 /* 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; 1056 init_perl_op.op_next = PL_op;
922 coro_setup_op.op_type = OP_ENTERSUB; 1057 init_perl_op.op_type = OP_ENTERSUB;
923 coro_setup_op.op_ppaddr = pp_slf; 1058 init_perl_op.op_ppaddr = pp_slf;
924 /* no flags etc. required, as an init function won't be called */ 1059 /* no flags etc. required, as an init function won't be called */
925 1060
926 PL_op = (OP *)&coro_setup_op; 1061 PL_op = (OP *)&init_perl_op;
927 1062
928 /* copy throw, in case it was set before coro_setup */ 1063 /* copy throw, in case it was set before init_perl */
929 CORO_THROW = coro->except; 1064 CORO_THROW = coro->except;
930}
931 1065
1066 SWAP_SVS (coro);
1067
1068 if (expect_false (enable_times))
1069 {
1070 coro_times_update ();
1071 coro_times_sub (coro);
1072 }
1073}
1074
932static void 1075static void
933coro_destruct (pTHX_ struct coro *coro) 1076coro_unwind_stacks (pTHX)
934{ 1077{
935 if (!IN_DESTRUCT) 1078 if (!IN_DESTRUCT)
936 { 1079 {
937 /* restore all saved variables and stuff */ 1080 /* restore all saved variables and stuff */
938 LEAVE_SCOPE (0); 1081 LEAVE_SCOPE (0);
946 POPSTACK_TO (PL_mainstack); 1089 POPSTACK_TO (PL_mainstack);
947 1090
948 /* unwind main stack */ 1091 /* unwind main stack */
949 dounwind (-1); 1092 dounwind (-1);
950 } 1093 }
1094}
951 1095
952 SvREFCNT_dec (GvSV (PL_defgv)); 1096static void
953 SvREFCNT_dec (GvAV (PL_defgv)); 1097destroy_perl (pTHX_ struct coro *coro)
954 SvREFCNT_dec (GvSV (PL_errgv)); 1098{
955 SvREFCNT_dec (PL_defoutgv); 1099 SV *svf [9];
956 SvREFCNT_dec (PL_rs);
957 SvREFCNT_dec (GvSV (irsgv));
958 SvREFCNT_dec (GvHV (PL_hintgv));
959 1100
960 SvREFCNT_dec (PL_diehook);
961 SvREFCNT_dec (PL_warnhook);
962 1101 {
1102 struct coro *current = SvSTATE_current;
1103
1104 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1105
1106 save_perl (aTHX_ current);
1107 load_perl (aTHX_ coro);
1108
1109 coro_unwind_stacks (aTHX);
1110 coro_destruct_stacks (aTHX);
1111
1112 /* restore swapped sv's */
1113 SWAP_SVS (coro);
1114
1115 // now save some sv's to be free'd later
1116 svf [0] = GvSV (PL_defgv);
1117 svf [1] = (SV *)GvAV (PL_defgv);
1118 svf [2] = GvSV (PL_errgv);
1119 svf [3] = (SV *)PL_defoutgv;
1120 svf [4] = PL_rs;
1121 svf [5] = GvSV (irsgv);
1122 svf [6] = (SV *)GvHV (PL_hintgv);
1123 svf [7] = PL_diehook;
1124 svf [8] = PL_warnhook;
1125 assert (9 == sizeof (svf) / sizeof (*svf));
1126
1127 load_perl (aTHX_ current);
1128 }
1129
1130 {
1131 unsigned int i;
1132
1133 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i)
1134 SvREFCNT_dec (svf [i]);
1135
963 SvREFCNT_dec (coro->saved_deffh); 1136 SvREFCNT_dec (coro->saved_deffh);
964 SvREFCNT_dec (coro->rouse_cb); 1137 SvREFCNT_dec (coro->rouse_cb);
965 SvREFCNT_dec (coro->invoke_cb); 1138 SvREFCNT_dec (coro->invoke_cb);
966 SvREFCNT_dec (coro->invoke_av); 1139 SvREFCNT_dec (coro->invoke_av);
967 1140 SvREFCNT_dec (coro->swap_sv);
968 coro_destruct_stacks (aTHX); 1141 }
969} 1142}
970 1143
971INLINE void 1144INLINE void
972free_coro_mortal (pTHX) 1145free_coro_mortal (pTHX)
973{ 1146{
1170 /* somebody or something will hit me for both perl_run and PL_restartop */ 1343 /* somebody or something will hit me for both perl_run and PL_restartop */
1171 PL_restartop = PL_op; 1344 PL_restartop = PL_op;
1172 perl_run (PL_curinterp); 1345 perl_run (PL_curinterp);
1173 /* 1346 /*
1174 * Unfortunately, there is no way to get at the return values of the 1347 * Unfortunately, there is no way to get at the return values of the
1175 * coro body here, as perl_run destroys these 1348 * coro body here, as perl_run destroys these. Likewise, we cannot catch
1349 * runtime errors here, as this is just a random interpreter, not a thread.
1176 */ 1350 */
1177 1351
1178 /* 1352 /*
1179 * If perl-run returns we assume exit() was being called or the coro 1353 * If perl-run returns we assume exit() was being called or the coro
1180 * fell off the end, which seems to be the only valid (non-bug) 1354 * fell off the end, which seems to be the only valid (non-bug)
1267cctx_destroy (coro_cctx *cctx) 1441cctx_destroy (coro_cctx *cctx)
1268{ 1442{
1269 if (!cctx) 1443 if (!cctx)
1270 return; 1444 return;
1271 1445
1272 assert (cctx != cctx_current);//D temporary 1446 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary?
1273 1447
1274 --cctx_count; 1448 --cctx_count;
1275 coro_destroy (&cctx->cctx); 1449 coro_destroy (&cctx->cctx);
1276 1450
1277 /* coro_transfer creates new, empty cctx's */ 1451 /* coro_transfer creates new, empty cctx's */
1341 /* TODO: throwing up here is considered harmful */ 1515 /* TODO: throwing up here is considered harmful */
1342 1516
1343 if (expect_true (prev != next)) 1517 if (expect_true (prev != next))
1344 { 1518 {
1345 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1519 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,"); 1520 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1347 1521
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)) 1522 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,"); 1523 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1353 1524
1354#if !PERL_VERSION_ATLEAST (5,10,0) 1525#if !PERL_VERSION_ATLEAST (5,10,0)
1355 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1526 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,"); 1527 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1357#endif 1528#endif
1390 if (expect_false (next->flags & CF_NEW)) 1561 if (expect_false (next->flags & CF_NEW))
1391 { 1562 {
1392 /* need to start coroutine */ 1563 /* need to start coroutine */
1393 next->flags &= ~CF_NEW; 1564 next->flags &= ~CF_NEW;
1394 /* setup coroutine call */ 1565 /* setup coroutine call */
1395 coro_setup (aTHX_ next); 1566 init_perl (aTHX_ next);
1396 } 1567 }
1397 else 1568 else
1398 load_perl (aTHX_ next); 1569 load_perl (aTHX_ next);
1399
1400 assert (!prev->cctx);//D temporary
1401 1570
1402 /* possibly untie and reuse the cctx */ 1571 /* possibly untie and reuse the cctx */
1403 if (expect_true ( 1572 if (expect_true (
1404 cctx_current->idle_sp == STACKLEVEL 1573 cctx_current->idle_sp == STACKLEVEL
1405 && !(cctx_current->flags & CC_TRACE) 1574 && !(cctx_current->flags & CC_TRACE)
1447coro_state_destroy (pTHX_ struct coro *coro) 1616coro_state_destroy (pTHX_ struct coro *coro)
1448{ 1617{
1449 if (coro->flags & CF_DESTROYED) 1618 if (coro->flags & CF_DESTROYED)
1450 return 0; 1619 return 0;
1451 1620
1452 if (coro->on_destroy) 1621 if (coro->on_destroy && !PL_dirty)
1453 coro->on_destroy (aTHX_ coro); 1622 coro->on_destroy (aTHX_ coro);
1454 1623
1455 coro->flags |= CF_DESTROYED; 1624 coro->flags |= CF_DESTROYED;
1456 1625
1457 if (coro->flags & CF_READY) 1626 if (coro->flags & CF_READY)
1461 --coro_nready; 1630 --coro_nready;
1462 } 1631 }
1463 else 1632 else
1464 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1633 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1465 1634
1466 if (coro->mainstack && coro->mainstack != main_mainstack) 1635 if (coro->mainstack
1467 { 1636 && coro->mainstack != main_mainstack
1468 struct coro temp; 1637 && coro->slot
1469 1638 && !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); 1639 destroy_perl (aTHX_ coro);
1474
1475 coro_destruct (aTHX_ coro);
1476
1477 load_perl (aTHX_ &temp);
1478
1479 coro->slot = 0;
1480 }
1481 1640
1482 cctx_destroy (coro->cctx); 1641 cctx_destroy (coro->cctx);
1483 SvREFCNT_dec (coro->startcv); 1642 SvREFCNT_dec (coro->startcv);
1484 SvREFCNT_dec (coro->args); 1643 SvREFCNT_dec (coro->args);
1485 SvREFCNT_dec (CORO_THROW); 1644 SvREFCNT_dec (CORO_THROW);
1544 1703
1545 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1704 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1546 TRANSFER (ta, 1); 1705 TRANSFER (ta, 1);
1547} 1706}
1548 1707
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 ********************************************************************/ 1708/** Coro ********************************************************************/
1573 1709
1574INLINE void 1710INLINE void
1575coro_enq (pTHX_ struct coro *coro) 1711coro_enq (pTHX_ struct coro *coro)
1576{ 1712{
1577 av_push (coro_ready [coro->prio - PRIO_MIN], SvREFCNT_inc_NN (coro->hv)); 1713 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1578}
1579 1714
1580INLINE SV * 1715 SvREFCNT_inc_NN (coro->hv);
1716
1717 coro->next_ready = 0;
1718 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1719 ready [1] = coro;
1720}
1721
1722INLINE struct coro *
1581coro_deq (pTHX) 1723coro_deq (pTHX)
1582{ 1724{
1583 int prio; 1725 int prio;
1584 1726
1585 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; ) 1727 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
1586 if (AvFILLp (coro_ready [prio]) >= 0) 1728 {
1587 return av_shift (coro_ready [prio]); 1729 struct coro **ready = coro_ready [prio];
1730
1731 if (ready [0])
1732 {
1733 struct coro *coro = ready [0];
1734 ready [0] = coro->next_ready;
1735 return coro;
1736 }
1737 }
1588 1738
1589 return 0; 1739 return 0;
1740}
1741
1742static void
1743invoke_sv_ready_hook_helper (void)
1744{
1745 dTHX;
1746 dSP;
1747
1748 ENTER;
1749 SAVETMPS;
1750
1751 PUSHMARK (SP);
1752 PUTBACK;
1753 call_sv (coro_readyhook, G_VOID | G_DISCARD);
1754
1755 FREETMPS;
1756 LEAVE;
1590} 1757}
1591 1758
1592static int 1759static int
1593api_ready (pTHX_ SV *coro_sv) 1760api_ready (pTHX_ SV *coro_sv)
1594{ 1761{
1595 struct coro *coro;
1596 SV *sv_hook;
1597 void (*xs_hook)(void);
1598
1599 coro = SvSTATE (coro_sv); 1762 struct coro *coro = SvSTATE (coro_sv);
1600 1763
1601 if (coro->flags & CF_READY) 1764 if (coro->flags & CF_READY)
1602 return 0; 1765 return 0;
1603 1766
1604 coro->flags |= CF_READY; 1767 coro->flags |= CF_READY;
1605 1768
1606 sv_hook = coro_nready ? 0 : coro_readyhook;
1607 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1608
1609 coro_enq (aTHX_ coro); 1769 coro_enq (aTHX_ coro);
1610 ++coro_nready;
1611 1770
1612 if (sv_hook) 1771 if (!coro_nready++)
1613 { 1772 if (coroapi.readyhook)
1614 dSP; 1773 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 1774
1630 return 1; 1775 return 1;
1631} 1776}
1632 1777
1633static int 1778static int
1656static void 1801static void
1657prepare_schedule (pTHX_ struct coro_transfer_args *ta) 1802prepare_schedule (pTHX_ struct coro_transfer_args *ta)
1658{ 1803{
1659 for (;;) 1804 for (;;)
1660 { 1805 {
1661 SV *next_sv = coro_deq (aTHX); 1806 struct coro *next = coro_deq (aTHX);
1662 1807
1663 if (expect_true (next_sv)) 1808 if (expect_true (next))
1664 { 1809 {
1665 struct coro *next = SvSTATE_hv (next_sv);
1666
1667 /* cannot transfer to destroyed coros, skip and look for next */ 1810 /* cannot transfer to destroyed coros, skip and look for next */
1668 if (expect_false (next->flags & CF_DESTROYED)) 1811 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED)))
1669 SvREFCNT_dec (next_sv); /* coro_nready has already been taken care of by destroy */ 1812 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1670 else 1813 else
1671 { 1814 {
1672 next->flags &= ~CF_READY; 1815 next->flags &= ~CF_READY;
1673 --coro_nready; 1816 --coro_nready;
1674 1817
1686 api_ready (aTHX_ SvRV (sv_idle)); 1829 api_ready (aTHX_ SvRV (sv_idle));
1687 --coro_nready; 1830 --coro_nready;
1688 } 1831 }
1689 else 1832 else
1690 { 1833 {
1834 /* TODO: deprecated, remove, cannot work reliably *//*D*/
1691 dSP; 1835 dSP;
1692 1836
1693 ENTER; 1837 ENTER;
1694 SAVETMPS; 1838 SAVETMPS;
1695 1839
1841{ 1985{
1842 int i; 1986 int i;
1843 HV *hv = (HV *)SvRV (coro_current); 1987 HV *hv = (HV *)SvRV (coro_current);
1844 AV *av = newAV (); 1988 AV *av = newAV ();
1845 1989
1990 /* items are actually not so common, so optimise for this case */
1991 if (items)
1992 {
1846 av_extend (av, items - 1); 1993 av_extend (av, items - 1);
1994
1847 for (i = 0; i < items; ++i) 1995 for (i = 0; i < items; ++i)
1848 av_push (av, SvREFCNT_inc_NN (arg [i])); 1996 av_push (av, SvREFCNT_inc_NN (arg [i]));
1997 }
1849 1998
1850 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 1999 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0);
1851 2000
1852 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */ 2001 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */
1853 api_ready (aTHX_ sv_manager); 2002 api_ready (aTHX_ sv_manager);
1854 2003
1855 frame->prepare = prepare_schedule; 2004 frame->prepare = prepare_schedule;
1856 frame->check = slf_check_repeat; 2005 frame->check = slf_check_repeat;
2006
2007 /* as a minor optimisation, we could unwind all stacks here */
2008 /* but that puts extra pressure on pp_slf, and is not worth much */
2009 /*coro_unwind_stacks (aTHX);*/
1857} 2010}
1858 2011
1859/*****************************************************************************/ 2012/*****************************************************************************/
1860/* async pool handler */ 2013/* async pool handler */
1861 2014
1939 2092
1940static void 2093static void
1941coro_rouse_callback (pTHX_ CV *cv) 2094coro_rouse_callback (pTHX_ CV *cv)
1942{ 2095{
1943 dXSARGS; 2096 dXSARGS;
1944 SV *data = (SV *)GENSUB_ARG; 2097 SV *data = (SV *)S_GENSUB_ARG;
1945 2098
1946 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2099 if (SvTYPE (SvRV (data)) != SVt_PVAV)
1947 { 2100 {
1948 /* first call, set args */ 2101 /* first call, set args */
2102 SV *coro = SvRV (data);
1949 AV *av = newAV (); 2103 AV *av = newAV ();
1950 SV *coro = SvRV (data);
1951 2104
1952 SvRV_set (data, (SV *)av); 2105 SvRV_set (data, (SV *)av);
1953 api_ready (aTHX_ coro);
1954 SvREFCNT_dec (coro);
1955 2106
1956 /* better take a full copy of the arguments */ 2107 /* better take a full copy of the arguments */
1957 while (items--) 2108 while (items--)
1958 av_store (av, items, newSVsv (ST (items))); 2109 av_store (av, items, newSVsv (ST (items)));
2110
2111 api_ready (aTHX_ coro);
2112 SvREFCNT_dec (coro);
1959 } 2113 }
1960 2114
1961 XSRETURN_EMPTY; 2115 XSRETURN_EMPTY;
1962} 2116}
1963 2117
1980 2134
1981 EXTEND (SP, AvFILLp (av) + 1); 2135 EXTEND (SP, AvFILLp (av) + 1);
1982 for (i = 0; i <= AvFILLp (av); ++i) 2136 for (i = 0; i <= AvFILLp (av); ++i)
1983 PUSHs (sv_2mortal (AvARRAY (av)[i])); 2137 PUSHs (sv_2mortal (AvARRAY (av)[i]));
1984 2138
1985 /* we have stolen the elements, so ste length to zero and free */ 2139 /* we have stolen the elements, so set length to zero and free */
1986 AvFILLp (av) = -1; 2140 AvFILLp (av) = -1;
1987 av_undef (av); 2141 av_undef (av);
1988 2142
1989 PUTBACK; 2143 PUTBACK;
1990 } 2144 }
2014 || SvTYPE (SvRV (cb)) != SVt_PVCV 2168 || SvTYPE (SvRV (cb)) != SVt_PVCV
2015 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2169 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2016 croak ("Coro::rouse_wait called with illegal callback argument,"); 2170 croak ("Coro::rouse_wait called with illegal callback argument,");
2017 2171
2018 { 2172 {
2019 CV *cv = (CV *)SvRV (cb); /* for GENSUB_ARG */ 2173 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
2020 SV *data = (SV *)GENSUB_ARG; 2174 SV *data = (SV *)S_GENSUB_ARG;
2021 2175
2022 frame->data = (void *)data; 2176 frame->data = (void *)data;
2023 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule; 2177 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
2024 frame->check = slf_check_rouse_wait; 2178 frame->check = slf_check_rouse_wait;
2025 } 2179 }
2029coro_new_rouse_cb (pTHX) 2183coro_new_rouse_cb (pTHX)
2030{ 2184{
2031 HV *hv = (HV *)SvRV (coro_current); 2185 HV *hv = (HV *)SvRV (coro_current);
2032 struct coro *coro = SvSTATE_hv (hv); 2186 struct coro *coro = SvSTATE_hv (hv);
2033 SV *data = newRV_inc ((SV *)hv); 2187 SV *data = newRV_inc ((SV *)hv);
2034 SV *cb = gensub (aTHX_ coro_rouse_callback, (void *)data); 2188 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
2035 2189
2036 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0); 2190 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0);
2037 SvREFCNT_dec (data); /* magicext increases the refcount */ 2191 SvREFCNT_dec (data); /* magicext increases the refcount */
2038 2192
2039 SvREFCNT_dec (coro->rouse_cb); 2193 SvREFCNT_dec (coro->rouse_cb);
2280 2434
2281 PL_op->op_ppaddr = pp_slf; 2435 PL_op->op_ppaddr = pp_slf;
2282 /*PL_op->op_type = OP_CUSTOM; /* we do behave like entersub still */ 2436 /*PL_op->op_type = OP_CUSTOM; /* we do behave like entersub still */
2283 2437
2284 PL_op = (OP *)&slf_restore; 2438 PL_op = (OP *)&slf_restore;
2439}
2440
2441/*****************************************************************************/
2442/* dynamic wind */
2443
2444static void
2445on_enterleave_call (pTHX_ SV *cb)
2446{
2447 dSP;
2448
2449 PUSHSTACK;
2450
2451 PUSHMARK (SP);
2452 PUTBACK;
2453 call_sv (cb, G_VOID | G_DISCARD);
2454 SPAGAIN;
2455
2456 POPSTACK;
2457}
2458
2459static SV *
2460coro_avp_pop_and_free (pTHX_ AV **avp)
2461{
2462 AV *av = *avp;
2463 SV *res = av_pop (av);
2464
2465 if (AvFILLp (av) < 0)
2466 {
2467 *avp = 0;
2468 SvREFCNT_dec (av);
2469 }
2470
2471 return res;
2472}
2473
2474static void
2475coro_pop_on_enter (pTHX_ void *coro)
2476{
2477 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_enter);
2478 SvREFCNT_dec (cb);
2479}
2480
2481static void
2482coro_pop_on_leave (pTHX_ void *coro)
2483{
2484 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2485 on_enterleave_call (aTHX_ sv_2mortal (cb));
2285} 2486}
2286 2487
2287/*****************************************************************************/ 2488/*****************************************************************************/
2288/* PerlIO::cede */ 2489/* PerlIO::cede */
2289 2490
2363/* Coro::Semaphore & Coro::Signal */ 2564/* Coro::Semaphore & Coro::Signal */
2364 2565
2365static SV * 2566static SV *
2366coro_waitarray_new (pTHX_ int count) 2567coro_waitarray_new (pTHX_ int count)
2367{ 2568{
2368 /* a semaphore contains a counter IV in $sem->[0] and any waiters after that */ 2569 /* a waitarray=semaphore contains a counter IV in $sem->[0] and any waiters after that */
2369 AV *av = newAV (); 2570 AV *av = newAV ();
2370 SV **ary; 2571 SV **ary;
2371 2572
2372 /* unfortunately, building manually saves memory */ 2573 /* unfortunately, building manually saves memory */
2373 Newx (ary, 2, SV *); 2574 Newx (ary, 2, SV *);
2374 AvALLOC (av) = ary; 2575 AvALLOC (av) = ary;
2576#if PERL_VERSION_ATLEAST (5,10,0)
2375 /*AvARRAY (av) = ary;*/ 2577 AvARRAY (av) = ary;
2578#else
2376 SvPVX ((SV *)av) = (char *)ary; /* 5.8.8 needs this syntax instead of AvARRAY = ary */ 2579 /* 5.8.8 needs this syntax instead of AvARRAY = ary, yet */
2580 /* -DDEBUGGING flags this as a bug, despite it perfectly working */
2581 SvPVX ((SV *)av) = (char *)ary;
2582#endif
2377 AvMAX (av) = 1; 2583 AvMAX (av) = 1;
2378 AvFILLp (av) = 0; 2584 AvFILLp (av) = 0;
2379 ary [0] = newSViv (count); 2585 ary [0] = newSViv (count);
2380 2586
2381 return newRV_noinc ((SV *)av); 2587 return newRV_noinc ((SV *)av);
2510{ 2716{
2511 if (items >= 2) 2717 if (items >= 2)
2512 { 2718 {
2513 /* callback form */ 2719 /* callback form */
2514 AV *av = (AV *)SvRV (arg [0]); 2720 AV *av = (AV *)SvRV (arg [0]);
2515 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 2721 SV *cb_cv = s_get_cv_croak (arg [1]);
2516 2722
2517 av_push (av, (SV *)SvREFCNT_inc_NN (cb_cv)); 2723 av_push (av, SvREFCNT_inc_NN (cb_cv));
2518 2724
2519 if (SvIVX (AvARRAY (av)[0]) > 0) 2725 if (SvIVX (AvARRAY (av)[0]) > 0)
2520 coro_semaphore_adjust (aTHX_ av, 0); 2726 coro_semaphore_adjust (aTHX_ av, 0);
2521 2727
2522 frame->prepare = prepare_nop; 2728 frame->prepare = prepare_nop;
2546 AvARRAY (av)[0] = AvARRAY (av)[1]; 2752 AvARRAY (av)[0] = AvARRAY (av)[1];
2547 AvARRAY (av)[1] = cb; 2753 AvARRAY (av)[1] = cb;
2548 2754
2549 cb = av_shift (av); 2755 cb = av_shift (av);
2550 2756
2757 if (SvTYPE (cb) == SVt_PVCV)
2758 {
2759 dSP;
2760 PUSHMARK (SP);
2761 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2762 PUTBACK;
2763 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2764 }
2765 else
2766 {
2551 api_ready (aTHX_ cb); 2767 api_ready (aTHX_ cb);
2552 sv_setiv (cb, 0); /* signal waiter */ 2768 sv_setiv (cb, 0); /* signal waiter */
2769 }
2770
2553 SvREFCNT_dec (cb); 2771 SvREFCNT_dec (cb);
2554 2772
2555 --count; 2773 --count;
2556 } 2774 }
2557} 2775}
2566static void 2784static void
2567slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2785slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2568{ 2786{
2569 AV *av = (AV *)SvRV (arg [0]); 2787 AV *av = (AV *)SvRV (arg [0]);
2570 2788
2789 if (items >= 2)
2790 {
2791 SV *cb_cv = s_get_cv_croak (arg [1]);
2792 av_push (av, SvREFCNT_inc_NN (cb_cv));
2793
2571 if (SvIVX (AvARRAY (av)[0])) 2794 if (SvIVX (AvARRAY (av)[0]))
2795 coro_signal_wake (aTHX_ av, 1); /* ust be the only waiter */
2796
2797 frame->prepare = prepare_nop;
2798 frame->check = slf_check_nop;
2799 }
2800 else if (SvIVX (AvARRAY (av)[0]))
2572 { 2801 {
2573 SvIVX (AvARRAY (av)[0]) = 0; 2802 SvIVX (AvARRAY (av)[0]) = 0;
2574 frame->prepare = prepare_nop; 2803 frame->prepare = prepare_nop;
2575 frame->check = slf_check_nop; 2804 frame->check = slf_check_nop;
2576 } 2805 }
2577 else 2806 else
2578 { 2807 {
2579 SV *waiter = newRV_inc (SvRV (coro_current)); /* owned by signal av */ 2808 SV *waiter = newSVsv (coro_current); /* owned by signal av */
2580 2809
2581 av_push (av, waiter); 2810 av_push (av, waiter);
2582 2811
2583 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */ 2812 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */
2584 frame->prepare = prepare_schedule; 2813 frame->prepare = prepare_schedule;
2602 2831
2603static void 2832static void
2604coro_aio_callback (pTHX_ CV *cv) 2833coro_aio_callback (pTHX_ CV *cv)
2605{ 2834{
2606 dXSARGS; 2835 dXSARGS;
2607 AV *state = (AV *)GENSUB_ARG; 2836 AV *state = (AV *)S_GENSUB_ARG;
2608 SV *coro = av_pop (state); 2837 SV *coro = av_pop (state);
2609 SV *data_sv = newSV (sizeof (struct io_state)); 2838 SV *data_sv = newSV (sizeof (struct io_state));
2610 2839
2611 av_extend (state, items - 1); 2840 av_extend (state, items - 1);
2612 2841
2726 2955
2727 for (i = 0; i < items; ++i) 2956 for (i = 0; i < items; ++i)
2728 PUSHs (arg [i]); 2957 PUSHs (arg [i]);
2729 2958
2730 /* now push the callback closure */ 2959 /* now push the callback closure */
2731 PUSHs (sv_2mortal (gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state)))); 2960 PUSHs (sv_2mortal (s_gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state))));
2732 2961
2733 /* now call the AIO function - we assume our request is uncancelable */ 2962 /* now call the AIO function - we assume our request is uncancelable */
2734 PUTBACK; 2963 PUTBACK;
2735 call_sv ((SV *)req, G_VOID | G_DISCARD); 2964 call_sv ((SV *)req, G_VOID | G_DISCARD);
2736 } 2965 }
2754/*****************************************************************************/ 2983/*****************************************************************************/
2755 2984
2756#if CORO_CLONE 2985#if CORO_CLONE
2757# include "clone.c" 2986# include "clone.c"
2758#endif 2987#endif
2988
2989/*****************************************************************************/
2990
2991static SV *
2992coro_new (pTHX_ HV *stash, SV **argv, int argc, int is_coro)
2993{
2994 SV *coro_sv;
2995 struct coro *coro;
2996 MAGIC *mg;
2997 HV *hv;
2998 SV *cb;
2999 int i;
3000
3001 if (argc > 0)
3002 {
3003 cb = s_get_cv_croak (argv [0]);
3004
3005 if (!is_coro)
3006 {
3007 if (CvISXSUB (cb))
3008 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
3009
3010 if (!CvROOT (cb))
3011 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
3012 }
3013 }
3014
3015 Newz (0, coro, 1, struct coro);
3016 coro->args = newAV ();
3017 coro->flags = CF_NEW;
3018
3019 if (coro_first) coro_first->prev = coro;
3020 coro->next = coro_first;
3021 coro_first = coro;
3022
3023 coro->hv = hv = newHV ();
3024 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
3025 mg->mg_flags |= MGf_DUP;
3026 coro_sv = sv_bless (newRV_noinc ((SV *)hv), stash);
3027
3028 if (argc > 0)
3029 {
3030 av_extend (coro->args, argc + is_coro - 1);
3031
3032 if (is_coro)
3033 {
3034 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
3035 cb = (SV *)cv_coro_run;
3036 }
3037
3038 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3039
3040 for (i = 1; i < argc; i++)
3041 av_push (coro->args, newSVsv (argv [i]));
3042 }
3043
3044 return coro_sv;
3045}
2759 3046
2760MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3047MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2761 3048
2762PROTOTYPES: DISABLE 3049PROTOTYPES: DISABLE
2763 3050
2823 3110
2824 if (!svp) croak ("Time::HiRes is required"); 3111 if (!svp) croak ("Time::HiRes is required");
2825 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer"); 3112 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
2826 3113
2827 nvtime = INT2PTR (double (*)(), SvIV (*svp)); 3114 nvtime = INT2PTR (double (*)(), SvIV (*svp));
3115
3116 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
3117 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
2828 } 3118 }
2829 3119
2830 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 3120 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
2831} 3121}
2832 3122
2833SV * 3123SV *
2834new (char *klass, ...) 3124new (SV *klass, ...)
2835 ALIAS: 3125 ALIAS:
2836 Coro::new = 1 3126 Coro::new = 1
2837 CODE: 3127 CODE:
2838{ 3128 RETVAL = coro_new (aTHX_ ix ? coro_stash : coro_state_stash, &ST (1), items - 1, ix);
2839 struct coro *coro; 3129 OUTPUT:
2840 MAGIC *mg;
2841 HV *hv;
2842 CV *cb;
2843 int i;
2844
2845 if (items > 1)
2846 {
2847 cb = coro_sv_2cv (aTHX_ ST (1));
2848
2849 if (!ix)
2850 {
2851 if (CvISXSUB (cb))
2852 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
2853
2854 if (!CvROOT (cb))
2855 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
2856 }
2857 }
2858
2859 Newz (0, coro, 1, struct coro);
2860 coro->args = newAV ();
2861 coro->flags = CF_NEW;
2862
2863 if (coro_first) coro_first->prev = coro;
2864 coro->next = coro_first;
2865 coro_first = coro;
2866
2867 coro->hv = hv = newHV ();
2868 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
2869 mg->mg_flags |= MGf_DUP;
2870 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
2871
2872 if (items > 1)
2873 {
2874 av_extend (coro->args, items - 1 + ix - 1);
2875
2876 if (ix)
2877 {
2878 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
2879 cb = cv_coro_run;
2880 }
2881
2882 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
2883
2884 for (i = 2; i < items; i++)
2885 av_push (coro->args, newSVsv (ST (i)));
2886 }
2887}
2888 OUTPUT:
2889 RETVAL 3130 RETVAL
2890 3131
2891void 3132void
2892transfer (...) 3133transfer (...)
2893 PROTOTYPE: $$ 3134 PROTOTYPE: $$
2910SV * 3151SV *
2911clone (Coro::State coro) 3152clone (Coro::State coro)
2912 CODE: 3153 CODE:
2913{ 3154{
2914#if CORO_CLONE 3155#if CORO_CLONE
2915 struct coro *ncoro = coro_clone (coro); 3156 struct coro *ncoro = coro_clone (aTHX_ coro);
2916 MAGIC *mg; 3157 MAGIC *mg;
2917 /* TODO: too much duplication */ 3158 /* TODO: too much duplication */
2918 ncoro->hv = newHV (); 3159 ncoro->hv = newHV ();
2919 mg = sv_magicext ((SV *)ncoro->hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)ncoro, 0); 3160 mg = sv_magicext ((SV *)ncoro->hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)ncoro, 0);
2920 mg->mg_flags |= MGf_DUP; 3161 mg->mg_flags |= MGf_DUP;
2982 eval = 1 3223 eval = 1
2983 CODE: 3224 CODE:
2984{ 3225{
2985 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3226 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
2986 { 3227 {
2987 struct coro temp; 3228 struct coro *current = SvSTATE_current;
2988 3229
2989 if (!(coro->flags & CF_RUNNING)) 3230 if (current != coro)
2990 { 3231 {
2991 PUTBACK; 3232 PUTBACK;
2992 save_perl (aTHX_ &temp); 3233 save_perl (aTHX_ current);
2993 load_perl (aTHX_ coro); 3234 load_perl (aTHX_ coro);
3235 SPAGAIN;
2994 } 3236 }
2995 3237
2996 {
2997 dSP;
2998 ENTER;
2999 SAVETMPS;
3000 PUTBACK;
3001 PUSHSTACK; 3238 PUSHSTACK;
3239
3002 PUSHMARK (SP); 3240 PUSHMARK (SP);
3241 PUTBACK;
3003 3242
3004 if (ix) 3243 if (ix)
3005 eval_sv (coderef, 0); 3244 eval_sv (coderef, 0);
3006 else 3245 else
3007 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 3246 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
3008 3247
3009 POPSTACK; 3248 POPSTACK;
3010 SPAGAIN; 3249 SPAGAIN;
3011 FREETMPS;
3012 LEAVE;
3013 PUTBACK;
3014 }
3015 3250
3016 if (!(coro->flags & CF_RUNNING)) 3251 if (current != coro)
3017 { 3252 {
3253 PUTBACK;
3018 save_perl (aTHX_ coro); 3254 save_perl (aTHX_ coro);
3019 load_perl (aTHX_ &temp); 3255 load_perl (aTHX_ current);
3020 SPAGAIN; 3256 SPAGAIN;
3021 } 3257 }
3022 } 3258 }
3023} 3259}
3024 3260
3028 ALIAS: 3264 ALIAS:
3029 is_ready = CF_READY 3265 is_ready = CF_READY
3030 is_running = CF_RUNNING 3266 is_running = CF_RUNNING
3031 is_new = CF_NEW 3267 is_new = CF_NEW
3032 is_destroyed = CF_DESTROYED 3268 is_destroyed = CF_DESTROYED
3269 is_suspended = CF_SUSPENDED
3033 CODE: 3270 CODE:
3034 RETVAL = boolSV (coro->flags & ix); 3271 RETVAL = boolSV (coro->flags & ix);
3035 OUTPUT: 3272 OUTPUT:
3036 RETVAL 3273 RETVAL
3037 3274
3041 CODE: 3278 CODE:
3042{ 3279{
3043 struct coro *current = SvSTATE_current; 3280 struct coro *current = SvSTATE_current;
3044 SV **throwp = self == current ? &CORO_THROW : &self->except; 3281 SV **throwp = self == current ? &CORO_THROW : &self->except;
3045 SvREFCNT_dec (*throwp); 3282 SvREFCNT_dec (*throwp);
3283 SvGETMAGIC (throw);
3046 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3284 *throwp = SvOK (throw) ? newSVsv (throw) : 0;
3047} 3285}
3048 3286
3049void 3287void
3050api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3288api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3102 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv; 3340 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
3103 3341
3104 SV *tmp = *src; *src = *dst; *dst = tmp; 3342 SV *tmp = *src; *src = *dst; *dst = tmp;
3105 } 3343 }
3106 3344
3345void
3346cancel (Coro::State self)
3347 CODE:
3348 coro_state_destroy (aTHX_ self);
3349 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */
3350
3351
3352SV *
3353enable_times (int enabled = enable_times)
3354 CODE:
3355{
3356 RETVAL = boolSV (enable_times);
3357
3358 if (enabled != enable_times)
3359 {
3360 enable_times = enabled;
3361
3362 coro_times_update ();
3363 (enabled ? coro_times_sub : coro_times_add)(SvSTATE (coro_current));
3364 }
3365}
3366 OUTPUT:
3367 RETVAL
3368
3369void
3370times (Coro::State self)
3371 PPCODE:
3372{
3373 struct coro *current = SvSTATE (coro_current);
3374
3375 if (expect_false (current == self))
3376 {
3377 coro_times_update ();
3378 coro_times_add (SvSTATE (coro_current));
3379 }
3380
3381 EXTEND (SP, 2);
3382 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3383 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3384
3385 if (expect_false (current == self))
3386 coro_times_sub (SvSTATE (coro_current));
3387}
3388
3389void
3390swap_sv (Coro::State coro, SV *sv, SV *swapsv)
3391 CODE:
3392{
3393 struct coro *current = SvSTATE_current;
3394
3395 if (current == coro)
3396 SWAP_SVS (current);
3397
3398 if (!coro->swap_sv)
3399 coro->swap_sv = newAV ();
3400
3401 av_push (coro->swap_sv, SvREFCNT_inc_NN (sv));
3402 av_push (coro->swap_sv, SvREFCNT_inc_NN (swapsv));
3403
3404 if (current == coro)
3405 SWAP_SVS (current);
3406}
3407
3107 3408
3108MODULE = Coro::State PACKAGE = Coro 3409MODULE = Coro::State PACKAGE = Coro
3109 3410
3110BOOT: 3411BOOT:
3111{ 3412{
3112 int i;
3113
3114 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3413 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3115 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3414 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3116 cv_coro_run = get_cv ( "Coro::_terminate", GV_ADD); 3415 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3117 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD); 3416 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3118 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 3417 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3119 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 3418 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3120 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 3419 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3121 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 3420 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3122 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 3421 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3123 3422
3124 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3423 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3125 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3424 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3126 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 3425 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3127 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new); 3426 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3128 3427
3129 coro_stash = gv_stashpv ("Coro", TRUE); 3428 coro_stash = gv_stashpv ("Coro", TRUE);
3130 3429
3131 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 3430 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3132 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 3431 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3133 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 3432 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
3134 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 3433 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (CORO_PRIO_LOW));
3135 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE)); 3434 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (CORO_PRIO_IDLE));
3136 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN)); 3435 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (CORO_PRIO_MIN));
3137
3138 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
3139 coro_ready[i] = newAV ();
3140 3436
3141 { 3437 {
3142 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 3438 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
3143 3439
3144 coroapi.schedule = api_schedule; 3440 coroapi.schedule = api_schedule;
3154 sv_setiv (sv, (IV)&coroapi); 3450 sv_setiv (sv, (IV)&coroapi);
3155 SvREADONLY_on (sv); 3451 SvREADONLY_on (sv);
3156 } 3452 }
3157} 3453}
3158 3454
3455SV *
3456async (...)
3457 PROTOTYPE: &@
3458 CODE:
3459 RETVAL = coro_new (aTHX_ coro_stash, &ST (0), items, 1);
3460 api_ready (aTHX_ RETVAL);
3461 OUTPUT:
3462 RETVAL
3463
3159void 3464void
3160terminate (...) 3465terminate (...)
3161 CODE: 3466 CODE:
3162 CORO_EXECUTE_SLF_XS (slf_init_terminate); 3467 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3163 3468
3183 3488
3184void 3489void
3185cede_notself (...) 3490cede_notself (...)
3186 CODE: 3491 CODE:
3187 CORO_EXECUTE_SLF_XS (slf_init_cede_notself); 3492 CORO_EXECUTE_SLF_XS (slf_init_cede_notself);
3188
3189void
3190_cancel (Coro::State self)
3191 CODE:
3192 coro_state_destroy (aTHX_ self);
3193 coro_call_on_destroy (aTHX_ self);
3194 3493
3195void 3494void
3196_set_current (SV *current) 3495_set_current (SV *current)
3197 PROTOTYPE: $ 3496 PROTOTYPE: $
3198 CODE: 3497 CODE:
3202void 3501void
3203_set_readyhook (SV *hook) 3502_set_readyhook (SV *hook)
3204 PROTOTYPE: $ 3503 PROTOTYPE: $
3205 CODE: 3504 CODE:
3206 SvREFCNT_dec (coro_readyhook); 3505 SvREFCNT_dec (coro_readyhook);
3506 SvGETMAGIC (hook);
3507 if (SvOK (hook))
3508 {
3207 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0; 3509 coro_readyhook = newSVsv (hook);
3510 CORO_READYHOOK = invoke_sv_ready_hook_helper;
3511 }
3512 else
3513 {
3514 coro_readyhook = 0;
3515 CORO_READYHOOK = 0;
3516 }
3208 3517
3209int 3518int
3210prio (Coro::State coro, int newprio = 0) 3519prio (Coro::State coro, int newprio = 0)
3211 PROTOTYPE: $;$ 3520 PROTOTYPE: $;$
3212 ALIAS: 3521 ALIAS:
3218 if (items > 1) 3527 if (items > 1)
3219 { 3528 {
3220 if (ix) 3529 if (ix)
3221 newprio = coro->prio - newprio; 3530 newprio = coro->prio - newprio;
3222 3531
3223 if (newprio < PRIO_MIN) newprio = PRIO_MIN; 3532 if (newprio < CORO_PRIO_MIN) newprio = CORO_PRIO_MIN;
3224 if (newprio > PRIO_MAX) newprio = PRIO_MAX; 3533 if (newprio > CORO_PRIO_MAX) newprio = CORO_PRIO_MAX;
3225 3534
3226 coro->prio = newprio; 3535 coro->prio = newprio;
3227 } 3536 }
3228} 3537}
3229 OUTPUT: 3538 OUTPUT:
3244 RETVAL = coro_nready; 3553 RETVAL = coro_nready;
3245 OUTPUT: 3554 OUTPUT:
3246 RETVAL 3555 RETVAL
3247 3556
3248void 3557void
3558suspend (Coro::State self)
3559 PROTOTYPE: $
3560 CODE:
3561 self->flags |= CF_SUSPENDED;
3562
3563void
3564resume (Coro::State self)
3565 PROTOTYPE: $
3566 CODE:
3567 self->flags &= ~CF_SUSPENDED;
3568
3569void
3249_pool_handler (...) 3570_pool_handler (...)
3250 CODE: 3571 CODE:
3251 CORO_EXECUTE_SLF_XS (slf_init_pool_handler); 3572 CORO_EXECUTE_SLF_XS (slf_init_pool_handler);
3252 3573
3253void 3574void
3264 for (i = 1; i < items; ++i) 3585 for (i = 1; i < items; ++i)
3265 av_push (av, SvREFCNT_inc_NN (ST (i))); 3586 av_push (av, SvREFCNT_inc_NN (ST (i)));
3266 3587
3267 if ((SV *)hv == &PL_sv_undef) 3588 if ((SV *)hv == &PL_sv_undef)
3268 { 3589 {
3269 PUSHMARK (SP); 3590 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3270 EXTEND (SP, 2);
3271 PUSHs (sv_Coro);
3272 PUSHs ((SV *)cv_pool_handler);
3273 PUTBACK;
3274 call_sv ((SV *)cv_coro_state_new, G_SCALAR);
3275 SPAGAIN;
3276
3277 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs)); 3591 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
3592 SvREFCNT_dec (sv);
3278 } 3593 }
3279 3594
3280 { 3595 {
3281 struct coro *coro = SvSTATE_hv (hv); 3596 struct coro *coro = SvSTATE_hv (hv);
3282 3597
3306rouse_wait (...) 3621rouse_wait (...)
3307 PROTOTYPE: ;$ 3622 PROTOTYPE: ;$
3308 PPCODE: 3623 PPCODE:
3309 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait); 3624 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait);
3310 3625
3626void
3627on_enter (SV *block)
3628 ALIAS:
3629 on_leave = 1
3630 PROTOTYPE: &
3631 CODE:
3632{
3633 struct coro *coro = SvSTATE_current;
3634 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3635
3636 block = s_get_cv_croak (block);
3637
3638 if (!*avp)
3639 *avp = newAV ();
3640
3641 av_push (*avp, SvREFCNT_inc (block));
3642
3643 if (!ix)
3644 on_enterleave_call (aTHX_ block);
3645
3646 LEAVE; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
3647 SAVEDESTRUCTOR_X (ix ? coro_pop_on_leave : coro_pop_on_enter, (void *)coro);
3648 ENTER; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
3649}
3650
3311 3651
3312MODULE = Coro::State PACKAGE = PerlIO::cede 3652MODULE = Coro::State PACKAGE = PerlIO::cede
3313 3653
3314BOOT: 3654BOOT:
3315 PerlIO_define_layer (aTHX_ &PerlIO_cede); 3655 PerlIO_define_layer (aTHX_ &PerlIO_cede);
3318MODULE = Coro::State PACKAGE = Coro::Semaphore 3658MODULE = Coro::State PACKAGE = Coro::Semaphore
3319 3659
3320SV * 3660SV *
3321new (SV *klass, SV *count = 0) 3661new (SV *klass, SV *count = 0)
3322 CODE: 3662 CODE:
3663{
3664 int semcnt = 1;
3665
3666 if (count)
3667 {
3668 SvGETMAGIC (count);
3669
3670 if (SvOK (count))
3671 semcnt = SvIV (count);
3672 }
3673
3323 RETVAL = sv_bless ( 3674 RETVAL = sv_bless (
3324 coro_waitarray_new (aTHX_ count && SvOK (count) ? SvIV (count) : 1), 3675 coro_waitarray_new (aTHX_ semcnt),
3325 GvSTASH (CvGV (cv)) 3676 GvSTASH (CvGV (cv))
3326 ); 3677 );
3678}
3327 OUTPUT: 3679 OUTPUT:
3328 RETVAL 3680 RETVAL
3329 3681
3330# helper for Coro::Channel 3682# helper for Coro::Channel and others
3331SV * 3683SV *
3332_alloc (int count) 3684_alloc (int count)
3333 CODE: 3685 CODE:
3334 RETVAL = coro_waitarray_new (aTHX_ count); 3686 RETVAL = coro_waitarray_new (aTHX_ count);
3335 OUTPUT: 3687 OUTPUT:
3393 for (i = 1; i <= wcount; ++i) 3745 for (i = 1; i <= wcount; ++i)
3394 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i]))); 3746 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i])));
3395 } 3747 }
3396} 3748}
3397 3749
3750MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3751
3752void
3753_may_delete (SV *sem, int count, int extra_refs)
3754 PPCODE:
3755{
3756 AV *av = (AV *)SvRV (sem);
3757
3758 if (SvREFCNT ((SV *)av) == 1 + extra_refs
3759 && AvFILLp (av) == 0 /* no waiters, just count */
3760 && SvIV (AvARRAY (av)[0]) == count)
3761 XSRETURN_YES;
3762
3763 XSRETURN_NO;
3764}
3765
3398MODULE = Coro::State PACKAGE = Coro::Signal 3766MODULE = Coro::State PACKAGE = Coro::Signal
3399 3767
3400SV * 3768SV *
3401new (SV *klass) 3769new (SV *klass)
3402 CODE: 3770 CODE:
3473 3841
3474void 3842void
3475_register (char *target, char *proto, SV *req) 3843_register (char *target, char *proto, SV *req)
3476 CODE: 3844 CODE:
3477{ 3845{
3478 CV *req_cv = coro_sv_2cv (aTHX_ req); 3846 SV *req_cv = s_get_cv_croak (req);
3479 /* newXSproto doesn't return the CV on 5.8 */ 3847 /* newXSproto doesn't return the CV on 5.8 */
3480 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 3848 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3481 sv_setpv ((SV *)slf_cv, proto); 3849 sv_setpv ((SV *)slf_cv, proto);
3482 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0); 3850 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
3483} 3851}
3484 3852
3853MODULE = Coro::State PACKAGE = Coro::Select
3854
3855void
3856patch_pp_sselect ()
3857 CODE:
3858 if (!coro_old_pp_sselect)
3859 {
3860 coro_select_select = (SV *)get_cv ("Coro::Select::select", 0);
3861 coro_old_pp_sselect = PL_ppaddr [OP_SSELECT];
3862 PL_ppaddr [OP_SSELECT] = coro_pp_sselect;
3863 }
3864
3865void
3866unpatch_pp_sselect ()
3867 CODE:
3868 if (coro_old_pp_sselect)
3869 {
3870 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
3871 coro_old_pp_sselect = 0;
3872 }
3873
3874

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines