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.335 by root, Thu Dec 4 04:31:41 2008 UTC vs.
Revision 1.365 by root, Mon Jul 20 16:18:30 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
287
288/** Coro::Select ************************************************************/
289
290static OP *(*coro_old_pp_sselect) (pTHX);
291static SV *coro_select_select;
292
293/* horrible hack, but if it works... */
294static OP *
295coro_pp_sselect (aTHX)
296{
297 dSP;
298 PUSHMARK (SP - 4); /* fake argument list */
299 XPUSHs (coro_select_select);
300 PUTBACK;
301
302 /* entersub is an UNOP, select a LISTOP... keep your fingers crossed */
303 PL_op->op_flags |= OPf_STACKED;
304 PL_op->op_private = 0;
305 return PL_ppaddr [OP_ENTERSUB](aTHX);
306}
318 307
319/** lowlevel stuff **********************************************************/ 308/** lowlevel stuff **********************************************************/
320 309
321static SV * 310static SV *
322coro_get_sv (pTHX_ const char *name, int create) 311coro_get_sv (pTHX_ const char *name, int create)
… …
346 get_hv (name, create); 335 get_hv (name, create);
347#endif 336#endif
348 return get_hv (name, create); 337 return get_hv (name, create);
349} 338}
350 339
351/* may croak */ 340INLINE void
352INLINE CV * 341coro_times_update ()
353coro_sv_2cv (pTHX_ SV *sv)
354{ 342{
355 HV *st; 343#ifdef coro_clock_gettime
356 GV *gvp; 344 struct timespec ts;
357 return sv_2cv (sv, &st, &gvp, 0); 345
346 ts.tv_sec = ts.tv_nsec = 0;
347 coro_clock_gettime (CORO_CLOCK_THREAD_CPUTIME_ID, &ts);
348 time_cpu [0] = ts.tv_sec; time_cpu [1] = ts.tv_nsec;
349
350 ts.tv_sec = ts.tv_nsec = 0;
351 coro_clock_gettime (CORO_CLOCK_MONOTONIC, &ts);
352 time_real [0] = ts.tv_sec; time_real [1] = ts.tv_nsec;
353#else
354 dTHX;
355 UV tv[2];
356
357 u2time (aTHX_ tv);
358 time_real [0] = tv [0];
359 time_real [1] = tv [1] * 1000;
360#endif
361}
362
363INLINE void
364coro_times_add (struct coro *c)
365{
366 c->t_real [1] += time_real [1];
367 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
368 c->t_real [0] += time_real [0];
369
370 c->t_cpu [1] += time_cpu [1];
371 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
372 c->t_cpu [0] += time_cpu [0];
373}
374
375INLINE void
376coro_times_sub (struct coro *c)
377{
378 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; }
379 c->t_real [1] -= time_real [1];
380 c->t_real [0] -= time_real [0];
381
382 if (c->t_cpu [1] < time_cpu [1]) { c->t_cpu [1] += 1000000000; --c->t_cpu [0]; }
383 c->t_cpu [1] -= time_cpu [1];
384 c->t_cpu [0] -= time_cpu [0];
358} 385}
359 386
360/*****************************************************************************/ 387/*****************************************************************************/
361/* magic glue */ 388/* magic glue */
362 389
… …
462static int 489static int
463coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 490coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
464{ 491{
465 AV *padlist; 492 AV *padlist;
466 AV *av = (AV *)mg->mg_obj; 493 AV *av = (AV *)mg->mg_obj;
494
495 /* perl manages to free our internal AV and _then_ call us */
496 if (IN_DESTRUCT)
497 return 0;
467 498
468 /* casting is fun. */ 499 /* casting is fun. */
469 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 500 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
470 free_padlist (aTHX_ padlist); 501 free_padlist (aTHX_ padlist);
471 502
… …
521} 552}
522 553
523/** load & save, init *******************************************************/ 554/** load & save, init *******************************************************/
524 555
525static void 556static void
557on_enterleave_call (pTHX_ SV *cb);
558
559static void
526load_perl (pTHX_ Coro__State c) 560load_perl (pTHX_ Coro__State c)
527{ 561{
528 perl_slots *slot = c->slot; 562 perl_slots *slot = c->slot;
529 c->slot = 0; 563 c->slot = 0;
530 564
… …
556 PUTBACK; 590 PUTBACK;
557 } 591 }
558 592
559 slf_frame = c->slf_frame; 593 slf_frame = c->slf_frame;
560 CORO_THROW = c->except; 594 CORO_THROW = c->except;
595
596 if (expect_false (enable_times))
597 {
598 if (expect_false (!times_valid))
599 coro_times_update ();
600
601 coro_times_sub (c);
602 }
603
604 if (expect_false (c->on_enter))
605 {
606 int i;
607
608 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
609 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
610 }
561} 611}
562 612
563static void 613static void
564save_perl (pTHX_ Coro__State c) 614save_perl (pTHX_ Coro__State c)
565{ 615{
616 if (expect_false (c->on_leave))
617 {
618 int i;
619
620 for (i = AvFILLp (c->on_leave); i >= 0; --i)
621 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
622 }
623
624 times_valid = 0;
625
626 if (expect_false (enable_times))
627 {
628 coro_times_update (); times_valid = 1;
629 coro_times_add (c);
630 }
631
566 c->except = CORO_THROW; 632 c->except = CORO_THROW;
567 c->slf_frame = slf_frame; 633 c->slf_frame = slf_frame;
568 634
569 { 635 {
570 dSP; 636 dSP;
… …
583 { 649 {
584 while (expect_true (cxix >= 0)) 650 while (expect_true (cxix >= 0))
585 { 651 {
586 PERL_CONTEXT *cx = &ccstk[cxix--]; 652 PERL_CONTEXT *cx = &ccstk[cxix--];
587 653
588 if (expect_true (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT)) 654 if (expect_true (CxTYPE (cx) == CXt_SUB) || expect_false (CxTYPE (cx) == CXt_FORMAT))
589 { 655 {
590 CV *cv = cx->blk_sub.cv; 656 CV *cv = cx->blk_sub.cv;
591 657
592 if (expect_true (CvDEPTH (cv))) 658 if (expect_true (CvDEPTH (cv)))
593 { 659 {
… …
617 /* we manually unroll here, as usually 2 slots is enough */ 683 /* we manually unroll here, as usually 2 slots is enough */
618 if (SLOT_COUNT >= 1) CXINC; 684 if (SLOT_COUNT >= 1) CXINC;
619 if (SLOT_COUNT >= 2) CXINC; 685 if (SLOT_COUNT >= 2) CXINC;
620 if (SLOT_COUNT >= 3) CXINC; 686 if (SLOT_COUNT >= 3) CXINC;
621 { 687 {
622 int i; 688 unsigned int i;
623 for (i = 3; i < SLOT_COUNT; ++i) 689 for (i = 3; i < SLOT_COUNT; ++i)
624 CXINC; 690 CXINC;
625 } 691 }
626 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 692 cxstack_ix -= SLOT_COUNT; /* undo allocation */
627 693
… …
769#endif 835#endif
770 836
771/* 837/*
772 * This overrides the default magic get method of %SIG elements. 838 * 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 839 * 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 840 * and instead of trying to save and restore the hash elements, we just provide
775 * readback here. 841 * 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 */ 842 */
780static int 843static int
781coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 844coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
782{ 845{
783 const char *s = MgPV_nolen_const (mg); 846 const char *s = MgPV_nolen_const (mg);
… …
836 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 899 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
837 900
838 if (svp) 901 if (svp)
839 { 902 {
840 SV *old = *svp; 903 SV *old = *svp;
841 *svp = newSVsv (sv); 904 *svp = SvOK (sv) ? newSVsv (sv) : 0;
842 SvREFCNT_dec (old); 905 SvREFCNT_dec (old);
843 return 0; 906 return 0;
844 } 907 }
845 } 908 }
846 909
… …
935 998
936 PL_op = (OP *)&coro_setup_op; 999 PL_op = (OP *)&coro_setup_op;
937 1000
938 /* copy throw, in case it was set before coro_setup */ 1001 /* copy throw, in case it was set before coro_setup */
939 CORO_THROW = coro->except; 1002 CORO_THROW = coro->except;
940}
941 1003
1004 if (expect_false (enable_times))
1005 {
1006 coro_times_update ();
1007 coro_times_sub (coro);
1008 }
1009}
1010
942static void 1011static void
943coro_destruct_perl (pTHX_ struct coro *coro) 1012coro_unwind_stacks (pTHX)
944{ 1013{
945 if (!IN_DESTRUCT) 1014 if (!IN_DESTRUCT)
946 { 1015 {
947 /* restore all saved variables and stuff */ 1016 /* restore all saved variables and stuff */
948 LEAVE_SCOPE (0); 1017 LEAVE_SCOPE (0);
… …
956 POPSTACK_TO (PL_mainstack); 1025 POPSTACK_TO (PL_mainstack);
957 1026
958 /* unwind main stack */ 1027 /* unwind main stack */
959 dounwind (-1); 1028 dounwind (-1);
960 } 1029 }
1030}
961 1031
962 SvREFCNT_dec (GvSV (PL_defgv)); 1032static void
963 SvREFCNT_dec (GvAV (PL_defgv)); 1033coro_destruct_perl (pTHX_ struct coro *coro)
964 SvREFCNT_dec (GvSV (PL_errgv)); 1034{
965 SvREFCNT_dec (PL_defoutgv); 1035 SV *svf [9];
966 SvREFCNT_dec (PL_rs);
967 SvREFCNT_dec (GvSV (irsgv));
968 SvREFCNT_dec (GvHV (PL_hintgv));
969 1036
970 SvREFCNT_dec (PL_diehook);
971 SvREFCNT_dec (PL_warnhook);
972 1037 {
1038 struct coro *current = SvSTATE_current;
1039
1040 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1041
1042 save_perl (aTHX_ current);
1043 load_perl (aTHX_ coro);
1044
1045 coro_unwind_stacks (aTHX);
1046 coro_destruct_stacks (aTHX);
1047
1048 // now save some sv's to be free'd later
1049 svf [0] = GvSV (PL_defgv);
1050 svf [1] = (SV *)GvAV (PL_defgv);
1051 svf [2] = GvSV (PL_errgv);
1052 svf [3] = (SV *)PL_defoutgv;
1053 svf [4] = PL_rs;
1054 svf [5] = GvSV (irsgv);
1055 svf [6] = (SV *)GvHV (PL_hintgv);
1056 svf [7] = PL_diehook;
1057 svf [8] = PL_warnhook;
1058 assert (9 == sizeof (svf) / sizeof (*svf));
1059
1060 load_perl (aTHX_ current);
1061 }
1062
1063 {
1064 unsigned int i;
1065
1066 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i)
1067 SvREFCNT_dec (svf [i]);
1068
973 SvREFCNT_dec (coro->saved_deffh); 1069 SvREFCNT_dec (coro->saved_deffh);
974 SvREFCNT_dec (coro->rouse_cb); 1070 SvREFCNT_dec (coro->rouse_cb);
975 SvREFCNT_dec (coro->invoke_cb); 1071 SvREFCNT_dec (coro->invoke_cb);
976 SvREFCNT_dec (coro->invoke_av); 1072 SvREFCNT_dec (coro->invoke_av);
977 1073 }
978 coro_destruct_stacks (aTHX);
979} 1074}
980 1075
981INLINE void 1076INLINE void
982free_coro_mortal (pTHX) 1077free_coro_mortal (pTHX)
983{ 1078{
… …
1277cctx_destroy (coro_cctx *cctx) 1372cctx_destroy (coro_cctx *cctx)
1278{ 1373{
1279 if (!cctx) 1374 if (!cctx)
1280 return; 1375 return;
1281 1376
1282 assert (cctx != cctx_current);//D temporary 1377 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary?
1283 1378
1284 --cctx_count; 1379 --cctx_count;
1285 coro_destroy (&cctx->cctx); 1380 coro_destroy (&cctx->cctx);
1286 1381
1287 /* coro_transfer creates new, empty cctx's */ 1382 /* coro_transfer creates new, empty cctx's */
… …
1351 /* TODO: throwing up here is considered harmful */ 1446 /* TODO: throwing up here is considered harmful */
1352 1447
1353 if (expect_true (prev != next)) 1448 if (expect_true (prev != next))
1354 { 1449 {
1355 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1450 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,"); 1451 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1357 1452
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)) 1453 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,"); 1454 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1363 1455
1364#if !PERL_VERSION_ATLEAST (5,10,0) 1456#if !PERL_VERSION_ATLEAST (5,10,0)
1365 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1457 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,"); 1458 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1367#endif 1459#endif
… …
1405 coro_setup (aTHX_ next); 1497 coro_setup (aTHX_ next);
1406 } 1498 }
1407 else 1499 else
1408 load_perl (aTHX_ next); 1500 load_perl (aTHX_ next);
1409 1501
1410 assert (!prev->cctx);//D temporary
1411
1412 /* possibly untie and reuse the cctx */ 1502 /* possibly untie and reuse the cctx */
1413 if (expect_true ( 1503 if (expect_true (
1414 cctx_current->idle_sp == STACKLEVEL 1504 cctx_current->idle_sp == STACKLEVEL
1415 && !(cctx_current->flags & CC_TRACE) 1505 && !(cctx_current->flags & CC_TRACE)
1416 && !force_cctx 1506 && !force_cctx
… …
1457coro_state_destroy (pTHX_ struct coro *coro) 1547coro_state_destroy (pTHX_ struct coro *coro)
1458{ 1548{
1459 if (coro->flags & CF_DESTROYED) 1549 if (coro->flags & CF_DESTROYED)
1460 return 0; 1550 return 0;
1461 1551
1462 if (coro->on_destroy) 1552 if (coro->on_destroy && !PL_dirty)
1463 coro->on_destroy (aTHX_ coro); 1553 coro->on_destroy (aTHX_ coro);
1464 1554
1465 coro->flags |= CF_DESTROYED; 1555 coro->flags |= CF_DESTROYED;
1466 1556
1467 if (coro->flags & CF_READY) 1557 if (coro->flags & CF_READY)
… …
1473 else 1563 else
1474 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1564 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1475 1565
1476 if (coro->mainstack 1566 if (coro->mainstack
1477 && coro->mainstack != main_mainstack 1567 && coro->mainstack != main_mainstack
1568 && coro->slot
1478 && !PL_dirty) 1569 && !PL_dirty)
1479 {
1480 struct coro temp;
1481
1482 assert (("FATAL: tried to destroy currently running coroutine (please report)", !(coro->flags & CF_RUNNING)));
1483
1484 save_perl (aTHX_ &temp);
1485 load_perl (aTHX_ coro);
1486
1487 coro_destruct_perl (aTHX_ coro); 1570 coro_destruct_perl (aTHX_ coro);
1488
1489 load_perl (aTHX_ &temp);
1490
1491 coro->slot = 0;
1492 }
1493 1571
1494 cctx_destroy (coro->cctx); 1572 cctx_destroy (coro->cctx);
1495 SvREFCNT_dec (coro->startcv); 1573 SvREFCNT_dec (coro->startcv);
1496 SvREFCNT_dec (coro->args); 1574 SvREFCNT_dec (coro->args);
1497 SvREFCNT_dec (CORO_THROW); 1575 SvREFCNT_dec (CORO_THROW);
… …
1556 1634
1557 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1635 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1558 TRANSFER (ta, 1); 1636 TRANSFER (ta, 1);
1559} 1637}
1560 1638
1561/*****************************************************************************/
1562/* gensub: simple closure generation utility */
1563
1564#define GENSUB_ARG CvXSUBANY (cv).any_ptr
1565
1566/* create a closure from XS, returns a code reference */
1567/* the arg can be accessed via GENSUB_ARG from the callback */
1568/* the callback must use dXSARGS/XSRETURN */
1569static SV *
1570gensub (pTHX_ void (*xsub)(pTHX_ CV *), void *arg)
1571{
1572 CV *cv = (CV *)newSV (0);
1573
1574 sv_upgrade ((SV *)cv, SVt_PVCV);
1575
1576 CvANON_on (cv);
1577 CvISXSUB_on (cv);
1578 CvXSUB (cv) = xsub;
1579 GENSUB_ARG = arg;
1580
1581 return newRV_noinc ((SV *)cv);
1582}
1583
1584/** Coro ********************************************************************/ 1639/** Coro ********************************************************************/
1585 1640
1586INLINE void 1641INLINE void
1587coro_enq (pTHX_ struct coro *coro) 1642coro_enq (pTHX_ struct coro *coro)
1588{ 1643{
1589 av_push (coro_ready [coro->prio - PRIO_MIN], SvREFCNT_inc_NN (coro->hv)); 1644 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1590}
1591 1645
1592INLINE SV * 1646 SvREFCNT_inc_NN (coro->hv);
1647
1648 coro->next_ready = 0;
1649 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1650 ready [1] = coro;
1651}
1652
1653INLINE struct coro *
1593coro_deq (pTHX) 1654coro_deq (pTHX)
1594{ 1655{
1595 int prio; 1656 int prio;
1596 1657
1597 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; ) 1658 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
1598 if (AvFILLp (coro_ready [prio]) >= 0) 1659 {
1599 return av_shift (coro_ready [prio]); 1660 struct coro **ready = coro_ready [prio];
1661
1662 if (ready [0])
1663 {
1664 struct coro *coro = ready [0];
1665 ready [0] = coro->next_ready;
1666 return coro;
1667 }
1668 }
1600 1669
1601 return 0; 1670 return 0;
1671}
1672
1673static void
1674invoke_sv_ready_hook_helper (void)
1675{
1676 dTHX;
1677 dSP;
1678
1679 ENTER;
1680 SAVETMPS;
1681
1682 PUSHMARK (SP);
1683 PUTBACK;
1684 call_sv (coro_readyhook, G_VOID | G_DISCARD);
1685
1686 FREETMPS;
1687 LEAVE;
1602} 1688}
1603 1689
1604static int 1690static int
1605api_ready (pTHX_ SV *coro_sv) 1691api_ready (pTHX_ SV *coro_sv)
1606{ 1692{
1607 struct coro *coro;
1608 SV *sv_hook;
1609 void (*xs_hook)(void);
1610
1611 coro = SvSTATE (coro_sv); 1693 struct coro *coro = SvSTATE (coro_sv);
1612 1694
1613 if (coro->flags & CF_READY) 1695 if (coro->flags & CF_READY)
1614 return 0; 1696 return 0;
1615 1697
1616 coro->flags |= CF_READY; 1698 coro->flags |= CF_READY;
1617 1699
1618 sv_hook = coro_nready ? 0 : coro_readyhook;
1619 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1620
1621 coro_enq (aTHX_ coro); 1700 coro_enq (aTHX_ coro);
1622 ++coro_nready;
1623 1701
1624 if (sv_hook) 1702 if (!coro_nready++)
1625 { 1703 if (coroapi.readyhook)
1626 dSP; 1704 coroapi.readyhook ();
1627
1628 ENTER;
1629 SAVETMPS;
1630
1631 PUSHMARK (SP);
1632 PUTBACK;
1633 call_sv (sv_hook, G_VOID | G_DISCARD);
1634
1635 FREETMPS;
1636 LEAVE;
1637 }
1638
1639 if (xs_hook)
1640 xs_hook ();
1641 1705
1642 return 1; 1706 return 1;
1643} 1707}
1644 1708
1645static int 1709static int
… …
1668static void 1732static void
1669prepare_schedule (pTHX_ struct coro_transfer_args *ta) 1733prepare_schedule (pTHX_ struct coro_transfer_args *ta)
1670{ 1734{
1671 for (;;) 1735 for (;;)
1672 { 1736 {
1673 SV *next_sv = coro_deq (aTHX); 1737 struct coro *next = coro_deq (aTHX);
1674 1738
1675 if (expect_true (next_sv)) 1739 if (expect_true (next))
1676 { 1740 {
1677 struct coro *next = SvSTATE_hv (next_sv);
1678
1679 /* cannot transfer to destroyed coros, skip and look for next */ 1741 /* cannot transfer to destroyed coros, skip and look for next */
1680 if (expect_false (next->flags & CF_DESTROYED)) 1742 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED)))
1681 SvREFCNT_dec (next_sv); /* coro_nready has already been taken care of by destroy */ 1743 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1682 else 1744 else
1683 { 1745 {
1684 next->flags &= ~CF_READY; 1746 next->flags &= ~CF_READY;
1685 --coro_nready; 1747 --coro_nready;
1686 1748
… …
1864 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */ 1926 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */
1865 api_ready (aTHX_ sv_manager); 1927 api_ready (aTHX_ sv_manager);
1866 1928
1867 frame->prepare = prepare_schedule; 1929 frame->prepare = prepare_schedule;
1868 frame->check = slf_check_repeat; 1930 frame->check = slf_check_repeat;
1931
1932 /* as a minor optimisation, we could unwind all stacks here */
1933 /* but that puts extra pressure on pp_slf, and is not worth much */
1934 /*coro_unwind_stacks (aTHX);*/
1869} 1935}
1870 1936
1871/*****************************************************************************/ 1937/*****************************************************************************/
1872/* async pool handler */ 1938/* async pool handler */
1873 1939
… …
1951 2017
1952static void 2018static void
1953coro_rouse_callback (pTHX_ CV *cv) 2019coro_rouse_callback (pTHX_ CV *cv)
1954{ 2020{
1955 dXSARGS; 2021 dXSARGS;
1956 SV *data = (SV *)GENSUB_ARG; 2022 SV *data = (SV *)S_GENSUB_ARG;
1957 2023
1958 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2024 if (SvTYPE (SvRV (data)) != SVt_PVAV)
1959 { 2025 {
1960 /* first call, set args */ 2026 /* first call, set args */
2027 SV *coro = SvRV (data);
1961 AV *av = newAV (); 2028 AV *av = newAV ();
1962 SV *coro = SvRV (data);
1963 2029
1964 SvRV_set (data, (SV *)av); 2030 SvRV_set (data, (SV *)av);
1965 api_ready (aTHX_ coro);
1966 SvREFCNT_dec (coro);
1967 2031
1968 /* better take a full copy of the arguments */ 2032 /* better take a full copy of the arguments */
1969 while (items--) 2033 while (items--)
1970 av_store (av, items, newSVsv (ST (items))); 2034 av_store (av, items, newSVsv (ST (items)));
2035
2036 api_ready (aTHX_ coro);
2037 SvREFCNT_dec (coro);
1971 } 2038 }
1972 2039
1973 XSRETURN_EMPTY; 2040 XSRETURN_EMPTY;
1974} 2041}
1975 2042
… …
1992 2059
1993 EXTEND (SP, AvFILLp (av) + 1); 2060 EXTEND (SP, AvFILLp (av) + 1);
1994 for (i = 0; i <= AvFILLp (av); ++i) 2061 for (i = 0; i <= AvFILLp (av); ++i)
1995 PUSHs (sv_2mortal (AvARRAY (av)[i])); 2062 PUSHs (sv_2mortal (AvARRAY (av)[i]));
1996 2063
1997 /* we have stolen the elements, so ste length to zero and free */ 2064 /* we have stolen the elements, so set length to zero and free */
1998 AvFILLp (av) = -1; 2065 AvFILLp (av) = -1;
1999 av_undef (av); 2066 av_undef (av);
2000 2067
2001 PUTBACK; 2068 PUTBACK;
2002 } 2069 }
… …
2026 || SvTYPE (SvRV (cb)) != SVt_PVCV 2093 || SvTYPE (SvRV (cb)) != SVt_PVCV
2027 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2094 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2028 croak ("Coro::rouse_wait called with illegal callback argument,"); 2095 croak ("Coro::rouse_wait called with illegal callback argument,");
2029 2096
2030 { 2097 {
2031 CV *cv = (CV *)SvRV (cb); /* for GENSUB_ARG */ 2098 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
2032 SV *data = (SV *)GENSUB_ARG; 2099 SV *data = (SV *)S_GENSUB_ARG;
2033 2100
2034 frame->data = (void *)data; 2101 frame->data = (void *)data;
2035 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule; 2102 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
2036 frame->check = slf_check_rouse_wait; 2103 frame->check = slf_check_rouse_wait;
2037 } 2104 }
… …
2041coro_new_rouse_cb (pTHX) 2108coro_new_rouse_cb (pTHX)
2042{ 2109{
2043 HV *hv = (HV *)SvRV (coro_current); 2110 HV *hv = (HV *)SvRV (coro_current);
2044 struct coro *coro = SvSTATE_hv (hv); 2111 struct coro *coro = SvSTATE_hv (hv);
2045 SV *data = newRV_inc ((SV *)hv); 2112 SV *data = newRV_inc ((SV *)hv);
2046 SV *cb = gensub (aTHX_ coro_rouse_callback, (void *)data); 2113 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
2047 2114
2048 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0); 2115 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0);
2049 SvREFCNT_dec (data); /* magicext increases the refcount */ 2116 SvREFCNT_dec (data); /* magicext increases the refcount */
2050 2117
2051 SvREFCNT_dec (coro->rouse_cb); 2118 SvREFCNT_dec (coro->rouse_cb);
… …
2292 2359
2293 PL_op->op_ppaddr = pp_slf; 2360 PL_op->op_ppaddr = pp_slf;
2294 /*PL_op->op_type = OP_CUSTOM; /* we do behave like entersub still */ 2361 /*PL_op->op_type = OP_CUSTOM; /* we do behave like entersub still */
2295 2362
2296 PL_op = (OP *)&slf_restore; 2363 PL_op = (OP *)&slf_restore;
2364}
2365
2366/*****************************************************************************/
2367/* dynamic wind */
2368
2369static void
2370on_enterleave_call (pTHX_ SV *cb)
2371{
2372 dSP;
2373
2374 PUSHSTACK;
2375
2376 PUSHMARK (SP);
2377 PUTBACK;
2378 call_sv (cb, G_VOID | G_DISCARD);
2379 SPAGAIN;
2380
2381 POPSTACK;
2382}
2383
2384static SV *
2385coro_avp_pop_and_free (pTHX_ AV **avp)
2386{
2387 AV *av = *avp;
2388 SV *res = av_pop (av);
2389
2390 if (AvFILLp (av) < 0)
2391 {
2392 *avp = 0;
2393 SvREFCNT_dec (av);
2394 }
2395
2396 return res;
2397}
2398
2399static void
2400coro_pop_on_enter (pTHX_ void *coro)
2401{
2402 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_enter);
2403 SvREFCNT_dec (cb);
2404}
2405
2406static void
2407coro_pop_on_leave (pTHX_ void *coro)
2408{
2409 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2410 on_enterleave_call (aTHX_ sv_2mortal (cb));
2297} 2411}
2298 2412
2299/*****************************************************************************/ 2413/*****************************************************************************/
2300/* PerlIO::cede */ 2414/* PerlIO::cede */
2301 2415
… …
2375/* Coro::Semaphore & Coro::Signal */ 2489/* Coro::Semaphore & Coro::Signal */
2376 2490
2377static SV * 2491static SV *
2378coro_waitarray_new (pTHX_ int count) 2492coro_waitarray_new (pTHX_ int count)
2379{ 2493{
2380 /* a semaphore contains a counter IV in $sem->[0] and any waiters after that */ 2494 /* a waitarray=semaphore contains a counter IV in $sem->[0] and any waiters after that */
2381 AV *av = newAV (); 2495 AV *av = newAV ();
2382 SV **ary; 2496 SV **ary;
2383 2497
2384 /* unfortunately, building manually saves memory */ 2498 /* unfortunately, building manually saves memory */
2385 Newx (ary, 2, SV *); 2499 Newx (ary, 2, SV *);
… …
2527{ 2641{
2528 if (items >= 2) 2642 if (items >= 2)
2529 { 2643 {
2530 /* callback form */ 2644 /* callback form */
2531 AV *av = (AV *)SvRV (arg [0]); 2645 AV *av = (AV *)SvRV (arg [0]);
2532 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 2646 SV *cb_cv = s_get_cv_croak (arg [1]);
2533 2647
2534 av_push (av, (SV *)SvREFCNT_inc_NN (cb_cv)); 2648 av_push (av, SvREFCNT_inc_NN (cb_cv));
2535 2649
2536 if (SvIVX (AvARRAY (av)[0]) > 0) 2650 if (SvIVX (AvARRAY (av)[0]) > 0)
2537 coro_semaphore_adjust (aTHX_ av, 0); 2651 coro_semaphore_adjust (aTHX_ av, 0);
2538 2652
2539 frame->prepare = prepare_nop; 2653 frame->prepare = prepare_nop;
… …
2563 AvARRAY (av)[0] = AvARRAY (av)[1]; 2677 AvARRAY (av)[0] = AvARRAY (av)[1];
2564 AvARRAY (av)[1] = cb; 2678 AvARRAY (av)[1] = cb;
2565 2679
2566 cb = av_shift (av); 2680 cb = av_shift (av);
2567 2681
2682 if (SvTYPE (cb) == SVt_PVCV)
2683 {
2684 dSP;
2685 PUSHMARK (SP);
2686 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2687 PUTBACK;
2688 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2689 }
2690 else
2691 {
2568 api_ready (aTHX_ cb); 2692 api_ready (aTHX_ cb);
2569 sv_setiv (cb, 0); /* signal waiter */ 2693 sv_setiv (cb, 0); /* signal waiter */
2694 }
2695
2570 SvREFCNT_dec (cb); 2696 SvREFCNT_dec (cb);
2571 2697
2572 --count; 2698 --count;
2573 } 2699 }
2574} 2700}
… …
2583static void 2709static void
2584slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2710slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2585{ 2711{
2586 AV *av = (AV *)SvRV (arg [0]); 2712 AV *av = (AV *)SvRV (arg [0]);
2587 2713
2714 if (items >= 2)
2715 {
2716 SV *cb_cv = s_get_cv_croak (arg [1]);
2717 av_push (av, SvREFCNT_inc_NN (cb_cv));
2718
2588 if (SvIVX (AvARRAY (av)[0])) 2719 if (SvIVX (AvARRAY (av)[0]))
2720 coro_signal_wake (aTHX_ av, 1); /* ust be the only waiter */
2721
2722 frame->prepare = prepare_nop;
2723 frame->check = slf_check_nop;
2724 }
2725 else if (SvIVX (AvARRAY (av)[0]))
2589 { 2726 {
2590 SvIVX (AvARRAY (av)[0]) = 0; 2727 SvIVX (AvARRAY (av)[0]) = 0;
2591 frame->prepare = prepare_nop; 2728 frame->prepare = prepare_nop;
2592 frame->check = slf_check_nop; 2729 frame->check = slf_check_nop;
2593 } 2730 }
2594 else 2731 else
2595 { 2732 {
2596 SV *waiter = newRV_inc (SvRV (coro_current)); /* owned by signal av */ 2733 SV *waiter = newSVsv (coro_current); /* owned by signal av */
2597 2734
2598 av_push (av, waiter); 2735 av_push (av, waiter);
2599 2736
2600 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */ 2737 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */
2601 frame->prepare = prepare_schedule; 2738 frame->prepare = prepare_schedule;
… …
2619 2756
2620static void 2757static void
2621coro_aio_callback (pTHX_ CV *cv) 2758coro_aio_callback (pTHX_ CV *cv)
2622{ 2759{
2623 dXSARGS; 2760 dXSARGS;
2624 AV *state = (AV *)GENSUB_ARG; 2761 AV *state = (AV *)S_GENSUB_ARG;
2625 SV *coro = av_pop (state); 2762 SV *coro = av_pop (state);
2626 SV *data_sv = newSV (sizeof (struct io_state)); 2763 SV *data_sv = newSV (sizeof (struct io_state));
2627 2764
2628 av_extend (state, items - 1); 2765 av_extend (state, items - 1);
2629 2766
… …
2743 2880
2744 for (i = 0; i < items; ++i) 2881 for (i = 0; i < items; ++i)
2745 PUSHs (arg [i]); 2882 PUSHs (arg [i]);
2746 2883
2747 /* now push the callback closure */ 2884 /* now push the callback closure */
2748 PUSHs (sv_2mortal (gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state)))); 2885 PUSHs (sv_2mortal (s_gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state))));
2749 2886
2750 /* now call the AIO function - we assume our request is uncancelable */ 2887 /* now call the AIO function - we assume our request is uncancelable */
2751 PUTBACK; 2888 PUTBACK;
2752 call_sv ((SV *)req, G_VOID | G_DISCARD); 2889 call_sv ((SV *)req, G_VOID | G_DISCARD);
2753 } 2890 }
… …
2840 2977
2841 if (!svp) croak ("Time::HiRes is required"); 2978 if (!svp) croak ("Time::HiRes is required");
2842 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer"); 2979 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
2843 2980
2844 nvtime = INT2PTR (double (*)(), SvIV (*svp)); 2981 nvtime = INT2PTR (double (*)(), SvIV (*svp));
2982
2983 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
2984 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
2845 } 2985 }
2846 2986
2847 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 2987 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
2848} 2988}
2849 2989
2850SV * 2990SV *
2851new (char *klass, ...) 2991new (char *klass, ...)
2852 ALIAS: 2992 ALIAS:
… …
2854 CODE: 2994 CODE:
2855{ 2995{
2856 struct coro *coro; 2996 struct coro *coro;
2857 MAGIC *mg; 2997 MAGIC *mg;
2858 HV *hv; 2998 HV *hv;
2859 CV *cb; 2999 SV *cb;
2860 int i; 3000 int i;
2861 3001
2862 if (items > 1) 3002 if (items > 1)
2863 { 3003 {
2864 cb = coro_sv_2cv (aTHX_ ST (1)); 3004 cb = s_get_cv_croak (ST (1));
2865 3005
2866 if (!ix) 3006 if (!ix)
2867 { 3007 {
2868 if (CvISXSUB (cb)) 3008 if (CvISXSUB (cb))
2869 croak ("Coro::State doesn't support XS functions as coroutine start, caught"); 3009 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
… …
2891 av_extend (coro->args, items - 1 + ix - 1); 3031 av_extend (coro->args, items - 1 + ix - 1);
2892 3032
2893 if (ix) 3033 if (ix)
2894 { 3034 {
2895 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb)); 3035 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
2896 cb = cv_coro_run; 3036 cb = (SV *)cv_coro_run;
2897 } 3037 }
2898 3038
2899 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb); 3039 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
2900 3040
2901 for (i = 2; i < items; i++) 3041 for (i = 2; i < items; i++)
… …
2999 eval = 1 3139 eval = 1
3000 CODE: 3140 CODE:
3001{ 3141{
3002 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3142 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
3003 { 3143 {
3004 struct coro temp; 3144 struct coro *current = SvSTATE_current;
3005 3145
3006 if (!(coro->flags & CF_RUNNING)) 3146 if (current != coro)
3007 { 3147 {
3008 PUTBACK; 3148 PUTBACK;
3009 save_perl (aTHX_ &temp); 3149 save_perl (aTHX_ current);
3010 load_perl (aTHX_ coro); 3150 load_perl (aTHX_ coro);
3151 SPAGAIN;
3011 } 3152 }
3012 3153
3013 {
3014 dSP;
3015 ENTER;
3016 SAVETMPS;
3017 PUTBACK;
3018 PUSHSTACK; 3154 PUSHSTACK;
3155
3019 PUSHMARK (SP); 3156 PUSHMARK (SP);
3157 PUTBACK;
3020 3158
3021 if (ix) 3159 if (ix)
3022 eval_sv (coderef, 0); 3160 eval_sv (coderef, 0);
3023 else 3161 else
3024 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 3162 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
3025 3163
3026 POPSTACK; 3164 POPSTACK;
3027 SPAGAIN; 3165 SPAGAIN;
3028 FREETMPS;
3029 LEAVE;
3030 PUTBACK;
3031 }
3032 3166
3033 if (!(coro->flags & CF_RUNNING)) 3167 if (current != coro)
3034 { 3168 {
3169 PUTBACK;
3035 save_perl (aTHX_ coro); 3170 save_perl (aTHX_ coro);
3036 load_perl (aTHX_ &temp); 3171 load_perl (aTHX_ current);
3037 SPAGAIN; 3172 SPAGAIN;
3038 } 3173 }
3039 } 3174 }
3040} 3175}
3041 3176
… …
3045 ALIAS: 3180 ALIAS:
3046 is_ready = CF_READY 3181 is_ready = CF_READY
3047 is_running = CF_RUNNING 3182 is_running = CF_RUNNING
3048 is_new = CF_NEW 3183 is_new = CF_NEW
3049 is_destroyed = CF_DESTROYED 3184 is_destroyed = CF_DESTROYED
3185 is_suspended = CF_SUSPENDED
3050 CODE: 3186 CODE:
3051 RETVAL = boolSV (coro->flags & ix); 3187 RETVAL = boolSV (coro->flags & ix);
3052 OUTPUT: 3188 OUTPUT:
3053 RETVAL 3189 RETVAL
3054 3190
… …
3058 CODE: 3194 CODE:
3059{ 3195{
3060 struct coro *current = SvSTATE_current; 3196 struct coro *current = SvSTATE_current;
3061 SV **throwp = self == current ? &CORO_THROW : &self->except; 3197 SV **throwp = self == current ? &CORO_THROW : &self->except;
3062 SvREFCNT_dec (*throwp); 3198 SvREFCNT_dec (*throwp);
3199 SvGETMAGIC (throw);
3063 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3200 *throwp = SvOK (throw) ? newSVsv (throw) : 0;
3064} 3201}
3065 3202
3066void 3203void
3067api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3204api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
… …
3119 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv; 3256 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
3120 3257
3121 SV *tmp = *src; *src = *dst; *dst = tmp; 3258 SV *tmp = *src; *src = *dst; *dst = tmp;
3122 } 3259 }
3123 3260
3261void
3262cancel (Coro::State self)
3263 CODE:
3264 coro_state_destroy (aTHX_ self);
3265 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */
3266
3267
3268SV *
3269enable_times (int enabled = enable_times)
3270 CODE:
3271{
3272 RETVAL = boolSV (enable_times);
3273
3274 if (enabled != enable_times)
3275 {
3276 enable_times = enabled;
3277
3278 coro_times_update ();
3279 (enabled ? coro_times_sub : coro_times_add)(SvSTATE (coro_current));
3280 }
3281}
3282 OUTPUT:
3283 RETVAL
3284
3285void
3286times (Coro::State self)
3287 PPCODE:
3288{
3289 struct coro *current = SvSTATE (coro_current);
3290
3291 if (expect_false (current == self))
3292 {
3293 coro_times_update ();
3294 coro_times_add (SvSTATE (coro_current));
3295 }
3296
3297 EXTEND (SP, 2);
3298 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3299 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3300
3301 if (expect_false (current == self))
3302 coro_times_sub (SvSTATE (coro_current));
3303}
3124 3304
3125MODULE = Coro::State PACKAGE = Coro 3305MODULE = Coro::State PACKAGE = Coro
3126 3306
3127BOOT: 3307BOOT:
3128{ 3308{
3129 int i;
3130
3131 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3309 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3132 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3310 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3133 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 3311 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3134 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD); 3312 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3135 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 3313 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
… …
3143 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 3321 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3144 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new); 3322 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new);
3145 3323
3146 coro_stash = gv_stashpv ("Coro", TRUE); 3324 coro_stash = gv_stashpv ("Coro", TRUE);
3147 3325
3148 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 3326 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3149 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 3327 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3150 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 3328 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
3151 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 3329 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (CORO_PRIO_LOW));
3152 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE)); 3330 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (CORO_PRIO_IDLE));
3153 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN)); 3331 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (CORO_PRIO_MIN));
3154
3155 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
3156 coro_ready[i] = newAV ();
3157 3332
3158 { 3333 {
3159 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 3334 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
3160 3335
3161 coroapi.schedule = api_schedule; 3336 coroapi.schedule = api_schedule;
… …
3202cede_notself (...) 3377cede_notself (...)
3203 CODE: 3378 CODE:
3204 CORO_EXECUTE_SLF_XS (slf_init_cede_notself); 3379 CORO_EXECUTE_SLF_XS (slf_init_cede_notself);
3205 3380
3206void 3381void
3207_cancel (Coro::State self)
3208 CODE:
3209 coro_state_destroy (aTHX_ self);
3210 coro_call_on_destroy (aTHX_ self);
3211
3212void
3213_set_current (SV *current) 3382_set_current (SV *current)
3214 PROTOTYPE: $ 3383 PROTOTYPE: $
3215 CODE: 3384 CODE:
3216 SvREFCNT_dec (SvRV (coro_current)); 3385 SvREFCNT_dec (SvRV (coro_current));
3217 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current))); 3386 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
… …
3219void 3388void
3220_set_readyhook (SV *hook) 3389_set_readyhook (SV *hook)
3221 PROTOTYPE: $ 3390 PROTOTYPE: $
3222 CODE: 3391 CODE:
3223 SvREFCNT_dec (coro_readyhook); 3392 SvREFCNT_dec (coro_readyhook);
3393 SvGETMAGIC (hook);
3394 if (SvOK (hook))
3395 {
3224 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0; 3396 coro_readyhook = newSVsv (hook);
3397 CORO_READYHOOK = invoke_sv_ready_hook_helper;
3398 CORO_READYHOOK ();
3399 }
3400 else
3401 {
3402 coro_readyhook = 0;
3403 CORO_READYHOOK = 0;
3404 }
3225 3405
3226int 3406int
3227prio (Coro::State coro, int newprio = 0) 3407prio (Coro::State coro, int newprio = 0)
3228 PROTOTYPE: $;$ 3408 PROTOTYPE: $;$
3229 ALIAS: 3409 ALIAS:
… …
3235 if (items > 1) 3415 if (items > 1)
3236 { 3416 {
3237 if (ix) 3417 if (ix)
3238 newprio = coro->prio - newprio; 3418 newprio = coro->prio - newprio;
3239 3419
3240 if (newprio < PRIO_MIN) newprio = PRIO_MIN; 3420 if (newprio < CORO_PRIO_MIN) newprio = CORO_PRIO_MIN;
3241 if (newprio > PRIO_MAX) newprio = PRIO_MAX; 3421 if (newprio > CORO_PRIO_MAX) newprio = CORO_PRIO_MAX;
3242 3422
3243 coro->prio = newprio; 3423 coro->prio = newprio;
3244 } 3424 }
3245} 3425}
3246 OUTPUT: 3426 OUTPUT:
… …
3259 PROTOTYPE: 3439 PROTOTYPE:
3260 CODE: 3440 CODE:
3261 RETVAL = coro_nready; 3441 RETVAL = coro_nready;
3262 OUTPUT: 3442 OUTPUT:
3263 RETVAL 3443 RETVAL
3444
3445void
3446suspend (Coro::State self)
3447 PROTOTYPE: $
3448 CODE:
3449 self->flags |= CF_SUSPENDED;
3450
3451void
3452resume (Coro::State self)
3453 PROTOTYPE: $
3454 CODE:
3455 self->flags &= ~CF_SUSPENDED;
3264 3456
3265void 3457void
3266_pool_handler (...) 3458_pool_handler (...)
3267 CODE: 3459 CODE:
3268 CORO_EXECUTE_SLF_XS (slf_init_pool_handler); 3460 CORO_EXECUTE_SLF_XS (slf_init_pool_handler);
… …
3323rouse_wait (...) 3515rouse_wait (...)
3324 PROTOTYPE: ;$ 3516 PROTOTYPE: ;$
3325 PPCODE: 3517 PPCODE:
3326 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait); 3518 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait);
3327 3519
3520void
3521on_enter (SV *block)
3522 ALIAS:
3523 on_leave = 1
3524 PROTOTYPE: &
3525 CODE:
3526{
3527 struct coro *coro = SvSTATE_current;
3528 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3529
3530 block = s_get_cv_croak (block);
3531
3532 if (!*avp)
3533 *avp = newAV ();
3534
3535 av_push (*avp, SvREFCNT_inc (block));
3536
3537 if (!ix)
3538 on_enterleave_call (aTHX_ block);
3539
3540 LEAVE; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
3541 SAVEDESTRUCTOR_X (ix ? coro_pop_on_leave : coro_pop_on_enter, (void *)coro);
3542 ENTER; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
3543}
3544
3328 3545
3329MODULE = Coro::State PACKAGE = PerlIO::cede 3546MODULE = Coro::State PACKAGE = PerlIO::cede
3330 3547
3331BOOT: 3548BOOT:
3332 PerlIO_define_layer (aTHX_ &PerlIO_cede); 3549 PerlIO_define_layer (aTHX_ &PerlIO_cede);
… …
3335MODULE = Coro::State PACKAGE = Coro::Semaphore 3552MODULE = Coro::State PACKAGE = Coro::Semaphore
3336 3553
3337SV * 3554SV *
3338new (SV *klass, SV *count = 0) 3555new (SV *klass, SV *count = 0)
3339 CODE: 3556 CODE:
3557{
3558 int semcnt = 1;
3559
3560 if (count)
3561 {
3562 SvGETMAGIC (count);
3563
3564 if (SvOK (count))
3565 semcnt = SvIV (count);
3566 }
3567
3340 RETVAL = sv_bless ( 3568 RETVAL = sv_bless (
3341 coro_waitarray_new (aTHX_ count && SvOK (count) ? SvIV (count) : 1), 3569 coro_waitarray_new (aTHX_ semcnt),
3342 GvSTASH (CvGV (cv)) 3570 GvSTASH (CvGV (cv))
3343 ); 3571 );
3572}
3344 OUTPUT: 3573 OUTPUT:
3345 RETVAL 3574 RETVAL
3346 3575
3347# helper for Coro::Channel 3576# helper for Coro::Channel and others
3348SV * 3577SV *
3349_alloc (int count) 3578_alloc (int count)
3350 CODE: 3579 CODE:
3351 RETVAL = coro_waitarray_new (aTHX_ count); 3580 RETVAL = coro_waitarray_new (aTHX_ count);
3352 OUTPUT: 3581 OUTPUT:
… …
3410 for (i = 1; i <= wcount; ++i) 3639 for (i = 1; i <= wcount; ++i)
3411 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i]))); 3640 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i])));
3412 } 3641 }
3413} 3642}
3414 3643
3644MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3645
3646void
3647_may_delete (SV *sem, int count, int extra_refs)
3648 PPCODE:
3649{
3650 AV *av = (AV *)SvRV (sem);
3651
3652 if (SvREFCNT ((SV *)av) == 1 + extra_refs
3653 && AvFILLp (av) == 0 /* no waiters, just count */
3654 && SvIV (AvARRAY (av)[0]) == count)
3655 XSRETURN_YES;
3656
3657 XSRETURN_NO;
3658}
3659
3415MODULE = Coro::State PACKAGE = Coro::Signal 3660MODULE = Coro::State PACKAGE = Coro::Signal
3416 3661
3417SV * 3662SV *
3418new (SV *klass) 3663new (SV *klass)
3419 CODE: 3664 CODE:
… …
3490 3735
3491void 3736void
3492_register (char *target, char *proto, SV *req) 3737_register (char *target, char *proto, SV *req)
3493 CODE: 3738 CODE:
3494{ 3739{
3495 CV *req_cv = coro_sv_2cv (aTHX_ req); 3740 SV *req_cv = s_get_cv_croak (req);
3496 /* newXSproto doesn't return the CV on 5.8 */ 3741 /* newXSproto doesn't return the CV on 5.8 */
3497 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 3742 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3498 sv_setpv ((SV *)slf_cv, proto); 3743 sv_setpv ((SV *)slf_cv, proto);
3499 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0); 3744 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
3500} 3745}
3501 3746
3747MODULE = Coro::State PACKAGE = Coro::Select
3748
3749void
3750patch_pp_sselect ()
3751 CODE:
3752 if (!coro_old_pp_sselect)
3753 {
3754 coro_select_select = (SV *)get_cv ("Coro::Select::select", 0);
3755 coro_old_pp_sselect = PL_ppaddr [OP_SSELECT];
3756 PL_ppaddr [OP_SSELECT] = coro_pp_sselect;
3757 }
3758
3759void
3760unpatch_pp_sselect ()
3761 CODE:
3762 if (coro_old_pp_sselect)
3763 {
3764 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
3765 coro_old_pp_sselect = 0;
3766 }
3767
3768

Diff Legend

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