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.332 by root, Thu Nov 27 12:20:31 2008 UTC vs.
Revision 1.363 by root, Tue Jul 14 00:55:10 2009 UTC

… …
6#include "EXTERN.h" 6#include "EXTERN.h"
7#include "perl.h" 7#include "perl.h"
8#include "XSUB.h" 8#include "XSUB.h"
9#include "perliol.h" 9#include "perliol.h"
10 10
11#include "patchlevel.h" 11#include "schmorp.h"
12 12
13#include <stdio.h> 13#include <stdio.h>
14#include <errno.h> 14#include <errno.h>
15#include <assert.h> 15#include <assert.h>
16 16
… …
51#endif 51#endif
52 52
53/* the maximum number of idle cctx that will be pooled */ 53/* the maximum number of idle cctx that will be pooled */
54static int cctx_max_idle = 4; 54static int cctx_max_idle = 4;
55 55
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 56#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
116# undef CORO_STACKGUARD 57# undef CORO_STACKGUARD
117#endif 58#endif
118 59
119#ifndef CORO_STACKGUARD 60#ifndef CORO_STACKGUARD
… …
137 78
138#define IN_DESTRUCT PL_dirty 79#define IN_DESTRUCT PL_dirty
139 80
140#if __GNUC__ >= 3 81#if __GNUC__ >= 3
141# define attribute(x) __attribute__(x) 82# define attribute(x) __attribute__(x)
142# define expect(expr,value) __builtin_expect ((expr),(value)) 83# define expect(expr,value) __builtin_expect ((expr), (value))
143# define INLINE static inline 84# define INLINE static inline
144#else 85#else
145# define attribute(x) 86# define attribute(x)
146# define expect(expr,value) (expr) 87# define expect(expr,value) (expr)
147# define INLINE static 88# define INLINE static
… …
159# if CORO_PTHREAD 100# if CORO_PTHREAD
160static void *coro_thx; 101static void *coro_thx;
161# endif 102# endif
162#endif 103#endif
163 104
105#ifdef __linux
106# include <time.h> /* for timespec */
107# include <syscall.h> /* for SYS_* */
108# ifdef SYS_clock_gettime
109# define coro_clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
110# define CORO_CLOCK_MONOTONIC 1
111# define CORO_CLOCK_THREAD_CPUTIME_ID 3
112# endif
113#endif
114
164static double (*nvtime)(); /* so why doesn't it take void? */ 115static double (*nvtime)(); /* so why doesn't it take void? */
116static void (*u2time)(pTHX_ UV ret[2]);
165 117
166/* we hijack an hopefully unused CV flag for our purposes */ 118/* we hijack an hopefully unused CV flag for our purposes */
167#define CVf_SLF 0x4000 119#define CVf_SLF 0x4000
168static OP *pp_slf (pTHX); 120static OP *pp_slf (pTHX);
169 121
… …
195static CV *cv_coro_state_new; 147static CV *cv_coro_state_new;
196 148
197/* Coro::AnyEvent */ 149/* Coro::AnyEvent */
198static SV *sv_activity; 150static SV *sv_activity;
199 151
152/* enable processtime/realtime profiling */
153static char enable_times;
154typedef U32 coro_ts[2];
155static coro_ts time_real, time_cpu;
156static char times_valid;
157
200static struct coro_cctx *cctx_first; 158static struct coro_cctx *cctx_first;
201static int cctx_count, cctx_idle; 159static int cctx_count, cctx_idle;
202 160
203enum { 161enum {
204 CC_MAPPED = 0x01, 162 CC_MAPPED = 0x01,
… …
238enum { 196enum {
239 CF_RUNNING = 0x0001, /* coroutine is running */ 197 CF_RUNNING = 0x0001, /* coroutine is running */
240 CF_READY = 0x0002, /* coroutine is ready */ 198 CF_READY = 0x0002, /* coroutine is ready */
241 CF_NEW = 0x0004, /* has never been switched to */ 199 CF_NEW = 0x0004, /* has never been switched to */
242 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 200 CF_DESTROYED = 0x0008, /* coroutine data has been freed */
201 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
243}; 202};
244 203
245/* the structure where most of the perl state is stored, overlaid on the cxstack */ 204/* the structure where most of the perl state is stored, overlaid on the cxstack */
246typedef struct 205typedef struct
247{ 206{
… …
260/* this is a structure representing a perl-level coroutine */ 219/* this is a structure representing a perl-level coroutine */
261struct coro { 220struct coro {
262 /* the C coroutine allocated to this perl coroutine, if any */ 221 /* the C coroutine allocated to this perl coroutine, if any */
263 coro_cctx *cctx; 222 coro_cctx *cctx;
264 223
224 /* ready queue */
225 struct coro *next_ready;
226
265 /* state data */ 227 /* state data */
266 struct CoroSLF slf_frame; /* saved slf frame */ 228 struct CoroSLF slf_frame; /* saved slf frame */
267 AV *mainstack; 229 AV *mainstack;
268 perl_slots *slot; /* basically the saved sp */ 230 perl_slots *slot; /* basically the saved sp */
269 231
… …
285 /* async_pool */ 247 /* async_pool */
286 SV *saved_deffh; 248 SV *saved_deffh;
287 SV *invoke_cb; 249 SV *invoke_cb;
288 AV *invoke_av; 250 AV *invoke_av;
289 251
252 /* on_enter/on_leave */
253 AV *on_enter;
254 AV *on_leave;
255
256 /* times */
257 coro_ts t_cpu, t_real;
258
290 /* linked list */ 259 /* linked list */
291 struct coro *next, *prev; 260 struct coro *next, *prev;
292}; 261};
293 262
294typedef struct coro *Coro__State; 263typedef struct coro *Coro__State;
… …
299/* the mainr easonw e don't support windows process emulation */ 268/* the mainr easonw e don't support windows process emulation */
300static struct CoroSLF slf_frame; /* the current slf frame */ 269static struct CoroSLF slf_frame; /* the current slf frame */
301 270
302/** Coro ********************************************************************/ 271/** Coro ********************************************************************/
303 272
304#define PRIO_MAX 3 273#define CORO_PRIO_MAX 3
305#define PRIO_HIGH 1 274#define CORO_PRIO_HIGH 1
306#define PRIO_NORMAL 0 275#define CORO_PRIO_NORMAL 0
307#define PRIO_LOW -1 276#define CORO_PRIO_LOW -1
308#define PRIO_IDLE -3 277#define CORO_PRIO_IDLE -3
309#define PRIO_MIN -4 278#define CORO_PRIO_MIN -4
310 279
311/* for Coro.pm */ 280/* for Coro.pm */
312static SV *coro_current; 281static SV *coro_current;
313static SV *coro_readyhook; 282static SV *coro_readyhook;
314static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1]; 283static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
315static CV *cv_coro_run, *cv_coro_terminate; 284static CV *cv_coro_run, *cv_coro_terminate;
316static struct coro *coro_first; 285static struct coro *coro_first;
317#define coro_nready coroapi.nready 286#define coro_nready coroapi.nready
318 287
319/** lowlevel stuff **********************************************************/ 288/** lowlevel stuff **********************************************************/
… …
346 get_hv (name, create); 315 get_hv (name, create);
347#endif 316#endif
348 return get_hv (name, create); 317 return get_hv (name, create);
349} 318}
350 319
351/* may croak */ 320INLINE void
352INLINE CV * 321coro_times_update ()
353coro_sv_2cv (pTHX_ SV *sv)
354{ 322{
355 HV *st; 323#ifdef coro_clock_gettime
356 GV *gvp; 324 struct timespec ts;
357 return sv_2cv (sv, &st, &gvp, 0); 325
326 ts.tv_sec = ts.tv_nsec = 0;
327 coro_clock_gettime (CORO_CLOCK_THREAD_CPUTIME_ID, &ts);
328 time_cpu [0] = ts.tv_sec; time_cpu [1] = ts.tv_nsec;
329
330 ts.tv_sec = ts.tv_nsec = 0;
331 coro_clock_gettime (CORO_CLOCK_MONOTONIC, &ts);
332 time_real [0] = ts.tv_sec; time_real [1] = ts.tv_nsec;
333#else
334 dTHX;
335 UV tv[2];
336
337 u2time (aTHX_ tv);
338 time_real [0] = tv [0];
339 time_real [1] = tv [1] * 1000;
340#endif
341}
342
343INLINE void
344coro_times_add (struct coro *c)
345{
346 c->t_real [1] += time_real [1];
347 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
348 c->t_real [0] += time_real [0];
349
350 c->t_cpu [1] += time_cpu [1];
351 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
352 c->t_cpu [0] += time_cpu [0];
353}
354
355INLINE void
356coro_times_sub (struct coro *c)
357{
358 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; }
359 c->t_real [1] -= time_real [1];
360 c->t_real [0] -= time_real [0];
361
362 if (c->t_cpu [1] < time_cpu [1]) { c->t_cpu [1] += 1000000000; --c->t_cpu [0]; }
363 c->t_cpu [1] -= time_cpu [1];
364 c->t_cpu [0] -= time_cpu [0];
358} 365}
359 366
360/*****************************************************************************/ 367/*****************************************************************************/
361/* magic glue */ 368/* magic glue */
362 369
… …
462static int 469static int
463coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 470coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
464{ 471{
465 AV *padlist; 472 AV *padlist;
466 AV *av = (AV *)mg->mg_obj; 473 AV *av = (AV *)mg->mg_obj;
474
475 /* perl manages to free our internal AV and _then_ call us */
476 if (IN_DESTRUCT)
477 return 0;
467 478
468 /* casting is fun. */ 479 /* casting is fun. */
469 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 480 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
470 free_padlist (aTHX_ padlist); 481 free_padlist (aTHX_ padlist);
471 482
… …
521} 532}
522 533
523/** load & save, init *******************************************************/ 534/** load & save, init *******************************************************/
524 535
525static void 536static void
537on_enterleave_call (pTHX_ SV *cb);
538
539static void
526load_perl (pTHX_ Coro__State c) 540load_perl (pTHX_ Coro__State c)
527{ 541{
528 perl_slots *slot = c->slot; 542 perl_slots *slot = c->slot;
529 c->slot = 0; 543 c->slot = 0;
530 544
… …
556 PUTBACK; 570 PUTBACK;
557 } 571 }
558 572
559 slf_frame = c->slf_frame; 573 slf_frame = c->slf_frame;
560 CORO_THROW = c->except; 574 CORO_THROW = c->except;
575
576 if (expect_false (enable_times))
577 {
578 if (expect_false (!times_valid))
579 coro_times_update ();
580
581 coro_times_sub (c);
582 }
583
584 if (expect_false (c->on_enter))
585 {
586 int i;
587
588 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
589 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
590 }
561} 591}
562 592
563static void 593static void
564save_perl (pTHX_ Coro__State c) 594save_perl (pTHX_ Coro__State c)
565{ 595{
596 if (expect_false (c->on_leave))
597 {
598 int i;
599
600 for (i = AvFILLp (c->on_leave); i >= 0; --i)
601 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
602 }
603
604 times_valid = 0;
605
606 if (expect_false (enable_times))
607 {
608 coro_times_update (); times_valid = 1;
609 coro_times_add (c);
610 }
611
566 c->except = CORO_THROW; 612 c->except = CORO_THROW;
567 c->slf_frame = slf_frame; 613 c->slf_frame = slf_frame;
568 614
569 { 615 {
570 dSP; 616 dSP;
… …
583 { 629 {
584 while (expect_true (cxix >= 0)) 630 while (expect_true (cxix >= 0))
585 { 631 {
586 PERL_CONTEXT *cx = &ccstk[cxix--]; 632 PERL_CONTEXT *cx = &ccstk[cxix--];
587 633
588 if (expect_true (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT)) 634 if (expect_true (CxTYPE (cx) == CXt_SUB) || expect_false (CxTYPE (cx) == CXt_FORMAT))
589 { 635 {
590 CV *cv = cx->blk_sub.cv; 636 CV *cv = cx->blk_sub.cv;
591 637
592 if (expect_true (CvDEPTH (cv))) 638 if (expect_true (CvDEPTH (cv)))
593 { 639 {
… …
617 /* we manually unroll here, as usually 2 slots is enough */ 663 /* we manually unroll here, as usually 2 slots is enough */
618 if (SLOT_COUNT >= 1) CXINC; 664 if (SLOT_COUNT >= 1) CXINC;
619 if (SLOT_COUNT >= 2) CXINC; 665 if (SLOT_COUNT >= 2) CXINC;
620 if (SLOT_COUNT >= 3) CXINC; 666 if (SLOT_COUNT >= 3) CXINC;
621 { 667 {
622 int i; 668 unsigned int i;
623 for (i = 3; i < SLOT_COUNT; ++i) 669 for (i = 3; i < SLOT_COUNT; ++i)
624 CXINC; 670 CXINC;
625 } 671 }
626 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 672 cxstack_ix -= SLOT_COUNT; /* undo allocation */
627 673
… …
769#endif 815#endif
770 816
771/* 817/*
772 * This overrides the default magic get method of %SIG elements. 818 * This overrides the default magic get method of %SIG elements.
773 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook 819 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
774 * and instead of tryign to save and restore the hash elements, we just provide 820 * and instead of trying to save and restore the hash elements, we just provide
775 * readback here. 821 * readback here.
776 * We only do this when the hook is != 0, as they are often set to 0 temporarily,
777 * not expecting this to actually change the hook. This is a potential problem
778 * when a schedule happens then, but we ignore this.
779 */ 822 */
780static int 823static int
781coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 824coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
782{ 825{
783 const char *s = MgPV_nolen_const (mg); 826 const char *s = MgPV_nolen_const (mg);
… …
836 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 879 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
837 880
838 if (svp) 881 if (svp)
839 { 882 {
840 SV *old = *svp; 883 SV *old = *svp;
841 *svp = newSVsv (sv); 884 *svp = SvOK (sv) ? newSVsv (sv) : 0;
842 SvREFCNT_dec (old); 885 SvREFCNT_dec (old);
843 return 0; 886 return 0;
844 } 887 }
845 } 888 }
846 889
… …
935 978
936 PL_op = (OP *)&coro_setup_op; 979 PL_op = (OP *)&coro_setup_op;
937 980
938 /* copy throw, in case it was set before coro_setup */ 981 /* copy throw, in case it was set before coro_setup */
939 CORO_THROW = coro->except; 982 CORO_THROW = coro->except;
940}
941 983
984 if (expect_false (enable_times))
985 {
986 coro_times_update ();
987 coro_times_sub (coro);
988 }
989}
990
942static void 991static void
943coro_destruct (pTHX_ struct coro *coro) 992coro_unwind_stacks (pTHX)
944{ 993{
945 if (!IN_DESTRUCT) 994 if (!IN_DESTRUCT)
946 { 995 {
947 /* restore all saved variables and stuff */ 996 /* restore all saved variables and stuff */
948 LEAVE_SCOPE (0); 997 LEAVE_SCOPE (0);
… …
956 POPSTACK_TO (PL_mainstack); 1005 POPSTACK_TO (PL_mainstack);
957 1006
958 /* unwind main stack */ 1007 /* unwind main stack */
959 dounwind (-1); 1008 dounwind (-1);
960 } 1009 }
1010}
961 1011
962 SvREFCNT_dec (GvSV (PL_defgv)); 1012static void
963 SvREFCNT_dec (GvAV (PL_defgv)); 1013coro_destruct_perl (pTHX_ struct coro *coro)
964 SvREFCNT_dec (GvSV (PL_errgv)); 1014{
965 SvREFCNT_dec (PL_defoutgv); 1015 SV *svf [9];
966 SvREFCNT_dec (PL_rs);
967 SvREFCNT_dec (GvSV (irsgv));
968 SvREFCNT_dec (GvHV (PL_hintgv));
969 1016
970 SvREFCNT_dec (PL_diehook);
971 SvREFCNT_dec (PL_warnhook);
972 1017 {
1018 struct coro *current = SvSTATE_current;
1019
1020 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1021
1022 save_perl (aTHX_ current);
1023 load_perl (aTHX_ coro);
1024
1025 coro_unwind_stacks (aTHX);
1026 coro_destruct_stacks (aTHX);
1027
1028 // now save some sv's to be free'd later
1029 svf [0] = GvSV (PL_defgv);
1030 svf [1] = (SV *)GvAV (PL_defgv);
1031 svf [2] = GvSV (PL_errgv);
1032 svf [3] = (SV *)PL_defoutgv;
1033 svf [4] = PL_rs;
1034 svf [5] = GvSV (irsgv);
1035 svf [6] = (SV *)GvHV (PL_hintgv);
1036 svf [7] = PL_diehook;
1037 svf [8] = PL_warnhook;
1038 assert (9 == sizeof (svf) / sizeof (*svf));
1039
1040 load_perl (aTHX_ current);
1041 }
1042
1043 {
1044 unsigned int i;
1045
1046 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i)
1047 SvREFCNT_dec (svf [i]);
1048
973 SvREFCNT_dec (coro->saved_deffh); 1049 SvREFCNT_dec (coro->saved_deffh);
974 SvREFCNT_dec (coro->rouse_cb); 1050 SvREFCNT_dec (coro->rouse_cb);
975 SvREFCNT_dec (coro->invoke_cb); 1051 SvREFCNT_dec (coro->invoke_cb);
976 SvREFCNT_dec (coro->invoke_av); 1052 SvREFCNT_dec (coro->invoke_av);
977 1053 }
978 coro_destruct_stacks (aTHX);
979} 1054}
980 1055
981INLINE void 1056INLINE void
982free_coro_mortal (pTHX) 1057free_coro_mortal (pTHX)
983{ 1058{
… …
1277cctx_destroy (coro_cctx *cctx) 1352cctx_destroy (coro_cctx *cctx)
1278{ 1353{
1279 if (!cctx) 1354 if (!cctx)
1280 return; 1355 return;
1281 1356
1282 assert (cctx != cctx_current);//D temporary 1357 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary?
1283 1358
1284 --cctx_count; 1359 --cctx_count;
1285 coro_destroy (&cctx->cctx); 1360 coro_destroy (&cctx->cctx);
1286 1361
1287 /* coro_transfer creates new, empty cctx's */ 1362 /* coro_transfer creates new, empty cctx's */
… …
1351 /* TODO: throwing up here is considered harmful */ 1426 /* TODO: throwing up here is considered harmful */
1352 1427
1353 if (expect_true (prev != next)) 1428 if (expect_true (prev != next))
1354 { 1429 {
1355 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1430 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1356 croak ("Coro::State::transfer called with a suspended prev Coro::State, but can only transfer from running or new states,"); 1431 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1357 1432
1358 if (expect_false (next->flags & CF_RUNNING))
1359 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states,");
1360
1361 if (expect_false (next->flags & CF_DESTROYED)) 1433 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED)))
1362 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states,"); 1434 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1363 1435
1364#if !PERL_VERSION_ATLEAST (5,10,0) 1436#if !PERL_VERSION_ATLEAST (5,10,0)
1365 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1437 if (expect_false (PL_lex_state != LEX_NOTPARSING))
1366 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,"); 1438 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1367#endif 1439#endif
… …
1405 coro_setup (aTHX_ next); 1477 coro_setup (aTHX_ next);
1406 } 1478 }
1407 else 1479 else
1408 load_perl (aTHX_ next); 1480 load_perl (aTHX_ next);
1409 1481
1410 assert (!prev->cctx);//D temporary
1411
1412 /* possibly untie and reuse the cctx */ 1482 /* possibly untie and reuse the cctx */
1413 if (expect_true ( 1483 if (expect_true (
1414 cctx_current->idle_sp == STACKLEVEL 1484 cctx_current->idle_sp == STACKLEVEL
1415 && !(cctx_current->flags & CC_TRACE) 1485 && !(cctx_current->flags & CC_TRACE)
1416 && !force_cctx 1486 && !force_cctx
… …
1457coro_state_destroy (pTHX_ struct coro *coro) 1527coro_state_destroy (pTHX_ struct coro *coro)
1458{ 1528{
1459 if (coro->flags & CF_DESTROYED) 1529 if (coro->flags & CF_DESTROYED)
1460 return 0; 1530 return 0;
1461 1531
1462 if (coro->on_destroy) 1532 if (coro->on_destroy && !PL_dirty)
1463 coro->on_destroy (aTHX_ coro); 1533 coro->on_destroy (aTHX_ coro);
1464 1534
1465 coro->flags |= CF_DESTROYED; 1535 coro->flags |= CF_DESTROYED;
1466 1536
1467 if (coro->flags & CF_READY) 1537 if (coro->flags & CF_READY)
… …
1471 --coro_nready; 1541 --coro_nready;
1472 } 1542 }
1473 else 1543 else
1474 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1544 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1475 1545
1476 if (coro->mainstack && coro->mainstack != main_mainstack) 1546 if (coro->mainstack
1477 { 1547 && coro->mainstack != main_mainstack
1478 struct coro temp; 1548 && coro->slot
1479 1549 && !PL_dirty)
1480 assert (("FATAL: tried to destroy currently running coroutine (please report)", !(coro->flags & CF_RUNNING)));
1481
1482 save_perl (aTHX_ &temp);
1483 load_perl (aTHX_ coro);
1484
1485 coro_destruct (aTHX_ coro); 1550 coro_destruct_perl (aTHX_ coro);
1486
1487 load_perl (aTHX_ &temp);
1488
1489 coro->slot = 0;
1490 }
1491 1551
1492 cctx_destroy (coro->cctx); 1552 cctx_destroy (coro->cctx);
1493 SvREFCNT_dec (coro->startcv); 1553 SvREFCNT_dec (coro->startcv);
1494 SvREFCNT_dec (coro->args); 1554 SvREFCNT_dec (coro->args);
1495 SvREFCNT_dec (CORO_THROW); 1555 SvREFCNT_dec (CORO_THROW);
… …
1554 1614
1555 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1615 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1556 TRANSFER (ta, 1); 1616 TRANSFER (ta, 1);
1557} 1617}
1558 1618
1559/*****************************************************************************/
1560/* gensub: simple closure generation utility */
1561
1562#define GENSUB_ARG CvXSUBANY (cv).any_ptr
1563
1564/* create a closure from XS, returns a code reference */
1565/* the arg can be accessed via GENSUB_ARG from the callback */
1566/* the callback must use dXSARGS/XSRETURN */
1567static SV *
1568gensub (pTHX_ void (*xsub)(pTHX_ CV *), void *arg)
1569{
1570 CV *cv = (CV *)newSV (0);
1571
1572 sv_upgrade ((SV *)cv, SVt_PVCV);
1573
1574 CvANON_on (cv);
1575 CvISXSUB_on (cv);
1576 CvXSUB (cv) = xsub;
1577 GENSUB_ARG = arg;
1578
1579 return newRV_noinc ((SV *)cv);
1580}
1581
1582/** Coro ********************************************************************/ 1619/** Coro ********************************************************************/
1583 1620
1584INLINE void 1621INLINE void
1585coro_enq (pTHX_ struct coro *coro) 1622coro_enq (pTHX_ struct coro *coro)
1586{ 1623{
1587 av_push (coro_ready [coro->prio - PRIO_MIN], SvREFCNT_inc_NN (coro->hv)); 1624 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1588}
1589 1625
1590INLINE SV * 1626 SvREFCNT_inc_NN (coro->hv);
1627
1628 coro->next_ready = 0;
1629 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1630 ready [1] = coro;
1631}
1632
1633INLINE struct coro *
1591coro_deq (pTHX) 1634coro_deq (pTHX)
1592{ 1635{
1593 int prio; 1636 int prio;
1594 1637
1595 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; ) 1638 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
1596 if (AvFILLp (coro_ready [prio]) >= 0) 1639 {
1597 return av_shift (coro_ready [prio]); 1640 struct coro **ready = coro_ready [prio];
1641
1642 if (ready [0])
1643 {
1644 struct coro *coro = ready [0];
1645 ready [0] = coro->next_ready;
1646 return coro;
1647 }
1648 }
1598 1649
1599 return 0; 1650 return 0;
1600} 1651}
1601 1652
1602static int 1653static int
… …
1666static void 1717static void
1667prepare_schedule (pTHX_ struct coro_transfer_args *ta) 1718prepare_schedule (pTHX_ struct coro_transfer_args *ta)
1668{ 1719{
1669 for (;;) 1720 for (;;)
1670 { 1721 {
1671 SV *next_sv = coro_deq (aTHX); 1722 struct coro *next = coro_deq (aTHX);
1672 1723
1673 if (expect_true (next_sv)) 1724 if (expect_true (next))
1674 { 1725 {
1675 struct coro *next = SvSTATE_hv (next_sv);
1676
1677 /* cannot transfer to destroyed coros, skip and look for next */ 1726 /* cannot transfer to destroyed coros, skip and look for next */
1678 if (expect_false (next->flags & CF_DESTROYED)) 1727 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED)))
1679 SvREFCNT_dec (next_sv); /* coro_nready has already been taken care of by destroy */ 1728 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1680 else 1729 else
1681 { 1730 {
1682 next->flags &= ~CF_READY; 1731 next->flags &= ~CF_READY;
1683 --coro_nready; 1732 --coro_nready;
1684 1733
… …
1862 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */ 1911 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */
1863 api_ready (aTHX_ sv_manager); 1912 api_ready (aTHX_ sv_manager);
1864 1913
1865 frame->prepare = prepare_schedule; 1914 frame->prepare = prepare_schedule;
1866 frame->check = slf_check_repeat; 1915 frame->check = slf_check_repeat;
1916
1917 /* as a minor optimisation, we could unwind all stacks here */
1918 /* but that puts extra pressure on pp_slf, and is not worth much */
1919 /*coro_unwind_stacks (aTHX);*/
1867} 1920}
1868 1921
1869/*****************************************************************************/ 1922/*****************************************************************************/
1870/* async pool handler */ 1923/* async pool handler */
1871 1924
… …
1949 2002
1950static void 2003static void
1951coro_rouse_callback (pTHX_ CV *cv) 2004coro_rouse_callback (pTHX_ CV *cv)
1952{ 2005{
1953 dXSARGS; 2006 dXSARGS;
1954 SV *data = (SV *)GENSUB_ARG; 2007 SV *data = (SV *)S_GENSUB_ARG;
1955 2008
1956 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2009 if (SvTYPE (SvRV (data)) != SVt_PVAV)
1957 { 2010 {
1958 /* first call, set args */ 2011 /* first call, set args */
2012 SV *coro = SvRV (data);
1959 AV *av = newAV (); 2013 AV *av = newAV ();
1960 SV *coro = SvRV (data);
1961 2014
1962 SvRV_set (data, (SV *)av); 2015 SvRV_set (data, (SV *)av);
1963 api_ready (aTHX_ coro);
1964 SvREFCNT_dec (coro);
1965 2016
1966 /* better take a full copy of the arguments */ 2017 /* better take a full copy of the arguments */
1967 while (items--) 2018 while (items--)
1968 av_store (av, items, newSVsv (ST (items))); 2019 av_store (av, items, newSVsv (ST (items)));
2020
2021 api_ready (aTHX_ coro);
2022 SvREFCNT_dec (coro);
1969 } 2023 }
1970 2024
1971 XSRETURN_EMPTY; 2025 XSRETURN_EMPTY;
1972} 2026}
1973 2027
… …
1990 2044
1991 EXTEND (SP, AvFILLp (av) + 1); 2045 EXTEND (SP, AvFILLp (av) + 1);
1992 for (i = 0; i <= AvFILLp (av); ++i) 2046 for (i = 0; i <= AvFILLp (av); ++i)
1993 PUSHs (sv_2mortal (AvARRAY (av)[i])); 2047 PUSHs (sv_2mortal (AvARRAY (av)[i]));
1994 2048
1995 /* we have stolen the elements, so ste length to zero and free */ 2049 /* we have stolen the elements, so set length to zero and free */
1996 AvFILLp (av) = -1; 2050 AvFILLp (av) = -1;
1997 av_undef (av); 2051 av_undef (av);
1998 2052
1999 PUTBACK; 2053 PUTBACK;
2000 } 2054 }
… …
2024 || SvTYPE (SvRV (cb)) != SVt_PVCV 2078 || SvTYPE (SvRV (cb)) != SVt_PVCV
2025 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2079 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2026 croak ("Coro::rouse_wait called with illegal callback argument,"); 2080 croak ("Coro::rouse_wait called with illegal callback argument,");
2027 2081
2028 { 2082 {
2029 CV *cv = (CV *)SvRV (cb); /* for GENSUB_ARG */ 2083 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
2030 SV *data = (SV *)GENSUB_ARG; 2084 SV *data = (SV *)S_GENSUB_ARG;
2031 2085
2032 frame->data = (void *)data; 2086 frame->data = (void *)data;
2033 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule; 2087 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
2034 frame->check = slf_check_rouse_wait; 2088 frame->check = slf_check_rouse_wait;
2035 } 2089 }
… …
2039coro_new_rouse_cb (pTHX) 2093coro_new_rouse_cb (pTHX)
2040{ 2094{
2041 HV *hv = (HV *)SvRV (coro_current); 2095 HV *hv = (HV *)SvRV (coro_current);
2042 struct coro *coro = SvSTATE_hv (hv); 2096 struct coro *coro = SvSTATE_hv (hv);
2043 SV *data = newRV_inc ((SV *)hv); 2097 SV *data = newRV_inc ((SV *)hv);
2044 SV *cb = gensub (aTHX_ coro_rouse_callback, (void *)data); 2098 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
2045 2099
2046 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0); 2100 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0);
2047 SvREFCNT_dec (data); /* magicext increases the refcount */ 2101 SvREFCNT_dec (data); /* magicext increases the refcount */
2048 2102
2049 SvREFCNT_dec (coro->rouse_cb); 2103 SvREFCNT_dec (coro->rouse_cb);
… …
2290 2344
2291 PL_op->op_ppaddr = pp_slf; 2345 PL_op->op_ppaddr = pp_slf;
2292 /*PL_op->op_type = OP_CUSTOM; /* we do behave like entersub still */ 2346 /*PL_op->op_type = OP_CUSTOM; /* we do behave like entersub still */
2293 2347
2294 PL_op = (OP *)&slf_restore; 2348 PL_op = (OP *)&slf_restore;
2349}
2350
2351/*****************************************************************************/
2352/* dynamic wind */
2353
2354static void
2355on_enterleave_call (pTHX_ SV *cb)
2356{
2357 dSP;
2358
2359 PUSHSTACK;
2360
2361 PUSHMARK (SP);
2362 PUTBACK;
2363 call_sv (cb, G_VOID | G_DISCARD);
2364 SPAGAIN;
2365
2366 POPSTACK;
2367}
2368
2369static SV *
2370coro_avp_pop_and_free (pTHX_ AV **avp)
2371{
2372 AV *av = *avp;
2373 SV *res = av_pop (av);
2374
2375 if (AvFILLp (av) < 0)
2376 {
2377 *avp = 0;
2378 SvREFCNT_dec (av);
2379 }
2380
2381 return res;
2382}
2383
2384static void
2385coro_pop_on_enter (pTHX_ void *coro)
2386{
2387 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_enter);
2388 SvREFCNT_dec (cb);
2389}
2390
2391static void
2392coro_pop_on_leave (pTHX_ void *coro)
2393{
2394 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2395 on_enterleave_call (aTHX_ sv_2mortal (cb));
2295} 2396}
2296 2397
2297/*****************************************************************************/ 2398/*****************************************************************************/
2298/* PerlIO::cede */ 2399/* PerlIO::cede */
2299 2400
… …
2373/* Coro::Semaphore & Coro::Signal */ 2474/* Coro::Semaphore & Coro::Signal */
2374 2475
2375static SV * 2476static SV *
2376coro_waitarray_new (pTHX_ int count) 2477coro_waitarray_new (pTHX_ int count)
2377{ 2478{
2378 /* a semaphore contains a counter IV in $sem->[0] and any waiters after that */ 2479 /* a waitarray=semaphore contains a counter IV in $sem->[0] and any waiters after that */
2379 AV *av = newAV (); 2480 AV *av = newAV ();
2380 SV **ary; 2481 SV **ary;
2381 2482
2382 /* unfortunately, building manually saves memory */ 2483 /* unfortunately, building manually saves memory */
2383 Newx (ary, 2, SV *); 2484 Newx (ary, 2, SV *);
… …
2525{ 2626{
2526 if (items >= 2) 2627 if (items >= 2)
2527 { 2628 {
2528 /* callback form */ 2629 /* callback form */
2529 AV *av = (AV *)SvRV (arg [0]); 2630 AV *av = (AV *)SvRV (arg [0]);
2530 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 2631 SV *cb_cv = s_get_cv_croak (arg [1]);
2531 2632
2532 av_push (av, (SV *)SvREFCNT_inc_NN (cb_cv)); 2633 av_push (av, SvREFCNT_inc_NN (cb_cv));
2533 2634
2534 if (SvIVX (AvARRAY (av)[0]) > 0) 2635 if (SvIVX (AvARRAY (av)[0]) > 0)
2535 coro_semaphore_adjust (aTHX_ av, 0); 2636 coro_semaphore_adjust (aTHX_ av, 0);
2536 2637
2537 frame->prepare = prepare_nop; 2638 frame->prepare = prepare_nop;
… …
2561 AvARRAY (av)[0] = AvARRAY (av)[1]; 2662 AvARRAY (av)[0] = AvARRAY (av)[1];
2562 AvARRAY (av)[1] = cb; 2663 AvARRAY (av)[1] = cb;
2563 2664
2564 cb = av_shift (av); 2665 cb = av_shift (av);
2565 2666
2667 if (SvTYPE (cb) == SVt_PVCV)
2668 {
2669 dSP;
2670 PUSHMARK (SP);
2671 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2672 PUTBACK;
2673 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2674 }
2675 else
2676 {
2566 api_ready (aTHX_ cb); 2677 api_ready (aTHX_ cb);
2567 sv_setiv (cb, 0); /* signal waiter */ 2678 sv_setiv (cb, 0); /* signal waiter */
2679 }
2680
2568 SvREFCNT_dec (cb); 2681 SvREFCNT_dec (cb);
2569 2682
2570 --count; 2683 --count;
2571 } 2684 }
2572} 2685}
… …
2581static void 2694static void
2582slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2695slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2583{ 2696{
2584 AV *av = (AV *)SvRV (arg [0]); 2697 AV *av = (AV *)SvRV (arg [0]);
2585 2698
2699 if (items >= 2)
2700 {
2701 SV *cb_cv = s_get_cv_croak (arg [1]);
2702 av_push (av, SvREFCNT_inc_NN (cb_cv));
2703
2586 if (SvIVX (AvARRAY (av)[0])) 2704 if (SvIVX (AvARRAY (av)[0]))
2705 coro_signal_wake (aTHX_ av, 1); /* ust be the only waiter */
2706
2707 frame->prepare = prepare_nop;
2708 frame->check = slf_check_nop;
2709 }
2710 else if (SvIVX (AvARRAY (av)[0]))
2587 { 2711 {
2588 SvIVX (AvARRAY (av)[0]) = 0; 2712 SvIVX (AvARRAY (av)[0]) = 0;
2589 frame->prepare = prepare_nop; 2713 frame->prepare = prepare_nop;
2590 frame->check = slf_check_nop; 2714 frame->check = slf_check_nop;
2591 } 2715 }
2592 else 2716 else
2593 { 2717 {
2594 SV *waiter = newRV_inc (SvRV (coro_current)); /* owned by signal av */ 2718 SV *waiter = newSVsv (coro_current); /* owned by signal av */
2595 2719
2596 av_push (av, waiter); 2720 av_push (av, waiter);
2597 2721
2598 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */ 2722 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */
2599 frame->prepare = prepare_schedule; 2723 frame->prepare = prepare_schedule;
… …
2617 2741
2618static void 2742static void
2619coro_aio_callback (pTHX_ CV *cv) 2743coro_aio_callback (pTHX_ CV *cv)
2620{ 2744{
2621 dXSARGS; 2745 dXSARGS;
2622 AV *state = (AV *)GENSUB_ARG; 2746 AV *state = (AV *)S_GENSUB_ARG;
2623 SV *coro = av_pop (state); 2747 SV *coro = av_pop (state);
2624 SV *data_sv = newSV (sizeof (struct io_state)); 2748 SV *data_sv = newSV (sizeof (struct io_state));
2625 2749
2626 av_extend (state, items - 1); 2750 av_extend (state, items - 1);
2627 2751
… …
2741 2865
2742 for (i = 0; i < items; ++i) 2866 for (i = 0; i < items; ++i)
2743 PUSHs (arg [i]); 2867 PUSHs (arg [i]);
2744 2868
2745 /* now push the callback closure */ 2869 /* now push the callback closure */
2746 PUSHs (sv_2mortal (gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state)))); 2870 PUSHs (sv_2mortal (s_gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state))));
2747 2871
2748 /* now call the AIO function - we assume our request is uncancelable */ 2872 /* now call the AIO function - we assume our request is uncancelable */
2749 PUTBACK; 2873 PUTBACK;
2750 call_sv ((SV *)req, G_VOID | G_DISCARD); 2874 call_sv ((SV *)req, G_VOID | G_DISCARD);
2751 } 2875 }
… …
2838 2962
2839 if (!svp) croak ("Time::HiRes is required"); 2963 if (!svp) croak ("Time::HiRes is required");
2840 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer"); 2964 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
2841 2965
2842 nvtime = INT2PTR (double (*)(), SvIV (*svp)); 2966 nvtime = INT2PTR (double (*)(), SvIV (*svp));
2967
2968 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
2969 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
2843 } 2970 }
2844 2971
2845 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 2972 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
2846} 2973}
2847 2974
2848SV * 2975SV *
2849new (char *klass, ...) 2976new (char *klass, ...)
2850 ALIAS: 2977 ALIAS:
… …
2852 CODE: 2979 CODE:
2853{ 2980{
2854 struct coro *coro; 2981 struct coro *coro;
2855 MAGIC *mg; 2982 MAGIC *mg;
2856 HV *hv; 2983 HV *hv;
2857 CV *cb; 2984 SV *cb;
2858 int i; 2985 int i;
2859 2986
2860 if (items > 1) 2987 if (items > 1)
2861 { 2988 {
2862 cb = coro_sv_2cv (aTHX_ ST (1)); 2989 cb = s_get_cv_croak (ST (1));
2863 2990
2864 if (!ix) 2991 if (!ix)
2865 { 2992 {
2866 if (CvISXSUB (cb)) 2993 if (CvISXSUB (cb))
2867 croak ("Coro::State doesn't support XS functions as coroutine start, caught"); 2994 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
… …
2889 av_extend (coro->args, items - 1 + ix - 1); 3016 av_extend (coro->args, items - 1 + ix - 1);
2890 3017
2891 if (ix) 3018 if (ix)
2892 { 3019 {
2893 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb)); 3020 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
2894 cb = cv_coro_run; 3021 cb = (SV *)cv_coro_run;
2895 } 3022 }
2896 3023
2897 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb); 3024 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
2898 3025
2899 for (i = 2; i < items; i++) 3026 for (i = 2; i < items; i++)
… …
2925SV * 3052SV *
2926clone (Coro::State coro) 3053clone (Coro::State coro)
2927 CODE: 3054 CODE:
2928{ 3055{
2929#if CORO_CLONE 3056#if CORO_CLONE
2930 struct coro *ncoro = coro_clone (coro); 3057 struct coro *ncoro = coro_clone (aTHX_ coro);
2931 MAGIC *mg; 3058 MAGIC *mg;
2932 /* TODO: too much duplication */ 3059 /* TODO: too much duplication */
2933 ncoro->hv = newHV (); 3060 ncoro->hv = newHV ();
2934 mg = sv_magicext ((SV *)ncoro->hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)ncoro, 0); 3061 mg = sv_magicext ((SV *)ncoro->hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)ncoro, 0);
2935 mg->mg_flags |= MGf_DUP; 3062 mg->mg_flags |= MGf_DUP;
… …
2997 eval = 1 3124 eval = 1
2998 CODE: 3125 CODE:
2999{ 3126{
3000 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3127 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
3001 { 3128 {
3002 struct coro temp; 3129 struct coro *current = SvSTATE_current;
3003 3130
3004 if (!(coro->flags & CF_RUNNING)) 3131 if (current != coro)
3005 { 3132 {
3006 PUTBACK; 3133 PUTBACK;
3007 save_perl (aTHX_ &temp); 3134 save_perl (aTHX_ current);
3008 load_perl (aTHX_ coro); 3135 load_perl (aTHX_ coro);
3136 SPAGAIN;
3009 } 3137 }
3010 3138
3011 {
3012 dSP;
3013 ENTER;
3014 SAVETMPS;
3015 PUTBACK;
3016 PUSHSTACK; 3139 PUSHSTACK;
3140
3017 PUSHMARK (SP); 3141 PUSHMARK (SP);
3142 PUTBACK;
3018 3143
3019 if (ix) 3144 if (ix)
3020 eval_sv (coderef, 0); 3145 eval_sv (coderef, 0);
3021 else 3146 else
3022 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 3147 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
3023 3148
3024 POPSTACK; 3149 POPSTACK;
3025 SPAGAIN; 3150 SPAGAIN;
3026 FREETMPS;
3027 LEAVE;
3028 PUTBACK;
3029 }
3030 3151
3031 if (!(coro->flags & CF_RUNNING)) 3152 if (current != coro)
3032 { 3153 {
3154 PUTBACK;
3033 save_perl (aTHX_ coro); 3155 save_perl (aTHX_ coro);
3034 load_perl (aTHX_ &temp); 3156 load_perl (aTHX_ current);
3035 SPAGAIN; 3157 SPAGAIN;
3036 } 3158 }
3037 } 3159 }
3038} 3160}
3039 3161
… …
3043 ALIAS: 3165 ALIAS:
3044 is_ready = CF_READY 3166 is_ready = CF_READY
3045 is_running = CF_RUNNING 3167 is_running = CF_RUNNING
3046 is_new = CF_NEW 3168 is_new = CF_NEW
3047 is_destroyed = CF_DESTROYED 3169 is_destroyed = CF_DESTROYED
3170 is_suspended = CF_SUSPENDED
3048 CODE: 3171 CODE:
3049 RETVAL = boolSV (coro->flags & ix); 3172 RETVAL = boolSV (coro->flags & ix);
3050 OUTPUT: 3173 OUTPUT:
3051 RETVAL 3174 RETVAL
3052 3175
… …
3056 CODE: 3179 CODE:
3057{ 3180{
3058 struct coro *current = SvSTATE_current; 3181 struct coro *current = SvSTATE_current;
3059 SV **throwp = self == current ? &CORO_THROW : &self->except; 3182 SV **throwp = self == current ? &CORO_THROW : &self->except;
3060 SvREFCNT_dec (*throwp); 3183 SvREFCNT_dec (*throwp);
3184 SvGETMAGIC (throw);
3061 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3185 *throwp = SvOK (throw) ? newSVsv (throw) : 0;
3062} 3186}
3063 3187
3064void 3188void
3065api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3189api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
… …
3117 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv; 3241 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
3118 3242
3119 SV *tmp = *src; *src = *dst; *dst = tmp; 3243 SV *tmp = *src; *src = *dst; *dst = tmp;
3120 } 3244 }
3121 3245
3246void
3247cancel (Coro::State self)
3248 CODE:
3249 coro_state_destroy (aTHX_ self);
3250 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */
3251
3252
3253SV *
3254enable_times (int enabled = enable_times)
3255 CODE:
3256{
3257 RETVAL = boolSV (enable_times);
3258
3259 if (enabled != enable_times)
3260 {
3261 enable_times = enabled;
3262
3263 coro_times_update ();
3264 (enabled ? coro_times_sub : coro_times_add)(SvSTATE (coro_current));
3265 }
3266}
3267 OUTPUT:
3268 RETVAL
3269
3270void
3271times (Coro::State self)
3272 PPCODE:
3273{
3274 struct coro *current = SvSTATE (coro_current);
3275
3276 if (expect_false (current == self))
3277 {
3278 coro_times_update ();
3279 coro_times_add (SvSTATE (coro_current));
3280 }
3281
3282 EXTEND (SP, 2);
3283 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3284 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3285
3286 if (expect_false (current == self))
3287 coro_times_sub (SvSTATE (coro_current));
3288}
3122 3289
3123MODULE = Coro::State PACKAGE = Coro 3290MODULE = Coro::State PACKAGE = Coro
3124 3291
3125BOOT: 3292BOOT:
3126{ 3293{
3127 int i;
3128
3129 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3294 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3130 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3295 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3131 cv_coro_run = get_cv ( "Coro::_terminate", GV_ADD); 3296 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3132 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD); 3297 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3133 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 3298 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3134 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 3299 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3135 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 3300 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3136 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 3301 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
… …
3141 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 3306 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3142 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new); 3307 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new);
3143 3308
3144 coro_stash = gv_stashpv ("Coro", TRUE); 3309 coro_stash = gv_stashpv ("Coro", TRUE);
3145 3310
3146 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 3311 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3147 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 3312 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3148 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 3313 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
3149 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 3314 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (CORO_PRIO_LOW));
3150 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE)); 3315 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (CORO_PRIO_IDLE));
3151 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN)); 3316 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (CORO_PRIO_MIN));
3152
3153 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
3154 coro_ready[i] = newAV ();
3155 3317
3156 { 3318 {
3157 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 3319 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
3158 3320
3159 coroapi.schedule = api_schedule; 3321 coroapi.schedule = api_schedule;
… …
3200cede_notself (...) 3362cede_notself (...)
3201 CODE: 3363 CODE:
3202 CORO_EXECUTE_SLF_XS (slf_init_cede_notself); 3364 CORO_EXECUTE_SLF_XS (slf_init_cede_notself);
3203 3365
3204void 3366void
3205_cancel (Coro::State self)
3206 CODE:
3207 coro_state_destroy (aTHX_ self);
3208 coro_call_on_destroy (aTHX_ self);
3209
3210void
3211_set_current (SV *current) 3367_set_current (SV *current)
3212 PROTOTYPE: $ 3368 PROTOTYPE: $
3213 CODE: 3369 CODE:
3214 SvREFCNT_dec (SvRV (coro_current)); 3370 SvREFCNT_dec (SvRV (coro_current));
3215 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current))); 3371 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
… …
3217void 3373void
3218_set_readyhook (SV *hook) 3374_set_readyhook (SV *hook)
3219 PROTOTYPE: $ 3375 PROTOTYPE: $
3220 CODE: 3376 CODE:
3221 SvREFCNT_dec (coro_readyhook); 3377 SvREFCNT_dec (coro_readyhook);
3378 SvGETMAGIC (hook);
3222 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0; 3379 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0;
3223 3380
3224int 3381int
3225prio (Coro::State coro, int newprio = 0) 3382prio (Coro::State coro, int newprio = 0)
3226 PROTOTYPE: $;$ 3383 PROTOTYPE: $;$
… …
3233 if (items > 1) 3390 if (items > 1)
3234 { 3391 {
3235 if (ix) 3392 if (ix)
3236 newprio = coro->prio - newprio; 3393 newprio = coro->prio - newprio;
3237 3394
3238 if (newprio < PRIO_MIN) newprio = PRIO_MIN; 3395 if (newprio < CORO_PRIO_MIN) newprio = CORO_PRIO_MIN;
3239 if (newprio > PRIO_MAX) newprio = PRIO_MAX; 3396 if (newprio > CORO_PRIO_MAX) newprio = CORO_PRIO_MAX;
3240 3397
3241 coro->prio = newprio; 3398 coro->prio = newprio;
3242 } 3399 }
3243} 3400}
3244 OUTPUT: 3401 OUTPUT:
… …
3257 PROTOTYPE: 3414 PROTOTYPE:
3258 CODE: 3415 CODE:
3259 RETVAL = coro_nready; 3416 RETVAL = coro_nready;
3260 OUTPUT: 3417 OUTPUT:
3261 RETVAL 3418 RETVAL
3419
3420void
3421suspend (Coro::State self)
3422 PROTOTYPE: $
3423 CODE:
3424 self->flags |= CF_SUSPENDED;
3425
3426void
3427resume (Coro::State self)
3428 PROTOTYPE: $
3429 CODE:
3430 self->flags &= ~CF_SUSPENDED;
3262 3431
3263void 3432void
3264_pool_handler (...) 3433_pool_handler (...)
3265 CODE: 3434 CODE:
3266 CORO_EXECUTE_SLF_XS (slf_init_pool_handler); 3435 CORO_EXECUTE_SLF_XS (slf_init_pool_handler);
… …
3321rouse_wait (...) 3490rouse_wait (...)
3322 PROTOTYPE: ;$ 3491 PROTOTYPE: ;$
3323 PPCODE: 3492 PPCODE:
3324 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait); 3493 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait);
3325 3494
3495void
3496on_enter (SV *block)
3497 ALIAS:
3498 on_leave = 1
3499 PROTOTYPE: &
3500 CODE:
3501{
3502 struct coro *coro = SvSTATE_current;
3503 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3504
3505 block = s_get_cv_croak (block);
3506
3507 if (!*avp)
3508 *avp = newAV ();
3509
3510 av_push (*avp, SvREFCNT_inc (block));
3511
3512 if (!ix)
3513 on_enterleave_call (aTHX_ block);
3514
3515 LEAVE; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
3516 SAVEDESTRUCTOR_X (ix ? coro_pop_on_leave : coro_pop_on_enter, (void *)coro);
3517 ENTER; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
3518}
3519
3326 3520
3327MODULE = Coro::State PACKAGE = PerlIO::cede 3521MODULE = Coro::State PACKAGE = PerlIO::cede
3328 3522
3329BOOT: 3523BOOT:
3330 PerlIO_define_layer (aTHX_ &PerlIO_cede); 3524 PerlIO_define_layer (aTHX_ &PerlIO_cede);
… …
3333MODULE = Coro::State PACKAGE = Coro::Semaphore 3527MODULE = Coro::State PACKAGE = Coro::Semaphore
3334 3528
3335SV * 3529SV *
3336new (SV *klass, SV *count = 0) 3530new (SV *klass, SV *count = 0)
3337 CODE: 3531 CODE:
3532{
3533 int semcnt = 1;
3534
3535 if (count)
3536 {
3537 SvGETMAGIC (count);
3538
3539 if (SvOK (count))
3540 semcnt = SvIV (count);
3541 }
3542
3338 RETVAL = sv_bless ( 3543 RETVAL = sv_bless (
3339 coro_waitarray_new (aTHX_ count && SvOK (count) ? SvIV (count) : 1), 3544 coro_waitarray_new (aTHX_ semcnt),
3340 GvSTASH (CvGV (cv)) 3545 GvSTASH (CvGV (cv))
3341 ); 3546 );
3547}
3342 OUTPUT: 3548 OUTPUT:
3343 RETVAL 3549 RETVAL
3344 3550
3345# helper for Coro::Channel 3551# helper for Coro::Channel and others
3346SV * 3552SV *
3347_alloc (int count) 3553_alloc (int count)
3348 CODE: 3554 CODE:
3349 RETVAL = coro_waitarray_new (aTHX_ count); 3555 RETVAL = coro_waitarray_new (aTHX_ count);
3350 OUTPUT: 3556 OUTPUT:
… …
3408 for (i = 1; i <= wcount; ++i) 3614 for (i = 1; i <= wcount; ++i)
3409 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i]))); 3615 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i])));
3410 } 3616 }
3411} 3617}
3412 3618
3619MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3620
3621void
3622_may_delete (SV *sem, int count, int extra_refs)
3623 PPCODE:
3624{
3625 AV *av = (AV *)SvRV (sem);
3626
3627 if (SvREFCNT ((SV *)av) == 1 + extra_refs
3628 && AvFILLp (av) == 0 /* no waiters, just count */
3629 && SvIV (AvARRAY (av)[0]) == count)
3630 XSRETURN_YES;
3631
3632 XSRETURN_NO;
3633}
3634
3413MODULE = Coro::State PACKAGE = Coro::Signal 3635MODULE = Coro::State PACKAGE = Coro::Signal
3414 3636
3415SV * 3637SV *
3416new (SV *klass) 3638new (SV *klass)
3417 CODE: 3639 CODE:
… …
3488 3710
3489void 3711void
3490_register (char *target, char *proto, SV *req) 3712_register (char *target, char *proto, SV *req)
3491 CODE: 3713 CODE:
3492{ 3714{
3493 CV *req_cv = coro_sv_2cv (aTHX_ req); 3715 SV *req_cv = s_get_cv_croak (req);
3494 /* newXSproto doesn't return the CV on 5.8 */ 3716 /* newXSproto doesn't return the CV on 5.8 */
3495 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 3717 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3496 sv_setpv ((SV *)slf_cv, proto); 3718 sv_setpv ((SV *)slf_cv, proto);
3497 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0); 3719 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
3498} 3720}

Diff Legend

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