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.340 by root, Mon Dec 15 00:30:40 2008 UTC vs.
Revision 1.365 by root, Mon Jul 20 16:18:30 2009 UTC

… …
6#include "EXTERN.h" 6#include "EXTERN.h"
7#include "perl.h" 7#include "perl.h"
8#include "XSUB.h" 8#include "XSUB.h"
9#include "perliol.h" 9#include "perliol.h"
10 10
11#include "patchlevel.h" 11#include "schmorp.h"
12 12
13#include <stdio.h> 13#include <stdio.h>
14#include <errno.h> 14#include <errno.h>
15#include <assert.h> 15#include <assert.h>
16 16
… …
51#endif 51#endif
52 52
53/* the maximum number of idle cctx that will be pooled */ 53/* the maximum number of idle cctx that will be pooled */
54static int cctx_max_idle = 4; 54static int cctx_max_idle = 4;
55 55
56#define PERL_VERSION_ATLEAST(a,b,c) \
57 (PERL_REVISION > (a) \
58 || (PERL_REVISION == (a) \
59 && (PERL_VERSION > (b) \
60 || (PERL_VERSION == (b) && PERL_SUBVERSION >= (c)))))
61
62#if !PERL_VERSION_ATLEAST (5,6,0)
63# ifndef PL_ppaddr
64# define PL_ppaddr ppaddr
65# endif
66# ifndef call_sv
67# define call_sv perl_call_sv
68# endif
69# ifndef get_sv
70# define get_sv perl_get_sv
71# endif
72# ifndef get_cv
73# define get_cv perl_get_cv
74# endif
75# ifndef IS_PADGV
76# define IS_PADGV(v) 0
77# endif
78# ifndef IS_PADCONST
79# define IS_PADCONST(v) 0
80# endif
81#endif
82
83/* 5.11 */
84#ifndef CxHASARGS
85# define CxHASARGS(cx) (cx)->blk_sub.hasargs
86#endif
87
88/* 5.10.0 */
89#ifndef SvREFCNT_inc_NN
90# define SvREFCNT_inc_NN(sv) SvREFCNT_inc (sv)
91#endif
92
93/* 5.8.8 */
94#ifndef GV_NOTQUAL
95# define GV_NOTQUAL 0
96#endif
97#ifndef newSV
98# define newSV(l) NEWSV(0,l)
99#endif
100#ifndef CvISXSUB_on
101# define CvISXSUB_on(cv) (void)cv
102#endif
103#ifndef CvISXSUB
104# define CvISXSUB(cv) (CvXSUB (cv) ? TRUE : FALSE)
105#endif
106#ifndef Newx
107# define Newx(ptr,nitems,type) New (0,ptr,nitems,type)
108#endif
109
110/* 5.8.7 */
111#ifndef SvRV_set
112# define SvRV_set(s,v) SvRV(s) = (v)
113#endif
114
115#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 56#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
116# undef CORO_STACKGUARD 57# undef CORO_STACKGUARD
117#endif 58#endif
118 59
119#ifndef CORO_STACKGUARD 60#ifndef CORO_STACKGUARD
… …
137 78
138#define IN_DESTRUCT PL_dirty 79#define IN_DESTRUCT PL_dirty
139 80
140#if __GNUC__ >= 3 81#if __GNUC__ >= 3
141# define attribute(x) __attribute__(x) 82# define attribute(x) __attribute__(x)
142# define expect(expr,value) __builtin_expect ((expr),(value)) 83# define expect(expr,value) __builtin_expect ((expr), (value))
143# define INLINE static inline 84# define INLINE static inline
144#else 85#else
145# define attribute(x) 86# define attribute(x)
146# define expect(expr,value) (expr) 87# define expect(expr,value) (expr)
147# define INLINE static 88# define INLINE static
… …
159# if CORO_PTHREAD 100# if CORO_PTHREAD
160static void *coro_thx; 101static void *coro_thx;
161# endif 102# endif
162#endif 103#endif
163 104
105#ifdef __linux
106# include <time.h> /* for timespec */
107# include <syscall.h> /* for SYS_* */
108# ifdef SYS_clock_gettime
109# define coro_clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
110# define CORO_CLOCK_MONOTONIC 1
111# define CORO_CLOCK_THREAD_CPUTIME_ID 3
112# endif
113#endif
114
164static double (*nvtime)(); /* so why doesn't it take void? */ 115static double (*nvtime)(); /* so why doesn't it take void? */
116static void (*u2time)(pTHX_ UV ret[2]);
165 117
166/* we hijack an hopefully unused CV flag for our purposes */ 118/* we hijack an hopefully unused CV flag for our purposes */
167#define CVf_SLF 0x4000 119#define CVf_SLF 0x4000
168static OP *pp_slf (pTHX); 120static OP *pp_slf (pTHX);
169 121
… …
195static CV *cv_coro_state_new; 147static CV *cv_coro_state_new;
196 148
197/* Coro::AnyEvent */ 149/* Coro::AnyEvent */
198static SV *sv_activity; 150static SV *sv_activity;
199 151
152/* enable processtime/realtime profiling */
153static char enable_times;
154typedef U32 coro_ts[2];
155static coro_ts time_real, time_cpu;
156static char times_valid;
157
200static struct coro_cctx *cctx_first; 158static struct coro_cctx *cctx_first;
201static int cctx_count, cctx_idle; 159static int cctx_count, cctx_idle;
202 160
203enum { 161enum {
204 CC_MAPPED = 0x01, 162 CC_MAPPED = 0x01,
… …
238enum { 196enum {
239 CF_RUNNING = 0x0001, /* coroutine is running */ 197 CF_RUNNING = 0x0001, /* coroutine is running */
240 CF_READY = 0x0002, /* coroutine is ready */ 198 CF_READY = 0x0002, /* coroutine is ready */
241 CF_NEW = 0x0004, /* has never been switched to */ 199 CF_NEW = 0x0004, /* has never been switched to */
242 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 200 CF_DESTROYED = 0x0008, /* coroutine data has been freed */
201 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
243}; 202};
244 203
245/* the structure where most of the perl state is stored, overlaid on the cxstack */ 204/* the structure where most of the perl state is stored, overlaid on the cxstack */
246typedef struct 205typedef struct
247{ 206{
… …
260/* this is a structure representing a perl-level coroutine */ 219/* this is a structure representing a perl-level coroutine */
261struct coro { 220struct coro {
262 /* the C coroutine allocated to this perl coroutine, if any */ 221 /* the C coroutine allocated to this perl coroutine, if any */
263 coro_cctx *cctx; 222 coro_cctx *cctx;
264 223
224 /* ready queue */
225 struct coro *next_ready;
226
265 /* state data */ 227 /* state data */
266 struct CoroSLF slf_frame; /* saved slf frame */ 228 struct CoroSLF slf_frame; /* saved slf frame */
267 AV *mainstack; 229 AV *mainstack;
268 perl_slots *slot; /* basically the saved sp */ 230 perl_slots *slot; /* basically the saved sp */
269 231
… …
289 251
290 /* on_enter/on_leave */ 252 /* on_enter/on_leave */
291 AV *on_enter; 253 AV *on_enter;
292 AV *on_leave; 254 AV *on_leave;
293 255
256 /* times */
257 coro_ts t_cpu, t_real;
258
294 /* linked list */ 259 /* linked list */
295 struct coro *next, *prev; 260 struct coro *next, *prev;
296}; 261};
297 262
298typedef struct coro *Coro__State; 263typedef struct coro *Coro__State;
… …
303/* the mainr easonw e don't support windows process emulation */ 268/* the mainr easonw e don't support windows process emulation */
304static struct CoroSLF slf_frame; /* the current slf frame */ 269static struct CoroSLF slf_frame; /* the current slf frame */
305 270
306/** Coro ********************************************************************/ 271/** Coro ********************************************************************/
307 272
308#define PRIO_MAX 3 273#define CORO_PRIO_MAX 3
309#define PRIO_HIGH 1 274#define CORO_PRIO_HIGH 1
310#define PRIO_NORMAL 0 275#define CORO_PRIO_NORMAL 0
311#define PRIO_LOW -1 276#define CORO_PRIO_LOW -1
312#define PRIO_IDLE -3 277#define CORO_PRIO_IDLE -3
313#define PRIO_MIN -4 278#define CORO_PRIO_MIN -4
314 279
315/* for Coro.pm */ 280/* for Coro.pm */
316static SV *coro_current; 281static SV *coro_current;
317static SV *coro_readyhook; 282static SV *coro_readyhook;
318static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1]; 283static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
319static CV *cv_coro_run, *cv_coro_terminate; 284static CV *cv_coro_run, *cv_coro_terminate;
320static struct coro *coro_first; 285static struct coro *coro_first;
321#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}
322 307
323/** lowlevel stuff **********************************************************/ 308/** lowlevel stuff **********************************************************/
324 309
325static SV * 310static SV *
326coro_get_sv (pTHX_ const char *name, int create) 311coro_get_sv (pTHX_ const char *name, int create)
… …
350 get_hv (name, create); 335 get_hv (name, create);
351#endif 336#endif
352 return get_hv (name, create); 337 return get_hv (name, create);
353} 338}
354 339
355/* may croak */ 340INLINE void
356INLINE CV * 341coro_times_update ()
357coro_sv_2cv (pTHX_ SV *sv)
358{ 342{
359 HV *st; 343#ifdef coro_clock_gettime
360 GV *gvp; 344 struct timespec ts;
361 CV *cv = sv_2cv (sv, &st, &gvp, 0);
362 345
363 if (!cv) 346 ts.tv_sec = ts.tv_nsec = 0;
364 croak ("code reference expected"); 347 coro_clock_gettime (CORO_CLOCK_THREAD_CPUTIME_ID, &ts);
348 time_cpu [0] = ts.tv_sec; time_cpu [1] = ts.tv_nsec;
365 349
366 return cv; 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];
367} 385}
368 386
369/*****************************************************************************/ 387/*****************************************************************************/
370/* magic glue */ 388/* magic glue */
371 389
… …
471static int 489static int
472coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 490coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
473{ 491{
474 AV *padlist; 492 AV *padlist;
475 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;
476 498
477 /* casting is fun. */ 499 /* casting is fun. */
478 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 500 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
479 free_padlist (aTHX_ padlist); 501 free_padlist (aTHX_ padlist);
480 502
… …
569 } 591 }
570 592
571 slf_frame = c->slf_frame; 593 slf_frame = c->slf_frame;
572 CORO_THROW = c->except; 594 CORO_THROW = c->except;
573 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
574 if (expect_false (c->on_enter)) 604 if (expect_false (c->on_enter))
575 { 605 {
576 int i; 606 int i;
577 607
578 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 608 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
… …
587 { 617 {
588 int i; 618 int i;
589 619
590 for (i = AvFILLp (c->on_leave); i >= 0; --i) 620 for (i = AvFILLp (c->on_leave); i >= 0; --i)
591 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[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);
592 } 630 }
593 631
594 c->except = CORO_THROW; 632 c->except = CORO_THROW;
595 c->slf_frame = slf_frame; 633 c->slf_frame = slf_frame;
596 634
… …
611 { 649 {
612 while (expect_true (cxix >= 0)) 650 while (expect_true (cxix >= 0))
613 { 651 {
614 PERL_CONTEXT *cx = &ccstk[cxix--]; 652 PERL_CONTEXT *cx = &ccstk[cxix--];
615 653
616 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))
617 { 655 {
618 CV *cv = cx->blk_sub.cv; 656 CV *cv = cx->blk_sub.cv;
619 657
620 if (expect_true (CvDEPTH (cv))) 658 if (expect_true (CvDEPTH (cv)))
621 { 659 {
… …
645 /* we manually unroll here, as usually 2 slots is enough */ 683 /* we manually unroll here, as usually 2 slots is enough */
646 if (SLOT_COUNT >= 1) CXINC; 684 if (SLOT_COUNT >= 1) CXINC;
647 if (SLOT_COUNT >= 2) CXINC; 685 if (SLOT_COUNT >= 2) CXINC;
648 if (SLOT_COUNT >= 3) CXINC; 686 if (SLOT_COUNT >= 3) CXINC;
649 { 687 {
650 int i; 688 unsigned int i;
651 for (i = 3; i < SLOT_COUNT; ++i) 689 for (i = 3; i < SLOT_COUNT; ++i)
652 CXINC; 690 CXINC;
653 } 691 }
654 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 692 cxstack_ix -= SLOT_COUNT; /* undo allocation */
655 693
… …
960 998
961 PL_op = (OP *)&coro_setup_op; 999 PL_op = (OP *)&coro_setup_op;
962 1000
963 /* copy throw, in case it was set before coro_setup */ 1001 /* copy throw, in case it was set before coro_setup */
964 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 }
965} 1009}
966 1010
967static void 1011static void
968coro_unwind_stacks (pTHX) 1012coro_unwind_stacks (pTHX)
969{ 1013{
… …
986} 1030}
987 1031
988static void 1032static void
989coro_destruct_perl (pTHX_ struct coro *coro) 1033coro_destruct_perl (pTHX_ struct coro *coro)
990{ 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
991 coro_unwind_stacks (aTHX); 1045 coro_unwind_stacks (aTHX);
1046 coro_destruct_stacks (aTHX);
992 1047
993 SvREFCNT_dec (GvSV (PL_defgv)); 1048 // now save some sv's to be free'd later
994 SvREFCNT_dec (GvAV (PL_defgv)); 1049 svf [0] = GvSV (PL_defgv);
995 SvREFCNT_dec (GvSV (PL_errgv)); 1050 svf [1] = (SV *)GvAV (PL_defgv);
996 SvREFCNT_dec (PL_defoutgv); 1051 svf [2] = GvSV (PL_errgv);
997 SvREFCNT_dec (PL_rs); 1052 svf [3] = (SV *)PL_defoutgv;
998 SvREFCNT_dec (GvSV (irsgv)); 1053 svf [4] = PL_rs;
999 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));
1000 1059
1001 SvREFCNT_dec (PL_diehook); 1060 load_perl (aTHX_ current);
1002 SvREFCNT_dec (PL_warnhook);
1003 1061 }
1062
1063 {
1064 unsigned int i;
1065
1066 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i)
1067 SvREFCNT_dec (svf [i]);
1068
1004 SvREFCNT_dec (coro->saved_deffh); 1069 SvREFCNT_dec (coro->saved_deffh);
1005 SvREFCNT_dec (coro->rouse_cb); 1070 SvREFCNT_dec (coro->rouse_cb);
1006 SvREFCNT_dec (coro->invoke_cb); 1071 SvREFCNT_dec (coro->invoke_cb);
1007 SvREFCNT_dec (coro->invoke_av); 1072 SvREFCNT_dec (coro->invoke_av);
1008 1073 }
1009 coro_destruct_stacks (aTHX);
1010} 1074}
1011 1075
1012INLINE void 1076INLINE void
1013free_coro_mortal (pTHX) 1077free_coro_mortal (pTHX)
1014{ 1078{
… …
1382 /* TODO: throwing up here is considered harmful */ 1446 /* TODO: throwing up here is considered harmful */
1383 1447
1384 if (expect_true (prev != next)) 1448 if (expect_true (prev != next))
1385 { 1449 {
1386 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1450 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1387 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,");
1388 1452
1389 if (expect_false (next->flags & CF_RUNNING))
1390 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states,");
1391
1392 if (expect_false (next->flags & CF_DESTROYED)) 1453 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED)))
1393 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,");
1394 1455
1395#if !PERL_VERSION_ATLEAST (5,10,0) 1456#if !PERL_VERSION_ATLEAST (5,10,0)
1396 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1457 if (expect_false (PL_lex_state != LEX_NOTPARSING))
1397 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,");
1398#endif 1459#endif
… …
1486coro_state_destroy (pTHX_ struct coro *coro) 1547coro_state_destroy (pTHX_ struct coro *coro)
1487{ 1548{
1488 if (coro->flags & CF_DESTROYED) 1549 if (coro->flags & CF_DESTROYED)
1489 return 0; 1550 return 0;
1490 1551
1491 if (coro->on_destroy) 1552 if (coro->on_destroy && !PL_dirty)
1492 coro->on_destroy (aTHX_ coro); 1553 coro->on_destroy (aTHX_ coro);
1493 1554
1494 coro->flags |= CF_DESTROYED; 1555 coro->flags |= CF_DESTROYED;
1495 1556
1496 if (coro->flags & CF_READY) 1557 if (coro->flags & CF_READY)
… …
1504 1565
1505 if (coro->mainstack 1566 if (coro->mainstack
1506 && coro->mainstack != main_mainstack 1567 && coro->mainstack != main_mainstack
1507 && coro->slot 1568 && coro->slot
1508 && !PL_dirty) 1569 && !PL_dirty)
1509 {
1510 struct coro *current = SvSTATE_current;
1511
1512 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1513
1514 save_perl (aTHX_ current);
1515 load_perl (aTHX_ coro);
1516
1517 coro_destruct_perl (aTHX_ coro); 1570 coro_destruct_perl (aTHX_ coro);
1518
1519 load_perl (aTHX_ current);
1520
1521 coro->slot = 0;
1522 }
1523 1571
1524 cctx_destroy (coro->cctx); 1572 cctx_destroy (coro->cctx);
1525 SvREFCNT_dec (coro->startcv); 1573 SvREFCNT_dec (coro->startcv);
1526 SvREFCNT_dec (coro->args); 1574 SvREFCNT_dec (coro->args);
1527 SvREFCNT_dec (CORO_THROW); 1575 SvREFCNT_dec (CORO_THROW);
… …
1586 1634
1587 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1635 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1588 TRANSFER (ta, 1); 1636 TRANSFER (ta, 1);
1589} 1637}
1590 1638
1591/*****************************************************************************/
1592/* gensub: simple closure generation utility */
1593
1594#define GENSUB_ARG CvXSUBANY (cv).any_ptr
1595
1596/* create a closure from XS, returns a code reference */
1597/* the arg can be accessed via GENSUB_ARG from the callback */
1598/* the callback must use dXSARGS/XSRETURN */
1599static SV *
1600gensub (pTHX_ void (*xsub)(pTHX_ CV *), void *arg)
1601{
1602 CV *cv = (CV *)newSV (0);
1603
1604 sv_upgrade ((SV *)cv, SVt_PVCV);
1605
1606 CvANON_on (cv);
1607 CvISXSUB_on (cv);
1608 CvXSUB (cv) = xsub;
1609 GENSUB_ARG = arg;
1610
1611 return newRV_noinc ((SV *)cv);
1612}
1613
1614/** Coro ********************************************************************/ 1639/** Coro ********************************************************************/
1615 1640
1616INLINE void 1641INLINE void
1617coro_enq (pTHX_ struct coro *coro) 1642coro_enq (pTHX_ struct coro *coro)
1618{ 1643{
1619 av_push (coro_ready [coro->prio - PRIO_MIN], SvREFCNT_inc_NN (coro->hv)); 1644 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1620}
1621 1645
1622INLINE 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 *
1623coro_deq (pTHX) 1654coro_deq (pTHX)
1624{ 1655{
1625 int prio; 1656 int prio;
1626 1657
1627 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; ) 1658 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
1628 if (AvFILLp (coro_ready [prio]) >= 0) 1659 {
1629 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 }
1630 1669
1631 return 0; 1670 return 0;
1671}
1672
1673static void
1674invoke_sv_ready_hook_helper (void)
1675{
1676 dTHX;
1677 dSP;
1678
1679 ENTER;
1680 SAVETMPS;
1681
1682 PUSHMARK (SP);
1683 PUTBACK;
1684 call_sv (coro_readyhook, G_VOID | G_DISCARD);
1685
1686 FREETMPS;
1687 LEAVE;
1632} 1688}
1633 1689
1634static int 1690static int
1635api_ready (pTHX_ SV *coro_sv) 1691api_ready (pTHX_ SV *coro_sv)
1636{ 1692{
1637 struct coro *coro;
1638 SV *sv_hook;
1639 void (*xs_hook)(void);
1640
1641 coro = SvSTATE (coro_sv); 1693 struct coro *coro = SvSTATE (coro_sv);
1642 1694
1643 if (coro->flags & CF_READY) 1695 if (coro->flags & CF_READY)
1644 return 0; 1696 return 0;
1645 1697
1646 coro->flags |= CF_READY; 1698 coro->flags |= CF_READY;
1647 1699
1648 sv_hook = coro_nready ? 0 : coro_readyhook;
1649 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1650
1651 coro_enq (aTHX_ coro); 1700 coro_enq (aTHX_ coro);
1652 ++coro_nready;
1653 1701
1654 if (sv_hook) 1702 if (!coro_nready++)
1655 { 1703 if (coroapi.readyhook)
1656 dSP; 1704 coroapi.readyhook ();
1657
1658 ENTER;
1659 SAVETMPS;
1660
1661 PUSHMARK (SP);
1662 PUTBACK;
1663 call_sv (sv_hook, G_VOID | G_DISCARD);
1664
1665 FREETMPS;
1666 LEAVE;
1667 }
1668
1669 if (xs_hook)
1670 xs_hook ();
1671 1705
1672 return 1; 1706 return 1;
1673} 1707}
1674 1708
1675static int 1709static int
… …
1698static void 1732static void
1699prepare_schedule (pTHX_ struct coro_transfer_args *ta) 1733prepare_schedule (pTHX_ struct coro_transfer_args *ta)
1700{ 1734{
1701 for (;;) 1735 for (;;)
1702 { 1736 {
1703 SV *next_sv = coro_deq (aTHX); 1737 struct coro *next = coro_deq (aTHX);
1704 1738
1705 if (expect_true (next_sv)) 1739 if (expect_true (next))
1706 { 1740 {
1707 struct coro *next = SvSTATE_hv (next_sv);
1708
1709 /* cannot transfer to destroyed coros, skip and look for next */ 1741 /* cannot transfer to destroyed coros, skip and look for next */
1710 if (expect_false (next->flags & CF_DESTROYED)) 1742 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED)))
1711 SvREFCNT_dec (next_sv); /* coro_nready has already been taken care of by destroy */ 1743 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1712 else 1744 else
1713 { 1745 {
1714 next->flags &= ~CF_READY; 1746 next->flags &= ~CF_READY;
1715 --coro_nready; 1747 --coro_nready;
1716 1748
… …
1985 2017
1986static void 2018static void
1987coro_rouse_callback (pTHX_ CV *cv) 2019coro_rouse_callback (pTHX_ CV *cv)
1988{ 2020{
1989 dXSARGS; 2021 dXSARGS;
1990 SV *data = (SV *)GENSUB_ARG; 2022 SV *data = (SV *)S_GENSUB_ARG;
1991 2023
1992 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2024 if (SvTYPE (SvRV (data)) != SVt_PVAV)
1993 { 2025 {
1994 /* first call, set args */ 2026 /* first call, set args */
2027 SV *coro = SvRV (data);
1995 AV *av = newAV (); 2028 AV *av = newAV ();
1996 SV *coro = SvRV (data);
1997 2029
1998 SvRV_set (data, (SV *)av); 2030 SvRV_set (data, (SV *)av);
1999 api_ready (aTHX_ coro);
2000 SvREFCNT_dec (coro);
2001 2031
2002 /* better take a full copy of the arguments */ 2032 /* better take a full copy of the arguments */
2003 while (items--) 2033 while (items--)
2004 av_store (av, items, newSVsv (ST (items))); 2034 av_store (av, items, newSVsv (ST (items)));
2035
2036 api_ready (aTHX_ coro);
2037 SvREFCNT_dec (coro);
2005 } 2038 }
2006 2039
2007 XSRETURN_EMPTY; 2040 XSRETURN_EMPTY;
2008} 2041}
2009 2042
… …
2026 2059
2027 EXTEND (SP, AvFILLp (av) + 1); 2060 EXTEND (SP, AvFILLp (av) + 1);
2028 for (i = 0; i <= AvFILLp (av); ++i) 2061 for (i = 0; i <= AvFILLp (av); ++i)
2029 PUSHs (sv_2mortal (AvARRAY (av)[i])); 2062 PUSHs (sv_2mortal (AvARRAY (av)[i]));
2030 2063
2031 /* we have stolen the elements, so ste length to zero and free */ 2064 /* we have stolen the elements, so set length to zero and free */
2032 AvFILLp (av) = -1; 2065 AvFILLp (av) = -1;
2033 av_undef (av); 2066 av_undef (av);
2034 2067
2035 PUTBACK; 2068 PUTBACK;
2036 } 2069 }
… …
2060 || SvTYPE (SvRV (cb)) != SVt_PVCV 2093 || SvTYPE (SvRV (cb)) != SVt_PVCV
2061 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2094 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2062 croak ("Coro::rouse_wait called with illegal callback argument,"); 2095 croak ("Coro::rouse_wait called with illegal callback argument,");
2063 2096
2064 { 2097 {
2065 CV *cv = (CV *)SvRV (cb); /* for GENSUB_ARG */ 2098 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
2066 SV *data = (SV *)GENSUB_ARG; 2099 SV *data = (SV *)S_GENSUB_ARG;
2067 2100
2068 frame->data = (void *)data; 2101 frame->data = (void *)data;
2069 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule; 2102 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
2070 frame->check = slf_check_rouse_wait; 2103 frame->check = slf_check_rouse_wait;
2071 } 2104 }
… …
2075coro_new_rouse_cb (pTHX) 2108coro_new_rouse_cb (pTHX)
2076{ 2109{
2077 HV *hv = (HV *)SvRV (coro_current); 2110 HV *hv = (HV *)SvRV (coro_current);
2078 struct coro *coro = SvSTATE_hv (hv); 2111 struct coro *coro = SvSTATE_hv (hv);
2079 SV *data = newRV_inc ((SV *)hv); 2112 SV *data = newRV_inc ((SV *)hv);
2080 SV *cb = gensub (aTHX_ coro_rouse_callback, (void *)data); 2113 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
2081 2114
2082 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0); 2115 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0);
2083 SvREFCNT_dec (data); /* magicext increases the refcount */ 2116 SvREFCNT_dec (data); /* magicext increases the refcount */
2084 2117
2085 SvREFCNT_dec (coro->rouse_cb); 2118 SvREFCNT_dec (coro->rouse_cb);
… …
2456/* Coro::Semaphore & Coro::Signal */ 2489/* Coro::Semaphore & Coro::Signal */
2457 2490
2458static SV * 2491static SV *
2459coro_waitarray_new (pTHX_ int count) 2492coro_waitarray_new (pTHX_ int count)
2460{ 2493{
2461 /* a semaphore contains a counter IV in $sem->[0] and any waiters after that */ 2494 /* a waitarray=semaphore contains a counter IV in $sem->[0] and any waiters after that */
2462 AV *av = newAV (); 2495 AV *av = newAV ();
2463 SV **ary; 2496 SV **ary;
2464 2497
2465 /* unfortunately, building manually saves memory */ 2498 /* unfortunately, building manually saves memory */
2466 Newx (ary, 2, SV *); 2499 Newx (ary, 2, SV *);
… …
2608{ 2641{
2609 if (items >= 2) 2642 if (items >= 2)
2610 { 2643 {
2611 /* callback form */ 2644 /* callback form */
2612 AV *av = (AV *)SvRV (arg [0]); 2645 AV *av = (AV *)SvRV (arg [0]);
2613 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 2646 SV *cb_cv = s_get_cv_croak (arg [1]);
2614 2647
2615 av_push (av, (SV *)SvREFCNT_inc_NN (cb_cv)); 2648 av_push (av, SvREFCNT_inc_NN (cb_cv));
2616 2649
2617 if (SvIVX (AvARRAY (av)[0]) > 0) 2650 if (SvIVX (AvARRAY (av)[0]) > 0)
2618 coro_semaphore_adjust (aTHX_ av, 0); 2651 coro_semaphore_adjust (aTHX_ av, 0);
2619 2652
2620 frame->prepare = prepare_nop; 2653 frame->prepare = prepare_nop;
… …
2644 AvARRAY (av)[0] = AvARRAY (av)[1]; 2677 AvARRAY (av)[0] = AvARRAY (av)[1];
2645 AvARRAY (av)[1] = cb; 2678 AvARRAY (av)[1] = cb;
2646 2679
2647 cb = av_shift (av); 2680 cb = av_shift (av);
2648 2681
2682 if (SvTYPE (cb) == SVt_PVCV)
2683 {
2684 dSP;
2685 PUSHMARK (SP);
2686 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2687 PUTBACK;
2688 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2689 }
2690 else
2691 {
2649 api_ready (aTHX_ cb); 2692 api_ready (aTHX_ cb);
2650 sv_setiv (cb, 0); /* signal waiter */ 2693 sv_setiv (cb, 0); /* signal waiter */
2694 }
2695
2651 SvREFCNT_dec (cb); 2696 SvREFCNT_dec (cb);
2652 2697
2653 --count; 2698 --count;
2654 } 2699 }
2655} 2700}
… …
2664static void 2709static void
2665slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2710slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2666{ 2711{
2667 AV *av = (AV *)SvRV (arg [0]); 2712 AV *av = (AV *)SvRV (arg [0]);
2668 2713
2714 if (items >= 2)
2715 {
2716 SV *cb_cv = s_get_cv_croak (arg [1]);
2717 av_push (av, SvREFCNT_inc_NN (cb_cv));
2718
2669 if (SvIVX (AvARRAY (av)[0])) 2719 if (SvIVX (AvARRAY (av)[0]))
2720 coro_signal_wake (aTHX_ av, 1); /* ust be the only waiter */
2721
2722 frame->prepare = prepare_nop;
2723 frame->check = slf_check_nop;
2724 }
2725 else if (SvIVX (AvARRAY (av)[0]))
2670 { 2726 {
2671 SvIVX (AvARRAY (av)[0]) = 0; 2727 SvIVX (AvARRAY (av)[0]) = 0;
2672 frame->prepare = prepare_nop; 2728 frame->prepare = prepare_nop;
2673 frame->check = slf_check_nop; 2729 frame->check = slf_check_nop;
2674 } 2730 }
2675 else 2731 else
2676 { 2732 {
2677 SV *waiter = newRV_inc (SvRV (coro_current)); /* owned by signal av */ 2733 SV *waiter = newSVsv (coro_current); /* owned by signal av */
2678 2734
2679 av_push (av, waiter); 2735 av_push (av, waiter);
2680 2736
2681 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */ 2737 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */
2682 frame->prepare = prepare_schedule; 2738 frame->prepare = prepare_schedule;
… …
2700 2756
2701static void 2757static void
2702coro_aio_callback (pTHX_ CV *cv) 2758coro_aio_callback (pTHX_ CV *cv)
2703{ 2759{
2704 dXSARGS; 2760 dXSARGS;
2705 AV *state = (AV *)GENSUB_ARG; 2761 AV *state = (AV *)S_GENSUB_ARG;
2706 SV *coro = av_pop (state); 2762 SV *coro = av_pop (state);
2707 SV *data_sv = newSV (sizeof (struct io_state)); 2763 SV *data_sv = newSV (sizeof (struct io_state));
2708 2764
2709 av_extend (state, items - 1); 2765 av_extend (state, items - 1);
2710 2766
… …
2824 2880
2825 for (i = 0; i < items; ++i) 2881 for (i = 0; i < items; ++i)
2826 PUSHs (arg [i]); 2882 PUSHs (arg [i]);
2827 2883
2828 /* now push the callback closure */ 2884 /* now push the callback closure */
2829 PUSHs (sv_2mortal (gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state)))); 2885 PUSHs (sv_2mortal (s_gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state))));
2830 2886
2831 /* now call the AIO function - we assume our request is uncancelable */ 2887 /* now call the AIO function - we assume our request is uncancelable */
2832 PUTBACK; 2888 PUTBACK;
2833 call_sv ((SV *)req, G_VOID | G_DISCARD); 2889 call_sv ((SV *)req, G_VOID | G_DISCARD);
2834 } 2890 }
… …
2921 2977
2922 if (!svp) croak ("Time::HiRes is required"); 2978 if (!svp) croak ("Time::HiRes is required");
2923 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer"); 2979 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
2924 2980
2925 nvtime = INT2PTR (double (*)(), SvIV (*svp)); 2981 nvtime = INT2PTR (double (*)(), SvIV (*svp));
2982
2983 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
2984 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
2926 } 2985 }
2927 2986
2928 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 2987 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
2929} 2988}
2930 2989
2931SV * 2990SV *
2932new (char *klass, ...) 2991new (char *klass, ...)
2933 ALIAS: 2992 ALIAS:
… …
2935 CODE: 2994 CODE:
2936{ 2995{
2937 struct coro *coro; 2996 struct coro *coro;
2938 MAGIC *mg; 2997 MAGIC *mg;
2939 HV *hv; 2998 HV *hv;
2940 CV *cb; 2999 SV *cb;
2941 int i; 3000 int i;
2942 3001
2943 if (items > 1) 3002 if (items > 1)
2944 { 3003 {
2945 cb = coro_sv_2cv (aTHX_ ST (1)); 3004 cb = s_get_cv_croak (ST (1));
2946 3005
2947 if (!ix) 3006 if (!ix)
2948 { 3007 {
2949 if (CvISXSUB (cb)) 3008 if (CvISXSUB (cb))
2950 croak ("Coro::State doesn't support XS functions as coroutine start, caught"); 3009 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
… …
2972 av_extend (coro->args, items - 1 + ix - 1); 3031 av_extend (coro->args, items - 1 + ix - 1);
2973 3032
2974 if (ix) 3033 if (ix)
2975 { 3034 {
2976 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb)); 3035 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
2977 cb = cv_coro_run; 3036 cb = (SV *)cv_coro_run;
2978 } 3037 }
2979 3038
2980 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb); 3039 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
2981 3040
2982 for (i = 2; i < items; i++) 3041 for (i = 2; i < items; i++)
… …
3100 if (ix) 3159 if (ix)
3101 eval_sv (coderef, 0); 3160 eval_sv (coderef, 0);
3102 else 3161 else
3103 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 3162 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
3104 3163
3164 POPSTACK;
3105 SPAGAIN; 3165 SPAGAIN;
3106 POPSTACK;
3107 3166
3108 if (current != coro) 3167 if (current != coro)
3109 { 3168 {
3110 PUTBACK; 3169 PUTBACK;
3111 save_perl (aTHX_ coro); 3170 save_perl (aTHX_ coro);
… …
3121 ALIAS: 3180 ALIAS:
3122 is_ready = CF_READY 3181 is_ready = CF_READY
3123 is_running = CF_RUNNING 3182 is_running = CF_RUNNING
3124 is_new = CF_NEW 3183 is_new = CF_NEW
3125 is_destroyed = CF_DESTROYED 3184 is_destroyed = CF_DESTROYED
3185 is_suspended = CF_SUSPENDED
3126 CODE: 3186 CODE:
3127 RETVAL = boolSV (coro->flags & ix); 3187 RETVAL = boolSV (coro->flags & ix);
3128 OUTPUT: 3188 OUTPUT:
3129 RETVAL 3189 RETVAL
3130 3190
… …
3134 CODE: 3194 CODE:
3135{ 3195{
3136 struct coro *current = SvSTATE_current; 3196 struct coro *current = SvSTATE_current;
3137 SV **throwp = self == current ? &CORO_THROW : &self->except; 3197 SV **throwp = self == current ? &CORO_THROW : &self->except;
3138 SvREFCNT_dec (*throwp); 3198 SvREFCNT_dec (*throwp);
3199 SvGETMAGIC (throw);
3139 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3200 *throwp = SvOK (throw) ? newSVsv (throw) : 0;
3140} 3201}
3141 3202
3142void 3203void
3143api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3204api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
… …
3195 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv; 3256 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
3196 3257
3197 SV *tmp = *src; *src = *dst; *dst = tmp; 3258 SV *tmp = *src; *src = *dst; *dst = tmp;
3198 } 3259 }
3199 3260
3261void
3262cancel (Coro::State self)
3263 CODE:
3264 coro_state_destroy (aTHX_ self);
3265 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */
3266
3267
3268SV *
3269enable_times (int enabled = enable_times)
3270 CODE:
3271{
3272 RETVAL = boolSV (enable_times);
3273
3274 if (enabled != enable_times)
3275 {
3276 enable_times = enabled;
3277
3278 coro_times_update ();
3279 (enabled ? coro_times_sub : coro_times_add)(SvSTATE (coro_current));
3280 }
3281}
3282 OUTPUT:
3283 RETVAL
3284
3285void
3286times (Coro::State self)
3287 PPCODE:
3288{
3289 struct coro *current = SvSTATE (coro_current);
3290
3291 if (expect_false (current == self))
3292 {
3293 coro_times_update ();
3294 coro_times_add (SvSTATE (coro_current));
3295 }
3296
3297 EXTEND (SP, 2);
3298 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3299 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3300
3301 if (expect_false (current == self))
3302 coro_times_sub (SvSTATE (coro_current));
3303}
3200 3304
3201MODULE = Coro::State PACKAGE = Coro 3305MODULE = Coro::State PACKAGE = Coro
3202 3306
3203BOOT: 3307BOOT:
3204{ 3308{
3205 int i;
3206
3207 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3309 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3208 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3310 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3209 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 3311 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3210 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD); 3312 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3211 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 3313 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
… …
3219 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 3321 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3220 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new); 3322 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new);
3221 3323
3222 coro_stash = gv_stashpv ("Coro", TRUE); 3324 coro_stash = gv_stashpv ("Coro", TRUE);
3223 3325
3224 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 3326 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3225 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 3327 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3226 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 3328 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
3227 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 3329 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (CORO_PRIO_LOW));
3228 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE)); 3330 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (CORO_PRIO_IDLE));
3229 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN)); 3331 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (CORO_PRIO_MIN));
3230
3231 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
3232 coro_ready[i] = newAV ();
3233 3332
3234 { 3333 {
3235 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 3334 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
3236 3335
3237 coroapi.schedule = api_schedule; 3336 coroapi.schedule = api_schedule;
… …
3278cede_notself (...) 3377cede_notself (...)
3279 CODE: 3378 CODE:
3280 CORO_EXECUTE_SLF_XS (slf_init_cede_notself); 3379 CORO_EXECUTE_SLF_XS (slf_init_cede_notself);
3281 3380
3282void 3381void
3283_cancel (Coro::State self)
3284 CODE:
3285 coro_state_destroy (aTHX_ self);
3286 coro_call_on_destroy (aTHX_ self);
3287
3288void
3289_set_current (SV *current) 3382_set_current (SV *current)
3290 PROTOTYPE: $ 3383 PROTOTYPE: $
3291 CODE: 3384 CODE:
3292 SvREFCNT_dec (SvRV (coro_current)); 3385 SvREFCNT_dec (SvRV (coro_current));
3293 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current))); 3386 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
… …
3295void 3388void
3296_set_readyhook (SV *hook) 3389_set_readyhook (SV *hook)
3297 PROTOTYPE: $ 3390 PROTOTYPE: $
3298 CODE: 3391 CODE:
3299 SvREFCNT_dec (coro_readyhook); 3392 SvREFCNT_dec (coro_readyhook);
3393 SvGETMAGIC (hook);
3394 if (SvOK (hook))
3395 {
3300 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0; 3396 coro_readyhook = newSVsv (hook);
3397 CORO_READYHOOK = invoke_sv_ready_hook_helper;
3398 CORO_READYHOOK ();
3399 }
3400 else
3401 {
3402 coro_readyhook = 0;
3403 CORO_READYHOOK = 0;
3404 }
3301 3405
3302int 3406int
3303prio (Coro::State coro, int newprio = 0) 3407prio (Coro::State coro, int newprio = 0)
3304 PROTOTYPE: $;$ 3408 PROTOTYPE: $;$
3305 ALIAS: 3409 ALIAS:
… …
3311 if (items > 1) 3415 if (items > 1)
3312 { 3416 {
3313 if (ix) 3417 if (ix)
3314 newprio = coro->prio - newprio; 3418 newprio = coro->prio - newprio;
3315 3419
3316 if (newprio < PRIO_MIN) newprio = PRIO_MIN; 3420 if (newprio < CORO_PRIO_MIN) newprio = CORO_PRIO_MIN;
3317 if (newprio > PRIO_MAX) newprio = PRIO_MAX; 3421 if (newprio > CORO_PRIO_MAX) newprio = CORO_PRIO_MAX;
3318 3422
3319 coro->prio = newprio; 3423 coro->prio = newprio;
3320 } 3424 }
3321} 3425}
3322 OUTPUT: 3426 OUTPUT:
… …
3335 PROTOTYPE: 3439 PROTOTYPE:
3336 CODE: 3440 CODE:
3337 RETVAL = coro_nready; 3441 RETVAL = coro_nready;
3338 OUTPUT: 3442 OUTPUT:
3339 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;
3340 3456
3341void 3457void
3342_pool_handler (...) 3458_pool_handler (...)
3343 CODE: 3459 CODE:
3344 CORO_EXECUTE_SLF_XS (slf_init_pool_handler); 3460 CORO_EXECUTE_SLF_XS (slf_init_pool_handler);
… …
3409 CODE: 3525 CODE:
3410{ 3526{
3411 struct coro *coro = SvSTATE_current; 3527 struct coro *coro = SvSTATE_current;
3412 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 3528 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3413 3529
3414 block = (SV *)coro_sv_2cv (aTHX_ block); 3530 block = s_get_cv_croak (block);
3415 3531
3416 if (!*avp) 3532 if (!*avp)
3417 *avp = newAV (); 3533 *avp = newAV ();
3418 3534
3419 av_push (*avp, SvREFCNT_inc (block)); 3535 av_push (*avp, SvREFCNT_inc (block));
3420 3536
3421 if (!ix) 3537 if (!ix)
3422 on_enterleave_call (aTHX_ block); 3538 on_enterleave_call (aTHX_ block);
3423 3539
3424 LEAVE; /* pp_entersub unfortunately forces an ENTER/LEAVE around xs calls */ 3540 LEAVE; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
3425 SAVEDESTRUCTOR_X (ix ? coro_pop_on_leave : coro_pop_on_enter, (void *)coro); 3541 SAVEDESTRUCTOR_X (ix ? coro_pop_on_leave : coro_pop_on_enter, (void *)coro);
3426 ENTER; /* pp_entersub unfortunately forces an ENTER/LEAVE around xs calls */ 3542 ENTER; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
3427} 3543}
3428 3544
3429 3545
3430MODULE = Coro::State PACKAGE = PerlIO::cede 3546MODULE = Coro::State PACKAGE = PerlIO::cede
3431 3547
… …
3436MODULE = Coro::State PACKAGE = Coro::Semaphore 3552MODULE = Coro::State PACKAGE = Coro::Semaphore
3437 3553
3438SV * 3554SV *
3439new (SV *klass, SV *count = 0) 3555new (SV *klass, SV *count = 0)
3440 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
3441 RETVAL = sv_bless ( 3568 RETVAL = sv_bless (
3442 coro_waitarray_new (aTHX_ count && SvOK (count) ? SvIV (count) : 1), 3569 coro_waitarray_new (aTHX_ semcnt),
3443 GvSTASH (CvGV (cv)) 3570 GvSTASH (CvGV (cv))
3444 ); 3571 );
3572}
3445 OUTPUT: 3573 OUTPUT:
3446 RETVAL 3574 RETVAL
3447 3575
3448# helper for Coro::Channel 3576# helper for Coro::Channel and others
3449SV * 3577SV *
3450_alloc (int count) 3578_alloc (int count)
3451 CODE: 3579 CODE:
3452 RETVAL = coro_waitarray_new (aTHX_ count); 3580 RETVAL = coro_waitarray_new (aTHX_ count);
3453 OUTPUT: 3581 OUTPUT:
… …
3511 for (i = 1; i <= wcount; ++i) 3639 for (i = 1; i <= wcount; ++i)
3512 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i]))); 3640 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i])));
3513 } 3641 }
3514} 3642}
3515 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
3516MODULE = Coro::State PACKAGE = Coro::Signal 3660MODULE = Coro::State PACKAGE = Coro::Signal
3517 3661
3518SV * 3662SV *
3519new (SV *klass) 3663new (SV *klass)
3520 CODE: 3664 CODE:
… …
3591 3735
3592void 3736void
3593_register (char *target, char *proto, SV *req) 3737_register (char *target, char *proto, SV *req)
3594 CODE: 3738 CODE:
3595{ 3739{
3596 CV *req_cv = coro_sv_2cv (aTHX_ req); 3740 SV *req_cv = s_get_cv_croak (req);
3597 /* newXSproto doesn't return the CV on 5.8 */ 3741 /* newXSproto doesn't return the CV on 5.8 */
3598 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 3742 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3599 sv_setpv ((SV *)slf_cv, proto); 3743 sv_setpv ((SV *)slf_cv, proto);
3600 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);
3601} 3745}
3602 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