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.305 by root, Wed Nov 19 10:44:41 2008 UTC vs.
Revision 1.384 by root, Thu Feb 17 01:32:18 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}
295 318
296/** lowlevel stuff **********************************************************/ 319/** lowlevel stuff **********************************************************/
297 320
298static SV * 321static SV *
299coro_get_sv (pTHX_ const char *name, int create) 322coro_get_sv (pTHX_ const char *name, int create)
… …
323 get_hv (name, create); 346 get_hv (name, create);
324#endif 347#endif
325 return get_hv (name, create); 348 return get_hv (name, create);
326} 349}
327 350
351INLINE void
352coro_times_update ()
353{
354#ifdef coro_clock_gettime
355 struct timespec ts;
356
357 ts.tv_sec = ts.tv_nsec = 0;
358 coro_clock_gettime (CORO_CLOCK_THREAD_CPUTIME_ID, &ts);
359 time_cpu [0] = ts.tv_sec; time_cpu [1] = ts.tv_nsec;
360
361 ts.tv_sec = ts.tv_nsec = 0;
362 coro_clock_gettime (CORO_CLOCK_MONOTONIC, &ts);
363 time_real [0] = ts.tv_sec; time_real [1] = ts.tv_nsec;
364#else
365 dTHX;
366 UV tv[2];
367
368 u2time (aTHX_ tv);
369 time_real [0] = tv [0];
370 time_real [1] = tv [1] * 1000;
371#endif
372}
373
374INLINE void
375coro_times_add (struct coro *c)
376{
377 c->t_real [1] += time_real [1];
378 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
379 c->t_real [0] += time_real [0];
380
381 c->t_cpu [1] += time_cpu [1];
382 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
383 c->t_cpu [0] += time_cpu [0];
384}
385
386INLINE void
387coro_times_sub (struct coro *c)
388{
389 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; }
390 c->t_real [1] -= time_real [1];
391 c->t_real [0] -= time_real [0];
392
393 if (c->t_cpu [1] < time_cpu [1]) { c->t_cpu [1] += 1000000000; --c->t_cpu [0]; }
394 c->t_cpu [1] -= time_cpu [1];
395 c->t_cpu [0] -= time_cpu [0];
396}
397
398/*****************************************************************************/
399/* magic glue */
400
401#define CORO_MAGIC_type_cv 26
402#define CORO_MAGIC_type_state PERL_MAGIC_ext
403
404#define CORO_MAGIC_NN(sv, type) \
405 (expect_true (SvMAGIC (sv)->mg_type == type) \
406 ? SvMAGIC (sv) \
407 : mg_find (sv, type))
408
409#define CORO_MAGIC(sv, type) \
410 (expect_true (SvMAGIC (sv)) \
411 ? CORO_MAGIC_NN (sv, type) \
412 : 0)
413
414#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
415#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
416
417INLINE struct coro *
418SvSTATE_ (pTHX_ SV *coro)
419{
420 HV *stash;
421 MAGIC *mg;
422
423 if (SvROK (coro))
424 coro = SvRV (coro);
425
426 if (expect_false (SvTYPE (coro) != SVt_PVHV))
427 croak ("Coro::State object required");
428
429 stash = SvSTASH (coro);
430 if (expect_false (stash != coro_stash && stash != coro_state_stash))
431 {
432 /* very slow, but rare, check */
433 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
434 croak ("Coro::State object required");
435 }
436
437 mg = CORO_MAGIC_state (coro);
438 return (struct coro *)mg->mg_ptr;
439}
440
441#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
442
443/* faster than SvSTATE, but expects a coroutine hv */
444#define SvSTATE_hv(hv) ((struct coro *)CORO_MAGIC_NN ((SV *)hv, CORO_MAGIC_type_state)->mg_ptr)
445#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
446
447/*****************************************************************************/
448/* padlist management and caching */
449
328static AV * 450static AV *
329coro_clone_padlist (pTHX_ CV *cv) 451coro_derive_padlist (pTHX_ CV *cv)
330{ 452{
331 AV *padlist = CvPADLIST (cv); 453 AV *padlist = CvPADLIST (cv);
332 AV *newpadlist, *newpad; 454 AV *newpadlist, *newpad;
333 455
334 newpadlist = newAV (); 456 newpadlist = newAV ();
… …
339 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 461 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
340#endif 462#endif
341 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 463 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
342 --AvFILLp (padlist); 464 --AvFILLp (padlist);
343 465
344 av_store (newpadlist, 0, SvREFCNT_inc_NN (*av_fetch (padlist, 0, FALSE))); 466 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0]));
345 av_store (newpadlist, 1, (SV *)newpad); 467 av_store (newpadlist, 1, (SV *)newpad);
346 468
347 return newpadlist; 469 return newpadlist;
348} 470}
349 471
350static void 472static void
351free_padlist (pTHX_ AV *padlist) 473free_padlist (pTHX_ AV *padlist)
352{ 474{
353 /* may be during global destruction */ 475 /* may be during global destruction */
354 if (SvREFCNT (padlist)) 476 if (!IN_DESTRUCT)
355 { 477 {
356 I32 i = AvFILLp (padlist); 478 I32 i = AvFILLp (padlist);
357 while (i >= 0) 479
480 while (i > 0) /* special-case index 0 */
358 { 481 {
359 SV **svp = av_fetch (padlist, i--, FALSE); 482 /* we try to be extra-careful here */
360 if (svp) 483 AV *av = (AV *)AvARRAY (padlist)[i--];
361 { 484 I32 j = AvFILLp (av);
362 SV *sv; 485
363 while (&PL_sv_undef != (sv = av_pop ((AV *)*svp))) 486 while (j >= 0)
487 SvREFCNT_dec (AvARRAY (av)[j--]);
488
489 AvFILLp (av) = -1;
364 SvREFCNT_dec (sv); 490 SvREFCNT_dec (av);
365
366 SvREFCNT_dec (*svp);
367 }
368 } 491 }
369 492
493 SvREFCNT_dec (AvARRAY (padlist)[0]);
494
495 AvFILLp (padlist) = -1;
370 SvREFCNT_dec ((SV*)padlist); 496 SvREFCNT_dec ((SV*)padlist);
371 } 497 }
372} 498}
373 499
374static int 500static int
375coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 501coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
376{ 502{
377 AV *padlist; 503 AV *padlist;
378 AV *av = (AV *)mg->mg_obj; 504 AV *av = (AV *)mg->mg_obj;
505
506 /* perl manages to free our internal AV and _then_ call us */
507 if (IN_DESTRUCT)
508 return 0;
379 509
380 /* casting is fun. */ 510 /* casting is fun. */
381 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 511 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
382 free_padlist (aTHX_ padlist); 512 free_padlist (aTHX_ padlist);
383 513
384 SvREFCNT_dec (av); /* sv_magicext increased the refcount */ 514 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
385 515
386 return 0; 516 return 0;
387} 517}
388
389#define CORO_MAGIC_type_cv 26
390#define CORO_MAGIC_type_state PERL_MAGIC_ext
391 518
392static MGVTBL coro_cv_vtbl = { 519static MGVTBL coro_cv_vtbl = {
393 0, 0, 0, 0, 520 0, 0, 0, 0,
394 coro_cv_free 521 coro_cv_free
395}; 522};
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 523
440/* the next two functions merely cache the padlists */ 524/* the next two functions merely cache the padlists */
441static void 525static void
442get_padlist (pTHX_ CV *cv) 526get_padlist (pTHX_ CV *cv)
443{ 527{
… …
454 CV *cp = Perl_cv_clone (aTHX_ cv); 538 CV *cp = Perl_cv_clone (aTHX_ cv);
455 CvPADLIST (cv) = CvPADLIST (cp); 539 CvPADLIST (cv) = CvPADLIST (cp);
456 CvPADLIST (cp) = 0; 540 CvPADLIST (cp) = 0;
457 SvREFCNT_dec (cp); 541 SvREFCNT_dec (cp);
458#else 542#else
459 CvPADLIST (cv) = coro_clone_padlist (aTHX_ cv); 543 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
460#endif 544#endif
461 } 545 }
462} 546}
463 547
464static void 548static void
… …
471 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 555 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
472 556
473 av = (AV *)mg->mg_obj; 557 av = (AV *)mg->mg_obj;
474 558
475 if (expect_false (AvFILLp (av) >= AvMAX (av))) 559 if (expect_false (AvFILLp (av) >= AvMAX (av)))
476 av_extend (av, AvMAX (av) + 1); 560 av_extend (av, AvFILLp (av) + 1);
477 561
478 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 562 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
479} 563}
480 564
481/** load & save, init *******************************************************/ 565/** load & save, init *******************************************************/
566
567/* swap sv heads, at least logically */
568static void
569swap_svs (pTHX_ Coro__State c)
570{
571 int i;
572
573 for (i = 0; i <= AvFILLp (c->swap_sv); )
574 {
575 SV *a = AvARRAY (c->swap_sv)[i++];
576 SV *b = AvARRAY (c->swap_sv)[i++];
577
578 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
579 SV tmp;
580
581 /* swap sv_any */
582 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
583
584 /* swap sv_flags */
585 SvFLAGS (&tmp) = SvFLAGS (a);
586 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
587 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
588
589#if PERL_VERSION_ATLEAST (5,10,0)
590 /* perl 5.10 complicates this _quite_ a bit, but it also is
591 * is much faster, so no quarrels here. alternatively, we could
592 * sv_upgrade to avoid this.
593 */
594 {
595 /* swap sv_u */
596 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
597
598 /* if SvANY points to the head, we need to adjust the pointers,
599 * as the pointer for a still points to b, and maybe vice versa.
600 */
601 #define svany_in_head(type) \
602 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
603
604 if (svany_in_head (SvTYPE (a)))
605 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
606
607 if (svany_in_head (SvTYPE (b)))
608 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
609 }
610#endif
611 }
612}
613
614#define SWAP_SVS(coro) \
615 if (expect_false ((coro)->swap_sv)) \
616 swap_svs (aTHX_ (coro))
617
618static void
619on_enterleave_call (pTHX_ SV *cb);
482 620
483static void 621static void
484load_perl (pTHX_ Coro__State c) 622load_perl (pTHX_ Coro__State c)
485{ 623{
486 perl_slots *slot = c->slot; 624 perl_slots *slot = c->slot;
487 c->slot = 0; 625 c->slot = 0;
488 626
489 PL_mainstack = c->mainstack; 627 PL_mainstack = c->mainstack;
490 628
491 GvSV (PL_defgv) = slot->defsv; 629 GvSV (PL_defgv) = slot->defsv;
492 GvAV (PL_defgv) = slot->defav; 630 GvAV (PL_defgv) = slot->defav;
493 GvSV (PL_errgv) = slot->errsv; 631 GvSV (PL_errgv) = slot->errsv;
494 GvSV (irsgv) = slot->irsgv; 632 GvSV (irsgv) = slot->irsgv;
633 GvHV (PL_hintgv) = slot->hinthv;
495 634
496 #define VAR(name,type) PL_ ## name = slot->name; 635 #define VAR(name,type) PL_ ## name = slot->name;
497 # include "state.h" 636 # include "state.h"
498 #undef VAR 637 #undef VAR
499 638
… …
513 PUTBACK; 652 PUTBACK;
514 } 653 }
515 654
516 slf_frame = c->slf_frame; 655 slf_frame = c->slf_frame;
517 CORO_THROW = c->except; 656 CORO_THROW = c->except;
657
658 if (expect_false (enable_times))
659 {
660 if (expect_false (!times_valid))
661 coro_times_update ();
662
663 coro_times_sub (c);
664 }
665
666 if (expect_false (c->on_enter))
667 {
668 int i;
669
670 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
671 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
672 }
673
674 SWAP_SVS (c);
518} 675}
519 676
520static void 677static void
521save_perl (pTHX_ Coro__State c) 678save_perl (pTHX_ Coro__State c)
522{ 679{
680 SWAP_SVS (c);
681
682 if (expect_false (c->on_leave))
683 {
684 int i;
685
686 for (i = AvFILLp (c->on_leave); i >= 0; --i)
687 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
688 }
689
690 times_valid = 0;
691
692 if (expect_false (enable_times))
693 {
694 coro_times_update (); times_valid = 1;
695 coro_times_add (c);
696 }
697
523 c->except = CORO_THROW; 698 c->except = CORO_THROW;
524 c->slf_frame = slf_frame; 699 c->slf_frame = slf_frame;
525 700
526 { 701 {
527 dSP; 702 dSP;
… …
540 { 715 {
541 while (expect_true (cxix >= 0)) 716 while (expect_true (cxix >= 0))
542 { 717 {
543 PERL_CONTEXT *cx = &ccstk[cxix--]; 718 PERL_CONTEXT *cx = &ccstk[cxix--];
544 719
545 if (expect_true (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT)) 720 if (expect_true (CxTYPE (cx) == CXt_SUB) || expect_false (CxTYPE (cx) == CXt_FORMAT))
546 { 721 {
547 CV *cv = cx->blk_sub.cv; 722 CV *cv = cx->blk_sub.cv;
548 723
549 if (expect_true (CvDEPTH (cv))) 724 if (expect_true (CvDEPTH (cv)))
550 { 725 {
… …
574 /* we manually unroll here, as usually 2 slots is enough */ 749 /* we manually unroll here, as usually 2 slots is enough */
575 if (SLOT_COUNT >= 1) CXINC; 750 if (SLOT_COUNT >= 1) CXINC;
576 if (SLOT_COUNT >= 2) CXINC; 751 if (SLOT_COUNT >= 2) CXINC;
577 if (SLOT_COUNT >= 3) CXINC; 752 if (SLOT_COUNT >= 3) CXINC;
578 { 753 {
579 int i; 754 unsigned int i;
580 for (i = 3; i < SLOT_COUNT; ++i) 755 for (i = 3; i < SLOT_COUNT; ++i)
581 CXINC; 756 CXINC;
582 } 757 }
583 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 758 cxstack_ix -= SLOT_COUNT; /* undo allocation */
584 759
585 c->mainstack = PL_mainstack; 760 c->mainstack = PL_mainstack;
586 761
587 { 762 {
588 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 763 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
589 764
590 slot->defav = GvAV (PL_defgv); 765 slot->defav = GvAV (PL_defgv);
591 slot->defsv = DEFSV; 766 slot->defsv = DEFSV;
592 slot->errsv = ERRSV; 767 slot->errsv = ERRSV;
593 slot->irsgv = GvSV (irsgv); 768 slot->irsgv = GvSV (irsgv);
769 slot->hinthv = GvHV (PL_hintgv);
594 770
595 #define VAR(name,type) slot->name = PL_ ## name; 771 #define VAR(name,type) slot->name = PL_ ## name;
596 # include "state.h" 772 # include "state.h"
597 #undef VAR 773 #undef VAR
598 } 774 }
… …
676#if !PERL_VERSION_ATLEAST (5,10,0) 852#if !PERL_VERSION_ATLEAST (5,10,0)
677 Safefree (PL_retstack); 853 Safefree (PL_retstack);
678#endif 854#endif
679} 855}
680 856
857#define CORO_RSS \
858 rss += sizeof (SYM (curstackinfo)); \
859 rss += (SYM (curstackinfo->si_cxmax) + 1) * sizeof (PERL_CONTEXT); \
860 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (SYM (curstack))) * sizeof (SV *); \
861 rss += SYM (tmps_max) * sizeof (SV *); \
862 rss += (SYM (markstack_max) - SYM (markstack_ptr)) * sizeof (I32); \
863 rss += SYM (scopestack_max) * sizeof (I32); \
864 rss += SYM (savestack_max) * sizeof (ANY);
865
681static size_t 866static size_t
682coro_rss (pTHX_ struct coro *coro) 867coro_rss (pTHX_ struct coro *coro)
683{ 868{
684 size_t rss = sizeof (*coro); 869 size_t rss = sizeof (*coro);
685 870
686 if (coro->mainstack) 871 if (coro->mainstack)
687 { 872 {
688 perl_slots tmp_slot;
689 perl_slots *slot;
690
691 if (coro->flags & CF_RUNNING) 873 if (coro->flags & CF_RUNNING)
692 { 874 {
693 slot = &tmp_slot; 875 #define SYM(sym) PL_ ## sym
694 876 CORO_RSS;
695 #define VAR(name,type) slot->name = PL_ ## name;
696 # include "state.h"
697 #undef VAR 877 #undef SYM
698 } 878 }
699 else 879 else
700 slot = coro->slot;
701
702 if (slot)
703 { 880 {
704 rss += sizeof (slot->curstackinfo); 881 #define SYM(sym) coro->slot->sym
705 rss += (slot->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT); 882 CORO_RSS;
706 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (slot->curstack)) * sizeof (SV *); 883 #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 } 884 }
716 } 885 }
717 886
718 return rss; 887 return rss;
719} 888}
… …
732#endif 901#endif
733 902
734/* 903/*
735 * This overrides the default magic get method of %SIG elements. 904 * 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 905 * 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 906 * and instead of trying to save and restore the hash elements, we just provide
738 * readback here. 907 * 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 */ 908 */
743static int 909static int
744coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 910coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
745{ 911{
746 const char *s = MgPV_nolen_const (mg); 912 const char *s = MgPV_nolen_const (mg);
… …
799 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 965 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
800 966
801 if (svp) 967 if (svp)
802 { 968 {
803 SV *old = *svp; 969 SV *old = *svp;
804 *svp = newSVsv (sv); 970 *svp = SvOK (sv) ? newSVsv (sv) : 0;
805 SvREFCNT_dec (old); 971 SvREFCNT_dec (old);
806 return 0; 972 return 0;
807 } 973 }
808 } 974 }
809 975
… …
821slf_check_nop (pTHX_ struct CoroSLF *frame) 987slf_check_nop (pTHX_ struct CoroSLF *frame)
822{ 988{
823 return 0; 989 return 0;
824} 990}
825 991
826static UNOP coro_setup_op; 992static int
993slf_check_repeat (pTHX_ struct CoroSLF *frame)
994{
995 return 1;
996}
997
998static UNOP init_perl_op;
827 999
828static void NOINLINE /* noinline to keep it out of the transfer fast path */ 1000static void NOINLINE /* noinline to keep it out of the transfer fast path */
829coro_setup (pTHX_ struct coro *coro) 1001init_perl (pTHX_ struct coro *coro)
830{ 1002{
831 /* 1003 /*
832 * emulate part of the perl startup here. 1004 * emulate part of the perl startup here.
833 */ 1005 */
834 coro_init_stacks (aTHX); 1006 coro_init_stacks (aTHX);
835 1007
836 PL_runops = RUNOPS_DEFAULT; 1008 PL_runops = RUNOPS_DEFAULT;
837 PL_curcop = &PL_compiling; 1009 PL_curcop = &PL_compiling;
838 PL_in_eval = EVAL_NULL; 1010 PL_in_eval = EVAL_NULL;
839 PL_comppad = 0; 1011 PL_comppad = 0;
1012 PL_comppad_name = 0;
1013 PL_comppad_name_fill = 0;
1014 PL_comppad_name_floor = 0;
840 PL_curpm = 0; 1015 PL_curpm = 0;
841 PL_curpad = 0; 1016 PL_curpad = 0;
842 PL_localizing = 0; 1017 PL_localizing = 0;
843 PL_dirty = 0;
844 PL_restartop = 0; 1018 PL_restartop = 0;
845#if PERL_VERSION_ATLEAST (5,10,0) 1019#if PERL_VERSION_ATLEAST (5,10,0)
846 PL_parser = 0; 1020 PL_parser = 0;
847#endif 1021#endif
1022 PL_hints = 0;
848 1023
849 /* recreate the die/warn hooks */ 1024 /* recreate the die/warn hooks */
850 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1025 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); 1026 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook);
852 1027
853 GvSV (PL_defgv) = newSV (0); 1028 GvSV (PL_defgv) = newSV (0);
854 GvAV (PL_defgv) = coro->args; coro->args = 0; 1029 GvAV (PL_defgv) = coro->args; coro->args = 0;
855 GvSV (PL_errgv) = newSV (0); 1030 GvSV (PL_errgv) = newSV (0);
856 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1031 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
1032 GvHV (PL_hintgv) = 0;
857 PL_rs = newSVsv (GvSV (irsgv)); 1033 PL_rs = newSVsv (GvSV (irsgv));
858 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1034 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
859 1035
860 { 1036 {
861 dSP; 1037 dSP;
862 UNOP myop; 1038 UNOP myop;
863 1039
864 Zero (&myop, 1, UNOP); 1040 Zero (&myop, 1, UNOP);
865 myop.op_next = Nullop; 1041 myop.op_next = Nullop;
1042 myop.op_type = OP_ENTERSUB;
866 myop.op_flags = OPf_WANT_VOID; 1043 myop.op_flags = OPf_WANT_VOID;
867 1044
868 PUSHMARK (SP); 1045 PUSHMARK (SP);
869 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv)))); 1046 PUSHs ((SV *)coro->startcv);
870 PUTBACK; 1047 PUTBACK;
871 PL_op = (OP *)&myop; 1048 PL_op = (OP *)&myop;
872 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 1049 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
873 SPAGAIN;
874 } 1050 }
875 1051
876 /* this newly created coroutine might be run on an existing cctx which most 1052 /* 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. 1053 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
878 */ 1054 */
879 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1055 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 */ 1056 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
881 1057
882 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1058 /* 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; 1059 init_perl_op.op_next = PL_op;
884 coro_setup_op.op_type = OP_CUSTOM; 1060 init_perl_op.op_type = OP_ENTERSUB;
885 coro_setup_op.op_ppaddr = pp_slf; 1061 init_perl_op.op_ppaddr = pp_slf;
886 /* no flags required, as an init function won't be called */ 1062 /* no flags etc. required, as an init function won't be called */
887 1063
888 PL_op = (OP *)&coro_setup_op; 1064 PL_op = (OP *)&init_perl_op;
889 1065
890 /* copy throw, in case it was set before coro_setup */ 1066 /* copy throw, in case it was set before init_perl */
891 CORO_THROW = coro->except; 1067 CORO_THROW = coro->except;
892}
893 1068
1069 SWAP_SVS (coro);
1070
1071 if (expect_false (enable_times))
1072 {
1073 coro_times_update ();
1074 coro_times_sub (coro);
1075 }
1076}
1077
894static void 1078static void
895coro_destruct (pTHX_ struct coro *coro) 1079coro_unwind_stacks (pTHX)
896{ 1080{
897 if (!IN_DESTRUCT) 1081 if (!IN_DESTRUCT)
898 { 1082 {
899 /* restore all saved variables and stuff */ 1083 /* restore all saved variables and stuff */
900 LEAVE_SCOPE (0); 1084 LEAVE_SCOPE (0);
… …
908 POPSTACK_TO (PL_mainstack); 1092 POPSTACK_TO (PL_mainstack);
909 1093
910 /* unwind main stack */ 1094 /* unwind main stack */
911 dounwind (-1); 1095 dounwind (-1);
912 } 1096 }
1097}
913 1098
914 SvREFCNT_dec (GvSV (PL_defgv)); 1099static void
915 SvREFCNT_dec (GvAV (PL_defgv)); 1100destroy_perl (pTHX_ struct coro *coro)
916 SvREFCNT_dec (GvSV (PL_errgv)); 1101{
917 SvREFCNT_dec (PL_defoutgv); 1102 SV *svf [9];
918 SvREFCNT_dec (PL_rs);
919 SvREFCNT_dec (GvSV (irsgv));
920 1103
921 SvREFCNT_dec (PL_diehook);
922 SvREFCNT_dec (PL_warnhook);
923 1104 {
924 SvREFCNT_dec (CORO_THROW); 1105 struct coro *current = SvSTATE_current;
1106
1107 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1108
1109 save_perl (aTHX_ current);
1110 load_perl (aTHX_ coro);
1111
1112 coro_unwind_stacks (aTHX);
1113 coro_destruct_stacks (aTHX);
1114
1115 /* restore swapped sv's */
1116 SWAP_SVS (coro);
1117
1118 // now save some sv's to be free'd later
1119 svf [0] = GvSV (PL_defgv);
1120 svf [1] = (SV *)GvAV (PL_defgv);
1121 svf [2] = GvSV (PL_errgv);
1122 svf [3] = (SV *)PL_defoutgv;
1123 svf [4] = PL_rs;
1124 svf [5] = GvSV (irsgv);
1125 svf [6] = (SV *)GvHV (PL_hintgv);
1126 svf [7] = PL_diehook;
1127 svf [8] = PL_warnhook;
1128 assert (9 == sizeof (svf) / sizeof (*svf));
1129
1130 load_perl (aTHX_ current);
1131 }
1132
1133 {
1134 unsigned int i;
1135
1136 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i)
1137 SvREFCNT_dec (svf [i]);
1138
925 SvREFCNT_dec (coro->saved_deffh); 1139 SvREFCNT_dec (coro->saved_deffh);
926 SvREFCNT_dec (coro->rouse_cb); 1140 SvREFCNT_dec (coro->rouse_cb);
927 1141 SvREFCNT_dec (coro->invoke_cb);
928 coro_destruct_stacks (aTHX); 1142 SvREFCNT_dec (coro->invoke_av);
1143 }
929} 1144}
930 1145
931INLINE void 1146INLINE void
932free_coro_mortal (pTHX) 1147free_coro_mortal (pTHX)
933{ 1148{
… …
941static int 1156static int
942runops_trace (pTHX) 1157runops_trace (pTHX)
943{ 1158{
944 COP *oldcop = 0; 1159 COP *oldcop = 0;
945 int oldcxix = -2; 1160 int oldcxix = -2;
946 struct coro *coro = SvSTATE_current; /* trace cctx is tied to specific coro */
947 coro_cctx *cctx = coro->cctx;
948 1161
949 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX))) 1162 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX)))
950 { 1163 {
951 PERL_ASYNC_CHECK (); 1164 PERL_ASYNC_CHECK ();
952 1165
953 if (cctx->flags & CC_TRACE_ALL) 1166 if (cctx_current->flags & CC_TRACE_ALL)
954 { 1167 {
955 if (PL_op->op_type == OP_LEAVESUB && cctx->flags & CC_TRACE_SUB) 1168 if (PL_op->op_type == OP_LEAVESUB && cctx_current->flags & CC_TRACE_SUB)
956 { 1169 {
957 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1170 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
958 SV **bot, **top; 1171 SV **bot, **top;
959 AV *av = newAV (); /* return values */ 1172 AV *av = newAV (); /* return values */
960 SV **cb; 1173 SV **cb;
… …
997 1210
998 if (PL_curcop != &PL_compiling) 1211 if (PL_curcop != &PL_compiling)
999 { 1212 {
1000 SV **cb; 1213 SV **cb;
1001 1214
1002 if (oldcxix != cxstack_ix && cctx->flags & CC_TRACE_SUB) 1215 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB)
1003 { 1216 {
1004 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1217 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1005 1218
1006 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1219 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1007 { 1220 {
1008 runops_proc_t old_runops = PL_runops;
1009 dSP; 1221 dSP;
1010 GV *gv = CvGV (cx->blk_sub.cv); 1222 GV *gv = CvGV (cx->blk_sub.cv);
1011 SV *fullname = sv_2mortal (newSV (0)); 1223 SV *fullname = sv_2mortal (newSV (0));
1012 1224
1013 if (isGV (gv)) 1225 if (isGV (gv))
… …
1018 SAVETMPS; 1230 SAVETMPS;
1019 EXTEND (SP, 3); 1231 EXTEND (SP, 3);
1020 PUSHMARK (SP); 1232 PUSHMARK (SP);
1021 PUSHs (&PL_sv_yes); 1233 PUSHs (&PL_sv_yes);
1022 PUSHs (fullname); 1234 PUSHs (fullname);
1023 PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef); 1235 PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef);
1024 PUTBACK; 1236 PUTBACK;
1025 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0); 1237 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); 1238 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
1027 SPAGAIN; 1239 SPAGAIN;
1028 FREETMPS; 1240 FREETMPS;
… …
1031 } 1243 }
1032 1244
1033 oldcxix = cxstack_ix; 1245 oldcxix = cxstack_ix;
1034 } 1246 }
1035 1247
1036 if (cctx->flags & CC_TRACE_LINE) 1248 if (cctx_current->flags & CC_TRACE_LINE)
1037 { 1249 {
1038 dSP; 1250 dSP;
1039 1251
1040 PL_runops = RUNOPS_DEFAULT; 1252 PL_runops = RUNOPS_DEFAULT;
1041 ENTER; 1253 ENTER;
… …
1060 1272
1061 TAINT_NOT; 1273 TAINT_NOT;
1062 return 0; 1274 return 0;
1063} 1275}
1064 1276
1065static struct coro_cctx *cctx_ssl_cctx;
1066static struct CoroSLF cctx_ssl_frame; 1277static struct CoroSLF cctx_ssl_frame;
1067 1278
1068static void 1279static void
1069slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta) 1280slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta)
1070{ 1281{
1071 ta->prev = (struct coro *)cctx_ssl_cctx;
1072 ta->next = 0; 1282 ta->prev = 0;
1073} 1283}
1074 1284
1075static int 1285static int
1076slf_check_set_stacklevel (pTHX_ struct CoroSLF *frame) 1286slf_check_set_stacklevel (pTHX_ struct CoroSLF *frame)
1077{ 1287{
… …
1080 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1290 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1081} 1291}
1082 1292
1083/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1293/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1084static void NOINLINE 1294static void NOINLINE
1085cctx_prepare (pTHX_ coro_cctx *cctx) 1295cctx_prepare (pTHX)
1086{ 1296{
1087 PL_top_env = &PL_start_env; 1297 PL_top_env = &PL_start_env;
1088 1298
1089 if (cctx->flags & CC_TRACE) 1299 if (cctx_current->flags & CC_TRACE)
1090 PL_runops = runops_trace; 1300 PL_runops = runops_trace;
1091 1301
1092 /* we already must be executing an SLF op, there is no other valid way 1302 /* we already must be executing an SLF op, there is no other valid way
1093 * that can lead to creation of a new cctx */ 1303 * that can lead to creation of a new cctx */
1094 assert (("FATAL: can't prepare slf-less cctx in Coro module (please report)", 1304 assert (("FATAL: can't prepare slf-less cctx in Coro module (please report)",
1095 slf_frame.prepare && PL_op->op_ppaddr == pp_slf)); 1305 slf_frame.prepare && PL_op->op_ppaddr == pp_slf));
1096 1306
1097 /* we must emulate leaving pp_slf, which is done inside slf_check_set_stacklevel */ 1307 /* 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; 1308 cctx_ssl_frame = slf_frame;
1100 1309
1101 slf_frame.prepare = slf_prepare_set_stacklevel; 1310 slf_frame.prepare = slf_prepare_set_stacklevel;
1102 slf_frame.check = slf_check_set_stacklevel; 1311 slf_frame.check = slf_check_set_stacklevel;
1103} 1312}
… …
1126 /* normally we would need to skip the entersub here */ 1335 /* normally we would need to skip the entersub here */
1127 /* not doing so will re-execute it, which is exactly what we want */ 1336 /* not doing so will re-execute it, which is exactly what we want */
1128 /* PL_nop = PL_nop->op_next */ 1337 /* PL_nop = PL_nop->op_next */
1129 1338
1130 /* inject a fake subroutine call to cctx_init */ 1339 /* inject a fake subroutine call to cctx_init */
1131 cctx_prepare (aTHX_ (coro_cctx *)arg); 1340 cctx_prepare (aTHX);
1132 1341
1133 /* cctx_run is the alternative tail of transfer() */ 1342 /* cctx_run is the alternative tail of transfer() */
1134 transfer_tail (aTHX); 1343 transfer_tail (aTHX);
1135 1344
1136 /* somebody or something will hit me for both perl_run and PL_restartop */ 1345 /* somebody or something will hit me for both perl_run and PL_restartop */
1137 PL_restartop = PL_op; 1346 PL_restartop = PL_op;
1138 perl_run (PL_curinterp); 1347 perl_run (PL_curinterp);
1348 /*
1349 * Unfortunately, there is no way to get at the return values of the
1350 * coro body here, as perl_run destroys these. Likewise, we cannot catch
1351 * runtime errors here, as this is just a random interpreter, not a thread.
1352 */
1139 1353
1140 /* 1354 /*
1141 * If perl-run returns we assume exit() was being called or the coro 1355 * 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) 1356 * 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 1357 * 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" 1358 * bootstrap-time "top" top_env, as we cannot restore the "main"
1145 * coroutine as Coro has no such concept 1359 * coroutine as Coro has no such concept.
1360 * This actually isn't valid with the pthread backend, but OSes requiring
1361 * that backend are too broken to do it in a standards-compliant way.
1146 */ 1362 */
1147 PL_top_env = main_top_env; 1363 PL_top_env = main_top_env;
1148 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */ 1364 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1149 } 1365 }
1150} 1366}
… …
1227cctx_destroy (coro_cctx *cctx) 1443cctx_destroy (coro_cctx *cctx)
1228{ 1444{
1229 if (!cctx) 1445 if (!cctx)
1230 return; 1446 return;
1231 1447
1448 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary?
1449
1232 --cctx_count; 1450 --cctx_count;
1233 coro_destroy (&cctx->cctx); 1451 coro_destroy (&cctx->cctx);
1234 1452
1235 /* coro_transfer creates new, empty cctx's */ 1453 /* coro_transfer creates new, empty cctx's */
1236 if (cctx->sptr) 1454 if (cctx->sptr)
… …
1299 /* TODO: throwing up here is considered harmful */ 1517 /* TODO: throwing up here is considered harmful */
1300 1518
1301 if (expect_true (prev != next)) 1519 if (expect_true (prev != next))
1302 { 1520 {
1303 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1521 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,"); 1522 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1305 1523
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)) 1524 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,"); 1525 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1311 1526
1312#if !PERL_VERSION_ATLEAST (5,10,0) 1527#if !PERL_VERSION_ATLEAST (5,10,0)
1313 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1528 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,"); 1529 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1315#endif 1530#endif
… …
1321transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1536transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1322{ 1537{
1323 dSTACKLEVEL; 1538 dSTACKLEVEL;
1324 1539
1325 /* sometimes transfer is only called to set idle_sp */ 1540 /* sometimes transfer is only called to set idle_sp */
1326 if (expect_false (!next)) 1541 if (expect_false (!prev))
1327 { 1542 {
1328 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1543 cctx_current->idle_sp = STACKLEVEL;
1329 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1544 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1330 } 1545 }
1331 else if (expect_true (prev != next)) 1546 else if (expect_true (prev != next))
1332 { 1547 {
1333 coro_cctx *prev__cctx; 1548 coro_cctx *cctx_prev;
1334 1549
1335 if (expect_false (prev->flags & CF_NEW)) 1550 if (expect_false (prev->flags & CF_NEW))
1336 { 1551 {
1337 /* create a new empty/source context */ 1552 /* create a new empty/source context */
1338 prev->cctx = cctx_new_empty ();
1339 prev->flags &= ~CF_NEW; 1553 prev->flags &= ~CF_NEW;
1340 prev->flags |= CF_RUNNING; 1554 prev->flags |= CF_RUNNING;
1341 } 1555 }
1342 1556
1343 prev->flags &= ~CF_RUNNING; 1557 prev->flags &= ~CF_RUNNING;
… …
1349 if (expect_false (next->flags & CF_NEW)) 1563 if (expect_false (next->flags & CF_NEW))
1350 { 1564 {
1351 /* need to start coroutine */ 1565 /* need to start coroutine */
1352 next->flags &= ~CF_NEW; 1566 next->flags &= ~CF_NEW;
1353 /* setup coroutine call */ 1567 /* setup coroutine call */
1354 coro_setup (aTHX_ next); 1568 init_perl (aTHX_ next);
1355 } 1569 }
1356 else 1570 else
1357 load_perl (aTHX_ next); 1571 load_perl (aTHX_ next);
1358 1572
1359 prev__cctx = prev->cctx;
1360
1361 /* possibly untie and reuse the cctx */ 1573 /* possibly untie and reuse the cctx */
1362 if (expect_true ( 1574 if (expect_true (
1363 prev__cctx->idle_sp == STACKLEVEL 1575 cctx_current->idle_sp == STACKLEVEL
1364 && !(prev__cctx->flags & CC_TRACE) 1576 && !(cctx_current->flags & CC_TRACE)
1365 && !force_cctx 1577 && !force_cctx
1366 )) 1578 ))
1367 { 1579 {
1368 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1580 /* 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)); 1581 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1370 1582
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 */ 1583 /* 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 */ 1584 /* without this the next cctx_get might destroy the running cctx while still in use */
1375 if (expect_false (CCTX_EXPIRED (prev__cctx))) 1585 if (expect_false (CCTX_EXPIRED (cctx_current)))
1376 if (!next->cctx) 1586 if (expect_true (!next->cctx))
1377 next->cctx = cctx_get (aTHX); 1587 next->cctx = cctx_get (aTHX);
1378 1588
1379 cctx_put (prev__cctx); 1589 cctx_put (cctx_current);
1380 } 1590 }
1591 else
1592 prev->cctx = cctx_current;
1381 1593
1382 ++next->usecount; 1594 ++next->usecount;
1383 1595
1384 if (expect_true (!next->cctx)) 1596 cctx_prev = cctx_current;
1385 next->cctx = cctx_get (aTHX); 1597 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1386 1598
1387 if (expect_false (prev__cctx != next->cctx)) 1599 next->cctx = 0;
1600
1601 if (expect_false (cctx_prev != cctx_current))
1388 { 1602 {
1389 prev__cctx->top_env = PL_top_env; 1603 cctx_prev->top_env = PL_top_env;
1390 PL_top_env = next->cctx->top_env; 1604 PL_top_env = cctx_current->top_env;
1391 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1605 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1392 } 1606 }
1393 1607
1394 transfer_tail (aTHX); 1608 transfer_tail (aTHX);
1395 } 1609 }
1396} 1610}
… …
1404coro_state_destroy (pTHX_ struct coro *coro) 1618coro_state_destroy (pTHX_ struct coro *coro)
1405{ 1619{
1406 if (coro->flags & CF_DESTROYED) 1620 if (coro->flags & CF_DESTROYED)
1407 return 0; 1621 return 0;
1408 1622
1409 if (coro->on_destroy) 1623 if (coro->on_destroy && !PL_dirty)
1410 coro->on_destroy (aTHX_ coro); 1624 coro->on_destroy (aTHX_ coro);
1411 1625
1412 coro->flags |= CF_DESTROYED; 1626 coro->flags |= CF_DESTROYED;
1413 1627
1414 if (coro->flags & CF_READY) 1628 if (coro->flags & CF_READY)
… …
1418 --coro_nready; 1632 --coro_nready;
1419 } 1633 }
1420 else 1634 else
1421 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1635 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1422 1636
1423 if (coro->mainstack && coro->mainstack != main_mainstack) 1637 if (coro->mainstack
1424 { 1638 && coro->mainstack != main_mainstack
1425 struct coro temp; 1639 && coro->slot
1426 1640 && !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); 1641 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 1642
1442 if (coro->next) coro->next->prev = coro->prev; 1643 if (coro->next) coro->next->prev = coro->prev;
1443 if (coro->prev) coro->prev->next = coro->next; 1644 if (coro->prev) coro->prev->next = coro->next;
1444 if (coro == coro_first) coro_first = coro->next; 1645 if (coro == coro_first) coro_first = coro->next;
1646
1647 cctx_destroy (coro->cctx);
1648 SvREFCNT_dec (coro->startcv);
1649 SvREFCNT_dec (coro->args);
1650 SvREFCNT_dec (coro->swap_sv);
1651 SvREFCNT_dec (CORO_THROW);
1445 1652
1446 return 1; 1653 return 1;
1447} 1654}
1448 1655
1449static int 1656static int
… …
1499 1706
1500 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1707 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1501 TRANSFER (ta, 1); 1708 TRANSFER (ta, 1);
1502} 1709}
1503 1710
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 ********************************************************************/ 1711/** Coro ********************************************************************/
1528 1712
1529INLINE void 1713INLINE void
1530coro_enq (pTHX_ struct coro *coro) 1714coro_enq (pTHX_ struct coro *coro)
1531{ 1715{
1532 av_push (coro_ready [coro->prio - PRIO_MIN], SvREFCNT_inc_NN (coro->hv)); 1716 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1533}
1534 1717
1535INLINE SV * 1718 SvREFCNT_inc_NN (coro->hv);
1719
1720 coro->next_ready = 0;
1721 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1722 ready [1] = coro;
1723}
1724
1725INLINE struct coro *
1536coro_deq (pTHX) 1726coro_deq (pTHX)
1537{ 1727{
1538 int prio; 1728 int prio;
1539 1729
1540 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; ) 1730 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
1541 if (AvFILLp (coro_ready [prio]) >= 0) 1731 {
1542 return av_shift (coro_ready [prio]); 1732 struct coro **ready = coro_ready [prio];
1733
1734 if (ready [0])
1735 {
1736 struct coro *coro = ready [0];
1737 ready [0] = coro->next_ready;
1738 return coro;
1739 }
1740 }
1543 1741
1544 return 0; 1742 return 0;
1743}
1744
1745static void
1746invoke_sv_ready_hook_helper (void)
1747{
1748 dTHX;
1749 dSP;
1750
1751 ENTER;
1752 SAVETMPS;
1753
1754 PUSHMARK (SP);
1755 PUTBACK;
1756 call_sv (coro_readyhook, G_VOID | G_DISCARD);
1757
1758 FREETMPS;
1759 LEAVE;
1545} 1760}
1546 1761
1547static int 1762static int
1548api_ready (pTHX_ SV *coro_sv) 1763api_ready (pTHX_ SV *coro_sv)
1549{ 1764{
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); 1765 struct coro *coro = SvSTATE (coro_sv);
1558 1766
1559 if (coro->flags & CF_READY) 1767 if (coro->flags & CF_READY)
1560 return 0; 1768 return 0;
1561 1769
1562 coro->flags |= CF_READY; 1770 coro->flags |= CF_READY;
1563 1771
1564 sv_hook = coro_nready ? 0 : coro_readyhook;
1565 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1566
1567 coro_enq (aTHX_ coro); 1772 coro_enq (aTHX_ coro);
1568 ++coro_nready;
1569 1773
1570 if (sv_hook) 1774 if (!coro_nready++)
1571 { 1775 if (coroapi.readyhook)
1572 dSP; 1776 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 1777
1588 return 1; 1778 return 1;
1589} 1779}
1590 1780
1591static int 1781static int
1592api_is_ready (pTHX_ SV *coro_sv) 1782api_is_ready (pTHX_ SV *coro_sv)
1593{ 1783{
1594 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1784 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1595} 1785}
1596 1786
1787/* expects to own a reference to next->hv */
1597INLINE void 1788INLINE void
1598prepare_schedule (pTHX_ struct coro_transfer_args *ta) 1789prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1599{ 1790{
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); 1791 SV *prev_sv = SvRV (coro_current);
1792
1639 ta->prev = SvSTATE_hv (prev_sv); 1793 ta->prev = SvSTATE_hv (prev_sv);
1794 ta->next = next;
1795
1640 TRANSFER_CHECK (*ta); 1796 TRANSFER_CHECK (*ta);
1641 assert (("FATAL: next coroutine isn't marked as ready in Coro (please report)", ta->next->flags & CF_READY)); 1797
1642 ta->next->flags &= ~CF_READY;
1643 SvRV_set (coro_current, next_sv); 1798 SvRV_set (coro_current, (SV *)next->hv);
1644 1799
1645 free_coro_mortal (aTHX); 1800 free_coro_mortal (aTHX);
1646 coro_mortal = prev_sv; 1801 coro_mortal = prev_sv;
1647} 1802}
1648 1803
1804static void
1805prepare_schedule (pTHX_ struct coro_transfer_args *ta)
1806{
1807 for (;;)
1808 {
1809 struct coro *next = coro_deq (aTHX);
1810
1811 if (expect_true (next))
1812 {
1813 /* cannot transfer to destroyed coros, skip and look for next */
1814 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED)))
1815 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1816 else
1817 {
1818 next->flags &= ~CF_READY;
1819 --coro_nready;
1820
1821 prepare_schedule_to (aTHX_ ta, next);
1822 break;
1823 }
1824 }
1825 else
1826 {
1827 /* nothing to schedule: call the idle handler */
1828 if (SvROK (sv_idle)
1829 && SvOBJECT (SvRV (sv_idle)))
1830 {
1831 if (SvRV (sv_idle) == SvRV (coro_current))
1832 croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught");
1833
1834 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1835 api_ready (aTHX_ SvRV (sv_idle));
1836 --coro_nready;
1837 }
1838 else
1839 {
1840 /* TODO: deprecated, remove, cannot work reliably *//*D*/
1841 dSP;
1842
1843 ENTER;
1844 SAVETMPS;
1845
1846 PUSHMARK (SP);
1847 PUTBACK;
1848 call_sv (sv_idle, G_VOID | G_DISCARD);
1849
1850 FREETMPS;
1851 LEAVE;
1852 }
1853 }
1854 }
1855}
1856
1649INLINE void 1857INLINE void
1650prepare_cede (pTHX_ struct coro_transfer_args *ta) 1858prepare_cede (pTHX_ struct coro_transfer_args *ta)
1651{ 1859{
1652 api_ready (aTHX_ coro_current); 1860 api_ready (aTHX_ coro_current);
1653 prepare_schedule (aTHX_ ta); 1861 prepare_schedule (aTHX_ ta);
… …
1672{ 1880{
1673 struct coro_transfer_args ta; 1881 struct coro_transfer_args ta;
1674 1882
1675 prepare_schedule (aTHX_ &ta); 1883 prepare_schedule (aTHX_ &ta);
1676 TRANSFER (ta, 1); 1884 TRANSFER (ta, 1);
1885}
1886
1887static void
1888api_schedule_to (pTHX_ SV *coro_sv)
1889{
1890 struct coro_transfer_args ta;
1891 struct coro *next = SvSTATE (coro_sv);
1892
1893 SvREFCNT_inc_NN (coro_sv);
1894 prepare_schedule_to (aTHX_ &ta, next);
1677} 1895}
1678 1896
1679static int 1897static int
1680api_cede (pTHX) 1898api_cede (pTHX)
1681{ 1899{
… …
1710static void 1928static void
1711api_trace (pTHX_ SV *coro_sv, int flags) 1929api_trace (pTHX_ SV *coro_sv, int flags)
1712{ 1930{
1713 struct coro *coro = SvSTATE (coro_sv); 1931 struct coro *coro = SvSTATE (coro_sv);
1714 1932
1933 if (coro->flags & CF_RUNNING)
1934 croak ("cannot enable tracing on a running coroutine, caught");
1935
1715 if (flags & CC_TRACE) 1936 if (flags & CC_TRACE)
1716 { 1937 {
1717 if (!coro->cctx) 1938 if (!coro->cctx)
1718 coro->cctx = cctx_new_run (); 1939 coro->cctx = cctx_new_run ();
1719 else if (!(coro->cctx->flags & CC_TRACE)) 1940 else if (!(coro->cctx->flags & CC_TRACE))
1720 croak ("cannot enable tracing on coroutine with custom stack,"); 1941 croak ("cannot enable tracing on coroutine with custom stack, caught");
1721 1942
1722 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL)); 1943 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL));
1723 } 1944 }
1724 else if (coro->cctx && coro->cctx->flags & CC_TRACE) 1945 else if (coro->cctx && coro->cctx->flags & CC_TRACE)
1725 { 1946 {
… …
1730 else 1951 else
1731 coro->slot->runops = RUNOPS_DEFAULT; 1952 coro->slot->runops = RUNOPS_DEFAULT;
1732 } 1953 }
1733} 1954}
1734 1955
1956static void
1957coro_call_on_destroy (pTHX_ struct coro *coro)
1958{
1959 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0);
1960 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1961
1962 if (on_destroyp)
1963 {
1964 AV *on_destroy = (AV *)SvRV (*on_destroyp);
1965
1966 while (AvFILLp (on_destroy) >= 0)
1967 {
1968 dSP; /* don't disturb outer sp */
1969 SV *cb = av_pop (on_destroy);
1970
1971 PUSHMARK (SP);
1972
1973 if (statusp)
1974 {
1975 int i;
1976 AV *status = (AV *)SvRV (*statusp);
1977 EXTEND (SP, AvFILLp (status) + 1);
1978
1979 for (i = 0; i <= AvFILLp (status); ++i)
1980 PUSHs (AvARRAY (status)[i]);
1981 }
1982
1983 PUTBACK;
1984 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD);
1985 }
1986 }
1987}
1988
1989static void
1990slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1991{
1992 int i;
1993 HV *hv = (HV *)SvRV (coro_current);
1994 AV *av = newAV ();
1995
1996 /* items are actually not so common, so optimise for this case */
1997 if (items)
1998 {
1999 av_extend (av, items - 1);
2000
2001 for (i = 0; i < items; ++i)
2002 av_push (av, SvREFCNT_inc_NN (arg [i]));
2003 }
2004
2005 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0);
2006
2007 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */
2008 api_ready (aTHX_ sv_manager);
2009
2010 frame->prepare = prepare_schedule;
2011 frame->check = slf_check_repeat;
2012
2013 /* as a minor optimisation, we could unwind all stacks here */
2014 /* but that puts extra pressure on pp_slf, and is not worth much */
2015 /*coro_unwind_stacks (aTHX);*/
2016}
2017
2018/*****************************************************************************/
2019/* async pool handler */
2020
2021static int
2022slf_check_pool_handler (pTHX_ struct CoroSLF *frame)
2023{
2024 HV *hv = (HV *)SvRV (coro_current);
2025 struct coro *coro = (struct coro *)frame->data;
2026
2027 if (!coro->invoke_cb)
2028 return 1; /* loop till we have invoke */
2029 else
2030 {
2031 hv_store (hv, "desc", sizeof ("desc") - 1,
2032 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
2033
2034 coro->saved_deffh = SvREFCNT_inc_NN ((SV *)PL_defoutgv);
2035
2036 {
2037 dSP;
2038 XPUSHs (sv_2mortal (coro->invoke_cb)); coro->invoke_cb = 0;
2039 PUTBACK;
2040 }
2041
2042 SvREFCNT_dec (GvAV (PL_defgv));
2043 GvAV (PL_defgv) = coro->invoke_av;
2044 coro->invoke_av = 0;
2045
2046 return 0;
2047 }
2048}
2049
2050static void
2051slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2052{
2053 HV *hv = (HV *)SvRV (coro_current);
2054 struct coro *coro = SvSTATE_hv ((SV *)hv);
2055
2056 if (expect_true (coro->saved_deffh))
2057 {
2058 /* subsequent iteration */
2059 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
2060 coro->saved_deffh = 0;
2061
2062 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
2063 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
2064 {
2065 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate);
2066 coro->invoke_av = newAV ();
2067
2068 frame->prepare = prepare_nop;
2069 }
2070 else
2071 {
2072 av_clear (GvAV (PL_defgv));
2073 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
2074
2075 coro->prio = 0;
2076
2077 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
2078 api_trace (aTHX_ coro_current, 0);
2079
2080 frame->prepare = prepare_schedule;
2081 av_push (av_async_pool, SvREFCNT_inc (hv));
2082 }
2083 }
2084 else
2085 {
2086 /* first iteration, simply fall through */
2087 frame->prepare = prepare_nop;
2088 }
2089
2090 frame->check = slf_check_pool_handler;
2091 frame->data = (void *)coro;
2092}
2093
1735/*****************************************************************************/ 2094/*****************************************************************************/
1736/* rouse callback */ 2095/* rouse callback */
1737 2096
1738#define CORO_MAGIC_type_rouse PERL_MAGIC_ext 2097#define CORO_MAGIC_type_rouse PERL_MAGIC_ext
1739 2098
1740static void 2099static void
1741coro_rouse_callback (pTHX_ CV *cv) 2100coro_rouse_callback (pTHX_ CV *cv)
1742{ 2101{
1743 dXSARGS; 2102 dXSARGS;
1744 SV *data = (SV *)GENSUB_ARG; 2103 SV *data = (SV *)S_GENSUB_ARG;
1745 2104
1746 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2105 if (SvTYPE (SvRV (data)) != SVt_PVAV)
1747 { 2106 {
1748 /* first call, set args */ 2107 /* first call, set args */
1749 int i; 2108 SV *coro = SvRV (data);
1750 AV *av = newAV (); 2109 AV *av = newAV ();
1751 SV *coro = SvRV (data);
1752 2110
1753 SvRV_set (data, (SV *)av); 2111 SvRV_set (data, (SV *)av);
1754 api_ready (aTHX_ coro);
1755 SvREFCNT_dec (coro);
1756 2112
1757 /* better take a full copy of the arguments */ 2113 /* better take a full copy of the arguments */
1758 while (items--) 2114 while (items--)
1759 av_store (av, items, newSVsv (ST (items))); 2115 av_store (av, items, newSVsv (ST (items)));
2116
2117 api_ready (aTHX_ coro);
2118 SvREFCNT_dec (coro);
1760 } 2119 }
1761 2120
1762 XSRETURN_EMPTY; 2121 XSRETURN_EMPTY;
1763} 2122}
1764 2123
… …
1781 2140
1782 EXTEND (SP, AvFILLp (av) + 1); 2141 EXTEND (SP, AvFILLp (av) + 1);
1783 for (i = 0; i <= AvFILLp (av); ++i) 2142 for (i = 0; i <= AvFILLp (av); ++i)
1784 PUSHs (sv_2mortal (AvARRAY (av)[i])); 2143 PUSHs (sv_2mortal (AvARRAY (av)[i]));
1785 2144
1786 /* we have stolen the elements, so ste length to zero and free */ 2145 /* we have stolen the elements, so set length to zero and free */
1787 AvFILLp (av) = -1; 2146 AvFILLp (av) = -1;
1788 av_undef (av); 2147 av_undef (av);
1789 2148
1790 PUTBACK; 2149 PUTBACK;
1791 } 2150 }
… …
1815 || SvTYPE (SvRV (cb)) != SVt_PVCV 2174 || SvTYPE (SvRV (cb)) != SVt_PVCV
1816 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2175 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
1817 croak ("Coro::rouse_wait called with illegal callback argument,"); 2176 croak ("Coro::rouse_wait called with illegal callback argument,");
1818 2177
1819 { 2178 {
1820 CV *cv = (CV *)SvRV (cb); /* for GENSUB_ARG */ 2179 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
1821 SV *data = (SV *)GENSUB_ARG; 2180 SV *data = (SV *)S_GENSUB_ARG;
1822 2181
1823 frame->data = (void *)data; 2182 frame->data = (void *)data;
1824 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule; 2183 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
1825 frame->check = slf_check_rouse_wait; 2184 frame->check = slf_check_rouse_wait;
1826 } 2185 }
… …
1830coro_new_rouse_cb (pTHX) 2189coro_new_rouse_cb (pTHX)
1831{ 2190{
1832 HV *hv = (HV *)SvRV (coro_current); 2191 HV *hv = (HV *)SvRV (coro_current);
1833 struct coro *coro = SvSTATE_hv (hv); 2192 struct coro *coro = SvSTATE_hv (hv);
1834 SV *data = newRV_inc ((SV *)hv); 2193 SV *data = newRV_inc ((SV *)hv);
1835 SV *cb = gensub (aTHX_ coro_rouse_callback, (void *)data); 2194 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
1836 2195
1837 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0); 2196 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0);
1838 SvREFCNT_dec (data); /* magicext increases the refcount */ 2197 SvREFCNT_dec (data); /* magicext increases the refcount */
1839 2198
1840 SvREFCNT_dec (coro->rouse_cb); 2199 SvREFCNT_dec (coro->rouse_cb);
… …
1895static void 2254static void
1896slf_init_schedule (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2255slf_init_schedule (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1897{ 2256{
1898 frame->prepare = prepare_schedule; 2257 frame->prepare = prepare_schedule;
1899 frame->check = slf_check_nop; 2258 frame->check = slf_check_nop;
2259}
2260
2261static void
2262slf_prepare_schedule_to (pTHX_ struct coro_transfer_args *ta)
2263{
2264 struct coro *next = (struct coro *)slf_frame.data;
2265
2266 SvREFCNT_inc_NN (next->hv);
2267 prepare_schedule_to (aTHX_ ta, next);
2268}
2269
2270static void
2271slf_init_schedule_to (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2272{
2273 if (!items)
2274 croak ("Coro::schedule_to expects a coroutine argument, caught");
2275
2276 frame->data = (void *)SvSTATE (arg [0]);
2277 frame->prepare = slf_prepare_schedule_to;
2278 frame->check = slf_check_nop;
2279}
2280
2281static void
2282slf_init_cede_to (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2283{
2284 api_ready (aTHX_ SvRV (coro_current));
2285
2286 slf_init_schedule_to (aTHX_ frame, cv, arg, items);
1900} 2287}
1901 2288
1902static void 2289static void
1903slf_init_cede (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2290slf_init_cede (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1904{ 2291{
… …
2037 if (PL_op->op_flags & OPf_STACKED) 2424 if (PL_op->op_flags & OPf_STACKED)
2038 { 2425 {
2039 if (items > slf_arga) 2426 if (items > slf_arga)
2040 { 2427 {
2041 slf_arga = items; 2428 slf_arga = items;
2042 free (slf_argv); 2429 Safefree (slf_argv);
2043 slf_argv = malloc (slf_arga * sizeof (SV *)); 2430 New (0, slf_argv, slf_arga, SV *);
2044 } 2431 }
2045 2432
2046 slf_argc = items; 2433 slf_argc = items;
2047 2434
2048 for (i = 0; i < items; ++i) 2435 for (i = 0; i < items; ++i)
… …
2050 } 2437 }
2051 else 2438 else
2052 slf_argc = 0; 2439 slf_argc = 0;
2053 2440
2054 PL_op->op_ppaddr = pp_slf; 2441 PL_op->op_ppaddr = pp_slf;
2055 PL_op->op_type = OP_CUSTOM; /* maybe we should leave it at entersub? */ 2442 /*PL_op->op_type = OP_CUSTOM; /* we do behave like entersub still */
2056 2443
2057 PL_op = (OP *)&slf_restore; 2444 PL_op = (OP *)&slf_restore;
2445}
2446
2447/*****************************************************************************/
2448/* dynamic wind */
2449
2450static void
2451on_enterleave_call (pTHX_ SV *cb)
2452{
2453 dSP;
2454
2455 PUSHSTACK;
2456
2457 PUSHMARK (SP);
2458 PUTBACK;
2459 call_sv (cb, G_VOID | G_DISCARD);
2460 SPAGAIN;
2461
2462 POPSTACK;
2463}
2464
2465static SV *
2466coro_avp_pop_and_free (pTHX_ AV **avp)
2467{
2468 AV *av = *avp;
2469 SV *res = av_pop (av);
2470
2471 if (AvFILLp (av) < 0)
2472 {
2473 *avp = 0;
2474 SvREFCNT_dec (av);
2475 }
2476
2477 return res;
2478}
2479
2480static void
2481coro_pop_on_enter (pTHX_ void *coro)
2482{
2483 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_enter);
2484 SvREFCNT_dec (cb);
2485}
2486
2487static void
2488coro_pop_on_leave (pTHX_ void *coro)
2489{
2490 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2491 on_enterleave_call (aTHX_ sv_2mortal (cb));
2058} 2492}
2059 2493
2060/*****************************************************************************/ 2494/*****************************************************************************/
2061/* PerlIO::cede */ 2495/* PerlIO::cede */
2062 2496
… …
2136/* Coro::Semaphore & Coro::Signal */ 2570/* Coro::Semaphore & Coro::Signal */
2137 2571
2138static SV * 2572static SV *
2139coro_waitarray_new (pTHX_ int count) 2573coro_waitarray_new (pTHX_ int count)
2140{ 2574{
2141 /* a semaphore contains a counter IV in $sem->[0] and any waiters after that */ 2575 /* a waitarray=semaphore contains a counter IV in $sem->[0] and any waiters after that */
2142 AV *av = newAV (); 2576 AV *av = newAV ();
2143 SV **ary; 2577 SV **ary;
2144 2578
2145 /* unfortunately, building manually saves memory */ 2579 /* unfortunately, building manually saves memory */
2146 Newx (ary, 2, SV *); 2580 Newx (ary, 2, SV *);
2147 AvALLOC (av) = ary; 2581 AvALLOC (av) = ary;
2582#if PERL_VERSION_ATLEAST (5,10,0)
2148 /*AvARRAY (av) = ary;*/ 2583 AvARRAY (av) = ary;
2584#else
2149 SvPVX ((SV *)av) = (char *)ary; /* 5.8.8 needs this syntax instead of AvARRAY = ary */ 2585 /* 5.8.8 needs this syntax instead of AvARRAY = ary, yet */
2586 /* -DDEBUGGING flags this as a bug, despite it perfectly working */
2587 SvPVX ((SV *)av) = (char *)ary;
2588#endif
2150 AvMAX (av) = 1; 2589 AvMAX (av) = 1;
2151 AvFILLp (av) = 0; 2590 AvFILLp (av) = 0;
2152 ary [0] = newSViv (count); 2591 ary [0] = newSViv (count);
2153 2592
2154 return newRV_noinc ((SV *)av); 2593 return newRV_noinc ((SV *)av);
… …
2174 AvARRAY (av)[0] = AvARRAY (av)[1]; 2613 AvARRAY (av)[0] = AvARRAY (av)[1];
2175 AvARRAY (av)[1] = count_sv; 2614 AvARRAY (av)[1] = count_sv;
2176 cb = av_shift (av); 2615 cb = av_shift (av);
2177 2616
2178 if (SvOBJECT (cb)) 2617 if (SvOBJECT (cb))
2618 {
2179 api_ready (aTHX_ cb); 2619 api_ready (aTHX_ cb);
2180 else 2620 --count;
2181 croak ("callbacks not yet supported"); 2621 }
2622 else if (SvTYPE (cb) == SVt_PVCV)
2623 {
2624 dSP;
2625 PUSHMARK (SP);
2626 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2627 PUTBACK;
2628 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2629 }
2182 2630
2183 SvREFCNT_dec (cb); 2631 SvREFCNT_dec (cb);
2184
2185 --count;
2186 } 2632 }
2187} 2633}
2188 2634
2189static void 2635static void
2190coro_semaphore_on_destroy (pTHX_ struct coro *coro) 2636coro_semaphore_on_destroy (pTHX_ struct coro *coro)
… …
2272} 2718}
2273 2719
2274static void 2720static void
2275slf_init_semaphore_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2721slf_init_semaphore_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2276{ 2722{
2723 if (items >= 2)
2724 {
2725 /* callback form */
2726 AV *av = (AV *)SvRV (arg [0]);
2727 SV *cb_cv = s_get_cv_croak (arg [1]);
2728
2729 av_push (av, SvREFCNT_inc_NN (cb_cv));
2730
2731 if (SvIVX (AvARRAY (av)[0]) > 0)
2732 coro_semaphore_adjust (aTHX_ av, 0);
2733
2734 frame->prepare = prepare_nop;
2735 frame->check = slf_check_nop;
2736 }
2737 else
2738 {
2277 slf_init_semaphore_down_or_wait (aTHX_ frame, cv, arg, items); 2739 slf_init_semaphore_down_or_wait (aTHX_ frame, cv, arg, items);
2278 frame->check = slf_check_semaphore_wait; 2740 frame->check = slf_check_semaphore_wait;
2741 }
2279} 2742}
2280 2743
2281/* signal */ 2744/* signal */
2282 2745
2283static void 2746static void
… …
2295 AvARRAY (av)[0] = AvARRAY (av)[1]; 2758 AvARRAY (av)[0] = AvARRAY (av)[1];
2296 AvARRAY (av)[1] = cb; 2759 AvARRAY (av)[1] = cb;
2297 2760
2298 cb = av_shift (av); 2761 cb = av_shift (av);
2299 2762
2763 if (SvTYPE (cb) == SVt_PVCV)
2764 {
2765 dSP;
2766 PUSHMARK (SP);
2767 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2768 PUTBACK;
2769 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2770 }
2771 else
2772 {
2300 api_ready (aTHX_ cb); 2773 api_ready (aTHX_ cb);
2301 sv_setiv (cb, 0); /* signal waiter */ 2774 sv_setiv (cb, 0); /* signal waiter */
2775 }
2776
2302 SvREFCNT_dec (cb); 2777 SvREFCNT_dec (cb);
2303 2778
2304 --count; 2779 --count;
2305 } 2780 }
2306} 2781}
… …
2315static void 2790static void
2316slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2791slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2317{ 2792{
2318 AV *av = (AV *)SvRV (arg [0]); 2793 AV *av = (AV *)SvRV (arg [0]);
2319 2794
2795 if (items >= 2)
2796 {
2797 SV *cb_cv = s_get_cv_croak (arg [1]);
2798 av_push (av, SvREFCNT_inc_NN (cb_cv));
2799
2320 if (SvIVX (AvARRAY (av)[0])) 2800 if (SvIVX (AvARRAY (av)[0]))
2801 coro_signal_wake (aTHX_ av, 1); /* must be the only waiter */
2802
2803 frame->prepare = prepare_nop;
2804 frame->check = slf_check_nop;
2805 }
2806 else if (SvIVX (AvARRAY (av)[0]))
2321 { 2807 {
2322 SvIVX (AvARRAY (av)[0]) = 0; 2808 SvIVX (AvARRAY (av)[0]) = 0;
2323 frame->prepare = prepare_nop; 2809 frame->prepare = prepare_nop;
2324 frame->check = slf_check_nop; 2810 frame->check = slf_check_nop;
2325 } 2811 }
2326 else 2812 else
2327 { 2813 {
2328 SV *waiter = newRV_inc (SvRV (coro_current)); /* owned by signal av */ 2814 SV *waiter = newSVsv (coro_current); /* owned by signal av */
2329 2815
2330 av_push (av, waiter); 2816 av_push (av, waiter);
2331 2817
2332 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */ 2818 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */
2333 frame->prepare = prepare_schedule; 2819 frame->prepare = prepare_schedule;
… …
2351 2837
2352static void 2838static void
2353coro_aio_callback (pTHX_ CV *cv) 2839coro_aio_callback (pTHX_ CV *cv)
2354{ 2840{
2355 dXSARGS; 2841 dXSARGS;
2356 AV *state = (AV *)GENSUB_ARG; 2842 AV *state = (AV *)S_GENSUB_ARG;
2357 SV *coro = av_pop (state); 2843 SV *coro = av_pop (state);
2358 SV *data_sv = newSV (sizeof (struct io_state)); 2844 SV *data_sv = newSV (sizeof (struct io_state));
2359 2845
2360 av_extend (state, items); 2846 av_extend (state, items - 1);
2361 2847
2362 sv_upgrade (data_sv, SVt_PV); 2848 sv_upgrade (data_sv, SVt_PV);
2363 SvCUR_set (data_sv, sizeof (struct io_state)); 2849 SvCUR_set (data_sv, sizeof (struct io_state));
2364 SvPOK_only (data_sv); 2850 SvPOK_only (data_sv);
2365 2851
… …
2475 2961
2476 for (i = 0; i < items; ++i) 2962 for (i = 0; i < items; ++i)
2477 PUSHs (arg [i]); 2963 PUSHs (arg [i]);
2478 2964
2479 /* now push the callback closure */ 2965 /* now push the callback closure */
2480 PUSHs (sv_2mortal (gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state)))); 2966 PUSHs (sv_2mortal (s_gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state))));
2481 2967
2482 /* now call the AIO function - we assume our request is uncancelable */ 2968 /* now call the AIO function - we assume our request is uncancelable */
2483 PUTBACK; 2969 PUTBACK;
2484 call_sv ((SV *)req, G_VOID | G_DISCARD); 2970 call_sv ((SV *)req, G_VOID | G_DISCARD);
2485 } 2971 }
2486 2972
2487 /* now that the requets is going, we loop toll we have a result */ 2973 /* now that the request is going, we loop till we have a result */
2488 frame->data = (void *)state; 2974 frame->data = (void *)state;
2489 frame->prepare = prepare_schedule; 2975 frame->prepare = prepare_schedule;
2490 frame->check = slf_check_aio_req; 2976 frame->check = slf_check_aio_req;
2491} 2977}
2492 2978
… …
2499 2985
2500 XSRETURN_EMPTY; 2986 XSRETURN_EMPTY;
2501} 2987}
2502 2988
2503/*****************************************************************************/ 2989/*****************************************************************************/
2990
2991#if CORO_CLONE
2992# include "clone.c"
2993#endif
2994
2995/*****************************************************************************/
2996
2997static SV *
2998coro_new (pTHX_ HV *stash, SV **argv, int argc, int is_coro)
2999{
3000 SV *coro_sv;
3001 struct coro *coro;
3002 MAGIC *mg;
3003 HV *hv;
3004 SV *cb;
3005 int i;
3006
3007 if (argc > 0)
3008 {
3009 cb = s_get_cv_croak (argv [0]);
3010
3011 if (!is_coro)
3012 {
3013 if (CvISXSUB (cb))
3014 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
3015
3016 if (!CvROOT (cb))
3017 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
3018 }
3019 }
3020
3021 Newz (0, coro, 1, struct coro);
3022 coro->args = newAV ();
3023 coro->flags = CF_NEW;
3024
3025 if (coro_first) coro_first->prev = coro;
3026 coro->next = coro_first;
3027 coro_first = coro;
3028
3029 coro->hv = hv = newHV ();
3030 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
3031 mg->mg_flags |= MGf_DUP;
3032 coro_sv = sv_bless (newRV_noinc ((SV *)hv), stash);
3033
3034 if (argc > 0)
3035 {
3036 av_extend (coro->args, argc + is_coro - 1);
3037
3038 if (is_coro)
3039 {
3040 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
3041 cb = (SV *)cv_coro_run;
3042 }
3043
3044 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3045
3046 for (i = 1; i < argc; i++)
3047 av_push (coro->args, newSVsv (argv [i]));
3048 }
3049
3050 return coro_sv;
3051}
2504 3052
2505MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3053MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2506 3054
2507PROTOTYPES: DISABLE 3055PROTOTYPES: DISABLE
2508 3056
… …
2513 coro_thx = PERL_GET_CONTEXT; 3061 coro_thx = PERL_GET_CONTEXT;
2514# endif 3062# endif
2515#endif 3063#endif
2516 BOOT_PAGESIZE; 3064 BOOT_PAGESIZE;
2517 3065
3066 cctx_current = cctx_new_empty ();
3067
2518 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3068 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
2519 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3069 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
2520 3070
2521 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 3071 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get;
2522 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set; 3072 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set;
… …
2541 3091
2542 { 3092 {
2543 SV *slf = sv_2mortal (newSViv (PTR2IV (pp_slf))); 3093 SV *slf = sv_2mortal (newSViv (PTR2IV (pp_slf)));
2544 3094
2545 if (!PL_custom_op_names) PL_custom_op_names = newHV (); 3095 if (!PL_custom_op_names) PL_custom_op_names = newHV ();
2546 hv_store_ent (PL_custom_op_names, slf, 3096 hv_store_ent (PL_custom_op_names, slf, newSVpv ("coro_slf", 0), 0);
2547 newSVpv ("coro_slf", 0), 0);
2548 3097
2549 if (!PL_custom_op_descs) PL_custom_op_descs = newHV (); 3098 if (!PL_custom_op_descs) PL_custom_op_descs = newHV ();
2550 hv_store_ent (PL_custom_op_descs, slf, 3099 hv_store_ent (PL_custom_op_descs, slf, newSVpv ("coro schedule like function", 0), 0);
2551 newSVpv ("coro schedule like function", 0), 0);
2552 } 3100 }
2553 3101
2554 coroapi.ver = CORO_API_VERSION; 3102 coroapi.ver = CORO_API_VERSION;
2555 coroapi.rev = CORO_API_REVISION; 3103 coroapi.rev = CORO_API_REVISION;
2556 3104
… …
2568 3116
2569 if (!svp) croak ("Time::HiRes is required"); 3117 if (!svp) croak ("Time::HiRes is required");
2570 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer"); 3118 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
2571 3119
2572 nvtime = INT2PTR (double (*)(), SvIV (*svp)); 3120 nvtime = INT2PTR (double (*)(), SvIV (*svp));
3121
3122 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
3123 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
2573 } 3124 }
2574 3125
2575 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 3126 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
2576} 3127}
2577 3128
2578SV * 3129SV *
2579new (char *klass, ...) 3130new (SV *klass, ...)
3131 ALIAS:
3132 Coro::new = 1
2580 CODE: 3133 CODE:
2581{ 3134 RETVAL = coro_new (aTHX_ ix ? coro_stash : coro_state_stash, &ST (1), items - 1, ix);
2582 struct coro *coro; 3135 OUTPUT:
2583 MAGIC *mg;
2584 HV *hv;
2585 int i;
2586
2587 Newz (0, coro, 1, struct coro);
2588 coro->args = newAV ();
2589 coro->flags = CF_NEW;
2590
2591 if (coro_first) coro_first->prev = coro;
2592 coro->next = coro_first;
2593 coro_first = coro;
2594
2595 coro->hv = hv = newHV ();
2596 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
2597 mg->mg_flags |= MGf_DUP;
2598 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
2599
2600 av_extend (coro->args, items - 1);
2601 for (i = 1; i < items; i++)
2602 av_push (coro->args, newSVsv (ST (i)));
2603}
2604 OUTPUT:
2605 RETVAL 3136 RETVAL
2606 3137
2607void 3138void
2608transfer (...) 3139transfer (...)
2609 PROTOTYPE: $$ 3140 PROTOTYPE: $$
… …
2620void 3151void
2621_exit (int code) 3152_exit (int code)
2622 PROTOTYPE: $ 3153 PROTOTYPE: $
2623 CODE: 3154 CODE:
2624 _exit (code); 3155 _exit (code);
3156
3157SV *
3158clone (Coro::State coro)
3159 CODE:
3160{
3161#if CORO_CLONE
3162 struct coro *ncoro = coro_clone (aTHX_ coro);
3163 MAGIC *mg;
3164 /* TODO: too much duplication */
3165 ncoro->hv = newHV ();
3166 mg = sv_magicext ((SV *)ncoro->hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)ncoro, 0);
3167 mg->mg_flags |= MGf_DUP;
3168 RETVAL = sv_bless (newRV_noinc ((SV *)ncoro->hv), SvSTASH (coro->hv));
3169#else
3170 croak ("Coro::State->clone has not been configured into this installation of Coro, realised");
3171#endif
3172}
3173 OUTPUT:
3174 RETVAL
2625 3175
2626int 3176int
2627cctx_stacksize (int new_stacksize = 0) 3177cctx_stacksize (int new_stacksize = 0)
2628 PROTOTYPE: ;$ 3178 PROTOTYPE: ;$
2629 CODE: 3179 CODE:
… …
2679 eval = 1 3229 eval = 1
2680 CODE: 3230 CODE:
2681{ 3231{
2682 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3232 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
2683 { 3233 {
2684 struct coro temp; 3234 struct coro *current = SvSTATE_current;
2685 3235
2686 if (!(coro->flags & CF_RUNNING)) 3236 if (current != coro)
2687 { 3237 {
2688 PUTBACK; 3238 PUTBACK;
2689 save_perl (aTHX_ &temp); 3239 save_perl (aTHX_ current);
2690 load_perl (aTHX_ coro); 3240 load_perl (aTHX_ coro);
3241 SPAGAIN;
2691 } 3242 }
2692 3243
2693 {
2694 dSP;
2695 ENTER;
2696 SAVETMPS;
2697 PUTBACK;
2698 PUSHSTACK; 3244 PUSHSTACK;
3245
2699 PUSHMARK (SP); 3246 PUSHMARK (SP);
3247 PUTBACK;
2700 3248
2701 if (ix) 3249 if (ix)
2702 eval_sv (coderef, 0); 3250 eval_sv (coderef, 0);
2703 else 3251 else
2704 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 3252 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
2705 3253
2706 POPSTACK; 3254 POPSTACK;
2707 SPAGAIN; 3255 SPAGAIN;
2708 FREETMPS;
2709 LEAVE;
2710 PUTBACK;
2711 }
2712 3256
2713 if (!(coro->flags & CF_RUNNING)) 3257 if (current != coro)
2714 { 3258 {
3259 PUTBACK;
2715 save_perl (aTHX_ coro); 3260 save_perl (aTHX_ coro);
2716 load_perl (aTHX_ &temp); 3261 load_perl (aTHX_ current);
2717 SPAGAIN; 3262 SPAGAIN;
2718 } 3263 }
2719 } 3264 }
2720} 3265}
2721 3266
… …
2725 ALIAS: 3270 ALIAS:
2726 is_ready = CF_READY 3271 is_ready = CF_READY
2727 is_running = CF_RUNNING 3272 is_running = CF_RUNNING
2728 is_new = CF_NEW 3273 is_new = CF_NEW
2729 is_destroyed = CF_DESTROYED 3274 is_destroyed = CF_DESTROYED
3275 is_suspended = CF_SUSPENDED
2730 CODE: 3276 CODE:
2731 RETVAL = boolSV (coro->flags & ix); 3277 RETVAL = boolSV (coro->flags & ix);
2732 OUTPUT: 3278 OUTPUT:
2733 RETVAL 3279 RETVAL
2734 3280
2735void 3281void
2736throw (Coro::State self, SV *throw = &PL_sv_undef) 3282throw (Coro::State self, SV *exception = &PL_sv_undef)
2737 PROTOTYPE: $;$ 3283 PROTOTYPE: $;$
2738 CODE: 3284 CODE:
2739{ 3285{
2740 struct coro *current = SvSTATE_current; 3286 struct coro *current = SvSTATE_current;
2741 SV **throwp = self == current ? &CORO_THROW : &self->except; 3287 SV **exceptionp = self == current ? &CORO_THROW : &self->except;
2742 SvREFCNT_dec (*throwp); 3288 SvREFCNT_dec (*exceptionp);
2743 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3289 SvGETMAGIC (exception);
3290 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
2744} 3291}
2745 3292
2746void 3293void
2747api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3294api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
2748 PROTOTYPE: $;$ 3295 PROTOTYPE: $;$
… …
2750 3297
2751SV * 3298SV *
2752has_cctx (Coro::State coro) 3299has_cctx (Coro::State coro)
2753 PROTOTYPE: $ 3300 PROTOTYPE: $
2754 CODE: 3301 CODE:
2755 RETVAL = boolSV (!!coro->cctx); 3302 /* maybe manage the running flag differently */
3303 RETVAL = boolSV (!!coro->cctx || (coro->flags & CF_RUNNING));
2756 OUTPUT: 3304 OUTPUT:
2757 RETVAL 3305 RETVAL
2758 3306
2759int 3307int
2760is_traced (Coro::State coro) 3308is_traced (Coro::State coro)
… …
2780 3328
2781void 3329void
2782force_cctx () 3330force_cctx ()
2783 PROTOTYPE: 3331 PROTOTYPE:
2784 CODE: 3332 CODE:
2785 SvSTATE_current->cctx->idle_sp = 0; 3333 cctx_current->idle_sp = 0;
2786 3334
2787void 3335void
2788swap_defsv (Coro::State self) 3336swap_defsv (Coro::State self)
2789 PROTOTYPE: $ 3337 PROTOTYPE: $
2790 ALIAS: 3338 ALIAS:
… …
2798 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv; 3346 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
2799 3347
2800 SV *tmp = *src; *src = *dst; *dst = tmp; 3348 SV *tmp = *src; *src = *dst; *dst = tmp;
2801 } 3349 }
2802 3350
3351void
3352cancel (Coro::State self)
3353 CODE:
3354 coro_state_destroy (aTHX_ self);
3355 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */
3356
3357
3358SV *
3359enable_times (int enabled = enable_times)
3360 CODE:
3361{
3362 RETVAL = boolSV (enable_times);
3363
3364 if (enabled != enable_times)
3365 {
3366 enable_times = enabled;
3367
3368 coro_times_update ();
3369 (enabled ? coro_times_sub : coro_times_add)(SvSTATE (coro_current));
3370 }
3371}
3372 OUTPUT:
3373 RETVAL
3374
3375void
3376times (Coro::State self)
3377 PPCODE:
3378{
3379 struct coro *current = SvSTATE (coro_current);
3380
3381 if (expect_false (current == self))
3382 {
3383 coro_times_update ();
3384 coro_times_add (SvSTATE (coro_current));
3385 }
3386
3387 EXTEND (SP, 2);
3388 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3389 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3390
3391 if (expect_false (current == self))
3392 coro_times_sub (SvSTATE (coro_current));
3393}
3394
3395void
3396swap_sv (Coro::State coro, SV *sv, SV *swapsv)
3397 CODE:
3398{
3399 struct coro *current = SvSTATE_current;
3400
3401 if (current == coro)
3402 SWAP_SVS (current);
3403
3404 if (!coro->swap_sv)
3405 coro->swap_sv = newAV ();
3406
3407 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv )));
3408 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv)));
3409
3410 if (current == coro)
3411 SWAP_SVS (current);
3412}
3413
2803 3414
2804MODULE = Coro::State PACKAGE = Coro 3415MODULE = Coro::State PACKAGE = Coro
2805 3416
2806BOOT: 3417BOOT:
2807{ 3418{
2808 int i;
2809
2810 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
2811 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3419 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
2812 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3420 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
2813 3421 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3422 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
2814 coro_current = coro_get_sv (aTHX_ "Coro::current", FALSE); 3423 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
2815 SvREADONLY_on (coro_current); 3424 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3425 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3426 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3427 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
2816 3428
3429 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3430 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3431 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3432 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3433
2817 coro_stash = gv_stashpv ("Coro", TRUE); 3434 coro_stash = gv_stashpv ("Coro", TRUE);
2818 3435
2819 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 3436 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
2820 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 3437 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
2821 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 3438 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
2822 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 3439 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (CORO_PRIO_LOW));
2823 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE)); 3440 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (CORO_PRIO_IDLE));
2824 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN)); 3441 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (CORO_PRIO_MIN));
2825
2826 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
2827 coro_ready[i] = newAV ();
2828 3442
2829 { 3443 {
2830 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 3444 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
2831 3445
2832 coroapi.schedule = api_schedule; 3446 coroapi.schedule = api_schedule;
3447 coroapi.schedule_to = api_schedule_to;
2833 coroapi.cede = api_cede; 3448 coroapi.cede = api_cede;
2834 coroapi.cede_notself = api_cede_notself; 3449 coroapi.cede_notself = api_cede_notself;
2835 coroapi.ready = api_ready; 3450 coroapi.ready = api_ready;
2836 coroapi.is_ready = api_is_ready; 3451 coroapi.is_ready = api_is_ready;
2837 coroapi.nready = coro_nready; 3452 coroapi.nready = coro_nready;
… …
2841 sv_setiv (sv, (IV)&coroapi); 3456 sv_setiv (sv, (IV)&coroapi);
2842 SvREADONLY_on (sv); 3457 SvREADONLY_on (sv);
2843 } 3458 }
2844} 3459}
2845 3460
3461SV *
3462async (...)
3463 PROTOTYPE: &@
3464 CODE:
3465 RETVAL = coro_new (aTHX_ coro_stash, &ST (0), items, 1);
3466 api_ready (aTHX_ RETVAL);
3467 OUTPUT:
3468 RETVAL
3469
3470void
3471terminate (...)
3472 CODE:
3473 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3474
2846void 3475void
2847schedule (...) 3476schedule (...)
2848 CODE: 3477 CODE:
2849 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3478 CORO_EXECUTE_SLF_XS (slf_init_schedule);
3479
3480void
3481schedule_to (...)
3482 CODE:
3483 CORO_EXECUTE_SLF_XS (slf_init_schedule_to);
3484
3485void
3486cede_to (...)
3487 CODE:
3488 CORO_EXECUTE_SLF_XS (slf_init_cede_to);
2850 3489
2851void 3490void
2852cede (...) 3491cede (...)
2853 CODE: 3492 CODE:
2854 CORO_EXECUTE_SLF_XS (slf_init_cede); 3493 CORO_EXECUTE_SLF_XS (slf_init_cede);
… …
2868void 3507void
2869_set_readyhook (SV *hook) 3508_set_readyhook (SV *hook)
2870 PROTOTYPE: $ 3509 PROTOTYPE: $
2871 CODE: 3510 CODE:
2872 SvREFCNT_dec (coro_readyhook); 3511 SvREFCNT_dec (coro_readyhook);
3512 SvGETMAGIC (hook);
3513 if (SvOK (hook))
3514 {
2873 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0; 3515 coro_readyhook = newSVsv (hook);
3516 CORO_READYHOOK = invoke_sv_ready_hook_helper;
3517 }
3518 else
3519 {
3520 coro_readyhook = 0;
3521 CORO_READYHOOK = 0;
3522 }
2874 3523
2875int 3524int
2876prio (Coro::State coro, int newprio = 0) 3525prio (Coro::State coro, int newprio = 0)
2877 PROTOTYPE: $;$ 3526 PROTOTYPE: $;$
2878 ALIAS: 3527 ALIAS:
… …
2884 if (items > 1) 3533 if (items > 1)
2885 { 3534 {
2886 if (ix) 3535 if (ix)
2887 newprio = coro->prio - newprio; 3536 newprio = coro->prio - newprio;
2888 3537
2889 if (newprio < PRIO_MIN) newprio = PRIO_MIN; 3538 if (newprio < CORO_PRIO_MIN) newprio = CORO_PRIO_MIN;
2890 if (newprio > PRIO_MAX) newprio = PRIO_MAX; 3539 if (newprio > CORO_PRIO_MAX) newprio = CORO_PRIO_MAX;
2891 3540
2892 coro->prio = newprio; 3541 coro->prio = newprio;
2893 } 3542 }
2894} 3543}
2895 OUTPUT: 3544 OUTPUT:
… …
2909 CODE: 3558 CODE:
2910 RETVAL = coro_nready; 3559 RETVAL = coro_nready;
2911 OUTPUT: 3560 OUTPUT:
2912 RETVAL 3561 RETVAL
2913 3562
2914# for async_pool speedup
2915void 3563void
2916_pool_1 (SV *cb) 3564suspend (Coro::State self)
3565 PROTOTYPE: $
2917 CODE: 3566 CODE:
2918{ 3567 self->flags |= CF_SUSPENDED;
2919 HV *hv = (HV *)SvRV (coro_current);
2920 struct coro *coro = SvSTATE_hv ((SV *)hv);
2921 AV *defav = GvAV (PL_defgv);
2922 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
2923 AV *invoke_av;
2924 int i, len;
2925 3568
2926 if (!invoke) 3569void
3570resume (Coro::State self)
3571 PROTOTYPE: $
3572 CODE:
3573 self->flags &= ~CF_SUSPENDED;
3574
3575void
3576_pool_handler (...)
3577 CODE:
3578 CORO_EXECUTE_SLF_XS (slf_init_pool_handler);
3579
3580void
3581async_pool (SV *cv, ...)
3582 PROTOTYPE: &@
3583 PPCODE:
3584{
3585 HV *hv = (HV *)av_pop (av_async_pool);
3586 AV *av = newAV ();
3587 SV *cb = ST (0);
3588 int i;
3589
3590 av_extend (av, items - 2);
3591 for (i = 1; i < items; ++i)
3592 av_push (av, SvREFCNT_inc_NN (ST (i)));
3593
3594 if ((SV *)hv == &PL_sv_undef)
2927 { 3595 {
2928 SV *old = PL_diehook; 3596 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
2929 PL_diehook = 0; 3597 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
2930 SvREFCNT_dec (old); 3598 SvREFCNT_dec (sv);
2931 croak ("\3async_pool terminate\2\n");
2932 } 3599 }
2933 3600
2934 SvREFCNT_dec (coro->saved_deffh);
2935 coro->saved_deffh = SvREFCNT_inc_NN ((SV *)PL_defoutgv);
2936
2937 hv_store (hv, "desc", sizeof ("desc") - 1,
2938 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
2939
2940 invoke_av = (AV *)SvRV (invoke);
2941 len = av_len (invoke_av);
2942
2943 sv_setsv (cb, AvARRAY (invoke_av)[0]);
2944
2945 if (len > 0)
2946 { 3601 {
2947 av_fill (defav, len - 1); 3602 struct coro *coro = SvSTATE_hv (hv);
2948 for (i = 0; i < len; ++i) 3603
2949 av_store (defav, i, SvREFCNT_inc_NN (AvARRAY (invoke_av)[i + 1])); 3604 assert (!coro->invoke_cb);
3605 assert (!coro->invoke_av);
3606 coro->invoke_cb = SvREFCNT_inc (cb);
3607 coro->invoke_av = av;
2950 } 3608 }
2951}
2952 3609
2953void 3610 api_ready (aTHX_ (SV *)hv);
2954_pool_2 (SV *cb)
2955 CODE:
2956{
2957 HV *hv = (HV *)SvRV (coro_current);
2958 struct coro *coro = SvSTATE_hv ((SV *)hv);
2959 3611
2960 sv_setsv (cb, &PL_sv_undef); 3612 if (GIMME_V != G_VOID)
2961 3613 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
2962 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 3614 else
2963 coro->saved_deffh = 0;
2964
2965 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
2966 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
2967 {
2968 SV *old = PL_diehook;
2969 PL_diehook = 0;
2970 SvREFCNT_dec (old); 3615 SvREFCNT_dec (hv);
2971 croak ("\3async_pool terminate\2\n");
2972 }
2973
2974 av_clear (GvAV (PL_defgv));
2975 hv_store (hv, "desc", sizeof ("desc") - 1,
2976 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
2977
2978 coro->prio = 0;
2979
2980 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
2981 api_trace (aTHX_ coro_current, 0);
2982
2983 av_push (av_async_pool, newSVsv (coro_current));
2984} 3616}
2985 3617
2986SV * 3618SV *
2987rouse_cb () 3619rouse_cb ()
2988 PROTOTYPE: 3620 PROTOTYPE:
… …
2990 RETVAL = coro_new_rouse_cb (aTHX); 3622 RETVAL = coro_new_rouse_cb (aTHX);
2991 OUTPUT: 3623 OUTPUT:
2992 RETVAL 3624 RETVAL
2993 3625
2994void 3626void
2995rouse_wait (SV *cb = 0) 3627rouse_wait (...)
2996 PROTOTYPE: ;$ 3628 PROTOTYPE: ;$
2997 PPCODE: 3629 PPCODE:
2998 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait); 3630 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait);
2999 3631
3632void
3633on_enter (SV *block)
3634 ALIAS:
3635 on_leave = 1
3636 PROTOTYPE: &
3637 CODE:
3638{
3639 struct coro *coro = SvSTATE_current;
3640 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3641
3642 block = s_get_cv_croak (block);
3643
3644 if (!*avp)
3645 *avp = newAV ();
3646
3647 av_push (*avp, SvREFCNT_inc (block));
3648
3649 if (!ix)
3650 on_enterleave_call (aTHX_ block);
3651
3652 LEAVE; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
3653 SAVEDESTRUCTOR_X (ix ? coro_pop_on_leave : coro_pop_on_enter, (void *)coro);
3654 ENTER; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
3655}
3656
3000 3657
3001MODULE = Coro::State PACKAGE = PerlIO::cede 3658MODULE = Coro::State PACKAGE = PerlIO::cede
3002 3659
3003BOOT: 3660BOOT:
3004 PerlIO_define_layer (aTHX_ &PerlIO_cede); 3661 PerlIO_define_layer (aTHX_ &PerlIO_cede);
… …
3007MODULE = Coro::State PACKAGE = Coro::Semaphore 3664MODULE = Coro::State PACKAGE = Coro::Semaphore
3008 3665
3009SV * 3666SV *
3010new (SV *klass, SV *count = 0) 3667new (SV *klass, SV *count = 0)
3011 CODE: 3668 CODE:
3669{
3670 int semcnt = 1;
3671
3672 if (count)
3673 {
3674 SvGETMAGIC (count);
3675
3676 if (SvOK (count))
3677 semcnt = SvIV (count);
3678 }
3679
3012 RETVAL = sv_bless ( 3680 RETVAL = sv_bless (
3013 coro_waitarray_new (aTHX_ count && SvOK (count) ? SvIV (count) : 1), 3681 coro_waitarray_new (aTHX_ semcnt),
3014 GvSTASH (CvGV (cv)) 3682 GvSTASH (CvGV (cv))
3015 ); 3683 );
3684}
3016 OUTPUT: 3685 OUTPUT:
3017 RETVAL 3686 RETVAL
3018 3687
3019# helper for Coro::Channel 3688# helper for Coro::Channel and others
3020SV * 3689SV *
3021_alloc (int count) 3690_alloc (int count)
3022 CODE: 3691 CODE:
3023 RETVAL = coro_waitarray_new (aTHX_ count); 3692 RETVAL = coro_waitarray_new (aTHX_ count);
3024 OUTPUT: 3693 OUTPUT:
… …
3037 adjust = 1 3706 adjust = 1
3038 CODE: 3707 CODE:
3039 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1); 3708 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1);
3040 3709
3041void 3710void
3042down (SV *self) 3711down (...)
3043 CODE: 3712 CODE:
3044 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down); 3713 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down);
3045 3714
3046void 3715void
3047wait (SV *self) 3716wait (...)
3048 CODE: 3717 CODE:
3049 CORO_EXECUTE_SLF_XS (slf_init_semaphore_wait); 3718 CORO_EXECUTE_SLF_XS (slf_init_semaphore_wait);
3050 3719
3051void 3720void
3052try (SV *self) 3721try (SV *self)
… …
3082 for (i = 1; i <= wcount; ++i) 3751 for (i = 1; i <= wcount; ++i)
3083 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i]))); 3752 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i])));
3084 } 3753 }
3085} 3754}
3086 3755
3756MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3757
3758void
3759_may_delete (SV *sem, int count, int extra_refs)
3760 PPCODE:
3761{
3762 AV *av = (AV *)SvRV (sem);
3763
3764 if (SvREFCNT ((SV *)av) == 1 + extra_refs
3765 && AvFILLp (av) == 0 /* no waiters, just count */
3766 && SvIV (AvARRAY (av)[0]) == count)
3767 XSRETURN_YES;
3768
3769 XSRETURN_NO;
3770}
3771
3087MODULE = Coro::State PACKAGE = Coro::Signal 3772MODULE = Coro::State PACKAGE = Coro::Signal
3088 3773
3089SV * 3774SV *
3090new (SV *klass) 3775new (SV *klass)
3091 CODE: 3776 CODE:
… …
3095 ); 3780 );
3096 OUTPUT: 3781 OUTPUT:
3097 RETVAL 3782 RETVAL
3098 3783
3099void 3784void
3100wait (SV *self) 3785wait (...)
3101 CODE: 3786 CODE:
3102 CORO_EXECUTE_SLF_XS (slf_init_signal_wait); 3787 CORO_EXECUTE_SLF_XS (slf_init_signal_wait);
3103 3788
3104void 3789void
3105broadcast (SV *self) 3790broadcast (SV *self)
… …
3162 3847
3163void 3848void
3164_register (char *target, char *proto, SV *req) 3849_register (char *target, char *proto, SV *req)
3165 CODE: 3850 CODE:
3166{ 3851{
3167 HV *st; 3852 SV *req_cv = s_get_cv_croak (req);
3168 GV *gvp;
3169 CV *req_cv = sv_2cv (req, &st, &gvp, 0);
3170 /* newXSproto doesn't return the CV on 5.8 */ 3853 /* newXSproto doesn't return the CV on 5.8 */
3171 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 3854 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3172 sv_setpv ((SV *)slf_cv, proto); 3855 sv_setpv ((SV *)slf_cv, proto);
3173 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0); 3856 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
3174} 3857}
3175 3858
3859MODULE = Coro::State PACKAGE = Coro::Select
3860
3861void
3862patch_pp_sselect ()
3863 CODE:
3864 if (!coro_old_pp_sselect)
3865 {
3866 coro_select_select = (SV *)get_cv ("Coro::Select::select", 0);
3867 coro_old_pp_sselect = PL_ppaddr [OP_SSELECT];
3868 PL_ppaddr [OP_SSELECT] = coro_pp_sselect;
3869 }
3870
3871void
3872unpatch_pp_sselect ()
3873 CODE:
3874 if (coro_old_pp_sselect)
3875 {
3876 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
3877 coro_old_pp_sselect = 0;
3878 }
3879

Diff Legend

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