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.302 by root, Wed Nov 19 04:48:24 2008 UTC vs.
Revision 1.386 by root, Sat Feb 19 06:51:23 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>
21
22#ifndef SVs_PADSTALE
23# define SVs_PADSTALE 0
24#endif
16 25
17#ifdef WIN32 26#ifdef WIN32
18# undef setjmp 27# undef setjmp
19# undef longjmp 28# undef longjmp
20# undef _exit 29# undef _exit
… …
51#endif 60#endif
52 61
53/* the maximum number of idle cctx that will be pooled */ 62/* the maximum number of idle cctx that will be pooled */
54static int cctx_max_idle = 4; 63static int cctx_max_idle = 4;
55 64
56#define PERL_VERSION_ATLEAST(a,b,c) \
57 (PERL_REVISION > (a) \
58 || (PERL_REVISION == (a) \
59 && (PERL_VERSION > (b) \
60 || (PERL_VERSION == (b) && PERLSUBVERSION >= (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 65#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
110# undef CORO_STACKGUARD 66# undef CORO_STACKGUARD
111#endif 67#endif
112 68
113#ifndef CORO_STACKGUARD 69#ifndef CORO_STACKGUARD
… …
127#else 83#else
128# define dSTACKLEVEL volatile void *stacklevel 84# define dSTACKLEVEL volatile void *stacklevel
129# define STACKLEVEL ((void *)&stacklevel) 85# define STACKLEVEL ((void *)&stacklevel)
130#endif 86#endif
131 87
132#define IN_DESTRUCT (PL_main_cv == Nullcv) 88#define IN_DESTRUCT PL_dirty
133 89
134#if __GNUC__ >= 3 90#if __GNUC__ >= 3
135# define attribute(x) __attribute__(x) 91# define attribute(x) __attribute__(x)
136# define expect(expr,value) __builtin_expect ((expr),(value)) 92# define expect(expr,value) __builtin_expect ((expr), (value))
137# define INLINE static inline 93# define INLINE static inline
138#else 94#else
139# define attribute(x) 95# define attribute(x)
140# define expect(expr,value) (expr) 96# define expect(expr,value) (expr)
141# define INLINE static 97# define INLINE static
… …
153# if CORO_PTHREAD 109# if CORO_PTHREAD
154static void *coro_thx; 110static void *coro_thx;
155# endif 111# endif
156#endif 112#endif
157 113
114#ifdef __linux
115# include <time.h> /* for timespec */
116# include <syscall.h> /* for SYS_* */
117# ifdef SYS_clock_gettime
118# define coro_clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
119# define CORO_CLOCK_MONOTONIC 1
120# define CORO_CLOCK_THREAD_CPUTIME_ID 3
121# endif
122#endif
123
158static double (*nvtime)(); /* so why doesn't it take void? */ 124static double (*nvtime)(); /* so why doesn't it take void? */
125static void (*u2time)(pTHX_ UV ret[2]);
159 126
160/* we hijack an hopefully unused CV flag for our purposes */ 127/* we hijack an hopefully unused CV flag for our purposes */
161#define CVf_SLF 0x4000 128#define CVf_SLF 0x4000
162static OP *pp_slf (pTHX); 129static OP *pp_slf (pTHX);
163 130
… …
167static AV *main_mainstack; /* used to differentiate between $main and others */ 134static AV *main_mainstack; /* used to differentiate between $main and others */
168static JMPENV *main_top_env; 135static JMPENV *main_top_env;
169static HV *coro_state_stash, *coro_stash; 136static HV *coro_state_stash, *coro_stash;
170static volatile SV *coro_mortal; /* will be freed/thrown after next transfer */ 137static volatile SV *coro_mortal; /* will be freed/thrown after next transfer */
171 138
139static AV *av_destroy; /* destruction queue */
140static SV *sv_manager; /* the manager coro */
141static SV *sv_idle; /* $Coro::idle */
142
172static GV *irsgv; /* $/ */ 143static GV *irsgv; /* $/ */
173static GV *stdoutgv; /* *STDOUT */ 144static GV *stdoutgv; /* *STDOUT */
174static SV *rv_diehook; 145static SV *rv_diehook;
175static SV *rv_warnhook; 146static SV *rv_warnhook;
176static HV *hv_sig; /* %SIG */ 147static HV *hv_sig; /* %SIG */
177 148
178/* async_pool helper stuff */ 149/* async_pool helper stuff */
179static SV *sv_pool_rss; 150static SV *sv_pool_rss;
180static SV *sv_pool_size; 151static SV *sv_pool_size;
152static SV *sv_async_pool_idle; /* description string */
181static AV *av_async_pool; 153static AV *av_async_pool; /* idle pool */
154static SV *sv_Coro; /* class string */
155static CV *cv_pool_handler;
182 156
183/* Coro::AnyEvent */ 157/* Coro::AnyEvent */
184static SV *sv_activity; 158static SV *sv_activity;
159
160/* enable processtime/realtime profiling */
161static char enable_times;
162typedef U32 coro_ts[2];
163static coro_ts time_real, time_cpu;
164static char times_valid;
185 165
186static struct coro_cctx *cctx_first; 166static struct coro_cctx *cctx_first;
187static int cctx_count, cctx_idle; 167static int cctx_count, cctx_idle;
188 168
189enum { 169enum {
… …
215 int valgrind_id; 195 int valgrind_id;
216#endif 196#endif
217 unsigned char flags; 197 unsigned char flags;
218} coro_cctx; 198} coro_cctx;
219 199
200coro_cctx *cctx_current; /* the currently running cctx */
201
202/*****************************************************************************/
203
220enum { 204enum {
221 CF_RUNNING = 0x0001, /* coroutine is running */ 205 CF_RUNNING = 0x0001, /* coroutine is running */
222 CF_READY = 0x0002, /* coroutine is ready */ 206 CF_READY = 0x0002, /* coroutine is ready */
223 CF_NEW = 0x0004, /* has never been switched to */ 207 CF_NEW = 0x0004, /* has never been switched to */
224 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 208 CF_DESTROYED = 0x0008, /* coroutine data has been freed */
209 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
225}; 210};
226 211
227/* the structure where most of the perl state is stored, overlaid on the cxstack */ 212/* the structure where most of the perl state is stored, overlaid on the cxstack */
228typedef struct 213typedef struct
229{ 214{
230 SV *defsv; 215 SV *defsv;
231 AV *defav; 216 AV *defav;
232 SV *errsv; 217 SV *errsv;
233 SV *irsgv; 218 SV *irsgv;
219 HV *hinthv;
234#define VAR(name,type) type name; 220#define VAR(name,type) type name;
235# include "state.h" 221# include "state.h"
236#undef VAR 222#undef VAR
237} perl_slots; 223} perl_slots;
238 224
… …
241/* this is a structure representing a perl-level coroutine */ 227/* this is a structure representing a perl-level coroutine */
242struct coro { 228struct coro {
243 /* the C coroutine allocated to this perl coroutine, if any */ 229 /* the C coroutine allocated to this perl coroutine, if any */
244 coro_cctx *cctx; 230 coro_cctx *cctx;
245 231
232 /* ready queue */
233 struct coro *next_ready;
234
246 /* state data */ 235 /* state data */
247 struct CoroSLF slf_frame; /* saved slf frame */ 236 struct CoroSLF slf_frame; /* saved slf frame */
248 AV *mainstack; 237 AV *mainstack;
249 perl_slots *slot; /* basically the saved sp */ 238 perl_slots *slot; /* basically the saved sp */
250 239
240 CV *startcv; /* the CV to execute */
251 AV *args; /* data associated with this coroutine (initial args) */ 241 AV *args; /* data associated with this coroutine (initial args) */
252 int refcnt; /* coroutines are refcounted, yes */ 242 int refcnt; /* coroutines are refcounted, yes */
253 int flags; /* CF_ flags */ 243 int flags; /* CF_ flags */
254 HV *hv; /* the perl hash associated with this coro, if any */ 244 HV *hv; /* the perl hash associated with this coro, if any */
255 void (*on_destroy)(pTHX_ struct coro *coro); 245 void (*on_destroy)(pTHX_ struct coro *coro); /* for temporary use by xs in critical sections */
256 246
257 /* statistics */ 247 /* statistics */
258 int usecount; /* number of transfers to this coro */ 248 int usecount; /* number of transfers to this coro */
259 249
260 /* coro process data */ 250 /* coro process data */
… …
262 SV *except; /* exception to be thrown */ 252 SV *except; /* exception to be thrown */
263 SV *rouse_cb; 253 SV *rouse_cb;
264 254
265 /* async_pool */ 255 /* async_pool */
266 SV *saved_deffh; 256 SV *saved_deffh;
257 SV *invoke_cb;
258 AV *invoke_av;
259
260 /* on_enter/on_leave */
261 AV *on_enter;
262 AV *on_leave;
263
264 /* swap_sv */
265 AV *swap_sv;
266
267 /* times */
268 coro_ts t_cpu, t_real;
267 269
268 /* linked list */ 270 /* linked list */
269 struct coro *next, *prev; 271 struct coro *next, *prev;
270}; 272};
271 273
… …
277/* the mainr easonw e don't support windows process emulation */ 279/* the mainr easonw e don't support windows process emulation */
278static struct CoroSLF slf_frame; /* the current slf frame */ 280static struct CoroSLF slf_frame; /* the current slf frame */
279 281
280/** Coro ********************************************************************/ 282/** Coro ********************************************************************/
281 283
282#define PRIO_MAX 3 284#define CORO_PRIO_MAX 3
283#define PRIO_HIGH 1 285#define CORO_PRIO_HIGH 1
284#define PRIO_NORMAL 0 286#define CORO_PRIO_NORMAL 0
285#define PRIO_LOW -1 287#define CORO_PRIO_LOW -1
286#define PRIO_IDLE -3 288#define CORO_PRIO_IDLE -3
287#define PRIO_MIN -4 289#define CORO_PRIO_MIN -4
288 290
289/* for Coro.pm */ 291/* for Coro.pm */
290static SV *coro_current; 292static SV *coro_current;
291static SV *coro_readyhook; 293static SV *coro_readyhook;
292static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1]; 294static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
295static CV *cv_coro_run, *cv_coro_terminate;
293static struct coro *coro_first; 296static struct coro *coro_first;
294#define coro_nready coroapi.nready 297#define coro_nready coroapi.nready
298
299/** Coro::Select ************************************************************/
300
301static OP *(*coro_old_pp_sselect) (pTHX);
302static SV *coro_select_select;
303
304/* horrible hack, but if it works... */
305static OP *
306coro_pp_sselect (pTHX)
307{
308 dSP;
309 PUSHMARK (SP - 4); /* fake argument list */
310 XPUSHs (coro_select_select);
311 PUTBACK;
312
313 /* entersub is an UNOP, select a LISTOP... keep your fingers crossed */
314 PL_op->op_flags |= OPf_STACKED;
315 PL_op->op_private = 0;
316 return PL_ppaddr [OP_ENTERSUB](aTHX);
317}
318
319/** time stuff **************************************************************/
320
321#ifdef HAS_GETTIMEOFDAY
322
323static void
324coro_u2time (aTHX_ UV ret[2])
325{
326 struct timeval tv;
327 gettimeofday (&tv, 0);
328
329 ret [0] = tv.tv_sec;
330 ret [1] = tv.tv_usec;
331}
332
333static double
334coro_nvtime ()
335{
336 struct timeval tv;
337 gettimeofday (&tv, 0);
338
339 return tv.tv_sec + tv.tv_usec * 1e-6;
340}
341
342static void
343time_init (void)
344{
345 nvtime = coro_nvtime;
346 u2time = coro_u2time;
347}
348
349#else
350
351static void
352time_init (void)
353{
354 SV **svp;
355
356 require_pv ("Time::HiRes");
357
358 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
359
360 if (!svp) croak ("Time::HiRes is required");
361 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
362
363 nvtime = INT2PTR (double (*)(), SvIV (*svp));
364
365 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
366 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
367}
368
369#endif
295 370
296/** lowlevel stuff **********************************************************/ 371/** lowlevel stuff **********************************************************/
297 372
298static SV * 373static SV *
299coro_get_sv (pTHX_ const char *name, int create) 374coro_get_sv (pTHX_ const char *name, int create)
… …
323 get_hv (name, create); 398 get_hv (name, create);
324#endif 399#endif
325 return get_hv (name, create); 400 return get_hv (name, create);
326} 401}
327 402
403INLINE void
404coro_times_update ()
405{
406#ifdef coro_clock_gettime
407 struct timespec ts;
408
409 ts.tv_sec = ts.tv_nsec = 0;
410 coro_clock_gettime (CORO_CLOCK_THREAD_CPUTIME_ID, &ts);
411 time_cpu [0] = ts.tv_sec; time_cpu [1] = ts.tv_nsec;
412
413 ts.tv_sec = ts.tv_nsec = 0;
414 coro_clock_gettime (CORO_CLOCK_MONOTONIC, &ts);
415 time_real [0] = ts.tv_sec; time_real [1] = ts.tv_nsec;
416#else
417 dTHX;
418 UV tv[2];
419
420 u2time (aTHX_ tv);
421 time_real [0] = tv [0];
422 time_real [1] = tv [1] * 1000;
423#endif
424}
425
426INLINE void
427coro_times_add (struct coro *c)
428{
429 c->t_real [1] += time_real [1];
430 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
431 c->t_real [0] += time_real [0];
432
433 c->t_cpu [1] += time_cpu [1];
434 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
435 c->t_cpu [0] += time_cpu [0];
436}
437
438INLINE void
439coro_times_sub (struct coro *c)
440{
441 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; }
442 c->t_real [1] -= time_real [1];
443 c->t_real [0] -= time_real [0];
444
445 if (c->t_cpu [1] < time_cpu [1]) { c->t_cpu [1] += 1000000000; --c->t_cpu [0]; }
446 c->t_cpu [1] -= time_cpu [1];
447 c->t_cpu [0] -= time_cpu [0];
448}
449
450/*****************************************************************************/
451/* magic glue */
452
453#define CORO_MAGIC_type_cv 26
454#define CORO_MAGIC_type_state PERL_MAGIC_ext
455
456#define CORO_MAGIC_NN(sv, type) \
457 (expect_true (SvMAGIC (sv)->mg_type == type) \
458 ? SvMAGIC (sv) \
459 : mg_find (sv, type))
460
461#define CORO_MAGIC(sv, type) \
462 (expect_true (SvMAGIC (sv)) \
463 ? CORO_MAGIC_NN (sv, type) \
464 : 0)
465
466#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
467#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
468
469INLINE struct coro *
470SvSTATE_ (pTHX_ SV *coro)
471{
472 HV *stash;
473 MAGIC *mg;
474
475 if (SvROK (coro))
476 coro = SvRV (coro);
477
478 if (expect_false (SvTYPE (coro) != SVt_PVHV))
479 croak ("Coro::State object required");
480
481 stash = SvSTASH (coro);
482 if (expect_false (stash != coro_stash && stash != coro_state_stash))
483 {
484 /* very slow, but rare, check */
485 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
486 croak ("Coro::State object required");
487 }
488
489 mg = CORO_MAGIC_state (coro);
490 return (struct coro *)mg->mg_ptr;
491}
492
493#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
494
495/* faster than SvSTATE, but expects a coroutine hv */
496#define SvSTATE_hv(hv) ((struct coro *)CORO_MAGIC_NN ((SV *)hv, CORO_MAGIC_type_state)->mg_ptr)
497#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
498
499/*****************************************************************************/
500/* padlist management and caching */
501
328static AV * 502static AV *
329coro_clone_padlist (pTHX_ CV *cv) 503coro_derive_padlist (pTHX_ CV *cv)
330{ 504{
331 AV *padlist = CvPADLIST (cv); 505 AV *padlist = CvPADLIST (cv);
332 AV *newpadlist, *newpad; 506 AV *newpadlist, *newpad;
333 507
334 newpadlist = newAV (); 508 newpadlist = newAV ();
… …
339 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 513 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
340#endif 514#endif
341 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 515 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
342 --AvFILLp (padlist); 516 --AvFILLp (padlist);
343 517
344 av_store (newpadlist, 0, SvREFCNT_inc_NN (*av_fetch (padlist, 0, FALSE))); 518 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0]));
345 av_store (newpadlist, 1, (SV *)newpad); 519 av_store (newpadlist, 1, (SV *)newpad);
346 520
347 return newpadlist; 521 return newpadlist;
348} 522}
349 523
350static void 524static void
351free_padlist (pTHX_ AV *padlist) 525free_padlist (pTHX_ AV *padlist)
352{ 526{
353 /* may be during global destruction */ 527 /* may be during global destruction */
354 if (SvREFCNT (padlist)) 528 if (!IN_DESTRUCT)
355 { 529 {
356 I32 i = AvFILLp (padlist); 530 I32 i = AvFILLp (padlist);
357 while (i >= 0) 531
532 while (i > 0) /* special-case index 0 */
358 { 533 {
359 SV **svp = av_fetch (padlist, i--, FALSE); 534 /* we try to be extra-careful here */
360 if (svp) 535 AV *av = (AV *)AvARRAY (padlist)[i--];
361 { 536 I32 j = AvFILLp (av);
362 SV *sv; 537
363 while (&PL_sv_undef != (sv = av_pop ((AV *)*svp))) 538 while (j >= 0)
539 SvREFCNT_dec (AvARRAY (av)[j--]);
540
541 AvFILLp (av) = -1;
364 SvREFCNT_dec (sv); 542 SvREFCNT_dec (av);
365
366 SvREFCNT_dec (*svp);
367 }
368 } 543 }
369 544
545 SvREFCNT_dec (AvARRAY (padlist)[0]);
546
547 AvFILLp (padlist) = -1;
370 SvREFCNT_dec ((SV*)padlist); 548 SvREFCNT_dec ((SV*)padlist);
371 } 549 }
372} 550}
373 551
374static int 552static int
375coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 553coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
376{ 554{
377 AV *padlist; 555 AV *padlist;
378 AV *av = (AV *)mg->mg_obj; 556 AV *av = (AV *)mg->mg_obj;
557
558 /* perl manages to free our internal AV and _then_ call us */
559 if (IN_DESTRUCT)
560 return 0;
379 561
380 /* casting is fun. */ 562 /* casting is fun. */
381 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 563 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
382 free_padlist (aTHX_ padlist); 564 free_padlist (aTHX_ padlist);
383 565
384 SvREFCNT_dec (av); /* sv_magicext increased the refcount */ 566 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
385 567
386 return 0; 568 return 0;
387} 569}
388
389#define CORO_MAGIC_type_cv 26
390#define CORO_MAGIC_type_state PERL_MAGIC_ext
391 570
392static MGVTBL coro_cv_vtbl = { 571static MGVTBL coro_cv_vtbl = {
393 0, 0, 0, 0, 572 0, 0, 0, 0,
394 coro_cv_free 573 coro_cv_free
395}; 574};
396
397#define CORO_MAGIC_NN(sv, type) \
398 (expect_true (SvMAGIC (sv)->mg_type == type) \
399 ? SvMAGIC (sv) \
400 : mg_find (sv, type))
401
402#define CORO_MAGIC(sv, type) \
403 (expect_true (SvMAGIC (sv)) \
404 ? CORO_MAGIC_NN (sv, type) \
405 : 0)
406
407#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
408#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
409
410INLINE struct coro *
411SvSTATE_ (pTHX_ SV *coro)
412{
413 HV *stash;
414 MAGIC *mg;
415
416 if (SvROK (coro))
417 coro = SvRV (coro);
418
419 if (expect_false (SvTYPE (coro) != SVt_PVHV))
420 croak ("Coro::State object required");
421
422 stash = SvSTASH (coro);
423 if (expect_false (stash != coro_stash && stash != coro_state_stash))
424 {
425 /* very slow, but rare, check */
426 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
427 croak ("Coro::State object required");
428 }
429
430 mg = CORO_MAGIC_state (coro);
431 return (struct coro *)mg->mg_ptr;
432}
433
434#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
435
436/* faster than SvSTATE, but expects a coroutine hv */
437#define SvSTATE_hv(hv) ((struct coro *)CORO_MAGIC_NN ((SV *)hv, CORO_MAGIC_type_state)->mg_ptr)
438#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
439 575
440/* the next two functions merely cache the padlists */ 576/* the next two functions merely cache the padlists */
441static void 577static void
442get_padlist (pTHX_ CV *cv) 578get_padlist (pTHX_ CV *cv)
443{ 579{
… …
449 else 585 else
450 { 586 {
451#if CORO_PREFER_PERL_FUNCTIONS 587#if CORO_PREFER_PERL_FUNCTIONS
452 /* this is probably cleaner? but also slower! */ 588 /* this is probably cleaner? but also slower! */
453 /* in practise, it seems to be less stable */ 589 /* in practise, it seems to be less stable */
454 CV *cp = Perl_cv_clone (cv); 590 CV *cp = Perl_cv_clone (aTHX_ cv);
455 CvPADLIST (cv) = CvPADLIST (cp); 591 CvPADLIST (cv) = CvPADLIST (cp);
456 CvPADLIST (cp) = 0; 592 CvPADLIST (cp) = 0;
457 SvREFCNT_dec (cp); 593 SvREFCNT_dec (cp);
458#else 594#else
459 CvPADLIST (cv) = coro_clone_padlist (aTHX_ cv); 595 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
460#endif 596#endif
461 } 597 }
462} 598}
463 599
464static void 600static void
… …
471 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 607 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
472 608
473 av = (AV *)mg->mg_obj; 609 av = (AV *)mg->mg_obj;
474 610
475 if (expect_false (AvFILLp (av) >= AvMAX (av))) 611 if (expect_false (AvFILLp (av) >= AvMAX (av)))
476 av_extend (av, AvMAX (av) + 1); 612 av_extend (av, AvFILLp (av) + 1);
477 613
478 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 614 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
479} 615}
480 616
481/** load & save, init *******************************************************/ 617/** load & save, init *******************************************************/
618
619/* swap sv heads, at least logically */
620static void
621swap_svs (pTHX_ Coro__State c)
622{
623 int i;
624
625 for (i = 0; i <= AvFILLp (c->swap_sv); )
626 {
627 SV *a = AvARRAY (c->swap_sv)[i++];
628 SV *b = AvARRAY (c->swap_sv)[i++];
629
630 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
631 SV tmp;
632
633 /* swap sv_any */
634 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
635
636 /* swap sv_flags */
637 SvFLAGS (&tmp) = SvFLAGS (a);
638 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
639 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
640
641#if PERL_VERSION_ATLEAST (5,10,0)
642 /* perl 5.10 complicates this _quite_ a bit, but it also is
643 * much faster, so no quarrels here. alternatively, we could
644 * sv_upgrade to avoid this.
645 */
646 {
647 /* swap sv_u */
648 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
649
650 /* if SvANY points to the head, we need to adjust the pointers,
651 * as the pointer for a still points to b, and maybe vice versa.
652 */
653 #define svany_in_head(type) \
654 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
655
656 if (svany_in_head (SvTYPE (a)))
657 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
658
659 if (svany_in_head (SvTYPE (b)))
660 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
661 }
662#endif
663 }
664}
665
666#define SWAP_SVS(coro) \
667 if (expect_false ((coro)->swap_sv)) \
668 swap_svs (aTHX_ (coro))
669
670static void
671on_enterleave_call (pTHX_ SV *cb);
482 672
483static void 673static void
484load_perl (pTHX_ Coro__State c) 674load_perl (pTHX_ Coro__State c)
485{ 675{
486 perl_slots *slot = c->slot; 676 perl_slots *slot = c->slot;
487 c->slot = 0; 677 c->slot = 0;
488 678
489 PL_mainstack = c->mainstack; 679 PL_mainstack = c->mainstack;
490 680
491 GvSV (PL_defgv) = slot->defsv; 681 GvSV (PL_defgv) = slot->defsv;
492 GvAV (PL_defgv) = slot->defav; 682 GvAV (PL_defgv) = slot->defav;
493 GvSV (PL_errgv) = slot->errsv; 683 GvSV (PL_errgv) = slot->errsv;
494 GvSV (irsgv) = slot->irsgv; 684 GvSV (irsgv) = slot->irsgv;
685 GvHV (PL_hintgv) = slot->hinthv;
495 686
496 #define VAR(name,type) PL_ ## name = slot->name; 687 #define VAR(name,type) PL_ ## name = slot->name;
497 # include "state.h" 688 # include "state.h"
498 #undef VAR 689 #undef VAR
499 690
… …
513 PUTBACK; 704 PUTBACK;
514 } 705 }
515 706
516 slf_frame = c->slf_frame; 707 slf_frame = c->slf_frame;
517 CORO_THROW = c->except; 708 CORO_THROW = c->except;
709
710 if (expect_false (enable_times))
711 {
712 if (expect_false (!times_valid))
713 coro_times_update ();
714
715 coro_times_sub (c);
716 }
717
718 if (expect_false (c->on_enter))
719 {
720 int i;
721
722 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
723 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
724 }
725
726 SWAP_SVS (c);
518} 727}
519 728
520static void 729static void
521save_perl (pTHX_ Coro__State c) 730save_perl (pTHX_ Coro__State c)
522{ 731{
732 SWAP_SVS (c);
733
734 if (expect_false (c->on_leave))
735 {
736 int i;
737
738 for (i = AvFILLp (c->on_leave); i >= 0; --i)
739 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
740 }
741
742 times_valid = 0;
743
744 if (expect_false (enable_times))
745 {
746 coro_times_update (); times_valid = 1;
747 coro_times_add (c);
748 }
749
523 c->except = CORO_THROW; 750 c->except = CORO_THROW;
524 c->slf_frame = slf_frame; 751 c->slf_frame = slf_frame;
525 752
526 { 753 {
527 dSP; 754 dSP;
… …
540 { 767 {
541 while (expect_true (cxix >= 0)) 768 while (expect_true (cxix >= 0))
542 { 769 {
543 PERL_CONTEXT *cx = &ccstk[cxix--]; 770 PERL_CONTEXT *cx = &ccstk[cxix--];
544 771
545 if (expect_true (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT)) 772 if (expect_true (CxTYPE (cx) == CXt_SUB) || expect_false (CxTYPE (cx) == CXt_FORMAT))
546 { 773 {
547 CV *cv = cx->blk_sub.cv; 774 CV *cv = cx->blk_sub.cv;
548 775
549 if (expect_true (CvDEPTH (cv))) 776 if (expect_true (CvDEPTH (cv)))
550 { 777 {
… …
574 /* we manually unroll here, as usually 2 slots is enough */ 801 /* we manually unroll here, as usually 2 slots is enough */
575 if (SLOT_COUNT >= 1) CXINC; 802 if (SLOT_COUNT >= 1) CXINC;
576 if (SLOT_COUNT >= 2) CXINC; 803 if (SLOT_COUNT >= 2) CXINC;
577 if (SLOT_COUNT >= 3) CXINC; 804 if (SLOT_COUNT >= 3) CXINC;
578 { 805 {
579 int i; 806 unsigned int i;
580 for (i = 3; i < SLOT_COUNT; ++i) 807 for (i = 3; i < SLOT_COUNT; ++i)
581 CXINC; 808 CXINC;
582 } 809 }
583 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 810 cxstack_ix -= SLOT_COUNT; /* undo allocation */
584 811
585 c->mainstack = PL_mainstack; 812 c->mainstack = PL_mainstack;
586 813
587 { 814 {
588 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 815 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
589 816
590 slot->defav = GvAV (PL_defgv); 817 slot->defav = GvAV (PL_defgv);
591 slot->defsv = DEFSV; 818 slot->defsv = DEFSV;
592 slot->errsv = ERRSV; 819 slot->errsv = ERRSV;
593 slot->irsgv = GvSV (irsgv); 820 slot->irsgv = GvSV (irsgv);
821 slot->hinthv = GvHV (PL_hintgv);
594 822
595 #define VAR(name,type) slot->name = PL_ ## name; 823 #define VAR(name,type) slot->name = PL_ ## name;
596 # include "state.h" 824 # include "state.h"
597 #undef VAR 825 #undef VAR
598 } 826 }
… …
603 * of perl.c:init_stacks, except that it uses less memory 831 * of perl.c:init_stacks, except that it uses less memory
604 * on the (sometimes correct) assumption that coroutines do 832 * on the (sometimes correct) assumption that coroutines do
605 * not usually need a lot of stackspace. 833 * not usually need a lot of stackspace.
606 */ 834 */
607#if CORO_PREFER_PERL_FUNCTIONS 835#if CORO_PREFER_PERL_FUNCTIONS
608# define coro_init_stacks init_stacks 836# define coro_init_stacks(thx) init_stacks ()
609#else 837#else
610static void 838static void
611coro_init_stacks (pTHX) 839coro_init_stacks (pTHX)
612{ 840{
613 PL_curstackinfo = new_stackinfo(32, 8); 841 PL_curstackinfo = new_stackinfo(32, 8);
… …
676#if !PERL_VERSION_ATLEAST (5,10,0) 904#if !PERL_VERSION_ATLEAST (5,10,0)
677 Safefree (PL_retstack); 905 Safefree (PL_retstack);
678#endif 906#endif
679} 907}
680 908
909#define CORO_RSS \
910 rss += sizeof (SYM (curstackinfo)); \
911 rss += (SYM (curstackinfo->si_cxmax) + 1) * sizeof (PERL_CONTEXT); \
912 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (SYM (curstack))) * sizeof (SV *); \
913 rss += SYM (tmps_max) * sizeof (SV *); \
914 rss += (SYM (markstack_max) - SYM (markstack_ptr)) * sizeof (I32); \
915 rss += SYM (scopestack_max) * sizeof (I32); \
916 rss += SYM (savestack_max) * sizeof (ANY);
917
681static size_t 918static size_t
682coro_rss (pTHX_ struct coro *coro) 919coro_rss (pTHX_ struct coro *coro)
683{ 920{
684 size_t rss = sizeof (*coro); 921 size_t rss = sizeof (*coro);
685 922
686 if (coro->mainstack) 923 if (coro->mainstack)
687 { 924 {
688 perl_slots tmp_slot;
689 perl_slots *slot;
690
691 if (coro->flags & CF_RUNNING) 925 if (coro->flags & CF_RUNNING)
692 { 926 {
693 slot = &tmp_slot; 927 #define SYM(sym) PL_ ## sym
694 928 CORO_RSS;
695 #define VAR(name,type) slot->name = PL_ ## name;
696 # include "state.h"
697 #undef VAR 929 #undef SYM
698 } 930 }
699 else 931 else
700 slot = coro->slot;
701
702 if (slot)
703 { 932 {
704 rss += sizeof (slot->curstackinfo); 933 #define SYM(sym) coro->slot->sym
705 rss += (slot->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT); 934 CORO_RSS;
706 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (slot->curstack)) * sizeof (SV *); 935 #undef SYM
707 rss += slot->tmps_max * sizeof (SV *);
708 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32);
709 rss += slot->scopestack_max * sizeof (I32);
710 rss += slot->savestack_max * sizeof (ANY);
711
712#if !PERL_VERSION_ATLEAST (5,10,0)
713 rss += slot->retstack_max * sizeof (OP *);
714#endif
715 } 936 }
716 } 937 }
717 938
718 return rss; 939 return rss;
719} 940}
… …
732#endif 953#endif
733 954
734/* 955/*
735 * This overrides the default magic get method of %SIG elements. 956 * This overrides the default magic get method of %SIG elements.
736 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook 957 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
737 * and instead of tryign to save and restore the hash elements, we just provide 958 * and instead of trying to save and restore the hash elements, we just provide
738 * readback here. 959 * readback here.
739 * We only do this when the hook is != 0, as they are often set to 0 temporarily,
740 * not expecting this to actually change the hook. This is a potential problem
741 * when a schedule happens then, but we ignore this.
742 */ 960 */
743static int 961static int
744coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 962coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
745{ 963{
746 const char *s = MgPV_nolen_const (mg); 964 const char *s = MgPV_nolen_const (mg);
… …
799 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 1017 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
800 1018
801 if (svp) 1019 if (svp)
802 { 1020 {
803 SV *old = *svp; 1021 SV *old = *svp;
804 *svp = newSVsv (sv); 1022 *svp = SvOK (sv) ? newSVsv (sv) : 0;
805 SvREFCNT_dec (old); 1023 SvREFCNT_dec (old);
806 return 0; 1024 return 0;
807 } 1025 }
808 } 1026 }
809 1027
… …
821slf_check_nop (pTHX_ struct CoroSLF *frame) 1039slf_check_nop (pTHX_ struct CoroSLF *frame)
822{ 1040{
823 return 0; 1041 return 0;
824} 1042}
825 1043
826static UNOP coro_setup_op; 1044static int
1045slf_check_repeat (pTHX_ struct CoroSLF *frame)
1046{
1047 return 1;
1048}
1049
1050static UNOP init_perl_op;
827 1051
828static void NOINLINE /* noinline to keep it out of the transfer fast path */ 1052static void NOINLINE /* noinline to keep it out of the transfer fast path */
829coro_setup (pTHX_ struct coro *coro) 1053init_perl (pTHX_ struct coro *coro)
830{ 1054{
831 /* 1055 /*
832 * emulate part of the perl startup here. 1056 * emulate part of the perl startup here.
833 */ 1057 */
834 coro_init_stacks (aTHX); 1058 coro_init_stacks (aTHX);
835 1059
836 PL_runops = RUNOPS_DEFAULT; 1060 PL_runops = RUNOPS_DEFAULT;
837 PL_curcop = &PL_compiling; 1061 PL_curcop = &PL_compiling;
838 PL_in_eval = EVAL_NULL; 1062 PL_in_eval = EVAL_NULL;
839 PL_comppad = 0; 1063 PL_comppad = 0;
1064 PL_comppad_name = 0;
1065 PL_comppad_name_fill = 0;
1066 PL_comppad_name_floor = 0;
840 PL_curpm = 0; 1067 PL_curpm = 0;
841 PL_curpad = 0; 1068 PL_curpad = 0;
842 PL_localizing = 0; 1069 PL_localizing = 0;
843 PL_dirty = 0;
844 PL_restartop = 0; 1070 PL_restartop = 0;
845#if PERL_VERSION_ATLEAST (5,10,0) 1071#if PERL_VERSION_ATLEAST (5,10,0)
846 PL_parser = 0; 1072 PL_parser = 0;
847#endif 1073#endif
1074 PL_hints = 0;
848 1075
849 /* recreate the die/warn hooks */ 1076 /* recreate the die/warn hooks */
850 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1077 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook );
851 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1078 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook);
852 1079
853 GvSV (PL_defgv) = newSV (0); 1080 GvSV (PL_defgv) = newSV (0);
854 GvAV (PL_defgv) = coro->args; coro->args = 0; 1081 GvAV (PL_defgv) = coro->args; coro->args = 0;
855 GvSV (PL_errgv) = newSV (0); 1082 GvSV (PL_errgv) = newSV (0);
856 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1083 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
1084 GvHV (PL_hintgv) = 0;
857 PL_rs = newSVsv (GvSV (irsgv)); 1085 PL_rs = newSVsv (GvSV (irsgv));
858 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1086 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
859 1087
860 { 1088 {
861 dSP; 1089 dSP;
862 UNOP myop; 1090 UNOP myop;
863 1091
864 Zero (&myop, 1, UNOP); 1092 Zero (&myop, 1, UNOP);
865 myop.op_next = Nullop; 1093 myop.op_next = Nullop;
1094 myop.op_type = OP_ENTERSUB;
866 myop.op_flags = OPf_WANT_VOID; 1095 myop.op_flags = OPf_WANT_VOID;
867 1096
868 PUSHMARK (SP); 1097 PUSHMARK (SP);
869 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv)))); 1098 PUSHs ((SV *)coro->startcv);
870 PUTBACK; 1099 PUTBACK;
871 PL_op = (OP *)&myop; 1100 PL_op = (OP *)&myop;
872 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 1101 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
873 SPAGAIN;
874 } 1102 }
875 1103
876 /* this newly created coroutine might be run on an existing cctx which most 1104 /* this newly created coroutine might be run on an existing cctx which most
877 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here. 1105 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
878 */ 1106 */
879 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1107 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
880 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */ 1108 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
881 1109
882 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1110 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */
883 coro_setup_op.op_next = PL_op; 1111 init_perl_op.op_next = PL_op;
884 coro_setup_op.op_type = OP_CUSTOM; 1112 init_perl_op.op_type = OP_ENTERSUB;
885 coro_setup_op.op_ppaddr = pp_slf; 1113 init_perl_op.op_ppaddr = pp_slf;
886 /* no flags required, as an init function won't be called */ 1114 /* no flags etc. required, as an init function won't be called */
887 1115
888 PL_op = (OP *)&coro_setup_op; 1116 PL_op = (OP *)&init_perl_op;
889 1117
890 /* copy throw, in case it was set before coro_setup */ 1118 /* copy throw, in case it was set before init_perl */
891 CORO_THROW = coro->except; 1119 CORO_THROW = coro->except;
892}
893 1120
1121 SWAP_SVS (coro);
1122
1123 if (expect_false (enable_times))
1124 {
1125 coro_times_update ();
1126 coro_times_sub (coro);
1127 }
1128}
1129
894static void 1130static void
895coro_destruct (pTHX_ struct coro *coro) 1131coro_unwind_stacks (pTHX)
896{ 1132{
897 if (!IN_DESTRUCT) 1133 if (!IN_DESTRUCT)
898 { 1134 {
899 /* restore all saved variables and stuff */ 1135 /* restore all saved variables and stuff */
900 LEAVE_SCOPE (0); 1136 LEAVE_SCOPE (0);
… …
908 POPSTACK_TO (PL_mainstack); 1144 POPSTACK_TO (PL_mainstack);
909 1145
910 /* unwind main stack */ 1146 /* unwind main stack */
911 dounwind (-1); 1147 dounwind (-1);
912 } 1148 }
1149}
913 1150
914 SvREFCNT_dec (GvSV (PL_defgv)); 1151static void
915 SvREFCNT_dec (GvAV (PL_defgv)); 1152destroy_perl (pTHX_ struct coro *coro)
916 SvREFCNT_dec (GvSV (PL_errgv)); 1153{
917 SvREFCNT_dec (PL_defoutgv); 1154 SV *svf [9];
918 SvREFCNT_dec (PL_rs);
919 SvREFCNT_dec (GvSV (irsgv));
920 1155
921 SvREFCNT_dec (PL_diehook);
922 SvREFCNT_dec (PL_warnhook);
923 1156 {
924 SvREFCNT_dec (CORO_THROW); 1157 struct coro *current = SvSTATE_current;
1158
1159 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1160
1161 save_perl (aTHX_ current);
1162 load_perl (aTHX_ coro);
1163
1164 coro_unwind_stacks (aTHX);
1165 coro_destruct_stacks (aTHX);
1166
1167 /* restore swapped sv's */
1168 SWAP_SVS (coro);
1169
1170 // now save some sv's to be free'd later
1171 svf [0] = GvSV (PL_defgv);
1172 svf [1] = (SV *)GvAV (PL_defgv);
1173 svf [2] = GvSV (PL_errgv);
1174 svf [3] = (SV *)PL_defoutgv;
1175 svf [4] = PL_rs;
1176 svf [5] = GvSV (irsgv);
1177 svf [6] = (SV *)GvHV (PL_hintgv);
1178 svf [7] = PL_diehook;
1179 svf [8] = PL_warnhook;
1180 assert (9 == sizeof (svf) / sizeof (*svf));
1181
1182 load_perl (aTHX_ current);
1183 }
1184
1185 {
1186 unsigned int i;
1187
1188 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i)
1189 SvREFCNT_dec (svf [i]);
1190
925 SvREFCNT_dec (coro->saved_deffh); 1191 SvREFCNT_dec (coro->saved_deffh);
926 SvREFCNT_dec (coro->rouse_cb); 1192 SvREFCNT_dec (coro->rouse_cb);
927 1193 SvREFCNT_dec (coro->invoke_cb);
928 coro_destruct_stacks (aTHX); 1194 SvREFCNT_dec (coro->invoke_av);
1195 }
929} 1196}
930 1197
931INLINE void 1198INLINE void
932free_coro_mortal (pTHX) 1199free_coro_mortal (pTHX)
933{ 1200{
… …
941static int 1208static int
942runops_trace (pTHX) 1209runops_trace (pTHX)
943{ 1210{
944 COP *oldcop = 0; 1211 COP *oldcop = 0;
945 int oldcxix = -2; 1212 int oldcxix = -2;
946 struct coro *coro = SvSTATE_current; /* trace cctx is tied to specific coro */
947 coro_cctx *cctx = coro->cctx;
948 1213
949 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX))) 1214 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX)))
950 { 1215 {
951 PERL_ASYNC_CHECK (); 1216 PERL_ASYNC_CHECK ();
952 1217
953 if (cctx->flags & CC_TRACE_ALL) 1218 if (cctx_current->flags & CC_TRACE_ALL)
954 { 1219 {
955 if (PL_op->op_type == OP_LEAVESUB && cctx->flags & CC_TRACE_SUB) 1220 if (PL_op->op_type == OP_LEAVESUB && cctx_current->flags & CC_TRACE_SUB)
956 { 1221 {
957 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1222 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
958 SV **bot, **top; 1223 SV **bot, **top;
959 AV *av = newAV (); /* return values */ 1224 AV *av = newAV (); /* return values */
960 SV **cb; 1225 SV **cb;
… …
997 1262
998 if (PL_curcop != &PL_compiling) 1263 if (PL_curcop != &PL_compiling)
999 { 1264 {
1000 SV **cb; 1265 SV **cb;
1001 1266
1002 if (oldcxix != cxstack_ix && cctx->flags & CC_TRACE_SUB) 1267 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB)
1003 { 1268 {
1004 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1269 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1005 1270
1006 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1271 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1007 { 1272 {
1008 runops_proc_t old_runops = PL_runops;
1009 dSP; 1273 dSP;
1010 GV *gv = CvGV (cx->blk_sub.cv); 1274 GV *gv = CvGV (cx->blk_sub.cv);
1011 SV *fullname = sv_2mortal (newSV (0)); 1275 SV *fullname = sv_2mortal (newSV (0));
1012 1276
1013 if (isGV (gv)) 1277 if (isGV (gv))
… …
1018 SAVETMPS; 1282 SAVETMPS;
1019 EXTEND (SP, 3); 1283 EXTEND (SP, 3);
1020 PUSHMARK (SP); 1284 PUSHMARK (SP);
1021 PUSHs (&PL_sv_yes); 1285 PUSHs (&PL_sv_yes);
1022 PUSHs (fullname); 1286 PUSHs (fullname);
1023 PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef); 1287 PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef);
1024 PUTBACK; 1288 PUTBACK;
1025 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0); 1289 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
1026 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 1290 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
1027 SPAGAIN; 1291 SPAGAIN;
1028 FREETMPS; 1292 FREETMPS;
… …
1031 } 1295 }
1032 1296
1033 oldcxix = cxstack_ix; 1297 oldcxix = cxstack_ix;
1034 } 1298 }
1035 1299
1036 if (cctx->flags & CC_TRACE_LINE) 1300 if (cctx_current->flags & CC_TRACE_LINE)
1037 { 1301 {
1038 dSP; 1302 dSP;
1039 1303
1040 PL_runops = RUNOPS_DEFAULT; 1304 PL_runops = RUNOPS_DEFAULT;
1041 ENTER; 1305 ENTER;
… …
1060 1324
1061 TAINT_NOT; 1325 TAINT_NOT;
1062 return 0; 1326 return 0;
1063} 1327}
1064 1328
1065static struct coro_cctx *cctx_ssl_cctx;
1066static struct CoroSLF cctx_ssl_frame; 1329static struct CoroSLF cctx_ssl_frame;
1067 1330
1068static void 1331static void
1069slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta) 1332slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta)
1070{ 1333{
1071 ta->prev = (struct coro *)cctx_ssl_cctx;
1072 ta->next = 0; 1334 ta->prev = 0;
1073} 1335}
1074 1336
1075static int 1337static int
1076slf_check_set_stacklevel (pTHX_ struct CoroSLF *frame) 1338slf_check_set_stacklevel (pTHX_ struct CoroSLF *frame)
1077{ 1339{
… …
1080 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1342 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1081} 1343}
1082 1344
1083/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1345/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1084static void NOINLINE 1346static void NOINLINE
1085cctx_prepare (pTHX_ coro_cctx *cctx) 1347cctx_prepare (pTHX)
1086{ 1348{
1087 PL_top_env = &PL_start_env; 1349 PL_top_env = &PL_start_env;
1088 1350
1089 if (cctx->flags & CC_TRACE) 1351 if (cctx_current->flags & CC_TRACE)
1090 PL_runops = runops_trace; 1352 PL_runops = runops_trace;
1091 1353
1092 /* we already must be executing an SLF op, there is no other valid way 1354 /* we already must be executing an SLF op, there is no other valid way
1093 * that can lead to creation of a new cctx */ 1355 * that can lead to creation of a new cctx */
1094 assert (("FATAL: can't prepare slf-less cctx in Coro module (please report)", 1356 assert (("FATAL: can't prepare slf-less cctx in Coro module (please report)",
1095 slf_frame.prepare && PL_op->op_ppaddr == pp_slf)); 1357 slf_frame.prepare && PL_op->op_ppaddr == pp_slf));
1096 1358
1097 /* we must emulate leaving pp_slf, which is done inside slf_check_set_stacklevel */ 1359 /* we must emulate leaving pp_slf, which is done inside slf_check_set_stacklevel */
1098 cctx_ssl_cctx = cctx;
1099 cctx_ssl_frame = slf_frame; 1360 cctx_ssl_frame = slf_frame;
1100 1361
1101 slf_frame.prepare = slf_prepare_set_stacklevel; 1362 slf_frame.prepare = slf_prepare_set_stacklevel;
1102 slf_frame.check = slf_check_set_stacklevel; 1363 slf_frame.check = slf_check_set_stacklevel;
1103} 1364}
… …
1126 /* normally we would need to skip the entersub here */ 1387 /* normally we would need to skip the entersub here */
1127 /* not doing so will re-execute it, which is exactly what we want */ 1388 /* not doing so will re-execute it, which is exactly what we want */
1128 /* PL_nop = PL_nop->op_next */ 1389 /* PL_nop = PL_nop->op_next */
1129 1390
1130 /* inject a fake subroutine call to cctx_init */ 1391 /* inject a fake subroutine call to cctx_init */
1131 cctx_prepare (aTHX_ (coro_cctx *)arg); 1392 cctx_prepare (aTHX);
1132 1393
1133 /* cctx_run is the alternative tail of transfer() */ 1394 /* cctx_run is the alternative tail of transfer() */
1134 transfer_tail (aTHX); 1395 transfer_tail (aTHX);
1135 1396
1136 /* somebody or something will hit me for both perl_run and PL_restartop */ 1397 /* somebody or something will hit me for both perl_run and PL_restartop */
1137 PL_restartop = PL_op; 1398 PL_restartop = PL_op;
1138 perl_run (PL_curinterp); 1399 perl_run (PL_curinterp);
1400 /*
1401 * Unfortunately, there is no way to get at the return values of the
1402 * coro body here, as perl_run destroys these. Likewise, we cannot catch
1403 * runtime errors here, as this is just a random interpreter, not a thread.
1404 */
1139 1405
1140 /* 1406 /*
1141 * If perl-run returns we assume exit() was being called or the coro 1407 * If perl-run returns we assume exit() was being called or the coro
1142 * fell off the end, which seems to be the only valid (non-bug) 1408 * fell off the end, which seems to be the only valid (non-bug)
1143 * reason for perl_run to return. We try to exit by jumping to the 1409 * reason for perl_run to return. We try to exit by jumping to the
1144 * bootstrap-time "top" top_env, as we cannot restore the "main" 1410 * bootstrap-time "top" top_env, as we cannot restore the "main"
1145 * coroutine as Coro has no such concept 1411 * coroutine as Coro has no such concept.
1412 * This actually isn't valid with the pthread backend, but OSes requiring
1413 * that backend are too broken to do it in a standards-compliant way.
1146 */ 1414 */
1147 PL_top_env = main_top_env; 1415 PL_top_env = main_top_env;
1148 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */ 1416 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1149 } 1417 }
1150} 1418}
… …
1227cctx_destroy (coro_cctx *cctx) 1495cctx_destroy (coro_cctx *cctx)
1228{ 1496{
1229 if (!cctx) 1497 if (!cctx)
1230 return; 1498 return;
1231 1499
1500 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary?
1501
1232 --cctx_count; 1502 --cctx_count;
1233 coro_destroy (&cctx->cctx); 1503 coro_destroy (&cctx->cctx);
1234 1504
1235 /* coro_transfer creates new, empty cctx's */ 1505 /* coro_transfer creates new, empty cctx's */
1236 if (cctx->sptr) 1506 if (cctx->sptr)
… …
1299 /* TODO: throwing up here is considered harmful */ 1569 /* TODO: throwing up here is considered harmful */
1300 1570
1301 if (expect_true (prev != next)) 1571 if (expect_true (prev != next))
1302 { 1572 {
1303 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1573 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1304 croak ("Coro::State::transfer called with non-running/new prev Coro::State, but can only transfer from running or new states,"); 1574 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1305 1575
1306 if (expect_false (next->flags & CF_RUNNING))
1307 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states,");
1308
1309 if (expect_false (next->flags & CF_DESTROYED)) 1576 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED)))
1310 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states,"); 1577 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1311 1578
1312#if !PERL_VERSION_ATLEAST (5,10,0) 1579#if !PERL_VERSION_ATLEAST (5,10,0)
1313 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1580 if (expect_false (PL_lex_state != LEX_NOTPARSING))
1314 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,"); 1581 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1315#endif 1582#endif
… …
1321transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1588transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1322{ 1589{
1323 dSTACKLEVEL; 1590 dSTACKLEVEL;
1324 1591
1325 /* sometimes transfer is only called to set idle_sp */ 1592 /* sometimes transfer is only called to set idle_sp */
1326 if (expect_false (!next)) 1593 if (expect_false (!prev))
1327 { 1594 {
1328 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1595 cctx_current->idle_sp = STACKLEVEL;
1329 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1596 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1330 } 1597 }
1331 else if (expect_true (prev != next)) 1598 else if (expect_true (prev != next))
1332 { 1599 {
1333 coro_cctx *prev__cctx; 1600 coro_cctx *cctx_prev;
1334 1601
1335 if (expect_false (prev->flags & CF_NEW)) 1602 if (expect_false (prev->flags & CF_NEW))
1336 { 1603 {
1337 /* create a new empty/source context */ 1604 /* create a new empty/source context */
1338 prev->cctx = cctx_new_empty ();
1339 prev->flags &= ~CF_NEW; 1605 prev->flags &= ~CF_NEW;
1340 prev->flags |= CF_RUNNING; 1606 prev->flags |= CF_RUNNING;
1341 } 1607 }
1342 1608
1343 prev->flags &= ~CF_RUNNING; 1609 prev->flags &= ~CF_RUNNING;
… …
1349 if (expect_false (next->flags & CF_NEW)) 1615 if (expect_false (next->flags & CF_NEW))
1350 { 1616 {
1351 /* need to start coroutine */ 1617 /* need to start coroutine */
1352 next->flags &= ~CF_NEW; 1618 next->flags &= ~CF_NEW;
1353 /* setup coroutine call */ 1619 /* setup coroutine call */
1354 coro_setup (aTHX_ next); 1620 init_perl (aTHX_ next);
1355 } 1621 }
1356 else 1622 else
1357 load_perl (aTHX_ next); 1623 load_perl (aTHX_ next);
1358 1624
1359 prev__cctx = prev->cctx;
1360
1361 /* possibly untie and reuse the cctx */ 1625 /* possibly untie and reuse the cctx */
1362 if (expect_true ( 1626 if (expect_true (
1363 prev__cctx->idle_sp == STACKLEVEL 1627 cctx_current->idle_sp == STACKLEVEL
1364 && !(prev__cctx->flags & CC_TRACE) 1628 && !(cctx_current->flags & CC_TRACE)
1365 && !force_cctx 1629 && !force_cctx
1366 )) 1630 ))
1367 { 1631 {
1368 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1632 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */
1369 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == prev__cctx->idle_te)); 1633 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1370 1634
1371 prev->cctx = 0;
1372
1373 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */ 1635 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */
1374 /* without this the next cctx_get might destroy the prev__cctx while still in use */ 1636 /* without this the next cctx_get might destroy the running cctx while still in use */
1375 if (expect_false (CCTX_EXPIRED (prev__cctx))) 1637 if (expect_false (CCTX_EXPIRED (cctx_current)))
1376 if (!next->cctx) 1638 if (expect_true (!next->cctx))
1377 next->cctx = cctx_get (aTHX); 1639 next->cctx = cctx_get (aTHX);
1378 1640
1379 cctx_put (prev__cctx); 1641 cctx_put (cctx_current);
1380 } 1642 }
1643 else
1644 prev->cctx = cctx_current;
1381 1645
1382 ++next->usecount; 1646 ++next->usecount;
1383 1647
1384 if (expect_true (!next->cctx)) 1648 cctx_prev = cctx_current;
1385 next->cctx = cctx_get (aTHX); 1649 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1386 1650
1387 if (expect_false (prev__cctx != next->cctx)) 1651 next->cctx = 0;
1652
1653 if (expect_false (cctx_prev != cctx_current))
1388 { 1654 {
1389 prev__cctx->top_env = PL_top_env; 1655 cctx_prev->top_env = PL_top_env;
1390 PL_top_env = next->cctx->top_env; 1656 PL_top_env = cctx_current->top_env;
1391 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1657 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1392 } 1658 }
1393 1659
1394 transfer_tail (aTHX); 1660 transfer_tail (aTHX);
1395 } 1661 }
1396} 1662}
… …
1404coro_state_destroy (pTHX_ struct coro *coro) 1670coro_state_destroy (pTHX_ struct coro *coro)
1405{ 1671{
1406 if (coro->flags & CF_DESTROYED) 1672 if (coro->flags & CF_DESTROYED)
1407 return 0; 1673 return 0;
1408 1674
1409 if (coro->on_destroy) 1675 if (coro->on_destroy && !PL_dirty)
1410 coro->on_destroy (aTHX_ coro); 1676 coro->on_destroy (aTHX_ coro);
1411 1677
1412 coro->flags |= CF_DESTROYED; 1678 coro->flags |= CF_DESTROYED;
1413 1679
1414 if (coro->flags & CF_READY) 1680 if (coro->flags & CF_READY)
… …
1418 --coro_nready; 1684 --coro_nready;
1419 } 1685 }
1420 else 1686 else
1421 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1687 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1422 1688
1423 if (coro->mainstack && coro->mainstack != main_mainstack) 1689 if (coro->mainstack
1424 { 1690 && coro->mainstack != main_mainstack
1425 struct coro temp; 1691 && coro->slot
1426 1692 && !PL_dirty)
1427 assert (("FATAL: tried to destroy currently running coroutine (please report)", !(coro->flags & CF_RUNNING)));
1428
1429 save_perl (aTHX_ &temp);
1430 load_perl (aTHX_ coro); 1693 destroy_perl (aTHX_ coro);
1431
1432 coro_destruct (aTHX_ coro);
1433
1434 load_perl (aTHX_ &temp);
1435
1436 coro->slot = 0;
1437 }
1438
1439 cctx_destroy (coro->cctx);
1440 SvREFCNT_dec (coro->args);
1441 1694
1442 if (coro->next) coro->next->prev = coro->prev; 1695 if (coro->next) coro->next->prev = coro->prev;
1443 if (coro->prev) coro->prev->next = coro->next; 1696 if (coro->prev) coro->prev->next = coro->next;
1444 if (coro == coro_first) coro_first = coro->next; 1697 if (coro == coro_first) coro_first = coro->next;
1698
1699 cctx_destroy (coro->cctx);
1700 SvREFCNT_dec (coro->startcv);
1701 SvREFCNT_dec (coro->args);
1702 SvREFCNT_dec (coro->swap_sv);
1703 SvREFCNT_dec (CORO_THROW);
1445 1704
1446 return 1; 1705 return 1;
1447} 1706}
1448 1707
1449static int 1708static int
… …
1499 1758
1500 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1759 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1501 TRANSFER (ta, 1); 1760 TRANSFER (ta, 1);
1502} 1761}
1503 1762
1504/*****************************************************************************/
1505/* gensub: simple closure generation utility */
1506
1507#define GENSUB_ARG CvXSUBANY (cv).any_ptr
1508
1509/* create a closure from XS, returns a code reference */
1510/* the arg can be accessed via GENSUB_ARG from the callback */
1511/* the callback must use dXSARGS/XSRETURN */
1512static SV *
1513gensub (pTHX_ void (*xsub)(pTHX_ CV *), void *arg)
1514{
1515 CV *cv = (CV *)newSV (0);
1516
1517 sv_upgrade ((SV *)cv, SVt_PVCV);
1518
1519 CvANON_on (cv);
1520 CvISXSUB_on (cv);
1521 CvXSUB (cv) = xsub;
1522 GENSUB_ARG = arg;
1523
1524 return newRV_noinc ((SV *)cv);
1525}
1526
1527/** Coro ********************************************************************/ 1763/** Coro ********************************************************************/
1528 1764
1529INLINE void 1765INLINE void
1530coro_enq (pTHX_ struct coro *coro) 1766coro_enq (pTHX_ struct coro *coro)
1531{ 1767{
1532 av_push (coro_ready [coro->prio - PRIO_MIN], SvREFCNT_inc_NN (coro->hv)); 1768 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1533}
1534 1769
1535INLINE SV * 1770 SvREFCNT_inc_NN (coro->hv);
1771
1772 coro->next_ready = 0;
1773 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1774 ready [1] = coro;
1775}
1776
1777INLINE struct coro *
1536coro_deq (pTHX) 1778coro_deq (pTHX)
1537{ 1779{
1538 int prio; 1780 int prio;
1539 1781
1540 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; ) 1782 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
1541 if (AvFILLp (coro_ready [prio]) >= 0) 1783 {
1542 return av_shift (coro_ready [prio]); 1784 struct coro **ready = coro_ready [prio];
1785
1786 if (ready [0])
1787 {
1788 struct coro *coro = ready [0];
1789 ready [0] = coro->next_ready;
1790 return coro;
1791 }
1792 }
1543 1793
1544 return 0; 1794 return 0;
1795}
1796
1797static void
1798invoke_sv_ready_hook_helper (void)
1799{
1800 dTHX;
1801 dSP;
1802
1803 ENTER;
1804 SAVETMPS;
1805
1806 PUSHMARK (SP);
1807 PUTBACK;
1808 call_sv (coro_readyhook, G_VOID | G_DISCARD);
1809
1810 FREETMPS;
1811 LEAVE;
1545} 1812}
1546 1813
1547static int 1814static int
1548api_ready (pTHX_ SV *coro_sv) 1815api_ready (pTHX_ SV *coro_sv)
1549{ 1816{
1550 struct coro *coro;
1551 SV *sv_hook;
1552 void (*xs_hook)(void);
1553
1554 if (SvROK (coro_sv))
1555 coro_sv = SvRV (coro_sv);
1556
1557 coro = SvSTATE (coro_sv); 1817 struct coro *coro = SvSTATE (coro_sv);
1558 1818
1559 if (coro->flags & CF_READY) 1819 if (coro->flags & CF_READY)
1560 return 0; 1820 return 0;
1561 1821
1562 coro->flags |= CF_READY; 1822 coro->flags |= CF_READY;
1563 1823
1564 sv_hook = coro_nready ? 0 : coro_readyhook;
1565 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1566
1567 coro_enq (aTHX_ coro); 1824 coro_enq (aTHX_ coro);
1568 ++coro_nready;
1569 1825
1570 if (sv_hook) 1826 if (!coro_nready++)
1571 { 1827 if (coroapi.readyhook)
1572 dSP; 1828 coroapi.readyhook ();
1573
1574 ENTER;
1575 SAVETMPS;
1576
1577 PUSHMARK (SP);
1578 PUTBACK;
1579 call_sv (sv_hook, G_VOID | G_DISCARD);
1580
1581 FREETMPS;
1582 LEAVE;
1583 }
1584
1585 if (xs_hook)
1586 xs_hook ();
1587 1829
1588 return 1; 1830 return 1;
1589} 1831}
1590 1832
1591static int 1833static int
1592api_is_ready (pTHX_ SV *coro_sv) 1834api_is_ready (pTHX_ SV *coro_sv)
1593{ 1835{
1594 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1836 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1595} 1837}
1596 1838
1839/* expects to own a reference to next->hv */
1597INLINE void 1840INLINE void
1598prepare_schedule (pTHX_ struct coro_transfer_args *ta) 1841prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1599{ 1842{
1600 SV *prev_sv, *next_sv;
1601
1602 for (;;)
1603 {
1604 next_sv = coro_deq (aTHX);
1605
1606 /* nothing to schedule: call the idle handler */
1607 if (expect_false (!next_sv))
1608 {
1609 dSP;
1610
1611 ENTER;
1612 SAVETMPS;
1613
1614 PUSHMARK (SP);
1615 PUTBACK;
1616 call_sv (get_sv ("Coro::idle", FALSE), G_VOID | G_DISCARD);
1617
1618 FREETMPS;
1619 LEAVE;
1620 continue;
1621 }
1622
1623 ta->next = SvSTATE_hv (next_sv);
1624
1625 /* cannot transfer to destroyed coros, skip and look for next */
1626 if (expect_false (ta->next->flags & CF_DESTROYED))
1627 {
1628 SvREFCNT_dec (next_sv);
1629 /* coro_nready has already been taken care of by destroy */
1630 continue;
1631 }
1632
1633 --coro_nready;
1634 break;
1635 }
1636
1637 /* free this only after the transfer */
1638 prev_sv = SvRV (coro_current); 1843 SV *prev_sv = SvRV (coro_current);
1844
1639 ta->prev = SvSTATE_hv (prev_sv); 1845 ta->prev = SvSTATE_hv (prev_sv);
1846 ta->next = next;
1847
1640 TRANSFER_CHECK (*ta); 1848 TRANSFER_CHECK (*ta);
1641 assert (("FATAL: next coroutine isn't marked as ready in Coro (please report)", ta->next->flags & CF_READY)); 1849
1642 ta->next->flags &= ~CF_READY;
1643 SvRV_set (coro_current, next_sv); 1850 SvRV_set (coro_current, (SV *)next->hv);
1644 1851
1645 free_coro_mortal (aTHX); 1852 free_coro_mortal (aTHX);
1646 coro_mortal = prev_sv; 1853 coro_mortal = prev_sv;
1647} 1854}
1648 1855
1856static void
1857prepare_schedule (pTHX_ struct coro_transfer_args *ta)
1858{
1859 for (;;)
1860 {
1861 struct coro *next = coro_deq (aTHX);
1862
1863 if (expect_true (next))
1864 {
1865 /* cannot transfer to destroyed coros, skip and look for next */
1866 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED)))
1867 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1868 else
1869 {
1870 next->flags &= ~CF_READY;
1871 --coro_nready;
1872
1873 prepare_schedule_to (aTHX_ ta, next);
1874 break;
1875 }
1876 }
1877 else
1878 {
1879 /* nothing to schedule: call the idle handler */
1880 if (SvROK (sv_idle)
1881 && SvOBJECT (SvRV (sv_idle)))
1882 {
1883 if (SvRV (sv_idle) == SvRV (coro_current))
1884 croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught");
1885
1886 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1887 api_ready (aTHX_ SvRV (sv_idle));
1888 --coro_nready;
1889 }
1890 else
1891 {
1892 /* TODO: deprecated, remove, cannot work reliably *//*D*/
1893 dSP;
1894
1895 ENTER;
1896 SAVETMPS;
1897
1898 PUSHMARK (SP);
1899 PUTBACK;
1900 call_sv (sv_idle, G_VOID | G_DISCARD);
1901
1902 FREETMPS;
1903 LEAVE;
1904 }
1905 }
1906 }
1907}
1908
1649INLINE void 1909INLINE void
1650prepare_cede (pTHX_ struct coro_transfer_args *ta) 1910prepare_cede (pTHX_ struct coro_transfer_args *ta)
1651{ 1911{
1652 api_ready (aTHX_ coro_current); 1912 api_ready (aTHX_ coro_current);
1653 prepare_schedule (aTHX_ ta); 1913 prepare_schedule (aTHX_ ta);
… …
1672{ 1932{
1673 struct coro_transfer_args ta; 1933 struct coro_transfer_args ta;
1674 1934
1675 prepare_schedule (aTHX_ &ta); 1935 prepare_schedule (aTHX_ &ta);
1676 TRANSFER (ta, 1); 1936 TRANSFER (ta, 1);
1937}
1938
1939static void
1940api_schedule_to (pTHX_ SV *coro_sv)
1941{
1942 struct coro_transfer_args ta;
1943 struct coro *next = SvSTATE (coro_sv);
1944
1945 SvREFCNT_inc_NN (coro_sv);
1946 prepare_schedule_to (aTHX_ &ta, next);
1677} 1947}
1678 1948
1679static int 1949static int
1680api_cede (pTHX) 1950api_cede (pTHX)
1681{ 1951{
… …
1710static void 1980static void
1711api_trace (pTHX_ SV *coro_sv, int flags) 1981api_trace (pTHX_ SV *coro_sv, int flags)
1712{ 1982{
1713 struct coro *coro = SvSTATE (coro_sv); 1983 struct coro *coro = SvSTATE (coro_sv);
1714 1984
1985 if (coro->flags & CF_RUNNING)
1986 croak ("cannot enable tracing on a running coroutine, caught");
1987
1715 if (flags & CC_TRACE) 1988 if (flags & CC_TRACE)
1716 { 1989 {
1717 if (!coro->cctx) 1990 if (!coro->cctx)
1718 coro->cctx = cctx_new_run (); 1991 coro->cctx = cctx_new_run ();
1719 else if (!(coro->cctx->flags & CC_TRACE)) 1992 else if (!(coro->cctx->flags & CC_TRACE))
1720 croak ("cannot enable tracing on coroutine with custom stack,"); 1993 croak ("cannot enable tracing on coroutine with custom stack, caught");
1721 1994
1722 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL)); 1995 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL));
1723 } 1996 }
1724 else if (coro->cctx && coro->cctx->flags & CC_TRACE) 1997 else if (coro->cctx && coro->cctx->flags & CC_TRACE)
1725 { 1998 {
… …
1730 else 2003 else
1731 coro->slot->runops = RUNOPS_DEFAULT; 2004 coro->slot->runops = RUNOPS_DEFAULT;
1732 } 2005 }
1733} 2006}
1734 2007
2008static void
2009coro_call_on_destroy (pTHX_ struct coro *coro)
2010{
2011 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0);
2012 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
2013
2014 if (on_destroyp)
2015 {
2016 AV *on_destroy = (AV *)SvRV (*on_destroyp);
2017
2018 while (AvFILLp (on_destroy) >= 0)
2019 {
2020 dSP; /* don't disturb outer sp */
2021 SV *cb = av_pop (on_destroy);
2022
2023 PUSHMARK (SP);
2024
2025 if (statusp)
2026 {
2027 int i;
2028 AV *status = (AV *)SvRV (*statusp);
2029 EXTEND (SP, AvFILLp (status) + 1);
2030
2031 for (i = 0; i <= AvFILLp (status); ++i)
2032 PUSHs (AvARRAY (status)[i]);
2033 }
2034
2035 PUTBACK;
2036 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD);
2037 }
2038 }
2039}
2040
2041static void
2042slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2043{
2044 int i;
2045 HV *hv = (HV *)SvRV (coro_current);
2046 AV *av = newAV ();
2047
2048 /* items are actually not so common, so optimise for this case */
2049 if (items)
2050 {
2051 av_extend (av, items - 1);
2052
2053 for (i = 0; i < items; ++i)
2054 av_push (av, SvREFCNT_inc_NN (arg [i]));
2055 }
2056
2057 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0);
2058
2059 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */
2060 api_ready (aTHX_ sv_manager);
2061
2062 frame->prepare = prepare_schedule;
2063 frame->check = slf_check_repeat;
2064
2065 /* as a minor optimisation, we could unwind all stacks here */
2066 /* but that puts extra pressure on pp_slf, and is not worth much */
2067 /*coro_unwind_stacks (aTHX);*/
2068}
2069
2070/*****************************************************************************/
2071/* async pool handler */
2072
2073static int
2074slf_check_pool_handler (pTHX_ struct CoroSLF *frame)
2075{
2076 HV *hv = (HV *)SvRV (coro_current);
2077 struct coro *coro = (struct coro *)frame->data;
2078
2079 if (!coro->invoke_cb)
2080 return 1; /* loop till we have invoke */
2081 else
2082 {
2083 hv_store (hv, "desc", sizeof ("desc") - 1,
2084 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
2085
2086 coro->saved_deffh = SvREFCNT_inc_NN ((SV *)PL_defoutgv);
2087
2088 {
2089 dSP;
2090 XPUSHs (sv_2mortal (coro->invoke_cb)); coro->invoke_cb = 0;
2091 PUTBACK;
2092 }
2093
2094 SvREFCNT_dec (GvAV (PL_defgv));
2095 GvAV (PL_defgv) = coro->invoke_av;
2096 coro->invoke_av = 0;
2097
2098 return 0;
2099 }
2100}
2101
2102static void
2103slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2104{
2105 HV *hv = (HV *)SvRV (coro_current);
2106 struct coro *coro = SvSTATE_hv ((SV *)hv);
2107
2108 if (expect_true (coro->saved_deffh))
2109 {
2110 /* subsequent iteration */
2111 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
2112 coro->saved_deffh = 0;
2113
2114 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
2115 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
2116 {
2117 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate);
2118 coro->invoke_av = newAV ();
2119
2120 frame->prepare = prepare_nop;
2121 }
2122 else
2123 {
2124 av_clear (GvAV (PL_defgv));
2125 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
2126
2127 coro->prio = 0;
2128
2129 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
2130 api_trace (aTHX_ coro_current, 0);
2131
2132 frame->prepare = prepare_schedule;
2133 av_push (av_async_pool, SvREFCNT_inc (hv));
2134 }
2135 }
2136 else
2137 {
2138 /* first iteration, simply fall through */
2139 frame->prepare = prepare_nop;
2140 }
2141
2142 frame->check = slf_check_pool_handler;
2143 frame->data = (void *)coro;
2144}
2145
1735/*****************************************************************************/ 2146/*****************************************************************************/
1736/* rouse callback */ 2147/* rouse callback */
1737 2148
1738#define CORO_MAGIC_type_rouse PERL_MAGIC_ext 2149#define CORO_MAGIC_type_rouse PERL_MAGIC_ext
1739 2150
1740static void 2151static void
1741coro_rouse_callback (pTHX_ CV *cv) 2152coro_rouse_callback (pTHX_ CV *cv)
1742{ 2153{
1743 dXSARGS; 2154 dXSARGS;
1744 SV *data = (SV *)GENSUB_ARG; 2155 SV *data = (SV *)S_GENSUB_ARG;
1745 2156
1746 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2157 if (SvTYPE (SvRV (data)) != SVt_PVAV)
1747 { 2158 {
1748 /* first call, set args */ 2159 /* first call, set args */
1749 int i; 2160 SV *coro = SvRV (data);
1750 AV *av = newAV (); 2161 AV *av = newAV ();
1751 SV *coro = SvRV (data);
1752 2162
1753 SvRV_set (data, (SV *)av); 2163 SvRV_set (data, (SV *)av);
2164
2165 /* better take a full copy of the arguments */
2166 while (items--)
2167 av_store (av, items, newSVsv (ST (items)));
2168
1754 api_ready (aTHX_ coro); 2169 api_ready (aTHX_ coro);
1755 SvREFCNT_dec (coro); 2170 SvREFCNT_dec (coro);
1756
1757 while (items--)
1758 av_store (av, items, SvREFCNT_inc_NN (ST (items)));
1759 } 2171 }
1760 2172
1761 XSRETURN_EMPTY; 2173 XSRETURN_EMPTY;
1762} 2174}
1763 2175
… …
1778 AV *av = (AV *)SvRV (data); 2190 AV *av = (AV *)SvRV (data);
1779 int i; 2191 int i;
1780 2192
1781 EXTEND (SP, AvFILLp (av) + 1); 2193 EXTEND (SP, AvFILLp (av) + 1);
1782 for (i = 0; i <= AvFILLp (av); ++i) 2194 for (i = 0; i <= AvFILLp (av); ++i)
1783 PUSHs (AvARRAY (av)[i]); 2195 PUSHs (sv_2mortal (AvARRAY (av)[i]));
2196
2197 /* we have stolen the elements, so set length to zero and free */
2198 AvFILLp (av) = -1;
2199 av_undef (av);
1784 2200
1785 PUTBACK; 2201 PUTBACK;
1786 } 2202 }
1787 2203
1788 return 0; 2204 return 0;
… …
1810 || SvTYPE (SvRV (cb)) != SVt_PVCV 2226 || SvTYPE (SvRV (cb)) != SVt_PVCV
1811 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2227 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
1812 croak ("Coro::rouse_wait called with illegal callback argument,"); 2228 croak ("Coro::rouse_wait called with illegal callback argument,");
1813 2229
1814 { 2230 {
1815 CV *cv = (CV *)SvRV (cb); /* for GENSUB_ARG */ 2231 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
1816 SV *data = (SV *)GENSUB_ARG; 2232 SV *data = (SV *)S_GENSUB_ARG;
1817 2233
1818 frame->data = (void *)data; 2234 frame->data = (void *)data;
1819 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule; 2235 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
1820 frame->check = slf_check_rouse_wait; 2236 frame->check = slf_check_rouse_wait;
1821 } 2237 }
… …
1825coro_new_rouse_cb (pTHX) 2241coro_new_rouse_cb (pTHX)
1826{ 2242{
1827 HV *hv = (HV *)SvRV (coro_current); 2243 HV *hv = (HV *)SvRV (coro_current);
1828 struct coro *coro = SvSTATE_hv (hv); 2244 struct coro *coro = SvSTATE_hv (hv);
1829 SV *data = newRV_inc ((SV *)hv); 2245 SV *data = newRV_inc ((SV *)hv);
1830 SV *cb = gensub (aTHX_ coro_rouse_callback, (void *)data); 2246 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
1831 2247
1832 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0); 2248 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0);
2249 SvREFCNT_dec (data); /* magicext increases the refcount */
1833 2250
1834 SvREFCNT_dec (coro->rouse_cb); 2251 SvREFCNT_dec (coro->rouse_cb);
1835 coro->rouse_cb = SvREFCNT_inc_NN (cb); 2252 coro->rouse_cb = SvREFCNT_inc_NN (cb);
1836 2253
1837 return cb; 2254 return cb;
… …
1889static void 2306static void
1890slf_init_schedule (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2307slf_init_schedule (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1891{ 2308{
1892 frame->prepare = prepare_schedule; 2309 frame->prepare = prepare_schedule;
1893 frame->check = slf_check_nop; 2310 frame->check = slf_check_nop;
2311}
2312
2313static void
2314slf_prepare_schedule_to (pTHX_ struct coro_transfer_args *ta)
2315{
2316 struct coro *next = (struct coro *)slf_frame.data;
2317
2318 SvREFCNT_inc_NN (next->hv);
2319 prepare_schedule_to (aTHX_ ta, next);
2320}
2321
2322static void
2323slf_init_schedule_to (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2324{
2325 if (!items)
2326 croak ("Coro::schedule_to expects a coroutine argument, caught");
2327
2328 frame->data = (void *)SvSTATE (arg [0]);
2329 frame->prepare = slf_prepare_schedule_to;
2330 frame->check = slf_check_nop;
2331}
2332
2333static void
2334slf_init_cede_to (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2335{
2336 api_ready (aTHX_ SvRV (coro_current));
2337
2338 slf_init_schedule_to (aTHX_ frame, cv, arg, items);
1894} 2339}
1895 2340
1896static void 2341static void
1897slf_init_cede (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2342slf_init_cede (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1898{ 2343{
… …
2031 if (PL_op->op_flags & OPf_STACKED) 2476 if (PL_op->op_flags & OPf_STACKED)
2032 { 2477 {
2033 if (items > slf_arga) 2478 if (items > slf_arga)
2034 { 2479 {
2035 slf_arga = items; 2480 slf_arga = items;
2036 free (slf_argv); 2481 Safefree (slf_argv);
2037 slf_argv = malloc (slf_arga * sizeof (SV *)); 2482 New (0, slf_argv, slf_arga, SV *);
2038 } 2483 }
2039 2484
2040 slf_argc = items; 2485 slf_argc = items;
2041 2486
2042 for (i = 0; i < items; ++i) 2487 for (i = 0; i < items; ++i)
… …
2044 } 2489 }
2045 else 2490 else
2046 slf_argc = 0; 2491 slf_argc = 0;
2047 2492
2048 PL_op->op_ppaddr = pp_slf; 2493 PL_op->op_ppaddr = pp_slf;
2049 PL_op->op_type = OP_CUSTOM; /* maybe we should leave it at entersub? */ 2494 /*PL_op->op_type = OP_CUSTOM; /* we do behave like entersub still */
2050 2495
2051 PL_op = (OP *)&slf_restore; 2496 PL_op = (OP *)&slf_restore;
2497}
2498
2499/*****************************************************************************/
2500/* dynamic wind */
2501
2502static void
2503on_enterleave_call (pTHX_ SV *cb)
2504{
2505 dSP;
2506
2507 PUSHSTACK;
2508
2509 PUSHMARK (SP);
2510 PUTBACK;
2511 call_sv (cb, G_VOID | G_DISCARD);
2512 SPAGAIN;
2513
2514 POPSTACK;
2515}
2516
2517static SV *
2518coro_avp_pop_and_free (pTHX_ AV **avp)
2519{
2520 AV *av = *avp;
2521 SV *res = av_pop (av);
2522
2523 if (AvFILLp (av) < 0)
2524 {
2525 *avp = 0;
2526 SvREFCNT_dec (av);
2527 }
2528
2529 return res;
2530}
2531
2532static void
2533coro_pop_on_enter (pTHX_ void *coro)
2534{
2535 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_enter);
2536 SvREFCNT_dec (cb);
2537}
2538
2539static void
2540coro_pop_on_leave (pTHX_ void *coro)
2541{
2542 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2543 on_enterleave_call (aTHX_ sv_2mortal (cb));
2052} 2544}
2053 2545
2054/*****************************************************************************/ 2546/*****************************************************************************/
2055/* PerlIO::cede */ 2547/* PerlIO::cede */
2056 2548
… …
2130/* Coro::Semaphore & Coro::Signal */ 2622/* Coro::Semaphore & Coro::Signal */
2131 2623
2132static SV * 2624static SV *
2133coro_waitarray_new (pTHX_ int count) 2625coro_waitarray_new (pTHX_ int count)
2134{ 2626{
2135 /* a semaphore contains a counter IV in $sem->[0] and any waiters after that */ 2627 /* a waitarray=semaphore contains a counter IV in $sem->[0] and any waiters after that */
2136 AV *av = newAV (); 2628 AV *av = newAV ();
2137 SV **ary; 2629 SV **ary;
2138 2630
2139 /* unfortunately, building manually saves memory */ 2631 /* unfortunately, building manually saves memory */
2140 Newx (ary, 2, SV *); 2632 Newx (ary, 2, SV *);
2141 AvALLOC (av) = ary; 2633 AvALLOC (av) = ary;
2634#if PERL_VERSION_ATLEAST (5,10,0)
2142 AvARRAY (av) = ary; 2635 AvARRAY (av) = ary;
2636#else
2637 /* 5.8.8 needs this syntax instead of AvARRAY = ary, yet */
2638 /* -DDEBUGGING flags this as a bug, despite it perfectly working */
2639 SvPVX ((SV *)av) = (char *)ary;
2640#endif
2143 AvMAX (av) = 1; 2641 AvMAX (av) = 1;
2144 AvFILLp (av) = 0; 2642 AvFILLp (av) = 0;
2145 ary [0] = newSViv (count); 2643 ary [0] = newSViv (count);
2146 2644
2147 return newRV_noinc ((SV *)av); 2645 return newRV_noinc ((SV *)av);
… …
2167 AvARRAY (av)[0] = AvARRAY (av)[1]; 2665 AvARRAY (av)[0] = AvARRAY (av)[1];
2168 AvARRAY (av)[1] = count_sv; 2666 AvARRAY (av)[1] = count_sv;
2169 cb = av_shift (av); 2667 cb = av_shift (av);
2170 2668
2171 if (SvOBJECT (cb)) 2669 if (SvOBJECT (cb))
2670 {
2172 api_ready (aTHX_ cb); 2671 api_ready (aTHX_ cb);
2173 else 2672 --count;
2174 croak ("callbacks not yet supported"); 2673 }
2674 else if (SvTYPE (cb) == SVt_PVCV)
2675 {
2676 dSP;
2677 PUSHMARK (SP);
2678 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2679 PUTBACK;
2680 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2681 }
2175 2682
2176 SvREFCNT_dec (cb); 2683 SvREFCNT_dec (cb);
2177
2178 --count;
2179 } 2684 }
2180} 2685}
2181 2686
2182static void 2687static void
2183coro_semaphore_on_destroy (pTHX_ struct coro *coro) 2688coro_semaphore_on_destroy (pTHX_ struct coro *coro)
… …
2265} 2770}
2266 2771
2267static void 2772static void
2268slf_init_semaphore_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2773slf_init_semaphore_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2269{ 2774{
2775 if (items >= 2)
2776 {
2777 /* callback form */
2778 AV *av = (AV *)SvRV (arg [0]);
2779 SV *cb_cv = s_get_cv_croak (arg [1]);
2780
2781 av_push (av, SvREFCNT_inc_NN (cb_cv));
2782
2783 if (SvIVX (AvARRAY (av)[0]) > 0)
2784 coro_semaphore_adjust (aTHX_ av, 0);
2785
2786 frame->prepare = prepare_nop;
2787 frame->check = slf_check_nop;
2788 }
2789 else
2790 {
2270 slf_init_semaphore_down_or_wait (aTHX_ frame, cv, arg, items); 2791 slf_init_semaphore_down_or_wait (aTHX_ frame, cv, arg, items);
2271 frame->check = slf_check_semaphore_wait; 2792 frame->check = slf_check_semaphore_wait;
2793 }
2272} 2794}
2273 2795
2274/* signal */ 2796/* signal */
2275 2797
2276static void 2798static void
… …
2288 AvARRAY (av)[0] = AvARRAY (av)[1]; 2810 AvARRAY (av)[0] = AvARRAY (av)[1];
2289 AvARRAY (av)[1] = cb; 2811 AvARRAY (av)[1] = cb;
2290 2812
2291 cb = av_shift (av); 2813 cb = av_shift (av);
2292 2814
2815 if (SvTYPE (cb) == SVt_PVCV)
2816 {
2817 dSP;
2818 PUSHMARK (SP);
2819 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2820 PUTBACK;
2821 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2822 }
2823 else
2824 {
2293 api_ready (aTHX_ cb); 2825 api_ready (aTHX_ cb);
2294 sv_setiv (cb, 0); /* signal waiter */ 2826 sv_setiv (cb, 0); /* signal waiter */
2827 }
2828
2295 SvREFCNT_dec (cb); 2829 SvREFCNT_dec (cb);
2296 2830
2297 --count; 2831 --count;
2298 } 2832 }
2299} 2833}
… …
2308static void 2842static void
2309slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2843slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2310{ 2844{
2311 AV *av = (AV *)SvRV (arg [0]); 2845 AV *av = (AV *)SvRV (arg [0]);
2312 2846
2847 if (items >= 2)
2848 {
2849 SV *cb_cv = s_get_cv_croak (arg [1]);
2850 av_push (av, SvREFCNT_inc_NN (cb_cv));
2851
2313 if (SvIVX (AvARRAY (av)[0])) 2852 if (SvIVX (AvARRAY (av)[0]))
2853 coro_signal_wake (aTHX_ av, 1); /* must be the only waiter */
2854
2855 frame->prepare = prepare_nop;
2856 frame->check = slf_check_nop;
2857 }
2858 else if (SvIVX (AvARRAY (av)[0]))
2314 { 2859 {
2315 SvIVX (AvARRAY (av)[0]) = 0; 2860 SvIVX (AvARRAY (av)[0]) = 0;
2316 frame->prepare = prepare_nop; 2861 frame->prepare = prepare_nop;
2317 frame->check = slf_check_nop; 2862 frame->check = slf_check_nop;
2318 } 2863 }
2319 else 2864 else
2320 { 2865 {
2321 SV *waiter = newRV_inc (SvRV (coro_current)); /* owned by signal av */ 2866 SV *waiter = newSVsv (coro_current); /* owned by signal av */
2322 2867
2323 av_push (av, waiter); 2868 av_push (av, waiter);
2324 2869
2325 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */ 2870 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */
2326 frame->prepare = prepare_schedule; 2871 frame->prepare = prepare_schedule;
… …
2344 2889
2345static void 2890static void
2346coro_aio_callback (pTHX_ CV *cv) 2891coro_aio_callback (pTHX_ CV *cv)
2347{ 2892{
2348 dXSARGS; 2893 dXSARGS;
2349 AV *state = (AV *)GENSUB_ARG; 2894 AV *state = (AV *)S_GENSUB_ARG;
2350 SV *coro = av_pop (state); 2895 SV *coro = av_pop (state);
2351 SV *data_sv = newSV (sizeof (struct io_state)); 2896 SV *data_sv = newSV (sizeof (struct io_state));
2352 2897
2353 av_extend (state, items); 2898 av_extend (state, items - 1);
2354 2899
2355 sv_upgrade (data_sv, SVt_PV); 2900 sv_upgrade (data_sv, SVt_PV);
2356 SvCUR_set (data_sv, sizeof (struct io_state)); 2901 SvCUR_set (data_sv, sizeof (struct io_state));
2357 SvPOK_only (data_sv); 2902 SvPOK_only (data_sv);
2358 2903
… …
2468 3013
2469 for (i = 0; i < items; ++i) 3014 for (i = 0; i < items; ++i)
2470 PUSHs (arg [i]); 3015 PUSHs (arg [i]);
2471 3016
2472 /* now push the callback closure */ 3017 /* now push the callback closure */
2473 PUSHs (sv_2mortal (gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state)))); 3018 PUSHs (sv_2mortal (s_gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state))));
2474 3019
2475 /* now call the AIO function - we assume our request is uncancelable */ 3020 /* now call the AIO function - we assume our request is uncancelable */
2476 PUTBACK; 3021 PUTBACK;
2477 call_sv ((SV *)req, G_VOID | G_DISCARD); 3022 call_sv ((SV *)req, G_VOID | G_DISCARD);
2478 } 3023 }
2479 3024
2480 /* now that the requets is going, we loop toll we have a result */ 3025 /* now that the request is going, we loop till we have a result */
2481 frame->data = (void *)state; 3026 frame->data = (void *)state;
2482 frame->prepare = prepare_schedule; 3027 frame->prepare = prepare_schedule;
2483 frame->check = slf_check_aio_req; 3028 frame->check = slf_check_aio_req;
2484} 3029}
2485 3030
… …
2492 3037
2493 XSRETURN_EMPTY; 3038 XSRETURN_EMPTY;
2494} 3039}
2495 3040
2496/*****************************************************************************/ 3041/*****************************************************************************/
3042
3043#if CORO_CLONE
3044# include "clone.c"
3045#endif
3046
3047/*****************************************************************************/
3048
3049static SV *
3050coro_new (pTHX_ HV *stash, SV **argv, int argc, int is_coro)
3051{
3052 SV *coro_sv;
3053 struct coro *coro;
3054 MAGIC *mg;
3055 HV *hv;
3056 SV *cb;
3057 int i;
3058
3059 if (argc > 0)
3060 {
3061 cb = s_get_cv_croak (argv [0]);
3062
3063 if (!is_coro)
3064 {
3065 if (CvISXSUB (cb))
3066 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
3067
3068 if (!CvROOT (cb))
3069 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
3070 }
3071 }
3072
3073 Newz (0, coro, 1, struct coro);
3074 coro->args = newAV ();
3075 coro->flags = CF_NEW;
3076
3077 if (coro_first) coro_first->prev = coro;
3078 coro->next = coro_first;
3079 coro_first = coro;
3080
3081 coro->hv = hv = newHV ();
3082 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
3083 mg->mg_flags |= MGf_DUP;
3084 coro_sv = sv_bless (newRV_noinc ((SV *)hv), stash);
3085
3086 if (argc > 0)
3087 {
3088 av_extend (coro->args, argc + is_coro - 1);
3089
3090 if (is_coro)
3091 {
3092 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
3093 cb = (SV *)cv_coro_run;
3094 }
3095
3096 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3097
3098 for (i = 1; i < argc; i++)
3099 av_push (coro->args, newSVsv (argv [i]));
3100 }
3101
3102 return coro_sv;
3103}
2497 3104
2498MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3105MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2499 3106
2500PROTOTYPES: DISABLE 3107PROTOTYPES: DISABLE
2501 3108
… …
2506 coro_thx = PERL_GET_CONTEXT; 3113 coro_thx = PERL_GET_CONTEXT;
2507# endif 3114# endif
2508#endif 3115#endif
2509 BOOT_PAGESIZE; 3116 BOOT_PAGESIZE;
2510 3117
3118 cctx_current = cctx_new_empty ();
3119
2511 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3120 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
2512 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3121 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
2513 3122
2514 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 3123 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get;
2515 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set; 3124 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set;
… …
2534 3143
2535 { 3144 {
2536 SV *slf = sv_2mortal (newSViv (PTR2IV (pp_slf))); 3145 SV *slf = sv_2mortal (newSViv (PTR2IV (pp_slf)));
2537 3146
2538 if (!PL_custom_op_names) PL_custom_op_names = newHV (); 3147 if (!PL_custom_op_names) PL_custom_op_names = newHV ();
2539 hv_store_ent (PL_custom_op_names, slf, 3148 hv_store_ent (PL_custom_op_names, slf, newSVpv ("coro_slf", 0), 0);
2540 newSVpv ("coro_slf", 0), 0);
2541 3149
2542 if (!PL_custom_op_descs) PL_custom_op_descs = newHV (); 3150 if (!PL_custom_op_descs) PL_custom_op_descs = newHV ();
2543 hv_store_ent (PL_custom_op_descs, slf, 3151 hv_store_ent (PL_custom_op_descs, slf, newSVpv ("coro schedule like function", 0), 0);
2544 newSVpv ("coro schedule like function", 0), 0);
2545 } 3152 }
2546 3153
2547 coroapi.ver = CORO_API_VERSION; 3154 coroapi.ver = CORO_API_VERSION;
2548 coroapi.rev = CORO_API_REVISION; 3155 coroapi.rev = CORO_API_REVISION;
2549 3156
… …
2554 coroapi.prepare_nop = prepare_nop; 3161 coroapi.prepare_nop = prepare_nop;
2555 coroapi.prepare_schedule = prepare_schedule; 3162 coroapi.prepare_schedule = prepare_schedule;
2556 coroapi.prepare_cede = prepare_cede; 3163 coroapi.prepare_cede = prepare_cede;
2557 coroapi.prepare_cede_notself = prepare_cede_notself; 3164 coroapi.prepare_cede_notself = prepare_cede_notself;
2558 3165
2559 { 3166 time_init ();
2560 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
2561 3167
2562 if (!svp) croak ("Time::HiRes is required");
2563 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
2564
2565 nvtime = INT2PTR (double (*)(), SvIV (*svp));
2566 }
2567
2568 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 3168 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
2569} 3169}
2570 3170
2571SV * 3171SV *
2572new (char *klass, ...) 3172new (SV *klass, ...)
3173 ALIAS:
3174 Coro::new = 1
2573 CODE: 3175 CODE:
2574{ 3176 RETVAL = coro_new (aTHX_ ix ? coro_stash : coro_state_stash, &ST (1), items - 1, ix);
2575 struct coro *coro; 3177 OUTPUT:
2576 MAGIC *mg;
2577 HV *hv;
2578 int i;
2579
2580 Newz (0, coro, 1, struct coro);
2581 coro->args = newAV ();
2582 coro->flags = CF_NEW;
2583
2584 if (coro_first) coro_first->prev = coro;
2585 coro->next = coro_first;
2586 coro_first = coro;
2587
2588 coro->hv = hv = newHV ();
2589 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
2590 mg->mg_flags |= MGf_DUP;
2591 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
2592
2593 av_extend (coro->args, items - 1);
2594 for (i = 1; i < items; i++)
2595 av_push (coro->args, newSVsv (ST (i)));
2596}
2597 OUTPUT:
2598 RETVAL 3178 RETVAL
2599 3179
2600void 3180void
2601transfer (...) 3181transfer (...)
2602 PROTOTYPE: $$ 3182 PROTOTYPE: $$
… …
2613void 3193void
2614_exit (int code) 3194_exit (int code)
2615 PROTOTYPE: $ 3195 PROTOTYPE: $
2616 CODE: 3196 CODE:
2617 _exit (code); 3197 _exit (code);
3198
3199SV *
3200clone (Coro::State coro)
3201 CODE:
3202{
3203#if CORO_CLONE
3204 struct coro *ncoro = coro_clone (aTHX_ coro);
3205 MAGIC *mg;
3206 /* TODO: too much duplication */
3207 ncoro->hv = newHV ();
3208 mg = sv_magicext ((SV *)ncoro->hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)ncoro, 0);
3209 mg->mg_flags |= MGf_DUP;
3210 RETVAL = sv_bless (newRV_noinc ((SV *)ncoro->hv), SvSTASH (coro->hv));
3211#else
3212 croak ("Coro::State->clone has not been configured into this installation of Coro, realised");
3213#endif
3214}
3215 OUTPUT:
3216 RETVAL
2618 3217
2619int 3218int
2620cctx_stacksize (int new_stacksize = 0) 3219cctx_stacksize (int new_stacksize = 0)
2621 PROTOTYPE: ;$ 3220 PROTOTYPE: ;$
2622 CODE: 3221 CODE:
… …
2672 eval = 1 3271 eval = 1
2673 CODE: 3272 CODE:
2674{ 3273{
2675 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3274 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
2676 { 3275 {
2677 struct coro temp; 3276 struct coro *current = SvSTATE_current;
2678 3277
2679 if (!(coro->flags & CF_RUNNING)) 3278 if (current != coro)
2680 { 3279 {
2681 PUTBACK; 3280 PUTBACK;
2682 save_perl (aTHX_ &temp); 3281 save_perl (aTHX_ current);
2683 load_perl (aTHX_ coro); 3282 load_perl (aTHX_ coro);
3283 SPAGAIN;
2684 } 3284 }
2685 3285
2686 {
2687 dSP;
2688 ENTER;
2689 SAVETMPS;
2690 PUTBACK;
2691 PUSHSTACK; 3286 PUSHSTACK;
3287
2692 PUSHMARK (SP); 3288 PUSHMARK (SP);
3289 PUTBACK;
2693 3290
2694 if (ix) 3291 if (ix)
2695 eval_sv (coderef, 0); 3292 eval_sv (coderef, 0);
2696 else 3293 else
2697 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 3294 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
2698 3295
2699 POPSTACK; 3296 POPSTACK;
2700 SPAGAIN; 3297 SPAGAIN;
2701 FREETMPS;
2702 LEAVE;
2703 PUTBACK;
2704 }
2705 3298
2706 if (!(coro->flags & CF_RUNNING)) 3299 if (current != coro)
2707 { 3300 {
3301 PUTBACK;
2708 save_perl (aTHX_ coro); 3302 save_perl (aTHX_ coro);
2709 load_perl (aTHX_ &temp); 3303 load_perl (aTHX_ current);
2710 SPAGAIN; 3304 SPAGAIN;
2711 } 3305 }
2712 } 3306 }
2713} 3307}
2714 3308
… …
2718 ALIAS: 3312 ALIAS:
2719 is_ready = CF_READY 3313 is_ready = CF_READY
2720 is_running = CF_RUNNING 3314 is_running = CF_RUNNING
2721 is_new = CF_NEW 3315 is_new = CF_NEW
2722 is_destroyed = CF_DESTROYED 3316 is_destroyed = CF_DESTROYED
3317 is_suspended = CF_SUSPENDED
2723 CODE: 3318 CODE:
2724 RETVAL = boolSV (coro->flags & ix); 3319 RETVAL = boolSV (coro->flags & ix);
2725 OUTPUT: 3320 OUTPUT:
2726 RETVAL 3321 RETVAL
2727 3322
2728void 3323void
2729throw (Coro::State self, SV *throw = &PL_sv_undef) 3324throw (Coro::State self, SV *exception = &PL_sv_undef)
2730 PROTOTYPE: $;$ 3325 PROTOTYPE: $;$
2731 CODE: 3326 CODE:
2732{ 3327{
2733 struct coro *current = SvSTATE_current; 3328 struct coro *current = SvSTATE_current;
2734 SV **throwp = self == current ? &CORO_THROW : &self->except; 3329 SV **exceptionp = self == current ? &CORO_THROW : &self->except;
2735 SvREFCNT_dec (*throwp); 3330 SvREFCNT_dec (*exceptionp);
2736 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3331 SvGETMAGIC (exception);
3332 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
2737} 3333}
2738 3334
2739void 3335void
2740api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3336api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
2741 PROTOTYPE: $;$ 3337 PROTOTYPE: $;$
… …
2743 3339
2744SV * 3340SV *
2745has_cctx (Coro::State coro) 3341has_cctx (Coro::State coro)
2746 PROTOTYPE: $ 3342 PROTOTYPE: $
2747 CODE: 3343 CODE:
2748 RETVAL = boolSV (!!coro->cctx); 3344 /* maybe manage the running flag differently */
3345 RETVAL = boolSV (!!coro->cctx || (coro->flags & CF_RUNNING));
2749 OUTPUT: 3346 OUTPUT:
2750 RETVAL 3347 RETVAL
2751 3348
2752int 3349int
2753is_traced (Coro::State coro) 3350is_traced (Coro::State coro)
… …
2773 3370
2774void 3371void
2775force_cctx () 3372force_cctx ()
2776 PROTOTYPE: 3373 PROTOTYPE:
2777 CODE: 3374 CODE:
2778 SvSTATE_current->cctx->idle_sp = 0; 3375 cctx_current->idle_sp = 0;
2779 3376
2780void 3377void
2781swap_defsv (Coro::State self) 3378swap_defsv (Coro::State self)
2782 PROTOTYPE: $ 3379 PROTOTYPE: $
2783 ALIAS: 3380 ALIAS:
… …
2791 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv; 3388 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
2792 3389
2793 SV *tmp = *src; *src = *dst; *dst = tmp; 3390 SV *tmp = *src; *src = *dst; *dst = tmp;
2794 } 3391 }
2795 3392
3393void
3394cancel (Coro::State self)
3395 CODE:
3396 coro_state_destroy (aTHX_ self);
3397 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */
3398
3399
3400SV *
3401enable_times (int enabled = enable_times)
3402 CODE:
3403{
3404 RETVAL = boolSV (enable_times);
3405
3406 if (enabled != enable_times)
3407 {
3408 enable_times = enabled;
3409
3410 coro_times_update ();
3411 (enabled ? coro_times_sub : coro_times_add)(SvSTATE (coro_current));
3412 }
3413}
3414 OUTPUT:
3415 RETVAL
3416
3417void
3418times (Coro::State self)
3419 PPCODE:
3420{
3421 struct coro *current = SvSTATE (coro_current);
3422
3423 if (expect_false (current == self))
3424 {
3425 coro_times_update ();
3426 coro_times_add (SvSTATE (coro_current));
3427 }
3428
3429 EXTEND (SP, 2);
3430 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3431 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3432
3433 if (expect_false (current == self))
3434 coro_times_sub (SvSTATE (coro_current));
3435}
3436
3437void
3438swap_sv (Coro::State coro, SV *sv, SV *swapsv)
3439 CODE:
3440{
3441 struct coro *current = SvSTATE_current;
3442
3443 if (current == coro)
3444 SWAP_SVS (current);
3445
3446 if (!coro->swap_sv)
3447 coro->swap_sv = newAV ();
3448
3449 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv )));
3450 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv)));
3451
3452 if (current == coro)
3453 SWAP_SVS (current);
3454}
3455
2796 3456
2797MODULE = Coro::State PACKAGE = Coro 3457MODULE = Coro::State PACKAGE = Coro
2798 3458
2799BOOT: 3459BOOT:
2800{ 3460{
2801 int i;
2802
2803 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
2804 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3461 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
2805 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3462 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
2806 3463 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3464 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
2807 coro_current = coro_get_sv (aTHX_ "Coro::current", FALSE); 3465 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
2808 SvREADONLY_on (coro_current); 3466 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3467 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3468 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3469 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
2809 3470
3471 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3472 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3473 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3474 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3475
2810 coro_stash = gv_stashpv ("Coro", TRUE); 3476 coro_stash = gv_stashpv ("Coro", TRUE);
2811 3477
2812 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 3478 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
2813 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 3479 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
2814 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 3480 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
2815 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 3481 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (CORO_PRIO_LOW));
2816 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE)); 3482 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (CORO_PRIO_IDLE));
2817 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN)); 3483 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (CORO_PRIO_MIN));
2818
2819 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
2820 coro_ready[i] = newAV ();
2821 3484
2822 { 3485 {
2823 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 3486 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
2824 3487
2825 coroapi.schedule = api_schedule; 3488 coroapi.schedule = api_schedule;
3489 coroapi.schedule_to = api_schedule_to;
2826 coroapi.cede = api_cede; 3490 coroapi.cede = api_cede;
2827 coroapi.cede_notself = api_cede_notself; 3491 coroapi.cede_notself = api_cede_notself;
2828 coroapi.ready = api_ready; 3492 coroapi.ready = api_ready;
2829 coroapi.is_ready = api_is_ready; 3493 coroapi.is_ready = api_is_ready;
2830 coroapi.nready = coro_nready; 3494 coroapi.nready = coro_nready;
… …
2834 sv_setiv (sv, (IV)&coroapi); 3498 sv_setiv (sv, (IV)&coroapi);
2835 SvREADONLY_on (sv); 3499 SvREADONLY_on (sv);
2836 } 3500 }
2837} 3501}
2838 3502
3503SV *
3504async (...)
3505 PROTOTYPE: &@
3506 CODE:
3507 RETVAL = coro_new (aTHX_ coro_stash, &ST (0), items, 1);
3508 api_ready (aTHX_ RETVAL);
3509 OUTPUT:
3510 RETVAL
3511
3512void
3513terminate (...)
3514 CODE:
3515 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3516
2839void 3517void
2840schedule (...) 3518schedule (...)
2841 CODE: 3519 CODE:
2842 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3520 CORO_EXECUTE_SLF_XS (slf_init_schedule);
3521
3522void
3523schedule_to (...)
3524 CODE:
3525 CORO_EXECUTE_SLF_XS (slf_init_schedule_to);
3526
3527void
3528cede_to (...)
3529 CODE:
3530 CORO_EXECUTE_SLF_XS (slf_init_cede_to);
2843 3531
2844void 3532void
2845cede (...) 3533cede (...)
2846 CODE: 3534 CODE:
2847 CORO_EXECUTE_SLF_XS (slf_init_cede); 3535 CORO_EXECUTE_SLF_XS (slf_init_cede);
… …
2861void 3549void
2862_set_readyhook (SV *hook) 3550_set_readyhook (SV *hook)
2863 PROTOTYPE: $ 3551 PROTOTYPE: $
2864 CODE: 3552 CODE:
2865 SvREFCNT_dec (coro_readyhook); 3553 SvREFCNT_dec (coro_readyhook);
3554 SvGETMAGIC (hook);
3555 if (SvOK (hook))
3556 {
2866 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0; 3557 coro_readyhook = newSVsv (hook);
3558 CORO_READYHOOK = invoke_sv_ready_hook_helper;
3559 }
3560 else
3561 {
3562 coro_readyhook = 0;
3563 CORO_READYHOOK = 0;
3564 }
2867 3565
2868int 3566int
2869prio (Coro::State coro, int newprio = 0) 3567prio (Coro::State coro, int newprio = 0)
2870 PROTOTYPE: $;$ 3568 PROTOTYPE: $;$
2871 ALIAS: 3569 ALIAS:
… …
2877 if (items > 1) 3575 if (items > 1)
2878 { 3576 {
2879 if (ix) 3577 if (ix)
2880 newprio = coro->prio - newprio; 3578 newprio = coro->prio - newprio;
2881 3579
2882 if (newprio < PRIO_MIN) newprio = PRIO_MIN; 3580 if (newprio < CORO_PRIO_MIN) newprio = CORO_PRIO_MIN;
2883 if (newprio > PRIO_MAX) newprio = PRIO_MAX; 3581 if (newprio > CORO_PRIO_MAX) newprio = CORO_PRIO_MAX;
2884 3582
2885 coro->prio = newprio; 3583 coro->prio = newprio;
2886 } 3584 }
2887} 3585}
2888 OUTPUT: 3586 OUTPUT:
… …
2902 CODE: 3600 CODE:
2903 RETVAL = coro_nready; 3601 RETVAL = coro_nready;
2904 OUTPUT: 3602 OUTPUT:
2905 RETVAL 3603 RETVAL
2906 3604
2907# for async_pool speedup
2908void 3605void
2909_pool_1 (SV *cb) 3606suspend (Coro::State self)
3607 PROTOTYPE: $
2910 CODE: 3608 CODE:
2911{ 3609 self->flags |= CF_SUSPENDED;
2912 HV *hv = (HV *)SvRV (coro_current);
2913 struct coro *coro = SvSTATE_hv ((SV *)hv);
2914 AV *defav = GvAV (PL_defgv);
2915 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
2916 AV *invoke_av;
2917 int i, len;
2918 3610
2919 if (!invoke) 3611void
3612resume (Coro::State self)
3613 PROTOTYPE: $
3614 CODE:
3615 self->flags &= ~CF_SUSPENDED;
3616
3617void
3618_pool_handler (...)
3619 CODE:
3620 CORO_EXECUTE_SLF_XS (slf_init_pool_handler);
3621
3622void
3623async_pool (SV *cv, ...)
3624 PROTOTYPE: &@
3625 PPCODE:
3626{
3627 HV *hv = (HV *)av_pop (av_async_pool);
3628 AV *av = newAV ();
3629 SV *cb = ST (0);
3630 int i;
3631
3632 av_extend (av, items - 2);
3633 for (i = 1; i < items; ++i)
3634 av_push (av, SvREFCNT_inc_NN (ST (i)));
3635
3636 if ((SV *)hv == &PL_sv_undef)
2920 { 3637 {
2921 SV *old = PL_diehook; 3638 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
2922 PL_diehook = 0; 3639 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
2923 SvREFCNT_dec (old); 3640 SvREFCNT_dec (sv);
2924 croak ("\3async_pool terminate\2\n");
2925 } 3641 }
2926 3642
2927 SvREFCNT_dec (coro->saved_deffh);
2928 coro->saved_deffh = SvREFCNT_inc_NN ((SV *)PL_defoutgv);
2929
2930 hv_store (hv, "desc", sizeof ("desc") - 1,
2931 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
2932
2933 invoke_av = (AV *)SvRV (invoke);
2934 len = av_len (invoke_av);
2935
2936 sv_setsv (cb, AvARRAY (invoke_av)[0]);
2937
2938 if (len > 0)
2939 { 3643 {
2940 av_fill (defav, len - 1); 3644 struct coro *coro = SvSTATE_hv (hv);
2941 for (i = 0; i < len; ++i) 3645
2942 av_store (defav, i, SvREFCNT_inc_NN (AvARRAY (invoke_av)[i + 1])); 3646 assert (!coro->invoke_cb);
3647 assert (!coro->invoke_av);
3648 coro->invoke_cb = SvREFCNT_inc (cb);
3649 coro->invoke_av = av;
2943 } 3650 }
2944}
2945 3651
2946void 3652 api_ready (aTHX_ (SV *)hv);
2947_pool_2 (SV *cb)
2948 CODE:
2949{
2950 HV *hv = (HV *)SvRV (coro_current);
2951 struct coro *coro = SvSTATE_hv ((SV *)hv);
2952 3653
2953 sv_setsv (cb, &PL_sv_undef); 3654 if (GIMME_V != G_VOID)
2954 3655 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
2955 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 3656 else
2956 coro->saved_deffh = 0;
2957
2958 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
2959 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
2960 {
2961 SV *old = PL_diehook;
2962 PL_diehook = 0;
2963 SvREFCNT_dec (old); 3657 SvREFCNT_dec (hv);
2964 croak ("\3async_pool terminate\2\n");
2965 }
2966
2967 av_clear (GvAV (PL_defgv));
2968 hv_store (hv, "desc", sizeof ("desc") - 1,
2969 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
2970
2971 coro->prio = 0;
2972
2973 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
2974 api_trace (aTHX_ coro_current, 0);
2975
2976 av_push (av_async_pool, newSVsv (coro_current));
2977} 3658}
2978 3659
2979SV * 3660SV *
2980rouse_cb () 3661rouse_cb ()
2981 PROTOTYPE: 3662 PROTOTYPE:
… …
2983 RETVAL = coro_new_rouse_cb (aTHX); 3664 RETVAL = coro_new_rouse_cb (aTHX);
2984 OUTPUT: 3665 OUTPUT:
2985 RETVAL 3666 RETVAL
2986 3667
2987void 3668void
2988rouse_wait (SV *cb = 0) 3669rouse_wait (...)
2989 PROTOTYPE: ;$ 3670 PROTOTYPE: ;$
2990 PPCODE: 3671 PPCODE:
2991 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait); 3672 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait);
2992 3673
3674void
3675on_enter (SV *block)
3676 ALIAS:
3677 on_leave = 1
3678 PROTOTYPE: &
3679 CODE:
3680{
3681 struct coro *coro = SvSTATE_current;
3682 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3683
3684 block = s_get_cv_croak (block);
3685
3686 if (!*avp)
3687 *avp = newAV ();
3688
3689 av_push (*avp, SvREFCNT_inc (block));
3690
3691 if (!ix)
3692 on_enterleave_call (aTHX_ block);
3693
3694 LEAVE; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
3695 SAVEDESTRUCTOR_X (ix ? coro_pop_on_leave : coro_pop_on_enter, (void *)coro);
3696 ENTER; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
3697}
3698
2993 3699
2994MODULE = Coro::State PACKAGE = PerlIO::cede 3700MODULE = Coro::State PACKAGE = PerlIO::cede
2995 3701
2996BOOT: 3702BOOT:
2997 PerlIO_define_layer (aTHX_ &PerlIO_cede); 3703 PerlIO_define_layer (aTHX_ &PerlIO_cede);
… …
3000MODULE = Coro::State PACKAGE = Coro::Semaphore 3706MODULE = Coro::State PACKAGE = Coro::Semaphore
3001 3707
3002SV * 3708SV *
3003new (SV *klass, SV *count = 0) 3709new (SV *klass, SV *count = 0)
3004 CODE: 3710 CODE:
3711{
3712 int semcnt = 1;
3713
3714 if (count)
3715 {
3716 SvGETMAGIC (count);
3717
3718 if (SvOK (count))
3719 semcnt = SvIV (count);
3720 }
3721
3005 RETVAL = sv_bless ( 3722 RETVAL = sv_bless (
3006 coro_waitarray_new (aTHX_ count && SvOK (count) ? SvIV (count) : 1), 3723 coro_waitarray_new (aTHX_ semcnt),
3007 GvSTASH (CvGV (cv)) 3724 GvSTASH (CvGV (cv))
3008 ); 3725 );
3726}
3009 OUTPUT: 3727 OUTPUT:
3010 RETVAL 3728 RETVAL
3011 3729
3012# helper for Coro::Channel 3730# helper for Coro::Channel and others
3013SV * 3731SV *
3014_alloc (int count) 3732_alloc (int count)
3015 CODE: 3733 CODE:
3016 RETVAL = coro_waitarray_new (aTHX_ count); 3734 RETVAL = coro_waitarray_new (aTHX_ count);
3017 OUTPUT: 3735 OUTPUT:
… …
3030 adjust = 1 3748 adjust = 1
3031 CODE: 3749 CODE:
3032 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1); 3750 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1);
3033 3751
3034void 3752void
3035down (SV *self) 3753down (...)
3036 CODE: 3754 CODE:
3037 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down); 3755 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down);
3038 3756
3039void 3757void
3040wait (SV *self) 3758wait (...)
3041 CODE: 3759 CODE:
3042 CORO_EXECUTE_SLF_XS (slf_init_semaphore_wait); 3760 CORO_EXECUTE_SLF_XS (slf_init_semaphore_wait);
3043 3761
3044void 3762void
3045try (SV *self) 3763try (SV *self)
… …
3075 for (i = 1; i <= wcount; ++i) 3793 for (i = 1; i <= wcount; ++i)
3076 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i]))); 3794 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i])));
3077 } 3795 }
3078} 3796}
3079 3797
3798MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3799
3800void
3801_may_delete (SV *sem, int count, int extra_refs)
3802 PPCODE:
3803{
3804 AV *av = (AV *)SvRV (sem);
3805
3806 if (SvREFCNT ((SV *)av) == 1 + extra_refs
3807 && AvFILLp (av) == 0 /* no waiters, just count */
3808 && SvIV (AvARRAY (av)[0]) == count)
3809 XSRETURN_YES;
3810
3811 XSRETURN_NO;
3812}
3813
3080MODULE = Coro::State PACKAGE = Coro::Signal 3814MODULE = Coro::State PACKAGE = Coro::Signal
3081 3815
3082SV * 3816SV *
3083new (SV *klass) 3817new (SV *klass)
3084 CODE: 3818 CODE:
… …
3088 ); 3822 );
3089 OUTPUT: 3823 OUTPUT:
3090 RETVAL 3824 RETVAL
3091 3825
3092void 3826void
3093wait (SV *self) 3827wait (...)
3094 CODE: 3828 CODE:
3095 CORO_EXECUTE_SLF_XS (slf_init_signal_wait); 3829 CORO_EXECUTE_SLF_XS (slf_init_signal_wait);
3096 3830
3097void 3831void
3098broadcast (SV *self) 3832broadcast (SV *self)
… …
3155 3889
3156void 3890void
3157_register (char *target, char *proto, SV *req) 3891_register (char *target, char *proto, SV *req)
3158 CODE: 3892 CODE:
3159{ 3893{
3160 HV *st; 3894 SV *req_cv = s_get_cv_croak (req);
3161 GV *gvp;
3162 CV *req_cv = sv_2cv (req, &st, &gvp, 0);
3163 /* newXSproto doesn't return the CV on 5.8 */ 3895 /* newXSproto doesn't return the CV on 5.8 */
3164 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 3896 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3165 sv_setpv ((SV *)slf_cv, proto); 3897 sv_setpv ((SV *)slf_cv, proto);
3166 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0); 3898 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
3167} 3899}
3168 3900
3901MODULE = Coro::State PACKAGE = Coro::Select
3902
3903void
3904patch_pp_sselect ()
3905 CODE:
3906 if (!coro_old_pp_sselect)
3907 {
3908 coro_select_select = (SV *)get_cv ("Coro::Select::select", 0);
3909 coro_old_pp_sselect = PL_ppaddr [OP_SSELECT];
3910 PL_ppaddr [OP_SSELECT] = coro_pp_sselect;
3911 }
3912
3913void
3914unpatch_pp_sselect ()
3915 CODE:
3916 if (coro_old_pp_sselect)
3917 {
3918 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
3919 coro_old_pp_sselect = 0;
3920 }
3921

Diff Legend

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