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.339 by root, Mon Dec 15 00:28:30 2008 UTC vs.
Revision 1.372 by root, Thu Oct 1 23:50:23 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
190static SV *sv_pool_size; 142static SV *sv_pool_size;
191static SV *sv_async_pool_idle; /* description string */ 143static SV *sv_async_pool_idle; /* description string */
192static AV *av_async_pool; /* idle pool */ 144static AV *av_async_pool; /* idle pool */
193static SV *sv_Coro; /* class string */ 145static SV *sv_Coro; /* class string */
194static CV *cv_pool_handler; 146static CV *cv_pool_handler;
195static CV *cv_coro_state_new;
196 147
197/* Coro::AnyEvent */ 148/* Coro::AnyEvent */
198static SV *sv_activity; 149static SV *sv_activity;
150
151/* enable processtime/realtime profiling */
152static char enable_times;
153typedef U32 coro_ts[2];
154static coro_ts time_real, time_cpu;
155static char times_valid;
199 156
200static struct coro_cctx *cctx_first; 157static struct coro_cctx *cctx_first;
201static int cctx_count, cctx_idle; 158static int cctx_count, cctx_idle;
202 159
203enum { 160enum {
238enum { 195enum {
239 CF_RUNNING = 0x0001, /* coroutine is running */ 196 CF_RUNNING = 0x0001, /* coroutine is running */
240 CF_READY = 0x0002, /* coroutine is ready */ 197 CF_READY = 0x0002, /* coroutine is ready */
241 CF_NEW = 0x0004, /* has never been switched to */ 198 CF_NEW = 0x0004, /* has never been switched to */
242 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 199 CF_DESTROYED = 0x0008, /* coroutine data has been freed */
200 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
243}; 201};
244 202
245/* the structure where most of the perl state is stored, overlaid on the cxstack */ 203/* the structure where most of the perl state is stored, overlaid on the cxstack */
246typedef struct 204typedef struct
247{ 205{
260/* this is a structure representing a perl-level coroutine */ 218/* this is a structure representing a perl-level coroutine */
261struct coro { 219struct coro {
262 /* the C coroutine allocated to this perl coroutine, if any */ 220 /* the C coroutine allocated to this perl coroutine, if any */
263 coro_cctx *cctx; 221 coro_cctx *cctx;
264 222
223 /* ready queue */
224 struct coro *next_ready;
225
265 /* state data */ 226 /* state data */
266 struct CoroSLF slf_frame; /* saved slf frame */ 227 struct CoroSLF slf_frame; /* saved slf frame */
267 AV *mainstack; 228 AV *mainstack;
268 perl_slots *slot; /* basically the saved sp */ 229 perl_slots *slot; /* basically the saved sp */
269 230
289 250
290 /* on_enter/on_leave */ 251 /* on_enter/on_leave */
291 AV *on_enter; 252 AV *on_enter;
292 AV *on_leave; 253 AV *on_leave;
293 254
255 /* times */
256 coro_ts t_cpu, t_real;
257
294 /* linked list */ 258 /* linked list */
295 struct coro *next, *prev; 259 struct coro *next, *prev;
296}; 260};
297 261
298typedef struct coro *Coro__State; 262typedef struct coro *Coro__State;
303/* the mainr easonw e don't support windows process emulation */ 267/* the mainr easonw e don't support windows process emulation */
304static struct CoroSLF slf_frame; /* the current slf frame */ 268static struct CoroSLF slf_frame; /* the current slf frame */
305 269
306/** Coro ********************************************************************/ 270/** Coro ********************************************************************/
307 271
308#define PRIO_MAX 3 272#define CORO_PRIO_MAX 3
309#define PRIO_HIGH 1 273#define CORO_PRIO_HIGH 1
310#define PRIO_NORMAL 0 274#define CORO_PRIO_NORMAL 0
311#define PRIO_LOW -1 275#define CORO_PRIO_LOW -1
312#define PRIO_IDLE -3 276#define CORO_PRIO_IDLE -3
313#define PRIO_MIN -4 277#define CORO_PRIO_MIN -4
314 278
315/* for Coro.pm */ 279/* for Coro.pm */
316static SV *coro_current; 280static SV *coro_current;
317static SV *coro_readyhook; 281static SV *coro_readyhook;
318static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1]; 282static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
319static CV *cv_coro_run, *cv_coro_terminate; 283static CV *cv_coro_run, *cv_coro_terminate;
320static struct coro *coro_first; 284static struct coro *coro_first;
321#define coro_nready coroapi.nready 285#define coro_nready coroapi.nready
286
287/** Coro::Select ************************************************************/
288
289static OP *(*coro_old_pp_sselect) (pTHX);
290static SV *coro_select_select;
291
292/* horrible hack, but if it works... */
293static OP *
294coro_pp_sselect (pTHX)
295{
296 dSP;
297 PUSHMARK (SP - 4); /* fake argument list */
298 XPUSHs (coro_select_select);
299 PUTBACK;
300
301 /* entersub is an UNOP, select a LISTOP... keep your fingers crossed */
302 PL_op->op_flags |= OPf_STACKED;
303 PL_op->op_private = 0;
304 return PL_ppaddr [OP_ENTERSUB](aTHX);
305}
322 306
323/** lowlevel stuff **********************************************************/ 307/** lowlevel stuff **********************************************************/
324 308
325static SV * 309static SV *
326coro_get_sv (pTHX_ const char *name, int create) 310coro_get_sv (pTHX_ const char *name, int create)
350 get_hv (name, create); 334 get_hv (name, create);
351#endif 335#endif
352 return get_hv (name, create); 336 return get_hv (name, create);
353} 337}
354 338
355/* may croak */ 339INLINE void
356INLINE CV * 340coro_times_update ()
357coro_sv_2cv (pTHX_ SV *sv)
358{ 341{
359 HV *st; 342#ifdef coro_clock_gettime
360 GV *gvp; 343 struct timespec ts;
361 CV *cv = sv_2cv (sv, &st, &gvp, 0);
362 344
363 if (!cv) 345 ts.tv_sec = ts.tv_nsec = 0;
364 croak ("code reference expected"); 346 coro_clock_gettime (CORO_CLOCK_THREAD_CPUTIME_ID, &ts);
347 time_cpu [0] = ts.tv_sec; time_cpu [1] = ts.tv_nsec;
365 348
366 return cv; 349 ts.tv_sec = ts.tv_nsec = 0;
350 coro_clock_gettime (CORO_CLOCK_MONOTONIC, &ts);
351 time_real [0] = ts.tv_sec; time_real [1] = ts.tv_nsec;
352#else
353 dTHX;
354 UV tv[2];
355
356 u2time (aTHX_ tv);
357 time_real [0] = tv [0];
358 time_real [1] = tv [1] * 1000;
359#endif
360}
361
362INLINE void
363coro_times_add (struct coro *c)
364{
365 c->t_real [1] += time_real [1];
366 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
367 c->t_real [0] += time_real [0];
368
369 c->t_cpu [1] += time_cpu [1];
370 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
371 c->t_cpu [0] += time_cpu [0];
372}
373
374INLINE void
375coro_times_sub (struct coro *c)
376{
377 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; }
378 c->t_real [1] -= time_real [1];
379 c->t_real [0] -= time_real [0];
380
381 if (c->t_cpu [1] < time_cpu [1]) { c->t_cpu [1] += 1000000000; --c->t_cpu [0]; }
382 c->t_cpu [1] -= time_cpu [1];
383 c->t_cpu [0] -= time_cpu [0];
367} 384}
368 385
369/*****************************************************************************/ 386/*****************************************************************************/
370/* magic glue */ 387/* magic glue */
371 388
471static int 488static int
472coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 489coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
473{ 490{
474 AV *padlist; 491 AV *padlist;
475 AV *av = (AV *)mg->mg_obj; 492 AV *av = (AV *)mg->mg_obj;
493
494 /* perl manages to free our internal AV and _then_ call us */
495 if (IN_DESTRUCT)
496 return 0;
476 497
477 /* casting is fun. */ 498 /* casting is fun. */
478 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 499 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
479 free_padlist (aTHX_ padlist); 500 free_padlist (aTHX_ padlist);
480 501
569 } 590 }
570 591
571 slf_frame = c->slf_frame; 592 slf_frame = c->slf_frame;
572 CORO_THROW = c->except; 593 CORO_THROW = c->except;
573 594
595 if (expect_false (enable_times))
596 {
597 if (expect_false (!times_valid))
598 coro_times_update ();
599
600 coro_times_sub (c);
601 }
602
574 if (expect_false (c->on_enter)) 603 if (expect_false (c->on_enter))
575 { 604 {
576 int i; 605 int i;
577 606
578 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 607 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
579 on_enterleave_call (AvARRAY (c->on_enter)[i]); 608 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
580 } 609 }
581} 610}
582 611
583static void 612static void
584save_perl (pTHX_ Coro__State c) 613save_perl (pTHX_ Coro__State c)
586 if (expect_false (c->on_leave)) 615 if (expect_false (c->on_leave))
587 { 616 {
588 int i; 617 int i;
589 618
590 for (i = AvFILLp (c->on_leave); i >= 0; --i) 619 for (i = AvFILLp (c->on_leave); i >= 0; --i)
591 on_enterleave_call (AvARRAY (c->on_leave)[i]); 620 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
621 }
622
623 times_valid = 0;
624
625 if (expect_false (enable_times))
626 {
627 coro_times_update (); times_valid = 1;
628 coro_times_add (c);
592 } 629 }
593 630
594 c->except = CORO_THROW; 631 c->except = CORO_THROW;
595 c->slf_frame = slf_frame; 632 c->slf_frame = slf_frame;
596 633
611 { 648 {
612 while (expect_true (cxix >= 0)) 649 while (expect_true (cxix >= 0))
613 { 650 {
614 PERL_CONTEXT *cx = &ccstk[cxix--]; 651 PERL_CONTEXT *cx = &ccstk[cxix--];
615 652
616 if (expect_true (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT)) 653 if (expect_true (CxTYPE (cx) == CXt_SUB) || expect_false (CxTYPE (cx) == CXt_FORMAT))
617 { 654 {
618 CV *cv = cx->blk_sub.cv; 655 CV *cv = cx->blk_sub.cv;
619 656
620 if (expect_true (CvDEPTH (cv))) 657 if (expect_true (CvDEPTH (cv)))
621 { 658 {
645 /* we manually unroll here, as usually 2 slots is enough */ 682 /* we manually unroll here, as usually 2 slots is enough */
646 if (SLOT_COUNT >= 1) CXINC; 683 if (SLOT_COUNT >= 1) CXINC;
647 if (SLOT_COUNT >= 2) CXINC; 684 if (SLOT_COUNT >= 2) CXINC;
648 if (SLOT_COUNT >= 3) CXINC; 685 if (SLOT_COUNT >= 3) CXINC;
649 { 686 {
650 int i; 687 unsigned int i;
651 for (i = 3; i < SLOT_COUNT; ++i) 688 for (i = 3; i < SLOT_COUNT; ++i)
652 CXINC; 689 CXINC;
653 } 690 }
654 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 691 cxstack_ix -= SLOT_COUNT; /* undo allocation */
655 692
960 997
961 PL_op = (OP *)&coro_setup_op; 998 PL_op = (OP *)&coro_setup_op;
962 999
963 /* copy throw, in case it was set before coro_setup */ 1000 /* copy throw, in case it was set before coro_setup */
964 CORO_THROW = coro->except; 1001 CORO_THROW = coro->except;
1002
1003 if (expect_false (enable_times))
1004 {
1005 coro_times_update ();
1006 coro_times_sub (coro);
1007 }
965} 1008}
966 1009
967static void 1010static void
968coro_unwind_stacks (pTHX) 1011coro_unwind_stacks (pTHX)
969{ 1012{
986} 1029}
987 1030
988static void 1031static void
989coro_destruct_perl (pTHX_ struct coro *coro) 1032coro_destruct_perl (pTHX_ struct coro *coro)
990{ 1033{
1034 SV *svf [9];
1035
1036 {
1037 struct coro *current = SvSTATE_current;
1038
1039 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1040
1041 save_perl (aTHX_ current);
1042 load_perl (aTHX_ coro);
1043
991 coro_unwind_stacks (aTHX); 1044 coro_unwind_stacks (aTHX);
1045 coro_destruct_stacks (aTHX);
992 1046
993 SvREFCNT_dec (GvSV (PL_defgv)); 1047 // now save some sv's to be free'd later
994 SvREFCNT_dec (GvAV (PL_defgv)); 1048 svf [0] = GvSV (PL_defgv);
995 SvREFCNT_dec (GvSV (PL_errgv)); 1049 svf [1] = (SV *)GvAV (PL_defgv);
996 SvREFCNT_dec (PL_defoutgv); 1050 svf [2] = GvSV (PL_errgv);
997 SvREFCNT_dec (PL_rs); 1051 svf [3] = (SV *)PL_defoutgv;
998 SvREFCNT_dec (GvSV (irsgv)); 1052 svf [4] = PL_rs;
999 SvREFCNT_dec (GvHV (PL_hintgv)); 1053 svf [5] = GvSV (irsgv);
1054 svf [6] = (SV *)GvHV (PL_hintgv);
1055 svf [7] = PL_diehook;
1056 svf [8] = PL_warnhook;
1057 assert (9 == sizeof (svf) / sizeof (*svf));
1000 1058
1001 SvREFCNT_dec (PL_diehook); 1059 load_perl (aTHX_ current);
1002 SvREFCNT_dec (PL_warnhook);
1003 1060 }
1061
1062 {
1063 unsigned int i;
1064
1065 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i)
1066 SvREFCNT_dec (svf [i]);
1067
1004 SvREFCNT_dec (coro->saved_deffh); 1068 SvREFCNT_dec (coro->saved_deffh);
1005 SvREFCNT_dec (coro->rouse_cb); 1069 SvREFCNT_dec (coro->rouse_cb);
1006 SvREFCNT_dec (coro->invoke_cb); 1070 SvREFCNT_dec (coro->invoke_cb);
1007 SvREFCNT_dec (coro->invoke_av); 1071 SvREFCNT_dec (coro->invoke_av);
1008 1072 }
1009 coro_destruct_stacks (aTHX);
1010} 1073}
1011 1074
1012INLINE void 1075INLINE void
1013free_coro_mortal (pTHX) 1076free_coro_mortal (pTHX)
1014{ 1077{
1211 /* somebody or something will hit me for both perl_run and PL_restartop */ 1274 /* somebody or something will hit me for both perl_run and PL_restartop */
1212 PL_restartop = PL_op; 1275 PL_restartop = PL_op;
1213 perl_run (PL_curinterp); 1276 perl_run (PL_curinterp);
1214 /* 1277 /*
1215 * Unfortunately, there is no way to get at the return values of the 1278 * Unfortunately, there is no way to get at the return values of the
1216 * coro body here, as perl_run destroys these 1279 * coro body here, as perl_run destroys these. Likewise, we cannot catch
1280 * runtime errors here, as this is just a random interpreter, not a thread.
1217 */ 1281 */
1218 1282
1219 /* 1283 /*
1220 * If perl-run returns we assume exit() was being called or the coro 1284 * If perl-run returns we assume exit() was being called or the coro
1221 * fell off the end, which seems to be the only valid (non-bug) 1285 * fell off the end, which seems to be the only valid (non-bug)
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
1728 api_ready (aTHX_ SvRV (sv_idle)); 1760 api_ready (aTHX_ SvRV (sv_idle));
1729 --coro_nready; 1761 --coro_nready;
1730 } 1762 }
1731 else 1763 else
1732 { 1764 {
1765 /* TODO: deprecated, remove, cannot work reliably *//*D*/
1733 dSP; 1766 dSP;
1734 1767
1735 ENTER; 1768 ENTER;
1736 SAVETMPS; 1769 SAVETMPS;
1737 1770
1883{ 1916{
1884 int i; 1917 int i;
1885 HV *hv = (HV *)SvRV (coro_current); 1918 HV *hv = (HV *)SvRV (coro_current);
1886 AV *av = newAV (); 1919 AV *av = newAV ();
1887 1920
1921 /* items are actually not so common, so optimise for this case */
1922 if (items)
1923 {
1888 av_extend (av, items - 1); 1924 av_extend (av, items - 1);
1925
1889 for (i = 0; i < items; ++i) 1926 for (i = 0; i < items; ++i)
1890 av_push (av, SvREFCNT_inc_NN (arg [i])); 1927 av_push (av, SvREFCNT_inc_NN (arg [i]));
1928 }
1891 1929
1892 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 1930 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0);
1893 1931
1894 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */ 1932 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */
1895 api_ready (aTHX_ sv_manager); 1933 api_ready (aTHX_ sv_manager);
1985 2023
1986static void 2024static void
1987coro_rouse_callback (pTHX_ CV *cv) 2025coro_rouse_callback (pTHX_ CV *cv)
1988{ 2026{
1989 dXSARGS; 2027 dXSARGS;
1990 SV *data = (SV *)GENSUB_ARG; 2028 SV *data = (SV *)S_GENSUB_ARG;
1991 2029
1992 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2030 if (SvTYPE (SvRV (data)) != SVt_PVAV)
1993 { 2031 {
1994 /* first call, set args */ 2032 /* first call, set args */
2033 SV *coro = SvRV (data);
1995 AV *av = newAV (); 2034 AV *av = newAV ();
1996 SV *coro = SvRV (data);
1997 2035
1998 SvRV_set (data, (SV *)av); 2036 SvRV_set (data, (SV *)av);
1999 api_ready (aTHX_ coro);
2000 SvREFCNT_dec (coro);
2001 2037
2002 /* better take a full copy of the arguments */ 2038 /* better take a full copy of the arguments */
2003 while (items--) 2039 while (items--)
2004 av_store (av, items, newSVsv (ST (items))); 2040 av_store (av, items, newSVsv (ST (items)));
2041
2042 api_ready (aTHX_ coro);
2043 SvREFCNT_dec (coro);
2005 } 2044 }
2006 2045
2007 XSRETURN_EMPTY; 2046 XSRETURN_EMPTY;
2008} 2047}
2009 2048
2026 2065
2027 EXTEND (SP, AvFILLp (av) + 1); 2066 EXTEND (SP, AvFILLp (av) + 1);
2028 for (i = 0; i <= AvFILLp (av); ++i) 2067 for (i = 0; i <= AvFILLp (av); ++i)
2029 PUSHs (sv_2mortal (AvARRAY (av)[i])); 2068 PUSHs (sv_2mortal (AvARRAY (av)[i]));
2030 2069
2031 /* we have stolen the elements, so ste length to zero and free */ 2070 /* we have stolen the elements, so set length to zero and free */
2032 AvFILLp (av) = -1; 2071 AvFILLp (av) = -1;
2033 av_undef (av); 2072 av_undef (av);
2034 2073
2035 PUTBACK; 2074 PUTBACK;
2036 } 2075 }
2060 || SvTYPE (SvRV (cb)) != SVt_PVCV 2099 || SvTYPE (SvRV (cb)) != SVt_PVCV
2061 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2100 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2062 croak ("Coro::rouse_wait called with illegal callback argument,"); 2101 croak ("Coro::rouse_wait called with illegal callback argument,");
2063 2102
2064 { 2103 {
2065 CV *cv = (CV *)SvRV (cb); /* for GENSUB_ARG */ 2104 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
2066 SV *data = (SV *)GENSUB_ARG; 2105 SV *data = (SV *)S_GENSUB_ARG;
2067 2106
2068 frame->data = (void *)data; 2107 frame->data = (void *)data;
2069 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule; 2108 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
2070 frame->check = slf_check_rouse_wait; 2109 frame->check = slf_check_rouse_wait;
2071 } 2110 }
2075coro_new_rouse_cb (pTHX) 2114coro_new_rouse_cb (pTHX)
2076{ 2115{
2077 HV *hv = (HV *)SvRV (coro_current); 2116 HV *hv = (HV *)SvRV (coro_current);
2078 struct coro *coro = SvSTATE_hv (hv); 2117 struct coro *coro = SvSTATE_hv (hv);
2079 SV *data = newRV_inc ((SV *)hv); 2118 SV *data = newRV_inc ((SV *)hv);
2080 SV *cb = gensub (aTHX_ coro_rouse_callback, (void *)data); 2119 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
2081 2120
2082 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0); 2121 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0);
2083 SvREFCNT_dec (data); /* magicext increases the refcount */ 2122 SvREFCNT_dec (data); /* magicext increases the refcount */
2084 2123
2085 SvREFCNT_dec (coro->rouse_cb); 2124 SvREFCNT_dec (coro->rouse_cb);
2292 if (PL_op->op_ppaddr != PL_ppaddr [OP_ENTERSUB] 2331 if (PL_op->op_ppaddr != PL_ppaddr [OP_ENTERSUB]
2293 && PL_op->op_ppaddr != pp_slf) 2332 && PL_op->op_ppaddr != pp_slf)
2294 croak ("FATAL: Coro SLF calls can only be made normally, not via goto or any other means, caught"); 2333 croak ("FATAL: Coro SLF calls can only be made normally, not via goto or any other means, caught");
2295 2334
2296 CvFLAGS (cv) |= CVf_SLF; 2335 CvFLAGS (cv) |= CVf_SLF;
2336 CvNODEBUG_on (cv);
2297 CvXSUBANY (cv).any_ptr = (void *)init_cb; 2337 CvXSUBANY (cv).any_ptr = (void *)init_cb;
2298 slf_cv = cv; 2338 slf_cv = cv;
2299 2339
2300 /* we patch the op, and then re-run the whole call */ 2340 /* we patch the op, and then re-run the whole call */
2301 /* we have to put the same argument on the stack for this to work */ 2341 /* we have to put the same argument on the stack for this to work */
2347 2387
2348 POPSTACK; 2388 POPSTACK;
2349} 2389}
2350 2390
2351static SV * 2391static SV *
2352coro_avp_pop_and_free (AV **avp) 2392coro_avp_pop_and_free (pTHX_ AV **avp)
2353{ 2393{
2354 AV *av = *avp; 2394 AV *av = *avp;
2355 SV *res = av_pop (av); 2395 SV *res = av_pop (av);
2356 2396
2357 if (AvFILLp (av) < 0) 2397 if (AvFILLp (av) < 0)
2364} 2404}
2365 2405
2366static void 2406static void
2367coro_pop_on_enter (pTHX_ void *coro) 2407coro_pop_on_enter (pTHX_ void *coro)
2368{ 2408{
2369 SV *cb = coro_avp_pop_and_free (&((struct coro *)coro)->on_enter); 2409 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_enter);
2370 SvREFCNT_dec (cb); 2410 SvREFCNT_dec (cb);
2371} 2411}
2372 2412
2373static void 2413static void
2374coro_pop_on_leave (pTHX_ void *coro) 2414coro_pop_on_leave (pTHX_ void *coro)
2375{ 2415{
2376 SV *cb = coro_avp_pop_and_free (&((struct coro *)coro)->on_leave); 2416 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2377 on_enterleave_call (sv_2mortal (cb)); 2417 on_enterleave_call (aTHX_ sv_2mortal (cb));
2378} 2418}
2379 2419
2380/*****************************************************************************/ 2420/*****************************************************************************/
2381/* PerlIO::cede */ 2421/* PerlIO::cede */
2382 2422
2456/* Coro::Semaphore & Coro::Signal */ 2496/* Coro::Semaphore & Coro::Signal */
2457 2497
2458static SV * 2498static SV *
2459coro_waitarray_new (pTHX_ int count) 2499coro_waitarray_new (pTHX_ int count)
2460{ 2500{
2461 /* a semaphore contains a counter IV in $sem->[0] and any waiters after that */ 2501 /* a waitarray=semaphore contains a counter IV in $sem->[0] and any waiters after that */
2462 AV *av = newAV (); 2502 AV *av = newAV ();
2463 SV **ary; 2503 SV **ary;
2464 2504
2465 /* unfortunately, building manually saves memory */ 2505 /* unfortunately, building manually saves memory */
2466 Newx (ary, 2, SV *); 2506 Newx (ary, 2, SV *);
2608{ 2648{
2609 if (items >= 2) 2649 if (items >= 2)
2610 { 2650 {
2611 /* callback form */ 2651 /* callback form */
2612 AV *av = (AV *)SvRV (arg [0]); 2652 AV *av = (AV *)SvRV (arg [0]);
2613 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 2653 SV *cb_cv = s_get_cv_croak (arg [1]);
2614 2654
2615 av_push (av, (SV *)SvREFCNT_inc_NN (cb_cv)); 2655 av_push (av, SvREFCNT_inc_NN (cb_cv));
2616 2656
2617 if (SvIVX (AvARRAY (av)[0]) > 0) 2657 if (SvIVX (AvARRAY (av)[0]) > 0)
2618 coro_semaphore_adjust (aTHX_ av, 0); 2658 coro_semaphore_adjust (aTHX_ av, 0);
2619 2659
2620 frame->prepare = prepare_nop; 2660 frame->prepare = prepare_nop;
2644 AvARRAY (av)[0] = AvARRAY (av)[1]; 2684 AvARRAY (av)[0] = AvARRAY (av)[1];
2645 AvARRAY (av)[1] = cb; 2685 AvARRAY (av)[1] = cb;
2646 2686
2647 cb = av_shift (av); 2687 cb = av_shift (av);
2648 2688
2689 if (SvTYPE (cb) == SVt_PVCV)
2690 {
2691 dSP;
2692 PUSHMARK (SP);
2693 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2694 PUTBACK;
2695 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2696 }
2697 else
2698 {
2649 api_ready (aTHX_ cb); 2699 api_ready (aTHX_ cb);
2650 sv_setiv (cb, 0); /* signal waiter */ 2700 sv_setiv (cb, 0); /* signal waiter */
2701 }
2702
2651 SvREFCNT_dec (cb); 2703 SvREFCNT_dec (cb);
2652 2704
2653 --count; 2705 --count;
2654 } 2706 }
2655} 2707}
2664static void 2716static void
2665slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2717slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2666{ 2718{
2667 AV *av = (AV *)SvRV (arg [0]); 2719 AV *av = (AV *)SvRV (arg [0]);
2668 2720
2721 if (items >= 2)
2722 {
2723 SV *cb_cv = s_get_cv_croak (arg [1]);
2724 av_push (av, SvREFCNT_inc_NN (cb_cv));
2725
2669 if (SvIVX (AvARRAY (av)[0])) 2726 if (SvIVX (AvARRAY (av)[0]))
2727 coro_signal_wake (aTHX_ av, 1); /* ust be the only waiter */
2728
2729 frame->prepare = prepare_nop;
2730 frame->check = slf_check_nop;
2731 }
2732 else if (SvIVX (AvARRAY (av)[0]))
2670 { 2733 {
2671 SvIVX (AvARRAY (av)[0]) = 0; 2734 SvIVX (AvARRAY (av)[0]) = 0;
2672 frame->prepare = prepare_nop; 2735 frame->prepare = prepare_nop;
2673 frame->check = slf_check_nop; 2736 frame->check = slf_check_nop;
2674 } 2737 }
2675 else 2738 else
2676 { 2739 {
2677 SV *waiter = newRV_inc (SvRV (coro_current)); /* owned by signal av */ 2740 SV *waiter = newSVsv (coro_current); /* owned by signal av */
2678 2741
2679 av_push (av, waiter); 2742 av_push (av, waiter);
2680 2743
2681 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */ 2744 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */
2682 frame->prepare = prepare_schedule; 2745 frame->prepare = prepare_schedule;
2700 2763
2701static void 2764static void
2702coro_aio_callback (pTHX_ CV *cv) 2765coro_aio_callback (pTHX_ CV *cv)
2703{ 2766{
2704 dXSARGS; 2767 dXSARGS;
2705 AV *state = (AV *)GENSUB_ARG; 2768 AV *state = (AV *)S_GENSUB_ARG;
2706 SV *coro = av_pop (state); 2769 SV *coro = av_pop (state);
2707 SV *data_sv = newSV (sizeof (struct io_state)); 2770 SV *data_sv = newSV (sizeof (struct io_state));
2708 2771
2709 av_extend (state, items - 1); 2772 av_extend (state, items - 1);
2710 2773
2824 2887
2825 for (i = 0; i < items; ++i) 2888 for (i = 0; i < items; ++i)
2826 PUSHs (arg [i]); 2889 PUSHs (arg [i]);
2827 2890
2828 /* now push the callback closure */ 2891 /* now push the callback closure */
2829 PUSHs (sv_2mortal (gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state)))); 2892 PUSHs (sv_2mortal (s_gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state))));
2830 2893
2831 /* now call the AIO function - we assume our request is uncancelable */ 2894 /* now call the AIO function - we assume our request is uncancelable */
2832 PUTBACK; 2895 PUTBACK;
2833 call_sv ((SV *)req, G_VOID | G_DISCARD); 2896 call_sv ((SV *)req, G_VOID | G_DISCARD);
2834 } 2897 }
2852/*****************************************************************************/ 2915/*****************************************************************************/
2853 2916
2854#if CORO_CLONE 2917#if CORO_CLONE
2855# include "clone.c" 2918# include "clone.c"
2856#endif 2919#endif
2920
2921/*****************************************************************************/
2922
2923static SV *
2924coro_new (pTHX_ HV *stash, SV **argv, int argc, int is_coro)
2925{
2926 SV *coro_sv;
2927 struct coro *coro;
2928 MAGIC *mg;
2929 HV *hv;
2930 SV *cb;
2931 int i;
2932
2933 if (argc > 0)
2934 {
2935 cb = s_get_cv_croak (argv [0]);
2936
2937 if (!is_coro)
2938 {
2939 if (CvISXSUB (cb))
2940 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
2941
2942 if (!CvROOT (cb))
2943 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
2944 }
2945 }
2946
2947 Newz (0, coro, 1, struct coro);
2948 coro->args = newAV ();
2949 coro->flags = CF_NEW;
2950
2951 if (coro_first) coro_first->prev = coro;
2952 coro->next = coro_first;
2953 coro_first = coro;
2954
2955 coro->hv = hv = newHV ();
2956 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
2957 mg->mg_flags |= MGf_DUP;
2958 coro_sv = sv_bless (newRV_noinc ((SV *)hv), stash);
2959
2960 if (argc > 0)
2961 {
2962 av_extend (coro->args, argc + is_coro - 1);
2963
2964 if (is_coro)
2965 {
2966 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
2967 cb = (SV *)cv_coro_run;
2968 }
2969
2970 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
2971
2972 for (i = 1; i < argc; i++)
2973 av_push (coro->args, newSVsv (argv [i]));
2974 }
2975
2976 return coro_sv;
2977}
2857 2978
2858MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 2979MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2859 2980
2860PROTOTYPES: DISABLE 2981PROTOTYPES: DISABLE
2861 2982
2921 3042
2922 if (!svp) croak ("Time::HiRes is required"); 3043 if (!svp) croak ("Time::HiRes is required");
2923 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer"); 3044 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
2924 3045
2925 nvtime = INT2PTR (double (*)(), SvIV (*svp)); 3046 nvtime = INT2PTR (double (*)(), SvIV (*svp));
3047
3048 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
3049 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
2926 } 3050 }
2927 3051
2928 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 3052 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
2929} 3053}
2930 3054
2931SV * 3055SV *
2932new (char *klass, ...) 3056new (SV *klass, ...)
2933 ALIAS: 3057 ALIAS:
2934 Coro::new = 1 3058 Coro::new = 1
2935 CODE: 3059 CODE:
2936{ 3060 RETVAL = coro_new (aTHX_ ix ? coro_stash : coro_state_stash, &ST (1), items - 1, ix);
2937 struct coro *coro; 3061 OUTPUT:
2938 MAGIC *mg;
2939 HV *hv;
2940 CV *cb;
2941 int i;
2942
2943 if (items > 1)
2944 {
2945 cb = coro_sv_2cv (aTHX_ ST (1));
2946
2947 if (!ix)
2948 {
2949 if (CvISXSUB (cb))
2950 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
2951
2952 if (!CvROOT (cb))
2953 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
2954 }
2955 }
2956
2957 Newz (0, coro, 1, struct coro);
2958 coro->args = newAV ();
2959 coro->flags = CF_NEW;
2960
2961 if (coro_first) coro_first->prev = coro;
2962 coro->next = coro_first;
2963 coro_first = coro;
2964
2965 coro->hv = hv = newHV ();
2966 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
2967 mg->mg_flags |= MGf_DUP;
2968 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
2969
2970 if (items > 1)
2971 {
2972 av_extend (coro->args, items - 1 + ix - 1);
2973
2974 if (ix)
2975 {
2976 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
2977 cb = cv_coro_run;
2978 }
2979
2980 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
2981
2982 for (i = 2; i < items; i++)
2983 av_push (coro->args, newSVsv (ST (i)));
2984 }
2985}
2986 OUTPUT:
2987 RETVAL 3062 RETVAL
2988 3063
2989void 3064void
2990transfer (...) 3065transfer (...)
2991 PROTOTYPE: $$ 3066 PROTOTYPE: $$
3100 if (ix) 3175 if (ix)
3101 eval_sv (coderef, 0); 3176 eval_sv (coderef, 0);
3102 else 3177 else
3103 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 3178 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
3104 3179
3180 POPSTACK;
3105 SPAGAIN; 3181 SPAGAIN;
3106 POPSTACK;
3107 3182
3108 if (current != coro) 3183 if (current != coro)
3109 { 3184 {
3110 PUTBACK; 3185 PUTBACK;
3111 save_perl (aTHX_ coro); 3186 save_perl (aTHX_ coro);
3121 ALIAS: 3196 ALIAS:
3122 is_ready = CF_READY 3197 is_ready = CF_READY
3123 is_running = CF_RUNNING 3198 is_running = CF_RUNNING
3124 is_new = CF_NEW 3199 is_new = CF_NEW
3125 is_destroyed = CF_DESTROYED 3200 is_destroyed = CF_DESTROYED
3201 is_suspended = CF_SUSPENDED
3126 CODE: 3202 CODE:
3127 RETVAL = boolSV (coro->flags & ix); 3203 RETVAL = boolSV (coro->flags & ix);
3128 OUTPUT: 3204 OUTPUT:
3129 RETVAL 3205 RETVAL
3130 3206
3134 CODE: 3210 CODE:
3135{ 3211{
3136 struct coro *current = SvSTATE_current; 3212 struct coro *current = SvSTATE_current;
3137 SV **throwp = self == current ? &CORO_THROW : &self->except; 3213 SV **throwp = self == current ? &CORO_THROW : &self->except;
3138 SvREFCNT_dec (*throwp); 3214 SvREFCNT_dec (*throwp);
3215 SvGETMAGIC (throw);
3139 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3216 *throwp = SvOK (throw) ? newSVsv (throw) : 0;
3140} 3217}
3141 3218
3142void 3219void
3143api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3220api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3195 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv; 3272 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
3196 3273
3197 SV *tmp = *src; *src = *dst; *dst = tmp; 3274 SV *tmp = *src; *src = *dst; *dst = tmp;
3198 } 3275 }
3199 3276
3277void
3278cancel (Coro::State self)
3279 CODE:
3280 coro_state_destroy (aTHX_ self);
3281 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */
3282
3283
3284SV *
3285enable_times (int enabled = enable_times)
3286 CODE:
3287{
3288 RETVAL = boolSV (enable_times);
3289
3290 if (enabled != enable_times)
3291 {
3292 enable_times = enabled;
3293
3294 coro_times_update ();
3295 (enabled ? coro_times_sub : coro_times_add)(SvSTATE (coro_current));
3296 }
3297}
3298 OUTPUT:
3299 RETVAL
3300
3301void
3302times (Coro::State self)
3303 PPCODE:
3304{
3305 struct coro *current = SvSTATE (coro_current);
3306
3307 if (expect_false (current == self))
3308 {
3309 coro_times_update ();
3310 coro_times_add (SvSTATE (coro_current));
3311 }
3312
3313 EXTEND (SP, 2);
3314 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3315 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3316
3317 if (expect_false (current == self))
3318 coro_times_sub (SvSTATE (coro_current));
3319}
3200 3320
3201MODULE = Coro::State PACKAGE = Coro 3321MODULE = Coro::State PACKAGE = Coro
3202 3322
3203BOOT: 3323BOOT:
3204{ 3324{
3205 int i;
3206
3207 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3325 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3208 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3326 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3209 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 3327 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3210 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD); 3328 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3211 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 3329 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3215 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 3333 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3216 3334
3217 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3335 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3218 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3336 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3219 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 3337 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); 3338 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3221 3339
3222 coro_stash = gv_stashpv ("Coro", TRUE); 3340 coro_stash = gv_stashpv ("Coro", TRUE);
3223 3341
3224 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 3342 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3225 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 3343 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3226 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 3344 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
3227 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 3345 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (CORO_PRIO_LOW));
3228 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE)); 3346 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (CORO_PRIO_IDLE));
3229 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN)); 3347 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 3348
3234 { 3349 {
3235 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 3350 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
3236 3351
3237 coroapi.schedule = api_schedule; 3352 coroapi.schedule = api_schedule;
3247 sv_setiv (sv, (IV)&coroapi); 3362 sv_setiv (sv, (IV)&coroapi);
3248 SvREADONLY_on (sv); 3363 SvREADONLY_on (sv);
3249 } 3364 }
3250} 3365}
3251 3366
3367SV *
3368async (...)
3369 PROTOTYPE: &@
3370 CODE:
3371 RETVAL = coro_new (aTHX_ coro_stash, &ST (0), items, 1);
3372 api_ready (aTHX_ RETVAL);
3373 OUTPUT:
3374 RETVAL
3375
3252void 3376void
3253terminate (...) 3377terminate (...)
3254 CODE: 3378 CODE:
3255 CORO_EXECUTE_SLF_XS (slf_init_terminate); 3379 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3256 3380
3276 3400
3277void 3401void
3278cede_notself (...) 3402cede_notself (...)
3279 CODE: 3403 CODE:
3280 CORO_EXECUTE_SLF_XS (slf_init_cede_notself); 3404 CORO_EXECUTE_SLF_XS (slf_init_cede_notself);
3281
3282void
3283_cancel (Coro::State self)
3284 CODE:
3285 coro_state_destroy (aTHX_ self);
3286 coro_call_on_destroy (aTHX_ self);
3287 3405
3288void 3406void
3289_set_current (SV *current) 3407_set_current (SV *current)
3290 PROTOTYPE: $ 3408 PROTOTYPE: $
3291 CODE: 3409 CODE:
3295void 3413void
3296_set_readyhook (SV *hook) 3414_set_readyhook (SV *hook)
3297 PROTOTYPE: $ 3415 PROTOTYPE: $
3298 CODE: 3416 CODE:
3299 SvREFCNT_dec (coro_readyhook); 3417 SvREFCNT_dec (coro_readyhook);
3418 SvGETMAGIC (hook);
3419 if (SvOK (hook))
3420 {
3300 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0; 3421 coro_readyhook = newSVsv (hook);
3422 CORO_READYHOOK = invoke_sv_ready_hook_helper;
3423 }
3424 else
3425 {
3426 coro_readyhook = 0;
3427 CORO_READYHOOK = 0;
3428 }
3301 3429
3302int 3430int
3303prio (Coro::State coro, int newprio = 0) 3431prio (Coro::State coro, int newprio = 0)
3304 PROTOTYPE: $;$ 3432 PROTOTYPE: $;$
3305 ALIAS: 3433 ALIAS:
3311 if (items > 1) 3439 if (items > 1)
3312 { 3440 {
3313 if (ix) 3441 if (ix)
3314 newprio = coro->prio - newprio; 3442 newprio = coro->prio - newprio;
3315 3443
3316 if (newprio < PRIO_MIN) newprio = PRIO_MIN; 3444 if (newprio < CORO_PRIO_MIN) newprio = CORO_PRIO_MIN;
3317 if (newprio > PRIO_MAX) newprio = PRIO_MAX; 3445 if (newprio > CORO_PRIO_MAX) newprio = CORO_PRIO_MAX;
3318 3446
3319 coro->prio = newprio; 3447 coro->prio = newprio;
3320 } 3448 }
3321} 3449}
3322 OUTPUT: 3450 OUTPUT:
3337 RETVAL = coro_nready; 3465 RETVAL = coro_nready;
3338 OUTPUT: 3466 OUTPUT:
3339 RETVAL 3467 RETVAL
3340 3468
3341void 3469void
3470suspend (Coro::State self)
3471 PROTOTYPE: $
3472 CODE:
3473 self->flags |= CF_SUSPENDED;
3474
3475void
3476resume (Coro::State self)
3477 PROTOTYPE: $
3478 CODE:
3479 self->flags &= ~CF_SUSPENDED;
3480
3481void
3342_pool_handler (...) 3482_pool_handler (...)
3343 CODE: 3483 CODE:
3344 CORO_EXECUTE_SLF_XS (slf_init_pool_handler); 3484 CORO_EXECUTE_SLF_XS (slf_init_pool_handler);
3345 3485
3346void 3486void
3357 for (i = 1; i < items; ++i) 3497 for (i = 1; i < items; ++i)
3358 av_push (av, SvREFCNT_inc_NN (ST (i))); 3498 av_push (av, SvREFCNT_inc_NN (ST (i)));
3359 3499
3360 if ((SV *)hv == &PL_sv_undef) 3500 if ((SV *)hv == &PL_sv_undef)
3361 { 3501 {
3362 PUSHMARK (SP); 3502 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3363 EXTEND (SP, 2);
3364 PUSHs (sv_Coro);
3365 PUSHs ((SV *)cv_pool_handler);
3366 PUTBACK;
3367 call_sv ((SV *)cv_coro_state_new, G_SCALAR);
3368 SPAGAIN;
3369
3370 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs)); 3503 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
3504 SvREFCNT_dec (sv);
3371 } 3505 }
3372 3506
3373 { 3507 {
3374 struct coro *coro = SvSTATE_hv (hv); 3508 struct coro *coro = SvSTATE_hv (hv);
3375 3509
3409 CODE: 3543 CODE:
3410{ 3544{
3411 struct coro *coro = SvSTATE_current; 3545 struct coro *coro = SvSTATE_current;
3412 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 3546 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3413 3547
3414 block = (SV *)coro_sv_2cv (block); 3548 block = s_get_cv_croak (block);
3415 3549
3416 if (!*avp) 3550 if (!*avp)
3417 *avp = newAV (); 3551 *avp = newAV ();
3418 3552
3419 av_push (*avp, SvREFCNT_inc (block)); 3553 av_push (*avp, SvREFCNT_inc (block));
3420 3554
3421 if (!ix) 3555 if (!ix)
3422 on_enterleave_call (aTHX_ block); 3556 on_enterleave_call (aTHX_ block);
3423 3557
3424 LEAVE; /* pp_entersub unfortunately forces an ENTER/LEAVE around xs calls */ 3558 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); 3559 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 */ 3560 ENTER; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
3427} 3561}
3428 3562
3429 3563
3430MODULE = Coro::State PACKAGE = PerlIO::cede 3564MODULE = Coro::State PACKAGE = PerlIO::cede
3431 3565
3436MODULE = Coro::State PACKAGE = Coro::Semaphore 3570MODULE = Coro::State PACKAGE = Coro::Semaphore
3437 3571
3438SV * 3572SV *
3439new (SV *klass, SV *count = 0) 3573new (SV *klass, SV *count = 0)
3440 CODE: 3574 CODE:
3575{
3576 int semcnt = 1;
3577
3578 if (count)
3579 {
3580 SvGETMAGIC (count);
3581
3582 if (SvOK (count))
3583 semcnt = SvIV (count);
3584 }
3585
3441 RETVAL = sv_bless ( 3586 RETVAL = sv_bless (
3442 coro_waitarray_new (aTHX_ count && SvOK (count) ? SvIV (count) : 1), 3587 coro_waitarray_new (aTHX_ semcnt),
3443 GvSTASH (CvGV (cv)) 3588 GvSTASH (CvGV (cv))
3444 ); 3589 );
3590}
3445 OUTPUT: 3591 OUTPUT:
3446 RETVAL 3592 RETVAL
3447 3593
3448# helper for Coro::Channel 3594# helper for Coro::Channel and others
3449SV * 3595SV *
3450_alloc (int count) 3596_alloc (int count)
3451 CODE: 3597 CODE:
3452 RETVAL = coro_waitarray_new (aTHX_ count); 3598 RETVAL = coro_waitarray_new (aTHX_ count);
3453 OUTPUT: 3599 OUTPUT:
3511 for (i = 1; i <= wcount; ++i) 3657 for (i = 1; i <= wcount; ++i)
3512 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i]))); 3658 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i])));
3513 } 3659 }
3514} 3660}
3515 3661
3662MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3663
3664void
3665_may_delete (SV *sem, int count, int extra_refs)
3666 PPCODE:
3667{
3668 AV *av = (AV *)SvRV (sem);
3669
3670 if (SvREFCNT ((SV *)av) == 1 + extra_refs
3671 && AvFILLp (av) == 0 /* no waiters, just count */
3672 && SvIV (AvARRAY (av)[0]) == count)
3673 XSRETURN_YES;
3674
3675 XSRETURN_NO;
3676}
3677
3516MODULE = Coro::State PACKAGE = Coro::Signal 3678MODULE = Coro::State PACKAGE = Coro::Signal
3517 3679
3518SV * 3680SV *
3519new (SV *klass) 3681new (SV *klass)
3520 CODE: 3682 CODE:
3591 3753
3592void 3754void
3593_register (char *target, char *proto, SV *req) 3755_register (char *target, char *proto, SV *req)
3594 CODE: 3756 CODE:
3595{ 3757{
3596 CV *req_cv = coro_sv_2cv (aTHX_ req); 3758 SV *req_cv = s_get_cv_croak (req);
3597 /* newXSproto doesn't return the CV on 5.8 */ 3759 /* newXSproto doesn't return the CV on 5.8 */
3598 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 3760 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3599 sv_setpv ((SV *)slf_cv, proto); 3761 sv_setpv ((SV *)slf_cv, proto);
3600 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0); 3762 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
3601} 3763}
3602 3764
3765MODULE = Coro::State PACKAGE = Coro::Select
3766
3767void
3768patch_pp_sselect ()
3769 CODE:
3770 if (!coro_old_pp_sselect)
3771 {
3772 coro_select_select = (SV *)get_cv ("Coro::Select::select", 0);
3773 coro_old_pp_sselect = PL_ppaddr [OP_SSELECT];
3774 PL_ppaddr [OP_SSELECT] = coro_pp_sselect;
3775 }
3776
3777void
3778unpatch_pp_sselect ()
3779 CODE:
3780 if (coro_old_pp_sselect)
3781 {
3782 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
3783 coro_old_pp_sselect = 0;
3784 }
3785
3786

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines