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.338 by root, Sun Dec 7 15:33:21 2008 UTC vs.
Revision 1.367 by root, Mon Aug 3 09:19:57 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
… …
932 998
933 PL_op = (OP *)&coro_setup_op; 999 PL_op = (OP *)&coro_setup_op;
934 1000
935 /* copy throw, in case it was set before coro_setup */ 1001 /* copy throw, in case it was set before coro_setup */
936 CORO_THROW = coro->except; 1002 CORO_THROW = coro->except;
1003
1004 if (expect_false (enable_times))
1005 {
1006 coro_times_update ();
1007 coro_times_sub (coro);
1008 }
937} 1009}
938 1010
939static void 1011static void
940coro_unwind_stacks (pTHX) 1012coro_unwind_stacks (pTHX)
941{ 1013{
… …
958} 1030}
959 1031
960static void 1032static void
961coro_destruct_perl (pTHX_ struct coro *coro) 1033coro_destruct_perl (pTHX_ struct coro *coro)
962{ 1034{
1035 SV *svf [9];
1036
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
963 coro_unwind_stacks (aTHX); 1045 coro_unwind_stacks (aTHX);
1046 coro_destruct_stacks (aTHX);
964 1047
965 SvREFCNT_dec (GvSV (PL_defgv)); 1048 // now save some sv's to be free'd later
966 SvREFCNT_dec (GvAV (PL_defgv)); 1049 svf [0] = GvSV (PL_defgv);
967 SvREFCNT_dec (GvSV (PL_errgv)); 1050 svf [1] = (SV *)GvAV (PL_defgv);
968 SvREFCNT_dec (PL_defoutgv); 1051 svf [2] = GvSV (PL_errgv);
969 SvREFCNT_dec (PL_rs); 1052 svf [3] = (SV *)PL_defoutgv;
970 SvREFCNT_dec (GvSV (irsgv)); 1053 svf [4] = PL_rs;
971 SvREFCNT_dec (GvHV (PL_hintgv)); 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));
972 1059
973 SvREFCNT_dec (PL_diehook); 1060 load_perl (aTHX_ current);
974 SvREFCNT_dec (PL_warnhook);
975 1061 }
1062
1063 {
1064 unsigned int i;
1065
1066 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i)
1067 SvREFCNT_dec (svf [i]);
1068
976 SvREFCNT_dec (coro->saved_deffh); 1069 SvREFCNT_dec (coro->saved_deffh);
977 SvREFCNT_dec (coro->rouse_cb); 1070 SvREFCNT_dec (coro->rouse_cb);
978 SvREFCNT_dec (coro->invoke_cb); 1071 SvREFCNT_dec (coro->invoke_cb);
979 SvREFCNT_dec (coro->invoke_av); 1072 SvREFCNT_dec (coro->invoke_av);
980 1073 }
981 coro_destruct_stacks (aTHX);
982} 1074}
983 1075
984INLINE void 1076INLINE void
985free_coro_mortal (pTHX) 1077free_coro_mortal (pTHX)
986{ 1078{
… …
1183 /* somebody or something will hit me for both perl_run and PL_restartop */ 1275 /* somebody or something will hit me for both perl_run and PL_restartop */
1184 PL_restartop = PL_op; 1276 PL_restartop = PL_op;
1185 perl_run (PL_curinterp); 1277 perl_run (PL_curinterp);
1186 /* 1278 /*
1187 * Unfortunately, there is no way to get at the return values of the 1279 * Unfortunately, there is no way to get at the return values of the
1188 * coro body here, as perl_run destroys these 1280 * coro body here, as perl_run destroys these. Likewise, we cannot catch
1281 * runtime errors here, as this is just a random interpreter, not a thread.
1189 */ 1282 */
1190 1283
1191 /* 1284 /*
1192 * If perl-run returns we assume exit() was being called or the coro 1285 * If perl-run returns we assume exit() was being called or the coro
1193 * fell off the end, which seems to be the only valid (non-bug) 1286 * fell off the end, which seems to be the only valid (non-bug)
… …
1354 /* TODO: throwing up here is considered harmful */ 1447 /* TODO: throwing up here is considered harmful */
1355 1448
1356 if (expect_true (prev != next)) 1449 if (expect_true (prev != next))
1357 { 1450 {
1358 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1451 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1359 croak ("Coro::State::transfer called with a suspended prev Coro::State, but can only transfer from running or new states,"); 1452 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1360 1453
1361 if (expect_false (next->flags & CF_RUNNING))
1362 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states,");
1363
1364 if (expect_false (next->flags & CF_DESTROYED)) 1454 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED)))
1365 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states,"); 1455 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1366 1456
1367#if !PERL_VERSION_ATLEAST (5,10,0) 1457#if !PERL_VERSION_ATLEAST (5,10,0)
1368 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1458 if (expect_false (PL_lex_state != LEX_NOTPARSING))
1369 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,"); 1459 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1370#endif 1460#endif
… …
1458coro_state_destroy (pTHX_ struct coro *coro) 1548coro_state_destroy (pTHX_ struct coro *coro)
1459{ 1549{
1460 if (coro->flags & CF_DESTROYED) 1550 if (coro->flags & CF_DESTROYED)
1461 return 0; 1551 return 0;
1462 1552
1463 if (coro->on_destroy) 1553 if (coro->on_destroy && !PL_dirty)
1464 coro->on_destroy (aTHX_ coro); 1554 coro->on_destroy (aTHX_ coro);
1465 1555
1466 coro->flags |= CF_DESTROYED; 1556 coro->flags |= CF_DESTROYED;
1467 1557
1468 if (coro->flags & CF_READY) 1558 if (coro->flags & CF_READY)
… …
1476 1566
1477 if (coro->mainstack 1567 if (coro->mainstack
1478 && coro->mainstack != main_mainstack 1568 && coro->mainstack != main_mainstack
1479 && coro->slot 1569 && coro->slot
1480 && !PL_dirty) 1570 && !PL_dirty)
1481 {
1482 struct coro temp;
1483
1484 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1485
1486 save_perl (aTHX_ &temp);
1487 load_perl (aTHX_ coro);
1488
1489 coro_destruct_perl (aTHX_ coro); 1571 coro_destruct_perl (aTHX_ coro);
1490
1491 load_perl (aTHX_ &temp);
1492
1493 coro->slot = 0;
1494 }
1495 1572
1496 cctx_destroy (coro->cctx); 1573 cctx_destroy (coro->cctx);
1497 SvREFCNT_dec (coro->startcv); 1574 SvREFCNT_dec (coro->startcv);
1498 SvREFCNT_dec (coro->args); 1575 SvREFCNT_dec (coro->args);
1499 SvREFCNT_dec (CORO_THROW); 1576 SvREFCNT_dec (CORO_THROW);
… …
1558 1635
1559 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1636 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1560 TRANSFER (ta, 1); 1637 TRANSFER (ta, 1);
1561} 1638}
1562 1639
1563/*****************************************************************************/
1564/* gensub: simple closure generation utility */
1565
1566#define GENSUB_ARG CvXSUBANY (cv).any_ptr
1567
1568/* create a closure from XS, returns a code reference */
1569/* the arg can be accessed via GENSUB_ARG from the callback */
1570/* the callback must use dXSARGS/XSRETURN */
1571static SV *
1572gensub (pTHX_ void (*xsub)(pTHX_ CV *), void *arg)
1573{
1574 CV *cv = (CV *)newSV (0);
1575
1576 sv_upgrade ((SV *)cv, SVt_PVCV);
1577
1578 CvANON_on (cv);
1579 CvISXSUB_on (cv);
1580 CvXSUB (cv) = xsub;
1581 GENSUB_ARG = arg;
1582
1583 return newRV_noinc ((SV *)cv);
1584}
1585
1586/** Coro ********************************************************************/ 1640/** Coro ********************************************************************/
1587 1641
1588INLINE void 1642INLINE void
1589coro_enq (pTHX_ struct coro *coro) 1643coro_enq (pTHX_ struct coro *coro)
1590{ 1644{
1591 av_push (coro_ready [coro->prio - PRIO_MIN], SvREFCNT_inc_NN (coro->hv)); 1645 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1592}
1593 1646
1594INLINE SV * 1647 SvREFCNT_inc_NN (coro->hv);
1648
1649 coro->next_ready = 0;
1650 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1651 ready [1] = coro;
1652}
1653
1654INLINE struct coro *
1595coro_deq (pTHX) 1655coro_deq (pTHX)
1596{ 1656{
1597 int prio; 1657 int prio;
1598 1658
1599 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; ) 1659 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
1600 if (AvFILLp (coro_ready [prio]) >= 0) 1660 {
1601 return av_shift (coro_ready [prio]); 1661 struct coro **ready = coro_ready [prio];
1662
1663 if (ready [0])
1664 {
1665 struct coro *coro = ready [0];
1666 ready [0] = coro->next_ready;
1667 return coro;
1668 }
1669 }
1602 1670
1603 return 0; 1671 return 0;
1672}
1673
1674static void
1675invoke_sv_ready_hook_helper (void)
1676{
1677 dTHX;
1678 dSP;
1679
1680 ENTER;
1681 SAVETMPS;
1682
1683 PUSHMARK (SP);
1684 PUTBACK;
1685 call_sv (coro_readyhook, G_VOID | G_DISCARD);
1686
1687 FREETMPS;
1688 LEAVE;
1604} 1689}
1605 1690
1606static int 1691static int
1607api_ready (pTHX_ SV *coro_sv) 1692api_ready (pTHX_ SV *coro_sv)
1608{ 1693{
1609 struct coro *coro;
1610 SV *sv_hook;
1611 void (*xs_hook)(void);
1612
1613 coro = SvSTATE (coro_sv); 1694 struct coro *coro = SvSTATE (coro_sv);
1614 1695
1615 if (coro->flags & CF_READY) 1696 if (coro->flags & CF_READY)
1616 return 0; 1697 return 0;
1617 1698
1618 coro->flags |= CF_READY; 1699 coro->flags |= CF_READY;
1619 1700
1620 sv_hook = coro_nready ? 0 : coro_readyhook;
1621 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1622
1623 coro_enq (aTHX_ coro); 1701 coro_enq (aTHX_ coro);
1624 ++coro_nready;
1625 1702
1626 if (sv_hook) 1703 if (!coro_nready++)
1627 { 1704 if (coroapi.readyhook)
1628 dSP; 1705 coroapi.readyhook ();
1629
1630 ENTER;
1631 SAVETMPS;
1632
1633 PUSHMARK (SP);
1634 PUTBACK;
1635 call_sv (sv_hook, G_VOID | G_DISCARD);
1636
1637 FREETMPS;
1638 LEAVE;
1639 }
1640
1641 if (xs_hook)
1642 xs_hook ();
1643 1706
1644 return 1; 1707 return 1;
1645} 1708}
1646 1709
1647static int 1710static int
… …
1670static void 1733static void
1671prepare_schedule (pTHX_ struct coro_transfer_args *ta) 1734prepare_schedule (pTHX_ struct coro_transfer_args *ta)
1672{ 1735{
1673 for (;;) 1736 for (;;)
1674 { 1737 {
1675 SV *next_sv = coro_deq (aTHX); 1738 struct coro *next = coro_deq (aTHX);
1676 1739
1677 if (expect_true (next_sv)) 1740 if (expect_true (next))
1678 { 1741 {
1679 struct coro *next = SvSTATE_hv (next_sv);
1680
1681 /* cannot transfer to destroyed coros, skip and look for next */ 1742 /* cannot transfer to destroyed coros, skip and look for next */
1682 if (expect_false (next->flags & CF_DESTROYED)) 1743 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED)))
1683 SvREFCNT_dec (next_sv); /* coro_nready has already been taken care of by destroy */ 1744 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1684 else 1745 else
1685 { 1746 {
1686 next->flags &= ~CF_READY; 1747 next->flags &= ~CF_READY;
1687 --coro_nready; 1748 --coro_nready;
1688 1749
… …
1957 2018
1958static void 2019static void
1959coro_rouse_callback (pTHX_ CV *cv) 2020coro_rouse_callback (pTHX_ CV *cv)
1960{ 2021{
1961 dXSARGS; 2022 dXSARGS;
1962 SV *data = (SV *)GENSUB_ARG; 2023 SV *data = (SV *)S_GENSUB_ARG;
1963 2024
1964 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2025 if (SvTYPE (SvRV (data)) != SVt_PVAV)
1965 { 2026 {
1966 /* first call, set args */ 2027 /* first call, set args */
2028 SV *coro = SvRV (data);
1967 AV *av = newAV (); 2029 AV *av = newAV ();
1968 SV *coro = SvRV (data);
1969 2030
1970 SvRV_set (data, (SV *)av); 2031 SvRV_set (data, (SV *)av);
1971 api_ready (aTHX_ coro);
1972 SvREFCNT_dec (coro);
1973 2032
1974 /* better take a full copy of the arguments */ 2033 /* better take a full copy of the arguments */
1975 while (items--) 2034 while (items--)
1976 av_store (av, items, newSVsv (ST (items))); 2035 av_store (av, items, newSVsv (ST (items)));
2036
2037 api_ready (aTHX_ coro);
2038 SvREFCNT_dec (coro);
1977 } 2039 }
1978 2040
1979 XSRETURN_EMPTY; 2041 XSRETURN_EMPTY;
1980} 2042}
1981 2043
… …
1998 2060
1999 EXTEND (SP, AvFILLp (av) + 1); 2061 EXTEND (SP, AvFILLp (av) + 1);
2000 for (i = 0; i <= AvFILLp (av); ++i) 2062 for (i = 0; i <= AvFILLp (av); ++i)
2001 PUSHs (sv_2mortal (AvARRAY (av)[i])); 2063 PUSHs (sv_2mortal (AvARRAY (av)[i]));
2002 2064
2003 /* we have stolen the elements, so ste length to zero and free */ 2065 /* we have stolen the elements, so set length to zero and free */
2004 AvFILLp (av) = -1; 2066 AvFILLp (av) = -1;
2005 av_undef (av); 2067 av_undef (av);
2006 2068
2007 PUTBACK; 2069 PUTBACK;
2008 } 2070 }
… …
2032 || SvTYPE (SvRV (cb)) != SVt_PVCV 2094 || SvTYPE (SvRV (cb)) != SVt_PVCV
2033 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2095 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2034 croak ("Coro::rouse_wait called with illegal callback argument,"); 2096 croak ("Coro::rouse_wait called with illegal callback argument,");
2035 2097
2036 { 2098 {
2037 CV *cv = (CV *)SvRV (cb); /* for GENSUB_ARG */ 2099 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
2038 SV *data = (SV *)GENSUB_ARG; 2100 SV *data = (SV *)S_GENSUB_ARG;
2039 2101
2040 frame->data = (void *)data; 2102 frame->data = (void *)data;
2041 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule; 2103 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
2042 frame->check = slf_check_rouse_wait; 2104 frame->check = slf_check_rouse_wait;
2043 } 2105 }
… …
2047coro_new_rouse_cb (pTHX) 2109coro_new_rouse_cb (pTHX)
2048{ 2110{
2049 HV *hv = (HV *)SvRV (coro_current); 2111 HV *hv = (HV *)SvRV (coro_current);
2050 struct coro *coro = SvSTATE_hv (hv); 2112 struct coro *coro = SvSTATE_hv (hv);
2051 SV *data = newRV_inc ((SV *)hv); 2113 SV *data = newRV_inc ((SV *)hv);
2052 SV *cb = gensub (aTHX_ coro_rouse_callback, (void *)data); 2114 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
2053 2115
2054 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0); 2116 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0);
2055 SvREFCNT_dec (data); /* magicext increases the refcount */ 2117 SvREFCNT_dec (data); /* magicext increases the refcount */
2056 2118
2057 SvREFCNT_dec (coro->rouse_cb); 2119 SvREFCNT_dec (coro->rouse_cb);
… …
2298 2360
2299 PL_op->op_ppaddr = pp_slf; 2361 PL_op->op_ppaddr = pp_slf;
2300 /*PL_op->op_type = OP_CUSTOM; /* we do behave like entersub still */ 2362 /*PL_op->op_type = OP_CUSTOM; /* we do behave like entersub still */
2301 2363
2302 PL_op = (OP *)&slf_restore; 2364 PL_op = (OP *)&slf_restore;
2365}
2366
2367/*****************************************************************************/
2368/* dynamic wind */
2369
2370static void
2371on_enterleave_call (pTHX_ SV *cb)
2372{
2373 dSP;
2374
2375 PUSHSTACK;
2376
2377 PUSHMARK (SP);
2378 PUTBACK;
2379 call_sv (cb, G_VOID | G_DISCARD);
2380 SPAGAIN;
2381
2382 POPSTACK;
2383}
2384
2385static SV *
2386coro_avp_pop_and_free (pTHX_ AV **avp)
2387{
2388 AV *av = *avp;
2389 SV *res = av_pop (av);
2390
2391 if (AvFILLp (av) < 0)
2392 {
2393 *avp = 0;
2394 SvREFCNT_dec (av);
2395 }
2396
2397 return res;
2398}
2399
2400static void
2401coro_pop_on_enter (pTHX_ void *coro)
2402{
2403 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_enter);
2404 SvREFCNT_dec (cb);
2405}
2406
2407static void
2408coro_pop_on_leave (pTHX_ void *coro)
2409{
2410 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2411 on_enterleave_call (aTHX_ sv_2mortal (cb));
2303} 2412}
2304 2413
2305/*****************************************************************************/ 2414/*****************************************************************************/
2306/* PerlIO::cede */ 2415/* PerlIO::cede */
2307 2416
… …
2381/* Coro::Semaphore & Coro::Signal */ 2490/* Coro::Semaphore & Coro::Signal */
2382 2491
2383static SV * 2492static SV *
2384coro_waitarray_new (pTHX_ int count) 2493coro_waitarray_new (pTHX_ int count)
2385{ 2494{
2386 /* a semaphore contains a counter IV in $sem->[0] and any waiters after that */ 2495 /* a waitarray=semaphore contains a counter IV in $sem->[0] and any waiters after that */
2387 AV *av = newAV (); 2496 AV *av = newAV ();
2388 SV **ary; 2497 SV **ary;
2389 2498
2390 /* unfortunately, building manually saves memory */ 2499 /* unfortunately, building manually saves memory */
2391 Newx (ary, 2, SV *); 2500 Newx (ary, 2, SV *);
… …
2533{ 2642{
2534 if (items >= 2) 2643 if (items >= 2)
2535 { 2644 {
2536 /* callback form */ 2645 /* callback form */
2537 AV *av = (AV *)SvRV (arg [0]); 2646 AV *av = (AV *)SvRV (arg [0]);
2538 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 2647 SV *cb_cv = s_get_cv_croak (arg [1]);
2539 2648
2540 av_push (av, (SV *)SvREFCNT_inc_NN (cb_cv)); 2649 av_push (av, SvREFCNT_inc_NN (cb_cv));
2541 2650
2542 if (SvIVX (AvARRAY (av)[0]) > 0) 2651 if (SvIVX (AvARRAY (av)[0]) > 0)
2543 coro_semaphore_adjust (aTHX_ av, 0); 2652 coro_semaphore_adjust (aTHX_ av, 0);
2544 2653
2545 frame->prepare = prepare_nop; 2654 frame->prepare = prepare_nop;
… …
2569 AvARRAY (av)[0] = AvARRAY (av)[1]; 2678 AvARRAY (av)[0] = AvARRAY (av)[1];
2570 AvARRAY (av)[1] = cb; 2679 AvARRAY (av)[1] = cb;
2571 2680
2572 cb = av_shift (av); 2681 cb = av_shift (av);
2573 2682
2683 if (SvTYPE (cb) == SVt_PVCV)
2684 {
2685 dSP;
2686 PUSHMARK (SP);
2687 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2688 PUTBACK;
2689 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2690 }
2691 else
2692 {
2574 api_ready (aTHX_ cb); 2693 api_ready (aTHX_ cb);
2575 sv_setiv (cb, 0); /* signal waiter */ 2694 sv_setiv (cb, 0); /* signal waiter */
2695 }
2696
2576 SvREFCNT_dec (cb); 2697 SvREFCNT_dec (cb);
2577 2698
2578 --count; 2699 --count;
2579 } 2700 }
2580} 2701}
… …
2589static void 2710static void
2590slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2711slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2591{ 2712{
2592 AV *av = (AV *)SvRV (arg [0]); 2713 AV *av = (AV *)SvRV (arg [0]);
2593 2714
2715 if (items >= 2)
2716 {
2717 SV *cb_cv = s_get_cv_croak (arg [1]);
2718 av_push (av, SvREFCNT_inc_NN (cb_cv));
2719
2594 if (SvIVX (AvARRAY (av)[0])) 2720 if (SvIVX (AvARRAY (av)[0]))
2721 coro_signal_wake (aTHX_ av, 1); /* ust be the only waiter */
2722
2723 frame->prepare = prepare_nop;
2724 frame->check = slf_check_nop;
2725 }
2726 else if (SvIVX (AvARRAY (av)[0]))
2595 { 2727 {
2596 SvIVX (AvARRAY (av)[0]) = 0; 2728 SvIVX (AvARRAY (av)[0]) = 0;
2597 frame->prepare = prepare_nop; 2729 frame->prepare = prepare_nop;
2598 frame->check = slf_check_nop; 2730 frame->check = slf_check_nop;
2599 } 2731 }
2600 else 2732 else
2601 { 2733 {
2602 SV *waiter = newRV_inc (SvRV (coro_current)); /* owned by signal av */ 2734 SV *waiter = newSVsv (coro_current); /* owned by signal av */
2603 2735
2604 av_push (av, waiter); 2736 av_push (av, waiter);
2605 2737
2606 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */ 2738 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */
2607 frame->prepare = prepare_schedule; 2739 frame->prepare = prepare_schedule;
… …
2625 2757
2626static void 2758static void
2627coro_aio_callback (pTHX_ CV *cv) 2759coro_aio_callback (pTHX_ CV *cv)
2628{ 2760{
2629 dXSARGS; 2761 dXSARGS;
2630 AV *state = (AV *)GENSUB_ARG; 2762 AV *state = (AV *)S_GENSUB_ARG;
2631 SV *coro = av_pop (state); 2763 SV *coro = av_pop (state);
2632 SV *data_sv = newSV (sizeof (struct io_state)); 2764 SV *data_sv = newSV (sizeof (struct io_state));
2633 2765
2634 av_extend (state, items - 1); 2766 av_extend (state, items - 1);
2635 2767
… …
2749 2881
2750 for (i = 0; i < items; ++i) 2882 for (i = 0; i < items; ++i)
2751 PUSHs (arg [i]); 2883 PUSHs (arg [i]);
2752 2884
2753 /* now push the callback closure */ 2885 /* now push the callback closure */
2754 PUSHs (sv_2mortal (gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state)))); 2886 PUSHs (sv_2mortal (s_gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state))));
2755 2887
2756 /* now call the AIO function - we assume our request is uncancelable */ 2888 /* now call the AIO function - we assume our request is uncancelable */
2757 PUTBACK; 2889 PUTBACK;
2758 call_sv ((SV *)req, G_VOID | G_DISCARD); 2890 call_sv ((SV *)req, G_VOID | G_DISCARD);
2759 } 2891 }
… …
2846 2978
2847 if (!svp) croak ("Time::HiRes is required"); 2979 if (!svp) croak ("Time::HiRes is required");
2848 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer"); 2980 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
2849 2981
2850 nvtime = INT2PTR (double (*)(), SvIV (*svp)); 2982 nvtime = INT2PTR (double (*)(), SvIV (*svp));
2983
2984 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
2985 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
2851 } 2986 }
2852 2987
2853 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 2988 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
2854} 2989}
2855 2990
2856SV * 2991SV *
2857new (char *klass, ...) 2992new (char *klass, ...)
2858 ALIAS: 2993 ALIAS:
… …
2860 CODE: 2995 CODE:
2861{ 2996{
2862 struct coro *coro; 2997 struct coro *coro;
2863 MAGIC *mg; 2998 MAGIC *mg;
2864 HV *hv; 2999 HV *hv;
2865 CV *cb; 3000 SV *cb;
2866 int i; 3001 int i;
2867 3002
2868 if (items > 1) 3003 if (items > 1)
2869 { 3004 {
2870 cb = coro_sv_2cv (aTHX_ ST (1)); 3005 cb = s_get_cv_croak (ST (1));
2871 3006
2872 if (!ix) 3007 if (!ix)
2873 { 3008 {
2874 if (CvISXSUB (cb)) 3009 if (CvISXSUB (cb))
2875 croak ("Coro::State doesn't support XS functions as coroutine start, caught"); 3010 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
… …
2897 av_extend (coro->args, items - 1 + ix - 1); 3032 av_extend (coro->args, items - 1 + ix - 1);
2898 3033
2899 if (ix) 3034 if (ix)
2900 { 3035 {
2901 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb)); 3036 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
2902 cb = cv_coro_run; 3037 cb = (SV *)cv_coro_run;
2903 } 3038 }
2904 3039
2905 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb); 3040 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
2906 3041
2907 for (i = 2; i < items; i++) 3042 for (i = 2; i < items; i++)
… …
3005 eval = 1 3140 eval = 1
3006 CODE: 3141 CODE:
3007{ 3142{
3008 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3143 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
3009 { 3144 {
3010 struct coro temp; 3145 struct coro *current = SvSTATE_current;
3011 3146
3012 if (!(coro->flags & CF_RUNNING)) 3147 if (current != coro)
3013 { 3148 {
3014 PUTBACK; 3149 PUTBACK;
3015 save_perl (aTHX_ &temp); 3150 save_perl (aTHX_ current);
3016 load_perl (aTHX_ coro); 3151 load_perl (aTHX_ coro);
3152 SPAGAIN;
3017 } 3153 }
3018 3154
3019 {
3020 dSP;
3021 ENTER;
3022 SAVETMPS;
3023 PUTBACK;
3024 PUSHSTACK; 3155 PUSHSTACK;
3156
3025 PUSHMARK (SP); 3157 PUSHMARK (SP);
3158 PUTBACK;
3026 3159
3027 if (ix) 3160 if (ix)
3028 eval_sv (coderef, 0); 3161 eval_sv (coderef, 0);
3029 else 3162 else
3030 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 3163 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
3031 3164
3032 POPSTACK; 3165 POPSTACK;
3033 SPAGAIN; 3166 SPAGAIN;
3034 FREETMPS;
3035 LEAVE;
3036 PUTBACK;
3037 }
3038 3167
3039 if (!(coro->flags & CF_RUNNING)) 3168 if (current != coro)
3040 { 3169 {
3170 PUTBACK;
3041 save_perl (aTHX_ coro); 3171 save_perl (aTHX_ coro);
3042 load_perl (aTHX_ &temp); 3172 load_perl (aTHX_ current);
3043 SPAGAIN; 3173 SPAGAIN;
3044 } 3174 }
3045 } 3175 }
3046} 3176}
3047 3177
… …
3051 ALIAS: 3181 ALIAS:
3052 is_ready = CF_READY 3182 is_ready = CF_READY
3053 is_running = CF_RUNNING 3183 is_running = CF_RUNNING
3054 is_new = CF_NEW 3184 is_new = CF_NEW
3055 is_destroyed = CF_DESTROYED 3185 is_destroyed = CF_DESTROYED
3186 is_suspended = CF_SUSPENDED
3056 CODE: 3187 CODE:
3057 RETVAL = boolSV (coro->flags & ix); 3188 RETVAL = boolSV (coro->flags & ix);
3058 OUTPUT: 3189 OUTPUT:
3059 RETVAL 3190 RETVAL
3060 3191
… …
3064 CODE: 3195 CODE:
3065{ 3196{
3066 struct coro *current = SvSTATE_current; 3197 struct coro *current = SvSTATE_current;
3067 SV **throwp = self == current ? &CORO_THROW : &self->except; 3198 SV **throwp = self == current ? &CORO_THROW : &self->except;
3068 SvREFCNT_dec (*throwp); 3199 SvREFCNT_dec (*throwp);
3200 SvGETMAGIC (throw);
3069 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3201 *throwp = SvOK (throw) ? newSVsv (throw) : 0;
3070} 3202}
3071 3203
3072void 3204void
3073api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3205api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
… …
3125 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv; 3257 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
3126 3258
3127 SV *tmp = *src; *src = *dst; *dst = tmp; 3259 SV *tmp = *src; *src = *dst; *dst = tmp;
3128 } 3260 }
3129 3261
3262void
3263cancel (Coro::State self)
3264 CODE:
3265 coro_state_destroy (aTHX_ self);
3266 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */
3267
3268
3269SV *
3270enable_times (int enabled = enable_times)
3271 CODE:
3272{
3273 RETVAL = boolSV (enable_times);
3274
3275 if (enabled != enable_times)
3276 {
3277 enable_times = enabled;
3278
3279 coro_times_update ();
3280 (enabled ? coro_times_sub : coro_times_add)(SvSTATE (coro_current));
3281 }
3282}
3283 OUTPUT:
3284 RETVAL
3285
3286void
3287times (Coro::State self)
3288 PPCODE:
3289{
3290 struct coro *current = SvSTATE (coro_current);
3291
3292 if (expect_false (current == self))
3293 {
3294 coro_times_update ();
3295 coro_times_add (SvSTATE (coro_current));
3296 }
3297
3298 EXTEND (SP, 2);
3299 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3300 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3301
3302 if (expect_false (current == self))
3303 coro_times_sub (SvSTATE (coro_current));
3304}
3130 3305
3131MODULE = Coro::State PACKAGE = Coro 3306MODULE = Coro::State PACKAGE = Coro
3132 3307
3133BOOT: 3308BOOT:
3134{ 3309{
3135 int i;
3136
3137 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3310 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3138 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3311 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3139 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 3312 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3140 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD); 3313 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3141 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 3314 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
… …
3149 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 3322 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3150 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new); 3323 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new);
3151 3324
3152 coro_stash = gv_stashpv ("Coro", TRUE); 3325 coro_stash = gv_stashpv ("Coro", TRUE);
3153 3326
3154 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 3327 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3155 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 3328 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3156 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 3329 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
3157 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 3330 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (CORO_PRIO_LOW));
3158 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE)); 3331 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (CORO_PRIO_IDLE));
3159 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN)); 3332 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (CORO_PRIO_MIN));
3160
3161 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
3162 coro_ready[i] = newAV ();
3163 3333
3164 { 3334 {
3165 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 3335 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
3166 3336
3167 coroapi.schedule = api_schedule; 3337 coroapi.schedule = api_schedule;
… …
3208cede_notself (...) 3378cede_notself (...)
3209 CODE: 3379 CODE:
3210 CORO_EXECUTE_SLF_XS (slf_init_cede_notself); 3380 CORO_EXECUTE_SLF_XS (slf_init_cede_notself);
3211 3381
3212void 3382void
3213_cancel (Coro::State self)
3214 CODE:
3215 coro_state_destroy (aTHX_ self);
3216 coro_call_on_destroy (aTHX_ self);
3217
3218void
3219_set_current (SV *current) 3383_set_current (SV *current)
3220 PROTOTYPE: $ 3384 PROTOTYPE: $
3221 CODE: 3385 CODE:
3222 SvREFCNT_dec (SvRV (coro_current)); 3386 SvREFCNT_dec (SvRV (coro_current));
3223 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current))); 3387 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
… …
3225void 3389void
3226_set_readyhook (SV *hook) 3390_set_readyhook (SV *hook)
3227 PROTOTYPE: $ 3391 PROTOTYPE: $
3228 CODE: 3392 CODE:
3229 SvREFCNT_dec (coro_readyhook); 3393 SvREFCNT_dec (coro_readyhook);
3394 SvGETMAGIC (hook);
3395 if (SvOK (hook))
3396 {
3230 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0; 3397 coro_readyhook = newSVsv (hook);
3398 CORO_READYHOOK = invoke_sv_ready_hook_helper;
3399 }
3400 else
3401 {
3402 coro_readyhook = 0;
3403 CORO_READYHOOK = 0;
3404 }
3231 3405
3232int 3406int
3233prio (Coro::State coro, int newprio = 0) 3407prio (Coro::State coro, int newprio = 0)
3234 PROTOTYPE: $;$ 3408 PROTOTYPE: $;$
3235 ALIAS: 3409 ALIAS:
… …
3241 if (items > 1) 3415 if (items > 1)
3242 { 3416 {
3243 if (ix) 3417 if (ix)
3244 newprio = coro->prio - newprio; 3418 newprio = coro->prio - newprio;
3245 3419
3246 if (newprio < PRIO_MIN) newprio = PRIO_MIN; 3420 if (newprio < CORO_PRIO_MIN) newprio = CORO_PRIO_MIN;
3247 if (newprio > PRIO_MAX) newprio = PRIO_MAX; 3421 if (newprio > CORO_PRIO_MAX) newprio = CORO_PRIO_MAX;
3248 3422
3249 coro->prio = newprio; 3423 coro->prio = newprio;
3250 } 3424 }
3251} 3425}
3252 OUTPUT: 3426 OUTPUT:
… …
3265 PROTOTYPE: 3439 PROTOTYPE:
3266 CODE: 3440 CODE:
3267 RETVAL = coro_nready; 3441 RETVAL = coro_nready;
3268 OUTPUT: 3442 OUTPUT:
3269 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;
3270 3456
3271void 3457void
3272_pool_handler (...) 3458_pool_handler (...)
3273 CODE: 3459 CODE:
3274 CORO_EXECUTE_SLF_XS (slf_init_pool_handler); 3460 CORO_EXECUTE_SLF_XS (slf_init_pool_handler);
… …
3329rouse_wait (...) 3515rouse_wait (...)
3330 PROTOTYPE: ;$ 3516 PROTOTYPE: ;$
3331 PPCODE: 3517 PPCODE:
3332 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait); 3518 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait);
3333 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
3334 3545
3335MODULE = Coro::State PACKAGE = PerlIO::cede 3546MODULE = Coro::State PACKAGE = PerlIO::cede
3336 3547
3337BOOT: 3548BOOT:
3338 PerlIO_define_layer (aTHX_ &PerlIO_cede); 3549 PerlIO_define_layer (aTHX_ &PerlIO_cede);
… …
3341MODULE = Coro::State PACKAGE = Coro::Semaphore 3552MODULE = Coro::State PACKAGE = Coro::Semaphore
3342 3553
3343SV * 3554SV *
3344new (SV *klass, SV *count = 0) 3555new (SV *klass, SV *count = 0)
3345 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
3346 RETVAL = sv_bless ( 3568 RETVAL = sv_bless (
3347 coro_waitarray_new (aTHX_ count && SvOK (count) ? SvIV (count) : 1), 3569 coro_waitarray_new (aTHX_ semcnt),
3348 GvSTASH (CvGV (cv)) 3570 GvSTASH (CvGV (cv))
3349 ); 3571 );
3572}
3350 OUTPUT: 3573 OUTPUT:
3351 RETVAL 3574 RETVAL
3352 3575
3353# helper for Coro::Channel 3576# helper for Coro::Channel and others
3354SV * 3577SV *
3355_alloc (int count) 3578_alloc (int count)
3356 CODE: 3579 CODE:
3357 RETVAL = coro_waitarray_new (aTHX_ count); 3580 RETVAL = coro_waitarray_new (aTHX_ count);
3358 OUTPUT: 3581 OUTPUT:
… …
3416 for (i = 1; i <= wcount; ++i) 3639 for (i = 1; i <= wcount; ++i)
3417 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i]))); 3640 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i])));
3418 } 3641 }
3419} 3642}
3420 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
3421MODULE = Coro::State PACKAGE = Coro::Signal 3660MODULE = Coro::State PACKAGE = Coro::Signal
3422 3661
3423SV * 3662SV *
3424new (SV *klass) 3663new (SV *klass)
3425 CODE: 3664 CODE:
… …
3496 3735
3497void 3736void
3498_register (char *target, char *proto, SV *req) 3737_register (char *target, char *proto, SV *req)
3499 CODE: 3738 CODE:
3500{ 3739{
3501 CV *req_cv = coro_sv_2cv (aTHX_ req); 3740 SV *req_cv = s_get_cv_croak (req);
3502 /* newXSproto doesn't return the CV on 5.8 */ 3741 /* newXSproto doesn't return the CV on 5.8 */
3503 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 3742 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3504 sv_setpv ((SV *)slf_cv, proto); 3743 sv_setpv ((SV *)slf_cv, proto);
3505 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);
3506} 3745}
3507 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