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.319 by root, Thu Nov 20 07:25:01 2008 UTC vs.
Revision 1.388 by root, Wed Feb 23 07:14:22 2011 UTC

1/* this works around a bug in mingw32 providing a non-working setjmp */
2#define USE_NO_MINGW_SETJMP_TWO_ARGS
3
4#define NDEBUG 1
5
1#include "libcoro/coro.c" 6#include "libcoro/coro.c"
2 7
3#define PERL_NO_GET_CONTEXT 8#define PERL_NO_GET_CONTEXT
4#define PERL_EXT 9#define PERL_EXT
5 10
6#include "EXTERN.h" 11#include "EXTERN.h"
7#include "perl.h" 12#include "perl.h"
8#include "XSUB.h" 13#include "XSUB.h"
9#include "perliol.h" 14#include "perliol.h"
10 15
11#include "patchlevel.h" 16#include "schmorp.h"
12 17
13#include <stdio.h> 18#include <stdio.h>
14#include <errno.h> 19#include <errno.h>
15#include <assert.h> 20#include <assert.h>
16 21
22#ifndef SVs_PADSTALE
23# define SVs_PADSTALE 0
24#endif
25
17#ifdef WIN32 26#ifdef WIN32
27# undef HAS_GETTIMEOFDAY
18# undef setjmp 28# undef setjmp
19# undef longjmp 29# undef longjmp
20# undef _exit 30# undef _exit
21# define setjmp _setjmp /* deep magic */ 31# define setjmp _setjmp /* deep magic */
22#else 32#else
… …
51#endif 61#endif
52 62
53/* the maximum number of idle cctx that will be pooled */ 63/* the maximum number of idle cctx that will be pooled */
54static int cctx_max_idle = 4; 64static int cctx_max_idle = 4;
55 65
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
107/* 5.8.7 */
108#ifndef SvRV_set
109# define SvRV_set(s,v) SvRV(s) = (v)
110#endif
111
112#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 66#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
113# undef CORO_STACKGUARD 67# undef CORO_STACKGUARD
114#endif 68#endif
115 69
116#ifndef CORO_STACKGUARD 70#ifndef CORO_STACKGUARD
… …
130#else 84#else
131# define dSTACKLEVEL volatile void *stacklevel 85# define dSTACKLEVEL volatile void *stacklevel
132# define STACKLEVEL ((void *)&stacklevel) 86# define STACKLEVEL ((void *)&stacklevel)
133#endif 87#endif
134 88
135#define IN_DESTRUCT (PL_main_cv == Nullcv) 89#define IN_DESTRUCT PL_dirty
136 90
137#if __GNUC__ >= 3 91#if __GNUC__ >= 3
138# define attribute(x) __attribute__(x) 92# define attribute(x) __attribute__(x)
139# define expect(expr,value) __builtin_expect ((expr),(value)) 93# define expect(expr,value) __builtin_expect ((expr), (value))
140# define INLINE static inline 94# define INLINE static inline
141#else 95#else
142# define attribute(x) 96# define attribute(x)
143# define expect(expr,value) (expr) 97# define expect(expr,value) (expr)
144# define INLINE static 98# define INLINE static
… …
156# if CORO_PTHREAD 110# if CORO_PTHREAD
157static void *coro_thx; 111static void *coro_thx;
158# endif 112# endif
159#endif 113#endif
160 114
115#ifdef __linux
116# include <time.h> /* for timespec */
117# include <syscall.h> /* for SYS_* */
118# ifdef SYS_clock_gettime
119# define coro_clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
120# define CORO_CLOCK_MONOTONIC 1
121# define CORO_CLOCK_THREAD_CPUTIME_ID 3
122# endif
123#endif
124
161static double (*nvtime)(); /* so why doesn't it take void? */ 125static double (*nvtime)(); /* so why doesn't it take void? */
126static void (*u2time)(pTHX_ UV ret[2]);
162 127
163/* we hijack an hopefully unused CV flag for our purposes */ 128/* we hijack an hopefully unused CV flag for our purposes */
164#define CVf_SLF 0x4000 129#define CVf_SLF 0x4000
165static OP *pp_slf (pTHX); 130static OP *pp_slf (pTHX);
166 131
… …
172static HV *coro_state_stash, *coro_stash; 137static HV *coro_state_stash, *coro_stash;
173static volatile SV *coro_mortal; /* will be freed/thrown after next transfer */ 138static volatile SV *coro_mortal; /* will be freed/thrown after next transfer */
174 139
175static AV *av_destroy; /* destruction queue */ 140static AV *av_destroy; /* destruction queue */
176static SV *sv_manager; /* the manager coro */ 141static SV *sv_manager; /* the manager coro */
142static SV *sv_idle; /* $Coro::idle */
177 143
178static GV *irsgv; /* $/ */ 144static GV *irsgv; /* $/ */
179static GV *stdoutgv; /* *STDOUT */ 145static GV *stdoutgv; /* *STDOUT */
180static SV *rv_diehook; 146static SV *rv_diehook;
181static SV *rv_warnhook; 147static SV *rv_warnhook;
… …
186static SV *sv_pool_size; 152static SV *sv_pool_size;
187static SV *sv_async_pool_idle; /* description string */ 153static SV *sv_async_pool_idle; /* description string */
188static AV *av_async_pool; /* idle pool */ 154static AV *av_async_pool; /* idle pool */
189static SV *sv_Coro; /* class string */ 155static SV *sv_Coro; /* class string */
190static CV *cv_pool_handler; 156static CV *cv_pool_handler;
191static CV *cv_coro_state_new;
192 157
193/* Coro::AnyEvent */ 158/* Coro::AnyEvent */
194static SV *sv_activity; 159static SV *sv_activity;
160
161/* enable processtime/realtime profiling */
162static char enable_times;
163typedef U32 coro_ts[2];
164static coro_ts time_real, time_cpu;
165static char times_valid;
195 166
196static struct coro_cctx *cctx_first; 167static struct coro_cctx *cctx_first;
197static int cctx_count, cctx_idle; 168static int cctx_count, cctx_idle;
198 169
199enum { 170enum {
… …
225 int valgrind_id; 196 int valgrind_id;
226#endif 197#endif
227 unsigned char flags; 198 unsigned char flags;
228} coro_cctx; 199} coro_cctx;
229 200
201coro_cctx *cctx_current; /* the currently running cctx */
202
203/*****************************************************************************/
204
230enum { 205enum {
231 CF_RUNNING = 0x0001, /* coroutine is running */ 206 CF_RUNNING = 0x0001, /* coroutine is running */
232 CF_READY = 0x0002, /* coroutine is ready */ 207 CF_READY = 0x0002, /* coroutine is ready */
233 CF_NEW = 0x0004, /* has never been switched to */ 208 CF_NEW = 0x0004, /* has never been switched to */
234 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 209 CF_DESTROYED = 0x0008, /* coroutine data has been freed */
210 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
235}; 211};
236 212
237/* the structure where most of the perl state is stored, overlaid on the cxstack */ 213/* the structure where most of the perl state is stored, overlaid on the cxstack */
238typedef struct 214typedef struct
239{ 215{
240 SV *defsv; 216 SV *defsv;
241 AV *defav; 217 AV *defav;
242 SV *errsv; 218 SV *errsv;
243 SV *irsgv; 219 SV *irsgv;
220 HV *hinthv;
244#define VAR(name,type) type name; 221#define VAR(name,type) type name;
245# include "state.h" 222# include "state.h"
246#undef VAR 223#undef VAR
247} perl_slots; 224} perl_slots;
248 225
… …
250 227
251/* this is a structure representing a perl-level coroutine */ 228/* this is a structure representing a perl-level coroutine */
252struct coro { 229struct coro {
253 /* the C coroutine allocated to this perl coroutine, if any */ 230 /* the C coroutine allocated to this perl coroutine, if any */
254 coro_cctx *cctx; 231 coro_cctx *cctx;
232
233 /* ready queue */
234 struct coro *next_ready;
255 235
256 /* state data */ 236 /* state data */
257 struct CoroSLF slf_frame; /* saved slf frame */ 237 struct CoroSLF slf_frame; /* saved slf frame */
258 AV *mainstack; 238 AV *mainstack;
259 perl_slots *slot; /* basically the saved sp */ 239 perl_slots *slot; /* basically the saved sp */
… …
261 CV *startcv; /* the CV to execute */ 241 CV *startcv; /* the CV to execute */
262 AV *args; /* data associated with this coroutine (initial args) */ 242 AV *args; /* data associated with this coroutine (initial args) */
263 int refcnt; /* coroutines are refcounted, yes */ 243 int refcnt; /* coroutines are refcounted, yes */
264 int flags; /* CF_ flags */ 244 int flags; /* CF_ flags */
265 HV *hv; /* the perl hash associated with this coro, if any */ 245 HV *hv; /* the perl hash associated with this coro, if any */
266 void (*on_destroy)(pTHX_ struct coro *coro); 246 void (*on_destroy)(pTHX_ struct coro *coro); /* for temporary use by xs in critical sections */
267 247
268 /* statistics */ 248 /* statistics */
269 int usecount; /* number of transfers to this coro */ 249 int usecount; /* number of transfers to this coro */
270 250
271 /* coro process data */ 251 /* coro process data */
… …
276 /* async_pool */ 256 /* async_pool */
277 SV *saved_deffh; 257 SV *saved_deffh;
278 SV *invoke_cb; 258 SV *invoke_cb;
279 AV *invoke_av; 259 AV *invoke_av;
280 260
261 /* on_enter/on_leave */
262 AV *on_enter;
263 AV *on_leave;
264
265 /* swap_sv */
266 AV *swap_sv;
267
268 /* times */
269 coro_ts t_cpu, t_real;
270
281 /* linked list */ 271 /* linked list */
282 struct coro *next, *prev; 272 struct coro *next, *prev;
283}; 273};
284 274
285typedef struct coro *Coro__State; 275typedef struct coro *Coro__State;
… …
290/* the mainr easonw e don't support windows process emulation */ 280/* the mainr easonw e don't support windows process emulation */
291static struct CoroSLF slf_frame; /* the current slf frame */ 281static struct CoroSLF slf_frame; /* the current slf frame */
292 282
293/** Coro ********************************************************************/ 283/** Coro ********************************************************************/
294 284
295#define PRIO_MAX 3 285#define CORO_PRIO_MAX 3
296#define PRIO_HIGH 1 286#define CORO_PRIO_HIGH 1
297#define PRIO_NORMAL 0 287#define CORO_PRIO_NORMAL 0
298#define PRIO_LOW -1 288#define CORO_PRIO_LOW -1
299#define PRIO_IDLE -3 289#define CORO_PRIO_IDLE -3
300#define PRIO_MIN -4 290#define CORO_PRIO_MIN -4
301 291
302/* for Coro.pm */ 292/* for Coro.pm */
303static SV *coro_current; 293static SV *coro_current;
304static SV *coro_readyhook; 294static SV *coro_readyhook;
305static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1]; 295static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
306static CV *cv_coro_run, *cv_coro_terminate; 296static CV *cv_coro_run, *cv_coro_terminate;
307static struct coro *coro_first; 297static struct coro *coro_first;
308#define coro_nready coroapi.nready 298#define coro_nready coroapi.nready
299
300/** Coro::Select ************************************************************/
301
302static OP *(*coro_old_pp_sselect) (pTHX);
303static SV *coro_select_select;
304
305/* horrible hack, but if it works... */
306static OP *
307coro_pp_sselect (pTHX)
308{
309 dSP;
310 PUSHMARK (SP - 4); /* fake argument list */
311 XPUSHs (coro_select_select);
312 PUTBACK;
313
314 /* entersub is an UNOP, select a LISTOP... keep your fingers crossed */
315 PL_op->op_flags |= OPf_STACKED;
316 PL_op->op_private = 0;
317 return PL_ppaddr [OP_ENTERSUB](aTHX);
318}
319
320/** time stuff **************************************************************/
321
322#ifdef HAS_GETTIMEOFDAY
323
324static void
325coro_u2time (pTHX_ UV ret[2])
326{
327 struct timeval tv;
328 gettimeofday (&tv, 0);
329
330 ret [0] = tv.tv_sec;
331 ret [1] = tv.tv_usec;
332}
333
334static double
335coro_nvtime ()
336{
337 struct timeval tv;
338 gettimeofday (&tv, 0);
339
340 return tv.tv_sec + tv.tv_usec * 1e-6;
341}
342
343static void
344time_init (pTHX)
345{
346 nvtime = coro_nvtime;
347 u2time = coro_u2time;
348}
349
350#else
351
352static void
353time_init (pTHX)
354{
355 SV **svp;
356
357 require_pv ("Time/HiRes.pm");
358
359 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
360
361 if (!svp) croak ("Time::HiRes is required, but missing.");
362 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
363
364 nvtime = INT2PTR (double (*)(), SvIV (*svp));
365
366 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
367 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
368}
369
370#endif
309 371
310/** lowlevel stuff **********************************************************/ 372/** lowlevel stuff **********************************************************/
311 373
312static SV * 374static SV *
313coro_get_sv (pTHX_ const char *name, int create) 375coro_get_sv (pTHX_ const char *name, int create)
… …
337 get_hv (name, create); 399 get_hv (name, create);
338#endif 400#endif
339 return get_hv (name, create); 401 return get_hv (name, create);
340} 402}
341 403
342/* may croak */ 404INLINE void
343INLINE CV * 405coro_times_update ()
344coro_sv_2cv (pTHX_ SV *sv)
345{ 406{
407#ifdef coro_clock_gettime
408 struct timespec ts;
409
410 ts.tv_sec = ts.tv_nsec = 0;
411 coro_clock_gettime (CORO_CLOCK_THREAD_CPUTIME_ID, &ts);
412 time_cpu [0] = ts.tv_sec; time_cpu [1] = ts.tv_nsec;
413
414 ts.tv_sec = ts.tv_nsec = 0;
415 coro_clock_gettime (CORO_CLOCK_MONOTONIC, &ts);
416 time_real [0] = ts.tv_sec; time_real [1] = ts.tv_nsec;
417#else
418 dTHX;
419 UV tv[2];
420
421 u2time (aTHX_ tv);
422 time_real [0] = tv [0];
423 time_real [1] = tv [1] * 1000;
424#endif
425}
426
427INLINE void
428coro_times_add (struct coro *c)
429{
430 c->t_real [1] += time_real [1];
431 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
432 c->t_real [0] += time_real [0];
433
434 c->t_cpu [1] += time_cpu [1];
435 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
436 c->t_cpu [0] += time_cpu [0];
437}
438
439INLINE void
440coro_times_sub (struct coro *c)
441{
442 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; }
443 c->t_real [1] -= time_real [1];
444 c->t_real [0] -= time_real [0];
445
446 if (c->t_cpu [1] < time_cpu [1]) { c->t_cpu [1] += 1000000000; --c->t_cpu [0]; }
447 c->t_cpu [1] -= time_cpu [1];
448 c->t_cpu [0] -= time_cpu [0];
449}
450
451/*****************************************************************************/
452/* magic glue */
453
454#define CORO_MAGIC_type_cv 26
455#define CORO_MAGIC_type_state PERL_MAGIC_ext
456
457#define CORO_MAGIC_NN(sv, type) \
458 (expect_true (SvMAGIC (sv)->mg_type == type) \
459 ? SvMAGIC (sv) \
460 : mg_find (sv, type))
461
462#define CORO_MAGIC(sv, type) \
463 (expect_true (SvMAGIC (sv)) \
464 ? CORO_MAGIC_NN (sv, type) \
465 : 0)
466
467#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
468#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
469
470INLINE struct coro *
471SvSTATE_ (pTHX_ SV *coro)
472{
346 HV *st; 473 HV *stash;
347 GV *gvp; 474 MAGIC *mg;
348 return sv_2cv (sv, &st, &gvp, 0); 475
476 if (SvROK (coro))
477 coro = SvRV (coro);
478
479 if (expect_false (SvTYPE (coro) != SVt_PVHV))
480 croak ("Coro::State object required");
481
482 stash = SvSTASH (coro);
483 if (expect_false (stash != coro_stash && stash != coro_state_stash))
484 {
485 /* very slow, but rare, check */
486 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
487 croak ("Coro::State object required");
488 }
489
490 mg = CORO_MAGIC_state (coro);
491 return (struct coro *)mg->mg_ptr;
349} 492}
493
494#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
495
496/* faster than SvSTATE, but expects a coroutine hv */
497#define SvSTATE_hv(hv) ((struct coro *)CORO_MAGIC_NN ((SV *)hv, CORO_MAGIC_type_state)->mg_ptr)
498#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
499
500/*****************************************************************************/
501/* padlist management and caching */
350 502
351static AV * 503static AV *
352coro_clone_padlist (pTHX_ CV *cv) 504coro_derive_padlist (pTHX_ CV *cv)
353{ 505{
354 AV *padlist = CvPADLIST (cv); 506 AV *padlist = CvPADLIST (cv);
355 AV *newpadlist, *newpad; 507 AV *newpadlist, *newpad;
356 508
357 newpadlist = newAV (); 509 newpadlist = newAV ();
… …
362 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 514 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
363#endif 515#endif
364 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 516 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
365 --AvFILLp (padlist); 517 --AvFILLp (padlist);
366 518
367 av_store (newpadlist, 0, SvREFCNT_inc_NN (*av_fetch (padlist, 0, FALSE))); 519 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0]));
368 av_store (newpadlist, 1, (SV *)newpad); 520 av_store (newpadlist, 1, (SV *)newpad);
369 521
370 return newpadlist; 522 return newpadlist;
371} 523}
372 524
373static void 525static void
374free_padlist (pTHX_ AV *padlist) 526free_padlist (pTHX_ AV *padlist)
375{ 527{
376 /* may be during global destruction */ 528 /* may be during global destruction */
377 if (SvREFCNT (padlist)) 529 if (!IN_DESTRUCT)
378 { 530 {
379 I32 i = AvFILLp (padlist); 531 I32 i = AvFILLp (padlist);
380 while (i >= 0) 532
533 while (i > 0) /* special-case index 0 */
381 { 534 {
382 SV **svp = av_fetch (padlist, i--, FALSE); 535 /* we try to be extra-careful here */
383 if (svp) 536 AV *av = (AV *)AvARRAY (padlist)[i--];
384 { 537 I32 j = AvFILLp (av);
385 SV *sv; 538
386 while (&PL_sv_undef != (sv = av_pop ((AV *)*svp))) 539 while (j >= 0)
540 SvREFCNT_dec (AvARRAY (av)[j--]);
541
542 AvFILLp (av) = -1;
387 SvREFCNT_dec (sv); 543 SvREFCNT_dec (av);
388
389 SvREFCNT_dec (*svp);
390 }
391 } 544 }
392 545
546 SvREFCNT_dec (AvARRAY (padlist)[0]);
547
548 AvFILLp (padlist) = -1;
393 SvREFCNT_dec ((SV*)padlist); 549 SvREFCNT_dec ((SV*)padlist);
394 } 550 }
395} 551}
396 552
397static int 553static int
398coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 554coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
399{ 555{
400 AV *padlist; 556 AV *padlist;
401 AV *av = (AV *)mg->mg_obj; 557 AV *av = (AV *)mg->mg_obj;
558
559 /* perl manages to free our internal AV and _then_ call us */
560 if (IN_DESTRUCT)
561 return 0;
402 562
403 /* casting is fun. */ 563 /* casting is fun. */
404 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 564 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
405 free_padlist (aTHX_ padlist); 565 free_padlist (aTHX_ padlist);
406 566
407 SvREFCNT_dec (av); /* sv_magicext increased the refcount */ 567 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
408 568
409 return 0; 569 return 0;
410} 570}
411
412#define CORO_MAGIC_type_cv 26
413#define CORO_MAGIC_type_state PERL_MAGIC_ext
414 571
415static MGVTBL coro_cv_vtbl = { 572static MGVTBL coro_cv_vtbl = {
416 0, 0, 0, 0, 573 0, 0, 0, 0,
417 coro_cv_free 574 coro_cv_free
418}; 575};
419
420#define CORO_MAGIC_NN(sv, type) \
421 (expect_true (SvMAGIC (sv)->mg_type == type) \
422 ? SvMAGIC (sv) \
423 : mg_find (sv, type))
424
425#define CORO_MAGIC(sv, type) \
426 (expect_true (SvMAGIC (sv)) \
427 ? CORO_MAGIC_NN (sv, type) \
428 : 0)
429
430#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
431#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
432
433INLINE struct coro *
434SvSTATE_ (pTHX_ SV *coro)
435{
436 HV *stash;
437 MAGIC *mg;
438
439 if (SvROK (coro))
440 coro = SvRV (coro);
441
442 if (expect_false (SvTYPE (coro) != SVt_PVHV))
443 croak ("Coro::State object required");
444
445 stash = SvSTASH (coro);
446 if (expect_false (stash != coro_stash && stash != coro_state_stash))
447 {
448 /* very slow, but rare, check */
449 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
450 croak ("Coro::State object required");
451 }
452
453 mg = CORO_MAGIC_state (coro);
454 return (struct coro *)mg->mg_ptr;
455}
456
457#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
458
459/* faster than SvSTATE, but expects a coroutine hv */
460#define SvSTATE_hv(hv) ((struct coro *)CORO_MAGIC_NN ((SV *)hv, CORO_MAGIC_type_state)->mg_ptr)
461#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
462 576
463/* the next two functions merely cache the padlists */ 577/* the next two functions merely cache the padlists */
464static void 578static void
465get_padlist (pTHX_ CV *cv) 579get_padlist (pTHX_ CV *cv)
466{ 580{
… …
477 CV *cp = Perl_cv_clone (aTHX_ cv); 591 CV *cp = Perl_cv_clone (aTHX_ cv);
478 CvPADLIST (cv) = CvPADLIST (cp); 592 CvPADLIST (cv) = CvPADLIST (cp);
479 CvPADLIST (cp) = 0; 593 CvPADLIST (cp) = 0;
480 SvREFCNT_dec (cp); 594 SvREFCNT_dec (cp);
481#else 595#else
482 CvPADLIST (cv) = coro_clone_padlist (aTHX_ cv); 596 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
483#endif 597#endif
484 } 598 }
485} 599}
486 600
487static void 601static void
… …
494 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 608 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
495 609
496 av = (AV *)mg->mg_obj; 610 av = (AV *)mg->mg_obj;
497 611
498 if (expect_false (AvFILLp (av) >= AvMAX (av))) 612 if (expect_false (AvFILLp (av) >= AvMAX (av)))
499 av_extend (av, AvMAX (av) + 1); 613 av_extend (av, AvFILLp (av) + 1);
500 614
501 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 615 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
502} 616}
503 617
504/** load & save, init *******************************************************/ 618/** load & save, init *******************************************************/
619
620/* swap sv heads, at least logically */
621static void
622swap_svs (pTHX_ Coro__State c)
623{
624 int i;
625
626 for (i = 0; i <= AvFILLp (c->swap_sv); )
627 {
628 SV *a = AvARRAY (c->swap_sv)[i++];
629 SV *b = AvARRAY (c->swap_sv)[i++];
630
631 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
632 SV tmp;
633
634 /* swap sv_any */
635 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
636
637 /* swap sv_flags */
638 SvFLAGS (&tmp) = SvFLAGS (a);
639 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
640 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
641
642#if PERL_VERSION_ATLEAST (5,10,0)
643 /* perl 5.10 complicates this _quite_ a bit, but it also is
644 * much faster, so no quarrels here. alternatively, we could
645 * sv_upgrade to avoid this.
646 */
647 {
648 /* swap sv_u */
649 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
650
651 /* if SvANY points to the head, we need to adjust the pointers,
652 * as the pointer for a still points to b, and maybe vice versa.
653 */
654 #define svany_in_head(type) \
655 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
656
657 if (svany_in_head (SvTYPE (a)))
658 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
659
660 if (svany_in_head (SvTYPE (b)))
661 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
662 }
663#endif
664 }
665}
666
667#define SWAP_SVS(coro) \
668 if (expect_false ((coro)->swap_sv)) \
669 swap_svs (aTHX_ (coro))
670
671static void
672on_enterleave_call (pTHX_ SV *cb);
505 673
506static void 674static void
507load_perl (pTHX_ Coro__State c) 675load_perl (pTHX_ Coro__State c)
508{ 676{
509 perl_slots *slot = c->slot; 677 perl_slots *slot = c->slot;
510 c->slot = 0; 678 c->slot = 0;
511 679
512 PL_mainstack = c->mainstack; 680 PL_mainstack = c->mainstack;
513 681
514 GvSV (PL_defgv) = slot->defsv; 682 GvSV (PL_defgv) = slot->defsv;
515 GvAV (PL_defgv) = slot->defav; 683 GvAV (PL_defgv) = slot->defav;
516 GvSV (PL_errgv) = slot->errsv; 684 GvSV (PL_errgv) = slot->errsv;
517 GvSV (irsgv) = slot->irsgv; 685 GvSV (irsgv) = slot->irsgv;
686 GvHV (PL_hintgv) = slot->hinthv;
518 687
519 #define VAR(name,type) PL_ ## name = slot->name; 688 #define VAR(name,type) PL_ ## name = slot->name;
520 # include "state.h" 689 # include "state.h"
521 #undef VAR 690 #undef VAR
522 691
… …
536 PUTBACK; 705 PUTBACK;
537 } 706 }
538 707
539 slf_frame = c->slf_frame; 708 slf_frame = c->slf_frame;
540 CORO_THROW = c->except; 709 CORO_THROW = c->except;
710
711 if (expect_false (enable_times))
712 {
713 if (expect_false (!times_valid))
714 coro_times_update ();
715
716 coro_times_sub (c);
717 }
718
719 if (expect_false (c->on_enter))
720 {
721 int i;
722
723 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
724 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
725 }
726
727 SWAP_SVS (c);
541} 728}
542 729
543static void 730static void
544save_perl (pTHX_ Coro__State c) 731save_perl (pTHX_ Coro__State c)
545{ 732{
733 SWAP_SVS (c);
734
735 if (expect_false (c->on_leave))
736 {
737 int i;
738
739 for (i = AvFILLp (c->on_leave); i >= 0; --i)
740 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
741 }
742
743 times_valid = 0;
744
745 if (expect_false (enable_times))
746 {
747 coro_times_update (); times_valid = 1;
748 coro_times_add (c);
749 }
750
546 c->except = CORO_THROW; 751 c->except = CORO_THROW;
547 c->slf_frame = slf_frame; 752 c->slf_frame = slf_frame;
548 753
549 { 754 {
550 dSP; 755 dSP;
… …
563 { 768 {
564 while (expect_true (cxix >= 0)) 769 while (expect_true (cxix >= 0))
565 { 770 {
566 PERL_CONTEXT *cx = &ccstk[cxix--]; 771 PERL_CONTEXT *cx = &ccstk[cxix--];
567 772
568 if (expect_true (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT)) 773 if (expect_true (CxTYPE (cx) == CXt_SUB) || expect_false (CxTYPE (cx) == CXt_FORMAT))
569 { 774 {
570 CV *cv = cx->blk_sub.cv; 775 CV *cv = cx->blk_sub.cv;
571 776
572 if (expect_true (CvDEPTH (cv))) 777 if (expect_true (CvDEPTH (cv)))
573 { 778 {
… …
597 /* we manually unroll here, as usually 2 slots is enough */ 802 /* we manually unroll here, as usually 2 slots is enough */
598 if (SLOT_COUNT >= 1) CXINC; 803 if (SLOT_COUNT >= 1) CXINC;
599 if (SLOT_COUNT >= 2) CXINC; 804 if (SLOT_COUNT >= 2) CXINC;
600 if (SLOT_COUNT >= 3) CXINC; 805 if (SLOT_COUNT >= 3) CXINC;
601 { 806 {
602 int i; 807 unsigned int i;
603 for (i = 3; i < SLOT_COUNT; ++i) 808 for (i = 3; i < SLOT_COUNT; ++i)
604 CXINC; 809 CXINC;
605 } 810 }
606 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 811 cxstack_ix -= SLOT_COUNT; /* undo allocation */
607 812
608 c->mainstack = PL_mainstack; 813 c->mainstack = PL_mainstack;
609 814
610 { 815 {
611 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 816 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
612 817
613 slot->defav = GvAV (PL_defgv); 818 slot->defav = GvAV (PL_defgv);
614 slot->defsv = DEFSV; 819 slot->defsv = DEFSV;
615 slot->errsv = ERRSV; 820 slot->errsv = ERRSV;
616 slot->irsgv = GvSV (irsgv); 821 slot->irsgv = GvSV (irsgv);
822 slot->hinthv = GvHV (PL_hintgv);
617 823
618 #define VAR(name,type) slot->name = PL_ ## name; 824 #define VAR(name,type) slot->name = PL_ ## name;
619 # include "state.h" 825 # include "state.h"
620 #undef VAR 826 #undef VAR
621 } 827 }
… …
748#endif 954#endif
749 955
750/* 956/*
751 * This overrides the default magic get method of %SIG elements. 957 * This overrides the default magic get method of %SIG elements.
752 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook 958 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
753 * and instead of tryign to save and restore the hash elements, we just provide 959 * and instead of trying to save and restore the hash elements, we just provide
754 * readback here. 960 * readback here.
755 * We only do this when the hook is != 0, as they are often set to 0 temporarily,
756 * not expecting this to actually change the hook. This is a potential problem
757 * when a schedule happens then, but we ignore this.
758 */ 961 */
759static int 962static int
760coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 963coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
761{ 964{
762 const char *s = MgPV_nolen_const (mg); 965 const char *s = MgPV_nolen_const (mg);
… …
815 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 1018 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
816 1019
817 if (svp) 1020 if (svp)
818 { 1021 {
819 SV *old = *svp; 1022 SV *old = *svp;
820 *svp = newSVsv (sv); 1023 *svp = SvOK (sv) ? newSVsv (sv) : 0;
821 SvREFCNT_dec (old); 1024 SvREFCNT_dec (old);
822 return 0; 1025 return 0;
823 } 1026 }
824 } 1027 }
825 1028
… …
843slf_check_repeat (pTHX_ struct CoroSLF *frame) 1046slf_check_repeat (pTHX_ struct CoroSLF *frame)
844{ 1047{
845 return 1; 1048 return 1;
846} 1049}
847 1050
848static UNOP coro_setup_op; 1051static UNOP init_perl_op;
849 1052
850static void NOINLINE /* noinline to keep it out of the transfer fast path */ 1053static void NOINLINE /* noinline to keep it out of the transfer fast path */
851coro_setup (pTHX_ struct coro *coro) 1054init_perl (pTHX_ struct coro *coro)
852{ 1055{
853 /* 1056 /*
854 * emulate part of the perl startup here. 1057 * emulate part of the perl startup here.
855 */ 1058 */
856 coro_init_stacks (aTHX); 1059 coro_init_stacks (aTHX);
857 1060
858 PL_runops = RUNOPS_DEFAULT; 1061 PL_runops = RUNOPS_DEFAULT;
859 PL_curcop = &PL_compiling; 1062 PL_curcop = &PL_compiling;
860 PL_in_eval = EVAL_NULL; 1063 PL_in_eval = EVAL_NULL;
861 PL_comppad = 0; 1064 PL_comppad = 0;
1065 PL_comppad_name = 0;
1066 PL_comppad_name_fill = 0;
1067 PL_comppad_name_floor = 0;
862 PL_curpm = 0; 1068 PL_curpm = 0;
863 PL_curpad = 0; 1069 PL_curpad = 0;
864 PL_localizing = 0; 1070 PL_localizing = 0;
865 PL_dirty = 0;
866 PL_restartop = 0; 1071 PL_restartop = 0;
867#if PERL_VERSION_ATLEAST (5,10,0) 1072#if PERL_VERSION_ATLEAST (5,10,0)
868 PL_parser = 0; 1073 PL_parser = 0;
869#endif 1074#endif
1075 PL_hints = 0;
870 1076
871 /* recreate the die/warn hooks */ 1077 /* recreate the die/warn hooks */
872 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1078 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook );
873 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1079 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook);
874 1080
875 GvSV (PL_defgv) = newSV (0); 1081 GvSV (PL_defgv) = newSV (0);
876 GvAV (PL_defgv) = coro->args; coro->args = 0; 1082 GvAV (PL_defgv) = coro->args; coro->args = 0;
877 GvSV (PL_errgv) = newSV (0); 1083 GvSV (PL_errgv) = newSV (0);
878 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1084 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
1085 GvHV (PL_hintgv) = 0;
879 PL_rs = newSVsv (GvSV (irsgv)); 1086 PL_rs = newSVsv (GvSV (irsgv));
880 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1087 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
881 1088
882 { 1089 {
883 dSP; 1090 dSP;
… …
900 */ 1107 */
901 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1108 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
902 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */ 1109 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
903 1110
904 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1111 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */
905 coro_setup_op.op_next = PL_op; 1112 init_perl_op.op_next = PL_op;
906 coro_setup_op.op_type = OP_CUSTOM; 1113 init_perl_op.op_type = OP_ENTERSUB;
907 coro_setup_op.op_ppaddr = pp_slf; 1114 init_perl_op.op_ppaddr = pp_slf;
908 /* no flags etc. required, as an init function won't be called */ 1115 /* no flags etc. required, as an init function won't be called */
909 1116
910 PL_op = (OP *)&coro_setup_op; 1117 PL_op = (OP *)&init_perl_op;
911 1118
912 /* copy throw, in case it was set before coro_setup */ 1119 /* copy throw, in case it was set before init_perl */
913 CORO_THROW = coro->except; 1120 CORO_THROW = coro->except;
914}
915 1121
1122 SWAP_SVS (coro);
1123
1124 if (expect_false (enable_times))
1125 {
1126 coro_times_update ();
1127 coro_times_sub (coro);
1128 }
1129}
1130
916static void 1131static void
917coro_destruct (pTHX_ struct coro *coro) 1132coro_unwind_stacks (pTHX)
918{ 1133{
919 if (!IN_DESTRUCT) 1134 if (!IN_DESTRUCT)
920 { 1135 {
921 /* restore all saved variables and stuff */ 1136 /* restore all saved variables and stuff */
922 LEAVE_SCOPE (0); 1137 LEAVE_SCOPE (0);
… …
930 POPSTACK_TO (PL_mainstack); 1145 POPSTACK_TO (PL_mainstack);
931 1146
932 /* unwind main stack */ 1147 /* unwind main stack */
933 dounwind (-1); 1148 dounwind (-1);
934 } 1149 }
1150}
935 1151
936 SvREFCNT_dec (GvSV (PL_defgv)); 1152static void
937 SvREFCNT_dec (GvAV (PL_defgv)); 1153destroy_perl (pTHX_ struct coro *coro)
938 SvREFCNT_dec (GvSV (PL_errgv)); 1154{
939 SvREFCNT_dec (PL_defoutgv); 1155 SV *svf [9];
940 SvREFCNT_dec (PL_rs);
941 SvREFCNT_dec (GvSV (irsgv));
942 1156
943 SvREFCNT_dec (PL_diehook);
944 SvREFCNT_dec (PL_warnhook);
945 1157 {
1158 struct coro *current = SvSTATE_current;
1159
1160 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1161
1162 save_perl (aTHX_ current);
1163 load_perl (aTHX_ coro);
1164
1165 coro_unwind_stacks (aTHX);
1166 coro_destruct_stacks (aTHX);
1167
1168 /* restore swapped sv's */
1169 SWAP_SVS (coro);
1170
1171 // now save some sv's to be free'd later
1172 svf [0] = GvSV (PL_defgv);
1173 svf [1] = (SV *)GvAV (PL_defgv);
1174 svf [2] = GvSV (PL_errgv);
1175 svf [3] = (SV *)PL_defoutgv;
1176 svf [4] = PL_rs;
1177 svf [5] = GvSV (irsgv);
1178 svf [6] = (SV *)GvHV (PL_hintgv);
1179 svf [7] = PL_diehook;
1180 svf [8] = PL_warnhook;
1181 assert (9 == sizeof (svf) / sizeof (*svf));
1182
1183 load_perl (aTHX_ current);
1184 }
1185
1186 {
1187 unsigned int i;
1188
1189 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i)
1190 SvREFCNT_dec (svf [i]);
1191
946 SvREFCNT_dec (coro->saved_deffh); 1192 SvREFCNT_dec (coro->saved_deffh);
947 SvREFCNT_dec (coro->rouse_cb); 1193 SvREFCNT_dec (coro->rouse_cb);
948 SvREFCNT_dec (coro->invoke_cb); 1194 SvREFCNT_dec (coro->invoke_cb);
949 SvREFCNT_dec (coro->invoke_av); 1195 SvREFCNT_dec (coro->invoke_av);
950 1196 }
951 coro_destruct_stacks (aTHX);
952} 1197}
953 1198
954INLINE void 1199INLINE void
955free_coro_mortal (pTHX) 1200free_coro_mortal (pTHX)
956{ 1201{
… …
964static int 1209static int
965runops_trace (pTHX) 1210runops_trace (pTHX)
966{ 1211{
967 COP *oldcop = 0; 1212 COP *oldcop = 0;
968 int oldcxix = -2; 1213 int oldcxix = -2;
969 struct coro *coro = SvSTATE_current; /* trace cctx is tied to specific coro */
970 coro_cctx *cctx = coro->cctx;
971 1214
972 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX))) 1215 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX)))
973 { 1216 {
974 PERL_ASYNC_CHECK (); 1217 PERL_ASYNC_CHECK ();
975 1218
976 if (cctx->flags & CC_TRACE_ALL) 1219 if (cctx_current->flags & CC_TRACE_ALL)
977 { 1220 {
978 if (PL_op->op_type == OP_LEAVESUB && cctx->flags & CC_TRACE_SUB) 1221 if (PL_op->op_type == OP_LEAVESUB && cctx_current->flags & CC_TRACE_SUB)
979 { 1222 {
980 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1223 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
981 SV **bot, **top; 1224 SV **bot, **top;
982 AV *av = newAV (); /* return values */ 1225 AV *av = newAV (); /* return values */
983 SV **cb; 1226 SV **cb;
… …
1020 1263
1021 if (PL_curcop != &PL_compiling) 1264 if (PL_curcop != &PL_compiling)
1022 { 1265 {
1023 SV **cb; 1266 SV **cb;
1024 1267
1025 if (oldcxix != cxstack_ix && cctx->flags & CC_TRACE_SUB) 1268 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB)
1026 { 1269 {
1027 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1270 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1028 1271
1029 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1272 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1030 { 1273 {
… …
1053 } 1296 }
1054 1297
1055 oldcxix = cxstack_ix; 1298 oldcxix = cxstack_ix;
1056 } 1299 }
1057 1300
1058 if (cctx->flags & CC_TRACE_LINE) 1301 if (cctx_current->flags & CC_TRACE_LINE)
1059 { 1302 {
1060 dSP; 1303 dSP;
1061 1304
1062 PL_runops = RUNOPS_DEFAULT; 1305 PL_runops = RUNOPS_DEFAULT;
1063 ENTER; 1306 ENTER;
… …
1082 1325
1083 TAINT_NOT; 1326 TAINT_NOT;
1084 return 0; 1327 return 0;
1085} 1328}
1086 1329
1087static struct coro_cctx *cctx_ssl_cctx;
1088static struct CoroSLF cctx_ssl_frame; 1330static struct CoroSLF cctx_ssl_frame;
1089 1331
1090static void 1332static void
1091slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta) 1333slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta)
1092{ 1334{
1093 ta->prev = (struct coro *)cctx_ssl_cctx;
1094 ta->next = 0; 1335 ta->prev = 0;
1095} 1336}
1096 1337
1097static int 1338static int
1098slf_check_set_stacklevel (pTHX_ struct CoroSLF *frame) 1339slf_check_set_stacklevel (pTHX_ struct CoroSLF *frame)
1099{ 1340{
… …
1102 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1343 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1103} 1344}
1104 1345
1105/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1346/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1106static void NOINLINE 1347static void NOINLINE
1107cctx_prepare (pTHX_ coro_cctx *cctx) 1348cctx_prepare (pTHX)
1108{ 1349{
1109 PL_top_env = &PL_start_env; 1350 PL_top_env = &PL_start_env;
1110 1351
1111 if (cctx->flags & CC_TRACE) 1352 if (cctx_current->flags & CC_TRACE)
1112 PL_runops = runops_trace; 1353 PL_runops = runops_trace;
1113 1354
1114 /* we already must be executing an SLF op, there is no other valid way 1355 /* we already must be executing an SLF op, there is no other valid way
1115 * that can lead to creation of a new cctx */ 1356 * that can lead to creation of a new cctx */
1116 assert (("FATAL: can't prepare slf-less cctx in Coro module (please report)", 1357 assert (("FATAL: can't prepare slf-less cctx in Coro module (please report)",
1117 slf_frame.prepare && PL_op->op_ppaddr == pp_slf)); 1358 slf_frame.prepare && PL_op->op_ppaddr == pp_slf));
1118 1359
1119 /* we must emulate leaving pp_slf, which is done inside slf_check_set_stacklevel */ 1360 /* we must emulate leaving pp_slf, which is done inside slf_check_set_stacklevel */
1120 cctx_ssl_cctx = cctx;
1121 cctx_ssl_frame = slf_frame; 1361 cctx_ssl_frame = slf_frame;
1122 1362
1123 slf_frame.prepare = slf_prepare_set_stacklevel; 1363 slf_frame.prepare = slf_prepare_set_stacklevel;
1124 slf_frame.check = slf_check_set_stacklevel; 1364 slf_frame.check = slf_check_set_stacklevel;
1125} 1365}
… …
1148 /* normally we would need to skip the entersub here */ 1388 /* normally we would need to skip the entersub here */
1149 /* not doing so will re-execute it, which is exactly what we want */ 1389 /* not doing so will re-execute it, which is exactly what we want */
1150 /* PL_nop = PL_nop->op_next */ 1390 /* PL_nop = PL_nop->op_next */
1151 1391
1152 /* inject a fake subroutine call to cctx_init */ 1392 /* inject a fake subroutine call to cctx_init */
1153 cctx_prepare (aTHX_ (coro_cctx *)arg); 1393 cctx_prepare (aTHX);
1154 1394
1155 /* cctx_run is the alternative tail of transfer() */ 1395 /* cctx_run is the alternative tail of transfer() */
1156 transfer_tail (aTHX); 1396 transfer_tail (aTHX);
1157 1397
1158 /* somebody or something will hit me for both perl_run and PL_restartop */ 1398 /* somebody or something will hit me for both perl_run and PL_restartop */
1159 PL_restartop = PL_op; 1399 PL_restartop = PL_op;
1160 perl_run (PL_curinterp); 1400 perl_run (PL_curinterp);
1161 /* 1401 /*
1162 * Unfortunately, there is no way to get at the return values of the 1402 * Unfortunately, there is no way to get at the return values of the
1163 * coro body here, as perl_run destroys these 1403 * coro body here, as perl_run destroys these. Likewise, we cannot catch
1404 * runtime errors here, as this is just a random interpreter, not a thread.
1164 */ 1405 */
1165 1406
1166 /* 1407 /*
1167 * If perl-run returns we assume exit() was being called or the coro 1408 * If perl-run returns we assume exit() was being called or the coro
1168 * fell off the end, which seems to be the only valid (non-bug) 1409 * fell off the end, which seems to be the only valid (non-bug)
1169 * reason for perl_run to return. We try to exit by jumping to the 1410 * reason for perl_run to return. We try to exit by jumping to the
1170 * bootstrap-time "top" top_env, as we cannot restore the "main" 1411 * bootstrap-time "top" top_env, as we cannot restore the "main"
1171 * coroutine as Coro has no such concept 1412 * coroutine as Coro has no such concept.
1413 * This actually isn't valid with the pthread backend, but OSes requiring
1414 * that backend are too broken to do it in a standards-compliant way.
1172 */ 1415 */
1173 PL_top_env = main_top_env; 1416 PL_top_env = main_top_env;
1174 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */ 1417 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1175 } 1418 }
1176} 1419}
… …
1253cctx_destroy (coro_cctx *cctx) 1496cctx_destroy (coro_cctx *cctx)
1254{ 1497{
1255 if (!cctx) 1498 if (!cctx)
1256 return; 1499 return;
1257 1500
1501 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary?
1502
1258 --cctx_count; 1503 --cctx_count;
1259 coro_destroy (&cctx->cctx); 1504 coro_destroy (&cctx->cctx);
1260 1505
1261 /* coro_transfer creates new, empty cctx's */ 1506 /* coro_transfer creates new, empty cctx's */
1262 if (cctx->sptr) 1507 if (cctx->sptr)
… …
1325 /* TODO: throwing up here is considered harmful */ 1570 /* TODO: throwing up here is considered harmful */
1326 1571
1327 if (expect_true (prev != next)) 1572 if (expect_true (prev != next))
1328 { 1573 {
1329 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1574 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1330 croak ("Coro::State::transfer called with non-running/new prev Coro::State, but can only transfer from running or new states,"); 1575 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1331 1576
1332 if (expect_false (next->flags & CF_RUNNING))
1333 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states,");
1334
1335 if (expect_false (next->flags & CF_DESTROYED)) 1577 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED)))
1336 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states,"); 1578 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1337 1579
1338#if !PERL_VERSION_ATLEAST (5,10,0) 1580#if !PERL_VERSION_ATLEAST (5,10,0)
1339 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1581 if (expect_false (PL_lex_state != LEX_NOTPARSING))
1340 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,"); 1582 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1341#endif 1583#endif
… …
1347transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1589transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1348{ 1590{
1349 dSTACKLEVEL; 1591 dSTACKLEVEL;
1350 1592
1351 /* sometimes transfer is only called to set idle_sp */ 1593 /* sometimes transfer is only called to set idle_sp */
1352 if (expect_false (!next)) 1594 if (expect_false (!prev))
1353 { 1595 {
1354 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1596 cctx_current->idle_sp = STACKLEVEL;
1355 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1597 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1356 } 1598 }
1357 else if (expect_true (prev != next)) 1599 else if (expect_true (prev != next))
1358 { 1600 {
1359 coro_cctx *prev__cctx; 1601 coro_cctx *cctx_prev;
1360 1602
1361 if (expect_false (prev->flags & CF_NEW)) 1603 if (expect_false (prev->flags & CF_NEW))
1362 { 1604 {
1363 /* create a new empty/source context */ 1605 /* create a new empty/source context */
1364 prev->cctx = cctx_new_empty ();
1365 prev->flags &= ~CF_NEW; 1606 prev->flags &= ~CF_NEW;
1366 prev->flags |= CF_RUNNING; 1607 prev->flags |= CF_RUNNING;
1367 } 1608 }
1368 1609
1369 prev->flags &= ~CF_RUNNING; 1610 prev->flags &= ~CF_RUNNING;
… …
1375 if (expect_false (next->flags & CF_NEW)) 1616 if (expect_false (next->flags & CF_NEW))
1376 { 1617 {
1377 /* need to start coroutine */ 1618 /* need to start coroutine */
1378 next->flags &= ~CF_NEW; 1619 next->flags &= ~CF_NEW;
1379 /* setup coroutine call */ 1620 /* setup coroutine call */
1380 coro_setup (aTHX_ next); 1621 init_perl (aTHX_ next);
1381 } 1622 }
1382 else 1623 else
1383 load_perl (aTHX_ next); 1624 load_perl (aTHX_ next);
1384 1625
1385 prev__cctx = prev->cctx;
1386
1387 /* possibly untie and reuse the cctx */ 1626 /* possibly untie and reuse the cctx */
1388 if (expect_true ( 1627 if (expect_true (
1389 prev__cctx->idle_sp == STACKLEVEL 1628 cctx_current->idle_sp == STACKLEVEL
1390 && !(prev__cctx->flags & CC_TRACE) 1629 && !(cctx_current->flags & CC_TRACE)
1391 && !force_cctx 1630 && !force_cctx
1392 )) 1631 ))
1393 { 1632 {
1394 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1633 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */
1395 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == prev__cctx->idle_te)); 1634 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1396 1635
1397 prev->cctx = 0;
1398
1399 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */ 1636 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */
1400 /* without this the next cctx_get might destroy the prev__cctx while still in use */ 1637 /* without this the next cctx_get might destroy the running cctx while still in use */
1401 if (expect_false (CCTX_EXPIRED (prev__cctx))) 1638 if (expect_false (CCTX_EXPIRED (cctx_current)))
1402 if (!next->cctx) 1639 if (expect_true (!next->cctx))
1403 next->cctx = cctx_get (aTHX); 1640 next->cctx = cctx_get (aTHX);
1404 1641
1405 cctx_put (prev__cctx); 1642 cctx_put (cctx_current);
1406 } 1643 }
1644 else
1645 prev->cctx = cctx_current;
1407 1646
1408 ++next->usecount; 1647 ++next->usecount;
1409 1648
1410 if (expect_true (!next->cctx)) 1649 cctx_prev = cctx_current;
1411 next->cctx = cctx_get (aTHX); 1650 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1412 1651
1413 if (expect_false (prev__cctx != next->cctx)) 1652 next->cctx = 0;
1653
1654 if (expect_false (cctx_prev != cctx_current))
1414 { 1655 {
1415 prev__cctx->top_env = PL_top_env; 1656 cctx_prev->top_env = PL_top_env;
1416 PL_top_env = next->cctx->top_env; 1657 PL_top_env = cctx_current->top_env;
1417 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1658 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1418 } 1659 }
1419 1660
1420 transfer_tail (aTHX); 1661 transfer_tail (aTHX);
1421 } 1662 }
1422} 1663}
… …
1430coro_state_destroy (pTHX_ struct coro *coro) 1671coro_state_destroy (pTHX_ struct coro *coro)
1431{ 1672{
1432 if (coro->flags & CF_DESTROYED) 1673 if (coro->flags & CF_DESTROYED)
1433 return 0; 1674 return 0;
1434 1675
1435 if (coro->on_destroy) 1676 if (coro->on_destroy && !PL_dirty)
1436 coro->on_destroy (aTHX_ coro); 1677 coro->on_destroy (aTHX_ coro);
1437 1678
1438 coro->flags |= CF_DESTROYED; 1679 coro->flags |= CF_DESTROYED;
1439 1680
1440 if (coro->flags & CF_READY) 1681 if (coro->flags & CF_READY)
… …
1444 --coro_nready; 1685 --coro_nready;
1445 } 1686 }
1446 else 1687 else
1447 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1688 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1448 1689
1449 if (coro->mainstack && coro->mainstack != main_mainstack) 1690 if (coro->mainstack
1450 { 1691 && coro->mainstack != main_mainstack
1451 struct coro temp; 1692 && coro->slot
1452 1693 && !PL_dirty)
1453 assert (("FATAL: tried to destroy currently running coroutine (please report)", !(coro->flags & CF_RUNNING)));
1454
1455 save_perl (aTHX_ &temp);
1456 load_perl (aTHX_ coro); 1694 destroy_perl (aTHX_ coro);
1457 1695
1458 coro_destruct (aTHX_ coro); 1696 if (coro->next) coro->next->prev = coro->prev;
1459 1697 if (coro->prev) coro->prev->next = coro->next;
1460 load_perl (aTHX_ &temp); 1698 if (coro == coro_first) coro_first = coro->next;
1461
1462 coro->slot = 0;
1463 }
1464 1699
1465 cctx_destroy (coro->cctx); 1700 cctx_destroy (coro->cctx);
1466 SvREFCNT_dec (coro->startcv); 1701 SvREFCNT_dec (coro->startcv);
1467 SvREFCNT_dec (coro->args); 1702 SvREFCNT_dec (coro->args);
1703 SvREFCNT_dec (coro->swap_sv);
1468 SvREFCNT_dec (CORO_THROW); 1704 SvREFCNT_dec (CORO_THROW);
1469
1470 if (coro->next) coro->next->prev = coro->prev;
1471 if (coro->prev) coro->prev->next = coro->next;
1472 if (coro == coro_first) coro_first = coro->next;
1473 1705
1474 return 1; 1706 return 1;
1475} 1707}
1476 1708
1477static int 1709static int
… …
1527 1759
1528 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1760 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1529 TRANSFER (ta, 1); 1761 TRANSFER (ta, 1);
1530} 1762}
1531 1763
1532/*****************************************************************************/
1533/* gensub: simple closure generation utility */
1534
1535#define GENSUB_ARG CvXSUBANY (cv).any_ptr
1536
1537/* create a closure from XS, returns a code reference */
1538/* the arg can be accessed via GENSUB_ARG from the callback */
1539/* the callback must use dXSARGS/XSRETURN */
1540static SV *
1541gensub (pTHX_ void (*xsub)(pTHX_ CV *), void *arg)
1542{
1543 CV *cv = (CV *)newSV (0);
1544
1545 sv_upgrade ((SV *)cv, SVt_PVCV);
1546
1547 CvANON_on (cv);
1548 CvISXSUB_on (cv);
1549 CvXSUB (cv) = xsub;
1550 GENSUB_ARG = arg;
1551
1552 return newRV_noinc ((SV *)cv);
1553}
1554
1555/** Coro ********************************************************************/ 1764/** Coro ********************************************************************/
1556 1765
1557INLINE void 1766INLINE void
1558coro_enq (pTHX_ struct coro *coro) 1767coro_enq (pTHX_ struct coro *coro)
1559{ 1768{
1560 av_push (coro_ready [coro->prio - PRIO_MIN], SvREFCNT_inc_NN (coro->hv)); 1769 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1561}
1562 1770
1563INLINE SV * 1771 SvREFCNT_inc_NN (coro->hv);
1772
1773 coro->next_ready = 0;
1774 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1775 ready [1] = coro;
1776}
1777
1778INLINE struct coro *
1564coro_deq (pTHX) 1779coro_deq (pTHX)
1565{ 1780{
1566 int prio; 1781 int prio;
1567 1782
1568 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; ) 1783 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
1569 if (AvFILLp (coro_ready [prio]) >= 0) 1784 {
1570 return av_shift (coro_ready [prio]); 1785 struct coro **ready = coro_ready [prio];
1786
1787 if (ready [0])
1788 {
1789 struct coro *coro = ready [0];
1790 ready [0] = coro->next_ready;
1791 return coro;
1792 }
1793 }
1571 1794
1572 return 0; 1795 return 0;
1796}
1797
1798static void
1799invoke_sv_ready_hook_helper (void)
1800{
1801 dTHX;
1802 dSP;
1803
1804 ENTER;
1805 SAVETMPS;
1806
1807 PUSHMARK (SP);
1808 PUTBACK;
1809 call_sv (coro_readyhook, G_VOID | G_DISCARD);
1810
1811 FREETMPS;
1812 LEAVE;
1573} 1813}
1574 1814
1575static int 1815static int
1576api_ready (pTHX_ SV *coro_sv) 1816api_ready (pTHX_ SV *coro_sv)
1577{ 1817{
1578 struct coro *coro;
1579 SV *sv_hook;
1580 void (*xs_hook)(void);
1581
1582 if (SvROK (coro_sv))
1583 coro_sv = SvRV (coro_sv);
1584
1585 coro = SvSTATE (coro_sv); 1818 struct coro *coro = SvSTATE (coro_sv);
1586 1819
1587 if (coro->flags & CF_READY) 1820 if (coro->flags & CF_READY)
1588 return 0; 1821 return 0;
1589 1822
1590 coro->flags |= CF_READY; 1823 coro->flags |= CF_READY;
1591 1824
1592 sv_hook = coro_nready ? 0 : coro_readyhook;
1593 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1594
1595 coro_enq (aTHX_ coro); 1825 coro_enq (aTHX_ coro);
1596 ++coro_nready;
1597 1826
1598 if (sv_hook) 1827 if (!coro_nready++)
1599 { 1828 if (coroapi.readyhook)
1600 dSP; 1829 coroapi.readyhook ();
1601
1602 ENTER;
1603 SAVETMPS;
1604
1605 PUSHMARK (SP);
1606 PUTBACK;
1607 call_sv (sv_hook, G_VOID | G_DISCARD);
1608
1609 FREETMPS;
1610 LEAVE;
1611 }
1612
1613 if (xs_hook)
1614 xs_hook ();
1615 1830
1616 return 1; 1831 return 1;
1617} 1832}
1618 1833
1619static int 1834static int
… …
1642static void 1857static void
1643prepare_schedule (pTHX_ struct coro_transfer_args *ta) 1858prepare_schedule (pTHX_ struct coro_transfer_args *ta)
1644{ 1859{
1645 for (;;) 1860 for (;;)
1646 { 1861 {
1647 SV *next_sv = coro_deq (aTHX); 1862 struct coro *next = coro_deq (aTHX);
1648 1863
1649 if (expect_true (next_sv)) 1864 if (expect_true (next))
1650 { 1865 {
1651 struct coro *next = SvSTATE_hv (next_sv);
1652
1653 /* cannot transfer to destroyed coros, skip and look for next */ 1866 /* cannot transfer to destroyed coros, skip and look for next */
1654 if (expect_false (next->flags & CF_DESTROYED)) 1867 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED)))
1655 SvREFCNT_dec (next_sv); /* coro_nready has already been taken care of by destroy */ 1868 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1656 else 1869 else
1657 { 1870 {
1658 next->flags &= ~CF_READY; 1871 next->flags &= ~CF_READY;
1659 --coro_nready; 1872 --coro_nready;
1660 1873
… …
1663 } 1876 }
1664 } 1877 }
1665 else 1878 else
1666 { 1879 {
1667 /* nothing to schedule: call the idle handler */ 1880 /* nothing to schedule: call the idle handler */
1881 if (SvROK (sv_idle)
1882 && SvOBJECT (SvRV (sv_idle)))
1883 {
1884 if (SvRV (sv_idle) == SvRV (coro_current))
1885 croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught");
1886
1887 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1888 api_ready (aTHX_ SvRV (sv_idle));
1889 --coro_nready;
1890 }
1891 else
1892 {
1893 /* TODO: deprecated, remove, cannot work reliably *//*D*/
1668 dSP; 1894 dSP;
1669 1895
1670 ENTER; 1896 ENTER;
1671 SAVETMPS; 1897 SAVETMPS;
1672 1898
1673 PUSHMARK (SP); 1899 PUSHMARK (SP);
1674 PUTBACK; 1900 PUTBACK;
1675 call_sv (get_sv ("Coro::idle", FALSE), G_VOID | G_DISCARD); 1901 call_sv (sv_idle, G_VOID | G_DISCARD);
1676 1902
1677 FREETMPS; 1903 FREETMPS;
1678 LEAVE; 1904 LEAVE;
1905 }
1679 } 1906 }
1680 } 1907 }
1681} 1908}
1682 1909
1683INLINE void 1910INLINE void
… …
1754static void 1981static void
1755api_trace (pTHX_ SV *coro_sv, int flags) 1982api_trace (pTHX_ SV *coro_sv, int flags)
1756{ 1983{
1757 struct coro *coro = SvSTATE (coro_sv); 1984 struct coro *coro = SvSTATE (coro_sv);
1758 1985
1986 if (coro->flags & CF_RUNNING)
1987 croak ("cannot enable tracing on a running coroutine, caught");
1988
1759 if (flags & CC_TRACE) 1989 if (flags & CC_TRACE)
1760 { 1990 {
1761 if (!coro->cctx) 1991 if (!coro->cctx)
1762 coro->cctx = cctx_new_run (); 1992 coro->cctx = cctx_new_run ();
1763 else if (!(coro->cctx->flags & CC_TRACE)) 1993 else if (!(coro->cctx->flags & CC_TRACE))
1764 croak ("cannot enable tracing on coroutine with custom stack,"); 1994 croak ("cannot enable tracing on coroutine with custom stack, caught");
1765 1995
1766 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL)); 1996 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL));
1767 } 1997 }
1768 else if (coro->cctx && coro->cctx->flags & CC_TRACE) 1998 else if (coro->cctx && coro->cctx->flags & CC_TRACE)
1769 { 1999 {
… …
1814{ 2044{
1815 int i; 2045 int i;
1816 HV *hv = (HV *)SvRV (coro_current); 2046 HV *hv = (HV *)SvRV (coro_current);
1817 AV *av = newAV (); 2047 AV *av = newAV ();
1818 2048
2049 /* items are actually not so common, so optimise for this case */
2050 if (items)
2051 {
1819 av_extend (av, items - 1); 2052 av_extend (av, items - 1);
2053
1820 for (i = 0; i < items; ++i) 2054 for (i = 0; i < items; ++i)
1821 av_push (av, SvREFCNT_inc_NN (arg [i])); 2055 av_push (av, SvREFCNT_inc_NN (arg [i]));
2056 }
1822 2057
1823 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 2058 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0);
1824 2059
1825 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */ 2060 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */
1826 api_ready (aTHX_ sv_manager); 2061 api_ready (aTHX_ sv_manager);
1827 2062
1828 frame->prepare = prepare_schedule; 2063 frame->prepare = prepare_schedule;
1829 frame->check = slf_check_repeat; 2064 frame->check = slf_check_repeat;
2065
2066 /* as a minor optimisation, we could unwind all stacks here */
2067 /* but that puts extra pressure on pp_slf, and is not worth much */
2068 /*coro_unwind_stacks (aTHX);*/
1830} 2069}
1831 2070
1832/*****************************************************************************/ 2071/*****************************************************************************/
1833/* async pool handler */ 2072/* async pool handler */
1834 2073
… …
1912 2151
1913static void 2152static void
1914coro_rouse_callback (pTHX_ CV *cv) 2153coro_rouse_callback (pTHX_ CV *cv)
1915{ 2154{
1916 dXSARGS; 2155 dXSARGS;
1917 SV *data = (SV *)GENSUB_ARG; 2156 SV *data = (SV *)S_GENSUB_ARG;
1918 2157
1919 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2158 if (SvTYPE (SvRV (data)) != SVt_PVAV)
1920 { 2159 {
1921 /* first call, set args */ 2160 /* first call, set args */
2161 SV *coro = SvRV (data);
1922 AV *av = newAV (); 2162 AV *av = newAV ();
1923 SV *coro = SvRV (data);
1924 2163
1925 SvRV_set (data, (SV *)av); 2164 SvRV_set (data, (SV *)av);
1926 api_ready (aTHX_ coro);
1927 SvREFCNT_dec (coro);
1928 2165
1929 /* better take a full copy of the arguments */ 2166 /* better take a full copy of the arguments */
1930 while (items--) 2167 while (items--)
1931 av_store (av, items, newSVsv (ST (items))); 2168 av_store (av, items, newSVsv (ST (items)));
2169
2170 api_ready (aTHX_ coro);
2171 SvREFCNT_dec (coro);
1932 } 2172 }
1933 2173
1934 XSRETURN_EMPTY; 2174 XSRETURN_EMPTY;
1935} 2175}
1936 2176
… …
1953 2193
1954 EXTEND (SP, AvFILLp (av) + 1); 2194 EXTEND (SP, AvFILLp (av) + 1);
1955 for (i = 0; i <= AvFILLp (av); ++i) 2195 for (i = 0; i <= AvFILLp (av); ++i)
1956 PUSHs (sv_2mortal (AvARRAY (av)[i])); 2196 PUSHs (sv_2mortal (AvARRAY (av)[i]));
1957 2197
1958 /* we have stolen the elements, so ste length to zero and free */ 2198 /* we have stolen the elements, so set length to zero and free */
1959 AvFILLp (av) = -1; 2199 AvFILLp (av) = -1;
1960 av_undef (av); 2200 av_undef (av);
1961 2201
1962 PUTBACK; 2202 PUTBACK;
1963 } 2203 }
… …
1987 || SvTYPE (SvRV (cb)) != SVt_PVCV 2227 || SvTYPE (SvRV (cb)) != SVt_PVCV
1988 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2228 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
1989 croak ("Coro::rouse_wait called with illegal callback argument,"); 2229 croak ("Coro::rouse_wait called with illegal callback argument,");
1990 2230
1991 { 2231 {
1992 CV *cv = (CV *)SvRV (cb); /* for GENSUB_ARG */ 2232 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
1993 SV *data = (SV *)GENSUB_ARG; 2233 SV *data = (SV *)S_GENSUB_ARG;
1994 2234
1995 frame->data = (void *)data; 2235 frame->data = (void *)data;
1996 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule; 2236 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
1997 frame->check = slf_check_rouse_wait; 2237 frame->check = slf_check_rouse_wait;
1998 } 2238 }
… …
2002coro_new_rouse_cb (pTHX) 2242coro_new_rouse_cb (pTHX)
2003{ 2243{
2004 HV *hv = (HV *)SvRV (coro_current); 2244 HV *hv = (HV *)SvRV (coro_current);
2005 struct coro *coro = SvSTATE_hv (hv); 2245 struct coro *coro = SvSTATE_hv (hv);
2006 SV *data = newRV_inc ((SV *)hv); 2246 SV *data = newRV_inc ((SV *)hv);
2007 SV *cb = gensub (aTHX_ coro_rouse_callback, (void *)data); 2247 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
2008 2248
2009 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0); 2249 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0);
2010 SvREFCNT_dec (data); /* magicext increases the refcount */ 2250 SvREFCNT_dec (data); /* magicext increases the refcount */
2011 2251
2012 SvREFCNT_dec (coro->rouse_cb); 2252 SvREFCNT_dec (coro->rouse_cb);
… …
2237 if (PL_op->op_flags & OPf_STACKED) 2477 if (PL_op->op_flags & OPf_STACKED)
2238 { 2478 {
2239 if (items > slf_arga) 2479 if (items > slf_arga)
2240 { 2480 {
2241 slf_arga = items; 2481 slf_arga = items;
2242 free (slf_argv); 2482 Safefree (slf_argv);
2243 slf_argv = malloc (slf_arga * sizeof (SV *)); 2483 New (0, slf_argv, slf_arga, SV *);
2244 } 2484 }
2245 2485
2246 slf_argc = items; 2486 slf_argc = items;
2247 2487
2248 for (i = 0; i < items; ++i) 2488 for (i = 0; i < items; ++i)
… …
2250 } 2490 }
2251 else 2491 else
2252 slf_argc = 0; 2492 slf_argc = 0;
2253 2493
2254 PL_op->op_ppaddr = pp_slf; 2494 PL_op->op_ppaddr = pp_slf;
2255 PL_op->op_type = OP_CUSTOM; /* maybe we should leave it at entersub? */ 2495 /*PL_op->op_type = OP_CUSTOM; /* we do behave like entersub still */
2256 2496
2257 PL_op = (OP *)&slf_restore; 2497 PL_op = (OP *)&slf_restore;
2498}
2499
2500/*****************************************************************************/
2501/* dynamic wind */
2502
2503static void
2504on_enterleave_call (pTHX_ SV *cb)
2505{
2506 dSP;
2507
2508 PUSHSTACK;
2509
2510 PUSHMARK (SP);
2511 PUTBACK;
2512 call_sv (cb, G_VOID | G_DISCARD);
2513 SPAGAIN;
2514
2515 POPSTACK;
2516}
2517
2518static SV *
2519coro_avp_pop_and_free (pTHX_ AV **avp)
2520{
2521 AV *av = *avp;
2522 SV *res = av_pop (av);
2523
2524 if (AvFILLp (av) < 0)
2525 {
2526 *avp = 0;
2527 SvREFCNT_dec (av);
2528 }
2529
2530 return res;
2531}
2532
2533static void
2534coro_pop_on_enter (pTHX_ void *coro)
2535{
2536 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_enter);
2537 SvREFCNT_dec (cb);
2538}
2539
2540static void
2541coro_pop_on_leave (pTHX_ void *coro)
2542{
2543 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2544 on_enterleave_call (aTHX_ sv_2mortal (cb));
2258} 2545}
2259 2546
2260/*****************************************************************************/ 2547/*****************************************************************************/
2261/* PerlIO::cede */ 2548/* PerlIO::cede */
2262 2549
… …
2336/* Coro::Semaphore & Coro::Signal */ 2623/* Coro::Semaphore & Coro::Signal */
2337 2624
2338static SV * 2625static SV *
2339coro_waitarray_new (pTHX_ int count) 2626coro_waitarray_new (pTHX_ int count)
2340{ 2627{
2341 /* a semaphore contains a counter IV in $sem->[0] and any waiters after that */ 2628 /* a waitarray=semaphore contains a counter IV in $sem->[0] and any waiters after that */
2342 AV *av = newAV (); 2629 AV *av = newAV ();
2343 SV **ary; 2630 SV **ary;
2344 2631
2345 /* unfortunately, building manually saves memory */ 2632 /* unfortunately, building manually saves memory */
2346 Newx (ary, 2, SV *); 2633 Newx (ary, 2, SV *);
2347 AvALLOC (av) = ary; 2634 AvALLOC (av) = ary;
2635#if PERL_VERSION_ATLEAST (5,10,0)
2348 /*AvARRAY (av) = ary;*/ 2636 AvARRAY (av) = ary;
2637#else
2349 SvPVX ((SV *)av) = (char *)ary; /* 5.8.8 needs this syntax instead of AvARRAY = ary */ 2638 /* 5.8.8 needs this syntax instead of AvARRAY = ary, yet */
2639 /* -DDEBUGGING flags this as a bug, despite it perfectly working */
2640 SvPVX ((SV *)av) = (char *)ary;
2641#endif
2350 AvMAX (av) = 1; 2642 AvMAX (av) = 1;
2351 AvFILLp (av) = 0; 2643 AvFILLp (av) = 0;
2352 ary [0] = newSViv (count); 2644 ary [0] = newSViv (count);
2353 2645
2354 return newRV_noinc ((SV *)av); 2646 return newRV_noinc ((SV *)av);
… …
2483{ 2775{
2484 if (items >= 2) 2776 if (items >= 2)
2485 { 2777 {
2486 /* callback form */ 2778 /* callback form */
2487 AV *av = (AV *)SvRV (arg [0]); 2779 AV *av = (AV *)SvRV (arg [0]);
2488 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 2780 SV *cb_cv = s_get_cv_croak (arg [1]);
2489 2781
2490 av_push (av, (SV *)SvREFCNT_inc_NN (cb_cv)); 2782 av_push (av, SvREFCNT_inc_NN (cb_cv));
2491 2783
2492 if (SvIVX (AvARRAY (av)[0]) > 0) 2784 if (SvIVX (AvARRAY (av)[0]) > 0)
2493 coro_semaphore_adjust (aTHX_ av, 0); 2785 coro_semaphore_adjust (aTHX_ av, 0);
2494 2786
2495 frame->prepare = prepare_nop; 2787 frame->prepare = prepare_nop;
… …
2519 AvARRAY (av)[0] = AvARRAY (av)[1]; 2811 AvARRAY (av)[0] = AvARRAY (av)[1];
2520 AvARRAY (av)[1] = cb; 2812 AvARRAY (av)[1] = cb;
2521 2813
2522 cb = av_shift (av); 2814 cb = av_shift (av);
2523 2815
2816 if (SvTYPE (cb) == SVt_PVCV)
2817 {
2818 dSP;
2819 PUSHMARK (SP);
2820 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2821 PUTBACK;
2822 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2823 }
2824 else
2825 {
2524 api_ready (aTHX_ cb); 2826 api_ready (aTHX_ cb);
2525 sv_setiv (cb, 0); /* signal waiter */ 2827 sv_setiv (cb, 0); /* signal waiter */
2828 }
2829
2526 SvREFCNT_dec (cb); 2830 SvREFCNT_dec (cb);
2527 2831
2528 --count; 2832 --count;
2529 } 2833 }
2530} 2834}
… …
2539static void 2843static void
2540slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2844slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2541{ 2845{
2542 AV *av = (AV *)SvRV (arg [0]); 2846 AV *av = (AV *)SvRV (arg [0]);
2543 2847
2848 if (items >= 2)
2849 {
2850 SV *cb_cv = s_get_cv_croak (arg [1]);
2851 av_push (av, SvREFCNT_inc_NN (cb_cv));
2852
2544 if (SvIVX (AvARRAY (av)[0])) 2853 if (SvIVX (AvARRAY (av)[0]))
2854 coro_signal_wake (aTHX_ av, 1); /* must be the only waiter */
2855
2856 frame->prepare = prepare_nop;
2857 frame->check = slf_check_nop;
2858 }
2859 else if (SvIVX (AvARRAY (av)[0]))
2545 { 2860 {
2546 SvIVX (AvARRAY (av)[0]) = 0; 2861 SvIVX (AvARRAY (av)[0]) = 0;
2547 frame->prepare = prepare_nop; 2862 frame->prepare = prepare_nop;
2548 frame->check = slf_check_nop; 2863 frame->check = slf_check_nop;
2549 } 2864 }
2550 else 2865 else
2551 { 2866 {
2552 SV *waiter = newRV_inc (SvRV (coro_current)); /* owned by signal av */ 2867 SV *waiter = newSVsv (coro_current); /* owned by signal av */
2553 2868
2554 av_push (av, waiter); 2869 av_push (av, waiter);
2555 2870
2556 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */ 2871 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */
2557 frame->prepare = prepare_schedule; 2872 frame->prepare = prepare_schedule;
… …
2575 2890
2576static void 2891static void
2577coro_aio_callback (pTHX_ CV *cv) 2892coro_aio_callback (pTHX_ CV *cv)
2578{ 2893{
2579 dXSARGS; 2894 dXSARGS;
2580 AV *state = (AV *)GENSUB_ARG; 2895 AV *state = (AV *)S_GENSUB_ARG;
2581 SV *coro = av_pop (state); 2896 SV *coro = av_pop (state);
2582 SV *data_sv = newSV (sizeof (struct io_state)); 2897 SV *data_sv = newSV (sizeof (struct io_state));
2583 2898
2584 av_extend (state, items - 1); 2899 av_extend (state, items - 1);
2585 2900
… …
2699 3014
2700 for (i = 0; i < items; ++i) 3015 for (i = 0; i < items; ++i)
2701 PUSHs (arg [i]); 3016 PUSHs (arg [i]);
2702 3017
2703 /* now push the callback closure */ 3018 /* now push the callback closure */
2704 PUSHs (sv_2mortal (gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state)))); 3019 PUSHs (sv_2mortal (s_gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state))));
2705 3020
2706 /* now call the AIO function - we assume our request is uncancelable */ 3021 /* now call the AIO function - we assume our request is uncancelable */
2707 PUTBACK; 3022 PUTBACK;
2708 call_sv ((SV *)req, G_VOID | G_DISCARD); 3023 call_sv ((SV *)req, G_VOID | G_DISCARD);
2709 } 3024 }
2710 3025
2711 /* now that the requets is going, we loop toll we have a result */ 3026 /* now that the request is going, we loop till we have a result */
2712 frame->data = (void *)state; 3027 frame->data = (void *)state;
2713 frame->prepare = prepare_schedule; 3028 frame->prepare = prepare_schedule;
2714 frame->check = slf_check_aio_req; 3029 frame->check = slf_check_aio_req;
2715} 3030}
2716 3031
… …
2723 3038
2724 XSRETURN_EMPTY; 3039 XSRETURN_EMPTY;
2725} 3040}
2726 3041
2727/*****************************************************************************/ 3042/*****************************************************************************/
3043
3044#if CORO_CLONE
3045# include "clone.c"
3046#endif
3047
3048/*****************************************************************************/
3049
3050static SV *
3051coro_new (pTHX_ HV *stash, SV **argv, int argc, int is_coro)
3052{
3053 SV *coro_sv;
3054 struct coro *coro;
3055 MAGIC *mg;
3056 HV *hv;
3057 SV *cb;
3058 int i;
3059
3060 if (argc > 0)
3061 {
3062 cb = s_get_cv_croak (argv [0]);
3063
3064 if (!is_coro)
3065 {
3066 if (CvISXSUB (cb))
3067 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
3068
3069 if (!CvROOT (cb))
3070 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
3071 }
3072 }
3073
3074 Newz (0, coro, 1, struct coro);
3075 coro->args = newAV ();
3076 coro->flags = CF_NEW;
3077
3078 if (coro_first) coro_first->prev = coro;
3079 coro->next = coro_first;
3080 coro_first = coro;
3081
3082 coro->hv = hv = newHV ();
3083 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
3084 mg->mg_flags |= MGf_DUP;
3085 coro_sv = sv_bless (newRV_noinc ((SV *)hv), stash);
3086
3087 if (argc > 0)
3088 {
3089 av_extend (coro->args, argc + is_coro - 1);
3090
3091 if (is_coro)
3092 {
3093 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
3094 cb = (SV *)cv_coro_run;
3095 }
3096
3097 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3098
3099 for (i = 1; i < argc; i++)
3100 av_push (coro->args, newSVsv (argv [i]));
3101 }
3102
3103 return coro_sv;
3104}
2728 3105
2729MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3106MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2730 3107
2731PROTOTYPES: DISABLE 3108PROTOTYPES: DISABLE
2732 3109
… …
2737 coro_thx = PERL_GET_CONTEXT; 3114 coro_thx = PERL_GET_CONTEXT;
2738# endif 3115# endif
2739#endif 3116#endif
2740 BOOT_PAGESIZE; 3117 BOOT_PAGESIZE;
2741 3118
3119 cctx_current = cctx_new_empty ();
3120
2742 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3121 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
2743 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3122 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
2744 3123
2745 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 3124 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get;
2746 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set; 3125 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set;
… …
2783 coroapi.prepare_nop = prepare_nop; 3162 coroapi.prepare_nop = prepare_nop;
2784 coroapi.prepare_schedule = prepare_schedule; 3163 coroapi.prepare_schedule = prepare_schedule;
2785 coroapi.prepare_cede = prepare_cede; 3164 coroapi.prepare_cede = prepare_cede;
2786 coroapi.prepare_cede_notself = prepare_cede_notself; 3165 coroapi.prepare_cede_notself = prepare_cede_notself;
2787 3166
2788 { 3167 time_init (aTHX);
2789 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
2790 3168
2791 if (!svp) croak ("Time::HiRes is required");
2792 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
2793
2794 nvtime = INT2PTR (double (*)(), SvIV (*svp));
2795 }
2796
2797 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 3169 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
2798} 3170}
2799 3171
2800SV * 3172SV *
2801new (char *klass, ...) 3173new (SV *klass, ...)
2802 ALIAS: 3174 ALIAS:
2803 Coro::new = 1 3175 Coro::new = 1
2804 CODE: 3176 CODE:
2805{ 3177 RETVAL = coro_new (aTHX_ ix ? coro_stash : coro_state_stash, &ST (1), items - 1, ix);
2806 struct coro *coro; 3178 OUTPUT:
2807 MAGIC *mg;
2808 HV *hv;
2809 CV *cb;
2810 int i;
2811
2812 if (items > 1)
2813 {
2814 cb = coro_sv_2cv (aTHX_ ST (1));
2815
2816 if (!ix)
2817 {
2818 if (CvISXSUB (cb))
2819 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
2820
2821 if (!CvROOT (cb))
2822 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
2823 }
2824 }
2825
2826 Newz (0, coro, 1, struct coro);
2827 coro->args = newAV ();
2828 coro->flags = CF_NEW;
2829
2830 if (coro_first) coro_first->prev = coro;
2831 coro->next = coro_first;
2832 coro_first = coro;
2833
2834 coro->hv = hv = newHV ();
2835 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
2836 mg->mg_flags |= MGf_DUP;
2837 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
2838
2839 if (items > 1)
2840 {
2841 av_extend (coro->args, items - 1 + ix - 1);
2842
2843 if (ix)
2844 {
2845 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
2846 cb = cv_coro_run;
2847 }
2848
2849 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
2850
2851 for (i = 2; i < items; i++)
2852 av_push (coro->args, newSVsv (ST (i)));
2853 }
2854}
2855 OUTPUT:
2856 RETVAL 3179 RETVAL
2857 3180
2858void 3181void
2859transfer (...) 3182transfer (...)
2860 PROTOTYPE: $$ 3183 PROTOTYPE: $$
… …
2871void 3194void
2872_exit (int code) 3195_exit (int code)
2873 PROTOTYPE: $ 3196 PROTOTYPE: $
2874 CODE: 3197 CODE:
2875 _exit (code); 3198 _exit (code);
3199
3200SV *
3201clone (Coro::State coro)
3202 CODE:
3203{
3204#if CORO_CLONE
3205 struct coro *ncoro = coro_clone (aTHX_ coro);
3206 MAGIC *mg;
3207 /* TODO: too much duplication */
3208 ncoro->hv = newHV ();
3209 mg = sv_magicext ((SV *)ncoro->hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)ncoro, 0);
3210 mg->mg_flags |= MGf_DUP;
3211 RETVAL = sv_bless (newRV_noinc ((SV *)ncoro->hv), SvSTASH (coro->hv));
3212#else
3213 croak ("Coro::State->clone has not been configured into this installation of Coro, realised");
3214#endif
3215}
3216 OUTPUT:
3217 RETVAL
2876 3218
2877int 3219int
2878cctx_stacksize (int new_stacksize = 0) 3220cctx_stacksize (int new_stacksize = 0)
2879 PROTOTYPE: ;$ 3221 PROTOTYPE: ;$
2880 CODE: 3222 CODE:
… …
2930 eval = 1 3272 eval = 1
2931 CODE: 3273 CODE:
2932{ 3274{
2933 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3275 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
2934 { 3276 {
2935 struct coro temp; 3277 struct coro *current = SvSTATE_current;
2936 3278
2937 if (!(coro->flags & CF_RUNNING)) 3279 if (current != coro)
2938 { 3280 {
2939 PUTBACK; 3281 PUTBACK;
2940 save_perl (aTHX_ &temp); 3282 save_perl (aTHX_ current);
2941 load_perl (aTHX_ coro); 3283 load_perl (aTHX_ coro);
3284 SPAGAIN;
2942 } 3285 }
2943 3286
2944 {
2945 dSP;
2946 ENTER;
2947 SAVETMPS;
2948 PUTBACK;
2949 PUSHSTACK; 3287 PUSHSTACK;
3288
2950 PUSHMARK (SP); 3289 PUSHMARK (SP);
3290 PUTBACK;
2951 3291
2952 if (ix) 3292 if (ix)
2953 eval_sv (coderef, 0); 3293 eval_sv (coderef, 0);
2954 else 3294 else
2955 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 3295 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
2956 3296
2957 POPSTACK; 3297 POPSTACK;
2958 SPAGAIN; 3298 SPAGAIN;
2959 FREETMPS;
2960 LEAVE;
2961 PUTBACK;
2962 }
2963 3299
2964 if (!(coro->flags & CF_RUNNING)) 3300 if (current != coro)
2965 { 3301 {
3302 PUTBACK;
2966 save_perl (aTHX_ coro); 3303 save_perl (aTHX_ coro);
2967 load_perl (aTHX_ &temp); 3304 load_perl (aTHX_ current);
2968 SPAGAIN; 3305 SPAGAIN;
2969 } 3306 }
2970 } 3307 }
2971} 3308}
2972 3309
… …
2976 ALIAS: 3313 ALIAS:
2977 is_ready = CF_READY 3314 is_ready = CF_READY
2978 is_running = CF_RUNNING 3315 is_running = CF_RUNNING
2979 is_new = CF_NEW 3316 is_new = CF_NEW
2980 is_destroyed = CF_DESTROYED 3317 is_destroyed = CF_DESTROYED
3318 is_suspended = CF_SUSPENDED
2981 CODE: 3319 CODE:
2982 RETVAL = boolSV (coro->flags & ix); 3320 RETVAL = boolSV (coro->flags & ix);
2983 OUTPUT: 3321 OUTPUT:
2984 RETVAL 3322 RETVAL
2985 3323
2986void 3324void
2987throw (Coro::State self, SV *throw = &PL_sv_undef) 3325throw (Coro::State self, SV *exception = &PL_sv_undef)
2988 PROTOTYPE: $;$ 3326 PROTOTYPE: $;$
2989 CODE: 3327 CODE:
2990{ 3328{
2991 struct coro *current = SvSTATE_current; 3329 struct coro *current = SvSTATE_current;
2992 SV **throwp = self == current ? &CORO_THROW : &self->except; 3330 SV **exceptionp = self == current ? &CORO_THROW : &self->except;
2993 SvREFCNT_dec (*throwp); 3331 SvREFCNT_dec (*exceptionp);
2994 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3332 SvGETMAGIC (exception);
3333 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
2995} 3334}
2996 3335
2997void 3336void
2998api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3337api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
2999 PROTOTYPE: $;$ 3338 PROTOTYPE: $;$
… …
3001 3340
3002SV * 3341SV *
3003has_cctx (Coro::State coro) 3342has_cctx (Coro::State coro)
3004 PROTOTYPE: $ 3343 PROTOTYPE: $
3005 CODE: 3344 CODE:
3006 RETVAL = boolSV (!!coro->cctx); 3345 /* maybe manage the running flag differently */
3346 RETVAL = boolSV (!!coro->cctx || (coro->flags & CF_RUNNING));
3007 OUTPUT: 3347 OUTPUT:
3008 RETVAL 3348 RETVAL
3009 3349
3010int 3350int
3011is_traced (Coro::State coro) 3351is_traced (Coro::State coro)
… …
3031 3371
3032void 3372void
3033force_cctx () 3373force_cctx ()
3034 PROTOTYPE: 3374 PROTOTYPE:
3035 CODE: 3375 CODE:
3036 SvSTATE_current->cctx->idle_sp = 0; 3376 cctx_current->idle_sp = 0;
3037 3377
3038void 3378void
3039swap_defsv (Coro::State self) 3379swap_defsv (Coro::State self)
3040 PROTOTYPE: $ 3380 PROTOTYPE: $
3041 ALIAS: 3381 ALIAS:
… …
3049 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv; 3389 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
3050 3390
3051 SV *tmp = *src; *src = *dst; *dst = tmp; 3391 SV *tmp = *src; *src = *dst; *dst = tmp;
3052 } 3392 }
3053 3393
3394void
3395cancel (Coro::State self)
3396 CODE:
3397 coro_state_destroy (aTHX_ self);
3398 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */
3399
3400
3401SV *
3402enable_times (int enabled = enable_times)
3403 CODE:
3404{
3405 RETVAL = boolSV (enable_times);
3406
3407 if (enabled != enable_times)
3408 {
3409 enable_times = enabled;
3410
3411 coro_times_update ();
3412 (enabled ? coro_times_sub : coro_times_add)(SvSTATE (coro_current));
3413 }
3414}
3415 OUTPUT:
3416 RETVAL
3417
3418void
3419times (Coro::State self)
3420 PPCODE:
3421{
3422 struct coro *current = SvSTATE (coro_current);
3423
3424 if (expect_false (current == self))
3425 {
3426 coro_times_update ();
3427 coro_times_add (SvSTATE (coro_current));
3428 }
3429
3430 EXTEND (SP, 2);
3431 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3432 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3433
3434 if (expect_false (current == self))
3435 coro_times_sub (SvSTATE (coro_current));
3436}
3437
3438void
3439swap_sv (Coro::State coro, SV *sv, SV *swapsv)
3440 CODE:
3441{
3442 struct coro *current = SvSTATE_current;
3443
3444 if (current == coro)
3445 SWAP_SVS (current);
3446
3447 if (!coro->swap_sv)
3448 coro->swap_sv = newAV ();
3449
3450 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv )));
3451 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv)));
3452
3453 if (current == coro)
3454 SWAP_SVS (current);
3455}
3456
3054 3457
3055MODULE = Coro::State PACKAGE = Coro 3458MODULE = Coro::State PACKAGE = Coro
3056 3459
3057BOOT: 3460BOOT:
3058{ 3461{
3059 int i;
3060
3061 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3462 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3062 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3463 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3063 cv_coro_run = get_cv ( "Coro::_terminate", GV_ADD); 3464 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3064 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD); 3465 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3065 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 3466 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3066 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 3467 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3067 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 3468 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3068 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 3469 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3470 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3069 3471
3070 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3472 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3071 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3473 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3072 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 3474 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3073 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new); 3475 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3074 3476
3075 coro_stash = gv_stashpv ("Coro", TRUE); 3477 coro_stash = gv_stashpv ("Coro", TRUE);
3076 3478
3077 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 3479 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3078 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 3480 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3079 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 3481 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
3080 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 3482 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (CORO_PRIO_LOW));
3081 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE)); 3483 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (CORO_PRIO_IDLE));
3082 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN)); 3484 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (CORO_PRIO_MIN));
3083
3084 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
3085 coro_ready[i] = newAV ();
3086 3485
3087 { 3486 {
3088 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 3487 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
3089 3488
3090 coroapi.schedule = api_schedule; 3489 coroapi.schedule = api_schedule;
… …
3100 sv_setiv (sv, (IV)&coroapi); 3499 sv_setiv (sv, (IV)&coroapi);
3101 SvREADONLY_on (sv); 3500 SvREADONLY_on (sv);
3102 } 3501 }
3103} 3502}
3104 3503
3504SV *
3505async (...)
3506 PROTOTYPE: &@
3507 CODE:
3508 RETVAL = coro_new (aTHX_ coro_stash, &ST (0), items, 1);
3509 api_ready (aTHX_ RETVAL);
3510 OUTPUT:
3511 RETVAL
3512
3105void 3513void
3106terminate (...) 3514terminate (...)
3107 CODE: 3515 CODE:
3108 CORO_EXECUTE_SLF_XS (slf_init_terminate); 3516 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3109 3517
… …
3129 3537
3130void 3538void
3131cede_notself (...) 3539cede_notself (...)
3132 CODE: 3540 CODE:
3133 CORO_EXECUTE_SLF_XS (slf_init_cede_notself); 3541 CORO_EXECUTE_SLF_XS (slf_init_cede_notself);
3134
3135void
3136_cancel (Coro::State self)
3137 CODE:
3138 coro_state_destroy (aTHX_ self);
3139 coro_call_on_destroy (aTHX_ self);
3140 3542
3141void 3543void
3142_set_current (SV *current) 3544_set_current (SV *current)
3143 PROTOTYPE: $ 3545 PROTOTYPE: $
3144 CODE: 3546 CODE:
… …
3148void 3550void
3149_set_readyhook (SV *hook) 3551_set_readyhook (SV *hook)
3150 PROTOTYPE: $ 3552 PROTOTYPE: $
3151 CODE: 3553 CODE:
3152 SvREFCNT_dec (coro_readyhook); 3554 SvREFCNT_dec (coro_readyhook);
3555 SvGETMAGIC (hook);
3556 if (SvOK (hook))
3557 {
3153 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0; 3558 coro_readyhook = newSVsv (hook);
3559 CORO_READYHOOK = invoke_sv_ready_hook_helper;
3560 }
3561 else
3562 {
3563 coro_readyhook = 0;
3564 CORO_READYHOOK = 0;
3565 }
3154 3566
3155int 3567int
3156prio (Coro::State coro, int newprio = 0) 3568prio (Coro::State coro, int newprio = 0)
3157 PROTOTYPE: $;$ 3569 PROTOTYPE: $;$
3158 ALIAS: 3570 ALIAS:
… …
3164 if (items > 1) 3576 if (items > 1)
3165 { 3577 {
3166 if (ix) 3578 if (ix)
3167 newprio = coro->prio - newprio; 3579 newprio = coro->prio - newprio;
3168 3580
3169 if (newprio < PRIO_MIN) newprio = PRIO_MIN; 3581 if (newprio < CORO_PRIO_MIN) newprio = CORO_PRIO_MIN;
3170 if (newprio > PRIO_MAX) newprio = PRIO_MAX; 3582 if (newprio > CORO_PRIO_MAX) newprio = CORO_PRIO_MAX;
3171 3583
3172 coro->prio = newprio; 3584 coro->prio = newprio;
3173 } 3585 }
3174} 3586}
3175 OUTPUT: 3587 OUTPUT:
… …
3190 RETVAL = coro_nready; 3602 RETVAL = coro_nready;
3191 OUTPUT: 3603 OUTPUT:
3192 RETVAL 3604 RETVAL
3193 3605
3194void 3606void
3607suspend (Coro::State self)
3608 PROTOTYPE: $
3609 CODE:
3610 self->flags |= CF_SUSPENDED;
3611
3612void
3613resume (Coro::State self)
3614 PROTOTYPE: $
3615 CODE:
3616 self->flags &= ~CF_SUSPENDED;
3617
3618void
3195_pool_handler (...) 3619_pool_handler (...)
3196 CODE: 3620 CODE:
3197 CORO_EXECUTE_SLF_XS (slf_init_pool_handler); 3621 CORO_EXECUTE_SLF_XS (slf_init_pool_handler);
3198 3622
3199void 3623void
… …
3210 for (i = 1; i < items; ++i) 3634 for (i = 1; i < items; ++i)
3211 av_push (av, SvREFCNT_inc_NN (ST (i))); 3635 av_push (av, SvREFCNT_inc_NN (ST (i)));
3212 3636
3213 if ((SV *)hv == &PL_sv_undef) 3637 if ((SV *)hv == &PL_sv_undef)
3214 { 3638 {
3215 PUSHMARK (SP); 3639 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3216 EXTEND (SP, 2);
3217 PUSHs (sv_Coro);
3218 PUSHs ((SV *)cv_pool_handler);
3219 PUTBACK;
3220 call_sv ((SV *)cv_coro_state_new, G_SCALAR);
3221 SPAGAIN;
3222
3223 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs)); 3640 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
3641 SvREFCNT_dec (sv);
3224 } 3642 }
3225 3643
3226 { 3644 {
3227 struct coro *coro = SvSTATE_hv (hv); 3645 struct coro *coro = SvSTATE_hv (hv);
3228 3646
… …
3252rouse_wait (...) 3670rouse_wait (...)
3253 PROTOTYPE: ;$ 3671 PROTOTYPE: ;$
3254 PPCODE: 3672 PPCODE:
3255 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait); 3673 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait);
3256 3674
3675void
3676on_enter (SV *block)
3677 ALIAS:
3678 on_leave = 1
3679 PROTOTYPE: &
3680 CODE:
3681{
3682 struct coro *coro = SvSTATE_current;
3683 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3684
3685 block = s_get_cv_croak (block);
3686
3687 if (!*avp)
3688 *avp = newAV ();
3689
3690 av_push (*avp, SvREFCNT_inc (block));
3691
3692 if (!ix)
3693 on_enterleave_call (aTHX_ block);
3694
3695 LEAVE; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
3696 SAVEDESTRUCTOR_X (ix ? coro_pop_on_leave : coro_pop_on_enter, (void *)coro);
3697 ENTER; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
3698}
3699
3257 3700
3258MODULE = Coro::State PACKAGE = PerlIO::cede 3701MODULE = Coro::State PACKAGE = PerlIO::cede
3259 3702
3260BOOT: 3703BOOT:
3261 PerlIO_define_layer (aTHX_ &PerlIO_cede); 3704 PerlIO_define_layer (aTHX_ &PerlIO_cede);
… …
3264MODULE = Coro::State PACKAGE = Coro::Semaphore 3707MODULE = Coro::State PACKAGE = Coro::Semaphore
3265 3708
3266SV * 3709SV *
3267new (SV *klass, SV *count = 0) 3710new (SV *klass, SV *count = 0)
3268 CODE: 3711 CODE:
3712{
3713 int semcnt = 1;
3714
3715 if (count)
3716 {
3717 SvGETMAGIC (count);
3718
3719 if (SvOK (count))
3720 semcnt = SvIV (count);
3721 }
3722
3269 RETVAL = sv_bless ( 3723 RETVAL = sv_bless (
3270 coro_waitarray_new (aTHX_ count && SvOK (count) ? SvIV (count) : 1), 3724 coro_waitarray_new (aTHX_ semcnt),
3271 GvSTASH (CvGV (cv)) 3725 GvSTASH (CvGV (cv))
3272 ); 3726 );
3727}
3273 OUTPUT: 3728 OUTPUT:
3274 RETVAL 3729 RETVAL
3275 3730
3276# helper for Coro::Channel 3731# helper for Coro::Channel and others
3277SV * 3732SV *
3278_alloc (int count) 3733_alloc (int count)
3279 CODE: 3734 CODE:
3280 RETVAL = coro_waitarray_new (aTHX_ count); 3735 RETVAL = coro_waitarray_new (aTHX_ count);
3281 OUTPUT: 3736 OUTPUT:
… …
3339 for (i = 1; i <= wcount; ++i) 3794 for (i = 1; i <= wcount; ++i)
3340 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i]))); 3795 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i])));
3341 } 3796 }
3342} 3797}
3343 3798
3799MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3800
3801void
3802_may_delete (SV *sem, int count, int extra_refs)
3803 PPCODE:
3804{
3805 AV *av = (AV *)SvRV (sem);
3806
3807 if (SvREFCNT ((SV *)av) == 1 + extra_refs
3808 && AvFILLp (av) == 0 /* no waiters, just count */
3809 && SvIV (AvARRAY (av)[0]) == count)
3810 XSRETURN_YES;
3811
3812 XSRETURN_NO;
3813}
3814
3344MODULE = Coro::State PACKAGE = Coro::Signal 3815MODULE = Coro::State PACKAGE = Coro::Signal
3345 3816
3346SV * 3817SV *
3347new (SV *klass) 3818new (SV *klass)
3348 CODE: 3819 CODE:
… …
3419 3890
3420void 3891void
3421_register (char *target, char *proto, SV *req) 3892_register (char *target, char *proto, SV *req)
3422 CODE: 3893 CODE:
3423{ 3894{
3424 CV *req_cv = coro_sv_2cv (aTHX_ req); 3895 SV *req_cv = s_get_cv_croak (req);
3425 /* newXSproto doesn't return the CV on 5.8 */ 3896 /* newXSproto doesn't return the CV on 5.8 */
3426 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 3897 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3427 sv_setpv ((SV *)slf_cv, proto); 3898 sv_setpv ((SV *)slf_cv, proto);
3428 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0); 3899 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
3429} 3900}
3430 3901
3902MODULE = Coro::State PACKAGE = Coro::Select
3903
3904void
3905patch_pp_sselect ()
3906 CODE:
3907 if (!coro_old_pp_sselect)
3908 {
3909 coro_select_select = (SV *)get_cv ("Coro::Select::select", 0);
3910 coro_old_pp_sselect = PL_ppaddr [OP_SSELECT];
3911 PL_ppaddr [OP_SSELECT] = coro_pp_sselect;
3912 }
3913
3914void
3915unpatch_pp_sselect ()
3916 CODE:
3917 if (coro_old_pp_sselect)
3918 {
3919 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
3920 coro_old_pp_sselect = 0;
3921 }
3922

Diff Legend

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