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.333 by root, Thu Nov 27 12:39:00 2008 UTC vs.
Revision 1.364 by root, Thu Jul 16 02:19:17 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 (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)
… …
1471 --coro_nready; 1561 --coro_nready;
1472 } 1562 }
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 && coro->mainstack != main_mainstack) 1566 if (coro->mainstack
1477 { 1567 && coro->mainstack != main_mainstack
1478 struct coro temp; 1568 && coro->slot
1479 1569 && !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); 1570 coro_destruct_perl (aTHX_ coro);
1486
1487 load_perl (aTHX_ &temp);
1488
1489 coro->slot = 0;
1490 }
1491 1571
1492 cctx_destroy (coro->cctx); 1572 cctx_destroy (coro->cctx);
1493 SvREFCNT_dec (coro->startcv); 1573 SvREFCNT_dec (coro->startcv);
1494 SvREFCNT_dec (coro->args); 1574 SvREFCNT_dec (coro->args);
1495 SvREFCNT_dec (CORO_THROW); 1575 SvREFCNT_dec (CORO_THROW);
… …
1554 1634
1555 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1635 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1556 TRANSFER (ta, 1); 1636 TRANSFER (ta, 1);
1557} 1637}
1558 1638
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 ********************************************************************/ 1639/** Coro ********************************************************************/
1583 1640
1584INLINE void 1641INLINE void
1585coro_enq (pTHX_ struct coro *coro) 1642coro_enq (pTHX_ struct coro *coro)
1586{ 1643{
1587 av_push (coro_ready [coro->prio - PRIO_MIN], SvREFCNT_inc_NN (coro->hv)); 1644 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1588}
1589 1645
1590INLINE 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 *
1591coro_deq (pTHX) 1654coro_deq (pTHX)
1592{ 1655{
1593 int prio; 1656 int prio;
1594 1657
1595 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; ) 1658 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
1596 if (AvFILLp (coro_ready [prio]) >= 0) 1659 {
1597 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 }
1598 1669
1599 return 0; 1670 return 0;
1600} 1671}
1601 1672
1602static int 1673static int
… …
1666static void 1737static void
1667prepare_schedule (pTHX_ struct coro_transfer_args *ta) 1738prepare_schedule (pTHX_ struct coro_transfer_args *ta)
1668{ 1739{
1669 for (;;) 1740 for (;;)
1670 { 1741 {
1671 SV *next_sv = coro_deq (aTHX); 1742 struct coro *next = coro_deq (aTHX);
1672 1743
1673 if (expect_true (next_sv)) 1744 if (expect_true (next))
1674 { 1745 {
1675 struct coro *next = SvSTATE_hv (next_sv);
1676
1677 /* cannot transfer to destroyed coros, skip and look for next */ 1746 /* cannot transfer to destroyed coros, skip and look for next */
1678 if (expect_false (next->flags & CF_DESTROYED)) 1747 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED)))
1679 SvREFCNT_dec (next_sv); /* coro_nready has already been taken care of by destroy */ 1748 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1680 else 1749 else
1681 { 1750 {
1682 next->flags &= ~CF_READY; 1751 next->flags &= ~CF_READY;
1683 --coro_nready; 1752 --coro_nready;
1684 1753
… …
1862 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */ 1931 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */
1863 api_ready (aTHX_ sv_manager); 1932 api_ready (aTHX_ sv_manager);
1864 1933
1865 frame->prepare = prepare_schedule; 1934 frame->prepare = prepare_schedule;
1866 frame->check = slf_check_repeat; 1935 frame->check = slf_check_repeat;
1936
1937 /* as a minor optimisation, we could unwind all stacks here */
1938 /* but that puts extra pressure on pp_slf, and is not worth much */
1939 /*coro_unwind_stacks (aTHX);*/
1867} 1940}
1868 1941
1869/*****************************************************************************/ 1942/*****************************************************************************/
1870/* async pool handler */ 1943/* async pool handler */
1871 1944
… …
1949 2022
1950static void 2023static void
1951coro_rouse_callback (pTHX_ CV *cv) 2024coro_rouse_callback (pTHX_ CV *cv)
1952{ 2025{
1953 dXSARGS; 2026 dXSARGS;
1954 SV *data = (SV *)GENSUB_ARG; 2027 SV *data = (SV *)S_GENSUB_ARG;
1955 2028
1956 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2029 if (SvTYPE (SvRV (data)) != SVt_PVAV)
1957 { 2030 {
1958 /* first call, set args */ 2031 /* first call, set args */
2032 SV *coro = SvRV (data);
1959 AV *av = newAV (); 2033 AV *av = newAV ();
1960 SV *coro = SvRV (data);
1961 2034
1962 SvRV_set (data, (SV *)av); 2035 SvRV_set (data, (SV *)av);
1963 api_ready (aTHX_ coro);
1964 SvREFCNT_dec (coro);
1965 2036
1966 /* better take a full copy of the arguments */ 2037 /* better take a full copy of the arguments */
1967 while (items--) 2038 while (items--)
1968 av_store (av, items, newSVsv (ST (items))); 2039 av_store (av, items, newSVsv (ST (items)));
2040
2041 api_ready (aTHX_ coro);
2042 SvREFCNT_dec (coro);
1969 } 2043 }
1970 2044
1971 XSRETURN_EMPTY; 2045 XSRETURN_EMPTY;
1972} 2046}
1973 2047
… …
1990 2064
1991 EXTEND (SP, AvFILLp (av) + 1); 2065 EXTEND (SP, AvFILLp (av) + 1);
1992 for (i = 0; i <= AvFILLp (av); ++i) 2066 for (i = 0; i <= AvFILLp (av); ++i)
1993 PUSHs (sv_2mortal (AvARRAY (av)[i])); 2067 PUSHs (sv_2mortal (AvARRAY (av)[i]));
1994 2068
1995 /* we have stolen the elements, so ste length to zero and free */ 2069 /* we have stolen the elements, so set length to zero and free */
1996 AvFILLp (av) = -1; 2070 AvFILLp (av) = -1;
1997 av_undef (av); 2071 av_undef (av);
1998 2072
1999 PUTBACK; 2073 PUTBACK;
2000 } 2074 }
… …
2024 || SvTYPE (SvRV (cb)) != SVt_PVCV 2098 || SvTYPE (SvRV (cb)) != SVt_PVCV
2025 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2099 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2026 croak ("Coro::rouse_wait called with illegal callback argument,"); 2100 croak ("Coro::rouse_wait called with illegal callback argument,");
2027 2101
2028 { 2102 {
2029 CV *cv = (CV *)SvRV (cb); /* for GENSUB_ARG */ 2103 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
2030 SV *data = (SV *)GENSUB_ARG; 2104 SV *data = (SV *)S_GENSUB_ARG;
2031 2105
2032 frame->data = (void *)data; 2106 frame->data = (void *)data;
2033 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule; 2107 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
2034 frame->check = slf_check_rouse_wait; 2108 frame->check = slf_check_rouse_wait;
2035 } 2109 }
… …
2039coro_new_rouse_cb (pTHX) 2113coro_new_rouse_cb (pTHX)
2040{ 2114{
2041 HV *hv = (HV *)SvRV (coro_current); 2115 HV *hv = (HV *)SvRV (coro_current);
2042 struct coro *coro = SvSTATE_hv (hv); 2116 struct coro *coro = SvSTATE_hv (hv);
2043 SV *data = newRV_inc ((SV *)hv); 2117 SV *data = newRV_inc ((SV *)hv);
2044 SV *cb = gensub (aTHX_ coro_rouse_callback, (void *)data); 2118 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
2045 2119
2046 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0); 2120 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0);
2047 SvREFCNT_dec (data); /* magicext increases the refcount */ 2121 SvREFCNT_dec (data); /* magicext increases the refcount */
2048 2122
2049 SvREFCNT_dec (coro->rouse_cb); 2123 SvREFCNT_dec (coro->rouse_cb);
… …
2290 2364
2291 PL_op->op_ppaddr = pp_slf; 2365 PL_op->op_ppaddr = pp_slf;
2292 /*PL_op->op_type = OP_CUSTOM; /* we do behave like entersub still */ 2366 /*PL_op->op_type = OP_CUSTOM; /* we do behave like entersub still */
2293 2367
2294 PL_op = (OP *)&slf_restore; 2368 PL_op = (OP *)&slf_restore;
2369}
2370
2371/*****************************************************************************/
2372/* dynamic wind */
2373
2374static void
2375on_enterleave_call (pTHX_ SV *cb)
2376{
2377 dSP;
2378
2379 PUSHSTACK;
2380
2381 PUSHMARK (SP);
2382 PUTBACK;
2383 call_sv (cb, G_VOID | G_DISCARD);
2384 SPAGAIN;
2385
2386 POPSTACK;
2387}
2388
2389static SV *
2390coro_avp_pop_and_free (pTHX_ AV **avp)
2391{
2392 AV *av = *avp;
2393 SV *res = av_pop (av);
2394
2395 if (AvFILLp (av) < 0)
2396 {
2397 *avp = 0;
2398 SvREFCNT_dec (av);
2399 }
2400
2401 return res;
2402}
2403
2404static void
2405coro_pop_on_enter (pTHX_ void *coro)
2406{
2407 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_enter);
2408 SvREFCNT_dec (cb);
2409}
2410
2411static void
2412coro_pop_on_leave (pTHX_ void *coro)
2413{
2414 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2415 on_enterleave_call (aTHX_ sv_2mortal (cb));
2295} 2416}
2296 2417
2297/*****************************************************************************/ 2418/*****************************************************************************/
2298/* PerlIO::cede */ 2419/* PerlIO::cede */
2299 2420
… …
2373/* Coro::Semaphore & Coro::Signal */ 2494/* Coro::Semaphore & Coro::Signal */
2374 2495
2375static SV * 2496static SV *
2376coro_waitarray_new (pTHX_ int count) 2497coro_waitarray_new (pTHX_ int count)
2377{ 2498{
2378 /* a semaphore contains a counter IV in $sem->[0] and any waiters after that */ 2499 /* a waitarray=semaphore contains a counter IV in $sem->[0] and any waiters after that */
2379 AV *av = newAV (); 2500 AV *av = newAV ();
2380 SV **ary; 2501 SV **ary;
2381 2502
2382 /* unfortunately, building manually saves memory */ 2503 /* unfortunately, building manually saves memory */
2383 Newx (ary, 2, SV *); 2504 Newx (ary, 2, SV *);
… …
2525{ 2646{
2526 if (items >= 2) 2647 if (items >= 2)
2527 { 2648 {
2528 /* callback form */ 2649 /* callback form */
2529 AV *av = (AV *)SvRV (arg [0]); 2650 AV *av = (AV *)SvRV (arg [0]);
2530 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 2651 SV *cb_cv = s_get_cv_croak (arg [1]);
2531 2652
2532 av_push (av, (SV *)SvREFCNT_inc_NN (cb_cv)); 2653 av_push (av, SvREFCNT_inc_NN (cb_cv));
2533 2654
2534 if (SvIVX (AvARRAY (av)[0]) > 0) 2655 if (SvIVX (AvARRAY (av)[0]) > 0)
2535 coro_semaphore_adjust (aTHX_ av, 0); 2656 coro_semaphore_adjust (aTHX_ av, 0);
2536 2657
2537 frame->prepare = prepare_nop; 2658 frame->prepare = prepare_nop;
… …
2561 AvARRAY (av)[0] = AvARRAY (av)[1]; 2682 AvARRAY (av)[0] = AvARRAY (av)[1];
2562 AvARRAY (av)[1] = cb; 2683 AvARRAY (av)[1] = cb;
2563 2684
2564 cb = av_shift (av); 2685 cb = av_shift (av);
2565 2686
2687 if (SvTYPE (cb) == SVt_PVCV)
2688 {
2689 dSP;
2690 PUSHMARK (SP);
2691 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2692 PUTBACK;
2693 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2694 }
2695 else
2696 {
2566 api_ready (aTHX_ cb); 2697 api_ready (aTHX_ cb);
2567 sv_setiv (cb, 0); /* signal waiter */ 2698 sv_setiv (cb, 0); /* signal waiter */
2699 }
2700
2568 SvREFCNT_dec (cb); 2701 SvREFCNT_dec (cb);
2569 2702
2570 --count; 2703 --count;
2571 } 2704 }
2572} 2705}
… …
2581static void 2714static void
2582slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2715slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2583{ 2716{
2584 AV *av = (AV *)SvRV (arg [0]); 2717 AV *av = (AV *)SvRV (arg [0]);
2585 2718
2719 if (items >= 2)
2720 {
2721 SV *cb_cv = s_get_cv_croak (arg [1]);
2722 av_push (av, SvREFCNT_inc_NN (cb_cv));
2723
2586 if (SvIVX (AvARRAY (av)[0])) 2724 if (SvIVX (AvARRAY (av)[0]))
2725 coro_signal_wake (aTHX_ av, 1); /* ust be the only waiter */
2726
2727 frame->prepare = prepare_nop;
2728 frame->check = slf_check_nop;
2729 }
2730 else if (SvIVX (AvARRAY (av)[0]))
2587 { 2731 {
2588 SvIVX (AvARRAY (av)[0]) = 0; 2732 SvIVX (AvARRAY (av)[0]) = 0;
2589 frame->prepare = prepare_nop; 2733 frame->prepare = prepare_nop;
2590 frame->check = slf_check_nop; 2734 frame->check = slf_check_nop;
2591 } 2735 }
2592 else 2736 else
2593 { 2737 {
2594 SV *waiter = newRV_inc (SvRV (coro_current)); /* owned by signal av */ 2738 SV *waiter = newSVsv (coro_current); /* owned by signal av */
2595 2739
2596 av_push (av, waiter); 2740 av_push (av, waiter);
2597 2741
2598 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */ 2742 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */
2599 frame->prepare = prepare_schedule; 2743 frame->prepare = prepare_schedule;
… …
2617 2761
2618static void 2762static void
2619coro_aio_callback (pTHX_ CV *cv) 2763coro_aio_callback (pTHX_ CV *cv)
2620{ 2764{
2621 dXSARGS; 2765 dXSARGS;
2622 AV *state = (AV *)GENSUB_ARG; 2766 AV *state = (AV *)S_GENSUB_ARG;
2623 SV *coro = av_pop (state); 2767 SV *coro = av_pop (state);
2624 SV *data_sv = newSV (sizeof (struct io_state)); 2768 SV *data_sv = newSV (sizeof (struct io_state));
2625 2769
2626 av_extend (state, items - 1); 2770 av_extend (state, items - 1);
2627 2771
… …
2741 2885
2742 for (i = 0; i < items; ++i) 2886 for (i = 0; i < items; ++i)
2743 PUSHs (arg [i]); 2887 PUSHs (arg [i]);
2744 2888
2745 /* now push the callback closure */ 2889 /* now push the callback closure */
2746 PUSHs (sv_2mortal (gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state)))); 2890 PUSHs (sv_2mortal (s_gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state))));
2747 2891
2748 /* now call the AIO function - we assume our request is uncancelable */ 2892 /* now call the AIO function - we assume our request is uncancelable */
2749 PUTBACK; 2893 PUTBACK;
2750 call_sv ((SV *)req, G_VOID | G_DISCARD); 2894 call_sv ((SV *)req, G_VOID | G_DISCARD);
2751 } 2895 }
… …
2838 2982
2839 if (!svp) croak ("Time::HiRes is required"); 2983 if (!svp) croak ("Time::HiRes is required");
2840 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer"); 2984 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
2841 2985
2842 nvtime = INT2PTR (double (*)(), SvIV (*svp)); 2986 nvtime = INT2PTR (double (*)(), SvIV (*svp));
2987
2988 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
2989 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
2843 } 2990 }
2844 2991
2845 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 2992 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
2846} 2993}
2847 2994
2848SV * 2995SV *
2849new (char *klass, ...) 2996new (char *klass, ...)
2850 ALIAS: 2997 ALIAS:
… …
2852 CODE: 2999 CODE:
2853{ 3000{
2854 struct coro *coro; 3001 struct coro *coro;
2855 MAGIC *mg; 3002 MAGIC *mg;
2856 HV *hv; 3003 HV *hv;
2857 CV *cb; 3004 SV *cb;
2858 int i; 3005 int i;
2859 3006
2860 if (items > 1) 3007 if (items > 1)
2861 { 3008 {
2862 cb = coro_sv_2cv (aTHX_ ST (1)); 3009 cb = s_get_cv_croak (ST (1));
2863 3010
2864 if (!ix) 3011 if (!ix)
2865 { 3012 {
2866 if (CvISXSUB (cb)) 3013 if (CvISXSUB (cb))
2867 croak ("Coro::State doesn't support XS functions as coroutine start, caught"); 3014 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
… …
2889 av_extend (coro->args, items - 1 + ix - 1); 3036 av_extend (coro->args, items - 1 + ix - 1);
2890 3037
2891 if (ix) 3038 if (ix)
2892 { 3039 {
2893 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb)); 3040 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
2894 cb = cv_coro_run; 3041 cb = (SV *)cv_coro_run;
2895 } 3042 }
2896 3043
2897 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb); 3044 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
2898 3045
2899 for (i = 2; i < items; i++) 3046 for (i = 2; i < items; i++)
… …
2997 eval = 1 3144 eval = 1
2998 CODE: 3145 CODE:
2999{ 3146{
3000 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3147 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
3001 { 3148 {
3002 struct coro temp; 3149 struct coro *current = SvSTATE_current;
3003 3150
3004 if (!(coro->flags & CF_RUNNING)) 3151 if (current != coro)
3005 { 3152 {
3006 PUTBACK; 3153 PUTBACK;
3007 save_perl (aTHX_ &temp); 3154 save_perl (aTHX_ current);
3008 load_perl (aTHX_ coro); 3155 load_perl (aTHX_ coro);
3156 SPAGAIN;
3009 } 3157 }
3010 3158
3011 {
3012 dSP;
3013 ENTER;
3014 SAVETMPS;
3015 PUTBACK;
3016 PUSHSTACK; 3159 PUSHSTACK;
3160
3017 PUSHMARK (SP); 3161 PUSHMARK (SP);
3162 PUTBACK;
3018 3163
3019 if (ix) 3164 if (ix)
3020 eval_sv (coderef, 0); 3165 eval_sv (coderef, 0);
3021 else 3166 else
3022 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 3167 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
3023 3168
3024 POPSTACK; 3169 POPSTACK;
3025 SPAGAIN; 3170 SPAGAIN;
3026 FREETMPS;
3027 LEAVE;
3028 PUTBACK;
3029 }
3030 3171
3031 if (!(coro->flags & CF_RUNNING)) 3172 if (current != coro)
3032 { 3173 {
3174 PUTBACK;
3033 save_perl (aTHX_ coro); 3175 save_perl (aTHX_ coro);
3034 load_perl (aTHX_ &temp); 3176 load_perl (aTHX_ current);
3035 SPAGAIN; 3177 SPAGAIN;
3036 } 3178 }
3037 } 3179 }
3038} 3180}
3039 3181
… …
3043 ALIAS: 3185 ALIAS:
3044 is_ready = CF_READY 3186 is_ready = CF_READY
3045 is_running = CF_RUNNING 3187 is_running = CF_RUNNING
3046 is_new = CF_NEW 3188 is_new = CF_NEW
3047 is_destroyed = CF_DESTROYED 3189 is_destroyed = CF_DESTROYED
3190 is_suspended = CF_SUSPENDED
3048 CODE: 3191 CODE:
3049 RETVAL = boolSV (coro->flags & ix); 3192 RETVAL = boolSV (coro->flags & ix);
3050 OUTPUT: 3193 OUTPUT:
3051 RETVAL 3194 RETVAL
3052 3195
… …
3056 CODE: 3199 CODE:
3057{ 3200{
3058 struct coro *current = SvSTATE_current; 3201 struct coro *current = SvSTATE_current;
3059 SV **throwp = self == current ? &CORO_THROW : &self->except; 3202 SV **throwp = self == current ? &CORO_THROW : &self->except;
3060 SvREFCNT_dec (*throwp); 3203 SvREFCNT_dec (*throwp);
3204 SvGETMAGIC (throw);
3061 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3205 *throwp = SvOK (throw) ? newSVsv (throw) : 0;
3062} 3206}
3063 3207
3064void 3208void
3065api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3209api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
… …
3117 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv; 3261 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
3118 3262
3119 SV *tmp = *src; *src = *dst; *dst = tmp; 3263 SV *tmp = *src; *src = *dst; *dst = tmp;
3120 } 3264 }
3121 3265
3266void
3267cancel (Coro::State self)
3268 CODE:
3269 coro_state_destroy (aTHX_ self);
3270 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */
3271
3272
3273SV *
3274enable_times (int enabled = enable_times)
3275 CODE:
3276{
3277 RETVAL = boolSV (enable_times);
3278
3279 if (enabled != enable_times)
3280 {
3281 enable_times = enabled;
3282
3283 coro_times_update ();
3284 (enabled ? coro_times_sub : coro_times_add)(SvSTATE (coro_current));
3285 }
3286}
3287 OUTPUT:
3288 RETVAL
3289
3290void
3291times (Coro::State self)
3292 PPCODE:
3293{
3294 struct coro *current = SvSTATE (coro_current);
3295
3296 if (expect_false (current == self))
3297 {
3298 coro_times_update ();
3299 coro_times_add (SvSTATE (coro_current));
3300 }
3301
3302 EXTEND (SP, 2);
3303 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3304 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3305
3306 if (expect_false (current == self))
3307 coro_times_sub (SvSTATE (coro_current));
3308}
3122 3309
3123MODULE = Coro::State PACKAGE = Coro 3310MODULE = Coro::State PACKAGE = Coro
3124 3311
3125BOOT: 3312BOOT:
3126{ 3313{
3127 int i;
3128
3129 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3314 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3130 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3315 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3131 cv_coro_run = get_cv ( "Coro::_terminate", GV_ADD); 3316 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3132 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD); 3317 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3133 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 3318 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); 3319 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3135 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 3320 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3136 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 3321 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); 3326 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); 3327 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new);
3143 3328
3144 coro_stash = gv_stashpv ("Coro", TRUE); 3329 coro_stash = gv_stashpv ("Coro", TRUE);
3145 3330
3146 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 3331 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3147 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 3332 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3148 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 3333 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
3149 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 3334 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (CORO_PRIO_LOW));
3150 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE)); 3335 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (CORO_PRIO_IDLE));
3151 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN)); 3336 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 3337
3156 { 3338 {
3157 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 3339 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
3158 3340
3159 coroapi.schedule = api_schedule; 3341 coroapi.schedule = api_schedule;
… …
3200cede_notself (...) 3382cede_notself (...)
3201 CODE: 3383 CODE:
3202 CORO_EXECUTE_SLF_XS (slf_init_cede_notself); 3384 CORO_EXECUTE_SLF_XS (slf_init_cede_notself);
3203 3385
3204void 3386void
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) 3387_set_current (SV *current)
3212 PROTOTYPE: $ 3388 PROTOTYPE: $
3213 CODE: 3389 CODE:
3214 SvREFCNT_dec (SvRV (coro_current)); 3390 SvREFCNT_dec (SvRV (coro_current));
3215 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current))); 3391 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
… …
3217void 3393void
3218_set_readyhook (SV *hook) 3394_set_readyhook (SV *hook)
3219 PROTOTYPE: $ 3395 PROTOTYPE: $
3220 CODE: 3396 CODE:
3221 SvREFCNT_dec (coro_readyhook); 3397 SvREFCNT_dec (coro_readyhook);
3398 SvGETMAGIC (hook);
3222 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0; 3399 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0;
3223 3400
3224int 3401int
3225prio (Coro::State coro, int newprio = 0) 3402prio (Coro::State coro, int newprio = 0)
3226 PROTOTYPE: $;$ 3403 PROTOTYPE: $;$
… …
3233 if (items > 1) 3410 if (items > 1)
3234 { 3411 {
3235 if (ix) 3412 if (ix)
3236 newprio = coro->prio - newprio; 3413 newprio = coro->prio - newprio;
3237 3414
3238 if (newprio < PRIO_MIN) newprio = PRIO_MIN; 3415 if (newprio < CORO_PRIO_MIN) newprio = CORO_PRIO_MIN;
3239 if (newprio > PRIO_MAX) newprio = PRIO_MAX; 3416 if (newprio > CORO_PRIO_MAX) newprio = CORO_PRIO_MAX;
3240 3417
3241 coro->prio = newprio; 3418 coro->prio = newprio;
3242 } 3419 }
3243} 3420}
3244 OUTPUT: 3421 OUTPUT:
… …
3257 PROTOTYPE: 3434 PROTOTYPE:
3258 CODE: 3435 CODE:
3259 RETVAL = coro_nready; 3436 RETVAL = coro_nready;
3260 OUTPUT: 3437 OUTPUT:
3261 RETVAL 3438 RETVAL
3439
3440void
3441suspend (Coro::State self)
3442 PROTOTYPE: $
3443 CODE:
3444 self->flags |= CF_SUSPENDED;
3445
3446void
3447resume (Coro::State self)
3448 PROTOTYPE: $
3449 CODE:
3450 self->flags &= ~CF_SUSPENDED;
3262 3451
3263void 3452void
3264_pool_handler (...) 3453_pool_handler (...)
3265 CODE: 3454 CODE:
3266 CORO_EXECUTE_SLF_XS (slf_init_pool_handler); 3455 CORO_EXECUTE_SLF_XS (slf_init_pool_handler);
… …
3321rouse_wait (...) 3510rouse_wait (...)
3322 PROTOTYPE: ;$ 3511 PROTOTYPE: ;$
3323 PPCODE: 3512 PPCODE:
3324 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait); 3513 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait);
3325 3514
3515void
3516on_enter (SV *block)
3517 ALIAS:
3518 on_leave = 1
3519 PROTOTYPE: &
3520 CODE:
3521{
3522 struct coro *coro = SvSTATE_current;
3523 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3524
3525 block = s_get_cv_croak (block);
3526
3527 if (!*avp)
3528 *avp = newAV ();
3529
3530 av_push (*avp, SvREFCNT_inc (block));
3531
3532 if (!ix)
3533 on_enterleave_call (aTHX_ block);
3534
3535 LEAVE; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
3536 SAVEDESTRUCTOR_X (ix ? coro_pop_on_leave : coro_pop_on_enter, (void *)coro);
3537 ENTER; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
3538}
3539
3326 3540
3327MODULE = Coro::State PACKAGE = PerlIO::cede 3541MODULE = Coro::State PACKAGE = PerlIO::cede
3328 3542
3329BOOT: 3543BOOT:
3330 PerlIO_define_layer (aTHX_ &PerlIO_cede); 3544 PerlIO_define_layer (aTHX_ &PerlIO_cede);
… …
3333MODULE = Coro::State PACKAGE = Coro::Semaphore 3547MODULE = Coro::State PACKAGE = Coro::Semaphore
3334 3548
3335SV * 3549SV *
3336new (SV *klass, SV *count = 0) 3550new (SV *klass, SV *count = 0)
3337 CODE: 3551 CODE:
3552{
3553 int semcnt = 1;
3554
3555 if (count)
3556 {
3557 SvGETMAGIC (count);
3558
3559 if (SvOK (count))
3560 semcnt = SvIV (count);
3561 }
3562
3338 RETVAL = sv_bless ( 3563 RETVAL = sv_bless (
3339 coro_waitarray_new (aTHX_ count && SvOK (count) ? SvIV (count) : 1), 3564 coro_waitarray_new (aTHX_ semcnt),
3340 GvSTASH (CvGV (cv)) 3565 GvSTASH (CvGV (cv))
3341 ); 3566 );
3567}
3342 OUTPUT: 3568 OUTPUT:
3343 RETVAL 3569 RETVAL
3344 3570
3345# helper for Coro::Channel 3571# helper for Coro::Channel and others
3346SV * 3572SV *
3347_alloc (int count) 3573_alloc (int count)
3348 CODE: 3574 CODE:
3349 RETVAL = coro_waitarray_new (aTHX_ count); 3575 RETVAL = coro_waitarray_new (aTHX_ count);
3350 OUTPUT: 3576 OUTPUT:
… …
3408 for (i = 1; i <= wcount; ++i) 3634 for (i = 1; i <= wcount; ++i)
3409 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i]))); 3635 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i])));
3410 } 3636 }
3411} 3637}
3412 3638
3639MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3640
3641void
3642_may_delete (SV *sem, int count, int extra_refs)
3643 PPCODE:
3644{
3645 AV *av = (AV *)SvRV (sem);
3646
3647 if (SvREFCNT ((SV *)av) == 1 + extra_refs
3648 && AvFILLp (av) == 0 /* no waiters, just count */
3649 && SvIV (AvARRAY (av)[0]) == count)
3650 XSRETURN_YES;
3651
3652 XSRETURN_NO;
3653}
3654
3413MODULE = Coro::State PACKAGE = Coro::Signal 3655MODULE = Coro::State PACKAGE = Coro::Signal
3414 3656
3415SV * 3657SV *
3416new (SV *klass) 3658new (SV *klass)
3417 CODE: 3659 CODE:
… …
3488 3730
3489void 3731void
3490_register (char *target, char *proto, SV *req) 3732_register (char *target, char *proto, SV *req)
3491 CODE: 3733 CODE:
3492{ 3734{
3493 CV *req_cv = coro_sv_2cv (aTHX_ req); 3735 SV *req_cv = s_get_cv_croak (req);
3494 /* newXSproto doesn't return the CV on 5.8 */ 3736 /* newXSproto doesn't return the CV on 5.8 */
3495 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 3737 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3496 sv_setpv ((SV *)slf_cv, proto); 3738 sv_setpv ((SV *)slf_cv, proto);
3497 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0); 3739 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
3498} 3740}
3499 3741
3742MODULE = Coro::State PACKAGE = Coro::Select
3743
3744void
3745patch_pp_sselect ()
3746 CODE:
3747 if (!coro_old_pp_sselect)
3748 {
3749 coro_select_select = (SV *)get_cv ("Coro::Select::select", 0);
3750 coro_old_pp_sselect = PL_ppaddr [OP_SSELECT];
3751 PL_ppaddr [OP_SSELECT] = coro_pp_sselect;
3752 }
3753
3754void
3755unpatch_pp_sselect ()
3756 CODE:
3757 if (coro_old_pp_sselect)
3758 {
3759 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
3760 coro_old_pp_sselect = 0;
3761 }
3762
3763

Diff Legend

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