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.313 by root, Thu Nov 20 03:22:59 2008 UTC vs.
Revision 1.395 by root, Fri May 6 07:22:14 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
17#ifdef WIN32 22#ifndef SVs_PADSTALE
23# define SVs_PADSTALE 0
24#endif
25
26#if defined(_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
104/* 5.8.7 */
105#ifndef SvRV_set
106# define SvRV_set(s,v) SvRV(s) = (v)
107#endif
108
109#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 66#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
110# undef CORO_STACKGUARD 67# undef CORO_STACKGUARD
111#endif 68#endif
112 69
113#ifndef CORO_STACKGUARD 70#ifndef CORO_STACKGUARD
… …
127#else 84#else
128# define dSTACKLEVEL volatile void *stacklevel 85# define dSTACKLEVEL volatile void *stacklevel
129# define STACKLEVEL ((void *)&stacklevel) 86# define STACKLEVEL ((void *)&stacklevel)
130#endif 87#endif
131 88
132#define IN_DESTRUCT (PL_main_cv == Nullcv) 89#define IN_DESTRUCT PL_dirty
133 90
134#if __GNUC__ >= 3 91#if __GNUC__ >= 3
135# define attribute(x) __attribute__(x) 92# define attribute(x) __attribute__(x)
136# define expect(expr,value) __builtin_expect ((expr),(value)) 93# define expect(expr,value) __builtin_expect ((expr), (value))
137# define INLINE static inline 94# define INLINE static inline
138#else 95#else
139# define attribute(x) 96# define attribute(x)
140# define expect(expr,value) (expr) 97# define expect(expr,value) (expr)
141# define INLINE static 98# define INLINE static
… …
153# if CORO_PTHREAD 110# if CORO_PTHREAD
154static void *coro_thx; 111static void *coro_thx;
155# endif 112# endif
156#endif 113#endif
157 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
158static 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]);
159 127
160/* we hijack an hopefully unused CV flag for our purposes */ 128/* we hijack an hopefully unused CV flag for our purposes */
161#define CVf_SLF 0x4000 129#define CVf_SLF 0x4000
162static OP *pp_slf (pTHX); 130static OP *pp_slf (pTHX);
163 131
… …
167static AV *main_mainstack; /* used to differentiate between $main and others */ 135static AV *main_mainstack; /* used to differentiate between $main and others */
168static JMPENV *main_top_env; 136static JMPENV *main_top_env;
169static HV *coro_state_stash, *coro_stash; 137static HV *coro_state_stash, *coro_stash;
170static volatile SV *coro_mortal; /* will be freed/thrown after next transfer */ 138static volatile SV *coro_mortal; /* will be freed/thrown after next transfer */
171 139
140static AV *av_destroy; /* destruction queue */
141static SV *sv_manager; /* the manager coro */
142static SV *sv_idle; /* $Coro::idle */
143
172static GV *irsgv; /* $/ */ 144static GV *irsgv; /* $/ */
173static GV *stdoutgv; /* *STDOUT */ 145static GV *stdoutgv; /* *STDOUT */
174static SV *rv_diehook; 146static SV *rv_diehook;
175static SV *rv_warnhook; 147static SV *rv_warnhook;
176static HV *hv_sig; /* %SIG */ 148static HV *hv_sig; /* %SIG */
177 149
178/* async_pool helper stuff */ 150/* async_pool helper stuff */
179static SV *sv_pool_rss; 151static SV *sv_pool_rss;
180static SV *sv_pool_size; 152static SV *sv_pool_size;
181static SV *sv_async_pool_idle; 153static SV *sv_async_pool_idle; /* description string */
182static AV *av_async_pool; 154static AV *av_async_pool; /* idle pool */
183static SV *sv_Coro; 155static SV *sv_Coro; /* class string */
184static CV *cv_pool_handler; 156static CV *cv_pool_handler;
185static CV *cv_coro_new;
186 157
187/* Coro::AnyEvent */ 158/* Coro::AnyEvent */
188static 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;
189 166
190static struct coro_cctx *cctx_first; 167static struct coro_cctx *cctx_first;
191static int cctx_count, cctx_idle; 168static int cctx_count, cctx_idle;
192 169
193enum { 170enum {
… …
219 int valgrind_id; 196 int valgrind_id;
220#endif 197#endif
221 unsigned char flags; 198 unsigned char flags;
222} coro_cctx; 199} coro_cctx;
223 200
201static coro_cctx *cctx_current; /* the currently running cctx */
202
203/*****************************************************************************/
204
224enum { 205enum {
225 CF_RUNNING = 0x0001, /* coroutine is running */ 206 CF_RUNNING = 0x0001, /* coroutine is running */
226 CF_READY = 0x0002, /* coroutine is ready */ 207 CF_READY = 0x0002, /* coroutine is ready */
227 CF_NEW = 0x0004, /* has never been switched to */ 208 CF_NEW = 0x0004, /* has never been switched to */
228 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 */
211 CF_NOCANCEL = 0x0020, /* cannot cancel, set slf_frame.data to 1 (hackish) */
229}; 212};
230 213
231/* the structure where most of the perl state is stored, overlaid on the cxstack */ 214/* the structure where most of the perl state is stored, overlaid on the cxstack */
232typedef struct 215typedef struct
233{ 216{
234 SV *defsv; 217 SV *defsv;
235 AV *defav; 218 AV *defav;
236 SV *errsv; 219 SV *errsv;
237 SV *irsgv; 220 SV *irsgv;
221 HV *hinthv;
238#define VAR(name,type) type name; 222#define VAR(name,type) type name;
239# include "state.h" 223# include "state.h"
240#undef VAR 224#undef VAR
241} perl_slots; 225} perl_slots;
242 226
… …
244 228
245/* this is a structure representing a perl-level coroutine */ 229/* this is a structure representing a perl-level coroutine */
246struct coro { 230struct coro {
247 /* the C coroutine allocated to this perl coroutine, if any */ 231 /* the C coroutine allocated to this perl coroutine, if any */
248 coro_cctx *cctx; 232 coro_cctx *cctx;
233
234 /* ready queue */
235 struct coro *next_ready;
249 236
250 /* state data */ 237 /* state data */
251 struct CoroSLF slf_frame; /* saved slf frame */ 238 struct CoroSLF slf_frame; /* saved slf frame */
252 AV *mainstack; 239 AV *mainstack;
253 perl_slots *slot; /* basically the saved sp */ 240 perl_slots *slot; /* basically the saved sp */
… …
255 CV *startcv; /* the CV to execute */ 242 CV *startcv; /* the CV to execute */
256 AV *args; /* data associated with this coroutine (initial args) */ 243 AV *args; /* data associated with this coroutine (initial args) */
257 int refcnt; /* coroutines are refcounted, yes */ 244 int refcnt; /* coroutines are refcounted, yes */
258 int flags; /* CF_ flags */ 245 int flags; /* CF_ flags */
259 HV *hv; /* the perl hash associated with this coro, if any */ 246 HV *hv; /* the perl hash associated with this coro, if any */
260 void (*on_destroy)(pTHX_ struct coro *coro); 247 void (*on_destroy)(pTHX_ struct coro *coro); /* for temporary use by xs in critical sections */
261 248
262 /* statistics */ 249 /* statistics */
263 int usecount; /* number of transfers to this coro */ 250 int usecount; /* number of transfers to this coro */
264 251
265 /* coro process data */ 252 /* coro process data */
… …
270 /* async_pool */ 257 /* async_pool */
271 SV *saved_deffh; 258 SV *saved_deffh;
272 SV *invoke_cb; 259 SV *invoke_cb;
273 AV *invoke_av; 260 AV *invoke_av;
274 261
262 /* on_enter/on_leave */
263 AV *on_enter;
264 AV *on_leave;
265
266 /* swap_sv */
267 AV *swap_sv;
268
269 /* times */
270 coro_ts t_cpu, t_real;
271
275 /* linked list */ 272 /* linked list */
276 struct coro *next, *prev; 273 struct coro *next, *prev;
277}; 274};
278 275
279typedef struct coro *Coro__State; 276typedef struct coro *Coro__State;
280typedef struct coro *Coro__State_or_hashref; 277typedef struct coro *Coro__State_or_hashref;
281 278
282/* the following variables are effectively part of the perl context */ 279/* the following variables are effectively part of the perl context */
283/* and get copied between struct coro and these variables */ 280/* and get copied between struct coro and these variables */
284/* the mainr easonw e don't support windows process emulation */ 281/* the main reason we don't support windows process emulation */
285static struct CoroSLF slf_frame; /* the current slf frame */ 282static struct CoroSLF slf_frame; /* the current slf frame */
286 283
287/** Coro ********************************************************************/ 284/** Coro ********************************************************************/
288 285
289#define PRIO_MAX 3 286#define CORO_PRIO_MAX 3
290#define PRIO_HIGH 1 287#define CORO_PRIO_HIGH 1
291#define PRIO_NORMAL 0 288#define CORO_PRIO_NORMAL 0
292#define PRIO_LOW -1 289#define CORO_PRIO_LOW -1
293#define PRIO_IDLE -3 290#define CORO_PRIO_IDLE -3
294#define PRIO_MIN -4 291#define CORO_PRIO_MIN -4
295 292
296/* for Coro.pm */ 293/* for Coro.pm */
297static SV *coro_current; 294static SV *coro_current;
298static SV *coro_readyhook; 295static SV *coro_readyhook;
299static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1]; 296static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
300static CV *cv_coro_run, *cv_coro_terminate; 297static CV *cv_coro_run, *cv_coro_terminate;
301static struct coro *coro_first; 298static struct coro *coro_first;
302#define coro_nready coroapi.nready 299#define coro_nready coroapi.nready
300
301/** Coro::Select ************************************************************/
302
303static OP *(*coro_old_pp_sselect) (pTHX);
304static SV *coro_select_select;
305
306/* horrible hack, but if it works... */
307static OP *
308coro_pp_sselect (pTHX)
309{
310 dSP;
311 PUSHMARK (SP - 4); /* fake argument list */
312 XPUSHs (coro_select_select);
313 PUTBACK;
314
315 /* entersub is an UNOP, select a LISTOP... keep your fingers crossed */
316 PL_op->op_flags |= OPf_STACKED;
317 PL_op->op_private = 0;
318 return PL_ppaddr [OP_ENTERSUB](aTHX);
319}
320
321/** time stuff **************************************************************/
322
323#ifdef HAS_GETTIMEOFDAY
324
325static void
326coro_u2time (pTHX_ UV ret[2])
327{
328 struct timeval tv;
329 gettimeofday (&tv, 0);
330
331 ret [0] = tv.tv_sec;
332 ret [1] = tv.tv_usec;
333}
334
335static double
336coro_nvtime ()
337{
338 struct timeval tv;
339 gettimeofday (&tv, 0);
340
341 return tv.tv_sec + tv.tv_usec * 1e-6;
342}
343
344static void
345time_init (pTHX)
346{
347 nvtime = coro_nvtime;
348 u2time = coro_u2time;
349}
350
351#else
352
353static void
354time_init (pTHX)
355{
356 SV **svp;
357
358 require_pv ("Time/HiRes.pm");
359
360 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
361
362 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
363 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught");
364
365 nvtime = INT2PTR (double (*)(), SvIV (*svp));
366
367 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
368 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
369}
370
371#endif
303 372
304/** lowlevel stuff **********************************************************/ 373/** lowlevel stuff **********************************************************/
305 374
306static SV * 375static SV *
307coro_get_sv (pTHX_ const char *name, int create) 376coro_get_sv (pTHX_ const char *name, int create)
… …
331 get_hv (name, create); 400 get_hv (name, create);
332#endif 401#endif
333 return get_hv (name, create); 402 return get_hv (name, create);
334} 403}
335 404
336/* may croak */ 405INLINE void
337INLINE CV * 406coro_times_update ()
338coro_sv_2cv (pTHX_ SV *sv)
339{ 407{
408#ifdef coro_clock_gettime
409 struct timespec ts;
410
411 ts.tv_sec = ts.tv_nsec = 0;
412 coro_clock_gettime (CORO_CLOCK_THREAD_CPUTIME_ID, &ts);
413 time_cpu [0] = ts.tv_sec; time_cpu [1] = ts.tv_nsec;
414
415 ts.tv_sec = ts.tv_nsec = 0;
416 coro_clock_gettime (CORO_CLOCK_MONOTONIC, &ts);
417 time_real [0] = ts.tv_sec; time_real [1] = ts.tv_nsec;
418#else
419 dTHX;
420 UV tv[2];
421
422 u2time (aTHX_ tv);
423 time_real [0] = tv [0];
424 time_real [1] = tv [1] * 1000;
425#endif
426}
427
428INLINE void
429coro_times_add (struct coro *c)
430{
431 c->t_real [1] += time_real [1];
432 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
433 c->t_real [0] += time_real [0];
434
435 c->t_cpu [1] += time_cpu [1];
436 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
437 c->t_cpu [0] += time_cpu [0];
438}
439
440INLINE void
441coro_times_sub (struct coro *c)
442{
443 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; }
444 c->t_real [1] -= time_real [1];
445 c->t_real [0] -= time_real [0];
446
447 if (c->t_cpu [1] < time_cpu [1]) { c->t_cpu [1] += 1000000000; --c->t_cpu [0]; }
448 c->t_cpu [1] -= time_cpu [1];
449 c->t_cpu [0] -= time_cpu [0];
450}
451
452/*****************************************************************************/
453/* magic glue */
454
455#define CORO_MAGIC_type_cv 26
456#define CORO_MAGIC_type_state PERL_MAGIC_ext
457
458#define CORO_MAGIC_NN(sv, type) \
459 (expect_true (SvMAGIC (sv)->mg_type == type) \
460 ? SvMAGIC (sv) \
461 : mg_find (sv, type))
462
463#define CORO_MAGIC(sv, type) \
464 (expect_true (SvMAGIC (sv)) \
465 ? CORO_MAGIC_NN (sv, type) \
466 : 0)
467
468#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
469#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
470
471INLINE struct coro *
472SvSTATE_ (pTHX_ SV *coro)
473{
340 HV *st; 474 HV *stash;
341 GV *gvp; 475 MAGIC *mg;
342 return sv_2cv (sv, &st, &gvp, 0); 476
477 if (SvROK (coro))
478 coro = SvRV (coro);
479
480 if (expect_false (SvTYPE (coro) != SVt_PVHV))
481 croak ("Coro::State object required");
482
483 stash = SvSTASH (coro);
484 if (expect_false (stash != coro_stash && stash != coro_state_stash))
485 {
486 /* very slow, but rare, check */
487 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
488 croak ("Coro::State object required");
489 }
490
491 mg = CORO_MAGIC_state (coro);
492 return (struct coro *)mg->mg_ptr;
343} 493}
494
495#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
496
497/* faster than SvSTATE, but expects a coroutine hv */
498#define SvSTATE_hv(hv) ((struct coro *)CORO_MAGIC_NN ((SV *)hv, CORO_MAGIC_type_state)->mg_ptr)
499#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
500
501/*****************************************************************************/
502/* padlist management and caching */
344 503
345static AV * 504static AV *
346coro_clone_padlist (pTHX_ CV *cv) 505coro_derive_padlist (pTHX_ CV *cv)
347{ 506{
348 AV *padlist = CvPADLIST (cv); 507 AV *padlist = CvPADLIST (cv);
349 AV *newpadlist, *newpad; 508 AV *newpadlist, *newpad;
350 509
351 newpadlist = newAV (); 510 newpadlist = newAV ();
… …
356 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 515 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
357#endif 516#endif
358 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 517 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
359 --AvFILLp (padlist); 518 --AvFILLp (padlist);
360 519
361 av_store (newpadlist, 0, SvREFCNT_inc_NN (*av_fetch (padlist, 0, FALSE))); 520 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0]));
362 av_store (newpadlist, 1, (SV *)newpad); 521 av_store (newpadlist, 1, (SV *)newpad);
363 522
364 return newpadlist; 523 return newpadlist;
365} 524}
366 525
367static void 526static void
368free_padlist (pTHX_ AV *padlist) 527free_padlist (pTHX_ AV *padlist)
369{ 528{
370 /* may be during global destruction */ 529 /* may be during global destruction */
371 if (SvREFCNT (padlist)) 530 if (!IN_DESTRUCT)
372 { 531 {
373 I32 i = AvFILLp (padlist); 532 I32 i = AvFILLp (padlist);
374 while (i >= 0) 533
534 while (i > 0) /* special-case index 0 */
375 { 535 {
376 SV **svp = av_fetch (padlist, i--, FALSE); 536 /* we try to be extra-careful here */
377 if (svp) 537 AV *av = (AV *)AvARRAY (padlist)[i--];
378 { 538 I32 j = AvFILLp (av);
379 SV *sv; 539
380 while (&PL_sv_undef != (sv = av_pop ((AV *)*svp))) 540 while (j >= 0)
541 SvREFCNT_dec (AvARRAY (av)[j--]);
542
543 AvFILLp (av) = -1;
381 SvREFCNT_dec (sv); 544 SvREFCNT_dec (av);
382
383 SvREFCNT_dec (*svp);
384 }
385 } 545 }
386 546
547 SvREFCNT_dec (AvARRAY (padlist)[0]);
548
549 AvFILLp (padlist) = -1;
387 SvREFCNT_dec ((SV*)padlist); 550 SvREFCNT_dec ((SV*)padlist);
388 } 551 }
389} 552}
390 553
391static int 554static int
392coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 555coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
393{ 556{
394 AV *padlist; 557 AV *padlist;
395 AV *av = (AV *)mg->mg_obj; 558 AV *av = (AV *)mg->mg_obj;
559
560 /* perl manages to free our internal AV and _then_ call us */
561 if (IN_DESTRUCT)
562 return 0;
396 563
397 /* casting is fun. */ 564 /* casting is fun. */
398 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 565 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
399 free_padlist (aTHX_ padlist); 566 free_padlist (aTHX_ padlist);
400 567
401 SvREFCNT_dec (av); /* sv_magicext increased the refcount */ 568 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
402 569
403 return 0; 570 return 0;
404} 571}
405
406#define CORO_MAGIC_type_cv 26
407#define CORO_MAGIC_type_state PERL_MAGIC_ext
408 572
409static MGVTBL coro_cv_vtbl = { 573static MGVTBL coro_cv_vtbl = {
410 0, 0, 0, 0, 574 0, 0, 0, 0,
411 coro_cv_free 575 coro_cv_free
412}; 576};
413
414#define CORO_MAGIC_NN(sv, type) \
415 (expect_true (SvMAGIC (sv)->mg_type == type) \
416 ? SvMAGIC (sv) \
417 : mg_find (sv, type))
418
419#define CORO_MAGIC(sv, type) \
420 (expect_true (SvMAGIC (sv)) \
421 ? CORO_MAGIC_NN (sv, type) \
422 : 0)
423
424#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
425#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
426
427INLINE struct coro *
428SvSTATE_ (pTHX_ SV *coro)
429{
430 HV *stash;
431 MAGIC *mg;
432
433 if (SvROK (coro))
434 coro = SvRV (coro);
435
436 if (expect_false (SvTYPE (coro) != SVt_PVHV))
437 croak ("Coro::State object required");
438
439 stash = SvSTASH (coro);
440 if (expect_false (stash != coro_stash && stash != coro_state_stash))
441 {
442 /* very slow, but rare, check */
443 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
444 croak ("Coro::State object required");
445 }
446
447 mg = CORO_MAGIC_state (coro);
448 return (struct coro *)mg->mg_ptr;
449}
450
451#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
452
453/* faster than SvSTATE, but expects a coroutine hv */
454#define SvSTATE_hv(hv) ((struct coro *)CORO_MAGIC_NN ((SV *)hv, CORO_MAGIC_type_state)->mg_ptr)
455#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
456 577
457/* the next two functions merely cache the padlists */ 578/* the next two functions merely cache the padlists */
458static void 579static void
459get_padlist (pTHX_ CV *cv) 580get_padlist (pTHX_ CV *cv)
460{ 581{
… …
471 CV *cp = Perl_cv_clone (aTHX_ cv); 592 CV *cp = Perl_cv_clone (aTHX_ cv);
472 CvPADLIST (cv) = CvPADLIST (cp); 593 CvPADLIST (cv) = CvPADLIST (cp);
473 CvPADLIST (cp) = 0; 594 CvPADLIST (cp) = 0;
474 SvREFCNT_dec (cp); 595 SvREFCNT_dec (cp);
475#else 596#else
476 CvPADLIST (cv) = coro_clone_padlist (aTHX_ cv); 597 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
477#endif 598#endif
478 } 599 }
479} 600}
480 601
481static void 602static void
… …
488 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 609 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
489 610
490 av = (AV *)mg->mg_obj; 611 av = (AV *)mg->mg_obj;
491 612
492 if (expect_false (AvFILLp (av) >= AvMAX (av))) 613 if (expect_false (AvFILLp (av) >= AvMAX (av)))
493 av_extend (av, AvMAX (av) + 1); 614 av_extend (av, AvFILLp (av) + 1);
494 615
495 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 616 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
496} 617}
497 618
498/** load & save, init *******************************************************/ 619/** load & save, init *******************************************************/
620
621/* swap sv heads, at least logically */
622static void
623swap_svs (pTHX_ Coro__State c)
624{
625 int i;
626
627 for (i = 0; i <= AvFILLp (c->swap_sv); )
628 {
629 SV *a = AvARRAY (c->swap_sv)[i++];
630 SV *b = AvARRAY (c->swap_sv)[i++];
631
632 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
633 SV tmp;
634
635 /* swap sv_any */
636 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
637
638 /* swap sv_flags */
639 SvFLAGS (&tmp) = SvFLAGS (a);
640 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
641 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
642
643#if PERL_VERSION_ATLEAST (5,10,0)
644 /* perl 5.10 complicates this _quite_ a bit, but it also is
645 * much faster, so no quarrels here. alternatively, we could
646 * sv_upgrade to avoid this.
647 */
648 {
649 /* swap sv_u */
650 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
651
652 /* if SvANY points to the head, we need to adjust the pointers,
653 * as the pointer for a still points to b, and maybe vice versa.
654 */
655 #define svany_in_head(type) \
656 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
657
658 if (svany_in_head (SvTYPE (a)))
659 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
660
661 if (svany_in_head (SvTYPE (b)))
662 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
663 }
664#endif
665 }
666}
667
668#define SWAP_SVS(coro) \
669 if (expect_false ((coro)->swap_sv)) \
670 swap_svs (aTHX_ (coro))
671
672static void
673on_enterleave_call (pTHX_ SV *cb);
499 674
500static void 675static void
501load_perl (pTHX_ Coro__State c) 676load_perl (pTHX_ Coro__State c)
502{ 677{
503 perl_slots *slot = c->slot; 678 perl_slots *slot = c->slot;
504 c->slot = 0; 679 c->slot = 0;
505 680
506 PL_mainstack = c->mainstack; 681 PL_mainstack = c->mainstack;
507 682
508 GvSV (PL_defgv) = slot->defsv; 683 GvSV (PL_defgv) = slot->defsv;
509 GvAV (PL_defgv) = slot->defav; 684 GvAV (PL_defgv) = slot->defav;
510 GvSV (PL_errgv) = slot->errsv; 685 GvSV (PL_errgv) = slot->errsv;
511 GvSV (irsgv) = slot->irsgv; 686 GvSV (irsgv) = slot->irsgv;
687 GvHV (PL_hintgv) = slot->hinthv;
512 688
513 #define VAR(name,type) PL_ ## name = slot->name; 689 #define VAR(name,type) PL_ ## name = slot->name;
514 # include "state.h" 690 # include "state.h"
515 #undef VAR 691 #undef VAR
516 692
… …
530 PUTBACK; 706 PUTBACK;
531 } 707 }
532 708
533 slf_frame = c->slf_frame; 709 slf_frame = c->slf_frame;
534 CORO_THROW = c->except; 710 CORO_THROW = c->except;
711
712 if (expect_false (enable_times))
713 {
714 if (expect_false (!times_valid))
715 coro_times_update ();
716
717 coro_times_sub (c);
718 }
719
720 if (expect_false (c->on_enter))
721 {
722 int i;
723
724 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
725 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
726 }
727
728 SWAP_SVS (c);
535} 729}
536 730
537static void 731static void
538save_perl (pTHX_ Coro__State c) 732save_perl (pTHX_ Coro__State c)
539{ 733{
734 SWAP_SVS (c);
735
736 if (expect_false (c->on_leave))
737 {
738 int i;
739
740 for (i = AvFILLp (c->on_leave); i >= 0; --i)
741 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
742 }
743
744 times_valid = 0;
745
746 if (expect_false (enable_times))
747 {
748 coro_times_update (); times_valid = 1;
749 coro_times_add (c);
750 }
751
540 c->except = CORO_THROW; 752 c->except = CORO_THROW;
541 c->slf_frame = slf_frame; 753 c->slf_frame = slf_frame;
542 754
543 { 755 {
544 dSP; 756 dSP;
… …
557 { 769 {
558 while (expect_true (cxix >= 0)) 770 while (expect_true (cxix >= 0))
559 { 771 {
560 PERL_CONTEXT *cx = &ccstk[cxix--]; 772 PERL_CONTEXT *cx = &ccstk[cxix--];
561 773
562 if (expect_true (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT)) 774 if (expect_true (CxTYPE (cx) == CXt_SUB) || expect_false (CxTYPE (cx) == CXt_FORMAT))
563 { 775 {
564 CV *cv = cx->blk_sub.cv; 776 CV *cv = cx->blk_sub.cv;
565 777
566 if (expect_true (CvDEPTH (cv))) 778 if (expect_true (CvDEPTH (cv)))
567 { 779 {
… …
591 /* we manually unroll here, as usually 2 slots is enough */ 803 /* we manually unroll here, as usually 2 slots is enough */
592 if (SLOT_COUNT >= 1) CXINC; 804 if (SLOT_COUNT >= 1) CXINC;
593 if (SLOT_COUNT >= 2) CXINC; 805 if (SLOT_COUNT >= 2) CXINC;
594 if (SLOT_COUNT >= 3) CXINC; 806 if (SLOT_COUNT >= 3) CXINC;
595 { 807 {
596 int i; 808 unsigned int i;
597 for (i = 3; i < SLOT_COUNT; ++i) 809 for (i = 3; i < SLOT_COUNT; ++i)
598 CXINC; 810 CXINC;
599 } 811 }
600 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 812 cxstack_ix -= SLOT_COUNT; /* undo allocation */
601 813
602 c->mainstack = PL_mainstack; 814 c->mainstack = PL_mainstack;
603 815
604 { 816 {
605 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 817 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
606 818
607 slot->defav = GvAV (PL_defgv); 819 slot->defav = GvAV (PL_defgv);
608 slot->defsv = DEFSV; 820 slot->defsv = DEFSV;
609 slot->errsv = ERRSV; 821 slot->errsv = ERRSV;
610 slot->irsgv = GvSV (irsgv); 822 slot->irsgv = GvSV (irsgv);
823 slot->hinthv = GvHV (PL_hintgv);
611 824
612 #define VAR(name,type) slot->name = PL_ ## name; 825 #define VAR(name,type) slot->name = PL_ ## name;
613 # include "state.h" 826 # include "state.h"
614 #undef VAR 827 #undef VAR
615 } 828 }
… …
742#endif 955#endif
743 956
744/* 957/*
745 * This overrides the default magic get method of %SIG elements. 958 * This overrides the default magic get method of %SIG elements.
746 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook 959 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
747 * and instead of tryign to save and restore the hash elements, we just provide 960 * and instead of trying to save and restore the hash elements, we just provide
748 * readback here. 961 * readback here.
749 * We only do this when the hook is != 0, as they are often set to 0 temporarily,
750 * not expecting this to actually change the hook. This is a potential problem
751 * when a schedule happens then, but we ignore this.
752 */ 962 */
753static int 963static int
754coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 964coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
755{ 965{
756 const char *s = MgPV_nolen_const (mg); 966 const char *s = MgPV_nolen_const (mg);
… …
809 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 1019 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
810 1020
811 if (svp) 1021 if (svp)
812 { 1022 {
813 SV *old = *svp; 1023 SV *old = *svp;
814 *svp = newSVsv (sv); 1024 *svp = SvOK (sv) ? newSVsv (sv) : 0;
815 SvREFCNT_dec (old); 1025 SvREFCNT_dec (old);
816 return 0; 1026 return 0;
817 } 1027 }
818 } 1028 }
819 1029
… …
831slf_check_nop (pTHX_ struct CoroSLF *frame) 1041slf_check_nop (pTHX_ struct CoroSLF *frame)
832{ 1042{
833 return 0; 1043 return 0;
834} 1044}
835 1045
836static UNOP coro_setup_op; 1046static int
1047slf_check_repeat (pTHX_ struct CoroSLF *frame)
1048{
1049 return 1;
1050}
1051
1052static UNOP init_perl_op;
837 1053
838static void NOINLINE /* noinline to keep it out of the transfer fast path */ 1054static void NOINLINE /* noinline to keep it out of the transfer fast path */
839coro_setup (pTHX_ struct coro *coro) 1055init_perl (pTHX_ struct coro *coro)
840{ 1056{
841 /* 1057 /*
842 * emulate part of the perl startup here. 1058 * emulate part of the perl startup here.
843 */ 1059 */
844 coro_init_stacks (aTHX); 1060 coro_init_stacks (aTHX);
845 1061
846 PL_runops = RUNOPS_DEFAULT; 1062 PL_runops = RUNOPS_DEFAULT;
847 PL_curcop = &PL_compiling; 1063 PL_curcop = &PL_compiling;
848 PL_in_eval = EVAL_NULL; 1064 PL_in_eval = EVAL_NULL;
849 PL_comppad = 0; 1065 PL_comppad = 0;
1066 PL_comppad_name = 0;
1067 PL_comppad_name_fill = 0;
1068 PL_comppad_name_floor = 0;
850 PL_curpm = 0; 1069 PL_curpm = 0;
851 PL_curpad = 0; 1070 PL_curpad = 0;
852 PL_localizing = 0; 1071 PL_localizing = 0;
853 PL_dirty = 0;
854 PL_restartop = 0; 1072 PL_restartop = 0;
855#if PERL_VERSION_ATLEAST (5,10,0) 1073#if PERL_VERSION_ATLEAST (5,10,0)
856 PL_parser = 0; 1074 PL_parser = 0;
857#endif 1075#endif
1076 PL_hints = 0;
858 1077
859 /* recreate the die/warn hooks */ 1078 /* recreate the die/warn hooks */
860 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1079 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook );
861 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1080 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook);
862 1081
863 GvSV (PL_defgv) = newSV (0); 1082 GvSV (PL_defgv) = newSV (0);
864 GvAV (PL_defgv) = coro->args; coro->args = 0; 1083 GvAV (PL_defgv) = coro->args; coro->args = 0;
865 GvSV (PL_errgv) = newSV (0); 1084 GvSV (PL_errgv) = newSV (0);
866 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1085 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
1086 GvHV (PL_hintgv) = 0;
867 PL_rs = newSVsv (GvSV (irsgv)); 1087 PL_rs = newSVsv (GvSV (irsgv));
868 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1088 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
869 1089
870 { 1090 {
871 dSP; 1091 dSP;
… …
888 */ 1108 */
889 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1109 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
890 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */ 1110 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
891 1111
892 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1112 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */
893 coro_setup_op.op_next = PL_op; 1113 init_perl_op.op_next = PL_op;
894 coro_setup_op.op_type = OP_CUSTOM; 1114 init_perl_op.op_type = OP_ENTERSUB;
895 coro_setup_op.op_ppaddr = pp_slf; 1115 init_perl_op.op_ppaddr = pp_slf;
896 /* no flags etc. required, as an init function won't be called */ 1116 /* no flags etc. required, as an init function won't be called */
897 1117
898 PL_op = (OP *)&coro_setup_op; 1118 PL_op = (OP *)&init_perl_op;
899 1119
900 /* copy throw, in case it was set before coro_setup */ 1120 /* copy throw, in case it was set before init_perl */
901 CORO_THROW = coro->except; 1121 CORO_THROW = coro->except;
902}
903 1122
1123 SWAP_SVS (coro);
1124
1125 if (expect_false (enable_times))
1126 {
1127 coro_times_update ();
1128 coro_times_sub (coro);
1129 }
1130}
1131
904static void 1132static void
905coro_destruct (pTHX_ struct coro *coro) 1133coro_unwind_stacks (pTHX)
906{ 1134{
907 if (!IN_DESTRUCT) 1135 if (!IN_DESTRUCT)
908 { 1136 {
909 /* restore all saved variables and stuff */ 1137 /* restore all saved variables and stuff */
910 LEAVE_SCOPE (0); 1138 LEAVE_SCOPE (0);
… …
918 POPSTACK_TO (PL_mainstack); 1146 POPSTACK_TO (PL_mainstack);
919 1147
920 /* unwind main stack */ 1148 /* unwind main stack */
921 dounwind (-1); 1149 dounwind (-1);
922 } 1150 }
1151}
923 1152
924 SvREFCNT_dec (GvSV (PL_defgv)); 1153static void
925 SvREFCNT_dec (GvAV (PL_defgv)); 1154destroy_perl (pTHX_ struct coro *coro)
926 SvREFCNT_dec (GvSV (PL_errgv)); 1155{
927 SvREFCNT_dec (PL_defoutgv); 1156 SV *svf [9];
928 SvREFCNT_dec (PL_rs);
929 SvREFCNT_dec (GvSV (irsgv));
930 1157
931 SvREFCNT_dec (PL_diehook);
932 SvREFCNT_dec (PL_warnhook);
933 1158 {
1159 struct coro *current = SvSTATE_current;
1160
1161 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1162
1163 save_perl (aTHX_ current);
1164 /*SvRV_set (coro_current, (SV *)coro->hv);*/
1165 load_perl (aTHX_ coro);
1166
1167 coro_unwind_stacks (aTHX);
1168 coro_destruct_stacks (aTHX);
1169
1170 /* restore swapped sv's */
1171 SWAP_SVS (coro);
1172
1173 // now save some sv's to be free'd later
1174 svf [0] = GvSV (PL_defgv);
1175 svf [1] = (SV *)GvAV (PL_defgv);
1176 svf [2] = GvSV (PL_errgv);
1177 svf [3] = (SV *)PL_defoutgv;
1178 svf [4] = PL_rs;
1179 svf [5] = GvSV (irsgv);
1180 svf [6] = (SV *)GvHV (PL_hintgv);
1181 svf [7] = PL_diehook;
1182 svf [8] = PL_warnhook;
1183 assert (9 == sizeof (svf) / sizeof (*svf));
1184
1185 /*SvRV_set (coro_current, (SV *)current->hv);*/
1186 load_perl (aTHX_ current);
1187 }
1188
1189 {
1190 unsigned int i;
1191
1192 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i)
1193 SvREFCNT_dec (svf [i]);
1194
934 SvREFCNT_dec (coro->saved_deffh); 1195 SvREFCNT_dec (coro->saved_deffh);
935 SvREFCNT_dec (coro->rouse_cb); 1196 SvREFCNT_dec (coro->rouse_cb);
936 SvREFCNT_dec (coro->invoke_cb); 1197 SvREFCNT_dec (coro->invoke_cb);
937 SvREFCNT_dec (coro->invoke_av); 1198 SvREFCNT_dec (coro->invoke_av);
938 1199 }
939 coro_destruct_stacks (aTHX);
940} 1200}
941 1201
942INLINE void 1202INLINE void
943free_coro_mortal (pTHX) 1203free_coro_mortal (pTHX)
944{ 1204{
… …
952static int 1212static int
953runops_trace (pTHX) 1213runops_trace (pTHX)
954{ 1214{
955 COP *oldcop = 0; 1215 COP *oldcop = 0;
956 int oldcxix = -2; 1216 int oldcxix = -2;
957 struct coro *coro = SvSTATE_current; /* trace cctx is tied to specific coro */
958 coro_cctx *cctx = coro->cctx;
959 1217
960 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX))) 1218 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX)))
961 { 1219 {
962 PERL_ASYNC_CHECK (); 1220 PERL_ASYNC_CHECK ();
963 1221
964 if (cctx->flags & CC_TRACE_ALL) 1222 if (cctx_current->flags & CC_TRACE_ALL)
965 { 1223 {
966 if (PL_op->op_type == OP_LEAVESUB && cctx->flags & CC_TRACE_SUB) 1224 if (PL_op->op_type == OP_LEAVESUB && cctx_current->flags & CC_TRACE_SUB)
967 { 1225 {
968 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1226 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
969 SV **bot, **top; 1227 SV **bot, **top;
970 AV *av = newAV (); /* return values */ 1228 AV *av = newAV (); /* return values */
971 SV **cb; 1229 SV **cb;
… …
1008 1266
1009 if (PL_curcop != &PL_compiling) 1267 if (PL_curcop != &PL_compiling)
1010 { 1268 {
1011 SV **cb; 1269 SV **cb;
1012 1270
1013 if (oldcxix != cxstack_ix && cctx->flags & CC_TRACE_SUB) 1271 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB)
1014 { 1272 {
1015 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1273 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1016 1274
1017 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1275 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1018 { 1276 {
1019 runops_proc_t old_runops = PL_runops;
1020 dSP; 1277 dSP;
1021 GV *gv = CvGV (cx->blk_sub.cv); 1278 GV *gv = CvGV (cx->blk_sub.cv);
1022 SV *fullname = sv_2mortal (newSV (0)); 1279 SV *fullname = sv_2mortal (newSV (0));
1023 1280
1024 if (isGV (gv)) 1281 if (isGV (gv))
… …
1042 } 1299 }
1043 1300
1044 oldcxix = cxstack_ix; 1301 oldcxix = cxstack_ix;
1045 } 1302 }
1046 1303
1047 if (cctx->flags & CC_TRACE_LINE) 1304 if (cctx_current->flags & CC_TRACE_LINE)
1048 { 1305 {
1049 dSP; 1306 dSP;
1050 1307
1051 PL_runops = RUNOPS_DEFAULT; 1308 PL_runops = RUNOPS_DEFAULT;
1052 ENTER; 1309 ENTER;
… …
1071 1328
1072 TAINT_NOT; 1329 TAINT_NOT;
1073 return 0; 1330 return 0;
1074} 1331}
1075 1332
1076static struct coro_cctx *cctx_ssl_cctx;
1077static struct CoroSLF cctx_ssl_frame; 1333static struct CoroSLF cctx_ssl_frame;
1078 1334
1079static void 1335static void
1080slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta) 1336slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta)
1081{ 1337{
1082 ta->prev = (struct coro *)cctx_ssl_cctx;
1083 ta->next = 0; 1338 ta->prev = 0;
1084} 1339}
1085 1340
1086static int 1341static int
1087slf_check_set_stacklevel (pTHX_ struct CoroSLF *frame) 1342slf_check_set_stacklevel (pTHX_ struct CoroSLF *frame)
1088{ 1343{
… …
1091 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1346 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1092} 1347}
1093 1348
1094/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1349/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1095static void NOINLINE 1350static void NOINLINE
1096cctx_prepare (pTHX_ coro_cctx *cctx) 1351cctx_prepare (pTHX)
1097{ 1352{
1098 PL_top_env = &PL_start_env; 1353 PL_top_env = &PL_start_env;
1099 1354
1100 if (cctx->flags & CC_TRACE) 1355 if (cctx_current->flags & CC_TRACE)
1101 PL_runops = runops_trace; 1356 PL_runops = runops_trace;
1102 1357
1103 /* we already must be executing an SLF op, there is no other valid way 1358 /* we already must be executing an SLF op, there is no other valid way
1104 * that can lead to creation of a new cctx */ 1359 * that can lead to creation of a new cctx */
1105 assert (("FATAL: can't prepare slf-less cctx in Coro module (please report)", 1360 assert (("FATAL: can't prepare slf-less cctx in Coro module (please report)",
1106 slf_frame.prepare && PL_op->op_ppaddr == pp_slf)); 1361 slf_frame.prepare && PL_op->op_ppaddr == pp_slf));
1107 1362
1108 /* we must emulate leaving pp_slf, which is done inside slf_check_set_stacklevel */ 1363 /* we must emulate leaving pp_slf, which is done inside slf_check_set_stacklevel */
1109 cctx_ssl_cctx = cctx;
1110 cctx_ssl_frame = slf_frame; 1364 cctx_ssl_frame = slf_frame;
1111 1365
1112 slf_frame.prepare = slf_prepare_set_stacklevel; 1366 slf_frame.prepare = slf_prepare_set_stacklevel;
1113 slf_frame.check = slf_check_set_stacklevel; 1367 slf_frame.check = slf_check_set_stacklevel;
1114} 1368}
… …
1137 /* normally we would need to skip the entersub here */ 1391 /* normally we would need to skip the entersub here */
1138 /* not doing so will re-execute it, which is exactly what we want */ 1392 /* not doing so will re-execute it, which is exactly what we want */
1139 /* PL_nop = PL_nop->op_next */ 1393 /* PL_nop = PL_nop->op_next */
1140 1394
1141 /* inject a fake subroutine call to cctx_init */ 1395 /* inject a fake subroutine call to cctx_init */
1142 cctx_prepare (aTHX_ (coro_cctx *)arg); 1396 cctx_prepare (aTHX);
1143 1397
1144 /* cctx_run is the alternative tail of transfer() */ 1398 /* cctx_run is the alternative tail of transfer() */
1145 transfer_tail (aTHX); 1399 transfer_tail (aTHX);
1146 1400
1147 /* somebody or something will hit me for both perl_run and PL_restartop */ 1401 /* somebody or something will hit me for both perl_run and PL_restartop */
1148 PL_restartop = PL_op; 1402 PL_restartop = PL_op;
1149 perl_run (PL_curinterp); 1403 perl_run (PL_curinterp);
1150 /* 1404 /*
1151 * Unfortunately, there is no way to get at the return values of the 1405 * Unfortunately, there is no way to get at the return values of the
1152 * coro body here, as perl_run destroys these 1406 * coro body here, as perl_run destroys these. Likewise, we cannot catch
1407 * runtime errors here, as this is just a random interpreter, not a thread.
1153 */ 1408 */
1154 1409
1155 /* 1410 /*
1156 * If perl-run returns we assume exit() was being called or the coro 1411 * If perl-run returns we assume exit() was being called or the coro
1157 * fell off the end, which seems to be the only valid (non-bug) 1412 * fell off the end, which seems to be the only valid (non-bug)
1158 * reason for perl_run to return. We try to exit by jumping to the 1413 * reason for perl_run to return. We try to exit by jumping to the
1159 * bootstrap-time "top" top_env, as we cannot restore the "main" 1414 * bootstrap-time "top" top_env, as we cannot restore the "main"
1160 * coroutine as Coro has no such concept 1415 * coroutine as Coro has no such concept.
1416 * This actually isn't valid with the pthread backend, but OSes requiring
1417 * that backend are too broken to do it in a standards-compliant way.
1161 */ 1418 */
1162 PL_top_env = main_top_env; 1419 PL_top_env = main_top_env;
1163 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */ 1420 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1164 } 1421 }
1165} 1422}
… …
1242cctx_destroy (coro_cctx *cctx) 1499cctx_destroy (coro_cctx *cctx)
1243{ 1500{
1244 if (!cctx) 1501 if (!cctx)
1245 return; 1502 return;
1246 1503
1504 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1505
1247 --cctx_count; 1506 --cctx_count;
1248 coro_destroy (&cctx->cctx); 1507 coro_destroy (&cctx->cctx);
1249 1508
1250 /* coro_transfer creates new, empty cctx's */ 1509 /* coro_transfer creates new, empty cctx's */
1251 if (cctx->sptr) 1510 if (cctx->sptr)
… …
1314 /* TODO: throwing up here is considered harmful */ 1573 /* TODO: throwing up here is considered harmful */
1315 1574
1316 if (expect_true (prev != next)) 1575 if (expect_true (prev != next))
1317 { 1576 {
1318 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1577 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1319 croak ("Coro::State::transfer called with non-running/new prev Coro::State, but can only transfer from running or new states,"); 1578 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1320 1579
1321 if (expect_false (next->flags & CF_RUNNING))
1322 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states,");
1323
1324 if (expect_false (next->flags & CF_DESTROYED)) 1580 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED)))
1325 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states,"); 1581 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1326 1582
1327#if !PERL_VERSION_ATLEAST (5,10,0) 1583#if !PERL_VERSION_ATLEAST (5,10,0)
1328 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1584 if (expect_false (PL_lex_state != LEX_NOTPARSING))
1329 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,"); 1585 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1330#endif 1586#endif
… …
1336transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1592transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1337{ 1593{
1338 dSTACKLEVEL; 1594 dSTACKLEVEL;
1339 1595
1340 /* sometimes transfer is only called to set idle_sp */ 1596 /* sometimes transfer is only called to set idle_sp */
1341 if (expect_false (!next)) 1597 if (expect_false (!prev))
1342 { 1598 {
1343 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1599 cctx_current->idle_sp = STACKLEVEL;
1344 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1600 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1345 } 1601 }
1346 else if (expect_true (prev != next)) 1602 else if (expect_true (prev != next))
1347 { 1603 {
1348 coro_cctx *prev__cctx; 1604 coro_cctx *cctx_prev;
1349 1605
1350 if (expect_false (prev->flags & CF_NEW)) 1606 if (expect_false (prev->flags & CF_NEW))
1351 { 1607 {
1352 /* create a new empty/source context */ 1608 /* create a new empty/source context */
1353 prev->cctx = cctx_new_empty ();
1354 prev->flags &= ~CF_NEW; 1609 prev->flags &= ~CF_NEW;
1355 prev->flags |= CF_RUNNING; 1610 prev->flags |= CF_RUNNING;
1356 } 1611 }
1357 1612
1358 prev->flags &= ~CF_RUNNING; 1613 prev->flags &= ~CF_RUNNING;
… …
1364 if (expect_false (next->flags & CF_NEW)) 1619 if (expect_false (next->flags & CF_NEW))
1365 { 1620 {
1366 /* need to start coroutine */ 1621 /* need to start coroutine */
1367 next->flags &= ~CF_NEW; 1622 next->flags &= ~CF_NEW;
1368 /* setup coroutine call */ 1623 /* setup coroutine call */
1369 coro_setup (aTHX_ next); 1624 init_perl (aTHX_ next);
1370 } 1625 }
1371 else 1626 else
1372 load_perl (aTHX_ next); 1627 load_perl (aTHX_ next);
1373 1628
1374 prev__cctx = prev->cctx;
1375
1376 /* possibly untie and reuse the cctx */ 1629 /* possibly untie and reuse the cctx */
1377 if (expect_true ( 1630 if (expect_true (
1378 prev__cctx->idle_sp == STACKLEVEL 1631 cctx_current->idle_sp == STACKLEVEL
1379 && !(prev__cctx->flags & CC_TRACE) 1632 && !(cctx_current->flags & CC_TRACE)
1380 && !force_cctx 1633 && !force_cctx
1381 )) 1634 ))
1382 { 1635 {
1383 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1636 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */
1384 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == prev__cctx->idle_te)); 1637 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1385 1638
1386 prev->cctx = 0;
1387
1388 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */ 1639 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */
1389 /* without this the next cctx_get might destroy the prev__cctx while still in use */ 1640 /* without this the next cctx_get might destroy the running cctx while still in use */
1390 if (expect_false (CCTX_EXPIRED (prev__cctx))) 1641 if (expect_false (CCTX_EXPIRED (cctx_current)))
1391 if (!next->cctx) 1642 if (expect_true (!next->cctx))
1392 next->cctx = cctx_get (aTHX); 1643 next->cctx = cctx_get (aTHX);
1393 1644
1394 cctx_put (prev__cctx); 1645 cctx_put (cctx_current);
1395 } 1646 }
1647 else
1648 prev->cctx = cctx_current;
1396 1649
1397 ++next->usecount; 1650 ++next->usecount;
1398 1651
1399 if (expect_true (!next->cctx)) 1652 cctx_prev = cctx_current;
1400 next->cctx = cctx_get (aTHX); 1653 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1401 1654
1402 if (expect_false (prev__cctx != next->cctx)) 1655 next->cctx = 0;
1656
1657 if (expect_false (cctx_prev != cctx_current))
1403 { 1658 {
1404 prev__cctx->top_env = PL_top_env; 1659 cctx_prev->top_env = PL_top_env;
1405 PL_top_env = next->cctx->top_env; 1660 PL_top_env = cctx_current->top_env;
1406 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1661 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1407 } 1662 }
1408 1663
1409 transfer_tail (aTHX); 1664 transfer_tail (aTHX);
1410 } 1665 }
1411} 1666}
… …
1413#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx)) 1668#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1414#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1669#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1415 1670
1416/** high level stuff ********************************************************/ 1671/** high level stuff ********************************************************/
1417 1672
1418static int 1673static void
1419coro_state_destroy (pTHX_ struct coro *coro) 1674coro_state_destroy (pTHX_ struct coro *coro)
1420{ 1675{
1421 if (coro->flags & CF_DESTROYED) 1676 if (coro->flags & CF_DESTROYED)
1422 return 0; 1677 return;
1423 1678
1679 /* this callback is reserved for slf functions needing to do cleanup */
1424 if (coro->on_destroy) 1680 if (coro->on_destroy && !PL_dirty)
1425 coro->on_destroy (aTHX_ coro); 1681 coro->on_destroy (aTHX_ coro);
1682
1683 /*
1684 * The on_destroy above most likely is from an SLF call.
1685 * Since by definition the SLF call will not finish when we destroy
1686 * the coro, we will have to force-finish it here, otherwise
1687 * cleanup functions cannot call SLF functions.
1688 */
1689 coro->slf_frame.prepare = 0;
1426 1690
1427 coro->flags |= CF_DESTROYED; 1691 coro->flags |= CF_DESTROYED;
1428 1692
1429 if (coro->flags & CF_READY) 1693 if (coro->flags & CF_READY)
1430 { 1694 {
… …
1433 --coro_nready; 1697 --coro_nready;
1434 } 1698 }
1435 else 1699 else
1436 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1700 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1437 1701
1438 if (coro->mainstack && coro->mainstack != main_mainstack) 1702 if (coro->mainstack
1439 { 1703 && coro->mainstack != main_mainstack
1440 struct coro temp; 1704 && coro->slot
1441 1705 && !PL_dirty)
1442 assert (("FATAL: tried to destroy currently running coroutine (please report)", !(coro->flags & CF_RUNNING)));
1443
1444 save_perl (aTHX_ &temp);
1445 load_perl (aTHX_ coro); 1706 destroy_perl (aTHX_ coro);
1446 1707
1447 coro_destruct (aTHX_ coro); 1708 if (coro->next) coro->next->prev = coro->prev;
1448 1709 if (coro->prev) coro->prev->next = coro->next;
1449 load_perl (aTHX_ &temp); 1710 if (coro == coro_first) coro_first = coro->next;
1450
1451 coro->slot = 0;
1452 }
1453 1711
1454 cctx_destroy (coro->cctx); 1712 cctx_destroy (coro->cctx);
1455 SvREFCNT_dec (coro->startcv); 1713 SvREFCNT_dec (coro->startcv);
1456 SvREFCNT_dec (coro->args); 1714 SvREFCNT_dec (coro->args);
1715 SvREFCNT_dec (coro->swap_sv);
1457 SvREFCNT_dec (CORO_THROW); 1716 SvREFCNT_dec (CORO_THROW);
1458
1459 if (coro->next) coro->next->prev = coro->prev;
1460 if (coro->prev) coro->prev->next = coro->next;
1461 if (coro == coro_first) coro_first = coro->next;
1462
1463 return 1;
1464} 1717}
1465 1718
1466static int 1719static int
1467coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1720coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1468{ 1721{
… …
1516 1769
1517 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1770 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1518 TRANSFER (ta, 1); 1771 TRANSFER (ta, 1);
1519} 1772}
1520 1773
1521/*****************************************************************************/
1522/* gensub: simple closure generation utility */
1523
1524#define GENSUB_ARG CvXSUBANY (cv).any_ptr
1525
1526/* create a closure from XS, returns a code reference */
1527/* the arg can be accessed via GENSUB_ARG from the callback */
1528/* the callback must use dXSARGS/XSRETURN */
1529static SV *
1530gensub (pTHX_ void (*xsub)(pTHX_ CV *), void *arg)
1531{
1532 CV *cv = (CV *)newSV (0);
1533
1534 sv_upgrade ((SV *)cv, SVt_PVCV);
1535
1536 CvANON_on (cv);
1537 CvISXSUB_on (cv);
1538 CvXSUB (cv) = xsub;
1539 GENSUB_ARG = arg;
1540
1541 return newRV_noinc ((SV *)cv);
1542}
1543
1544/** Coro ********************************************************************/ 1774/** Coro ********************************************************************/
1545 1775
1546INLINE void 1776INLINE void
1547coro_enq (pTHX_ struct coro *coro) 1777coro_enq (pTHX_ struct coro *coro)
1548{ 1778{
1549 av_push (coro_ready [coro->prio - PRIO_MIN], SvREFCNT_inc_NN (coro->hv)); 1779 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1550}
1551 1780
1552INLINE SV * 1781 SvREFCNT_inc_NN (coro->hv);
1782
1783 coro->next_ready = 0;
1784 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1785 ready [1] = coro;
1786}
1787
1788INLINE struct coro *
1553coro_deq (pTHX) 1789coro_deq (pTHX)
1554{ 1790{
1555 int prio; 1791 int prio;
1556 1792
1557 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; ) 1793 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
1558 if (AvFILLp (coro_ready [prio]) >= 0) 1794 {
1559 return av_shift (coro_ready [prio]); 1795 struct coro **ready = coro_ready [prio];
1796
1797 if (ready [0])
1798 {
1799 struct coro *coro = ready [0];
1800 ready [0] = coro->next_ready;
1801 return coro;
1802 }
1803 }
1560 1804
1561 return 0; 1805 return 0;
1806}
1807
1808static void
1809invoke_sv_ready_hook_helper (void)
1810{
1811 dTHX;
1812 dSP;
1813
1814 ENTER;
1815 SAVETMPS;
1816
1817 PUSHMARK (SP);
1818 PUTBACK;
1819 call_sv (coro_readyhook, G_VOID | G_DISCARD);
1820
1821 FREETMPS;
1822 LEAVE;
1562} 1823}
1563 1824
1564static int 1825static int
1565api_ready (pTHX_ SV *coro_sv) 1826api_ready (pTHX_ SV *coro_sv)
1566{ 1827{
1567 struct coro *coro;
1568 SV *sv_hook;
1569 void (*xs_hook)(void);
1570
1571 if (SvROK (coro_sv))
1572 coro_sv = SvRV (coro_sv);
1573
1574 coro = SvSTATE (coro_sv); 1828 struct coro *coro = SvSTATE (coro_sv);
1575 1829
1576 if (coro->flags & CF_READY) 1830 if (coro->flags & CF_READY)
1577 return 0; 1831 return 0;
1578 1832
1579 coro->flags |= CF_READY; 1833 coro->flags |= CF_READY;
1580 1834
1581 sv_hook = coro_nready ? 0 : coro_readyhook;
1582 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1583
1584 coro_enq (aTHX_ coro); 1835 coro_enq (aTHX_ coro);
1585 ++coro_nready;
1586 1836
1587 if (sv_hook) 1837 if (!coro_nready++)
1588 { 1838 if (coroapi.readyhook)
1589 dSP; 1839 coroapi.readyhook ();
1590
1591 ENTER;
1592 SAVETMPS;
1593
1594 PUSHMARK (SP);
1595 PUTBACK;
1596 call_sv (sv_hook, G_VOID | G_DISCARD);
1597
1598 FREETMPS;
1599 LEAVE;
1600 }
1601
1602 if (xs_hook)
1603 xs_hook ();
1604 1840
1605 return 1; 1841 return 1;
1606} 1842}
1607 1843
1608static int 1844static int
1609api_is_ready (pTHX_ SV *coro_sv) 1845api_is_ready (pTHX_ SV *coro_sv)
1610{ 1846{
1611 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1847 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1612} 1848}
1613 1849
1850/* expects to own a reference to next->hv */
1614INLINE void 1851INLINE void
1615prepare_schedule (pTHX_ struct coro_transfer_args *ta) 1852prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1616{ 1853{
1617 SV *prev_sv, *next_sv;
1618
1619 for (;;)
1620 {
1621 next_sv = coro_deq (aTHX);
1622
1623 /* nothing to schedule: call the idle handler */
1624 if (expect_false (!next_sv))
1625 {
1626 dSP;
1627
1628 ENTER;
1629 SAVETMPS;
1630
1631 PUSHMARK (SP);
1632 PUTBACK;
1633 call_sv (get_sv ("Coro::idle", FALSE), G_VOID | G_DISCARD);
1634
1635 FREETMPS;
1636 LEAVE;
1637 continue;
1638 }
1639
1640 ta->next = SvSTATE_hv (next_sv);
1641
1642 /* cannot transfer to destroyed coros, skip and look for next */
1643 if (expect_false (ta->next->flags & CF_DESTROYED))
1644 {
1645 SvREFCNT_dec (next_sv);
1646 /* coro_nready has already been taken care of by destroy */
1647 continue;
1648 }
1649
1650 --coro_nready;
1651 break;
1652 }
1653
1654 /* free this only after the transfer */
1655 prev_sv = SvRV (coro_current); 1854 SV *prev_sv = SvRV (coro_current);
1855
1656 ta->prev = SvSTATE_hv (prev_sv); 1856 ta->prev = SvSTATE_hv (prev_sv);
1857 ta->next = next;
1858
1657 TRANSFER_CHECK (*ta); 1859 TRANSFER_CHECK (*ta);
1658 assert (("FATAL: next coroutine isn't marked as ready in Coro (please report)", ta->next->flags & CF_READY)); 1860
1659 ta->next->flags &= ~CF_READY;
1660 SvRV_set (coro_current, next_sv); 1861 SvRV_set (coro_current, (SV *)next->hv);
1661 1862
1662 free_coro_mortal (aTHX); 1863 free_coro_mortal (aTHX);
1663 coro_mortal = prev_sv; 1864 coro_mortal = prev_sv;
1664} 1865}
1665 1866
1867static void
1868prepare_schedule (pTHX_ struct coro_transfer_args *ta)
1869{
1870 for (;;)
1871 {
1872 struct coro *next = coro_deq (aTHX);
1873
1874 if (expect_true (next))
1875 {
1876 /* cannot transfer to destroyed coros, skip and look for next */
1877 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED)))
1878 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1879 else
1880 {
1881 next->flags &= ~CF_READY;
1882 --coro_nready;
1883
1884 prepare_schedule_to (aTHX_ ta, next);
1885 break;
1886 }
1887 }
1888 else
1889 {
1890 /* nothing to schedule: call the idle handler */
1891 if (SvROK (sv_idle)
1892 && SvOBJECT (SvRV (sv_idle)))
1893 {
1894 if (SvRV (sv_idle) == SvRV (coro_current))
1895 croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught");
1896
1897 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1898 api_ready (aTHX_ SvRV (sv_idle));
1899 --coro_nready;
1900 }
1901 else
1902 {
1903 /* TODO: deprecated, remove, cannot work reliably *//*D*/
1904 dSP;
1905
1906 ENTER;
1907 SAVETMPS;
1908
1909 PUSHMARK (SP);
1910 PUTBACK;
1911 call_sv (sv_idle, G_VOID | G_DISCARD);
1912
1913 FREETMPS;
1914 LEAVE;
1915 }
1916 }
1917 }
1918}
1919
1666INLINE void 1920INLINE void
1667prepare_cede (pTHX_ struct coro_transfer_args *ta) 1921prepare_cede (pTHX_ struct coro_transfer_args *ta)
1668{ 1922{
1669 api_ready (aTHX_ coro_current); 1923 api_ready (aTHX_ coro_current);
1670 prepare_schedule (aTHX_ ta); 1924 prepare_schedule (aTHX_ ta);
… …
1689{ 1943{
1690 struct coro_transfer_args ta; 1944 struct coro_transfer_args ta;
1691 1945
1692 prepare_schedule (aTHX_ &ta); 1946 prepare_schedule (aTHX_ &ta);
1693 TRANSFER (ta, 1); 1947 TRANSFER (ta, 1);
1948}
1949
1950static void
1951api_schedule_to (pTHX_ SV *coro_sv)
1952{
1953 struct coro_transfer_args ta;
1954 struct coro *next = SvSTATE (coro_sv);
1955
1956 SvREFCNT_inc_NN (coro_sv);
1957 prepare_schedule_to (aTHX_ &ta, next);
1694} 1958}
1695 1959
1696static int 1960static int
1697api_cede (pTHX) 1961api_cede (pTHX)
1698{ 1962{
… …
1727static void 1991static void
1728api_trace (pTHX_ SV *coro_sv, int flags) 1992api_trace (pTHX_ SV *coro_sv, int flags)
1729{ 1993{
1730 struct coro *coro = SvSTATE (coro_sv); 1994 struct coro *coro = SvSTATE (coro_sv);
1731 1995
1996 if (coro->flags & CF_RUNNING)
1997 croak ("cannot enable tracing on a running coroutine, caught");
1998
1732 if (flags & CC_TRACE) 1999 if (flags & CC_TRACE)
1733 { 2000 {
1734 if (!coro->cctx) 2001 if (!coro->cctx)
1735 coro->cctx = cctx_new_run (); 2002 coro->cctx = cctx_new_run ();
1736 else if (!(coro->cctx->flags & CC_TRACE)) 2003 else if (!(coro->cctx->flags & CC_TRACE))
1737 croak ("cannot enable tracing on coroutine with custom stack,"); 2004 croak ("cannot enable tracing on coroutine with custom stack, caught");
1738 2005
1739 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL)); 2006 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL));
1740 } 2007 }
1741 else if (coro->cctx && coro->cctx->flags & CC_TRACE) 2008 else if (coro->cctx && coro->cctx->flags & CC_TRACE)
1742 { 2009 {
… …
1744 2011
1745 if (coro->flags & CF_RUNNING) 2012 if (coro->flags & CF_RUNNING)
1746 PL_runops = RUNOPS_DEFAULT; 2013 PL_runops = RUNOPS_DEFAULT;
1747 else 2014 else
1748 coro->slot->runops = RUNOPS_DEFAULT; 2015 coro->slot->runops = RUNOPS_DEFAULT;
2016 }
2017}
2018
2019static void
2020coro_call_on_destroy (pTHX_ struct coro *coro)
2021{
2022 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0);
2023
2024 if (on_destroyp)
2025 {
2026 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
2027 AV *on_destroy = sv_2mortal (SvREFCNT_inc ((AV *)SvRV (*on_destroyp)));
2028 AV *status = statusp ? sv_2mortal (SvREFCNT_inc ((AV *)SvRV (*statusp))) : 0;
2029
2030 while (AvFILLp (on_destroy) >= 0)
2031 {
2032 dSP; /* don't disturb outer sp */
2033 SV *cb = av_pop (on_destroy);
2034
2035 PUSHMARK (SP);
2036
2037 if (statusp)
2038 {
2039 int i;
2040 EXTEND (SP, AvFILLp (status) + 1);
2041
2042 for (i = 0; i <= AvFILLp (status); ++i)
2043 PUSHs (AvARRAY (status)[i]);
2044 }
2045
2046 PUTBACK;
2047 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD);
2048 }
2049 }
2050}
2051
2052static void
2053coro_set_status (HV *coro_hv, SV **arg, int items)
2054{
2055 AV *av = newAV ();
2056
2057 /* items are actually not so common, so optimise for this case */
2058 if (items)
2059 {
2060 int i;
2061
2062 av_extend (av, items - 1);
2063
2064 for (i = 0; i < items; ++i)
2065 av_push (av, SvREFCNT_inc_NN (arg [i]));
2066 }
2067
2068 hv_store (coro_hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0);
2069}
2070
2071static void
2072slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2073{
2074 av_push (av_destroy, (SV *)newRV_inc ((SV *)coro_hv)); /* RVinc for perl */
2075 api_ready (aTHX_ sv_manager);
2076
2077 frame->prepare = prepare_schedule;
2078 frame->check = slf_check_repeat;
2079
2080 /* as a minor optimisation, we could unwind all stacks here */
2081 /* but that puts extra pressure on pp_slf, and is not worth much */
2082 /*coro_unwind_stacks (aTHX);*/
2083}
2084
2085static void
2086slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2087{
2088 HV *coro_hv = (HV *)SvRV (coro_current);
2089
2090 coro_set_status (coro_hv, arg, items);
2091 slf_init_terminate_cancel_common (frame, coro_hv);
2092}
2093
2094static void
2095slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2096{
2097 HV *coro_hv;
2098 struct coro *coro;
2099
2100 if (items <= 0)
2101 croak ("Coro::cancel called without coro object,");
2102
2103 coro = SvSTATE (arg [0]);
2104 coro_hv = coro->hv;
2105
2106 coro_set_status (coro_hv, arg + 1, items - 1);
2107
2108 if (expect_false (coro->flags & CF_NOCANCEL))
2109 {
2110 /* coro currently busy cancelling something, so just notify it */
2111 coro->slf_frame.data = (void *)coro;
2112
2113 frame->prepare = prepare_nop;
2114 frame->check = slf_check_nop;
2115 }
2116 else if (coro_hv == (HV *)SvRV (coro_current))
2117 {
2118 /* cancelling the current coro is allowed, and equals terminate */
2119 slf_init_terminate_cancel_common (frame, coro_hv);
2120 }
2121 else
2122 {
2123 struct coro *self = SvSTATE_current;
2124
2125 /* otherwise we cancel directly, purely for speed reasons
2126 * unfortunately, this requires some magic trickery, as
2127 * somebody else could cancel us, so we have to fight the cancellation.
2128 * this is ugly, and hopefully fully worth the extra speed.
2129 * besides, I can't get the slow-but-safe version working...
2130 */
2131 slf_frame.data = 0;
2132 self->flags |= CF_NOCANCEL;
2133
2134 coro_state_destroy (aTHX_ coro);
2135 coro_call_on_destroy (aTHX_ coro);
2136
2137 self->flags &= ~CF_NOCANCEL;
2138
2139 if (slf_frame.data)
2140 {
2141 /* while we were busy we have been cancelled, so terminate */
2142 slf_init_terminate_cancel_common (frame, self->hv);
2143 }
2144 else
2145 {
2146 frame->prepare = prepare_nop;
2147 frame->check = slf_check_nop;
2148 }
1749 } 2149 }
1750} 2150}
1751 2151
1752/*****************************************************************************/ 2152/*****************************************************************************/
1753/* async pool handler */ 2153/* async pool handler */
… …
1832 2232
1833static void 2233static void
1834coro_rouse_callback (pTHX_ CV *cv) 2234coro_rouse_callback (pTHX_ CV *cv)
1835{ 2235{
1836 dXSARGS; 2236 dXSARGS;
1837 SV *data = (SV *)GENSUB_ARG; 2237 SV *data = (SV *)S_GENSUB_ARG;
1838 2238
1839 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2239 if (SvTYPE (SvRV (data)) != SVt_PVAV)
1840 { 2240 {
1841 /* first call, set args */ 2241 /* first call, set args */
2242 SV *coro = SvRV (data);
1842 AV *av = newAV (); 2243 AV *av = newAV ();
1843 SV *coro = SvRV (data);
1844 2244
1845 SvRV_set (data, (SV *)av); 2245 SvRV_set (data, (SV *)av);
1846 api_ready (aTHX_ coro);
1847 SvREFCNT_dec (coro);
1848 2246
1849 /* better take a full copy of the arguments */ 2247 /* better take a full copy of the arguments */
1850 while (items--) 2248 while (items--)
1851 av_store (av, items, newSVsv (ST (items))); 2249 av_store (av, items, newSVsv (ST (items)));
2250
2251 api_ready (aTHX_ coro);
2252 SvREFCNT_dec (coro);
1852 } 2253 }
1853 2254
1854 XSRETURN_EMPTY; 2255 XSRETURN_EMPTY;
1855} 2256}
1856 2257
… …
1873 2274
1874 EXTEND (SP, AvFILLp (av) + 1); 2275 EXTEND (SP, AvFILLp (av) + 1);
1875 for (i = 0; i <= AvFILLp (av); ++i) 2276 for (i = 0; i <= AvFILLp (av); ++i)
1876 PUSHs (sv_2mortal (AvARRAY (av)[i])); 2277 PUSHs (sv_2mortal (AvARRAY (av)[i]));
1877 2278
1878 /* we have stolen the elements, so ste length to zero and free */ 2279 /* we have stolen the elements, so set length to zero and free */
1879 AvFILLp (av) = -1; 2280 AvFILLp (av) = -1;
1880 av_undef (av); 2281 av_undef (av);
1881 2282
1882 PUTBACK; 2283 PUTBACK;
1883 } 2284 }
… …
1907 || SvTYPE (SvRV (cb)) != SVt_PVCV 2308 || SvTYPE (SvRV (cb)) != SVt_PVCV
1908 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2309 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
1909 croak ("Coro::rouse_wait called with illegal callback argument,"); 2310 croak ("Coro::rouse_wait called with illegal callback argument,");
1910 2311
1911 { 2312 {
1912 CV *cv = (CV *)SvRV (cb); /* for GENSUB_ARG */ 2313 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
1913 SV *data = (SV *)GENSUB_ARG; 2314 SV *data = (SV *)S_GENSUB_ARG;
1914 2315
1915 frame->data = (void *)data; 2316 frame->data = (void *)data;
1916 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule; 2317 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
1917 frame->check = slf_check_rouse_wait; 2318 frame->check = slf_check_rouse_wait;
1918 } 2319 }
… …
1922coro_new_rouse_cb (pTHX) 2323coro_new_rouse_cb (pTHX)
1923{ 2324{
1924 HV *hv = (HV *)SvRV (coro_current); 2325 HV *hv = (HV *)SvRV (coro_current);
1925 struct coro *coro = SvSTATE_hv (hv); 2326 struct coro *coro = SvSTATE_hv (hv);
1926 SV *data = newRV_inc ((SV *)hv); 2327 SV *data = newRV_inc ((SV *)hv);
1927 SV *cb = gensub (aTHX_ coro_rouse_callback, (void *)data); 2328 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
1928 2329
1929 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0); 2330 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0);
1930 SvREFCNT_dec (data); /* magicext increases the refcount */ 2331 SvREFCNT_dec (data); /* magicext increases the refcount */
1931 2332
1932 SvREFCNT_dec (coro->rouse_cb); 2333 SvREFCNT_dec (coro->rouse_cb);
… …
1987static void 2388static void
1988slf_init_schedule (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2389slf_init_schedule (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1989{ 2390{
1990 frame->prepare = prepare_schedule; 2391 frame->prepare = prepare_schedule;
1991 frame->check = slf_check_nop; 2392 frame->check = slf_check_nop;
2393}
2394
2395static void
2396slf_prepare_schedule_to (pTHX_ struct coro_transfer_args *ta)
2397{
2398 struct coro *next = (struct coro *)slf_frame.data;
2399
2400 SvREFCNT_inc_NN (next->hv);
2401 prepare_schedule_to (aTHX_ ta, next);
2402}
2403
2404static void
2405slf_init_schedule_to (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2406{
2407 if (!items)
2408 croak ("Coro::schedule_to expects a coroutine argument, caught");
2409
2410 frame->data = (void *)SvSTATE (arg [0]);
2411 frame->prepare = slf_prepare_schedule_to;
2412 frame->check = slf_check_nop;
2413}
2414
2415static void
2416slf_init_cede_to (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2417{
2418 api_ready (aTHX_ SvRV (coro_current));
2419
2420 slf_init_schedule_to (aTHX_ frame, cv, arg, items);
1992} 2421}
1993 2422
1994static void 2423static void
1995slf_init_cede (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2424slf_init_cede (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1996{ 2425{
… …
2129 if (PL_op->op_flags & OPf_STACKED) 2558 if (PL_op->op_flags & OPf_STACKED)
2130 { 2559 {
2131 if (items > slf_arga) 2560 if (items > slf_arga)
2132 { 2561 {
2133 slf_arga = items; 2562 slf_arga = items;
2134 free (slf_argv); 2563 Safefree (slf_argv);
2135 slf_argv = malloc (slf_arga * sizeof (SV *)); 2564 New (0, slf_argv, slf_arga, SV *);
2136 } 2565 }
2137 2566
2138 slf_argc = items; 2567 slf_argc = items;
2139 2568
2140 for (i = 0; i < items; ++i) 2569 for (i = 0; i < items; ++i)
… …
2142 } 2571 }
2143 else 2572 else
2144 slf_argc = 0; 2573 slf_argc = 0;
2145 2574
2146 PL_op->op_ppaddr = pp_slf; 2575 PL_op->op_ppaddr = pp_slf;
2147 PL_op->op_type = OP_CUSTOM; /* maybe we should leave it at entersub? */ 2576 /*PL_op->op_type = OP_CUSTOM; /* we do behave like entersub still */
2148 2577
2149 PL_op = (OP *)&slf_restore; 2578 PL_op = (OP *)&slf_restore;
2579}
2580
2581/*****************************************************************************/
2582/* dynamic wind */
2583
2584static void
2585on_enterleave_call (pTHX_ SV *cb)
2586{
2587 dSP;
2588
2589 PUSHSTACK;
2590
2591 PUSHMARK (SP);
2592 PUTBACK;
2593 call_sv (cb, G_VOID | G_DISCARD);
2594 SPAGAIN;
2595
2596 POPSTACK;
2597}
2598
2599static SV *
2600coro_avp_pop_and_free (pTHX_ AV **avp)
2601{
2602 AV *av = *avp;
2603 SV *res = av_pop (av);
2604
2605 if (AvFILLp (av) < 0)
2606 {
2607 *avp = 0;
2608 SvREFCNT_dec (av);
2609 }
2610
2611 return res;
2612}
2613
2614static void
2615coro_pop_on_enter (pTHX_ void *coro)
2616{
2617 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_enter);
2618 SvREFCNT_dec (cb);
2619}
2620
2621static void
2622coro_pop_on_leave (pTHX_ void *coro)
2623{
2624 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2625 on_enterleave_call (aTHX_ sv_2mortal (cb));
2150} 2626}
2151 2627
2152/*****************************************************************************/ 2628/*****************************************************************************/
2153/* PerlIO::cede */ 2629/* PerlIO::cede */
2154 2630
… …
2228/* Coro::Semaphore & Coro::Signal */ 2704/* Coro::Semaphore & Coro::Signal */
2229 2705
2230static SV * 2706static SV *
2231coro_waitarray_new (pTHX_ int count) 2707coro_waitarray_new (pTHX_ int count)
2232{ 2708{
2233 /* a semaphore contains a counter IV in $sem->[0] and any waiters after that */ 2709 /* a waitarray=semaphore contains a counter IV in $sem->[0] and any waiters after that */
2234 AV *av = newAV (); 2710 AV *av = newAV ();
2235 SV **ary; 2711 SV **ary;
2236 2712
2237 /* unfortunately, building manually saves memory */ 2713 /* unfortunately, building manually saves memory */
2238 Newx (ary, 2, SV *); 2714 Newx (ary, 2, SV *);
2239 AvALLOC (av) = ary; 2715 AvALLOC (av) = ary;
2716#if PERL_VERSION_ATLEAST (5,10,0)
2240 /*AvARRAY (av) = ary;*/ 2717 AvARRAY (av) = ary;
2718#else
2241 SvPVX ((SV *)av) = (char *)ary; /* 5.8.8 needs this syntax instead of AvARRAY = ary */ 2719 /* 5.8.8 needs this syntax instead of AvARRAY = ary, yet */
2720 /* -DDEBUGGING flags this as a bug, despite it perfectly working */
2721 SvPVX ((SV *)av) = (char *)ary;
2722#endif
2242 AvMAX (av) = 1; 2723 AvMAX (av) = 1;
2243 AvFILLp (av) = 0; 2724 AvFILLp (av) = 0;
2244 ary [0] = newSViv (count); 2725 ary [0] = newSViv (count);
2245 2726
2246 return newRV_noinc ((SV *)av); 2727 return newRV_noinc ((SV *)av);
… …
2375{ 2856{
2376 if (items >= 2) 2857 if (items >= 2)
2377 { 2858 {
2378 /* callback form */ 2859 /* callback form */
2379 AV *av = (AV *)SvRV (arg [0]); 2860 AV *av = (AV *)SvRV (arg [0]);
2380 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 2861 SV *cb_cv = s_get_cv_croak (arg [1]);
2381 2862
2382 av_push (av, (SV *)SvREFCNT_inc_NN (cb_cv)); 2863 av_push (av, SvREFCNT_inc_NN (cb_cv));
2383 2864
2384 if (SvIVX (AvARRAY (av)[0]) > 0) 2865 if (SvIVX (AvARRAY (av)[0]) > 0)
2385 coro_semaphore_adjust (aTHX_ av, 0); 2866 coro_semaphore_adjust (aTHX_ av, 0);
2386 2867
2387 frame->prepare = prepare_nop; 2868 frame->prepare = prepare_nop;
… …
2411 AvARRAY (av)[0] = AvARRAY (av)[1]; 2892 AvARRAY (av)[0] = AvARRAY (av)[1];
2412 AvARRAY (av)[1] = cb; 2893 AvARRAY (av)[1] = cb;
2413 2894
2414 cb = av_shift (av); 2895 cb = av_shift (av);
2415 2896
2897 if (SvTYPE (cb) == SVt_PVCV)
2898 {
2899 dSP;
2900 PUSHMARK (SP);
2901 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2902 PUTBACK;
2903 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2904 }
2905 else
2906 {
2416 api_ready (aTHX_ cb); 2907 api_ready (aTHX_ cb);
2417 sv_setiv (cb, 0); /* signal waiter */ 2908 sv_setiv (cb, 0); /* signal waiter */
2909 }
2910
2418 SvREFCNT_dec (cb); 2911 SvREFCNT_dec (cb);
2419 2912
2420 --count; 2913 --count;
2421 } 2914 }
2422} 2915}
… …
2431static void 2924static void
2432slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2925slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2433{ 2926{
2434 AV *av = (AV *)SvRV (arg [0]); 2927 AV *av = (AV *)SvRV (arg [0]);
2435 2928
2929 if (items >= 2)
2930 {
2931 SV *cb_cv = s_get_cv_croak (arg [1]);
2932 av_push (av, SvREFCNT_inc_NN (cb_cv));
2933
2436 if (SvIVX (AvARRAY (av)[0])) 2934 if (SvIVX (AvARRAY (av)[0]))
2935 coro_signal_wake (aTHX_ av, 1); /* must be the only waiter */
2936
2937 frame->prepare = prepare_nop;
2938 frame->check = slf_check_nop;
2939 }
2940 else if (SvIVX (AvARRAY (av)[0]))
2437 { 2941 {
2438 SvIVX (AvARRAY (av)[0]) = 0; 2942 SvIVX (AvARRAY (av)[0]) = 0;
2439 frame->prepare = prepare_nop; 2943 frame->prepare = prepare_nop;
2440 frame->check = slf_check_nop; 2944 frame->check = slf_check_nop;
2441 } 2945 }
2442 else 2946 else
2443 { 2947 {
2444 SV *waiter = newRV_inc (SvRV (coro_current)); /* owned by signal av */ 2948 SV *waiter = newSVsv (coro_current); /* owned by signal av */
2445 2949
2446 av_push (av, waiter); 2950 av_push (av, waiter);
2447 2951
2448 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */ 2952 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */
2449 frame->prepare = prepare_schedule; 2953 frame->prepare = prepare_schedule;
… …
2467 2971
2468static void 2972static void
2469coro_aio_callback (pTHX_ CV *cv) 2973coro_aio_callback (pTHX_ CV *cv)
2470{ 2974{
2471 dXSARGS; 2975 dXSARGS;
2472 AV *state = (AV *)GENSUB_ARG; 2976 AV *state = (AV *)S_GENSUB_ARG;
2473 SV *coro = av_pop (state); 2977 SV *coro = av_pop (state);
2474 SV *data_sv = newSV (sizeof (struct io_state)); 2978 SV *data_sv = newSV (sizeof (struct io_state));
2475 2979
2476 av_extend (state, items - 1); 2980 av_extend (state, items - 1);
2477 2981
… …
2591 3095
2592 for (i = 0; i < items; ++i) 3096 for (i = 0; i < items; ++i)
2593 PUSHs (arg [i]); 3097 PUSHs (arg [i]);
2594 3098
2595 /* now push the callback closure */ 3099 /* now push the callback closure */
2596 PUSHs (sv_2mortal (gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state)))); 3100 PUSHs (sv_2mortal (s_gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state))));
2597 3101
2598 /* now call the AIO function - we assume our request is uncancelable */ 3102 /* now call the AIO function - we assume our request is uncancelable */
2599 PUTBACK; 3103 PUTBACK;
2600 call_sv ((SV *)req, G_VOID | G_DISCARD); 3104 call_sv ((SV *)req, G_VOID | G_DISCARD);
2601 } 3105 }
2602 3106
2603 /* now that the requets is going, we loop toll we have a result */ 3107 /* now that the request is going, we loop till we have a result */
2604 frame->data = (void *)state; 3108 frame->data = (void *)state;
2605 frame->prepare = prepare_schedule; 3109 frame->prepare = prepare_schedule;
2606 frame->check = slf_check_aio_req; 3110 frame->check = slf_check_aio_req;
2607} 3111}
2608 3112
… …
2615 3119
2616 XSRETURN_EMPTY; 3120 XSRETURN_EMPTY;
2617} 3121}
2618 3122
2619/*****************************************************************************/ 3123/*****************************************************************************/
3124
3125#if CORO_CLONE
3126# include "clone.c"
3127#endif
3128
3129/*****************************************************************************/
3130
3131static SV *
3132coro_new (pTHX_ HV *stash, SV **argv, int argc, int is_coro)
3133{
3134 SV *coro_sv;
3135 struct coro *coro;
3136 MAGIC *mg;
3137 HV *hv;
3138 SV *cb;
3139 int i;
3140
3141 if (argc > 0)
3142 {
3143 cb = s_get_cv_croak (argv [0]);
3144
3145 if (!is_coro)
3146 {
3147 if (CvISXSUB (cb))
3148 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
3149
3150 if (!CvROOT (cb))
3151 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
3152 }
3153 }
3154
3155 Newz (0, coro, 1, struct coro);
3156 coro->args = newAV ();
3157 coro->flags = CF_NEW;
3158
3159 if (coro_first) coro_first->prev = coro;
3160 coro->next = coro_first;
3161 coro_first = coro;
3162
3163 coro->hv = hv = newHV ();
3164 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
3165 mg->mg_flags |= MGf_DUP;
3166 coro_sv = sv_bless (newRV_noinc ((SV *)hv), stash);
3167
3168 if (argc > 0)
3169 {
3170 av_extend (coro->args, argc + is_coro - 1);
3171
3172 if (is_coro)
3173 {
3174 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
3175 cb = (SV *)cv_coro_run;
3176 }
3177
3178 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3179
3180 for (i = 1; i < argc; i++)
3181 av_push (coro->args, newSVsv (argv [i]));
3182 }
3183
3184 return coro_sv;
3185}
2620 3186
2621MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3187MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2622 3188
2623PROTOTYPES: DISABLE 3189PROTOTYPES: DISABLE
2624 3190
… …
2629 coro_thx = PERL_GET_CONTEXT; 3195 coro_thx = PERL_GET_CONTEXT;
2630# endif 3196# endif
2631#endif 3197#endif
2632 BOOT_PAGESIZE; 3198 BOOT_PAGESIZE;
2633 3199
3200 cctx_current = cctx_new_empty ();
3201
2634 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3202 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
2635 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3203 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
2636 3204
2637 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 3205 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get;
2638 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set; 3206 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set;
… …
2657 3225
2658 { 3226 {
2659 SV *slf = sv_2mortal (newSViv (PTR2IV (pp_slf))); 3227 SV *slf = sv_2mortal (newSViv (PTR2IV (pp_slf)));
2660 3228
2661 if (!PL_custom_op_names) PL_custom_op_names = newHV (); 3229 if (!PL_custom_op_names) PL_custom_op_names = newHV ();
2662 hv_store_ent (PL_custom_op_names, slf, 3230 hv_store_ent (PL_custom_op_names, slf, newSVpv ("coro_slf", 0), 0);
2663 newSVpv ("coro_slf", 0), 0);
2664 3231
2665 if (!PL_custom_op_descs) PL_custom_op_descs = newHV (); 3232 if (!PL_custom_op_descs) PL_custom_op_descs = newHV ();
2666 hv_store_ent (PL_custom_op_descs, slf, 3233 hv_store_ent (PL_custom_op_descs, slf, newSVpv ("coro schedule like function", 0), 0);
2667 newSVpv ("coro schedule like function", 0), 0);
2668 } 3234 }
2669 3235
2670 coroapi.ver = CORO_API_VERSION; 3236 coroapi.ver = CORO_API_VERSION;
2671 coroapi.rev = CORO_API_REVISION; 3237 coroapi.rev = CORO_API_REVISION;
2672 3238
… …
2677 coroapi.prepare_nop = prepare_nop; 3243 coroapi.prepare_nop = prepare_nop;
2678 coroapi.prepare_schedule = prepare_schedule; 3244 coroapi.prepare_schedule = prepare_schedule;
2679 coroapi.prepare_cede = prepare_cede; 3245 coroapi.prepare_cede = prepare_cede;
2680 coroapi.prepare_cede_notself = prepare_cede_notself; 3246 coroapi.prepare_cede_notself = prepare_cede_notself;
2681 3247
2682 { 3248 time_init (aTHX);
2683 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
2684 3249
2685 if (!svp) croak ("Time::HiRes is required");
2686 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
2687
2688 nvtime = INT2PTR (double (*)(), SvIV (*svp));
2689 }
2690
2691 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 3250 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
2692} 3251}
2693 3252
2694SV * 3253SV *
2695new (char *klass, ...) 3254new (SV *klass, ...)
2696 ALIAS: 3255 ALIAS:
2697 Coro::new = 1 3256 Coro::new = 1
2698 CODE: 3257 CODE:
2699{ 3258 RETVAL = coro_new (aTHX_ ix ? coro_stash : coro_state_stash, &ST (1), items - 1, ix);
2700 struct coro *coro; 3259 OUTPUT:
2701 MAGIC *mg;
2702 HV *hv;
2703 CV *cb;
2704 int i;
2705
2706 if (items > 1)
2707 {
2708 cb = coro_sv_2cv (aTHX_ ST (1));
2709
2710 if (!ix)
2711 {
2712 if (CvISXSUB (cb))
2713 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
2714
2715 if (!CvROOT (cb))
2716 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
2717 }
2718 }
2719
2720 Newz (0, coro, 1, struct coro);
2721 coro->args = newAV ();
2722 coro->flags = CF_NEW;
2723
2724 if (coro_first) coro_first->prev = coro;
2725 coro->next = coro_first;
2726 coro_first = coro;
2727
2728 coro->hv = hv = newHV ();
2729 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
2730 mg->mg_flags |= MGf_DUP;
2731 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
2732
2733 if (items > 1)
2734 {
2735 av_extend (coro->args, items - 1 + ix - 1);
2736
2737 if (ix)
2738 {
2739 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
2740 cb = cv_coro_run;
2741 }
2742
2743 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
2744
2745 for (i = 2; i < items; i++)
2746 av_push (coro->args, newSVsv (ST (i)));
2747 }
2748}
2749 OUTPUT:
2750 RETVAL 3260 RETVAL
2751 3261
2752void 3262void
2753transfer (...) 3263transfer (...)
2754 PROTOTYPE: $$ 3264 PROTOTYPE: $$
2755 CODE: 3265 CODE:
2756 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3266 CORO_EXECUTE_SLF_XS (slf_init_transfer);
2757 3267
2758bool
2759_destroy (SV *coro_sv)
2760 CODE:
2761 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
2762 OUTPUT:
2763 RETVAL
2764
2765void 3268void
2766_exit (int code) 3269_exit (int code)
2767 PROTOTYPE: $ 3270 PROTOTYPE: $
2768 CODE: 3271 CODE:
2769 _exit (code); 3272 _exit (code);
3273
3274SV *
3275clone (Coro::State coro)
3276 CODE:
3277{
3278#if CORO_CLONE
3279 struct coro *ncoro = coro_clone (aTHX_ coro);
3280 MAGIC *mg;
3281 /* TODO: too much duplication */
3282 ncoro->hv = newHV ();
3283 mg = sv_magicext ((SV *)ncoro->hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)ncoro, 0);
3284 mg->mg_flags |= MGf_DUP;
3285 RETVAL = sv_bless (newRV_noinc ((SV *)ncoro->hv), SvSTASH (coro->hv));
3286#else
3287 croak ("Coro::State->clone has not been configured into this installation of Coro, realised");
3288#endif
3289}
3290 OUTPUT:
3291 RETVAL
2770 3292
2771int 3293int
2772cctx_stacksize (int new_stacksize = 0) 3294cctx_stacksize (int new_stacksize = 0)
2773 PROTOTYPE: ;$ 3295 PROTOTYPE: ;$
2774 CODE: 3296 CODE:
… …
2824 eval = 1 3346 eval = 1
2825 CODE: 3347 CODE:
2826{ 3348{
2827 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3349 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
2828 { 3350 {
2829 struct coro temp; 3351 struct coro *current = SvSTATE_current;
3352 struct CoroSLF slf_save;
2830 3353
2831 if (!(coro->flags & CF_RUNNING)) 3354 if (current != coro)
2832 { 3355 {
2833 PUTBACK; 3356 PUTBACK;
2834 save_perl (aTHX_ &temp); 3357 save_perl (aTHX_ current);
2835 load_perl (aTHX_ coro); 3358 load_perl (aTHX_ coro);
3359 /* the coro is most likely in an active SLF call.
3360 * while not strictly required (the code we execute is
3361 * not allowed to call any SLF functions), it's cleaner
3362 * to reinitialise the slf_frame and restore it later.
3363 * This might one day allow us to actually do SLF calls
3364 * from code executed here.
3365 */
3366 slf_save = slf_frame;
3367 slf_frame.prepare = 0;
3368 SPAGAIN;
2836 } 3369 }
2837 3370
2838 {
2839 dSP;
2840 ENTER;
2841 SAVETMPS;
2842 PUTBACK;
2843 PUSHSTACK; 3371 PUSHSTACK;
3372
2844 PUSHMARK (SP); 3373 PUSHMARK (SP);
3374 PUTBACK;
2845 3375
2846 if (ix) 3376 if (ix)
2847 eval_sv (coderef, 0); 3377 eval_sv (coderef, 0);
2848 else 3378 else
2849 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 3379 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
2850 3380
2851 POPSTACK; 3381 POPSTACK;
2852 SPAGAIN; 3382 SPAGAIN;
2853 FREETMPS;
2854 LEAVE;
2855 PUTBACK;
2856 }
2857 3383
2858 if (!(coro->flags & CF_RUNNING)) 3384 if (current != coro)
2859 { 3385 {
3386 PUTBACK;
3387 slf_frame = slf_save;
2860 save_perl (aTHX_ coro); 3388 save_perl (aTHX_ coro);
2861 load_perl (aTHX_ &temp); 3389 load_perl (aTHX_ current);
2862 SPAGAIN; 3390 SPAGAIN;
2863 } 3391 }
2864 } 3392 }
2865} 3393}
2866 3394
… …
2870 ALIAS: 3398 ALIAS:
2871 is_ready = CF_READY 3399 is_ready = CF_READY
2872 is_running = CF_RUNNING 3400 is_running = CF_RUNNING
2873 is_new = CF_NEW 3401 is_new = CF_NEW
2874 is_destroyed = CF_DESTROYED 3402 is_destroyed = CF_DESTROYED
3403 is_suspended = CF_SUSPENDED
2875 CODE: 3404 CODE:
2876 RETVAL = boolSV (coro->flags & ix); 3405 RETVAL = boolSV (coro->flags & ix);
2877 OUTPUT: 3406 OUTPUT:
2878 RETVAL 3407 RETVAL
2879 3408
2880void 3409void
2881throw (Coro::State self, SV *throw = &PL_sv_undef) 3410throw (Coro::State self, SV *exception = &PL_sv_undef)
2882 PROTOTYPE: $;$ 3411 PROTOTYPE: $;$
2883 CODE: 3412 CODE:
2884{ 3413{
2885 struct coro *current = SvSTATE_current; 3414 struct coro *current = SvSTATE_current;
2886 SV **throwp = self == current ? &CORO_THROW : &self->except; 3415 SV **exceptionp = self == current ? &CORO_THROW : &self->except;
2887 SvREFCNT_dec (*throwp); 3416 SvREFCNT_dec (*exceptionp);
2888 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3417 SvGETMAGIC (exception);
3418 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
2889} 3419}
2890 3420
2891void 3421void
2892api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3422api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
2893 PROTOTYPE: $;$ 3423 PROTOTYPE: $;$
… …
2895 3425
2896SV * 3426SV *
2897has_cctx (Coro::State coro) 3427has_cctx (Coro::State coro)
2898 PROTOTYPE: $ 3428 PROTOTYPE: $
2899 CODE: 3429 CODE:
2900 RETVAL = boolSV (!!coro->cctx); 3430 /* maybe manage the running flag differently */
3431 RETVAL = boolSV (!!coro->cctx || (coro->flags & CF_RUNNING));
2901 OUTPUT: 3432 OUTPUT:
2902 RETVAL 3433 RETVAL
2903 3434
2904int 3435int
2905is_traced (Coro::State coro) 3436is_traced (Coro::State coro)
… …
2925 3456
2926void 3457void
2927force_cctx () 3458force_cctx ()
2928 PROTOTYPE: 3459 PROTOTYPE:
2929 CODE: 3460 CODE:
2930 SvSTATE_current->cctx->idle_sp = 0; 3461 cctx_current->idle_sp = 0;
2931 3462
2932void 3463void
2933swap_defsv (Coro::State self) 3464swap_defsv (Coro::State self)
2934 PROTOTYPE: $ 3465 PROTOTYPE: $
2935 ALIAS: 3466 ALIAS:
… …
2943 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv; 3474 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
2944 3475
2945 SV *tmp = *src; *src = *dst; *dst = tmp; 3476 SV *tmp = *src; *src = *dst; *dst = tmp;
2946 } 3477 }
2947 3478
3479void
3480cancel (Coro::State self)
3481 CODE:
3482 coro_state_destroy (aTHX_ self);
3483
3484SV *
3485enable_times (int enabled = enable_times)
3486 CODE:
3487{
3488 RETVAL = boolSV (enable_times);
3489
3490 if (enabled != enable_times)
3491 {
3492 enable_times = enabled;
3493
3494 coro_times_update ();
3495 (enabled ? coro_times_sub : coro_times_add)(SvSTATE (coro_current));
3496 }
3497}
3498 OUTPUT:
3499 RETVAL
3500
3501void
3502times (Coro::State self)
3503 PPCODE:
3504{
3505 struct coro *current = SvSTATE (coro_current);
3506
3507 if (expect_false (current == self))
3508 {
3509 coro_times_update ();
3510 coro_times_add (SvSTATE (coro_current));
3511 }
3512
3513 EXTEND (SP, 2);
3514 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3515 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3516
3517 if (expect_false (current == self))
3518 coro_times_sub (SvSTATE (coro_current));
3519}
3520
3521void
3522swap_sv (Coro::State coro, SV *sv, SV *swapsv)
3523 CODE:
3524{
3525 struct coro *current = SvSTATE_current;
3526
3527 if (current == coro)
3528 SWAP_SVS (current);
3529
3530 if (!coro->swap_sv)
3531 coro->swap_sv = newAV ();
3532
3533 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv )));
3534 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv)));
3535
3536 if (current == coro)
3537 SWAP_SVS (current);
3538}
3539
2948 3540
2949MODULE = Coro::State PACKAGE = Coro 3541MODULE = Coro::State PACKAGE = Coro
2950 3542
2951BOOT: 3543BOOT:
2952{ 3544{
2953 int i;
2954
2955 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
2956 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3545 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
2957 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3546 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
2958 cv_coro_run = get_cv ( "Coro::_terminate", GV_ADD); 3547 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
2959 cv_coro_terminate = get_cv ( "Coro::terminate", GV_ADD); 3548 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
2960 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); 3549 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
2961 SvREADONLY_on (coro_current); 3550 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3551 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3552 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3553 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
2962 3554
2963 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3555 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
2964 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3556 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
2965 cv_pool_handler = get_cv ("Coro::_pool_handler", 0); SvREADONLY_on (cv_pool_handler); 3557 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
2966 cv_coro_new = get_cv ("Coro::new", 0); SvREADONLY_on (cv_coro_new); 3558 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
2967 3559
2968 coro_stash = gv_stashpv ("Coro", TRUE); 3560 coro_stash = gv_stashpv ("Coro", TRUE);
2969 3561
2970 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 3562 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
2971 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 3563 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
2972 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 3564 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
2973 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 3565 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (CORO_PRIO_LOW));
2974 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE)); 3566 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (CORO_PRIO_IDLE));
2975 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN)); 3567 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (CORO_PRIO_MIN));
2976
2977 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
2978 coro_ready[i] = newAV ();
2979 3568
2980 { 3569 {
2981 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 3570 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
2982 3571
2983 coroapi.schedule = api_schedule; 3572 coroapi.schedule = api_schedule;
3573 coroapi.schedule_to = api_schedule_to;
2984 coroapi.cede = api_cede; 3574 coroapi.cede = api_cede;
2985 coroapi.cede_notself = api_cede_notself; 3575 coroapi.cede_notself = api_cede_notself;
2986 coroapi.ready = api_ready; 3576 coroapi.ready = api_ready;
2987 coroapi.is_ready = api_is_ready; 3577 coroapi.is_ready = api_is_ready;
2988 coroapi.nready = coro_nready; 3578 coroapi.nready = coro_nready;
… …
2992 sv_setiv (sv, (IV)&coroapi); 3582 sv_setiv (sv, (IV)&coroapi);
2993 SvREADONLY_on (sv); 3583 SvREADONLY_on (sv);
2994 } 3584 }
2995} 3585}
2996 3586
3587SV *
3588async (...)
3589 PROTOTYPE: &@
3590 CODE:
3591 RETVAL = coro_new (aTHX_ coro_stash, &ST (0), items, 1);
3592 api_ready (aTHX_ RETVAL);
3593 OUTPUT:
3594 RETVAL
3595
3596void
3597_destroy (Coro::State coro)
3598 CODE:
3599 /* used by the manager thread */
3600 coro_state_destroy (aTHX_ coro);
3601 coro_call_on_destroy (aTHX_ coro);
3602
3603void
3604terminate (...)
3605 CODE:
3606 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3607
3608void
3609cancel (...)
3610 CODE:
3611 CORO_EXECUTE_SLF_XS (slf_init_cancel);
3612
2997void 3613void
2998schedule (...) 3614schedule (...)
2999 CODE: 3615 CODE:
3000 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3616 CORO_EXECUTE_SLF_XS (slf_init_schedule);
3617
3618void
3619schedule_to (...)
3620 CODE:
3621 CORO_EXECUTE_SLF_XS (slf_init_schedule_to);
3622
3623void
3624cede_to (...)
3625 CODE:
3626 CORO_EXECUTE_SLF_XS (slf_init_cede_to);
3001 3627
3002void 3628void
3003cede (...) 3629cede (...)
3004 CODE: 3630 CODE:
3005 CORO_EXECUTE_SLF_XS (slf_init_cede); 3631 CORO_EXECUTE_SLF_XS (slf_init_cede);
… …
3019void 3645void
3020_set_readyhook (SV *hook) 3646_set_readyhook (SV *hook)
3021 PROTOTYPE: $ 3647 PROTOTYPE: $
3022 CODE: 3648 CODE:
3023 SvREFCNT_dec (coro_readyhook); 3649 SvREFCNT_dec (coro_readyhook);
3650 SvGETMAGIC (hook);
3651 if (SvOK (hook))
3652 {
3024 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0; 3653 coro_readyhook = newSVsv (hook);
3654 CORO_READYHOOK = invoke_sv_ready_hook_helper;
3655 }
3656 else
3657 {
3658 coro_readyhook = 0;
3659 CORO_READYHOOK = 0;
3660 }
3025 3661
3026int 3662int
3027prio (Coro::State coro, int newprio = 0) 3663prio (Coro::State coro, int newprio = 0)
3028 PROTOTYPE: $;$ 3664 PROTOTYPE: $;$
3029 ALIAS: 3665 ALIAS:
… …
3035 if (items > 1) 3671 if (items > 1)
3036 { 3672 {
3037 if (ix) 3673 if (ix)
3038 newprio = coro->prio - newprio; 3674 newprio = coro->prio - newprio;
3039 3675
3040 if (newprio < PRIO_MIN) newprio = PRIO_MIN; 3676 if (newprio < CORO_PRIO_MIN) newprio = CORO_PRIO_MIN;
3041 if (newprio > PRIO_MAX) newprio = PRIO_MAX; 3677 if (newprio > CORO_PRIO_MAX) newprio = CORO_PRIO_MAX;
3042 3678
3043 coro->prio = newprio; 3679 coro->prio = newprio;
3044 } 3680 }
3045} 3681}
3046 OUTPUT: 3682 OUTPUT:
… …
3061 RETVAL = coro_nready; 3697 RETVAL = coro_nready;
3062 OUTPUT: 3698 OUTPUT:
3063 RETVAL 3699 RETVAL
3064 3700
3065void 3701void
3702suspend (Coro::State self)
3703 PROTOTYPE: $
3704 CODE:
3705 self->flags |= CF_SUSPENDED;
3706
3707void
3708resume (Coro::State self)
3709 PROTOTYPE: $
3710 CODE:
3711 self->flags &= ~CF_SUSPENDED;
3712
3713void
3066_pool_handler (...) 3714_pool_handler (...)
3067 CODE: 3715 CODE:
3068 CORO_EXECUTE_SLF_XS (slf_init_pool_handler); 3716 CORO_EXECUTE_SLF_XS (slf_init_pool_handler);
3069 3717
3070void 3718void
… …
3081 for (i = 1; i < items; ++i) 3729 for (i = 1; i < items; ++i)
3082 av_push (av, SvREFCNT_inc_NN (ST (i))); 3730 av_push (av, SvREFCNT_inc_NN (ST (i)));
3083 3731
3084 if ((SV *)hv == &PL_sv_undef) 3732 if ((SV *)hv == &PL_sv_undef)
3085 { 3733 {
3086 PUSHMARK (SP); 3734 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3087 EXTEND (SP, 2);
3088 PUSHs (sv_Coro);
3089 PUSHs ((SV *)cv_pool_handler);
3090 PUTBACK;
3091 call_sv ((SV *)cv_coro_new, G_SCALAR);
3092 SPAGAIN;
3093
3094 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs)); 3735 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
3736 SvREFCNT_dec (sv);
3095 } 3737 }
3096 3738
3097 { 3739 {
3098 struct coro *coro = SvSTATE_hv (hv); 3740 struct coro *coro = SvSTATE_hv (hv);
3099 3741
… …
3123rouse_wait (...) 3765rouse_wait (...)
3124 PROTOTYPE: ;$ 3766 PROTOTYPE: ;$
3125 PPCODE: 3767 PPCODE:
3126 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait); 3768 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait);
3127 3769
3770void
3771on_enter (SV *block)
3772 ALIAS:
3773 on_leave = 1
3774 PROTOTYPE: &
3775 CODE:
3776{
3777 struct coro *coro = SvSTATE_current;
3778 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3779
3780 block = s_get_cv_croak (block);
3781
3782 if (!*avp)
3783 *avp = newAV ();
3784
3785 av_push (*avp, SvREFCNT_inc (block));
3786
3787 if (!ix)
3788 on_enterleave_call (aTHX_ block);
3789
3790 LEAVE; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
3791 SAVEDESTRUCTOR_X (ix ? coro_pop_on_leave : coro_pop_on_enter, (void *)coro);
3792 ENTER; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
3793}
3794
3128 3795
3129MODULE = Coro::State PACKAGE = PerlIO::cede 3796MODULE = Coro::State PACKAGE = PerlIO::cede
3130 3797
3131BOOT: 3798BOOT:
3132 PerlIO_define_layer (aTHX_ &PerlIO_cede); 3799 PerlIO_define_layer (aTHX_ &PerlIO_cede);
… …
3135MODULE = Coro::State PACKAGE = Coro::Semaphore 3802MODULE = Coro::State PACKAGE = Coro::Semaphore
3136 3803
3137SV * 3804SV *
3138new (SV *klass, SV *count = 0) 3805new (SV *klass, SV *count = 0)
3139 CODE: 3806 CODE:
3807{
3808 int semcnt = 1;
3809
3810 if (count)
3811 {
3812 SvGETMAGIC (count);
3813
3814 if (SvOK (count))
3815 semcnt = SvIV (count);
3816 }
3817
3140 RETVAL = sv_bless ( 3818 RETVAL = sv_bless (
3141 coro_waitarray_new (aTHX_ count && SvOK (count) ? SvIV (count) : 1), 3819 coro_waitarray_new (aTHX_ semcnt),
3142 GvSTASH (CvGV (cv)) 3820 GvSTASH (CvGV (cv))
3143 ); 3821 );
3822}
3144 OUTPUT: 3823 OUTPUT:
3145 RETVAL 3824 RETVAL
3146 3825
3147# helper for Coro::Channel 3826# helper for Coro::Channel and others
3148SV * 3827SV *
3149_alloc (int count) 3828_alloc (int count)
3150 CODE: 3829 CODE:
3151 RETVAL = coro_waitarray_new (aTHX_ count); 3830 RETVAL = coro_waitarray_new (aTHX_ count);
3152 OUTPUT: 3831 OUTPUT:
… …
3210 for (i = 1; i <= wcount; ++i) 3889 for (i = 1; i <= wcount; ++i)
3211 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i]))); 3890 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i])));
3212 } 3891 }
3213} 3892}
3214 3893
3894MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3895
3896void
3897_may_delete (SV *sem, int count, int extra_refs)
3898 PPCODE:
3899{
3900 AV *av = (AV *)SvRV (sem);
3901
3902 if (SvREFCNT ((SV *)av) == 1 + extra_refs
3903 && AvFILLp (av) == 0 /* no waiters, just count */
3904 && SvIV (AvARRAY (av)[0]) == count)
3905 XSRETURN_YES;
3906
3907 XSRETURN_NO;
3908}
3909
3215MODULE = Coro::State PACKAGE = Coro::Signal 3910MODULE = Coro::State PACKAGE = Coro::Signal
3216 3911
3217SV * 3912SV *
3218new (SV *klass) 3913new (SV *klass)
3219 CODE: 3914 CODE:
… …
3290 3985
3291void 3986void
3292_register (char *target, char *proto, SV *req) 3987_register (char *target, char *proto, SV *req)
3293 CODE: 3988 CODE:
3294{ 3989{
3295 CV *req_cv = coro_sv_2cv (aTHX_ req); 3990 SV *req_cv = s_get_cv_croak (req);
3296 /* newXSproto doesn't return the CV on 5.8 */ 3991 /* newXSproto doesn't return the CV on 5.8 */
3297 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 3992 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3298 sv_setpv ((SV *)slf_cv, proto); 3993 sv_setpv ((SV *)slf_cv, proto);
3299 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0); 3994 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
3300} 3995}
3301 3996
3997MODULE = Coro::State PACKAGE = Coro::Select
3998
3999void
4000patch_pp_sselect ()
4001 CODE:
4002 if (!coro_old_pp_sselect)
4003 {
4004 coro_select_select = (SV *)get_cv ("Coro::Select::select", 0);
4005 coro_old_pp_sselect = PL_ppaddr [OP_SSELECT];
4006 PL_ppaddr [OP_SSELECT] = coro_pp_sselect;
4007 }
4008
4009void
4010unpatch_pp_sselect ()
4011 CODE:
4012 if (coro_old_pp_sselect)
4013 {
4014 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
4015 coro_old_pp_sselect = 0;
4016 }
4017

Diff Legend

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